diff options
| author | Tianrui Zhao <zhaotianrui@loongson.cn> | 2023-06-13 19:37:36 +0800 |
|---|---|---|
| committer | Song Gao <gaosong@loongson.cn> | 2023-06-16 17:58:46 +0800 |
| commit | f33238836544cb6f3b27968d1ececbd46f037904 (patch) | |
| tree | 42726267a38de086f73b1c93f971cc7a0c44b4c8 | |
| parent | 0cf1478d6d708276f37361169e327b755669cf8a (diff) | |
| download | focaccia-qemu-f33238836544cb6f3b27968d1ececbd46f037904.tar.gz focaccia-qemu-f33238836544cb6f3b27968d1ececbd46f037904.zip | |
hw/loongarch: Supplement cpu topology arguments
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>
| -rw-r--r-- | hw/loongarch/acpi-build.c | 4 | ||||
| -rw-r--r-- | hw/loongarch/virt.c | 9 |
2 files changed, 12 insertions, 1 deletions
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 @@ -438,6 +438,10 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine) 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); if (machine->numa_state->num_nodes) { 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; } |