[PATCH 09/11] x86/fpu: Move CPUID leaf definitions to common code

Dave Hansen
2024-11-20T19:53:39Z

From: Dave Hansen <dave.hansen@linux.intel.com>

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

b/arch/x86/include/asm/cpuid.h | 2 ++
b/arch/x86/include/asm/fpu/xstate.h | 4 ----
b/arch/x86/kernel/cpu/common.c | 2 +-
b/arch/x86/kernel/fpu/xstate.c | 1 +
4 files changed, 4 insertions(+), 5 deletions(-)

diff -puN arch/x86/include/asm/cpuid.h~xsave-leaf-checks-1 arch/x86/include/asm/cpuid.h
--- a/arch/x86/include/asm/cpuid.h~xsave-leaf-checks-1 2024-11-20 11:44:19.817750116 -0800
+++ b/arch/x86/include/asm/cpuid.h 2024-11-20 11:44:19.825750422 -0800
@@ -21,8 +21,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
extern int have_cpuid_p(void);
diff -puN arch/x86/include/asm/fpu/xstate.h~xsave-leaf-checks-1 arch/x86/include/asm/fpu/xstate.h
--- a/arch/x86/include/asm/fpu/xstate.h~xsave-leaf-checks-1 2024-11-20 11:44:19.817750116 -0800
+++ b/arch/x86/include/asm/fpu/xstate.h 2024-11-20 11:44:19.825750422 -0800
@@ -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 -puN arch/x86/kernel/cpu/common.c~xsave-leaf-checks-1 arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/common.c~xsave-leaf-checks-1 2024-11-20 11:44:19.821750269 -0800
+++ b/arch/x86/kernel/cpu/common.c 2024-11-20 11:44:19.825750422 -0800
@@ -640,7 +640,7 @@ static const struct cpuid_dependent_feat
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 -puN arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-1 arch/x86/kernel/fpu/xstate.c
--- a/arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-1 2024-11-20 11:44:19.821750269 -0800
+++ b/arch/x86/kernel/fpu/xstate.c 2024-11-20 11:44:19.825750422 -0800
@@ -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>
_