Commit 567b549e authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'bnxt_en-driver-update' 

Michael Chan says:

====================
bnxt_en: Driver update

This patchset contains these updates to the driver:

1. New ethtool coredump type for FW to include cached context for live dump.
2. Support ENABLE_ROCE devlink generic parameter.
3. Support capability change flag from FW.
4. FW interface update.
5. Support .set_module_eeprom_by_page().
====================

Link: https://patch.msgid.link/20250310183129.3154117-1-michael.chan@broadcom.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents e63265f9 c3be245d

Documentation/networking/devlink/bnxt.rst

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ Parameters 
     - Permanent

   * - ``enable_remote_dev_reset``

     - Runtime

   * - ``enable_roce``

     - Permanent



The ``bnxt`` driver also implements the following driver-specific

parameters.

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

+6 −2
Original line number Diff line number Diff line
@@ -12309,6 +12309,7 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
	struct hwrm_func_drv_if_change_input *req;

	bool fw_reset = !bp->irq_tbl;

	bool resc_reinit = false;

	bool caps_change = false;

	int rc, retry = 0;

	u32 flags = 0;
@@ -12364,8 +12365,11 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
		set_bit(BNXT_STATE_ABORT_ERR, &bp->state);

		return -ENODEV;

	}

	if (resc_reinit || fw_reset) {

		if (fw_reset) {

	if (flags & FUNC_DRV_IF_CHANGE_RESP_FLAGS_CAPS_CHANGE)

		caps_change = true;



	if (resc_reinit || fw_reset || caps_change) {

		if (fw_reset || caps_change) {

			set_bit(BNXT_STATE_FW_RESET_DET, &bp->state);

			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))

				bnxt_ulp_irq_stop(bp);

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

+1 −0
Original line number Diff line number Diff line
@@ -2697,6 +2697,7 @@ struct bnxt { 
#define BNXT_DUMP_LIVE		0

#define BNXT_DUMP_CRASH		1

#define BNXT_DUMP_DRIVER	2

#define BNXT_DUMP_LIVE_WITH_CTX_L1_CACHE	3



	struct bpf_prog		*xdp_prog;

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

+6 −3
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ static int bnxt_hwrm_dbg_coredump_list(struct bnxt *bp, 
	return rc;

}



static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 component_id,

					   u16 segment_id)

static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 dump_type,

					   u16 component_id, u16 segment_id)

{

	struct hwrm_dbg_coredump_initiate_input *req;

	int rc;
@@ -172,6 +172,8 @@ static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 component_id, 
	hwrm_req_timeout(bp, req, bp->hwrm_cmd_max_timeout);

	req->component_id = cpu_to_le16(component_id);

	req->segment_id = cpu_to_le16(segment_id);

	if (dump_type == BNXT_DUMP_LIVE_WITH_CTX_L1_CACHE)

		req->seg_flags = DBG_COREDUMP_INITIATE_REQ_SEG_FLAGS_COLLECT_CTX_L1_CACHE;



	return hwrm_req_send(bp, req);

}
@@ -450,7 +452,8 @@ static int __bnxt_get_coredump(struct bnxt *bp, u16 dump_type, void *buf, 


		start = jiffies;



		rc = bnxt_hwrm_dbg_coredump_initiate(bp, comp_id, seg_id);

		rc = bnxt_hwrm_dbg_coredump_initiate(bp, dump_type, comp_id,

						     seg_id);

		if (rc) {

			netdev_err(bp->dev,

				   "Failed to initiate coredump for seg = %d\n",

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

+65 −30
Original line number Diff line number Diff line
@@ -679,6 +679,8 @@ static const struct bnxt_dl_nvm_param nvm_params[] = { 
	 NVM_OFF_MSIX_VEC_PER_PF_MAX, BNXT_NVM_SHARED_CFG, 10, 4},

	{DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,

	 NVM_OFF_MSIX_VEC_PER_PF_MIN, BNXT_NVM_SHARED_CFG, 7, 4},

	{DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE, NVM_OFF_SUPPORT_RDMA,

	 BNXT_NVM_FUNC_CFG, 1, 1},

	{BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK, NVM_OFF_DIS_GRE_VER_CHECK,

	 BNXT_NVM_SHARED_CFG, 1, 1},

};
@@ -1023,37 +1025,19 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 


}



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

static int __bnxt_hwrm_nvm_req(struct bnxt *bp,

			       const struct bnxt_dl_nvm_param *nvm, void *msg,

			       union devlink_param_value *val)

{

	struct hwrm_nvm_get_variable_input *req = msg;

	struct bnxt_dl_nvm_param nvm_param;

	struct hwrm_err_output *resp;

	union bnxt_nvm_data *data;

	dma_addr_t data_dma_addr;

	int idx = 0, rc, i;



	/* Get/Set NVM CFG parameter is supported only on PFs */

	if (BNXT_VF(bp)) {

		hwrm_req_drop(bp, req);

		return -EPERM;

	}



	for (i = 0; i < ARRAY_SIZE(nvm_params); i++) {

		if (nvm_params[i].id == param_id) {

			nvm_param = nvm_params[i];

			break;

		}

	}



	if (i == ARRAY_SIZE(nvm_params)) {

		hwrm_req_drop(bp, req);

		return -EOPNOTSUPP;

	}

	int idx = 0, rc;



	if (nvm_param.dir_type == BNXT_NVM_PORT_CFG)

	if (nvm->dir_type == BNXT_NVM_PORT_CFG)

		idx = bp->pf.port_id;

	else if (nvm_param.dir_type == BNXT_NVM_FUNC_CFG)

	else if (nvm->dir_type == BNXT_NVM_FUNC_CFG)

		idx = bp->pf.fw_fid - BNXT_FIRST_PF_FID;



	data = hwrm_req_dma_slice(bp, req, sizeof(*data), &data_dma_addr);
@@ -1064,23 +1048,23 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg, 
	}



	req->dest_data_addr = cpu_to_le64(data_dma_addr);

	req->data_len = cpu_to_le16(nvm_param.nvm_num_bits);

	req->option_num = cpu_to_le16(nvm_param.offset);

	req->data_len = cpu_to_le16(nvm->nvm_num_bits);

	req->option_num = cpu_to_le16(nvm->offset);

	req->index_0 = cpu_to_le16(idx);

	if (idx)

		req->dimensions = cpu_to_le16(1);



	resp = hwrm_req_hold(bp, req);

	if (req->req_type == cpu_to_le16(HWRM_NVM_SET_VARIABLE)) {

		bnxt_copy_to_nvm_data(data, val, nvm_param.nvm_num_bits,

				      nvm_param.dl_num_bytes);

		bnxt_copy_to_nvm_data(data, val, nvm->nvm_num_bits,

				      nvm->dl_num_bytes);

		rc = hwrm_req_send(bp, msg);

	} else {

		rc = hwrm_req_send_silent(bp, msg);

		if (!rc) {

			bnxt_copy_from_nvm_data(val, data,

						nvm_param.nvm_num_bits,

						nvm_param.dl_num_bytes);

						nvm->nvm_num_bits,

						nvm->dl_num_bytes);

		} else {

			if (resp->cmd_err ==

				NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST)
@@ -1093,6 +1077,27 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg, 
	return rc;

}



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

			     union devlink_param_value *val)

{

	struct hwrm_nvm_get_variable_input *req = msg;

	const struct bnxt_dl_nvm_param *nvm_param;

	int i;



	/* Get/Set NVM CFG parameter is supported only on PFs */

	if (BNXT_VF(bp)) {

		hwrm_req_drop(bp, req);

		return -EPERM;

	}



	for (i = 0; i < ARRAY_SIZE(nvm_params); i++) {

		nvm_param = &nvm_params[i];

		if (nvm_param->id == param_id)

			return __bnxt_hwrm_nvm_req(bp, nvm_param, msg, val);

	}

	return -EOPNOTSUPP;

}



static int bnxt_dl_nvm_param_get(struct devlink *dl, u32 id,

				 struct devlink_param_gset_ctx *ctx)

{
@@ -1129,6 +1134,32 @@ static int bnxt_dl_nvm_param_set(struct devlink *dl, u32 id, 
	return bnxt_hwrm_nvm_req(bp, id, req, &ctx->val);

}



static int bnxt_dl_roce_validate(struct devlink *dl, u32 id,

				 union devlink_param_value val,

				 struct netlink_ext_ack *extack)

{

	const struct bnxt_dl_nvm_param nvm_roce_cap = {0, NVM_OFF_RDMA_CAPABLE,

		BNXT_NVM_SHARED_CFG, 1, 1};

	struct bnxt *bp = bnxt_get_bp_from_dl(dl);

	struct hwrm_nvm_get_variable_input *req;

	union devlink_param_value roce_cap;

	int rc;



	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_VARIABLE);

	if (rc)

		return rc;



	if (__bnxt_hwrm_nvm_req(bp, &nvm_roce_cap, req, &roce_cap)) {

		NL_SET_ERR_MSG_MOD(extack, "Unable to verify if device is RDMA Capable");

		return -EINVAL;

	}

	if (!roce_cap.vbool) {

		NL_SET_ERR_MSG_MOD(extack, "Device does not support RDMA");

		return -EINVAL;

	}

	return 0;

}



static int bnxt_dl_msix_validate(struct devlink *dl, u32 id,

				 union devlink_param_value val,

				 struct netlink_ext_ack *extack)
@@ -1193,6 +1224,10 @@ static const struct devlink_param bnxt_dl_params[] = { 
			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),

			      bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,

			      bnxt_dl_msix_validate),

	DEVLINK_PARAM_GENERIC(ENABLE_ROCE,

			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),

			      bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,

			      bnxt_dl_roce_validate),

	DEVLINK_PARAM_DRIVER(BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK,

			     "gre_ver_check", DEVLINK_PARAM_TYPE_BOOL,

			     BIT(DEVLINK_PARAM_CMODE_PERMANENT),