leds/trigger/cpu: Move from CPU_STARTING to ONLINE level

There is no need the ledtriger to be called *that* early in the hotplug
process (+ with disabled interrupts). As explained by Jacek Anaszewski [0]
there is no need for it.
Therefore this patch moves it to the ONLINE/PREPARE_DOWN level using the
dynamic registration for the id.

[0] https://lkml.kernel.org/r/578C92BC.2070603@samsung.com

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: rt@linutronix.de
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-leds@vger.kernel.org
Link: http://lkml.kernel.org/r/1469028295-14702-1-git-send-email-bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/leds/trigger/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c
index 4a6a182d0a886b5877f1a0661547d082cf98ce76..22f0634dd3fa4de4f4f525f0696420c17374ec35 100644 (file)
--- a/drivers/leds/trigger/ledtrig-cpu.c
+++ b/drivers/leds/trigger/ledtrig-cpu.c
@@ -92,13 +92,13 @@ static struct syscore_ops ledtrig_cpu_syscore_ops = {
        .resume         = ledtrig_cpu_syscore_resume,
 };
 
-static int ledtrig_starting_cpu(unsigned int cpu)
+static int ledtrig_online_cpu(unsigned int cpu)
 {
        ledtrig_cpu(CPU_LED_START);
        return 0;
 }
 
-static int ledtrig_dying_cpu(unsigned int cpu)
+static int ledtrig_prepare_down_cpu(unsigned int cpu)
 {
        ledtrig_cpu(CPU_LED_STOP);
        return 0;
@@ -107,6 +107,7 @@ static int ledtrig_dying_cpu(unsigned int cpu)
 static int __init ledtrig_cpu_init(void)
 {
        int cpu;
+       int ret;
 
        /* Supports up to 9999 cpu cores */
        BUILD_BUG_ON(CONFIG_NR_CPUS > 9999);
@@ -126,12 +127,11 @@ static int __init ledtrig_cpu_init(void)
 
        register_syscore_ops(&ledtrig_cpu_syscore_ops);
 
-       /*
-        * FIXME: Why needs this to happen in the interrupt disabled
-        * low level bringup phase of a cpu?
-        */
-       cpuhp_setup_state(CPUHP_AP_LEDTRIG_STARTING, "AP_LEDTRIG_STARTING",
-                         ledtrig_starting_cpu, ledtrig_dying_cpu);
+       ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "AP_LEDTRIG_STARTING",
+                               ledtrig_online_cpu, ledtrig_prepare_down_cpu);
+       if (ret < 0)
+               pr_err("CPU hotplug notifier for ledtrig-cpu could not be registered: %d\n",
+                      ret);
 
        pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n");
 

diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 5015f463d314da3b14467cab11693377acba1801..6d405db6fb127ada88285f90109f7d6185031da1 100644 (file)
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -66,7 +66,6 @@ enum cpuhp_state {
        CPUHP_AP_ARM_CORESIGHT_STARTING,
        CPUHP_AP_ARM_CORESIGHT4_STARTING,
        CPUHP_AP_ARM64_ISNDEP_STARTING,
-       CPUHP_AP_LEDTRIG_STARTING,
        CPUHP_AP_SMPCFD_DYING,
        CPUHP_AP_X86_TBOOT_DYING,
        CPUHP_AP_NOTIFY_STARTING,