From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 28 Jun 2009 13:22:28 +0000 (+0100)
Subject: intel-iommu: Use domain_pfn_mapping() in intel_iommu_map_range()
X-Git-Tag: firefly_0821_release~13508^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad05122162b67f64d5a1c6d35e001f7a88619b88;p=firefly-linux-kernel-4.4.55.git

intel-iommu: Use domain_pfn_mapping() in intel_iommu_map_range()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index dccd0a7b7a5f..a490b39ca3d5 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -3516,8 +3516,11 @@ static int intel_iommu_map_range(struct iommu_domain *domain,
 		}
 		dmar_domain->max_addr = max_addr;
 	}
-
-	ret = domain_page_mapping(dmar_domain, iova, hpa, size, prot);
+	/* Round up size to next multiple of PAGE_SIZE, if it and
+	   the low bits of hpa would take us onto the next page */
+	size = aligned_size(hpa, size) >> VTD_PAGE_SHIFT;
+	ret = domain_pfn_mapping(dmar_domain, iova >> VTD_PAGE_SHIFT,
+				 hpa >> VTD_PAGE_SHIFT, size, prot);
 	return ret;
 }