From: Michael Chan <michael.chan@broadcom.com>

Date: Tue, 16 Nov 2021 14:26:10 -0500

Subject: bnxt_en: Fix compile error regression when CONFIG_BNXT_SRIOV is not

 set

Patch-mainline: v5.16-rc2

Git-commit: 9f5363916a5099e618e6e40606e91b8ce0833754

References: jsc#SLE-18978

bp->sriov_cfg is not defined when CONFIG_BNXT_SRIOV is not set.  Fix

it by adding a helper function bnxt_sriov_cfg() to handle the logic

with or without the config option.

Fixes: 46d08f55d24e ("bnxt_en: extend RTNL to VF check in devlink driver_reinit")

Reported-by: kernel test robot <lkp@intel.com>

Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>

Reviewed-by: Andy Gospodarek <gospo@broadcom.com>

Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Link: https://lore.kernel.org/r/1637090770-22835-1-git-send-email-michael.chan@broadcom.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/broadcom/bnxt/bnxt.h         |   10 ++++++++++

 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c |    2 +-

 2 files changed, 11 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h

+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h

@@ -2258,6 +2258,16 @@ static inline void bnxt_db_write(struct

 	}

 }

+/* Must hold rtnl_lock */

+static inline bool bnxt_sriov_cfg(struct bnxt *bp)

+{

+#if defined(CONFIG_BNXT_SRIOV)

+	return BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg);

+#else

+	return false;

+#endif

+}

+

 extern const u16 bnxt_lhint_arr[];

 int bnxt_alloc_rx_data(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,

--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

@@ -442,7 +442,7 @@ static int bnxt_dl_reload_down(struct de

 	switch (action) {

 	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: {

 		rtnl_lock();

-		if (BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg)) {

+		if (bnxt_sriov_cfg(bp)) {

 			NL_SET_ERR_MSG_MOD(extack,

 					   "reload is unsupported while VFs are allocated or being configured");

 			rtnl_unlock();