From patchwork Wed Apr 3 21:37:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2389341 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AAD083FC71 for ; Wed, 3 Apr 2013 21:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761419Ab3DCVhW (ORCPT ); Wed, 3 Apr 2013 17:37:22 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:41196 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760497Ab3DCVhW (ORCPT ); Wed, 3 Apr 2013 17:37:22 -0400 Received: by mail-pa0-f48.google.com with SMTP id lj1so1114350pab.7 for ; Wed, 03 Apr 2013 14:37:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=AHrUvVWsrzLZe0egcehT5AdgswBSq+eKP+UeANNdC1g=; b=U8vnZ2dgNVcMmkP8wF0ZFbmGxjLMX2UQcXT8umPwcAwqf5+tNXI1oHRuN6IUoapr9s n3brpTPa7i2DlbeFth4lK04NtMjLAXR8GaFwZ3sHg8p+GzKh+kC7kPh6TRXa5amxctFU OyUq5e5EG5SQ34WF0c1p14BvcX0FNuDhxums5fNMWQsUDoYAUtQR2UBO3X0ozqlaUJ42 GNbDIEVj3t1canJe+m4SyCoEjpruD0i4cubSXswwkAqaHeGoCUrQjC2pXcAneyz9W4o4 ilN/IQeuyz/ezU0uhxsCWHGYfixv/jLVubJyqlxYSxOxnMqLZQuj/P6WZiUUH+FCq1DX ne/A== X-Received: by 10.68.197.231 with SMTP id ix7mr4968822pbc.123.1365025041700; Wed, 03 Apr 2013 14:37:21 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id to7sm8463536pab.0.2013.04.03.14.37.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 14:37:20 -0700 (PDT) From: Kevin Hilman To: Santosh Shilimkar Cc: , , , Subject: Re: [PATCH v2 16/18] ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state() References: <1364205910-32392-1-git-send-email-santosh.shilimkar@ti.com> <1364205910-32392-17-git-send-email-santosh.shilimkar@ti.com> Date: Wed, 03 Apr 2013 14:37:18 -0700 In-Reply-To: <1364205910-32392-17-git-send-email-santosh.shilimkar@ti.com> (Santosh Shilimkar's message of "Mon, 25 Mar 2013 15:35:08 +0530") Message-ID: <876203qos1.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm/VsUejprTFrL4Nwckj05xhS8SF5Rtiuwl4aB6qFTRTzHOatrU1FEAMbaxQ7gy6KzaNdyX Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Santosh Shilimkar writes: > Current OMAP4 CPUIdle driver is using omap4_mpuss_read_prev_context_state() > function to check whether the MPU cluster lost context or not. Thanks to > couple CPUIdle, cluster low power entry is almost guaranteed and hence > the programmed cluster check is enough in idle exit path. The API was > more of an optimization for corner cases, where if the cluster low power > entry fails for some reason, the cluster context restore gets skipped. > > Moving forward, OMAP CPUidle drivers needs to be moved to drivers/idle/* > once the PRM/CM code gets moved to drivers. This patch also reduces one > dependency with platform code for idle driver movement. > > Acked-by: Nishanth Menon > Signed-off-by: Santosh Shilimkar Looks good, but I find the changelog a bit confusing. Below is a slightly modified patch (I only modified the changelog). If those changes are OK with you, I'll add it to my cpuidle branch as well. Kevin From c01794dc249f826f0714578f26ff9efd35ea6296 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 25 Mar 2013 15:35:08 +0530 Subject: [PATCH] ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state() Current OMAP4 CPUIdle driver is using omap4_mpuss_read_prev_context_state() to check whether the MPU cluster lost context or not before calling cpu_cluster_pm_exit(). This was initially done an optimization for corner cases, where if the cluster low power entry fails for some reason, the cluster context restore gets skipped. However, since reading the previous context is expensive (involving slow accesses to the PRCM), it's better to avoid it and simply check the target cluster state instead. Moving forward, OMAP CPUidle drivers needs to be moved to drivers/idle/* once the PRM/CM code gets moved to drivers. This patch also reduces one dependency with platform code for idle driver movement. Acked-by: Nishanth Menon Signed-off-by: Santosh Shilimkar [khilman@linaro.org: minor changelog edits] Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/common.h | 5 ----- arch/arm/mach-omap2/cpuidle44xx.c | 3 ++- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 -------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 40f4a03..f5c9983 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -249,7 +249,6 @@ extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state); extern int omap4_finish_suspend(unsigned long cpu_state); extern void omap4_cpu_resume(void); extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state); -extern u32 omap4_mpuss_read_prev_context_state(void); #else static inline int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) @@ -277,10 +276,6 @@ static inline int omap4_finish_suspend(unsigned long cpu_state) static inline void omap4_cpu_resume(void) {} -static inline u32 omap4_mpuss_read_prev_context_state(void) -{ - return 0; -} #endif struct omap_sdrc_params; diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index 354517a..3cad103 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -149,7 +149,8 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev, * Call idle CPU cluster PM exit notifier chain * to restore GIC and wakeupgen context. */ - if (omap4_mpuss_read_prev_context_state()) + if ((cx->mpu_state == PWRDM_POWER_RET) && + (cx->mpu_logic_state == PWRDM_POWER_OFF)) cpu_cluster_pm_exit(); clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id); diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 8bcb64b..e80327b 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -139,20 +139,6 @@ static inline void cpu_clear_prev_logic_pwrst(unsigned int cpu_id) } } -/** - * omap4_mpuss_read_prev_context_state: - * Function returns the MPUSS previous context state - */ -u32 omap4_mpuss_read_prev_context_state(void) -{ - u32 reg; - - reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, - OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET); - reg &= OMAP4430_LOSTCONTEXT_DFF_MASK; - return reg; -} - /* * Store the CPU cluster state for L2X0 low power operations. */