Merge branch 'smp' into misc

Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
author: Russell King <rmk+kernel@arm.linux.org.uk> 2011-01-06 17:31:35 -0500
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2011-01-06 17:32:03 -0500
commit: 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch)
tree: b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mach-tegra
parent: 24056f525051a9e186af28904b396320e18bf9a0 (diff)
parent: 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff)
3 files changed, 25 insertions, 64 deletions
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index 8e7f115aa21e..a5cb1ce76ff2 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -11,12 +11,9 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/smp.h>
-#include <linux/completion.h>
 #include <asm/cacheflush.h>
-static DECLARE_COMPLETION(cpu_killed);
 static inline void cpu_enter_lowpower(void)
 {
        unsigned int v;
@@ -29,13 +26,13 @@ static inline void cpu_enter_lowpower(void)
         * Turn off coherency
         */
        "       mrc     p15, 0, %0, c1, c0, 1\n"
-        "       bic     %0, %0, #0x20\n"
+        "       bic     %0, %0, %2\n"
        "       mcr     p15, 0, %0, c1, c0, 1\n"
        "       mrc     p15, 0, %0, c1, c0, 0\n"
        "       bic     %0, %0, #0x04\n"
        "       mcr     p15, 0, %0, c1, c0, 0\n"
          : "=&r" (v)
-          : "r" (0)
+          : "r" (0), "Ir" (CR_C)
          : "cc");
 }
@@ -45,17 +42,17 @@ static inline void cpu_leave_lowpower(void)
        asm volatile(
        "mrc    p15, 0, %0, c1, c0, 0\n"
-        "       orr     %0, %0, #0x04\n"
+        "       orr     %0, %0, %1\n"
        "       mcr     p15, 0, %0, c1, c0, 0\n"
        "       mrc     p15, 0, %0, c1, c0, 1\n"
        "       orr     %0, %0, #0x20\n"
        "       mcr     p15, 0, %0, c1, c0, 1\n"
          : "=&r" (v)
-          :
+          : "Ir" (CR_C)
          : "cc");
 }
-static inline void platform_do_lowpower(unsigned int cpu)
+static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 {
        /*
         * there is no power-control hardware on this platform, so all
@@ -79,22 +76,19 @@ static inline void platform_do_lowpower(unsigned int cpu)
                /*}*/
                /*
-                 * getting here, means that we have come out of WFI without
+                 * Getting here, means that we have come out of WFI without
                 * having been woken up - this shouldn't happen
                 *
-                 * The trouble is, letting people know about this is not really
+                 * Just note it happening - when we're woken, we can report
-                 * possible, since we are currently running incoherently, and
+                 * its occurrence.
-                 * therefore cannot safely call printk() or anything else
                 */
-#ifdef DEBUG
+                (*spurious)++;
-                printk(KERN_WARN "CPU%u: spurious wakeup call\n", cpu);
-#endif
        }
 }
 int platform_cpu_kill(unsigned int cpu)
 {
-        return wait_for_completion_timeout(&cpu_killed, 5000);
+        return 1;
 }
 /*
@@ -104,30 +98,22 @@ int platform_cpu_kill(unsigned int cpu)
 */
 void platform_cpu_die(unsigned int cpu)
 {
-#ifdef DEBUG
+        int spurious = 0;
-        unsigned int this_cpu = hard_smp_processor_id();
-        if (cpu != this_cpu) {
-                printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",
-                           this_cpu, cpu);
-                BUG();
-        }
-#endif
-        printk(KERN_NOTICE "CPU%u: shutdown\n", cpu);
-        complete(&cpu_killed);
        /*
         * we're ready for shutdown now, so do it
         */
        cpu_enter_lowpower();
-        platform_do_lowpower(cpu);
+        platform_do_lowpower(cpu, &spurious);
        /*
         * bring this CPU back into the world of cache
         * coherency, and then restore interrupts
         */
        cpu_leave_lowpower();
+        if (spurious)
+                pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
 }
 int platform_cpu_disable(unsigned int cpu)
diff --git a/arch/arm/mach-tegra/include/mach/smp.h b/arch/arm/mach-tegra/include/mach/smp.h
index e4a34a35a544..c8221b38ee7c 100644
--- a/arch/arm/mach-tegra/include/mach/smp.h
+++ b/arch/arm/mach-tegra/include/mach/smp.h
@@ -2,21 +2,13 @@
 #define ASMARM_ARCH_SMP_H
 #include <asm/hardware/gic.h>
-#include <asm/smp_mpidr.h>
 /*
 * We use IRQ1 as the IPI
 */
-static inline void smp_cross_call(const struct cpumask *mask)
+static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, 1);
-}
-/*
- * Do nothing on MPcore.
- */
-static inline void smp_cross_call_done(cpumask_t callmap)
 {
+        gic_raise_softirq(mask, ipi);
 }
 #endif
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 1c0fd92cab39..c729cd72cc3b 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -22,7 +22,6 @@
 #include <asm/cacheflush.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/localtimer.h>
 #include <asm/smp_scu.h>
 #include <mach/iomap.h>
@@ -41,8 +40,6 @@ static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE);
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
-        trace_hardirqs_off();
        /*
         * if any interrupts are already enabled for the primary
         * core (e.g. timer irq), then they will not have been enabled
@@ -117,24 +114,20 @@ void __init smp_init_cpus(void)
 {
        unsigned int i, ncores = scu_get_core_count(scu_base);
+        if (ncores > NR_CPUS) {
+                printk(KERN_ERR "Tegra: no. of cores (%u) greater than configured (%u), clipping\n",
+                        ncores, NR_CPUS);
+                ncores = NR_CPUS;
+        }
        for (i = 0; i < ncores; i++)
                cpu_set(i, cpu_possible_map);
 }
-void __init smp_prepare_cpus(unsigned int max_cpus)
+void __init platform_smp_prepare_cpus(unsigned int max_cpus)
 {
-        unsigned int ncores = scu_get_core_count(scu_base);
-        unsigned int cpu = smp_processor_id();
        int i;
-        smp_store_cpu_info(cpu);
-        /*
-         * are we trying to boot more cores than exist?
-         */
-        if (max_cpus > ncores)
-                max_cpus = ncores;
        /*
         * Initialise the present map, which describes the set of CPUs
         * actually populated at the present time.
@@ -142,15 +135,5 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        for (i = 0; i < max_cpus; i++)
                set_cpu_present(i, true);
-        /*
+        scu_enable(scu_base);
-         * Initialise the SCU if there are more than one CPU and let
-         * them know where to start. Note that, on modern versions of
-         * MILO, the "poke" doesn't actually do anything until each
-         * individual core is sent a soft interrupt to get it out of
-         * WFI
-         */
-        if (max_cpus > 1) {
-                percpu_timer_setup();
-                scu_enable(scu_base);
-        }
 }
author	Russell King <rmk+kernel@arm.linux.org.uk>	2011-01-06 17:31:35 -0500
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2011-01-06 17:32:03 -0500
commit	4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch)
tree	b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mach-tegra
parent	24056f525051a9e186af28904b396320e18bf9a0 (diff)
parent	15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff)