From: Yanan Wang <wangyanan55@huawei.com>
To: <qemu-devel@nongnu.org>, <qemu-arm@nongnu.org>
Cc: Barry Song <song.bao.hua@hisilicon.com>,
Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <drjones@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
wanghaibin.wang@huawei.com,
Richard Henderson <richard.henderson@linaro.org>,
Yanan Wang <wangyanan55@huawei.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
yuzenghui@huawei.com, Igor Mammedov <imammedo@redhat.com>,
zhukeqian1@huawei.com, Jiajie Li <lijiajie11@huawei.com>
Subject: [RFC PATCH 6/6] hw/arm/virt: Add cluster level for ARM device tree
Date: Wed, 31 Mar 2021 17:53:43 +0800 [thread overview]
Message-ID: <20210331095343.12172-7-wangyanan55@huawei.com> (raw)
In-Reply-To: <20210331095343.12172-1-wangyanan55@huawei.com>
Add a cluster level between core level and package level for
ARM device tree.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
hw/arm/virt.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index c9ad76ff64..d78db3387e 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -430,14 +430,20 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms)
if (ms->smp.threads > 1) {
map_path = g_strdup_printf(
- "/cpus/cpu-map/%s%d/%s%d/%s%d",
- "socket", cpu / (ms->smp.cores * ms->smp.threads),
+ "/cpus/cpu-map/%s%d/%s%d/%s%d/%s%d",
+ "socket",
+ cpu / (ms->smp.clusters * ms->smp.cores *
+ ms->smp.threads),
+ "cluster",
+ (cpu / (ms->smp.cores * ms->smp.threads)) %
+ ms->smp.clusters,
"core", (cpu / ms->smp.threads) % ms->smp.cores,
"thread", cpu % ms->smp.threads);
} else {
map_path = g_strdup_printf(
- "/cpus/cpu-map/%s%d/%s%d",
- "socket", cpu / ms->smp.cores,
+ "/cpus/cpu-map/%s%d/%s%d/%s%d",
+ "socket", cpu / (ms->smp.clusters * ms->smp.cores),
+ "cluster", (cpu / ms->smp.cores) % ms->smp.clusters,
"core", cpu % ms->smp.cores);
}
qemu_fdt_add_path(vms->fdt, map_path);
--
2.19.1
next prev parent reply other threads:[~2021-03-31 10:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 9:53 [RFC PATCH 0/6] Introduce cluster cpu topology support Yanan Wang
2021-03-31 9:53 ` [RFC PATCH 1/6] vl.c: Add arch-neutral -smp, clusters=* command line support Yanan Wang
2021-03-31 9:53 ` [RFC PATCH 2/6] hw/core/machine: Parse cluster cpu topology in smp_parse() Yanan Wang
2021-03-31 9:53 ` [RFC PATCH 3/6] hw/arm/virt: Parse cluster cpu topology for ARM machines Yanan Wang
2021-03-31 9:53 ` [RFC PATCH 4/6] hw/i386/pc: Parse cluster cpu topology for PC machines Yanan Wang
2021-03-31 9:53 ` [RFC PATCH 5/6] hw/arm/virt-acpi-build: Add cluster level for ARM PPTT table Yanan Wang
2021-03-31 9:53 ` Yanan Wang [this message]
2021-03-31 10:00 ` [RFC PATCH 0/6] Introduce cluster cpu topology support Paolo Bonzini
2021-04-01 8:43 ` wangyanan (Y)
2021-04-27 9:57 ` Philippe Mathieu-Daudé
2021-04-27 11:00 ` wangyanan (Y)
2021-04-27 12:08 ` Philippe Mathieu-Daudé
2021-04-27 12:34 ` wangyanan (Y)
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=20210331095343.12172-7-wangyanan55@huawei.com \
--to=wangyanan55@huawei.com \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lijiajie11@huawei.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shannon.zhaosl@gmail.com \
--cc=song.bao.hua@hisilicon.com \
--cc=wanghaibin.wang@huawei.com \
--cc=yuzenghui@huawei.com \
--cc=zhukeqian1@huawei.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).