1 files changed, 63 insertions, 107 deletions

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 44cb513f9a87..137880a19ebe 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -51,6 +51,7 @@ atomic_t qps_created;
 atomic_t sw_qps_destroyed;
 
 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
+static int nes_dereg_mr(struct ib_mr *ib_mr);
 
 /**
  * nes_alloc_mw
@@ -443,79 +444,46 @@ static struct ib_mr *nes_alloc_mr(struct ib_pd *ibpd,
         } else {
                 kfree(nesmr);
                 nes_free_resource(nesadapter, nesadapter->allocated_mrs, stag_index);
-                ibmr = ERR_PTR(-ENOMEM);
+                return ERR_PTR(-ENOMEM);
         }
+
+        nesmr->pages = pci_alloc_consistent(nesdev->pcidev,
+                                            max_num_sg * sizeof(u64),
+                                            &nesmr->paddr);
+        if (!nesmr->paddr)
+                goto err;
+
+        nesmr->max_pages = max_num_sg;
+
         return ibmr;
+
+err:
+        nes_dereg_mr(ibmr);
+
+        return ERR_PTR(-ENOMEM);
 }
 
-/*
- * nes_alloc_fast_reg_page_list
- */
-static struct ib_fast_reg_page_list *nes_alloc_fast_reg_page_list(
-                                                        struct ib_device *ibdev,
-                                                        int page_list_len)
+static int nes_set_page(struct ib_mr *ibmr, u64 addr)
 {
-        struct nes_vnic *nesvnic = to_nesvnic(ibdev);
-        struct nes_device *nesdev = nesvnic->nesdev;
-        struct ib_fast_reg_page_list *pifrpl;
-        struct nes_ib_fast_reg_page_list *pnesfrpl;
+        struct nes_mr *nesmr = to_nesmr(ibmr);
 
-        if (page_list_len > (NES_4K_PBL_CHUNK_SIZE / sizeof(u64)))
-                return ERR_PTR(-E2BIG);
-        /*
-         * Allocate the ib_fast_reg_page_list structure, the
-         * nes_fast_bpl structure, and the PLB table.
-         */
-        pnesfrpl = kmalloc(sizeof(struct nes_ib_fast_reg_page_list) +
-                           page_list_len * sizeof(u64), GFP_KERNEL);
-
-        if (!pnesfrpl)
-                return ERR_PTR(-ENOMEM);
+        if (unlikely(nesmr->npages == nesmr->max_pages))
+                return -ENOMEM;
 
-        pifrpl = &pnesfrpl->ibfrpl;
-        pifrpl->page_list = &pnesfrpl->pbl;
-        pifrpl->max_page_list_len = page_list_len;
-        /*
-         * Allocate the WQE PBL
-         */
-        pnesfrpl->nes_wqe_pbl.kva = pci_alloc_consistent(nesdev->pcidev,
-                                                         page_list_len * sizeof(u64),
-                                                         &pnesfrpl->nes_wqe_pbl.paddr);
+        nesmr->pages[nesmr->npages++] = cpu_to_le64(addr);
 
-        if (!pnesfrpl->nes_wqe_pbl.kva) {
-                kfree(pnesfrpl);
-                return ERR_PTR(-ENOMEM);
-        }
-        nes_debug(NES_DBG_MR, "nes_alloc_fast_reg_pbl: nes_frpl = %p, "
-                  "ibfrpl = %p, ibfrpl.page_list = %p, pbl.kva = %p, "
-                  "pbl.paddr = %llx\n", pnesfrpl, &pnesfrpl->ibfrpl,
-                  pnesfrpl->ibfrpl.page_list, pnesfrpl->nes_wqe_pbl.kva,
-                  (unsigned long long) pnesfrpl->nes_wqe_pbl.paddr);
-
-        return pifrpl;
+        return 0;
 }
 
