diff options
| author | Xiaoliang Yang <xiaoliang.yang_1@nxp.com> | 2021-07-05 18:26:55 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-05 10:16:17 -0700 |
| commit | e9e3720002f61cd637a49ecafae77cac230eefae (patch) | |
| tree | 0cf6de55843143b4cec266d801c988cd998063fa /drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | |
| parent | b2aae654a4794ef898ad33a179f341eb610f6b85 (diff) | |
| download | linux-e9e3720002f61cd637a49ecafae77cac230eefae.tar.gz linux-e9e3720002f61cd637a49ecafae77cac230eefae.tar.bz2 linux-e9e3720002f61cd637a49ecafae77cac230eefae.zip | |
net: stmmac: ptp: update tas basetime after ptp adjust
After adjusting the ptp time, the Qbv base time may be the past time
of the new current time. dwmac5 hardware limited the base time cannot
be set as past time. This patch add a btr_reserve to store the base
time get from qopt, then calculate the base time and reset the Qbv
configuration after ptp time adjust.
Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 2e3cdf540168..4f3b6437b114 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -739,7 +739,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv, { u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep; struct plat_stmmacenet_data *plat = priv->plat; - struct timespec64 time, current_time; + struct timespec64 time, current_time, qopt_time; ktime_t current_time_ns; bool fpe = false; int i, ret = 0; @@ -848,6 +848,10 @@ static int tc_setup_taprio(struct stmmac_priv *priv, priv->plat->est->btr[0] = (u32)time.tv_nsec; priv->plat->est->btr[1] = (u32)time.tv_sec; + qopt_time = ktime_to_timespec64(qopt->base_time); + priv->plat->est->btr_reserve[0] = (u32)qopt_time.tv_nsec; + priv->plat->est->btr_reserve[1] = (u32)qopt_time.tv_sec; + ctr = qopt->cycle_time; priv->plat->est->ctr[0] = do_div(ctr, NSEC_PER_SEC); priv->plat->est->ctr[1] = (u32)ctr; |