diff options
Diffstat (limited to 'arch/x86/kernel/irqinit_32.c')
-rw-r--r-- | arch/x86/kernel/irqinit_32.c | 84 |
1 files changed, 78 insertions, 6 deletions
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index d66914287ee..845aa9803e8 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -69,11 +69,48 @@ void __init init_ISA_irqs (void) | |||
69 | * 16 old-style INTA-cycle interrupts: | 69 | * 16 old-style INTA-cycle interrupts: |
70 | */ | 70 | */ |
71 | for (i = 0; i < 16; i++) { | 71 | for (i = 0; i < 16; i++) { |
72 | /* first time call this irq_desc */ | ||
73 | struct irq_desc *desc = irq_to_desc(i); | ||
74 | |||
75 | desc->status = IRQ_DISABLED; | ||
76 | desc->action = NULL; | ||
77 | desc->depth = 1; | ||
78 | |||
72 | set_irq_chip_and_handler_name(i, &i8259A_chip, | 79 | set_irq_chip_and_handler_name(i, &i8259A_chip, |
73 | handle_level_irq, "XT"); | 80 | handle_level_irq, "XT"); |
74 | } | 81 | } |
75 | } | 82 | } |
76 | 83 | ||
84 | /* | ||
85 | * IRQ2 is cascade interrupt to second interrupt controller | ||
86 | */ | ||
87 | static struct irqaction irq2 = { | ||
88 | .handler = no_action, | ||
89 | .mask = CPU_MASK_NONE, | ||
90 | .name = "cascade", | ||
91 | }; | ||
92 | |||
93 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
94 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
95 | [IRQ0_VECTOR] = 0, | ||
96 | [IRQ1_VECTOR] = 1, | ||
97 | [IRQ2_VECTOR] = 2, | ||
98 | [IRQ3_VECTOR] = 3, | ||
99 | [IRQ4_VECTOR] = 4, | ||
100 | [IRQ5_VECTOR] = 5, | ||
101 | [IRQ6_VECTOR] = 6, | ||
102 | [IRQ7_VECTOR] = 7, | ||
103 | [IRQ8_VECTOR] = 8, | ||
104 | [IRQ9_VECTOR] = 9, | ||
105 | [IRQ10_VECTOR] = 10, | ||
106 | [IRQ11_VECTOR] = 11, | ||
107 | [IRQ12_VECTOR] = 12, | ||
108 | [IRQ13_VECTOR] = 13, | ||
109 | [IRQ14_VECTOR] = 14, | ||
110 | [IRQ15_VECTOR] = 15, | ||
111 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
112 | }; | ||
113 | |||
77 | /* Overridden in paravirt.c */ | 114 | /* Overridden in paravirt.c */ |
78 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | 115 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); |
79 | 116 | ||
@@ -89,15 +126,50 @@ void __init native_init_IRQ(void) | |||
89 | * us. (some of these will be overridden and become | 126 | * us. (some of these will be overridden and become |
90 | * 'special' SMP interrupts) | 127 | * 'special' SMP interrupts) |
91 | */ | 128 | */ |
92 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | 129 | for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) { |
93 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
94 | if (i >= NR_IRQS) | ||
95 | break; | ||
96 | /* SYSCALL_VECTOR was reserved in trap_init. */ | 130 | /* SYSCALL_VECTOR was reserved in trap_init. */ |
97 | if (!test_bit(vector, used_vectors)) | 131 | if (i != SYSCALL_VECTOR) |
98 | set_intr_gate(vector, interrupt[i]); | 132 | set_intr_gate(i, interrupt[i]); |
99 | } | 133 | } |
100 | 134 | ||
135 | |||
136 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_SMP) | ||
137 | /* | ||
138 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
139 | * IPI, driven by wakeup. | ||
140 | */ | ||
141 | alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
142 | |||
143 | /* IPI for invalidation */ | ||
144 | alloc_intr_gate(INVALIDATE_TLB_VECTOR, invalidate_interrupt); | ||
145 | |||
146 | /* IPI for generic function call */ | ||
147 | alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
148 | |||
149 | /* IPI for single call function */ | ||
150 | set_intr_gate(CALL_FUNCTION_SINGLE_VECTOR, call_function_single_interrupt); | ||
151 | |||
152 | /* Low priority IPI to cleanup after moving an irq */ | ||
153 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
154 | #endif | ||
155 | |||
156 | #ifdef CONFIG_X86_LOCAL_APIC | ||
157 | /* self generated IPI for local APIC timer */ | ||
158 | alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
159 | |||
160 | /* IPI vectors for APIC spurious and error interrupts */ | ||
161 | alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
162 | alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
163 | #endif | ||
164 | |||
165 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL) | ||
166 | /* thermal monitor LVT interrupt */ | ||
167 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
168 | #endif | ||
169 | |||
170 | if (!acpi_ioapic) | ||
171 | setup_irq(2, &irq2); | ||
172 | |||
101 | /* setup after call gates are initialised (usually add in | 173 | /* setup after call gates are initialised (usually add in |
102 | * the architecture specific gates) | 174 | * the architecture specific gates) |
103 | */ | 175 | */ |