[MIPS] Add support for MIPS CMP platform.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

4 files changed, 108 insertions, 5 deletions

diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile
index b31d8dfed1be..f7f87fc09d1e 100644
--- a/arch/mips/mips-boards/generic/Makefile
+++ b/arch/mips/mips-boards/generic/Makefile
@@ -20,6 +20,7 @@
 
 obj-y                           := reset.o display.o init.o memory.o \
                                    cmdline.o time.o
+obj-y                           += amon.o
 
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
 obj-$(CONFIG_PCI)               += pci.o
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c
new file mode 100644
index 000000000000..b7633fda4180
--- /dev/null
+++ b/arch/mips/mips-boards/generic/amon.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2007  MIPS Technologies, Inc.
+ *      All rights reserved.
+
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * Arbitrary Monitor interface
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+
+#include <asm-mips/addrspace.h>
+#include <asm-mips/mips-boards/launch.h>
+#include <asm-mips/mipsmtregs.h>
+
+int amon_cpu_avail(int cpu)
+{
+        struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
+
+        if (cpu < 0 || cpu >= NCPULAUNCH) {
+                pr_debug("avail: cpu%d is out of range\n", cpu);
+                return 0;
+        }
+
+        launch += cpu;
+        if (!(launch->flags & LAUNCH_FREADY)) {
+                pr_debug("avail: cpu%d is not ready\n", cpu);
+                return 0;
+        }
+        if (launch->flags & (LAUNCH_FGO|LAUNCH_FGONE)) {
+                pr_debug("avail: too late.. cpu%d is already gone\n", cpu);
+                return 0;
+        }
+
+        return 1;
+}
+
+void amon_cpu_start(int cpu,
+                    unsigned long pc, unsigned long sp,
+                    unsigned long gp, unsigned long a0)
+{
+        volatile struct cpulaunch *launch =
+                (struct cpulaunch  *)KSEG0ADDR(CPULAUNCH);
+
+        if (!amon_cpu_avail(cpu))
+                return;
+        if (cpu == smp_processor_id()) {
+                pr_debug("launch: I am cpu%d!\n", cpu);
+                return;
+        }
+        launch += cpu;
+
+        pr_debug("launch: starting cpu%d\n", cpu);
+
+        launch->pc = pc;
+        launch->gp = gp;
+        launch->sp = sp;
+        launch->a0 = a0;
+
+        /* Make sure target sees parameters before the go bit */
+        smp_mb();
+
+        launch->flags |= LAUNCH_FGO;
+        while ((launch->flags & LAUNCH_FGONE) == 0)
+                ;
+        pr_debug("launch: cpu%d gone!\n", cpu);
+}
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index 07671fb9074f..852b19492d8c 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -424,6 +424,9 @@ void __init prom_init(void)
 #ifdef CONFIG_SERIAL_8250_CONSOLE
         console_config();
 #endif
+#ifdef CONFIG_MIPS_CMP
+        register_smp_ops(&cmp_smp_ops);
+#endif
 #ifdef CONFIG_MIPS_MT_SMP
         register_smp_ops(&vsmp_smp_ops);
 #endif
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index b50e0fc406ac..4fe62fca994e 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -55,16 +55,36 @@
 unsigned long cpu_khz;
 
 static int mips_cpu_timer_irq;
+static int mips_cpu_perf_irq;
 extern int cp0_perfcount_irq;
 
+DEFINE_PER_CPU(unsigned int, tickcount);
+#define tickcount_this_cpu __get_cpu_var(tickcount)
+static unsigned long ledbitmask;
+
 static void mips_timer_dispatch(void)
 {
+#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_ATLAS)
+        /*
+         * Yes, this is very tacky, won't work as expected with SMTC and
+         * dyntick will break it,
+         * but it gives me a nice warm feeling during debug
+         */
+#define LEDBAR 0xbf000408
+        if (tickcount_this_cpu++ >= HZ) {
+                tickcount_this_cpu = 0;
+                change_bit(smp_processor_id(), &ledbitmask);
+                smp_wmb(); /* Make sure every one else sees the change */
+                /* This will pick up any recent changes made by other CPU's */
+                *(unsigned int *)LEDBAR = ledbitmask;
+        }
+#endif
         do_IRQ(mips_cpu_timer_irq);
 }
 
 static void mips_perf_dispatch(void)
 {
-        do_IRQ(cp0_perfcount_irq);
+        do_IRQ(mips_cpu_perf_irq);
 }
 
 /*
@@ -129,19 +149,18 @@ unsigned long read_persistent_clock(void)
 
 void __init plat_perf_setup(void)
 {
-        cp0_perfcount_irq = -1;
-
 #ifdef MSC01E_INT_BASE
         if (cpu_has_veic) {
                 set_vi_handler(MSC01E_INT_PERFCTR, mips_perf_dispatch);
-                cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR;
+                mips_cpu_perf_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR;
         } else
 #endif
         if (cp0_perfcount_irq >= 0) {
                 if (cpu_has_vint)
                         set_vi_handler(cp0_perfcount_irq, mips_perf_dispatch);
+                mips_cpu_perf_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
 #ifdef CONFIG_SMP
-                set_irq_handler(cp0_perfcount_irq, handle_percpu_irq);
+                set_irq_handler(mips_cpu_perf_irq, handle_percpu_irq);
 #endif
         }
 }