|
 |
c7ffa4 |
From 52bececea4d2327d842ee40e6c99388b6b3d8f93 Mon Sep 17 00:00:00 2001
|
|
|
c7ffa4 |
Message-Id: <52bececea4d2327d842ee40e6c99388b6b3d8f93.1524241750.git.dcaratti@redhat.com>
|
|
|
c7ffa4 |
In-Reply-To: <02bd8182658600ebf2cbe61168e80c19ce4cdaa5.1524241750.git.dcaratti@redhat.com>
|
|
|
c7ffa4 |
References: <02bd8182658600ebf2cbe61168e80c19ce4cdaa5.1524241750.git.dcaratti@redhat.com>
|
|
|
c7ffa4 |
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
|
|
|
c7ffa4 |
Date: Fri, 20 Apr 2018 07:22:01 -0700
|
|
|
c7ffa4 |
Subject: [PATCH 2/3] net/bnxt: avoid invalid vnic id in set L2 Rx mask
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
In some cases bnxt_hwrm_cfa_l2_set_rx_mask is being called before
|
|
|
c7ffa4 |
VNICs are allocated. The FW returns an error in such cases.
|
|
|
c7ffa4 |
Move bnxt_init_nic to bnxt_dev_init such that the ids are initialized
|
|
|
c7ffa4 |
to an invalid id.
|
|
|
c7ffa4 |
Prevent sending the command to the FW only with a valid vnic id.
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Fixes: 244bc98b0da7 ("net/bnxt: set L2 Rx mask")
|
|
|
c7ffa4 |
Cc: stable@dpdk.org
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
|
|
|
c7ffa4 |
---
|
|
|
c7ffa4 |
drivers/net/bnxt/bnxt_ethdev.c | 7 ++-----
|
|
|
c7ffa4 |
drivers/net/bnxt/bnxt_hwrm.c | 3 +++
|
|
|
c7ffa4 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
|
|
|
c7ffa4 |
index a133114a3..348129dad 100644
|
|
|
c7ffa4 |
--- a/drivers/net/bnxt/bnxt_ethdev.c
|
|
|
c7ffa4 |
+++ b/drivers/net/bnxt/bnxt_ethdev.c
|
|
|
c7ffa4 |
@@ -395,10 +395,6 @@ static int bnxt_init_nic(struct bnxt *bp)
|
|
|
c7ffa4 |
bnxt_init_vnics(bp);
|
|
|
c7ffa4 |
bnxt_init_filters(bp);
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
- rc = bnxt_init_chip(bp);
|
|
|
c7ffa4 |
- if (rc)
|
|
|
c7ffa4 |
- return rc;
|
|
|
c7ffa4 |
-
|
|
|
c7ffa4 |
return 0;
|
|
|
c7ffa4 |
}
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
@@ -594,7 +590,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
|
|
|
c7ffa4 |
}
|
|
|
c7ffa4 |
bp->dev_stopped = 0;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
- rc = bnxt_init_nic(bp);
|
|
|
c7ffa4 |
+ rc = bnxt_init_chip(bp);
|
|
|
c7ffa4 |
if (rc)
|
|
|
c7ffa4 |
goto error;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
@@ -3398,6 +3394,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
|
|
|
c7ffa4 |
goto error_free_int;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
bnxt_enable_int(bp);
|
|
|
c7ffa4 |
+ bnxt_init_nic(bp);
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
return 0;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
|
|
|
c7ffa4 |
index 11204bf42..bc8773509 100644
|
|
|
c7ffa4 |
--- a/drivers/net/bnxt/bnxt_hwrm.c
|
|
|
c7ffa4 |
+++ b/drivers/net/bnxt/bnxt_hwrm.c
|
|
|
c7ffa4 |
@@ -221,6 +221,9 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,
|
|
|
c7ffa4 |
struct hwrm_cfa_l2_set_rx_mask_output *resp = bp->hwrm_cmd_resp_addr;
|
|
|
c7ffa4 |
uint32_t mask = 0;
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
+ if (vnic->fw_vnic_id == INVALID_HW_RING_ID)
|
|
|
c7ffa4 |
+ return rc;
|
|
|
c7ffa4 |
+
|
|
|
c7ffa4 |
HWRM_PREP(req, CFA_L2_SET_RX_MASK);
|
|
|
c7ffa4 |
req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);
|
|
|
c7ffa4 |
|
|
|
c7ffa4 |
--
|
|
|
c7ffa4 |
2.14.3
|
|
|
c7ffa4 |
|