From: Yanan Wang <wangyanan55@huawei.com>
To: <qemu-devel@nongnu.org>, <qemu-arm@nongnu.org>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <drjones@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
wanghaibin.wang@huawei.com, Yanan Wang <wangyanan55@huawei.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
prime.zeng@hisilicon.com, yangyicong@huawei.com,
yuzenghui@huawei.com, Igor Mammedov <imammedo@redhat.com>,
zhukeqian1@huawei.com, Jiajie Li <lijiajie11@huawei.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [RFC PATCH v2 2/6] hw/arm/virt: DT: Add cpu-map
Date: Tue, 13 Apr 2021 16:07:41 +0800 [thread overview]
Message-ID: <20210413080745.33004-3-wangyanan55@huawei.com> (raw)
In-Reply-To: <20210413080745.33004-1-wangyanan55@huawei.com>
From: Andrew Jones <drjones@redhat.com>
Support device tree CPU topology descriptions.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
hw/arm/virt.c | 41 ++++++++++++++++++++++++++++++++++++++++-
include/hw/arm/virt.h | 1 +
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9f01d9041b..f4ae60ded9 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -352,10 +352,11 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms)
int cpu;
int addr_cells = 1;
const MachineState *ms = MACHINE(vms);
+ const VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
int smp_cpus = ms->smp.cpus;
/*
- * From Documentation/devicetree/bindings/arm/cpus.txt
+ * See Linux Documentation/devicetree/bindings/arm/cpus.yaml
* On ARM v8 64-bit systems value should be set to 2,
* that corresponds to the MPIDR_EL1 register size.
* If MPIDR_EL1[63:32] value is equal to 0 on all CPUs
@@ -408,8 +409,45 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms)
ms->possible_cpus->cpus[cs->cpu_index].props.node_id);
}
+ if (ms->smp.cpus > 1 && !vmc->no_cpu_topology) {
+ qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle",
+ qemu_fdt_alloc_phandle(ms->fdt));
+ }
+
g_free(nodename);
}
+
+ if (ms->smp.cpus > 1 && !vmc->no_cpu_topology) {
+ /*
+ * See Linux Documentation/devicetree/bindings/cpu/cpu-topology.txt
+ * In a SMP system, the hierarchy of CPUs is defined through four
+ * entities that are used to describe the layout of physical CPUs
+ * in the system: socket/cluster/core/thread.
+ */
+ qemu_fdt_add_subnode(ms->fdt, "/cpus/cpu-map");
+
+ for (cpu = ms->smp.cpus - 1; cpu >= 0; cpu--) {
+ char *cpu_path = g_strdup_printf("/cpus/cpu@%d", cpu);
+ char *map_path;
+
+ 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),
+ "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,
+ "core", cpu % ms->smp.cores);
+ }
+ qemu_fdt_add_path(ms->fdt, map_path);
+ qemu_fdt_setprop_phandle(ms->fdt, map_path, "cpu", cpu_path);
+ g_free(map_path);
+ g_free(cpu_path);
+ }
+ }
}
static void fdt_add_its_gic_node(VirtMachineState *vms)
@@ -2769,6 +2807,7 @@ static void virt_machine_5_2_options(MachineClass *mc)
virt_machine_6_0_options(mc);
compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len);
vmc->no_secure_gpio = true;
+ vmc->no_cpu_topology = true;
}
DEFINE_VIRT_MACHINE(5, 2)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 921416f918..4a4b98e4a7 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -129,6 +129,7 @@ struct VirtMachineClass {
bool no_kvm_steal_time;
bool acpi_expose_flash;
bool no_secure_gpio;
+ bool no_cpu_topology;
};
struct VirtMachineState {
--
2.19.1
next prev parent reply other threads:[~2021-04-13 8:09 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 8:07 [RFC PATCH v2 0/6] hw/arm/virt: Introduce cpu topology support Yanan Wang
2021-04-13 8:07 ` [RFC PATCH v2 1/6] device_tree: Add qemu_fdt_add_path Yanan Wang
2021-04-16 4:52 ` David Gibson
2021-04-17 2:36 ` wangyanan (Y)
2021-04-19 1:13 ` David Gibson
2021-04-19 7:02 ` wangyanan (Y)
2021-04-13 8:07 ` Yanan Wang [this message]
2021-04-27 9:47 ` [RFC PATCH v2 2/6] hw/arm/virt: DT: Add cpu-map Philippe Mathieu-Daudé
2021-04-27 10:04 ` Andrew Jones
2021-04-27 12:36 ` Philippe Mathieu-Daudé
2021-04-28 6:36 ` wangyanan (Y)
2021-05-13 6:58 ` Andrew Jones
2021-05-13 7:15 ` wangyanan (Y)
2021-04-13 8:07 ` [RFC PATCH v2 3/6] hw/arm/virt-acpi-build: Distinguish possible and present cpus Yanan Wang
2021-04-27 13:18 ` Andrew Jones
2021-04-28 6:42 ` wangyanan (Y)
2021-04-27 14:50 ` Andrew Jones
2021-04-28 6:47 ` wangyanan (Y)
2021-04-13 8:07 ` [RFC PATCH v2 4/6] hw/acpi/aml-build: Add processor hierarchy node structure Yanan Wang
2021-04-27 13:37 ` Andrew Jones
2021-04-28 6:59 ` wangyanan (Y)
2021-04-13 8:07 ` [RFC PATCH v2 5/6] hw/arm/virt-acpi-build: Add PPTT table Yanan Wang
2021-04-27 14:16 ` Andrew Jones
2021-04-28 7:30 ` wangyanan (Y)
2021-05-13 5:10 ` wangyanan (Y)
2021-05-13 6:55 ` Andrew Jones
2021-05-18 7:17 ` Salil Mehta
2021-05-18 7:42 ` Andrew Jones
2021-05-18 18:34 ` Salil Mehta
2021-05-18 19:05 ` Andrew Jones
2021-05-18 19:22 ` Salil Mehta
2021-05-19 3:18 ` wangyanan (Y)
2021-05-19 7:54 ` Salil Mehta
2021-05-19 8:15 ` Andrew Jones
2021-05-19 8:42 ` wangyanan (Y)
2021-05-19 10:00 ` Salil Mehta
2021-05-19 8:27 ` Andrew Jones
2021-05-19 13:26 ` wangyanan (Y)
2021-05-19 13:40 ` wangyanan (Y)
2021-05-18 9:16 ` wangyanan (Y)
2021-04-13 8:07 ` [RFC PATCH v2 6/6] hw/arm/virt: Replace smp_parse with one that prefers cores Yanan Wang
2021-04-27 14:58 ` Andrew Jones
2021-04-28 8:04 ` wangyanan (Y)
2021-04-28 9:36 ` wangyanan (Y)
2021-04-28 10:13 ` Andrew Jones
2021-04-29 2:21 ` wangyanan (Y)
2021-04-21 7:40 ` [RFC PATCH v2 0/6] hw/arm/virt: Introduce cpu topology support wangyanan (Y)
2021-04-21 9:31 ` 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=20210413080745.33004-3-wangyanan55@huawei.com \
--to=wangyanan55@huawei.com \
--cc=alistair.francis@wdc.com \
--cc=david@gibson.dropbear.id.au \
--cc=drjones@redhat.com \
--cc=imammedo@redhat.com \
--cc=lijiajie11@huawei.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=prime.zeng@hisilicon.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
--cc=wanghaibin.wang@huawei.com \
--cc=yangyicong@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).