Add functions reading inactive versions from the inactive flash
banks.
Print stored NVM, OROM and netlist versions by devlink when there
is an ongoing update for E610 devices.
Reviewed-by: Mateusz Polchlopek <mateusz.polchlo...@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kits...@intel.com>
Co-developed-by: Slawomir Mrozowicz <slawomirx.mrozow...@intel.com>
Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozow...@intel.com>
Co-developed-by: Piotr Kwapulinski <piotr.kwapulin...@intel.com>
Signed-off-by: Piotr Kwapulinski <piotr.kwapulin...@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagiel...@intel.com>
---
v3: use devlink_info_version_*_put() function; squash functions dealing with
running and stored versions into single ones
v5: add else to if/else if statements
---
.../ethernet/intel/ixgbe/devlink/devlink.c | 210 ++++++++++++++++--
drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 59 +++++
drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h | 3 +
3 files changed, 250 insertions(+), 22 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
b/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
index b13a10d430eb..8677d648576d 100644
--- a/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
@@ -6,6 +6,15 @@
struct ixgbe_info_ctx {
char buf[128];
+ struct ixgbe_orom_info pending_orom;
+ struct ixgbe_nvm_info pending_nvm;
+ struct ixgbe_netlist_info pending_netlist;
+ struct ixgbe_hw_dev_caps dev_caps;
+};
+
+enum ixgbe_devlink_version_type {
+ IXGBE_DL_VERSION_RUNNING,
+ IXGBE_DL_VERSION_STORED
};
static void ixgbe_info_get_dsn(struct ixgbe_adapter *adapter,
@@ -20,7 +29,8 @@ static void ixgbe_info_get_dsn(struct ixgbe_adapter *adapter,
}
static void ixgbe_info_orom_ver(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
struct ixgbe_hw *hw = &adapter->hw;
struct ixgbe_nvm_version nvm_ver;
@@ -28,7 +38,14 @@ static void ixgbe_info_orom_ver(struct ixgbe_adapter
*adapter,
ctx->buf[0] = '\0';
if (hw->mac.type == ixgbe_mac_e610) {
- struct ixgbe_orom_info *orom = &adapter->hw.flash.orom;
+ struct ixgbe_orom_info *orom;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ orom = &adapter->hw.flash.orom;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ orom = &ctx->pending_orom;
+ else
+ return;
snprintf(ctx->buf, sizeof(ctx->buf), "%d.%d.%d",
orom->major, orom->build, orom->patch);
@@ -51,14 +68,23 @@ static void ixgbe_info_orom_ver(struct ixgbe_adapter
*adapter,
}
static void ixgbe_info_eetrack(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
struct ixgbe_hw *hw = &adapter->hw;
struct ixgbe_nvm_version nvm_ver;
if (hw->mac.type == ixgbe_mac_e610) {
- snprintf(ctx->buf, sizeof(ctx->buf), "0x%08x",
- hw->flash.nvm.eetrack);
+ u32 eetrack;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ eetrack = hw->flash.nvm.eetrack;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ eetrack = ctx->pending_nvm.eetrack;
+ else
+ return;
+
+ snprintf(ctx->buf, sizeof(ctx->buf), "0x%08x", eetrack);
return;
}
@@ -92,33 +118,65 @@ static void ixgbe_info_fw_build(struct ixgbe_adapter
*adapter,
}
static void ixgbe_info_fw_srev(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
- struct ixgbe_nvm_info *nvm = &adapter->hw.flash.nvm;
+ struct ixgbe_nvm_info *nvm;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ nvm = &adapter->hw.flash.nvm;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ nvm = &ctx->pending_nvm;
+ else
+ return;
snprintf(ctx->buf, sizeof(ctx->buf), "%u", nvm->srev);
}
static void ixgbe_info_orom_srev(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
- struct ixgbe_orom_info *orom = &adapter->hw.flash.orom;
+ struct ixgbe_orom_info *orom;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ orom = &adapter->hw.flash.orom;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ orom = &ctx->pending_orom;
+ else
+ return;
snprintf(ctx->buf, sizeof(ctx->buf), "%u", orom->srev);
}
static void ixgbe_info_nvm_ver(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
- struct ixgbe_nvm_info *nvm = &adapter->hw.flash.nvm;
+ struct ixgbe_nvm_info *nvm;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ nvm = &adapter->hw.flash.nvm;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ nvm = &ctx->pending_nvm;
+ else
+ return;
snprintf(ctx->buf, sizeof(ctx->buf), "%x.%02x", nvm->major, nvm->minor);
}
static void ixgbe_info_netlist_ver(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
- struct ixgbe_netlist_info *netlist = &adapter->hw.flash.netlist;
+ struct ixgbe_netlist_info *netlist;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ netlist = &adapter->hw.flash.netlist;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ netlist = &ctx->pending_netlist;
+ else
+ return;
/* The netlist version fields are BCD formatted */
snprintf(ctx->buf, sizeof(ctx->buf), "%x.%x.%x-%x.%x.%x",
@@ -128,13 +186,56 @@ static void ixgbe_info_netlist_ver(struct ixgbe_adapter
*adapter,
}
static void ixgbe_info_netlist_build(struct ixgbe_adapter *adapter,
- struct ixgbe_info_ctx *ctx)
+ struct ixgbe_info_ctx *ctx,
+ enum ixgbe_devlink_version_type type)
{
- struct ixgbe_netlist_info *netlist = &adapter->hw.flash.netlist;
+ struct ixgbe_netlist_info *netlist;
+
+ if (type == IXGBE_DL_VERSION_RUNNING)
+ netlist = &adapter->hw.flash.netlist;
+ else if (type == IXGBE_DL_VERSION_STORED)
+ netlist = &ctx->pending_netlist;
+ else
+ return;
snprintf(ctx->buf, sizeof(ctx->buf), "0x%08x", netlist->hash);
}
+static int ixgbe_set_ctx_dev_caps(struct ixgbe_hw *hw,
+ struct ixgbe_info_ctx *ctx,
+ struct netlink_ext_ack *extack)
+{
+ int err = ixgbe_discover_dev_caps(hw, &ctx->dev_caps);
+
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Unable to discover device capabilities");
+ return err;
+ }
+
+ if (ctx->dev_caps.common_cap.nvm_update_pending_orom) {
+ err = ixgbe_get_inactive_orom_ver(hw, &ctx->pending_orom);
+ if (err)
+ ctx->dev_caps.common_cap.nvm_update_pending_orom =
+ false;
+ }
+
+ if (ctx->dev_caps.common_cap.nvm_update_pending_nvm) {
+ err = ixgbe_get_inactive_nvm_ver(hw, &ctx->pending_nvm);
+ if (err)
+ ctx->dev_caps.common_cap.nvm_update_pending_nvm = false;
+ }
+
+ if (ctx->dev_caps.common_cap.nvm_update_pending_netlist) {
+ err = ixgbe_get_inactive_netlist_ver(hw, &ctx->pending_netlist);
+ if (err)
+ ctx->dev_caps.common_cap.nvm_update_pending_netlist =
+ false;
+ }
+
+ return 0;
+}
+
static int ixgbe_devlink_info_get_E610(struct ixgbe_adapter *adapter,
struct devlink_info_req *req,
struct ixgbe_info_ctx *ctx)
@@ -153,33 +254,90 @@ static int ixgbe_devlink_info_get_E610(struct
ixgbe_adapter *adapter,
if (err)
return err;
- ixgbe_info_fw_srev(adapter, ctx);
+ ixgbe_info_fw_srev(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req, "fw.mgmt.srev", ctx->buf);
if (err)
return err;
- ixgbe_info_orom_srev(adapter, ctx);
+ ixgbe_info_orom_srev(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req, "fw.undi.srev", ctx->buf);
if (err)
return err;
- ixgbe_info_nvm_ver(adapter, ctx);
+ ixgbe_info_nvm_ver(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req, "fw.psid.api", ctx->buf);
if (err)
return err;
- ixgbe_info_netlist_ver(adapter, ctx);
+ ixgbe_info_netlist_ver(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req, "fw.netlist", ctx->buf);
if (err)
return err;
- ixgbe_info_netlist_build(adapter, ctx);
+ ixgbe_info_netlist_build(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req, "fw.netlist.build",
ctx->buf);
return err;
}
+static int
+ixgbe_devlink_pending_info_get_E610(struct ixgbe_adapter *adapter,
+ struct devlink_info_req *req,
+ struct ixgbe_info_ctx *ctx)
+{
+ int err = 0;
+
+ if (!ctx->dev_caps.common_cap.nvm_update_pending_nvm)
+ goto no_nvm;
+
+ ixgbe_info_fw_srev(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req, "fw.mgmt.srev", ctx->buf);
+ if (err)
+ return err;
+
+ ixgbe_info_eetrack(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID,
+ ctx->buf);
+ if (err)
+ return err;
+
+ ixgbe_info_nvm_ver(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req, "fw.psid.api", ctx->buf);
+ if (err)
+ return err;
+
+no_nvm:
+ if (!ctx->dev_caps.common_cap.nvm_update_pending_orom)
+ goto no_orom;
+
+ ixgbe_info_orom_ver(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW_UNDI,
+ ctx->buf);
+ if (err)
+ return err;
+
+ ixgbe_info_orom_srev(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req, "fw.undi.srev", ctx->buf);
+no_orom:
+ if (err || !ctx->dev_caps.common_cap.nvm_update_pending_netlist)
+ return err;
+
+ ixgbe_info_netlist_ver(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req, "fw.netlist", ctx->buf);
+
+ if (err)
+ return err;
+
+ ixgbe_info_netlist_build(adapter, ctx, IXGBE_DL_VERSION_STORED);
+ err = devlink_info_version_stored_put(req, "fw.netlist.build",
+ ctx->buf);
+
+ return err;
+}
+
static int ixgbe_devlink_info_get(struct devlink *devlink,
struct devlink_info_req *req,
struct netlink_ext_ack *extack)
@@ -198,14 +356,14 @@ static int ixgbe_devlink_info_get(struct devlink *devlink,
if (err)
goto free_ctx;
- ixgbe_info_orom_ver(adapter, ctx);
+ ixgbe_info_orom_ver(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req,
DEVLINK_INFO_VERSION_GENERIC_FW_UNDI,
ctx->buf);
if (err)
goto free_ctx;
- ixgbe_info_eetrack(adapter, ctx);
+ ixgbe_info_eetrack(adapter, ctx, IXGBE_DL_VERSION_RUNNING);
err = devlink_info_version_running_put(req,
DEVLINK_INFO_VERSION_GENERIC_FW_UNDI,
ctx->buf);
@@ -220,7 +378,15 @@ static int ixgbe_devlink_info_get(struct devlink *devlink,
if (err || hw->mac.type != ixgbe_mac_e610)
goto free_ctx;
+ err = ixgbe_set_ctx_dev_caps(hw, ctx, extack);
+ if (err)
+ goto free_ctx;
+
err = ixgbe_devlink_info_get_E610(adapter, req, ctx);
+ if (err)
+ goto free_ctx;
+
+ err = ixgbe_devlink_pending_info_get_E610(adapter, req, ctx);
free_ctx:
kfree(ctx);
return err;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
index 2b1549992754..87a646659e45 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
@@ -589,6 +589,15 @@ static bool ixgbe_parse_e610_caps(struct ixgbe_hw *hw,
break;
case IXGBE_ACI_CAPS_NVM_VER:
break;
+ case IXGBE_ACI_CAPS_PENDING_NVM_VER:
+ caps->nvm_update_pending_nvm = true;
+ break;
+ case IXGBE_ACI_CAPS_PENDING_OROM_VER:
+ caps->nvm_update_pending_orom = true;
+ break;
+ case IXGBE_ACI_CAPS_PENDING_NET_VER:
+ caps->nvm_update_pending_netlist = true;
+ break;
case IXGBE_ACI_CAPS_MAX_MTU:
caps->max_mtu = number;
break;
@@ -2932,6 +2941,23 @@ static int ixgbe_get_orom_ver_info(struct ixgbe_hw *hw,
return err;
}
+/**
+ * ixgbe_get_inactive_orom_ver - Read Option ROM version from the inactive bank
+ * @hw: pointer to the HW structure
+ * @orom: storage for Option ROM version information
+ *
+ * Read the Option ROM version and security revision data for the inactive
+ * section of flash. Used to access version data for a pending update that has
+ * not yet been activated.
+ *
+ * Return: the exit code of the operation.
+ */
+int ixgbe_get_inactive_orom_ver(struct ixgbe_hw *hw,
+ struct ixgbe_orom_info *orom)
+{
+ return ixgbe_get_orom_ver_info(hw, IXGBE_INACTIVE_FLASH_BANK, orom);
+}
+
/**
* ixgbe_get_nvm_ver_info - Read NVM version information
* @hw: pointer to the HW struct
@@ -2975,6 +3001,22 @@ static int ixgbe_get_nvm_ver_info(struct ixgbe_hw *hw,
return 0;
}
+/**
+ * ixgbe_get_inactive_nvm_ver - Read Option ROM version from the inactive bank
+ * @hw: pointer to the HW structure
+ * @nvm: storage for Option ROM version information
+ *
+ * Read the NVM EETRACK ID, Map version, and security revision of the
+ * inactive NVM bank. Used to access version data for a pending update that
+ * has not yet been activated.
+ *
+ * Return: the exit code of the operation.
+ */
+int ixgbe_get_inactive_nvm_ver(struct ixgbe_hw *hw, struct ixgbe_nvm_info *nvm)
+{
+ return ixgbe_get_nvm_ver_info(hw, IXGBE_INACTIVE_FLASH_BANK, nvm);
+}
+
/**
* ixgbe_get_netlist_info - Read the netlist version information
* @hw: pointer to the HW struct
@@ -3055,6 +3097,23 @@ static int ixgbe_get_netlist_info(struct ixgbe_hw *hw,
return err;
}
+/**
+ * ixgbe_get_inactive_netlist_ver - Read netlist version from the inactive bank
+ * @hw: pointer to the HW struct
+ * @netlist: pointer to netlist version info structure
+ *
+ * Read the netlist version data from the inactive netlist bank. Used to
+ * extract version data of a pending flash update in order to display the
+ * version data.
+ *
+ * Return: the exit code of the operation.
+ */
+int ixgbe_get_inactive_netlist_ver(struct ixgbe_hw *hw,
+ struct ixgbe_netlist_info *netlist)
+{
+ return ixgbe_get_netlist_info(hw, IXGBE_INACTIVE_FLASH_BANK, netlist);
+}
+
/**
* ixgbe_get_flash_data - get flash data
* @hw: pointer to the HW struct
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
index 2c971a34200b..07c888d554d5 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
@@ -67,6 +67,9 @@ int ixgbe_aci_read_nvm(struct ixgbe_hw *hw, u16
module_typeid, u32 offset,
u16 length, void *data, bool last_command,
bool read_shadow_ram);
int ixgbe_nvm_validate_checksum(struct ixgbe_hw *hw);
+int ixgbe_get_inactive_orom_ver(struct ixgbe_hw *hw, struct ixgbe_orom_info
*orom);
+int ixgbe_get_inactive_nvm_ver(struct ixgbe_hw *hw, struct ixgbe_nvm_info
*nvm);
+int ixgbe_get_inactive_netlist_ver(struct ixgbe_hw *hw, struct
ixgbe_netlist_info *netlist);
int ixgbe_read_sr_word_aci(struct ixgbe_hw *hw, u16 offset, u16 *data);
int ixgbe_read_flat_nvm(struct ixgbe_hw *hw, u32 offset, u32 *length,
u8 *data, bool read_shadow_ram);
--
2.31.1
