[patch 2/2] x2apic: use x2apic id reported by cpuid during topology discovery

[Suresh Siddha <suresh.b.siddha@intel.com>]

[-- Attachment #1: use_initial_apicid_x2apic.patch --]
[-- Type: text/plain, Size: 1716 bytes --]

use x2apic id reported by cpuid during topology discovery, instead of the
apic id configured in the APIC. For most of the systems, x2apic id
reported by cpuid leaf 0xb will be same as the physical apic id reported
by the APIC_ID register of the APIC. We follow the suggested guidelines
and use the apic id reported by the cpuid.

No change to non-generic UV platforms, will use the apic id reported in the
APIC_ID register as the cpuid reported apic id's may not be unique.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---


Index: tip/arch/x86/kernel/genx2apic_cluster.c
===================================================================
--- tip.orig/arch/x86/kernel/genx2apic_cluster.c	2008-08-25 11:25:47.000000000 -0700
+++ tip/arch/x86/kernel/genx2apic_cluster.c	2008-08-25 13:15:45.000000000 -0700
@@ -120,14 +120,9 @@
 	return x;
 }
 
-static unsigned int x2apic_read_id(void)
-{
-	return apic_read(APIC_ID);
-}
-
 static unsigned int phys_pkg_id(int index_msb)
 {
-	return x2apic_read_id() >> index_msb;
+	return current_cpu_data.initial_apicid >> index_msb;
 }
 
 static void x2apic_send_IPI_self(int vector)
Index: tip/arch/x86/kernel/genx2apic_phys.c
===================================================================
--- tip.orig/arch/x86/kernel/genx2apic_phys.c	2008-08-25 11:25:47.000000000 -0700
+++ tip/arch/x86/kernel/genx2apic_phys.c	2008-08-25 13:15:45.000000000 -0700
@@ -118,14 +118,9 @@
 	return x;
 }
 
-static unsigned int x2apic_read_id(void)
-{
-	return apic_read(APIC_ID);
-}
-
 static unsigned int phys_pkg_id(int index_msb)
 {
-	return x2apic_read_id() >> index_msb;
+	return current_cpu_data.initial_apicid >> index_msb;
 }
 
 void x2apic_send_IPI_self(int vector)

--