ice: report netlist version in .info_get
Subsystems (5)
PATCH 1/1 ice: report netlist version in .info_get
The flash memory for the ice hardware contains a block of information used for link management called the Netlist module.
As this essentially represents another section of firmware, add its version information to the output of the driver's .info_get handler.
This includes both a version and the first few bytes of a hash of the module contents.
fw.netlist -> the version information extracted from the netlist module fw.netlist.build-> first 4 bytes of the hash of the contents, similar
to fw.mgmt.build
--- Documentation/networking/devlink/ice.rst | 11 +++ .../net/ethernet/intel/ice/ice_adminq_cmd.h | 27 ++++++ drivers/net/ethernet/intel/ice/ice_devlink.c | 23 +++++ drivers/net/ethernet/intel/ice/ice_nvm.c | 86 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_type.h | 11 +++ 5 files changed, 158 insertions(+)
Documentation/networking/devlink/ice.rst +11 -0
@@ -69,6 +69,17 @@ The ``ice`` driver reports the following versions - The version of the DDP package that is active in the device. Note that both the name (as reported by ``fw.app.name``) and version are required to uniquely identify the package. + * - ``fw.netlist`` + - running + - 1.1.2000-6.7.0 + - The version of the netlist module. This module defines the device's + Ethernet capabilities and default settings, and is used by the + management firmware as part of managing link and device + connectivity. + * - ``fw.netlist.build`` + - running + - 0xee16ced7 + - The first 4 bytes of the hash of the netlist module contents. Regions =======
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +27 -0
@@ -1265,6 +1265,33 @@ struct ice_aqc_nvm_checksum {u8 rsvd2[12 ]; }; +/* The result of netlist NVM read comes in a TLV format. The actual data +* (netlist header) starts from word offset 1 (byte 2). The FW strips +* out the type field from the TLV header so all the netlist fields +* should adjust their offset value by 1 word (2 bytes) in order to map +* their correct location. +*/ +#define ICE_AQC_NVM_LINK_TOPO_NETLIST_MOD_ID 0x11B +#define ICE_AQC_NVM_LINK_TOPO_NETLIST_LEN_OFFSET 1 +#define ICE_AQC_NVM_LINK_TOPO_NETLIST_LEN 2/* In bytes */ +#define ICE_AQC_NVM_NETLIST_NODE_COUNT_OFFSET 2 +#define ICE_AQC_NVM_NETLIST_NODE_COUNT_LEN 2/* In bytes */ +#define ICE_AQC_NVM_NETLIST_NODE_COUNT_M ICE_M(0x3FF, 0) +#define ICE_AQC_NVM_NETLIST_ID_BLK_START_OFFSET 5 +#define ICE_AQC_NVM_NETLIST_ID_BLK_LEN 0x30/* In words */ + +/* netlist ID block field offsets (word offsets) */ +#define ICE_AQC_NVM_NETLIST_ID_BLK_MAJOR_VER_LOW 2 +#define ICE_AQC_NVM_NETLIST_ID_BLK_MAJOR_VER_HIGH 3 +#define ICE_AQC_NVM_NETLIST_ID_BLK_MINOR_VER_LOW 4 +#define ICE_AQC_NVM_NETLIST_ID_BLK_MINOR_VER_HIGH 5 +#define ICE_AQC_NVM_NETLIST_ID_BLK_TYPE_LOW 6 +#define ICE_AQC_NVM_NETLIST_ID_BLK_TYPE_HIGH 7 +#define ICE_AQC_NVM_NETLIST_ID_BLK_REV_LOW 8 +#define ICE_AQC_NVM_NETLIST_ID_BLK_REV_HIGH 9 +#define ICE_AQC_NVM_NETLIST_ID_BLK_SHA_HASH 0xA +#define ICE_AQC_NVM_NETLIST_ID_BLK_CUST_VER 0x2F +/** * Send to PF command (indirect 0x0801) ID is only used by PF *
drivers/net/ethernet/intel/ice/ice_devlink.c +23 -0
@@ -105,6 +105,27 @@ static int ice_info_ddp_pkg_version(struct ice_pf *pf, char *buf, size_t len)return 0 ; } +static int ice_info_netlist_ver (struct ice_pf *pf,char *buf,size_t len) +{ +struct ice_netlist_ver_info *netlist = &pf->hw.netlist_ver; + +/* The netlist version fields are BCD formatted */ +snprintf (buf, len,"%x.%x.%x-%x.%x.%x" , netlist->major, netlist->minor, + netlist->type >>16 , netlist->type &0xFFFF , netlist->rev, + netlist->cust_ver); + +return 0 ; +} + +static int ice_info_netlist_build (struct ice_pf *pf,char *buf,size_t len) +{ +struct ice_netlist_ver_info *netlist = &pf->hw.netlist_ver; + +snprintf (buf, len,"0x%08x" , netlist->hash); + +return 0 ; +} +#define fixed (key, getter) { ICE_VERSION_FIXED, key, getter }#define running (key, getter) { ICE_VERSION_RUNNING, key, getter }
@@ -128,6 +149,8 @@ static const struct ice_devlink_version {running (DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID , ice_info_eetrack),running ("fw.app.name" , ice_info_ddp_pkg_name),running (DEVLINK_INFO_VERSION_GENERIC_FW_APP , ice_info_ddp_pkg_version), +running ("fw.netlist" , ice_info_netlist_ver), + running("fw.netlist.build", ice_info_netlist_build), };/**
drivers/net/ethernet/intel/ice/ice_nvm.c +86 -0
98 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_type.h +11 -0
@@ -261,6 +261,16 @@ struct ice_nvm_info {#define ICE_NVM_VER_LEN 32 +/* netlist version information */ +struct ice_netlist_ver_info { +u32 major;/* major high/low */ +u32 minor;/* minor high/low */ +u32 type;/* type high/low */ +u32 rev;/* revision high/low */ +u32 hash;/* SHA-1 hash word */ +u16 cust_ver;/* customer version */ +}; +/* Max number of port to queue branches w.r.t topology */ #define ICE_MAX_TRAFFIC_CLASS 8#define ICE_TXSCHED_MAX_BRANCHES ICE_MAX_TRAFFIC_CLASS
@@ -510,6 +520,7 @@ struct ice_hw {struct ice_nvm_info nvm;struct ice_hw_dev_caps dev_caps;/* device capabilities */ struct ice_hw_func_caps func_caps;/* function capabilities */ +struct ice_netlist_ver_info netlist_ver;/* netlist version info */ struct ice_switch_info *switch_info;/* switch filter lists */
Signature · 1 line
2.25.2
Bowers
PATCH 1/1 ice: report netlist version in .info_get
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Tuesday, May 5, 2020 3:56 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH net-next] ice: report netlist version in .info_get
The flash memory for the ice hardware contains a block of information used for link management called the Netlist module.
As this essentially represents another section of firmware, add its version information to the output of the driver's .info_get handler.
This includes both a version and the first few bytes of a hash of the module contents.
fw.netlist -> the version information extracted from the netlist module fw.netlist.build-> first 4 bytes of the hash of the contents, similar
to fw.mgmt.build
--- Documentation/networking/devlink/ice.rst | 11 +++ .../net/ethernet/intel/ice/ice_adminq_cmd.h | 27 ++++++ drivers/net/ethernet/intel/ice/ice_devlink.c | 23 +++++ drivers/net/ethernet/intel/ice/ice_nvm.c | 86 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_type.h | 11 +++ 5 files changed, 158 insertions(+)