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

Commit 7fbbaebf authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ingo Molnar
Browse files

ARM/mvebu: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153333.503198935@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7ca04bc2

arch/arm/mach-mvebu/coherency.c

+6 −13
Original line number Diff line number Diff line
@@ -111,20 +111,12 @@ static struct notifier_block mvebu_hwcc_pci_nb __maybe_unused = { 
	.notifier_call = mvebu_hwcc_notifier,

};



static int armada_xp_clear_shared_l2_notifier_func(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

static int armada_xp_clear_l2_starting(unsigned int cpu)

{

	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)

	armada_xp_clear_shared_l2();



	return NOTIFY_OK;

	return 0;

}



static struct notifier_block armada_xp_clear_shared_l2_notifier = {

	.notifier_call = armada_xp_clear_shared_l2_notifier_func,

	.priority = 100,

};



static void __init armada_370_coherency_init(struct device_node *np)

{

	struct resource res;
@@ -155,8 +147,9 @@ static void __init armada_370_coherency_init(struct device_node *np) 


	of_node_put(cpu_config_np);



	register_cpu_notifier(&armada_xp_clear_shared_l2_notifier);



	cpuhp_setup_state_nocalls(CPUHP_AP_ARM_MVEBU_COHERENCY,

				  "AP_ARM_MVEBU_COHERENCY",

				  armada_xp_clear_l2_starting, NULL);

exit:

	set_cpu_coherent();

}

include/linux/cpuhotplug.h

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

	CPUHP_AP_IRQ_ARMADA_CASC_STARTING,

	CPUHP_AP_IRQ_BCM2836_STARTING,

	CPUHP_AP_ARM_MVEBU_COHERENCY,

	CPUHP_AP_NOTIFY_STARTING,

	CPUHP_AP_ONLINE,

	CPUHP_TEARDOWN_CPU,