x86: set nr_irqs_gsi only in probe_nr_irqs_gsi
PATCH 1/1 x86: set nr_irqs_gsi only in probe_nr_irqs_gsi
don't clear that in arch_early_irq_init
probe_nr_irqs_gsi is always called when ioapic is selected in config.
so even for mrst, print out from probe_nr_irqs_gsi report correct nr_irqs_gsi
--- arch/x86/kernel/apic/io_apic.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/io_apic.c +7 -3
@@ -151,10 +151,12 @@ int __init arch_early_irq_init(void)int node;int i; -if (!legacy_pic->nr_legacy_irqs) { - nr_irqs_gsi =0 ; +/* +* in case, io apic is not detected +* then setup_IO_APIC() is not called +*/ +if (!legacy_pic->nr_legacy_irqs) io_apic_irqs = ~0UL ; - } cfg = irq_cfgx; count =ARRAY_SIZE (irq_cfgx);
@@ -3857,6 +3859,8 @@ void __init probe_nr_irqs_gsi(void) {int nr =0 ; + nr_irqs_gsi = legacy_pic->nr_legacy_irqs; + nr =acpi_probe_gsi ();if (nr > nr_irqs_gsi) { nr_irqs_gsi = nr;
PATCH 1/1 x86: kill smpboot_hooks.h
only one user, move it back to smpboot.c
remove smpboot_clear_io_apic, and only keep smpboot_clear_io_apic_irqs.
and check nr_legacy_irqs before clear it.
--- arch/x86/include/asm/smpboot_hooks.h | 61 ----------------------------------- arch/x86/kernel/smpboot.c | 57 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 64 deletions(-)
arch/x86/include/asm/smpboot_hooks.h deleted +0 -61
@@ -1,61 +0,0 @@ -/* two abstractions specific to kernel/smpboot.c, mainly to cater to visws -* which needs to alter them. */ - -static inline void smpboot_clear_io_apic_irqs (void ) -{ -#ifdef CONFIG_X86_IO_APIC - io_apic_irqs =0 ; -#endif -} - -static inline void smpboot_setup_warm_reset_vector (unsigned long start_eip) -{ -CMOS_WRITE (0xa ,0xf ); -local_flush_tlb (); -pr_debug ("1.\n" ); - *((volatile unsigned short *)phys_to_virt (apic->trampoline_phys_high)) = - start_eip >>4 ; -pr_debug ("2.\n" ); - *((volatile unsigned short *)phys_to_virt (apic->trampoline_phys_low)) = - start_eip &0xf ; -pr_debug ("3.\n" ); -} - -static inline void smpboot_restore_warm_reset_vector (void ) -{ -/* -* Install writable page 0 entry to set BIOS data area. -*/ -local_flush_tlb (); - -/* -* Paranoid: Set warm reset code and vector here back -* to default values. -*/ -CMOS_WRITE (0 ,0xf ); - - *((volatile long *)phys_to_virt (apic->trampoline_phys_low)) =0 ; -} - -static inline void __init smpboot_setup_io_apic (void ) -{ -#ifdef CONFIG_X86_IO_APIC -/* -* Here we can be sure that there is an IO-APIC in the system. Let's -* go and set it up: -*/ -if (!skip_ioapic_setup && nr_ioapics) -setup_IO_APIC (); -else { - nr_ioapics =0 ; -localise_nmi_watchdog (); - } -#endif -} - -static inline void smpboot_clear_io_apic (void ) -{ -#ifdef CONFIG_X86_IO_APIC - nr_ioapics =0 ; -#endif -}
arch/x86/kernel/smpboot.c +54 -3
93 lines not on this page · raw message
PATCH 1/1 x86: set nr_irqs_gsi only in probe_nr_irqs_gsi
In reply to Yinghai Ludon't clear that in arch_early_irq_init
probe_nr_irqs_gsi is always called when ioapic is selected in config.
so even for mrst, print out from probe_nr_irqs_gsi is report correct nr_irqs_gsi
-v2: remove io_apic_irqs assignement, setup_IO_APIC will do that.
--- arch/x86/kernel/apic/io_apic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/io_apic.c +2 -5
@@ -151,11 +151,6 @@ int __init arch_early_irq_init(void)int node;int i; -if (!legacy_pic->nr_legacy_irqs) { - nr_irqs_gsi =0 ; - io_apic_irqs = ~0UL ; - } - cfg = irq_cfgx; count =ARRAY_SIZE (irq_cfgx); node=cpu_to_node (boot_cpu_id);
@@ -3857,6 +3852,8 @@ void __init probe_nr_irqs_gsi(void) {int nr =0 ; + nr_irqs_gsi = legacy_pic->nr_legacy_irqs; + nr =acpi_probe_gsi ();if (nr > nr_irqs_gsi) { nr_irqs_gsi = nr;