IB/ehca: Fix Small QP regressions

The new Small QP code had a few bugs that would also make it trigger
for non-Small QPs.  Fix them.

Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Stefan Roscher 2007-08-31 16:02:59 +02:00 committed by Roland Dreier
parent 18115f4537
commit fecea0ab34
2 changed files with 7 additions and 5 deletions

View File

@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp(
if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap) if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap)
&& !(context && udata)) { /* no small QP support in userspace ATM */ && !(context && udata)) { /* no small QP support in userspace ATM */
ehca_determine_small_queue( if (HAS_SQ(my_qp))
&parms.squeue, max_send_sge, is_llqp); ehca_determine_small_queue(
ehca_determine_small_queue( &parms.squeue, max_send_sge, is_llqp);
&parms.rqueue, max_recv_sge, is_llqp); if (HAS_RQ(my_qp))
ehca_determine_small_queue(
&parms.rqueue, max_recv_sge, is_llqp);
parms.qp_storage = parms.qp_storage =
(parms.squeue.is_small || parms.rqueue.is_small); (parms.squeue.is_small || parms.rqueue.is_small);
} }

View File

@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd)
unsigned long bit; unsigned long bit;
int free_page = 0; int free_page = 0;
bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK) bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK)
>> (order + 9); >> (order + 9);
mutex_lock(&pd->lock); mutex_lock(&pd->lock);