x86/apic: Disable I/O APIC before shutdown of the local APIC
authorFenghua Yu <fenghua.yu@intel.com>
Thu, 24 Oct 2013 01:30:12 +0000 (18:30 -0700)
committerIngo Molnar <mingo@kernel.org>
Thu, 7 Nov 2013 09:12:37 +0000 (10:12 +0100)
In reboot and crash path, when we shut down the local APIC, the I/O APIC is
still active. This may cause issues because external interrupts
can still come in and disturb the local APIC during shutdown process.

To quiet external interrupts, disable I/O APIC before shutdown local APIC.

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1382578212-4677-1-git-send-email-fenghua.yu@intel.com
Cc: <stable@kernel.org>
[ I suppose the 'issue' is a hang during shutdown. It's a fine change nevertheless. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/crash.c
arch/x86/kernel/reboot.c

index e0e0841eef45dcf4381e28a9618a9c1db203df05..18677a90d6a35e1b5823d3f33501229197e21219 100644 (file)
@@ -127,12 +127,12 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
        cpu_emergency_vmxoff();
        cpu_emergency_svm_disable();
 
-       lapic_shutdown();
 #ifdef CONFIG_X86_IO_APIC
        /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
        ioapic_zap_locks();
        disable_IO_APIC();
 #endif
+       lapic_shutdown();
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif
index 7e920bff99a34b260e1ea338c3fc7dee44ba0e67..618ce264b237c4872e6c9bf52ad92b1d14558476 100644 (file)
@@ -550,6 +550,10 @@ static void native_machine_emergency_restart(void)
 void native_machine_shutdown(void)
 {
        /* Stop the cpus and apics */
+#ifdef CONFIG_X86_IO_APIC
+       disable_IO_APIC();
+#endif
+
 #ifdef CONFIG_SMP
        /*
         * Stop all of the others. Also disable the local irq to
@@ -562,10 +566,6 @@ void native_machine_shutdown(void)
 
        lapic_shutdown();
 
-#ifdef CONFIG_X86_IO_APIC
-       disable_IO_APIC();
-#endif
-
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif