bnxt_en: Fix VNIC accounting when enabling aRFS on 57500 chips.
Michael Chan
maintainerPATCH 1/1 bnxt_en: Fix VNIC accounting when enabling aRFS on 57500 chips.
Unlike legacy chips, 57500 chips don't need additional VNIC resources for aRFS/ntuple. Fix the code accordingly so that we don't reserve and allocate additional VNICs on 57500 chips. Without this patch, the driver is failing to initialize when it tries to allocate extra VNICs.
---
Please queue this for 5.2 -stable also. Thanks.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -2
@@ -3075,7 +3075,7 @@ static int bnxt_alloc_vnics(struct bnxt *bp)int num_vnics =1 ;#ifdef CONFIG_RFS_ACCEL -if (bp->flags &BNXT_FLAG_RFS ) +if ((bp->flags & (BNXT_FLAG_RFS |BNXT_FLAG_CHIP_P5 )) ==BNXT_FLAG_RFS ) num_vnics += bp->rx_nr_rings;#endif
@@ -7186,6 +7186,9 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)#ifdef CONFIG_RFS_ACCEL int i, rc =0 ; +if (bp->flags &BNXT_FLAG_CHIP_P5 ) +return 0 ; +for (i =0 ; i < bp->rx_nr_rings; i++) {struct bnxt_vnic_info *vnic;u16 vnic_id = i +1 ;
@@ -9645,7 +9648,7 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,return -ENOMEM ; vnics =1 ; -if (bp->flags &BNXT_FLAG_RFS ) +if ((bp->flags & (BNXT_FLAG_RFS |BNXT_FLAG_CHIP_P5 )) ==BNXT_FLAG_RFS ) vnics += rx_rings;if (bp->flags &BNXT_FLAG_AGG_RINGS )
Signature · 1 line
2.5.1
From: Michael Chan <[email protected]>
Date: Wed, 17 Jul 2019 03:07:23 -0400
Quoted 8 lines
Unlike legacy chips, 57500 chips don't need additional VNIC resources for aRFS/ntuple. Fix the code accordingly so that we don't reserve and allocate additional VNICs on 57500 chips. Without this patch, the driver is failing to initialize when it tries to allocate extra VNICs.
Fixes ac33906c67e2 ("bnxt_en: Add support for aRFS on 57500 chips.")Signed-off-by Michael Chan <[email protected]>
Applied.
Quoted 1 line
Please queue this for 5.2 -stable also. Thanks.
Queued up.