Gitweb: http://git.kernel.org/linus/04b18e65dd5a3e544f07f4bcfa8fb52704a1833b
Commit: 04b18e65dd5a3e544f07f4bcfa8fb52704a1833b
Parent: 66eae8469e4e4ba6f4ca7ef82103c78f6d645583
Author: David Woodhouse <David.Woodhouse@intel.com>
AuthorDate: Sat Jun 27 19:15:01 2009 +0100
Committer: David Woodhouse <David.Woodhouse@intel.com>
CommitDate: Mon Jun 29 13:26:36 2009 +0100
intel-iommu: Make dma_pte_clear_range() use pfns
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
drivers/pci/intel-iommu.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index ad367f5..d4217f7 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -779,21 +779,17 @@ static void dma_pte_clear_one(struct dmar_domain *domain, unsigned long pfn)
/* clear last level pte, a tlb flush should be followed */
static void dma_pte_clear_range(struct dmar_domain *domain, u64 start, u64 end)
{
- int addr_width = agaw_to_width(domain->agaw);
- int npages;
-
- BUG_ON(start >> addr_width);
- BUG_ON((end-1) >> addr_width);
+ unsigned long start_pfn = IOVA_PFN(start);
+ unsigned long end_pfn = IOVA_PFN(end-1);
+ int addr_width = agaw_to_width(domain->agaw) - VTD_PAGE_SHIFT;
- /* in case it's partial page */
- start &= PAGE_MASK;
- end = PAGE_ALIGN(end);
- npages = (end - start) / VTD_PAGE_SIZE;
+ BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
+ BUG_ON(addr_width < BITS_PER_LONG && end_pfn >> addr_width);
- /* we don't need lock here, nobody else touches the iova range */
- while (npages--) {
- dma_pte_clear_one(domain, start >> VTD_PAGE_SHIFT);
- start += VTD_PAGE_SIZE;
+ /* we don't need lock here; nobody else touches the iova range */
+ while (start_pfn <= end_pfn) {
+ dma_pte_clear_one(domain, start_pfn);
+ start_pfn++;
}
}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
