From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anna-Maria Gleixner Subject: [patch V2 43/67] leds/trigger/cpu: Convert to hotplug state machine Date: Wed, 13 Jul 2016 17:16:45 -0000 Message-ID: <20160713153336.465496902@linutronix.de> References: <20160713153219.128052238@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Return-path: Received: from [62.245.132.108] ([62.245.132.108]:40443 "EHLO Galois.linutronix.de" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752492AbcGMRTk (ORCPT ); Wed, 13 Jul 2016 13:19:40 -0400 Content-Disposition: inline; filename=0042-leds-trigger-cpu-Convert-to-hotplug-state-machine.patch Sender: linux-leds-owner@vger.kernel.org List-Id: linux-leds@vger.kernel.org To: LKML Cc: Peter Zijlstra , Ingo Molnar , Thomas Gleixner , rt@linutronix.de, Richard Cochran , Sebastian Andrzej Siewior , Jacek Anaszewski , Linus Torvalds , Linus Walleij , Paul Gortmaker , Richard Purdie , linux-leds@vger.kernel.org, Anna-Maria Gleixner From: Richard Cochran 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. Signed-off-by: Richard Cochran Reviewed-by: Sebastian Andrzej Siewior Cc: Jacek Anaszewski Cc: Linus Torvalds Cc: Linus Walleij Cc: Paul Gortmaker Cc: Peter Zijlstra Cc: Richard Purdie Cc: Thomas Gleixner Cc: linux-leds@vger.kernel.org Signed-off-by: Anna-Maria Gleixner --- drivers/leds/trigger/ledtrig-cpu.c | 32 +++++++++++++++----------------- 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 938467f..4a6a182 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 = { .resume = ledtrig_cpu_syscore_resume, }; -static int ledtrig_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) +static int ledtrig_starting_cpu(unsigned int cpu) { - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_STARTING: - ledtrig_cpu(CPU_LED_START); - break; - case CPU_DYING: - ledtrig_cpu(CPU_LED_STOP); - break; - } - - return NOTIFY_OK; + ledtrig_cpu(CPU_LED_START); + return 0; } - -static struct notifier_block ledtrig_cpu_nb = { - .notifier_call = ledtrig_cpu_notify, -}; +static int ledtrig_dying_cpu(unsigned int cpu) +{ + ledtrig_cpu(CPU_LED_STOP); + return 0; +} static int __init ledtrig_cpu_init(void) { @@ -133,7 +125,13 @@ static int __init ledtrig_cpu_init(void) } register_syscore_ops(&ledtrig_cpu_syscore_ops); - register_cpu_notifier(&ledtrig_cpu_nb); + + /* + * 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); pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n"); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index c052b04..ef7bfa6 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -43,6 +43,7 @@ enum cpuhp_state { CPUHP_AP_QCOM_TIMER_STARTING, CPUHP_AP_MIPS_GIC_TIMER_STARTING, CPUHP_AP_KVM_STARTING, + CPUHP_AP_LEDTRIG_STARTING, CPUHP_AP_NOTIFY_STARTING, CPUHP_AP_ONLINE, CPUHP_TEARDOWN_CPU, -- 2.8.1