101 lines
3.4 KiB
Diff
101 lines
3.4 KiB
Diff
From 69564ae0e54345391ceceadb6cde9a09db01c2d9 Mon Sep 17 00:00:00 2001
|
|
From: saarloos <9090-90-90-9090@163.com>
|
|
Date: Mon, 23 May 2022 20:59:51 +0800
|
|
Subject: [PATCH] arm/acpi: Fix when make qemu-system-aarch64 at x86_64 host
|
|
bios_tables_test fail reason: __aarch64__ macro let build_pptt at x86_64 and
|
|
aarch64 host build different function that let bios_tables_test fail.
|
|
|
|
Signed-off-by: Yangzi Zhang <zhangziyang1@huawei.com>
|
|
---
|
|
hw/acpi/aml-build.c | 5 +----
|
|
hw/arm/virt-acpi-build.c | 2 +-
|
|
include/hw/acpi/aml-build.h | 7 +++----
|
|
3 files changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
|
|
index c4edaafa4a..39b8d807c0 100644
|
|
--- a/hw/acpi/aml-build.c
|
|
+++ b/hw/acpi/aml-build.c
|
|
@@ -2016,7 +2016,6 @@ static void build_processor_hierarchy_node(GArray *tbl, uint32_t flags,
|
|
}
|
|
}
|
|
|
|
-#ifdef __aarch64__
|
|
/*
|
|
* ACPI spec, Revision 6.3
|
|
* 5.2.29.2 Cache Type Structure (Type 1)
|
|
@@ -2072,7 +2071,7 @@ static void build_cache_hierarchy_node(GArray *tbl, uint32_t next_level,
|
|
* ACPI spec, Revision 6.3
|
|
* 5.2.29 Processor Properties Topology Table (PPTT)
|
|
*/
|
|
-void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
+void build_pptt_arm(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
const char *oem_id, const char *oem_table_id)
|
|
{
|
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
|
@@ -2172,7 +2171,6 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
acpi_table_end(linker, &table);
|
|
}
|
|
|
|
-#else
|
|
/*
|
|
* ACPI spec, Revision 6.3
|
|
* 5.2.29 Processor Properties Topology Table (PPTT)
|
|
@@ -2263,7 +2261,6 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
g_queue_free(list);
|
|
acpi_table_end(linker, &table);
|
|
}
|
|
-#endif
|
|
|
|
/* build rev1/rev3/rev5.1 FADT */
|
|
void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
|
|
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
|
|
index 1101161d70..89cecdd8e6 100644
|
|
--- a/hw/arm/virt-acpi-build.c
|
|
+++ b/hw/arm/virt-acpi-build.c
|
|
@@ -1070,7 +1070,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
|
|
|
|
if (!vmc->no_cpu_topology) {
|
|
acpi_add_table(table_offsets, tables_blob);
|
|
- build_pptt(tables_blob, tables->linker, ms,
|
|
+ build_pptt_arm(tables_blob, tables->linker, ms,
|
|
vms->oem_id, vms->oem_table_id);
|
|
}
|
|
|
|
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
|
|
index 2e00d2e208..5e9b72c024 100644
|
|
--- a/include/hw/acpi/aml-build.h
|
|
+++ b/include/hw/acpi/aml-build.h
|
|
@@ -221,9 +221,7 @@ struct AcpiBuildTables {
|
|
BIOSLinker *linker;
|
|
} AcpiBuildTables;
|
|
|
|
-#ifdef __aarch64__
|
|
/* Definitions of the hardcoded cache info*/
|
|
-
|
|
typedef enum {
|
|
ARM_L1D_CACHE,
|
|
ARM_L1I_CACHE,
|
|
@@ -266,8 +264,6 @@ struct offset_status {
|
|
uint32_t l1i_offset;
|
|
};
|
|
|
|
-#endif
|
|
-
|
|
typedef
|
|
struct CrsRangeEntry {
|
|
uint64_t base;
|
|
@@ -542,6 +538,9 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
const char *oem_id, const char *oem_table_id);
|
|
|
|
+void build_pptt_arm(GArray *table_data, BIOSLinker *linker, MachineState *ms,
|
|
+ const char *oem_id, const char *oem_table_id);
|
|
+
|
|
void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
|
|
const char *oem_id, const char *oem_table_id);
|
|
|
|
--
|
|
2.35.1.windows.2
|
|
|