Commit 65ecee13 authored by Kalesh AP's avatar Kalesh AP Committed by Leon Romanovsky
Browse files

RDMA/bnxt_re: Fail probe early when not enough MSI-x vectors are reserved 



L2 driver allocates and populates the MSI-x vector details for RoCE
in the en_dev structure. RoCE driver requires minimum 2 MSIx vectors.
Hence during probe, driver has to check and bail out if there are not
enough MSI-x vectors reserved for it before proceeding further
initialization.

Reviewed-by: default avatarAndy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: default avatarAjit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: default avatarHongguang Gao <hongguang.gao@broadcom.com>
Reviewed-by: default avatarBhargava Chenna Marreddy <bhargava.marreddy@broadcom.com>
Reviewed-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: default avatarChandramohan Akula <chandramohan.akula@broadcom.com>
Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1731577748-1804-2-git-send-email-selvin.xavier@broadcom.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent faa62440

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ struct bnxt_re_pacing { 


#define BNXT_RE_GRC_FIFO_REG_BASE 0x2000



#define BNXT_RE_MIN_MSIX		2



#define MAX_CQ_HASH_BITS		(16)

#define MAX_SRQ_HASH_BITS		(16)

drivers/infiniband/hw/bnxt_re/main.c

+12 −10
Original line number Diff line number Diff line
@@ -1936,6 +1936,18 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
	}

	set_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);



	if (rdev->en_dev->ulp_tbl->msix_requested < BNXT_RE_MIN_MSIX) {

		ibdev_err(&rdev->ibdev,

			  "RoCE requires minimum 2 MSI-X vectors, but only %d reserved\n",

			  rdev->en_dev->ulp_tbl->msix_requested);

		bnxt_unregister_dev(rdev->en_dev);

		clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);

		return -EINVAL;

	}

	ibdev_dbg(&rdev->ibdev, "Got %d MSI-X vectors\n",

		  rdev->en_dev->ulp_tbl->msix_requested);

	rdev->num_msix = rdev->en_dev->ulp_tbl->msix_requested;



	rc = bnxt_re_setup_chip_ctx(rdev);

	if (rc) {

		bnxt_unregister_dev(rdev->en_dev);
@@ -1947,16 +1959,6 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
	/* Check whether VF or PF */

	bnxt_re_get_sriov_func_type(rdev);



	if (!rdev->en_dev->ulp_tbl->msix_requested) {

		ibdev_err(&rdev->ibdev,

			  "Failed to get MSI-X vectors: %#x\n", rc);

		rc = -EINVAL;

		goto fail;

	}

	ibdev_dbg(&rdev->ibdev, "Got %d MSI-X vectors\n",

		  rdev->en_dev->ulp_tbl->msix_requested);

	rdev->num_msix = rdev->en_dev->ulp_tbl->msix_requested;



	bnxt_re_query_hwrm_intf_version(rdev);



	/* Establish RCFW Communication Channel to initialize the context