stm32mp: compute ram_top based on the optee base address only for STM32MP1

Reserved memory for OP-TEE is located at end of DDR for STM32MP1 SoC only
(STM32MP13 and STM32MP15) and the OP-TEE reserved memory is located at the
beginning of DDR for STM32MP25 SoC, before CONFIG_TEXT_BASE and
with reserved memory for companion coprocessor. So the ram_top is limited
by OP-TEE reserved memory only for STM32MP1 SoC.

This patch solves an issue for ram_top value on STM32MP25 SoC because the
generic reserved memory management, based on LMB, is no more used before
relocation.

Fixes: 8242f14a3e6f ("stm32mp: compute ram_top based on the optee base address")
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 3698fc49bf180c495f40b6ea475b4420e44931c6..a2ad6d1aaac0ea8ab7d8ece36be2b8b05ed7ab42 100644 (file)
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -62,7 +62,6 @@ int dram_init(void)
 
 phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
 {
-       int ret;
        phys_size_t size;
        phys_addr_t reg;
        u32 optee_start, optee_size;
@@ -75,10 +74,17 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
         * if the effective available memory is bigger
         */
        gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
+
+       /* add 8M for U-Boot reserved memory: display, fdt, gd,... */
        size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE);
 
-       ret = optee_get_reserved_memory(&optee_start, &optee_size);
-       reg = (!ret ? optee_start : gd->ram_top) - size;
+       reg = gd->ram_top - size;
+
+       /* Reserved memory for OP-TEE at END of DDR for STM32MP1 SoC */
+       if (IS_ENABLED(CONFIG_STM32MP13X) || IS_ENABLED(CONFIG_STM32MP15X)) {
+               if (!optee_get_reserved_memory(&optee_start, &optee_size))
+                       reg = ALIGN(optee_start - size, MMU_SECTION_SIZE);
+       }
 
        /* before relocation, mark the U-Boot memory as cacheable by default */
        if (!(gd->flags & GD_FLG_RELOC))