Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b5ff24 authored by Michael Chan's avatar Michael Chan Committed by Greg Kroah-Hartman
Browse files

bnxt_en: Set default completion ring for async events. 




[ Upstream commit 486b5c22ea1d35e00e90dd79a32a9ee530b18915 ]

With the added support for the bnxt_re RDMA driver, both drivers can be
allocating completion rings in any order.  The firmware does not know
which completion ring should be receiving async events.  Add an
extra step to tell firmware the completion ring number for receiving
async events after bnxt_en allocates the completion rings.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12ad9854

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

+30 −0
Original line number Diff line number Diff line
@@ -3800,6 +3800,30 @@ static int hwrm_ring_alloc_send_msg(struct bnxt *bp, 
	return rc;

}



static int bnxt_hwrm_set_async_event_cr(struct bnxt *bp, int idx)

{

	int rc;



	if (BNXT_PF(bp)) {

		struct hwrm_func_cfg_input req = {0};



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

		req.fid = cpu_to_le16(0xffff);

		req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR);

		req.async_event_cr = cpu_to_le16(idx);

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

	} else {

		struct hwrm_func_vf_cfg_input req = {0};



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

		req.enables =

			cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_ASYNC_EVENT_CR);

		req.async_event_cr = cpu_to_le16(idx);

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

	}

	return rc;

}



static int bnxt_hwrm_ring_alloc(struct bnxt *bp)

{

	int i, rc = 0;
@@ -3816,6 +3840,12 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp) 
			goto err_out;

		BNXT_CP_DB(cpr->cp_doorbell, cpr->cp_raw_cons);

		bp->grp_info[i].cp_fw_ring_id = ring->fw_ring_id;



		if (!i) {

			rc = bnxt_hwrm_set_async_event_cr(bp, ring->fw_ring_id);

			if (rc)

				netdev_warn(bp->dev, "Failed to set async event completion ring.\n");

		}

	}



	for (i = 0; i < bp->tx_nr_rings; i++) {