Commit 1bd50f2d authored by Paul Greenwalt's avatar Paul Greenwalt Committed by Tony Nguyen
Browse files

ice: add helper function to check FW API version 



Several functions in ice_common.c check the firmware API version to see if
the current API version meets some minimum requirement.

Improve the readability of these checks by introducing
ice_is_fw_api_min_ver, a helper function to perform that check.

Signed-off-by: default avatarPaul Greenwalt <paul.greenwalt@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0b57e0d4

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

+29 −28
Original line number Diff line number Diff line
@@ -5286,26 +5286,41 @@ ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx, 
}



/**

 * ice_fw_supports_link_override

 * ice_is_fw_api_min_ver

 * @hw: pointer to the hardware structure

 * @maj: major version

 * @min: minor version

 * @patch: patch version

 *

 * Checks if the firmware supports link override

 * Checks if the firmware API is minimum version

 */

bool ice_fw_supports_link_override(struct ice_hw *hw)

static bool ice_is_fw_api_min_ver(struct ice_hw *hw, u8 maj, u8 min, u8 patch)

{

	if (hw->api_maj_ver == ICE_FW_API_LINK_OVERRIDE_MAJ) {

		if (hw->api_min_ver > ICE_FW_API_LINK_OVERRIDE_MIN)

	if (hw->api_maj_ver == maj) {

		if (hw->api_min_ver > min)

			return true;

		if (hw->api_min_ver == ICE_FW_API_LINK_OVERRIDE_MIN &&

		    hw->api_patch >= ICE_FW_API_LINK_OVERRIDE_PATCH)

		if (hw->api_min_ver == min && hw->api_patch >= patch)

			return true;

	} else if (hw->api_maj_ver > ICE_FW_API_LINK_OVERRIDE_MAJ) {

	} else if (hw->api_maj_ver > maj) {

		return true;

	}



	return false;

}



/**

 * ice_fw_supports_link_override

 * @hw: pointer to the hardware structure

 *

 * Checks if the firmware supports link override

 */

bool ice_fw_supports_link_override(struct ice_hw *hw)

{

	return ice_is_fw_api_min_ver(hw, ICE_FW_API_LINK_OVERRIDE_MAJ,

				     ICE_FW_API_LINK_OVERRIDE_MIN,

				     ICE_FW_API_LINK_OVERRIDE_PATCH);

}



/**

 * ice_get_link_default_override

 * @ldo: pointer to the link default override struct
@@ -5436,16 +5451,9 @@ bool ice_fw_supports_lldp_fltr_ctrl(struct ice_hw *hw) 
	if (hw->mac_type != ICE_MAC_E810)

		return false;



	if (hw->api_maj_ver == ICE_FW_API_LLDP_FLTR_MAJ) {

		if (hw->api_min_ver > ICE_FW_API_LLDP_FLTR_MIN)

			return true;

		if (hw->api_min_ver == ICE_FW_API_LLDP_FLTR_MIN &&

		    hw->api_patch >= ICE_FW_API_LLDP_FLTR_PATCH)

			return true;

	} else if (hw->api_maj_ver > ICE_FW_API_LLDP_FLTR_MAJ) {

		return true;

	}

	return false;

	return ice_is_fw_api_min_ver(hw, ICE_FW_API_LLDP_FLTR_MAJ,

				     ICE_FW_API_LLDP_FLTR_MIN,

				     ICE_FW_API_LLDP_FLTR_PATCH);

}



/**
@@ -5482,14 +5490,7 @@ ice_lldp_fltr_add_remove(struct ice_hw *hw, u16 vsi_num, bool add) 
 */

bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)

{

	if (hw->api_maj_ver == ICE_FW_API_REPORT_DFLT_CFG_MAJ) {

		if (hw->api_min_ver > ICE_FW_API_REPORT_DFLT_CFG_MIN)

			return true;

		if (hw->api_min_ver == ICE_FW_API_REPORT_DFLT_CFG_MIN &&

		    hw->api_patch >= ICE_FW_API_REPORT_DFLT_CFG_PATCH)

			return true;

	} else if (hw->api_maj_ver > ICE_FW_API_REPORT_DFLT_CFG_MAJ) {

		return true;

	}

	return false;

	return ice_is_fw_api_min_ver(hw, ICE_FW_API_REPORT_DFLT_CFG_MAJ,

				     ICE_FW_API_REPORT_DFLT_CFG_MIN,

				     ICE_FW_API_REPORT_DFLT_CFG_PATCH);

}