Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fecea0ab3415bfab9a1964690e53b10c5d8f2e46
Commit:     fecea0ab3415bfab9a1964690e53b10c5d8f2e46
Parent:     18115f45374d19ada218fc013aa5308baf5d283e
Author:     Stefan Roscher <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 31 16:02:59 2007 +0200
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Fri Aug 31 13:56:42 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
---
 drivers/infiniband/hw/ehca/ehca_qp.c   |   10 ++++++----
 drivers/infiniband/hw/ehca/ipz_pt_fn.c |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c 
b/drivers/infiniband/hw/ehca/ehca_qp.c
index b178cba..84d435a 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp(
 
        if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap)
            && !(context && udata)) { /* no small QP support in userspace ATM */
-               ehca_determine_small_queue(
-                       &parms.squeue, max_send_sge, is_llqp);
-               ehca_determine_small_queue(
-                       &parms.rqueue, max_recv_sge, is_llqp);
+               if (HAS_SQ(my_qp))
+                       ehca_determine_small_queue(
+                               &parms.squeue, max_send_sge, is_llqp);
+               if (HAS_RQ(my_qp))
+                       ehca_determine_small_queue(
+                               &parms.rqueue, max_recv_sge, is_llqp);
                parms.qp_storage =
                        (parms.squeue.is_small || parms.rqueue.is_small);
        }
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c 
b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index a090c67..29bd476 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, 
struct ehca_pd *pd)
        unsigned long bit;
        int free_page = 0;
 
-       bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK)
+       bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK)
                >> (order + 9);
 
        mutex_lock(&pd->lock);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to