Re: [PATCH net-next v4 3/3] bnxt_en: implement callbacks for devlink selftests

From: Jiri Pirko
Date: Thu Jul 21 2022 - 09:00:06 EST


Thu, Jul 21, 2022 at 09:21:21AM CEST, vikas.gupta@xxxxxxxxxxxx wrote:
>Add callbacks
>=============
>.selftest_check: returns true for flash selftest.
>.selftest_run: runs a flash selftest.
>
>Signed-off-by: Vikas Gupta <vikas.gupta@xxxxxxxxxxxx>
>Reviewed-by: Michael Chan <michael.chan@xxxxxxxxxxxx>
>Reviewed-by: Andy Gospodarek <andrew.gospodarek@xxxxxxxxxxxx>
>---
> .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 60 +++++++++++++++++++
> 1 file changed, 60 insertions(+)
>
>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>index 6b3d4f4c2a75..927cf368d856 100644
>--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>@@ -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,62 @@ 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, int test_id,
>+ struct netlink_ext_ack *extack)
>+{
>+ return (test_id == DEVLINK_SELFTEST_ATTR_FLASH);

Return is not a function, avoid "()"


>+}
>+
>+static u8 bnxt_dl_selftest_run(struct devlink *dl, int test_id,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct bnxt *bp = bnxt_get_bp_from_dl(dl);
>+
>+ if (test_id == DEVLINK_SELFTEST_ATTR_FLASH) {
>+ return (bnxt_nvm_test(bp, extack) ? DEVLINK_SELFTEST_PASS :
>+ DEVLINK_SELFTEST_FAIL);

Return is not a function, avoid "()"

>+ }

No need for "{}", it's a simple statement. I'm pretty sure checkpatch
would warn you, did you run it?


>+
>+ return DEVLINK_SELFTEST_SKIP;
>+}
>+
> static const struct devlink_ops bnxt_dl_ops = {
> #ifdef CONFIG_BNXT_SRIOV
> .eswitch_mode_set = bnxt_dl_eswitch_mode_set,
>@@ -622,6 +680,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;
>--
>2.31.1
>