[PATCH v2 net-next 0/7] bnxt_en: Updates to devlink info_get cb

[PATCH v2 net-next 0/7] bnxt_en: Updates to devlink info_get cb

[Vasundhara Volam]

This series adds support for some of the generic macros to devlink info_get
cb. Updates the devlink-info.rst and bnxt.rst documentation accordingly.

---
v1->v2: Remove ECN dev param, base_mh_addr and serial number info support
in this series.
Rename drv.spec macro to fw.api.
---

Vasundhara Volam (7):
  devlink: Add macro for "fw.api" to info_get cb.
  bnxt_en: Add fw.api version to devlink info_get cb.
  devlink: Add macro for "hw.addr" to info_get cb.
  bnxt_en: Add hw addr to devlink info_get cb.
  PCI: Add new PCI_VPD_RO_KEYWORD_SERIALNO macro
  bnxt_en: Read partno and serialno of the board from VPD
  bnxt_en: Add partno to devlink info_get cb

 Documentation/networking/devlink/bnxt.rst         |  9 +++
 Documentation/networking/devlink/devlink-info.rst | 11 ++++
 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 74 ++++++++++++++++++++++-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         |  5 ++
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 19 ++++++
 include/linux/pci.h                               |  1 +
 include/net/devlink.h                             |  5 ++
 7 files changed, 123 insertions(+), 1 deletion(-)

-- 
1.8.3.1

[PATCH v2 net-next 1/7] devlink: Add macro for "fw.api" to info_get cb.

[Vasundhara Volam]

Add definition and documentation for the new generic info "fw.api".
"fw.api" specifies the version of the software interfaces between
driver and overall firmware.

Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
v1->v2: Rename macro to "fw.api" from "drv.spec".
---
 Documentation/networking/devlink/devlink-info.rst | 6 ++++++
 include/net/devlink.h                             | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
index e5e5e89..650e2c0e3 100644
--- a/Documentation/networking/devlink/devlink-info.rst
+++ b/Documentation/networking/devlink/devlink-info.rst
@@ -150,6 +150,12 @@ fw
 Overall firmware version, often representing the collection of
 fw.mgmt, fw.app, etc.
 
+fw.api
+------
+
+Overall firmware interface specification version of the software interfaces
+between driver and firmware.
+
 fw.mgmt
 -------
 
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 37230e2..d51482f 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -478,6 +478,8 @@ enum devlink_param_generic_id {
 
 /* Overall FW version */
 #define DEVLINK_INFO_VERSION_GENERIC_FW		"fw"
+/* Overall FW interface specification version */
+#define DEVLINK_INFO_VERSION_GENERIC_FW_API	"fw.api"
 /* Control processor FW version */
 #define DEVLINK_INFO_VERSION_GENERIC_FW_MGMT	"fw.mgmt"
 /* Data path microcode controlling high-speed packet processing */
-- 
1.8.3.1

Re: [PATCH v2 net-next 1/7] devlink: Add macro for "fw.api" to info_get cb.

[Jiri Pirko]

Thu, Mar 26, 2020 at 07:26:58AM CET, vasundhara-v.volam@broadcom.com wrote:
>Add definition and documentation for the new generic info "fw.api".
>"fw.api" specifies the version of the software interfaces between
>driver and overall firmware.
>
>Cc: Jakub Kicinski <kuba@kernel.org>
>Cc: Jiri Pirko <jiri@mellanox.com>
>Cc: Jacob Keller <jacob.e.keller@intel.com>
>Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
>Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Looks sane to me.

Reviewed-by: Jiri Pirko <jiri@mellanox.com>

[PATCH v2 net-next 2/7] bnxt_en: Add fw.api version to devlink info_get cb.

[Vasundhara Volam]

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>
---
v1->v2: Display the minimum version of fw spec supported between fw and
driver, instead of version implemented by driver.
---
 Documentation/networking/devlink/bnxt.rst         |  3 +++
 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 15 ++++++++++++++-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h         |  1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c |  5 +++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Documentation/networking/devlink/bnxt.rst b/Documentation/networking/devlink/bnxt.rst
index 82ef9ec..71f5a5a 100644
--- a/Documentation/networking/devlink/bnxt.rst
+++ b/Documentation/networking/devlink/bnxt.rst
@@ -63,6 +63,9 @@ The ``bnxt_en`` driver reports the following versions
    * - ``fw``
      - stored, running
      - Overall board firmware version
+   * - ``fw.api``
+     - running
+     - Minimum firmware interface spec version supported between driver and firmware
    * - ``fw.app``
      - stored, running
      - Data path firmware version
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 663dcf6..7bcd313 100644
--- 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 5adc25f..cc57538 100644
--- 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 d3c93cc..51abc6c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -434,6 +434,11 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
 			return rc;
 	}
 
