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

Commit 870f805e authored by Lukasz Czapnik's avatar Lukasz Czapnik Committed by Jeff Kirsher
Browse files

ice: Fix FW version formatting in dmesg 



The FW build id is currently being displayed as an int which doesn't make
sense. Instead display FW build id as a hex value. Also add other useful
information to the output such as NVM version, API patch info, and FW
build hash.

Signed-off-by: default avatarLukasz Czapnik <lukasz.czapnik@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e3710a01

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ extern const char ice_drv_ver[]; 


#define ICE_DFLT_TRAFFIC_CLASS	BIT(0)

#define ICE_INT_NAME_STR_LEN	(IFNAMSIZ + 16)

#define ICE_ETHTOOL_FWVER_LEN	32

#define ICE_AQ_LEN		64

#define ICE_MBXSQ_LEN		64

#define ICE_MBXRQ_LEN		512

drivers/net/ethernet/intel/ice/ice_common.c

+23 −0
Original line number Diff line number Diff line
@@ -728,6 +728,29 @@ static void ice_get_itr_intrl_gran(struct ice_hw *hw) 
	}

}



/**

 * ice_get_nvm_version - get cached NVM version data

 * @hw: pointer to the hardware structure

 * @oem_ver: 8 bit NVM version

 * @oem_build: 16 bit NVM build number

 * @oem_patch: 8 NVM patch number

 * @ver_hi: high 16 bits of the NVM version

 * @ver_lo: low 16 bits of the NVM version

 */

void

ice_get_nvm_version(struct ice_hw *hw, u8 *oem_ver, u16 *oem_build,

		    u8 *oem_patch, u8 *ver_hi, u8 *ver_lo)

{

	struct ice_nvm_info *nvm = &hw->nvm;



	*oem_ver = (u8)((nvm->oem_ver & ICE_OEM_VER_MASK) >> ICE_OEM_VER_SHIFT);

	*oem_patch = (u8)(nvm->oem_ver & ICE_OEM_VER_PATCH_MASK);

	*oem_build = (u16)((nvm->oem_ver & ICE_OEM_VER_BUILD_MASK) >>

			   ICE_OEM_VER_BUILD_SHIFT);

	*ver_hi = (nvm->ver & ICE_NVM_VER_HI_MASK) >> ICE_NVM_VER_HI_SHIFT;

	*ver_lo = (nvm->ver & ICE_NVM_VER_LO_MASK) >> ICE_NVM_VER_LO_SHIFT;

}



/**

 * ice_init_hw - main hardware initialization routine

 * @hw: pointer to the hardware structure

drivers/net/ethernet/intel/ice/ice_common.h

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ ice_stat_update40(struct ice_hw *hw, u32 reg, bool prev_stat_loaded, 
void

ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		  u64 *prev_stat, u64 *cur_stat);

void

ice_get_nvm_version(struct ice_hw *hw, u8 *oem_ver, u16 *oem_build,

		    u8 *oem_patch, u8 *ver_hi, u8 *ver_lo);

enum ice_status

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_get_elem *buf);

drivers/net/ethernet/intel/ice/ice_ethtool.c

+0 −25
Original line number Diff line number Diff line
@@ -160,31 +160,6 @@ static const struct ice_priv_flag ice_gstrings_priv_flags[] = { 


#define ICE_PRIV_FLAG_ARRAY_SIZE	ARRAY_SIZE(ice_gstrings_priv_flags)



/**

 * ice_nvm_version_str - format the NVM version strings

 * @hw: ptr to the hardware info

 */

static char *ice_nvm_version_str(struct ice_hw *hw)

{

	static char buf[ICE_ETHTOOL_FWVER_LEN];

	u8 ver, patch;

	u32 full_ver;

	u16 build;



	full_ver = hw->nvm.oem_ver;

	ver = (u8)((full_ver & ICE_OEM_VER_MASK) >> ICE_OEM_VER_SHIFT);

	build = (u16)((full_ver & ICE_OEM_VER_BUILD_MASK) >>

		      ICE_OEM_VER_BUILD_SHIFT);

	patch = (u8)(full_ver & ICE_OEM_VER_PATCH_MASK);



	snprintf(buf, sizeof(buf), "%x.%02x 0x%x %d.%d.%d",

		 (hw->nvm.ver & ICE_NVM_VER_HI_MASK) >> ICE_NVM_VER_HI_SHIFT,

		 (hw->nvm.ver & ICE_NVM_VER_LO_MASK) >> ICE_NVM_VER_LO_SHIFT,

		 hw->nvm.eetrack, ver, build, patch);



	return buf;

}



static void

ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)

{

drivers/net/ethernet/intel/ice/ice_lib.c

+19 −0
Original line number Diff line number Diff line
@@ -3275,6 +3275,25 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc) 
}

#endif /* CONFIG_DCB */



/**

 * ice_nvm_version_str - format the NVM version strings

 * @hw: ptr to the hardware info

 */

char *ice_nvm_version_str(struct ice_hw *hw)

{

	u8 oem_ver, oem_patch, ver_hi, ver_lo;

	static char buf[ICE_NVM_VER_LEN];

	u16 oem_build;



	ice_get_nvm_version(hw, &oem_ver, &oem_build, &oem_patch, &ver_hi,

			    &ver_lo);



	snprintf(buf, sizeof(buf), "%x.%02x 0x%x %d.%d.%d", ver_hi, ver_lo,

		 hw->nvm.eetrack, oem_ver, oem_build, oem_patch);



	return buf;

}



/**

 * ice_vsi_cfg_mac_fltr - Add or remove a MAC address filter for a VSI

 * @vsi: the VSI being configured MAC filter