x86: fully honor "nolapic"
PATCH 1/1 x86: fully honor "nolapic"
"nolapic" should not only suppress SMP and use of the LAPIC, but it also ought to have the effect of disabling all IO-APIC related activity as well as PCI MSI and HT-IRQs.
Signed-off-by Jan Beulich <[email protected]>
--- arch/x86/kernel/apic.c | 7 ++++++- arch/x86/kernel/io_apic.c | 6 ++++++ arch/x86/kernel/smpboot.c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
arch/x86/kernel/apic.c +6 -1
@@ -1125,6 +1125,11 @@ void __cpuinit setup_local_APIC(void)unsigned int value;int i, j; +if (disable_apic) { +disable_ioapic_setup (); +return ; + } +#ifdef CONFIG_X86_32 /* Pound the ESR really hard over the head with a big hammer - mbligh */ if (lapic_is_integrated () && esr_disable) {
@@ -1565,11 +1570,11 @@ int apic_version[MAX_APICS];int __init APIC_init_uniprocessor (void ) { -#ifdef CONFIG_X86_64 if (disable_apic) {pr_info ("Apic disabled\n" );return -1 ; } +#ifdef CONFIG_X86_64 if (!cpu_has_apic) { disable_apic =1 ;pr_info ("Apic disabled by BIOS\n" );
arch/x86/kernel/io_apic.c +6 -0
@@ -3258,6 +3258,9 @@ static int msi_compose_msg(struct pci_deint err;unsigned dest; +if (disable_apic) +return -ENXIO ; + cfg =irq_cfg (irq); err =assign_irq_vector (irq, cfg,TARGET_CPUS );if (err)
@@ -3726,6 +3729,9 @@ int arch_setup_ht_irq(unsigned int irq,struct irq_cfg *cfg;int err; +if (disable_apic) +return -ENXIO ; + cfg =irq_cfg (irq); err =assign_irq_vector (irq, cfg,TARGET_CPUS );if (!err) {
arch/x86/kernel/smpboot.c +1 -0
@@ -1125,6 +1125,7 @@ static int __init smp_sanity_check(unsigprintk (KERN_ERR "... forcing use of dummy APIC emulation." "(tell your hw vendor)\n" );smpboot_clear_io_apic (); +disable_ioapic_setup ();return -1 ; }
Ingo Molnar
AppliedQuoted 11 lines · Jan Beulich
"nolapic" should not only suppress SMP and use of the LAPIC, but it also ought to have the effect of disabling all IO-APIC related activity as well as PCI MSI and HT-IRQs.
Signed-off-by Jan Beulich <[email protected]>--- arch/x86/kernel/apic.c | 7 ++++++- arch/x86/kernel/io_apic.c | 6 ++++++ arch/x86/kernel/smpboot.c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
applied to tip/x86/urgent, thanks Jan!
Ingo