From patchwork Tue Mar 20 20:22:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 7371 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 4F2A423DC3 for ; Tue, 20 Mar 2012 20:23:23 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 13C22A1802F for ; Tue, 20 Mar 2012 20:23:22 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so671092iag.11 for ; Tue, 20 Mar 2012 13:23:22 -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=zsWySHCHc3bWEXOSwuJuUeXrC8dE6lNjXiuVteKVnJw=; b=D5dfqeDXXPX+iRDW64kwffZX2MtSYJMIuqXP8weldVARqJD9bZo32JLPpXRimiMN3o DCYmQmdLq2GzmPbhpmTSDAMhoViyiKbicN5srdnN6jaOQKprb1FKzbjFlb7JTGcY/gMW PCoNyjTxgugkBsmKK9O08p7kts366bITtEUylUgxuQVpPyiR5TeVkPwCMT4d3Uffvnry PpiLk8um3RqsGqMD5H4N/IjGK4/np7FSZIFsCte/Zwg/6JWqVUuAygI0Wr1GumWCMJGs xQVxL4D2B3GSKEZrfKCE+YzG+XI1jfEgR6tucGnLEaswf/JS3bwVuUyjiFjyfP1pfz2L u4Qg== Received: by 10.50.155.229 with SMTP id vz5mr1032120igb.12.1332275002856; Tue, 20 Mar 2012 13:23:22 -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 fh15csp12156ibb; Tue, 20 Mar 2012 13:23:22 -0700 (PDT) Received: by 10.229.78.165 with SMTP id l37mr513361qck.142.1332275001937; Tue, 20 Mar 2012 13:23:21 -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 l7si1074534qcw.160.2012.03.20.13.23.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 13:23:21 -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 e14so250671qcs.37 for ; Tue, 20 Mar 2012 13:23:21 -0700 (PDT) Received: by 10.224.58.147 with SMTP id g19mr2674631qah.58.1332274997663; Tue, 20 Mar 2012 13:23:17 -0700 (PDT) Received: from localhost.localdomain ([216.59.27.113]) by mx.google.com with ESMTPS id n8sm4392976qan.12.2012.03.20.13.23.14 (version=SSLv3 cipher=OTHER); Tue, 20 Mar 2012 13:23:17 -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 6/8] ARM: omap: Consolidate OMAP4 time keeping and irq enable Date: Tue, 20 Mar 2012 15:22:47 -0500 Message-Id: <1332274969-15782-7-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: ALoCoQn+vPQ3bVJLcO0rf6alM2yTncFK8ubJ9PHL4Cqv0FkB5qepQ+/KQn/++X1PNKaPXsNjyMu3 Enable core cpuidle timekeeping and irq enabling and remove that handling from this code. Signed-off-by: Robert Lee Reviewed-by: Kevin Hilman Reviewed-by: Daniel Lezcano Acked-by: Jean Pihet --- arch/arm/mach-omap2/cpuidle44xx.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index 72e018b..f386cbe 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -62,15 +62,9 @@ static int omap4_enter_idle(struct cpuidle_device *dev, { struct omap4_idle_statedata *cx = cpuidle_get_statedata(&dev->states_usage[index]); - struct timespec ts_preidle, ts_postidle, ts_idle; u32 cpu1_state; - int idle_time; int cpu_id = smp_processor_id(); - /* Used to keep track of the total time in idle */ - getnstimeofday(&ts_preidle); - - local_irq_disable(); local_fiq_disable(); /* @@ -128,26 +122,17 @@ static int omap4_enter_idle(struct cpuidle_device *dev, if (index > 0) clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id); - 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; } DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); struct cpuidle_driver omap4_idle_driver = { - .name = "omap4_idle", - .owner = THIS_MODULE, + .name = "omap4_idle", + .owner = THIS_MODULE, + .en_core_tk_irqen = 1, }; static inline void _fill_cstate(struct cpuidle_driver *drv,