Commit 547848af authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-Updates-for-net-next' 



Michael Chan says:

====================
bnxt_en: Updates for net-next.

This series contains these main changes:

1. Change of default message level to enable more logging.
2. Some cleanups related to processing async events from firmware.
3. Allow online ethtool selftest on multi-function PFs.
4. Return stored firmware version information to devlink.

v2:
Patch 3: Change bnxt_reset_task() to silent mode.
Patch 8 & 9: Ensure we copy NULL terminated fw strings to devlink.
Patch 8 & 9: Return directly after the last bnxt_dl_info_put() call.
Patch 9: If FW call to get stored dev info fails, return success to
         devlink without the stored versions.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2ad119d9 1388875b

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

+28 −11
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "bnxt_debugfs.h"



#define BNXT_TX_TIMEOUT		(5 * HZ)

#define BNXT_DEF_MSG_ENABLE	(NETIF_MSG_DRV | NETIF_MSG_HW)



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Broadcom BCM573xx network driver");
@@ -1979,11 +1980,12 @@ static int bnxt_async_event_process(struct bnxt *bp, 
				    struct hwrm_async_event_cmpl *cmpl)

{

	u16 event_id = le16_to_cpu(cmpl->event_id);

	u32 data1 = le32_to_cpu(cmpl->event_data1);

	u32 data2 = le32_to_cpu(cmpl->event_data2);



	/* TODO CHIMP_FW: Define event id's for link change, error etc */

	switch (event_id) {

	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		struct bnxt_link_info *link_info = &bp->link_info;



		if (BNXT_VF(bp))
@@ -2013,7 +2015,6 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		set_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event);

		break;

	case ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		u16 port_id = BNXT_GET_EVENT_PORT(data1);



		if (BNXT_VF(bp))
@@ -2030,9 +2031,10 @@ static int bnxt_async_event_process(struct bnxt *bp, 
			goto async_event_process_exit;

		set_bit(BNXT_RESET_TASK_SILENT_SP_EVENT, &bp->sp_event);

		break;

	case ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);



	case ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY:

		if (netif_msg_hw(bp))

			netdev_warn(bp->dev, "Received RESET_NOTIFY event, data1: 0x%x, data2: 0x%x\n",

				    data1, data2);

		if (!bp->fw_health)

			goto async_event_process_exit;
@@ -2052,10 +2054,8 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		}

		set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &bp->sp_event);

		break;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY: {

		struct bnxt_fw_health *fw_health = bp->fw_health;

		u32 data1 = le32_to_cpu(cmpl->event_data1);



		if (!fw_health)

			goto async_event_process_exit;
@@ -2083,8 +2083,6 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		goto async_event_process_exit;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		u32 data2 = le32_to_cpu(cmpl->event_data2);

		struct bnxt_rx_ring_info *rxr;

		u16 grp_idx;
@@ -4325,6 +4323,8 @@ static int bnxt_hwrm_to_stderr(u32 hwrm_err) 
	switch (hwrm_err) {

	case HWRM_ERR_CODE_SUCCESS:

		return 0;

	case HWRM_ERR_CODE_RESOURCE_LOCKED:

		return -EROFS;

	case HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED:

		return -EACCES;

	case HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR:
@@ -7562,6 +7562,16 @@ static int bnxt_hwrm_func_reset(struct bnxt *bp) 
	return hwrm_send_message(bp, &req, sizeof(req), HWRM_RESET_TIMEOUT);

}



static void bnxt_nvm_cfg_ver_get(struct bnxt *bp)

{

	struct hwrm_nvm_get_dev_info_output nvm_info;



	if (!bnxt_hwrm_nvm_get_dev_info(bp, &nvm_info))

		snprintf(bp->nvm_cfg_ver, FW_VER_STR_LEN, "%d.%d.%d",

			 nvm_info.nvm_cfg_ver_maj, nvm_info.nvm_cfg_ver_min,

			 nvm_info.nvm_cfg_ver_upd);

}



static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)

