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>

diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index b178cba963450cee28a72a01947d90fee63c48ef..84d435a5ee11951487084981e02c77a3ece16b50 100644 (file)
--- 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 a090c679c39787f70a181d674bab1940c2f7fe87..29bd476fbd54d3a4e9bff83a44b7ec559726ab88 100644 (file)
--- 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);