[PATCH] fix CONFIG_SMP=n generic builds

[PATCH] fix CONFIG_SMP=n generic builds

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

On Wednesday, January 19, 2005 3:19 pm, Luck, Tony wrote:
> Uni-processor support is a mess right now.  Dan's resurrection
> of Jesse's patches for generic-up support doesn't apply ... the
> prime culprit is discontig.c:find_per_node_space() which has been
> touched by several patches, so we still have lots of build
> errors for generic-up.  tiger and zx1 systems do compile cleanly
> with CONFIG_SMP=n, but the tiger stalls:

Here's something that works for me with both generic and sn2 configs with and 
w/o CONFIG_SMP.  Needs careful review (the new per-cpu MCA bits are broken 
for SMP, can you take a look Russ?).

Fix the CONFIG_IA64_GENERIC + CONFIG_SMP=n build by fixing up discontig, numa, 
and other CONFIG_SMP=n issues with the build.  Note that some driver fixes 
are omitted (e.g. mmtimer and sn_hwperf) as they've already been sent 
separately.  Eventually it would be good to get to the point where we can 
build kernels w/CONFIG_DISCONTIGMEM and w/o CONFIG_NUMA as well since that's 
the sort of kernel that will probably be most useful for kexec based crash 
dumping.  This is one small step in that direction.

Thanks,
Jesse

[-- Attachment #2: ia64-generic-no-smp-4.patch --]
[-- Type: text/plain, Size: 11429 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/24 12:27:50-08:00 jbarnes@tomahawk.engr.sgi.com 
#   config_smp=n support
# 
# arch/ia64/kernel/numa.c
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +57 -0
# 
# include/asm-ia64/sn/sn_cpuid.h
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +0 -4
#   config_smp=n support
# 
# include/asm-ia64/smp.h
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +1 -0
#   config_smp=n support
# 
# arch/ia64/mm/discontig.c
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +58 -29
#   config_smp=n support
# 
# arch/ia64/kernel/smpboot.c
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +0 -41
#   config_smp=n support
# 
# arch/ia64/kernel/setup.c
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +2 -0
#   config_smp=n support
# 
# arch/ia64/kernel/numa.c
#   2005/01/24 12:27:33-08:00 jbarnes@tomahawk.engr.sgi.com +0 -0
#   BitKeeper file /home/jbarnes/working/linux-2.5-up/arch/ia64/kernel/numa.c
# 
# arch/ia64/kernel/acpi.c
#   2005/01/24 12:27:28-08:00 jbarnes@tomahawk.engr.sgi.com +3 -1
#   config_smp=n support
# 
# arch/ia64/kernel/Makefile
#   2005/01/24 12:27:28-08:00 jbarnes@tomahawk.engr.sgi.com +1 -0
#   config_smp=n support
# 
diff -Nru a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
--- a/arch/ia64/kernel/Makefile	2005-01-24 12:37:30 -08:00
+++ b/arch/ia64/kernel/Makefile	2005-01-24 12:37:30 -08:00
@@ -17,6 +17,7 @@
 obj-$(CONFIG_IOSAPIC)		+= iosapic.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o domain.o
+obj-$(CONFIG_NUMA)		+= numa.o
 obj-$(CONFIG_PERFMON)		+= perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
 obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
diff -Nru a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/acpi.c	2005-01-24 12:37:30 -08:00
+++ b/arch/ia64/kernel/acpi.c	2005-01-24 12:37:30 -08:00
@@ -642,8 +642,10 @@
 			if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
 				node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
 	}
-	build_cpu_to_node_map();
 # endif
+#endif
+#ifdef CONFIG_ACPI_NUMA
+	build_cpu_to_node_map();
 #endif
 	/* Make boot-up look pretty */
 	printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
diff -Nru a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/arch/ia64/kernel/numa.c	2005-01-24 12:37:30 -08:00
@@ -0,0 +1,57 @@
+/*
+ * 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.  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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * ia64 kernel NUMA specific stuff
+ *
+ * Copyright (C) 2002 Erich Focht <efocht@ess.nec.de>
+ * Copyright (C) 2004 Silicon Graphics, Inc.
+ *   Jesse Barnes <jbarnes@sgi.com>
+ */
+#include <linux/config.h>
+#include <linux/topology.h>
+#include <linux/module.h>
+#include <asm/processor.h>
+#include <asm/smp.h>
+
+u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+EXPORT_SYMBOL(cpu_to_node_map);
+
+cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+
+/**
+ * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
+ *
+ * Build cpu to node mapping and initialize the per node cpu masks using
+ * info from the node_cpuid array handed to us by ACPI.
+ */
+void __init build_cpu_to_node_map(void)
+{
+	int cpu, i, node;
+
+	for(node=0; node < MAX_NUMNODES; node++)
+		cpus_clear(node_to_cpu_mask[node]);
+
+	for(cpu = 0; cpu < NR_CPUS; ++cpu) {
+		node = -1;
+		for (i = 0; i < NR_CPUS; ++i)
+			if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
+				node = node_cpuid[i].nid;
+				break;
+			}
+		cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
+		if (node >= 0)
+			cpu_set(cpu, node_to_cpu_mask[node]);
+	}
+}
diff -Nru a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c	2005-01-24 12:37:30 -08:00
+++ b/arch/ia64/kernel/setup.c	2005-01-24 12:37:30 -08:00
@@ -657,7 +657,9 @@
 		BUG();
 
 	ia64_mmu_init(ia64_imva(cpu_data));
