iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40e: Move inline helpers to i40e_prototype.h

Browse Source 
Move version check helper functions from i40e_type.h to
i40e_prototype.h as per discussion [1].

[1] https://lore.kernel.org/all/cdcd6b97-1138-4cd7-854f-b3faa1f475f8@intel.com/#t

Cc: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20231113231047.548659-15-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ivan Vecera 2023-11-13 15:10:33 -08:00 committed by Jakub Kicinski
parent d8c6bee01c
commit f699a4bfc8
2 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/net/ethernet/intel/i40e/i40e_prototype.h
View File

@ -501,4 +501,74 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
/* i40e_ddp */
int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);
/* Firmware and AdminQ version check helpers */
/**
* i40e_is_aq_api_ver_ge
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current HW API version is greater/equal than provided.
**/
static inline bool i40e_is_aq_api_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.api_maj_ver > maj ||
(hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min));
}
/**
* i40e_is_aq_api_ver_lt
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current HW API version is less than provided.
**/
static inline bool i40e_is_aq_api_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
{
return !i40e_is_aq_api_ver_ge(hw, maj, min);
}
/**
* i40e_is_fw_ver_ge
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is greater/equal than provided.
**/
static inline bool i40e_is_fw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.fw_maj_ver > maj ||
(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver >= min));
}
/**
* i40e_is_fw_ver_lt
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is less than provided.
**/
static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
{
return !i40e_is_fw_ver_ge(hw, maj, min);
}
/**
* i40e_is_fw_ver_eq
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is equal to provided.
**/
static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.fw_maj_ver > maj ||
(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min));
}
#endif /* _I40E_PROTOTYPE_H_ */

68
drivers/net/ethernet/intel/i40e/i40e_type.h
View File

@ -586,74 +586,6 @@ struct i40e_hw {
char err_str[16];
};
/**
* i40e_is_aq_api_ver_ge
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current HW API version is greater/equal than provided.
**/
static inline bool i40e_is_aq_api_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.api_maj_ver > maj ||
(hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min));
}
/**
* i40e_is_aq_api_ver_lt
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current HW API version is less than provided.
**/
static inline bool i40e_is_aq_api_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
{
return !i40e_is_aq_api_ver_ge(hw, maj, min);
}
/**
* i40e_is_fw_ver_ge
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is greater/equal than provided.
**/
static inline bool i40e_is_fw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.fw_maj_ver > maj ||
(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver >= min));
}
/**
* i40e_is_fw_ver_lt
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is less than provided.
**/
static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
{
return !i40e_is_fw_ver_ge(hw, maj, min);
}
/**
* i40e_is_fw_ver_eq
* @hw: pointer to i40e_hw structure
* @maj: API major value to compare
* @min: API minor value to compare
*
* Assert whether current firmware version is equal to provided.
**/
static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min)
{
return (hw->aq.fw_maj_ver > maj ||
(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min));
}
struct i40e_driver_version {
u8 major_version;
u8 minor_version;