Merge tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel: "Two fixes are necessary. One patch fixes a boot crash on MacBook Air with interrupt remapping enabled and the other patch fixes a regression (which causes a boot crash on AMD IOMMUv2 systems too) in the init code of the AMD IOMMU driver." * tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/amd: Fix wrong check for ARRAY_SIZE() irq_remap: disable IRQ remapping if any IOAPIC lacks an IOMMU

Merge tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel: "Two fixes are necessary. One patch fixes a boot crash on MacBook Air with interrupt remapping enabled and the other patch fixes a regression (which causes a boot crash on AMD IOMMUv2 systems too) in the init code of the AMD IOMMU driver." * tag 'iommu-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/amd: Fix wrong check for ARRAY_SIZE() irq_remap: disable IRQ remapping if any IOAPIC lacks an IOMMU
Linus Torvalds
2 parents c71a35520f 2bd5ed002c
Showing 2 changed files Side-by-side Diff
drivers/iommu/amd_iommu_init.c
drivers/iommu/intel_irq_remapping.c
@@ -1111,7 +1111,7 @@
  
 		if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
 			pr_info("AMD-Vi:  Extended features: ");
-			for (i = 0; ARRAY_SIZE(feat_str); ++i) {
+			for (i = 0; i < ARRAY_SIZE(feat_str); ++i) {
 				if (iommu_feature(iommu, (1ULL << i)))
 					pr_cont(" %s", feat_str[i]);
 			}
@@ -736,6 +736,7 @@
 {
 	struct dmar_drhd_unit *drhd;
 	int ir_supported = 0;
+	int ioapic_idx;
  
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
  
@@ -748,13 +749,20 @@
 		}
 	}
  
-	if (ir_supported && ir_ioapic_num != nr_ioapics) {
-		printk(KERN_WARNING
-		       "Not all IO-APIC's listed under remapping hardware\n");
-		return -1;
+	if (!ir_supported)
+		return 0;
+
+	for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) {
+		int ioapic_id = mpc_ioapic_id(ioapic_idx);
+		if (!map_ioapic_to_ir(ioapic_id)) {
+			pr_err(FW_BUG "ioapic %d has no mapping iommu, "
+			       "interrupt remapping will be disabled\n",
+			       ioapic_id);
+			return -1;
+		}
 	}
  
-	return ir_supported;
+	return 1;
 }
  
 int __init ir_dev_scope_init(void)
...	...	@@ -1111,7 +1111,7 @@
1111	1111
1112	1112	if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
1113	1113	pr_info("AMD-Vi: Extended features: ");
1114		- for (i = 0; ARRAY_SIZE(feat_str); ++i) {
	1114	+ for (i = 0; i < ARRAY_SIZE(feat_str); ++i) {
1115	1115	if (iommu_feature(iommu, (1ULL << i)))
1116	1116	pr_cont(" %s", feat_str[i]);
1117	1117	}
...	...	@@ -736,6 +736,7 @@
736	736	{
737	737	struct dmar_drhd_unit *drhd;
738	738	int ir_supported = 0;
	739	+ int ioapic_idx;
739	740
740	741	for_each_drhd_unit(drhd) {
741	742	struct intel_iommu *iommu = drhd->iommu;
742	743
...	...	@@ -748,13 +749,20 @@
748	749	}
749	750	}
750	751
751		- if (ir_supported && ir_ioapic_num != nr_ioapics) {
752		- printk(KERN_WARNING
753		- "Not all IO-APIC's listed under remapping hardware\n");
754		- return -1;
	752	+ if (!ir_supported)
	753	+ return 0;
	754	+
	755	+ for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) {
	756	+ int ioapic_id = mpc_ioapic_id(ioapic_idx);
	757	+ if (!map_ioapic_to_ir(ioapic_id)) {
	758	+ pr_err(FW_BUG "ioapic %d has no mapping iommu, "
	759	+ "interrupt remapping will be disabled\n",
	760	+ ioapic_id);
	761	+ return -1;
	762	+ }
755	763	}
756	764
757		- return ir_supported;
	765	+ return 1;
758	766	}
759	767
760	768	int __init ir_dev_scope_init(void)