Commit b1cfe43d authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Roland Dreier
Browse files

IB/ehca: Return QP pointer in poll_cq() 



Also add two unlikely() statements.

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 26ed687f

drivers/infiniband/hw/ehca/ehca_reqs.c

+8 −3
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc) 
	int ret = 0;

	struct ehca_cq *my_cq = container_of(cq, struct ehca_cq, ib_cq);

	struct ehca_cqe *cqe;

	struct ehca_qp *my_qp;

	int cqe_count = 0;



poll_cq_one_read_cqe:
@@ -568,7 +569,7 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc) 
	}



	/* tracing cqe */

	if (ehca_debug_level) {

	if (unlikely(ehca_debug_level)) {

		ehca_dbg(cq->device,

			 "Received COMPLETION ehca_cq=%p cq_num=%x -----",

			 my_cq, my_cq->cq_number);
@@ -602,7 +603,11 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc) 
	} else

		wc->status = IB_WC_SUCCESS;



	wc->qp = NULL;

	read_lock(&ehca_qp_idr_lock);

	my_qp = idr_find(&ehca_qp_idr, cqe->qp_token);

	wc->qp = &my_qp->ib_qp;

	read_unlock(&ehca_qp_idr_lock);



	wc->byte_len = cqe->nr_bytes_transferred;

	wc->pkey_index = cqe->pkey_index;

	wc->slid = cqe->rlid;
@@ -612,7 +617,7 @@ static inline int ehca_poll_cq_one(struct ib_cq *cq, struct ib_wc *wc) 
	wc->imm_data = cpu_to_be32(cqe->immediate_data);

	wc->sl = cqe->service_level;



	if (wc->status != IB_WC_SUCCESS)

	if (unlikely(wc->status != IB_WC_SUCCESS))

		ehca_dbg(cq->device,

			 "ehca_cq=%p cq_num=%x WARNING unsuccessful cqe "

			 "OPType=%x status=%x qp_num=%x src_qp=%x wr_id=%lx "