please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree has one bug fix (really the second half of a fix for a bug that appeared two different places):
Michael S. Tsirkin:
IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor
drivers/infiniband/hw/mthca/mthca_srq.c | 41 ++++++++++++++++--------------- 1 files changed, 21 insertions(+), 20 deletions(-)
drivers/infiniband/hw/mthca/mthca_srq.c +21 -20
@@ -490,26 +490,7 @@ int mthca_tavor_post_srq_recv(struct ib_ 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->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)) {