Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1356442
| From | Jianyu Zhan <nasa4836@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/3] x86/irq: refactor native_init_IRQ |
| Date | 2016-03-12 16:20 +0100 |
| Message-ID | <rbTuG-847-11@gated-at.bofh.it> (permalink) |
| References | <rbTl0-7Va-15@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
After prepatory patch(x86/asm/irq: Rearrange definitoin of specical irq vectors and cleanup)
is applied, now refactor native_init_IRQ() per the special irq vectors layout.
Signed-off-by: Jianyu Zhan <nasa4836@gmail.com>
---
arch/x86/kernel/irqinit.c | 68 ++++++++++++++++++++++++++++-------------------
1 file changed, 40 insertions(+), 28 deletions(-)
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index 1423ab1..0e9fa7c 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -121,47 +121,55 @@ static void __init smp_intr_init(void)
/* IPI used for rebooting/stopping */
alloc_intr_gate(REBOOT_VECTOR, reboot_interrupt);
+
+ /* IPI for X86 platform specific use */
+ alloc_intr_gate(X86_PLATFORM_IPI_VECTOR, x86_platform_ipi);
#endif /* CONFIG_SMP */
}
static void __init apic_intr_init(void)
{
- smp_intr_init();
-
-#ifdef CONFIG_X86_THERMAL_VECTOR
- alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
-#endif
-#ifdef CONFIG_X86_MCE_THRESHOLD
- alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);
-#endif
+#ifdef CONFIG_X86_LOCAL_APIC
-#ifdef CONFIG_X86_MCE_AMD
- alloc_intr_gate(DEFERRED_ERROR_VECTOR, deferred_error_interrupt);
-#endif
+ /* IPI vectors for APIC spurious and error interrupts */
+ alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
+ alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
-#ifdef CONFIG_X86_LOCAL_APIC
/* self generated IPI for local APIC timer */
alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);
- /* IPI for X86 platform specific use */
- alloc_intr_gate(X86_PLATFORM_IPI_VECTOR, x86_platform_ipi);
-#ifdef CONFIG_HAVE_KVM
- /* IPI for KVM to deliver posted interrupt */
- alloc_intr_gate(POSTED_INTR_VECTOR, kvm_posted_intr_ipi);
- /* IPI for KVM to deliver interrupt to wake up tasks */
- alloc_intr_gate(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi);
-#endif
+# ifdef CONFIG_X86_THERMAL_VECTOR
+ alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
+# endif
- /* IPI vectors for APIC spurious and error interrupts */
- alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
- alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
+# ifdef CONFIG_X86_MCE_THRESHOLD
+ alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);
+# endif
- /* IRQ work interrupts: */
-# ifdef CONFIG_IRQ_WORK
- alloc_intr_gate(IRQ_WORK_VECTOR, irq_work_interrupt);
+# ifdef CONFIG_X86_MCE_AMD
+ alloc_intr_gate(DEFERRED_ERROR_VECTOR, deferred_error_interrupt);
# endif
+# ifdef CONFIG_HAVE_KVM
+ /* IPI for KVM to deliver posted interrupt */
+ alloc_intr_gate(POSTED_INTR_VECTOR, kvm_posted_intr_ipi);
+ /* IPI for KVM to deliver interrupt to wake up tasks */
+ alloc_intr_gate(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi);
+# endif
+
+#endif
+}
+
+/* See asm/irq_vectors.h for sepcial vector definiton */
+static void __init system_intr_init(void)
+{
+ smp_intr_init();
+
+#ifdef CONFIG_IRQ_WORK
+ alloc_intr_gate(IRQ_WORK_VECTOR, irq_work_interrupt);
#endif
+
+ apic_intr_init();
}
void __init native_init_IRQ(void)
@@ -171,10 +179,11 @@ void __init native_init_IRQ(void)
/* Execute any quirks before the call gates are initialised: */
x86_init.irqs.pre_vector_init();
- apic_intr_init();
+ /* First, init system vectors, will update 'first_system_vector' */
+ system_intr_init();
/*
- * Cover the whole vector space, no vector can escape
+ * Second, cover the whole vector space, no vector can escape
* us. (some of these will be overridden and become
* 'special' SMP interrupts)
*/
@@ -187,11 +196,14 @@ void __init native_init_IRQ(void)
set_intr_gate(i, irq_entries_start +
8 * (i - FIRST_EXTERNAL_VECTOR));
}
+
+ /* Third, mark all spare vector as spurious. */
#ifdef CONFIG_X86_LOCAL_APIC
for_each_clear_bit_from(i, used_vectors, NR_VECTORS)
set_intr_gate(i, spurious_interrupt);
#endif
+ /* Fourth, fixup for legacy PIC */
if (!acpi_ioapic && !of_ioapic && nr_legacy_irqs())
setup_irq(2, &irq2);
--
2.4.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/3] x86/irq: Refactor special vector definition and cleanup Jianyu Zhan <nasa4836@gmail.com> - 2016-03-12 16:10 +0100
[PATCH 1/3] x86/asm/irq: Rearrange definitoin of specical irq vectors and cleanup. Jianyu Zhan <nasa4836@gmail.com> - 2016-03-12 16:10 +0100
[PATCH 2/3] x86/irq: refactor native_init_IRQ Jianyu Zhan <nasa4836@gmail.com> - 2016-03-12 16:20 +0100
Re: [PATCH 2/3] x86/irq: refactor native_init_IRQ kbuild test robot <lkp@intel.com> - 2016-03-12 16:40 +0100
Re: [PATCH 2/3] x86/irq: refactor native_init_IRQ Jianyu Zhan <nasa4836@gmail.com> - 2016-03-12 16:40 +0100
Re: [PATCH 2/3] x86/irq: refactor native_init_IRQ kbuild test robot <lkp@intel.com> - 2016-03-12 17:30 +0100
[PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-12 16:20 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-12 21:20 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 02:30 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-13 07:40 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 08:30 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 08:50 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-13 09:00 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 09:30 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-13 10:20 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 10:40 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-13 10:40 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Jianyu Zhan <nasa4836@gmail.com> - 2016-03-13 11:10 +0100
Re: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Thomas Gleixner <tglx@linutronix.de> - 2016-03-13 12:20 +0100
csiph-web