Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd894f14 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: default avatarLinus 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent bdab88e0

drivers/leds/trigger/ledtrig-cpu.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -92,13 +92,13 @@ static struct syscore_ops ledtrig_cpu_syscore_ops = { 
	.resume		= ledtrig_cpu_syscore_resume,

	.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);

	ledtrig_cpu(CPU_LED_START);

	return 0;

	return 0;

}

}





static int ledtrig_dying_cpu(unsigned int cpu)

static int ledtrig_prepare_down_cpu(unsigned int cpu)

{

{

	ledtrig_cpu(CPU_LED_STOP);

	ledtrig_cpu(CPU_LED_STOP);

	return 0;

	return 0;
@@ -107,6 +107,7 @@ static int ledtrig_dying_cpu(unsigned int cpu) 
static int __init ledtrig_cpu_init(void)

static int __init ledtrig_cpu_init(void)

{

{

	int cpu;

	int cpu;

	int ret;





	/* Supports up to 9999 cpu cores */

	/* Supports up to 9999 cpu cores */

	BUILD_BUG_ON(CONFIG_NR_CPUS > 9999);

	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);

	register_syscore_ops(&ledtrig_cpu_syscore_ops);





	/*

	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "AP_LEDTRIG_STARTING",

	 * FIXME: Why needs this to happen in the interrupt disabled

				ledtrig_online_cpu, ledtrig_prepare_down_cpu);

	 * low level bringup phase of a cpu?

	if (ret < 0)

	 */

		pr_err("CPU hotplug notifier for ledtrig-cpu could not be registered: %d\n",

	cpuhp_setup_state(CPUHP_AP_LEDTRIG_STARTING, "AP_LEDTRIG_STARTING",

		       ret);

			  ledtrig_starting_cpu, ledtrig_dying_cpu);





	pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n");

	pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n");

include/linux/cpuhotplug.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ enum cpuhp_state { 
	CPUHP_AP_ARM_CORESIGHT_STARTING,

	CPUHP_AP_ARM_CORESIGHT_STARTING,

	CPUHP_AP_ARM_CORESIGHT4_STARTING,

	CPUHP_AP_ARM_CORESIGHT4_STARTING,

	CPUHP_AP_ARM64_ISNDEP_STARTING,

	CPUHP_AP_ARM64_ISNDEP_STARTING,

	CPUHP_AP_LEDTRIG_STARTING,

	CPUHP_AP_SMPCFD_DYING,

	CPUHP_AP_SMPCFD_DYING,

	CPUHP_AP_X86_TBOOT_DYING,

	CPUHP_AP_X86_TBOOT_DYING,

	CPUHP_AP_NOTIFY_STARTING,

	CPUHP_AP_NOTIFY_STARTING,