powerpc/mm/numa: move numa topology discovery earlier

Split sparsemem initialisation from basic numa topology discovery.
Move the parsing earlier in boot, before pacas are allocated.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index 469b7fdc9be41cd9ab0ceb7f50c2b633c19f01a4..d2bf233aebd57166d4ca5d65cfc765df672e4130 100644 (file)
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -23,6 +23,7 @@ extern void reloc_got2(unsigned long);
 #define PTRRELOC(x)    ((typeof(x)) add_reloc_offset((unsigned long)(x)))
 
 void check_for_initrd(void);
+void mem_topology_setup(void);
 void initmem_init(void);
 void setup_panic(void);
 #define ARCH_PANIC_TIMEOUT 180

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index d73ec518ef8057e202c013b3dd4b98894ec7ea0b..9eaf26318d20f973d41f54e4b48120cdf62d8410 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -888,6 +888,9 @@ void __init setup_arch(char **cmdline_p)
        /* Check the SMT related command line arguments (ppc64). */
        check_smt_enabled();
 
+       /* Parse memory topology */
+       mem_topology_setup();
+
        /* On BookE, setup per-core TLB data structures. */
        setup_tlb_core_data();
 

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index fe8c61149fb8230ea71e2231281beaaf79d2031b..4eee46ea4d9613a48ba0d55d6608cee5f55c004c 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -212,7 +212,7 @@ walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
 EXPORT_SYMBOL_GPL(walk_system_ram_range);
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES
-void __init initmem_init(void)
+void __init mem_topology_setup(void)
 {
        max_low_pfn = max_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
        min_low_pfn = MEMORY_START >> PAGE_SHIFT;
@@ -224,7 +224,10 @@ void __init initmem_init(void)
         * memblock_regions
         */
        memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
+}
 
+void __init initmem_init(void)
+{
        /* XXX need to clip this if using highmem? */
        sparse_memory_present_with_active_regions(0);
        sparse_init();

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index e9ec465068f1c9bc6e40f151086bb3b29567bbae..1eec1bcc03a6b507700062cd7c6472ddb3dd7a20 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -836,18 +836,13 @@ out:
        of_node_put(rtas);
 }
 
-void __init initmem_init(void)
+void __init mem_topology_setup(void)
 {
-       int nid, cpu;
-
-       max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
-       max_pfn = max_low_pfn;
+       int cpu;
 
        if (parse_numa_properties())
                setup_nonnuma();
 
-       memblock_dump_all();
-
        /*
         * Modify the set of possible NUMA nodes to reflect information
         * available about the set of online nodes, and the set of nodes
@@ -858,6 +853,23 @@ void __init initmem_init(void)
 
        find_possible_nodes();
 
+       setup_node_to_cpumask_map();
+
+       reset_numa_cpu_lookup_table();
+
+       for_each_present_cpu(cpu)
+               numa_setup_cpu(cpu);
+}
+
+void __init initmem_init(void)
+{
+       int nid;
+
+       max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
+       max_pfn = max_low_pfn;
+
+       memblock_dump_all();
+
        for_each_online_node(nid) {
                unsigned long start_pfn, end_pfn;
 
@@ -868,10 +880,6 @@ void __init initmem_init(void)
 
        sparse_init();
 
-       setup_node_to_cpumask_map();
-
-       reset_numa_cpu_lookup_table();
-
        /*
         * We need the numa_cpu_lookup_table to be accurate for all CPUs,
         * even before we online them, so that we can use cpu_to_{node,mem}
@@ -881,8 +889,6 @@ void __init initmem_init(void)
         */
        cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "powerpc/numa:prepare",
                                  ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
-       for_each_present_cpu(cpu)
-               numa_setup_cpu(cpu);
 }
 
 static int __init early_numa(char *p)