bnxt_en: Add support for devlink info command

Display the following information via devlink info command:
  - Driver name
  - Board id
  - Broad revision
  - Board Serial number
  - Board FW version
  - FW parameter set version
  - FW App version
  - FW management version
  - FW RoCE version

  Standard output example:
  $ devlink dev info pci/0000:3b:00.0
  pci/0000:3b:00.0:
  driver bnxt_en
  serial_number 00-10-18-FF-FE-AD-05-00
  versions:
      fixed:
        asic.id D802
        asic.rev 1
      running:
        fw 216.1.124.0
        fw.psid 0.0.0
        fw.app 216.1.122.0
        fw.mgmt 864.0.32.0
        fw.roce 216.1.15.0

[ This version has incorporated changes suggested by Jakub Kicinski to
  use generic devlink version tags. ]

v2: Use fw.psid

Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 35e2a22534c1480d75d916263926cc3c471832b2..eec0168330b757af7e598f1608342c2161bfbc2e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -284,11 +284,15 @@ void bnxt_dl_health_recovery_done(struct bnxt *bp)
                devlink_health_reporter_recovery_done(hlth->fw_reset_reporter);
 }
 
+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
+                           struct netlink_ext_ack *extack);
+
 static const struct devlink_ops bnxt_dl_ops = {
 #ifdef CONFIG_BNXT_SRIOV
        .eswitch_mode_set = bnxt_dl_eswitch_mode_set,
        .eswitch_mode_get = bnxt_dl_eswitch_mode_get,
 #endif /* CONFIG_BNXT_SRIOV */
+       .info_get         = bnxt_dl_info_get,
        .flash_update     = bnxt_dl_flash_update,
 };
 
@@ -355,6 +359,136 @@ static void bnxt_copy_from_nvm_data(union devlink_param_value *dst,
                dst->vu8 = (u8)val32;
 }
 
