diff options
author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2008-01-30 07:30:39 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:39 -0500 |
commit | 1c69524c2e5b83e52a098ebdeb4a8b52169f6a03 (patch) | |
tree | 36549be4486756386782a3405c6afdad45aaa548 /arch/x86/kernel/apic_64.c | |
parent | 04e1ba852132c9ad006affcd5b8c8606295170b0 (diff) |
x86: clear IO_APIC before enabing apic error vector.
4 socket quad core, 8 socket quad core will do apic ID lifting for BSP.
But io-apic regs for ExtINT still use 0 as dest.
so when we enable apic error vector in BSP, we will get one APIC error.
CPU: L1 I Cache: 64K (64 bytes/line), D cache 64K (64 bytes/line)
CPU: L2 Cache: 512K (64 bytes/line)
CPU 0/4 -> Node 0
CPU: Physical Processor ID: 1
CPU: Processor Core ID: 0
SMP alternatives: switching to UP code
ACPI: Core revision 20070126
enabled ExtINT on CPU#0
ESR value after enabling vector: 00000000, after 0000000c
APIC error on CPU0: 0c(08)
ENABLING IO-APIC IRQs
Synchronizing Arb IDs.
So move enable_IO_APIC from setup_IO_APIC into setup_local_APIC and call it
before enabling the ACPI error vector.
[ tglx: arch/x86 adaptation ]
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 915808bd8a2a..994298bf4921 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -774,6 +774,13 @@ void __cpuinit setup_local_APIC(void) | |||
774 | value = APIC_DM_NMI | APIC_LVT_MASKED; | 774 | value = APIC_DM_NMI | APIC_LVT_MASKED; |
775 | apic_write(APIC_LVT1, value); | 775 | apic_write(APIC_LVT1, value); |
776 | 776 | ||
777 | /* | ||
778 | * Now enable IO-APICs, actually call clear_IO_APIC | ||
779 | * We need clear_IO_APIC before enabling vector on BP | ||
780 | */ | ||
781 | if (!smp_processor_id() && !skip_ioapic_setup && nr_ioapics) | ||
782 | enable_IO_APIC(); | ||
783 | |||
777 | { | 784 | { |
778 | unsigned oldvalue; | 785 | unsigned oldvalue; |
779 | maxlvt = lapic_get_maxlvt(); | 786 | maxlvt = lapic_get_maxlvt(); |