56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From da6c7cae87a945451617014a97c83b0e38879786 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:44 +0200
|
|
Subject: [PATCH 009/115] i386/cpu: Drop cores_per_pkg in cpu_x86_cpuid()
|
|
|
|
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: [9/115] 1e8cca4b6784adde542654cd45b4f921fbc91fcd (bonzini/rhel-qemu-kvm)
|
|
|
|
Local variable cores_per_pkg is only used to calculate threads_per_pkg.
|
|
No need for it. Drop it and open-code it instead.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20241219110125.1266461-4-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 00ec7be67c3981b486293aa8e0aef9534f229c5e)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 589e1863d4e871e09af4ff176df97c23e2a33b8b)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/cpu.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index 1fe492f33d..b639769ef3 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -6950,7 +6950,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
|
uint32_t limit;
|
|
uint32_t signature[3];
|
|
X86CPUTopoInfo topo_info;
|
|
- uint32_t cores_per_pkg;
|
|
uint32_t threads_per_pkg;
|
|
|
|
topo_info.dies_per_pkg = env->nr_dies;
|
|
@@ -6958,9 +6957,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
|
topo_info.cores_per_module = cs->nr_cores / env->nr_dies / env->nr_modules;
|
|
topo_info.threads_per_core = cs->nr_threads;
|
|
|
|
- cores_per_pkg = topo_info.cores_per_module * topo_info.modules_per_die *
|
|
- topo_info.dies_per_pkg;
|
|
- threads_per_pkg = cores_per_pkg * topo_info.threads_per_core;
|
|
+ threads_per_pkg = topo_info.threads_per_core * topo_info.cores_per_module *
|
|
+ topo_info.modules_per_die * topo_info.dies_per_pkg;
|
|
|
|
/* Calculate & apply limits for different index ranges */
|
|
if (index >= 0xC0000000) {
|
|
--
|
|
2.50.1
|
|
|