Commit a1801cc8 authored by David S. Miller's avatar David S. Miller

Merge branch 'bnxt_en-fixes'

Michael Chan says:

====================
bnxt_en: Small misc. fixes.

Fix a NULL pointer crash in open failure path, wrong arguments when
printing error messages, and a DMA unmap bug in XDP shutdown path.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e91793bb 3ed3a83e
...@@ -1983,21 +1983,26 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) ...@@ -1983,21 +1983,26 @@ static void bnxt_free_rx_skbs(struct bnxt *bp)
for (j = 0; j < max_idx; j++) { for (j = 0; j < max_idx; j++) {
struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[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; void *data = rx_buf->data;
if (!data) if (!data)
continue; continue;
dma_unmap_single(&pdev->dev, rx_buf->mapping,
bp->rx_buf_use_size, bp->rx_dir);
rx_buf->data = NULL; rx_buf->data = NULL;
if (BNXT_RX_PAGE_MODE(bp)) if (BNXT_RX_PAGE_MODE(bp)) {
mapping -= bp->rx_dma_offset;
dma_unmap_page(&pdev->dev, mapping,
PAGE_SIZE, bp->rx_dir);
__free_page(data); __free_page(data);
else } else {
dma_unmap_single(&pdev->dev, mapping,
bp->rx_buf_use_size,
bp->rx_dir);
kfree(data); kfree(data);
} }
}
for (j = 0; j < max_agg_idx; j++) { for (j = 0; j < max_agg_idx; j++) {
struct bnxt_sw_rx_agg_bd *rx_agg_buf = struct bnxt_sw_rx_agg_bd *rx_agg_buf =
...@@ -2455,6 +2460,18 @@ static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr) ...@@ -2455,6 +2460,18 @@ static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr)
return 0; return 0;
} }
static void bnxt_init_cp_rings(struct bnxt *bp)
{
int i;
for (i = 0; i < bp->cp_nr_rings; i++) {
struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
struct bnxt_ring_struct *ring = &cpr->cp_ring_struct;
ring->fw_ring_id = INVALID_HW_RING_ID;
}
}
static int bnxt_init_rx_rings(struct bnxt *bp) static int bnxt_init_rx_rings(struct bnxt *bp)
{ {
int i, rc = 0; int i, rc = 0;
...@@ -4732,7 +4749,7 @@ static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa) ...@@ -4732,7 +4749,7 @@ static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa)
rc = bnxt_hwrm_vnic_set_tpa(bp, i, tpa_flags); rc = bnxt_hwrm_vnic_set_tpa(bp, i, tpa_flags);
if (rc) { if (rc) {
netdev_err(bp->dev, "hwrm vnic set tpa failure rc for vnic %d: %x\n", netdev_err(bp->dev, "hwrm vnic set tpa failure rc for vnic %d: %x\n",
rc, i); i, rc);
return rc; return rc;
} }
} }
...@@ -5006,6 +5023,7 @@ static int bnxt_shutdown_nic(struct bnxt *bp, bool irq_re_init) ...@@ -5006,6 +5023,7 @@ static int bnxt_shutdown_nic(struct bnxt *bp, bool irq_re_init)
static int bnxt_init_nic(struct bnxt *bp, bool irq_re_init) static int bnxt_init_nic(struct bnxt *bp, bool irq_re_init)
{ {
bnxt_init_cp_rings(bp);
bnxt_init_rx_rings(bp); bnxt_init_rx_rings(bp);
bnxt_init_tx_rings(bp); bnxt_init_tx_rings(bp);
bnxt_init_ring_grps(bp, irq_re_init); bnxt_init_ring_grps(bp, irq_re_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment