Commit 5708155d authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

ice: add FW load wait 



As some cards load FW from external sources, we have to wait
to be sure that FW is ready before setting link up.

Add check and wait for FW readiness

Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 272ad794

drivers/net/ethernet/intel/ice/ice_hw_autogen.h

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ 
#define VP_MDET_TX_TCLAN_VALID_M		BIT(0)

#define VP_MDET_TX_TDPU(_VF)			(0x00040000 + ((_VF) * 4))

#define VP_MDET_TX_TDPU_VALID_M			BIT(0)

#define GL_MNG_FWSM				0x000B6134

#define GL_MNG_FWSM_FW_LOADING_M		BIT(30)

#define GLNVM_FLA				0x000B6108

#define GLNVM_FLA_LOCKED_M			BIT(6)

#define GLNVM_GENS				0x000B6100

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

+37 −0
Original line number Diff line number Diff line
@@ -4520,6 +4520,31 @@ static void ice_deinit_eth(struct ice_pf *pf) 
	ice_decfg_netdev(vsi);

}



/**

 * ice_wait_for_fw - wait for full FW readiness

 * @hw: pointer to the hardware structure

 * @timeout: milliseconds that can elapse before timing out

 */

static int ice_wait_for_fw(struct ice_hw *hw, u32 timeout)

{

	int fw_loading;

	u32 elapsed = 0;



	while (elapsed <= timeout) {

		fw_loading = rd32(hw, GL_MNG_FWSM) & GL_MNG_FWSM_FW_LOADING_M;



		/* firmware was not yet loaded, we have to wait more */

		if (fw_loading) {

			elapsed += 100;

			msleep(100);

			continue;

		}

		return 0;

	}



	return -ETIMEDOUT;

}



static int ice_init_dev(struct ice_pf *pf)

{

	struct device *dev = ice_pf_to_dev(pf);
@@ -4532,6 +4557,18 @@ static int ice_init_dev(struct ice_pf *pf) 
		return err;

	}



	/* Some cards require longer initialization times

	 * due to necessity of loading FW from an external source.

	 * This can take even half a minute.

	 */

	if (ice_is_pf_c827(hw)) {

		err = ice_wait_for_fw(hw, 30000);

		if (err) {

			dev_err(dev, "ice_wait_for_fw timed out");

			return err;

		}

	}



	ice_init_feature_support(pf);



	ice_request_fw(pf);