Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80739b57 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Check for DCB capability before initializing DCB 



Check the ICE_FLAG_DCB_CAPABLE before calling ice_init_pf_dcb.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c61d2342

drivers/net/ethernet/intel/ice/ice_dcb_lib.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/intel/ice/ice_main.c

+8 −7
Original line number Diff line number Diff line
@@ -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) {

	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);



		/* do not fail overall init if DCB init fails */

		err = 0;

		}

	}



	ice_determine_q_usage(pf);