Commit 0c4dcd60 authored by Devesh Sharma's avatar Devesh Sharma Committed by Jason Gunthorpe
Browse files

RDMA/bnxt_re: Refactor hardware queue memory allocation 

At top level there are three major data structure addition.  viz
bnxt_qplib_hwq_attr, bnxt_qplib_sg_info and bnxt_qplib_tqm_ctx

Intorduction of first data structure reduces the arguments list to
bnxt_re_alloc_init_hwq() function. There are changes all over the driver
code to incorporate this new structure. The caller needs to fill the
attribute data structure and pass to this function.

The second data structure is to pass memory region description
viz. sghead, page_size and page_shift. There are changes all over the
driver code to initialize bnxt_re_sg_info data structure. The new data
structure helps to reduce the argument list of __alloc_pbl() function
call.

Till now the TQM rings related members were not collected under any
specific data-structure making it hard to manage. The third data
sctructure bnxt_qplib_tqm_ctx is added to refactor the TQM queue
allocation and initialization.

Link: https://lore.kernel.org/r/1581786665-23705-4-git-send-email-devesh.sharma@broadcom.com


Signed-off-by: default avatarNaresh Kumar PBS <nareshkumar.pbs@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 0cfb329d

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+21 −5
Original line number Diff line number Diff line
@@ -871,9 +871,11 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, 
		return PTR_ERR(umem);



	qp->sumem = umem;

	qplib_qp->sq.sg_info.sglist = umem->sg_head.sgl;

	qplib_qp->sq.sg_info.sghead = umem->sg_head.sgl;

	qplib_qp->sq.sg_info.npages = ib_umem_num_pages(umem);

	qplib_qp->sq.sg_info.nmap = umem->nmap;

	qplib_qp->sq.sg_info.pgsize = PAGE_SIZE;

	qplib_qp->sq.sg_info.pgshft = PAGE_SHIFT;

	qplib_qp->qp_handle = ureq.qp_handle;



	if (!qp->qplib_qp.srq) {
@@ -884,9 +886,11 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, 
		if (IS_ERR(umem))

			goto rqfail;

		qp->rumem = umem;

		qplib_qp->rq.sg_info.sglist = umem->sg_head.sgl;

		qplib_qp->rq.sg_info.sghead = umem->sg_head.sgl;

		qplib_qp->rq.sg_info.npages = ib_umem_num_pages(umem);

		qplib_qp->rq.sg_info.nmap = umem->nmap;

		qplib_qp->rq.sg_info.pgsize = PAGE_SIZE;

		qplib_qp->rq.sg_info.pgshft = PAGE_SHIFT;

	}



	qplib_qp->dpi = &cntx->dpi;
@@ -976,6 +980,8 @@ static struct bnxt_re_qp *bnxt_re_create_shadow_qp 
	qp->qplib_qp.sq.max_sge = 2;

	/* Q full delta can be 1 since it is internal QP */

	qp->qplib_qp.sq.q_full_delta = 1;

	qp->qplib_qp.sq.sg_info.pgsize = PAGE_SIZE;

	qp->qplib_qp.sq.sg_info.pgshft = PAGE_SHIFT;



	qp->qplib_qp.scq = qp1_qp->scq;

	qp->qplib_qp.rcq = qp1_qp->rcq;
@@ -984,6 +990,8 @@ static struct bnxt_re_qp *bnxt_re_create_shadow_qp 
	qp->qplib_qp.rq.max_sge = qp1_qp->rq.max_sge;

	/* Q full delta can be 1 since it is internal QP */

	qp->qplib_qp.rq.q_full_delta = 1;

	qp->qplib_qp.rq.sg_info.pgsize = PAGE_SIZE;

	qp->qplib_qp.rq.sg_info.pgshft = PAGE_SHIFT;



	qp->qplib_qp.mtu = qp1_qp->mtu;
@@ -1043,6 +1051,8 @@ static int bnxt_re_init_rq_attr(struct bnxt_re_qp *qp, 
		if (qplqp->rq.max_sge > dev_attr->max_qp_sges)

			qplqp->rq.max_sge = dev_attr->max_qp_sges;

	}

	qplqp->rq.sg_info.pgsize = PAGE_SIZE;

	qplqp->rq.sg_info.pgshft = PAGE_SHIFT;



	return 0;

}
@@ -1095,6 +1105,8 @@ static void bnxt_re_init_sq_attr(struct bnxt_re_qp *qp, 
	 * unexpected Queue full condition

	 */

	qplqp->sq.q_full_delta -= 1;

	qplqp->sq.sg_info.pgsize = PAGE_SIZE;

	qplqp->sq.sg_info.pgshft = PAGE_SHIFT;

}



