From: Pali Rohár Date: Fri, 9 Sep 2022 15:32:43 +0000 (+0200) Subject: ddr: fsl: Fix fsl_ddr_sdram_size() for 4GB modules with 32-bit phys_size_t X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=922460be0b72b40cae52f5e870d38c90b609b64b;p=u-boot.git ddr: fsl: Fix fsl_ddr_sdram_size() for 4GB modules with 32-bit phys_size_t Function fsl_ddr_compute() always return size in unsigned long long type, but function fsl_ddr_sdram_size() returns size in phys_size_t type. When 36-bit addressing mode is not enabled then phys_size_t type is only 32-bit and thus it cannot store value 4GB (0x100000000). Function fsl_ddr_sdram_size() in this case returns truncated value 0x0. Fix this issue by returning the highest representable value, which is 0xffffffff (4GB - 1 byte). This change fixes crashing of proper U-Boot because it detected 4 GB module as RAM with zero size. Signed-off-by: Pali Rohár --- diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index 020adb0abb..d44f16cdba 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -950,5 +950,9 @@ fsl_ddr_sdram_size(void) /* Compute it once normally. */ total_memory = fsl_ddr_compute(&info, STEP_GET_SPD, 1); + /* Ensure that total_memory does not overflow on return */ + if (total_memory > (phys_size_t)~0ULL) + total_memory = (phys_size_t)~0ULL; + return total_memory; }