Skip to contentSkip to conversation

add framework for selftests in devlink

PATCH Superseded Vikas Gupta 4 participants 10 messages Jul 23, 2022 – Jul 25, 2022

Subsystems (5)

v6 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v6 cover add framework for selftests in devlink

Hi,
This patchset adds support for selftests in the devlink framework. It adds a callback .selftests_check and .selftests_run in devlink_ops. User can add test(s) suite which is subsequently passed to the driver and driver can opt for running particular tests based on its capabilities.

Patchset adds a flash based test for the bnxt_en driver.

Suggested commands at user level would be as below:

changes from:
v5->v6:
Addressed change in .rst file only suggested by [email protected] in patch v5.

v4->v5:
Addressed the changes requested by [email protected] in patch v4.

v3->v4:
Addressed the changes requested by [email protected] in patch v3.

v2->v3:
1)
After discussions with [email protected], passing a testmask from user to kernel is removed and a flag based arguments are adopted. This way we can have more than 32/64 selftests defined in the kernel.
Below is the format from user to kernel and vice-versa.

Kernel to user for show command . Users can know what all tests are supported by the driver. A return from kernel to user if driver supports TEST1, TEST4, and TEST7.

	______
	|NEST |
	|_____ |TEST1|TEST4|TEST7|...


    User to kernel to execute test: If user wants to execute test4, test8,
	test1...
	______
	|NEST |
	|_____ |TEST4|TEST8|TEST1|...

	After executing the tests kernel return to user.
	|NEST |
	|_____ | NEST|       |NEST|       |NEST|
	        TEST4,RES4   TEST8,RES8   TEST1, RES1
    
    2) Added dumpit in devlink for list/show command.

v1->v2:
Addressed the changes requested by [email protected] in patch v1. Fixed the style issues.

Thanks,
Vikas

Vikas Gupta (2):
devlink: introduce framework for selftests
bnxt_en: implement callbacks for devlink selftests

 .../networking/devlink/devlink-selftests.rst  |  38 +++
 .../net/ethernet/broadcom/bnxt/bnxt_devlink.c |  61 +++++
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c |  24 +-
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.h |  12 +
 include/net/devlink.h                         |  21 ++
 include/uapi/linux/devlink.h                  |  32 +++
 net/core/devlink.c                            | 223 ++++++++++++++++++
 7 files changed, 399 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/networking/devlink/devlink-selftests.rst
Signature · 1 line
2.31.1
#1 lore raw

PATCH v6 1/2 devlink: introduce framework for selftests

Add a framework for running selftests.
Framework exposes devlink commands and test suite(s) to the user to execute and query the supported tests by the driver.

Below are new entries in devlink_nl_ops devlink_nl_cmd_selftests_show_doit/dumpit: To query the supported selftests by the drivers.
devlink_nl_cmd_selftests_run: To execute selftests. Users can provide a test mask for executing group tests or standalone tests.

Documentation/networking/devlink/ path is already part of MAINTAINERS & the new files come under this path. Hence no update needed to the MAINTAINERS

---
 .../networking/devlink/devlink-selftests.rst  |  38 +++
 include/net/devlink.h                         |  21 ++
 include/uapi/linux/devlink.h                  |  32 +++
 net/core/devlink.c                            | 223 ++++++++++++++++++
 4 files changed, 314 insertions(+)
 create mode 100644 Documentation/networking/devlink/devlink-selftests.rst
