diff mbox series

[v1,4/9] stm32mp: dram_init: Limit DDR usage under 4GB boundary for STM32MP

Message ID 20231027144304.1002307-5-patrice.chotard@foss.st.com
State Accepted
Commit 75ba0fd570c850b92dfd43d873bab877b4a1b73b
Delegated to: Patrick Delaunay
Headers show
Series Add STM32MP2 SoCs and STM32MP257F-EV board support | expand

Commit Message

Patrice CHOTARD Oct. 27, 2023, 2:42 p.m. UTC
Limit DDR usage under 4GB boundary on STM32MP regardless of
memory size declared in device tree.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

 arch/arm/mach-stm32mp/dram_init.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Patrick Delaunay Nov. 9, 2023, 9:13 a.m. UTC | #1
Hi,

On 10/27/23 16:42, Patrice Chotard wrote:
> Limit DDR usage under 4GB boundary on STM32MP regardless of
> memory size declared in device tree.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
>   arch/arm/mach-stm32mp/dram_init.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
> index cb35ed60ca1..fb1208fc5d5 100644
> --- a/arch/arm/mach-stm32mp/dram_init.c
> +++ b/arch/arm/mach-stm32mp/dram_init.c
> @@ -52,9 +52,15 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
>   	if (!total_size)
>   		return gd->ram_top;
>   
> +	/*
> +	 * make sure U-Boot uses address space below 4GB boundaries even
> +	 * if the effective available memory is bigger
> +	 */
> +	gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
> +
>   	/* found enough not-reserved memory to relocated U-Boot */
>   	lmb_init(&lmb);
> -	lmb_add(&lmb, gd->ram_base, get_effective_memsize());
> +	lmb_add(&lmb, gd->ram_base, gd->ram_top - gd->ram_base);
>   	boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
>   	/* add 8M for reserved memory for display, fdt, gd,... */
>   	size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick
Patrice CHOTARD Nov. 10, 2023, 1:21 p.m. UTC | #2
On 11/9/23 10:13, Patrick DELAUNAY wrote:
> Hi,
> 
> On 10/27/23 16:42, Patrice Chotard wrote:
>> Limit DDR usage under 4GB boundary on STM32MP regardless of
>> memory size declared in device tree.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>>   arch/arm/mach-stm32mp/dram_init.c | 8 +++++++-
>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
>> index cb35ed60ca1..fb1208fc5d5 100644
>> --- a/arch/arm/mach-stm32mp/dram_init.c
>> +++ b/arch/arm/mach-stm32mp/dram_init.c
>> @@ -52,9 +52,15 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
>>       if (!total_size)
>>           return gd->ram_top;
>>   +    /*
>> +     * make sure U-Boot uses address space below 4GB boundaries even
>> +     * if the effective available memory is bigger
>> +     */
>> +    gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
>> +
>>       /* found enough not-reserved memory to relocated U-Boot */
>>       lmb_init(&lmb);
>> -    lmb_add(&lmb, gd->ram_base, get_effective_memsize());
>> +    lmb_add(&lmb, gd->ram_base, gd->ram_top - gd->ram_base);
>>       boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
>>       /* add 8M for reserved memory for display, fdt, gd,... */
>>       size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks
Patrice
diff mbox series

Patch

diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index cb35ed60ca1..fb1208fc5d5 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -52,9 +52,15 @@  phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
 	if (!total_size)
 		return gd->ram_top;
 
+	/*
+	 * make sure U-Boot uses address space below 4GB boundaries even
+	 * if the effective available memory is bigger
+	 */
+	gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
+
 	/* found enough not-reserved memory to relocated U-Boot */
 	lmb_init(&lmb);
-	lmb_add(&lmb, gd->ram_base, get_effective_memsize());
+	lmb_add(&lmb, gd->ram_base, gd->ram_top - gd->ram_base);
 	boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
 	/* add 8M for reserved memory for display, fdt, gd,... */
 	size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),