smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi: stub: add additional types of memory

Browse Source 
U-Boot itself might be mapped as LOADER_CODE, there's also no reason not
to make additional pages accessible to the OS. This fixes an issue where
U-Boot can't run EFI apps because it gets relocated somewhere outside of
its own memory map.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Caleb Connolly
2024-11-24 21:27:01 +01:00
committed by Simon Glass
parent d9d2b8fb71
commit cef0312def
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/efi/efi_info.c
View File

@@ -119,6 +119,26 @@ int of_populate_from_efi(struct device_node *root)
return ret;
}
static bool efi_mem_type_is_usable(u32 type)
{
switch (type) {
case EFI_CONVENTIONAL_MEMORY:
case EFI_LOADER_DATA:
case EFI_LOADER_CODE:
case EFI_BOOT_SERVICES_CODE:
return true;
case EFI_RESERVED_MEMORY_TYPE:
case EFI_UNUSABLE_MEMORY:
case EFI_UNACCEPTED_MEMORY_TYPE:
case EFI_RUNTIME_SERVICES_DATA:
case EFI_MMAP_IO:
case EFI_MMAP_IO_PORT:
case EFI_PERSISTENT_MEMORY_TYPE:
default:
return false;
}
}
int dram_init_banksize_from_efi(void)
{
struct efi_mem_desc *desc, *end;
@@ -141,8 +161,7 @@ int dram_init_banksize_from_efi(void)
* We only use conventional memory and ignore
* anything less than 1MB.
*/
if (desc->type != EFI_CONVENTIONAL_MEMORY ||
(desc->num_pages << EFI_PAGE_SHIFT) < 1 << 20)
if (!efi_mem_type_is_usable(desc->type) || (desc->num_pages << EFI_PAGE_SHIFT) < 1 << 20)
continue;
gd->bd->bi_dram[num_banks].start = desc->physical_start;
gd->bd->bi_dram[num_banks].size = desc->num_pages <<