iommu/amd: Optimize amd_iommu_iova_to_phys for new fetch_pte interface

Now that fetch_pte returns the page-size of the pte, this
function can be optimized too.

Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index f97441b6aaadce255004dad66e23e1455d296f46..7a00e5d40eb629fde64076927926f4bfd32e50ec 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3375,7 +3375,6 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
 {
        struct protection_domain *domain = dom->priv;
        unsigned long offset_mask, pte_pgsize;
-       phys_addr_t paddr;
        u64 *pte, __pte;
 
        if (domain->mode == PAGE_MODE_NONE)
@@ -3386,15 +3385,10 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
        if (!pte || !IOMMU_PTE_PRESENT(*pte))
                return 0;
 
-       if (PM_PTE_LEVEL(*pte) == 0)
-               offset_mask = PAGE_SIZE - 1;
-       else
-               offset_mask = PTE_PAGE_SIZE(*pte) - 1;
-
-       __pte = *pte & PM_ADDR_MASK;
-       paddr = (__pte & ~offset_mask) | (iova & offset_mask);
+       offset_mask = pte_pgsize - 1;
+       __pte       = *pte & PM_ADDR_MASK;
 
-       return paddr;
+       return (__pte & ~offset_mask) | (iova & offset_mask);
 }
 
 static bool amd_iommu_capable(enum iommu_cap cap)