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

i40e: Use helpers to check running FW and AQ API versions 



Use new helpers to check versions of running FW and provided
AQ API to make the code more readable.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.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-13-anthony.l.nguyen@intel.com


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

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

+19 −37
Original line number Diff line number Diff line
@@ -508,42 +508,35 @@ static int i40e_shutdown_arq(struct i40e_hw *hw) 
 **/

static void i40e_set_hw_caps(struct i40e_hw *hw)

{

	struct i40e_adminq_info *aq = &hw->aq;



	bitmap_zero(hw->caps, I40E_HW_CAPS_NBITS);



	switch (hw->mac.type) {

	case I40E_MAC_XL710:

		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710)) {

		if (i40e_is_aq_api_ver_ge(hw, 1,

					  I40E_MINOR_VER_GET_LINK_INFO_XL710)) {

			set_bit(I40E_HW_CAP_AQ_PHY_ACCESS, hw->caps);

			set_bit(I40E_HW_CAP_FW_LLDP_STOPPABLE, hw->caps);

			/* The ability to RX (not drop) 802.1ad frames */

			set_bit(I40E_HW_CAP_802_1AD, hw->caps);

		}

		if ((aq->api_maj_ver == 1 && aq->api_min_ver > 4) ||

		    aq->api_maj_ver > 1) {

		if (i40e_is_aq_api_ver_ge(hw, 1, 5)) {

			/* Supported in FW API version higher than 1.4 */

			set_bit(I40E_HW_CAP_GENEVE_OFFLOAD, hw->caps);

		}

		if ((aq->fw_maj_ver == 4 && aq->fw_min_ver < 33) ||

		    aq->fw_maj_ver < 4) {

		if (i40e_is_fw_ver_lt(hw, 4, 33)) {

			set_bit(I40E_HW_CAP_RESTART_AUTONEG, hw->caps);

			/* No DCB support  for FW < v4.33 */

			set_bit(I40E_HW_CAP_NO_DCB_SUPPORT, hw->caps);

		}

		if ((aq->fw_maj_ver == 4 && aq->fw_min_ver < 3) ||

		    aq->fw_maj_ver < 4) {

		if (i40e_is_fw_ver_lt(hw, 4, 3)) {

			/* Disable FW LLDP if FW < v4.3 */

			set_bit(I40E_HW_CAP_STOP_FW_LLDP, hw->caps);

		}

		if ((aq->fw_maj_ver == 4 && aq->fw_min_ver >= 40) ||

		    aq->fw_maj_ver >= 5) {

			/* Use the FW Set LLDP MIB API if FW > v4.40 */

		if (i40e_is_fw_ver_ge(hw, 4, 40)) {

			/* Use the FW Set LLDP MIB API if FW >= v4.40 */

			set_bit(I40E_HW_CAP_USE_SET_LLDP_MIB, hw->caps);

		}

		if (aq->fw_maj_ver >= 6) {

		if (i40e_is_fw_ver_ge(hw, 6, 0)) {

			/* Enable PTP L4 if FW > v6.0 */

			set_bit(I40E_HW_CAP_PTP_L4, hw->caps);

		}
@@ -569,19 +562,16 @@ static void i40e_set_hw_caps(struct i40e_hw *hw) 
			clear_bit(I40E_HW_CAP_ATR_EVICT, hw->caps);

		}



		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))

		if (i40e_is_aq_api_ver_ge(hw, 1,

					  I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))

			set_bit(I40E_HW_CAP_FW_LLDP_STOPPABLE, hw->caps);



		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_X722))

		if (i40e_is_aq_api_ver_ge(hw, 1,

					  I40E_MINOR_VER_GET_LINK_INFO_X722))

			set_bit(I40E_HW_CAP_AQ_PHY_ACCESS, hw->caps);



		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_FW_REQUEST_FEC_X722))

		if (i40e_is_aq_api_ver_ge(hw, 1,

					  I40E_MINOR_VER_FW_REQUEST_FEC_X722))

			set_bit(I40E_HW_CAP_X722_FEC_REQUEST, hw->caps);



		fallthrough;
