bnx2x: Utilize firmware 7.13.21.0
PATCH 1/2 bnx2x: Utilize firmware 7.13.21.0
commit b7a49f73059fe6147b6b78e8f674ce0d21237432 upstream
This new firmware addresses few important issues and enhancements as mentioned below -
- Support direct invalidation of FP HSI Ver per function ID, required for invalidating FP HSI Ver prior to each VF start, as there is no VF start
- BRB hardware block parity error detection support for the driver
- Fix the FCOE underrun flow
- Fix PSOD during FCoE BFS over the NIC ports after preboot driver
- Maintains backward compatibility
This patch incorporates this new firmware 7.13.21.0 in bnx2x driver.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 3 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 75 +++++++++++++++------- 5 files changed, 69 insertions(+), 28 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +10 -1
@@ -1850,6 +1850,14 @@ struct bnx2x {/* Vxlan/Geneve related information */ u16 udp_tunnel_ports[BNX2X_UDP_PORT_MAX ]; + +#define FW_CAP_INVALIDATE_VF_FP_HSI BIT(0) +u32 fw_cap; + +u32 fw_major; +u32 fw_minor; +u32 fw_rev; +u32 fw_eng; };/* Tx queues may be less or equal to Rx queues */
@@ -2526,5 +2534,6 @@ enum {* Meant for implicit re-load flows. */ int bnx2x_vlan_reconfigure_vid (struct bnx2x *bp); - +int bnx2x_init_firmware (struct bnx2x *bp); +void bnx2x_release_firmware (struct bnx2x *bp);#endif /* bnx2x.h */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +2 -4
@@ -2364,10 +2364,8 @@ int bnx2x_compare_fw_ver(struct bnx2x *bp, u32 load_code, bool print_err)if (load_code !=FW_MSG_CODE_DRV_LOAD_COMMON_CHIP && load_code !=FW_MSG_CODE_DRV_LOAD_COMMON ) {/* build my FW version dword */ -u32 my_fw = (BCM_5710_FW_MAJOR_VERSION ) + - (BCM_5710_FW_MINOR_VERSION <<8 ) + - (BCM_5710_FW_REVISION_VERSION <<16 ) + - (BCM_5710_FW_ENGINEERING_VERSION <<24 ); +u32 my_fw = (bp->fw_major) + (bp->fw_minor <<8 ) + + (bp->fw_rev <<16 ) + (bp->fw_eng <<24 );/* read loaded FW from chip */ u32 loaded_fw =REG_RD (bp,XSEM_REG_PRAM );
drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h +2 -0
@@ -241,6 +241,8 @@ IRO[221].m2))#define XSTORM_VF_TO_PF_OFFSET (funcId) \ (IRO[48].base + ((funcId) * IRO[48].m1)) +#define XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET (fid) \ + (IRO[386].base + ((fid) * IRO[386].m1))#define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0/* eth hsi version */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h +2 -1
@@ -3024,7 +3024,8 @@ struct afex_stats {#define BCM_5710_FW_MAJOR_VERSION 7#define BCM_5710_FW_MINOR_VERSION 13 -#define BCM_5710_FW_REVISION_VERSION 15 +#define BCM_5710_FW_REVISION_VERSION 21 +#define BCM_5710_FW_REVISION_VERSION_V15 15#define BCM_5710_FW_ENGINEERING_VERSION 0#define BCM_5710_FW_COMPILE_FLAGS 1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +53 -22
146 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 2/2 bnx2x: Invalidate fastpath HSI version for VFs
commit 802d4d207e75d7208ff75adb712b556c1e91cf1c upstream
Commit 0a6890b9b4df ("bnx2x: Utilize FW 7.13.15.0.") added validation for fastpath HSI versions for different client init which was not meant for SR-IOV VF clients, which resulted in firmware asserts when running VF clients with different fastpath HSI version.
This patch along with the new firmware support in patch #1 fixes this behavior in order to not validate fastpath HSI version for the VFs.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2
@@ -758,9 +758,18 @@ static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf)void bnx2x_vf_enable_access (struct bnx2x *bp,u8 abs_vfid) { +u16 abs_fid; + + abs_fid =FW_VF_HANDLE (abs_vfid); +/* set the VF-PF association in the FW */ -storm_memset_vf_to_pf (bp,FW_VF_HANDLE (abs_vfid),BP_FUNC (bp)); -storm_memset_func_en (bp,FW_VF_HANDLE (abs_vfid),1 ); +storm_memset_vf_to_pf (bp, abs_fid,BP_FUNC (bp)); +storm_memset_func_en (bp, abs_fid,1 ); + +/* Invalidate fp_hsi version for vfs */ +if (bp->fw_cap &FW_CAP_INVALIDATE_VF_FP_HSI ) +REG_WR8 (bp,BAR_XSTRORM_INTMEM + +XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET (abs_fid),0 );/* clear vf errors*/ bnx2x_vf_semi_clear_err (bp, abs_vfid);
Signature · 1 line
1.8.3.1
Greg KH
maintainerQuoted 19 lines · Manish Chopra
commit
b7a49f73059fe6147b6b78e8f674ce0d21237432upstreamThis new firmware addresses few important issues and enhancements as mentioned below -
- Support direct invalidation of FP HSI Ver per function ID, required for invalidating FP HSI Ver prior to each VF start, as there is no VF start
- BRB hardware block parity error detection support for the driver
- Fix the FCOE underrun flow
- Fix PSOD during FCoE BFS over the NIC ports after preboot driver
- Maintains backward compatibilityThis patch incorporates this new firmware 7.13.21.0 in bnx2x driver.
Signed-off-by Manish Chopra <[email protected]>Signed-off-by Prabhakar Kushwaha <[email protected]>Signed-off-by Alok Prasad <[email protected]>Signed-off-by Ariel Elior <[email protected]>Signed-off-by David S. Miller <[email protected]>
Quoted 7 lines
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 3 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 75 +++++++++++++++------- 5 files changed, 69 insertions(+), 28 deletions(-)
All backports now queued up, thanks.
greg k-h