Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 16:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: bootefi: Parse reserved-memory node from DT

Browse source 
Currently, bootefi only parses memory reservation block to setup
EFI reserved memory mappings. However, it doesn't parse the
reserved-memory[1] device tree node that also can contain the
reserved memory regions.

Add capability to parse reserved-memory node and update the EFI memory
mappings accordingly.

1. <U-Boot source>/doc/device-tree-bindings/reserved-memory/reserved-memory.txt]

Signed-off-by: Atish Patra <atish.patra@wdc.com>

Fix an endless loop.

The /reserved-memory node may have children without reg property. Remove
a superfluous debug statement.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Atish Patra 2020-03-13 17:11:30 -07:00 • committed by Heinrich Schuchardt
parent a415d61eac
commit 7be64b885a
1 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cmd/bootefi.c
View file

@ -149,6 +149,20 @@ done:
return ret; return ret;
} }
static void efi_reserve_memory(u64 addr, u64 size)
{
u64 pages;
/* Convert from sandbox address space. */
addr = (uintptr_t)map_sysmem(addr, 0);
pages = efi_size_in_pages(size + (addr & EFI_PAGE_MASK));
addr &= ~EFI_PAGE_MASK;
if (efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE,
false) != EFI_SUCCESS)
printf("Reserved memory mapping failed addr %llx size %llx\n",
addr, size);
}
/** /**
* efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges * efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges
* *
@ -161,7 +175,8 @@ done:
static void efi_carve_out_dt_rsv(void *fdt) static void efi_carve_out_dt_rsv(void *fdt)
{ {
int nr_rsv, i; int nr_rsv, i;
uint64_t addr, size, pages; u64 addr, size;
int nodeoffset, subnode;
nr_rsv = fdt_num_mem_rsv(fdt); nr_rsv = fdt_num_mem_rsv(fdt);
@ -169,15 +184,25 @@ static void efi_carve_out_dt_rsv(void *fdt)
for (i = 0; i < nr_rsv; i++) { for (i = 0; i < nr_rsv; i++) {
if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0) if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0)
continue; continue;
efi_reserve_memory(addr, size);
}
/* Convert from sandbox address space. */ /* process reserved-memory */
addr = (uintptr_t)map_sysmem(addr, 0); nodeoffset = fdt_subnode_offset(fdt, 0, "reserved-memory");
if (nodeoffset >= 0) {
pages = efi_size_in_pages(size + (addr & EFI_PAGE_MASK)); subnode = fdt_first_subnode(fdt, nodeoffset);
addr &= ~EFI_PAGE_MASK; while (subnode >= 0) {
if (efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE, /* check if this subnode has a reg property */
false) != EFI_SUCCESS) addr = fdtdec_get_addr_size(fdt, subnode, "reg",
printf("FDT memrsv map %d: Failed to add to map\n", i); (fdt_size_t *)&size);
/*
* The /reserved-memory node may have children with
* a size instead of a reg property.
*/
if (addr != FDT_ADDR_T_NONE)
efi_reserve_memory(addr, size);
subnode = fdt_next_subnode(fdt, subnode);
}
} }
} }