From: Marek Szyprowski Date: Mon, 1 Feb 2021 11:16:33 +0000 (+0100) Subject: rpi: limit size of the RAM to the multiple of the MMU_SECTION_SIZE X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6b3d18c2cb61e5beefbce2de589fe7707ac78fe3;p=u-boot.git rpi: limit size of the RAM to the multiple of the MMU_SECTION_SIZE When RPi4 is booted from USB Mass Storage, the firmware reports 947MiB of the ARM memory (948 in case of the standard SD-card boot). This value is not MMU_SECTION_SIZE aligned, so the dram_bank_mmu_setup() skips mapping of the last 1MiB. This later causes u-boot in ARM 32bit mode to freeze, because it relocated itself into that unmapped memory and fails to execute. Fix this by limiting the size of the first bank to the multiple of MMU_SECTION_SIZE. Signed-off-by: Marek Szyprowski Reviewed-by: Nicolas Saenz Julienne Tested-by: Jaehoon Chung Reviewed-by: Jaehoon Chung Signed-off-by: Matthias Brugger --- diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 6b1fa5fc14..6a9384f1d6 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -268,6 +268,13 @@ int dram_init(void) gd->ram_size = msg->get_arm_mem.body.resp.mem_size; + /* + * In some configurations the memory size returned by VideoCore + * is not aligned to the section size, what is mandatory for + * the u-boot's memory setup. + */ + gd->ram_size &= ~MMU_SECTION_SIZE; + return 0; }