Commit-ID: 7fbbaebf8cd18cca58e84837fd80c07ea8d8bd56 Gitweb: http://git.kernel.org/tip/7fbbaebf8cd18cca58e84837fd80c07ea8d8bd56 Author: Sebastian Andrzej Siewior <bige...@linutronix.de> AuthorDate: Wed, 13 Jul 2016 17:16:08 +0000 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 14 Jul 2016 09:34:30 +0200
ARM/mvebu: Convert to hotplug state machine Install the callbacks via the state machine. Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-ma...@linutronix.de> Cc: Andrew Lunn <and...@lunn.ch> Cc: Gregory Clement <gregory.clem...@free-electrons.com> Cc: Jason Cooper <ja...@lakedaemon.net> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Russell King <li...@armlinux.org.uk> Cc: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux-arm-ker...@lists.infradead.org Cc: r...@linutronix.de Link: http://lkml.kernel.org/r/20160713153333.503198...@linutronix.de Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/arm/mach-mvebu/coherency.c | 19 ++++++------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index 7e989d6..77aaa52 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -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; + armada_xp_clear_shared_l2(); + 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(); } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 420cfcf..d769ec9 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -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,
