From: Michael Chan <michael.chan@broadcom.com>
Date: Sun, 15 May 2016 07:04:51 +0000 (-0400)
Subject: bnxt_en: Use dma_rmb() instead of rmb().
X-Git-Tag: v4.1.12-92~126^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bfb0a96e5eadee1c28893fefd01ce6601eda0db9;p=users%2Fjedix%2Flinux-maple.git

bnxt_en: Use dma_rmb() instead of rmb().

Orabug: 23221795

Use the weaker but more appropriate dma_rmb() to order the reading of
the completion ring.

Suggested-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit b67daab033293b3882ba4dc926ffb084d70044e0)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7b798c28ff555..99be94d4c6e32 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1497,7 +1497,7 @@ static int bnxt_poll_work(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)
 		/* The valid test of the entry must be done first before
 		 * reading any further.
 		 */
-		rmb();
+		dma_rmb();
 		if (TX_CMP_TYPE(txcmp) == CMP_TYPE_TX_L2_CMP) {
 			tx_pkts++;
 			/* return full budget so NAPI will complete. */