ice: add helper function to check FW API version
Subsystems (2)
PATCH 1/1 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.
--- drivers/net/ethernet/intel/ice/ice_common.c | 63 +++++++++++---------- 1 file changed, 32 insertions(+), 31 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +32 -31
@@ -5298,6 +5298,29 @@ ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,return 0 ; } +/** +* 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 API is minimum version +*/ +static bool ice_is_fw_api_min_ver (struct ice_hw *hw,u8 maj,u8 min,u8 patch) +{ +if (hw->api_maj_ver == maj) { +if (hw->api_min_ver > min) +return true; +if (hw->api_min_ver == min && hw->api_patch >= patch) +return true; + }else if (hw->api_maj_ver > maj) { +return true; + } + +return false; +} +/** * ice_is_fw_min_ver * @hw: pointer to the hardware structure
@@ -5335,17 +5358,9 @@ static bool ice_is_fw_min_ver(struct ice_hw *hw, u8 branch, u8 maj, u8 min,*/ bool ice_fw_supports_link_override (struct ice_hw *hw) { -if (hw->api_maj_ver ==ICE_FW_API_LINK_OVERRIDE_MAJ ) { -if (hw->api_min_ver >ICE_FW_API_LINK_OVERRIDE_MIN ) -return true; -if (hw->api_min_ver ==ICE_FW_API_LINK_OVERRIDE_MIN && - hw->api_patch >=ICE_FW_API_LINK_OVERRIDE_PATCH ) -return true; - }else if (hw->api_maj_ver >ICE_FW_API_LINK_OVERRIDE_MAJ ) { -return true; - } - -return false; +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 ); }/**
@@ -5478,16 +5493,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 ); }/**
@@ -5537,16 +5545,9 @@ int ice_lldp_execute_pending_mib(struct ice_hw *hw)*/ 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 ); }/**
base-commit: 90b3bee3a23249977852079b908270afc6ee03bb
prerequisite-patch-id: 0410da0e98c471eb87819eba41169befed1b9c0e
prerequisite-patch-id: 88c93486586ee62eb0d20b8c5f0ba725be63087d
Signature · 6 lines
2.37.1.394.gc50926e1f488 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Tuesday, August 23, 2022 8:35 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH net-next] ice: add helper function to check FW API versionSeveral functions in
ice_common.ccheck the firmware API version to see if the current API version meets some minimum requirement.
Quoted 9 lines
Improve the readability of these checks by introducing
ice_is_fw_api_min_ver, a helper function to perform that check.Signed-off-by Paul Greenwalt <[email protected]>Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 63 +++++++++++---------- 1 file changed, 32 insertions(+), 31 deletions(-)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan