From patchwork Fri Aug 23 16:19:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep KarkadaNagesha X-Patchwork-Id: 2848932 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E0F8FBF546 for ; Fri, 23 Aug 2013 16:22:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 056F8203FD for ; Fri, 23 Aug 2013 16:22:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2716203FB for ; Fri, 23 Aug 2013 16:22:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCu7E-0005JU-Lc; Fri, 23 Aug 2013 16:21:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCu6x-0007tZ-TD; Fri, 23 Aug 2013 16:21:19 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VCu6P-0007pA-Pm for linux-arm-kernel@lists.infradead.org; Fri, 23 Aug 2013 16:20:50 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 23 Aug 2013 17:20:26 +0100 Received: from e103737-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 Aug 2013 17:20:24 +0100 From: Sudeep KarkadaNagesha To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/5] drivers: clocksource: add CPU PM notifier for ARM architected timer Date: Fri, 23 Aug 2013 17:19:09 +0100 Message-Id: <1377274749-6196-6-git-send-email-Sudeep.KarkadaNagesha@arm.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377274749-6196-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> References: <1377274749-6196-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> X-OriginalArrivalTime: 23 Aug 2013 16:20:24.0204 (UTC) FILETIME=[ABCAB4C0:01CEA01C] X-MC-Unique: 113082317202608101 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130823_122046_136211_E66C4B80 X-CRM114-Status: GOOD ( 14.19 ) X-Spam-Score: -2.6 (--) Cc: Lorenzo Pieralisi , Sudeep KarkadaNagesha , Catalin Marinas , Daniel Lezcano , Will Deacon , Thomas Gleixner X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 From: Sudeep KarkadaNagesha Few control settings done in architected timer as part of initialisation can be lost when CPU enters deeper power states. They need to be re-initialised when the CPU is (warm)reset again. This patch adds CPU PM notifiers to do the timer initialisation on warm resets. It also save the event stream divider value calculated during cold reset and uses the same in warm reset path. Cc: Catalin Marinas Reviewed-by: Lorenzo Pieralisi Reviewed-by: Will Deacon Signed-off-by: Sudeep KarkadaNagesha --- drivers/clocksource/arm_arch_timer.c | 47 +++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index e331818..1d5b75d 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -124,6 +125,12 @@ static int arch_timer_set_next_event_phys(unsigned long evt, } #ifdef CONFIG_ARM_ARCH_TIMER_EVTSTREAM +static int arch_timer_evtstream_div; +static void arch_timer_evtstream_reset(void) +{ + /* enable event stream */ + arch_timer_evtstrm_config(true, arch_timer_evtstream_div); +} static void arch_timer_setup_evtstream(void) { int evt_stream_div, pos; @@ -133,16 +140,19 @@ static void arch_timer_setup_evtstream(void) pos = fls(evt_stream_div); if (pos > 1 && !(evt_stream_div & (1 << (pos - 2)))) pos--; - /* enable event stream */ - arch_timer_evtstrm_config(true, min(pos, 15)); + /* save divider value for use in CPU PM notifier */ + arch_timer_evtstream_div = min(pos, 15); + arch_timer_evtstream_reset(); /* enable hwcap definition to the users for event stream feature */ arch_timer_set_hwcap_evtstrm(); } #else -static void arch_timer_setup_evtstream(void) +static void arch_timer_evtstream_reset(void) { + /* disable event stream */ arch_timer_evtstrm_config(false, 0); } +#define arch_timer_setup_evtstream arch_timer_evtstream_reset #endif static int arch_timer_setup(struct clock_event_device *clk) @@ -283,6 +293,31 @@ static struct notifier_block arch_timer_cpu_nb = { .notifier_call = arch_timer_cpu_notify, }; +#ifdef CONFIG_CPU_PM +static int arch_timer_cpu_pm_notify(struct notifier_block *self, + unsigned long action, void *hcpu) +{ + if (action == CPU_PM_EXIT) + arch_timer_evtstream_reset(); + + return NOTIFY_OK; +} + +static struct notifier_block arch_timer_cpu_pm_notifier = { + .notifier_call = arch_timer_cpu_pm_notify, +}; + +static int __init arch_timer_cpu_pm_init(void) +{ + return cpu_pm_register_notifier(&arch_timer_cpu_pm_notifier); +} +#else +static int __init arch_timer_cpu_pm_init(void) +{ + return 0; +} +#endif + static int __init arch_timer_register(void) { int err; @@ -332,11 +367,17 @@ static int __init arch_timer_register(void) if (err) goto out_free_irq; + err = arch_timer_cpu_pm_init(); + if (err) + goto out_unreg_notify; + /* Immediately configure the timer on the boot CPU */ arch_timer_setup(this_cpu_ptr(arch_timer_evt)); return 0; +out_unreg_notify: + unregister_cpu_notifier(&arch_timer_cpu_nb); out_free_irq: if (arch_timer_use_virtual) free_percpu_irq(arch_timer_ppi[VIRT_PPI], arch_timer_evt);