These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / kernel / smp_twd.c

diff --git a/kernel/arch/arm/kernel/smp_twd.c b/kernel/arch/arm/kernel/smp_twd.c
index 172c6a0..1bfa7a7 100644 (file)
--- a/kernel/arch/arm/kernel/smp_twd.c
+++ b/kernel/arch/arm/kernel/smp_twd.c
@@ -23,7 +23,6 @@
 #include <linux/of_irq.h>
 #include <linux/of_address.h>
 
-#include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
 
 /* set up by the platform code */
@@ -34,31 +33,34 @@ static unsigned long twd_timer_rate;
 static DEFINE_PER_CPU(bool, percpu_setup_called);
 
 static struct clock_event_device __percpu *twd_evt;
+static unsigned int twd_features =
+               CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
 static int twd_ppi;
 
-static void twd_set_mode(enum clock_event_mode mode,
-                       struct clock_event_device *clk)
+static int twd_shutdown(struct clock_event_device *clk)
 {
-       unsigned long ctrl;
-
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE
-                       | TWD_TIMER_CONTROL_PERIODIC;
-               writel_relaxed(DIV_ROUND_CLOSEST(twd_timer_rate, HZ),
-                       twd_base + TWD_TIMER_LOAD);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               /* period set, and timer enabled in 'next_event' hook */
-               ctrl = TWD_TIMER_CONTROL_IT_ENABLE | TWD_TIMER_CONTROL_ONESHOT;
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       default:
-               ctrl = 0;
-       }
+       writel_relaxed(0, twd_base + TWD_TIMER_CONTROL);
+       return 0;
+}
 
+static int twd_set_oneshot(struct clock_event_device *clk)
+{
+       /* period set, and timer enabled in 'next_event' hook */
+       writel_relaxed(TWD_TIMER_CONTROL_IT_ENABLE | TWD_TIMER_CONTROL_ONESHOT,
+                      twd_base + TWD_TIMER_CONTROL);
+       return 0;
+}
+
+static int twd_set_periodic(struct clock_event_device *clk)
+{
+       unsigned long ctrl = TWD_TIMER_CONTROL_ENABLE |
+                            TWD_TIMER_CONTROL_IT_ENABLE |
+                            TWD_TIMER_CONTROL_PERIODIC;
+
+       writel_relaxed(DIV_ROUND_CLOSEST(twd_timer_rate, HZ),
+                      twd_base + TWD_TIMER_LOAD);
        writel_relaxed(ctrl, twd_base + TWD_TIMER_CONTROL);
+       return 0;
 }
 
 static int twd_set_next_event(unsigned long evt,
@@ -94,7 +96,7 @@ static void twd_timer_stop(void)
 {
        struct clock_event_device *clk = raw_cpu_ptr(twd_evt);
 
-       twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
+       twd_shutdown(clk);
        disable_percpu_irq(clk->irq);
 }
 
@@ -293,10 +295,12 @@ static void twd_timer_setup(void)
        writel_relaxed(0, twd_base + TWD_TIMER_CONTROL);
 
        clk->name = "local_timer";
-       clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
-                       CLOCK_EVT_FEAT_C3STOP;
+       clk->features = twd_features;
        clk->rating = 350;
-       clk->set_mode = twd_set_mode;
+       clk->set_state_shutdown = twd_shutdown;
+       clk->set_state_periodic = twd_set_periodic;
+       clk->set_state_oneshot = twd_set_oneshot;
+       clk->tick_resume = twd_shutdown;
        clk->set_next_event = twd_set_next_event;
        clk->irq = twd_ppi;
        clk->cpumask = cpumask_of(cpu);
@@ -346,6 +350,8 @@ static int __init twd_local_timer_common_register(struct device_node *np)
                goto out_irq;
 
        twd_get_clock(np);
+       if (!of_property_read_bool(np, "always-on"))
+               twd_features |= CLOCK_EVT_FEAT_C3STOP;
 
        /*
         * Immediately configure the timer on the boot CPU, unless we need
@@ -388,9 +394,6 @@ static void __init twd_local_timer_of_register(struct device_node *np)
 {
        int err;
 
-       if (!is_smp() || !setup_max_cpus)
-               return;
-
        twd_ppi = irq_of_parse_and_map(np, 0);
        if (!twd_ppi) {
                err = -EINVAL;