diff options
| author |   Niklas Cassel <niklas.cassel@axis.com> | 2018-02-26 22:47:08 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-27 14:28:10 -0500 |
| commit | a6b25da5e7ba212af5826a662e6a035a79bffabd (patch) | |
| tree | 77db9952a2c424b51902d829666a3c9638f1d8eb /drivers | |
| parent | net: stmmac: use correct barrier between coherent memory and MMIO (diff) | |
| download | linux-dev-a6b25da5e7ba212af5826a662e6a035a79bffabd.tar.xz linux-dev-a6b25da5e7ba212af5826a662e6a035a79bffabd.zip | |
net: stmmac: ensure that the device has released ownership before reading data
According to Documentation/memory-barriers.txt, we need to use a
dma_rmb() after reading the status/own bit, to ensure that all
descriptor fields are read after reading the own bit.
This way, we ensure that the DMA engine is done with the DMA
descriptor before we read the other descriptor fields, e.g. reading
the tx hardware timestamp (if PTP is enabled).
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6dd04f237b2a..a9856a8bf8ad 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1844,6 +1844,11 @@ static void stmmac_tx_clean(struct stmmac_priv *priv, u32 queue) if (unlikely(status & tx_dma_own)) break; + /* Make sure descriptor fields are read after reading + * the own bit. + */ + dma_rmb(); + /* Just consider the last segment and ...*/ if (likely(!(status & tx_not_ls))) { /* ... verify the status error condition */ |