* RFC [PATCH] x86: make generic arch support NUMAQ
@ 2008-06-05 10:09 Yinghai Lu
2008-06-05 11:00 ` Sam Ravnborg
2008-06-06 0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
0 siblings, 2 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-05 10:09 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
so it could fallback to normal numa.
also decouple genericarch numa with acpi.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3105e40..ef48cb9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -310,12 +310,12 @@ config X86_VISWS
and vice versa. See <file:Documentation/sgi-visws.txt> for details.
config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
+ bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
depends on X86_32
help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
+ This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+ subarchitectures. It is intended for a generic binary kernel.
+ You need enable NUMA, otherwise NUMAQ is skipped.
config X86_ES7000
bool "Support for Unisys ES7000 IA32 series"
@@ -911,9 +911,9 @@ config X86_PAE
config NUMA
bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
depends on SMP
- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
default n if X86_PC
- default y if (X86_NUMAQ || X86_SUMMIT)
+ default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
help
Enable NUMA (Non Uniform Memory Access) support.
The kernel will try to allocate memory used by a CPU on the
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index d10e727..1b12ac1 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -217,7 +217,7 @@ static char *vidmem;
static int vidport;
static int lines, cols;
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
void *xquad_portio;
#endif
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 882298d..adbf1ab 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -67,7 +67,15 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
-obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
+
+ifeq ($(CONFIG_X86_NUMAQ), y)
+obj-y += numaq_32.o
+else
+ifeq ($(CONFIG_X86_GENERICARCH), y)
+obj-$(CONFIG_NUMA) += numaq_32.o
+endif
+endif
+
obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
obj-y += vsmp_64.o
obj-$(CONFIG_KPROBES) += kprobes.o
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 9dbe7e9..db9efcd 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-#ifndef CONFIG_X86_NUMAQ
static void __init setup_ioapic_ids_from_mpc(void)
{
union IO_APIC_reg_00 reg_00;
@@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from_mpc(void)
unsigned char old_id;
unsigned long flags;
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
+ if (found_numaq)
+ return;
+#endif
+
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
@@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from_mpc(void)
apic_printk(APIC_VERBOSE, " ok.\n");
}
}
-#else
-static void __init setup_ioapic_ids_from_mpc(void) { }
-#endif
int no_timer_check __initdata;
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index b4a950d..83673bc 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -48,16 +48,74 @@ static int __init mpf_checksum(unsigned char *mp, int len)
return sum & 0xFF;
}
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
+int found_numaq;
/*
* Have to match translation table entries to main table entries by counter
* hence the mpc_record variable .... can't see a less disgusting way of
* doing this ....
*/
+struct mpc_config_translation {
+ unsigned char mpc_type;
+ unsigned char trans_len;
+ unsigned char trans_type;
+ unsigned char trans_quad;
+ unsigned char trans_global;
+ unsigned char trans_local;
+ unsigned short trans_reserved;
+};
+
static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
__cpuinitdata;
+
+static inline int generate_logical_apicid(int quad, int phys_apicid)
+{
+ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
+}
+
+
+static inline int mpc_apic_id(struct mpc_config_processor *m,
+ struct mpc_config_translation *translation_record)
+{
+ int quad = translation_record->trans_quad;
+ int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
+
+ printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
+ m->mpc_apicid,
+ (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+ (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+ m->mpc_apicver, quad, logical_apicid);
+ return logical_apicid;
+}
+
+int mp_bus_id_to_node[MAX_MP_BUSSES];
+
+int mp_bus_id_to_local[MAX_MP_BUSSES];
+
+static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ mp_bus_id_to_node[m->mpc_busid] = quad;
+ mp_bus_id_to_local[m->mpc_busid] = local;
+ printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+ m->mpc_busid, name, quad);
+}
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+static void mpc_oem_pci_bus(struct mpc_config_bus *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
+
#endif
static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -69,7 +127,7 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
disabled_cpus++;
return;
}
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
if (found_numaq)
apicid = mpc_apic_id(m, translation_table[mpc_record]);
else
@@ -93,7 +151,7 @@ static void __init MP_bus_info(struct mpc_config_bus *m)
memcpy(str, m->mpc_bustype, 6);
str[6] = 0;
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
if (found_numaq)
mpc_oem_bus_info(m, str, translation_table[mpc_record]);
#else
@@ -115,7 +173,7 @@ static void __init MP_bus_info(struct mpc_config_bus *m)
mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
#endif
} else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI) - 1) == 0) {
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
if (found_numaq)
mpc_oem_pci_bus(m, translation_table[mpc_record]);
#endif
@@ -258,7 +316,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)
m->mpc_srcbusirq, m->mpc_destapic, m->mpc_destapiclint);
}
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
static void __init MP_translation_info(struct mpc_config_translation *m)
{
printk(KERN_INFO
@@ -333,7 +391,7 @@ static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
smp_read_mpc_oem((struct mp_config_oemtable *)mpc->mpc_oemptr,
mpc->mpc_oemsize);
}
-#endif /* CONFIG_X86_NUMAQ */
+#endif /* CONFIG_X86_NUMAQ || CONFIG_X86_GENERICARCH */
/*
* Read/parse the MPC
@@ -401,7 +459,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
/*
* Now process the configuration blocks.
*/
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
mpc_record = 0;
#endif
while (count < mpc->mpc_length) {
@@ -469,7 +527,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
count = mpc->mpc_length;
break;
}
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
++mpc_record;
#endif
}
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 56f5d07..44ab680 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -94,7 +94,6 @@ static inline unsigned int get_timer_irqs(int cpu)
#endif
}
-#ifdef CONFIG_X86_64
/* Run after command line and cpu_init init, but before all other checks */
void nmi_watchdog_default(void)
{
@@ -102,7 +101,6 @@ void nmi_watchdog_default(void)
return;
nmi_watchdog = NMI_NONE;
}
-#endif
#ifdef CONFIG_SMP
/*
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 66c43c2..74e81bf 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -36,8 +36,6 @@
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
-int found_numaq;
-
/*
* Function: smp_dump_qct()
*
@@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void)
}
arch_initcall(numaq_tsc_disable);
-#ifdef CONFIG_ACPI
-/*
- * Dummy implementation:
- */
-struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
-{
- return NULL;
-}
-#endif
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 19d6d40..dc3a205 100644
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -5,4 +5,5 @@
EXTRA_CFLAGS := -Iarch/x86/kernel
obj-y := probe.o summit.o bigsmp.o es7000.o default.o
+obj-$(CONFIG_NUMA) += numaq.o
obj-y += ../../x86/mach-es7000/
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index c5ae751..bd1c195 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -16,6 +16,9 @@
#include <asm/apicdef.h>
#include <asm/genapic.h>
+#ifdef CONFIG_NUMA
+extern struct genapic apic_numaq;
+#endif
extern struct genapic apic_summit;
extern struct genapic apic_bigsmp;
extern struct genapic apic_es7000;
@@ -24,6 +27,9 @@ extern struct genapic apic_default;
struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = {
+#ifdef CONFIG_NUMA
+ &apic_numaq,
+#endif
&apic_summit,
&apic_bigsmp,
&apic_es7000,
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
index 89ec35d..88d6fcc 100644
--- a/arch/x86/pci/Makefile_32
+++ b/arch/x86/pci/Makefile_32
@@ -16,7 +16,13 @@ pci-y += legacy.o irq.o
# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
+
+ifeq ($(CONFIG_X86_NUMAQ), y)
+pci-y := numa.o irq.o
+endif
+ifeq ($(CONFIG_X86_GENERICARCH), y)
+pci-y += numa.o
+endif
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index d9afbae..a4ff536 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -11,38 +11,18 @@
#define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
+extern int mp_bus_id_to_node[MAX_MP_BUSSES];
#define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
+extern int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- mp_bus_id_to_node[m->mpc_busid] = quad;
- mp_bus_id_to_local[m->mpc_busid] = local;
- printk(KERN_INFO "Bus #%d is %s (node %d)\n",
- m->mpc_busid, name, quad);
-}
-
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
/* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
EXPORT_SYMBOL(xquad_portio);
#endif
diff --git a/include/asm-x86/mach-generic/mach_apic.h b/include/asm-x86/mach-generic/mach_apic.h
index 6eff343..4a7c1af 100644
--- a/include/asm-x86/mach-generic/mach_apic.h
+++ b/include/asm-x86/mach-generic/mach_apic.h
@@ -27,6 +27,7 @@
#define enable_apic_mode (genapic->enable_apic_mode)
#define phys_pkg_id (genapic->phys_pkg_id)
+extern int found_numaq;
extern void generic_bigsmp_probe(void);
#endif /* __ASM_MACH_APIC_H */
diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
index 0d0b5ba..1f2d4cf 100644
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,6 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif
diff --git a/include/asm-x86/mach-numaq/mach_apic.h b/include/asm-x86/mach-numaq/mach_apic.h
index 75a56e5..d802465 100644
--- a/include/asm-x86/mach-numaq/mach_apic.h
+++ b/include/asm-x86/mach-numaq/mach_apic.h
@@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void)
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
-#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
-#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
+static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+ return physid_isset(apicid, bitmap);
+}
+static inline unsigned long check_apicid_present(int bit)
+{
+ return physid_isset(bit, phys_cpu_present_map);
+}
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline int apic_id_registered(void)
@@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(int mps_cpu)
return BAD_APICID;
}
-static inline int generate_logical_apicid(int quad, int phys_apicid)
-{
- return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
-}
-
static inline int apicid_to_node(int logical_apicid)
{
return logical_apicid >> 4;
@@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cpu_present(int logical_apicid)
return physid_mask_of_physid(cpu + 4*node);
}
-struct mpc_config_translation {
- unsigned char mpc_type;
- unsigned char trans_len;
- unsigned char trans_type;
- unsigned char trans_quad;
- unsigned char trans_global;
- unsigned char trans_local;
- unsigned short trans_reserved;
-};
-
-static inline int mpc_apic_id(struct mpc_config_processor *m,
- struct mpc_config_translation *translation_record)
-{
- int quad = translation_record->trans_quad;
- int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
-
- printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
- m->mpc_apicid,
- (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
- (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
- m->mpc_apicver, quad, logical_apicid);
- return logical_apicid;
-}
-
extern void *xquad_portio;
static inline void setup_portio_remap(void)
diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h
index 459b124..e0bab65 100644
--- a/include/asm-x86/mach-numaq/mach_mpparse.h
+++ b/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,11 +1,6 @@
#ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H
-extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation);
-extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation);
-
/* Hook from generic ACPI tables.c */
static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
diff --git a/include/asm-x86/mmzone_32.h b/include/asm-x86/mmzone_32.h
index ab00128..9c56ba9 100644
--- a/include/asm-x86/mmzone_32.h
+++ b/include/asm-x86/mmzone_32.h
@@ -12,9 +12,10 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
#include <asm/numaq.h>
-#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
+#endif
+#if defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
#include <asm/srat.h>
#endif
@@ -26,10 +27,12 @@ extern int get_memcfg_numa_flat(void);
*/
static inline void get_memcfg_numa(void)
{
-#ifdef CONFIG_X86_NUMAQ
+
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
if (get_memcfg_numaq())
return;
-#elif defined(CONFIG_ACPI_SRAT)
+#endif
+#if defined(CONFIG_ACPI_SRAT)
if (get_memcfg_from_srat())
return;
#endif
@@ -42,7 +45,6 @@ extern int early_pfn_to_nid(unsigned long pfn);
#else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat
-#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
@@ -83,9 +85,6 @@ static inline int pfn_to_nid(unsigned long pfn)
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
-#define pfn_valid(pfn) ((pfn) < num_physpages)
-#else
static inline int pfn_valid(int pfn)
{
int nid = pfn_to_nid(pfn);
@@ -94,7 +93,6 @@ static inline int pfn_valid(int pfn)
return (pfn < node_end_pfn(nid));
return 0;
}
-#endif /* CONFIG_X86_NUMAQ */
#endif /* CONFIG_DISCONTIGMEM */
diff --git a/include/asm-x86/numaq.h b/include/asm-x86/numaq.h
index 739d164..76e0b13 100644
--- a/include/asm-x86/numaq.h
+++ b/include/asm-x86/numaq.h
@@ -26,7 +26,7 @@
#ifndef NUMAQ_H
#define NUMAQ_H
-#ifdef CONFIG_X86_NUMAQ
+#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
extern int found_numaq;
extern int get_memcfg_numaq(void);
@@ -157,10 +157,6 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
-static inline unsigned long *get_zholes_size(int nid)
-{
- return NULL;
-}
-#endif /* CONFIG_X86_NUMAQ */
+#endif /* CONFIG_X86_NUMAQ || CONFIG_X86_GENERICARCH */
#endif /* NUMAQ_H */
diff --git a/include/asm-x86/srat.h b/include/asm-x86/srat.h
index f4bba13..ad1f502 100644
--- a/include/asm-x86/srat.h
+++ b/include/asm-x86/srat.h
@@ -32,6 +32,5 @@
#endif
extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
#endif /* _ASM_SRAT_H_ */
--- /dev/null 2007-09-21 12:12:45.000000000 -0700
+++ b/arch/x86/mach-generic/numaq.c 2008-06-05 00:11:51.000000000 -0700
@@ -0,0 +1,35 @@
+/*
+ * APIC driver for the IBM NUMAQ chipset.
+ */
+#define APIC_DEFINITION 1
+#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <asm/smp.h>
+#include <asm/mpspec.h>
+#include <asm/genapic.h>
+#include <asm/fixmap.h>
+#include <asm/apicdef.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/smp.h>
+#include <linux/init.h>
+#include <asm/mach-numaq/mach_apic.h>
+#include <asm/mach-numaq/mach_apicdef.h>
+#include <asm/mach-numaq/mach_ipi.h>
+#include <asm/mach-numaq/mach_mpparse.h>
+#include <asm/mach-numaq/mach_wakecpu.h>
+#include <asm/numaq.h>
+
+static int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
+{
+ return 0;
+}
+
+static int probe_numaq(void)
+{
+ /* already know from get_memcfg_numaq() */
+ return found_numaq;
+}
+
+struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: RFC [PATCH] x86: make generic arch support NUMAQ
2008-06-05 10:09 RFC [PATCH] x86: make generic arch support NUMAQ Yinghai Lu
@ 2008-06-05 11:00 ` Sam Ravnborg
2008-06-05 12:39 ` Ingo Molnar
2008-06-05 17:26 ` Yinghai Lu
2008-06-06 0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
1 sibling, 2 replies; 21+ messages in thread
From: Sam Ravnborg @ 2008-06-05 11:00 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
Hi Yinghai Lu.
Some random comments after skimming through the diff.
In general I like the simplification moving numaq.
But there is too much ifdef going on - and it
can be done better.
Part of this may belong in a followup patch - other parts
should be addressed in this patch.
> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
I counted several places where you test for the above.
Introducing a CONFIG_X86_NUMAQ_OR_GENERIC would simplify stuff.
> -obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
> +
> +ifeq ($(CONFIG_X86_NUMAQ), y)
> +obj-y += numaq_32.o
> +else
> +ifeq ($(CONFIG_X86_GENERICARCH), y)
> +obj-$(CONFIG_NUMA) += numaq_32.o
> +endif
> +endif
Can we move these dependencies to Kconfig?
It should looks roughtly like this in the Makefile:
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_NUMA_OR_GENERIC) += numaq_32.o
> -#ifndef CONFIG_X86_NUMAQ
> static void __init setup_ioapic_ids_from_mpc(void)
> {
> union IO_APIC_reg_00 reg_00;
> @@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from_mpc(void)
> unsigned char old_id;
> unsigned long flags;
>
> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
> + if (found_numaq)
> + return;
> +#endif
This ifdef should be found in a .h file defining a simple inline.
Then you could just do:
if (found_numaq())
return;
> +
> +int mp_bus_id_to_node[MAX_MP_BUSSES];
> +
> +int mp_bus_id_to_local[MAX_MP_BUSSES];
static? and introduce helper functions with proper
prototypes in a .h file?
> +++ b/arch/x86/mach-generic/probe.c
> @@ -16,6 +16,9 @@
> #include <asm/apicdef.h>
> #include <asm/genapic.h>
>
> +#ifdef CONFIG_NUMA
> +extern struct genapic apic_numaq;
> +#endif
No reason to use ifdef araound a extern.
> diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
> index 89ec35d..88d6fcc 100644
> --- a/arch/x86/pci/Makefile_32
> +++ b/arch/x86/pci/Makefile_32
> @@ -16,7 +16,13 @@ pci-y += legacy.o irq.o
> # Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
> # therefor correct. This needs a proper fix by distangling the code.
> pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
> -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
> +
> +ifeq ($(CONFIG_X86_NUMAQ), y)
> +pci-y := numa.o irq.o
> +endif
> +ifeq ($(CONFIG_X86_GENERICARCH), y)
> +pci-y += numa.o
> +endif
Use:
pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
pci-$(CONFIG_X86_GENERICARCH) += numa.o
> diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
> index d9afbae..a4ff536 100644
> --- a/arch/x86/pci/numa.c
> +++ b/arch/x86/pci/numa.c
> @@ -11,38 +11,18 @@
> #define XQUAD_PORTIO_BASE 0xfe400000
> #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
>
> -int mp_bus_id_to_node[MAX_MP_BUSSES];
> +extern int mp_bus_id_to_node[MAX_MP_BUSSES];
> #define BUS2QUAD(global) (mp_bus_id_to_node[global])
>
> -int mp_bus_id_to_local[MAX_MP_BUSSES];
> +extern int mp_bus_id_to_local[MAX_MP_BUSSES];
> #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
Move extern to .h file and consider introducing a helper function.
> --- a/include/asm-x86/mmzone_32.h
> +++ b/include/asm-x86/mmzone_32.h
> @@ -12,9 +12,10 @@
> extern struct pglist_data *node_data[];
> #define NODE_DATA(nid) (node_data[nid])
>
> -#ifdef CONFIG_X86_NUMAQ
> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
> #include <asm/numaq.h>
> -#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
> +#endif
> +#if defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
> #include <asm/srat.h>
> #endif
Move ifdef to .h files.
If at all needed.
> +#if defined(CONFIG_ACPI_SRAT)
> if (get_memcfg_from_srat())
> return;
> #endif
Create a dummy inline in a .h file for this function
so we can drop the ifdef here.
Sam
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: RFC [PATCH] x86: make generic arch support NUMAQ
2008-06-05 11:00 ` Sam Ravnborg
@ 2008-06-05 12:39 ` Ingo Molnar
2008-06-05 17:33 ` Yinghai Lu
2008-06-05 17:26 ` Yinghai Lu
1 sibling, 1 reply; 21+ messages in thread
From: Ingo Molnar @ 2008-06-05 12:39 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
* Sam Ravnborg <sam@ravnborg.org> wrote:
> > +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
>
> I counted several places where you test for the above. Introducing a
> CONFIG_X86_NUMAQ_OR_GENERIC would simplify stuff.
Yinghai, please get rid of the NUMAQ build option altogether and
eliminate the subarch.
We should keep a compatibility CONFIG_X86_NUMAQ that selects
X86_GENERICARCH, so that 'make oldconfig' on a NUMAQ config does the
right thing - but it's not a subarch anymore nor anything
user-configurable.
All that together would be a very nice simplification.
Ingo
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: RFC [PATCH] x86: make generic arch support NUMAQ
2008-06-05 11:00 ` Sam Ravnborg
2008-06-05 12:39 ` Ingo Molnar
@ 2008-06-05 17:26 ` Yinghai Lu
1 sibling, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-05 17:26 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
On Thu, Jun 5, 2008 at 4:00 AM, Sam Ravnborg <sam@ravnborg.org> wrote:
> Hi Yinghai Lu.
>
> Some random comments after skimming through the diff.
>
> In general I like the simplification moving numaq.
> But there is too much ifdef going on - and it
> can be done better.
> Part of this may belong in a followup patch - other parts
> should be addressed in this patch.
>
>> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
>
> I counted several places where you test for the above.
> Introducing a CONFIG_X86_NUMAQ_OR_GENERIC would simplify stuff.
>
>
>> -obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
>> +
>> +ifeq ($(CONFIG_X86_NUMAQ), y)
>> +obj-y += numaq_32.o
>> +else
>> +ifeq ($(CONFIG_X86_GENERICARCH), y)
>> +obj-$(CONFIG_NUMA) += numaq_32.o
>> +endif
>> +endif
>
> Can we move these dependencies to Kconfig?
> It should looks roughtly like this in the Makefile:
>
> obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
> obj-$(CONFIG_X86_NUMA_OR_GENERIC) += numaq_32.o
>
>
>> -#ifndef CONFIG_X86_NUMAQ
>> static void __init setup_ioapic_ids_from_mpc(void)
>> {
>> union IO_APIC_reg_00 reg_00;
>> @@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from_mpc(void)
>> unsigned char old_id;
>> unsigned long flags;
>>
>> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
>> + if (found_numaq)
>> + return;
>> +#endif
> This ifdef should be found in a .h file defining a simple inline.
> Then you could just do:
> if (found_numaq())
> return;
>
>> +
>> +int mp_bus_id_to_node[MAX_MP_BUSSES];
>> +
>> +int mp_bus_id_to_local[MAX_MP_BUSSES];
>
> static? and introduce helper functions with proper
> prototypes in a .h file?
>
>> +++ b/arch/x86/mach-generic/probe.c
>> @@ -16,6 +16,9 @@
>> #include <asm/apicdef.h>
>> #include <asm/genapic.h>
>>
>> +#ifdef CONFIG_NUMA
>> +extern struct genapic apic_numaq;
>> +#endif
>
> No reason to use ifdef araound a extern.
>
>> diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
>> index 89ec35d..88d6fcc 100644
>> --- a/arch/x86/pci/Makefile_32
>> +++ b/arch/x86/pci/Makefile_32
>> @@ -16,7 +16,13 @@ pci-y += legacy.o irq.o
>> # Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
>> # therefor correct. This needs a proper fix by distangling the code.
>> pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
>> -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
>> +
>> +ifeq ($(CONFIG_X86_NUMAQ), y)
>> +pci-y := numa.o irq.o
>> +endif
>> +ifeq ($(CONFIG_X86_GENERICARCH), y)
>> +pci-y += numa.o
>> +endif
>
> Use:
> pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
> pci-$(CONFIG_X86_GENERICARCH) += numa.o
>
>
>> diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
>> index d9afbae..a4ff536 100644
>> --- a/arch/x86/pci/numa.c
>> +++ b/arch/x86/pci/numa.c
>> @@ -11,38 +11,18 @@
>> #define XQUAD_PORTIO_BASE 0xfe400000
>> #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
>>
>> -int mp_bus_id_to_node[MAX_MP_BUSSES];
>> +extern int mp_bus_id_to_node[MAX_MP_BUSSES];
>> #define BUS2QUAD(global) (mp_bus_id_to_node[global])
>>
>> -int mp_bus_id_to_local[MAX_MP_BUSSES];
>> +extern int mp_bus_id_to_local[MAX_MP_BUSSES];
>> #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
>
> Move extern to .h file and consider introducing a helper function.
>
>> --- a/include/asm-x86/mmzone_32.h
>> +++ b/include/asm-x86/mmzone_32.h
>> @@ -12,9 +12,10 @@
>> extern struct pglist_data *node_data[];
>> #define NODE_DATA(nid) (node_data[nid])
>>
>> -#ifdef CONFIG_X86_NUMAQ
>> +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
>> #include <asm/numaq.h>
>> -#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
>> +#endif
>> +#if defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
>> #include <asm/srat.h>
>> #endif
>
> Move ifdef to .h files.
> If at all needed.
>
>> +#if defined(CONFIG_ACPI_SRAT)
>> if (get_memcfg_from_srat())
>> return;
>> #endif
>
> Create a dummy inline in a .h file for this function
> so we can drop the ifdef here.
>
Thanks, will check it.
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: RFC [PATCH] x86: make generic arch support NUMAQ
2008-06-05 12:39 ` Ingo Molnar
@ 2008-06-05 17:33 ` Yinghai Lu
0 siblings, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-05 17:33 UTC (permalink / raw)
To: Ingo Molnar
Cc: Sam Ravnborg, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
On Thu, Jun 5, 2008 at 5:39 AM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Sam Ravnborg <sam@ravnborg.org> wrote:
>
>> > +#if defined(CONFIG_X86_NUMAQ) || defined(CONFIG_X86_GENERICARCH)
>>
>> I counted several places where you test for the above. Introducing a
>> CONFIG_X86_NUMAQ_OR_GENERIC would simplify stuff.
>
> Yinghai, please get rid of the NUMAQ build option altogether and
> eliminate the subarch.
>
> We should keep a compatibility CONFIG_X86_NUMAQ that selects
> X86_GENERICARCH, so that 'make oldconfig' on a NUMAQ config does the
> right thing - but it's not a subarch anymore nor anything
> user-configurable.
how about the Summit, and ES7000? You still have the two entries for them.
Anyway, will remove entry in the list and make CONFIG_X86_NUMAQ select
X86_GENERICARCH
and make the those ifdef only use X86_GENERICARCH...
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ v2
2008-06-05 10:09 RFC [PATCH] x86: make generic arch support NUMAQ Yinghai Lu
2008-06-05 11:00 ` Sam Ravnborg
@ 2008-06-06 0:14 ` Yinghai Lu
2008-06-06 0:54 ` Yinghai Lu
2008-06-06 21:41 ` [PATCH] x86: make generic arch support NUMAQ v3 Yinghai Lu
1 sibling, 2 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-06 0:14 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Sam Ravnborg
Cc: linux-kernel@vger.kernel.org
so it could fallback to normal numa.
NUMAQ depends on GENERICARCH
also decouple genericarch numa with acpi.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -264,17 +264,6 @@ config X86_VOYAGER
If you do not specifically know you have a Voyager based machine,
say N here, otherwise the kernel you build will not be bootable.
-config X86_NUMAQ
- bool "NUMAQ (IBM/Sequent)"
- depends on SMP && X86_32 && PCI
- select NUMA
- help
- This option is used for getting Linux to run on a (IBM/Sequent) NUMA
- multiquad box. This changes the way that processors are bootstrapped,
- and uses Clustered Logical APIC addressing mode instead of Flat Logical.
- You will need a new lynxer.elf file to flash your firmware with - send
- email to <Martin.Bligh@us.ibm.com>.
-
config X86_SUMMIT
bool "Summit/EXA (IBM x440)"
depends on X86_32 && SMP
@@ -307,12 +296,12 @@ config X86_VISWS
and vice versa. See <file:Documentation/sgi-visws.txt> for details.
config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
+ bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
depends on X86_32
help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
+ This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+ subarchitectures. It is intended for a generic binary kernel.
+ You need enable NUMA, otherwise NUMAQ is skipped.
config X86_ES7000
bool "Support for Unisys ES7000 IA32 series"
@@ -348,6 +337,17 @@ config X86_VSMP
endchoice
+config X86_NUMAQ
+ bool "NUMAQ (IBM/Sequent)"
+ depends on SMP && X86_32 && PCI && X86_GENERICARCH
+ select NUMA
+ help
+ This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
+ NUMA multiquad box. This changes the way that processors are
+ bootstrapped, and uses Clustered Logical APIC addressing mode instead
+ of Flat Logical. You will need a new lynxer.elf file to flash your
+ firmware with - send email to <Martin.Bligh@us.ibm.com>.
+
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"
@@ -908,9 +908,9 @@ config X86_PAE
config NUMA
bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
depends on SMP
- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
default n if X86_PC
- default y if (X86_NUMAQ || X86_SUMMIT)
+ default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
help
Enable NUMA (Non Uniform Memory Access) support.
The kernel will try to allocate memory used by a CPU on the
Index: linux-2.6/arch/x86/kernel/io_apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
+++ linux-2.6/arch/x86/kernel/io_apic_32.c
@@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-#ifndef CONFIG_X86_NUMAQ
static void __init setup_ioapic_ids_from_mpc(void)
{
union IO_APIC_reg_00 reg_00;
@@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
unsigned char old_id;
unsigned long flags;
+#ifdef CONFIG_X86_NUMAQ
+ if (found_numaq)
+ return;
+#endif
+
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
@@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
apic_printk(APIC_VERBOSE, " ok.\n");
}
}
-#else
-static void __init setup_ioapic_ids_from_mpc(void) { }
-#endif
int no_timer_check __initdata;
Index: linux-2.6/arch/x86/kernel/mpparse.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/mpparse.c
+++ linux-2.6/arch/x86/kernel/mpparse.c
@@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
}
#ifdef CONFIG_X86_NUMAQ
+int found_numaq;
/*
* Have to match translation table entries to main table entries by counter
* hence the mpc_record variable .... can't see a less disgusting way of
* doing this ....
*/
+struct mpc_config_translation {
+ unsigned char mpc_type;
+ unsigned char trans_len;
+ unsigned char trans_type;
+ unsigned char trans_quad;
+ unsigned char trans_global;
+ unsigned char trans_local;
+ unsigned short trans_reserved;
+};
+
static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
__cpuinitdata;
+
+static inline int generate_logical_apicid(int quad, int phys_apicid)
+{
+ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
+}
+
+
+static inline int mpc_apic_id(struct mpc_config_processor *m,
+ struct mpc_config_translation *translation_record)
+{
+ int quad = translation_record->trans_quad;
+ int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
+
+ printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
+ m->mpc_apicid,
+ (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+ (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+ m->mpc_apicver, quad, logical_apicid);
+ return logical_apicid;
+}
+
+int mp_bus_id_to_node[MAX_MP_BUSSES];
+
+int mp_bus_id_to_local[MAX_MP_BUSSES];
+
+static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ mp_bus_id_to_node[m->mpc_busid] = quad;
+ mp_bus_id_to_local[m->mpc_busid] = local;
+ printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+ m->mpc_busid, name, quad);
+}
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+static void mpc_oem_pci_bus(struct mpc_config_bus *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
+
#endif
static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -84,6 +142,9 @@ static void __cpuinit MP_processor_info(
printk(KERN_INFO "Processor #%d%s\n", m->mpc_apicid, bootup_cpu);
generic_processor_info(apicid, m->mpc_apicver);
+#ifdef CONFIG_X86_GENERICARCH
+ generic_bigsmp_probe();
+#endif
}
#ifdef CONFIG_X86_IO_APIC
@@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
}
}
-static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
+void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
if (strncmp(oem, "IBM NUMA", 8))
- printk("Warning! May not be a NUMA-Q system!\n");
+ printk("Warning! Not a NUMA-Q system!\n");
else
found_numaq = 1;
@@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
return 0;
#ifdef CONFIG_X86_32
- mps_oem_check(mpc, oem, str);
+ /*
+ * need to make sure summit and es7000's mps_oem_check is safe to be
+ * called early via genericarch 's mps_oem_check
+ */
+ if (early) {
+#ifdef CONFIG_X86_NUMAQ
+ numaq_mps_oem_check(mpc, oem, str);
+#endif
+ } else
+ mps_oem_check(mpc, oem, str);
#endif
/* save the local APIC address, it might be non-default */
Index: linux-2.6/arch/x86/kernel/numaq_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/numaq_32.c
+++ linux-2.6/arch/x86/kernel/numaq_32.c
@@ -36,8 +36,6 @@
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
-int found_numaq;
-
/*
* Function: smp_dump_qct()
*
@@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
}
arch_initcall(numaq_tsc_disable);
-#ifdef CONFIG_ACPI
-/*
- * Dummy implementation:
- */
-struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
-{
- return NULL;
-}
-#endif
Index: linux-2.6/arch/x86/mach-generic/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/Makefile
+++ linux-2.6/arch/x86/mach-generic/Makefile
@@ -2,7 +2,8 @@
# Makefile for the generic architecture
#
-EXTRA_CFLAGS := -Iarch/x86/kernel
+EXTRA_CFLAGS := -Iarch/x86/kernel
-obj-y := probe.o summit.o bigsmp.o es7000.o default.o
-obj-y += ../../x86/mach-es7000/
+obj-y := probe.o summit.o bigsmp.o es7000.o default.o
+obj-$(CONFIG_X86_NUMAQ) += numaq.o
+obj-y += ../../x86/mach-es7000/
Index: linux-2.6/arch/x86/mach-generic/probe.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/probe.c
+++ linux-2.6/arch/x86/mach-generic/probe.c
@@ -16,6 +16,7 @@
#include <asm/apicdef.h>
#include <asm/genapic.h>
+extern struct genapic apic_numaq;
extern struct genapic apic_summit;
extern struct genapic apic_bigsmp;
extern struct genapic apic_es7000;
@@ -24,6 +25,9 @@ extern struct genapic apic_default;
struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = {
+#ifdef CONFIG_X86_NUMAQ
+ &apic_numaq,
+#endif
&apic_summit,
&apic_bigsmp,
&apic_es7000,
@@ -88,7 +92,8 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */
-int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
+int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
{
int i;
for (i = 0; apic_probe[i]; ++i) {
Index: linux-2.6/arch/x86/pci/Makefile_32
===================================================================
--- linux-2.6.orig/arch/x86/pci/Makefile_32
+++ linux-2.6/arch/x86/pci/Makefile_32
@@ -13,10 +13,11 @@ pci-y := fixup.o
pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
+
+pci-$(CONFIG_X86_NUMAQ) += numa.o
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
Index: linux-2.6/arch/x86/pci/numa.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/numa.c
+++ linux-2.6/arch/x86/pci/numa.c
@@ -6,45 +6,21 @@
#include <linux/init.h>
#include <linux/nodemask.h>
#include <mach_apic.h>
+#include <asm/mpspec.h>
#include "pci.h"
#define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
#define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- mp_bus_id_to_node[m->mpc_busid] = quad;
- mp_bus_id_to_local[m->mpc_busid] = local;
- printk(KERN_INFO "Bus #%d is %s (node %d)\n",
- m->mpc_busid, name, quad);
-}
-
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
/* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
EXPORT_SYMBOL(xquad_portio);
-#endif
#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,10 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
+
+extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
+
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif
Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
@@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
-#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
-#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
+static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+ return physid_isset(apicid, bitmap);
+}
+static inline unsigned long check_apicid_present(int bit)
+{
+ return physid_isset(bit, phys_cpu_present_map);
+}
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline int apic_id_registered(void)
@@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
return BAD_APICID;
}
-static inline int generate_logical_apicid(int quad, int phys_apicid)
-{
- return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
-}
-
static inline int apicid_to_node(int logical_apicid)
{
return logical_apicid >> 4;
@@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
return physid_mask_of_physid(cpu + 4*node);
}
-struct mpc_config_translation {
- unsigned char mpc_type;
- unsigned char trans_len;
- unsigned char trans_type;
- unsigned char trans_quad;
- unsigned char trans_global;
- unsigned char trans_local;
- unsigned short trans_reserved;
-};
-
-static inline int mpc_apic_id(struct mpc_config_processor *m,
- struct mpc_config_translation *translation_record)
-{
- int quad = translation_record->trans_quad;
- int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
-
- printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
- m->mpc_apicid,
- (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
- (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
- m->mpc_apicver, quad, logical_apicid);
- return logical_apicid;
-}
-
extern void *xquad_portio;
static inline void setup_portio_remap(void)
Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,14 +1,7 @@
#ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H
-extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation);
-extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation);
-
-/* Hook from generic ACPI tables.c */
-static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-}
+extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
#endif /* __ASM_MACH_MPPARSE_H */
Index: linux-2.6/include/asm-x86/mmzone_32.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mmzone_32.h
+++ linux-2.6/include/asm-x86/mmzone_32.h
@@ -12,11 +12,9 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_X86_NUMAQ
- #include <asm/numaq.h>
-#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
- #include <asm/srat.h>
-#endif
+#include <asm/numaq.h>
+/* summit or generic arch */
+#include <asm/srat.h>
extern int get_memcfg_numa_flat(void);
/*
@@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
*/
static inline void get_memcfg_numa(void)
{
-#ifdef CONFIG_X86_NUMAQ
+
if (get_memcfg_numaq())
return;
-#elif defined(CONFIG_ACPI_SRAT)
if (get_memcfg_from_srat())
return;
-#endif
-
get_memcfg_numa_flat();
}
@@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
#else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat
-#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
@@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
-#define pfn_valid(pfn) ((pfn) < num_physpages)
-#else
static inline int pfn_valid(int pfn)
{
int nid = pfn_to_nid(pfn);
@@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
return (pfn < node_end_pfn(nid));
return 0;
}
-#endif /* CONFIG_X86_NUMAQ */
#endif /* CONFIG_DISCONTIGMEM */
Index: linux-2.6/include/asm-x86/numaq.h
===================================================================
--- linux-2.6.orig/include/asm-x86/numaq.h
+++ linux-2.6/include/asm-x86/numaq.h
@@ -157,9 +157,10 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
-static inline unsigned long *get_zholes_size(int nid)
+#else
+static inline int get_memcfg_numaq(void)
{
- return NULL;
+ return 0;
}
#endif /* CONFIG_X86_NUMAQ */
#endif /* NUMAQ_H */
Index: linux-2.6/include/asm-x86/srat.h
===================================================================
--- linux-2.6.orig/include/asm-x86/srat.h
+++ linux-2.6/include/asm-x86/srat.h
@@ -27,11 +27,13 @@
#ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
-
+#ifdef CONFIG_ACPI_SRAT
extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+ return 0;
+}
+#endif
#endif /* _ASM_SRAT_H_ */
Index: linux-2.6/arch/x86/mach-generic/numaq.c
===================================================================
--- /dev/null
+++ linux-2.6/arch/x86/mach-generic/numaq.c
@@ -0,0 +1,41 @@
+/*
+ * APIC driver for the IBM NUMAQ chipset.
+ */
+#define APIC_DEFINITION 1
+#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <linux/smp.h>
+#include <asm/mpspec.h>
+#include <asm/genapic.h>
+#include <asm/fixmap.h>
+#include <asm/apicdef.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/mach-numaq/mach_apic.h>
+#include <asm/mach-numaq/mach_apicdef.h>
+#include <asm/mach-numaq/mach_ipi.h>
+#include <asm/mach-numaq/mach_mpparse.h>
+#include <asm/mach-numaq/mach_wakecpu.h>
+#include <asm/numaq.h>
+
+static int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
+{
+ numaq_mps_oem_check(mpc, oem, productid);
+ return found_numaq;
+}
+
+static int probe_numaq(void)
+{
+ /* already know from get_memcfg_numaq() */
+ return found_numaq;
+}
+
+/* Hook from generic ACPI tables.c */
+static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+ return 0;
+}
+
+struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
Index: linux-2.6/arch/x86/kernel/apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic_32.c
+++ linux-2.6/arch/x86/kernel/apic_32.c
@@ -1528,7 +1528,7 @@ void __cpuinit generic_processor_info(in
* if (CPU_HOTPLUG_ENABLED || num_processors > 8)
* - Ashok Raj <ashok.raj@intel.com>
*/
- if (num_processors > 8) {
+ if (apicid > 8) {
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_INTEL:
if (!APIC_XAPIC(version)) {
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
+++ linux-2.6/arch/x86/mach-generic/bigsmp.c
@@ -48,7 +48,7 @@ static const struct dmi_system_id bigsmp
static int probe_bigsmp(void)
{
if (def_to_bigsmp)
- dmi_bigsmp = 1;
+ dmi_bigsmp = 1;
else
dmi_check_system(bigsmp_dmi_table);
return dmi_bigsmp;
Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.orig/drivers/acpi/Kconfig
+++ linux-2.6/drivers/acpi/Kconfig
@@ -4,7 +4,6 @@
menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
- depends on !X86_NUMAQ
depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
Index: linux-2.6/include/asm-x86/mpspec.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mpspec.h
+++ linux-2.6/include/asm-x86/mpspec.h
@@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
extern u8 apicid_2_node[];
extern int pic_mode;
+#ifdef CONFIG_X86_NUMAQ
+extern int mp_bus_id_to_node[MAX_MP_BUSSES];
+extern int mp_bus_id_to_local[MAX_MP_BUSSES];
+extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+#endif
+
#define MAX_APICID 256
#else
Index: linux-2.6/arch/x86/kernel/summit_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/summit_32.c
+++ linux-2.6/arch/x86/kernel/summit_32.c
@@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
+#ifndef CONFIG_X86_NUMAQ
static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
+#endif
static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
{
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v2
2008-06-06 0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
@ 2008-06-06 0:54 ` Yinghai Lu
2008-06-06 6:17 ` Sam Ravnborg
2008-06-06 21:41 ` [PATCH] x86: make generic arch support NUMAQ v3 Yinghai Lu
1 sibling, 1 reply; 21+ messages in thread
From: Yinghai Lu @ 2008-06-06 0:54 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Sam Ravnborg
Cc: linux-kernel@vger.kernel.org
On Thu, Jun 5, 2008 at 5:14 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>
> so it could fallback to normal numa.
>
> NUMAQ depends on GENERICARCH
>
> also decouple genericarch numa with acpi.
>
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>
> Index: linux-2.6/arch/x86/Kconfig
> ===================================================================
> --- linux-2.6.orig/arch/x86/Kconfig
> +++ linux-2.6/arch/x86/Kconfig
> @@ -264,17 +264,6 @@ config X86_VOYAGER
> If you do not specifically know you have a Voyager based machine,
> say N here, otherwise the kernel you build will not be bootable.
>
> -config X86_NUMAQ
> - bool "NUMAQ (IBM/Sequent)"
> - depends on SMP && X86_32 && PCI
> - select NUMA
> - help
> - This option is used for getting Linux to run on a (IBM/Sequent) NUMA
> - multiquad box. This changes the way that processors are bootstrapped,
> - and uses Clustered Logical APIC addressing mode instead of Flat Logical.
> - You will need a new lynxer.elf file to flash your firmware with - send
> - email to <Martin.Bligh@us.ibm.com>.
> -
> config X86_SUMMIT
> bool "Summit/EXA (IBM x440)"
> depends on X86_32 && SMP
> @@ -307,12 +296,12 @@ config X86_VISWS
> and vice versa. See <file:Documentation/sgi-visws.txt> for details.
>
> config X86_GENERICARCH
> - bool "Generic architecture (Summit, bigsmp, ES7000, default)"
> + bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
> depends on X86_32
> help
> - This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
> - It is intended for a generic binary kernel.
> - If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
> + This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
> + subarchitectures. It is intended for a generic binary kernel.
> + You need enable NUMA, otherwise NUMAQ is skipped.
>
> config X86_ES7000
> bool "Support for Unisys ES7000 IA32 series"
> @@ -348,6 +337,17 @@ config X86_VSMP
>
> endchoice
>
> +config X86_NUMAQ
> + bool "NUMAQ (IBM/Sequent)"
> + depends on SMP && X86_32 && PCI && X86_GENERICARCH
> + select NUMA
> + help
> + This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
> + NUMA multiquad box. This changes the way that processors are
> + bootstrapped, and uses Clustered Logical APIC addressing mode instead
> + of Flat Logical. You will need a new lynxer.elf file to flash your
> + firmware with - send email to <Martin.Bligh@us.ibm.com>.
> +
> config SCHED_NO_NO_OMIT_FRAME_POINTER
> def_bool y
> prompt "Single-depth WCHAN output"
> @@ -908,9 +908,9 @@ config X86_PAE
> config NUMA
> bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
> depends on SMP
> - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
> + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
> default n if X86_PC
> - default y if (X86_NUMAQ || X86_SUMMIT)
> + default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
> help
> Enable NUMA (Non Uniform Memory Access) support.
> The kernel will try to allocate memory used by a CPU on the
Sam,
now NUMAQ depends on GENERICARCH.
and Ingo want to make oldconfig to migration NUMAQ....to select GENERICARCH...
but if i add select X86_GENERICARCH, make oldconfig will get
> make ARCH=i386 oldconfig
scripts/kconfig/conf -o arch/x86/Kconfig
arch/x86/Kconfig:299:error: found recursive dependency:
X86_GENERICARCH -> X86_NUMAQ -> X86_GENERICARCH -> <choice>
make[1]: *** [oldconfig] Error 1
make: *** [oldconfig] Error 2
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v2
2008-06-06 0:54 ` Yinghai Lu
@ 2008-06-06 6:17 ` Sam Ravnborg
2008-06-06 6:27 ` Yinghai Lu
0 siblings, 1 reply; 21+ messages in thread
From: Sam Ravnborg @ 2008-06-06 6:17 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
On Thu, Jun 05, 2008 at 05:54:40PM -0700, Yinghai Lu wrote:
> On Thu, Jun 5, 2008 at 5:14 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> >
> > so it could fallback to normal numa.
> >
> > NUMAQ depends on GENERICARCH
> >
> > also decouple genericarch numa with acpi.
> >
> > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> >
> > Index: linux-2.6/arch/x86/Kconfig
> > ===================================================================
> > --- linux-2.6.orig/arch/x86/Kconfig
> > +++ linux-2.6/arch/x86/Kconfig
> > @@ -264,17 +264,6 @@ config X86_VOYAGER
> > If you do not specifically know you have a Voyager based machine,
> > say N here, otherwise the kernel you build will not be bootable.
> >
> > -config X86_NUMAQ
> > - bool "NUMAQ (IBM/Sequent)"
> > - depends on SMP && X86_32 && PCI
> > - select NUMA
> > - help
> > - This option is used for getting Linux to run on a (IBM/Sequent) NUMA
> > - multiquad box. This changes the way that processors are bootstrapped,
> > - and uses Clustered Logical APIC addressing mode instead of Flat Logical.
> > - You will need a new lynxer.elf file to flash your firmware with - send
> > - email to <Martin.Bligh@us.ibm.com>.
> > -
> > config X86_SUMMIT
> > bool "Summit/EXA (IBM x440)"
> > depends on X86_32 && SMP
> > @@ -307,12 +296,12 @@ config X86_VISWS
> > and vice versa. See <file:Documentation/sgi-visws.txt> for details.
> >
> > config X86_GENERICARCH
> > - bool "Generic architecture (Summit, bigsmp, ES7000, default)"
> > + bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
> > depends on X86_32
> > help
> > - This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
> > - It is intended for a generic binary kernel.
> > - If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
> > + This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
> > + subarchitectures. It is intended for a generic binary kernel.
> > + You need enable NUMA, otherwise NUMAQ is skipped.
> >
> > config X86_ES7000
> > bool "Support for Unisys ES7000 IA32 series"
> > @@ -348,6 +337,17 @@ config X86_VSMP
> >
> > endchoice
> >
> > +config X86_NUMAQ
> > + bool "NUMAQ (IBM/Sequent)"
> > + depends on SMP && X86_32 && PCI && X86_GENERICARCH
> > + select NUMA
> > + help
> > + This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
> > + NUMA multiquad box. This changes the way that processors are
> > + bootstrapped, and uses Clustered Logical APIC addressing mode instead
> > + of Flat Logical. You will need a new lynxer.elf file to flash your
> > + firmware with - send email to <Martin.Bligh@us.ibm.com>.
> > +
> > config SCHED_NO_NO_OMIT_FRAME_POINTER
> > def_bool y
> > prompt "Single-depth WCHAN output"
> > @@ -908,9 +908,9 @@ config X86_PAE
> > config NUMA
> > bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
> > depends on SMP
> > - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
> > + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
> > default n if X86_PC
> > - default y if (X86_NUMAQ || X86_SUMMIT)
> > + default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
> > help
> > Enable NUMA (Non Uniform Memory Access) support.
> > The kernel will try to allocate memory used by a CPU on the
>
> Sam,
>
> now NUMAQ depends on GENERICARCH.
>
> and Ingo want to make oldconfig to migration NUMAQ....to select GENERICARCH...
>
> but if i add select X86_GENERICARCH, make oldconfig will get
It is my understanding that special support for NUMAQ should die,
so the only remaning usage of CONFIG_NUMAQ is if set to select GENERICARCH.
In other words that you should not use CONFIG_NUMAQ anywhere in the code
but solely rely on GENERICARCH and then do runtime detection of the
other things.
That has been my understanding of the discussions about eliminating the
subarch support - but obviosuly Ingo & Co are the ones with better
knowledge in this area.
My point is that NUMAQ should not be a visible option at all in
*config and solely be present to select GENERICARCH is set to Y
in a defconfig file.
So you would have something like:
config NUMAQ
defbool n
config GENERICARCH
default NUMAQ
I am though not sure if this works as expected when NUMAQ is not visible
but it should be trivial to test.
Sam
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v2
2008-06-06 6:17 ` Sam Ravnborg
@ 2008-06-06 6:27 ` Yinghai Lu
2008-06-06 14:09 ` Ingo Molnar
0 siblings, 1 reply; 21+ messages in thread
From: Yinghai Lu @ 2008-06-06 6:27 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
On Thu, Jun 5, 2008 at 11:17 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> On Thu, Jun 05, 2008 at 05:54:40PM -0700, Yinghai Lu wrote:
>> On Thu, Jun 5, 2008 at 5:14 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>> >
>> > so it could fallback to normal numa.
>> >
>> > NUMAQ depends on GENERICARCH
>> >
>> > also decouple genericarch numa with acpi.
>> >
>> > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>> >
>> > Index: linux-2.6/arch/x86/Kconfig
>> > ===================================================================
>> > --- linux-2.6.orig/arch/x86/Kconfig
>> > +++ linux-2.6/arch/x86/Kconfig
>> > @@ -264,17 +264,6 @@ config X86_VOYAGER
>> > If you do not specifically know you have a Voyager based machine,
>> > say N here, otherwise the kernel you build will not be bootable.
>> >
>> > -config X86_NUMAQ
>> > - bool "NUMAQ (IBM/Sequent)"
>> > - depends on SMP && X86_32 && PCI
>> > - select NUMA
>> > - help
>> > - This option is used for getting Linux to run on a (IBM/Sequent) NUMA
>> > - multiquad box. This changes the way that processors are bootstrapped,
>> > - and uses Clustered Logical APIC addressing mode instead of Flat Logical.
>> > - You will need a new lynxer.elf file to flash your firmware with - send
>> > - email to <Martin.Bligh@us.ibm.com>.
>> > -
>> > config X86_SUMMIT
>> > bool "Summit/EXA (IBM x440)"
>> > depends on X86_32 && SMP
>> > @@ -307,12 +296,12 @@ config X86_VISWS
>> > and vice versa. See <file:Documentation/sgi-visws.txt> for details.
>> >
>> > config X86_GENERICARCH
>> > - bool "Generic architecture (Summit, bigsmp, ES7000, default)"
>> > + bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
>> > depends on X86_32
>> > help
>> > - This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
>> > - It is intended for a generic binary kernel.
>> > - If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
>> > + This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
>> > + subarchitectures. It is intended for a generic binary kernel.
>> > + You need enable NUMA, otherwise NUMAQ is skipped.
>> >
>> > config X86_ES7000
>> > bool "Support for Unisys ES7000 IA32 series"
>> > @@ -348,6 +337,17 @@ config X86_VSMP
>> >
>> > endchoice
>> >
>> > +config X86_NUMAQ
>> > + bool "NUMAQ (IBM/Sequent)"
>> > + depends on SMP && X86_32 && PCI && X86_GENERICARCH
>> > + select NUMA
>> > + help
>> > + This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
>> > + NUMA multiquad box. This changes the way that processors are
>> > + bootstrapped, and uses Clustered Logical APIC addressing mode instead
>> > + of Flat Logical. You will need a new lynxer.elf file to flash your
>> > + firmware with - send email to <Martin.Bligh@us.ibm.com>.
>> > +
>> > config SCHED_NO_NO_OMIT_FRAME_POINTER
>> > def_bool y
>> > prompt "Single-depth WCHAN output"
>> > @@ -908,9 +908,9 @@ config X86_PAE
>> > config NUMA
>> > bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
>> > depends on SMP
>> > - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
>> > + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
>> > default n if X86_PC
>> > - default y if (X86_NUMAQ || X86_SUMMIT)
>> > + default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
>> > help
>> > Enable NUMA (Non Uniform Memory Access) support.
>> > The kernel will try to allocate memory used by a CPU on the
>>
>> Sam,
>>
>> now NUMAQ depends on GENERICARCH.
>>
>> and Ingo want to make oldconfig to migration NUMAQ....to select GENERICARCH...
>>
>> but if i add select X86_GENERICARCH, make oldconfig will get
>
> It is my understanding that special support for NUMAQ should die,
> so the only remaning usage of CONFIG_NUMAQ is if set to select GENERICARCH.
> In other words that you should not use CONFIG_NUMAQ anywhere in the code
> but solely rely on GENERICARCH and then do runtime detection of the
> other things.
in case someone don't want to build that special numaq code in.
I think we should make ES7000, Summit depend to GENERICARCH too.
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v2
2008-06-06 6:27 ` Yinghai Lu
@ 2008-06-06 14:09 ` Ingo Molnar
2008-06-06 18:05 ` Yinghai Lu
0 siblings, 1 reply; 21+ messages in thread
From: Ingo Molnar @ 2008-06-06 14:09 UTC (permalink / raw)
To: Yinghai Lu
Cc: Sam Ravnborg, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
* Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> > It is my understanding that special support for NUMAQ should die, so
> > the only remaning usage of CONFIG_NUMAQ is if set to select
> > GENERICARCH. In other words that you should not use CONFIG_NUMAQ
> > anywhere in the code but solely rely on GENERICARCH and then do
> > runtime detection of the other things.
>
> in case someone don't want to build that special numaq code in.
>
> I think we should make ES7000, Summit depend to GENERICARCH too.
correct. If someone wants more restricted support, pure CONFIG_X86_PC
should do that fine.
also, even GENERICARCH should have as little Kconfig implications as
possible. I.e. before your cleanups the subarch code was used to
implement something very non-PC, and it was done build-time - which is a
PITA in terms of testing and in terms of general complexity. We want to
remove those complications and eventually we want to remove the subarch
code altogether. (without narrowing hw support of course)
Ingo
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v2
2008-06-06 14:09 ` Ingo Molnar
@ 2008-06-06 18:05 ` Yinghai Lu
0 siblings, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-06 18:05 UTC (permalink / raw)
To: Ingo Molnar
Cc: Sam Ravnborg, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
On Fri, Jun 6, 2008 at 7:09 AM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>
>> > It is my understanding that special support for NUMAQ should die, so
>> > the only remaning usage of CONFIG_NUMAQ is if set to select
>> > GENERICARCH. In other words that you should not use CONFIG_NUMAQ
>> > anywhere in the code but solely rely on GENERICARCH and then do
>> > runtime detection of the other things.
>>
>> in case someone don't want to build that special numaq code in.
>>
>> I think we should make ES7000, Summit depend to GENERICARCH too.
>
> correct. If someone wants more restricted support, pure CONFIG_X86_PC
> should do that fine.
>
> also, even GENERICARCH should have as little Kconfig implications as
> possible. I.e. before your cleanups the subarch code was used to
> implement something very non-PC, and it was done build-time - which is a
> PITA in terms of testing and in terms of general complexity. We want to
> remove those complications and eventually we want to remove the subarch
> code altogether. (without narrowing hw support of course)
current
static struct genapic *apic_probe[] __initdata = {
#ifdef CONFIG_X86_NUMAQ
&apic_numaq,
#endif
&apic_summit,
&apic_bigsmp,
&apic_es7000,
&apic_default, /* must be last */
NULL,
};
the apic_default is the 86_PC.
so could make GENERICARCH default to yes.
and have
static struct genapic *apic_probe[] __initdata = {
#ifdef CONFIG_X86_NUMAQ
&apic_numaq,
#endif
#ifdef CONFIG_X86_SUMMIT
&apic_summit,
#endif
#ifdef CONFIG_X86_BIGSMP
&apic_bigsmp,
#endif
#ifdef CONFIG_X86_ES7000
&apic_es7000,
Eendif
&apic_default, /* must be last */
NULL,
};
also may expand probe a little bit...to cover other different.
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ v3
2008-06-06 0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
2008-06-06 0:54 ` Yinghai Lu
@ 2008-06-06 21:41 ` Yinghai Lu
2008-06-07 7:31 ` [PATCH] x86: make generic arch support NUMAQ v4 Yinghai Lu
1 sibling, 1 reply; 21+ messages in thread
From: Yinghai Lu @ 2008-06-06 21:41 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Sam Ravnborg
Cc: linux-kernel@vger.kernel.org
so it could fallback to normal numa.
NUMAQ depends on GENERICARCH
also decouple genericarch numa with acpi.
also make it fallback to bigsmp if apicid > 8.
v3: return early if not found_numaq in pci_numa_init
remove xquad_portio in misc.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -264,17 +264,6 @@ config X86_VOYAGER
If you do not specifically know you have a Voyager based machine,
say N here, otherwise the kernel you build will not be bootable.
-config X86_NUMAQ
- bool "NUMAQ (IBM/Sequent)"
- depends on SMP && X86_32 && PCI
- select NUMA
- help
- This option is used for getting Linux to run on a (IBM/Sequent) NUMA
- multiquad box. This changes the way that processors are bootstrapped,
- and uses Clustered Logical APIC addressing mode instead of Flat Logical.
- You will need a new lynxer.elf file to flash your firmware with - send
- email to <Martin.Bligh@us.ibm.com>.
-
config X86_SUMMIT
bool "Summit/EXA (IBM x440)"
depends on X86_32 && SMP
@@ -307,12 +296,12 @@ config X86_VISWS
and vice versa. See <file:Documentation/sgi-visws.txt> for details.
config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
+ bool "Generic architecture (NUMAQ, Summit, bigsmp, ES7000, default)"
depends on X86_32
help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
+ This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+ subarchitectures. It is intended for a generic binary kernel.
+ You need enable NUMA, otherwise NUMAQ is skipped.
config X86_ES7000
bool "Support for Unisys ES7000 IA32 series"
@@ -348,6 +337,17 @@ config X86_VSMP
endchoice
+config X86_NUMAQ
+ bool "NUMAQ (IBM/Sequent)"
+ depends on SMP && X86_32 && PCI && X86_GENERICARCH
+ select NUMA
+ help
+ This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
+ NUMA multiquad box. This changes the way that processors are
+ bootstrapped, and uses Clustered Logical APIC addressing mode instead
+ of Flat Logical. You will need a new lynxer.elf file to flash your
+ firmware with - send email to <Martin.Bligh@us.ibm.com>.
+
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"
@@ -908,9 +908,9 @@ config X86_PAE
config NUMA
bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
depends on SMP
- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
default n if X86_PC
- default y if (X86_NUMAQ || X86_SUMMIT)
+ default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
help
Enable NUMA (Non Uniform Memory Access) support.
The kernel will try to allocate memory used by a CPU on the
Index: linux-2.6/arch/x86/kernel/io_apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
+++ linux-2.6/arch/x86/kernel/io_apic_32.c
@@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-#ifndef CONFIG_X86_NUMAQ
static void __init setup_ioapic_ids_from_mpc(void)
{
union IO_APIC_reg_00 reg_00;
@@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
unsigned char old_id;
unsigned long flags;
+#ifdef CONFIG_X86_NUMAQ
+ if (found_numaq)
+ return;
+#endif
+
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
@@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
apic_printk(APIC_VERBOSE, " ok.\n");
}
}
-#else
-static void __init setup_ioapic_ids_from_mpc(void) { }
-#endif
int no_timer_check __initdata;
Index: linux-2.6/arch/x86/kernel/mpparse.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/mpparse.c
+++ linux-2.6/arch/x86/kernel/mpparse.c
@@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
}
#ifdef CONFIG_X86_NUMAQ
+int found_numaq;
/*
* Have to match translation table entries to main table entries by counter
* hence the mpc_record variable .... can't see a less disgusting way of
* doing this ....
*/
+struct mpc_config_translation {
+ unsigned char mpc_type;
+ unsigned char trans_len;
+ unsigned char trans_type;
+ unsigned char trans_quad;
+ unsigned char trans_global;
+ unsigned char trans_local;
+ unsigned short trans_reserved;
+};
+
static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
__cpuinitdata;
+
+static inline int generate_logical_apicid(int quad, int phys_apicid)
+{
+ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
+}
+
+
+static inline int mpc_apic_id(struct mpc_config_processor *m,
+ struct mpc_config_translation *translation_record)
+{
+ int quad = translation_record->trans_quad;
+ int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
+
+ printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
+ m->mpc_apicid,
+ (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+ (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+ m->mpc_apicver, quad, logical_apicid);
+ return logical_apicid;
+}
+
+int mp_bus_id_to_node[MAX_MP_BUSSES];
+
+int mp_bus_id_to_local[MAX_MP_BUSSES];
+
+static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ mp_bus_id_to_node[m->mpc_busid] = quad;
+ mp_bus_id_to_local[m->mpc_busid] = local;
+ printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+ m->mpc_busid, name, quad);
+}
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+static void mpc_oem_pci_bus(struct mpc_config_bus *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
+
#endif
static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -84,6 +142,9 @@ static void __cpuinit MP_processor_info(
printk(KERN_INFO "Processor #%d%s\n", m->mpc_apicid, bootup_cpu);
generic_processor_info(apicid, m->mpc_apicver);
+#ifdef CONFIG_X86_GENERICARCH
+ generic_bigsmp_probe();
+#endif
}
#ifdef CONFIG_X86_IO_APIC
@@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
}
}
-static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
+void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
if (strncmp(oem, "IBM NUMA", 8))
- printk("Warning! May not be a NUMA-Q system!\n");
+ printk("Warning! Not a NUMA-Q system!\n");
else
found_numaq = 1;
@@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
return 0;
#ifdef CONFIG_X86_32
- mps_oem_check(mpc, oem, str);
+ /*
+ * need to make sure summit and es7000's mps_oem_check is safe to be
+ * called early via genericarch 's mps_oem_check
+ */
+ if (early) {
+#ifdef CONFIG_X86_NUMAQ
+ numaq_mps_oem_check(mpc, oem, str);
+#endif
+ } else
+ mps_oem_check(mpc, oem, str);
#endif
/* save the local APIC address, it might be non-default */
Index: linux-2.6/arch/x86/kernel/numaq_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/numaq_32.c
+++ linux-2.6/arch/x86/kernel/numaq_32.c
@@ -36,8 +36,6 @@
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
-int found_numaq;
-
/*
* Function: smp_dump_qct()
*
@@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
}
arch_initcall(numaq_tsc_disable);
-#ifdef CONFIG_ACPI
-/*
- * Dummy implementation:
- */
-struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
-{
- return NULL;
-}
-#endif
Index: linux-2.6/arch/x86/mach-generic/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/Makefile
+++ linux-2.6/arch/x86/mach-generic/Makefile
@@ -2,7 +2,8 @@
# Makefile for the generic architecture
#
-EXTRA_CFLAGS := -Iarch/x86/kernel
+EXTRA_CFLAGS := -Iarch/x86/kernel
-obj-y := probe.o summit.o bigsmp.o es7000.o default.o
-obj-y += ../../x86/mach-es7000/
+obj-y := probe.o summit.o bigsmp.o es7000.o default.o
+obj-$(CONFIG_X86_NUMAQ) += numaq.o
+obj-y += ../../x86/mach-es7000/
Index: linux-2.6/arch/x86/mach-generic/probe.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/probe.c
+++ linux-2.6/arch/x86/mach-generic/probe.c
@@ -16,6 +16,7 @@
#include <asm/apicdef.h>
#include <asm/genapic.h>
+extern struct genapic apic_numaq;
extern struct genapic apic_summit;
extern struct genapic apic_bigsmp;
extern struct genapic apic_es7000;
@@ -24,6 +25,9 @@ extern struct genapic apic_default;
struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = {
+#ifdef CONFIG_X86_NUMAQ
+ &apic_numaq,
+#endif
&apic_summit,
&apic_bigsmp,
&apic_es7000,
@@ -88,7 +92,8 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */
-int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
+int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
{
int i;
for (i = 0; apic_probe[i]; ++i) {
Index: linux-2.6/arch/x86/pci/Makefile_32
===================================================================
--- linux-2.6.orig/arch/x86/pci/Makefile_32
+++ linux-2.6/arch/x86/pci/Makefile_32
@@ -13,10 +13,11 @@ pci-y := fixup.o
pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
+
+pci-$(CONFIG_X86_NUMAQ) += numa.o
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
Index: linux-2.6/arch/x86/pci/numa.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/numa.c
+++ linux-2.6/arch/x86/pci/numa.c
@@ -6,45 +6,21 @@
#include <linux/init.h>
#include <linux/nodemask.h>
#include <mach_apic.h>
+#include <asm/mpspec.h>
#include "pci.h"
#define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
#define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- mp_bus_id_to_node[m->mpc_busid] = quad;
- mp_bus_id_to_local[m->mpc_busid] = local;
- printk(KERN_INFO "Bus #%d is %s (node %d)\n",
- m->mpc_busid, name, quad);
-}
-
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
/* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
EXPORT_SYMBOL(xquad_portio);
-#endif
#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
@@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
{
int quad;
+ if (!found_numaq)
+ return 0;
+
raw_pci_ops = &pci_direct_conf1_mq;
if (pcibios_scanned++)
Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,10 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
+
+extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
+
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif
Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
@@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
-#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
-#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
+static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+ return physid_isset(apicid, bitmap);
+}
+static inline unsigned long check_apicid_present(int bit)
+{
+ return physid_isset(bit, phys_cpu_present_map);
+}
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline int apic_id_registered(void)
@@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
return BAD_APICID;
}
-static inline int generate_logical_apicid(int quad, int phys_apicid)
-{
- return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
-}
-
static inline int apicid_to_node(int logical_apicid)
{
return logical_apicid >> 4;
@@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
return physid_mask_of_physid(cpu + 4*node);
}
-struct mpc_config_translation {
- unsigned char mpc_type;
- unsigned char trans_len;
- unsigned char trans_type;
- unsigned char trans_quad;
- unsigned char trans_global;
- unsigned char trans_local;
- unsigned short trans_reserved;
-};
-
-static inline int mpc_apic_id(struct mpc_config_processor *m,
- struct mpc_config_translation *translation_record)
-{
- int quad = translation_record->trans_quad;
- int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
-
- printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
- m->mpc_apicid,
- (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
- (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
- m->mpc_apicver, quad, logical_apicid);
- return logical_apicid;
-}
-
extern void *xquad_portio;
static inline void setup_portio_remap(void)
Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,14 +1,7 @@
#ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H
-extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation);
-extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation);
-
-/* Hook from generic ACPI tables.c */
-static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-}
+extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
#endif /* __ASM_MACH_MPPARSE_H */
Index: linux-2.6/include/asm-x86/mmzone_32.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mmzone_32.h
+++ linux-2.6/include/asm-x86/mmzone_32.h
@@ -12,11 +12,9 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_X86_NUMAQ
- #include <asm/numaq.h>
-#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
- #include <asm/srat.h>
-#endif
+#include <asm/numaq.h>
+/* summit or generic arch */
+#include <asm/srat.h>
extern int get_memcfg_numa_flat(void);
/*
@@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
*/
static inline void get_memcfg_numa(void)
{
-#ifdef CONFIG_X86_NUMAQ
+
if (get_memcfg_numaq())
return;
-#elif defined(CONFIG_ACPI_SRAT)
if (get_memcfg_from_srat())
return;
-#endif
-
get_memcfg_numa_flat();
}
@@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
#else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat
-#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
@@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
-#define pfn_valid(pfn) ((pfn) < num_physpages)
-#else
static inline int pfn_valid(int pfn)
{
int nid = pfn_to_nid(pfn);
@@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
return (pfn < node_end_pfn(nid));
return 0;
}
-#endif /* CONFIG_X86_NUMAQ */
#endif /* CONFIG_DISCONTIGMEM */
Index: linux-2.6/include/asm-x86/numaq.h
===================================================================
--- linux-2.6.orig/include/asm-x86/numaq.h
+++ linux-2.6/include/asm-x86/numaq.h
@@ -157,9 +157,10 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
-static inline unsigned long *get_zholes_size(int nid)
+#else
+static inline int get_memcfg_numaq(void)
{
- return NULL;
+ return 0;
}
#endif /* CONFIG_X86_NUMAQ */
#endif /* NUMAQ_H */
Index: linux-2.6/include/asm-x86/srat.h
===================================================================
--- linux-2.6.orig/include/asm-x86/srat.h
+++ linux-2.6/include/asm-x86/srat.h
@@ -27,11 +27,13 @@
#ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
-
+#ifdef CONFIG_ACPI_SRAT
extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+ return 0;
+}
+#endif
#endif /* _ASM_SRAT_H_ */
Index: linux-2.6/arch/x86/mach-generic/numaq.c
===================================================================
--- /dev/null
+++ linux-2.6/arch/x86/mach-generic/numaq.c
@@ -0,0 +1,41 @@
+/*
+ * APIC driver for the IBM NUMAQ chipset.
+ */
+#define APIC_DEFINITION 1
+#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <linux/smp.h>
+#include <asm/mpspec.h>
+#include <asm/genapic.h>
+#include <asm/fixmap.h>
+#include <asm/apicdef.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/mach-numaq/mach_apic.h>
+#include <asm/mach-numaq/mach_apicdef.h>
+#include <asm/mach-numaq/mach_ipi.h>
+#include <asm/mach-numaq/mach_mpparse.h>
+#include <asm/mach-numaq/mach_wakecpu.h>
+#include <asm/numaq.h>
+
+static int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
+{
+ numaq_mps_oem_check(mpc, oem, productid);
+ return found_numaq;
+}
+
+static int probe_numaq(void)
+{
+ /* already know from get_memcfg_numaq() */
+ return found_numaq;
+}
+
+/* Hook from generic ACPI tables.c */
+static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+ return 0;
+}
+
+struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
Index: linux-2.6/arch/x86/kernel/apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic_32.c
+++ linux-2.6/arch/x86/kernel/apic_32.c
@@ -1528,7 +1528,7 @@ void __cpuinit generic_processor_info(in
* if (CPU_HOTPLUG_ENABLED || num_processors > 8)
* - Ashok Raj <ashok.raj@intel.com>
*/
- if (num_processors > 8) {
+ if (apicid > 8) {
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_INTEL:
if (!APIC_XAPIC(version)) {
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
+++ linux-2.6/arch/x86/mach-generic/bigsmp.c
@@ -48,7 +48,7 @@ static const struct dmi_system_id bigsmp
static int probe_bigsmp(void)
{
if (def_to_bigsmp)
- dmi_bigsmp = 1;
+ dmi_bigsmp = 1;
else
dmi_check_system(bigsmp_dmi_table);
return dmi_bigsmp;
Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.orig/drivers/acpi/Kconfig
+++ linux-2.6/drivers/acpi/Kconfig
@@ -4,7 +4,6 @@
menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
- depends on !X86_NUMAQ
depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
Index: linux-2.6/include/asm-x86/mpspec.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mpspec.h
+++ linux-2.6/include/asm-x86/mpspec.h
@@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
extern u8 apicid_2_node[];
extern int pic_mode;
+#ifdef CONFIG_X86_NUMAQ
+extern int mp_bus_id_to_node[MAX_MP_BUSSES];
+extern int mp_bus_id_to_local[MAX_MP_BUSSES];
+extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+#endif
+
#define MAX_APICID 256
#else
Index: linux-2.6/arch/x86/kernel/summit_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/summit_32.c
+++ linux-2.6/arch/x86/kernel/summit_32.c
@@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
+#ifndef CONFIG_X86_NUMAQ
static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
+#endif
static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
{
Index: linux-2.6/arch/x86/boot/compressed/misc.c
===================================================================
--- linux-2.6.orig/arch/x86/boot/compressed/misc.c
+++ linux-2.6/arch/x86/boot/compressed/misc.c
@@ -217,10 +217,6 @@ static char *vidmem;
static int vidport;
static int lines, cols;
-#ifdef CONFIG_X86_NUMAQ
-void *xquad_portio;
-#endif
-
#include "../../../../lib/inflate.c"
static void *malloc(int size)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ v4
2008-06-06 21:41 ` [PATCH] x86: make generic arch support NUMAQ v3 Yinghai Lu
@ 2008-06-07 7:31 ` Yinghai Lu
2008-06-09 1:29 ` [PATCH] x86: introduce max_physical_apicid for bigsmp switching Yinghai Lu
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
0 siblings, 2 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-07 7:31 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Sam Ravnborg
Cc: linux-kernel@vger.kernel.org
so it could fallback to normal numa.
NUMAQ depends on GENERICARCH
also decouple genericarch numa with acpi.
also make it fallback to bigsmp if apicid > 8.
v3: return early if not found_numaq in pci_numa_init
remove xquad_portio in misc.c
v4: make summit, bigsmp and es7000 depend on GENERICARCH too
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -264,36 +264,6 @@ config X86_VOYAGER
If you do not specifically know you have a Voyager based machine,
say N here, otherwise the kernel you build will not be bootable.
-config X86_NUMAQ
- bool "NUMAQ (IBM/Sequent)"
- depends on SMP && X86_32 && PCI
- select NUMA
- help
- This option is used for getting Linux to run on a (IBM/Sequent) NUMA
- multiquad box. This changes the way that processors are bootstrapped,
- and uses Clustered Logical APIC addressing mode instead of Flat Logical.
- You will need a new lynxer.elf file to flash your firmware with - send
- email to <Martin.Bligh@us.ibm.com>.
-
-config X86_SUMMIT
- bool "Summit/EXA (IBM x440)"
- depends on X86_32 && SMP
- help
- This option is needed for IBM systems that use the Summit/EXA chipset.
- In particular, it is needed for the x440.
-
- If you don't have one of these computers, you should say N here.
- If you want to build a NUMA kernel, you must select ACPI.
-
-config X86_BIGSMP
- bool "Support for other sub-arch SMP systems with more than 8 CPUs"
- depends on X86_32 && SMP
- help
- This option is needed for the systems that have more than 8 CPUs
- and if the system is not of any sub-arch type above.
-
- If you don't have such a system, you should say N here.
-
config X86_VISWS
bool "SGI 320/540 (Visual Workstation)"
depends on X86_32 && !PCI
@@ -307,12 +277,33 @@ config X86_VISWS
and vice versa. See <file:Documentation/sgi-visws.txt> for details.
config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
+ bool "Generic architecture"
depends on X86_32
help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
+ This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+ subarchitectures. It is intended for a generic binary kernel.
+ if you select them all, kernel will probe it one by one. and will
+ fallback to default.
+
+if X86_GENERICARCH
+
+config X86_NUMAQ
+ bool "NUMAQ (IBM/Sequent)"
+ depends on SMP && X86_32 && PCI
+ select NUMA
+ help
+ This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
+ NUMA multiquad box. This changes the way that processors are
+ bootstrapped, and uses Clustered Logical APIC addressing mode instead
+ of Flat Logical. You will need a new lynxer.elf file to flash your
+ firmware with - send email to <Martin.Bligh@us.ibm.com>.
+
+config X86_SUMMIT
+ bool "Summit/EXA (IBM x440)"
+ depends on X86_32 && SMP
+ help
+ This option is needed for IBM systems that use the Summit/EXA chipset.
+ In particular, it is needed for the x440.
config X86_ES7000
bool "Support for Unisys ES7000 IA32 series"
@@ -320,8 +311,15 @@ config X86_ES7000
help
Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
supposed to run on an IA32-based Unisys ES7000 system.
- Only choose this option if you have such a system, otherwise you
- should say N here.
+
+config X86_BIGSMP
+ bool "Support for big SMP systems with more than 8 CPUs"
+ depends on X86_32 && SMP
+ help
+ This option is needed for the systems that have more than 8 CPUs
+ and if the system is not of any sub-arch type above.
+
+endif
config X86_RDC321X
bool "RDC R-321x SoC"
@@ -908,9 +906,9 @@ config X86_PAE
config NUMA
bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
depends on SMP
- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
default n if X86_PC
- default y if (X86_NUMAQ || X86_SUMMIT)
+ default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
help
Enable NUMA (Non Uniform Memory Access) support.
The kernel will try to allocate memory used by a CPU on the
Index: linux-2.6/arch/x86/kernel/io_apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
+++ linux-2.6/arch/x86/kernel/io_apic_32.c
@@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-#ifndef CONFIG_X86_NUMAQ
static void __init setup_ioapic_ids_from_mpc(void)
{
union IO_APIC_reg_00 reg_00;
@@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
unsigned char old_id;
unsigned long flags;
+#ifdef CONFIG_X86_NUMAQ
+ if (found_numaq)
+ return;
+#endif
+
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
@@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
apic_printk(APIC_VERBOSE, " ok.\n");
}
}
-#else
-static void __init setup_ioapic_ids_from_mpc(void) { }
-#endif
int no_timer_check __initdata;
Index: linux-2.6/arch/x86/kernel/mpparse.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/mpparse.c
+++ linux-2.6/arch/x86/kernel/mpparse.c
@@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
}
#ifdef CONFIG_X86_NUMAQ
+int found_numaq;
/*
* Have to match translation table entries to main table entries by counter
* hence the mpc_record variable .... can't see a less disgusting way of
* doing this ....
*/
+struct mpc_config_translation {
+ unsigned char mpc_type;
+ unsigned char trans_len;
+ unsigned char trans_type;
+ unsigned char trans_quad;
+ unsigned char trans_global;
+ unsigned char trans_local;
+ unsigned short trans_reserved;
+};
+
static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
__cpuinitdata;
+
+static inline int generate_logical_apicid(int quad, int phys_apicid)
+{
+ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
+}
+
+
+static inline int mpc_apic_id(struct mpc_config_processor *m,
+ struct mpc_config_translation *translation_record)
+{
+ int quad = translation_record->trans_quad;
+ int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
+
+ printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
+ m->mpc_apicid,
+ (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+ (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+ m->mpc_apicver, quad, logical_apicid);
+ return logical_apicid;
+}
+
+int mp_bus_id_to_node[MAX_MP_BUSSES];
+
+int mp_bus_id_to_local[MAX_MP_BUSSES];
+
+static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ mp_bus_id_to_node[m->mpc_busid] = quad;
+ mp_bus_id_to_local[m->mpc_busid] = local;
+ printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+ m->mpc_busid, name, quad);
+}
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+static void mpc_oem_pci_bus(struct mpc_config_bus *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
+
#endif
static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -84,6 +142,9 @@ static void __cpuinit MP_processor_info(
printk(KERN_INFO "Processor #%d%s\n", m->mpc_apicid, bootup_cpu);
generic_processor_info(apicid, m->mpc_apicver);
+#ifdef CONFIG_X86_GENERICARCH
+ generic_bigsmp_probe();
+#endif
}
#ifdef CONFIG_X86_IO_APIC
@@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
}
}
-static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
+void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
if (strncmp(oem, "IBM NUMA", 8))
- printk("Warning! May not be a NUMA-Q system!\n");
+ printk("Warning! Not a NUMA-Q system!\n");
else
found_numaq = 1;
@@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
return 0;
#ifdef CONFIG_X86_32
- mps_oem_check(mpc, oem, str);
+ /*
+ * need to make sure summit and es7000's mps_oem_check is safe to be
+ * called early via genericarch 's mps_oem_check
+ */
+ if (early) {
+#ifdef CONFIG_X86_NUMAQ
+ numaq_mps_oem_check(mpc, oem, str);
+#endif
+ } else
+ mps_oem_check(mpc, oem, str);
#endif
/* save the local APIC address, it might be non-default */
Index: linux-2.6/arch/x86/kernel/numaq_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/numaq_32.c
+++ linux-2.6/arch/x86/kernel/numaq_32.c
@@ -36,8 +36,6 @@
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
-int found_numaq;
-
/*
* Function: smp_dump_qct()
*
@@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
}
arch_initcall(numaq_tsc_disable);
-#ifdef CONFIG_ACPI
-/*
- * Dummy implementation:
- */
-struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
-{
- return NULL;
-}
-#endif
Index: linux-2.6/arch/x86/mach-generic/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/Makefile
+++ linux-2.6/arch/x86/mach-generic/Makefile
@@ -2,7 +2,11 @@
# Makefile for the generic architecture
#
-EXTRA_CFLAGS := -Iarch/x86/kernel
+EXTRA_CFLAGS := -Iarch/x86/kernel
-obj-y := probe.o summit.o bigsmp.o es7000.o default.o
-obj-y += ../../x86/mach-es7000/
+obj-y := probe.o default.o
+obj-$(CONFIG_X86_NUMAQ) += numaq.o
+obj-$(CONFIG_X86_SUMMIT) += summit.o
+obj-$(CONFIG_X86_BIGSMP) += bigsmp.o
+obj-$(CONFIG_X86_ES7000) += es7000.o
+obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/
Index: linux-2.6/arch/x86/mach-generic/probe.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/probe.c
+++ linux-2.6/arch/x86/mach-generic/probe.c
@@ -16,6 +16,7 @@
#include <asm/apicdef.h>
#include <asm/genapic.h>
+extern struct genapic apic_numaq;
extern struct genapic apic_summit;
extern struct genapic apic_bigsmp;
extern struct genapic apic_es7000;
@@ -24,9 +25,18 @@ extern struct genapic apic_default;
struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = {
+#ifdef CONFIG_X86_NUMAQ
+ &apic_numaq,
+#endif
+#ifdef CONFIG_X86_SUMMIT
&apic_summit,
+#endif
+#ifdef CONFIG_X86_BIGSMP
&apic_bigsmp,
+#endif
+#ifdef CONFIG_X86_ES7000
&apic_es7000,
+#endif
&apic_default, /* must be last */
NULL,
};
@@ -54,6 +64,7 @@ early_param("apic", parse_apic);
void __init generic_bigsmp_probe(void)
{
+#if CONFIG_X86_BIGSMP
/*
* This routine is used to switch to bigsmp mode when
* - There is no apic= option specified by the user
@@ -67,6 +78,7 @@ void __init generic_bigsmp_probe(void)
printk(KERN_INFO "Overriding APIC driver with %s\n",
genapic->name);
}
+#endif
}
void __init generic_apic_probe(void)
@@ -88,7 +100,8 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */
-int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
+int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
{
int i;
for (i = 0; apic_probe[i]; ++i) {
Index: linux-2.6/arch/x86/pci/Makefile_32
===================================================================
--- linux-2.6.orig/arch/x86/pci/Makefile_32
+++ linux-2.6/arch/x86/pci/Makefile_32
@@ -13,10 +13,11 @@ pci-y := fixup.o
pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
+
+pci-$(CONFIG_X86_NUMAQ) += numa.o
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
Index: linux-2.6/arch/x86/pci/numa.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/numa.c
+++ linux-2.6/arch/x86/pci/numa.c
@@ -6,45 +6,21 @@
#include <linux/init.h>
#include <linux/nodemask.h>
#include <mach_apic.h>
+#include <asm/mpspec.h>
#include "pci.h"
#define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
#define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- mp_bus_id_to_node[m->mpc_busid] = quad;
- mp_bus_id_to_local[m->mpc_busid] = local;
- printk(KERN_INFO "Bus #%d is %s (node %d)\n",
- m->mpc_busid, name, quad);
-}
-
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
/* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
EXPORT_SYMBOL(xquad_portio);
-#endif
#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
@@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
{
int quad;
+ if (!found_numaq)
+ return 0;
+
raw_pci_ops = &pci_direct_conf1_mq;
if (pcibios_scanned++)
Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,10 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
+
+extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
+
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif
Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
@@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
-#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
-#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
+static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+ return physid_isset(apicid, bitmap);
+}
+static inline unsigned long check_apicid_present(int bit)
+{
+ return physid_isset(bit, phys_cpu_present_map);
+}
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline int apic_id_registered(void)
@@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
return BAD_APICID;
}
-static inline int generate_logical_apicid(int quad, int phys_apicid)
-{
- return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
-}
-
static inline int apicid_to_node(int logical_apicid)
{
return logical_apicid >> 4;
@@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
return physid_mask_of_physid(cpu + 4*node);
}
-struct mpc_config_translation {
- unsigned char mpc_type;
- unsigned char trans_len;
- unsigned char trans_type;
- unsigned char trans_quad;
- unsigned char trans_global;
- unsigned char trans_local;
- unsigned short trans_reserved;
-};
-
-static inline int mpc_apic_id(struct mpc_config_processor *m,
- struct mpc_config_translation *translation_record)
-{
- int quad = translation_record->trans_quad;
- int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
-
- printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
- m->mpc_apicid,
- (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
- (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
- m->mpc_apicver, quad, logical_apicid);
- return logical_apicid;
-}
-
extern void *xquad_portio;
static inline void setup_portio_remap(void)
Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,14 +1,7 @@
#ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H
-extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation);
-extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation);
-
-/* Hook from generic ACPI tables.c */
-static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-}
+extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
#endif /* __ASM_MACH_MPPARSE_H */
Index: linux-2.6/include/asm-x86/mmzone_32.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mmzone_32.h
+++ linux-2.6/include/asm-x86/mmzone_32.h
@@ -12,11 +12,9 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_X86_NUMAQ
- #include <asm/numaq.h>
-#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
- #include <asm/srat.h>
-#endif
+#include <asm/numaq.h>
+/* summit or generic arch */
+#include <asm/srat.h>
extern int get_memcfg_numa_flat(void);
/*
@@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
*/
static inline void get_memcfg_numa(void)
{
-#ifdef CONFIG_X86_NUMAQ
+
if (get_memcfg_numaq())
return;
-#elif defined(CONFIG_ACPI_SRAT)
if (get_memcfg_from_srat())
return;
-#endif
-
get_memcfg_numa_flat();
}
@@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
#else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat
-#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
@@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
-#define pfn_valid(pfn) ((pfn) < num_physpages)
-#else
static inline int pfn_valid(int pfn)
{
int nid = pfn_to_nid(pfn);
@@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
return (pfn < node_end_pfn(nid));
return 0;
}
-#endif /* CONFIG_X86_NUMAQ */
#endif /* CONFIG_DISCONTIGMEM */
Index: linux-2.6/include/asm-x86/numaq.h
===================================================================
--- linux-2.6.orig/include/asm-x86/numaq.h
+++ linux-2.6/include/asm-x86/numaq.h
@@ -157,9 +157,10 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
-static inline unsigned long *get_zholes_size(int nid)
+#else
+static inline int get_memcfg_numaq(void)
{
- return NULL;
+ return 0;
}
#endif /* CONFIG_X86_NUMAQ */
#endif /* NUMAQ_H */
Index: linux-2.6/include/asm-x86/srat.h
===================================================================
--- linux-2.6.orig/include/asm-x86/srat.h
+++ linux-2.6/include/asm-x86/srat.h
@@ -27,11 +27,13 @@
#ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
-
+#ifdef CONFIG_ACPI_SRAT
extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+ return 0;
+}
+#endif
#endif /* _ASM_SRAT_H_ */
Index: linux-2.6/arch/x86/mach-generic/numaq.c
===================================================================
--- /dev/null
+++ linux-2.6/arch/x86/mach-generic/numaq.c
@@ -0,0 +1,41 @@
+/*
+ * APIC driver for the IBM NUMAQ chipset.
+ */
+#define APIC_DEFINITION 1
+#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <linux/smp.h>
+#include <asm/mpspec.h>
+#include <asm/genapic.h>
+#include <asm/fixmap.h>
+#include <asm/apicdef.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/mach-numaq/mach_apic.h>
+#include <asm/mach-numaq/mach_apicdef.h>
+#include <asm/mach-numaq/mach_ipi.h>
+#include <asm/mach-numaq/mach_mpparse.h>
+#include <asm/mach-numaq/mach_wakecpu.h>
+#include <asm/numaq.h>
+
+static int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
+{
+ numaq_mps_oem_check(mpc, oem, productid);
+ return found_numaq;
+}
+
+static int probe_numaq(void)
+{
+ /* already know from get_memcfg_numaq() */
+ return found_numaq;
+}
+
+/* Hook from generic ACPI tables.c */
+static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+ return 0;
+}
+
+struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
Index: linux-2.6/arch/x86/kernel/apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic_32.c
+++ linux-2.6/arch/x86/kernel/apic_32.c
@@ -1531,7 +1531,7 @@ void __cpuinit generic_processor_info(in
* if (CPU_HOTPLUG_ENABLED || num_processors > 8)
* - Ashok Raj <ashok.raj@intel.com>
*/
- if (num_processors > 8) {
+ if (apicid > 8) {
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_INTEL:
if (!APIC_XAPIC(version)) {
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
+++ linux-2.6/arch/x86/mach-generic/bigsmp.c
@@ -23,10 +23,8 @@ static int dmi_bigsmp; /* can be set by
static int hp_ht_bigsmp(const struct dmi_system_id *d)
{
-#ifdef CONFIG_X86_GENERICARCH
printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
dmi_bigsmp = 1;
-#endif
return 0;
}
@@ -48,7 +46,7 @@ static const struct dmi_system_id bigsmp
static int probe_bigsmp(void)
{
if (def_to_bigsmp)
- dmi_bigsmp = 1;
+ dmi_bigsmp = 1;
else
dmi_check_system(bigsmp_dmi_table);
return dmi_bigsmp;
Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.orig/drivers/acpi/Kconfig
+++ linux-2.6/drivers/acpi/Kconfig
@@ -4,7 +4,6 @@
menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
- depends on !X86_NUMAQ
depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
Index: linux-2.6/include/asm-x86/mpspec.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mpspec.h
+++ linux-2.6/include/asm-x86/mpspec.h
@@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
extern u8 apicid_2_node[];
extern int pic_mode;
+#ifdef CONFIG_X86_NUMAQ
+extern int mp_bus_id_to_node[MAX_MP_BUSSES];
+extern int mp_bus_id_to_local[MAX_MP_BUSSES];
+extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+#endif
+
#define MAX_APICID 256
#else
Index: linux-2.6/arch/x86/kernel/summit_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/summit_32.c
+++ linux-2.6/arch/x86/kernel/summit_32.c
@@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
+#ifndef CONFIG_X86_NUMAQ
static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
+#endif
static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
{
Index: linux-2.6/arch/x86/boot/compressed/misc.c
===================================================================
--- linux-2.6.orig/arch/x86/boot/compressed/misc.c
+++ linux-2.6/arch/x86/boot/compressed/misc.c
@@ -217,10 +217,6 @@ static char *vidmem;
static int vidport;
static int lines, cols;
-#ifdef CONFIG_X86_NUMAQ
-void *xquad_portio;
-#endif
-
#include "../../../../lib/inflate.c"
static void *malloc(int size)
Index: linux-2.6/arch/x86/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/Makefile
+++ linux-2.6/arch/x86/Makefile
@@ -117,29 +117,11 @@ mcore-$(CONFIG_X86_VOYAGER) := arch/x86/
mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws/
-# NUMAQ subarch support
-mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default/
-
-# BIGSMP subarch support
-mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default/
-
-#Summit subarch support
-mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
-mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default/
-
# generic subarchitecture
mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/
-
-# ES7000 subarch support
-mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
-fcore-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
-mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default/
-
# RDC R-321x subarch support
mflags-$(CONFIG_X86_RDC321X) := -Iinclude/asm-x86/mach-rdc321x
mcore-$(CONFIG_X86_RDC321X) := arch/x86/mach-default/
Index: linux-2.6/arch/x86/kernel/acpi/boot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c
+++ linux-2.6/arch/x86/kernel/acpi/boot.c
@@ -858,7 +858,7 @@ static int __init acpi_parse_madt_lapic_
#ifdef CONFIG_X86_IO_APIC
#define MP_ISA_BUS 0
-#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
+#ifdef CONFIG_X86_ES7000
extern int es7000_plat;
#endif
@@ -1007,7 +1007,7 @@ void __init mp_config_acpi_legacy_irqs(v
set_bit(MP_ISA_BUS, mp_bus_not_pci);
Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
-#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
+#ifdef CONFIG_X86_ES7000
/*
* Older generations of ES7000 have no legacy identity mappings
*/
Index: linux-2.6/arch/x86/mach-es7000/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-es7000/Makefile
+++ linux-2.6/arch/x86/mach-es7000/Makefile
@@ -3,4 +3,3 @@
#
obj-$(CONFIG_X86_ES7000) := es7000plat.o
-obj-$(CONFIG_X86_GENERICARCH) := es7000plat.o
Index: linux-2.6/arch/x86/mach-es7000/es7000plat.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-es7000/es7000plat.c
+++ linux-2.6/arch/x86/mach-es7000/es7000plat.c
@@ -177,53 +177,6 @@ find_unisys_acpi_oem_table(unsigned long
}
#endif
-/*
- * This file also gets compiled if CONFIG_X86_GENERICARCH is set. Generic
- * arch already has got following function definitions (asm-generic/es7000.c)
- * hence no need to define these for that case.
- */
-#ifndef CONFIG_X86_GENERICARCH
-void es7000_sw_apic(void);
-void __init enable_apic_mode(void)
-{
- es7000_sw_apic();
- return;
-}
-
-__init int mps_oem_check(struct mp_config_table *mpc, char *oem,
- char *productid)
-{
- if (mpc->mpc_oemptr) {
- struct mp_config_oemtable *oem_table =
- (struct mp_config_oemtable *)mpc->mpc_oemptr;
- if (!strncmp(oem, "UNISYS", 6))
- return parse_unisys_oem((char *)oem_table);
- }
- return 0;
-}
-#ifdef CONFIG_ACPI
-/* Hook from generic ACPI tables.c */
-int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
- unsigned long oem_addr;
- if (!find_unisys_acpi_oem_table(&oem_addr)) {
- if (es7000_check_dsdt())
- return parse_unisys_oem((char *)oem_addr);
- else {
- setup_unisys();
- return 1;
- }
- }
- return 0;
-}
-#else
-int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
- return 0;
-}
-#endif
-#endif /* COFIG_X86_GENERICARCH */
-
static void
es7000_spin(int n)
{
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: introduce max_physical_apicid for bigsmp switching
2008-06-07 7:31 ` [PATCH] x86: make generic arch support NUMAQ v4 Yinghai Lu
@ 2008-06-09 1:29 ` Yinghai Lu
2008-06-10 9:53 ` Ingo Molnar
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
1 sibling, 1 reply; 21+ messages in thread
From: Yinghai Lu @ 2008-06-09 1:29 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton
Cc: linux-kernel@vger.kernel.org
one multi-sockets system with 3 or 4 ioapics, when 4 dualcore cpus or 2 quadcore cpus
installed, need to switch to bigsmp or physflat. because cpu apic id is [4,11]
instead of [0,7], and we need to check max apic id instead of cpu numbers.
also add check for 32 bit when acpi is not compiled in or acpi=off
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Index: linux-2.6/arch/x86/kernel/apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic_32.c
+++ linux-2.6/arch/x86/kernel/apic_32.c
@@ -1520,6 +1520,9 @@ void __cpuinit generic_processor_info(in
*/
cpu = 0;
+ if (apicid > max_physical_apicid)
+ max_physical_apicid = apicid;
+
/*
* Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y
* but we need to work other dependencies like SMP_SUSPEND etc
@@ -1527,7 +1530,7 @@ void __cpuinit generic_processor_info(in
* if (CPU_HOTPLUG_ENABLED || num_processors > 8)
* - Ashok Raj <ashok.raj@intel.com>
*/
- if (num_processors > 8) {
+ if (max_physical_apicid >= 8) {
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_INTEL:
if (!APIC_XAPIC(version)) {
Index: linux-2.6/arch/x86/kernel/apic_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic_64.c
+++ linux-2.6/arch/x86/kernel/apic_64.c
@@ -1092,6 +1092,9 @@ void __cpuinit generic_processor_info(in
*/
cpu = 0;
}
+ if (apicid > max_physical_apicid)
+ max_physical_apicid = apicid;
+
/* are we being called early in kernel startup? */
if (early_per_cpu_ptr(x86_cpu_to_apicid)) {
u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);
Index: linux-2.6/arch/x86/kernel/genapic_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/genapic_64.c
+++ linux-2.6/arch/x86/kernel/genapic_64.c
@@ -51,7 +51,7 @@ void __init setup_apic_routing(void)
else
#endif
- if (num_possible_cpus() <= 8)
+ if (max_physical_apicid < 8)
genapic = &apic_flat;
else
genapic = &apic_physflat;
Index: linux-2.6/arch/x86/kernel/mpparse.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/mpparse.c
+++ linux-2.6/arch/x86/kernel/mpparse.c
@@ -473,6 +473,11 @@ static int __init smp_read_mpc(struct mp
++mpc_record;
#endif
}
+
+#ifdef CONFIG_X86_GENERICARCH
+ generic_bigsmp_probe();
+#endif
+
setup_apic_routing();
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup.c
+++ linux-2.6/arch/x86/kernel/setup.c
@@ -17,6 +17,7 @@ unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata;
/* Processor that is doing the boot up */
unsigned int boot_cpu_physical_apicid = -1U;
+unsigned int max_physical_apicid;
EXPORT_SYMBOL(boot_cpu_physical_apicid);
/* Bitmask of physically existing CPUs */
Index: linux-2.6/arch/x86/kernel/setup_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_32.c
+++ linux-2.6/arch/x86/kernel/setup_32.c
@@ -838,18 +838,17 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_ACPI
acpi_boot_init();
-
+#endif
+#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
+ if (smp_found_config)
+ get_smp_config();
+#endif
#if defined(CONFIG_SMP) && defined(CONFIG_X86_PC)
if (def_to_bigsmp)
printk(KERN_WARNING "More than 8 CPUs detected and "
"CONFIG_X86_PC cannot handle it.\nUse "
"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
#endif
-#endif
-#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
- if (smp_found_config)
- get_smp_config();
-#endif
e820_setup_gap();
e820_mark_nosave_regions(max_low_pfn);
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
+++ linux-2.6/arch/x86/mach-generic/bigsmp.c
@@ -48,7 +48,7 @@ static const struct dmi_system_id bigsmp
static int probe_bigsmp(void)
{
if (def_to_bigsmp)
- dmi_bigsmp = 1;
+ dmi_bigsmp = 1;
else
dmi_check_system(bigsmp_dmi_table);
return dmi_bigsmp;
Index: linux-2.6/include/asm-x86/mpspec.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mpspec.h
+++ linux-2.6/include/asm-x86/mpspec.h
@@ -33,6 +33,7 @@ extern int mp_bus_id_to_type[MAX_MP_BUSS
extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
extern unsigned int boot_cpu_physical_apicid;
+extern unsigned int max_physical_apicid;
extern int smp_found_config;
extern int mpc_default_type;
extern unsigned long mp_lapic_addr;
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ v5
2008-06-07 7:31 ` [PATCH] x86: make generic arch support NUMAQ v4 Yinghai Lu
2008-06-09 1:29 ` [PATCH] x86: introduce max_physical_apicid for bigsmp switching Yinghai Lu
@ 2008-06-09 1:31 ` Yinghai Lu
2008-06-09 14:41 ` Andy Whitcroft
` (3 more replies)
1 sibling, 4 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-09 1:31 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, Andrew Morton, Sam Ravnborg
Cc: Thomas Gleixner, linux-kernel@vger.kernel.org
so it could fallback to normal numa.
NUMAQ depends on GENERICARCH
also decouple genericarch numa with acpi.
also make it fallback to bigsmp if apicid > 8.
v3: return early if not found_numaq in pci_numa_init
remove xquad_portio in misc.c
v4: make summit, bigsmp and es7000 depend on GENERICARCH too
v5: seperate apicid check for bigsmp to another patch
[PATCH] x86: introduce max_physical_apicid for bigsmp switching
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -264,36 +264,6 @@ config X86_VOYAGER
If you do not specifically know you have a Voyager based machine,
say N here, otherwise the kernel you build will not be bootable.
-config X86_NUMAQ
- bool "NUMAQ (IBM/Sequent)"
- depends on SMP && X86_32 && PCI
- select NUMA
- help
- This option is used for getting Linux to run on a (IBM/Sequent) NUMA
- multiquad box. This changes the way that processors are bootstrapped,
- and uses Clustered Logical APIC addressing mode instead of Flat Logical.
- You will need a new lynxer.elf file to flash your firmware with - send
- email to <Martin.Bligh@us.ibm.com>.
-
-config X86_SUMMIT
- bool "Summit/EXA (IBM x440)"
- depends on X86_32 && SMP
- help
- This option is needed for IBM systems that use the Summit/EXA chipset.
- In particular, it is needed for the x440.
-
- If you don't have one of these computers, you should say N here.
- If you want to build a NUMA kernel, you must select ACPI.
-
-config X86_BIGSMP
- bool "Support for other sub-arch SMP systems with more than 8 CPUs"
- depends on X86_32 && SMP
- help
- This option is needed for the systems that have more than 8 CPUs
- and if the system is not of any sub-arch type above.
-
- If you don't have such a system, you should say N here.
-
config X86_VISWS
bool "SGI 320/540 (Visual Workstation)"
depends on X86_32 && !PCI
@@ -307,12 +277,33 @@ config X86_VISWS
and vice versa. See <file:Documentation/sgi-visws.txt> for details.
config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
+ bool "Generic architecture"
depends on X86_32
help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
+ This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+ subarchitectures. It is intended for a generic binary kernel.
+ if you select them all, kernel will probe it one by one. and will
+ fallback to default.
+
+if X86_GENERICARCH
+
+config X86_NUMAQ
+ bool "NUMAQ (IBM/Sequent)"
+ depends on SMP && X86_32 && PCI
+ select NUMA
+ help
+ This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
+ NUMA multiquad box. This changes the way that processors are
+ bootstrapped, and uses Clustered Logical APIC addressing mode instead
+ of Flat Logical. You will need a new lynxer.elf file to flash your
+ firmware with - send email to <Martin.Bligh@us.ibm.com>.
+
+config X86_SUMMIT
+ bool "Summit/EXA (IBM x440)"
+ depends on X86_32 && SMP
+ help
+ This option is needed for IBM systems that use the Summit/EXA chipset.
+ In particular, it is needed for the x440.
config X86_ES7000
bool "Support for Unisys ES7000 IA32 series"
@@ -320,8 +311,15 @@ config X86_ES7000
help
Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
supposed to run on an IA32-based Unisys ES7000 system.
- Only choose this option if you have such a system, otherwise you
- should say N here.
+
+config X86_BIGSMP
+ bool "Support for big SMP systems with more than 8 CPUs"
+ depends on X86_32 && SMP
+ help
+ This option is needed for the systems that have more than 8 CPUs
+ and if the system is not of any sub-arch type above.
+
+endif
config X86_RDC321X
bool "RDC R-321x SoC"
@@ -908,9 +906,9 @@ config X86_PAE
config NUMA
bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
depends on SMP
- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
default n if X86_PC
- default y if (X86_NUMAQ || X86_SUMMIT)
+ default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
help
Enable NUMA (Non Uniform Memory Access) support.
The kernel will try to allocate memory used by a CPU on the
Index: linux-2.6/arch/x86/kernel/io_apic_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
+++ linux-2.6/arch/x86/kernel/io_apic_32.c
@@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-#ifndef CONFIG_X86_NUMAQ
static void __init setup_ioapic_ids_from_mpc(void)
{
union IO_APIC_reg_00 reg_00;
@@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
unsigned char old_id;
unsigned long flags;
+#ifdef CONFIG_X86_NUMAQ
+ if (found_numaq)
+ return;
+#endif
+
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
@@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
apic_printk(APIC_VERBOSE, " ok.\n");
}
}
-#else
-static void __init setup_ioapic_ids_from_mpc(void) { }
-#endif
int no_timer_check __initdata;
Index: linux-2.6/arch/x86/kernel/mpparse.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/mpparse.c
+++ linux-2.6/arch/x86/kernel/mpparse.c
@@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
}
#ifdef CONFIG_X86_NUMAQ
+int found_numaq;
/*
* Have to match translation table entries to main table entries by counter
* hence the mpc_record variable .... can't see a less disgusting way of
* doing this ....
*/
+struct mpc_config_translation {
+ unsigned char mpc_type;
+ unsigned char trans_len;
+ unsigned char trans_type;
+ unsigned char trans_quad;
+ unsigned char trans_global;
+ unsigned char trans_local;
+ unsigned short trans_reserved;
+};
+
static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
__cpuinitdata;
+
+static inline int generate_logical_apicid(int quad, int phys_apicid)
+{
+ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
+}
+
+
+static inline int mpc_apic_id(struct mpc_config_processor *m,
+ struct mpc_config_translation *translation_record)
+{
+ int quad = translation_record->trans_quad;
+ int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
+
+ printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
+ m->mpc_apicid,
+ (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+ (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+ m->mpc_apicver, quad, logical_apicid);
+ return logical_apicid;
+}
+
+int mp_bus_id_to_node[MAX_MP_BUSSES];
+
+int mp_bus_id_to_local[MAX_MP_BUSSES];
+
+static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ mp_bus_id_to_node[m->mpc_busid] = quad;
+ mp_bus_id_to_local[m->mpc_busid] = local;
+ printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+ m->mpc_busid, name, quad);
+}
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+static void mpc_oem_pci_bus(struct mpc_config_bus *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+
+ quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
+
#endif
static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
}
}
-static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
+void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
if (strncmp(oem, "IBM NUMA", 8))
- printk("Warning! May not be a NUMA-Q system!\n");
+ printk("Warning! Not a NUMA-Q system!\n");
else
found_numaq = 1;
@@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
return 0;
#ifdef CONFIG_X86_32
- mps_oem_check(mpc, oem, str);
+ /*
+ * need to make sure summit and es7000's mps_oem_check is safe to be
+ * called early via genericarch 's mps_oem_check
+ */
+ if (early) {
+#ifdef CONFIG_X86_NUMAQ
+ numaq_mps_oem_check(mpc, oem, str);
+#endif
+ } else
+ mps_oem_check(mpc, oem, str);
#endif
/* save the local APIC address, it might be non-default */
Index: linux-2.6/arch/x86/kernel/numaq_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/numaq_32.c
+++ linux-2.6/arch/x86/kernel/numaq_32.c
@@ -36,8 +36,6 @@
#define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
-int found_numaq;
-
/*
* Function: smp_dump_qct()
*
@@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
}
arch_initcall(numaq_tsc_disable);
-#ifdef CONFIG_ACPI
-/*
- * Dummy implementation:
- */
-struct pci_bus * __devinit
-pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
-{
- return NULL;
-}
-#endif
Index: linux-2.6/arch/x86/mach-generic/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/Makefile
+++ linux-2.6/arch/x86/mach-generic/Makefile
@@ -2,7 +2,11 @@
# Makefile for the generic architecture
#
-EXTRA_CFLAGS := -Iarch/x86/kernel
+EXTRA_CFLAGS := -Iarch/x86/kernel
-obj-y := probe.o summit.o bigsmp.o es7000.o default.o
-obj-y += ../../x86/mach-es7000/
+obj-y := probe.o default.o
+obj-$(CONFIG_X86_NUMAQ) += numaq.o
+obj-$(CONFIG_X86_SUMMIT) += summit.o
+obj-$(CONFIG_X86_BIGSMP) += bigsmp.o
+obj-$(CONFIG_X86_ES7000) += es7000.o
+obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/
Index: linux-2.6/arch/x86/mach-generic/probe.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/probe.c
+++ linux-2.6/arch/x86/mach-generic/probe.c
@@ -16,6 +16,7 @@
#include <asm/apicdef.h>
#include <asm/genapic.h>
+extern struct genapic apic_numaq;
extern struct genapic apic_summit;
extern struct genapic apic_bigsmp;
extern struct genapic apic_es7000;
@@ -24,9 +25,18 @@ extern struct genapic apic_default;
struct genapic *genapic = &apic_default;
static struct genapic *apic_probe[] __initdata = {
+#ifdef CONFIG_X86_NUMAQ
+ &apic_numaq,
+#endif
+#ifdef CONFIG_X86_SUMMIT
&apic_summit,
+#endif
+#ifdef CONFIG_X86_BIGSMP
&apic_bigsmp,
+#endif
+#ifdef CONFIG_X86_ES7000
&apic_es7000,
+#endif
&apic_default, /* must be last */
NULL,
};
@@ -54,6 +64,7 @@ early_param("apic", parse_apic);
void __init generic_bigsmp_probe(void)
{
+#if CONFIG_X86_BIGSMP
/*
* This routine is used to switch to bigsmp mode when
* - There is no apic= option specified by the user
@@ -67,6 +78,7 @@ void __init generic_bigsmp_probe(void)
printk(KERN_INFO "Overriding APIC driver with %s\n",
genapic->name);
}
+#endif
}
void __init generic_apic_probe(void)
@@ -88,7 +100,8 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */
-int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
+int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
{
int i;
for (i = 0; apic_probe[i]; ++i) {
Index: linux-2.6/arch/x86/pci/Makefile_32
===================================================================
--- linux-2.6.orig/arch/x86/pci/Makefile_32
+++ linux-2.6/arch/x86/pci/Makefile_32
@@ -13,10 +13,11 @@ pci-y := fixup.o
pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
+
+pci-$(CONFIG_X86_NUMAQ) += numa.o
# Necessary for NUMAQ as well
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
Index: linux-2.6/arch/x86/pci/numa.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/numa.c
+++ linux-2.6/arch/x86/pci/numa.c
@@ -6,45 +6,21 @@
#include <linux/init.h>
#include <linux/nodemask.h>
#include <mach_apic.h>
+#include <asm/mpspec.h>
#include "pci.h"
#define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
#define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- mp_bus_id_to_node[m->mpc_busid] = quad;
- mp_bus_id_to_local[m->mpc_busid] = local;
- printk(KERN_INFO "Bus #%d is %s (node %d)\n",
- m->mpc_busid, name, quad);
-}
-
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation)
-{
- int quad = translation->trans_quad;
- int local = translation->trans_local;
-
- quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
/* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
EXPORT_SYMBOL(xquad_portio);
-#endif
#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
@@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
{
int quad;
+ if (!found_numaq)
+ return 0;
+
raw_pci_ops = &pci_direct_conf1_mq;
if (pcibios_scanned++)
Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,7 +1,10 @@
#ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
+
+extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
+
+extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif
Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
@@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
-#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
-#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
+static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+{
+ return physid_isset(apicid, bitmap);
+}
+static inline unsigned long check_apicid_present(int bit)
+{
+ return physid_isset(bit, phys_cpu_present_map);
+}
#define apicid_cluster(apicid) (apicid & 0xF0)
static inline int apic_id_registered(void)
@@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
return BAD_APICID;
}
-static inline int generate_logical_apicid(int quad, int phys_apicid)
-{
- return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
-}
-
static inline int apicid_to_node(int logical_apicid)
{
return logical_apicid >> 4;
@@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
return physid_mask_of_physid(cpu + 4*node);
}
-struct mpc_config_translation {
- unsigned char mpc_type;
- unsigned char trans_len;
- unsigned char trans_type;
- unsigned char trans_quad;
- unsigned char trans_global;
- unsigned char trans_local;
- unsigned short trans_reserved;
-};
-
-static inline int mpc_apic_id(struct mpc_config_processor *m,
- struct mpc_config_translation *translation_record)
-{
- int quad = translation_record->trans_quad;
- int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
-
- printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
- m->mpc_apicid,
- (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
- (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
- m->mpc_apicver, quad, logical_apicid);
- return logical_apicid;
-}
-
extern void *xquad_portio;
static inline void setup_portio_remap(void)
Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
+++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,14 +1,7 @@
#ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H
-extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
- struct mpc_config_translation *translation);
-extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
- struct mpc_config_translation *translation);
-
-/* Hook from generic ACPI tables.c */
-static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-}
+extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid);
#endif /* __ASM_MACH_MPPARSE_H */
Index: linux-2.6/include/asm-x86/mmzone_32.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mmzone_32.h
+++ linux-2.6/include/asm-x86/mmzone_32.h
@@ -12,11 +12,9 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_X86_NUMAQ
- #include <asm/numaq.h>
-#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
- #include <asm/srat.h>
-#endif
+#include <asm/numaq.h>
+/* summit or generic arch */
+#include <asm/srat.h>
extern int get_memcfg_numa_flat(void);
/*
@@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
*/
static inline void get_memcfg_numa(void)
{
-#ifdef CONFIG_X86_NUMAQ
+
if (get_memcfg_numaq())
return;
-#elif defined(CONFIG_ACPI_SRAT)
if (get_memcfg_from_srat())
return;
-#endif
-
get_memcfg_numa_flat();
}
@@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
#else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat
-#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
@@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
-#define pfn_valid(pfn) ((pfn) < num_physpages)
-#else
static inline int pfn_valid(int pfn)
{
int nid = pfn_to_nid(pfn);
@@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
return (pfn < node_end_pfn(nid));
return 0;
}
-#endif /* CONFIG_X86_NUMAQ */
#endif /* CONFIG_DISCONTIGMEM */
Index: linux-2.6/include/asm-x86/numaq.h
===================================================================
--- linux-2.6.orig/include/asm-x86/numaq.h
+++ linux-2.6/include/asm-x86/numaq.h
@@ -157,9 +157,10 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
-static inline unsigned long *get_zholes_size(int nid)
+#else
+static inline int get_memcfg_numaq(void)
{
- return NULL;
+ return 0;
}
#endif /* CONFIG_X86_NUMAQ */
#endif /* NUMAQ_H */
Index: linux-2.6/include/asm-x86/srat.h
===================================================================
--- linux-2.6.orig/include/asm-x86/srat.h
+++ linux-2.6/include/asm-x86/srat.h
@@ -27,11 +27,13 @@
#ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
-
+#ifdef CONFIG_ACPI_SRAT
extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+ return 0;
+}
+#endif
#endif /* _ASM_SRAT_H_ */
Index: linux-2.6/arch/x86/mach-generic/numaq.c
===================================================================
--- /dev/null
+++ linux-2.6/arch/x86/mach-generic/numaq.c
@@ -0,0 +1,41 @@
+/*
+ * APIC driver for the IBM NUMAQ chipset.
+ */
+#define APIC_DEFINITION 1
+#include <linux/threads.h>
+#include <linux/cpumask.h>
+#include <linux/smp.h>
+#include <asm/mpspec.h>
+#include <asm/genapic.h>
+#include <asm/fixmap.h>
+#include <asm/apicdef.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/mach-numaq/mach_apic.h>
+#include <asm/mach-numaq/mach_apicdef.h>
+#include <asm/mach-numaq/mach_ipi.h>
+#include <asm/mach-numaq/mach_mpparse.h>
+#include <asm/mach-numaq/mach_wakecpu.h>
+#include <asm/numaq.h>
+
+static int mps_oem_check(struct mp_config_table *mpc, char *oem,
+ char *productid)
+{
+ numaq_mps_oem_check(mpc, oem, productid);
+ return found_numaq;
+}
+
+static int probe_numaq(void)
+{
+ /* already know from get_memcfg_numaq() */
+ return found_numaq;
+}
+
+/* Hook from generic ACPI tables.c */
+static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+ return 0;
+}
+
+struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
+++ linux-2.6/arch/x86/mach-generic/bigsmp.c
@@ -23,10 +23,8 @@ static int dmi_bigsmp; /* can be set by
static int hp_ht_bigsmp(const struct dmi_system_id *d)
{
-#ifdef CONFIG_X86_GENERICARCH
printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
dmi_bigsmp = 1;
-#endif
return 0;
}
Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.orig/drivers/acpi/Kconfig
+++ linux-2.6/drivers/acpi/Kconfig
@@ -4,7 +4,6 @@
menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
- depends on !X86_NUMAQ
depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
Index: linux-2.6/include/asm-x86/mpspec.h
===================================================================
--- linux-2.6.orig/include/asm-x86/mpspec.h
+++ linux-2.6/include/asm-x86/mpspec.h
@@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
extern u8 apicid_2_node[];
extern int pic_mode;
+#ifdef CONFIG_X86_NUMAQ
+extern int mp_bus_id_to_node[MAX_MP_BUSSES];
+extern int mp_bus_id_to_local[MAX_MP_BUSSES];
+extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
+#endif
+
#define MAX_APICID 256
#else
Index: linux-2.6/arch/x86/kernel/summit_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/summit_32.c
+++ linux-2.6/arch/x86/kernel/summit_32.c
@@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
+#ifndef CONFIG_X86_NUMAQ
static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
+#endif
static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
{
Index: linux-2.6/arch/x86/boot/compressed/misc.c
===================================================================
--- linux-2.6.orig/arch/x86/boot/compressed/misc.c
+++ linux-2.6/arch/x86/boot/compressed/misc.c
@@ -217,10 +217,6 @@ static char *vidmem;
static int vidport;
static int lines, cols;
-#ifdef CONFIG_X86_NUMAQ
-void *xquad_portio;
-#endif
-
#include "../../../../lib/inflate.c"
static void *malloc(int size)
Index: linux-2.6/arch/x86/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/Makefile
+++ linux-2.6/arch/x86/Makefile
@@ -117,29 +117,11 @@ mcore-$(CONFIG_X86_VOYAGER) := arch/x86/
mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws/
-# NUMAQ subarch support
-mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default/
-
-# BIGSMP subarch support
-mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default/
-
-#Summit subarch support
-mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
-mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default/
-
# generic subarchitecture
mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/
-
-# ES7000 subarch support
-mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
-fcore-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
-mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default/
-
# RDC R-321x subarch support
mflags-$(CONFIG_X86_RDC321X) := -Iinclude/asm-x86/mach-rdc321x
mcore-$(CONFIG_X86_RDC321X) := arch/x86/mach-default/
Index: linux-2.6/arch/x86/kernel/acpi/boot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c
+++ linux-2.6/arch/x86/kernel/acpi/boot.c
@@ -858,7 +858,7 @@ static int __init acpi_parse_madt_lapic_
#ifdef CONFIG_X86_IO_APIC
#define MP_ISA_BUS 0
-#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
+#ifdef CONFIG_X86_ES7000
extern int es7000_plat;
#endif
@@ -1007,7 +1007,7 @@ void __init mp_config_acpi_legacy_irqs(v
set_bit(MP_ISA_BUS, mp_bus_not_pci);
Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
-#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
+#ifdef CONFIG_X86_ES7000
/*
* Older generations of ES7000 have no legacy identity mappings
*/
Index: linux-2.6/arch/x86/mach-es7000/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/mach-es7000/Makefile
+++ linux-2.6/arch/x86/mach-es7000/Makefile
@@ -3,4 +3,3 @@
#
obj-$(CONFIG_X86_ES7000) := es7000plat.o
-obj-$(CONFIG_X86_GENERICARCH) := es7000plat.o
Index: linux-2.6/arch/x86/mach-es7000/es7000plat.c
===================================================================
--- linux-2.6.orig/arch/x86/mach-es7000/es7000plat.c
+++ linux-2.6/arch/x86/mach-es7000/es7000plat.c
@@ -177,53 +177,6 @@ find_unisys_acpi_oem_table(unsigned long
}
#endif
-/*
- * This file also gets compiled if CONFIG_X86_GENERICARCH is set. Generic
- * arch already has got following function definitions (asm-generic/es7000.c)
- * hence no need to define these for that case.
- */
-#ifndef CONFIG_X86_GENERICARCH
-void es7000_sw_apic(void);
-void __init enable_apic_mode(void)
-{
- es7000_sw_apic();
- return;
-}
-
-__init int mps_oem_check(struct mp_config_table *mpc, char *oem,
- char *productid)
-{
- if (mpc->mpc_oemptr) {
- struct mp_config_oemtable *oem_table =
- (struct mp_config_oemtable *)mpc->mpc_oemptr;
- if (!strncmp(oem, "UNISYS", 6))
- return parse_unisys_oem((char *)oem_table);
- }
- return 0;
-}
-#ifdef CONFIG_ACPI
-/* Hook from generic ACPI tables.c */
-int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
- unsigned long oem_addr;
- if (!find_unisys_acpi_oem_table(&oem_addr)) {
- if (es7000_check_dsdt())
- return parse_unisys_oem((char *)oem_addr);
- else {
- setup_unisys();
- return 1;
- }
- }
- return 0;
-}
-#else
-int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
- return 0;
-}
-#endif
-#endif /* COFIG_X86_GENERICARCH */
-
static void
es7000_spin(int n)
{
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v5
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
@ 2008-06-09 14:41 ` Andy Whitcroft
2008-06-09 18:00 ` Yinghai Lu
2008-06-10 0:00 ` [PATCH] x86: make generic arch support NUMAQ - fix Yinghai Lu
` (2 subsequent siblings)
3 siblings, 1 reply; 21+ messages in thread
From: Andy Whitcroft @ 2008-06-09 14:41 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, H. Peter Anvin, Andrew Morton, Sam Ravnborg,
Thomas Gleixner, linux-kernel@vger.kernel.org
On Sun, Jun 08, 2008 at 06:31:54PM -0700, Yinghai Lu wrote:
>
> so it could fallback to normal numa.
> NUMAQ depends on GENERICARCH
> also decouple genericarch numa with acpi.
> also make it fallback to bigsmp if apicid > 8.
>
> v3: return early if not found_numaq in pci_numa_init
> remove xquad_portio in misc.c
> v4: make summit, bigsmp and es7000 depend on GENERICARCH too
> v5: seperate apicid check for bigsmp to another patch
> [PATCH] x86: introduce max_physical_apicid for bigsmp switching
Do you have a NUMA-Q to test this on? Also, what is the baseline here
as I would like to test it?
>
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>
> Index: linux-2.6/arch/x86/Kconfig
> ===================================================================
> --- linux-2.6.orig/arch/x86/Kconfig
> +++ linux-2.6/arch/x86/Kconfig
> @@ -264,36 +264,6 @@ config X86_VOYAGER
> If you do not specifically know you have a Voyager based machine,
> say N here, otherwise the kernel you build will not be bootable.
>
> -config X86_NUMAQ
> - bool "NUMAQ (IBM/Sequent)"
> - depends on SMP && X86_32 && PCI
> - select NUMA
> - help
> - This option is used for getting Linux to run on a (IBM/Sequent) NUMA
> - multiquad box. This changes the way that processors are bootstrapped,
> - and uses Clustered Logical APIC addressing mode instead of Flat Logical.
> - You will need a new lynxer.elf file to flash your firmware with - send
> - email to <Martin.Bligh@us.ibm.com>.
> -
> -config X86_SUMMIT
> - bool "Summit/EXA (IBM x440)"
> - depends on X86_32 && SMP
> - help
> - This option is needed for IBM systems that use the Summit/EXA chipset.
> - In particular, it is needed for the x440.
> -
> - If you don't have one of these computers, you should say N here.
> - If you want to build a NUMA kernel, you must select ACPI.
> -
> -config X86_BIGSMP
> - bool "Support for other sub-arch SMP systems with more than 8 CPUs"
> - depends on X86_32 && SMP
> - help
> - This option is needed for the systems that have more than 8 CPUs
> - and if the system is not of any sub-arch type above.
> -
> - If you don't have such a system, you should say N here.
> -
> config X86_VISWS
> bool "SGI 320/540 (Visual Workstation)"
> depends on X86_32 && !PCI
> @@ -307,12 +277,33 @@ config X86_VISWS
> and vice versa. See <file:Documentation/sgi-visws.txt> for details.
>
> config X86_GENERICARCH
> - bool "Generic architecture (Summit, bigsmp, ES7000, default)"
> + bool "Generic architecture"
> depends on X86_32
> help
> - This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
> - It is intended for a generic binary kernel.
> - If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
> + This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
> + subarchitectures. It is intended for a generic binary kernel.
> + if you select them all, kernel will probe it one by one. and will
> + fallback to default.
> +
> +if X86_GENERICARCH
> +
> +config X86_NUMAQ
> + bool "NUMAQ (IBM/Sequent)"
> + depends on SMP && X86_32 && PCI
Can we not just add && X86_GENERICARCH here instead of putting them in
that if ?
> + select NUMA
> + help
> + This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
> + NUMA multiquad box. This changes the way that processors are
> + bootstrapped, and uses Clustered Logical APIC addressing mode instead
> + of Flat Logical. You will need a new lynxer.elf file to flash your
> + firmware with - send email to <Martin.Bligh@us.ibm.com>.
> +
> +config X86_SUMMIT
> + bool "Summit/EXA (IBM x440)"
> + depends on X86_32 && SMP
> + help
> + This option is needed for IBM systems that use the Summit/EXA chipset.
> + In particular, it is needed for the x440.
>
> config X86_ES7000
> bool "Support for Unisys ES7000 IA32 series"
> @@ -320,8 +311,15 @@ config X86_ES7000
> help
> Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
> supposed to run on an IA32-based Unisys ES7000 system.
> - Only choose this option if you have such a system, otherwise you
> - should say N here.
> +
> +config X86_BIGSMP
> + bool "Support for big SMP systems with more than 8 CPUs"
> + depends on X86_32 && SMP
> + help
> + This option is needed for the systems that have more than 8 CPUs
> + and if the system is not of any sub-arch type above.
> +
> +endif
>
> config X86_RDC321X
> bool "RDC R-321x SoC"
> @@ -908,9 +906,9 @@ config X86_PAE
> config NUMA
> bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
> depends on SMP
> - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
> + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
> default n if X86_PC
> - default y if (X86_NUMAQ || X86_SUMMIT)
> + default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
If I am reading this right we are making all genericarch kernels NUMA,
which before they were not. Hmmm is that going to cause problems
elsewhere? Mind you can you get non-numa boxes any more?
If its only NUMAQ which makes that requireemnt it seems wrong to add
GENERICARCH here. ie. its NUMAQ or SUMMIT that brings the requirement.
> help
> Enable NUMA (Non Uniform Memory Access) support.
> The kernel will try to allocate memory used by a CPU on the
> Index: linux-2.6/arch/x86/kernel/io_apic_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
> +++ linux-2.6/arch/x86/kernel/io_apic_32.c
> @@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
> * by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
> */
>
> -#ifndef CONFIG_X86_NUMAQ
> static void __init setup_ioapic_ids_from_mpc(void)
> {
> union IO_APIC_reg_00 reg_00;
> @@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
> unsigned char old_id;
> unsigned long flags;
>
> +#ifdef CONFIG_X86_NUMAQ
> + if (found_numaq)
> + return;
> +#endif
> +
Could this not be always compiled in? As long as found_numaq is never 1
we should be ok.
> /*
> * Don't check I/O APIC IDs for xAPIC systems. They have
> * no meaning without the serial APIC bus.
> @@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
> apic_printk(APIC_VERBOSE, " ok.\n");
> }
> }
> -#else
> -static void __init setup_ioapic_ids_from_mpc(void) { }
> -#endif
>
> int no_timer_check __initdata;
>
> Index: linux-2.6/arch/x86/kernel/mpparse.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/mpparse.c
> +++ linux-2.6/arch/x86/kernel/mpparse.c
> @@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
> }
>
> #ifdef CONFIG_X86_NUMAQ
> +int found_numaq;
> /*
> * Have to match translation table entries to main table entries by counter
> * hence the mpc_record variable .... can't see a less disgusting way of
> * doing this ....
> */
> +struct mpc_config_translation {
> + unsigned char mpc_type;
> + unsigned char trans_len;
> + unsigned char trans_type;
> + unsigned char trans_quad;
> + unsigned char trans_global;
> + unsigned char trans_local;
> + unsigned short trans_reserved;
> +};
> +
>
> static int mpc_record;
> static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
> __cpuinitdata;
> +
> +static inline int generate_logical_apicid(int quad, int phys_apicid)
> +{
> + return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
> +}
> +
> +
> +static inline int mpc_apic_id(struct mpc_config_processor *m,
> + struct mpc_config_translation *translation_record)
> +{
> + int quad = translation_record->trans_quad;
> + int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
> +
> + printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
> + m->mpc_apicid,
> + (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
> + (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
> + m->mpc_apicver, quad, logical_apicid);
> + return logical_apicid;
> +}
> +
> +int mp_bus_id_to_node[MAX_MP_BUSSES];
> +
> +int mp_bus_id_to_local[MAX_MP_BUSSES];
> +
> +static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
> + struct mpc_config_translation *translation)
> +{
> + int quad = translation->trans_quad;
> + int local = translation->trans_local;
> +
> + mp_bus_id_to_node[m->mpc_busid] = quad;
> + mp_bus_id_to_local[m->mpc_busid] = local;
> + printk(KERN_INFO "Bus #%d is %s (node %d)\n",
> + m->mpc_busid, name, quad);
> +}
> +
> +int quad_local_to_mp_bus_id [NR_CPUS/4][4];
> +static void mpc_oem_pci_bus(struct mpc_config_bus *m,
> + struct mpc_config_translation *translation)
> +{
> + int quad = translation->trans_quad;
> + int local = translation->trans_local;
> +
> + quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
> +}
> +
> #endif
>
> static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
> @@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
> }
> }
>
> -static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
> +void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
> char *productid)
> {
> if (strncmp(oem, "IBM NUMA", 8))
> - printk("Warning! May not be a NUMA-Q system!\n");
> + printk("Warning! Not a NUMA-Q system!\n");
> else
> found_numaq = 1;
>
> @@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
> return 0;
>
> #ifdef CONFIG_X86_32
> - mps_oem_check(mpc, oem, str);
> + /*
> + * need to make sure summit and es7000's mps_oem_check is safe to be
> + * called early via genericarch 's mps_oem_check
> + */
> + if (early) {
> +#ifdef CONFIG_X86_NUMAQ
> + numaq_mps_oem_check(mpc, oem, str);
> +#endif
Is there any reason we cannot use:
if (found_numaq)
numaq_mps_oem_check(mpc, oem, str);
Also why is this dependant on 'early'. There doesn't seem to be such
a check in the original path?
> + } else
> + mps_oem_check(mpc, oem, str);
> #endif
>
> /* save the local APIC address, it might be non-default */
> Index: linux-2.6/arch/x86/kernel/numaq_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/numaq_32.c
> +++ linux-2.6/arch/x86/kernel/numaq_32.c
> @@ -36,8 +36,6 @@
>
> #define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
>
> -int found_numaq;
> -
> /*
> * Function: smp_dump_qct()
> *
> @@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
> }
> arch_initcall(numaq_tsc_disable);
>
> -#ifdef CONFIG_ACPI
> -/*
> - * Dummy implementation:
> - */
> -struct pci_bus * __devinit
> -pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
> -{
> - return NULL;
> -}
> -#endif
> Index: linux-2.6/arch/x86/mach-generic/Makefile
> ===================================================================
> --- linux-2.6.orig/arch/x86/mach-generic/Makefile
> +++ linux-2.6/arch/x86/mach-generic/Makefile
> @@ -2,7 +2,11 @@
> # Makefile for the generic architecture
> #
>
> -EXTRA_CFLAGS := -Iarch/x86/kernel
> +EXTRA_CFLAGS := -Iarch/x86/kernel
>
> -obj-y := probe.o summit.o bigsmp.o es7000.o default.o
> -obj-y += ../../x86/mach-es7000/
> +obj-y := probe.o default.o
> +obj-$(CONFIG_X86_NUMAQ) += numaq.o
> +obj-$(CONFIG_X86_SUMMIT) += summit.o
> +obj-$(CONFIG_X86_BIGSMP) += bigsmp.o
> +obj-$(CONFIG_X86_ES7000) += es7000.o
> +obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/
> Index: linux-2.6/arch/x86/mach-generic/probe.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mach-generic/probe.c
> +++ linux-2.6/arch/x86/mach-generic/probe.c
> @@ -16,6 +16,7 @@
> #include <asm/apicdef.h>
> #include <asm/genapic.h>
>
> +extern struct genapic apic_numaq;
> extern struct genapic apic_summit;
> extern struct genapic apic_bigsmp;
> extern struct genapic apic_es7000;
> @@ -24,9 +25,18 @@ extern struct genapic apic_default;
> struct genapic *genapic = &apic_default;
>
> static struct genapic *apic_probe[] __initdata = {
> +#ifdef CONFIG_X86_NUMAQ
> + &apic_numaq,
> +#endif
> +#ifdef CONFIG_X86_SUMMIT
> &apic_summit,
> +#endif
> +#ifdef CONFIG_X86_BIGSMP
> &apic_bigsmp,
> +#endif
> +#ifdef CONFIG_X86_ES7000
> &apic_es7000,
> +#endif
> &apic_default, /* must be last */
> NULL,
> };
> @@ -54,6 +64,7 @@ early_param("apic", parse_apic);
>
> void __init generic_bigsmp_probe(void)
> {
> +#if CONFIG_X86_BIGSMP
> /*
> * This routine is used to switch to bigsmp mode when
> * - There is no apic= option specified by the user
> @@ -67,6 +78,7 @@ void __init generic_bigsmp_probe(void)
> printk(KERN_INFO "Overriding APIC driver with %s\n",
> genapic->name);
> }
> +#endif
> }
>
> void __init generic_apic_probe(void)
> @@ -88,7 +100,8 @@ void __init generic_apic_probe(void)
>
> /* These functions can switch the APIC even after the initial ->probe() */
>
> -int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
> +int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
> + char *productid)
> {
> int i;
> for (i = 0; apic_probe[i]; ++i) {
That looks like an unrelated cleanup?
> Index: linux-2.6/arch/x86/pci/Makefile_32
> ===================================================================
> --- linux-2.6.orig/arch/x86/pci/Makefile_32
> +++ linux-2.6/arch/x86/pci/Makefile_32
> @@ -13,10 +13,11 @@ pci-y := fixup.o
> pci-$(CONFIG_ACPI) += acpi.o
> pci-y += legacy.o irq.o
>
> -# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
> +# Careful: VISWS overrule the pci-y above. The colons are
> # therefor correct. This needs a proper fix by distangling the code.
> pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
> -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
> +
> +pci-$(CONFIG_X86_NUMAQ) += numa.o
>
> # Necessary for NUMAQ as well
> pci-$(CONFIG_NUMA) += mp_bus_to_node.o
> Index: linux-2.6/arch/x86/pci/numa.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/pci/numa.c
> +++ linux-2.6/arch/x86/pci/numa.c
> @@ -6,45 +6,21 @@
> #include <linux/init.h>
> #include <linux/nodemask.h>
> #include <mach_apic.h>
> +#include <asm/mpspec.h>
> #include "pci.h"
>
> #define XQUAD_PORTIO_BASE 0xfe400000
> #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
>
> -int mp_bus_id_to_node[MAX_MP_BUSSES];
> #define BUS2QUAD(global) (mp_bus_id_to_node[global])
>
> -int mp_bus_id_to_local[MAX_MP_BUSSES];
> #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
>
> -void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
> - struct mpc_config_translation *translation)
> -{
> - int quad = translation->trans_quad;
> - int local = translation->trans_local;
> -
> - mp_bus_id_to_node[m->mpc_busid] = quad;
> - mp_bus_id_to_local[m->mpc_busid] = local;
> - printk(KERN_INFO "Bus #%d is %s (node %d)\n",
> - m->mpc_busid, name, quad);
> -}
> -
> -int quad_local_to_mp_bus_id [NR_CPUS/4][4];
> #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
> -void mpc_oem_pci_bus(struct mpc_config_bus *m,
> - struct mpc_config_translation *translation)
> -{
> - int quad = translation->trans_quad;
> - int local = translation->trans_local;
> -
> - quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
> -}
>
> /* Where the IO area was mapped on multiquad, always 0 otherwise */
> void *xquad_portio;
> -#ifdef CONFIG_X86_NUMAQ
> EXPORT_SYMBOL(xquad_portio);
> -#endif
>
> #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
>
> @@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
> {
> int quad;
>
> + if (!found_numaq)
> + return 0;
> +
> raw_pci_ops = &pci_direct_conf1_mq;
>
> if (pcibios_scanned++)
> Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
> +++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
> @@ -1,7 +1,10 @@
> #ifndef _MACH_MPPARSE_H
> #define _MACH_MPPARSE_H 1
>
> -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
> -int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
> +
> +extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
> + char *productid);
> +
> +extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
>
> #endif
> Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
> +++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
> @@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
> #define INT_DELIVERY_MODE dest_LowestPrio
> #define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
>
> -#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
> -#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
> +static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
> +{
> + return physid_isset(apicid, bitmap);
> +}
> +static inline unsigned long check_apicid_present(int bit)
> +{
> + return physid_isset(bit, phys_cpu_present_map);
> +}
> #define apicid_cluster(apicid) (apicid & 0xF0)
>
> static inline int apic_id_registered(void)
> @@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
> return BAD_APICID;
> }
>
> -static inline int generate_logical_apicid(int quad, int phys_apicid)
> -{
> - return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
> -}
> -
> static inline int apicid_to_node(int logical_apicid)
> {
> return logical_apicid >> 4;
> @@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
> return physid_mask_of_physid(cpu + 4*node);
> }
>
> -struct mpc_config_translation {
> - unsigned char mpc_type;
> - unsigned char trans_len;
> - unsigned char trans_type;
> - unsigned char trans_quad;
> - unsigned char trans_global;
> - unsigned char trans_local;
> - unsigned short trans_reserved;
> -};
> -
> -static inline int mpc_apic_id(struct mpc_config_processor *m,
> - struct mpc_config_translation *translation_record)
> -{
> - int quad = translation_record->trans_quad;
> - int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
> -
> - printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
> - m->mpc_apicid,
> - (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
> - (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
> - m->mpc_apicver, quad, logical_apicid);
> - return logical_apicid;
> -}
> -
> extern void *xquad_portio;
>
> static inline void setup_portio_remap(void)
> Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
> +++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
> @@ -1,14 +1,7 @@
> #ifndef __ASM_MACH_MPPARSE_H
> #define __ASM_MACH_MPPARSE_H
>
> -extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
> - struct mpc_config_translation *translation);
> -extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
> - struct mpc_config_translation *translation);
> -
> -/* Hook from generic ACPI tables.c */
> -static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
> -{
> -}
> +extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
> + char *productid);
>
> #endif /* __ASM_MACH_MPPARSE_H */
> Index: linux-2.6/include/asm-x86/mmzone_32.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/mmzone_32.h
> +++ linux-2.6/include/asm-x86/mmzone_32.h
> @@ -12,11 +12,9 @@
> extern struct pglist_data *node_data[];
> #define NODE_DATA(nid) (node_data[nid])
>
> -#ifdef CONFIG_X86_NUMAQ
> - #include <asm/numaq.h>
> -#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
> - #include <asm/srat.h>
> -#endif
> +#include <asm/numaq.h>
> +/* summit or generic arch */
> +#include <asm/srat.h>
>
> extern int get_memcfg_numa_flat(void);
> /*
> @@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
> */
> static inline void get_memcfg_numa(void)
> {
> -#ifdef CONFIG_X86_NUMAQ
> +
> if (get_memcfg_numaq())
> return;
> -#elif defined(CONFIG_ACPI_SRAT)
> if (get_memcfg_from_srat())
> return;
> -#endif
> -
> get_memcfg_numa_flat();
> }
>
> @@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
> #else /* !CONFIG_NUMA */
>
> #define get_memcfg_numa get_memcfg_numa_flat
> -#define get_zholes_size(n) (0)
>
> #endif /* CONFIG_NUMA */
>
> @@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
> __pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
> })
>
> -#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
> -#define pfn_valid(pfn) ((pfn) < num_physpages)
> -#else
> static inline int pfn_valid(int pfn)
> {
> int nid = pfn_to_nid(pfn);
> @@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
> return (pfn < node_end_pfn(nid));
> return 0;
> }
> -#endif /* CONFIG_X86_NUMAQ */
Ok, that is a small change in pfn_valid for numaq, but essentially its a
little less efficient. We can probabally live with that.
> #endif /* CONFIG_DISCONTIGMEM */
>
> Index: linux-2.6/include/asm-x86/numaq.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/numaq.h
> +++ linux-2.6/include/asm-x86/numaq.h
> @@ -157,9 +157,10 @@ struct sys_cfg_data {
> struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
> };
>
> -static inline unsigned long *get_zholes_size(int nid)
> +#else
> +static inline int get_memcfg_numaq(void)
> {
> - return NULL;
> + return 0;
> }
> #endif /* CONFIG_X86_NUMAQ */
> #endif /* NUMAQ_H */
> Index: linux-2.6/include/asm-x86/srat.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/srat.h
> +++ linux-2.6/include/asm-x86/srat.h
> @@ -27,11 +27,13 @@
> #ifndef _ASM_SRAT_H_
> #define _ASM_SRAT_H_
>
> -#ifndef CONFIG_ACPI_SRAT
> -#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
> -#endif
> -
> +#ifdef CONFIG_ACPI_SRAT
> extern int get_memcfg_from_srat(void);
> -extern unsigned long *get_zholes_size(int);
> +#else
> +static inline int get_memcfg_from_srat(void)
> +{
> + return 0;
> +}
> +#endif
>
> #endif /* _ASM_SRAT_H_ */
> Index: linux-2.6/arch/x86/mach-generic/numaq.c
> ===================================================================
> --- /dev/null
> +++ linux-2.6/arch/x86/mach-generic/numaq.c
> @@ -0,0 +1,41 @@
> +/*
> + * APIC driver for the IBM NUMAQ chipset.
> + */
> +#define APIC_DEFINITION 1
> +#include <linux/threads.h>
> +#include <linux/cpumask.h>
> +#include <linux/smp.h>
> +#include <asm/mpspec.h>
> +#include <asm/genapic.h>
> +#include <asm/fixmap.h>
> +#include <asm/apicdef.h>
> +#include <linux/kernel.h>
> +#include <linux/string.h>
> +#include <linux/init.h>
> +#include <asm/mach-numaq/mach_apic.h>
> +#include <asm/mach-numaq/mach_apicdef.h>
> +#include <asm/mach-numaq/mach_ipi.h>
> +#include <asm/mach-numaq/mach_mpparse.h>
> +#include <asm/mach-numaq/mach_wakecpu.h>
> +#include <asm/numaq.h>
> +
> +static int mps_oem_check(struct mp_config_table *mpc, char *oem,
> + char *productid)
> +{
> + numaq_mps_oem_check(mpc, oem, productid);
> + return found_numaq;
> +}
> +
> +static int probe_numaq(void)
> +{
> + /* already know from get_memcfg_numaq() */
> + return found_numaq;
> +}
> +
> +/* Hook from generic ACPI tables.c */
> +static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
> +{
> + return 0;
> +}
> +
> +struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
> Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
> +++ linux-2.6/arch/x86/mach-generic/bigsmp.c
> @@ -23,10 +23,8 @@ static int dmi_bigsmp; /* can be set by
>
> static int hp_ht_bigsmp(const struct dmi_system_id *d)
> {
> -#ifdef CONFIG_X86_GENERICARCH
> printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
> dmi_bigsmp = 1;
> -#endif
> return 0;
> }
>
> Index: linux-2.6/drivers/acpi/Kconfig
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/Kconfig
> +++ linux-2.6/drivers/acpi/Kconfig
> @@ -4,7 +4,6 @@
>
> menuconfig ACPI
> bool "ACPI (Advanced Configuration and Power Interface) Support"
> - depends on !X86_NUMAQ
> depends on !X86_VISWS
> depends on !IA64_HP_SIM
> depends on IA64 || X86
> Index: linux-2.6/include/asm-x86/mpspec.h
> ===================================================================
> --- linux-2.6.orig/include/asm-x86/mpspec.h
> +++ linux-2.6/include/asm-x86/mpspec.h
> @@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
> extern u8 apicid_2_node[];
> extern int pic_mode;
>
> +#ifdef CONFIG_X86_NUMAQ
> +extern int mp_bus_id_to_node[MAX_MP_BUSSES];
> +extern int mp_bus_id_to_local[MAX_MP_BUSSES];
> +extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
> +#endif
> +
> #define MAX_APICID 256
>
> #else
> Index: linux-2.6/arch/x86/kernel/summit_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/summit_32.c
> +++ linux-2.6/arch/x86/kernel/summit_32.c
> @@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
> static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
> static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
>
> +#ifndef CONFIG_X86_NUMAQ
> static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
> +#endif
>
> static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
> {
> Index: linux-2.6/arch/x86/boot/compressed/misc.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/boot/compressed/misc.c
> +++ linux-2.6/arch/x86/boot/compressed/misc.c
> @@ -217,10 +217,6 @@ static char *vidmem;
> static int vidport;
> static int lines, cols;
>
> -#ifdef CONFIG_X86_NUMAQ
> -void *xquad_portio;
> -#endif
> -
> #include "../../../../lib/inflate.c"
>
> static void *malloc(int size)
> Index: linux-2.6/arch/x86/Makefile
> ===================================================================
> --- linux-2.6.orig/arch/x86/Makefile
> +++ linux-2.6/arch/x86/Makefile
> @@ -117,29 +117,11 @@ mcore-$(CONFIG_X86_VOYAGER) := arch/x86/
> mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
> mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws/
>
> -# NUMAQ subarch support
> -mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
> -mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default/
> -
> -# BIGSMP subarch support
> -mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
> -mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default/
> -
> -#Summit subarch support
> -mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
> -mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default/
> -
> # generic subarchitecture
> mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
> fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
> mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/
>
> -
> -# ES7000 subarch support
> -mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
> -fcore-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
> -mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default/
> -
> # RDC R-321x subarch support
> mflags-$(CONFIG_X86_RDC321X) := -Iinclude/asm-x86/mach-rdc321x
> mcore-$(CONFIG_X86_RDC321X) := arch/x86/mach-default/
> Index: linux-2.6/arch/x86/kernel/acpi/boot.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/acpi/boot.c
> +++ linux-2.6/arch/x86/kernel/acpi/boot.c
> @@ -858,7 +858,7 @@ static int __init acpi_parse_madt_lapic_
> #ifdef CONFIG_X86_IO_APIC
> #define MP_ISA_BUS 0
>
> -#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
> +#ifdef CONFIG_X86_ES7000
> extern int es7000_plat;
> #endif
>
> @@ -1007,7 +1007,7 @@ void __init mp_config_acpi_legacy_irqs(v
> set_bit(MP_ISA_BUS, mp_bus_not_pci);
> Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
>
> -#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
> +#ifdef CONFIG_X86_ES7000
> /*
> * Older generations of ES7000 have no legacy identity mappings
> */
> Index: linux-2.6/arch/x86/mach-es7000/Makefile
> ===================================================================
> --- linux-2.6.orig/arch/x86/mach-es7000/Makefile
> +++ linux-2.6/arch/x86/mach-es7000/Makefile
> @@ -3,4 +3,3 @@
> #
>
> obj-$(CONFIG_X86_ES7000) := es7000plat.o
> -obj-$(CONFIG_X86_GENERICARCH) := es7000plat.o
> Index: linux-2.6/arch/x86/mach-es7000/es7000plat.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mach-es7000/es7000plat.c
> +++ linux-2.6/arch/x86/mach-es7000/es7000plat.c
> @@ -177,53 +177,6 @@ find_unisys_acpi_oem_table(unsigned long
> }
> #endif
>
> -/*
> - * This file also gets compiled if CONFIG_X86_GENERICARCH is set. Generic
> - * arch already has got following function definitions (asm-generic/es7000.c)
> - * hence no need to define these for that case.
> - */
> -#ifndef CONFIG_X86_GENERICARCH
> -void es7000_sw_apic(void);
> -void __init enable_apic_mode(void)
> -{
> - es7000_sw_apic();
> - return;
> -}
> -
> -__init int mps_oem_check(struct mp_config_table *mpc, char *oem,
> - char *productid)
> -{
> - if (mpc->mpc_oemptr) {
> - struct mp_config_oemtable *oem_table =
> - (struct mp_config_oemtable *)mpc->mpc_oemptr;
> - if (!strncmp(oem, "UNISYS", 6))
> - return parse_unisys_oem((char *)oem_table);
> - }
> - return 0;
> -}
> -#ifdef CONFIG_ACPI
> -/* Hook from generic ACPI tables.c */
> -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
> -{
> - unsigned long oem_addr;
> - if (!find_unisys_acpi_oem_table(&oem_addr)) {
> - if (es7000_check_dsdt())
> - return parse_unisys_oem((char *)oem_addr);
> - else {
> - setup_unisys();
> - return 1;
> - }
> - }
> - return 0;
> -}
> -#else
> -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
> -{
> - return 0;
> -}
> -#endif
> -#endif /* COFIG_X86_GENERICARCH */
> -
> static void
> es7000_spin(int n)
> {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
On the face of it the idea seems sound. The NUMAQ changes look ok on a
quick scan. I will need to see this applied and tested to be sure its
really sane.
-apw
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v5
2008-06-09 14:41 ` Andy Whitcroft
@ 2008-06-09 18:00 ` Yinghai Lu
0 siblings, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-09 18:00 UTC (permalink / raw)
To: Andy Whitcroft
Cc: Ingo Molnar, H. Peter Anvin, Andrew Morton, Sam Ravnborg,
Thomas Gleixner, linux-kernel@vger.kernel.org
On Mon, Jun 9, 2008 at 7:41 AM, Andy Whitcroft <apw@shadowen.org> wrote:
> On Sun, Jun 08, 2008 at 06:31:54PM -0700, Yinghai Lu wrote:
>>
>> so it could fallback to normal numa.
>> NUMAQ depends on GENERICARCH
>> also decouple genericarch numa with acpi.
>> also make it fallback to bigsmp if apicid > 8.
>>
>> v3: return early if not found_numaq in pci_numa_init
>> remove xquad_portio in misc.c
>> v4: make summit, bigsmp and es7000 depend on GENERICARCH too
>> v5: seperate apicid check for bigsmp to another patch
>> [PATCH] x86: introduce max_physical_apicid for bigsmp switching
>
> Do you have a NUMA-Q to test this on? Also, what is the baseline here
> as I would like to test it?
>
>>
>> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>>
>> Index: linux-2.6/arch/x86/Kconfig
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/Kconfig
>> +++ linux-2.6/arch/x86/Kconfig
>> @@ -264,36 +264,6 @@ config X86_VOYAGER
>> If you do not specifically know you have a Voyager based machine,
>> say N here, otherwise the kernel you build will not be bootable.
>>
>> -config X86_NUMAQ
>> - bool "NUMAQ (IBM/Sequent)"
>> - depends on SMP && X86_32 && PCI
>> - select NUMA
>> - help
>> - This option is used for getting Linux to run on a (IBM/Sequent) NUMA
>> - multiquad box. This changes the way that processors are bootstrapped,
>> - and uses Clustered Logical APIC addressing mode instead of Flat Logical.
>> - You will need a new lynxer.elf file to flash your firmware with - send
>> - email to <Martin.Bligh@us.ibm.com>.
>> -
>> -config X86_SUMMIT
>> - bool "Summit/EXA (IBM x440)"
>> - depends on X86_32 && SMP
>> - help
>> - This option is needed for IBM systems that use the Summit/EXA chipset.
>> - In particular, it is needed for the x440.
>> -
>> - If you don't have one of these computers, you should say N here.
>> - If you want to build a NUMA kernel, you must select ACPI.
>> -
>> -config X86_BIGSMP
>> - bool "Support for other sub-arch SMP systems with more than 8 CPUs"
>> - depends on X86_32 && SMP
>> - help
>> - This option is needed for the systems that have more than 8 CPUs
>> - and if the system is not of any sub-arch type above.
>> -
>> - If you don't have such a system, you should say N here.
>> -
>> config X86_VISWS
>> bool "SGI 320/540 (Visual Workstation)"
>> depends on X86_32 && !PCI
>> @@ -307,12 +277,33 @@ config X86_VISWS
>> and vice versa. See <file:Documentation/sgi-visws.txt> for details.
>>
>> config X86_GENERICARCH
>> - bool "Generic architecture (Summit, bigsmp, ES7000, default)"
>> + bool "Generic architecture"
>> depends on X86_32
>> help
>> - This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
>> - It is intended for a generic binary kernel.
>> - If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
>> + This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
>> + subarchitectures. It is intended for a generic binary kernel.
>> + if you select them all, kernel will probe it one by one. and will
>> + fallback to default.
>> +
>> +if X86_GENERICARCH
>> +
>> +config X86_NUMAQ
>> + bool "NUMAQ (IBM/Sequent)"
>> + depends on SMP && X86_32 && PCI
>
> Can we not just add && X86_GENERICARCH here instead of putting them in
> that if ?
>
>> + select NUMA
>> + help
>> + This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
>> + NUMA multiquad box. This changes the way that processors are
>> + bootstrapped, and uses Clustered Logical APIC addressing mode instead
>> + of Flat Logical. You will need a new lynxer.elf file to flash your
>> + firmware with - send email to <Martin.Bligh@us.ibm.com>.
>> +
>> +config X86_SUMMIT
>> + bool "Summit/EXA (IBM x440)"
>> + depends on X86_32 && SMP
>> + help
>> + This option is needed for IBM systems that use the Summit/EXA chipset.
>> + In particular, it is needed for the x440.
>>
>> config X86_ES7000
>> bool "Support for Unisys ES7000 IA32 series"
>> @@ -320,8 +311,15 @@ config X86_ES7000
>> help
>> Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
>> supposed to run on an IA32-based Unisys ES7000 system.
>> - Only choose this option if you have such a system, otherwise you
>> - should say N here.
>> +
>> +config X86_BIGSMP
>> + bool "Support for big SMP systems with more than 8 CPUs"
>> + depends on X86_32 && SMP
>> + help
>> + This option is needed for the systems that have more than 8 CPUs
>> + and if the system is not of any sub-arch type above.
>> +
>> +endif
>>
>> config X86_RDC321X
>> bool "RDC R-321x SoC"
>> @@ -908,9 +906,9 @@ config X86_PAE
>> config NUMA
>> bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
>> depends on SMP
>> - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
>> + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
>> default n if X86_PC
>> - default y if (X86_NUMAQ || X86_SUMMIT)
>> + default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
>
> If I am reading this right we are making all genericarch kernels NUMA,
> which before they were not. Hmmm is that going to cause problems
> elsewhere? Mind you can you get non-numa boxes any more?
yes, you still can select genericarch without numa
>
> If its only NUMAQ which makes that requireemnt it seems wrong to add
> GENERICARCH here. ie. its NUMAQ or SUMMIT that brings the requirement.
>
>> help
>> Enable NUMA (Non Uniform Memory Access) support.
>> The kernel will try to allocate memory used by a CPU on the
>> Index: linux-2.6/arch/x86/kernel/io_apic_32.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/io_apic_32.c
>> +++ linux-2.6/arch/x86/kernel/io_apic_32.c
>> @@ -1715,7 +1715,6 @@ void disable_IO_APIC(void)
>> * by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
>> */
>>
>> -#ifndef CONFIG_X86_NUMAQ
>> static void __init setup_ioapic_ids_from_mpc(void)
>> {
>> union IO_APIC_reg_00 reg_00;
>> @@ -1725,6 +1724,11 @@ static void __init setup_ioapic_ids_from
>> unsigned char old_id;
>> unsigned long flags;
>>
>> +#ifdef CONFIG_X86_NUMAQ
>> + if (found_numaq)
>> + return;
>> +#endif
>> +
>
> Could this not be always compiled in? As long as found_numaq is never 1
> we should be ok.
wonder if someone don't want to have extra code for numaq check compiled in?
>
>> /*
>> * Don't check I/O APIC IDs for xAPIC systems. They have
>> * no meaning without the serial APIC bus.
>> @@ -1821,9 +1825,6 @@ static void __init setup_ioapic_ids_from
>> apic_printk(APIC_VERBOSE, " ok.\n");
>> }
>> }
>> -#else
>> -static void __init setup_ioapic_ids_from_mpc(void) { }
>> -#endif
>>
>> int no_timer_check __initdata;
>>
>> Index: linux-2.6/arch/x86/kernel/mpparse.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/mpparse.c
>> +++ linux-2.6/arch/x86/kernel/mpparse.c
>> @@ -49,15 +49,73 @@ static int __init mpf_checksum(unsigned
>> }
>>
>> #ifdef CONFIG_X86_NUMAQ
>> +int found_numaq;
>> /*
>> * Have to match translation table entries to main table entries by counter
>> * hence the mpc_record variable .... can't see a less disgusting way of
>> * doing this ....
>> */
>> +struct mpc_config_translation {
>> + unsigned char mpc_type;
>> + unsigned char trans_len;
>> + unsigned char trans_type;
>> + unsigned char trans_quad;
>> + unsigned char trans_global;
>> + unsigned char trans_local;
>> + unsigned short trans_reserved;
>> +};
>> +
>>
>> static int mpc_record;
>> static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]
>> __cpuinitdata;
>> +
>> +static inline int generate_logical_apicid(int quad, int phys_apicid)
>> +{
>> + return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
>> +}
>> +
>> +
>> +static inline int mpc_apic_id(struct mpc_config_processor *m,
>> + struct mpc_config_translation *translation_record)
>> +{
>> + int quad = translation_record->trans_quad;
>> + int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
>> +
>> + printk(KERN_DEBUG "Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
>> + m->mpc_apicid,
>> + (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
>> + (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
>> + m->mpc_apicver, quad, logical_apicid);
>> + return logical_apicid;
>> +}
>> +
>> +int mp_bus_id_to_node[MAX_MP_BUSSES];
>> +
>> +int mp_bus_id_to_local[MAX_MP_BUSSES];
>> +
>> +static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
>> + struct mpc_config_translation *translation)
>> +{
>> + int quad = translation->trans_quad;
>> + int local = translation->trans_local;
>> +
>> + mp_bus_id_to_node[m->mpc_busid] = quad;
>> + mp_bus_id_to_local[m->mpc_busid] = local;
>> + printk(KERN_INFO "Bus #%d is %s (node %d)\n",
>> + m->mpc_busid, name, quad);
>> +}
>> +
>> +int quad_local_to_mp_bus_id [NR_CPUS/4][4];
>> +static void mpc_oem_pci_bus(struct mpc_config_bus *m,
>> + struct mpc_config_translation *translation)
>> +{
>> + int quad = translation->trans_quad;
>> + int local = translation->trans_local;
>> +
>> + quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
>> +}
>> +
>> #endif
>>
>> static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
>> @@ -321,11 +382,11 @@ static void __init smp_read_mpc_oem(stru
>> }
>> }
>>
>> -static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
>> +void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
>> char *productid)
>> {
>> if (strncmp(oem, "IBM NUMA", 8))
>> - printk("Warning! May not be a NUMA-Q system!\n");
>> + printk("Warning! Not a NUMA-Q system!\n");
>> else
>> found_numaq = 1;
>>
>> @@ -388,7 +449,16 @@ static int __init smp_read_mpc(struct mp
>> return 0;
>>
>> #ifdef CONFIG_X86_32
>> - mps_oem_check(mpc, oem, str);
>> + /*
>> + * need to make sure summit and es7000's mps_oem_check is safe to be
>> + * called early via genericarch 's mps_oem_check
>> + */
>> + if (early) {
>> +#ifdef CONFIG_X86_NUMAQ
>> + numaq_mps_oem_check(mpc, oem, str);
>> +#endif
>
> Is there any reason we cannot use:
>
> if (found_numaq)
> numaq_mps_oem_check(mpc, oem, str);
>
> Also why is this dependant on 'early'. There doesn't seem to be such
> a check in the original path?
because I wonder if extra early calling for mps_oem_check is safe for
summit, es7000.
>
>
>> + } else
>> + mps_oem_check(mpc, oem, str);
>> #endif
>>
>> /* save the local APIC address, it might be non-default */
>> Index: linux-2.6/arch/x86/kernel/numaq_32.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/numaq_32.c
>> +++ linux-2.6/arch/x86/kernel/numaq_32.c
>> @@ -36,8 +36,6 @@
>>
>> #define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
>>
>> -int found_numaq;
>> -
>> /*
>> * Function: smp_dump_qct()
>> *
>> @@ -105,13 +103,3 @@ static int __init numaq_tsc_disable(void
>> }
>> arch_initcall(numaq_tsc_disable);
>>
>> -#ifdef CONFIG_ACPI
>> -/*
>> - * Dummy implementation:
>> - */
>> -struct pci_bus * __devinit
>> -pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
>> -{
>> - return NULL;
>> -}
>> -#endif
>> Index: linux-2.6/arch/x86/mach-generic/Makefile
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/mach-generic/Makefile
>> +++ linux-2.6/arch/x86/mach-generic/Makefile
>> @@ -2,7 +2,11 @@
>> # Makefile for the generic architecture
>> #
>>
>> -EXTRA_CFLAGS := -Iarch/x86/kernel
>> +EXTRA_CFLAGS := -Iarch/x86/kernel
>>
>> -obj-y := probe.o summit.o bigsmp.o es7000.o default.o
>> -obj-y += ../../x86/mach-es7000/
>> +obj-y := probe.o default.o
>> +obj-$(CONFIG_X86_NUMAQ) += numaq.o
>> +obj-$(CONFIG_X86_SUMMIT) += summit.o
>> +obj-$(CONFIG_X86_BIGSMP) += bigsmp.o
>> +obj-$(CONFIG_X86_ES7000) += es7000.o
>> +obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/
>> Index: linux-2.6/arch/x86/mach-generic/probe.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/mach-generic/probe.c
>> +++ linux-2.6/arch/x86/mach-generic/probe.c
>> @@ -16,6 +16,7 @@
>> #include <asm/apicdef.h>
>> #include <asm/genapic.h>
>>
>> +extern struct genapic apic_numaq;
>> extern struct genapic apic_summit;
>> extern struct genapic apic_bigsmp;
>> extern struct genapic apic_es7000;
>> @@ -24,9 +25,18 @@ extern struct genapic apic_default;
>> struct genapic *genapic = &apic_default;
>>
>> static struct genapic *apic_probe[] __initdata = {
>> +#ifdef CONFIG_X86_NUMAQ
>> + &apic_numaq,
>> +#endif
>> +#ifdef CONFIG_X86_SUMMIT
>> &apic_summit,
>> +#endif
>> +#ifdef CONFIG_X86_BIGSMP
>> &apic_bigsmp,
>> +#endif
>> +#ifdef CONFIG_X86_ES7000
>> &apic_es7000,
>> +#endif
>> &apic_default, /* must be last */
>> NULL,
>> };
>> @@ -54,6 +64,7 @@ early_param("apic", parse_apic);
>>
>> void __init generic_bigsmp_probe(void)
>> {
>> +#if CONFIG_X86_BIGSMP
>> /*
>> * This routine is used to switch to bigsmp mode when
>> * - There is no apic= option specified by the user
>> @@ -67,6 +78,7 @@ void __init generic_bigsmp_probe(void)
>> printk(KERN_INFO "Overriding APIC driver with %s\n",
>> genapic->name);
>> }
>> +#endif
>> }
>>
>> void __init generic_apic_probe(void)
>> @@ -88,7 +100,8 @@ void __init generic_apic_probe(void)
>>
>> /* These functions can switch the APIC even after the initial ->probe() */
>>
>> -int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
>> +int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
>> + char *productid)
>> {
>> int i;
>> for (i = 0; apic_probe[i]; ++i) {
>
> That looks like an unrelated cleanup?
yeah.
>
>> Index: linux-2.6/arch/x86/pci/Makefile_32
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/pci/Makefile_32
>> +++ linux-2.6/arch/x86/pci/Makefile_32
>> @@ -13,10 +13,11 @@ pci-y := fixup.o
>> pci-$(CONFIG_ACPI) += acpi.o
>> pci-y += legacy.o irq.o
>>
>> -# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
>> +# Careful: VISWS overrule the pci-y above. The colons are
>> # therefor correct. This needs a proper fix by distangling the code.
>> pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
>> -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
>> +
>> +pci-$(CONFIG_X86_NUMAQ) += numa.o
>>
>> # Necessary for NUMAQ as well
>> pci-$(CONFIG_NUMA) += mp_bus_to_node.o
>> Index: linux-2.6/arch/x86/pci/numa.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/pci/numa.c
>> +++ linux-2.6/arch/x86/pci/numa.c
>> @@ -6,45 +6,21 @@
>> #include <linux/init.h>
>> #include <linux/nodemask.h>
>> #include <mach_apic.h>
>> +#include <asm/mpspec.h>
>> #include "pci.h"
>>
>> #define XQUAD_PORTIO_BASE 0xfe400000
>> #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
>>
>> -int mp_bus_id_to_node[MAX_MP_BUSSES];
>> #define BUS2QUAD(global) (mp_bus_id_to_node[global])
>>
>> -int mp_bus_id_to_local[MAX_MP_BUSSES];
>> #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
>>
>> -void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
>> - struct mpc_config_translation *translation)
>> -{
>> - int quad = translation->trans_quad;
>> - int local = translation->trans_local;
>> -
>> - mp_bus_id_to_node[m->mpc_busid] = quad;
>> - mp_bus_id_to_local[m->mpc_busid] = local;
>> - printk(KERN_INFO "Bus #%d is %s (node %d)\n",
>> - m->mpc_busid, name, quad);
>> -}
>> -
>> -int quad_local_to_mp_bus_id [NR_CPUS/4][4];
>> #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
>> -void mpc_oem_pci_bus(struct mpc_config_bus *m,
>> - struct mpc_config_translation *translation)
>> -{
>> - int quad = translation->trans_quad;
>> - int local = translation->trans_local;
>> -
>> - quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
>> -}
>>
>> /* Where the IO area was mapped on multiquad, always 0 otherwise */
>> void *xquad_portio;
>> -#ifdef CONFIG_X86_NUMAQ
>> EXPORT_SYMBOL(xquad_portio);
>> -#endif
>>
>> #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
>>
>> @@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
>> {
>> int quad;
>>
>> + if (!found_numaq)
>> + return 0;
>> +
>> raw_pci_ops = &pci_direct_conf1_mq;
>>
>> if (pcibios_scanned++)
>> Index: linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/mach-generic/mach_mpparse.h
>> +++ linux-2.6/include/asm-x86/mach-generic/mach_mpparse.h
>> @@ -1,7 +1,10 @@
>> #ifndef _MACH_MPPARSE_H
>> #define _MACH_MPPARSE_H 1
>>
>> -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
>> -int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
>> +
>> +extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
>> + char *productid);
>> +
>> +extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
>>
>> #endif
>> Index: linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/mach-numaq/mach_apic.h
>> +++ linux-2.6/include/asm-x86/mach-numaq/mach_apic.h
>> @@ -20,8 +20,14 @@ static inline cpumask_t target_cpus(void
>> #define INT_DELIVERY_MODE dest_LowestPrio
>> #define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
>>
>> -#define check_apicid_used(bitmap, apicid) physid_isset(apicid, bitmap)
>> -#define check_apicid_present(bit) physid_isset(bit, phys_cpu_present_map)
>> +static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
>> +{
>> + return physid_isset(apicid, bitmap);
>> +}
>> +static inline unsigned long check_apicid_present(int bit)
>> +{
>> + return physid_isset(bit, phys_cpu_present_map);
>> +}
>> #define apicid_cluster(apicid) (apicid & 0xF0)
>>
>> static inline int apic_id_registered(void)
>> @@ -77,11 +83,6 @@ static inline int cpu_present_to_apicid(
>> return BAD_APICID;
>> }
>>
>> -static inline int generate_logical_apicid(int quad, int phys_apicid)
>> -{
>> - return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);
>> -}
>> -
>> static inline int apicid_to_node(int logical_apicid)
>> {
>> return logical_apicid >> 4;
>> @@ -95,30 +96,6 @@ static inline physid_mask_t apicid_to_cp
>> return physid_mask_of_physid(cpu + 4*node);
>> }
>>
>> -struct mpc_config_translation {
>> - unsigned char mpc_type;
>> - unsigned char trans_len;
>> - unsigned char trans_type;
>> - unsigned char trans_quad;
>> - unsigned char trans_global;
>> - unsigned char trans_local;
>> - unsigned short trans_reserved;
>> -};
>> -
>> -static inline int mpc_apic_id(struct mpc_config_processor *m,
>> - struct mpc_config_translation *translation_record)
>> -{
>> - int quad = translation_record->trans_quad;
>> - int logical_apicid = generate_logical_apicid(quad, m->mpc_apicid);
>> -
>> - printk("Processor #%d %u:%u APIC version %d (quad %d, apic %d)\n",
>> - m->mpc_apicid,
>> - (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
>> - (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
>> - m->mpc_apicver, quad, logical_apicid);
>> - return logical_apicid;
>> -}
>> -
>> extern void *xquad_portio;
>>
>> static inline void setup_portio_remap(void)
>> Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/mach-numaq/mach_mpparse.h
>> +++ linux-2.6/include/asm-x86/mach-numaq/mach_mpparse.h
>> @@ -1,14 +1,7 @@
>> #ifndef __ASM_MACH_MPPARSE_H
>> #define __ASM_MACH_MPPARSE_H
>>
>> -extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
>> - struct mpc_config_translation *translation);
>> -extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
>> - struct mpc_config_translation *translation);
>> -
>> -/* Hook from generic ACPI tables.c */
>> -static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
>> -{
>> -}
>> +extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
>> + char *productid);
>>
>> #endif /* __ASM_MACH_MPPARSE_H */
>> Index: linux-2.6/include/asm-x86/mmzone_32.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/mmzone_32.h
>> +++ linux-2.6/include/asm-x86/mmzone_32.h
>> @@ -12,11 +12,9 @@
>> extern struct pglist_data *node_data[];
>> #define NODE_DATA(nid) (node_data[nid])
>>
>> -#ifdef CONFIG_X86_NUMAQ
>> - #include <asm/numaq.h>
>> -#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
>> - #include <asm/srat.h>
>> -#endif
>> +#include <asm/numaq.h>
>> +/* summit or generic arch */
>> +#include <asm/srat.h>
>>
>> extern int get_memcfg_numa_flat(void);
>> /*
>> @@ -26,14 +24,11 @@ extern int get_memcfg_numa_flat(void);
>> */
>> static inline void get_memcfg_numa(void)
>> {
>> -#ifdef CONFIG_X86_NUMAQ
>> +
>> if (get_memcfg_numaq())
>> return;
>> -#elif defined(CONFIG_ACPI_SRAT)
>> if (get_memcfg_from_srat())
>> return;
>> -#endif
>> -
>> get_memcfg_numa_flat();
>> }
>>
>> @@ -42,7 +37,6 @@ extern int early_pfn_to_nid(unsigned lon
>> #else /* !CONFIG_NUMA */
>>
>> #define get_memcfg_numa get_memcfg_numa_flat
>> -#define get_zholes_size(n) (0)
>>
>> #endif /* CONFIG_NUMA */
>>
>> @@ -83,9 +77,6 @@ static inline int pfn_to_nid(unsigned lo
>> __pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
>> })
>>
>> -#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
>> -#define pfn_valid(pfn) ((pfn) < num_physpages)
>> -#else
>> static inline int pfn_valid(int pfn)
>> {
>> int nid = pfn_to_nid(pfn);
>> @@ -94,7 +85,6 @@ static inline int pfn_valid(int pfn)
>> return (pfn < node_end_pfn(nid));
>> return 0;
>> }
>> -#endif /* CONFIG_X86_NUMAQ */
>
> Ok, that is a small change in pfn_valid for numaq, but essentially its a
> little less efficient. We can probabally live with that.
>
>> #endif /* CONFIG_DISCONTIGMEM */
>>
>> Index: linux-2.6/include/asm-x86/numaq.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/numaq.h
>> +++ linux-2.6/include/asm-x86/numaq.h
>> @@ -157,9 +157,10 @@ struct sys_cfg_data {
>> struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
>> };
>>
>> -static inline unsigned long *get_zholes_size(int nid)
>> +#else
>> +static inline int get_memcfg_numaq(void)
>> {
>> - return NULL;
>> + return 0;
>> }
>> #endif /* CONFIG_X86_NUMAQ */
>> #endif /* NUMAQ_H */
>> Index: linux-2.6/include/asm-x86/srat.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/srat.h
>> +++ linux-2.6/include/asm-x86/srat.h
>> @@ -27,11 +27,13 @@
>> #ifndef _ASM_SRAT_H_
>> #define _ASM_SRAT_H_
>>
>> -#ifndef CONFIG_ACPI_SRAT
>> -#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
>> -#endif
>> -
>> +#ifdef CONFIG_ACPI_SRAT
>> extern int get_memcfg_from_srat(void);
>> -extern unsigned long *get_zholes_size(int);
>> +#else
>> +static inline int get_memcfg_from_srat(void)
>> +{
>> + return 0;
>> +}
>> +#endif
>>
>> #endif /* _ASM_SRAT_H_ */
>> Index: linux-2.6/arch/x86/mach-generic/numaq.c
>> ===================================================================
>> --- /dev/null
>> +++ linux-2.6/arch/x86/mach-generic/numaq.c
>> @@ -0,0 +1,41 @@
>> +/*
>> + * APIC driver for the IBM NUMAQ chipset.
>> + */
>> +#define APIC_DEFINITION 1
>> +#include <linux/threads.h>
>> +#include <linux/cpumask.h>
>> +#include <linux/smp.h>
>> +#include <asm/mpspec.h>
>> +#include <asm/genapic.h>
>> +#include <asm/fixmap.h>
>> +#include <asm/apicdef.h>
>> +#include <linux/kernel.h>
>> +#include <linux/string.h>
>> +#include <linux/init.h>
>> +#include <asm/mach-numaq/mach_apic.h>
>> +#include <asm/mach-numaq/mach_apicdef.h>
>> +#include <asm/mach-numaq/mach_ipi.h>
>> +#include <asm/mach-numaq/mach_mpparse.h>
>> +#include <asm/mach-numaq/mach_wakecpu.h>
>> +#include <asm/numaq.h>
>> +
>> +static int mps_oem_check(struct mp_config_table *mpc, char *oem,
>> + char *productid)
>> +{
>> + numaq_mps_oem_check(mpc, oem, productid);
>> + return found_numaq;
>> +}
>> +
>> +static int probe_numaq(void)
>> +{
>> + /* already know from get_memcfg_numaq() */
>> + return found_numaq;
>> +}
>> +
>> +/* Hook from generic ACPI tables.c */
>> +static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
>> +{
>> + return 0;
>> +}
>> +
>> +struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
>> Index: linux-2.6/arch/x86/mach-generic/bigsmp.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c
>> +++ linux-2.6/arch/x86/mach-generic/bigsmp.c
>> @@ -23,10 +23,8 @@ static int dmi_bigsmp; /* can be set by
>>
>> static int hp_ht_bigsmp(const struct dmi_system_id *d)
>> {
>> -#ifdef CONFIG_X86_GENERICARCH
>> printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
>> dmi_bigsmp = 1;
>> -#endif
>> return 0;
>> }
>>
>> Index: linux-2.6/drivers/acpi/Kconfig
>> ===================================================================
>> --- linux-2.6.orig/drivers/acpi/Kconfig
>> +++ linux-2.6/drivers/acpi/Kconfig
>> @@ -4,7 +4,6 @@
>>
>> menuconfig ACPI
>> bool "ACPI (Advanced Configuration and Power Interface) Support"
>> - depends on !X86_NUMAQ
>> depends on !X86_VISWS
>> depends on !IA64_HP_SIM
>> depends on IA64 || X86
>> Index: linux-2.6/include/asm-x86/mpspec.h
>> ===================================================================
>> --- linux-2.6.orig/include/asm-x86/mpspec.h
>> +++ linux-2.6/include/asm-x86/mpspec.h
>> @@ -13,6 +13,12 @@ extern int apic_version[MAX_APICS];
>> extern u8 apicid_2_node[];
>> extern int pic_mode;
>>
>> +#ifdef CONFIG_X86_NUMAQ
>> +extern int mp_bus_id_to_node[MAX_MP_BUSSES];
>> +extern int mp_bus_id_to_local[MAX_MP_BUSSES];
>> +extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
>> +#endif
>> +
>> #define MAX_APICID 256
>>
>> #else
>> Index: linux-2.6/arch/x86/kernel/summit_32.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/summit_32.c
>> +++ linux-2.6/arch/x86/kernel/summit_32.c
>> @@ -36,7 +36,9 @@ static struct rio_table_hdr *rio_table_h
>> static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
>> static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
>>
>> +#ifndef CONFIG_X86_NUMAQ
>> static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
>> +#endif
>>
>> static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
>> {
>> Index: linux-2.6/arch/x86/boot/compressed/misc.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/boot/compressed/misc.c
>> +++ linux-2.6/arch/x86/boot/compressed/misc.c
>> @@ -217,10 +217,6 @@ static char *vidmem;
>> static int vidport;
>> static int lines, cols;
>>
>> -#ifdef CONFIG_X86_NUMAQ
>> -void *xquad_portio;
>> -#endif
>> -
>> #include "../../../../lib/inflate.c"
>>
>> static void *malloc(int size)
>> Index: linux-2.6/arch/x86/Makefile
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/Makefile
>> +++ linux-2.6/arch/x86/Makefile
>> @@ -117,29 +117,11 @@ mcore-$(CONFIG_X86_VOYAGER) := arch/x86/
>> mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
>> mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws/
>>
>> -# NUMAQ subarch support
>> -mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
>> -mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default/
>> -
>> -# BIGSMP subarch support
>> -mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
>> -mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default/
>> -
>> -#Summit subarch support
>> -mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
>> -mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default/
>> -
>> # generic subarchitecture
>> mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
>> fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
>> mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/
>>
>> -
>> -# ES7000 subarch support
>> -mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
>> -fcore-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
>> -mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default/
>> -
>> # RDC R-321x subarch support
>> mflags-$(CONFIG_X86_RDC321X) := -Iinclude/asm-x86/mach-rdc321x
>> mcore-$(CONFIG_X86_RDC321X) := arch/x86/mach-default/
>> Index: linux-2.6/arch/x86/kernel/acpi/boot.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/acpi/boot.c
>> +++ linux-2.6/arch/x86/kernel/acpi/boot.c
>> @@ -858,7 +858,7 @@ static int __init acpi_parse_madt_lapic_
>> #ifdef CONFIG_X86_IO_APIC
>> #define MP_ISA_BUS 0
>>
>> -#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
>> +#ifdef CONFIG_X86_ES7000
>> extern int es7000_plat;
>> #endif
>>
>> @@ -1007,7 +1007,7 @@ void __init mp_config_acpi_legacy_irqs(v
>> set_bit(MP_ISA_BUS, mp_bus_not_pci);
>> Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
>>
>> -#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
>> +#ifdef CONFIG_X86_ES7000
>> /*
>> * Older generations of ES7000 have no legacy identity mappings
>> */
>> Index: linux-2.6/arch/x86/mach-es7000/Makefile
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/mach-es7000/Makefile
>> +++ linux-2.6/arch/x86/mach-es7000/Makefile
>> @@ -3,4 +3,3 @@
>> #
>>
>> obj-$(CONFIG_X86_ES7000) := es7000plat.o
>> -obj-$(CONFIG_X86_GENERICARCH) := es7000plat.o
>> Index: linux-2.6/arch/x86/mach-es7000/es7000plat.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/mach-es7000/es7000plat.c
>> +++ linux-2.6/arch/x86/mach-es7000/es7000plat.c
>> @@ -177,53 +177,6 @@ find_unisys_acpi_oem_table(unsigned long
>> }
>> #endif
>>
>> -/*
>> - * This file also gets compiled if CONFIG_X86_GENERICARCH is set. Generic
>> - * arch already has got following function definitions (asm-generic/es7000.c)
>> - * hence no need to define these for that case.
>> - */
>> -#ifndef CONFIG_X86_GENERICARCH
>> -void es7000_sw_apic(void);
>> -void __init enable_apic_mode(void)
>> -{
>> - es7000_sw_apic();
>> - return;
>> -}
>> -
>> -__init int mps_oem_check(struct mp_config_table *mpc, char *oem,
>> - char *productid)
>> -{
>> - if (mpc->mpc_oemptr) {
>> - struct mp_config_oemtable *oem_table =
>> - (struct mp_config_oemtable *)mpc->mpc_oemptr;
>> - if (!strncmp(oem, "UNISYS", 6))
>> - return parse_unisys_oem((char *)oem_table);
>> - }
>> - return 0;
>> -}
>> -#ifdef CONFIG_ACPI
>> -/* Hook from generic ACPI tables.c */
>> -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
>> -{
>> - unsigned long oem_addr;
>> - if (!find_unisys_acpi_oem_table(&oem_addr)) {
>> - if (es7000_check_dsdt())
>> - return parse_unisys_oem((char *)oem_addr);
>> - else {
>> - setup_unisys();
>> - return 1;
>> - }
>> - }
>> - return 0;
>> -}
>> -#else
>> -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
>> -{
>> - return 0;
>> -}
>> -#endif
>> -#endif /* COFIG_X86_GENERICARCH */
>> -
>> static void
>> es7000_spin(int n)
>> {
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>
> On the face of it the idea seems sound. The NUMAQ changes look ok on a
> quick scan. I will need to see this applied and tested to be sure its
> really sane.
thanks.
YH
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ - fix
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
2008-06-09 14:41 ` Andy Whitcroft
@ 2008-06-10 0:00 ` Yinghai Lu
2008-06-10 1:11 ` [PATCH] x86: make generic arch support NUMAQ - fix #2 Yinghai Lu
2008-06-10 9:55 ` [PATCH] x86: make generic arch support NUMAQ v5 Ingo Molnar
3 siblings, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-10 0:00 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, Andrew Morton, Sam Ravnborg,
Thomas Gleixner
Cc: linux-kernel@vger.kernel.org
fix typo in bigsmp switching
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index ba18dec..5a7e461 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -64,7 +64,7 @@ early_param("apic", parse_apic);
void __init generic_bigsmp_probe(void)
{
-#if CONFIG_X86_BIGSMP
+#ifdef CONFIG_X86_BIGSMP
/*
* This routine is used to switch to bigsmp mode when
* - There is no apic= option specified by the user
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH] x86: make generic arch support NUMAQ - fix #2
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
2008-06-09 14:41 ` Andy Whitcroft
2008-06-10 0:00 ` [PATCH] x86: make generic arch support NUMAQ - fix Yinghai Lu
@ 2008-06-10 1:11 ` Yinghai Lu
2008-06-10 9:55 ` [PATCH] x86: make generic arch support NUMAQ v5 Ingo Molnar
3 siblings, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2008-06-10 1:11 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, Andrew Morton, Sam Ravnborg,
Thomas Gleixner
Cc: linux-kernel@vger.kernel.org
do not need reserve if it early scan smp table
we are checking mptable early for numaq, so don't need to reserve_bootmem for
it. bootmem is not there yet.
do the samething like 64 bit.
find it on 64g above system from 64 bit kernel kexec to 32 bit kernel with
numaq support
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 6ae6090..7ac1b68 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -853,9 +853,13 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
smp_found_config = 1;
#endif
mpf_found = mpf;
-#ifdef CONFIG_X86_32
+
printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n",
mpf, virt_to_phys(mpf));
+
+ if (!reserve)
+ return 1;
+#ifdef CONFIG_X86_32
reserve_bootmem(virt_to_phys(mpf), PAGE_SIZE,
BOOTMEM_DEFAULT);
if (mpf->mpf_physptr) {
@@ -877,9 +881,6 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
}
#else
- if (!reserve)
- return 1;
-
reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
BOOTMEM_DEFAULT);
if (mpf->mpf_physptr)
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: introduce max_physical_apicid for bigsmp switching
2008-06-09 1:29 ` [PATCH] x86: introduce max_physical_apicid for bigsmp switching Yinghai Lu
@ 2008-06-10 9:53 ` Ingo Molnar
0 siblings, 0 replies; 21+ messages in thread
From: Ingo Molnar @ 2008-06-10 9:53 UTC (permalink / raw)
To: Yinghai Lu
Cc: Thomas Gleixner, H. Peter Anvin, Andrew Morton,
linux-kernel@vger.kernel.org
* Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> one multi-sockets system with 3 or 4 ioapics, when 4 dualcore cpus or
> 2 quadcore cpus installed, need to switch to bigsmp or physflat.
> because cpu apic id is [4,11] instead of [0,7], and we need to check
> max apic id instead of cpu numbers.
>
> also add check for 32 bit when acpi is not compiled in or acpi=off
applied to tip/x86/mpparse, thanks.
Ingo
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] x86: make generic arch support NUMAQ v5
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
` (2 preceding siblings ...)
2008-06-10 1:11 ` [PATCH] x86: make generic arch support NUMAQ - fix #2 Yinghai Lu
@ 2008-06-10 9:55 ` Ingo Molnar
3 siblings, 0 replies; 21+ messages in thread
From: Ingo Molnar @ 2008-06-10 9:55 UTC (permalink / raw)
To: Yinghai Lu
Cc: H. Peter Anvin, Andrew Morton, Sam Ravnborg, Thomas Gleixner,
linux-kernel@vger.kernel.org, the arch/x86 maintainers
* Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> so it could fallback to normal numa.
> NUMAQ depends on GENERICARCH
> also decouple genericarch numa with acpi.
> also make it fallback to bigsmp if apicid > 8.
>
> v3: return early if not found_numaq in pci_numa_init
> remove xquad_portio in misc.c
> v4: make summit, bigsmp and es7000 depend on GENERICARCH too
> v5: seperate apicid check for bigsmp to another patch
> [PATCH] x86: introduce max_physical_apicid for bigsmp switching
applied to tip/x86/mpparse, thanks.
Ingo
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2008-06-10 9:56 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-05 10:09 RFC [PATCH] x86: make generic arch support NUMAQ Yinghai Lu
2008-06-05 11:00 ` Sam Ravnborg
2008-06-05 12:39 ` Ingo Molnar
2008-06-05 17:33 ` Yinghai Lu
2008-06-05 17:26 ` Yinghai Lu
2008-06-06 0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
2008-06-06 0:54 ` Yinghai Lu
2008-06-06 6:17 ` Sam Ravnborg
2008-06-06 6:27 ` Yinghai Lu
2008-06-06 14:09 ` Ingo Molnar
2008-06-06 18:05 ` Yinghai Lu
2008-06-06 21:41 ` [PATCH] x86: make generic arch support NUMAQ v3 Yinghai Lu
2008-06-07 7:31 ` [PATCH] x86: make generic arch support NUMAQ v4 Yinghai Lu
2008-06-09 1:29 ` [PATCH] x86: introduce max_physical_apicid for bigsmp switching Yinghai Lu
2008-06-10 9:53 ` Ingo Molnar
2008-06-09 1:31 ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
2008-06-09 14:41 ` Andy Whitcroft
2008-06-09 18:00 ` Yinghai Lu
2008-06-10 0:00 ` [PATCH] x86: make generic arch support NUMAQ - fix Yinghai Lu
2008-06-10 1:11 ` [PATCH] x86: make generic arch support NUMAQ - fix #2 Yinghai Lu
2008-06-10 9:55 ` [PATCH] x86: make generic arch support NUMAQ v5 Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).