iommu/core: stop converting bytes to page order back and forth

Express sizes in bytes rather than in page order, to eliminate the
size->order->size conversions we have whenever the IOMMU API is calling
the low level drivers' map/unmap methods.

Adopt all existing drivers.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: David Brown <davidb@codeaurora.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Joerg Roedel <Joerg.Roedel@amd.com>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Cc: KyongHo Cho <pullip.cho@samsung.com>
Cc: Hiroshi DOYU <hdoyu@nvidia.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 5865dd2e28f9..13718d958da8 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -352,7 +352,7 @@ fail:
 }
 
 static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
-                         phys_addr_t pa, int order, int prot)
+                         phys_addr_t pa, size_t len, int prot)
 {
         struct msm_priv *priv;
         unsigned long flags;
@@ -363,7 +363,6 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
         unsigned long *sl_pte;
         unsigned long sl_offset;
         unsigned int pgprot;
-        size_t len = 0x1000UL << order;
         int ret = 0, tex, sh;
 
         spin_lock_irqsave(&msm_iommu_lock, flags);
@@ -463,8 +462,8 @@ fail:
         return ret;
 }
 
-static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
-                            int order)
+static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
+                            size_t len)
 {
         struct msm_priv *priv;
         unsigned long flags;
@@ -474,7 +473,6 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
         unsigned long *sl_table;
         unsigned long *sl_pte;
         unsigned long sl_offset;
-        size_t len = 0x1000UL << order;
         int i, ret = 0;
 
         spin_lock_irqsave(&msm_iommu_lock, flags);
@@ -544,15 +542,12 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         ret = __flush_iotlb(domain);
 
-        /*
-         * the IOMMU API requires us to return the order of the unmapped
-         * page (on success).
-         */
-        if (!ret)
-                ret = order;
 fail:
         spin_unlock_irqrestore(&msm_iommu_lock, flags);
-        return ret;
+
+        /* the IOMMU API requires us to return how many bytes were unmapped */
+        len = ret ? 0 : len;
+        return len;
 }
 
 static phys_addr_t msm_iommu_iova_to_phys(struct iommu_domain *domain,