From: Ying Fang <fangying1@huawei.com>
To: <qemu-devel@nongnu.org>
Cc: peter.maydell@linaro.org, drjones@redhat.com,
zhang.zhanghailiang@huawei.com, mst@redhat.com,
salil.mehta@huawei.com, shannon.zhaosl@gmail.com,
qemu-arm@nongnu.org, alistair.francis@wdc.com,
Ying Fang <fangying1@huawei.com>,
imammedo@redhat.com
Subject: [RFC PATCH 2/5] hw/arm/virt: Add cpu-map to device tree
Date: Thu, 25 Feb 2021 16:56:24 +0800 [thread overview]
Message-ID: <20210225085627.2263-3-fangying1@huawei.com> (raw)
In-Reply-To: <20210225085627.2263-1-fangying1@huawei.com>
Support device tree CPU topology descriptions.
Signed-off-by: Ying Fang <fangying1@huawei.com>
---
hw/arm/virt.c | 38 +++++++++++++++++++++++++++++++++++++-
include/hw/arm/virt.h | 1 +
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 371147f3ae..c133b342b8 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -351,10 +351,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
@@ -407,8 +408,42 @@ 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(vms->fdt, nodename, "phandle",
+ qemu_fdt_alloc_phandle(vms->fdt));
+ }
+
g_free(nodename);
}
+
+ if (ms->smp.cpus > 1 && !vmc->no_cpu_topology) {
+ /*
+ * See Linux Documentation/devicetree/bindings/cpu/cpu-topology.txt
+ */
+ qemu_fdt_add_subnode(vms->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",
+ "cluster", 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",
+ "cluster", cpu / ms->smp.cores,
+ "core", cpu % ms->smp.cores);
+ }
+ qemu_fdt_add_path(vms->fdt, map_path);
+ qemu_fdt_setprop_phandle(vms->fdt, map_path, "cpu", cpu_path);
+ g_free(map_path);
+ g_free(cpu_path);
+ }
+ }
}
static void fdt_add_its_gic_node(VirtMachineState *vms)
@@ -2742,6 +2777,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 ee9a93101e..7ef6d08ac3 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.23.0
next prev parent reply other threads:[~2021-02-25 9:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 8:56 [RFC PATCH 0/5] hw/arm/virt: Introduce cpu topology support Ying Fang
2021-02-25 8:56 ` [RFC PATCH 1/5] device_tree: Add qemu_fdt_add_path Ying Fang
2021-02-25 11:03 ` Andrew Jones
2021-02-25 12:54 ` Ying Fang
2021-02-25 13:25 ` Andrew Jones
2021-02-25 13:39 ` Ying Fang
2021-02-25 8:56 ` Ying Fang [this message]
2021-02-25 11:16 ` [RFC PATCH 2/5] hw/arm/virt: Add cpu-map to device tree Andrew Jones
2021-02-25 13:18 ` Ying Fang
2021-02-25 14:30 ` Andrew Jones
2021-02-25 8:56 ` [RFC PATCH 3/5] hw/arm/virt-acpi-build: distinguish possible and present cpus Ying Fang
2021-02-25 11:26 ` Andrew Jones
2021-02-25 8:56 ` [RFC PATCH 4/5] hw/acpi/aml-build: add processor hierarchy node structure Ying Fang
2021-02-25 11:47 ` Andrew Jones
2021-02-26 2:23 ` Ying Fang
2021-03-01 9:39 ` Andrew Jones
2021-03-01 15:50 ` Michael S. Tsirkin
2021-03-04 7:09 ` Ying Fang
2021-02-25 8:56 ` [RFC PATCH 5/5] hw/arm/virt-acpi-build: add PPTT table Ying Fang
2021-02-25 11:38 ` Andrew Jones
2021-02-26 2:26 ` Ying Fang
2021-02-25 12:02 ` [RFC PATCH 0/5] hw/arm/virt: Introduce cpu topology support Andrew Jones
2021-02-26 8:41 ` Ying Fang
2021-03-01 9:48 ` Andrew Jones
2021-03-05 6:14 ` Ying Fang
[not found] ` <20210310092059.blt3yymqi2eyc2ua@kamzik.brq.redhat.com>
2021-03-10 9:43 ` 答复: " fangying
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=20210225085627.2263-3-fangying1@huawei.com \
--to=fangying1@huawei.com \
--cc=alistair.francis@wdc.com \
--cc=drjones@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=salil.mehta@huawei.com \
--cc=shannon.zhaosl@gmail.com \
--cc=zhang.zhanghailiang@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).