d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/bnxt: avoid invalid vnic id in set L2 Rx mask

Browse Source 
In some cases bnxt_hwrm_cfa_l2_set_rx_mask is being called before
VNICs are allocated. The FW returns an error in such cases.
Move bnxt_init_nic to bnxt_dev_init such that the ids are initialized
to an invalid id.
Prevent sending the command to the FW only with a valid vnic id.

Fixes: 244bc98b0d ("net/bnxt: set L2 Rx mask")
Cc: stable@dpdk.org

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
This commit is contained in:
Ajit Khaparde 2018-04-20 07:22:01 -07:00 committed by Ferruh Yigit
parent e3d8f1e6a6
commit 1b533790f4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bnxt/bnxt_ethdev.c
View File

@ -395,10 +395,6 @@ static int bnxt_init_nic(struct bnxt *bp)
bnxt_init_vnics(bp); bnxt_init_vnics(bp);
bnxt_init_filters(bp); bnxt_init_filters(bp);
rc = bnxt_init_chip(bp);
if (rc)
return rc;
return 0; return 0;
} }
@ -594,7 +590,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
} }
bp->dev_stopped = 0; bp->dev_stopped = 0;
rc = bnxt_init_nic(bp); rc = bnxt_init_chip(bp);
if (rc) if (rc)
goto error; goto error;
@ -3398,6 +3394,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
goto error_free_int; goto error_free_int;
bnxt_enable_int(bp); bnxt_enable_int(bp);
bnxt_init_nic(bp);
return 0; return 0;

3
drivers/net/bnxt/bnxt_hwrm.c
View File

@ -221,6 +221,9 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,
struct hwrm_cfa_l2_set_rx_mask_output *resp = bp->hwrm_cmd_resp_addr; struct hwrm_cfa_l2_set_rx_mask_output *resp = bp->hwrm_cmd_resp_addr;
uint32_t mask = 0; uint32_t mask = 0;
if (vnic->fw_vnic_id == INVALID_HW_RING_ID)
return rc;
HWRM_PREP(req, CFA_L2_SET_RX_MASK); HWRM_PREP(req, CFA_L2_SET_RX_MASK);
req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id); req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);