[PATCH v2 09/13] iommu/amd: Rename variables to be consistent with struct io_pgtable_ops

[Suravee Suthikulpanit]

There is no functional change.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>
---
 drivers/iommu/amd/io_pgtable.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index a2acd7e85ec3..ff1294e8729d 100644
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -393,9 +393,9 @@ static struct page *free_clear_pte(u64 *pte, u64 pteval, 
struct page *freelist)
  * and full 64 bit address spaces.
  */
 int iommu_map_page(struct protection_domain *dom,
-                  unsigned long bus_addr,
-                  unsigned long phys_addr,
-                  unsigned long page_size,
+                  unsigned long iova,
+                  unsigned long paddr,
+                  unsigned long size,
                   int prot,
                   gfp_t gfp)
 {
@@ -404,15 +404,15 @@ int iommu_map_page(struct protection_domain *dom,
        u64 __pte, *pte;
        int ret, i, count;
 
-       BUG_ON(!IS_ALIGNED(bus_addr, page_size));
-       BUG_ON(!IS_ALIGNED(phys_addr, page_size));
+       BUG_ON(!IS_ALIGNED(iova, size));
+       BUG_ON(!IS_ALIGNED(paddr, size));
 
        ret = -EINVAL;
        if (!(prot & IOMMU_PROT_MASK))
                goto out;
 
-       count = PAGE_SIZE_PTE_COUNT(page_size);
-       pte   = alloc_pte(dom, bus_addr, page_size, NULL, gfp, &updated);
+       count = PAGE_SIZE_PTE_COUNT(size);
+       pte   = alloc_pte(dom, iova, size, NULL, gfp, &updated);
 
        ret = -ENOMEM;
        if (!pte)
@@ -425,10 +425,10 @@ int iommu_map_page(struct protection_domain *dom,
                updated = true;
 
        if (count > 1) {
-               __pte = PAGE_SIZE_PTE(__sme_set(phys_addr), page_size);
+               __pte = PAGE_SIZE_PTE(__sme_set(paddr), size);
                __pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_PR | IOMMU_PTE_FC;
        } else
-               __pte = __sme_set(phys_addr) | IOMMU_PTE_PR | IOMMU_PTE_FC;
+               __pte = __sme_set(paddr) | IOMMU_PTE_PR | IOMMU_PTE_FC;
 
        if (prot & IOMMU_PROT_IR)
                __pte |= IOMMU_PTE_IR;
@@ -462,20 +462,19 @@ int iommu_map_page(struct protection_domain *dom,
 }
 
 unsigned long iommu_unmap_page(struct protection_domain *dom,
-                              unsigned long bus_addr,
-                              unsigned long page_size)
+                              unsigned long iova,
+                              unsigned long size)
 {
        unsigned long long unmapped;
        unsigned long unmap_size;
        u64 *pte;
 
-       BUG_ON(!is_power_of_2(page_size));
+       BUG_ON(!is_power_of_2(size));
 
        unmapped = 0;
 
-       while (unmapped < page_size) {
-
-               pte = fetch_pte(dom, bus_addr, &unmap_size);
+       while (unmapped < size) {
+               pte = fetch_pte(dom, iova, &unmap_size);
 
                if (pte) {
                        int i, count;
@@ -485,7 +484,7 @@ unsigned long iommu_unmap_page(struct protection_domain 
*dom,
                                pte[i] = 0ULL;
                }
 
-               bus_addr  = (bus_addr & ~(unmap_size - 1)) + unmap_size;
+               iova = (iova & ~(unmap_size - 1)) + unmap_size;
                unmapped += unmap_size;
        }
 
-- 
2.17.1