From: Michael Chan <michael.chan@broadcom.com>
Date: Tue, 28 Mar 2017 23:47:31 +0000 (-0400)
Subject: bnxt_en: Fix DMA unmapping of the RX buffers in XDP mode during shutdown.
X-Git-Tag: v4.1.12-106.0.20170710_2300~48
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dca323c4fba3311ef495ff8fdf587f4cd1e5ddae;p=users%2Fjedix%2Flinux-maple.git

bnxt_en: Fix DMA unmapping of the RX buffers in XDP mode during shutdown.

Orabug: 26402533, 26325599, 26366387

In bnxt_free_rx_skbs(), which is called to free up all RX buffers during
shutdown, we need to unmap the page if we are running in XDP mode.

Fixes: c61fb99cae51 ("bnxt_en: Add RX page mode support.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 3ed3a83e3f3871c57b18cef09b148e96921236ed)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

Conflicts:
	drivers/net/ethernet/broadcom/bnxt/bnxt.c
---

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8c5d40f314f6..d224dbde3c55 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2010,21 +2010,26 @@ static void bnxt_free_rx_skbs(struct bnxt *bp)
 
 		for (j = 0; j < max_idx; j++) {
 			struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[j];
+			dma_addr_t mapping = rx_buf->mapping;
 			void *data = rx_buf->data;
 
 			if (!data)
 				continue;
 
-			dma_unmap_single_attrs(&pdev->dev, rx_buf->mapping,
-					       bp->rx_buf_use_size, bp->rx_dir,
-					       &attrs);
-
 			rx_buf->data = NULL;
 
-			if (BNXT_RX_PAGE_MODE(bp))
+			if (BNXT_RX_PAGE_MODE(bp)) {
+				mapping -= bp->rx_dma_offset;
+				dma_unmap_page_attrs(&pdev->dev, mapping,
+						     PAGE_SIZE, bp->rx_dir,
+						     &attrs);
 				__free_page(data);
-			else
+			} else {
+				dma_unmap_single_attrs(&pdev->dev, mapping,
+							bp->rx_buf_use_size,
+							bp->rx_dir, &attrs);
 				kfree(data);
+			}
 		}
 
 		for (j = 0; j < max_agg_idx; j++) {