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/io_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/io_apic_64.c')
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 3e471d0fb150..4ef85a3b3f9f 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -1172,7 +1172,7 @@ void __apicdebuginit print_PIC(void) | |||
1172 | 1172 | ||
1173 | #endif /* 0 */ | 1173 | #endif /* 0 */ |
1174 | 1174 | ||
1175 | static void __init enable_IO_APIC(void) | 1175 | void __init enable_IO_APIC(void) |
1176 | { | 1176 | { |
1177 | union IO_APIC_reg_01 reg_01; | 1177 | union IO_APIC_reg_01 reg_01; |
1178 | int i8259_apic, i8259_pin; | 1178 | int i8259_apic, i8259_pin; |
@@ -1789,7 +1789,10 @@ __setup("no_timer_check", notimercheck); | |||
1789 | 1789 | ||
1790 | void __init setup_IO_APIC(void) | 1790 | void __init setup_IO_APIC(void) |
1791 | { | 1791 | { |
1792 | enable_IO_APIC(); | 1792 | |
1793 | /* | ||
1794 | * calling enable_IO_APIC() is moved to setup_local_APIC for BP | ||
1795 | */ | ||
1793 | 1796 | ||
1794 | if (acpi_ioapic) | 1797 | if (acpi_ioapic) |
1795 | io_apic_irqs = ~0; /* all IRQs go through IOAPIC */ | 1798 | io_apic_irqs = ~0; /* all IRQs go through IOAPIC */ |