[MIPS] Consolidate all variants of MIPS cp0 timer interrupt handlers.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 70 insertions, 25 deletions

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 137183bba54..a7afbf2c971 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -867,7 +867,7 @@ void ipi_decode(struct smtc_ipi *pipi)
 #ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
                 clock_hang_reported[dest_copy] = 0;
 #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
-                local_timer_interrupt(0, NULL);
+                local_timer_interrupt(0);
                 irq_exit();
                 break;
         case LINUX_SMP_IPI:
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index c48ebd4b495..d23e6825e98 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -144,7 +144,7 @@ void local_timer_interrupt(int irq, void *dev_id)
  * High-level timer interrupt service routines.  This function
  * is set as irqaction->handler and is invoked through do_IRQ.
  */
-irqreturn_t timer_interrupt(int irq, void *dev_id)
+static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
         write_seqlock(&xtime_lock);
 
@@ -174,9 +174,10 @@ int null_perf_irq(void)
         return 0;
 }
 
+EXPORT_SYMBOL(null_perf_irq);
+
 int (*perf_irq)(void) = null_perf_irq;
 
-EXPORT_SYMBOL(null_perf_irq);
 EXPORT_SYMBOL(perf_irq);
 
 /*
@@ -208,35 +209,79 @@ static inline int handle_perf_irq (int r2)
                 !r2;
 }
 
-asmlinkage void ll_timer_interrupt(int irq)
+void ll_timer_interrupt(int irq, void *dev_id)
 {
-        int r2 = cpu_has_mips_r2;
+        int cpu = smp_processor_id();
 
-        irq_enter();
-        kstat_this_cpu.irqs[irq]++;
+#ifdef CONFIG_MIPS_MT_SMTC
+        /*
+         *  In an SMTC system, one Count/Compare set exists per VPE.
+         *  Which TC within a VPE gets the interrupt is essentially
+         *  random - we only know that it shouldn't be one with
+         *  IXMT set. Whichever TC gets the interrupt needs to
+         *  send special interprocessor interrupts to the other
+         *  TCs to make sure that they schedule, etc.
+         *
+         *  That code is specific to the SMTC kernel, not to
+         *  the a particular platform, so it's invoked from
+         *  the general MIPS timer_interrupt routine.
+         */
+
+        /*
+         * We could be here due to timer interrupt,
+         * perf counter overflow, or both.
+         */
+        (void) handle_perf_irq(1);
+
+        if (read_c0_cause() & (1 << 30)) {
+                /*
+                 * There are things we only want to do once per tick
+                 * in an "MP" system.   One TC of each VPE will take
+                 * the actual timer interrupt.  The others will get
+                 * timer broadcast IPIs. We use whoever it is that takes
+                 * the tick on VPE 0 to run the full timer_interrupt().
+                 */
+                if (cpu_data[cpu].vpe_id == 0) {
+                        timer_interrupt(irq, NULL);
+                } else {
+                        write_c0_compare(read_c0_count() +
+                                         (mips_hpt_frequency/HZ));
+                        local_timer_interrupt(irq, dev_id);
+                }
+                smtc_timer_broadcast(cpu_data[cpu].vpe_id);
+        }
+#else /* CONFIG_MIPS_MT_SMTC */
+        int r2 = cpu_has_mips_r2;
 
         if (handle_perf_irq(r2))
-                goto out;
+                return;
 
         if (r2 && ((read_c0_cause() & (1 << 30)) == 0))
-                goto out;
-
-        timer_interrupt(irq, NULL);
-
-out:
-        irq_exit();
-}
-
-asmlinkage void ll_local_timer_interrupt(int irq)
-{
-        irq_enter();
-        if (smp_processor_id() != 0)
-                kstat_this_cpu.irqs[irq]++;
-
-        /* we keep interrupt disabled all the time */
-        local_timer_interrupt(irq, NULL);
+                return;
 
-        irq_exit();
+        if (cpu == 0) {
+                /*
+                 * CPU 0 handles the global timer interrupt job and process
+                 * accounting resets count/compare registers to trigger next
+                 * timer int.
+                 */
+                timer_interrupt(irq, NULL);
+        } else {
+                /* Everyone else needs to reset the timer int here as
+                   ll_local_timer_interrupt doesn't */
+                /*
+                 * FIXME: need to cope with counter underflow.
+                 * More support needs to be added to kernel/time for
+                 * counter/timer interrupts on multiple CPU's
+                 */
+                write_c0_compare(read_c0_count() + (mips_hpt_frequency/HZ));
+
+                /*
+                 * Other CPUs should do profiling and process accounting
+                 */
+                local_timer_interrupt(irq, dev_id);
+        }
+#endif /* CONFIG_MIPS_MT_SMTC */
 }
 
 /*