10 files changed, 115 insertions, 64 deletions

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 3b002995e145..00595bc2da8d 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -222,7 +222,7 @@ struct apic apic_flat =  {
         .send_IPI_all                   = flat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
@@ -373,7 +373,7 @@ struct apic apic_physflat =  {
         .send_IPI_all                   = physflat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 0b1093394fdf..8c25917b51a0 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -256,7 +256,7 @@ struct apic apic_bigsmp = {
         .send_IPI_all                   = bigsmp_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 320f2d2e4e54..9f6102fc87a1 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -163,17 +163,12 @@ static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip)
         return 0;
 }
 
-static int __init es7000_update_apic(void)
+static int __init es7000_apic_is_cluster(void)
 {
-        apic->wakeup_cpu = wakeup_secondary_cpu_via_mip;
-
         /* MPENTIUMIII */
         if (boot_cpu_data.x86 == 6 &&
-            (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11)) {
-                es7000_update_apic_to_cluster();
-                apic->wait_for_init_deassert = NULL;
-                apic->wakeup_cpu = wakeup_secondary_cpu_via_mip;
-        }
+            (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11))
+                return 1;
 
         return 0;
 }
@@ -192,8 +187,6 @@ static void __init setup_unisys(void)
         else
                 es7000_plat = ES7000_CLASSIC;
         ioapic_renumber_irq = es7000_rename_gsi;
-
-        x86_quirks->update_apic = es7000_update_apic;
 }
 
 /*
@@ -310,6 +303,8 @@ static int es7000_check_dsdt(void)
         return 0;
 }
 
+static int __initdata es7000_acpi_ret;
+
 /* Hook from generic ACPI tables.c */
 static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
@@ -332,8 +327,19 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
                  */
                 unmap_unisys_acpi_oem_table(oem_addr);
         }
-        return ret;
+
+        es7000_acpi_ret = ret;
+
+        return ret && !es7000_apic_is_cluster();
 }
+static int __init es7000_acpi_madt_oem_check_cluster(char *oem_id,
+                                                     char *oem_table_id)
+{
+        int ret = es7000_acpi_ret;
+
+        return ret && es7000_apic_is_cluster();
+}
+
 #else /* !CONFIG_ACPI: */
 static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
@@ -416,11 +422,8 @@ static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask)
 
 static void es7000_wait_for_init_deassert(atomic_t *deassert)
 {
-#ifndef CONFIG_ES7000_CLUSTERED_APIC
         while (!atomic_read(deassert))
                 cpu_relax();
-#endif
-        return;
 }
 
 static unsigned int es7000_get_apic_id(unsigned long x)
@@ -659,37 +662,103 @@ static int es7000_phys_pkg_id(int cpuid_apic, int index_msb)
         return cpuid_apic >> index_msb;
 }
 
-void __init es7000_update_apic_to_cluster(void)
-{
-        apic->target_cpus = target_cpus_cluster;
-        apic->irq_delivery_mode = dest_LowestPrio;
-        /* logical delivery broadcast to all procs: */
-        apic->irq_dest_mode = 1;
-
-        apic->init_apic_ldr = es7000_init_apic_ldr_cluster;
-
-        apic->cpu_mask_to_apicid = es7000_cpu_mask_to_apicid_cluster;
-}
-
 static int probe_es7000(void)
 {
         /* probed later in mptable/ACPI hooks */
         return 0;
 }
 
+static int __initdata es7000_mps_ret;
 static __init int
 es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
+        int ret = 0;
+
         if (mpc->oemptr) {
                 struct mpc_oemtable *oem_table =
                         (struct mpc_oemtable *)mpc->oemptr;
 
                 if (!strncmp(oem, "UNISYS", 6))
-                        return parse_unisys_oem((char *)oem_table);
+                        ret = parse_unisys_oem((char *)oem_table);
         }
-        return 0;
+
+        es7000_mps_ret = ret;
+
+        return ret && !es7000_apic_is_cluster();
+}
+
+static __init int
+es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem, char *productid)
+{
+        int ret = es7000_mps_ret;
+
+        return ret && es7000_apic_is_cluster();
 }
 
