From patchwork Fri Apr 4 07:47:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3936831 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 D25CF9F357 for ; Fri, 4 Apr 2014 07:48:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E392C203E1 for ; Fri, 4 Apr 2014 07:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 002A0203DC for ; Fri, 4 Apr 2014 07:47:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752101AbaDDHr6 (ORCPT ); Fri, 4 Apr 2014 03:47:58 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:62824 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755AbaDDHr5 (ORCPT ); Fri, 4 Apr 2014 03:47:57 -0400 Received: by mail-wi0-f182.google.com with SMTP id d1so687025wiv.3 for ; Fri, 04 Apr 2014 00:47:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wLt2TOLPaSeVX5o2TUwDBCxf7sRS2vc6q6rAVznN/lo=; b=Q3a2KDmeTbdXArCtj0vbmrRqLb6QPSPbhoWXoCHZJibC9N5lr3U7P+SS5MT80El3G7 QHjyLYC05MnAppVMPEEHQkf9U+bPFENKlbUXVTMCqRglSthZ/AvY9OEKHC7AjNu5iWQs N96cBVucwb+G/if8M9/SNIjQV9qCUcR2EgKYU0uMdZ4idXPReNS9Z529EPrHoeMtHx5k TKdAXExU0/ru7tGmoyanegZVZ7UnPs0FatKuVfx9wiu2pGt/cwhAJtRA4BiyboR/seRd LYt+gZWjpLFxwMQ4drk7Bcnjnny5aOn4l54fWiJf9sLCyfr0px9DhIAGHB432UqlIWRY 15aQ== X-Gm-Message-State: ALoCoQkdFM1ghlm8hRh43jQthcEeJg/JWzMEIdRdJ/yWZ2ZdDFhcH30t7FhiX3b/sHImGIvn4cBL X-Received: by 10.194.58.180 with SMTP id s20mr17615454wjq.54.1396597676758; Fri, 04 Apr 2014 00:47:56 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-451-172.w83-205.abo.wanadoo.fr. [83.205.74.172]) by mx.google.com with ESMTPSA id t1sm3028163wia.1.2014.04.04.00.47.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 00:47:56 -0700 (PDT) From: Daniel Lezcano To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, t.figa@samsung.com, linaro-kernel@lists.linaro.org, rjw@rjwysocki.net Subject: [PATCH 07/17] ARM: exynos: cpuidle: Use the cpu_pm notifier Date: Fri, 4 Apr 2014 09:47:53 +0200 Message-Id: <1396597683-6969-8-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> References: <1396597683-6969-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Use the cpu_pm_enter/exit notifier to group some pm code inside the pm file. The save and restore code is duplicated across pm.c and cpuidle.c. By using the cpu_pm notifier, we can factor out the routine. Signed-off-by: Daniel Lezcano --- arch/arm/mach-exynos/cpuidle.c | 24 ------------------------ arch/arm/mach-exynos/pm.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index a1e1882..4b090cf 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -66,26 +66,6 @@ static void exynos_set_wakeupmask(void) __raw_writel(0x0000ff3e, S5P_WAKEUP_MASK); } -static unsigned int g_pwr_ctrl, g_diag_reg; - -static void save_cpu_arch_register(void) -{ - /*read power control register*/ - asm("mrc p15, 0, %0, c15, c0, 0" : "=r"(g_pwr_ctrl) : : "cc"); - /*read diagnostic register*/ - asm("mrc p15, 0, %0, c15, c0, 1" : "=r"(g_diag_reg) : : "cc"); - return; -} - -static void restore_cpu_arch_register(void) -{ - /*write power control register*/ - asm("mcr p15, 0, %0, c15, c0, 0" : : "r"(g_pwr_ctrl) : "cc"); - /*write diagnostic register*/ - asm("mcr p15, 0, %0, c15, c0, 1" : : "r"(g_diag_reg) : "cc"); - return; -} - static int idle_finisher(unsigned long flags) { exynos_set_wakeupmask(); @@ -107,8 +87,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, { unsigned long tmp; - save_cpu_arch_register(); - /* Setting Central Sequence Register for power down mode */ tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); tmp &= ~S5P_CENTRAL_LOWPWR_CFG; @@ -123,8 +101,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, #endif cpu_pm_exit(); - restore_cpu_arch_register(); - /* * If PMU failed while entering sleep mode, WFI will be * ignored by PMU and then exiting cpu_do_idle(). diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 2326c67..b2a075e 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -376,16 +377,38 @@ early_wakeup: return; } +static int exynos_cpu_pm_notifier(struct notifier_block *self, + unsigned long cmd, void *v) +{ + switch (cmd) { + case CPU_PM_ENTER: + exynos_cpu_save_register(); + break; + + case CPU_PM_EXIT: + exynos_cpu_restore_register(); + break; + } + + return NOTIFY_OK; +} + static struct syscore_ops exynos_pm_syscore_ops = { .suspend = exynos_pm_suspend, .resume = exynos_pm_resume, }; +static struct notifier_block exynos_cpu_pm_notifier_block = { + .notifier_call = exynos_cpu_pm_notifier, +}; static __init int exynos_pm_syscore_init(void) { if (soc_is_exynos5440()) return 0; + if (!soc_is_exynos5250()) + cpu_pm_register_notifier(&exynos_cpu_pm_notifier_block); + register_syscore_ops(&exynos_pm_syscore_ops); return 0; }