Commit: 8fd3cf2940464765bc10ae341b525fe0eae8fa87 - uboot (git)

Commit MetaInfo

• Revision: 8fd3cf2940464765bc10ae341b525fe0eae8fa87 (tree)
• Zeit: 2022-07-21 14:46:10
• Autor: Chris Packham <judge.packham@gmai...>
• Commiter: Stefan Roese

Log Message

arm64: mvebu: handle non-zero base address for RAM

board_get_usable_ram_top() conflated the RAM size with the top address
of RAM. On systems where RAM starts at address 0 these numbers are the
same so it went unnoticed. Update board_get_usable_ram_top() to take
CONFIG_SYS_SDRAM_BASE into account when determining the top address.

Signed-off-by: Chris Packham <[e-mail]>
Reviewed-by: Stefan Roese <[e-mail]>

Ändern Zusammenfassung

• modified: arch/arm/mach-mvebu/arm64-common.c

Diff

--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -28,14 +28,13 @@ DECLARE_GLOBAL_DATA_PTR;
  * Currently only 2GiB are mapped for system memory. This is what
  * we pass to the U-Boot subsystem here.
  */
-#define USABLE_RAM_SIZE		0x80000000
+#define USABLE_RAM_SIZE		0x80000000ULL
 
 ulong board_get_usable_ram_top(ulong total_size)
 {
-	if (gd->ram_size > USABLE_RAM_SIZE)
-		return USABLE_RAM_SIZE;
+	unsigned long top = CONFIG_SYS_SDRAM_BASE + min(gd->ram_size, USABLE_RAM_SIZE);
 
-	return gd->ram_size;
+	return (gd->ram_top > top) ? top : gd->ram_top;
 }
 
 /*