common/memsize.c: Check for overflow in get_effective_memsize() only for mpc85xx
PATCH 1/1 common/memsize.c: Check for overflow in get_effective_memsize() only for mpc85xx
This reverts commit 777aaaa706bc ("common/memsize.c: Fix get_effective_memsize() to check for overflow") for non-mpc85xx platforms.
The changes to this generic function, which is intended to help with 32bit platforms with large amounts of memory has unintended side effects (which in turn lead to boot failures) on other platforms which were previously functional.
For now do overflow check only for powerpc mpc85xx platform. It is needed to prevent crashing of P1/P2 boards with 4GB DDR module in 32-bit mode.
--- common/memsize.c | 2 ++ 1 file changed, 2 insertions(+)
common/memsize.c +2 -0
@@ -96,6 +96,7 @@ phys_size_t __weak get_effective_memsize(void) {phys_size_t ram_size = gd->ram_size; +#ifdef CONFIG_MPC85xx/* * Check for overflow and limit ram size to some representable value. * It is required that ram_base + ram_size must be representable by
@@ -105,6 +106,7 @@ phys_size_t __weak get_effective_memsize(void)*/ if (gd->ram_base + ram_size < gd->ram_base) ram_size = ((phys_size_t )~0xfffULL ) - gd->ram_base; +#endif #ifndef CONFIG_MAX_MEM_MAPPED return ram_size;
Signature · 1 line
2.20.1
Quoted 8 lines · Pali Rohár
This reverts commit
777aaaa706bc("common/memsize.c: Fixget_effective_memsize()to check for overflow") for non-mpc85xx platforms.The changes to this generic function, which is intended to help with 32bit platforms with large amounts of memory has unintended side effects (which in turn lead to boot failures) on other platforms which were previously functional.
Quoted 5 lines
For now do overflow check only for powerpc mpc85xx platform. It is needed to prevent crashing of P1/P2 boards with 4GB DDR module in 32-bit mode.
Fixes 777aaaa706bc ("common/memsize.c: Fix get_effective_memsize() to check for overflow")Signed-off-by Pali Rohár <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom