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 has a couple of mthca driver bug fixes:
Michael S. Tsirkin:
IB/mthca: restore missing PCI registers after reset IB/mthca: memfree completion with error FW bug workaround
drivers/infiniband/hw/mthca/mthca_cq.c | 11 +++++ drivers/infiniband/hw/mthca/mthca_reset.c | 59 +++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-)
drivers/infiniband/hw/mthca/mthca_cq.c +10 -1
@@ -540,8 +540,17 @@ static inline int mthca_poll_one(struct entry->wr_id = srq->wrid[wqe_index];mthca_free_srq_wqe (srq, wqe); }else { +s32 wqe; wq = &(*cur_qp)->rq; - wqe_index =be32_to_cpu (cqe->wqe) >> wq->wqe_shift; + wqe =be32_to_cpu (cqe->wqe); + wqe_index = wqe >> wq->wqe_shift; +/* +* WQE addr == base - 1 might be reported in receive completion +* with error instead of (rq size - 1) by Sinai FW 1.0.800 and +* Arbel FW 5.1.400. This bug should be fixed in later FW revs. +*/ +if (unlikely (wqe_index <0 )) + wqe_index = wq->max -1 ; entry->wr_id = (*cur_qp)->wrid[wqe_index]; }
drivers/infiniband/hw/mthca/mthca_reset.c +59 -0
89 lines not on this page · raw message