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

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

ARM/OMAP/wakeupgen: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: rt@linutronix.de
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20160906170457.32393-4-bigeasy@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 657ebf7a

arch/arm/mach-omap2/omap-wakeupgen.c

+13 −22
Original line number Diff line number Diff line
@@ -322,34 +322,25 @@ static void irq_save_secure_context(void) 
#endif



#ifdef CONFIG_HOTPLUG_CPU

static int irq_cpu_hotplug_notify(struct notifier_block *self,

				  unsigned long action, void *hcpu)

static int omap_wakeupgen_cpu_online(unsigned int cpu)

{

	unsigned int cpu = (unsigned int)hcpu;



	/*

	 * Corresponding FROZEN transitions do not have to be handled,

	 * they are handled by at a higher level

	 * (drivers/cpuidle/coupled.c).

	 */

	switch (action) {

	case CPU_ONLINE:

	wakeupgen_irqmask_all(cpu, 0);

		break;

	case CPU_DEAD:

		wakeupgen_irqmask_all(cpu, 1);

		break;

	}

	return NOTIFY_OK;

	return 0;

}



static struct notifier_block irq_hotplug_notifier = {

	.notifier_call = irq_cpu_hotplug_notify,

};

static int omap_wakeupgen_cpu_dead(unsigned int cpu)

{

	wakeupgen_irqmask_all(cpu, 1);

	return 0;

}



static void __init irq_hotplug_init(void)

{

	register_hotcpu_notifier(&irq_hotplug_notifier);

	cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "arm/omap-wake:online",

				  omap_wakeupgen_cpu_online, NULL);

	cpuhp_setup_state_nocalls(CPUHP_ARM_OMAP_WAKE_DEAD,

				  "arm/omap-wake:dead", NULL,

				  omap_wakeupgen_cpu_dead);

}

#else

static void __init irq_hotplug_init(void)

include/linux/cpuhotplug.h

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

	CPUHP_CPUIDLE_DEAD,

	CPUHP_ARM64_FPSIMD_DEAD,

	CPUHP_ARM_OMAP_WAKE_DEAD,

	CPUHP_WORKQUEUE_PREP,

	CPUHP_POWER_NUMA_PREPARE,

	CPUHP_HRTIMERS_PREPARE,