From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753113AbcGSHTC (ORCPT ); Tue, 19 Jul 2016 03:19:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45838 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbcGSHS7 (ORCPT ); Tue, 19 Jul 2016 03:18:59 -0400 Date: Tue, 19 Jul 2016 00:18:28 -0700 From: tip-bot for Richard Cochran Message-ID: Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, rcochran@linutronix.de, hpa@zytor.com, tglx@linutronix.de, anna-maria@linutronix.de, daniel.lezcano@linaro.org, mingo@kernel.org, bigeasy@linutronix.de, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, rcochran@linutronix.de, torvalds@linux-foundation.org, daniel.lezcano@linaro.org, anna-maria@linutronix.de, tglx@linutronix.de, hpa@zytor.com, bigeasy@linutronix.de, peterz@infradead.org, mingo@kernel.org In-Reply-To: <20160713153336.130385842@linutronix.de> References: <20160713153336.130385842@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] clocksource/dummy_timer: Convert to hotplug state machine Git-Commit-ID: 00c1d17aab513d3b8117fb84644eba39434b33e4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 00c1d17aab513d3b8117fb84644eba39434b33e4 Gitweb: http://git.kernel.org/tip/00c1d17aab513d3b8117fb84644eba39434b33e4 Author: Richard Cochran AuthorDate: Wed, 13 Jul 2016 17:16:41 +0000 Committer: Ingo Molnar CommitDate: Fri, 15 Jul 2016 10:40:24 +0200 clocksource/dummy_timer: 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 Signed-off-by: Anna-Maria Gleixner Reviewed-by: Sebastian Andrzej Siewior Cc: Daniel Lezcano Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160713153336.130385842@linutronix.de Signed-off-by: Ingo Molnar --- drivers/clocksource/dummy_timer.c | 36 ++++++------------------------------ include/linux/cpuhotplug.h | 1 + 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c index 776b6c8..89f1c2e 100644 --- a/drivers/clocksource/dummy_timer.c +++ b/drivers/clocksource/dummy_timer.c @@ -16,10 +16,9 @@ static DEFINE_PER_CPU(struct clock_event_device, dummy_timer_evt); -static void dummy_timer_setup(void) +static int dummy_timer_starting_cpu(unsigned int cpu) { - int cpu = smp_processor_id(); - struct clock_event_device *evt = raw_cpu_ptr(&dummy_timer_evt); + struct clock_event_device *evt = per_cpu_ptr(&dummy_timer_evt, cpu); evt->name = "dummy_timer"; evt->features = CLOCK_EVT_FEAT_PERIODIC | @@ -29,36 +28,13 @@ static void dummy_timer_setup(void) evt->cpumask = cpumask_of(cpu); clockevents_register_device(evt); + return 0; } -static int dummy_timer_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - if ((action & ~CPU_TASKS_FROZEN) == CPU_STARTING) - dummy_timer_setup(); - - return NOTIFY_OK; -} - -static struct notifier_block dummy_timer_cpu_nb = { - .notifier_call = dummy_timer_cpu_notify, -}; - static int __init dummy_timer_register(void) { - int err = 0; - - cpu_notifier_register_begin(); - err = __register_cpu_notifier(&dummy_timer_cpu_nb); - if (err) - goto out; - - /* We won't get a call on the boot CPU, so register immediately */ - if (num_possible_cpus() > 1) - dummy_timer_setup(); - -out: - cpu_notifier_register_done(); - return err; + return cpuhp_setup_state(CPUHP_AP_DUMMY_TIMER_STARTING, + "AP_DUMMY_TIMER_STARTING", + dummy_timer_starting_cpu, NULL); } early_initcall(dummy_timer_register); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index f0524cd..8103561 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -37,6 +37,7 @@ enum cpuhp_state { CPUHP_AP_ARM_VFP_STARTING, CPUHP_AP_PERF_ARM_STARTING, CPUHP_AP_ARM_ARCH_TIMER_STARTING, + CPUHP_AP_DUMMY_TIMER_STARTING, CPUHP_AP_KVM_STARTING, CPUHP_AP_NOTIFY_STARTING, CPUHP_AP_ONLINE,