Module Name: src
Committed By: maxv
Date: Wed Nov 8 17:52:22 UTC 2017
Modified Files:
src/sys/arch/x86/x86: cpu.c fpu.c identcpu.c
src/sys/arch/xen/x86: cpu.c
Log Message:
Call fpuinit_mxcsr_mask in cpu_init, after cr4 is initialized, but before
touching xcr0. Then use clts/stts instead of modifying cr0, and enable the
mxcsr_mask detection on Xen.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/xen/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.138 src/sys/arch/x86/x86/cpu.c:1.139
--- src/sys/arch/x86/x86/cpu.c:1.138 Tue Oct 17 07:33:44 2017
+++ src/sys/arch/x86/x86/cpu.c Wed Nov 8 17:52:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.138 2017/10/17 07:33:44 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.139 2017/11/08 17:52:22 maxv Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.138 2017/10/17 07:33:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.139 2017/11/08 17:52:22 maxv Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -541,6 +541,7 @@ cpu_childdetached(device_t self, device_
void
cpu_init(struct cpu_info *ci)
{
+ extern int x86_fpu_save;
uint32_t cr4 = 0;
lcr0(rcr0() | CR0_WP);
@@ -584,6 +585,10 @@ cpu_init(struct cpu_info *ci)
lcr4(cr4);
}
+ if (x86_fpu_save >= FPU_SAVE_FXSAVE) {
+ fpuinit_mxcsr_mask();
+ }
+
/* If xsave is enabled, enable all fpu features */
if (cr4 & CR4_OSXSAVE)
wrxcr(0, x86_xsave_features & XCR0_FPU);
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.24 src/sys/arch/x86/x86/fpu.c:1.25
--- src/sys/arch/x86/x86/fpu.c:1.24 Sat Nov 4 08:58:30 2017
+++ src/sys/arch/x86/x86/fpu.c Wed Nov 8 17:52:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.24 2017/11/04 08:58:30 maxv Exp $ */
+/* $NetBSD: fpu.c,v 1.25 2017/11/08 17:52:22 maxv Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.24 2017/11/04 08:58:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.25 2017/11/08 17:52:22 maxv Exp $");
#include "opt_multiprocessor.h"
@@ -233,23 +233,21 @@ fpuinit(struct cpu_info *ci)
void
fpuinit_mxcsr_mask(void)
{
-#ifndef XEN
union savefpu fpusave __aligned(16);
- u_long cr0, psl;
+ u_long psl;
memset(&fpusave, 0, sizeof(fpusave));
/* Disable interrupts, and enable FPU */
psl = x86_read_psl();
x86_disable_intr();
- cr0 = rcr0();
- lcr0(cr0 & ~(CR0_EM|CR0_TS));
+ clts();
/* Fill in the FPU area */
fxsave(&fpusave);
/* Restore previous state */
- lcr0(cr0);
+ stts();
x86_write_psl(psl);
if (fpusave.sv_xmm.fx_mxcsr_mask == 0) {
@@ -257,12 +255,6 @@ fpuinit_mxcsr_mask(void)
} else {
x86_fpu_mxcsr_mask = fpusave.sv_xmm.fx_mxcsr_mask;
}
-#else
- /*
- * XXX: Does the detection above work on Xen?
- */
- x86_fpu_mxcsr_mask = __INITIAL_MXCSR_MASK__;
-#endif
}
/*
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.64 src/sys/arch/x86/x86/identcpu.c:1.65
--- src/sys/arch/x86/x86/identcpu.c:1.64 Fri Nov 3 16:21:01 2017
+++ src/sys/arch/x86/x86/identcpu.c Wed Nov 8 17:52:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.64 2017/11/03 16:21:01 kre Exp $ */
+/* $NetBSD: identcpu.c,v 1.65 2017/11/08 17:52:22 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.64 2017/11/03 16:21:01 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.65 2017/11/08 17:52:22 maxv Exp $");
#include "opt_xen.h"
@@ -753,8 +753,6 @@ cpu_probe_fpu(struct cpu_info *ci)
x86_fpu_save = FPU_SAVE_FXSAVE;
- fpuinit_mxcsr_mask();
-
/* See if xsave (for AVX) is supported */
if ((ci->ci_feat_val[1] & CPUID2_XSAVE) == 0)
return;
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.112 src/sys/arch/xen/x86/cpu.c:1.113
--- src/sys/arch/xen/x86/cpu.c:1.112 Sun Sep 17 09:04:51 2017
+++ src/sys/arch/xen/x86/cpu.c Wed Nov 8 17:52:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.112 2017/09/17 09:04:51 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.113 2017/11/08 17:52:22 maxv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.112 2017/09/17 09:04:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.113 2017/11/08 17:52:22 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -525,6 +525,7 @@ cpu_attach_common(device_t parent, devic
void
cpu_init(struct cpu_info *ci)
{
+ extern int x86_fpu_save;
/*
* If we have FXSAVE/FXRESTOR, use them.
@@ -539,6 +540,10 @@ cpu_init(struct cpu_info *ci)
lcr4(rcr4() | CR4_OSXMMEXCPT);
}
+ if (x86_fpu_save >= FPU_SAVE_FXSAVE) {
+ fpuinit_mxcsr_mask();
+ }
+
atomic_or_32(&ci->ci_flags, CPUF_RUNNING);
}