+struct apic apic_es7000_cluster = {
+
+        .name                           = "es7000",
+        .probe                          = probe_es7000,
+        .acpi_madt_oem_check            = es7000_acpi_madt_oem_check_cluster,
+        .apic_id_registered             = es7000_apic_id_registered,
+
+        .irq_delivery_mode              = dest_LowestPrio,
+        /* logical delivery broadcast to all procs: */
+        .irq_dest_mode                  = 1,
+
+        .target_cpus                    = target_cpus_cluster,
+        .disable_esr                    = 1,
+        .dest_logical                   = 0,
+        .check_apicid_used              = es7000_check_apicid_used,
+        .check_apicid_present           = es7000_check_apicid_present,
+
+        .vector_allocation_domain       = es7000_vector_allocation_domain,
+        .init_apic_ldr                  = es7000_init_apic_ldr_cluster,
+
+        .ioapic_phys_id_map             = es7000_ioapic_phys_id_map,
+        .setup_apic_routing             = es7000_setup_apic_routing,
+        .multi_timer_check              = NULL,
+        .apicid_to_node                 = es7000_apicid_to_node,
+        .cpu_to_logical_apicid          = es7000_cpu_to_logical_apicid,
+        .cpu_present_to_apicid          = es7000_cpu_present_to_apicid,
+        .apicid_to_cpu_present          = es7000_apicid_to_cpu_present,
+        .setup_portio_remap             = NULL,
+        .check_phys_apicid_present      = es7000_check_phys_apicid_present,
+        .enable_apic_mode               = es7000_enable_apic_mode,
+        .phys_pkg_id                    = es7000_phys_pkg_id,
+        .mps_oem_check                  = es7000_mps_oem_check_cluster,
+
+        .get_apic_id                    = es7000_get_apic_id,
+        .set_apic_id                    = NULL,
+        .apic_id_mask                   = 0xFF << 24,
+
+        .cpu_mask_to_apicid             = es7000_cpu_mask_to_apicid_cluster,
+        .cpu_mask_to_apicid_and         = es7000_cpu_mask_to_apicid_and,
+
+        .send_IPI_mask                  = es7000_send_IPI_mask,
+        .send_IPI_mask_allbutself       = NULL,
+        .send_IPI_allbutself            = es7000_send_IPI_allbutself,
+        .send_IPI_all                   = es7000_send_IPI_all,
+        .send_IPI_self                  = default_send_IPI_self,
+
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_mip,
+
+        .trampoline_phys_low            = 0x467,
+        .trampoline_phys_high           = 0x469,
+
+        .wait_for_init_deassert         = NULL,
+
+        /* Nothing to do for most platforms, since cleared by the INIT cycle: */
+        .smp_callin_clear_local_apic    = NULL,
+        .inquire_remote_apic            = default_inquire_remote_apic,
+
+        .read                           = native_apic_mem_read,
+        .write                          = native_apic_mem_write,
+        .icr_read                       = native_apic_icr_read,
+        .icr_write                      = native_apic_icr_write,
+        .wait_icr_idle                  = native_apic_wait_icr_idle,
+        .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
+};
 
 struct apic apic_es7000 = {
 
@@ -737,7 +806,7 @@ struct apic apic_es7000 = {
         .send_IPI_all                   = es7000_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
 
         .trampoline_phys_low            = 0x467,
         .trampoline_phys_high           = 0x469,
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index d9d6d61eed82..c503c1799d63 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -256,13 +256,6 @@ static int __init numaq_setup_ioapic_ids(void)
         return 1;
 }
 
-static int __init numaq_update_apic(void)
-{
-        apic->wakeup_cpu = wakeup_secondary_cpu_via_nmi;
-
-        return 0;
-}
-
 static struct x86_quirks numaq_x86_quirks __initdata = {
         .arch_pre_time_init             = numaq_pre_time_init,
         .arch_time_init                 = NULL,
@@ -278,7 +271,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
         .mpc_oem_pci_bus                = mpc_oem_pci_bus,
         .smp_read_mpc_oem               = smp_read_mpc_oem,
         .setup_ioapic_ids               = numaq_setup_ioapic_ids,
-        .update_apic                    = numaq_update_apic,
 };
 
 static __init void early_check_numaq(void)
@@ -546,7 +538,7 @@ struct apic apic_numaq = {
         .send_IPI_all                   = numaq_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_nmi,
         .trampoline_phys_low            = NUMAQ_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = NUMAQ_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 3a730fa574bb..13c6fc7dff99 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -138,7 +138,7 @@ struct apic apic_default = {
         .send_IPI_all                   = default_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
@@ -159,6 +159,7 @@ extern struct apic apic_numaq;
 extern struct apic apic_summit;
 extern struct apic apic_bigsmp;
 extern struct apic apic_es7000;
+extern struct apic apic_es7000_cluster;
 extern struct apic apic_default;
 
 struct apic *apic = &apic_default;
@@ -176,6 +177,7 @@ static struct apic *apic_probe[] __initdata = {
 #endif
 #ifdef CONFIG_X86_ES7000
         &apic_es7000,
+        &apic_es7000_cluster,
 #endif
         &apic_default,  /* must be last */
         NULL,
@@ -197,9 +199,6 @@ static int __init parse_apic(char *arg)
                 }
         }
 
-        if (x86_quirks->update_apic)
-                x86_quirks->update_apic();
-
         /* Parsed again by __setup for debug/verbose */
         return 0;
 }
@@ -218,8 +217,6 @@ void __init generic_bigsmp_probe(void)
         if (!cmdline_apic && apic == &apic_default) {
                 if (apic_bigsmp.probe()) {
                         apic = &apic_bigsmp;
-                        if (x86_quirks->update_apic)
-                                x86_quirks->update_apic();
                         printk(KERN_INFO "Overriding APIC driver with %s\n",
                                apic->name);
                 }
@@ -240,9 +237,6 @@ void __init generic_apic_probe(void)
                 /* Not visible without early console */
                 if (!apic_probe[i])
                         panic("Didn't find an APIC driver");
-
-                if (x86_quirks->update_apic)
-                        x86_quirks->update_apic();
         }
         printk(KERN_INFO "Using APIC driver %s\n", apic->name);
 }
