Messages in this thread | | | Date | Wed, 25 Oct 2023 12:44:42 +0200 | Subject | Re: [PATCH iwl-next 2/2] i40e: Move inline helpers to i40e_prototype.h | From | Wojciech Drewek <> |
| |
On 25.10.2023 12:33, Ivan Vecera wrote: > 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: Wojciech Drewek <wojciech.drewek@intel.com> > Cc: Jacob Keller <jacob.e.keller@intel.com> > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > ---
Thanks Ivan! Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
> .../net/ethernet/intel/i40e/i40e_prototype.h | 70 +++++++++++++++++++ > drivers/net/ethernet/intel/i40e/i40e_type.h | 68 ------------------ > 2 files changed, 70 insertions(+), 68 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > index 001162042050..af4269330581 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h > +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > @@ -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_ */ > diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h > index 7eaf8b013125..e3d40630f689 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_type.h > +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h > @@ -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;
| |