Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

intel-iommu: Clean up intel_iommu_unmap_range()

Browse Source 
Use unaligned address for domain->max_addr. That algorithm isn't ideal
anyway -- we should probably just look at the last iova in the tree.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-06-28 00:51:17 +01:00
parent d794dc9b30
commit 163cc52ccd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pci/intel-iommu.c
View File

@ -3491,7 +3491,7 @@ static int intel_iommu_map_range(struct iommu_domain *domain,
if ((iommu_prot & IOMMU_CACHE) && dmar_domain->iommu_snooping) if ((iommu_prot & IOMMU_CACHE) && dmar_domain->iommu_snooping)
prot |= DMA_PTE_SNP; prot |= DMA_PTE_SNP;
max_addr = (iova & VTD_PAGE_MASK) + VTD_PAGE_ALIGN(size); max_addr = iova + size;
if (dmar_domain->max_addr < max_addr) { if (dmar_domain->max_addr < max_addr) {
int min_agaw; int min_agaw;
u64 end; u64 end;
@ -3518,16 +3518,12 @@ static void intel_iommu_unmap_range(struct iommu_domain *domain,
unsigned long iova, size_t size) unsigned long iova, size_t size)
{ {
struct dmar_domain *dmar_domain = domain->priv; struct dmar_domain *dmar_domain = domain->priv;
dma_addr_t base;
/* The address might not be aligned */ dma_pte_clear_range(dmar_domain, iova >> VTD_PAGE_SHIFT,
base = iova & VTD_PAGE_MASK; (iova + size - 1) >> VTD_PAGE_SHIFT);
size = VTD_PAGE_ALIGN(size);
dma_pte_clear_range(dmar_domain, base >> VTD_PAGE_SHIFT,
(base + size - 1) >> VTD_PAGE_SHIFT);
if (dmar_domain->max_addr == base + size) if (dmar_domain->max_addr == iova + size)
dmar_domain->max_addr = base; dmar_domain->max_addr = iova;
} }
static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,