Merge branch 'for-3.19/drivers' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / clocksource / mips-gic-timer.c

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 2603f50..3bd31b1 100644 (file)
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -6,17 +6,19 @@
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
 #include <linux/clockchips.h>
+#include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irqchip/mips-gic.h>
+#include <linux/notifier.h>
+#include <linux/of_irq.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 
-#include <asm/time.h>
-
 static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
-static int gic_timer_irq_installed;
+static int gic_timer_irq;
+static unsigned int gic_frequency;
 
 static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
 {
@@ -38,63 +40,73 @@ static void gic_set_clock_mode(enum clock_event_mode mode,
 
 static irqreturn_t gic_compare_interrupt(int irq, void *dev_id)
 {
-       struct clock_event_device *cd;
-       int cpu = smp_processor_id();
+       struct clock_event_device *cd = dev_id;
 
        gic_write_compare(gic_read_compare());
-       cd = &per_cpu(gic_clockevent_device, cpu);
        cd->event_handler(cd);
        return IRQ_HANDLED;
 }
 
 struct irqaction gic_compare_irqaction = {
        .handler = gic_compare_interrupt,
+       .percpu_dev_id = &gic_clockevent_device,
        .flags = IRQF_PERCPU | IRQF_TIMER,
        .name = "timer",
 };
 
-static void gic_event_handler(struct clock_event_device *dev)
-{
-}
-
-int gic_clockevent_init(void)
+static void gic_clockevent_cpu_init(struct clock_event_device *cd)
 {
        unsigned int cpu = smp_processor_id();
-       struct clock_event_device *cd;
-       unsigned int irq;
-
-       if (!cpu_has_counter || !gic_frequency)
-               return -ENXIO;
-
-       irq = MIPS_GIC_IRQ_BASE + GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
-
-       cd = &per_cpu(gic_clockevent_device, cpu);
 
        cd->name                = "MIPS GIC";
        cd->features            = CLOCK_EVT_FEAT_ONESHOT |
                                  CLOCK_EVT_FEAT_C3STOP;
 
-       clockevent_set_clock(cd, gic_frequency);
-
-       /* Calculate the min / max delta */
-       cd->max_delta_ns        = clockevent_delta2ns(0x7fffffff, cd);
-       cd->min_delta_ns        = clockevent_delta2ns(0x300, cd);
-
-       cd->rating              = 300;
-       cd->irq                 = irq;
+       cd->rating              = 350;
+       cd->irq                 = gic_timer_irq;
        cd->cpumask             = cpumask_of(cpu);
        cd->set_next_event      = gic_next_event;
        cd->set_mode            = gic_set_clock_mode;
-       cd->event_handler       = gic_event_handler;
 
-       clockevents_register_device(cd);
+       clockevents_config_and_register(cd, gic_frequency, 0x300, 0x7fffffff);
 
-       if (!gic_timer_irq_installed) {
-               setup_percpu_irq(irq, &gic_compare_irqaction);
-               gic_timer_irq_installed = 1;
+       enable_percpu_irq(gic_timer_irq, IRQ_TYPE_NONE);
+}
+
+static void gic_clockevent_cpu_exit(struct clock_event_device *cd)
+{
+       disable_percpu_irq(gic_timer_irq);
+}
+
+static int gic_cpu_notifier(struct notifier_block *nb, unsigned long action,
+                               void *data)
+{
+       switch (action & ~CPU_TASKS_FROZEN) {
+       case CPU_STARTING:
+               gic_clockevent_cpu_init(this_cpu_ptr(&gic_clockevent_device));
+               break;
+       case CPU_DYING:
+               gic_clockevent_cpu_exit(this_cpu_ptr(&gic_clockevent_device));
+               break;
        }
 
-       enable_percpu_irq(irq, IRQ_TYPE_NONE);
+       return NOTIFY_OK;
+}
+
+static struct notifier_block gic_cpu_nb = {
+       .notifier_call = gic_cpu_notifier,
+};
+
+static int gic_clockevent_init(void)
+{
+       if (!cpu_has_counter || !gic_frequency)
+               return -ENXIO;
+
+       setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
+
+       register_cpu_notifier(&gic_cpu_nb);
+
+       gic_clockevent_cpu_init(this_cpu_ptr(&gic_clockevent_device));
 
        return 0;
 }
@@ -110,13 +122,45 @@ static struct clocksource gic_clocksource = {
        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-void __init gic_clocksource_init(unsigned int frequency)
+static void __init __gic_clocksource_init(void)
 {
        /* Set clocksource mask. */
        gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width());
 
        /* Calculate a somewhat reasonable rating value. */
-       gic_clocksource.rating = 200 + frequency / 10000000;
+       gic_clocksource.rating = 200 + gic_frequency / 10000000;
+
+       clocksource_register_hz(&gic_clocksource, gic_frequency);
+
+       gic_clockevent_init();
+}
+
+void __init gic_clocksource_init(unsigned int frequency)
+{
+       gic_frequency = frequency;
+       gic_timer_irq = MIPS_GIC_IRQ_BASE +
+               GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
+
+       __gic_clocksource_init();
+}
+
+static void __init gic_clocksource_of_init(struct device_node *node)
+{
+       if (WARN_ON(!gic_present || !node->parent ||
+                   !of_device_is_compatible(node->parent, "mti,gic")))
+               return;
+
+       if (of_property_read_u32(node, "clock-frequency", &gic_frequency)) {
+               pr_err("GIC frequency not specified.\n");
+               return;
+       }
+       gic_timer_irq = irq_of_parse_and_map(node, 0);
+       if (!gic_timer_irq) {
+               pr_err("GIC timer IRQ not specified.\n");
+               return;
+       }
 
-       clocksource_register_hz(&gic_clocksource, frequency);
+       __gic_clocksource_init();
 }
+CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",
+                      gic_clocksource_of_init);