+static int bnxt_hwrm_get_nvm_cfg_ver(struct bnxt *bp,
+                                    union devlink_param_value *nvm_cfg_ver)
+{
+       struct hwrm_nvm_get_variable_input req = {0};
+       union bnxt_nvm_data *data;
+       dma_addr_t data_dma_addr;
+       int rc;
+
+       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_NVM_GET_VARIABLE, -1, -1);
+       data = dma_alloc_coherent(&bp->pdev->dev, sizeof(*data),
+                                 &data_dma_addr, GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       req.dest_data_addr = cpu_to_le64(data_dma_addr);
+       req.data_len = cpu_to_le16(BNXT_NVM_CFG_VER_BITS);
+       req.option_num = cpu_to_le16(NVM_OFF_NVM_CFG_VER);
+
+       rc = hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+       if (!rc)
+               bnxt_copy_from_nvm_data(nvm_cfg_ver, data,
+                                       BNXT_NVM_CFG_VER_BITS,
+                                       BNXT_NVM_CFG_VER_BYTES);
+
+       dma_free_coherent(&bp->pdev->dev, sizeof(*data), data, data_dma_addr);
+       return rc;
+}
+
+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
+                           struct netlink_ext_ack *extack)
+{
+       struct bnxt *bp = bnxt_get_bp_from_dl(dl);
+       union devlink_param_value nvm_cfg_ver;
+       struct hwrm_ver_get_output *ver_resp;
+       char mgmt_ver[FW_VER_STR_LEN];
+       char roce_ver[FW_VER_STR_LEN];
+       char fw_ver[FW_VER_STR_LEN];
+       char buf[32];
+       int rc;
+
+       rc = devlink_info_driver_name_put(req, DRV_MODULE_NAME);
+       if (rc)
+               return rc;
+
+       sprintf(buf, "%X", bp->chip_num);
+       rc = devlink_info_version_fixed_put(req,
+                       DEVLINK_INFO_VERSION_GENERIC_ASIC_ID, buf);
+       if (rc)
+               return rc;
+
+       ver_resp = &bp->ver_resp;
+       sprintf(buf, "%X", ver_resp->chip_rev);
+       rc = devlink_info_version_fixed_put(req,
+                       DEVLINK_INFO_VERSION_GENERIC_ASIC_REV, buf);
+       if (rc)
+               return rc;
+
+       if (BNXT_PF(bp)) {
+               sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",
+                       bp->dsn[7], bp->dsn[6], bp->dsn[5], bp->dsn[4],
+                       bp->dsn[3], bp->dsn[2], bp->dsn[1], bp->dsn[0]);
+               rc = devlink_info_serial_number_put(req, buf);
+               if (rc)
+                       return rc;
+       }
+
+       if (strlen(ver_resp->active_pkg_name)) {
+               rc =
+                   devlink_info_version_running_put(req,
+                                       DEVLINK_INFO_VERSION_GENERIC_FW,
+                                       ver_resp->active_pkg_name);
+               if (rc)
+                       return rc;
+       }
+
+       if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {
+               u32 ver = nvm_cfg_ver.vu32;
+
+               sprintf(buf, "%X.%X.%X", (ver >> 16) & 0xF, (ver >> 8) & 0xF,
+                       ver & 0xF);
+               rc = devlink_info_version_running_put(req,
+                               DEVLINK_INFO_VERSION_GENERIC_FW_PSID, buf);
+               if (rc)
+                       return rc;
+       }
+
+       if (ver_resp->flags & VER_GET_RESP_FLAGS_EXT_VER_AVAIL) {
+               snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->hwrm_fw_major, ver_resp->hwrm_fw_minor,
+                        ver_resp->hwrm_fw_build, ver_resp->hwrm_fw_patch);
+
+               snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->mgmt_fw_major, ver_resp->mgmt_fw_minor,
+                        ver_resp->mgmt_fw_build, ver_resp->mgmt_fw_patch);
+
+               snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->roce_fw_major, ver_resp->roce_fw_minor,
+                        ver_resp->roce_fw_build, ver_resp->roce_fw_patch);
+       } else {
+               snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->hwrm_fw_maj_8b, ver_resp->hwrm_fw_min_8b,
+                        ver_resp->hwrm_fw_bld_8b, ver_resp->hwrm_fw_rsvd_8b);
+
+               snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->mgmt_fw_maj_8b, ver_resp->mgmt_fw_min_8b,
+                        ver_resp->mgmt_fw_bld_8b, ver_resp->mgmt_fw_rsvd_8b);
+
+               snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+                        ver_resp->roce_fw_maj_8b, ver_resp->roce_fw_min_8b,
+                        ver_resp->roce_fw_bld_8b, ver_resp->roce_fw_rsvd_8b);
+       }
+       rc = devlink_info_version_running_put(req,
+                       DEVLINK_INFO_VERSION_GENERIC_FW_APP, fw_ver);
+       if (rc)
+               return rc;
+
+       if (!(bp->flags & BNXT_FLAG_CHIP_P5)) {
+               rc = devlink_info_version_running_put(req,
+                       DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);
+               if (rc)
+                       return rc;
+
+               rc = devlink_info_version_running_put(req,
+                       DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);
+               if (rc)
+                       return rc;
+       }
+       return 0;
+}
+
 static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
                             int msg_len, union devlink_param_value *val)
 {

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
index 08aaa4441c78439499ed31ac88c637e310ecad45..95f893f2a74dc8c2fe2e7c8178f1bb55cb1e2b28 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
@@ -38,6 +38,10 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl)
 #define NVM_OFF_IGNORE_ARI             164
 #define NVM_OFF_DIS_GRE_VER_CHECK      171
 #define NVM_OFF_ENABLE_SRIOV           401
+#define NVM_OFF_NVM_CFG_VER            602
+
+#define BNXT_NVM_CFG_VER_BITS          24
+#define BNXT_NVM_CFG_VER_BYTES         4
 
 #define BNXT_MSIX_VEC_MAX      1280
 #define BNXT_MSIX_VEC_MIN_MAX  128