From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Babu Moger <babu.moger@amd.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL 7/9] i386: Fix pkg_id offset for EPYC cpu models
Date: Thu, 2 Apr 2020 19:20:49 -0300 [thread overview]
Message-ID: <20200402222051.523093-8-ehabkost@redhat.com> (raw)
In-Reply-To: <20200402222051.523093-1-ehabkost@redhat.com>
From: Babu Moger <babu.moger@amd.com>
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>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <158396725589.58170.16424607815207074485.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@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 b58925d063..5143c51653 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1526,6 +1526,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 468e03a153..6ad24774c5 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5610,7 +5610,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;
@@ -5644,7 +5644,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 8227479c94..e818fc712a 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1610,6 +1610,7 @@ typedef struct CPUX86State {
unsigned nr_dies;
unsigned nr_nodes;
+ unsigned pkg_offset;
} CPUX86State;
struct kvm_msrs;
--
2.24.1
next prev parent reply other threads:[~2020-04-02 22:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 22:20 [PULL 0/9] x86 queue for -rc2 Eduardo Habkost
2020-04-02 22:20 ` [PULL 1/9] hw/386: Add EPYC mode topology decoding functions Eduardo Habkost
2020-04-02 22:20 ` [PULL 2/9] target/i386: Cleanup and use the EPYC mode topology functions Eduardo Habkost
2020-04-02 22:20 ` [PULL 3/9] hw/i386: Introduce apicid functions inside X86MachineState Eduardo Habkost
2020-04-02 22:20 ` [PULL 4/9] i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition Eduardo Habkost
2020-04-02 22:20 ` [PULL 5/9] hw/i386: Move arch_id decode inside x86_cpus_init Eduardo Habkost
2020-04-02 22:20 ` [PULL 6/9] target/i386: Enable new apic id encoding for EPYC based cpus models Eduardo Habkost
2020-04-02 22:20 ` Eduardo Habkost [this message]
2020-04-02 22:20 ` [PULL 8/9] target/i386: set the CPUID level to 0x14 on old machine-type Eduardo Habkost
2020-04-02 22:20 ` [PULL 9/9] target/i386: Add ARCH_CAPABILITIES related bits into Icelake-Server CPU model Eduardo Habkost
2020-04-03 11:59 ` [PULL 0/9] x86 queue for -rc2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200402222051.523093-8-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=babu.moger@amd.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.