MIPS: Loongson64: Fix boot failure after dropping boot_mem_map
Subsystems (2)
PATCH 1/1 MIPS: Loongson64: Fix boot failure after dropping boot_mem_map
From a94e4f24ec836c8984f839594 ("MIPS: init: Drop boot_mem_map"), add_memory_region() is handled by memblock_add()/memblock_reserve() directly and all bootmem API should be converted to memblock API. Otherwise it will lead to boot failure, especially in the NUMA case because add_memory_region lose the node_id information.
--- arch/mips/loongson64/common/mem.c | 16 +++++++--------- arch/mips/loongson64/loongson-3/numa.c | 11 +---------- 2 files changed, 8 insertions(+), 19 deletions(-)
arch/mips/loongson64/common/mem.c +7 -9
@@ -3,6 +3,7 @@*/ #include <linux/fs.h> #include <linux/fcntl.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <asm/bootinfo.h>
@@ -67,19 +68,16 @@ void __init prom_init_memory(void)if (node_id ==0 ) {switch (mem_type) {case SYSTEM_RAM_LOW : -add_memory_region (loongson_memmap->map[i].mem_start, - (u64 )loongson_memmap->map[i].mem_size <<20 , -BOOT_MEM_RAM ); +memblock_add (loongson_memmap->map[i].mem_start, + (u64 )loongson_memmap->map[i].mem_size <<20 );break ;case SYSTEM_RAM_HIGH : -add_memory_region (loongson_memmap->map[i].mem_start, - (u64 )loongson_memmap->map[i].mem_size <<20 , -BOOT_MEM_RAM ); +memblock_add (loongson_memmap->map[i].mem_start, + (u64 )loongson_memmap->map[i].mem_size <<20 );break ;case SYSTEM_RAM_RESERVED : -add_memory_region (loongson_memmap->map[i].mem_start, - (u64 )loongson_memmap->map[i].mem_size <<20 , -BOOT_MEM_RESERVED ); +memblock_reserve (loongson_memmap->map[i].mem_start, + (u64 )loongson_memmap->map[i].mem_size <<20 );break ; } }
arch/mips/loongson64/loongson-3/numa.c +1 -10
@@ -142,8 +142,6 @@ static void __init szmem(unsigned int node) (u32)node_id, mem_type, mem_start, mem_size);pr_info (" start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n" , start_pfn, end_pfn, num_physpages); -add_memory_region ((node_id <<44 ) + mem_start, - (u64 )mem_size <<20 ,BOOT_MEM_RAM );memblock_add_node (PFN_PHYS (start_pfn),PFN_PHYS (end_pfn - start_pfn), node);break ;
@@ -156,16 +154,12 @@ static void __init szmem(unsigned int node) (u32)node_id, mem_type, mem_start, mem_size);pr_info (" start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n" , start_pfn, end_pfn, num_physpages); -add_memory_region ((node_id <<44 ) + mem_start, - (u64 )mem_size <<20 ,BOOT_MEM_RAM );memblock_add_node (PFN_PHYS (start_pfn),PFN_PHYS (end_pfn - start_pfn), node);break ;case SYSTEM_RAM_RESERVED :pr_info ("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n" , (u32 )node_id, mem_type, mem_start, mem_size); -add_memory_region ((node_id <<44 ) + mem_start, - (u64 )mem_size <<20 ,BOOT_MEM_RESERVED );memblock_reserve (((node_id <<44 ) + mem_start), mem_size <<20 );break ;
@@ -191,8 +185,6 @@ static void __init node_mem_init(unsigned int node)NODE_DATA (node)->node_start_pfn = start_pfn;NODE_DATA (node)->node_spanned_pages = end_pfn - start_pfn; -free_bootmem_with_active_regions (node, end_pfn); -if (node ==0 ) {/* kernel end address */ unsigned long kernel_end_pfn =PFN_UP (__pa_symbol (&_end));
@@ -209,8 +201,6 @@ static void __init node_mem_init(unsigned int node)memblock_reserve ((node_addrspace_offset |0xfe000000 ),32 <<20 ); } - -sparse_memory_present_with_active_regions (node); }static __init void prom_meminit (void )
@@ -227,6 +217,7 @@ static __init void prom_meminit(void)cpumask_clear (&__node_data[(node)]->cpumask); } } +memblocks_present (); max_low_pfn =PHYS_PFN (memblock_end_of_DRAM ());for (cpu =0 ; cpu < loongson_sysconf.nr_cpus; cpu++) {
Signature · 1 line
2.7.0
Paul Burton
AppliedHello,
Quoted 5 lines · Huacai Chen
From
a94e4f24ec836c8984f839594("MIPS: init: Dropboot_mem_map"),add_memory_region()is handled by memblock_add()/memblock_reserve() directly and all bootmem API should be converted to memblock API. Otherwise it will lead to boot failure, especially in the NUMA case becauseadd_memory_regionlose thenode_idinformation.
Applied to mips-fixes.
Quoted 11 lines
commit
2b6509f42dc6
https://git.kernel.org/mips/c/2b6509f42dc6Fixes a94e4f24ec836c8984f83959 ("MIPS: init: Drop boot_mem_map")Signed-off-by Huacai Chen <[email protected]>Signed-off-by Jiaxun Yang <[email protected]>[[email protected]:
- Invertnode_idcheck to de-indent the switch statement & avoid lines over 80 characters.
- Fixup commit reference in commit message.]Signed-off-by Paul Burton <[email protected]>
Thanks,
Paul
[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]