[PATCH] Clustered APIC setup for >8 CPU systems

Clustered APIC setup patch.  Needed to support generic systems with more
than 8 CPUs.

Motivation:

 The current APIC destination mode ("Flat Logical") used in linux kernel
 has an upper limit of 8 CPUs.  For more than 8 CPUs, either "Clustered
 Logical" or "Physical" mode has to be used.

 The attached patch adds support such systems by organizing them into
 logical clusters, with each cluster having 4 CPUs.  This is activated by
 a new config option "Support for other sub-arch SMP systems with more
 than 8 CPUs", under Processor feature->Sub architecture.

 The patch is made very simple and isolated, thanks to Martin J.
 Bligh's patchsets, which has moved all APIC related functions into
 sub-arch macros.  Has zero impact on standard systems.

 This patch enables all 16 logical processors on a generic, non-quad
 based, system that we have here.  Also, by looking at SuSE source, I
 have also added a special switch, to specifically support Unisys
 (ES7000).  Just replacing #define SEQUENTIAL_APICID by CLUSTERED_APICID
 in the patch should make it work on ES7000(not tested).

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5916d7cce686a498a808d47978ed67f3b08869d0..dffda495f39fff665a499a399355dc4515f40458 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -75,6 +75,14 @@ config X86_SUMMIT
 
          If you don't have one of these computers, you should say N here.
 
+config X86_BIGSMP
+       bool "Support for other sub-arch SMP systems with more than 8 CPUs"
+       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.
+
 # Visual Workstation support is utterly broken.
 # If you want to see it working mail an VW540 to hch@infradead.org 8)
 #config X86_VISWS

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index ffb77023d82736ba3544f146cdcd733c5b5be9ad..fe0b05d847b4f57339f17b5c56ccbdc37da5b694 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -65,6 +65,10 @@ mcore-$(CONFIG_X86_VISWS)    := mach-visws
 mflags-$(CONFIG_X86_NUMAQ)     := -Iinclude/asm-i386/mach-numaq
 mcore-$(CONFIG_X86_NUMAQ)      := mach-default
 
+# BIGSMP subarch support
+mflags-$(CONFIG_X86_BIGSMP)    := -Iinclude/asm-i386/mach-bigsmp
+mcore-$(CONFIG_X86_BIGSMP)     := mach-default
+
 # default subarch .h files
 mflags-y += -Iinclude/asm-i386/mach-default
 

diff --git a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-i386/mach-bigsmp/mach_apic.h
new file mode 100644 (file)
index 0000000..bee177a
--- /dev/null
+++ b/include/asm-i386/mach-bigsmp/mach_apic.h
@@ -0,0 +1,106 @@
+#ifndef __ASM_MACH_APIC_H
+#define __ASM_MACH_APIC_H
+
+#define SEQUENTIAL_APICID
+#ifdef SEQUENTIAL_APICID
+#define xapic_phys_to_log_apicid(phys_apic) ( (1ul << ((phys_apic) & 0x3)) |\
+               ((phys_apic<<2) & (~0xf)) )
+#elif CLUSTERED_APICID
+#define xapic_phys_to_log_apicid(phys_apic) ( (1ul << ((phys_apic) & 0x3)) |\
+               ((phys_apic) & (~0xf)) )
+#endif
+
+#define no_balance_irq (1)
+#define esr_disable (1)
+
+static inline int apic_id_registered(void)
+{
+               return (1);
+}
+
+#define APIC_DFR_VALUE (APIC_DFR_CLUSTER)
+#define TARGET_CPUS    ((cpu_online_map < 0xf)?cpu_online_map:0xf)
+
+#define APIC_BROADCAST_ID     (0x0f)
+#define check_apicid_used(bitmap, apicid) (0)
+
+static inline unsigned long calculate_ldr(unsigned long old)
+{
+       unsigned long id;
+       id = xapic_phys_to_log_apicid(hard_smp_processor_id());
+       return ((old & ~APIC_LDR_MASK) | SET_APIC_LOGICAL_ID(id));
+}
+
+/*
+ * Set up the logical destination ID.
+ *
+ * Intel recommends to set DFR, LDR and TPR before enabling
+ * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel
+ * document number 292116).  So here it goes...
+ */
+static inline void init_apic_ldr(void)
+{
+       unsigned long val;
+
+       apic_write_around(APIC_DFR, APIC_DFR_VALUE);
+       val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
+       val = calculate_ldr(val);
+       apic_write_around(APIC_LDR, val);
+}
+
+static inline void clustered_apic_check(void)
+{
+       printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
+               "Cluster", nr_ioapics);
+}
+
+static inline int multi_timer_check(int apic, int irq)
+{
+       return 0;
+}
+
+static inline int apicid_to_node(int logical_apicid)
+{
+       return 0;
+}
+
+extern u8 raw_phys_apicid[];
+
+static inline int cpu_present_to_apicid(int mps_cpu)
+{
+       return (int) raw_phys_apicid[mps_cpu];
+}
+
+static inline unsigned long apicid_to_cpu_present(int phys_apicid)
+{
+       return (1ul << phys_apicid);
+}
+
+static inline int mpc_apic_id(struct mpc_config_processor *m, int quad)
+{
+       printk("Processor #%d %ld:%ld APIC version %d\n",
+               m->mpc_apicid,
+               (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+               (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+               m->mpc_apicver);
+       return (m->mpc_apicid);
+}
+
+static inline ulong ioapic_phys_id_map(ulong phys_map)
+{
+       /* For clustered we don't have a good way to do this yet - hack */
+       return (0x0F);
+}
+
+#define WAKE_SECONDARY_VIA_INIT
+
+static inline void setup_portio_remap(void)
+{
+}
+
+static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)
+{
+       return (1);
+}
+
+#endif /* __ASM_MACH_APIC_H */

diff --git a/include/asm-i386/mach-bigsmp/mach_ipi.h b/include/asm-i386/mach-bigsmp/mach_ipi.h
new file mode 100644 (file)
index 0000000..e086613
--- /dev/null
+++ b/include/asm-i386/mach-bigsmp/mach_ipi.h
@@ -0,0 +1,24 @@
+#ifndef __ASM_MACH_IPI_H
+#define __ASM_MACH_IPI_H
+
+static inline void send_IPI_mask_sequence(int mask, int vector);
+
+static inline void send_IPI_mask(int mask, int vector)
+{
+       send_IPI_mask_sequence(mask, vector);
+}
+
+static inline void send_IPI_allbutself(int vector)
+{
+       unsigned long mask = cpu_online_map & ~(1 << smp_processor_id());
+
+       if (mask)
+               send_IPI_mask(mask, vector);
+}
+
+static inline void send_IPI_all(int vector)
+{
+       send_IPI_mask(cpu_online_map, vector);
+}
+
+#endif /* __ASM_MACH_IPI_H */