mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "i386: Fix pkg_id offset for EPYC cpu models"

Browse Source 
This reverts commit 7b225762c8.

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>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889933119.21294.8112825730577505757.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Babu Moger 2020-08-31 13:42:11 -05:00 committed by Eduardo Habkost
parent a7c893a1c4
commit fb49865d26
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/i386/pc.c
View File

@ -1502,7 +1502,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
env->nr_dies = x86ms->smp_dies; env->nr_dies = x86ms->smp_dies;
env->nr_nodes = topo_info.nodes_per_pkg; env->nr_nodes = topo_info.nodes_per_pkg;
env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
/* /*
* If APIC ID is not set, * If APIC ID is not set,

9
target/i386/cpu.c
View File

@ -5678,7 +5678,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx |= CPUID_TOPOLOGY_LEVEL_SMT; *ecx |= CPUID_TOPOLOGY_LEVEL_SMT;
break; break;
case 1: case 1:
*eax = env->pkg_offset; *eax = apicid_pkg_offset(&topo_info);
*ebx = cs->nr_cores * cs->nr_threads; *ebx = cs->nr_cores * cs->nr_threads;
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break; break;
@ -5712,7 +5712,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break; break;
case 2: case 2:
*eax = env->pkg_offset; *eax = apicid_pkg_offset(&topo_info);
*ebx = env->nr_dies * cs->nr_cores * cs->nr_threads; *ebx = env->nr_dies * cs->nr_cores * cs->nr_threads;
*ecx |= CPUID_TOPOLOGY_LEVEL_DIE; *ecx |= CPUID_TOPOLOGY_LEVEL_DIE;
break; 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 * Bits 15:12 is "The number of bits in the initial
* Core::X86::Apic::ApicId[ApicId] value that indicate * Core::X86::Apic::ApicId[ApicId] value that indicate
* thread ID within a package". This is already stored at * thread ID within a package".
* CPUX86State::pkg_offset.
* Bits 7:0 is "The number of threads in the package is NC+1" * 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); ((cs->nr_cores * cs->nr_threads) - 1);
} else { } else {
*ecx = 0; *ecx = 0;

1
target/i386/cpu.h
View File

@ -1630,7 +1630,6 @@ typedef struct CPUX86State {
unsigned nr_dies; unsigned nr_dies;
unsigned nr_nodes; unsigned nr_nodes;
unsigned pkg_offset;
} CPUX86State; } CPUX86State;
struct kvm_msrs; struct kvm_msrs;