[Intel-wired-lan] [PATCH v3 3/9] ice: store NVM version info in extracted format
andrewx.bowers at intel.com
Mon Mar 16 19:18:22 UTC 2020
From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf Of Jacob Keller
Sent: Wednesday, March 11, 2020 6:58 PM
To: Intel Wired LAN <intel-wired-lan at lists.osuosl.org>
Cc: Jakub Kicinski <kuba at kernel.org>
Subject: [Intel-wired-lan] [PATCH v3 3/9] ice: store NVM version info in extracted format
The NVM version and Option ROM version information is stored within the struct ice_nvm_ver_info structure. The data for the NVM is stored as a 2byte value with the major and minor versions each using one byte from the field. The Option ROM is stored as a 4byte value that contains a major, build, and patch number.
Modify the code to immediately extract the version values and store them in a new struct ice_orom_info. Remove the now unnecessary ice_get_nvm_version function.
Update ice_ethtool.c to use the new fields directly from the structured data.
This reduces complexity of the code that prints these versions in ice_ethtool.c
Update the macro definitions and variable names to use the term "orom"
instead of "oem" for the Option ROM version. This helps increase the clarity of the Option ROM version code.
Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
drivers/net/ethernet/intel/ice/ice_common.c | 23 ----- drivers/net/ethernet/intel/ice/ice_common.h | 3 - drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 +--
drivers/net/ethernet/intel/ice/ice_nvm.c | 94 +++++++++++++-------
drivers/net/ethernet/intel/ice/ice_type.h | 30 ++++---
5 files changed, 88 insertions(+), 75 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers at intel.com>
More information about the Intel-wired-lan