From patchwork Wed Sep 11 02:52:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: preeti X-Patchwork-Id: 2868561 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EE2739F495 for ; Wed, 11 Sep 2013 02:55:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17989202C4 for ; Wed, 11 Sep 2013 02:55:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01CF1200E7 for ; Wed, 11 Sep 2013 02:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753943Ab3IKCzU (ORCPT ); Tue, 10 Sep 2013 22:55:20 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:37319 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753687Ab3IKCzR (ORCPT ); Tue, 10 Sep 2013 22:55:17 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Sep 2013 22:55:16 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 10 Sep 2013 22:55:14 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 535456E804F; Tue, 10 Sep 2013 22:55:13 -0400 (EDT) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by b01cxnp22033.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8B2tDFR49152064; Wed, 11 Sep 2013 02:55:13 GMT Received: from d01av05.pok.ibm.com (loopback [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r8B2t94F026699; Tue, 10 Sep 2013 22:55:13 -0400 Received: from preeti.in.ibm.com (preeti.in.ibm.com [9.124.35.218]) by d01av05.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r8B2t2q4026119; Tue, 10 Sep 2013 22:55:02 -0400 Subject: [PATCH V3 6/6] cpuidle/ppc: Nominate new broadcast cpu on hotplug of the old To: benh@kernel.crashing.org, paul.gortmaker@windriver.com, paulus@samba.org, shangw@linux.vnet.ibm.com, rjw@sisk.pl, galak@kernel.crashing.org, fweisbec@gmail.com, paulmck@linux.vnet.ibm.com, arnd@arndb.de, linux-pm@vger.kernel.org, rostedt@goodmis.org, michael@ellerman.id.au, john.stultz@linaro.org, tglx@linutronix.de, chenhui.zhao@freescale.com, deepthi@linux.vnet.ibm.com, r58472@freescale.com, geoff@infradead.org, linux-kernel@vger.kernel.org, srivatsa.bhat@linux.vnet.ibm.com, schwidefsky@de.ibm.com, svaidy@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org From: Preeti U Murthy Date: Wed, 11 Sep 2013 08:22:26 +0530 Message-ID: <20130911025226.27726.71053.stgit@preeti.in.ibm.com> In-Reply-To: <20130911024906.27726.4735.stgit@preeti.in.ibm.com> References: <20130911024906.27726.4735.stgit@preeti.in.ibm.com> User-Agent: StGit/0.16-38-g167d MIME-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13091102-5806-0000-0000-000022B1D569 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On hotplug of the broadcast cpu, cancel the hrtimer queued to do broadcast and nominate a new broadcast cpu to be the first cpu in the broadcast mask which includes all the cpus that have notified the broadcast framework about entering deep idle state. Since the new broadcast cpu is one of the cpus in deep idle, send an ipi to wake it up to continue the duty of broadcast. The new broadcast cpu needs to find out if it woke up to resume broadcast. If so it needs to restart the broadcast hrtimer on itself. Its possible that the old broadcast cpu was hotplugged out when the broadcast hrtimer was about to fire on it. Therefore the newly nominated broadcast cpu should set the broadcast hrtimer on itself to expire immediately so as to not miss wakeups under such scenarios. Signed-off-by: Preeti U Murthy --- arch/powerpc/include/asm/time.h | 1 + arch/powerpc/kernel/time.c | 1 + drivers/cpuidle/cpuidle-ibm-power.c | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h index 38341fa..3bc0205 100644 --- a/arch/powerpc/include/asm/time.h +++ b/arch/powerpc/include/asm/time.h @@ -31,6 +31,7 @@ struct rtc_time; extern void to_tm(int tim, struct rtc_time * tm); extern void GregorianDay(struct rtc_time *tm); extern void decrementer_timer_interrupt(void); +extern void broadcast_irq_entry(void); extern void generic_calibrate_decr(void); diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 44a76de..0ac2e11 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -853,6 +853,7 @@ void decrementer_timer_interrupt(void) { u64 *next_tb = &__get_cpu_var(decrementers_next_tb); + broadcast_irq_entry(); *next_tb = get_tb_or_rtc(); __timer_interrupt(); } diff --git a/drivers/cpuidle/cpuidle-ibm-power.c b/drivers/cpuidle/cpuidle-ibm-power.c index ae47a0a..580ea04 100644 --- a/drivers/cpuidle/cpuidle-ibm-power.c +++ b/drivers/cpuidle/cpuidle-ibm-power.c @@ -282,6 +282,12 @@ static int longnap_loop(struct cpuidle_device *dev, return index; } +void broadcast_irq_entry(void) +{ + if (smp_processor_id() == bc_cpu) + hrtimer_start(bc_hrtimer, ns_to_ktime(0), HRTIMER_MODE_REL_PINNED); +} + /* * States for dedicated partition case. */ @@ -360,6 +366,7 @@ static int power_cpuidle_add_cpu_notifier(struct notifier_block *n, unsigned long action, void *hcpu) { int hotcpu = (unsigned long)hcpu; + unsigned long flags; struct cpuidle_device *dev = per_cpu(cpuidle_devices, hotcpu); @@ -372,6 +379,21 @@ static int power_cpuidle_add_cpu_notifier(struct notifier_block *n, cpuidle_resume_and_unlock(); break; + case CPU_DYING: + case CPU_DYING_FROZEN: + spin_lock_irqsave(&longnap_idle_lock, flags); + if (hotcpu == bc_cpu) { + bc_cpu = -1; + hrtimer_cancel(bc_hrtimer); + if (!cpumask_empty(tick_get_broadcast_oneshot_mask())) { + bc_cpu = cpumask_first( + tick_get_broadcast_oneshot_mask()); + arch_send_tick_broadcast(cpumask_of(bc_cpu)); + } + } + spin_unlock_irqrestore(&longnap_idle_lock, flags); + break; + case CPU_DEAD: case CPU_DEAD_FROZEN: cpuidle_pause_and_lock();