Commit 1388875b authored by Vasundhara Volam's avatar Vasundhara Volam Committed by Jakub Kicinski
Browse files

bnxt_en: Add stored FW version info to devlink info_get cb. 



This patch adds FW versions stored in the flash to devlink info_get
callback.  Return the correct fw.psid running version using the
newly added bp->nvm_cfg_ver.

v2:
Ensure stored pkg_name string is NULL terminated when copied to
devlink.

Return directly from the last call to bnxt_dl_info_put().

If the FW call to get stored version fails for any reason, return
success immediately to devlink without the stored versions.

Reviewed-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/1602493854-29283-10-git-send-email-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7154917a

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+45 −2
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static int bnxt_dl_info_put(struct bnxt *bp, struct devlink_info_req *req, 
static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,

			    struct netlink_ext_ack *extack)

{

	struct hwrm_nvm_get_dev_info_output nvm_dev_info;

	struct bnxt *bp = bnxt_get_bp_from_dl(dl);

	union devlink_param_value nvm_cfg_ver;

	struct hwrm_ver_get_output *ver_resp;
@@ -457,6 +458,12 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (rc)

		return rc;



	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,

			      bp->nvm_cfg_ver);

	if (rc)

		return rc;



	buf[0] = 0;

	strncat(buf, ver_resp->active_pkg_name, HWRM_FW_VER_STR_LEN);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,
@@ -469,7 +476,7 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 


		sprintf(buf, "%X.%X.%X", (ver >> 16) & 0xF, (ver >> 8) & 0xF,

			ver & 0xF);

		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

				      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,

				      buf);

		if (rc)
@@ -517,7 +524,43 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (rc)

		return rc;



	return bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);

	if (rc)

		return rc;



	rc = bnxt_hwrm_nvm_get_dev_info(bp, &nvm_dev_info);

	if (rc ||

	    !(nvm_dev_info.flags & NVM_GET_DEV_INFO_RESP_FLAGS_FW_VER_VALID))

		return 0;



	buf[0] = 0;

	strncat(buf, nvm_dev_info.pkg_name, HWRM_FW_VER_STR_LEN);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);

	if (rc)

		return rc;



	snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.hwrm_fw_major, nvm_dev_info.hwrm_fw_minor,

		 nvm_dev_info.hwrm_fw_build, nvm_dev_info.hwrm_fw_patch);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);

	if (rc)

		return rc;



	snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.mgmt_fw_major, nvm_dev_info.mgmt_fw_minor,

		 nvm_dev_info.mgmt_fw_build, nvm_dev_info.mgmt_fw_patch);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);

	if (rc)

		return rc;



	snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.roce_fw_major, nvm_dev_info.roce_fw_minor,

		 nvm_dev_info.roce_fw_build, nvm_dev_info.roce_fw_patch);

	return bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

				DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE