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

Commit 0aba6978 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Harmonize the names of the fpstate_init() helper functions 



Harmonize the inconsistent naming of these related functions:

                          fpstate_init()
  finit_soft_fpu()   =>   fpstate_init_fsoft()
  fx_finit()         =>   fpstate_init_fxstate()
  fx_finit()         =>   fpstate_init_fstate()       # split out

Cc: Andy Lutomirski <luto@amacapital.net>
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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e1cebad4

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

+11 −12
Original line number Diff line number Diff line
@@ -28,7 +28,18 @@ extern void fpu__init_cpu_xstate(void); 
extern void fpu__init_system(struct cpuinfo_x86 *c);



extern void fpu__activate_curr(struct fpu *fpu);



extern void fpstate_init(struct fpu *fpu);

#ifdef CONFIG_MATH_EMULATION

extern void fpstate_init_soft(struct i387_soft_struct *soft);

#else

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

#endif

static inline void fpstate_init_fxstate(struct i387_fxsave_struct *fx)

{

	fx->cwd = 0x37f;

	fx->mxcsr = MXCSR_DEFAULT;

}



extern int  dump_fpu(struct pt_regs *, struct user_i387_struct *);

extern int  fpu__exception_code(struct fpu *fpu, int trap_nr);
@@ -48,12 +59,6 @@ extern void fpu__resume_cpu(void); 


DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);



#ifdef CONFIG_MATH_EMULATION

extern void finit_soft_fpu(struct i387_soft_struct *soft);

#else

static inline void finit_soft_fpu(struct i387_soft_struct *soft) {}

#endif



/*

 * Must be run with preemption disabled: this clears the fpu_fpregs_owner_ctx,

 * on this CPU.
@@ -93,12 +98,6 @@ static __always_inline __pure bool use_fxsr(void) 
	return static_cpu_has_safe(X86_FEATURE_FXSR);

}



static inline void fx_finit(struct i387_fxsave_struct *fx)

{

	fx->cwd = 0x37f;

	fx->mxcsr = MXCSR_DEFAULT;

}



extern void fpstate_sanitize_xstate(struct fpu *fpu);



#define user_insn(insn, output, input...)				\

arch/x86/kernel/fpu/core.c

+16 −10
Original line number Diff line number Diff line
@@ -191,24 +191,30 @@ void fpu__save(struct fpu *fpu) 
}

EXPORT_SYMBOL_GPL(fpu__save);



/*

 * Legacy x87 fpstate state init:

 */

static inline void fpstate_init_fstate(struct i387_fsave_struct *fp)

{

	fp->cwd = 0xffff037fu;

	fp->swd = 0xffff0000u;

	fp->twd = 0xffffffffu;

	fp->fos = 0xffff0000u;

}



void fpstate_init(struct fpu *fpu)

{

	if (!cpu_has_fpu) {

		finit_soft_fpu(&fpu->state.soft);

		fpstate_init_soft(&fpu->state.soft);

		return;

	}



	memset(&fpu->state, 0, xstate_size);



	if (cpu_has_fxsr) {

		fx_finit(&fpu->state.fxsave);

	} else {

		struct i387_fsave_struct *fp = &fpu->state.fsave;

		fp->cwd = 0xffff037fu;

		fp->swd = 0xffff0000u;

		fp->twd = 0xffffffffu;

		fp->fos = 0xffff0000u;

	}

	if (cpu_has_fxsr)

		fpstate_init_fxstate(&fpu->state.fxsave);

	else

		fpstate_init_fstate(&fpu->state.fsave);

}

EXPORT_SYMBOL_GPL(fpstate_init);

arch/x86/kernel/fpu/init.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void fpu__init_system_generic(void) 
	 * Set up the legacy init FPU context. (xstate init might overwrite this

	 * with a more modern format, if the CPU supports it.)

	 */

	fx_finit(&init_xstate_ctx.i387);

	fpstate_init_fxstate(&init_xstate_ctx.i387);



	fpu__init_system_mxcsr();

}

arch/x86/math-emu/fpu_aux.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void fclex(void) 
}



/* Needs to be externally visible */

void finit_soft_fpu(struct i387_soft_struct *soft)

void fpstate_init_soft(struct i387_soft_struct *soft)

{

	struct address *oaddr, *iaddr;

	memset(soft, 0, sizeof(*soft));
@@ -52,7 +52,7 @@ void finit_soft_fpu(struct i387_soft_struct *soft) 


void finit(void)

{

	finit_soft_fpu(&current->thread.fpu.state.soft);

	fpstate_init_soft(&current->thread.fpu.state.soft);

}



/*