x86-32, NUMA: Replace srat_32.c with srat.c

SRAT support implementation in srat_32.c and srat.c are generally
similar; however, there are some differences.

First of all, 64bit implementation supports more types of SRAT
entries.  64bit supports x2apic, affinity, memory and SLIT.  32bit
only supports processor and memory.

Most other differences stem from different initialization protocols
employed by 64bit and 32bit NUMA init paths.

On 64bit,

* Mappings among PXM, node and apicid are directly done in each SRAT
  entry callback.

* Memory affinity information is passed to numa_add_memblk() which
  takes care of all interfacing with NUMA init.

* Doesn't directly initialize NUMA configurations.  All the
  information is recorded in numa_nodes_parsed and memblks.

On 32bit,

* Checks numa_off.

* Things go through one more level of indirection via private tables
  but eventually end up initializing the same mappings.

* node_start/end_pfn[] are initialized and
  memblock_x86_register_active_regions() is called for each memory
  chunk.

* node_set_online() is called for each online node.

* sort_node_map() is called.

There are also other minor differences in sanity checking and messages
but taking 64bit version should be good enough.

This patch drops the 32bit specific implementation and makes the 64bit
implementation common for both 32 and 64bit.

The init protocol differences are dealt with in two places - the
numa_add_memblk() shim added in the previous patch and new temporary
numa_32.c:get_memcfg_from_srat() which wraps invocation of
x86_acpi_numa_init().

The shim numa_add_memblk() handles the folowings.

* node_start/end_pfn[] initialization.

* node_set_online() for memory nodes.

* Invocation of memblock_x86_register_active_regions().

The shim get_memcfg_from_srat() handles the followings.

* numa_off check.

* node_set_online() for CPU nodes.

* sort_node_map() invocation.

* Clearing of numa_nodes_parsed and active_ranges on failure.

The shims are temporary and will be removed as the generic NUMA init
path in 32bit is replaced with 64bit one.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>

5 files changed, 24 insertions, 326 deletions

diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index 73e5745aef34..5e83a416eca8 100644
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
@@ -13,8 +13,6 @@ extern struct pglist_data *node_data[];
 #define NODE_DATA(nid)  (node_data[nid])
 
 #include <asm/numaq.h>
-/* summit or generic arch */
-#include <asm/srat.h>
 
 extern void resume_map_numa_kva(pgd_t *pgd);
 
diff --git a/arch/x86/include/asm/srat.h b/arch/x86/include/asm/srat.h
deleted file mode 100644
index b508d639d1a7..000000000000
--- a/arch/x86/include/asm/srat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Some of the code in this file has been gleaned from the 64 bit
- * discontigmem support code base.
- *
- * Copyright (C) 2002, IBM Corp.
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Send feedback to Pat Gaughen <gone@us.ibm.com>
- */
-
-#ifndef _ASM_X86_SRAT_H
-#define _ASM_X86_SRAT_H
-
-#ifdef CONFIG_ACPI_NUMA
-extern int get_memcfg_from_srat(void);
-#else
-static inline int get_memcfg_from_srat(void)
-{
-        return 0;
-}
-#endif
-
-#endif /* _ASM_X86_SRAT_H */
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 37e7043362a1..62997be33072 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -24,10 +24,7 @@ obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o
 
 obj-$(CONFIG_NUMA)              += numa.o numa_$(BITS).o
 obj-$(CONFIG_AMD_NUMA)          += amdtopology_64.o
-ifeq ($(CONFIG_ACPI_NUMA),y)
-obj-$(CONFIG_X86_64)            += srat.o
-obj-$(CONFIG_X86_32)            += srat_32.o
-endif
+obj-$(CONFIG_ACPI_NUMA)         += srat.o
 obj-$(CONFIG_NUMA_EMU)          += numa_emulation.o
 
 obj-$(CONFIG_HAVE_MEMBLOCK)             += memblock.o
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index d0369a56f843..8641239a0667 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -332,6 +332,29 @@ static __init void init_alloc_remap(int nid)
                nid, node_pa, node_pa + size, remap_va, remap_va + size);
 }
 
