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

Commit fad51b7d authored by Devesh Sharma's avatar Devesh Sharma Committed by Roland Dreier
Browse files

RDMA/ocrdma: Code clean-up 



Clean up code.  Also modifying GSI QP to error during ocrdma_close is fixed.

Signed-off-by: default avatarDevesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@emulex.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 334b8db3

drivers/infiniband/hw/ocrdma/ocrdma.h

+2 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <rdma/ib_verbs.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/ib_addr.h>



#include <be_roce.h>

#include "ocrdma_sli.h"
@@ -234,7 +235,7 @@ struct ocrdma_dev { 
	struct list_head entry;

	struct rcu_head rcu;

	int id;

	struct ocrdma_mr *stag_arr[OCRDMA_MAX_STAG];

	u64 stag_arr[OCRDMA_MAX_STAG];

	u16 pvid;

	u32 asic_id;
@@ -287,7 +288,6 @@ struct ocrdma_cq { 


struct ocrdma_pd {

	struct ib_pd ibpd;

	struct ocrdma_dev *dev;

	struct ocrdma_ucontext *uctx;

	u32 id;

	int num_dpp_qp;
@@ -372,10 +372,8 @@ struct ocrdma_qp { 
	bool dpp_enabled;

	u8 *ird_q_va;

	bool signaled;

	u16 db_cache;

};





struct ocrdma_ucontext {

	struct ib_ucontext ibucontext;

drivers/infiniband/hw/ocrdma/ocrdma_abi.h

+1 −3
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ struct ocrdma_create_qp_uresp { 
	u32 db_sq_offset;

	u32 db_rq_offset;

	u32 db_shift;

	u64 rsvd1;

	u64 rsvd2;

	u64 rsvd3;

	u64 rsvd[11];

} __packed;



struct ocrdma_create_srq_uresp {

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr) 
	if (!(attr->ah_flags & IB_AH_GRH))

		return ERR_PTR(-EINVAL);



	ah = kzalloc(sizeof *ah, GFP_ATOMIC);

	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);

	if (!ah)

		return ERR_PTR(-ENOMEM);

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+8 −12
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <rdma/ib_verbs.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/ib_addr.h>



#include "ocrdma.h"

#include "ocrdma_hw.h"
@@ -386,8 +385,8 @@ static void ocrdma_build_q_pages(struct ocrdma_pa *q_pa, int cnt, 
	}

}



static int ocrdma_mbx_delete_q(struct ocrdma_dev *dev, struct ocrdma_queue_info *q,

			       int queue_type)

static int ocrdma_mbx_delete_q(struct ocrdma_dev *dev,

			       struct ocrdma_queue_info *q, int queue_type)

{

	u8 opcode = 0;

	int status;
@@ -778,7 +777,6 @@ static void ocrdma_process_grp5_aync(struct ocrdma_dev *dev, 
	}

}





static void ocrdma_process_acqe(struct ocrdma_dev *dev, void *ae_cqe)

{

	/* async CQE processing */
@@ -825,8 +823,6 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id) 
			ocrdma_process_acqe(dev, cqe);

		else if (cqe->valid_ae_cmpl_cons & OCRDMA_MCQE_CMPL_MASK)

			ocrdma_process_mcqe(dev, cqe);

		else

			pr_err("%s() cqe->compl is not set.\n", __func__);

		memset(cqe, 0, sizeof(struct ocrdma_mcqe));

		ocrdma_mcq_inc_tail(dev);

	}
@@ -1050,6 +1046,9 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, 
	attr->max_qp =

	    (rsp->qp_srq_cq_ird_ord & OCRDMA_MBX_QUERY_CFG_MAX_QP_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_QP_SHIFT;

	attr->max_srq =

		(rsp->max_srq_rpir_qps & OCRDMA_MBX_QUERY_CFG_MAX_SRQ_MASK) >>

		OCRDMA_MBX_QUERY_CFG_MAX_SRQ_OFFSET;

	attr->max_send_sge = ((rsp->max_write_send_sge &

			       OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >>

			      OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT);
@@ -1065,9 +1064,6 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, 
	attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp &

				OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT;

	attr->max_srq =

		(rsp->max_srq_rpir_qps & OCRDMA_MBX_QUERY_CFG_MAX_SRQ_MASK) >>

		OCRDMA_MBX_QUERY_CFG_MAX_SRQ_OFFSET;

	attr->max_ird_per_qp = (rsp->max_ird_ord_per_qp &

				OCRDMA_MBX_QUERY_CFG_MAX_IRD_PER_QP_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_IRD_PER_QP_SHIFT;

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int ocrdma_close(struct ocrdma_dev *dev) 
		cur_qp = dev->qp_tbl;

		for (i = 0; i < OCRDMA_MAX_QP; i++) {

			qp = cur_qp[i];

			if (qp) {

			if (qp && qp->ibqp.qp_type != IB_QPT_GSI) {

				/* change the QP state to ERROR */

				_ocrdma_modify_qp(&qp->ibqp, &attrs, attr_mask);