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

Commit 73834aec authored by Paul Greenwalt's avatar Paul Greenwalt Committed by Jeff Kirsher
Browse files

ixgbe: extend firmware version support 



Extend FW version reporting by displaying information from the iSCSI
or OEM block in the EEPROM.

This will allow us to more accurately identify the FW.

Signed-off-by: default avatarPaul Greenwalt <paul.greenwalt@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3ead7c2e

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −2
Original line number Diff line number Diff line
@@ -723,8 +723,7 @@ struct ixgbe_adapter { 


	u16 bridge_mode;



	u16 eeprom_verh;

	u16 eeprom_verl;

	char eeprom_id[NVM_VER_SIZE];

	u16 eeprom_cap;



	u32 interrupt_event;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+112 −0
Original line number Diff line number Diff line
@@ -4028,6 +4028,118 @@ s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw) 
	return 0;

}



/**

 *  ixgbe_get_orom_version - Return option ROM from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  if valid option ROM version, nvm_ver->or_valid set to true

 *  else nvm_ver->or_valid is false.

 **/

void ixgbe_get_orom_version(struct ixgbe_hw *hw,

			    struct ixgbe_nvm_version *nvm_ver)

{

	u16 offset, eeprom_cfg_blkh, eeprom_cfg_blkl;



	nvm_ver->or_valid = false;

	/* Option Rom may or may not be present.  Start with pointer */

	hw->eeprom.ops.read(hw, NVM_OROM_OFFSET, &offset);



	/* make sure offset is valid */

	if (offset == 0x0 || offset == NVM_INVALID_PTR)

		return;



	hw->eeprom.ops.read(hw, offset + NVM_OROM_BLK_HI, &eeprom_cfg_blkh);

	hw->eeprom.ops.read(hw, offset + NVM_OROM_BLK_LOW, &eeprom_cfg_blkl);



	/* option rom exists and is valid */

	if ((eeprom_cfg_blkl | eeprom_cfg_blkh) == 0x0 ||

	    eeprom_cfg_blkl == NVM_VER_INVALID ||

	    eeprom_cfg_blkh == NVM_VER_INVALID)

		return;



	nvm_ver->or_valid = true;

	nvm_ver->or_major = eeprom_cfg_blkl >> NVM_OROM_SHIFT;

	nvm_ver->or_build = (eeprom_cfg_blkl << NVM_OROM_SHIFT) |

			    (eeprom_cfg_blkh >> NVM_OROM_SHIFT);

	nvm_ver->or_patch = eeprom_cfg_blkh & NVM_OROM_PATCH_MASK;

}



/**

 *  ixgbe_get_oem_prod_version Etrack ID from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  if valid OEM product version, nvm_ver->oem_valid set to true

 *  else nvm_ver->oem_valid is false.

 **/

void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,

				struct ixgbe_nvm_version *nvm_ver)

{

	u16 rel_num, prod_ver, mod_len, cap, offset;



	nvm_ver->oem_valid = false;

	hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);



	/* Return is offset to OEM Product Version block is invalid */

	if (offset == 0x0 && offset == NVM_INVALID_PTR)

		return;



	/* Read product version block */

	hw->eeprom.ops.read(hw, offset, &mod_len);

	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_CAP_OFF, &cap);



	/* Return if OEM product version block is invalid */

	if (mod_len != NVM_OEM_PROD_VER_MOD_LEN ||

	    (cap & NVM_OEM_PROD_VER_CAP_MASK) != 0x0)

		return;



	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_OFF_L, &prod_ver);

	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_OFF_H, &rel_num);



	/* Return if version is invalid */

	if ((rel_num | prod_ver) == 0x0 ||

	    rel_num == NVM_VER_INVALID || prod_ver == NVM_VER_INVALID)

		return;



	nvm_ver->oem_major = prod_ver >> NVM_VER_SHIFT;

	nvm_ver->oem_minor = prod_ver & NVM_VER_MASK;

	nvm_ver->oem_release = rel_num;

	nvm_ver->oem_valid = true;

}



/**

 *  ixgbe_get_etk_id - Return Etrack ID from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  word read errors will return 0xFFFF

 **/

void ixgbe_get_etk_id(struct ixgbe_hw *hw,

		      struct ixgbe_nvm_version *nvm_ver)

{

	u16 etk_id_l, etk_id_h;



	if (hw->eeprom.ops.read(hw, NVM_ETK_OFF_LOW, &etk_id_l))

		etk_id_l = NVM_VER_INVALID;

	if (hw->eeprom.ops.read(hw, NVM_ETK_OFF_HI, &etk_id_h))

		etk_id_h = NVM_VER_INVALID;



	/* The word order for the version format is determined by high order

	 * word bit 15.

	 */

	if ((etk_id_h & NVM_ETK_VALID) == 0) {

		nvm_ver->etk_id = etk_id_h;

		nvm_ver->etk_id |= (etk_id_l << NVM_ETK_SHIFT);

	} else {

		nvm_ver->etk_id = etk_id_l;

		nvm_ver->etk_id |= (etk_id_h << NVM_ETK_SHIFT);

	}

}



void ixgbe_disable_rx_generic(struct ixgbe_hw *hw)

{

	u32 rxctrl;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+6 −0
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ extern const u32 ixgbe_mvals_8259X[IXGBE_MVALS_IDX_LIMIT]; 


s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);

s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);

void ixgbe_get_etk_id(struct ixgbe_hw *hw,

		      struct ixgbe_nvm_version *nvm_ver);

void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,

				struct ixgbe_nvm_version *nvm_ver);

void ixgbe_get_orom_version(struct ixgbe_hw *hw,

			    struct ixgbe_nvm_version *nvm_ver);

void ixgbe_disable_rx_generic(struct ixgbe_hw *hw);

void ixgbe_enable_rx_generic(struct ixgbe_hw *hw);

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+2 −5
Original line number Diff line number Diff line
@@ -1014,16 +1014,13 @@ static void ixgbe_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *drvinfo)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	u32 nvm_track_id;



	strlcpy(drvinfo->driver, ixgbe_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, ixgbe_driver_version,

		sizeof(drvinfo->version));



	nvm_track_id = (adapter->eeprom_verh << 16) |

			adapter->eeprom_verl;

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "0x%08x",

		 nvm_track_id);

	strlcpy(drvinfo->fw_version, adapter->eeprom_id,

		sizeof(drvinfo->fw_version));



	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info));

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+2 −5
Original line number Diff line number Diff line
@@ -1034,11 +1034,8 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev, 
		 ixgbe_driver_name,

		 ixgbe_driver_version);

	/* Firmware Version */

	snprintf(info->firmware_version,

		 sizeof(info->firmware_version),

		 "0x%08x",

		 (adapter->eeprom_verh << 16) |

		  adapter->eeprom_verl);

	strlcpy(info->firmware_version, adapter->eeprom_id,

		sizeof(info->firmware_version));



	/* Model */

	if (hw->mac.type == ixgbe_mac_82599EB) {