bnxt_en: Add fw.mgmt.api version to devlink info_get cb.

Display the minimum version of firmware interface spec supported
between driver and firmware. Also update bnxt.rst documentation file.

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/Documentation/networking/devlink/bnxt.rst b/Documentation/networking/devlink/bnxt.rst
index 82ef9ec46707e8160eb84d9c7c28e35daec7ab0b..7ab34c99cd29b25a5c4b00b3f79ad60819da74a9 100644 (file)
--- a/Documentation/networking/devlink/bnxt.rst
+++ b/Documentation/networking/devlink/bnxt.rst
@@ -66,6 +66,9 @@ The ``bnxt_en`` driver reports the following versions
    * - ``fw.app``
      - stored, running
      - Data path firmware version
+   * - ``fw.mgmt.api``
+     - running
+     - Minimum firmware interface spec version supported between driver and firmware
    * - ``fw.mgmt``
      - stored, running
      - Management firmware version

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 1ea80283089437447a4d8a9d381bc6fd2688a105..3861dffd38f60eb3e93e8cc8b6e2410fbe9feac0 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7223,7 +7223,7 @@ static int __bnxt_hwrm_ver_get(struct bnxt *bp, bool silent)
 static int bnxt_hwrm_ver_get(struct bnxt *bp)
 {
        struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr;
-       u32 dev_caps_cfg;
+       u32 dev_caps_cfg, hwrm_ver;
        int rc;
 
        bp->hwrm_max_req_len = HWRM_MAX_REQ_LEN;
@@ -7243,6 +7243,19 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
                            resp->hwrm_intf_upd_8b);
                netdev_warn(bp->dev, "Please update firmware with HWRM interface 1.0.0 or newer.\n");
        }
+
+       hwrm_ver = HWRM_VERSION_MAJOR << 16 | HWRM_VERSION_MINOR << 8 |
+                       HWRM_VERSION_UPDATE;
+
+       if (bp->hwrm_spec_code > hwrm_ver)
+               snprintf(bp->hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",
+                        HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR,
+                        HWRM_VERSION_UPDATE);
+       else
+               snprintf(bp->hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",
+                        resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b,
+                        resp->hwrm_intf_upd_8b);
+
        snprintf(bp->fw_ver_str, BC_HWRM_STR_LEN, "%d.%d.%d.%d",
                 resp->hwrm_fw_maj_8b, resp->hwrm_fw_min_8b,
                 resp->hwrm_fw_bld_8b, resp->hwrm_fw_rsvd_8b);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index eaf20e371b3c4edbac24ea2df78576d3c1f4ccd5..a1e9d338ef5092cac35b517d8564aa2681db2995 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1730,6 +1730,7 @@ struct bnxt {
 #define BC_HWRM_STR_LEN                21
 #define PHY_VER_STR_LEN         (FW_VER_STR_LEN - BC_HWRM_STR_LEN)
        char                    fw_ver_str[FW_VER_STR_LEN];
+       char                    hwrm_ver_supp[FW_VER_STR_LEN];
        __be16                  vxlan_port;
        u8                      vxlan_port_cnt;
        __le16                  vxlan_fw_dst_port_id;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index d3c93ccee86ad9570cbfbdc3762b47a7ff903a26..39c2ac4ecc4ea3328083cd087cda7c1a6bf2f527 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -475,6 +475,12 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
        if (rc)
                return rc;
 
+       rc = devlink_info_version_running_put(req,
+                               DEVLINK_INFO_VERSION_GENERIC_FW_MGMT_API,
+                               bp->hwrm_ver_supp);
+       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);