diff options
author | Michael Chan <michael.chan@broadcom.com> | 2017-03-28 19:47:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-29 17:05:34 -0400 |
commit | 3ed3a83e3f3871c57b18cef09b148e96921236ed (patch) | |
tree | 9c50f34747b46d94165da8e1dc3f551a231816a9 | |
parent | 23e12c893489ed12ecfccbf866fc62af1bead4b0 (diff) |
bnxt_en: Fix DMA unmapping of the RX buffers in XDP mode during shutdown.
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>
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 6c8568780a6a..1f1e54ba0ecb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |||
@@ -1983,20 +1983,25 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) | |||
1983 | 1983 | ||
1984 | for (j = 0; j < max_idx; j++) { | 1984 | for (j = 0; j < max_idx; j++) { |
1985 | struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[j]; | 1985 | struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[j]; |
1986 | dma_addr_t mapping = rx_buf->mapping; | ||
1986 | void *data = rx_buf->data; | 1987 | void *data = rx_buf->data; |
1987 | 1988 | ||
1988 | if (!data) | 1989 | if (!data) |
1989 | continue; | 1990 | continue; |
1990 | 1991 | ||
1991 | dma_unmap_single(&pdev->dev, rx_buf->mapping, | ||
1992 | bp->rx_buf_use_size, bp->rx_dir); | ||
1993 | |||
1994 | rx_buf->data = NULL; | 1992 | rx_buf->data = NULL; |
1995 | 1993 | ||
1996 | if (BNXT_RX_PAGE_MODE(bp)) | 1994 | if (BNXT_RX_PAGE_MODE(bp)) { |
1995 | mapping -= bp->rx_dma_offset; | ||
1996 | dma_unmap_page(&pdev->dev, mapping, | ||
1997 | PAGE_SIZE, bp->rx_dir); | ||
1997 | __free_page(data); | 1998 | __free_page(data); |
1998 | else | 1999 | } else { |
2000 | dma_unmap_single(&pdev->dev, mapping, | ||
2001 | bp->rx_buf_use_size, | ||
2002 | bp->rx_dir); | ||
1999 | kfree(data); | 2003 | kfree(data); |
2004 | } | ||
2000 | } | 2005 | } |
2001 | 2006 | ||
2002 | for (j = 0; j < max_agg_idx; j++) { | 2007 | for (j = 0; j < max_agg_idx; j++) { |