summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2017-12-08 04:17:28 -0700
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2017-12-12 09:39:17 -0500
commit0f3922a9b99eca76c6578cd84191573378f2c988 (patch)
treeee9df16f009c9866d998f42b435b29f92cfdda2c
parent1ab134ca3151c55b6fc606857e71d9adb4c355d1 (diff)
downloadop-kernel-dev-0f3922a9b99eca76c6578cd84191573378f2c988.zip
op-kernel-dev-0f3922a9b99eca76c6578cd84191573378f2c988.tar.gz
x86/Xen: don't report ancient LAPIC version
Unconditionally reporting a value seen on the P4 or older invokes functionality like io_apic_get_unique_id() on 32-bit builds, resulting in a panic() with sufficiently many CPUs and/or IO-APICs. Doing what that function does would be the hypervisor's responsibility anyway, so makes no sense to be used when running on Xen. Uniformly report a more modern version; this shouldn't matter much as both LAPIC and IO-APIC are being managed entirely / mostly by the hypervisor. Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-rw-r--r--arch/x86/xen/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index b5e48da..c140485 100644
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -56,7 +56,7 @@ static u32 xen_apic_read(u32 reg)
return 0;
if (reg == APIC_LVR)
- return 0x10;
+ return 0x14;
#ifdef CONFIG_X86_32
if (reg == APIC_LDR)
return SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
OpenPOWER on IntegriCloud