From patchwork Fri Apr 4 07:47:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 27780 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5BC8320369 for ; Fri, 4 Apr 2014 07:48:07 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id j7sf7644908qaq.6 for ; Fri, 04 Apr 2014 00:48:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=NbjxatGV13mKNOeH0W23exyLT52SKOJa8rs/OP7EgqY=; b=PBfev3E6/4qM6l5+L1mm0lLEtj+YyV7tqI7M74x27yJkLXVvJrPGWjYcdNsBVv75kH Hi6D/q3qgLoJ7JbMySkMye+4hs5CVeJYudMC2yXbjjG92XtC4NHDDy5QdYP9sMozdJdX 00TE3MANY4CdjVGUap+KBEgl5ppY1heCUkbLy/iU12sMYQDLM8VCu/aEmm/dPL1MCgtE V7O1RN8Xqfzr5CekVAviadt+Si1eKkAgbxogvVZsH1luM3THRWh0s0FoqVAJp83/yydv AVn3siIjyJTDkr0XsMCdS1rTKPj3GQM2dG/cAS6SlylHh62AywrYeKUj6aIExvYEK8k7 sm4Q== X-Gm-Message-State: ALoCoQl3S0xINDXt2cUQjjXxrRGkC2gn0q1kyJ0tP9SpQUXnC4zHsreuQF7xdGKTeJnSI/D0bFd/ X-Received: by 10.58.43.170 with SMTP id x10mr2653132vel.36.1396597687144; Fri, 04 Apr 2014 00:48:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.70 with SMTP id 64ls962218qgy.48.gmail; Fri, 04 Apr 2014 00:48:07 -0700 (PDT) X-Received: by 10.220.12.66 with SMTP id w2mr7010618vcw.15.1396597687070; Fri, 04 Apr 2014 00:48:07 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id tv3si1669570vdc.18.2014.04.04.00.48.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 00:48:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so1171590veb.15 for ; Fri, 04 Apr 2014 00:48:07 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr3835193vec.15.1396597686980; Fri, 04 Apr 2014 00:48:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp92817vcv; Fri, 4 Apr 2014 00:48:06 -0700 (PDT) X-Received: by 10.69.19.161 with SMTP id gv1mr8717919pbd.143.1396597686096; Fri, 04 Apr 2014 00:48:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iw3si4270530pac.96.2014.04.04.00.48.05; Fri, 04 Apr 2014 00:48:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbaDDHsE (ORCPT + 9 others); Fri, 4 Apr 2014 03:48:04 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:61004 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752138AbaDDHsD (ORCPT ); Fri, 4 Apr 2014 03:48:03 -0400 Received: by mail-wi0-f176.google.com with SMTP id r20so683928wiv.15 for ; Fri, 04 Apr 2014 00:48:01 -0700 (PDT) X-Received: by 10.180.39.173 with SMTP id q13mr2278547wik.26.1396597681845; Fri, 04 Apr 2014 00:48:01 -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.48.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 00:48:01 -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 11/17] ARM: exynos: cpuidle: Move the power sequence call in the cpu_pm notifier Date: Fri, 4 Apr 2014 09:47:57 +0200 Message-Id: <1396597683-6969-12-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: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The code to initiate and exit the powerdown sequence is the same in pm.c and cpuidle.c. Let's split the common part in the pm.c and reuse it from the cpu_pm notifier. That is one more step forward to make the cpuidle driver arch indenpendant. Signed-off-by: Daniel Lezcano --- arch/arm/mach-exynos/cpuidle.c | 21 --------------------- arch/arm/mach-exynos/pm.c | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 7014654..635b09c 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -77,31 +77,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - unsigned long tmp; - - /* Setting Central Sequence Register for power down mode */ - tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); - tmp &= ~S5P_CENTRAL_LOWPWR_CFG; - __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); - cpu_pm_enter(); cpu_suspend(0, idle_finisher); cpu_pm_exit(); - /* - * If PMU failed while entering sleep mode, WFI will be - * ignored by PMU and then exiting cpu_do_idle(). - * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically - * in this situation. - */ - tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); - if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) { - tmp |= S5P_CENTRAL_LOWPWR_CFG; - __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); - /* Clear wakeup state register */ - __raw_writel(0x0, S5P_WAKEUP_STAT); - } - return index; } diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 3f2ddef..b364212 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -301,15 +301,19 @@ static __init int exynos_pm_drvinit(void) } arch_initcall(exynos_pm_drvinit); -static int exynos_pm_suspend(void) +static void exynos_pm_central_suspend(void) { unsigned long tmp; /* Setting Central Sequence Register for power down mode */ - tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION); tmp &= ~S5P_CENTRAL_LOWPWR_CFG; __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); +} + +static int exynos_pm_suspend(void) +{ + unsigned long tmp; /* Setting SEQ_OPTION register */ @@ -322,7 +326,7 @@ static int exynos_pm_suspend(void) return 0; } -static void exynos_pm_resume(void) +static int exynos_pm_central_resume(void) { unsigned long tmp; @@ -339,9 +343,17 @@ static void exynos_pm_resume(void) /* clear the wakeup state register */ __raw_writel(0x0, S5P_WAKEUP_STAT); /* No need to perform below restore code */ - goto early_wakeup; + return -1; } + return 0; +} + +static void exynos_pm_resume(void) +{ + if (exynos_pm_central_resume()) + goto early_wakeup; + if (!soc_is_exynos5250()) exynos_cpu_restore_register(); @@ -385,6 +397,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, { switch (cmd) { case CPU_PM_ENTER: + exynos_pm_central_suspend(); exynos_cpu_save_register(); exynos_set_wakeupmask(); break; @@ -392,6 +405,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_EXIT: scu_enable(S5P_VA_SCU); exynos_cpu_restore_register(); + exynos_pm_central_resume(); break; }