{

	int rc = 0;
@@ -8902,6 +8912,11 @@ static void bnxt_report_link(struct bnxt *bp) 
		u16 fec;



		netif_carrier_on(bp->dev);

		speed = bnxt_fw_to_ethtool_speed(bp->link_info.link_speed);

		if (speed == SPEED_UNKNOWN) {

			netdev_info(bp->dev, "NIC Link is Up, speed unknown\n");

			return;

		}

		if (bp->link_info.duplex == BNXT_LINK_DUPLEX_FULL)

			duplex = "full";

		else
@@ -8914,7 +8929,6 @@ static void bnxt_report_link(struct bnxt *bp) 
			flow_ctrl = "ON - receive";

		else

			flow_ctrl = "none";

		speed = bnxt_fw_to_ethtool_speed(bp->link_info.link_speed);

		netdev_info(bp->dev, "NIC Link is Up, %u Mbps %s duplex, Flow control: %s\n",

			    speed, duplex, flow_ctrl);

		if (bp->flags & BNXT_FLAG_EEE_CAP)
@@ -10751,7 +10765,7 @@ static void bnxt_rx_ring_reset(struct bnxt *bp) 
			else

				netdev_warn(bp->dev, "RX ring reset failed, rc = %d, falling back to global reset\n",

					    rc);

			bnxt_reset_task(bp, false);

			bnxt_reset_task(bp, true);

			break;

		}

		bnxt_free_one_rx_ring_skbs(bp, i);
@@ -11219,6 +11233,8 @@ static int bnxt_fw_init_one_p1(struct bnxt *bp) 
		if (rc)

			return rc;

	}

	bnxt_nvm_cfg_ver_get(bp);



	rc = bnxt_hwrm_func_reset(bp);

	if (rc)

		return -ENODEV;
@@ -12508,6 +12524,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENOMEM;



	bp = netdev_priv(dev);

	bp->msg_enable = BNXT_DEF_MSG_ENABLE;

	bnxt_set_max_func_irqs(bp, max_irqs);



	if (bnxt_vf_pciid(ent->driver_data))

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

+1 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,7 @@ struct bnxt { 
#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];

	char			nvm_cfg_ver[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))

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

+107 −47
Original line number Diff line number Diff line
@@ -382,15 +382,41 @@ static int bnxt_hwrm_get_nvm_cfg_ver(struct bnxt *bp, 
	return rc;

}



static int bnxt_dl_info_put(struct bnxt *bp, struct devlink_info_req *req,

			    enum bnxt_dl_version_type type, const char *key,

			    char *buf)

{

	if (!strlen(buf))

		return 0;



	if ((bp->flags & BNXT_FLAG_CHIP_P5) &&

	    (!strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_NCSI) ||

	     !strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_ROCE)))

		return 0;



	switch (type) {

	case BNXT_VERSION_FIXED:

		return devlink_info_version_fixed_put(req, key, buf);

	case BNXT_VERSION_RUNNING:

		return devlink_info_version_running_put(req, key, buf);

	case BNXT_VERSION_STORED:

		return devlink_info_version_stored_put(req, key, buf);

	}

	return 0;

}



#define HWRM_FW_VER_STR_LEN	16



static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,

			    struct netlink_ext_ack *extack)

{

	struct hwrm_nvm_get_dev_info_output nvm_dev_info;

	struct bnxt *bp = bnxt_get_bp_from_dl(dl);

	union devlink_param_value nvm_cfg_ver;

	struct hwrm_ver_get_output *ver_resp;

	char mgmt_ver[FW_VER_STR_LEN];

	char roce_ver[FW_VER_STR_LEN];

	char fw_ver[FW_VER_STR_LEN];

	char ncsi_ver[FW_VER_STR_LEN];

	char buf[32];

	int rc;
@@ -398,10 +424,11 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (rc)

		return rc;



