diff options
Diffstat (limited to '0025-x86-cpuid-Infrastructure-for-leaves-7-1-ecx-edx.patch')
| -rw-r--r-- | 0025-x86-cpuid-Infrastructure-for-leaves-7-1-ecx-edx.patch | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/0025-x86-cpuid-Infrastructure-for-leaves-7-1-ecx-edx.patch b/0025-x86-cpuid-Infrastructure-for-leaves-7-1-ecx-edx.patch new file mode 100644 index 0000000..e73f62d --- /dev/null +++ b/0025-x86-cpuid-Infrastructure-for-leaves-7-1-ecx-edx.patch @@ -0,0 +1,128 @@ +From 2094f834b85d32233c76763b014bc8764c3e36b1 Mon Sep 17 00:00:00 2001 +From: Andrew Cooper <andrew.cooper3@citrix.com> +Date: Fri, 3 Mar 2023 08:06:44 +0100 +Subject: [PATCH 25/61] x86/cpuid: Infrastructure for leaves 7:1{ecx,edx} + +We don't actually need ecx yet, but adding it in now will reduce the amount to +which leaf 7 is out of order in a featureset. + +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +master commit: b4a23bf6293aadecfd03bf9e83974443e2eac9cb +master date: 2023-02-09 18:26:17 +0000 +--- + tools/misc/xen-cpuid.c | 10 ++++++++++ + xen/arch/x86/cpu/common.c | 3 ++- + xen/include/public/arch-x86/cpufeatureset.h | 4 ++++ + xen/include/xen/lib/x86/cpuid.h | 17 +++++++++++++++-- + 4 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c +index cd094427dd..3cfbbf043f 100644 +--- a/tools/misc/xen-cpuid.c ++++ b/tools/misc/xen-cpuid.c +@@ -198,6 +198,14 @@ static const char *const str_7b1[32] = + { + }; + ++static const char *const str_7c1[32] = ++{ ++}; ++ ++static const char *const str_7d1[32] = ++{ ++}; ++ + static const char *const str_7d2[32] = + { + [ 0] = "intel-psfd", +@@ -223,6 +231,8 @@ static const struct { + { "0x80000021.eax", "e21a", str_e21a }, + { "0x00000007:1.ebx", "7b1", str_7b1 }, + { "0x00000007:2.edx", "7d2", str_7d2 }, ++ { "0x00000007:1.ecx", "7c1", str_7c1 }, ++ { "0x00000007:1.edx", "7d1", str_7d1 }, + }; + + #define COL_ALIGN "18" +diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c +index 9ce148a666..8222de6461 100644 +--- a/xen/arch/x86/cpu/common.c ++++ b/xen/arch/x86/cpu/common.c +@@ -448,7 +448,8 @@ static void generic_identify(struct cpuinfo_x86 *c) + cpuid_count(7, 1, + &c->x86_capability[FEATURESET_7a1], + &c->x86_capability[FEATURESET_7b1], +- &tmp, &tmp); ++ &c->x86_capability[FEATURESET_7c1], ++ &c->x86_capability[FEATURESET_7d1]); + if (max_subleaf >= 2) + cpuid_count(7, 2, + &tmp, &tmp, &tmp, +diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h +index e073122140..0b01ca5e8f 100644 +--- a/xen/include/public/arch-x86/cpufeatureset.h ++++ b/xen/include/public/arch-x86/cpufeatureset.h +@@ -304,6 +304,10 @@ XEN_CPUFEATURE(NSCB, 11*32+ 6) /*A Null Selector Clears Base (and + /* Intel-defined CPU features, CPUID level 0x00000007:2.edx, word 13 */ + XEN_CPUFEATURE(INTEL_PSFD, 13*32+ 0) /*A MSR_SPEC_CTRL.PSFD */ + ++/* Intel-defined CPU features, CPUID level 0x00000007:1.ecx, word 14 */ ++ ++/* Intel-defined CPU features, CPUID level 0x00000007:1.edx, word 15 */ ++ + #endif /* XEN_CPUFEATURE */ + + /* Clean up from a default include. Close the enum (for C). */ +diff --git a/xen/include/xen/lib/x86/cpuid.h b/xen/include/xen/lib/x86/cpuid.h +index 50be07c0eb..fa98b371ee 100644 +--- a/xen/include/xen/lib/x86/cpuid.h ++++ b/xen/include/xen/lib/x86/cpuid.h +@@ -17,7 +17,9 @@ + #define FEATURESET_7a1 10 /* 0x00000007:1.eax */ + #define FEATURESET_e21a 11 /* 0x80000021.eax */ + #define FEATURESET_7b1 12 /* 0x00000007:1.ebx */ +-#define FEATURESET_7d2 13 /* 0x80000007:2.edx */ ++#define FEATURESET_7d2 13 /* 0x00000007:2.edx */ ++#define FEATURESET_7c1 14 /* 0x00000007:1.ecx */ ++#define FEATURESET_7d1 15 /* 0x00000007:1.edx */ + + struct cpuid_leaf + { +@@ -194,7 +196,14 @@ struct cpuid_policy + uint32_t _7b1; + struct { DECL_BITFIELD(7b1); }; + }; +- uint32_t /* c */:32, /* d */:32; ++ union { ++ uint32_t _7c1; ++ struct { DECL_BITFIELD(7c1); }; ++ }; ++ union { ++ uint32_t _7d1; ++ struct { DECL_BITFIELD(7d1); }; ++ }; + + /* Subleaf 2. */ + uint32_t /* a */:32, /* b */:32, /* c */:32; +@@ -343,6 +352,8 @@ static inline void cpuid_policy_to_featureset( + fs[FEATURESET_e21a] = p->extd.e21a; + fs[FEATURESET_7b1] = p->feat._7b1; + fs[FEATURESET_7d2] = p->feat._7d2; ++ fs[FEATURESET_7c1] = p->feat._7c1; ++ fs[FEATURESET_7d1] = p->feat._7d1; + } + + /* Fill in a CPUID policy from a featureset bitmap. */ +@@ -363,6 +374,8 @@ static inline void cpuid_featureset_to_policy( + p->extd.e21a = fs[FEATURESET_e21a]; + p->feat._7b1 = fs[FEATURESET_7b1]; + p->feat._7d2 = fs[FEATURESET_7d2]; ++ p->feat._7c1 = fs[FEATURESET_7c1]; ++ p->feat._7d1 = fs[FEATURESET_7d1]; + } + + static inline uint64_t cpuid_policy_xcr0_max(const struct cpuid_policy *p) +-- +2.40.0 + |