70 lines
2.8 KiB
Diff
70 lines
2.8 KiB
Diff
From 90ccca2272ea05adc4ecedbbac70692f72831533 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:44 +0200
|
|
Subject: [PATCH 016/115] i386/cpu: Set and track CPUID_EXT3_CMP_LEG in
|
|
env->features[FEAT_8000_0001_ECX]
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [16/115] 8d6efb657ea34f7adccb5f8648cf0d10ba126299 (bonzini/rhel-qemu-kvm)
|
|
|
|
The correct usage is tracking and maintaining features in env->features[]
|
|
instead of manually set it in cpu_x86_cpuid().
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Link: https://lore.kernel.org/r/20241219110125.1266461-11-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 99a637a86f55c8486b06c698656befdf012eec4d)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit eb7304fc81c136a475a951720b76afa1f128ae95)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/cpu.c | 20 +++++++++-----------
|
|
1 file changed, 9 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index e20977411d..a97d042a2e 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -7404,17 +7404,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
|
*ecx = env->features[FEAT_8000_0001_ECX];
|
|
*edx = env->features[FEAT_8000_0001_EDX];
|
|
|
|
- /* The Linux kernel checks for the CMPLegacy bit and
|
|
- * discards multiple thread information if it is set.
|
|
- * So don't set it here for Intel to make Linux guests happy.
|
|
- */
|
|
- if (threads_per_pkg > 1) {
|
|
- if (env->cpuid_vendor1 != CPUID_VENDOR_INTEL_1 ||
|
|
- env->cpuid_vendor2 != CPUID_VENDOR_INTEL_2 ||
|
|
- env->cpuid_vendor3 != CPUID_VENDOR_INTEL_3) {
|
|
- *ecx |= 1 << 1; /* CmpLegacy bit */
|
|
- }
|
|
- }
|
|
if (tcg_enabled() && env->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 &&
|
|
!(env->hflags & HF_LMA_MASK)) {
|
|
*edx &= ~CPUID_EXT2_SYSCALL;
|
|
@@ -7976,6 +7965,15 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
|
|
|
|
if (x86_threads_per_pkg(&env->topo_info) > 1) {
|
|
env->features[FEAT_1_EDX] |= CPUID_HT;
|
|
+
|
|
+ /*
|
|
+ * The Linux kernel checks for the CMPLegacy bit and
|
|
+ * discards multiple thread information if it is set.
|
|
+ * So don't set it here for Intel to make Linux guests happy.
|
|
+ */
|
|
+ if (!IS_INTEL_CPU(env)) {
|
|
+ env->features[FEAT_8000_0001_ECX] |= CPUID_EXT3_CMP_LEG;
|
|
+ }
|
|
}
|
|
|
|
for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) {
|
|
--
|
|
2.50.1
|
|
|