+#ifdef CONFIG_SMP
 	set_mca_pointer(cpu_info, cpu_data);
+#endif
 
 #ifdef CONFIG_IA32_SUPPORT
 	ia32_cpu_init();
diff -Nru a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/smpboot.c	2005-01-24 12:37:30 -08:00
+++ b/arch/ia64/kernel/smpboot.c	2005-01-24 12:37:30 -08:00
@@ -477,47 +477,6 @@
 	}
 }
 
-#ifdef CONFIG_NUMA
-
-/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
-u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
-EXPORT_SYMBOL(cpu_to_node_map);
-/* which logical CPUs are on which nodes */
-cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
-
-/*
- * Build cpu to node mapping and initialize the per node cpu masks.
- */
-void __init
-build_cpu_to_node_map (void)
-{
-	int cpu, i, node;
-
-	for(node=0; node<MAX_NUMNODES; node++)
-		cpus_clear(node_to_cpu_mask[node]);
-	for(cpu = 0; cpu < NR_CPUS; ++cpu) {
-		/*
-		 * All Itanium NUMA platforms I know use ACPI, so maybe we
-		 * can drop this ifdef completely.                    [EF]
-		 */
-#ifdef CONFIG_ACPI_NUMA
-		node = -1;
-		for (i = 0; i < NR_CPUS; ++i)
-			if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
-				node = node_cpuid[i].nid;
-				break;
-			}
-#else
-#		error Fixme: Dunno how to build CPU-to-node map.
-#endif
-		cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
-		if (node >= 0)
-			cpu_set(cpu, node_to_cpu_mask[node]);
-	}
-}
-
-#endif /* CONFIG_NUMA */
-
 /*
  * Cycle through the APs sending Wakeup IPIs to boot each.
  */
diff -Nru a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/discontig.c	2005-01-24 12:37:30 -08:00
+++ b/arch/ia64/mm/discontig.c	2005-01-24 12:37:30 -08:00
@@ -4,7 +4,7 @@
  * Copyright (c) 2001 Tony Luck <tony.luck@intel.com>
  * Copyright (c) 2002 NEC Corp.
  * Copyright (c) 2002 Kimio Suganuma <k-suganuma@da.jp.nec.com>
- * Copyright (c) 2004 Silicon Graphics, Inc
+ * Copyright (c) 2004-2005 Silicon Graphics, Inc
  *	Russ Anderson <rja@sgi.com>
  *	Jesse Barnes <jbarnes@sgi.com>
  *	Jack Steiner <steiner@sgi.com>
