Commit c37dd67c authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Tony Nguyen
Browse files

ice: c827: move wait for FW to ice_init_hw() 



Move call to ice_wait_for_fw() from ice_init_dev() into ice_init_hw(),
where it fits better. This requires also to move ice_wait_for_fw()
to ice_common.c.

ice_is_pf_c827() is now used only in ice_common.c, so it could be static.

CC: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Reviewed-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-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 9c7ad356

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

+75 −35
Original line number Diff line number Diff line
@@ -308,6 +308,42 @@ bool ice_is_e825c(struct ice_hw *hw) 
	}

}



/**

 * ice_is_pf_c827 - check if pf contains c827 phy

 * @hw: pointer to the hw struct

 *

 * Return: true if the device has c827 phy.

 */

static bool ice_is_pf_c827(struct ice_hw *hw)

{

	struct ice_aqc_get_link_topo cmd = {};

	u8 node_part_number;

	u16 node_handle;

	int status;



	if (hw->mac_type != ICE_MAC_E810)

		return false;



	if (hw->device_id != ICE_DEV_ID_E810C_QSFP)

		return true;



	cmd.addr.topo_params.node_type_ctx =

		FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_TYPE_M, ICE_AQC_LINK_TOPO_NODE_TYPE_PHY) |

		FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_CTX_M, ICE_AQC_LINK_TOPO_NODE_CTX_PORT);

	cmd.addr.topo_params.index = 0;



	status = ice_aq_get_netlist_node(hw, &cmd, &node_part_number,

					 &node_handle);



	if (status || node_part_number != ICE_AQC_GET_LINK_TOPO_NODE_NR_C827)

		return false;



	if (node_handle == E810C_QSFP_C827_0_HANDLE || node_handle == E810C_QSFP_C827_1_HANDLE)

		return true;



	return false;

}



/**

 * ice_clear_pf_cfg - Clear PF configuration

 * @hw: pointer to the hardware structure
@@ -1025,6 +1061,33 @@ static void ice_get_itr_intrl_gran(struct ice_hw *hw) 
	}

}



/**

 * ice_wait_for_fw - wait for full FW readiness

 * @hw: pointer to the hardware structure

 * @timeout: milliseconds that can elapse before timing out

 *

 * Return: 0 on success, -ETIMEDOUT on timeout.

 */

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;

}



/**

 * ice_init_hw - main hardware initialization routine

 * @hw: pointer to the hardware structure
@@ -1174,8 +1237,19 @@ int ice_init_hw(struct ice_hw *hw) 
	mutex_init(&hw->tnl_lock);

	ice_init_chk_recipe_reuse_support(hw);



	return 0;

	/* 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)) {

		status = ice_wait_for_fw(hw, 30000);

		if (status) {

			dev_err(ice_hw_to_dev(hw), "ice_wait_for_fw timed out");

			goto err_unroll_fltr_mgmt_struct;

		}

	}



	return 0;

err_unroll_fltr_mgmt_struct:

	ice_cleanup_fltr_mgmt_struct(hw);

err_unroll_sched:
@@ -2728,40 +2802,6 @@ ice_parse_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, 
	ice_recalc_port_limited_caps(hw, &dev_p->common_cap);

}



/**

 * ice_is_pf_c827 - check if pf contains c827 phy

 * @hw: pointer to the hw struct

 */

bool ice_is_pf_c827(struct ice_hw *hw)

{

	struct ice_aqc_get_link_topo cmd = {};

	u8 node_part_number;

	u16 node_handle;

	int status;



	if (hw->mac_type != ICE_MAC_E810)

		return false;



	if (hw->device_id != ICE_DEV_ID_E810C_QSFP)

		return true;



	cmd.addr.topo_params.node_type_ctx =

		FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_TYPE_M, ICE_AQC_LINK_TOPO_NODE_TYPE_PHY) |

		FIELD_PREP(ICE_AQC_LINK_TOPO_NODE_CTX_M, ICE_AQC_LINK_TOPO_NODE_CTX_PORT);

	cmd.addr.topo_params.index = 0;



	status = ice_aq_get_netlist_node(hw, &cmd, &node_part_number,

					 &node_handle);



	if (status || node_part_number != ICE_AQC_GET_LINK_TOPO_NODE_NR_C827)

		return false;



	if (node_handle == E810C_QSFP_C827_0_HANDLE || node_handle == E810C_QSFP_C827_1_HANDLE)

		return true;



	return false;

}



/**

 * ice_is_phy_rclk_in_netlist

 * @hw: pointer to the hw struct

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

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ int 
ice_aq_get_phy_caps(struct ice_port_info *pi, bool qual_mods, u8 report_mode,

		    struct ice_aqc_get_phy_caps_data *caps,

		    struct ice_sq_cd *cd);

bool ice_is_pf_c827(struct ice_hw *hw);

bool ice_is_phy_rclk_in_netlist(struct ice_hw *hw);

bool ice_is_clock_mux_in_netlist(struct ice_hw *hw);

bool ice_is_cgu_in_netlist(struct ice_hw *hw);

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

+0 −37
Original line number Diff line number Diff line
@@ -4749,31 +4749,6 @@ static void ice_decfg_netdev(struct ice_vsi *vsi) 
	vsi->netdev = NULL;

}



/**

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

}



int ice_init_dev(struct ice_pf *pf)

{

	struct device *dev = ice_pf_to_dev(pf);
@@ -4786,18 +4761,6 @@ 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);



	err = ice_init_ddp_config(hw, pf);