@@ -590,25 +580,17 @@ static void i40e_set_hw_caps(struct i40e_hw *hw) 
	}



	/* Newer versions of firmware require lock when reading the NVM */

	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 5))

	if (i40e_is_aq_api_ver_ge(hw, 1, 5))

		set_bit(I40E_HW_CAP_NVM_READ_REQUIRES_LOCK, hw->caps);



	/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */

	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 7))

	if (i40e_is_aq_api_ver_ge(hw, 1, 7))

		set_bit(I40E_HW_CAP_802_1AD, hw->caps);



	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 8))

	if (i40e_is_aq_api_ver_ge(hw, 1, 8))

		set_bit(I40E_HW_CAP_FW_LLDP_PERSISTENT, hw->caps);



	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 9))

	if (i40e_is_aq_api_ver_ge(hw, 1, 9))

		set_bit(I40E_HW_CAP_AQ_PHY_ACCESS_EXTENDED, hw->caps);

}
@@ -694,7 +676,7 @@ int i40e_init_adminq(struct i40e_hw *hw) 
			   &oem_lo);

	hw->nvm.oem_ver = ((u32)oem_hi << 16) | oem_lo;



	if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {

	if (i40e_is_aq_api_ver_ge(hw, I40E_FW_API_VERSION_MAJOR + 1, 0)) {

		ret_code = -EIO;

		goto init_adminq_free_arq;

	}

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

+12 −13
Original line number Diff line number Diff line
@@ -1374,8 +1374,8 @@ i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 


	if (report_init) {

		if (hw->mac.type ==  I40E_MAC_XL710 &&

		    hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

		    hw->aq.api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710) {

		    i40e_is_aq_api_ver_ge(hw, I40E_FW_API_VERSION_MAJOR,

					  I40E_MINOR_VER_GET_LINK_INFO_XL710)) {

			status = i40e_aq_get_link_info(hw, true, NULL, NULL);

		} else {

			hw->phy.phy_types = le32_to_cpu(abilities->phy_type);
@@ -1645,9 +1645,8 @@ int i40e_aq_get_link_info(struct i40e_hw *hw, 
	else

		hw_link_info->lse_enable = false;



	if ((hw->mac.type == I40E_MAC_XL710) &&

	    (hw->aq.fw_maj_ver < 4 || (hw->aq.fw_maj_ver == 4 &&

	     hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)

	if (hw->mac.type == I40E_MAC_XL710 && i40e_is_fw_ver_lt(hw, 4, 40) &&

	    hw_link_info->phy_type == 0xE)

		hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;



	if (test_bit(I40E_HW_CAP_AQ_PHY_ACCESS, hw->caps) &&
@@ -5223,14 +5222,14 @@ int i40e_aq_rx_ctl_read_register(struct i40e_hw *hw, 
 **/

u32 i40e_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr)

{

	bool use_register;

	bool use_register = false;

	int status = 0;

	int retry = 5;

	u32 val = 0;



	use_register = (((hw->aq.api_maj_ver == 1) &&

			(hw->aq.api_min_ver < 5)) ||

			(hw->mac.type == I40E_MAC_X722));

	if (i40e_is_aq_api_ver_lt(hw, 1, 5) || hw->mac.type == I40E_MAC_X722)

		use_register = true;



	if (!use_register) {

do_retry:

		status = i40e_aq_rx_ctl_read_register(hw, reg_addr, &val, NULL);
@@ -5285,13 +5284,13 @@ int i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, 
 **/

void i40e_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val)

{

	bool use_register;

	bool use_register = false;

	int status = 0;

	int retry = 5;



	use_register = (((hw->aq.api_maj_ver == 1) &&

			(hw->aq.api_min_ver < 5)) ||

			(hw->mac.type == I40E_MAC_X722));

	if (i40e_is_aq_api_ver_lt(hw, 1, 5) || hw->mac.type == I40E_MAC_X722)

		use_register = true;



	if (!use_register) {

do_retry:

		status = i40e_aq_rx_ctl_write_register(hw, reg_addr,

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

+2 −5
Original line number Diff line number Diff line
@@ -804,14 +804,11 @@ int i40e_get_dcb_config(struct i40e_hw *hw) 
	int ret = 0;



	/* If Firmware version < v4.33 on X710/XL710, IEEE only */

	if ((hw->mac.type == I40E_MAC_XL710) &&

	    (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||

	      (hw->aq.fw_maj_ver < 4)))

	if (hw->mac.type == I40E_MAC_XL710 && i40e_is_fw_ver_lt(hw, 4, 33))

		return i40e_get_ieee_dcb_config(hw);



	/* If Firmware version == v4.33 on X710/XL710, use old CEE struct */

	if ((hw->mac.type == I40E_MAC_XL710) &&

	    ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33))) {

	if (hw->mac.type == I40E_MAC_XL710 && i40e_is_fw_ver_eq(hw, 4, 33)) {

		ret = i40e_aq_get_cee_dcb_config(hw, &cee_v1_cfg,

						 sizeof(cee_v1_cfg), NULL);

		if (!ret) {

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

+3 −3
Original line number Diff line number Diff line
@@ -15819,15 +15819,15 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		 hw->vendor_id, hw->device_id, hw->subsystem_vendor_id,

		 hw->subsystem_device_id);



	if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

	    hw->aq.api_min_ver > I40E_FW_MINOR_VERSION(hw))

	if (i40e_is_aq_api_ver_ge(hw, I40E_FW_API_VERSION_MAJOR,

				  I40E_FW_MINOR_VERSION(hw) + 1))

		dev_dbg(&pdev->dev,

			"The driver for the device detected a newer version of the NVM image v%u.%u than v%u.%u.\n",

			 hw->aq.api_maj_ver,

			 hw->aq.api_min_ver,

			 I40E_FW_API_VERSION_MAJOR,

			 I40E_FW_MINOR_VERSION(hw));

	else if (hw->aq.api_maj_ver == 1 && hw->aq.api_min_ver < 4)

	else if (i40e_is_aq_api_ver_lt(hw, 1, 4))

		dev_info(&pdev->dev,

			 "The driver for the device detected an older version of the NVM image v%u.%u than expected v%u.%u. Please update the NVM image.\n",

			 hw->aq.api_maj_ver,