From patchwork Tue Mar 20 20:22:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 7370 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E6F3723DC3 for ; Tue, 20 Mar 2012 20:23:21 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9A765A1802F for ; Tue, 20 Mar 2012 20:23:21 +0000 (UTC) Received: by yenl4 with SMTP id l4so606928yen.11 for ; Tue, 20 Mar 2012 13:23:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=lIqPH0YtF4DpGEqDowyZ/2obKHpmNHku6diPwUD2gF8=; b=WXAjVjg1J5nskFzJspUqQj8eqjunJVA7XluJpNowc7skpJa+C1byZ9joGYZSZQHTWf z0YwSojIO9CSg1ONTzdv3DlitrNYPqUxHj9f+7fmO49BK18FJ7oedDkN2sH3kYzOmXf/ VF+UPjDWqPZ7d+C6IL/AqTKllels1jveI8I64mTNX+aCzs7d9D11a3wk+noMusPTfzF1 Z9D+zG9d/gyCjEdWbm/lB8MPa9SOwEWhFRyZhs9JtT9glIvqvgLhUYE65E8jjzNTMGev 4UJB3ich0KD/pq0cPpfTtKHrR5KtQZY/OjxndB+CeukayS6PZzMxI10PPuDBGGN4qpu4 ukyg== Received: by 10.50.153.193 with SMTP id vi1mr1059374igb.2.1332274999824; Tue, 20 Mar 2012 13:23:19 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.203.79 with SMTP id fh15csp12155ibb; Tue, 20 Mar 2012 13:23:19 -0700 (PDT) Received: by 10.224.53.15 with SMTP id k15mr2594121qag.93.1332274998192; Tue, 20 Mar 2012 13:23:18 -0700 (PDT) Received: from mail-qc0-f178.google.com (mail-qc0-f178.google.com [209.85.216.178]) by mx.google.com with ESMTPS id hl5si2520002qab.102.2012.03.20.13.23.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 13:23:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.216.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.216.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) smtp.mail=rob.lee@linaro.org Received: by mail-qc0-f178.google.com with SMTP id e14so250683qcs.37 for ; Tue, 20 Mar 2012 13:23:18 -0700 (PDT) Received: by 10.229.114.220 with SMTP id f28mr508197qcq.151.1332274994462; Tue, 20 Mar 2012 13:23:14 -0700 (PDT) Received: from localhost.localdomain ([216.59.27.113]) by mx.google.com with ESMTPS id n8sm4392976qan.12.2012.03.20.13.23.10 (version=SSLv3 cipher=OTHER); Tue, 20 Mar 2012 13:23:13 -0700 (PDT) From: Robert Lee To: len.brown@intel.com Cc: akpm@linux-foundation.org, rjw@sisk.pl, khilman@ti.com, robherring2@gmail.com, Baohua.Song@csr.com, amit.kucheria@linaro.org, nicolas.ferre@atmel.com, linux@maxim.org.za, kgene.kim@samsung.com, amit.kachhap@linaro.org, magnus.damm@gmail.com, nsekhar@ti.com, daniel.lezcano@linaro.org, mturquette@linaro.org, vincent.guittot@linaro.org, arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org, deepthi@linux.vnet.ibm.com, broonie@opensource.wolfsonmicro.com, nicolas.pitre@linaro.org, linux@arm.linux.org.uk, jean.pihet@newoldbits.com, venki@google.com, ccross@google.com, g.trinabh@gmail.com, kernel@wantstofly.org, lethal@linux-sh.org, jon-hunter@ti.com, tony@atomide.com, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v8 5/8] ARM: omap: Consolidate OMAP3 time keeping and irq enable Date: Tue, 20 Mar 2012 15:22:46 -0500 Message-Id: <1332274969-15782-6-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.9.4 In-Reply-To: <1332274969-15782-1-git-send-email-rob.lee@linaro.org> References: <1332274969-15782-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQmqugpm0t2ITH3ZkSXou1ImE8LbE+bx2oPQveW0+Cu27O8ygMizyQFCd5knOnMLQEzUtTsT Use core cpuidle timekeeping and irqen wrapper and remove that handling from this code. Signed-off-by: Robert Lee Reviewed-by: Kevin Hilman Reviewed-by: Daniel Lezcano Tested-by: Jean Pihet Acked-by: Jean Pihet --- arch/arm/mach-omap2/cpuidle34xx.c | 42 +++++++++++++++---------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 464cffd..5358664 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -87,29 +87,14 @@ static int _cpuidle_deny_idle(struct powerdomain *pwrdm, return 0; } -/** - * omap3_enter_idle - Programs OMAP3 to enter the specified state - * @dev: cpuidle device - * @drv: cpuidle driver - * @index: the index of state to be entered - * - * Called from the CPUidle framework to program the device to the - * specified target state selected by the governor. - */ -static int omap3_enter_idle(struct cpuidle_device *dev, +static int __omap3_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { struct omap3_idle_statedata *cx = cpuidle_get_statedata(&dev->states_usage[index]); - struct timespec ts_preidle, ts_postidle, ts_idle; u32 mpu_state = cx->mpu_state, core_state = cx->core_state; - int idle_time; - - /* Used to keep track of the total time in idle */ - getnstimeofday(&ts_preidle); - local_irq_disable(); local_fiq_disable(); pwrdm_set_next_pwrst(mpu_pd, mpu_state); @@ -148,22 +133,29 @@ static int omap3_enter_idle(struct cpuidle_device *dev, } return_sleep_time: - getnstimeofday(&ts_postidle); - ts_idle = timespec_sub(ts_postidle, ts_preidle); - local_irq_enable(); local_fiq_enable(); - idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \ - USEC_PER_SEC; - - /* Update cpuidle counters */ - dev->last_residency = idle_time; - return index; } /** + * omap3_enter_idle - Programs OMAP3 to enter the specified state + * @dev: cpuidle device + * @drv: cpuidle driver + * @index: the index of state to be entered + * + * Called from the CPUidle framework to program the device to the + * specified target state selected by the governor. + */ +static inline int omap3_enter_idle(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle); +} + +/** * next_valid_state - Find next valid C-state * @dev: cpuidle device * @drv: cpuidle driver