MIPS: loongson64: alloc pglist_data at run time

Loongson64 allocates arrays of pglist_data statically and is located
at Node 0, and cpu from Nodes other than 0 need remote access to
pglist_data and zone info.

Delay pglist_data allocation till run time, and make it NUMA-aware

Signed-off-by: Huang Pei <huangpei@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index a8f57bf012854c055e99da6eaa3255bf7456c702..8315c871c4352dc2078d9d5388f112995eea6734 100644 (file)
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c
@@ -27,7 +27,6 @@
 #include <boot_param.h>
 #include <loongson.h>
 
-static struct pglist_data prealloc__node_data[MAX_NUMNODES];
 unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
 EXPORT_SYMBOL(__node_distances);
 struct pglist_data *__node_data[MAX_NUMNODES];
@@ -84,8 +83,12 @@ static void __init init_topology_matrix(void)
 
 static void __init node_mem_init(unsigned int node)
 {
+       struct pglist_data *nd;
        unsigned long node_addrspace_offset;
        unsigned long start_pfn, end_pfn;
+       unsigned long nd_pa;
+       int tnid;
+       const size_t nd_size = roundup(sizeof(pg_data_t), SMP_CACHE_BYTES);
 
        node_addrspace_offset = nid_to_addrbase(node);
        pr_info("Node%d's addrspace_offset is 0x%lx\n",
@@ -95,8 +98,16 @@ static void __init node_mem_init(unsigned int node)
        pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx\n",
                node, start_pfn, end_pfn);
 
-       __node_data[node] = prealloc__node_data + node;
-
+       nd_pa = memblock_phys_alloc_try_nid(nd_size, SMP_CACHE_BYTES, node);
+       if (!nd_pa)
+               panic("Cannot allocate %zu bytes for node %d data\n",
+                     nd_size, node);
+       nd = __va(nd_pa);
+       memset(nd, 0, sizeof(struct pglist_data));
+       tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
+       if (tnid != node)
+               pr_info("NODE_DATA(%d) on node %d\n", node, tnid);
+       __node_data[node] = nd;
        NODE_DATA(node)->node_start_pfn = start_pfn;
        NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;