[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 01/10] Revert "i386: Fix pkg_id offset for EPYC cpu models"
From: |
Babu Moger |
Subject: |
[PATCH v6 01/10] Revert "i386: Fix pkg_id offset for EPYC cpu models" |
Date: |
Mon, 31 Aug 2020 13:42:11 -0500 |
User-agent: |
StGit/unknown-version |
This reverts commit 7b225762c8c05fd31d4c2be116aedfbc00383f8b.
Remove the EPYC specific apicid decoding and use the generic
default decoding.
Also fix all the references of pkg_offset.
Signed-off-by: Babu Moger <babu.moger@amd.com>
---
hw/i386/pc.c | 1 -
target/i386/cpu.c | 9 ++++-----
target/i386/cpu.h | 1 -
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 5d8d5ef8b3..6b708f4341 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1502,7 +1502,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
env->nr_dies = x86ms->smp_dies;
env->nr_nodes = topo_info.nodes_per_pkg;
- env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
/*
* If APIC ID is not set,
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 588f32e136..173e6f4a07 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5678,7 +5678,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
*ecx |= CPUID_TOPOLOGY_LEVEL_SMT;
break;
case 1:
- *eax = env->pkg_offset;
+ *eax = apicid_pkg_offset(&topo_info);
*ebx = cs->nr_cores * cs->nr_threads;
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break;
@@ -5712,7 +5712,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break;
case 2:
- *eax = env->pkg_offset;
+ *eax = apicid_pkg_offset(&topo_info);
*ebx = env->nr_dies * cs->nr_cores * cs->nr_threads;
*ecx |= CPUID_TOPOLOGY_LEVEL_DIE;
break;
@@ -5889,11 +5889,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
/*
* Bits 15:12 is "The number of bits in the initial
* Core::X86::Apic::ApicId[ApicId] value that indicate
- * thread ID within a package". This is already stored at
- * CPUX86State::pkg_offset.
+ * thread ID within a package".
* Bits 7:0 is "The number of threads in the package is NC+1"
*/
- *ecx = (env->pkg_offset << 12) |
+ *ecx = (apicid_pkg_offset(&topo_info) << 12) |
((cs->nr_cores * cs->nr_threads) - 1);
} else {
*ecx = 0;
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index e1a5c174dc..d5ad42d694 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1630,7 +1630,6 @@ typedef struct CPUX86State {
unsigned nr_dies;
unsigned nr_nodes;
- unsigned pkg_offset;
} CPUX86State;
struct kvm_msrs;
- [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode, Babu Moger, 2020/08/31
- [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode, Babu Moger, 2020/08/31
- [PATCH v6 01/10] Revert "i386: Fix pkg_id offset for EPYC cpu models",
Babu Moger <=
- [PATCH v6 02/10] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models", Babu Moger, 2020/08/31
- [PATCH v6 03/10] Revert "hw/i386: Move arch_id decode inside x86_cpus_init", Babu Moger, 2020/08/31
- [PATCH v6 04/10] Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition", Babu Moger, 2020/08/31
- [PATCH v6 05/10] Revert "hw/i386: Introduce apicid functions inside X86MachineState", Babu Moger, 2020/08/31
- [PATCH v6 06/10] Revert "target/i386: Cleanup and use the EPYC mode topology functions", Babu Moger, 2020/08/31
- [PATCH v6 07/10] Revert "hw/386: Add EPYC mode topology decoding functions", Babu Moger, 2020/08/31
- [PATCH v6 08/10] Revert "hw/i386: Update structures to save the number of nodes per package", Babu Moger, 2020/08/31
- [PATCH v6 09/10] i386: Simplify CPUID_8000_001E for AMD, Babu Moger, 2020/08/31
- [PATCH v6 10/10] i386: Simplify CPUID_8000_001E for AMD, Babu Moger, 2020/08/31