+	rc = devlink_info_version_running_put(req,
+			DEVLINK_INFO_VERSION_GENERIC_FW_API, bp->hwrm_ver_supp);
+	if (rc)
+		return rc;
+
 	if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {
 		u32 ver = nvm_cfg_ver.vu32;
 
-- 
1.8.3.1

[PATCH v2 net-next 3/7] devlink: Add macro for "hw.addr" to info_get cb.

[Vasundhara Volam]

Add definition and documentation for the new generic info "hw.addr".
"hw.addr" displays the hardware address of the interface.

Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 Documentation/networking/devlink/devlink-info.rst | 5 +++++
 include/net/devlink.h                             | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
index 650e2c0e3..56d13c5 100644
--- a/Documentation/networking/devlink/devlink-info.rst
+++ b/Documentation/networking/devlink/devlink-info.rst
@@ -144,6 +144,11 @@ board.manufacture
 
 An identifier of the company or the facility which produced the part.
 
+hw.addr
+-------
+
+Hardware address of the interface.
+
 fw
 --
 
diff --git a/include/net/devlink.h b/include/net/devlink.h
index d51482f..c9383f4 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -476,6 +476,9 @@ enum devlink_param_generic_id {
 /* Revision of asic design */
 #define DEVLINK_INFO_VERSION_GENERIC_ASIC_REV	"asic.rev"
 
+/* Hardware address */
+#define DEVLINK_INFO_VERSION_GENERIC_HW_ADDR	"hw.addr"
+
 /* Overall FW version */
 #define DEVLINK_INFO_VERSION_GENERIC_FW		"fw"
 /* Overall FW interface specification version */
-- 
1.8.3.1

Re: [PATCH v2 net-next 3/7] devlink: Add macro for "hw.addr" to info_get cb.

[Jiri Pirko]

Thu, Mar 26, 2020 at 07:27:00AM CET, vasundhara-v.volam@broadcom.com wrote:
>Add definition and documentation for the new generic info "hw.addr".
>"hw.addr" displays the hardware address of the interface.
>
>Cc: Jiri Pirko <jiri@mellanox.com>
>Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
>Signed-off-by: Michael Chan <michael.chan@broadcom.com>
>---
> Documentation/networking/devlink/devlink-info.rst | 5 +++++
> include/net/devlink.h                             | 3 +++
> 2 files changed, 8 insertions(+)
>
>diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
>index 650e2c0e3..56d13c5 100644
>--- a/Documentation/networking/devlink/devlink-info.rst
>+++ b/Documentation/networking/devlink/devlink-info.rst
>@@ -144,6 +144,11 @@ board.manufacture
> 
> An identifier of the company or the facility which produced the part.
> 
>+hw.addr
>+-------
>+
>+Hardware address of the interface.
>+
> fw
> --
> 
>diff --git a/include/net/devlink.h b/include/net/devlink.h
>index d51482f..c9383f4 100644
>--- a/include/net/devlink.h
>+++ b/include/net/devlink.h
>@@ -476,6 +476,9 @@ enum devlink_param_generic_id {
> /* Revision of asic design */
> #define DEVLINK_INFO_VERSION_GENERIC_ASIC_REV	"asic.rev"
> 
>+/* Hardware address */
>+#define DEVLINK_INFO_VERSION_GENERIC_HW_ADDR	"hw.addr"

Wait a second. Is this a MAC. I don't understand why MAC would be here.
If not MAC, what is exactly this address about?


>+
> /* Overall FW version */
> #define DEVLINK_INFO_VERSION_GENERIC_FW		"fw"
> /* Overall FW interface specification version */
>-- 
>1.8.3.1
>

Re: [PATCH v2 net-next 3/7] devlink: Add macro for "hw.addr" to info_get cb.

[Vasundhara Volam]

On Thu, Mar 26, 2020 at 2:56 PM Jiri Pirko <jiri@resnulli.us> wrote:
>
> Thu, Mar 26, 2020 at 07:27:00AM CET, vasundhara-v.volam@broadcom.com wrote:
> >Add definition and documentation for the new generic info "hw.addr".
> >"hw.addr" displays the hardware address of the interface.
> >
> >Cc: Jiri Pirko <jiri@mellanox.com>
> >Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
> >Signed-off-by: Michael Chan <michael.chan@broadcom.com>
> >---
> > Documentation/networking/devlink/devlink-info.rst | 5 +++++
> > include/net/devlink.h                             | 3 +++
> > 2 files changed, 8 insertions(+)
> >
> >diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
> >index 650e2c0e3..56d13c5 100644
> >--- a/Documentation/networking/devlink/devlink-info.rst
> >+++ b/Documentation/networking/devlink/devlink-info.rst
> >@@ -144,6 +144,11 @@ board.manufacture
> >
> > An identifier of the company or the facility which produced the part.
> >
> >+hw.addr
> >+-------
> >+
> >+Hardware address of the interface.
> >+
> > fw
> > --
> >
> >diff --git a/include/net/devlink.h b/include/net/devlink.h
> >index d51482f..c9383f4 100644
> >--- a/include/net/devlink.h
> >+++ b/include/net/devlink.h
> >@@ -476,6 +476,9 @@ enum devlink_param_generic_id {
> > /* Revision of asic design */
> > #define DEVLINK_INFO_VERSION_GENERIC_ASIC_REV "asic.rev"
> >
> >+/* Hardware address */
> >+#define DEVLINK_INFO_VERSION_GENERIC_HW_ADDR  "hw.addr"
>
> Wait a second. Is this a MAC. I don't understand why MAC would be here.
Yes, this is MAC address. Since, most of the information is displayed
via info_get
as one place. Would like to display MAC address as well under info_get.

Thanks,
Vasundhara


> If not MAC, what is exactly this address about?
>
>
> >+
> > /* Overall FW version */
> > #define DEVLINK_INFO_VERSION_GENERIC_FW               "fw"
> > /* Overall FW interface specification version */
> >--
> >1.8.3.1
> >

Re: [PATCH v2 net-next 3/7] devlink: Add macro for "hw.addr" to info_get cb.

[Jiri Pirko]

Thu, Mar 26, 2020 at 12:02:43PM CET, vasundhara-v.volam@broadcom.com wrote:
>On Thu, Mar 26, 2020 at 2:56 PM Jiri Pirko <jiri@resnulli.us> wrote:
>>
>> Thu, Mar 26, 2020 at 07:27:00AM CET, vasundhara-v.volam@broadcom.com wrote:
>> >Add definition and documentation for the new generic info "hw.addr".
>> >"hw.addr" displays the hardware address of the interface.
>> >
>> >Cc: Jiri Pirko <jiri@mellanox.com>
>> >Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
>> >Signed-off-by: Michael Chan <michael.chan@broadcom.com>
>> >---
>> > Documentation/networking/devlink/devlink-info.rst | 5 +++++
>> > include/net/devlink.h                             | 3 +++
>> > 2 files changed, 8 insertions(+)
>> >
>> >diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
>> >index 650e2c0e3..56d13c5 100644
>> >--- a/Documentation/networking/devlink/devlink-info.rst
>> >+++ b/Documentation/networking/devlink/devlink-info.rst
>> >@@ -144,6 +144,11 @@ board.manufacture
>> >
>> > An identifier of the company or the facility which produced the part.
>> >
>> >+hw.addr
>> >+-------
>> >+
>> >+Hardware address of the interface.
>> >+
>> > fw
>> > --
>> >
>> >diff --git a/include/net/devlink.h b/include/net/devlink.h
>> >index d51482f..c9383f4 100644
>> >--- a/include/net/devlink.h
>> >+++ b/include/net/devlink.h
>> >@@ -476,6 +476,9 @@ enum devlink_param_generic_id {
>> > /* Revision of asic design */
>> > #define DEVLINK_INFO_VERSION_GENERIC_ASIC_REV "asic.rev"
>> >
>> >+/* Hardware address */
>> >+#define DEVLINK_INFO_VERSION_GENERIC_HW_ADDR  "hw.addr"
>>
>> Wait a second. Is this a MAC. I don't understand why MAC would be here.
>Yes, this is MAC address. Since, most of the information is displayed
>via info_get
>as one place. Would like to display MAC address as well under info_get.

No, I don't want to display mac here. It is a netdevice attribute. Leave
it there.


>
>Thanks,
>Vasundhara
>
>
>> If not MAC, what is exactly this address about?
>>
>>
>> >+
>> > /* Overall FW version */
>> > #define DEVLINK_INFO_VERSION_GENERIC_FW               "fw"
>> > /* Overall FW interface specification version */
>> >--
>> >1.8.3.1
>> >

Re: [PATCH v2 net-next 3/7] devlink: Add macro for "hw.addr" to info_get cb.

[Vasundhara Volam]

On Thu, Mar 26, 2020 at 9:24 PM Jiri Pirko <jiri@resnulli.us> wrote:
>
> Thu, Mar 26, 2020 at 12:02:43PM CET, vasundhara-v.volam@broadcom.com wrote:
> >On Thu, Mar 26, 2020 at 2:56 PM Jiri Pirko <jiri@resnulli.us> wrote:
> >>
> >> Thu, Mar 26, 2020 at 07:27:00AM CET, vasundhara-v.volam@broadcom.com wrote:
> >> >Add definition and documentation for the new generic info "hw.addr".
> >> >"hw.addr" displays the hardware address of the interface.
> >> >
> >> >Cc: Jiri Pirko <jiri@mellanox.com>
> >> >Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
> >> >Signed-off-by: Michael Chan <michael.chan@broadcom.com>
> >> >---
> >> > Documentation/networking/devlink/devlink-info.rst | 5 +++++
> >> > include/net/devlink.h                             | 3 +++
> >> > 2 files changed, 8 insertions(+)
> >> >
> >> >diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
> >> >index 650e2c0e3..56d13c5 100644
> >> >--- a/Documentation/networking/devlink/devlink-info.rst
> >> >+++ b/Documentation/networking/devlink/devlink-info.rst
> >> >@@ -144,6 +144,11 @@ board.manufacture
> >> >
> >> > An identifier of the company or the facility which produced the part.
> >> >
> >> >+hw.addr
> >> >+-------
> >> >+
> >> >+Hardware address of the interface.
> >> >+
> >> > fw
> >> > --
> >> >
> >> >diff --git a/include/net/devlink.h b/include/net/devlink.h
> >> >index d51482f..c9383f4 100644
> >> >--- a/include/net/devlink.h
> >> >+++ b/include/net/devlink.h
> >> >@@ -476,6 +476,9 @@ enum devlink_param_generic_id {
> >> > /* Revision of asic design */
> >> > #define DEVLINK_INFO_VERSION_GENERIC_ASIC_REV "asic.rev"
> >> >
> >> >+/* Hardware address */
> >> >+#define DEVLINK_INFO_VERSION_GENERIC_HW_ADDR  "hw.addr"
> >>
> >> Wait a second. Is this a MAC. I don't understand why MAC would be here.
> >Yes, this is MAC address. Since, most of the information is displayed
> >via info_get
> >as one place. Would like to display MAC address as well under info_get.
>
> No, I don't want to display mac here. It is a netdevice attribute. Leave
> it there.
>
Yes, realised it and sent a v3 patchset already, removing the MAC
address. Thanks.
>
> >
> >Thanks,
> >Vasundhara
> >
> >
> >> If not MAC, what is exactly this address about?
> >>
> >>
> >> >+
> >> > /* Overall FW version */
> >> > #define DEVLINK_INFO_VERSION_GENERIC_FW               "fw"
> >> > /* Overall FW interface specification version */
> >> >--
> >> >1.8.3.1
> >> >

[PATCH v2 net-next 4/7] bnxt_en: Add hw addr to devlink info_get cb.

[Vasundhara Volam]

Also update bnxt.rst documentation file.

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>
---
v1->v2: Remove mutlihost base hw addr info.
---
 Documentation/networking/devlink/bnxt.rst         | 3 +++
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/Documentation/networking/devlink/bnxt.rst b/Documentation/networking/devlink/bnxt.rst
index 71f5a5a..a514664 100644
--- a/Documentation/networking/devlink/bnxt.rst
+++ b/Documentation/networking/devlink/bnxt.rst
@@ -57,6 +57,9 @@ The ``bnxt_en`` driver reports the following versions
    * - ``asic.rev``
      - fixed
      - ASIC design revision
+   * - ``hw.addr``
+     - stored, running
+     - Hardware address of the interface
    * - ``fw.psid``
      - stored, running
      - Firmware parameter set version of the board
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 51abc6c..493a9eb 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -425,6 +425,12 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
 			return rc;
 	}
 
+	sprintf(buf, "%pM", bp->dev->dev_addr);
+	rc = devlink_info_version_running_put(req,
+				DEVLINK_INFO_VERSION_GENERIC_HW_ADDR, buf);
+	if (rc)
+		return rc;
+
 	if (strlen(ver_resp->active_pkg_name)) {
 		rc =
 		    devlink_info_version_running_put(req,
-- 
1.8.3.1