57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 9c16924ba0a77c34246b69e8b1faee219f266445 Mon Sep 17 00:00:00 2001
|
|
From: Yanan Wang <wangyanan55@huawei.com>
|
|
Date: Fri, 7 Jan 2022 16:32:31 +0800
|
|
Subject: [PATCH 19/24] hw/acpi/aml-build: Support cluster level in PPTT
|
|
generation
|
|
|
|
Support CPU cluster topology level in generation of ACPI
|
|
Processor Properties Topology Table (PPTT).
|
|
|
|
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Reviewed-by: Andrew Jones <drjones@redhat.com>
|
|
Message-id: 20220107083232.16256-6-wangyanan55@huawei.com
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
---
|
|
hw/acpi/aml-build.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
|
|
index 6aaedca2e5..bb2cad63b5 100644
|
|
--- a/hw/acpi/aml-build.c
|
|
+++ b/hw/acpi/aml-build.c
|
|
@@ -2001,6 +2001,7 @@ static void build_processor_hierarchy_node(GArray *tbl, uint32_t flags,
|
|
void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
const char *oem_id, const char *oem_table_id)
|
|
{
|
|
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
|
|
GQueue *list = g_queue_new();
|
|
guint pptt_start = table_data->len;
|
|
guint parent_offset;
|
|
@@ -2025,6 +2026,23 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
0, socket, NULL, 0);
|
|
}
|
|
|
|
+ if (mc->smp_props.clusters_supported) {
|
|
+ length = g_queue_get_length(list);
|
|
+ for (i = 0; i < length; i++) {
|
|
+ int cluster;
|
|
+
|
|
+ parent_offset = GPOINTER_TO_UINT(g_queue_pop_head(list));
|
|
+ for (cluster = 0; cluster < ms->smp.clusters; cluster++) {
|
|
+ g_queue_push_tail(list,
|
|
+ GUINT_TO_POINTER(table_data->len - pptt_start));
|
|
+ build_processor_hierarchy_node(
|
|
+ table_data,
|
|
+ (0 << 0), /* not a physical package */
|
|
+ parent_offset, cluster, NULL, 0);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
length = g_queue_get_length(list);
|
|
for (i = 0; i < length; i++) {
|
|
int core;
|
|
--
|
|
2.27.0
|
|
|