---

yaml --- r: 165428 b: refs/heads/master c: 074835f h: refs/heads/master v: v3
git-mirror · Sep 11, 2009 · 5496547 · 5496547
1 parent 7a1392a
commit 5496547
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e936d0773df172ec8600777fdd72bbc1f75f22ad
+refs/heads/master: 074835f0143b83845af5044af2739c52c9f53808
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -1316,3 +1316,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
 	return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+	struct acpi_table_dmar *dmar;
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	return dmar->flags & 0x1;
+}
diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
 	if (disable_intremap)
 		return 0;
 
+	if (!dmar_ir_support())
+		return 0;
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 

diff --git a/trunk/include/linux/intel-iommu.h b/trunk/include/linux/intel-iommu.h
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,

		extern int qi_submit_sync(struct qi_desc desc, struct intel_iommu iommu);

		extern int dmar_ir_support(void);

		#endif