	if (strlen(bp->board_partno)) {

		rc = devlink_info_version_fixed_put(req,

			DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,

			bp->board_partno);

	if (BNXT_PF(bp) && (bp->flags & BNXT_FLAG_DSN_VALID)) {

		sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",

			bp->dsn[7], bp->dsn[6], bp->dsn[5], bp->dsn[4],

			bp->dsn[3], bp->dsn[2], bp->dsn[1], bp->dsn[0]);

		rc = devlink_info_serial_number_put(req, buf);

		if (rc)

			return rc;

	}
@@ -412,54 +439,56 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
			return rc;

	}



	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,

			      DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,

			      bp->board_partno);

	if (rc)

		return rc;



	sprintf(buf, "%X", bp->chip_num);

	rc = devlink_info_version_fixed_put(req,

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,

			      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID, buf);

	if (rc)

		return rc;



	ver_resp = &bp->ver_resp;

	sprintf(buf, "%X", ver_resp->chip_rev);

	rc = devlink_info_version_fixed_put(req,

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,

			      DEVLINK_INFO_VERSION_GENERIC_ASIC_REV, buf);

	if (rc)

		return rc;



	if (BNXT_PF(bp)) {

		sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",

			bp->dsn[7], bp->dsn[6], bp->dsn[5], bp->dsn[4],

			bp->dsn[3], bp->dsn[2], bp->dsn[1], bp->dsn[0]);

		rc = devlink_info_serial_number_put(req, buf);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,

			      bp->nvm_cfg_ver);

	if (rc)

		return rc;

	}



	if (strlen(ver_resp->active_pkg_name)) {

		rc =

		    devlink_info_version_running_put(req,

					DEVLINK_INFO_VERSION_GENERIC_FW,

					ver_resp->active_pkg_name);

	buf[0] = 0;

	strncat(buf, ver_resp->active_pkg_name, HWRM_FW_VER_STR_LEN);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);

	if (rc)

		return rc;

	}



	if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {

		u32 ver = nvm_cfg_ver.vu32;



		sprintf(buf, "%X.%X.%X", (ver >> 16) & 0xF, (ver >> 8) & 0xF,

			ver & 0xF);

		rc = devlink_info_version_running_put(req,

				DEVLINK_INFO_VERSION_GENERIC_FW_PSID, buf);

		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

				      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,

				      buf);

		if (rc)

			return rc;

	}



	if (ver_resp->flags & VER_GET_RESP_FLAGS_EXT_VER_AVAIL) {

		snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

			 ver_resp->hwrm_fw_major, ver_resp->hwrm_fw_minor,

			 ver_resp->hwrm_fw_build, ver_resp->hwrm_fw_patch);



		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

			 ver_resp->mgmt_fw_major, ver_resp->mgmt_fw_minor,

			 ver_resp->mgmt_fw_build, ver_resp->mgmt_fw_patch);
@@ -467,11 +496,11 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
			 ver_resp->roce_fw_major, ver_resp->roce_fw_minor,

			 ver_resp->roce_fw_build, ver_resp->roce_fw_patch);

	} else {

		snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

			 ver_resp->hwrm_fw_maj_8b, ver_resp->hwrm_fw_min_8b,

			 ver_resp->hwrm_fw_bld_8b, ver_resp->hwrm_fw_rsvd_8b);



		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

			 ver_resp->mgmt_fw_maj_8b, ver_resp->mgmt_fw_min_8b,

			 ver_resp->mgmt_fw_bld_8b, ver_resp->mgmt_fw_rsvd_8b);
