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

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

sh/SH-X3 SMP: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-sh@vger.kernel.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160906170457.32393-6-bigeasy@linutronix.de


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

arch/sh/kernel/cpu/sh4a/smp-shx3.c

+5 −21
Original line number Diff line number Diff line
@@ -122,32 +122,16 @@ static void shx3_update_boot_vector(unsigned int cpu) 
	__raw_writel(STBCR_RESET, STBCR_REG(cpu));

}



static int

shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

static int shx3_cpu_prepare(unsigned int cpu)

{

	unsigned int cpu = (unsigned int)hcpu;



	switch (action) {

	case CPU_UP_PREPARE:

	shx3_update_boot_vector(cpu);

		break;

	case CPU_ONLINE:

		pr_info("CPU %u is now online\n", cpu);

		break;

	case CPU_DEAD:

		break;

	}



	return NOTIFY_OK;

	return 0;

}



static struct notifier_block shx3_cpu_notifier = {

	.notifier_call		= shx3_cpu_callback,

};



static int register_shx3_cpu_notifier(void)

{

	register_hotcpu_notifier(&shx3_cpu_notifier);

	cpuhp_setup_state_nocalls(CPUHP_SH_SH3X_PREPARE, "sh/shx3:prepare",

				  shx3_cpu_prepare, NULL);

	return 0;

}

late_initcall(register_shx3_cpu_notifier);

include/linux/cpuhotplug.h

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

	CPUHP_NOTIFY_PREPARE,

	CPUHP_ARM_SHMOBILE_SCU_PREPARE,

	CPUHP_SH_SH3X_PREPARE,

	CPUHP_TIMERS_DEAD,

	CPUHP_BRINGUP_CPU,

	CPUHP_AP_IDLE_DEAD,