x86/avx: Fix fpu init logic when CPUID_XSTATE fails

This should not fail if X86_FEATURE_XSAVE, but it does on an i5-3470 for reasons unknown. Handle it for the time being. Signed-off-by: Pedro Falcato <[email protected]>
heatd · May 12, 2024 · bde2a0b · bde2a0b
1 parent f4255c3
commit bde2a0b
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/kernel/arch/x86_64/avx.cpp b/kernel/arch/x86_64/avx.cpp
@@ -50,13 +50,12 @@ void avx_init()
         uint32_t eax, ebx, ecx, edx;
 
         ecx = 0;
-        if (!__get_cpuid_count(CPUID_XSTATE, 0, &eax, &ebx, &ecx, &edx))
-            return;
-
-        fpu_area_size = ebx;
-        fpu_area_alignment = AVX_SAVE_ALIGNMENT;
-
-        static_branch_enable(&avx_supported);
+        if (__get_cpuid_count(CPUID_XSTATE, 0, &eax, &ebx, &ecx, &edx))
+        {
+            fpu_area_size = ebx;
+            fpu_area_alignment = AVX_SAVE_ALIGNMENT;
+            static_branch_enable(&avx_supported);
+        }
     }
 
     fpu_init_cache();