@@ -275,6 +275,48 @@
 }
 
 /**
+ * per_cpu_node_setup - setup per-cpu areas on each node
+ * @cpu_data: per-cpu area on this node
+ * @node: node to setup
+ *
+ * Copy the static per-cpu data into the region we just set aside and then
+ * setup __per_cpu_offset for each CPU on this node.  Return a pointer to
+ * the end of the area.
+ */
+static void *per_cpu_node_setup(void *cpu_data, void *mca_data_phys, int node)
+{
+#ifdef CONFIG_SMP
+	int cpu;
+
+	for (cpu = 0; cpu < NR_CPUS; cpu++) {
+		if (node == node_cpuid[cpu].nid) {
+			memcpy(__va(cpu_data), __phys_per_cpu_start,
+			       __per_cpu_end - __per_cpu_start);
+			/*
+			 * The memory for the cpuinfo structure is allocated
+			 * here, but the data in the structure is initialized
+			 * later.  Save the physical address of the MCA save
+			 * area in __per_cpu_mca[cpu].  When the cpuinfo struct
+			 * is initialized, the value in __per_cpu_mca[cpu]
+			 * will be put in the cpuinfo structure.
+			 */
+			if (cpu == 0 || node_cpuid[cpu].phys_id > 0) {
+				__per_cpu_mca[cpu] = __pa(mca_data_phys);
+				mca_data_phys +=
+					L1_CACHE_ALIGN(sizeof(ia64_mca_cpu_t));
+			}
+			__per_cpu_offset[cpu] = (char*)__va(cpu_data) -
+				__per_cpu_start;
+			cpu_data += PERCPU_PAGE_SIZE;
+		}
+	}
+#else /* !CONFIG_SMP */
+	__per_cpu_mca[0] = __pa(mca_data_phys);
+#endif
+	return cpu_data;
+}
+
+/**
  * find_pernode_space - allocate memory for memory map and per-node structures
  * @start: physical start of range
  * @len: length of range
@@ -308,7 +350,7 @@
 static int __init find_pernode_space(unsigned long start, unsigned long len,
 				     int node)
 {
-	unsigned long epfn, cpu, cpus, phys_cpus;
+	unsigned long epfn, cpus, phys_cpus;
 	unsigned long pernodesize = 0, pernode, pages, mapsize;
 	void *cpu_data, *mca_data_phys;
 	struct bootmem_data *bdp = &mem_data[node].bootmem_data;
@@ -365,32 +407,7 @@
 		mca_data_phys = (void *)pernode;
 		pernode += L1_CACHE_ALIGN(sizeof(ia64_mca_cpu_t)) * phys_cpus;
 
-		/*
-		 * Copy the static per-cpu data into the region we
-		 * just set aside and then setup __per_cpu_offset
-		 * for each CPU on this node.
-		 */
-		for (cpu = 0; cpu < NR_CPUS; cpu++) {
-			if (node == node_cpuid[cpu].nid) {
-				memcpy(__va(cpu_data), __phys_per_cpu_start,
-				       __per_cpu_end - __per_cpu_start);
-				if ((cpu == 0) || (node_cpuid[cpu].phys_id > 0)) {
-					/* 
-					 * The memory for the cpuinfo structure is allocated
-					 * here, but the data in the structure is initialized
-					 * later.  Save the physical address of the MCA save
-					 * area in __per_cpu_mca[cpu].  When the cpuinfo struct 
-					 * is initialized, the value in __per_cpu_mca[cpu]
-					 * will be put in the cpuinfo structure.
-					 */
-					__per_cpu_mca[cpu] = __pa(mca_data_phys);
-					mca_data_phys += L1_CACHE_ALIGN(sizeof(ia64_mca_cpu_t));
-				}
-				__per_cpu_offset[cpu] = (char*)__va(cpu_data) -
-					__per_cpu_start;
-				cpu_data += PERCPU_PAGE_SIZE;
-			}
-		}
+		cpu_data = per_cpu_node_setup(cpu_data, mca_data_phys, node);
 	}
 
 	return 0;
@@ -467,12 +484,22 @@
 		memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
 		       sizeof(pgdat_list));
 	}
-
+#ifdef CONFIG_SMP
 	/* Set the node_data pointer for each per-cpu struct */
 	for (cpu = 0; cpu < NR_CPUS; cpu++) {
 		node = node_cpuid[cpu].nid;
 		per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;
 	}
+#else
+	{
+		struct cpuinfo_ia64 *cpu0_cpu_info;
+		cpu = 0;
+		node = node_cpuid[cpu].nid;
+		cpu0_cpu_info = (struct cpuinfo_ia64 *)(__phys_per_cpu_start +
+			((char *)&per_cpu__cpu_info - __per_cpu_start));
+		cpu0_cpu_info->node_data = mem_data[node].node_data;
+	}
+#endif /* CONFIG_SMP */
 }
 
 /**
@@ -539,6 +566,7 @@
 	find_initrd();
 }
 
+#ifdef CONFIG_SMP
 /**
  * per_cpu_init - setup per-cpu variables
  *
@@ -558,6 +586,7 @@
 
 	return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
 }
+#endif /* CONFIG_SMP */
 
 /**
  * show_mem - give short summary of memory stats
diff -Nru a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
--- a/include/asm-ia64/smp.h	2005-01-24 12:37:30 -08:00
+++ b/include/asm-ia64/smp.h	2005-01-24 12:37:30 -08:00
@@ -126,6 +126,7 @@
 #else
 
 #define cpu_logical_id(cpuid)		0
+#define cpu_physical_id(i)	((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
 
 #endif /* CONFIG_SMP */
 #endif /* _ASM_IA64_SMP_H */
diff -Nru a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h
--- a/include/asm-ia64/sn/sn_cpuid.h	2005-01-24 12:37:30 -08:00
+++ b/include/asm-ia64/sn/sn_cpuid.h	2005-01-24 12:37:30 -08:00
@@ -81,10 +81,6 @@
  *
  */
 
-#ifndef CONFIG_SMP
-#define cpu_physical_id(cpuid)			((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
-#endif
-
 
 #define get_node_number(addr)			NASID_GET(addr)