@@ -262,8 +256,6 @@ generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 
                 if (!cmdline_apic) {
                         apic = apic_probe[i];
-                        if (x86_quirks->update_apic)
-                                x86_quirks->update_apic();
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }
@@ -284,8 +276,6 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
                 if (!cmdline_apic) {
                         apic = apic_probe[i];
-                        if (x86_quirks->update_apic)
-                                x86_quirks->update_apic();
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index e7c163661c77..8d7748efe6a8 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -68,9 +68,6 @@ void __init default_setup_apic_routing(void)
                         apic = &apic_physflat;
                 printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
         }
-
-        if (x86_quirks->update_apic)
-                x86_quirks->update_apic();
 }
 
 /* Same for both flat and physical. */
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index 32838b57a945..5a75d563f676 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -574,7 +574,7 @@ struct apic apic_summit = {
         .send_IPI_all                   = summit_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 354b9c45601d..561a6b1042ae 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -224,7 +224,7 @@ struct apic apic_x2apic_cluster = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 5bcb174409bc..785f8ee4b1df 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -213,7 +213,7 @@ struct apic apic_x2apic_phys = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 20b4ad07c3a1..6d7b9d960ddc 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -91,7 +91,7 @@ static void uv_vector_allocation_domain(int cpu, struct cpumask *retmask)
         cpumask_set_cpu(cpu, retmask);
 }
 
-int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip)
+static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
 {
         unsigned long val;
         int pnode;
@@ -99,16 +99,19 @@ int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip)
         pnode = uv_apicid_to_pnode(phys_apicid);
         val = (1UL << UVH_IPI_INT_SEND_SHFT) |
             (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
-            (((long)start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
+            ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
             APIC_DM_INIT;
         uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
         mdelay(10);
 
         val = (1UL << UVH_IPI_INT_SEND_SHFT) |
             (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
-            (((long)start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
+            ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
             APIC_DM_STARTUP;
         uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
+
+        atomic_set(&init_deasserted, 1);
+
         return 0;
 }
 
@@ -285,7 +288,7 @@ struct apic apic_x2apic_uv_x = {
         .send_IPI_all                   = uv_send_IPI_all,
         .send_IPI_self                  = uv_send_IPI_self,
 
-        .wakeup_cpu                     = NULL,
+        .wakeup_cpu                     = uv_wakeup_secondary,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,