-/*
- * nes_free_fast_reg_page_list
- */
-static void nes_free_fast_reg_page_list(struct ib_fast_reg_page_list *pifrpl)
+static int nes_map_mr_sg(struct ib_mr *ibmr,
+                         struct scatterlist *sg,
+                         int sg_nents)
 {
-        struct nes_vnic *nesvnic = to_nesvnic(pifrpl->device);
-        struct nes_device *nesdev = nesvnic->nesdev;
-        struct nes_ib_fast_reg_page_list *pnesfrpl;
+        struct nes_mr *nesmr = to_nesmr(ibmr);
 
-        pnesfrpl = container_of(pifrpl, struct nes_ib_fast_reg_page_list, ibfrpl);
-        /*
-         * Free the WQE PBL.
-         */
-        pci_free_consistent(nesdev->pcidev,
-                            pifrpl->max_page_list_len * sizeof(u64),
-                            pnesfrpl->nes_wqe_pbl.kva,
-                            pnesfrpl->nes_wqe_pbl.paddr);
-        /*
-         * Free the PBL structure
-         */
-        kfree(pnesfrpl);
+        nesmr->npages = 0;
+
+        return ib_sg_to_pages(ibmr, sg, sg_nents, nes_set_page);
 }
 
 /**
@@ -2683,6 +2651,13 @@ static int nes_dereg_mr(struct ib_mr *ib_mr)
         u16 major_code;
         u16 minor_code;
 
+
+        if (nesmr->pages)
+                pci_free_consistent(nesdev->pcidev,
+                                    nesmr->max_pages * sizeof(u64),
+                                    nesmr->pages,
+                                    nesmr->paddr);
+
         if (nesmr->region) {
                 ib_umem_release(nesmr->region);
         }
@@ -3372,9 +3347,9 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                 wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;
 
                         set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
-                                            ib_wr->wr.rdma.rkey);
+                                            rdma_wr(ib_wr)->rkey);
                         set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
-                                            ib_wr->wr.rdma.remote_addr);
+                                            rdma_wr(ib_wr)->remote_addr);
 
                         if ((ib_wr->send_flags & IB_SEND_INLINE) &&
                             ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&
@@ -3409,9 +3384,9 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                         }
 
                         set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
-                                            ib_wr->wr.rdma.remote_addr);
+                                            rdma_wr(ib_wr)->remote_addr);
                         set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
-                                            ib_wr->wr.rdma.rkey);
+                                            rdma_wr(ib_wr)->rkey);
                         set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX,
                                             ib_wr->sg_list->length);
                         set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_FRAG0_LOW_IDX,
@@ -3425,19 +3400,13 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                             NES_IWARP_SQ_LOCINV_WQE_INV_STAG_IDX,
                                             ib_wr->ex.invalidate_rkey);
                         break;
-                case IB_WR_FAST_REG_MR:
+                case IB_WR_REG_MR:
                 {
-                        int i;
-                        int flags = ib_wr->wr.fast_reg.access_flags;
-                        struct nes_ib_fast_reg_page_list *pnesfrpl =
-                                container_of(ib_wr->wr.fast_reg.page_list,
-                                             struct nes_ib_fast_reg_page_list,
-                                             ibfrpl);
-                        u64 *src_page_list = pnesfrpl->ibfrpl.page_list;
-                        u64 *dst_page_list = pnesfrpl->nes_wqe_pbl.kva;
-
-                        if (ib_wr->wr.fast_reg.page_list_len >
-                            (NES_4K_PBL_CHUNK_SIZE / sizeof(u64))) {
+                        struct nes_mr *mr = to_nesmr(reg_wr(ib_wr)->mr);
+                        int page_shift = ilog2(reg_wr(ib_wr)->mr->page_size);
+                        int flags = reg_wr(ib_wr)->access;
+
+                        if (mr->npages > (NES_4K_PBL_CHUNK_SIZE / sizeof(u64))) {
                                 nes_debug(NES_DBG_IW_TX, "SQ_FMR: bad page_list_len\n");
                                 err = -EINVAL;
                                 break;
@@ -3445,19 +3414,19 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                         wqe_misc = NES_IWARP_SQ_OP_FAST_REG;
                         set_wqe_64bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_VA_FBO_LOW_IDX,
-                                            ib_wr->wr.fast_reg.iova_start);
+                                            mr->ibmr.iova);
                         set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX,
-                                            ib_wr->wr.fast_reg.length);
+                                            mr->ibmr.length);
                         set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_LENGTH_HIGH_IDX, 0);
                         set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX,
-                                            ib_wr->wr.fast_reg.rkey);
-                        /* Set page size: */
-                        if (ib_wr->wr.fast_reg.page_shift == 12) {
+                                            reg_wr(ib_wr)->key);
+
+                        if (page_shift == 12) {
                                 wqe_misc |= NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_4K;
-                        } else if (ib_wr->wr.fast_reg.page_shift == 21) {
+                        } else if (page_shift == 21) {
                                 wqe_misc |= NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_2M;
                         } else {
                                 nes_debug(NES_DBG_IW_TX, "Invalid page shift,"
@@ -3465,6 +3434,7 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                 err = -EINVAL;
                                 break;
                         }
+
                         /* Set access_flags */
                         wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_LOCAL_READ;
                         if (flags & IB_ACCESS_LOCAL_WRITE)
@@ -3480,35 +3450,22 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                 wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_WINDOW_BIND;
 
                         /* Fill in PBL info: */
-                        if (ib_wr->wr.fast_reg.page_list_len >
-                            pnesfrpl->ibfrpl.max_page_list_len) {
-                                nes_debug(NES_DBG_IW_TX, "Invalid page list length,"
-                                          " ib_wr=%p, value=%u, max=%u\n",
-                                          ib_wr, ib_wr->wr.fast_reg.page_list_len,
-                                          pnesfrpl->ibfrpl.max_page_list_len);
-                                err = -EINVAL;
-                                break;
-                        }
-
                         set_wqe_64bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_PBL_ADDR_LOW_IDX,
-                                            pnesfrpl->nes_wqe_pbl.paddr);
+                                            mr->paddr);
 
                         set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_PBL_LENGTH_IDX,
