Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e11723 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: establish PMB mappings for NUMA nodes. 



In the case of NUMA emulation when in range PPNs are being used for
secondary nodes, we need to make sure that the PMB has a mapping for it
before setting up the pgdat. This prevents the MMU from resetting.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a1042aa2

arch/sh/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ void __init setup_arch(char **cmdline_p) 


	nodes_clear(node_online_map);



	/* Setup bootmem with available RAM */

	pmb_init();

	lmb_init();

	setup_memory();

	sparse_init();
@@ -452,7 +452,6 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &dummy_con;

#endif

	paging_init();

	pmb_init();



	ioremap_fixed_init();

arch/sh/mm/numa.c

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) 
	start_pfn = start >> PAGE_SHIFT;

	end_pfn = end >> PAGE_SHIFT;



	pmb_bolt_mapping((unsigned long)__va(start), start, end - start,

			 PAGE_KERNEL);



	lmb_add(start, end - start);



	__add_active_range(nid, start_pfn, end_pfn);