[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 6/9] acpi: Align the size to 128k
From: |
Jiahui Cen |
Subject: |
[PATCH v10 6/9] acpi: Align the size to 128k |
Date: |
Thu, 19 Nov 2020 09:48:38 +0800 |
From: Yubo Miao <miaoyubo@huawei.com>
If table size is changed between virt_acpi_build and
virt_acpi_build_update, the table size would not be updated to
UEFI, therefore, just align the size to 128kb, which is enough
and same with x86. It would warn if 64k is not enough and the
align size should be updated.
Signed-off-by: Yubo Miao <miaoyubo@huawei.com>
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
---
hw/arm/virt-acpi-build.c | 25 ++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index e0bed9037c..711cf2069f 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -57,6 +57,8 @@
#define ARM_SPI_BASE 32
+#define ACPI_BUILD_TABLE_SIZE 0x20000
+
static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
{
uint16_t i;
@@ -656,6 +658,15 @@ struct AcpiBuildState {
bool patched;
} AcpiBuildState;
+static void acpi_align_size(GArray *blob, unsigned align)
+{
+ /*
+ * Align size to multiple of given size. This reduces the chance
+ * we need to change size in the future (breaking cross version migration).
+ */
+ g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align));
+}
+
static
void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
{
@@ -743,6 +754,20 @@ void virt_acpi_build(VirtMachineState *vms,
AcpiBuildTables *tables)
build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
}
+ /*
+ * The align size is 128, warn if 64k is not enough therefore
+ * the align size could be resized.
+ */
+ if (tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) {
+ warn_report("ACPI table size %u exceeds %d bytes,"
+ " migration may not work",
+ tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2);
+ error_printf("Try removing CPUs, NUMA nodes, memory slots"
+ " or PCI bridges.");
+ }
+ acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE);
+
+
/* Cleanup memory that's no longer used. */
g_array_free(table_offsets, true);
}
--
2.28.0
- [PATCH v10 0/9] pci_expander_brdige:acpi: Support pxb-pcie for ARM, Jiahui Cen, 2020/11/18
- [PATCH v10 6/9] acpi: Align the size to 128k,
Jiahui Cen <=
- [PATCH v10 3/9] hw/arm/virt: Write extra pci roots into fw_cfg, Jiahui Cen, 2020/11/18
- [PATCH v10 9/9] unit-test: Add the binary file and clear diff.h, Jiahui Cen, 2020/11/18
- [PATCH v10 4/9] acpi: Extract crs build form acpi_build.c, Jiahui Cen, 2020/11/18
- [PATCH v10 1/9] acpi/gpex: Extract two APIs from acpi_dsdt_add_pci, Jiahui Cen, 2020/11/18
- [PATCH v10 7/9] unit-test: The files changed., Jiahui Cen, 2020/11/18
- [PATCH v10 5/9] acpi/gpex: Build tables for pxb, Jiahui Cen, 2020/11/18
- [PATCH v10 8/9] unit-test: Add testcase for pxb, Jiahui Cen, 2020/11/18
- [PATCH v10 2/9] fw_cfg: Refactor extra pci roots addition, Jiahui Cen, 2020/11/18