x86/fpu: Move CPUID leaf definitions to common code

Move the XSAVE-related CPUID leaf definitions to common code.  Then,
use the new definition to remove the last magic number from the CPUID
level dependency table.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/all/20241213205037.43C57CDE%40davehans-spike.ostc.intel.com

diff --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
index e7803c21a3fdec487b97508e4f8e5d34d869402e..a86097eb26c9daaa4db2cd8e4709c2e91d367366 100644 (file)
--- a/arch/x86/include/asm/cpuid.h
+++ b/arch/x86/include/asm/cpuid.h
@@ -23,8 +23,10 @@ enum cpuid_regs_idx {
 
 #define CPUID_MWAIT_LEAF       0x5
 #define CPUID_DCA_LEAF         0x9
+#define XSTATE_CPUID           0x0d
 #define CPUID_TSC_LEAF         0x15
 #define CPUID_FREQ_LEAF                0x16
+#define TILE_CPUID             0x1d
 
 #ifdef CONFIG_X86_32
 bool have_cpuid_p(void);

diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h
index d4427b88ee12a73fe63128c3037cac05b0ffda8a..7f39fe7980c52c69b247ab5f1700d7df45ef26cd 100644 (file)
--- a/arch/x86/include/asm/fpu/xstate.h
+++ b/arch/x86/include/asm/fpu/xstate.h
@@ -12,10 +12,6 @@
 /* Bit 63 of XCR0 is reserved for future expansion */
 #define XFEATURE_MASK_EXTEND   (~(XFEATURE_MASK_FPSSE | (1ULL << 63)))
 
-#define XSTATE_CPUID           0x0000000d
-
-#define TILE_CPUID             0x0000001d
-
 #define FXSAVE_SIZE    512
 
 #define XSAVE_HDR_SIZE     64

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 5ffa1f4eac38324a34ddb98ba4c4adcbb49e24e8..f5c33e155f986323e33a3915760a7a4b66305a93 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -639,7 +639,7 @@ static const struct cpuid_dependent_feature
 cpuid_dependent_features[] = {
        { X86_FEATURE_MWAIT,            CPUID_MWAIT_LEAF },
        { X86_FEATURE_DCA,              CPUID_DCA_LEAF },
-       { X86_FEATURE_XSAVE,            0x0000000d },
+       { X86_FEATURE_XSAVE,            XSTATE_CPUID },
        { 0, 0 }
 };
 

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 22abb5ee0cf2dce7500d0c5d014d98b812e63629..bf38b3e7542581872ef0723e165a137b63c07bcb 100644 (file)
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -20,6 +20,7 @@
 #include <asm/fpu/signal.h>
 #include <asm/fpu/xcr.h>
 
+#include <asm/cpuid.h>
 #include <asm/tlbflush.h>
 #include <asm/prctl.h>
 #include <asm/elf.h>