| Message ID | 158326551090.40452.9028312447486758348.stgit@naples-babu.amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | APIC ID fixes for AMD EPYC CPU model | expand |
On Tue, 03 Mar 2020 13:58:30 -0600 Babu Moger <babu.moger@amd.com> wrote: > If the system is numa configured the pkg_offset needs > to be adjusted for EPYC cpu models. Fix it calling the > model specific handler. > > Signed-off-by: Babu Moger <babu.moger@amd.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/i386/pc.c | 1 + > target/i386/cpu.c | 4 ++-- > target/i386/cpu.h | 1 + > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index c600ba0432..b6237a3a14 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1527,6 +1527,7 @@ 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 f870f7c55b..9b160cbdd1 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -5503,7 +5503,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > *ecx |= CPUID_TOPOLOGY_LEVEL_SMT; > break; > case 1: > - *eax = apicid_pkg_offset(&topo_info); > + *eax = env->pkg_offset; > *ebx = cs->nr_cores * cs->nr_threads; > *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; > break; > @@ -5537,7 +5537,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; > break; > case 2: > - *eax = apicid_pkg_offset(&topo_info); > + *eax = env->pkg_offset; > *ebx = env->nr_dies * cs->nr_cores * cs->nr_threads; > *ecx |= CPUID_TOPOLOGY_LEVEL_DIE; > break; > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > index 34f0d994ef..aac86af5cf 100644 > --- a/target/i386/cpu.h > +++ b/target/i386/cpu.h > @@ -1608,6 +1608,7 @@ typedef struct CPUX86State { > > unsigned nr_dies; > unsigned nr_nodes; > + unsigned pkg_offset; > } CPUX86State; > > struct kvm_msrs; >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c600ba0432..b6237a3a14 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1527,6 +1527,7 @@ 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 f870f7c55b..9b160cbdd1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5503,7 +5503,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *ecx |= CPUID_TOPOLOGY_LEVEL_SMT; break; case 1: - *eax = apicid_pkg_offset(&topo_info); + *eax = env->pkg_offset; *ebx = cs->nr_cores * cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; break; @@ -5537,7 +5537,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; break; case 2: - *eax = apicid_pkg_offset(&topo_info); + *eax = env->pkg_offset; *ebx = env->nr_dies * cs->nr_cores * cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_DIE; break; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 34f0d994ef..aac86af5cf 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1608,6 +1608,7 @@ typedef struct CPUX86State { unsigned nr_dies; unsigned nr_nodes; + unsigned pkg_offset; } CPUX86State; struct kvm_msrs;
If the system is numa configured the pkg_offset needs to be adjusted for EPYC cpu models. Fix it calling the model specific handler. Signed-off-by: Babu Moger <babu.moger@amd.com> --- hw/i386/pc.c | 1 + target/i386/cpu.c | 4 ++-- target/i386/cpu.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)