bnxt_en: Bug fixes.
Michael Chan
maintainercover bnxt_en: Bug fixes.
The first patch stores the firmware version code which is needed by the next 2 patches to determine some worarounds based on the firmware version. The workarounds are to disable legacy TX push mode and to clear the hardware statistics during ifdown. The last patch checks that it is a PF before reading the VPD.
Please also queue these for -stable. Thanks.
Michael Chan (3):
bnxt_en: Store the running firmware version code.
bnxt_en: Do not enable legacy TX push on older firmware.
bnxt_en: Fix statistics counters issue during ifdown with older
firmware.
Vasundhara Volam (1):
bnxt_en: Read VPD info only for PFs
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +++++++++++++++++++++++++------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 +++++ 2 files changed, 34 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.3.1
Michael Chan
maintainerPATCH 1/4 bnxt_en: Store the running firmware version code.
We currently only store the firmware version as a string for ethtool and devlink info. Store it also as a version code. The next 2 patches will need to check the firmware major version to determine some workarounds.
We also use the 16-bit firmware version fields if the firmware is newer and provides the 16-bit fields.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 22 ++++++++++++++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++++ 2 files changed, 22 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +18 -4
@@ -7240,8 +7240,9 @@ static int __bnxt_hwrm_ver_get(struct bnxt *bp, bool silent)static int bnxt_hwrm_ver_get (struct bnxt *bp) {struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr; +u16 fw_maj, fw_min, fw_bld, fw_rsv;u32 dev_caps_cfg, hwrm_ver; -int rc; +int rc, len; bp->hwrm_max_req_len =HWRM_MAX_REQ_LEN ;mutex_lock (&bp->hwrm_cmd_lock);
@@ -7273,9 +7274,22 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b, resp->hwrm_intf_upd_8b); -snprintf (bp->fw_ver_str,BC_HWRM_STR_LEN ,"%d.%d.%d.%d" , - resp->hwrm_fw_maj_8b, resp->hwrm_fw_min_8b, - resp->hwrm_fw_bld_8b, resp->hwrm_fw_rsvd_8b); + fw_maj =le16_to_cpu (resp->hwrm_fw_major); +if (bp->hwrm_spec_code >0x10803 && fw_maj) { + fw_min =le16_to_cpu (resp->hwrm_fw_minor); + fw_bld =le16_to_cpu (resp->hwrm_fw_build); + fw_rsv =le16_to_cpu (resp->hwrm_fw_patch); + len =FW_VER_STR_LEN ; + }else { + fw_maj = resp->hwrm_fw_maj_8b; + fw_min = resp->hwrm_fw_min_8b; + fw_bld = resp->hwrm_fw_bld_8b; + fw_rsv = resp->hwrm_fw_rsvd_8b; + len =BC_HWRM_STR_LEN ; + } + bp->fw_ver_code =BNXT_FW_VER_CODE (fw_maj, fw_min, fw_bld, fw_rsv); +snprintf (bp->fw_ver_str, len,"%d.%d.%d.%d" , fw_maj, fw_min, fw_bld, + fw_rsv);if (strlen (resp->active_pkg_name)) {int fw_ver_len =strlen (bp->fw_ver_str);
drivers/net/ethernet/broadcom/bnxt/bnxt.h +4 -0
@@ -1746,6 +1746,10 @@ struct bnxt {#define PHY_VER_STR_LEN (FW_VER_STR_LEN - BC_HWRM_STR_LEN)char fw_ver_str[FW_VER_STR_LEN ];char hwrm_ver_supp[FW_VER_STR_LEN ]; +u64 fw_ver_code; +#define BNXT_FW_VER_CODE (maj, min, bld, rsv) \ + ((u64)(maj) << 48 | (u64)(min) << 32 | (u64)(bld) << 16 | (rsv)) +__be16 vxlan_port;u8 vxlan_port_cnt;__le16 vxlan_fw_dst_port_id;
Signature · 1 line
1.8.3.1
Michael Chan
maintainerPATCH 2/4 bnxt_en: Do not enable legacy TX push on older firmware.
In reply to Michael ChanOlder firmware may not support legacy TX push properly and may not be disabling it. So we check certain firmware versions that may have this problem and disable legacy TX push unconditionally.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -1
@@ -6976,7 +6976,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->fw_cap |=BNXT_FW_CAP_ERR_RECOVER_RELOAD ; bp->tx_push_thresh =0 ; -if (flags &FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED ) +if ((flags &FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED ) && +BNXT_FW_MAJ (bp) >217 ) bp->tx_push_thresh =BNXT_TX_PUSH_THRESH ; hw_resc->max_rsscos_ctxs =le16_to_cpu (resp->max_rsscos_ctx);
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1749,6 +1749,7 @@ struct bnxt {u64 fw_ver_code;#define BNXT_FW_VER_CODE (maj, min, bld, rsv) \ ((u64)(maj) << 48 | (u64)(min) << 32 | (u64)(bld) << 16 | (rsv)) +#define BNXT_FW_MAJ (bp) ((bp)->fw_ver_code >> 48)__be16 vxlan_port;u8 vxlan_port_cnt;
Signature · 1 line
1.8.3.1
Jakub Kicinski
maintainerRe: [PATCH net 2/4] bnxt_en: Do not enable legacy TX push on older firmware.
Quoted 3 lines · On Tue, 23 Jun 2020 19:01:36 -0400 Michael Chan wrote:
Older firmware may not support legacy TX push properly and may not be disabling it. So we check certain firmware versions that may have this problem and disable legacy TX push unconditionally.
For the future this commit message should have been clearer on user impact. What are the symptoms? Will the TX hang because of this? Will the performance be low?
Michael Chan
maintainerPATCH 3/4 bnxt_en: Fix statistics counters issue during ifdown with older firmware.
In reply to Michael ChanOn older firmware, the hardware statistics are not cleared when the driver frees the hardware stats contexts during ifdown. The driver expects these stats to be cleared and saves a copy before freeing the stats contexts. During the next ifup, the driver will likely allocate the same hardware stats contexts and this will cause a big increase in the counters as the old counters are added back to the saved counters.
We fix it by making an additional firmware call to clear the counters before freeing the hw stats contexts when the firmware is the older 20.x firmware.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +7 -1
@@ -6292,6 +6292,7 @@ int bnxt_hwrm_set_coal(struct bnxt *bp)static void bnxt_hwrm_stat_ctx_free (struct bnxt *bp) { +struct hwrm_stat_ctx_clr_stats_input req0 = {0 };struct hwrm_stat_ctx_free_input req = {0 };int i;
@@ -6301,6 +6302,7 @@ static void bnxt_hwrm_stat_ctx_free(struct bnxt *bp)if (BNXT_CHIP_TYPE_NITRO_A0 (bp))return ; +bnxt_hwrm_cmd_hdr_init (bp, &req0,HWRM_STAT_CTX_CLR_STATS ,-1 ,-1 );bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_STAT_CTX_FREE ,-1 ,-1 );mutex_lock (&bp->hwrm_cmd_lock);
@@ -6310,7 +6312,11 @@ static void bnxt_hwrm_stat_ctx_free(struct bnxt *bp)if (cpr->hw_stats_ctx_id !=INVALID_STATS_CTX_ID ) { req.stat_ctx_id =cpu_to_le32 (cpr->hw_stats_ctx_id); - +if (BNXT_FW_MAJ (bp) <=20 ) { + req0.stat_ctx_id = req.stat_ctx_id; +_hwrm_send_message (bp, &req0,sizeof (req0), +HWRM_CMD_TIMEOUT ); + }_hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT );
Signature · 1 line
1.8.3.1
Re: [PATCH net 3/4] bnxt_en: Fix statistics counters issue during ifdown with older firmware.
Quoted 8 lines · On Tue, 23 Jun 2020 19:01:37 -0400 Michael Chan wrote:
On older firmware, the hardware statistics are not cleared when the driver frees the hardware stats contexts during ifdown. The driver expects these stats to be cleared and saves a copy before freeing the stats contexts. During the next ifup, the driver will likely allocate the same hardware stats contexts and this will cause a big increase in the counters as the old counters are added back to the saved counters.
Quoted 8 lines
We fix it by making an additional firmware call to clear the counters before freeing the hw stats contexts when the firmware is the older 20.x firmware.
Fixes b8875ca356f1 ("bnxt_en: Save ring statistics before reset.")Reported-by Jakub Kicinski <[email protected]>Reviewed-by Vasundhara Volam <[email protected]>Signed-off-by Michael Chan <[email protected]>
Thanks Michael!
Michael Chan
maintainerPATCH 4/4 bnxt_en: Read VPD info only for PFs
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Virtual functions does not have VPD information. This patch modifies calling bnxt_read_vpd_info() only for PFs and avoids an unnecessary error log.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -1
@@ -11913,7 +11913,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->ethtool_ops = &bnxt_ethtool_ops;pci_set_drvdata (pdev, dev); -bnxt_vpd_read_info (bp); +if (BNXT_PF (bp)) +bnxt_vpd_read_info (bp); rc =bnxt_alloc_hwrm_resources (bp);if (rc)
Signature · 1 line
1.8.3.1
Quoted 7 lines · On Tue, 23 Jun 2020 19:01:34 -0400 Michael Chan wrote:
The first patch stores the firmware version code which is needed by the next 2 patches to determine some worarounds based on the firmware version. The workarounds are to disable legacy TX push mode and to clear the hardware statistics during ifdown. The last patch checks that it is a PF before reading the VPD.
Please also queue these for -stable. Thanks.
FWIW looks good to me:
From: Michael Chan <[email protected]>
Date: Tue, 23 Jun 2020 19:01:34 -0400
Quoted 5 lines
The first patch stores the firmware version code which is needed by the next 2 patches to determine some worarounds based on the firmware version. The workarounds are to disable legacy TX push mode and to clear the hardware statistics during ifdown. The last patch checks that it is a PF before reading the VPD.
Series applied.
Quoted 1 line
Please also queue these for -stable. Thanks.
Queued up, thanks.