diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2015-04-01 14:58:51 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-04-02 13:31:08 +0200 |
| commit | b24b1b63a37d05d61601d643ef30f95dd2452048 (patch) | |
| tree | ab66dfad2947c457d366cc28edfdf1e5013f3321 /drivers/iommu | |
| parent | iommu/amd: Optimize alloc_new_range for new fetch_pte interface (diff) | |
| download | linux-dev-b24b1b63a37d05d61601d643ef30f95dd2452048.tar.xz linux-dev-b24b1b63a37d05d61601d643ef30f95dd2452048.zip | |
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>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index f97441b6aaad..7a00e5d40eb6 100644 --- 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) |