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

Commit 309c68cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor
parents 705af309 ab28b171

drivers/infiniband/hw/mthca/mthca_srq.c

+21 −20
Original line number Diff line number Diff line
@@ -490,26 +490,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 


	first_ind = srq->first_free;



	for (nreq = 0; wr; ++nreq, wr = wr->next) {

		if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {

			nreq = 0;



			doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);

			doorbell[1] = cpu_to_be32(srq->srqn << 8);



			/*

			 * Make sure that descriptors are written

			 * before doorbell is rung.

			 */

			wmb();



			mthca_write64(doorbell,

				      dev->kar + MTHCA_RECEIVE_DOORBELL,

				      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));



			first_ind = srq->first_free;

		}



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

		ind = srq->first_free;



		if (ind < 0) {
@@ -569,6 +550,26 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 


		srq->wrid[ind]  = wr->wr_id;

		srq->first_free = next_ind;



		++nreq;

		if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {

			nreq = 0;



			doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);

			doorbell[1] = cpu_to_be32(srq->srqn << 8);



			/*

			 * Make sure that descriptors are written

			 * before doorbell is rung.

			 */

			wmb();



			mthca_write64(doorbell,

				      dev->kar + MTHCA_RECEIVE_DOORBELL,

				      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));



			first_ind = srq->first_free;

		}

	}



	if (likely(nreq)) {