From patchwork Fri Feb 12 18:27:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 78920 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1CGdphm008972 for ; Fri, 12 Feb 2010 16:39:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757246Ab0BLQjv (ORCPT ); Fri, 12 Feb 2010 11:39:51 -0500 Received: from smtp.nokia.com ([192.100.105.134]:64055 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757179Ab0BLQjt (ORCPT ); Fri, 12 Feb 2010 11:39:49 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o1CGdfLS022062 for ; Fri, 12 Feb 2010 10:39:48 -0600 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 12 Feb 2010 18:39:42 +0200 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 12 Feb 2010 18:39:42 +0200 Received: from localhost.localdomain (sokoban.nmp.nokia.com [172.22.215.13]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o1CGdVM1021112 for ; Fri, 12 Feb 2010 18:39:41 +0200 From: Tero Kristo To: linux-omap@vger.kernel.org Subject: [PATCHv6 8/9] OMAP3: CPUidle: Fixed off-mode support to fall-back to proper C state Date: Fri, 12 Feb 2010 20:27:44 +0200 Message-Id: <1265999265-4363-9-git-send-email-tero.kristo@nokia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1265999265-4363-8-git-send-email-tero.kristo@nokia.com> References: <> <1265999265-4363-1-git-send-email-tero.kristo@nokia.com> <1265999265-4363-2-git-send-email-tero.kristo@nokia.com> <1265999265-4363-3-git-send-email-tero.kristo@nokia.com> <1265999265-4363-4-git-send-email-tero.kristo@nokia.com> <1265999265-4363-5-git-send-email-tero.kristo@nokia.com> <1265999265-4363-6-git-send-email-tero.kristo@nokia.com> <1265999265-4363-7-git-send-email-tero.kristo@nokia.com> <1265999265-4363-8-git-send-email-tero.kristo@nokia.com> X-OriginalArrivalTime: 12 Feb 2010 16:39:42.0306 (UTC) FILETIME=[FA050C20:01CAAC01] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 12 Feb 2010 16:39:52 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 914022f..e41019f 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -115,13 +115,6 @@ static int omap3_enter_idle(struct cpuidle_device *dev, local_irq_disable(); local_fiq_disable(); - if (!enable_off_mode) { - if (mpu_state < PWRDM_POWER_RET) - mpu_state = PWRDM_POWER_RET; - if (core_state < PWRDM_POWER_RET) - core_state = PWRDM_POWER_RET; - } - omap3_pwrdm_set_next_pwrst(mpu_pd, mpu_state); omap3_pwrdm_set_next_pwrst(core_pd, core_state); @@ -155,7 +148,7 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, { struct cpuidle_state *new_state = state; u32 per_state = 0, saved_per_state = 0, cam_state, usb_state; - u32 iva2_state, sgx_state, dss_state, new_core_state; + u32 iva2_state, sgx_state, dss_state, new_core_state, new_mpu_state; struct omap3_processor_cx *cx; int ret; @@ -167,6 +160,14 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, } cx = cpuidle_get_statedata(state); new_core_state = cx->core_state; + new_mpu_state = cx->mpu_state; + + if (!enable_off_mode) { + if (new_mpu_state < PWRDM_POWER_RET) + new_mpu_state = PWRDM_POWER_RET; + if (new_core_state < PWRDM_POWER_RET) + new_core_state = PWRDM_POWER_RET; + } /* Check if CORE is active, if yes, fallback to inactive */ if (!pwrdm_can_idle(core_pd)) @@ -223,8 +224,9 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, new_core_state = PWRDM_POWER_RET; } - /* Fallback to new target core state */ - while (cx->core_state < new_core_state) { + /* Fallback to new target core/mpu state */ + while (cx->core_state < new_core_state || + cx->mpu_state < new_mpu_state) { state--; cx = cpuidle_get_statedata(state); }