Module Name: src
Committed By: martin
Date: Fri Jul 14 08:41:18 UTC 2017
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: lapic.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #135):
sys/arch/x86/x86/lapic.c: revision 1.60
PR/52266: Before access MSR[APICBASE], need to check if APIC is present.
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/arch/x86/x86/lapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.58.2.1 src/sys/arch/x86/x86/lapic.c:1.58.2.2
--- src/sys/arch/x86/x86/lapic.c:1.58.2.1 Mon Jul 10 12:26:21 2017
+++ src/sys/arch/x86/x86/lapic.c Fri Jul 14 08:41:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.58.2.1 2017/07/10 12:26:21 martin Exp $ */
+/* $NetBSD: lapic.c,v 1.58.2.2 2017/07/14 08:41:18 martin Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.58.2.1 2017/07/10 12:26:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.58.2.2 2017/07/14 08:41:18 martin Exp $");
#include "acpica.h"
#include "ioapic.h"
@@ -237,7 +237,8 @@ lapic_is_x2apic(void)
{
uint64_t msr;
- if (rdmsr_safe(MSR_APICBASE, &msr) == EFAULT)
+ if (!ISSET(cpu_feature[0], CPUID_APIC) ||
+ rdmsr_safe(MSR_APICBASE, &msr) == EFAULT)
return false;
return (msr & (APICBASE_EN | APICBASE_EXTD)) ==
(APICBASE_EN | APICBASE_EXTD);
