From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213AbcGSHKd (ORCPT ); Tue, 19 Jul 2016 03:10:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45370 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752789AbcGSHK3 (ORCPT ); Tue, 19 Jul 2016 03:10:29 -0400 Date: Tue, 19 Jul 2016 00:09:54 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, chris@zankel.net, alexander.shishkin@linux.intel.com, mingo@kernel.org, anna-maria@linutronix.de, jcmvbkbc@gmail.com, acme@kernel.org, linux-kernel@vger.kernel.org, bigeasy@linutronix.de Reply-To: anna-maria@linutronix.de, acme@kernel.org, jcmvbkbc@gmail.com, linux-kernel@vger.kernel.org, bigeasy@linutronix.de, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, chris@zankel.net, torvalds@linux-foundation.org, mingo@kernel.org, alexander.shishkin@linux.intel.com In-Reply-To: <20160713153334.852575891@linutronix.de> References: <20160713153334.852575891@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] xtensa/perf: Convert the hotplug notifier to state machine callbacks Git-Commit-ID: 25a77b55e74c46c79f838a97e782a45c33588ca6 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: 25a77b55e74c46c79f838a97e782a45c33588ca6 Gitweb: http://git.kernel.org/tip/25a77b55e74c46c79f838a97e782a45c33588ca6 Author: Sebastian Andrzej Siewior AuthorDate: Wed, 13 Jul 2016 17:16:26 +0000 Committer: Ingo Molnar CommitDate: Thu, 14 Jul 2016 09:34:41 +0200 xtensa/perf: Convert the hotplug notifier to state machine callbacks Install the callbacks via the state machine and let the core invoke the callbacks on the already online CPUs. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Anna-Maria Gleixner Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Chris Zankel Cc: Linus Torvalds Cc: Max Filippov Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-xtensa@linux-xtensa.org Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160713153334.852575891@linutronix.de Signed-off-by: Ingo Molnar --- arch/xtensa/kernel/perf_event.c | 26 +++++++++----------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/arch/xtensa/kernel/perf_event.c b/arch/xtensa/kernel/perf_event.c index ef90479..0fecc8a 100644 --- a/arch/xtensa/kernel/perf_event.c +++ b/arch/xtensa/kernel/perf_event.c @@ -404,7 +404,7 @@ static struct pmu xtensa_pmu = { .read = xtensa_pmu_read, }; -static void xtensa_pmu_setup(void) +static int xtensa_pmu_setup(int cpu) { unsigned i; @@ -413,21 +413,7 @@ static void xtensa_pmu_setup(void) set_er(0, XTENSA_PMU_PMCTRL(i)); set_er(get_er(XTENSA_PMU_PMSTAT(i)), XTENSA_PMU_PMSTAT(i)); } -} - -static int xtensa_pmu_notifier(struct notifier_block *self, - unsigned long action, void *data) -{ - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_STARTING: - xtensa_pmu_setup(); - break; - - default: - break; - } - - return NOTIFY_OK; + return 0; } static int __init xtensa_pmu_init(void) @@ -435,7 +421,13 @@ static int __init xtensa_pmu_init(void) int ret; int irq = irq_create_mapping(NULL, XCHAL_PROFILING_INTERRUPT); - perf_cpu_notifier(xtensa_pmu_notifier); + ret = cpuhp_setup_state(CPUHP_AP_PERF_XTENSA_STARTING, + "AP_PERF_XTENSA_STARTING", xtensa_pmu_setup, + NULL); + if (ret) { + pr_err("xtensa_pmu: failed to register CPU-hotplug.\n"); + return ret; + } #if XTENSA_FAKE_NMI enable_irq(irq); #else diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 2ee3c0e..f187c46 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -30,6 +30,7 @@ enum cpuhp_state { CPUHP_AP_PERF_X86_AMD_IBS_STARTING, CPUHP_AP_PERF_X86_CQM_STARTING, CPUHP_AP_PERF_X86_CSTATE_STARTING, + CPUHP_AP_PERF_XTENSA_STARTING, CPUHP_AP_NOTIFY_STARTING, CPUHP_AP_ONLINE, CPUHP_TEARDOWN_CPU,