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

[kvmfornfv.git] / kernel / drivers / clocksource / mtk_timer.c

diff --git a/kernel/drivers/clocksource/mtk_timer.c b/kernel/drivers/clocksource/mtk_timer.c
index 68ab423..fbfc746 100644 (file)
--- a/kernel/drivers/clocksource/mtk_timer.c
+++ b/kernel/drivers/clocksource/mtk_timer.c
@@ -24,6 +24,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/sched_clock.h>
 #include <linux/slab.h>
 
 #define GPT_IRQ_EN_REG         0x00
@@ -59,6 +60,13 @@ struct mtk_clock_event_device {
        struct clock_event_device dev;
 };
 
+static void __iomem *gpt_sched_reg __read_mostly;
+
+static u64 notrace mtk_read_sched_clock(void)
+{
+       return readl_relaxed(gpt_sched_reg);
+}
+
 static inline struct mtk_clock_event_device *to_mtk_clk(
                                struct clock_event_device *c)
 {
@@ -102,27 +110,20 @@ static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt,
               evt->gpt_base + TIMER_CTRL_REG(timer));
 }
 
-static void mtk_clkevt_mode(enum clock_event_mode mode,
-                               struct clock_event_device *clk)
+static int mtk_clkevt_shutdown(struct clock_event_device *clk)
+{
+       mtk_clkevt_time_stop(to_mtk_clk(clk), GPT_CLK_EVT);
+       return 0;
+}
+
+static int mtk_clkevt_set_periodic(struct clock_event_device *clk)
 {
        struct mtk_clock_event_device *evt = to_mtk_clk(clk);
 
        mtk_clkevt_time_stop(evt, GPT_CLK_EVT);
-
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               mtk_clkevt_time_setup(evt, evt->ticks_per_jiffy, GPT_CLK_EVT);
-               mtk_clkevt_time_start(evt, true, GPT_CLK_EVT);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               /* Timer is enabled in set_next_event */
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       default:
-               /* No more interrupts will occur as source is disabled */
-               break;
-       }
+       mtk_clkevt_time_setup(evt, evt->ticks_per_jiffy, GPT_CLK_EVT);
+       mtk_clkevt_time_start(evt, true, GPT_CLK_EVT);
+       return 0;
 }
 
 static int mtk_clkevt_next_event(unsigned long event,
@@ -148,14 +149,6 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static void mtk_timer_global_reset(struct mtk_clock_event_device *evt)
-{
-       /* Disable all interrupts */
-       writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
-       /* Acknowledge all interrupts */
-       writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
-}
-
 static void
 mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
 {
@@ -175,6 +168,12 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
 {
        u32 val;
 
+       /* Disable all interrupts */
+       writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
+
+       /* Acknowledge all spurious pending interrupts */
+       writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
+
        val = readl(evt->gpt_base + GPT_IRQ_EN_REG);
        writel(val | GPT_IRQ_ENABLE(timer),
                        evt->gpt_base + GPT_IRQ_EN_REG);
@@ -196,7 +195,10 @@ static void __init mtk_timer_init(struct device_node *node)
        evt->dev.name = "mtk_tick";
        evt->dev.rating = 300;
        evt->dev.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
-       evt->dev.set_mode = mtk_clkevt_mode;
+       evt->dev.set_state_shutdown = mtk_clkevt_shutdown;
+       evt->dev.set_state_periodic = mtk_clkevt_set_periodic;
+       evt->dev.set_state_oneshot = mtk_clkevt_shutdown;
+       evt->dev.tick_resume = mtk_clkevt_shutdown;
        evt->dev.set_next_event = mtk_clkevt_next_event;
        evt->dev.cpumask = cpu_possible_mask;
 
@@ -224,8 +226,6 @@ static void __init mtk_timer_init(struct device_node *node)
        }
        rate = clk_get_rate(clk);
 
-       mtk_timer_global_reset(evt);
-
        if (request_irq(evt->dev.irq, mtk_timer_interrupt,
                        IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {
                pr_warn("failed to setup irq %d\n", evt->dev.irq);
@@ -238,6 +238,8 @@ static void __init mtk_timer_init(struct device_node *node)
        mtk_timer_setup(evt, GPT_CLK_SRC, TIMER_CTRL_OP_FREERUN);
        clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC),
                        node->name, rate, 300, 32, clocksource_mmio_readl_up);
+       gpt_sched_reg = evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC);
+       sched_clock_register(mtk_read_sched_clock, 32, rate);
 
        /* Configure clock event */
        mtk_timer_setup(evt, GPT_CLK_EVT, TIMER_CTRL_OP_REPEAT);