Documentation/networking/devlink/devlink-selftests.rst new file +38 -0
new file mode 100644
index 000000000000..c6e6c6013991
@@ -0,0 +1,38 @@
+.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+
+=================
+Devlink Selftests
+=================
+
+The ``devlink-selftests`` API allows executing selftests on the device.
+
+Tests Mask
+==========
+The ``devlink-selftests`` command should be run with a mask indicating
+the tests to be executed.
+
+Tests Description
+=================
+The following is a list of tests that drivers may execute.
+
+.. list-table:: List of tests
+   :widths: 5 90
+
+   * - Name
+     - Description
+   * - ``DEVLINK_SELFTEST_FLASH``
+     - Devices may have the firmware on non-volatile memory on the board, e.g.
+       flash. This particular test helps to run a flash selftest on the device.
+       Implementation of the test is left to the driver/firmware.
+
+example usage
+-------------
+
+.. code:: shell
+
+    # Query selftests supported on the devlink device
+    $ devlink dev selftests show DEV
+    # Query selftests supported on all devlink devices
+    $ devlink dev selftests show
+    # Executes selftests on the device
+    $ devlink dev selftests run DEV test_id flash
include/net/devlink.h +21 -0
index 88c701b375a2..e5d999217c8d 100644
@@ -1509,6 +1509,27 @@ struct devlink_ops {
 				    struct devlink_rate *parent,
 				    void *priv_child, void *priv_parent,
 				    struct netlink_ext_ack *extack);
+	/**
+	 * selftests_check() - queries if selftest is supported
+	 * @devlink: devlink instance
+	 * @test_id: test index
+	 * @extack: extack for reporting error messages
+	 *
+	 * Return: true if test is supported by the driver
+	 */
+	bool (*selftest_check)(struct devlink *devlink, unsigned int test_id,
+			       struct netlink_ext_ack *extack);
+	/**
+	 * selftest_run() - Runs a selftest
+	 * @devlink: devlink instance
+	 * @test_id: test index
+	 * @extack: extack for reporting error messages
+	 *
+	 * Return: status of the test
+	 */
+	enum devlink_selftest_test_status
+	(*selftest_run)(struct devlink *devlink, unsigned int test_id,
+			struct netlink_ext_ack *extack);
 };
 
 void *devlink_priv(struct devlink *devlink);
