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

Commit 01f8fd73 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Replace cpu_has_fxsr with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459801503-15600-9-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 93984fbd

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	set_bit(bit, (unsigned long *)cpu_caps_set);	\

	set_bit(bit, (unsigned long *)cpu_caps_set);	\

} while (0)

} while (0)





#define cpu_has_fxsr		boot_cpu_has(X86_FEATURE_FXSR)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*

/*

arch/x86/kernel/fpu/core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ void fpstate_init(union fpregs_state *state) 




	memset(state, 0, xstate_size);

	memset(state, 0, xstate_size);





	if (cpu_has_fxsr)

	if (static_cpu_has(X86_FEATURE_FXSR))

		fpstate_init_fxstate(&state->fxsave);

		fpstate_init_fxstate(&state->fxsave);

	else

	else

		fpstate_init_fstate(&state->fsave);

		fpstate_init_fstate(&state->fsave);
@@ -508,7 +508,7 @@ void fpu__clear(struct fpu *fpu) 




static inline unsigned short get_fpu_cwd(struct fpu *fpu)

static inline unsigned short get_fpu_cwd(struct fpu *fpu)

{

{

	if (cpu_has_fxsr) {

	if (boot_cpu_has(X86_FEATURE_FXSR)) {

		return fpu->state.fxsave.cwd;

		return fpu->state.fxsave.cwd;

	} else {

	} else {

		return (unsigned short)fpu->state.fsave.cwd;

		return (unsigned short)fpu->state.fsave.cwd;
@@ -517,7 +517,7 @@ static inline unsigned short get_fpu_cwd(struct fpu *fpu) 




static inline unsigned short get_fpu_swd(struct fpu *fpu)

static inline unsigned short get_fpu_swd(struct fpu *fpu)

{

{

	if (cpu_has_fxsr) {

	if (boot_cpu_has(X86_FEATURE_FXSR)) {

		return fpu->state.fxsave.swd;

		return fpu->state.fxsave.swd;

	} else {

	} else {

		return (unsigned short)fpu->state.fsave.swd;

		return (unsigned short)fpu->state.fsave.swd;

arch/x86/kernel/fpu/init.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ static void fpu__init_cpu_generic(void) 
	unsigned long cr0;

	unsigned long cr0;

	unsigned long cr4_mask = 0;

	unsigned long cr4_mask = 0;





	if (cpu_has_fxsr)

	if (boot_cpu_has(X86_FEATURE_FXSR))

		cr4_mask |= X86_CR4_OSFXSR;

		cr4_mask |= X86_CR4_OSFXSR;

	if (boot_cpu_has(X86_FEATURE_XMM))

	if (boot_cpu_has(X86_FEATURE_XMM))

		cr4_mask |= X86_CR4_OSXMMEXCPT;

		cr4_mask |= X86_CR4_OSXMMEXCPT;
@@ -106,7 +106,7 @@ static void __init fpu__init_system_mxcsr(void) 
{

{

	unsigned int mask = 0;

	unsigned int mask = 0;





	if (cpu_has_fxsr) {

	if (boot_cpu_has(X86_FEATURE_FXSR)) {

		/* Static because GCC does not get 16-byte stack alignment right: */

		/* Static because GCC does not get 16-byte stack alignment right: */

		static struct fxregs_state fxregs __initdata;

		static struct fxregs_state fxregs __initdata;
@@ -221,7 +221,7 @@ static void __init fpu__init_system_xstate_size_legacy(void) 
		setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);

		setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);

		xstate_size = sizeof(struct swregs_state);

		xstate_size = sizeof(struct swregs_state);

	} else {

	} else {

		if (cpu_has_fxsr)

		if (boot_cpu_has(X86_FEATURE_FXSR))

			xstate_size = sizeof(struct fxregs_state);

			xstate_size = sizeof(struct fxregs_state);

		else

		else

			xstate_size = sizeof(struct fregs_state);

			xstate_size = sizeof(struct fregs_state);

arch/x86/kernel/fpu/regset.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -21,7 +21,10 @@ int regset_xregset_fpregs_active(struct task_struct *target, const struct user_r 
{

{

	struct fpu *target_fpu = &target->thread.fpu;

	struct fpu *target_fpu = &target->thread.fpu;





	return (cpu_has_fxsr && target_fpu->fpstate_active) ? regset->n : 0;

	if (boot_cpu_has(X86_FEATURE_FXSR) && target_fpu->fpstate_active)

		return regset->n;

	else

		return 0;

}

}





int xfpregs_get(struct task_struct *target, const struct user_regset *regset,

int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
@@ -30,7 +33,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, 
{

{

	struct fpu *fpu = &target->thread.fpu;

	struct fpu *fpu = &target->thread.fpu;





	if (!cpu_has_fxsr)

	if (!boot_cpu_has(X86_FEATURE_FXSR))

		return -ENODEV;

		return -ENODEV;





	fpu__activate_fpstate_read(fpu);

	fpu__activate_fpstate_read(fpu);
@@ -47,7 +50,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, 
	struct fpu *fpu = &target->thread.fpu;

	struct fpu *fpu = &target->thread.fpu;

	int ret;

	int ret;





	if (!cpu_has_fxsr)

	if (!boot_cpu_has(X86_FEATURE_FXSR))

		return -ENODEV;

		return -ENODEV;





	fpu__activate_fpstate_write(fpu);

	fpu__activate_fpstate_write(fpu);
@@ -278,7 +281,7 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset, 
	if (!static_cpu_has(X86_FEATURE_FPU))

	if (!static_cpu_has(X86_FEATURE_FPU))

		return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);

		return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);





	if (!cpu_has_fxsr)

	if (!boot_cpu_has(X86_FEATURE_FXSR))

		return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

		return user_regset_copyout(&pos, &count, &kbuf, &ubuf,

					   &fpu->state.fsave, 0,

					   &fpu->state.fsave, 0,

					   -1);

					   -1);
@@ -309,7 +312,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, 
	if (!static_cpu_has(X86_FEATURE_FPU))

	if (!static_cpu_has(X86_FEATURE_FPU))

		return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);

		return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);





	if (!cpu_has_fxsr)

	if (!boot_cpu_has(X86_FEATURE_FXSR))

		return user_regset_copyin(&pos, &count, &kbuf, &ubuf,

		return user_regset_copyin(&pos, &count, &kbuf, &ubuf,

					  &fpu->state.fsave, 0,

					  &fpu->state.fsave, 0,

					  -1);

					  -1);