sparc/time: Migrate to new 'set-state' interface

Migrate sparc drivers to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

We weren't doing anything which switching to few clockevent modes and so
their callbacks aren't implemented.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index d3408e72d20c0a9b4a834735eadffe5208224fb1..278c40abce828f78650b5d5a52841867065c0750 100644 (file)
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -247,7 +247,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
 
        ce = &per_cpu(sparc32_clockevent, cpu);
 
-       if (ce->mode & CLOCK_EVT_MODE_PERIODIC)
+       if (clockevent_state_periodic(ce))
                sun4m_clear_profile_irq(cpu);
        else
                sparc_config.load_profile_irq(cpu, 0); /* Is this needless? */

diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index c9692f387cee00fde5010c7b100ba878cfc6f6f6..1affabc96b087bb699a339372f0b0f963c92ecbd 100644 (file)
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -101,21 +101,18 @@ irqreturn_t notrace timer_interrupt(int dummy, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static void timer_ce_set_mode(enum clock_event_mode mode,
-                             struct clock_event_device *evt)
+static int timer_ce_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-               case CLOCK_EVT_MODE_PERIODIC:
-               case CLOCK_EVT_MODE_RESUME:
-                       timer_ce_enabled = 1;
-                       break;
-               case CLOCK_EVT_MODE_SHUTDOWN:
-                       timer_ce_enabled = 0;
-                       break;
-               default:
-                       break;
-       }
+       timer_ce_enabled = 0;
+       smp_mb();
+       return 0;
+}
+
+static int timer_ce_set_periodic(struct clock_event_device *evt)
+{
+       timer_ce_enabled = 1;
        smp_mb();
+       return 0;
 }
 
 static __init void setup_timer_ce(void)
@@ -127,7 +124,9 @@ static __init void setup_timer_ce(void)
        ce->name     = "timer_ce";
        ce->rating   = 100;
        ce->features = CLOCK_EVT_FEAT_PERIODIC;
-       ce->set_mode = timer_ce_set_mode;
+       ce->set_state_shutdown = timer_ce_shutdown;
+       ce->set_state_periodic = timer_ce_set_periodic;
+       ce->tick_resume = timer_ce_set_periodic;
        ce->cpumask  = cpu_possible_mask;
        ce->shift    = 32;
        ce->mult     = div_sc(sparc_config.clock_rate, NSEC_PER_SEC,
@@ -183,24 +182,20 @@ static __init int setup_timer_cs(void)
 }
 
 #ifdef CONFIG_SMP
-static void percpu_ce_setup(enum clock_event_mode mode,
-                       struct clock_event_device *evt)
+static int percpu_ce_shutdown(struct clock_event_device *evt)
 {
        int cpu = cpumask_first(evt->cpumask);
 
-       switch (mode) {
-               case CLOCK_EVT_MODE_PERIODIC:
-                       sparc_config.load_profile_irq(cpu,
-                                                     SBUS_CLOCK_RATE / HZ);
-                       break;
-               case CLOCK_EVT_MODE_ONESHOT:
-               case CLOCK_EVT_MODE_SHUTDOWN:
-               case CLOCK_EVT_MODE_UNUSED:
-                       sparc_config.load_profile_irq(cpu, 0);
-                       break;
-               default:
-                       break;
-       }
+       sparc_config.load_profile_irq(cpu, 0);
+       return 0;
+}
+
+static int percpu_ce_set_periodic(struct clock_event_device *evt)
+{
+       int cpu = cpumask_first(evt->cpumask);
+
+       sparc_config.load_profile_irq(cpu, SBUS_CLOCK_RATE / HZ);
+       return 0;
 }
 
 static int percpu_ce_set_next_event(unsigned long delta,
@@ -224,7 +219,9 @@ void register_percpu_ce(int cpu)
        ce->name           = "percpu_ce";
        ce->rating         = 200;
        ce->features       = features;
-       ce->set_mode       = percpu_ce_setup;
+       ce->set_state_shutdown = percpu_ce_shutdown;
+       ce->set_state_periodic = percpu_ce_set_periodic;
+       ce->set_state_oneshot = percpu_ce_shutdown;
        ce->set_next_event = percpu_ce_set_next_event;
        ce->cpumask        = cpumask_of(cpu);
        ce->shift          = 32;

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 2e6035c0a8ca91032e8fcf751241ac1dfe406cf8..c69b21e51efc444b7bd9ec11c6ff0cafd5220c71 100644 (file)
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -674,32 +674,19 @@ static int sparc64_next_event(unsigned long delta,
        return tick_ops->add_compare(delta) ? -ETIME : 0;
 }
 
-static void sparc64_timer_setup(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
-{
-       switch (mode) {
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               tick_ops->disable_irq();
-               break;
-
-       case CLOCK_EVT_MODE_PERIODIC:
-       case CLOCK_EVT_MODE_UNUSED:
-               WARN_ON(1);
-               break;
-       }
+static int sparc64_timer_shutdown(struct clock_event_device *evt)
+{
+       tick_ops->disable_irq();
+       return 0;
 }
 
 static struct clock_event_device sparc64_clockevent = {
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .set_mode       = sparc64_timer_setup,
-       .set_next_event = sparc64_next_event,
-       .rating         = 100,
-       .shift          = 30,
-       .irq            = -1,
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .set_state_shutdown     = sparc64_timer_shutdown,
+       .set_next_event         = sparc64_next_event,
+       .rating                 = 100,
+       .shift                  = 30,
+       .irq                    = -1,
 };
 static DEFINE_PER_CPU(struct clock_event_device, sparc64_events);