From: Joerg Roedel Date: Wed, 1 Apr 2015 12:58:51 +0000 (+0200) Subject: iommu/amd: Optimize amd_iommu_iova_to_phys for new fetch_pte interface X-Git-Tag: v3.12.44~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=253b6d09b48fb739305f0b37676f1de607558e24;p=thirdparty%2Fkernel%2Fstable.git iommu/amd: Optimize amd_iommu_iova_to_phys for new fetch_pte interface commit b24b1b63a37d05d61601d643ef30f95dd2452048 upstream. Now that fetch_pte returns the page-size of the pte, this function can be optimized too. Tested-by: Suravee Suthikulpanit Signed-off-by: Joerg Roedel Signed-off-by: Jiri Slaby --- diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 9e91d8c38a1ec..db84a3c1254a4 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3432,7 +3432,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) @@ -3443,15 +3442,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 int amd_iommu_domain_has_cap(struct iommu_domain *domain,