1 files changed, 24 insertions, 22 deletions

diff --git a/drivers/infiniband/hw/qib/qib_mr.c b/drivers/infiniband/hw/qib/qib_mr.c
index 19220dcb9a3b..294f5c706be9 100644
--- a/drivers/infiniband/hw/qib/qib_mr.c
+++ b/drivers/infiniband/hw/qib/qib_mr.c
@@ -303,6 +303,7 @@ int qib_dereg_mr(struct ib_mr *ibmr)
         int ret = 0;
         unsigned long timeout;
 
+        kfree(mr->pages);
         qib_free_lkey(&mr->mr);
 
         qib_put_mr(&mr->mr); /* will set completion if last */
@@ -323,7 +324,7 @@ out:
 
 /*
  * Allocate a memory region usable with the
- * IB_WR_FAST_REG_MR send work request.
+ * IB_WR_REG_MR send work request.
  *
  * Return the memory region on success, otherwise return an errno.
  */
@@ -340,37 +341,38 @@ struct ib_mr *qib_alloc_mr(struct ib_pd *pd,
         if (IS_ERR(mr))
                 return (struct ib_mr *)mr;
 
+        mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
+        if (!mr->pages)
+                goto err;
+
         return &mr->ibmr;
+
+err:
+        qib_dereg_mr(&mr->ibmr);
+        return ERR_PTR(-ENOMEM);
 }
 
-struct ib_fast_reg_page_list *
-qib_alloc_fast_reg_page_list(struct ib_device *ibdev, int page_list_len)
+static int qib_set_page(struct ib_mr *ibmr, u64 addr)
 {
-        unsigned size = page_list_len * sizeof(u64);
-        struct ib_fast_reg_page_list *pl;
-
-        if (size > PAGE_SIZE)
-                return ERR_PTR(-EINVAL);
-
-        pl = kzalloc(sizeof(*pl), GFP_KERNEL);
-        if (!pl)
-                return ERR_PTR(-ENOMEM);
+        struct qib_mr *mr = to_imr(ibmr);
 
-        pl->page_list = kzalloc(size, GFP_KERNEL);
-        if (!pl->page_list)
-                goto err_free;
+        if (unlikely(mr->npages == mr->mr.max_segs))
+                return -ENOMEM;
 
-        return pl;
+        mr->pages[mr->npages++] = addr;
 
-err_free:
-        kfree(pl);
-        return ERR_PTR(-ENOMEM);
+        return 0;
 }
 
-void qib_free_fast_reg_page_list(struct ib_fast_reg_page_list *pl)
+int qib_map_mr_sg(struct ib_mr *ibmr,
+                  struct scatterlist *sg,
+                  int sg_nents)
 {
-        kfree(pl->page_list);
-        kfree(pl);
+        struct qib_mr *mr = to_imr(ibmr);
+
+        mr->npages = 0;
+
+        return ib_sg_to_pages(ibmr, sg, sg_nents, qib_set_page);
 }
 
 /**