* [PATCH net 0/5] bnxt_en: Bug fixes.
@ 2020-04-26 20:24 Michael Chan
2020-04-26 20:24 ` [PATCH net 1/5] bnxt_en: Fix VF anti-spoof filter setup Michael Chan
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw)
To: davem; +Cc: netdev
A collection of 5 miscellaneous bug fixes covering VF anti-spoof setup
issues, devlink MSIX max value, AER, context memory allocation error
path, and VLAN acceleration logic.
Please queue for -stable. Thanks.
Michael Chan (4):
bnxt_en: Fix VF anti-spoof filter setup.
bnxt_en: Improve AER slot reset.
bnxt_en: Return error when allocating zero size context memory.
bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features().
Vasundhara Volam (1):
bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 20 +++++++++++++-------
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 -
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 10 ++--------
4 files changed, 16 insertions(+), 17 deletions(-)
--
2.5.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH net 1/5] bnxt_en: Fix VF anti-spoof filter setup. 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan @ 2020-04-26 20:24 ` Michael Chan 2020-04-26 20:24 ` [PATCH net 2/5] bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF Michael Chan ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw) To: davem; +Cc: netdev Fix the logic that sets the enable/disable flag for the source MAC filter according to firmware spec 1.7.1. In the original firmware spec. before 1.7.1, the VF spoof check flags were not latched after making the HWRM_FUNC_CFG call, so there was a need to keep the func_flags so that subsequent calls would perserve the VF spoof check setting. A change was made in the 1.7.1 spec so that the flags became latched. So we now set or clear the anti- spoof setting directly without retrieving the old settings in the stored vf->func_flags which are no longer valid. We also remove the unneeded vf->func_flags. Fixes: 8eb992e876a8 ("bnxt_en: Update firmware interface spec to 1.7.6.2.") Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index f2caa27..f6a3250 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1066,7 +1066,6 @@ struct bnxt_vf_info { #define BNXT_VF_LINK_FORCED 0x4 #define BNXT_VF_LINK_UP 0x8 #define BNXT_VF_TRUST 0x10 - u32 func_flags; /* func cfg flags */ u32 min_tx_rate; u32 max_tx_rate; void *hwrm_cmd_req_addr; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c index 6ea3df6d..cea2f99 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c @@ -85,11 +85,10 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting) if (old_setting == setting) return 0; - func_flags = vf->func_flags; if (setting) - func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE; + func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE; else - func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE; + func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE; /*TODO: if the driver supports VLAN filter on guest VLAN, * the spoof check should also include vlan anti-spoofing */ @@ -98,7 +97,6 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting) req.flags = cpu_to_le32(func_flags); rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT); if (!rc) { - vf->func_flags = func_flags; if (setting) vf->flags |= BNXT_VF_SPOOFCHK; else @@ -228,7 +226,6 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac) memcpy(vf->mac_addr, mac, ETH_ALEN); bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1); req.fid = cpu_to_le16(vf->fw_fid); - req.flags = cpu_to_le32(vf->func_flags); req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR); memcpy(req.dflt_mac_addr, mac, ETH_ALEN); return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT); @@ -266,7 +263,6 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos, bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1); req.fid = cpu_to_le16(vf->fw_fid); - req.flags = cpu_to_le32(vf->func_flags); req.dflt_vlan = cpu_to_le16(vlan_tag); req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN); rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT); @@ -305,7 +301,6 @@ int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate, return 0; bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1); req.fid = cpu_to_le16(vf->fw_fid); - req.flags = cpu_to_le32(vf->func_flags); req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MAX_BW); req.max_bw = cpu_to_le32(max_tx_rate); req.enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_MIN_BW); @@ -477,7 +472,6 @@ static void __bnxt_set_vf_params(struct bnxt *bp, int vf_id) vf = &bp->pf.vf[vf_id]; bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1); req.fid = cpu_to_le16(vf->fw_fid); - req.flags = cpu_to_le32(vf->func_flags); if (is_valid_ether_addr(vf->mac_addr)) { req.enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR); -- 2.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 2/5] bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF. 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan 2020-04-26 20:24 ` [PATCH net 1/5] bnxt_en: Fix VF anti-spoof filter setup Michael Chan @ 2020-04-26 20:24 ` Michael Chan 2020-04-26 20:24 ` [PATCH net 3/5] bnxt_en: Improve AER slot reset Michael Chan ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw) To: davem; +Cc: netdev, Vasundhara Volam From: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Broadcom adapters support only maximum of 512 CQs per PF. If user sets MSIx vectors more than supported CQs, firmware is setting incorrect value for msix_vec_per_pf_max parameter. Fix it by reducing the BNXT_MSIX_VEC_MAX value to 512, even though the maximum # of MSIx vectors supported by adapter are 1280. Fixes: f399e8497826 ("bnxt_en: Use msix_vec_per_pf_max and msix_vec_per_pf_min devlink params.") Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h index 95f893f..d5c8bd4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h @@ -43,7 +43,7 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl) #define BNXT_NVM_CFG_VER_BITS 24 #define BNXT_NVM_CFG_VER_BYTES 4 -#define BNXT_MSIX_VEC_MAX 1280 +#define BNXT_MSIX_VEC_MAX 512 #define BNXT_MSIX_VEC_MIN_MAX 128 enum bnxt_nvm_dir_type { -- 2.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 3/5] bnxt_en: Improve AER slot reset. 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan 2020-04-26 20:24 ` [PATCH net 1/5] bnxt_en: Fix VF anti-spoof filter setup Michael Chan 2020-04-26 20:24 ` [PATCH net 2/5] bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF Michael Chan @ 2020-04-26 20:24 ` Michael Chan 2020-04-26 20:24 ` [PATCH net 4/5] bnxt_en: Return error when allocating zero size context memory Michael Chan ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw) To: davem; +Cc: netdev Improve the slot reset sequence by disabling the device to prevent bad DMAs if slot reset fails. Return the proper result instead of always PCI_ERS_RESULT_RECOVERED to the caller. Fixes: 6316ea6db93d ("bnxt_en: Enable AER support.") Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index fead64f..d8db08e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -12212,12 +12212,15 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) bnxt_ulp_start(bp, err); } - if (result != PCI_ERS_RESULT_RECOVERED && netif_running(netdev)) - dev_close(netdev); + if (result != PCI_ERS_RESULT_RECOVERED) { + if (netif_running(netdev)) + dev_close(netdev); + pci_disable_device(pdev); + } rtnl_unlock(); - return PCI_ERS_RESULT_RECOVERED; + return result; } /** -- 2.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 4/5] bnxt_en: Return error when allocating zero size context memory. 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan ` (2 preceding siblings ...) 2020-04-26 20:24 ` [PATCH net 3/5] bnxt_en: Improve AER slot reset Michael Chan @ 2020-04-26 20:24 ` Michael Chan 2020-04-26 20:24 ` [PATCH net 5/5] bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features() Michael Chan 2020-04-27 18:45 ` [PATCH net 0/5] bnxt_en: Bug fixes David Miller 5 siblings, 0 replies; 7+ messages in thread From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw) To: davem; +Cc: netdev bnxt_alloc_ctx_pg_tbls() should return error when the memory size of the context memory to set up is zero. By returning success (0), the caller may proceed normally and may crash later when it tries to set up the memory. Fixes: 08fe9d181606 ("bnxt_en: Add Level 2 context memory paging support.") Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index d8db08e..070c42d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -6642,7 +6642,7 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp, int rc; if (!mem_size) - return 0; + return -EINVAL; ctx_pg->nr_pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE); if (ctx_pg->nr_pages > MAX_CTX_TOTAL_PAGES) { -- 2.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net 5/5] bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features(). 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan ` (3 preceding siblings ...) 2020-04-26 20:24 ` [PATCH net 4/5] bnxt_en: Return error when allocating zero size context memory Michael Chan @ 2020-04-26 20:24 ` Michael Chan 2020-04-27 18:45 ` [PATCH net 0/5] bnxt_en: Bug fixes David Miller 5 siblings, 0 replies; 7+ messages in thread From: Michael Chan @ 2020-04-26 20:24 UTC (permalink / raw) To: davem; +Cc: netdev The current logic in bnxt_fix_features() will inadvertently turn on both CTAG and STAG VLAN offload if the user tries to disable both. Fix it by checking that the user is trying to enable CTAG or STAG before enabling both. The logic is supposed to enable or disable both CTAG and STAG together. Fixes: 5a9f6b238e59 ("bnxt_en: Enable and disable RX CTAG and RX STAG VLAN acceleration together.") Signed-off-by: Michael Chan <michael.chan@broadcom.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 070c42d..d1a8371 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -9780,6 +9780,7 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev, netdev_features_t features) { struct bnxt *bp = netdev_priv(dev); + netdev_features_t vlan_features; if ((features & NETIF_F_NTUPLE) && !bnxt_rfs_capable(bp)) features &= ~NETIF_F_NTUPLE; @@ -9796,12 +9797,14 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev, /* Both CTAG and STAG VLAN accelaration on the RX side have to be * turned on or off together. */ - if ((features & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) != - (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) { + vlan_features = features & (NETIF_F_HW_VLAN_CTAG_RX | + NETIF_F_HW_VLAN_STAG_RX); + if (vlan_features != (NETIF_F_HW_VLAN_CTAG_RX | + NETIF_F_HW_VLAN_STAG_RX)) { if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) features &= ~(NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX); - else + else if (vlan_features) features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX; } -- 2.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net 0/5] bnxt_en: Bug fixes. 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan ` (4 preceding siblings ...) 2020-04-26 20:24 ` [PATCH net 5/5] bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features() Michael Chan @ 2020-04-27 18:45 ` David Miller 5 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2020-04-27 18:45 UTC (permalink / raw) To: michael.chan; +Cc: netdev From: Michael Chan <michael.chan@broadcom.com> Date: Sun, 26 Apr 2020 16:24:37 -0400 > A collection of 5 miscellaneous bug fixes covering VF anti-spoof setup > issues, devlink MSIX max value, AER, context memory allocation error > path, and VLAN acceleration logic. > > Please queue for -stable. Thanks. Applied and queued up for -stable, thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-04-27 18:45 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-26 20:24 [PATCH net 0/5] bnxt_en: Bug fixes Michael Chan 2020-04-26 20:24 ` [PATCH net 1/5] bnxt_en: Fix VF anti-spoof filter setup Michael Chan 2020-04-26 20:24 ` [PATCH net 2/5] bnxt_en: Reduce BNXT_MSIX_VEC_MAX value to supported CQs per PF Michael Chan 2020-04-26 20:24 ` [PATCH net 3/5] bnxt_en: Improve AER slot reset Michael Chan 2020-04-26 20:24 ` [PATCH net 4/5] bnxt_en: Return error when allocating zero size context memory Michael Chan 2020-04-26 20:24 ` [PATCH net 5/5] bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features() Michael Chan 2020-04-27 18:45 ` [PATCH net 0/5] bnxt_en: Bug fixes David Miller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.