iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages()

[linux-2.6-microblaze.git] / drivers / iommu / io-pgtable-arm-v7s.c

diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index d4004bc..5db90d7 100644 (file)
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -519,11 +519,12 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,
        return __arm_v7s_map(data, iova, paddr, size, prot, lvl + 1, cptep, gfp);
 }
 
-static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
-                       phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
+static int arm_v7s_map_pages(struct io_pgtable_ops *ops, unsigned long iova,
+                            phys_addr_t paddr, size_t pgsize, size_t pgcount,
+                            int prot, gfp_t gfp, size_t *mapped)
 {
        struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
-       int ret;
+       int ret = -EINVAL;
 
        if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
                    paddr >= (1ULL << data->iop.cfg.oas)))
@@ -533,7 +534,17 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
        if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
                return 0;
 
-       ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
+       while (pgcount--) {
+               ret = __arm_v7s_map(data, iova, paddr, pgsize, prot, 1, data->pgd,
+                                   gfp);
+               if (ret)
+                       break;
+
+               iova += pgsize;
+               paddr += pgsize;
+               if (mapped)
+                       *mapped += pgsize;
+       }
        /*
         * Synchronise all PTE updates for the new mapping before there's
         * a chance for anything to kick off a table walk for the new iova.
@@ -543,6 +554,12 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
        return ret;
 }
 
+static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
+                      phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
+{
+       return arm_v7s_map_pages(ops, iova, paddr, size, 1, prot, gfp, NULL);
+}
+
 static void arm_v7s_free_pgtable(struct io_pgtable *iop)
 {
        struct arm_v7s_io_pgtable *data = io_pgtable_to_data(iop);
@@ -710,15 +727,32 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
        return __arm_v7s_unmap(data, gather, iova, size, lvl + 1, ptep);
 }
 
-static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,
-                           size_t size, struct iommu_iotlb_gather *gather)
+static size_t arm_v7s_unmap_pages(struct io_pgtable_ops *ops, unsigned long iova,
+                                 size_t pgsize, size_t pgcount,
+                                 struct iommu_iotlb_gather *gather)
 {
        struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
+       size_t unmapped = 0, ret;
 
        if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias)))
                return 0;
 
-       return __arm_v7s_unmap(data, gather, iova, size, 1, data->pgd);
+       while (pgcount--) {
+               ret = __arm_v7s_unmap(data, gather, iova, pgsize, 1, data->pgd);
+               if (!ret)
+                       break;
+
+               unmapped += pgsize;
+               iova += pgsize;
+       }
+
+       return unmapped;
+}
+
+static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,
+                           size_t size, struct iommu_iotlb_gather *gather)
+{
+       return arm_v7s_unmap_pages(ops, iova, size, 1, gather);
 }
 
 static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,
@@ -780,7 +814,9 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 
        data->iop.ops = (struct io_pgtable_ops) {
                .map            = arm_v7s_map,
+               .map_pages      = arm_v7s_map_pages,
                .unmap          = arm_v7s_unmap,
+               .unmap_pages    = arm_v7s_unmap_pages,
                .iova_to_phys   = arm_v7s_iova_to_phys,
        };