From 89bd219d20859710f28819527f808b5d711b9f6e Mon Sep 17 00:00:00 2001 From: Srinivasarao P Date: Tue, 12 Jan 2021 16:04:20 +0530 Subject: [PATCH] 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 --- arch/arm64/mm/init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 671c44ed7fce..a7cf7af73400 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();