diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2012-03-30 14:47:06 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-05-07 08:35:00 -0400 |
commit | 263b5e8629c9ce21c9cd4c0e29c097afb1c10ef3 (patch) | |
tree | 5cd19f863f505982c9aa8331b62541e08eae2535 /include/linux/dmar.h | |
parent | 5e2b930b0784a30c98dee8e9d79c1f84c31f7209 (diff) |
x86, iommu/vt-d: Clean up interfaces for interrupt remapping
Remove the Intel specific interfaces from dmar.h and remove
asm/irq_remapping.h which is only used for io_apic.c anyway.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'include/linux/dmar.h')
-rw-r--r-- | include/linux/dmar.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 7a207a39f879..b029d1aa2d12 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h | |||
@@ -114,65 +114,6 @@ struct irte { | |||
114 | }; | 114 | }; |
115 | }; | 115 | }; |
116 | 116 | ||
117 | #ifdef CONFIG_IRQ_REMAP | ||
118 | extern int get_irte(int irq, struct irte *entry); | ||
119 | extern int modify_irte(int irq, struct irte *irte_modified); | ||
120 | extern int alloc_irte(struct intel_iommu *iommu, int irq, u16 count); | ||
121 | extern int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, | ||
122 | u16 sub_handle); | ||
123 | extern int map_irq_to_irte_handle(int irq, u16 *sub_handle); | ||
124 | |||
125 | extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev); | ||
126 | extern struct intel_iommu *map_ioapic_to_ir(int apic); | ||
127 | extern struct intel_iommu *map_hpet_to_ir(u8 id); | ||
128 | extern int set_ioapic_sid(struct irte *irte, int apic); | ||
129 | extern int set_hpet_sid(struct irte *irte, u8 id); | ||
130 | extern int set_msi_sid(struct irte *irte, struct pci_dev *dev); | ||
131 | #else | ||
132 | static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count) | ||
133 | { | ||
134 | return -1; | ||
135 | } | ||
136 | static inline int modify_irte(int irq, struct irte *irte_modified) | ||
137 | { | ||
138 | return -1; | ||
139 | } | ||
140 | static inline int map_irq_to_irte_handle(int irq, u16 *sub_handle) | ||
141 | { | ||
142 | return -1; | ||
143 | } | ||
144 | static inline int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, | ||
145 | u16 sub_handle) | ||
146 | { | ||
147 | return -1; | ||
148 | } | ||
149 | static inline struct intel_iommu *map_dev_to_ir(struct pci_dev *dev) | ||
150 | { | ||
151 | return NULL; | ||
152 | } | ||
153 | static inline struct intel_iommu *map_ioapic_to_ir(int apic) | ||
154 | { | ||
155 | return NULL; | ||
156 | } | ||
157 | static inline struct intel_iommu *map_hpet_to_ir(unsigned int hpet_id) | ||
158 | { | ||
159 | return NULL; | ||
160 | } | ||
161 | static inline int set_ioapic_sid(struct irte *irte, int apic) | ||
162 | { | ||
163 | return 0; | ||
164 | } | ||
165 | static inline int set_hpet_sid(struct irte *irte, u8 id) | ||
166 | { | ||
167 | return -1; | ||
168 | } | ||
169 | static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev) | ||
170 | { | ||
171 | return 0; | ||
172 | } | ||
173 | |||
174 | #endif | ||
175 | |||
176 | enum { | 117 | enum { |
177 | IRQ_REMAP_XAPIC_MODE, | 118 | IRQ_REMAP_XAPIC_MODE, |
178 | IRQ_REMAP_X2APIC_MODE, | 119 | IRQ_REMAP_X2APIC_MODE, |