include/uapi/linux/devlink.h +32 -0
index b3d40a5d72ff..fcf5389e8305 100644
@@ -136,6 +136,9 @@ enum devlink_command {
 	DEVLINK_CMD_LINECARD_NEW,
 	DEVLINK_CMD_LINECARD_DEL,
 
+	DEVLINK_CMD_SELFTESTS_GET,	/* can dump */
+	DEVLINK_CMD_SELFTESTS_RUN,
+
 	/* add new commands above here */
 	__DEVLINK_CMD_MAX,
 	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -276,6 +279,34 @@ enum {
 #define DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS \
 	(_BITUL(__DEVLINK_FLASH_OVERWRITE_MAX_BIT) - 1)
 
+enum devlink_attr_selftest_test_id {
+	DEVLINK_ATTR_SELFTEST_TEST_ID_UNSPEC,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH,	/* flag */
+
+	__DEVLINK_ATTR_SELFTEST_TEST_ID_MAX,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX - 1
+};
+
+enum devlink_selftest_test_status {
+	DEVLINK_SELFTEST_TEST_STATUS_SKIP,
+	DEVLINK_SELFTEST_TEST_STATUS_PASS,
+	DEVLINK_SELFTEST_TEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+	DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,
+	DEVLINK_ATTR_SELFTEST_RESULT,			/* nested */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID,		/* u32,
+							 * enum devlink_attr_selftest_test_id
+							 */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS,	/* u8,
+							 * enum devlink_selftest_test_status
+							 */
+
+	__DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+	DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1
+};
+
 /**
  * enum devlink_trap_action - Packet trap action.
  * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
@@ -576,6 +607,7 @@ enum devlink_attr {
 	DEVLINK_ATTR_LINECARD_TYPE,		/* string */
 	DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES,	/* nested */
 
+	DEVLINK_ATTR_SELFTESTS_INFO,		/* nested */
 	/* add new attributes above here, update the policy in devlink.c */
 
 	__DEVLINK_ATTR_MAX,
net/core/devlink.c +223 -0

247 lines not on this page · raw message

Signature · 1 line
2.31.1
maintainer Reviewed-by on v6 1/2
#2 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

Quoted 10 lines · Sat, Jul 23, 2022 at 06:22:05AM CEST, [email protected] wrote:

Add a framework for running selftests.
Framework exposes devlink commands and test suite(s) to the user to execute and query the supported tests by the driver.

Below are new entries in devlink_nl_ops devlink_nl_cmd_selftests_show_doit/dumpit: To query the supported selftests by the drivers.
devlink_nl_cmd_selftests_run: To execute selftests. Users can provide a test mask for executing group tests or standalone tests.

Quoted 7 lines

Documentation/networking/devlink/ path is already part of MAINTAINERS & the new files come under this path. Hence no update needed to the MAINTAINERS

maintainer
#3 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

In reply to Vikas Gupta
Quoted 16 lines · On Sat, 23 Jul 2022 09:52:05 +0530 Vikas Gupta wrote:
include/uapi/linux/devlink.h +16 -0
+enum devlink_attr_selftest_test_id {
+	DEVLINK_ATTR_SELFTEST_TEST_ID_UNSPEC,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH,	/* flag */
+
+	__DEVLINK_ATTR_SELFTEST_TEST_ID_MAX,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX - 1
+};
+
+enum devlink_selftest_test_status {
+	DEVLINK_SELFTEST_TEST_STATUS_SKIP,
+	DEVLINK_SELFTEST_TEST_STATUS_PASS,
+	DEVLINK_SELFTEST_TEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+	DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,

include/uapi/linux/devlink.h enum { · line 307

Quoted 10 lines
include/uapi/linux/devlink.h +10 -0
+	DEVLINK_ATTR_SELFTEST_RESULT,			/* nested */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID,		/* u32,
+							 * enum devlink_attr_selftest_test_id
+							 */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS,	/* u8,
+							 * enum devlink_selftest_test_status
+							 */
+
+	__DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+	DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1

Any thoughts on running:

	sed -i '/_SELFTEST/ {s/_TEST_/_/g}' $patch

on this patch? For example DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS is 40 characters long, ain't nobody typing that, and _TEST is repeated..

Otherwise LGTM!

#4 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

Quoted 7 lines · Jakub Kicinski

Any thoughts on running:

	sed -i '/_SELFTEST/ {s/_TEST_/_/g}' $patch

on this patch? For example DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS is 40 characters long, ain't nobody typing that, and _TEST is repeated..

+1

maintainer
#5 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

In reply to Jakub Kicinski
Quoted 30 lines · Sat, Jul 23, 2022 at 06:16:00PM CEST, [email protected] wrote:
Quoted 16 lines · On Sat, 23 Jul 2022 09:52:05 +0530 Vikas Gupta wrote:
include/uapi/linux/devlink.h +16 -0
+enum devlink_attr_selftest_test_id {
+	DEVLINK_ATTR_SELFTEST_TEST_ID_UNSPEC,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH,	/* flag */
+
+	__DEVLINK_ATTR_SELFTEST_TEST_ID_MAX,
+	DEVLINK_ATTR_SELFTEST_TEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX - 1
+};
+
+enum devlink_selftest_test_status {
+	DEVLINK_SELFTEST_TEST_STATUS_SKIP,
+	DEVLINK_SELFTEST_TEST_STATUS_PASS,
+	DEVLINK_SELFTEST_TEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+	DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,

include/uapi/linux/devlink.h enum { · line 307

Quoted 10 lines
include/uapi/linux/devlink.h +10 -0
+	DEVLINK_ATTR_SELFTEST_RESULT,			/* nested */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID,		/* u32,
+							 * enum devlink_attr_selftest_test_id
+							 */
+	DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS,	/* u8,
+							 * enum devlink_selftest_test_status
+							 */
+
+	__DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+	DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1

Any thoughts on running:

Quoted 1 line
	sed -i '/_SELFTEST/ {s/_TEST_/_/g}' $patch

Sure, why not. But please make sure you keep all other related things (variables, cmdline opts) consistent.

Thanks!

Quoted 5 lines

on this patch? For example DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS is 40 characters long, ain't nobody typing that, and _TEST is repeated..

Otherwise LGTM!

#6 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

Hi Jiri,

Quoted 32 lines · Jiri Pirko
Quoted 30 lines · Sat, Jul 23, 2022 at 06:16:00PM CEST, [email protected] wrote:
Quoted 16 lines · On Sat, 23 Jul 2022 09:52:05 +0530 Vikas Gupta wrote:
include/uapi/linux/devlink.h +16 -0
+enum devlink_attr_selftest_test_id {
+    DEVLINK_ATTR_SELFTEST_TEST_ID_UNSPEC,
+    DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH,    /* flag */
+
+    __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX,
+    DEVLINK_ATTR_SELFTEST_TEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX - 1
+};
+
+enum devlink_selftest_test_status {
+    DEVLINK_SELFTEST_TEST_STATUS_SKIP,
+    DEVLINK_SELFTEST_TEST_STATUS_PASS,
+    DEVLINK_SELFTEST_TEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+    DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,

include/uapi/linux/devlink.h enum { · line 307

Quoted 10 lines
include/uapi/linux/devlink.h +10 -0
+    DEVLINK_ATTR_SELFTEST_RESULT,                   /* nested */
+    DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID,           /* u32,
+                                                     * enum devlink_attr_selftest_test_id
+                                                     */
+    DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS,       /* u8,
+                                                     * enum devlink_selftest_test_status
+                                                     */
+
+    __DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+    DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1

Any thoughts on running:

Quoted 6 lines
Quoted 1 line
      sed -i '/_SELFTEST/ {s/_TEST_/_/g}' $patch

Sure, why not. But please make sure you keep all other related things (variables, cmdline opts) consistent.

Thanks!

Does the 'test_id' in command line
'devlink dev selftests run DEV test_id flash'
will still hold good if DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID changes to DEVLINK_ATTR_SELFTEST_RESULT_ID ?
or it should be
'devlink dev selftests run DEV selftest_id flash' ?

Thanks,
Vikas

Quoted 7 lines
Quoted 7 lines

on this patch? For example DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS is 40 characters long, ain't nobody typing that, and _TEST is repeated..

Otherwise LGTM!

maintainer
#7 lore raw

Re: [PATCH net-next v6 1/2] devlink: introduce framework for selftests

Quoted 40 lines · Mon, Jul 25, 2022 at 10:48:39AM CEST, [email protected] wrote:

Hi Jiri,

Quoted 37 lines · Jiri Pirko
Quoted 30 lines · Sat, Jul 23, 2022 at 06:16:00PM CEST, [email protected] wrote:
Quoted 16 lines · On Sat, 23 Jul 2022 09:52:05 +0530 Vikas Gupta wrote:
include/uapi/linux/devlink.h +16 -0
+enum devlink_attr_selftest_test_id {
+    DEVLINK_ATTR_SELFTEST_TEST_ID_UNSPEC,
+    DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH,    /* flag */
+
+    __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX,
+    DEVLINK_ATTR_SELFTEST_TEST_ID_MAX = __DEVLINK_ATTR_SELFTEST_TEST_ID_MAX - 1
+};
+
+enum devlink_selftest_test_status {
+    DEVLINK_SELFTEST_TEST_STATUS_SKIP,
+    DEVLINK_SELFTEST_TEST_STATUS_PASS,
+    DEVLINK_SELFTEST_TEST_STATUS_FAIL
+};
+
+enum devlink_attr_selftest_result {
+    DEVLINK_ATTR_SELFTEST_RESULT_UNSPEC,

include/uapi/linux/devlink.h enum { · line 307

Quoted 10 lines
include/uapi/linux/devlink.h +10 -0
+    DEVLINK_ATTR_SELFTEST_RESULT,                   /* nested */
+    DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID,           /* u32,
+                                                     * enum devlink_attr_selftest_test_id
+                                                     */
+    DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS,       /* u8,
+                                                     * enum devlink_selftest_test_status
+                                                     */
+
+    __DEVLINK_ATTR_SELFTEST_RESULT_MAX,
+    DEVLINK_ATTR_SELFTEST_RESULT_MAX = __DEVLINK_ATTR_SELFTEST_RESULT_MAX - 1

Any thoughts on running:

Quoted 1 line
      sed -i '/_SELFTEST/ {s/_TEST_/_/g}' $patch

Sure, why not. But please make sure you keep all other related things (variables, cmdline opts) consistent.

Quoted 7 lines
Quoted 1 line

Thanks!

Does the 'test_id' in command line
'devlink dev selftests run DEV test_id flash'
will still hold good if DEVLINK_ATTR_SELFTEST_RESULT_TEST_ID changes to DEVLINK_ATTR_SELFTEST_RESULT_ID ?
or it should be
'devlink dev selftests run DEV selftest_id flash' ?

Just "id". Thanks!

Quoted 12 lines

Thanks,
Vikas

Quoted 7 lines
Quoted 7 lines

on this patch? For example DEVLINK_ATTR_SELFTEST_RESULT_TEST_STATUS is 40 characters long, ain't nobody typing that, and _TEST is repeated..

Otherwise LGTM!

#8 lore raw

PATCH v6 2/2 bnxt_en: implement callbacks for devlink selftests

In reply to Vikas Gupta

Add callbacks
=============
.selftest_check: returns true for flash selftest. .selftest_run: runs a flash selftest.

Also, refactor NVM APIs so that they can be used with devlink and ethtool both.

---
 .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 61 +++++++++++++++++++
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 ++++----
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 12 ++++
 3 files changed, 85 insertions(+), 12 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +61 -0
index 6b3d4f4c2a75..27214fd1ee94 100644
@@ -20,6 +20,8 @@
 #include "bnxt_ulp.h"
 #include "bnxt_ptp.h"
 #include "bnxt_coredump.h"
+#include "bnxt_nvm_defs.h"
+#include "bnxt_ethtool.h"
 
 static void __bnxt_fw_recover(struct bnxt *bp)
 {
@@ -610,6 +612,63 @@ static int bnxt_dl_reload_up(struct devlink *dl, enum devlink_reload_action acti
 	return rc;
 }
 
+static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)
+{
+	u32 datalen;
+	u16 index;
+	u8 *buf;
+
+	if (bnxt_find_nvram_item(bp->dev, BNX_DIR_TYPE_VPD,
+				 BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,
+				 &index, NULL, &datalen) || !datalen) {
+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd entry error");
+		return false;
+	}
+
+	buf = kzalloc(datalen, GFP_KERNEL);
+	if (!buf) {
+		NL_SET_ERR_MSG_MOD(extack, "insufficient memory for nvm test");
+		return false;
+	}
+
+	if (bnxt_get_nvram_item(bp->dev, index, 0, datalen, buf)) {
+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd read error");
+		goto err;
+	}
+
+	if (bnxt_flash_nvram(bp->dev, BNX_DIR_TYPE_VPD, BNX_DIR_ORDINAL_FIRST,
+			     BNX_DIR_EXT_NONE, 0, 0, buf, datalen)) {
+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd write error");
+		goto err;
+	}
+
+	return true;
+
+err:
+	kfree(buf);
+	return false;
+}
+
+static bool bnxt_dl_selftest_check(struct devlink *dl, unsigned int test_id,
+				   struct netlink_ext_ack *extack)
+{
+	return test_id == DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH;
+}
+
+static enum devlink_selftest_test_status bnxt_dl_selftest_run(struct devlink *dl,
+							      unsigned int test_id,
+							      struct netlink_ext_ack *extack)
+{
+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);
+
+	if (test_id == DEVLINK_ATTR_SELFTEST_TEST_ID_FLASH)
+		return bnxt_nvm_test(bp, extack) ?
+				DEVLINK_SELFTEST_TEST_STATUS_PASS :
+				DEVLINK_SELFTEST_TEST_STATUS_FAIL;
+
+	return DEVLINK_SELFTEST_TEST_STATUS_SKIP;
+}
+
 static const struct devlink_ops bnxt_dl_ops = {
 #ifdef CONFIG_BNXT_SRIOV
 	.eswitch_mode_set = bnxt_dl_eswitch_mode_set,
@@ -622,6 +681,8 @@ static const struct devlink_ops bnxt_dl_ops = {
 	.reload_limits	  = BIT(DEVLINK_RELOAD_LIMIT_NO_RESET),
 	.reload_down	  = bnxt_dl_reload_down,
 	.reload_up	  = bnxt_dl_reload_up,
+	.selftest_check	  = bnxt_dl_selftest_check,
+	.selftest_run	  = bnxt_dl_selftest_run,
 };
 
 static const struct devlink_ops bnxt_vf_dl_ops;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +12 -12
index 7191e5d74208..87eb5362ad70 100644
@@ -2176,14 +2176,14 @@ static void bnxt_print_admin_err(struct bnxt *bp)
 	netdev_info(bp->dev, "PF does not have admin privileges to flash or reset the device\n");
 }
 
-static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
-				u16 ext, u16 *index, u32 *item_length,
-				u32 *data_length);
+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
+			 u16 ext, u16 *index, u32 *item_length,
+			 u32 *data_length);
 
-static int bnxt_flash_nvram(struct net_device *dev, u16 dir_type,
-			    u16 dir_ordinal, u16 dir_ext, u16 dir_attr,
-			    u32 dir_item_len, const u8 *data,
-			    size_t data_len)
+int bnxt_flash_nvram(struct net_device *dev, u16 dir_type,
+		     u16 dir_ordinal, u16 dir_ext, u16 dir_attr,
+		     u32 dir_item_len, const u8 *data,
+		     size_t data_len)
 {
 	struct bnxt *bp = netdev_priv(dev);
 	struct hwrm_nvm_write_input *req;
@@ -2836,8 +2836,8 @@ static int bnxt_get_nvram_directory(struct net_device *dev, u32 len, u8 *data)
 	return rc;
 }
 
-static int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,
-			       u32 length, u8 *data)
+int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,
+			u32 length, u8 *data)
 {
 	struct bnxt *bp = netdev_priv(dev);
 	int rc;
@@ -2871,9 +2871,9 @@ static int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,
 	return rc;
 }
 
-static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
-				u16 ext, u16 *index, u32 *item_length,
-				u32 *data_length)
+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
+			 u16 ext, u16 *index, u32 *item_length,
+			 u32 *data_length)
 {
 	struct hwrm_nvm_find_dir_entry_output *output;
 	struct hwrm_nvm_find_dir_entry_input *req;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h +12 -0
index a59284215e78..a8ecef8ab82c 100644
@@ -58,5 +58,17 @@ int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware
 int bnxt_get_pkginfo(struct net_device *dev, char *ver, int size);
 void bnxt_ethtool_init(struct bnxt *bp);
 void bnxt_ethtool_free(struct bnxt *bp);
+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
+			 u16 ext, u16 *index, u32 *item_length,
+			 u32 *data_length);
+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
+			 u16 ext, u16 *index, u32 *item_length,
+			 u32 *data_length);
+int bnxt_flash_nvram(struct net_device *dev, u16 dir_type,
+		     u16 dir_ordinal, u16 dir_ext, u16 dir_attr,
+		     u32 dir_item_len, const u8 *data,
+		     size_t data_len);
+int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,
+			u32 length, u8 *data);
 
 #endif
Signature · 1 line
2.31.1
maintainer Reviewed-by on v6 2/2
#9 lore raw

Re: [PATCH net-next v6 2/2] bnxt_en: implement callbacks for devlink selftests

Quoted 11 lines · Sat, Jul 23, 2022 at 06:22:06AM CEST, [email protected] wrote:

Add callbacks
=============
.selftest_check: returns true for flash selftest. .selftest_run: runs a flash selftest.

Also, refactor NVM APIs so that they can be used with devlink and ethtool both.