| From a3010a0465383300f909f62b8a83f83ffa7b2517 Mon Sep 17 00:00:00 2001 |
| From: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> |
| Date: Wed, 19 Dec 2018 19:16:16 +0300 |
| Subject: ARC: adjust memblock_reserve of kernel memory |
| |
| From: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> |
| |
| commit a3010a0465383300f909f62b8a83f83ffa7b2517 upstream. |
| |
| In setup_arch_memory we reserve the memory area wherein the kernel |
| is located. Current implementation may reserve more memory than |
| it actually required in case of CONFIG_LINUX_LINK_BASE is not |
| equal to CONFIG_LINUX_RAM_BASE. This happens because we calculate |
| start of the reserved region relatively to the CONFIG_LINUX_RAM_BASE |
| and end of the region relatively to the CONFIG_LINUX_RAM_BASE. |
| |
| For example in case of HSDK board we wasted 256MiB of physical memory: |
| ------------------->8------------------------------ |
| Memory: 770416K/1048576K available (5496K kernel code, |
| 240K rwdata, 1064K rodata, 2200K init, 275K bss, |
| 278160K reserved, 0K cma-reserved) |
| ------------------->8------------------------------ |
| |
| Fix that. |
| |
| Fixes: 9ed68785f7f2b ("ARC: mm: Decouple RAM base address from kernel link addr") |
| Cc: stable@vger.kernel.org #4.14+ |
| Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> |
| Signed-off-by: Vineet Gupta <vgupta@synopsys.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arc/mm/init.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/arc/mm/init.c |
| +++ b/arch/arc/mm/init.c |
| @@ -137,7 +137,8 @@ void __init setup_arch_memory(void) |
| */ |
| |
| memblock_add_node(low_mem_start, low_mem_sz, 0); |
| - memblock_reserve(low_mem_start, __pa(_end) - low_mem_start); |
| + memblock_reserve(CONFIG_LINUX_LINK_BASE, |
| + __pa(_end) - CONFIG_LINUX_LINK_BASE); |
| |
| #ifdef CONFIG_BLK_DEV_INITRD |
| if (initrd_start) |
