* [PATCH] hw/loongarch: Supplement cpu topology arguments
@ 2023-06-13 12:32 Tianrui Zhao
2023-06-13 12:55 ` Philippe Mathieu-Daudé
2023-06-16 7:10 ` Song Gao
0 siblings, 2 replies; 5+ messages in thread
From: Tianrui Zhao @ 2023-06-13 12:32 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, peter.maydell, philmd, imammedo, anisinha, mst,
alex.bennee, maobibo, yangxiaojuan, zhaotianrui, gaosong
Supplement LoongArch cpu topology arguments, including support socket
and threads per core.
Base-on:
https://patchew.org/QEMU/20230613122613.2471743-1-zhaotianrui@loongson.cn/
Signed-off-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
---
hw/loongarch/acpi-build.c | 4 ++++
hw/loongarch/virt.c | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index f526f3abba..0b62c3a2f7 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -437,6 +437,10 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
acpi_add_table(table_offsets, tables_blob);
build_madt(tables_blob, tables->linker, lams);
+ acpi_add_table(table_offsets, tables_blob);
+ build_pptt(tables_blob, tables->linker, machine,
+ lams->oem_id, lams->oem_table_id);
+
acpi_add_table(table_offsets, tables_blob);
build_srat(tables_blob, tables->linker, machine);
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index a2fcbf7643..d3b31e3f71 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -1096,8 +1096,15 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
for (n = 0; n < ms->possible_cpus->len; n++) {
ms->possible_cpus->cpus[n].type = ms->cpu_type;
ms->possible_cpus->cpus[n].arch_id = n;
+
+ ms->possible_cpus->cpus[n].props.has_socket_id = true;
+ ms->possible_cpus->cpus[n].props.socket_id =
+ n / (ms->smp.cores * ms->smp.threads);
ms->possible_cpus->cpus[n].props.has_core_id = true;
- ms->possible_cpus->cpus[n].props.core_id = n % ms->smp.cores;
+ ms->possible_cpus->cpus[n].props.core_id =
+ n / ms->smp.threads % ms->smp.cores;
+ ms->possible_cpus->cpus[n].props.has_thread_id = true;
+ ms->possible_cpus->cpus[n].props.thread_id = n % ms->smp.threads;
}
return ms->possible_cpus;
}
--
2.39.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] hw/loongarch: Supplement cpu topology arguments
2023-06-13 12:32 [PATCH] hw/loongarch: Supplement cpu topology arguments Tianrui Zhao
@ 2023-06-13 12:55 ` Philippe Mathieu-Daudé
2023-06-14 1:35 ` zhaotianrui
2023-06-16 7:10 ` Song Gao
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-06-13 12:55 UTC (permalink / raw)
To: Tianrui Zhao, qemu-devel
Cc: richard.henderson, peter.maydell, imammedo, anisinha, mst,
alex.bennee, maobibo, yangxiaojuan, gaosong
On 13/6/23 14:32, Tianrui Zhao wrote:
> Supplement LoongArch cpu topology arguments, including support socket
> and threads per core.
>
> Base-on:
> https://patchew.org/QEMU/20230613122613.2471743-1-zhaotianrui@loongson.cn/
^ FYI this tag ...
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
> ---
... goes here after the '---' separator, because it is only helpful when
testing/merging the patch. Once it is committed, this become irrelevant.
(Everything after the '---' separator is normally stripped when applying
patches).
> hw/loongarch/acpi-build.c | 4 ++++
> hw/loongarch/virt.c | 9 ++++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] hw/loongarch: Supplement cpu topology arguments
2023-06-13 12:55 ` Philippe Mathieu-Daudé
@ 2023-06-14 1:35 ` zhaotianrui
0 siblings, 0 replies; 5+ messages in thread
From: zhaotianrui @ 2023-06-14 1:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: richard.henderson, peter.maydell, imammedo, anisinha, mst,
alex.bennee, maobibo, yangxiaojuan, gaosong
在 2023/6/13 下午8:55, Philippe Mathieu-Daudé 写道:
> On 13/6/23 14:32, Tianrui Zhao wrote:
>> Supplement LoongArch cpu topology arguments, including support socket
>> and threads per core.
>>
>> Base-on:
>> https://patchew.org/QEMU/20230613122613.2471743-1-zhaotianrui@loongson.cn/
>>
>
> ^ FYI this tag ...
>
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
>> ---
>
> ... goes here after the '---' separator, because it is only helpful when
> testing/merging the patch. Once it is committed, this become irrelevant.
> (Everything after the '---' separator is normally stripped when applying
> patches).
>
Thanks, I will move the 'Base-on' flag after the '---'.
Tianrui Zhao
>> hw/loongarch/acpi-build.c | 4 ++++
>> hw/loongarch/virt.c | 9 ++++++++-
>> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] hw/loongarch: Supplement cpu topology arguments
2023-06-13 12:32 [PATCH] hw/loongarch: Supplement cpu topology arguments Tianrui Zhao
2023-06-13 12:55 ` Philippe Mathieu-Daudé
@ 2023-06-16 7:10 ` Song Gao
1 sibling, 0 replies; 5+ messages in thread
From: Song Gao @ 2023-06-16 7:10 UTC (permalink / raw)
To: Tianrui Zhao, qemu-devel
Cc: richard.henderson, peter.maydell, philmd, imammedo, anisinha, mst,
alex.bennee, maobibo, yangxiaojuan
在 2023/6/13 下午8:32, Tianrui Zhao 写道:
> Supplement LoongArch cpu topology arguments, including support socket
> and threads per core.
>
> Base-on:
> https://patchew.org/QEMU/20230613122613.2471743-1-zhaotianrui@loongson.cn/
>
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
> ---
> hw/loongarch/acpi-build.c | 4 ++++
> hw/loongarch/virt.c | 9 ++++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
Reviewed-by: Song Gao <gaosong@loongson.cn>
Thanks.
Song Gao
> diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
> index f526f3abba..0b62c3a2f7 100644
> --- a/hw/loongarch/acpi-build.c
> +++ b/hw/loongarch/acpi-build.c
> @@ -437,6 +437,10 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> acpi_add_table(table_offsets, tables_blob);
> build_madt(tables_blob, tables->linker, lams);
>
> + acpi_add_table(table_offsets, tables_blob);
> + build_pptt(tables_blob, tables->linker, machine,
> + lams->oem_id, lams->oem_table_id);
> +
> acpi_add_table(table_offsets, tables_blob);
> build_srat(tables_blob, tables->linker, machine);
>
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index a2fcbf7643..d3b31e3f71 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -1096,8 +1096,15 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
> for (n = 0; n < ms->possible_cpus->len; n++) {
> ms->possible_cpus->cpus[n].type = ms->cpu_type;
> ms->possible_cpus->cpus[n].arch_id = n;
> +
> + ms->possible_cpus->cpus[n].props.has_socket_id = true;
> + ms->possible_cpus->cpus[n].props.socket_id =
> + n / (ms->smp.cores * ms->smp.threads);
> ms->possible_cpus->cpus[n].props.has_core_id = true;
> - ms->possible_cpus->cpus[n].props.core_id = n % ms->smp.cores;
> + ms->possible_cpus->cpus[n].props.core_id =
> + n / ms->smp.threads % ms->smp.cores;
> + ms->possible_cpus->cpus[n].props.has_thread_id = true;
> + ms->possible_cpus->cpus[n].props.thread_id = n % ms->smp.threads;
> }
> return ms->possible_cpus;
> }
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] hw/loongarch: Supplement cpu topology arguments
@ 2023-05-30 12:59 Tianrui Zhao
0 siblings, 0 replies; 5+ messages in thread
From: Tianrui Zhao @ 2023-05-30 12:59 UTC (permalink / raw)
To: qemu-devel
Cc: gaosong, maobibo, zhaotianrui, philmd, richard.henderson,
peter.maydell
Supplement LoongArch cpu topology arguments, including support socket
and threads per core.
Based-on: <20230518014115.117869-1-gaosong@loongson.cn>
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
---
hw/loongarch/acpi-build.c | 4 ++++
hw/loongarch/virt.c | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index d4429bac00..51541ac532 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -414,6 +414,10 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
acpi_add_table(table_offsets, tables_blob);
build_madt(tables_blob, tables->linker, lams);
+ acpi_add_table(table_offsets, tables_blob);
+ build_pptt(tables_blob, tables->linker, machine,
+ lams->oem_id, lams->oem_table_id);
+
acpi_add_table(table_offsets, tables_blob);
build_srat(tables_blob, tables->linker, machine);
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 0a9067d4d8..1ace1631d0 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -1046,8 +1046,15 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
for (n = 0; n < ms->possible_cpus->len; n++) {
ms->possible_cpus->cpus[n].type = ms->cpu_type;
ms->possible_cpus->cpus[n].arch_id = n;
+
+ ms->possible_cpus->cpus[n].props.has_socket_id = true;
+ ms->possible_cpus->cpus[n].props.socket_id =
+ n / (ms->smp.cores * ms->smp.threads);
ms->possible_cpus->cpus[n].props.has_core_id = true;
- ms->possible_cpus->cpus[n].props.core_id = n;
+ ms->possible_cpus->cpus[n].props.core_id =
+ (n / ms->smp.threads) % ms->smp.cores;
+ ms->possible_cpus->cpus[n].props.has_thread_id = true;
+ ms->possible_cpus->cpus[n].props.thread_id = n % ms->smp.threads;
}
return ms->possible_cpus;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-16 7:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-13 12:32 [PATCH] hw/loongarch: Supplement cpu topology arguments Tianrui Zhao
2023-06-13 12:55 ` Philippe Mathieu-Daudé
2023-06-14 1:35 ` zhaotianrui
2023-06-16 7:10 ` Song Gao
-- strict thread matches above, loose matches on Subject: below --
2023-05-30 12:59 Tianrui Zhao
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).