]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
stm32mp: Fix board_get_usable_ram_top()
authorPatrice Chotard <patrice.chotard@foss.st.com>
Wed, 1 Sep 2021 07:56:02 +0000 (09:56 +0200)
committerPatrick Delaunay <patrick.delaunay@foss.st.com>
Mon, 6 Sep 2021 08:00:11 +0000 (10:00 +0200)
When booting in EFI, lib/efi_loader/efi_memory.c calls
board_get_usable_ram_top(0) which returns by default
gd->ram_base + gd->ram_size which is the top of DDR.

In case of OPTEE boot, the top of DDR is currently reserved by OPTEE,
board_get_usable_ram_top(0) must return an address outside OPTEE
reserved memory.

gd->ram_top matches this constraint as it has already been initialized
by substracting all DT reserved-memory (included OPTEE memory area).

Fixes: 92b611e8b003 ("stm32mp: correctly handle board_get_usable_ram_top(0)")
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
arch/arm/mach-stm32mp/dram_init.c

index 94f25f34e03452cc13e590b109fdb4b409a1aa52..920b99bb68f2698633957cfef730c791786f10b9 100644 (file)
@@ -47,7 +47,7 @@ ulong board_get_usable_ram_top(ulong total_size)
        struct lmb lmb;
 
        if (!total_size)
-               return gd->ram_base + gd->ram_size;
+               return gd->ram_top;
 
        /* found enough not-reserved memory to relocated U-Boot */
        lmb_init(&lmb);