IB/mlx4: Implement FMRs

[cascardo/linux.git] / drivers / infiniband / hw / mlx4 / mr.c

diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 85ae906..7dc91a3 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -96,11 +96,10 @@ int mlx4_ib_umem_write_mtt(struct mlx4_ib_dev *dev, struct mlx4_mtt *mtt,
                                pages[i++] = sg_dma_address(&chunk->page_list[j]) +
                                        umem->page_size * k;
                                /*
-                                * Be friendly to WRITE_MTT firmware
-                                * command, and pass it chunks of
-                                * appropriate size.
+                                * Be friendly to mlx4_write_mtt() and
+                                * pass it chunks of appropriate size.
                                 */
-                               if (i == PAGE_SIZE / sizeof (u64) - 2) {
+                               if (i == PAGE_SIZE / sizeof (u64)) {
                                        err = mlx4_write_mtt(dev->dev, mtt, n,
                                                             i, pages);
                                        if (err)
@@ -182,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;
+}