mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-22 20:58:22 +00:00
7b269a2bd6
When BLOBLIST_TABLES is used, the ACPI tables are not currently added to
the list of EFI tables. While we don't want to create a new memory
region, we do want to tell EFI about the tables.
Fix this by covering this case. At some point the non-bloblist code can
likely be removed.
Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 3da59ee9579 ("efi_loader: Avoid mapping the ACPI tables twice")
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* EFI application ACPI tables support
|
|
*
|
|
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_EFI
|
|
|
|
#include <bloblist.h>
|
|
#include <efi_loader.h>
|
|
#include <log.h>
|
|
#include <mapmem.h>
|
|
#include <acpi/acpi_table.h>
|
|
#include <asm/global_data.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
|
|
|
|
/*
|
|
* Install the ACPI table as a configuration table.
|
|
*
|
|
* Return: status code
|
|
*/
|
|
efi_status_t efi_acpi_register(void)
|
|
{
|
|
ulong addr, start, end;
|
|
efi_status_t ret;
|
|
|
|
/*
|
|
* The bloblist is already marked reserved. For now, we don't bother
|
|
* marking it with EFI_ACPI_RECLAIM_MEMORY since we would need to cut a
|
|
* hole in the EFI_BOOT_SERVICES_CODE region added by
|
|
* add_u_boot_and_runtime(). At some point that function could create a
|
|
* more detailed map.
|
|
*/
|
|
if (IS_ENABLED(CONFIG_BLOBLIST_TABLES)) {
|
|
int size;
|
|
void *tab = bloblist_get_blob(BLOBLISTT_ACPI_TABLES, &size);
|
|
|
|
if (!tab)
|
|
return EFI_NOT_FOUND;
|
|
addr = map_to_sysmem(tab);
|
|
|
|
ret = efi_add_memory_map(addr, size,
|
|
EFI_ACPI_RECLAIM_MEMORY);
|
|
if (ret != EFI_SUCCESS)
|
|
return ret;
|
|
} else {
|
|
/* Mark space used for tables */
|
|
start = ALIGN_DOWN(gd->arch.table_start, EFI_PAGE_MASK);
|
|
end = ALIGN(gd->arch.table_end, EFI_PAGE_MASK);
|
|
ret = efi_add_memory_map(start, end - start,
|
|
EFI_ACPI_RECLAIM_MEMORY);
|
|
if (ret != EFI_SUCCESS)
|
|
return ret;
|
|
if (gd->arch.table_start_high) {
|
|
start = ALIGN_DOWN(gd->arch.table_start_high,
|
|
EFI_PAGE_MASK);
|
|
end = ALIGN(gd->arch.table_end_high, EFI_PAGE_MASK);
|
|
ret = efi_add_memory_map(start, end - start,
|
|
EFI_ACPI_RECLAIM_MEMORY);
|
|
if (ret != EFI_SUCCESS)
|
|
return ret;
|
|
}
|
|
|
|
addr = gd_acpi_start();
|
|
}
|
|
log_debug("EFI using ACPI tables at %lx\n", addr);
|
|
|
|
/* And expose them to our EFI payload */
|
|
return efi_install_configuration_table(&acpi_guid,
|
|
(void *)(ulong)addr);
|
|
}
|