Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5828ed3 authored by Yu-cheng Yu's avatar Yu-cheng Yu Committed by Ingo Molnar
Browse files

x86/fpu/xstate: Move XSAVES state init to a function 



Make XSTATE init similar to existing code; move it to a separate function.
There is no functionality change.

Signed-off-by: default avatarYu-cheng Yu <yu-cheng.yu@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi V. Shankar <ravi.v.shankar@intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1485282346-15437-1-git-send-email-yu-cheng.yu@intel.com


[ Minor cleanliness edits. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dffba9a3

arch/x86/include/asm/fpu/internal.h

+10 −0
Original line number Diff line number Diff line
@@ -87,6 +87,16 @@ extern void fpstate_init_soft(struct swregs_state *soft); 
#else

static inline void fpstate_init_soft(struct swregs_state *soft) {}

#endif



static inline void fpstate_init_xstate(struct xregs_state *xsave)

{

	/*

	 * XRSTORS requires these bits set in xcomp_bv, or it will

	 * trigger #GP:

	 */

	xsave->header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT | xfeatures_mask;

}



static inline void fpstate_init_fxstate(struct fxregs_state *fx)

{

	fx->cwd = 0x37f;

arch/x86/kernel/fpu/core.c

+1 −8
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <asm/fpu/regset.h>

#include <asm/fpu/signal.h>

#include <asm/fpu/types.h>

#include <asm/fpu/xstate.h>

#include <asm/traps.h>



#include <linux/hardirq.h>
@@ -179,14 +178,8 @@ void fpstate_init(union fpregs_state *state) 


	memset(state, 0, fpu_kernel_xstate_size);



	/*

	 * XRSTORS requires that this bit is set in xcomp_bv, or

	 * it will #GP. Make sure it is replaced after the memset().

	 */

	if (static_cpu_has(X86_FEATURE_XSAVES))

		state->xsave.header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT |

					       xfeatures_mask;



		fpstate_init_xstate(&state->xsave);

	if (static_cpu_has(X86_FEATURE_FXSR))

		fpstate_init_fxstate(&state->fxsave);

	else