-                                            ib_wr->wr.fast_reg.page_list_len * 8);
-
-                        for (i = 0; i < ib_wr->wr.fast_reg.page_list_len; i++)
-                                dst_page_list[i] = cpu_to_le64(src_page_list[i]);
+                                            mr->npages * 8);
 
-                        nes_debug(NES_DBG_IW_TX, "SQ_FMR: iova_start: %llx, "
+                        nes_debug(NES_DBG_IW_TX, "SQ_REG_MR: iova_start: %llx, "
                                   "length: %d, rkey: %0x, pgl_paddr: %llx, "
                                   "page_list_len: %u, wqe_misc: %x\n",
-                                  (unsigned long long) ib_wr->wr.fast_reg.iova_start,
-                                  ib_wr->wr.fast_reg.length,
-                                  ib_wr->wr.fast_reg.rkey,
-                                  (unsigned long long) pnesfrpl->nes_wqe_pbl.paddr,
-                                  ib_wr->wr.fast_reg.page_list_len,
+                                  (unsigned long long) mr->ibmr.iova,
+                                  mr->ibmr.length,
+                                  reg_wr(ib_wr)->key,
+                                  (unsigned long long) mr->paddr,
+                                  mr->npages,
                                   wqe_misc);
                         break;
                 }
@@ -3751,7 +3708,7 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
                                                 entry->opcode = IB_WC_LOCAL_INV;
                                                 break;
                                         case NES_IWARP_SQ_OP_FAST_REG:
-                                                entry->opcode = IB_WC_FAST_REG_MR;
+                                                entry->opcode = IB_WC_REG_MR;
                                                 break;
                                 }
 
@@ -3939,8 +3896,7 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
         nesibdev->ibdev.bind_mw = nes_bind_mw;
 
         nesibdev->ibdev.alloc_mr = nes_alloc_mr;
-        nesibdev->ibdev.alloc_fast_reg_page_list = nes_alloc_fast_reg_page_list;
-        nesibdev->ibdev.free_fast_reg_page_list = nes_free_fast_reg_page_list;
+        nesibdev->ibdev.map_mr_sg = nes_map_mr_sg;
 
         nesibdev->ibdev.attach_mcast = nes_multicast_attach;
         nesibdev->ibdev.detach_mcast = nes_multicast_detach;