From patchwork Wed Feb 29 03:11:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 6990 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 2B35323EAF for ; Wed, 29 Feb 2012 03:12:20 +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 E83F1A18089 for ; Wed, 29 Feb 2012 03:12:19 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2503688iag.11 for ; Tue, 28 Feb 2012 19:12:19 -0800 (PST) Received: from mr.google.com ([10.50.187.168]) by 10.50.187.168 with SMTP id ft8mr5284250igc.55.1330485139790 (num_hops = 1); Tue, 28 Feb 2012 19:12:19 -0800 (PST) Received: by 10.50.187.168 with SMTP id ft8mr4387437igc.55.1330485139752; Tue, 28 Feb 2012 19:12:19 -0800 (PST) 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.11.10 with SMTP id r10csp23426ibr; Tue, 28 Feb 2012 19:12:19 -0800 (PST) Received: by 10.236.128.173 with SMTP id f33mr24339386yhi.107.1330485139047; Tue, 28 Feb 2012 19:12:19 -0800 (PST) Received: from mail-gx0-f178.google.com (mail-gx0-f178.google.com [209.85.161.178]) by mx.google.com with ESMTPS id d9si22510611yhn.31.2012.02.28.19.12.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 19:12:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.161.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.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 ggno1 with SMTP id o1so630145ggn.37 for ; Tue, 28 Feb 2012 19:12:18 -0800 (PST) Received-SPF: pass (google.com: domain of rob.lee@linaro.org designates 10.236.78.72 as permitted sender) client-ip=10.236.78.72; Received: from mr.google.com ([10.236.78.72]) by 10.236.78.72 with SMTP id f48mr21822746yhe.121.1330485138863 (num_hops = 1); Tue, 28 Feb 2012 19:12:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.78.72 with SMTP id f48mr16612286yhe.121.1330485136273; Tue, 28 Feb 2012 19:12:16 -0800 (PST) Received: from b18647-20 ([216.59.3.73]) by mx.google.com with ESMTPS id j2sm32232637ani.19.2012.02.28.19.12.13 (version=SSLv3 cipher=OTHER); Tue, 28 Feb 2012 19:12:15 -0800 (PST) From: Robert Lee To: len.brown@intel.com, khilman@ti.com Cc: 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-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 v6 7/9] ARM: omap: Consolidate OMAP4 time keeping and irq enable Date: Tue, 28 Feb 2012 21:11:47 -0600 Message-Id: <1330485109-7327-8-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330485109-7327-1-git-send-email-rob.lee@linaro.org> References: <1330485109-7327-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQmobN6gsAaxUFNVNPlftOgz2/KdmAeI9rfUQMIp9hlOeNd9QRBd4OOBitf4LB3uOk0Vcjcp Enable core cpuidle timekeeping and irq enabling and remove that handling from this code. Signed-off-by: Robert Lee --- arch/arm/mach-omap2/cpuidle44xx.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index cfdbb86..9729d2e 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -62,16 +62,10 @@ 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 new_state_idx; 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(); /* @@ -129,26 +123,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,