[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/5] hw/loongarch: Supplement cpu topology arguments
From: |
Song Gao |
Subject: |
[PULL 4/5] hw/loongarch: Supplement cpu topology arguments |
Date: |
Fri, 16 Jun 2023 18:01:57 +0800 |
From: Tianrui Zhao <zhaotianrui@loongson.cn>
Supplement LoongArch cpu topology arguments, including support socket
and threads per core.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20230613123251.2471878-1-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 1d5c764408..ca8824b6ef 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
- [PULL 0/5] loongarch-to-apply queue, Song Gao, 2023/06/16
- [PULL 4/5] hw/loongarch: Supplement cpu topology arguments,
Song Gao <=
- [PULL 3/5] hw/loongarch: Add numa support, Song Gao, 2023/06/16
- [PULL 1/5] hw/loongarch/virt: Add cpu arch_id support, Song Gao, 2023/06/16
- [PULL 2/5] hw/intc: Set physical cpuid route for LoongArch ipi device, Song Gao, 2023/06/16
- [PULL 5/5] target/loongarch: Fix CSR.DMW0-3.VSEG check, Song Gao, 2023/06/16
- Re: [PULL 0/5] loongarch-to-apply queue, Richard Henderson, 2023/06/17