From: Niklas Cassel Date: Mon, 26 Feb 2018 21:47:08 +0000 (+0100) Subject: net: stmmac: ensure that the device has released ownership before reading data X-Git-Tag: pci-v4.17-changes-2~83^2~347^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a6b25da5e7ba212af5826a662e6a035a79bffabd;p=users%2Fdwmw2%2Flinux.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6dd04f237b2aa..a9856a8bf8ad2 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 */