p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm/l2c: Convert to hotplug state machine 

Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.

Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Brad Mouring <brad.mouring@ni.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153336.801270887@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Richard Cochran 2016-07-13 17:16:50 +00:00 committed by Ingo Molnar
parent 04d045a681
commit 9eeb226477
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/mm/cache-l2x0.c
View File

@ -597,17 +597,16 @@ static void l2c310_configure(void __iomem *base)
L310_POWER_CTRL); L310_POWER_CTRL);
} }
static int l2c310_cpu_enable_flz(struct notifier_block *nb, unsigned long act, void *data) static int l2c310_starting_cpu(unsigned int cpu)
{ {
switch (act & ~CPU_TASKS_FROZEN) { set_auxcr(get_auxcr() | BIT(3) | BIT(2) | BIT(1));
case CPU_STARTING: return 0;
set_auxcr(get_auxcr() | BIT(3) | BIT(2) | BIT(1)); }
break;
case CPU_DYING: static int l2c310_dying_cpu(unsigned int cpu)
set_auxcr(get_auxcr() & ~(BIT(3) | BIT(2) | BIT(1))); {
break; set_auxcr(get_auxcr() & ~(BIT(3) | BIT(2) | BIT(1)));
} return 0;
return NOTIFY_OK;
} }
static void __init l2c310_enable(void __iomem *base, unsigned num_lock) static void __init l2c310_enable(void __iomem *base, unsigned num_lock)
@ -678,10 +677,10 @@ static void __init l2c310_enable(void __iomem *base, unsigned num_lock)
power_ctrl & L310_STNDBY_MODE_EN ? "en" : "dis"); power_ctrl & L310_STNDBY_MODE_EN ? "en" : "dis");
} }
if (aux & L310_AUX_CTRL_FULL_LINE_ZERO) { if (aux & L310_AUX_CTRL_FULL_LINE_ZERO)
set_auxcr(get_auxcr() | BIT(3) | BIT(2) | BIT(1)); cpuhp_setup_state(CPUHP_AP_ARM_L2X0_STARTING,
cpu_notifier(l2c310_cpu_enable_flz, 0); "AP_ARM_L2X0_STARTING", l2c310_starting_cpu,
} l2c310_dying_cpu);
} }
static void __init l2c310_fixup(void __iomem *base, u32 cache_id, static void __init l2c310_fixup(void __iomem *base, u32 cache_id,

1
include/linux/cpuhotplug.h
View File

@ -37,6 +37,7 @@ enum cpuhp_state {
CPUHP_AP_PERF_METAG_STARTING, CPUHP_AP_PERF_METAG_STARTING,
CPUHP_AP_ARM_VFP_STARTING, CPUHP_AP_ARM_VFP_STARTING,
CPUHP_AP_PERF_ARM_STARTING, CPUHP_AP_PERF_ARM_STARTING,
CPUHP_AP_ARM_L2X0_STARTING,
CPUHP_AP_ARM_ARCH_TIMER_STARTING, CPUHP_AP_ARM_ARCH_TIMER_STARTING,
CPUHP_AP_DUMMY_TIMER_STARTING, CPUHP_AP_DUMMY_TIMER_STARTING,
CPUHP_AP_METAG_TIMER_STARTING, CPUHP_AP_METAG_TIMER_STARTING,