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

Commit e83ab9ad authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Move !FPU check ingo fpu__init_system_early_generic() 



There's a !FPU related sanity check in fpu__init_cpu_generic(),
which is executed on every CPU onlining - even though we should do
this only once, and during system init.

Move this check to fpu__init_system_early_generic().

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 2e2f3da7

arch/x86/kernel/fpu/init.c

+9 −8
Original line number Diff line number Diff line
@@ -85,6 +85,15 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c) 
		set_cpu_cap(c, X86_FEATURE_FPU);

	else

		clear_cpu_cap(c, X86_FEATURE_FPU);



#ifndef CONFIG_MATH_EMULATION

	if (!cpu_has_fpu) {

		pr_emerg("No FPU found and no math emulation present\n");

		pr_emerg("Giving up\n");

		for (;;)

			asm volatile("hlt");

	}

#endif

}



/*
@@ -180,14 +189,6 @@ static void fpu__init_cpu_generic(void) 
	unsigned long cr0;

	unsigned long cr4_mask = 0;



#ifndef CONFIG_MATH_EMULATION

	if (!cpu_has_fpu) {

		pr_emerg("No FPU found and no math emulation present\n");

		pr_emerg("Giving up\n");

		for (;;)

			asm volatile("hlt");

	}

#endif

	if (cpu_has_fxsr)

		cr4_mask |= X86_CR4_OSFXSR;

	if (cpu_has_xmm)