bnxt_en: Fix "fw.mgmt" and "fw.nsci" info via devlink info_get cb

Fix macro names to report fw.mgmt and fw.ncsi versions to match the
devlink documentation.

Example display after fixes:

$ devlink dev info pci/0000:af:00.0
pci/0000:af:00.0:
  driver bnxt_en
  serial_number B0-26-28-FF-FE-25-84-20
  versions:
      fixed:
        board.id BCM957454A4540
        asic.id C454
        asic.rev 1
      running:
        fw 216.1.154.0
        fw.psid 0.0.0
        fw.mgmt 216.1.146.0
        fw.mgmt.api 1.10.1
        fw.ncsi 864.0.44.0
        fw.roce 216.1.16.0

Fixes: 9599e036b161 ("bnxt_en: Add support for devlink info command")
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 981811887f2409ffcfc924d4eee0cb5b62c93165..3dfd84ccb1c7b2264ca6ad8ff016f31e1c908b29 100644 (file)
--- a/Documentation/networking/devlink/bnxt.rst
+++ b/Documentation/networking/devlink/bnxt.rst
@@ -66,15 +66,15 @@ The ``bnxt_en`` driver reports the following versions
    * - ``fw``
      - stored, running
      - Overall board firmware version
-   * - ``fw.app``
+   * - ``fw.mgmt``
      - stored, running
-     - Data path firmware version
+     - NIC hardware resource management firmware version
    * - ``fw.mgmt.api``
      - running
      - Minimum firmware interface spec version supported between driver and firmware
-   * - ``fw.mgmt``
+   * - ``fw.nsci``
      - stored, running
-     - Management firmware version
+     - General platform management firmware version
    * - ``fw.roce``
      - stored, running
      - RoCE management firmware version

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 0c8283b9bafee7f2da9e7af594b42ef2d6dcbe9b..8e09a52a9c06c2fdf46a743ca2d2be19e4a11ceb 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -479,7 +479,7 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
                         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);
+                       DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, fw_ver);
        if (rc)
                return rc;
 
@@ -491,7 +491,7 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
 
        if (!(bp->flags & BNXT_FLAG_CHIP_P5)) {
                rc = devlink_info_version_running_put(req,
-                       DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);
+                       DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, mgmt_ver);
                if (rc)
                        return rc;