1 files changed, 54 insertions, 36 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index b3dab20acf34..122a580f7322 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -42,6 +42,7 @@
 #include <linux/timex.h>
 #include <linux/kernel_stat.h>
 #include <linux/time.h>
+#include <linux/clockchips.h>
 #include <linux/init.h>
 #include <linux/profile.h>
 #include <linux/cpu.h>
@@ -106,7 +107,7 @@ struct clock_event_device decrementer_clockevent = {
         .irq            = 0,
         .set_next_event = decrementer_set_next_event,
         .set_mode       = decrementer_set_mode,
-        .features       = CLOCK_EVT_FEAT_ONESHOT,
+        .features       = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP,
 };
 EXPORT_SYMBOL(decrementer_clockevent);
 
@@ -478,6 +479,47 @@ void arch_irq_work_raise(void)
 
 #endif /* CONFIG_IRQ_WORK */
 
+void __timer_interrupt(void)
+{
+        struct pt_regs *regs = get_irq_regs();
+        u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
+        struct clock_event_device *evt = &__get_cpu_var(decrementers);
+        u64 now;
+
+        trace_timer_interrupt_entry(regs);
+
+        if (test_irq_work_pending()) {
+                clear_irq_work_pending();
+                irq_work_run();
+        }
+
+        now = get_tb_or_rtc();
+        if (now >= *next_tb) {
+                *next_tb = ~(u64)0;
+                if (evt->event_handler)
+                        evt->event_handler(evt);
+                __get_cpu_var(irq_stat).timer_irqs_event++;
+        } else {
+                now = *next_tb - now;
+                if (now <= DECREMENTER_MAX)
+                        set_dec((int)now);
+                /* We may have raced with new irq work */
+                if (test_irq_work_pending())
+                        set_dec(1);
+                __get_cpu_var(irq_stat).timer_irqs_others++;
+        }
+
+#ifdef CONFIG_PPC64
+        /* collect purr register values often, for accurate calculations */
+        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+                struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
+                cu->current_tb = mfspr(SPRN_PURR);
+        }
+#endif
+
+        trace_timer_interrupt_exit(regs);
+}
+
 /*
  * timer_interrupt - gets called when the decrementer overflows,
  * with interrupts disabled.
@@ -486,8 +528,6 @@ void timer_interrupt(struct pt_regs * regs)
 {
         struct pt_regs *old_regs;
         u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
-        struct clock_event_device *evt = &__get_cpu_var(decrementers);
-        u64 now;
 
         /* Ensure a positive value is written to the decrementer, or else
          * some CPUs will continue to take decrementer exceptions.
@@ -519,39 +559,7 @@ void timer_interrupt(struct pt_regs * regs)
         old_regs = set_irq_regs(regs);
         irq_enter();
 
-        trace_timer_interrupt_entry(regs);
-
-        if (test_irq_work_pending()) {
-                clear_irq_work_pending();
-                irq_work_run();
-        }
-
-        now = get_tb_or_rtc();
-        if (now >= *next_tb) {
-                *next_tb = ~(u64)0;
-                if (evt->event_handler)
-                        evt->event_handler(evt);
-                __get_cpu_var(irq_stat).timer_irqs_event++;
-        } else {
-                now = *next_tb - now;
-                if (now <= DECREMENTER_MAX)
-                        set_dec((int)now);
-                /* We may have raced with new irq work */
-                if (test_irq_work_pending())
-                        set_dec(1);
-                __get_cpu_var(irq_stat).timer_irqs_others++;
-        }
-
-#ifdef CONFIG_PPC64
-        /* collect purr register values often, for accurate calculations */
-        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
-                struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
-                cu->current_tb = mfspr(SPRN_PURR);
-        }
-#endif
-
-        trace_timer_interrupt_exit(regs);
-
+        __timer_interrupt();
         irq_exit();
         set_irq_regs(old_regs);
 }
@@ -825,6 +833,15 @@ static void decrementer_set_mode(enum clock_event_mode mode,
                 decrementer_set_next_event(DECREMENTER_MAX, dev);
 }
 
+/* Interrupt handler for the timer broadcast IPI */
+void tick_broadcast_ipi_handler(void)
+{
+        u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
+
+        *next_tb = get_tb_or_rtc();
+        __timer_interrupt();
+}
+
 static void register_decrementer_clockevent(int cpu)
 {
         struct clock_event_device *dec = &per_cpu(decrementers, cpu);
@@ -928,6 +945,7 @@ void __init time_init(void)
         clocksource_init();
 
         init_decrementer_clockevent();
+        tick_setup_hrtimer_broadcast();
 }