@@ -479,29 +508,60 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
			 ver_resp->roce_fw_maj_8b, ver_resp->roce_fw_min_8b,

			 ver_resp->roce_fw_bld_8b, ver_resp->roce_fw_rsvd_8b);

	}

	rc = devlink_info_version_running_put(req,

			DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, fw_ver);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);

	if (rc)

		return rc;



	rc = devlink_info_version_running_put(req,

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT_API,

			      bp->hwrm_ver_supp);

	if (rc)

		return rc;



	if (!(bp->flags & BNXT_FLAG_CHIP_P5)) {

		rc = devlink_info_version_running_put(req,

			DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, mgmt_ver);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);

	if (rc)

		return rc;



		rc = devlink_info_version_running_put(req,

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,

			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);

	if (rc)

		return rc;

	}



	rc = bnxt_hwrm_nvm_get_dev_info(bp, &nvm_dev_info);

	if (rc ||

	    !(nvm_dev_info.flags & NVM_GET_DEV_INFO_RESP_FLAGS_FW_VER_VALID))

		return 0;



	buf[0] = 0;

	strncat(buf, nvm_dev_info.pkg_name, HWRM_FW_VER_STR_LEN);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);

	if (rc)

		return rc;



	snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.hwrm_fw_major, nvm_dev_info.hwrm_fw_minor,

		 nvm_dev_info.hwrm_fw_build, nvm_dev_info.hwrm_fw_patch);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);

	if (rc)

		return rc;



	snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.mgmt_fw_major, nvm_dev_info.mgmt_fw_minor,

		 nvm_dev_info.mgmt_fw_build, nvm_dev_info.mgmt_fw_patch);

	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);

	if (rc)

		return rc;



	snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",

		 nvm_dev_info.roce_fw_major, nvm_dev_info.roce_fw_minor,

		 nvm_dev_info.roce_fw_build, nvm_dev_info.roce_fw_patch);

	return bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

				DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);

}



static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ struct bnxt_dl_nvm_param { 
	u8 dl_num_bytes;

};



enum bnxt_dl_version_type {

	BNXT_VERSION_FIXED,

	BNXT_VERSION_RUNNING,

	BNXT_VERSION_STORED,

};



void bnxt_devlink_health_report(struct bnxt *bp, unsigned long event);

void bnxt_dl_health_status_update(struct bnxt *bp, bool healthy);

void bnxt_dl_health_recovery_done(struct bnxt *bp);

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

+20 −4
Original line number Diff line number Diff line
@@ -2072,6 +2072,22 @@ static u32 bnxt_get_link(struct net_device *dev) 
	return bp->link_info.link_up;

}



int bnxt_hwrm_nvm_get_dev_info(struct bnxt *bp,

			       struct hwrm_nvm_get_dev_info_output *nvm_dev_info)

{

	struct hwrm_nvm_get_dev_info_output *resp = bp->hwrm_cmd_resp_addr;

	struct hwrm_nvm_get_dev_info_input req = {0};

	int rc;



	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_NVM_GET_DEV_INFO, -1, -1);

	mutex_lock(&bp->hwrm_cmd_lock);

	rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

	if (!rc)

		memcpy(nvm_dev_info, resp, sizeof(*resp));

	mutex_unlock(&bp->hwrm_cmd_lock);

	return rc;

}



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");
@@ -3298,7 +3314,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
	u8 test_mask = 0;

	int rc = 0, i;



	if (!bp->num_tests || !BNXT_SINGLE_PF(bp))

	if (!bp->num_tests || !BNXT_PF(bp))

		return;

	memset(buf, 0, sizeof(u64) * bp->num_tests);

	if (!netif_running(dev)) {
@@ -3311,9 +3327,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
		do_ext_lpbk = true;



	if (etest->flags & ETH_TEST_FL_OFFLINE) {

		if (bp->pf.active_vfs) {

		if (bp->pf.active_vfs || !BNXT_SINGLE_PF(bp)) {

			etest->flags |= ETH_TEST_FL_FAILED;

			netdev_warn(dev, "Offline tests cannot be run with active VFs\n");

			netdev_warn(dev, "Offline tests cannot be run with active VFs or on shared PF\n");

			return;

		}

		offline = true;
@@ -3829,7 +3845,7 @@ void bnxt_ethtool_init(struct bnxt *bp) 
		bnxt_get_pkgver(dev);



	bp->num_tests = 0;

	if (bp->hwrm_spec_code < 0x10704 || !BNXT_SINGLE_PF(bp))

	if (bp->hwrm_spec_code < 0x10704 || !BNXT_PF(bp))

		return;



	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_SELFTEST_QLIST, -1, -1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE