Hi, > From: U-Boot <u-boot-boun...@lists.denx.de> On Behalf Of Heinrich Schuchardt > Sent: dimanche 15 mars 2020 13:03 > > From: Atish Patra <atish.pa...@wdc.com> > > 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.pa...@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.g...@gmx.de> > --- > cmd/bootefi.c | 43 ++++++++++++++++++++++++++++++++++--------- > 1 file changed, 34 insertions(+), 9 deletions(-) > > diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 24fc42ae89..b5b9d88273 100644 > --- a/cmd/bootefi.c > +++ b/cmd/bootefi.c > @@ -149,6 +149,20 @@ done: > 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 > * > @@ -161,7 +175,8 @@ done: > static void efi_carve_out_dt_rsv(void *fdt) { > int nr_rsv, i; > - uint64_t addr, size, pages; > + u64 addr, size; > + int nodeoffset, subnode; > > 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++) { > if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0) > continue; > + efi_reserve_memory(addr, size); > + } > > - /* 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("FDT memrsv map %d: Failed to add to map\n", i); > + /* process reserved-memory */ > + nodeoffset = fdt_subnode_offset(fdt, 0, "reserved-memory"); > + if (nodeoffset >= 0) { > + subnode = fdt_first_subnode(fdt, nodeoffset); > + while (subnode >= 0) { > + /* check if this subnode has a reg property */ > + addr = fdtdec_get_addr_size(fdt, subnode, "reg", > + (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); > + } > } > }
This part seens the same that the existing function common/image-fdt.c::boot_fdt_add_mem_rsv_regions() For information, a status check was added by commit "image: fdt: check "status" of "/reserved-memory" subnodes" See SHA1 28b417ce859490d6b06e71dbf4e842841e64d34d Perhaps need to be added also here. Regards Patrick