Skip to content

Commit

Permalink
x86, mce, cmci: recheck CMCI banks after APIC has been enabled on CPU #0
Browse files Browse the repository at this point in the history
Impact: Fix marginal race condition

One the first CPU the machine checks are enabled early before
the local APIC is enabled. This could in theory lead
to some lost CMCI events very early during boot because
CMCIs cannot be delivered with disabled LAPIC.

The poller also doesn't recover from this because it doesn't
check CMCI banks.

Add an explicit CMCI banks check after the LAPIC is enabled.
This is only done for CPU #0, the other CPUs only initialize
machine checks after the LAPIC is on.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Andi Kleen authored and H. Peter Anvin committed Feb 24, 2009
1 parent 5ca8681 commit be71b85
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/x86/kernel/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include <asm/apic.h>
#include <asm/i8259.h>
#include <asm/smp.h>
#include <asm/mce.h>

#include <mach_apic.h>
#include <mach_apicdef.h>
Expand Down Expand Up @@ -1270,6 +1271,12 @@ void __cpuinit setup_local_APIC(void)
apic_write(APIC_LVT1, value);

preempt_enable();

#ifdef CONFIG_X86_MCE_INTEL
/* Recheck CMCI information after local APIC is up on CPU #0 */
if (smp_processor_id() == 0)
cmci_recheck();
#endif
}

void __cpuinit end_local_APIC_setup(void)
Expand Down

0 comments on commit be71b85

Please sign in to comment.