MIPS: Loongson64: Fix up reserving kernel memory range
authorJinyang He <hejinyang@loongson.cn>
Wed, 25 Nov 2020 10:11:02 +0000 (18:11 +0800)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Fri, 27 Nov 2020 09:56:26 +0000 (10:56 +0100)
Reserve memory from &_text to &_end. Otherwise if kernel address
was modified, the memory range of start_pfn to kernel_start_pfn
would be reserved. Then we could not use this range.

Signed-off-by: Jinyang He <hejinyang@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/loongson64/numa.c

index 509b360e4d28b34697c94998c025e3498c16af2d..c6f0c48384f806624175adc2eb7e964fa920fe88 100644 (file)
@@ -151,6 +151,9 @@ static void __init node_mem_init(unsigned int node)
        NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;
 
        if (node == 0) {
+               /* kernel start address */
+               unsigned long kernel_start_pfn = PFN_DOWN(__pa_symbol(&_text));
+
                /* kernel end address */
                unsigned long kernel_end_pfn = PFN_UP(__pa_symbol(&_end));
 
@@ -158,8 +161,8 @@ static void __init node_mem_init(unsigned int node)
                max_low_pfn = end_pfn;
 
                /* Reserve the kernel text/data/bss */
-               memblock_reserve(start_pfn << PAGE_SHIFT,
-                                ((kernel_end_pfn - start_pfn) << PAGE_SHIFT));
+               memblock_reserve(kernel_start_pfn << PAGE_SHIFT,
+                                ((kernel_end_pfn - kernel_start_pfn) << PAGE_SHIFT));
 
                /* Reserve 0xfe000000~0xffffffff for RS780E integrated GPU */
                if (node_end_pfn(0) >= (0xffffffff >> PAGE_SHIFT))