Re: [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: add FW load wait

[Przemek Kitszel <przemyslaw.kitszel@intel.com>]

On 7/11/23 14:27, Jan Sokolowski wrote:
> 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 readyness

s/readyness/readiness/

> 
> Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
> ---
>   .../net/ethernet/intel/ice/ice_hw_autogen.h   |  2 +
>   drivers/net/ethernet/intel/ice/ice_main.c     | 41 +++++++++++++++++++
>   2 files changed, 43 insertions(+)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
> index 20f40dfeb761..531cc2194741 100644
> --- a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
> +++ b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
> @@ -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
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index e3245ee635b2..48991c6e94f5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -4561,6 +4561,35 @@ 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_register;

perhaps drop '_register' part of the name

> +	u32 elapsed = 0;
> +
> +	if (timeout == 0)
> +		return 0;
> +
> +	while (elapsed < timeout) {
> +		fw_loading_register = (rd32(hw, GL_MNG_FWSM) &
> +				       GL_MNG_FWSM_FW_LOADING_M);
> +
> +		/* firmware was not yet loaded, we have to wait more */
> +		if (fw_loading_register) {
> +			elapsed += 100;
> +			msleep(100);
> +			continue;
> +		}
> +		return 0;
> +	}
> +
> +	return -EIO;
> +}
> +
>   static int ice_init_dev(struct ice_pf *pf)
>   {
>   	struct device *dev = ice_pf_to_dev(pf);
> @@ -4573,6 +4602,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);

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan