3 files changed, 114 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index d9fc822a1468..d8287d9db41e 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -607,6 +607,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         ibdev->ib_dev.detach_mcast      = mlx4_ib_mcg_detach;
         ibdev->ib_dev.process_mad       = mlx4_ib_process_mad;
 
+        ibdev->ib_dev.alloc_fmr         = mlx4_ib_fmr_alloc;
+        ibdev->ib_dev.map_phys_fmr      = mlx4_ib_map_phys_fmr;
+        ibdev->ib_dev.unmap_fmr         = mlx4_ib_unmap_fmr;
+        ibdev->ib_dev.dealloc_fmr       = mlx4_ib_fmr_dealloc;
+
         if (init_node_data(ibdev))
                 goto err_map;
 
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index 705ff2fa237e..28697653a370 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -93,6 +93,11 @@ struct mlx4_ib_mr {
         struct ib_umem         *umem;
 };
 
+struct mlx4_ib_fmr {
+        struct ib_fmr           ibfmr;
+        struct mlx4_fmr         mfmr;
+};
+
 struct mlx4_ib_wq {
         u64                    *wrid;
         spinlock_t              lock;
@@ -199,6 +204,10 @@ static inline struct mlx4_ib_mr *to_mmr(struct ib_mr *ibmr)
         return container_of(ibmr, struct mlx4_ib_mr, ibmr);
 }
 
+static inline struct mlx4_ib_fmr *to_mfmr(struct ib_fmr *ibfmr)
+{
+        return container_of(ibfmr, struct mlx4_ib_fmr, ibfmr);
+}
 static inline struct mlx4_ib_qp *to_mqp(struct ib_qp *ibqp)
 {
         return container_of(ibqp, struct mlx4_ib_qp, ibqp);
@@ -284,6 +293,13 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags,	u8 port_num,
 int mlx4_ib_mad_init(struct mlx4_ib_dev *dev);
 void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev);
 
+struct ib_fmr *mlx4_ib_fmr_alloc(struct ib_pd *pd, int mr_access_flags,
+                                  struct ib_fmr_attr *fmr_attr);
+int mlx4_ib_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list, int npages,
+                         u64 iova);
+int mlx4_ib_unmap_fmr(struct list_head *fmr_list);
+int mlx4_ib_fmr_dealloc(struct ib_fmr *fmr);
+
 static inline int mlx4_ib_ah_grh_present(struct mlx4_ib_ah *ah)
 {
         return !!(ah->av.g_slid & 0x80);
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 734ec2bd15cd..7dc91a3e712d 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -181,3 +181,96 @@ int mlx4_ib_dereg_mr(struct ib_mr *ibmr)
 
         return 0;
 }
+
+struct ib_fmr *mlx4_ib_fmr_alloc(struct ib_pd *pd, int acc,
+                                 struct ib_fmr_attr *fmr_attr)
+{
+        struct mlx4_ib_dev *dev = to_mdev(pd->device);
+        struct mlx4_ib_fmr *fmr;
+        int err = -ENOMEM;
+
+        fmr = kmalloc(sizeof *fmr, GFP_KERNEL);
+        if (!fmr)
+                return ERR_PTR(-ENOMEM);
+
+        err = mlx4_fmr_alloc(dev->dev, to_mpd(pd)->pdn, convert_access(acc),
+                             fmr_attr->max_pages, fmr_attr->max_maps,
+                             fmr_attr->page_shift, &fmr->mfmr);
+        if (err)
+                goto err_free;
+
+        err = mlx4_mr_enable(to_mdev(pd->device)->dev, &fmr->mfmr.mr);
+        if (err)
+                goto err_mr;
+
+        fmr->ibfmr.rkey = fmr->ibfmr.lkey = fmr->mfmr.mr.key;
+
+        return &fmr->ibfmr;
+
+err_mr:
+        mlx4_mr_free(to_mdev(pd->device)->dev, &fmr->mfmr.mr);
+
+err_free:
+        kfree(fmr);
+
+        return ERR_PTR(err);
+}
+
+int mlx4_ib_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
+                      int npages, u64 iova)
+{
+        struct mlx4_ib_fmr *ifmr = to_mfmr(ibfmr);
+        struct mlx4_ib_dev *dev = to_mdev(ifmr->ibfmr.device);
+
+        return mlx4_map_phys_fmr(dev->dev, &ifmr->mfmr, page_list, npages, iova,
+                                 &ifmr->ibfmr.lkey, &ifmr->ibfmr.rkey);
+}
+
+int mlx4_ib_unmap_fmr(struct list_head *fmr_list)
+{
+        struct ib_fmr *ibfmr;
+        int err;
+        struct mlx4_dev *mdev = NULL;
+
+        list_for_each_entry(ibfmr, fmr_list, list) {
+                if (mdev && to_mdev(ibfmr->device)->dev != mdev)
+                        return -EINVAL;
+                mdev = to_mdev(ibfmr->device)->dev;
+        }
+
+        if (!mdev)
+                return 0;
+
+        list_for_each_entry(ibfmr, fmr_list, list) {
+                struct mlx4_ib_fmr *ifmr = to_mfmr(ibfmr);
+
+                mlx4_fmr_unmap(mdev, &ifmr->mfmr, &ifmr->ibfmr.lkey, &ifmr->ibfmr.rkey);
+        }
+
+        /*
+         * Make sure all MPT status updates are visible before issuing
+         * SYNC_TPT firmware command.
+         */
+        wmb();
+
+        err = mlx4_SYNC_TPT(mdev);
+        if (err)
+                printk(KERN_WARNING "mlx4_ib: SYNC_TPT error %d when "
+                       "unmapping FMRs\n", err);
+
+        return 0;
+}
+
+int mlx4_ib_fmr_dealloc(struct ib_fmr *ibfmr)
+{
+        struct mlx4_ib_fmr *ifmr = to_mfmr(ibfmr);
+        struct mlx4_ib_dev *dev = to_mdev(ibfmr->device);
+        int err;
+
+        err = mlx4_fmr_free(dev->dev, &ifmr->mfmr);
+
+        if (!err)
+                kfree(ifmr);
+
+        return err;
+}