Commit 0b815023 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Fix ring checking logic on 57500 chips. 



In bnxt_hwrm_check_pf_rings(), add the proper flag to test the NQ
resources.  Without the proper flag, the firmware will change
the NQ resource allocation and remap the IRQ, causing missing
IRQs.  This issue shows up when adding MQPRIO TX queues, for example.

Fixes: 36d65be9 ("bnxt_en: Disable MSIX before re-reserving NQs/CMPL rings.")
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d008e64

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −1
Original line number Diff line number Diff line
@@ -5601,7 +5601,8 @@ static int bnxt_hwrm_check_pf_rings(struct bnxt *bp, int tx_rings, int rx_rings, 
			 FUNC_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST |

			 FUNC_CFG_REQ_FLAGS_VNIC_ASSETS_TEST;

		if (bp->flags & BNXT_FLAG_CHIP_P5)

			flags |= FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST;

			flags |= FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST |

				 FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST;

		else

			flags |= FUNC_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST;

	}

drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h

+3 −2
Original line number Diff line number Diff line
@@ -386,8 +386,8 @@ struct hwrm_err_output { 
#define HWRM_VERSION_MAJOR 1

#define HWRM_VERSION_MINOR 10

#define HWRM_VERSION_UPDATE 0

#define HWRM_VERSION_RSVD 33

#define HWRM_VERSION_STR "1.10.0.33"

#define HWRM_VERSION_RSVD 35

#define HWRM_VERSION_STR "1.10.0.35"



/* hwrm_ver_get_input (size:192b/24B) */

struct hwrm_ver_get_input {
@@ -1184,6 +1184,7 @@ struct hwrm_func_cfg_input { 
	#define FUNC_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST             0x100000UL

	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE              0x200000UL

	#define FUNC_CFG_REQ_FLAGS_DYNAMIC_TX_RING_ALLOC          0x400000UL

	#define FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST                 0x800000UL

	__le32	enables;

	#define FUNC_CFG_REQ_ENABLES_MTU                     0x1UL

	#define FUNC_CFG_REQ_ENABLES_MRU                     0x2UL

CRA Git | Maintained and supported by SUSTech CRA and CCSE