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

Commit 2e2f3da7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Factor out fpu__init_system_early_generic() 



Move the generic bits of fpu__detect() into fpu__init_system_early_generic().

We'll move some other code here too in a followup patch.

Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
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 7218e8b7

arch/x86/kernel/fpu/init.c

+24 −17
Original line number Original line Diff line number Diff line
@@ -64,6 +64,29 @@ void fpu__init_check_bugs(void) 
		check_fpu();

		check_fpu();

}

}





/*

 * The earliest FPU detection code:

 */

static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)

{

	unsigned long cr0;

	u16 fsw, fcw;



	fsw = fcw = 0xffff;



	cr0 = read_cr0();

	cr0 &= ~(X86_CR0_TS | X86_CR0_EM);

	write_cr0(cr0);



	asm volatile("fninit ; fnstsw %0 ; fnstcw %1"

		     : "+m" (fsw), "+m" (fcw));



	if (fsw == 0 && (fcw & 0x103f) == 0x003f)

		set_cpu_cap(c, X86_FEATURE_FPU);

	else

		clear_cpu_cap(c, X86_FEATURE_FPU);

}



/*

/*

 * Boot time FPU feature detection code:

 * Boot time FPU feature detection code:

 */

 */
@@ -269,23 +292,7 @@ __setup("no387", no_387); 
 */

 */

void fpu__detect(struct cpuinfo_x86 *c)

void fpu__detect(struct cpuinfo_x86 *c)

{

{

	unsigned long cr0;

	fpu__init_system_early_generic(c);

	u16 fsw, fcw;



	fsw = fcw = 0xffff;



	cr0 = read_cr0();

	cr0 &= ~(X86_CR0_TS | X86_CR0_EM);

	write_cr0(cr0);



	asm volatile("fninit ; fnstsw %0 ; fnstcw %1"

		     : "+m" (fsw), "+m" (fcw));



	if (fsw == 0 && (fcw & 0x103f) == 0x003f)

		set_cpu_cap(c, X86_FEATURE_FPU);

	else

		clear_cpu_cap(c, X86_FEATURE_FPU);



	fpu__init_system();

	fpu__init_system();

	/* The final cr0 value is set later, in fpu_init() */

	/* The final cr0 value is set later, in fpu_init() */

}
 
}