2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index f6014d330b2e..9b1d9fa68257 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1558,6 +1558,9 @@ static int xgbe_dev_read(struct xgbe_channel *channel)
         if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, OWN))
                 return 1;
 
+        /* Make sure descriptor fields are read after reading the OWN bit */
+        rmb();
+
 #ifdef XGMAC_ENABLE_RX_DESC_DUMP
         xgbe_dump_rx_desc(ring, rdesc, ring->cur);
 #endif
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 0544931329d1..eebb787251c4 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1791,6 +1791,10 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
                 if (!hw_if->tx_complete(rdesc))
                         break;
 
+                /* Make sure descriptor fields are read after reading the OWN
+                 * bit */
+                rmb();
+
 #ifdef XGMAC_ENABLE_TX_DESC_DUMP
                 xgbe_dump_tx_desc(ring, ring->dirty, 1, 0);
 #endif