Commit 28c1726b authored by Ivan Vecera's avatar Ivan Vecera Committed by Jakub Kicinski
Browse files

i40e: Move i40e_is_aq_api_ver_ge helper 



Move i40e_is_aq_api_ver_ge helper function (used to check if AdminQ
API version is recent enough) to header so it can be used from
other .c files.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@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>
Link: https://lore.kernel.org/r/20231113231047.548659-11-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8cc29564

drivers/net/ethernet/intel/i40e/i40e_common.c

+4 −19
Original line number Diff line number Diff line
@@ -1749,21 +1749,6 @@ int i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags, 
	return status;

}



/**

 * i40e_is_aq_api_ver_ge

 * @aq: pointer to AdminQ info containing HW API version to compare

 * @maj: API major value

 * @min: API minor value

 *

 * Assert whether current HW API version is greater/equal than provided.

 **/

static bool i40e_is_aq_api_ver_ge(struct i40e_adminq_info *aq, u16 maj,

				  u16 min)

{

	return (aq->api_maj_ver > maj ||

		(aq->api_maj_ver == maj && aq->api_min_ver >= min));

}



/**

 * i40e_aq_add_vsi

 * @hw: pointer to the hw struct
@@ -1890,14 +1875,14 @@ int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, 


	if (set) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (rx_only_promisc && i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		if (rx_only_promisc && i40e_is_aq_api_ver_ge(hw, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);



	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

	if (i40e_is_aq_api_ver_ge(hw, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);
@@ -2000,13 +1985,13 @@ int i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, 


	if (enable) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		if (i40e_is_aq_api_ver_ge(hw, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);

	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

	if (i40e_is_aq_api_ver_ge(hw, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);

	cmd->seid = cpu_to_le16(seid);

drivers/net/ethernet/intel/i40e/i40e_type.h

+14 −0
Original line number Diff line number Diff line
@@ -594,6 +594,20 @@ static inline bool i40e_is_vf(struct i40e_hw *hw) 
		hw->mac.type == I40E_MAC_X722_VF);

}



/**

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

}



struct i40e_driver_version {

	u8 major_version;

	u8 minor_version;