ice: Check for DCB capability before initializing DCB

Check the ICE_FLAG_DCB_CAPABLE before calling ice_init_pf_dcb.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
index e922adf1fa159386ceb1a79bb8d69f60e5e7875f..20f440a646505c7d642c77eb9426e24070355c44 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
@@ -474,7 +474,6 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)
                }
 
                pf->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;
-               set_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
                return 0;
        }
 
@@ -483,8 +482,6 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)
        /* DCBX in FW and LLDP enabled in FW */
        pf->dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_IEEE;
 
-       set_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
-
        err = ice_dcb_init_cfg(pf, locked);
        if (err)
                goto dcb_init_err;

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 703fc7bf2b3140cd1e1de9be6ab766bc2b337d64..8bb3b81876a9768aaec6baa678a973a140d4c4cb 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2252,6 +2252,8 @@ static void ice_deinit_pf(struct ice_pf *pf)
 static int ice_init_pf(struct ice_pf *pf)
 {
        bitmap_zero(pf->flags, ICE_PF_FLAGS_NBITS);
+       if (pf->hw.func_caps.common_cap.dcb)
+               set_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
 #ifdef CONFIG_PCI_IOV
        if (pf->hw.func_caps.common_cap.sr_iov_1_1) {
                struct ice_hw *hw = &pf->hw;
@@ -2529,13 +2531,12 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
                goto err_init_pf_unroll;
        }
 
-       err = ice_init_pf_dcb(pf, false);
-       if (err) {
-               clear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
-               clear_bit(ICE_FLAG_DCB_ENA, pf->flags);
-
-               /* do not fail overall init if DCB init fails */
-               err = 0;
+       if (test_bit(ICE_FLAG_DCB_CAPABLE, pf->flags)) {
+               /* Note: DCB init failure is non-fatal to load */
+               if (ice_init_pf_dcb(pf, false)) {
+                       clear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);
+                       clear_bit(ICE_FLAG_DCB_ENA, pf->flags);
+               }
        }
 
        ice_determine_q_usage(pf);