diff options
author | Richard Cochran <rcochran@linutronix.de> | 2016-07-13 13:16:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 04:40:26 -0400 |
commit | 911a359de96d5e9d24f50c74a48c6f3cf061539a (patch) | |
tree | e4e742e35ead6963da60b395ac59a56976c1ac39 | |
parent | 2dab90932fd08f101a45acc0495ccd77b869da5d (diff) |
leds/trigger/cpu: Convert to hotplug state machine
This is a straightforward conversion. We place this callback last
in the list so that the LED illuminates only after a successful
bring up sequence.
( NOTE: The patch adds a FIXME question about the callback used,
this question should probably be revisited later on.)
Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-leds@vger.kernel.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153336.465496902@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | drivers/leds/trigger/ledtrig-cpu.c | 32 | ||||
-rw-r--r-- | include/linux/cpuhotplug.h | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/drivers/leds/trigger/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c index 938467fb82be..4a6a182d0a88 100644 --- a/drivers/leds/trigger/ledtrig-cpu.c +++ b/drivers/leds/trigger/ledtrig-cpu.c | |||
@@ -92,25 +92,17 @@ static struct syscore_ops ledtrig_cpu_syscore_ops = { | |||
92 | .resume = ledtrig_cpu_syscore_resume, | 92 | .resume = ledtrig_cpu_syscore_resume, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static int ledtrig_cpu_notify(struct notifier_block *self, | 95 | static int ledtrig_starting_cpu(unsigned int cpu) |
96 | unsigned long action, void *hcpu) | ||
97 | { | 96 | { |
98 | switch (action & ~CPU_TASKS_FROZEN) { | 97 | ledtrig_cpu(CPU_LED_START); |
99 | case CPU_STARTING: | 98 | return 0; |
100 | ledtrig_cpu(CPU_LED_START); | ||
101 | break; | ||
102 | case CPU_DYING: | ||
103 | ledtrig_cpu(CPU_LED_STOP); | ||
104 | break; | ||
105 | } | ||
106 | |||
107 | return NOTIFY_OK; | ||
108 | } | 99 | } |
109 | 100 | ||
110 | 101 | static int ledtrig_dying_cpu(unsigned int cpu) | |
111 | static struct notifier_block ledtrig_cpu_nb = { | 102 | { |
112 | .notifier_call = ledtrig_cpu_notify, | 103 | ledtrig_cpu(CPU_LED_STOP); |
113 | }; | 104 | return 0; |
105 | } | ||
114 | 106 | ||
115 | static int __init ledtrig_cpu_init(void) | 107 | static int __init ledtrig_cpu_init(void) |
116 | { | 108 | { |
@@ -133,7 +125,13 @@ static int __init ledtrig_cpu_init(void) | |||
133 | } | 125 | } |
134 | 126 | ||
135 | register_syscore_ops(&ledtrig_cpu_syscore_ops); | 127 | register_syscore_ops(&ledtrig_cpu_syscore_ops); |
136 | register_cpu_notifier(&ledtrig_cpu_nb); | 128 | |
129 | /* | ||
130 | * FIXME: Why needs this to happen in the interrupt disabled | ||
131 | * low level bringup phase of a cpu? | ||
132 | */ | ||
133 | cpuhp_setup_state(CPUHP_AP_LEDTRIG_STARTING, "AP_LEDTRIG_STARTING", | ||
134 | ledtrig_starting_cpu, ledtrig_dying_cpu); | ||
137 | 135 | ||
138 | pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n"); | 136 | pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n"); |
139 | 137 | ||
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 456e3d93272c..24f56e290003 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h | |||
@@ -42,6 +42,7 @@ enum cpuhp_state { | |||
42 | CPUHP_AP_QCOM_TIMER_STARTING, | 42 | CPUHP_AP_QCOM_TIMER_STARTING, |
43 | CPUHP_AP_MIPS_GIC_TIMER_STARTING, | 43 | CPUHP_AP_MIPS_GIC_TIMER_STARTING, |
44 | CPUHP_AP_KVM_STARTING, | 44 | CPUHP_AP_KVM_STARTING, |
45 | CPUHP_AP_LEDTRIG_STARTING, | ||
45 | CPUHP_AP_NOTIFY_STARTING, | 46 | CPUHP_AP_NOTIFY_STARTING, |
46 | CPUHP_AP_ONLINE, | 47 | CPUHP_AP_ONLINE, |
47 | CPUHP_TEARDOWN_CPU, | 48 | CPUHP_TEARDOWN_CPU, |