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

Commit fe310704 authored by Anjali Singhai jain's avatar Anjali Singhai jain Committed by Jeff Kirsher
Browse files

i40e: firmware version fields offsets update 



The version bits reported by the hardware changed, so fix
up the offsets to print the version correctly.

Change-Id: I8a8207b401ea88f6da024aebafe7d3826ee6512c
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 17e6a845

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

+9 −8
Original line number Diff line number Diff line
@@ -81,11 +81,14 @@ 
#define I40E_DEFAULT_MSG_ENABLE       4



#define I40E_NVM_VERSION_LO_SHIFT  0

#define I40E_NVM_VERSION_LO_MASK   (0xf << I40E_NVM_VERSION_LO_SHIFT)

#define I40E_NVM_VERSION_MID_SHIFT 4

#define I40E_NVM_VERSION_MID_MASK  (0xff << I40E_NVM_VERSION_MID_SHIFT)

#define I40E_NVM_VERSION_HI_SHIFT  12

#define I40E_NVM_VERSION_HI_MASK   (0xf << I40E_NVM_VERSION_HI_SHIFT)

#define I40E_NVM_VERSION_LO_MASK   (0xff << I40E_NVM_VERSION_LO_SHIFT)

#define I40E_NVM_VERSION_HI_SHIFT  8

#define I40E_NVM_VERSION_HI_MASK   (0xff << I40E_NVM_VERSION_HI_SHIFT)



/* The values in here are decimal coded as hex as is the case in the NVM map*/

#define I40E_CURRENT_NVM_VERSION_HI 0x2

#define I40E_CURRENT_NVM_VERSION_LO 0x1





/* magic for getting defines into strings */

#define STRINGIFY(foo)  #foo
@@ -441,13 +444,11 @@ static inline char *i40e_fw_version_str(struct i40e_hw *hw) 
	static char buf[32];



	snprintf(buf, sizeof(buf),

		 "f%d.%d a%d.%d n%02d.%02d.%02d e%08x",

		 "f%d.%d a%d.%d n%02x.%02x e%08x",

		 hw->aq.fw_maj_ver, hw->aq.fw_min_ver,

		 hw->aq.api_maj_ver, hw->aq.api_min_ver,

		 (hw->nvm.version & I40E_NVM_VERSION_HI_MASK)

						>> I40E_NVM_VERSION_HI_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_MID_MASK)

						>> I40E_NVM_VERSION_MID_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_LO_MASK)

						>> I40E_NVM_VERSION_LO_SHIFT,

		 hw->nvm.eetrack);

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

+7 −0
Original line number Diff line number Diff line
@@ -7141,6 +7141,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	err = i40e_init_adminq(hw);

	dev_info(&pdev->dev, "%s\n", i40e_fw_version_str(hw));

	if (((hw->nvm.version & I40E_NVM_VERSION_HI_MASK)

		 >> I40E_NVM_VERSION_HI_SHIFT) != I40E_CURRENT_NVM_VERSION_HI) {

		dev_info(&pdev->dev,

			 "warning: NVM version not supported, supported version: %02x.%02x\n",

			 I40E_CURRENT_NVM_VERSION_HI,

			 I40E_CURRENT_NVM_VERSION_LO);

	}

	if (err) {

		dev_info(&pdev->dev,

			 "init_adminq failed: %d expecting API %02x.%02x\n",