leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/apb_timer: Convert to hotplug state machine

Browse Source 
Install the callbacks via the state machine. There is no setup just one
teardown callback. Remove the silly comment about the workqueue up dependency.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153335.625342983@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Sebastian Andrzej Siewior 2016-07-13 17:16:34 +00:00 committed by Ingo Molnar
parent 251a5fd64b
commit 148b9e2abe
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/x86/kernel/apb_timer.c
View File

@ -215,26 +215,18 @@ void apbt_setup_secondary_clock(void)
* cpu timers during the offline process due to the ordering of notification. * cpu timers during the offline process due to the ordering of notification.
* the extra interrupt is harmless. * the extra interrupt is harmless.
*/ */
static int apbt_cpuhp_notify(struct notifier_block *n, static int apbt_cpu_dead(unsigned int cpu)
unsigned long action, void *hcpu)
{ {
unsigned long cpu = (unsigned long)hcpu;
struct apbt_dev *adev = &per_cpu(cpu_apbt_dev, cpu); struct apbt_dev *adev = &per_cpu(cpu_apbt_dev, cpu);
switch (action & ~CPU_TASKS_FROZEN) { dw_apb_clockevent_pause(adev->timer);
case CPU_DEAD: if (system_state == SYSTEM_RUNNING) {
dw_apb_clockevent_pause(adev->timer); pr_debug("skipping APBT CPU %u offline\n", cpu);
if (system_state == SYSTEM_RUNNING) { } else {
pr_debug("skipping APBT CPU %lu offline\n", cpu); pr_debug("APBT clockevent for cpu %u offline\n", cpu);
} else { dw_apb_clockevent_stop(adev->timer);
pr_debug("APBT clockevent for cpu %lu offline\n", cpu);
dw_apb_clockevent_stop(adev->timer);
}
break;
default:
pr_debug("APBT notified %lu, no action\n", action);
} }
return NOTIFY_OK; return 0;
} }
static __init int apbt_late_init(void) static __init int apbt_late_init(void)
@ -242,9 +234,8 @@ static __init int apbt_late_init(void)
if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT || if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
!apb_timer_block_enabled) !apb_timer_block_enabled)
return 0; return 0;
/* This notifier should be called after workqueue is ready */ return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "X86_APB_DEAD", NULL,
hotcpu_notifier(apbt_cpuhp_notify, -20); apbt_cpu_dead);
return 0;
} }
fs_initcall(apbt_late_init); fs_initcall(apbt_late_init);
#else #else

1
include/linux/cpuhotplug.h
View File

@ -13,6 +13,7 @@ enum cpuhp_state {
CPUHP_PERF_POWER, CPUHP_PERF_POWER,
CPUHP_PERF_SUPERH, CPUHP_PERF_SUPERH,
CPUHP_X86_HPET_DEAD, CPUHP_X86_HPET_DEAD,
CPUHP_X86_APB_DEAD,
CPUHP_WORKQUEUE_PREP, CPUHP_WORKQUEUE_PREP,
CPUHP_NOTIFY_PREPARE, CPUHP_NOTIFY_PREPARE,
CPUHP_BRINGUP_CPU, CPUHP_BRINGUP_CPU,