static void bnxt_re_adjust_gsi_sq_attr(struct bnxt_re_qp *qp,
@@ -1511,9 +1523,11 @@ static int bnxt_re_init_user_srq(struct bnxt_re_dev *rdev, 
		return PTR_ERR(umem);



	srq->umem = umem;

	qplib_srq->sg_info.sglist = umem->sg_head.sgl;

	qplib_srq->sg_info.sghead = umem->sg_head.sgl;

	qplib_srq->sg_info.npages = ib_umem_num_pages(umem);

	qplib_srq->sg_info.nmap = umem->nmap;

	qplib_srq->sg_info.pgsize = PAGE_SIZE;

	qplib_srq->sg_info.pgshft = PAGE_SHIFT;

	qplib_srq->srq_handle = ureq.srq_handle;

	qplib_srq->dpi = &cntx->dpi;
@@ -2368,7 +2382,7 @@ static int bnxt_re_build_reg_wqe(const struct ib_reg_wr *wr, 
	wqe->frmr.pbl_dma_ptr = qplib_frpl->hwq.pbl_dma_ptr[0];

	wqe->frmr.page_list = mr->pages;

	wqe->frmr.page_list_len = mr->npages;

	wqe->frmr.levels = qplib_frpl->hwq.level + 1;

	wqe->frmr.levels = qplib_frpl->hwq.level;

	wqe->type = BNXT_QPLIB_SWQE_TYPE_REG_MR;



	/* Need unconditional fence for reg_mr
@@ -2742,6 +2756,8 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	if (entries > dev_attr->max_cq_wqes + 1)

		entries = dev_attr->max_cq_wqes + 1;



	cq->qplib_cq.sg_info.pgsize = PAGE_SIZE;

	cq->qplib_cq.sg_info.pgshft = PAGE_SHIFT;

	if (udata) {

		struct bnxt_re_cq_req req;

		struct bnxt_re_ucontext *uctx = rdma_udata_to_drv_context(
@@ -2758,7 +2774,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
			rc = PTR_ERR(cq->umem);

			goto fail;

		}

		cq->qplib_cq.sg_info.sglist = cq->umem->sg_head.sgl;

		cq->qplib_cq.sg_info.sghead = cq->umem->sg_head.sgl;

		cq->qplib_cq.sg_info.npages = ib_umem_num_pages(cq->umem);

		cq->qplib_cq.sg_info.nmap = cq->umem->nmap;

		cq->qplib_cq.dpi = &uctx->dpi;

drivers/infiniband/hw/bnxt_re/main.c

+11 −9
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ static void bnxt_re_destroy_chip_ctx(struct bnxt_re_dev *rdev) 
	rdev->chip_ctx = NULL;

	rdev->rcfw.res = NULL;

	rdev->qplib_res.cctx = NULL;

	rdev->qplib_res.pdev = NULL;

	rdev->qplib_res.netdev = NULL;

	kfree(chip_ctx);

}
@@ -151,7 +153,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev) 
	ctx->cq_count = min_t(u32, BNXT_RE_MAX_CQ_COUNT, attr->max_cq);

	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))

		for (i = 0; i < MAX_TQM_ALLOC_REQ; i++)

			rdev->qplib_ctx.tqm_count[i] =

			rdev->qplib_ctx.tqm_ctx.qcount[i] =

			rdev->dev_attr.tqm_alloc_reqs[i];

}
@@ -982,8 +984,8 @@ static void bnxt_re_free_nq_res(struct bnxt_re_dev *rdev) 
	for (i = 0; i < rdev->num_msix - 1; i++) {

		type = bnxt_qplib_get_ring_type(rdev->chip_ctx);

		bnxt_re_net_ring_free(rdev, rdev->nq[i].ring_id, type);

		rdev->nq[i].res = NULL;

		bnxt_qplib_free_nq(&rdev->nq[i]);

		rdev->nq[i].res = NULL;

	}

}
@@ -1032,7 +1034,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev) 
		rdev->nq[i].res = &rdev->qplib_res;

		rdev->nq[i].hwq.max_elements = BNXT_RE_MAX_CQ_COUNT +

			BNXT_RE_MAX_SRQC_COUNT + 2;

		rc = bnxt_qplib_alloc_nq(rdev->en_dev->pdev, &rdev->nq[i]);

		rc = bnxt_qplib_alloc_nq(&rdev->qplib_res, &rdev->nq[i]);

		if (rc) {

			dev_err(rdev_to_dev(rdev), "Alloc Failed NQ%d rc:%#x",

				i, rc);
@@ -1056,7 +1058,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev) 
	}

	return 0;

free_nq:

	for (i = num_vec_created; i >= 0; i--) {

	for (i = num_vec_created - 1; i >= 0; i--) {

		type = bnxt_qplib_get_ring_type(rdev->chip_ctx);

		bnxt_re_net_ring_free(rdev, rdev->nq[i].ring_id, type);

		bnxt_qplib_free_nq(&rdev->nq[i]);
@@ -1335,7 +1337,7 @@ static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev) 
			dev_warn(rdev_to_dev(rdev),

				 "Failed to deinitialize RCFW: %#x", rc);

		bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id);

		bnxt_qplib_free_ctx(rdev->en_dev->pdev, &rdev->qplib_ctx);

		bnxt_qplib_free_ctx(&rdev->qplib_res, &rdev->qplib_ctx);

		bnxt_qplib_disable_rcfw_channel(&rdev->rcfw);

		type = bnxt_qplib_get_ring_type(rdev->chip_ctx);

		bnxt_re_net_ring_free(rdev, rdev->rcfw.creq_ring_id, type);
@@ -1411,7 +1413,7 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 
	/* Establish RCFW Communication Channel to initialize the context

	 * memory for the function and all child VFs

	 */

	rc = bnxt_qplib_alloc_rcfw_channel(rdev->en_dev->pdev, &rdev->rcfw,

	rc = bnxt_qplib_alloc_rcfw_channel(&rdev->qplib_res, &rdev->rcfw,

					   &rdev->qplib_ctx,

					   BNXT_RE_MAX_QPC_COUNT);

	if (rc) {
@@ -1432,7 +1434,7 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 
	}

	db_offt = bnxt_re_get_nqdb_offset(rdev, BNXT_RE_AEQ_IDX);

	vid = rdev->msix_entries[BNXT_RE_AEQ_IDX].vector;

	rc = bnxt_qplib_enable_rcfw_channel(rdev->en_dev->pdev, &rdev->rcfw,

	rc = bnxt_qplib_enable_rcfw_channel(&rdev->rcfw,

					    vid, db_offt, rdev->is_virtfn,

					    &bnxt_re_aeq_handler);

	if (rc) {
@@ -1447,7 +1449,7 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 


	bnxt_re_set_resource_limits(rdev);



	rc = bnxt_qplib_alloc_ctx(rdev->en_dev->pdev, &rdev->qplib_ctx, 0,

	rc = bnxt_qplib_alloc_ctx(&rdev->qplib_res, &rdev->qplib_ctx, 0,

				  bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx));

	if (rc) {

		pr_err("Failed to allocate QPLIB context: %#x\n", rc);
@@ -1514,7 +1516,7 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 
free_sctx:

	bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id);

free_ctx:

	bnxt_qplib_free_ctx(rdev->en_dev->pdev, &rdev->qplib_ctx);

	bnxt_qplib_free_ctx(&rdev->qplib_res, &rdev->qplib_ctx);

disable_rcfw:

	bnxt_qplib_disable_rcfw_channel(&rdev->rcfw);

free_ring:

drivers/infiniband/hw/bnxt_re/qplib_fp.c

+98 −71
Original line number Diff line number Diff line
@@ -464,26 +464,33 @@ fail: 
void bnxt_qplib_free_nq(struct bnxt_qplib_nq *nq)

{

	if (nq->hwq.max_elements) {

		bnxt_qplib_free_hwq(nq->pdev, &nq->hwq);

		bnxt_qplib_free_hwq(nq->res, &nq->hwq);

		nq->hwq.max_elements = 0;

	}

}



int bnxt_qplib_alloc_nq(struct pci_dev *pdev, struct bnxt_qplib_nq *nq)

int bnxt_qplib_alloc_nq(struct bnxt_qplib_res *res, struct bnxt_qplib_nq *nq)

{

	u8 hwq_type;

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct bnxt_qplib_sg_info sginfo = {};



	nq->pdev = pdev;

	nq->pdev = res->pdev;

	nq->res = res;

	if (!nq->hwq.max_elements ||

	    nq->hwq.max_elements > BNXT_QPLIB_NQE_MAX_CNT)

		nq->hwq.max_elements = BNXT_QPLIB_NQE_MAX_CNT;

	hwq_type = bnxt_qplib_get_hwq_type(nq->res);

	if (bnxt_qplib_alloc_init_hwq(nq->pdev, &nq->hwq, NULL,

				      &nq->hwq.max_elements,

				      BNXT_QPLIB_MAX_NQE_ENTRY_SIZE, 0,

				      PAGE_SIZE, hwq_type))

		return -ENOMEM;



	sginfo.pgsize = PAGE_SIZE;

	sginfo.pgshft = PAGE_SHIFT;

	hwq_attr.res = res;

	hwq_attr.sginfo = &sginfo;

	hwq_attr.depth = nq->hwq.max_elements;

	hwq_attr.stride = sizeof(struct nq_base);

	hwq_attr.type = bnxt_qplib_get_hwq_type(nq->res);

	if (bnxt_qplib_alloc_init_hwq(&nq->hwq, &hwq_attr)) {

		dev_err(&nq->pdev->dev, "FP NQ allocation failed");

		return -ENOMEM;

	}

	nq->budget = 8;

	return 0;

}
@@ -526,24 +533,26 @@ void bnxt_qplib_destroy_srq(struct bnxt_qplib_res *res, 
	kfree(srq->swq);

	if (rc)

		return;

	bnxt_qplib_free_hwq(res->pdev, &srq->hwq);

	bnxt_qplib_free_hwq(res, &srq->hwq);

}



int bnxt_qplib_create_srq(struct bnxt_qplib_res *res,

			  struct bnxt_qplib_srq *srq)

{

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct cmdq_create_srq req;

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct creq_create_srq_resp resp;

	struct cmdq_create_srq req;

	struct bnxt_qplib_pbl *pbl;

	u16 cmd_flags = 0;

	int rc, idx;



	srq->hwq.max_elements = srq->max_wqe;

	rc = bnxt_qplib_alloc_init_hwq(res->pdev, &srq->hwq, &srq->sg_info,

				       &srq->hwq.max_elements,

				       BNXT_QPLIB_MAX_RQE_ENTRY_SIZE, 0,

				       PAGE_SIZE, HWQ_TYPE_QUEUE);

	hwq_attr.res = res;

	hwq_attr.sginfo = &srq->sg_info;

	hwq_attr.depth = srq->max_wqe;

	hwq_attr.stride = BNXT_QPLIB_MAX_RQE_ENTRY_SIZE;

	hwq_attr.type = HWQ_TYPE_QUEUE;

	rc = bnxt_qplib_alloc_init_hwq(&srq->hwq, &hwq_attr);

	if (rc)

		goto exit;
@@ -602,7 +611,7 @@ int bnxt_qplib_create_srq(struct bnxt_qplib_res *res, 


	return 0;

fail:

	bnxt_qplib_free_hwq(res->pdev, &srq->hwq);

	bnxt_qplib_free_hwq(res, &srq->hwq);

	kfree(srq->swq);

exit:

	return rc;
@@ -721,15 +730,16 @@ done: 
/* QP */

int bnxt_qplib_create_qp1(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)

{

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct cmdq_create_qp1 req;

	struct creq_create_qp1_resp resp;

	struct bnxt_qplib_pbl *pbl;

	struct bnxt_qplib_q *sq = &qp->sq;

	struct bnxt_qplib_q *rq = &qp->rq;

	int rc;

	struct creq_create_qp1_resp resp;

	struct cmdq_create_qp1 req;

	struct bnxt_qplib_pbl *pbl;

	u16 cmd_flags = 0;

	u32 qp_flags = 0;

	int rc;



	RCFW_CMD_PREP(req, CREATE_QP1, cmd_flags);
@@ -739,11 +749,12 @@ int bnxt_qplib_create_qp1(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
	req.qp_handle = cpu_to_le64(qp->qp_handle);



	/* SQ */

	sq->hwq.max_elements = sq->max_wqe;

	rc = bnxt_qplib_alloc_init_hwq(res->pdev, &sq->hwq, NULL,

				       &sq->hwq.max_elements,

				       BNXT_QPLIB_MAX_SQE_ENTRY_SIZE, 0,

				       PAGE_SIZE, HWQ_TYPE_QUEUE);

	hwq_attr.res = res;

	hwq_attr.sginfo = &sq->sg_info;

	hwq_attr.depth = sq->max_wqe;

	hwq_attr.stride = BNXT_QPLIB_MAX_SQE_ENTRY_SIZE;

	hwq_attr.type = HWQ_TYPE_QUEUE;

	rc = bnxt_qplib_alloc_init_hwq(&sq->hwq, &hwq_attr);

	if (rc)

		goto exit;
@@ -778,11 +789,12 @@ int bnxt_qplib_create_qp1(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 


	/* RQ */

	if (rq->max_wqe) {

		rq->hwq.max_elements = qp->rq.max_wqe;

		rc = bnxt_qplib_alloc_init_hwq(res->pdev, &rq->hwq, NULL,

					       &rq->hwq.max_elements,

					       BNXT_QPLIB_MAX_RQE_ENTRY_SIZE, 0,

					       PAGE_SIZE, HWQ_TYPE_QUEUE);

		hwq_attr.res = res;

		hwq_attr.sginfo = &rq->sg_info;

		hwq_attr.stride = BNXT_QPLIB_MAX_RQE_ENTRY_SIZE;

		hwq_attr.depth = qp->rq.max_wqe;

		hwq_attr.type = HWQ_TYPE_QUEUE;

		rc = bnxt_qplib_alloc_init_hwq(&rq->hwq, &hwq_attr);

		if (rc)

			goto fail_sq;
@@ -848,10 +860,10 @@ int bnxt_qplib_create_qp1(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
fail:

	bnxt_qplib_free_qp_hdr_buf(res, qp);

fail_rq:

	bnxt_qplib_free_hwq(res->pdev, &rq->hwq);

	bnxt_qplib_free_hwq(res, &rq->hwq);

	kfree(rq->swq);

fail_sq:

	bnxt_qplib_free_hwq(res->pdev, &sq->hwq);

	bnxt_qplib_free_hwq(res, &sq->hwq);

	kfree(sq->swq);

exit:

	return rc;
@@ -860,7 +872,9 @@ exit: 
int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)

{

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	unsigned long int psn_search, poff = 0;

	struct bnxt_qplib_sg_info sginfo = {};

	struct sq_psn_search **psn_search_ptr;

	struct bnxt_qplib_q *sq = &qp->sq;

	struct bnxt_qplib_q *rq = &qp->rq;
@@ -887,12 +901,15 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
			 sizeof(struct sq_psn_search_ext) :

			 sizeof(struct sq_psn_search);

	}

	sq->hwq.max_elements = sq->max_wqe;

	rc = bnxt_qplib_alloc_init_hwq(res->pdev, &sq->hwq, &sq->sg_info,

				       &sq->hwq.max_elements,

				       BNXT_QPLIB_MAX_SQE_ENTRY_SIZE,

				       psn_sz,

				       PAGE_SIZE, HWQ_TYPE_QUEUE);



	hwq_attr.res = res;

	hwq_attr.sginfo = &sq->sg_info;

	hwq_attr.stride = BNXT_QPLIB_MAX_SQE_ENTRY_SIZE;

	hwq_attr.depth = sq->max_wqe;

	hwq_attr.aux_stride = psn_sz;

	hwq_attr.aux_depth = hwq_attr.depth;

	hwq_attr.type = HWQ_TYPE_QUEUE;

	rc = bnxt_qplib_alloc_init_hwq(&sq->hwq, &hwq_attr);

	if (rc)

		goto exit;
@@ -956,12 +973,14 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 


	/* RQ */

	if (rq->max_wqe) {

		rq->hwq.max_elements = rq->max_wqe;

		rc = bnxt_qplib_alloc_init_hwq(res->pdev, &rq->hwq,

					       &rq->sg_info,

					       &rq->hwq.max_elements,

					       BNXT_QPLIB_MAX_RQE_ENTRY_SIZE, 0,

					       PAGE_SIZE, HWQ_TYPE_QUEUE);

		hwq_attr.res = res;

		hwq_attr.sginfo = &rq->sg_info;

		hwq_attr.stride = BNXT_QPLIB_MAX_RQE_ENTRY_SIZE;

		hwq_attr.depth = rq->max_wqe;

		hwq_attr.aux_stride = 0;

		hwq_attr.aux_depth = 0;

		hwq_attr.type = HWQ_TYPE_QUEUE;

		rc = bnxt_qplib_alloc_init_hwq(&rq->hwq, &hwq_attr);

		if (rc)

			goto fail_sq;
@@ -1029,10 +1048,17 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
		req_size = xrrq->max_elements *

			   BNXT_QPLIB_MAX_ORRQE_ENTRY_SIZE + PAGE_SIZE - 1;

		req_size &= ~(PAGE_SIZE - 1);

		rc = bnxt_qplib_alloc_init_hwq(res->pdev, xrrq, NULL,

					       &xrrq->max_elements,

					       BNXT_QPLIB_MAX_ORRQE_ENTRY_SIZE,

					       0, req_size, HWQ_TYPE_CTX);

		sginfo.pgsize = req_size;

		sginfo.pgshft = PAGE_SHIFT;



		hwq_attr.res = res;

		hwq_attr.sginfo = &sginfo;

		hwq_attr.depth = xrrq->max_elements;

		hwq_attr.stride = BNXT_QPLIB_MAX_ORRQE_ENTRY_SIZE;

		hwq_attr.aux_stride = 0;

		hwq_attr.aux_depth = 0;

		hwq_attr.type = HWQ_TYPE_CTX;

		rc = bnxt_qplib_alloc_init_hwq(xrrq, &hwq_attr);

		if (rc)

			goto fail_buf_free;

		pbl = &xrrq->pbl[PBL_LVL_0];
@@ -1044,11 +1070,10 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
		req_size = xrrq->max_elements *

			   BNXT_QPLIB_MAX_IRRQE_ENTRY_SIZE + PAGE_SIZE - 1;

		req_size &= ~(PAGE_SIZE - 1);



		rc = bnxt_qplib_alloc_init_hwq(res->pdev, xrrq, NULL,

					       &xrrq->max_elements,

					       BNXT_QPLIB_MAX_IRRQE_ENTRY_SIZE,

					       0, req_size, HWQ_TYPE_CTX);

		sginfo.pgsize = req_size;

		hwq_attr.depth =  xrrq->max_elements;

		hwq_attr.stride = BNXT_QPLIB_MAX_IRRQE_ENTRY_SIZE;

		rc = bnxt_qplib_alloc_init_hwq(xrrq, &hwq_attr);

		if (rc)

			goto fail_orrq;
@@ -1074,17 +1099,17 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 


fail:

	if (qp->irrq.max_elements)

		bnxt_qplib_free_hwq(res->pdev, &qp->irrq);

		bnxt_qplib_free_hwq(res, &qp->irrq);

fail_orrq:

	if (qp->orrq.max_elements)

		bnxt_qplib_free_hwq(res->pdev, &qp->orrq);

		bnxt_qplib_free_hwq(res, &qp->orrq);

fail_buf_free:

	bnxt_qplib_free_qp_hdr_buf(res, qp);

fail_rq:

	bnxt_qplib_free_hwq(res->pdev, &rq->hwq);

	bnxt_qplib_free_hwq(res, &rq->hwq);

	kfree(rq->swq);

fail_sq:

	bnxt_qplib_free_hwq(res->pdev, &sq->hwq);

	bnxt_qplib_free_hwq(res, &sq->hwq);

	kfree(sq->swq);

exit:

	return rc;
@@ -1440,16 +1465,16 @@ void bnxt_qplib_free_qp_res(struct bnxt_qplib_res *res, 
			    struct bnxt_qplib_qp *qp)

{

	bnxt_qplib_free_qp_hdr_buf(res, qp);

	bnxt_qplib_free_hwq(res->pdev, &qp->sq.hwq);

	bnxt_qplib_free_hwq(res, &qp->sq.hwq);

	kfree(qp->sq.swq);



	bnxt_qplib_free_hwq(res->pdev, &qp->rq.hwq);

	bnxt_qplib_free_hwq(res, &qp->rq.hwq);

	kfree(qp->rq.swq);



	if (qp->irrq.max_elements)

		bnxt_qplib_free_hwq(res->pdev, &qp->irrq);

		bnxt_qplib_free_hwq(res, &qp->irrq);

	if (qp->orrq.max_elements)

		bnxt_qplib_free_hwq(res->pdev, &qp->orrq);

		bnxt_qplib_free_hwq(res, &qp->orrq);



}
@@ -1927,17 +1952,19 @@ static void bnxt_qplib_arm_cq(struct bnxt_qplib_cq *cq, u32 arm_type) 
int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq)

{

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct cmdq_create_cq req;

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct creq_create_cq_resp resp;

	struct cmdq_create_cq req;

	struct bnxt_qplib_pbl *pbl;

	u16 cmd_flags = 0;

	int rc;



	cq->hwq.max_elements = cq->max_wqe;

	rc = bnxt_qplib_alloc_init_hwq(res->pdev, &cq->hwq, &cq->sg_info,

				       &cq->hwq.max_elements,

				       BNXT_QPLIB_MAX_CQE_ENTRY_SIZE, 0,

				       PAGE_SIZE, HWQ_TYPE_QUEUE);

	hwq_attr.res = res;

	hwq_attr.depth = cq->max_wqe;

	hwq_attr.stride = sizeof(struct cq_base);

	hwq_attr.type = HWQ_TYPE_QUEUE;

	hwq_attr.sginfo = &cq->sg_info;

	rc = bnxt_qplib_alloc_init_hwq(&cq->hwq, &hwq_attr);

	if (rc)

		goto exit;
@@ -1988,7 +2015,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) 
	return 0;



fail:

	bnxt_qplib_free_hwq(res->pdev, &cq->hwq);

	bnxt_qplib_free_hwq(res, &cq->hwq);

exit:

	return rc;

}
@@ -2008,7 +2035,7 @@ int bnxt_qplib_destroy_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) 
					  (void *)&resp, NULL, 0);

	if (rc)

		return rc;

	bnxt_qplib_free_hwq(res->pdev, &cq->hwq);

	bnxt_qplib_free_hwq(res, &cq->hwq);

	return 0;

}

drivers/infiniband/hw/bnxt_re/qplib_fp.h

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ int bnxt_qplib_poll_cq(struct bnxt_qplib_cq *cq, struct bnxt_qplib_cqe *cqe, 
bool bnxt_qplib_is_cq_empty(struct bnxt_qplib_cq *cq);

void bnxt_qplib_req_notify_cq(struct bnxt_qplib_cq *cq, u32 arm_type);

void bnxt_qplib_free_nq(struct bnxt_qplib_nq *nq);

int bnxt_qplib_alloc_nq(struct pci_dev *pdev, struct bnxt_qplib_nq *nq);

int bnxt_qplib_alloc_nq(struct bnxt_qplib_res *res, struct bnxt_qplib_nq *nq);

void bnxt_qplib_add_flush_qp(struct bnxt_qplib_qp *qp);

void bnxt_qplib_acquire_cq_locks(struct bnxt_qplib_qp *qp,

				 unsigned long *flags);

drivers/infiniband/hw/bnxt_re/qplib_rcfw.c

+32 −25
Original line number Diff line number Diff line
@@ -520,9 +520,10 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, 
	level = ctx->tim_tbl.level;

	req.tim_pg_size_tim_lvl = (level << CMDQ_INITIALIZE_FW_TIM_LVL_SFT) |

				  __get_pbl_pg_idx(&ctx->tim_tbl.pbl[level]);

	level = ctx->tqm_pde_level;

	req.tqm_pg_size_tqm_lvl = (level << CMDQ_INITIALIZE_FW_TQM_LVL_SFT) |

				  __get_pbl_pg_idx(&ctx->tqm_pde.pbl[level]);

	level = ctx->tqm_ctx.pde.level;

	req.tqm_pg_size_tqm_lvl =

		(level << CMDQ_INITIALIZE_FW_TQM_LVL_SFT) |

		 __get_pbl_pg_idx(&ctx->tqm_ctx.pde.pbl[level]);



	req.qpc_page_dir =

		cpu_to_le64(ctx->qpc_tbl.pbl[PBL_LVL_0].pg_map_arr[0]);
@@ -535,7 +536,7 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, 
	req.tim_page_dir =

		cpu_to_le64(ctx->tim_tbl.pbl[PBL_LVL_0].pg_map_arr[0]);

	req.tqm_page_dir =

		cpu_to_le64(ctx->tqm_pde.pbl[PBL_LVL_0].pg_map_arr[0]);

		cpu_to_le64(ctx->tqm_ctx.pde.pbl[PBL_LVL_0].pg_map_arr[0]);



	req.number_of_qp = cpu_to_le32(ctx->qpc_tbl.max_elements);

	req.number_of_mrw = cpu_to_le32(ctx->mrw_tbl.max_elements);
@@ -563,25 +564,32 @@ void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw) 
{

	kfree(rcfw->qp_tbl);

	kfree(rcfw->crsqe_tbl);

	bnxt_qplib_free_hwq(rcfw->pdev, &rcfw->cmdq);

	bnxt_qplib_free_hwq(rcfw->pdev, &rcfw->creq);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->cmdq);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->creq);

	rcfw->pdev = NULL;

}



int bnxt_qplib_alloc_rcfw_channel(struct pci_dev *pdev,

int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res,

				  struct bnxt_qplib_rcfw *rcfw,

				  struct bnxt_qplib_ctx *ctx,

				  int qp_tbl_sz)

{

	u8 hwq_type;



	rcfw->pdev = pdev;

	rcfw->creq.max_elements = BNXT_QPLIB_CREQE_MAX_CNT;

	hwq_type = bnxt_qplib_get_hwq_type(rcfw->res);

	if (bnxt_qplib_alloc_init_hwq(rcfw->pdev, &rcfw->creq, NULL,

				      &rcfw->creq.max_elements,

				      BNXT_QPLIB_CREQE_UNITS,

				      0, PAGE_SIZE, hwq_type)) {

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct bnxt_qplib_sg_info sginfo = {};



	rcfw->pdev = res->pdev;

	rcfw->res = res;



	sginfo.pgsize = PAGE_SIZE;

	sginfo.pgshft = PAGE_SHIFT;



	hwq_attr.sginfo = &sginfo;

	hwq_attr.res = rcfw->res;

	hwq_attr.depth = BNXT_QPLIB_CREQE_MAX_CNT;

	hwq_attr.stride = BNXT_QPLIB_CREQE_UNITS;

	hwq_attr.type = bnxt_qplib_get_hwq_type(res);



	if (bnxt_qplib_alloc_init_hwq(&rcfw->creq, &hwq_attr)) {

		dev_err(&rcfw->pdev->dev,

			"HW channel CREQ allocation failed\n");

		goto fail;
@@ -591,13 +599,11 @@ int bnxt_qplib_alloc_rcfw_channel(struct pci_dev *pdev, 
	else

		rcfw->cmdq_depth = BNXT_QPLIB_CMDQE_MAX_CNT_8192;



	rcfw->cmdq.max_elements = rcfw->cmdq_depth;

	if (bnxt_qplib_alloc_init_hwq

			(rcfw->pdev, &rcfw->cmdq, NULL,

			 &rcfw->cmdq.max_elements,

			 BNXT_QPLIB_CMDQE_UNITS, 0,

			 bnxt_qplib_cmdqe_page_size(rcfw->cmdq_depth),

			 HWQ_TYPE_CTX)) {

	sginfo.pgsize = bnxt_qplib_cmdqe_page_size(rcfw->cmdq_depth);

	hwq_attr.depth = rcfw->cmdq_depth;

	hwq_attr.stride = BNXT_QPLIB_CMDQE_UNITS;

	hwq_attr.type = HWQ_TYPE_CTX;

	if (bnxt_qplib_alloc_init_hwq(&rcfw->cmdq, &hwq_attr)) {

		dev_err(&rcfw->pdev->dev,

			"HW channel CMDQ allocation failed\n");

		goto fail;
@@ -690,8 +696,7 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector, 
	return 0;

}



int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev,

				   struct bnxt_qplib_rcfw *rcfw,

int bnxt_qplib_enable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw,

				   int msix_vector,

				   int cp_bar_reg_off, int virt_fn,

				   int (*aeq_handler)(struct bnxt_qplib_rcfw *,
@@ -699,10 +704,12 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev, 
{

	resource_size_t res_base;

	struct cmdq_init init;

	struct pci_dev *pdev;

	u16 bmap_size;

	int rc;



	/* General */

	pdev = rcfw->pdev;

	rcfw->seq_num = 0;

	set_bit(FIRMWARE_FIRST_FLAG, &rcfw->flags);

	bmap_size = BITS_TO_LONGS(rcfw->cmdq_depth) * sizeof(unsigned long);

CRA Git | Maintained and supported by SUSTech CRA and CCSE