IB/mlx5: Modify to work with arbitrary page size

When dealing with umem objects, the driver assumed host page sizes
defined by PAGE_SHIFT.  Modify the code to use arbitrary page shift
provided by umem->page_shift to support different page sizes.

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c
index a3e81444c82519b6e3b7305ac6cb5911a69b20ce..dae07eae95073b8d08b42de972e62600560d17e3 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mem.c
+++ b/drivers/infiniband/hw/mlx5/mem.c
@@ -55,16 +55,17 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift,
        u64 pfn;
        struct scatterlist *sg;
        int entry;
+       unsigned long page_shift = ilog2(umem->page_size);
 
-       addr = addr >> PAGE_SHIFT;
+       addr = addr >> page_shift;
        tmp = (unsigned long)addr;
        m = find_first_bit(&tmp, sizeof(tmp));
        skip = 1 << m;
        mask = skip - 1;
        i = 0;
        for_each_sg(umem->sg_head.sgl, sg, umem->nmap, entry) {
-               len = sg_dma_len(sg) >> PAGE_SHIFT;
-               pfn = sg_dma_address(sg) >> PAGE_SHIFT;
+               len = sg_dma_len(sg) >> page_shift;
+               pfn = sg_dma_address(sg) >> page_shift;
                for (k = 0; k < len; k++) {
                        if (!(i & mask)) {
                                tmp = (unsigned long)pfn;
@@ -103,14 +104,15 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift,
 
                *ncont = 0;
        }
-       *shift = PAGE_SHIFT + m;
+       *shift = page_shift + m;
        *count = i;
 }
 
 void mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
                          int page_shift, __be64 *pas, int umr)
 {
-       int shift = page_shift - PAGE_SHIFT;
+       unsigned long umem_page_shift = ilog2(umem->page_size);
+       int shift = page_shift - umem_page_shift;
        int mask = (1 << shift) - 1;
        int i, k;
        u64 cur = 0;
@@ -121,11 +123,11 @@ void mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
 
        i = 0;
        for_each_sg(umem->sg_head.sgl, sg, umem->nmap, entry) {
-               len = sg_dma_len(sg) >> PAGE_SHIFT;
+               len = sg_dma_len(sg) >> umem_page_shift;
                base = sg_dma_address(sg);
                for (k = 0; k < len; k++) {
                        if (!(i & mask)) {
-                               cur = base + (k << PAGE_SHIFT);
+                               cur = base + (k << umem_page_shift);
                                if (umr)
                                        cur |= 3;
 
@@ -134,7 +136,7 @@ void mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
                                            i >> shift, be64_to_cpu(pas[i >> shift]));
                        }  else
                                mlx5_ib_dbg(dev, "=====> 0x%llx\n",
-                                           base + (k << PAGE_SHIFT));
+                                           base + (k << umem_page_shift));
                        i++;
                }
        }