The patch titled
drivers/pci/intel-iommu.c: intel_iommu_map_range failed at very end of address space
has been removed from the -mm tree. Its filename was
drivers-pci-intel-iommuc-intel_iommu_map_range-failed-at-very-end-of-address-space.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/pci/intel-iommu.c: intel_iommu_map_range failed at very end of address space
From: "Tom Lyon" <pugs@xxxxxxxxx>
intel_iommu_map_range() doesn't allow allocation at the very end of the
address space, that code has been simplified and corrected.
Signed-off-by: Tom Lyon <pugs@xxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
Cc: Joerg Roedel <joerg.roedel@xxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/intel-iommu.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff -puN drivers/pci/intel-iommu.c~drivers-pci-intel-iommuc-intel_iommu_map_range-failed-at-very-end-of-address-space drivers/pci/intel-iommu.c
--- a/drivers/pci/intel-iommu.c~drivers-pci-intel-iommuc-intel_iommu_map_range-failed-at-very-end-of-address-space
+++ a/drivers/pci/intel-iommu.c
@@ -3624,7 +3624,6 @@ static int intel_iommu_map_range(struct
{
struct dmar_domain *dmar_domain = domain->priv;
u64 max_addr;
- int addr_width;
int prot = 0;
int ret;
@@ -3637,18 +3636,14 @@ static int intel_iommu_map_range(struct
max_addr = iova + size;
if (dmar_domain->max_addr < max_addr) {
- int min_agaw;
u64 end;
/* check if minimum agaw is sufficient for mapped address */
- min_agaw = vm_domain_min_agaw(dmar_domain);
- addr_width = agaw_to_width(min_agaw);
- end = DOMAIN_MAX_ADDR(addr_width);
- end = end & VTD_PAGE_MASK;
+ end = __DOMAIN_MAX_ADDR(dmar_domain->gaw) + 1;
if (end < max_addr) {
- printk(KERN_ERR "%s: iommu agaw (%d) is not "
+ printk(KERN_ERR "%s: iommu width (%d) is not "
"sufficient for the mapped address (%llx)\n",
- __func__, min_agaw, max_addr);
+ __func__, dmar_domain->gaw, max_addr);
return -EFAULT;
}
dmar_domain->max_addr = max_addr;
_
Patches currently in -mm which might be from pugs@xxxxxxxxx are
drivers-pci-intel-iommuc-errors-with-smaller-iommu-widths.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
