Module Name: src
Committed By: msaitoh
Date: Thu Jan 11 09:18:16 UTC 2018
Modified Files:
src/sys/arch/x86/x86: cpu.c
Log Message:
Changing CR4 register may change cpuid values. For example, setting
CR4_OSXSAVE sets CPUID2_OSXSAVE. The CPUID2_OSXSAVE is in ci_feat_val[1],
so update it after changing CR4.
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/x86/x86/cpu.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/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.144 src/sys/arch/x86/x86/cpu.c:1.145
--- src/sys/arch/x86/x86/cpu.c:1.144 Sun Jan 7 16:10:16 2018
+++ src/sys/arch/x86/x86/cpu.c Thu Jan 11 09:18:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.144 2018/01/07 16:10:16 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.145 2018/01/11 09:18:16 msaitoh Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.144 2018/01/07 16:10:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.145 2018/01/11 09:18:16 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -623,6 +623,19 @@ cpu_init(struct cpu_info *ci)
lcr4(cr4);
}
+ /*
+ * Changing CR4 register may change cpuid values. For example, setting
+ * CR4_OSXSAVE sets CPUID2_OSXSAVE. The CPUID2_OSXSAVE is in
+ * ci_feat_val[1], so update it.
+ * XXX Other than ci_feat_val[1] might be changed.
+ */
+ if (cpuid_level >= 1) {
+ u_int descs[4];
+
+ x86_cpuid(1, descs);
+ ci->ci_feat_val[1] = descs[2];
+ }
+
if (x86_fpu_save >= FPU_SAVE_FXSAVE) {
fpuinit_mxcsr_mask();
}
