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

Commit 1897ce21 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Remove post_recv and use rdmavt version 



This patch removes the simple post recv function in favor of using rdmavt.
The packet receive processing still lives in the driver though.

Reviewed-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 75261cc6

drivers/staging/rdma/hfi1/verbs.c

+1 −62
Original line number Diff line number Diff line
@@ -323,67 +323,6 @@ void hfi1_skip_sge(struct rvt_sge_state *ss, u32 length, int release) 
	}

}



/**

 * post_receive - post a receive on a QP

 * @ibqp: the QP to post the receive on

 * @wr: the WR to post

 * @bad_wr: the first bad WR is put here

 *

 * This may be called from interrupt context.

 */

static int post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,

			struct ib_recv_wr **bad_wr)

{

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);

	struct rvt_rwq *wq = qp->r_rq.wq;

	unsigned long flags;

	int ret;



	/* Check that state is OK to post receive. */

	if (!(ib_rvt_state_ops[qp->state] & RVT_POST_RECV_OK) || !wq) {

		*bad_wr = wr;

		ret = -EINVAL;

		goto bail;

	}



	for (; wr; wr = wr->next) {

		struct rvt_rwqe *wqe;

		u32 next;

		int i;



		if ((unsigned) wr->num_sge > qp->r_rq.max_sge) {

			*bad_wr = wr;

			ret = -EINVAL;

			goto bail;

		}



		spin_lock_irqsave(&qp->r_rq.lock, flags);

		next = wq->head + 1;

		if (next >= qp->r_rq.size)

			next = 0;

		if (next == wq->tail) {

			spin_unlock_irqrestore(&qp->r_rq.lock, flags);

			*bad_wr = wr;

			ret = -ENOMEM;

			goto bail;

		}



		wqe = rvt_get_rwqe_ptr(&qp->r_rq, wq->head);

		wqe->wr_id = wr->wr_id;

		wqe->num_sge = wr->num_sge;

		for (i = 0; i < wr->num_sge; i++)

			wqe->sg_list[i] = wr->sg_list[i];

		/* Make sure queue entry is written before the head index. */

		smp_wmb();

		wq->head = next;

		spin_unlock_irqrestore(&qp->r_rq.lock, flags);

	}

	ret = 0;



bail:

	return ret;

}



/*

 * Make sure the QP is ready and able to accept the given opcode.

 */
@@ -1627,7 +1566,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	ibdev->query_qp = hfi1_query_qp;

	ibdev->destroy_qp = NULL;

	ibdev->post_send = NULL;

	ibdev->post_recv = post_receive;

	ibdev->post_recv = NULL;

	ibdev->post_srq_recv = hfi1_post_srq_receive;

	ibdev->create_cq = NULL;

	ibdev->destroy_cq = NULL;