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

Commit b41f7852 authored by Devesh Sharma's avatar Devesh Sharma Committed by Doug Ledford
Browse files

RDMA/ocrdma: Fix arm logic to align with new cq API 



Today ocrdma driver defer arming the CQ till poll is called.
This was used to prevent calling poll-cq on an armed CQ.

Recently a set of new CQ API has been introduced into the linux
kernel. The implementation of this API guarantees that a given
CQ is never armed before calling poll on it. Most of the kernel
ULPs have already moved to use this new API or have a code where
poll is called before arming the CQ.

Thus, the above workaround in ocrdma is not needed anymore.
This patch removes the additional logic to deffer arm till poll
is called. This patch adds a simple scheme where ib_req_notify_cq()
will actually arm the cq.

Signed-off-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 75c1657e

drivers/infiniband/hw/ocrdma/ocrdma.h

+0 −3
Original line number Diff line number Diff line
@@ -323,9 +323,6 @@ struct ocrdma_cq { 
			 */

	u32 max_hw_cqe;

	bool phase_change;

	bool deferred_arm, deferred_sol;

	bool first_arm;



	spinlock_t cq_lock ____cacheline_aligned; /* provide synchronization

						   * to cq polling

						   */

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+4 −14
Original line number Diff line number Diff line
@@ -1094,7 +1094,6 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev, 
	spin_lock_init(&cq->comp_handler_lock);

	INIT_LIST_HEAD(&cq->sq_head);

	INIT_LIST_HEAD(&cq->rq_head);

	cq->first_arm = true;



	if (ib_ctx) {

		uctx = get_ocrdma_ucontext(ib_ctx);
@@ -2910,12 +2909,9 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries, 
	}

stop_cqe:

	cq->getp = cur_getp;

	if (cq->deferred_arm || polled_hw_cqes) {

		ocrdma_ring_cq_db(dev, cq->id, cq->deferred_arm,

				  cq->deferred_sol, polled_hw_cqes);

		cq->deferred_arm = false;

		cq->deferred_sol = false;

	}



	if (polled_hw_cqes)

		ocrdma_ring_cq_db(dev, cq->id, false, false, polled_hw_cqes);



	return i;

}
@@ -2999,13 +2995,7 @@ int ocrdma_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags cq_flags) 
	if (cq_flags & IB_CQ_SOLICITED)

		sol_needed = true;



	if (cq->first_arm) {

	ocrdma_ring_cq_db(dev, cq_id, arm_needed, sol_needed, 0);

		cq->first_arm = false;

	}



	cq->deferred_arm = true;

	cq->deferred_sol = sol_needed;

	spin_unlock_irqrestore(&cq->cq_lock, flags);



	return 0;