Skip to contentSkip to conversation

deterine xapic using apic version

PATCH New Shaohua Li 1 participant 1 message Mar 7, 2006

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 1/1 deterine xapic using apic version

Checking APIC version instead of CPU family to determine XAPIC. Family 6 CPU could have xapic as well.

---

 linux-2.6.16-rc5-root/arch/i386/kernel/io_apic.c |    3 ++-
 linux-2.6.16-rc5-root/arch/i386/kernel/mpparse.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/i386/kernel/io_apic.c renamed from arch/i386/kernel/io_apic.c~xapic_id +2 -1
diff -puN arch/i386/kernel/io_apic.c~xapic_id arch/i386/kernel/io_apic.c
@@ -1759,7 +1759,8 @@ static void __init setup_ioapic_ids_from
 	 * Don't check I/O APIC IDs for xAPIC systems.  They have
 	 * no meaning without the serial APIC bus.
 	 */
-	if (!(boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && boot_cpu_data.x86 < 15))
+	if (!(boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+		|| APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
 		return;
 	/*
 	 * This is broken; anything with a real cpu count has to
arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c~xapic_id +2 -1
diff -puN arch/i386/kernel/mpparse.c~xapic_id arch/i386/kernel/mpparse.c
@@ -935,7 +935,8 @@ void __init mp_register_ioapic (
 	mp_ioapics[idx].mpc_apicaddr = address;
 
 	set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
-	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 < 15))
+	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+		&& !APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
 		tmpid = io_apic_get_unique_id(idx, id);
 	else
 		tmpid = id;

_