Message ID | 20200820165748.10264-2-khalid.elmously@canonical.com |
---|---|
State | New |
Headers | show |
Series | [SRU,F/Oracle,1/3] bnxt_en: Store the running firmware version code. | expand |
On Thu, Aug 20, 2020 at 12:57:46PM -0400, Khalid Elmously wrote: > From: Michael Chan <michael.chan@broadcom.com> > > BugLink: http://bugs.launchpad.net/bugs/1892397 > > We currently only store the firmware version as a string for ethtool > and devlink info. Store it also as a version code. The next 2 > patches will need to check the firmware major version to determine > some workarounds. > > We also use the 16-bit firmware version fields if the firmware is newer > and provides the 16-bit fields. > > Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> > Signed-off-by: Michael Chan <michael.chan@broadcom.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (backported from commit d0ad2ea2bc185835f8a749302ad07b70528d2a09) > [ kmously: context adjustments due to upstream refactoring of the > bnxt driver ] > Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com> Acked-by: William Breathitt Gray <william.gray@canonical.com> > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 +++++++++++++++++++---- > drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++++ > 2 files changed, 23 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > index 63ee0c49be7c..3c398c7632c9 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > @@ -7225,8 +7225,9 @@ 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; > + u16 fw_maj, fw_min, fw_bld, fw_rsv; > u32 dev_caps_cfg; > - int rc; > + int rc, len; > > bp->hwrm_max_req_len = HWRM_MAX_REQ_LEN; > mutex_lock(&bp->hwrm_cmd_lock); > @@ -7245,9 +7246,23 @@ 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"); > } > - 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); > + > + fw_maj = le16_to_cpu(resp->hwrm_fw_major); > + if (bp->hwrm_spec_code > 0x10803 && fw_maj) { > + fw_min = le16_to_cpu(resp->hwrm_fw_minor); > + fw_bld = le16_to_cpu(resp->hwrm_fw_build); > + fw_rsv = le16_to_cpu(resp->hwrm_fw_patch); > + len = FW_VER_STR_LEN; > + } else { > + fw_maj = resp->hwrm_fw_maj_8b; > + fw_min = resp->hwrm_fw_min_8b; > + fw_bld = resp->hwrm_fw_bld_8b; > + fw_rsv = resp->hwrm_fw_rsvd_8b; > + len = BC_HWRM_STR_LEN; > + } > + bp->fw_ver_code = BNXT_FW_VER_CODE(fw_maj, fw_min, fw_bld, fw_rsv); > + snprintf(bp->fw_ver_str, len, "%d.%d.%d.%d", fw_maj, fw_min, fw_bld, > + fw_rsv); > > if (strlen(resp->active_pkg_name)) { > int fw_ver_len = strlen(bp->fw_ver_str); > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > index a61a5873ab0a..2f428cb486b8 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > @@ -1699,6 +1699,10 @@ 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]; > + u64 fw_ver_code; > +#define BNXT_FW_VER_CODE(maj, min, bld, rsv) \ > + ((u64)(maj) << 48 | (u64)(min) << 32 | (u64)(bld) << 16 | (rsv)) > + > __be16 vxlan_port; > u8 vxlan_port_cnt; > __le16 vxlan_fw_dst_port_id; > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 63ee0c49be7c..3c398c7632c9 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7225,8 +7225,9 @@ 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; + u16 fw_maj, fw_min, fw_bld, fw_rsv; u32 dev_caps_cfg; - int rc; + int rc, len; bp->hwrm_max_req_len = HWRM_MAX_REQ_LEN; mutex_lock(&bp->hwrm_cmd_lock); @@ -7245,9 +7246,23 @@ 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"); } - 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); + + fw_maj = le16_to_cpu(resp->hwrm_fw_major); + if (bp->hwrm_spec_code > 0x10803 && fw_maj) { + fw_min = le16_to_cpu(resp->hwrm_fw_minor); + fw_bld = le16_to_cpu(resp->hwrm_fw_build); + fw_rsv = le16_to_cpu(resp->hwrm_fw_patch); + len = FW_VER_STR_LEN; + } else { + fw_maj = resp->hwrm_fw_maj_8b; + fw_min = resp->hwrm_fw_min_8b; + fw_bld = resp->hwrm_fw_bld_8b; + fw_rsv = resp->hwrm_fw_rsvd_8b; + len = BC_HWRM_STR_LEN; + } + bp->fw_ver_code = BNXT_FW_VER_CODE(fw_maj, fw_min, fw_bld, fw_rsv); + snprintf(bp->fw_ver_str, len, "%d.%d.%d.%d", fw_maj, fw_min, fw_bld, + fw_rsv); if (strlen(resp->active_pkg_name)) { int fw_ver_len = strlen(bp->fw_ver_str); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index a61a5873ab0a..2f428cb486b8 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1699,6 +1699,10 @@ 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]; + u64 fw_ver_code; +#define BNXT_FW_VER_CODE(maj, min, bld, rsv) \ + ((u64)(maj) << 48 | (u64)(min) << 32 | (u64)(bld) << 16 | (rsv)) + __be16 vxlan_port; u8 vxlan_port_cnt; __le16 vxlan_fw_dst_port_id;