commit 89bd219d20859710f28819527f808b5d711b9f6e
author Srinivasarao P <spathi@codeaurora.org> Tue Jan 12 16:04:20 2021 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 17 17:29:35 2021 -0800
tree 04ed82ebb3043fa440a111c1baaa40a3471ca4d8
parent 6cb02c4041e98d9edcbabdbe5a6ece864d507013

arm64: fix bootloader_memory_limit

set bootloader_memory_limit to end of dram, if the memory limit set
in kernel parameters is more than ram size.

Change-Id: I7d23ca84f08dfb4bf7660253db722a1f6456bf85
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

arch/arm64/mm/init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 671c44e..a7cf7af7 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -508,10 +508,9 @@ void __init arm64_memblock_init(void)
 	 * Save bootloader imposed memory limit before we overwirte
 	 * memblock.
 	 */
-	if (memory_limit == PHYS_ADDR_MAX)
+	bootloader_memory_limit = memblock_max_addr(memory_limit);
+	if (bootloader_memory_limit > memblock_end_of_DRAM())
 		bootloader_memory_limit = memblock_end_of_DRAM();
-	else
-		bootloader_memory_limit = memblock_max_addr(memory_limit);
 
 	update_memory_limit();