clocksource/mips-gic-timer: Print an error if IRQ setup fails

[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 89d3e4d..802055b 100644 (file)
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -49,10 +49,9 @@ struct irqaction gic_compare_irqaction = {
        .name = "timer",
 };
 
-static void gic_clockevent_cpu_init(struct clock_event_device *cd)
+static void gic_clockevent_cpu_init(unsigned int cpu,
+                                   struct clock_event_device *cd)
 {
-       unsigned int cpu = smp_processor_id();
-
        cd->name                = "MIPS GIC";
        cd->features            = CLOCK_EVT_FEAT_ONESHOT |
                                  CLOCK_EVT_FEAT_C3STOP;
@@ -79,19 +78,10 @@ static void gic_update_frequency(void *data)
        clockevents_update_freq(this_cpu_ptr(&gic_clockevent_device), rate);
 }
 
-static int gic_cpu_notifier(struct notifier_block *nb, unsigned long action,
-                               void *data)
+static int gic_starting_cpu(unsigned int cpu)
 {
-       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;
-       }
-
-       return NOTIFY_OK;
+       gic_clockevent_cpu_init(cpu, this_cpu_ptr(&gic_clockevent_device));
+       return 0;
 }
 
 static int gic_clk_notifier(struct notifier_block *nb, unsigned long action,
@@ -105,10 +95,11 @@ static int gic_clk_notifier(struct notifier_block *nb, unsigned long action,
        return NOTIFY_OK;
 }
 
-
-static struct notifier_block gic_cpu_nb = {
-       .notifier_call = gic_cpu_notifier,
-};
+static int gic_dying_cpu(unsigned int cpu)
+{
+       gic_clockevent_cpu_exit(this_cpu_ptr(&gic_clockevent_device));
+       return 0;
+}
 
 static struct notifier_block gic_clk_nb = {
        .notifier_call = gic_clk_notifier,
@@ -122,15 +113,15 @@ static int gic_clockevent_init(void)
                return -ENXIO;
 
        ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
-       if (ret < 0)
+       if (ret < 0) {
+               pr_err("GIC timer IRQ %d setup failed: %d\n",
+                      gic_timer_irq, ret);
                return ret;
+       }
 
-       ret = register_cpu_notifier(&gic_cpu_nb);
-       if (ret < 0)
-               pr_warn("GIC: Unable to register CPU notifier\n");
-
-       gic_clockevent_cpu_init(this_cpu_ptr(&gic_clockevent_device));
-
+       cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING,
+                         "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu,
+                         gic_dying_cpu);
        return 0;
 }
 
@@ -146,7 +137,7 @@ static struct clocksource gic_clocksource = {
        .archdata       = { .vdso_clock_mode = VDSO_CLOCK_GIC },
 };
 
-static void __init __gic_clocksource_init(void)
+static int __init __gic_clocksource_init(void)
 {
        int ret;
 
@@ -159,6 +150,8 @@ static void __init __gic_clocksource_init(void)
        ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
        if (ret < 0)
                pr_warn("GIC: Unable to register clocksource\n");
+
+       return ret;
 }
 
 void __init gic_clocksource_init(unsigned int frequency)
@@ -174,36 +167,40 @@ void __init gic_clocksource_init(unsigned int frequency)
        gic_start_count();
 }
 
-static void __init gic_clocksource_of_init(struct device_node *node)
+static int __init gic_clocksource_of_init(struct device_node *node)
 {
        struct clk *clk;
        int ret;
 
-       if (WARN_ON(!gic_present || !node->parent ||
-                   !of_device_is_compatible(node->parent, "mti,gic")))
-               return;
+       if (!gic_present || !node->parent ||
+           !of_device_is_compatible(node->parent, "mti,gic")) {
+               pr_warn("No DT definition for the mips gic driver");
+               return -ENXIO;
+       }
 
        clk = of_clk_get(node, 0);
        if (!IS_ERR(clk)) {
                if (clk_prepare_enable(clk) < 0) {
                        pr_err("GIC failed to enable clock\n");
                        clk_put(clk);
-                       return;
+                       return PTR_ERR(clk);
                }
 
                gic_frequency = clk_get_rate(clk);
        } else if (of_property_read_u32(node, "clock-frequency",
                                        &gic_frequency)) {
                pr_err("GIC frequency not specified.\n");
-               return;
+               return -EINVAL;;
        }
        gic_timer_irq = irq_of_parse_and_map(node, 0);
        if (!gic_timer_irq) {
                pr_err("GIC timer IRQ not specified.\n");
-               return;
+               return -EINVAL;;
        }
 
-       __gic_clocksource_init();
+       ret = __gic_clocksource_init();
+       if (ret)
+               return ret;
 
        ret = gic_clockevent_init();
        if (!ret && !IS_ERR(clk)) {
@@ -213,6 +210,8 @@ static void __init gic_clocksource_of_init(struct device_node *node)
 
        /* And finally start the counter */
        gic_start_count();
+
+       return 0;
 }
 CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",
                       gic_clocksource_of_init);