+static int get_memcfg_from_srat(void)
+{
+#ifdef CONFIG_ACPI_NUMA
+        int nid;
+
+        if (numa_off)
+                return 0;
+
+        if (x86_acpi_numa_init() < 0) {
+                nodes_clear(numa_nodes_parsed);
+                remove_all_active_ranges();
+                return 0;
+        }
+
+        for_each_node_mask(nid, numa_nodes_parsed)
+                node_set_online(nid);
+        sort_node_map();
+        return 1;
+#else
+        return 0;
+#endif
+}
+
 static void get_memcfg_numa(void)
 {
         if (get_memcfg_numaq())
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
deleted file mode 100644
index 6b9bfd78bc35..000000000000
--- a/arch/x86/mm/srat_32.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Some of the code in this file has been gleaned from the 64 bit 
- * discontigmem support code base.
- *
- * Copyright (C) 2002, IBM Corp.
- *
- * All rights reserved.          
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Send feedback to Pat Gaughen <gone@us.ibm.com>
- */
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/mmzone.h>
-#include <linux/acpi.h>
-#include <linux/nodemask.h>
-#include <asm/srat.h>
-#include <asm/topology.h>
-#include <asm/smp.h>
-#include <asm/e820.h>
-
-/*
- * proximity macros and definitions
- */
-#define NODE_ARRAY_INDEX(x)     ((x) / 8)       /* 8 bits/char */
-#define NODE_ARRAY_OFFSET(x)    ((x) % 8)       /* 8 bits/char */
-#define BMAP_SET(bmap, bit)     ((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 << NODE_ARRAY_OFFSET(bit))
-#define BMAP_TEST(bmap, bit)    ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))
-/* bitmap length; _PXM is at most 255 */
-#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) 
-static u8 __initdata pxm_bitmap[PXM_BITMAP_LEN];        /* bitmap of proximity domains */
-
-#define MAX_CHUNKS_PER_NODE     3
-#define MAXCHUNKS               (MAX_CHUNKS_PER_NODE * MAX_NUMNODES)
-struct node_memory_chunk_s {
-        unsigned long   start_pfn;
-        unsigned long   end_pfn;
-        u8      pxm;            // proximity domain of node
-        u8      nid;            // which cnode contains this chunk?
-        u8      bank;           // which mem bank on this node
-};
-static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS];
-
-static int __initdata num_memory_chunks; /* total number of memory chunks */
-static u8 __initdata apicid_to_pxm[MAX_LOCAL_APIC];
-
-int acpi_numa __initdata;
-
-static __init void bad_srat(void)
-{
-        printk(KERN_ERR "SRAT: SRAT not used.\n");
-        acpi_numa = -1;
-        num_memory_chunks = 0;
-}
-
-static __init inline int srat_disabled(void)
-{
-        return numa_off || acpi_numa < 0;
-}
-
-/* Identify CPU proximity domains */
-void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *cpu_affinity)
-{
-        if (srat_disabled())
-                return;
-        if (cpu_affinity->header.length !=
-             sizeof(struct acpi_srat_cpu_affinity)) {
-                bad_srat();
-                return;
-        }
-
-        if ((cpu_affinity->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-                return;         /* empty entry */
-
-        /* mark this node as "seen" in node bitmap */
-        BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain_lo);
-
-        /* don't need to check apic_id here, because it is always 8 bits */
-        apicid_to_pxm[cpu_affinity->apic_id] = cpu_affinity->proximity_domain_lo;
-
-        printk(KERN_DEBUG "CPU %02x in proximity domain %02x\n",
-                cpu_affinity->apic_id, cpu_affinity->proximity_domain_lo);
-}
-
-/*
- * Identify memory proximity domains and hot-remove capabilities.
- * Fill node memory chunk list structure.
- */
-void __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity)
-{
-        unsigned long long paddr, size;
-        unsigned long start_pfn, end_pfn;
-        u8 pxm;
-        struct node_memory_chunk_s *p, *q, *pend;
-
-        if (srat_disabled())
-                return;
-        if (memory_affinity->header.length !=
-             sizeof(struct acpi_srat_mem_affinity)) {
-                bad_srat();
-                return;
-        }
-
-        if ((memory_affinity->flags & ACPI_SRAT_MEM_ENABLED) == 0)
-                return;         /* empty entry */
-
-        pxm = memory_affinity->proximity_domain & 0xff;
-
-        /* mark this node as "seen" in node bitmap */
-        BMAP_SET(pxm_bitmap, pxm);
-
-        /* calculate info for memory chunk structure */
-        paddr = memory_affinity->base_address;
-        size = memory_affinity->length;
-
-        start_pfn = paddr >> PAGE_SHIFT;
-        end_pfn = (paddr + size) >> PAGE_SHIFT;
-
-
-        if (num_memory_chunks >= MAXCHUNKS) {
-                printk(KERN_WARNING "Too many mem chunks in SRAT."
-                        " Ignoring %lld MBytes at %llx\n",
-                        size/(1024*1024), paddr);
-                return;
-        }
-
-        /* Insertion sort based on base address */
-        pend = &node_memory_chunk[num_memory_chunks];
-        for (p = &node_memory_chunk[0]; p < pend; p++) {
-                if (start_pfn < p->start_pfn)
-                        break;
-        }
-        if (p < pend) {
-                for (q = pend; q >= p; q--)
-                        *(q + 1) = *q;
-        }
-        p->start_pfn = start_pfn;
-        p->end_pfn = end_pfn;
-        p->pxm = pxm;
-
-        num_memory_chunks++;
-
-        printk(KERN_DEBUG "Memory range %08lx to %08lx"
-                          " in proximity domain %02x %s\n",
-                start_pfn, end_pfn,
-                pxm,
-                ((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
-                 "enabled and removable" : "enabled" ) );
-}
-
-/* Callback for SLIT parsing */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
-}
-
-void acpi_numa_arch_fixup(void)
-{
-}
-/*
- * The SRAT table always lists ascending addresses, so can always
- * assume that the first "start" address that you see is the real
- * start of the node, and that the current "end" address is after
- * the previous one.
- */
-static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk)
-{
-        /*
-         * Only add present memory as told by the e820.
-         * There is no guarantee from the SRAT that the memory it
-         * enumerates is present at boot time because it represents
-         * *possible* memory hotplug areas the same as normal RAM.
-         */
-        if (memory_chunk->start_pfn >= max_pfn) {
-                printk(KERN_INFO "Ignoring SRAT pfns: %08lx - %08lx\n",
-                        memory_chunk->start_pfn, memory_chunk->end_pfn);
-                return -1;
-        }
-        if (memory_chunk->nid != nid)
-                return -1;
-
-        if (!node_has_online_mem(nid))
-                node_start_pfn[nid] = memory_chunk->start_pfn;
-
-        if (node_start_pfn[nid] > memory_chunk->start_pfn)
-                node_start_pfn[nid] = memory_chunk->start_pfn;
-
-        if (node_end_pfn[nid] < memory_chunk->end_pfn)
-                node_end_pfn[nid] = memory_chunk->end_pfn;
-
-        return 0;
-}
-
-int __init get_memcfg_from_srat(void)
-{
-        int i, j;
-
-        if (srat_disabled())
-                goto out_fail;
-
-        if (acpi_numa_init() < 0)
-                goto out_fail;
-
-        if (num_memory_chunks == 0) {
-                printk(KERN_DEBUG
-                         "could not find any ACPI SRAT memory areas.\n");
-                goto out_fail;
-        }
-
-        /* Calculate total number of nodes in system from PXM bitmap and create
-         * a set of sequential node IDs starting at zero.  (ACPI doesn't seem
-         * to specify the range of _PXM values.)
-         */
-        /*
-         * MCD - we no longer HAVE to number nodes sequentially.  PXM domain
-         * numbers could go as high as 256, and MAX_NUMNODES for i386 is typically
-         * 32, so we will continue numbering them in this manner until MAX_NUMNODES
-         * approaches MAX_PXM_DOMAINS for i386.
-         */
-        nodes_clear(node_online_map);
-        for (i = 0; i < MAX_PXM_DOMAINS; i++) {
-                if (BMAP_TEST(pxm_bitmap, i)) {
-                        int nid = acpi_map_pxm_to_node(i);
-                        node_set_online(nid);
-                }
-        }
-        BUG_ON(num_online_nodes() == 0);
-
-        /* set cnode id in memory chunk structure */
-        for (i = 0; i < num_memory_chunks; i++)
-                node_memory_chunk[i].nid = pxm_to_node(node_memory_chunk[i].pxm);
-
-        printk(KERN_DEBUG "pxm bitmap: ");
-        for (i = 0; i < sizeof(pxm_bitmap); i++) {
-                printk(KERN_CONT "%02x ", pxm_bitmap[i]);
-        }
-        printk(KERN_CONT "\n");
-        printk(KERN_DEBUG "Number of logical nodes in system = %d\n",
-                         num_online_nodes());
-        printk(KERN_DEBUG "Number of memory chunks in system = %d\n",
-                         num_memory_chunks);
-
-        for (i = 0; i < MAX_LOCAL_APIC; i++)
-                set_apicid_to_node(i, pxm_to_node(apicid_to_pxm[i]));
-
-        for (j = 0; j < num_memory_chunks; j++){
-                struct node_memory_chunk_s * chunk = &node_memory_chunk[j];
-                printk(KERN_DEBUG
-                        "chunk %d nid %d start_pfn %08lx end_pfn %08lx\n",
-                       j, chunk->nid, chunk->start_pfn, chunk->end_pfn);
-                if (node_read_chunk(chunk->nid, chunk))
-                        continue;
-
-                memblock_x86_register_active_regions(chunk->nid, chunk->start_pfn,
-                                             min(chunk->end_pfn, max_pfn));
-        }
-        /* for out of order entries in SRAT */
-        sort_node_map();
-
-        return 1;
-out_fail:
-        printk(KERN_DEBUG "failed to get NUMA memory information from SRAT"
-                        " table\n");
-        return 0;
-}