1 files changed, 9 insertions, 13 deletions

diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 6d9f0a7ef4c8..bd08fb77073d 100644
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -78,13 +78,15 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)
         cr0 &= ~(X86_CR0_TS | X86_CR0_EM);
         write_cr0(cr0);
 
-        asm volatile("fninit ; fnstsw %0 ; fnstcw %1"
-                     : "+m" (fsw), "+m" (fcw));
+        if (!test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {
+                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);
+                if (fsw == 0 && (fcw & 0x103f) == 0x003f)
+                        set_cpu_cap(c, X86_FEATURE_FPU);
+                else
+                        clear_cpu_cap(c, X86_FEATURE_FPU);
+        }
 
 #ifndef CONFIG_MATH_EMULATION
         if (!cpu_has_fpu) {
@@ -132,7 +134,7 @@ static void __init 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.)
          */
-        fpstate_init_fxstate(&init_fpstate.fxsave);
+        fpstate_init(&init_fpstate);
 
         fpu__init_system_mxcsr();
 }
@@ -300,12 +302,6 @@ u64 __init fpu__get_supported_xfeatures_mask(void)
 static void __init fpu__clear_eager_fpu_features(void)
 {
         setup_clear_cpu_cap(X86_FEATURE_MPX);
-        setup_clear_cpu_cap(X86_FEATURE_AVX);
-        setup_clear_cpu_cap(X86_FEATURE_AVX2);
-        setup_clear_cpu_cap(X86_FEATURE_AVX512F);
-        setup_clear_cpu_cap(X86_FEATURE_AVX512PF);
-        setup_clear_cpu_cap(X86_FEATURE_AVX512ER);
-        setup_clear_cpu_cap(X86_FEATURE_AVX512CD);
 }
 
 /*