Commit 5b6ff128 authored by vikas's avatar vikas Committed by Jakub Kicinski
Browse files

bnxt_en: implement callbacks for devlink selftests 



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.

Signed-off-by: default avatarVikas Gupta <vikas.gupta@broadcom.com>
Reviewed-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 08f588fa

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

+61 −0
Original line number Diff line number Diff line
@@ -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 id,

				   struct netlink_ext_ack *extack)

{

	return id == DEVLINK_ATTR_SELFTEST_ID_FLASH;

}



static enum devlink_selftest_status bnxt_dl_selftest_run(struct devlink *dl,

							 unsigned int id,

							 struct netlink_ext_ack *extack)

{

	struct bnxt *bp = bnxt_get_bp_from_dl(dl);



	if (id == DEVLINK_ATTR_SELFTEST_ID_FLASH)

		return bnxt_nvm_test(bp, extack) ?

				DEVLINK_SELFTEST_STATUS_PASS :

				DEVLINK_SELFTEST_STATUS_FAIL;



	return DEVLINK_SELFTEST_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
Original line number Diff line number Diff line
@@ -2176,11 +2176,11 @@ 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,

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,

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)
@@ -2836,7 +2836,7 @@ 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,

int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,

			u32 length, u8 *data)

{

	struct bnxt *bp = netdev_priv(dev);
@@ -2871,7 +2871,7 @@ 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,

int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,

			 u16 ext, u16 *index, u32 *item_length,

			 u32 *data_length)

{

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h

+12 −0
Original line number Diff line number Diff line
@@ -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