aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>2018-06-27 11:31:20 -0400
committerJoerg Roedel <jroedel@suse.de>2018-07-06 08:43:47 -0400
commit818b7587b4d34e989ea6c042eeb8d50ffa5be13e (patch)
treed028f318579d58946d640d6f999aeafbb8bf1ed7
parent3c120143f584360a13614787e23ae2cdcb5e5ccd (diff)
x86: irq_remapping: Move irq remapping mode enum
The enum is currently defined in Intel-specific DMAR header file, but it is also used by APIC common code. Therefore, move it to a more appropriate interrupt-remapping common header file. This will also be used by subsequent patches. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Joerg Roedel <jroedel@suse.de> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--arch/x86/include/asm/irq_remapping.h5
-rw-r--r--include/linux/dmar.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 023b4a9fc846..5f26962eff42 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -33,6 +33,11 @@ enum irq_remap_cap {
33 IRQ_POSTING_CAP = 0, 33 IRQ_POSTING_CAP = 0,
34}; 34};
35 35
36enum {
37 IRQ_REMAP_XAPIC_MODE,
38 IRQ_REMAP_X2APIC_MODE,
39};
40
36struct vcpu_data { 41struct vcpu_data {
37 u64 pi_desc_addr; /* Physical address of PI Descriptor */ 42 u64 pi_desc_addr; /* Physical address of PI Descriptor */
38 u32 vector; /* Guest vector of the interrupt */ 43 u32 vector; /* Guest vector of the interrupt */
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index e2433bc50210..843a41ba7e28 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -265,11 +265,6 @@ static inline void dmar_copy_shared_irte(struct irte *dst, struct irte *src)
265#define PDA_LOW_BIT 26 265#define PDA_LOW_BIT 26
266#define PDA_HIGH_BIT 32 266#define PDA_HIGH_BIT 32
267 267
268enum {
269 IRQ_REMAP_XAPIC_MODE,
270 IRQ_REMAP_X2APIC_MODE,
271};
272
273/* Can't use the common MSI interrupt functions 268/* Can't use the common MSI interrupt functions
274 * since DMAR is not a pci device 269 * since DMAR is not a pci device
275 */ 270 */