diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-04-01 15:58:50 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-04-02 14:31:08 +0300 |
| commit | 5d7c94c3f4f20964b217d64ee44a9a08320c315a (patch) | |
| tree | f8100a32e161166db6547d92819fbb64cc28e73a /drivers/iommu/amd_iommu.c | |
| parent | 71b390e9bec5121d25c45326ff0b0b96a143f9a8 (diff) | |
| download | linux-5d7c94c3f4f20964b217d64ee44a9a08320c315a.tar.xz | |
iommu/amd: Optimize alloc_new_range for new fetch_pte interface
Now that fetch_pte returns the page-size of the pte, the
call in this function can also be optimized a little bit.
Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index c9ee444d8209..f97441b6aaad 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1591,7 +1591,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, { int index = dma_dom->aperture_size >> APERTURE_RANGE_SHIFT; struct amd_iommu *iommu; - unsigned long i, old_size; + unsigned long i, old_size, pte_pgsize; #ifdef CONFIG_IOMMU_STRESS populate = false; @@ -1664,13 +1664,13 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, */ for (i = dma_dom->aperture[index]->offset; i < dma_dom->aperture_size; - i += PAGE_SIZE) { - unsigned long pte_pgsize; + i += pte_pgsize) { u64 *pte = fetch_pte(&dma_dom->domain, i, &pte_pgsize); if (!pte || !IOMMU_PTE_PRESENT(*pte)) continue; - dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, 1); + dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, + pte_pgsize >> 12); } update_domain(&dma_dom->domain); |