aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dmar.h
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2009-03-16 20:04:55 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2009-03-17 18:38:59 -0400
commit9d783ba042771284fb4ee5013c3d94220755ae7f (patch)
tree102ec9f89d363589108ae35e4b38c12fc6e2765c /include/linux/dmar.h
parent0ac2491f57af5644f88383d28809760902d6f4d7 (diff)
x86, x2apic: enable fault handling for intr-remapping
Impact: interface augmentation (not yet used) Enable fault handling flow for intr-remapping aswell. Fault handling code now shared by both dma-remapping and intr-remapping. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/dmar.h')
-rw-r--r--include/linux/dmar.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f28440784cf0..c7768330c11d 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -49,6 +49,7 @@ extern int dmar_dev_scope_init(void);
49 49
50/* Intel IOMMU detection */ 50/* Intel IOMMU detection */
51extern void detect_intel_iommu(void); 51extern void detect_intel_iommu(void);
52extern int enable_drhd_fault_handling(void);
52 53
53 54
54extern int parse_ioapics_under_ir(void); 55extern int parse_ioapics_under_ir(void);
@@ -116,9 +117,6 @@ extern struct intel_iommu *map_ioapic_to_ir(int apic);
116#define intr_remapping_enabled (0) 117#define intr_remapping_enabled (0)
117#endif 118#endif
118 119
119#ifdef CONFIG_DMAR
120extern const char *dmar_get_fault_reason(u8 fault_reason);
121
122/* Can't use the common MSI interrupt functions 120/* Can't use the common MSI interrupt functions
123 * since DMAR is not a pci device 121 * since DMAR is not a pci device
124 */ 122 */
@@ -129,6 +127,7 @@ extern void dmar_msi_write(int irq, struct msi_msg *msg);
129extern int dmar_set_interrupt(struct intel_iommu *iommu); 127extern int dmar_set_interrupt(struct intel_iommu *iommu);
130extern int arch_setup_dmar_msi(unsigned int irq); 128extern int arch_setup_dmar_msi(unsigned int irq);
131 129
130#ifdef CONFIG_DMAR
132extern int iommu_detected, no_iommu; 131extern int iommu_detected, no_iommu;
133extern struct list_head dmar_rmrr_units; 132extern struct list_head dmar_rmrr_units;
134struct dmar_rmrr_unit { 133struct dmar_rmrr_unit {