diff options
-rw-r--r-- | include/asm-x86/io_apic.h | 158 | ||||
-rw-r--r-- | include/asm-x86/io_apic_32.h | 155 | ||||
-rw-r--r-- | include/asm-x86/io_apic_64.h | 134 |
3 files changed, 156 insertions, 291 deletions
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h index 88494966beeb..0f5b3fef0b08 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
@@ -1,5 +1,159 @@ | |||
1 | #ifndef __ASM_IO_APIC_H | ||
2 | #define __ASM_IO_APIC_H | ||
3 | |||
4 | #include <asm/types.h> | ||
5 | #include <asm/mpspec.h> | ||
6 | #include <asm/apicdef.h> | ||
7 | |||
8 | /* | ||
9 | * Intel IO-APIC support for SMP and UP systems. | ||
10 | * | ||
11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar | ||
12 | */ | ||
13 | |||
14 | /* | ||
15 | * The structure of the IO-APIC: | ||
16 | */ | ||
17 | union IO_APIC_reg_00 { | ||
18 | u32 raw; | ||
19 | struct { | ||
20 | u32 __reserved_2 : 14, | ||
21 | LTS : 1, | ||
22 | delivery_type : 1, | ||
23 | __reserved_1 : 8, | ||
24 | ID : 8; | ||
25 | } __attribute__ ((packed)) bits; | ||
26 | }; | ||
27 | |||
28 | union IO_APIC_reg_01 { | ||
29 | u32 raw; | ||
30 | struct { | ||
31 | u32 version : 8, | ||
32 | __reserved_2 : 7, | ||
33 | PRQ : 1, | ||
34 | entries : 8, | ||
35 | __reserved_1 : 8; | ||
36 | } __attribute__ ((packed)) bits; | ||
37 | }; | ||
38 | |||
39 | union IO_APIC_reg_02 { | ||
40 | u32 raw; | ||
41 | struct { | ||
42 | u32 __reserved_2 : 24, | ||
43 | arbitration : 4, | ||
44 | __reserved_1 : 4; | ||
45 | } __attribute__ ((packed)) bits; | ||
46 | }; | ||
47 | |||
48 | union IO_APIC_reg_03 { | ||
49 | u32 raw; | ||
50 | struct { | ||
51 | u32 boot_DT : 1, | ||
52 | __reserved_1 : 31; | ||
53 | } __attribute__ ((packed)) bits; | ||
54 | }; | ||
55 | |||
56 | enum ioapic_irq_destination_types { | ||
57 | dest_Fixed = 0, | ||
58 | dest_LowestPrio = 1, | ||
59 | dest_SMI = 2, | ||
60 | dest__reserved_1 = 3, | ||
61 | dest_NMI = 4, | ||
62 | dest_INIT = 5, | ||
63 | dest__reserved_2 = 6, | ||
64 | dest_ExtINT = 7 | ||
65 | }; | ||
66 | |||
67 | struct IO_APIC_route_entry { | ||
68 | __u32 vector : 8, | ||
69 | delivery_mode : 3, /* 000: FIXED | ||
70 | * 001: lowest prio | ||
71 | * 111: ExtINT | ||
72 | */ | ||
73 | dest_mode : 1, /* 0: physical, 1: logical */ | ||
74 | delivery_status : 1, | ||
75 | polarity : 1, | ||
76 | irr : 1, | ||
77 | trigger : 1, /* 0: edge, 1: level */ | ||
78 | mask : 1, /* 0: enabled, 1: disabled */ | ||
79 | __reserved_2 : 15; | ||
80 | |||
1 | #ifdef CONFIG_X86_32 | 81 | #ifdef CONFIG_X86_32 |
2 | # include "io_apic_32.h" | 82 | union { |
83 | struct { | ||
84 | __u32 __reserved_1 : 24, | ||
85 | physical_dest : 4, | ||
86 | __reserved_2 : 4; | ||
87 | } physical; | ||
88 | |||
89 | struct { | ||
90 | __u32 __reserved_1 : 24, | ||
91 | logical_dest : 8; | ||
92 | } logical; | ||
93 | } dest; | ||
3 | #else | 94 | #else |
4 | # include "io_apic_64.h" | 95 | __u32 __reserved_3 : 24, |
96 | dest : 8; | ||
97 | #endif | ||
98 | |||
99 | } __attribute__ ((packed)); | ||
100 | |||
101 | #ifdef CONFIG_X86_IO_APIC | ||
102 | |||
103 | /* | ||
104 | * # of IO-APICs and # of IRQ routing registers | ||
105 | */ | ||
106 | extern int nr_ioapics; | ||
107 | extern int nr_ioapic_registers[MAX_IO_APICS]; | ||
108 | |||
109 | /* | ||
110 | * MP-BIOS irq configuration table structures: | ||
111 | */ | ||
112 | |||
113 | /* I/O APIC entries */ | ||
114 | extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | ||
115 | |||
116 | /* # of MP IRQ source entries */ | ||
117 | extern int mp_irq_entries; | ||
118 | |||
119 | /* MP IRQ source entries */ | ||
120 | extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
121 | |||
122 | /* non-0 if default (table-less) MP configuration */ | ||
123 | extern int mpc_default_type; | ||
124 | |||
125 | /* Older SiS APIC requires we rewrite the index register */ | ||
126 | extern int sis_apic_bug; | ||
127 | |||
128 | /* 1 if "noapic" boot option passed */ | ||
129 | extern int skip_ioapic_setup; | ||
130 | |||
131 | static inline void disable_ioapic_setup(void) | ||
132 | { | ||
133 | skip_ioapic_setup = 1; | ||
134 | } | ||
135 | |||
136 | /* | ||
137 | * If we use the IO-APIC for IRQ routing, disable automatic | ||
138 | * assignment of PCI IRQ's. | ||
139 | */ | ||
140 | #define io_apic_assign_pci_irqs \ | ||
141 | (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) | ||
142 | |||
143 | #ifdef CONFIG_ACPI | ||
144 | extern int io_apic_get_unique_id(int ioapic, int apic_id); | ||
145 | extern int io_apic_get_version(int ioapic); | ||
146 | extern int io_apic_get_redir_entries(int ioapic); | ||
147 | extern int io_apic_set_pci_routing(int ioapic, int pin, int irq, | ||
148 | int edge_level, int active_high_low); | ||
149 | extern int timer_uses_ioapic_pin_0; | ||
150 | #endif /* CONFIG_ACPI */ | ||
151 | |||
152 | extern int (*ioapic_renumber_irq)(int ioapic, int irq); | ||
153 | extern void ioapic_init_mappings(void); | ||
154 | |||
155 | #else /* !CONFIG_X86_IO_APIC */ | ||
156 | #define io_apic_assign_pci_irqs 0 | ||
157 | #endif | ||
158 | |||
5 | #endif | 159 | #endif |
diff --git a/include/asm-x86/io_apic_32.h b/include/asm-x86/io_apic_32.h deleted file mode 100644 index 3f087883ea48..000000000000 --- a/include/asm-x86/io_apic_32.h +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | #ifndef __ASM_IO_APIC_H | ||
2 | #define __ASM_IO_APIC_H | ||
3 | |||
4 | #include <asm/types.h> | ||
5 | #include <asm/mpspec.h> | ||
6 | #include <asm/apicdef.h> | ||
7 | |||
8 | /* | ||
9 | * Intel IO-APIC support for SMP and UP systems. | ||
10 | * | ||
11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar | ||
12 | */ | ||
13 | |||
14 | /* | ||
15 | * The structure of the IO-APIC: | ||
16 | */ | ||
17 | union IO_APIC_reg_00 { | ||
18 | u32 raw; | ||
19 | struct { | ||
20 | u32 __reserved_2 : 14, | ||
21 | LTS : 1, | ||
22 | delivery_type : 1, | ||
23 | __reserved_1 : 8, | ||
24 | ID : 8; | ||
25 | } __attribute__ ((packed)) bits; | ||
26 | }; | ||
27 | |||
28 | union IO_APIC_reg_01 { | ||
29 | u32 raw; | ||
30 | struct { | ||
31 | u32 version : 8, | ||
32 | __reserved_2 : 7, | ||
33 | PRQ : 1, | ||
34 | entries : 8, | ||
35 | __reserved_1 : 8; | ||
36 | } __attribute__ ((packed)) bits; | ||
37 | }; | ||
38 | |||
39 | union IO_APIC_reg_02 { | ||
40 | u32 raw; | ||
41 | struct { | ||
42 | u32 __reserved_2 : 24, | ||
43 | arbitration : 4, | ||
44 | __reserved_1 : 4; | ||
45 | } __attribute__ ((packed)) bits; | ||
46 | }; | ||
47 | |||
48 | union IO_APIC_reg_03 { | ||
49 | u32 raw; | ||
50 | struct { | ||
51 | u32 boot_DT : 1, | ||
52 | __reserved_1 : 31; | ||
53 | } __attribute__ ((packed)) bits; | ||
54 | }; | ||
55 | |||
56 | enum ioapic_irq_destination_types { | ||
57 | dest_Fixed = 0, | ||
58 | dest_LowestPrio = 1, | ||
59 | dest_SMI = 2, | ||
60 | dest__reserved_1 = 3, | ||
61 | dest_NMI = 4, | ||
62 | dest_INIT = 5, | ||
63 | dest__reserved_2 = 6, | ||
64 | dest_ExtINT = 7 | ||
65 | }; | ||
66 | |||
67 | struct IO_APIC_route_entry { | ||
68 | __u32 vector : 8, | ||
69 | delivery_mode : 3, /* 000: FIXED | ||
70 | * 001: lowest prio | ||
71 | * 111: ExtINT | ||
72 | */ | ||
73 | dest_mode : 1, /* 0: physical, 1: logical */ | ||
74 | delivery_status : 1, | ||
75 | polarity : 1, | ||
76 | irr : 1, | ||
77 | trigger : 1, /* 0: edge, 1: level */ | ||
78 | mask : 1, /* 0: enabled, 1: disabled */ | ||
79 | __reserved_2 : 15; | ||
80 | |||
81 | union { struct { __u32 | ||
82 | __reserved_1 : 24, | ||
83 | physical_dest : 4, | ||
84 | __reserved_2 : 4; | ||
85 | } physical; | ||
86 | |||
87 | struct { __u32 | ||
88 | __reserved_1 : 24, | ||
89 | logical_dest : 8; | ||
90 | } logical; | ||
91 | } dest; | ||
92 | |||
93 | } __attribute__ ((packed)); | ||
94 | |||
95 | #ifdef CONFIG_X86_IO_APIC | ||
96 | |||
97 | /* | ||
98 | * # of IO-APICs and # of IRQ routing registers | ||
99 | */ | ||
100 | extern int nr_ioapics; | ||
101 | extern int nr_ioapic_registers[MAX_IO_APICS]; | ||
102 | |||
103 | /* | ||
104 | * MP-BIOS irq configuration table structures: | ||
105 | */ | ||
106 | |||
107 | /* I/O APIC entries */ | ||
108 | extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | ||
109 | |||
110 | /* # of MP IRQ source entries */ | ||
111 | extern int mp_irq_entries; | ||
112 | |||
113 | /* MP IRQ source entries */ | ||
114 | extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
115 | |||
116 | /* non-0 if default (table-less) MP configuration */ | ||
117 | extern int mpc_default_type; | ||
118 | |||
119 | /* Older SiS APIC requires we rewrite the index register */ | ||
120 | extern int sis_apic_bug; | ||
121 | |||
122 | /* 1 if "noapic" boot option passed */ | ||
123 | extern int skip_ioapic_setup; | ||
124 | |||
125 | static inline void disable_ioapic_setup(void) | ||
126 | { | ||
127 | skip_ioapic_setup = 1; | ||
128 | } | ||
129 | |||
130 | static inline int ioapic_setup_disabled(void) | ||
131 | { | ||
132 | return skip_ioapic_setup; | ||
133 | } | ||
134 | |||
135 | /* | ||
136 | * If we use the IO-APIC for IRQ routing, disable automatic | ||
137 | * assignment of PCI IRQ's. | ||
138 | */ | ||
139 | #define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) | ||
140 | |||
141 | #ifdef CONFIG_ACPI | ||
142 | extern int io_apic_get_unique_id (int ioapic, int apic_id); | ||
143 | extern int io_apic_get_version (int ioapic); | ||
144 | extern int io_apic_get_redir_entries (int ioapic); | ||
145 | extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); | ||
146 | extern int timer_uses_ioapic_pin_0; | ||
147 | #endif /* CONFIG_ACPI */ | ||
148 | |||
149 | extern int (*ioapic_renumber_irq)(int ioapic, int irq); | ||
150 | |||
151 | #else /* !CONFIG_X86_IO_APIC */ | ||
152 | #define io_apic_assign_pci_irqs 0 | ||
153 | #endif | ||
154 | |||
155 | #endif | ||
diff --git a/include/asm-x86/io_apic_64.h b/include/asm-x86/io_apic_64.h deleted file mode 100644 index 3e3c2114d93a..000000000000 --- a/include/asm-x86/io_apic_64.h +++ /dev/null | |||
@@ -1,134 +0,0 @@ | |||
1 | #ifndef __ASM_IO_APIC_H | ||
2 | #define __ASM_IO_APIC_H | ||
3 | |||
4 | #include <asm/types.h> | ||
5 | #include <asm/mpspec.h> | ||
6 | #include <asm/apicdef.h> | ||
7 | |||
8 | /* | ||
9 | * Intel IO-APIC support for SMP and UP systems. | ||
10 | * | ||
11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar | ||
12 | */ | ||
13 | |||
14 | #define APIC_MISMATCH_DEBUG | ||
15 | |||
16 | /* | ||
17 | * The structure of the IO-APIC: | ||
18 | */ | ||
19 | union IO_APIC_reg_00 { | ||
20 | u32 raw; | ||
21 | struct { | ||
22 | u32 __reserved_2 : 14, | ||
23 | LTS : 1, | ||
24 | delivery_type : 1, | ||
25 | __reserved_1 : 8, | ||
26 | ID : 8; | ||
27 | } __attribute__ ((packed)) bits; | ||
28 | }; | ||
29 | |||
30 | union IO_APIC_reg_01 { | ||
31 | u32 raw; | ||
32 | struct { | ||
33 | u32 version : 8, | ||
34 | __reserved_2 : 7, | ||
35 | PRQ : 1, | ||
36 | entries : 8, | ||
37 | __reserved_1 : 8; | ||
38 | } __attribute__ ((packed)) bits; | ||
39 | }; | ||
40 | |||
41 | union IO_APIC_reg_02 { | ||
42 | u32 raw; | ||
43 | struct { | ||
44 | u32 __reserved_2 : 24, | ||
45 | arbitration : 4, | ||
46 | __reserved_1 : 4; | ||
47 | } __attribute__ ((packed)) bits; | ||
48 | }; | ||
49 | |||
50 | union IO_APIC_reg_03 { | ||
51 | u32 raw; | ||
52 | struct { | ||
53 | u32 boot_DT : 1, | ||
54 | __reserved_1 : 31; | ||
55 | } __attribute__ ((packed)) bits; | ||
56 | }; | ||
57 | |||
58 | /* | ||
59 | * # of IO-APICs and # of IRQ routing registers | ||
60 | */ | ||
61 | extern int nr_ioapics; | ||
62 | extern int nr_ioapic_registers[MAX_IO_APICS]; | ||
63 | |||
64 | enum ioapic_irq_destination_types { | ||
65 | dest_Fixed = 0, | ||
66 | dest_LowestPrio = 1, | ||
67 | dest_SMI = 2, | ||
68 | dest__reserved_1 = 3, | ||
69 | dest_NMI = 4, | ||
70 | dest_INIT = 5, | ||
71 | dest__reserved_2 = 6, | ||
72 | dest_ExtINT = 7 | ||
73 | }; | ||
74 | |||
75 | struct IO_APIC_route_entry { | ||
76 | __u32 vector : 8, | ||
77 | delivery_mode : 3, /* 000: FIXED | ||
78 | * 001: lowest prio | ||
79 | * 111: ExtINT | ||
80 | */ | ||
81 | dest_mode : 1, /* 0: physical, 1: logical */ | ||
82 | delivery_status : 1, | ||
83 | polarity : 1, | ||
84 | irr : 1, | ||
85 | trigger : 1, /* 0: edge, 1: level */ | ||
86 | mask : 1, /* 0: enabled, 1: disabled */ | ||
87 | __reserved_2 : 15; | ||
88 | |||
89 | __u32 __reserved_3 : 24, | ||
90 | dest : 8; | ||
91 | } __attribute__ ((packed)); | ||
92 | |||
93 | /* | ||
94 | * MP-BIOS irq configuration table structures: | ||
95 | */ | ||
96 | |||
97 | /* I/O APIC entries */ | ||
98 | extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | ||
99 | |||
100 | /* # of MP IRQ source entries */ | ||
101 | extern int mp_irq_entries; | ||
102 | |||
103 | /* MP IRQ source entries */ | ||
104 | extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
105 | |||
106 | /* non-0 if default (table-less) MP configuration */ | ||
107 | extern int mpc_default_type; | ||
108 | |||
109 | /* 1 if "noapic" boot option passed */ | ||
110 | extern int skip_ioapic_setup; | ||
111 | |||
112 | static inline void disable_ioapic_setup(void) | ||
113 | { | ||
114 | skip_ioapic_setup = 1; | ||
115 | } | ||
116 | |||
117 | |||
118 | /* | ||
119 | * If we use the IO-APIC for IRQ routing, disable automatic | ||
120 | * assignment of PCI IRQ's. | ||
121 | */ | ||
122 | #define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) | ||
123 | |||
124 | #ifdef CONFIG_ACPI | ||
125 | extern int io_apic_get_version (int ioapic); | ||
126 | extern int io_apic_get_redir_entries (int ioapic); | ||
127 | extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int); | ||
128 | #endif | ||
129 | |||
130 | extern void ioapic_init_mappings(void); | ||
131 | |||
132 | extern int sis_apic_bug; /* dummy */ | ||
133 | |||
134 | #endif | ||