rockchip: sdram-common: fix wrong size for 4GB in 32bit SoC

This is workaround for issue we can't get correct size for 4GB ram
in 32bit system and available before we really need ram space
out of 4GB, eg.enable ARM LAPE(rk3288 supports 8GB ram).
The size of 4GB is '0x1 00000000', and this value will be truncated
to 0 in 32bit system, and system can not get correct ram size.
Rockchip SoCs reserve a blob of space for peripheral near 4GB,
and we are now setting SDRAM_MAX_SIZE as max available space for
ram in 4GB, so we can use this directly to workaround the issue.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Tested-By: Vagrant Cascadian <vagrant@debian.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-rockchip/sdram_common.c b/arch/arm/mach-rockchip/sdram_common.c
index 650d53e4d98d0b5c1b8789c670a9e48ff61d9509..a27138083ab9e11d9afbab52cf19e3286c19f761 100644 (file)
--- a/arch/arm/mach-rockchip/sdram_common.c
+++ b/arch/arm/mach-rockchip/sdram_common.c
@@ -48,6 +48,24 @@ size_t rockchip_sdram_size(phys_addr_t reg)
                      rank, col, bk, cs0_row, bw, row_3_4);
        }
 
+       /*
+        * This is workaround for issue we can't get correct size for 4GB ram
+        * in 32bit system and available before we really need ram space
+        * out of 4GB, eg.enable ARM LAPE(rk3288 supports 8GB ram).
+        * The size of 4GB is '0x1 00000000', and this value will be truncated
+        * to 0 in 32bit system, and system can not get correct ram size.
+        * Rockchip SoCs reserve a blob of space for peripheral near 4GB,
+        * and we are now setting SDRAM_MAX_SIZE as max available space for
+        * ram in 4GB, so we can use this directly to workaround the issue.
+        * TODO:
+        *   1. update correct value for SDRAM_MAX_SIZE as what dram
+        *   controller sees.
+        *   2. update board_get_usable_ram_top() and dram_init_banksize()
+        *   to reserve memory for peripheral space after previous update.
+        */
+       if (size_mb > (SDRAM_MAX_SIZE >> 20))
+               size_mb = (SDRAM_MAX_SIZE >> 20);
+
        return (size_t)size_mb << 20;
 }