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

Commit 2bafc7f2 authored by Devesh Sharma's avatar Devesh Sharma Committed by Greg Kroah-Hartman
Browse files

RDMA/bnxt_re: Refactor queue pair creation code 

[ Upstream commit 8dae419f9ec730c1984ea7395067a2534780ada1 ]

Restructuring the bnxt_re_create_qp function. Listing below the major
changes:
 - Monolithic central part of create_qp where attributes are initialized
   is now enclosed in one function and this new function has few more
   sub-functions.
 - Top level qp limit checking code moved to a function.
 - GSI QP creation and GSI Shadow qp creation code is handled in a sub
   function.

Link: https://lore.kernel.org/r/1581786665-23705-2-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>
Stable-dep-of: 349e3c0cf239 ("RDMA/bnxt_re: Fix a possible memory leak")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 56446791

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+9 −4
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ struct bnxt_re_sqp_entries { 
	struct bnxt_re_qp *qp1_qp;

};



#define BNXT_RE_MAX_GSI_SQP_ENTRIES	1024

struct bnxt_re_gsi_context {

	struct	bnxt_re_qp *gsi_qp;

	struct	bnxt_re_qp *gsi_sqp;

	struct	bnxt_re_ah *gsi_sah;

	struct	bnxt_re_sqp_entries *sqp_tbl;

};



#define BNXT_RE_MIN_MSIX		2

#define BNXT_RE_MAX_MSIX		9

#define BNXT_RE_AEQ_IDX			0
@@ -165,10 +173,7 @@ struct bnxt_re_dev { 
	u16				cosq[2];



	/* QP for for handling QP1 packets */

	u32				sqp_id;

	struct bnxt_re_qp		*qp1_sqp;

	struct bnxt_re_ah		*sqp_ah;

	struct bnxt_re_sqp_entries sqp_tbl[1024];

	struct bnxt_re_gsi_context	gsi_ctx;

	atomic_t nq_alloc_cnt;

	u32 is_virtfn;

	u32 num_vfs;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+417 −212

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/bnxt_re/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,8 @@ static int bnxt_re_query_hwrm_pri2cos(struct bnxt_re_dev *rdev, u8 dir, 
static bool bnxt_re_is_qp1_or_shadow_qp(struct bnxt_re_dev *rdev,

					struct bnxt_re_qp *qp)

{

	return (qp->ib_qp.qp_type == IB_QPT_GSI) || (qp == rdev->qp1_sqp);

	return (qp->ib_qp.qp_type == IB_QPT_GSI) ||

	       (qp == rdev->gsi_ctx.gsi_sqp);

}



static void bnxt_re_dev_stop(struct bnxt_re_dev *rdev)