efi_loader: ACPI tables must be in EfiACPIReclaimMemory
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Sun, 21 Feb 2021 09:16:58 +0000 (10:16 +0100)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Fri, 26 Feb 2021 15:17:43 +0000 (16:17 +0100)
The UEFI spec does not allow ACPI tables to be in runtime services memory.
It recommends EfiACPIReclaimMemory.

Remove a superfluous check that the allocated pages are 16 byte aligned.
EFI pages are 4 KiB aligned.

Fixes: 86df34d42b05 ("efi_loader: Install ACPI configuration tables")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
lib/efi_loader/efi_acpi.c

index 585b2d2..a62c340 100644 (file)
@@ -25,7 +25,7 @@ efi_status_t efi_acpi_register(void)
 
        /* Reserve 64kiB page for ACPI */
        ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
-                                EFI_RUNTIME_SERVICES_DATA, 16, &acpi);
+                                EFI_ACPI_RECLAIM_MEMORY, 16, &acpi);
        if (ret != EFI_SUCCESS)
                return ret;
 
@@ -34,7 +34,6 @@ efi_status_t efi_acpi_register(void)
         * a 4k-aligned address, so it is safe to assume that
         * write_acpi_tables() will write the table at that address.
         */
-       assert(!(acpi & 0xf));
        write_acpi_tables(acpi);
 
        /* And expose them to our EFI payload */