aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2008-07-11 17:24:19 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-12 02:44:58 -0400
commit2d7a66d02e11af9ab8e16c76d22767e622b4e3d7 (patch)
treee8e58ce9f752cb90fe42d5b74cde0f1d1cde3147 /arch/x86/kernel/apic_64.c
parent0c81c746f9bdbfaafe64322d540c8b7b59c27314 (diff)
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support, fix
Yinghai Lu wrote: > Setting APIC routing to physical flat > Kernel panic - not syncing: Boot APIC ID in local APIC unexpected (0 vs 4) > Pid: 1, comm: swapper Not tainted 2.6.26-rc9-tip-01763-g74f94b1-dirty #320 > > Call Trace: > [<ffffffff80a21505>] ? set_cpu_sibling_map+0x38c/0x3bd > [<ffffffff80245215>] ? read_xapic_id+0x25/0x3e > [<ffffffff80e5a2c3>] ? verify_local_APIC+0x139/0x1b9 > [<ffffffff80245215>] ? read_xapic_id+0x25/0x3e > [<ffffffff80e589af>] ? native_smp_prepare_cpus+0x224/0x2e9 > [<ffffffff80e4881a>] ? kernel_init+0x64/0x341 > [<ffffffff8022a439>] ? child_rip+0xa/0x11 > [<ffffffff80e487b6>] ? kernel_init+0x0/0x341 > [<ffffffff8022a42f>] ? child_rip+0x0/0x11 > > > guess read_apic_id changing cuase some problem... genapic's read_apic_id() returns the actual apic id extracted from the APIC_ID register. And in some cases like UV, read_apic_id() returns completely different values from APIC ID register. Use the native apic register read, rather than genapic read_apic_id() in verify_local_APIC() And also, lapic_suspend() should also use native apic register read. Reported-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Cc: "akpm@linux-foundation.org" <akpm@linux-foundation.org> Cc: "arjan@linux.intel.com" <arjan@linux.intel.com> Cc: "andi@firstfloor.org" <andi@firstfloor.org> Cc: "ebiederm@xmission.com" <ebiederm@xmission.com> Cc: "jbarnes@virtuousgeek.org" <jbarnes@virtuousgeek.org> Cc: "steiner@sgi.com" <steiner@sgi.com> Cc: "jeremy@goop.org" <jeremy@goop.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 9dd4ee4735f5..3963f590c3d4 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -626,10 +626,10 @@ int __init verify_local_APIC(void)
626 /* 626 /*
627 * The ID register is read/write in a real APIC. 627 * The ID register is read/write in a real APIC.
628 */ 628 */
629 reg0 = read_apic_id(); 629 reg0 = apic_read(APIC_ID);
630 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0); 630 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);
631 apic_write(APIC_ID, reg0 ^ APIC_ID_MASK); 631 apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);
632 reg1 = read_apic_id(); 632 reg1 = apic_read(APIC_ID);
633 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1); 633 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);
634 apic_write(APIC_ID, reg0); 634 apic_write(APIC_ID, reg0);
635 if (reg1 != (reg0 ^ APIC_ID_MASK)) 635 if (reg1 != (reg0 ^ APIC_ID_MASK))
@@ -1137,7 +1137,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)
1137 1137
1138 maxlvt = lapic_get_maxlvt(); 1138 maxlvt = lapic_get_maxlvt();
1139 1139
1140 apic_pm_state.apic_id = read_apic_id(); 1140 apic_pm_state.apic_id = apic_read(APIC_ID);
1141 apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI); 1141 apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI);
1142 apic_pm_state.apic_ldr = apic_read(APIC_LDR); 1142 apic_pm_state.apic_ldr = apic_read(APIC_LDR);
1143 apic_pm_state.apic_dfr = apic_read(APIC_DFR); 1143 apic_pm_state.apic_dfr = apic_read(APIC_DFR);