Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22b96551 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: refactor FW version checking 



The i40e driver now supports two different devices with two different
firmware versions. So be smart about how we handle these. Move the FW
version macros to the appropriate header file, and add a convenience
macro that checks the version based on the device. Then use this macro
to check whether or not the driver can use the new link info API.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a3f5aa90

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

+9 −1
Original line number Diff line number Diff line
@@ -34,7 +34,15 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR	0x0005

#define I40E_FW_API_VERSION_MINOR_X722	0x0005

#define I40E_FW_API_VERSION_MINOR_X710	0x0007



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \

					I40E_FW_API_VERSION_MINOR_X710 : \

					I40E_FW_API_VERSION_MINOR_X722)



/* API version 1.7 implements additional link and PHY-specific APIs  */

#define I40E_MINOR_VER_GET_LINK_INFO_XL710 0x0007



struct i40e_aq_desc {

	__le16 flags;

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

+4 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,10 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
		status = I40E_ERR_UNKNOWN_PHY;



	if (report_init) {

		hw->phy.phy_types = le32_to_cpu(abilities->phy_type);

		hw->phy.phy_types |= ((u64)abilities->phy_type_ext << 32);

		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)

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

	}



	return status;

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

+1 −1
Original line number Diff line number Diff line
@@ -11434,7 +11434,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		 i40e_nvm_version_str(hw));



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

	    hw->aq.api_min_ver > I40E_FW_API_VERSION_MINOR)

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

		dev_info(&pdev->dev,

			 "The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n");

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

drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h

+9 −1
Original line number Diff line number Diff line
@@ -34,7 +34,15 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR	0x0005

#define I40E_FW_API_VERSION_MINOR_X722	0x0005

#define I40E_FW_API_VERSION_MINOR_X710	0x0007



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \

					I40E_FW_API_VERSION_MINOR_X710 : \

					I40E_FW_API_VERSION_MINOR_X722)



/* API version 1.7 implements additional link and PHY-specific APIs  */

#define I40E_MINOR_VER_GET_LINK_INFO_XL710 0x0007



struct i40e_aq_desc {

	__le16 flags;