From patchwork Thu Mar 1 00:42:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 7019 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 08FD223EB0 for ; Thu, 1 Mar 2012 00:43:34 +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 C259BA1825C for ; Thu, 1 Mar 2012 00:43:33 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so90122iag.11 for ; Wed, 29 Feb 2012 16:43:33 -0800 (PST) Received: from mr.google.com ([10.50.187.168]) by 10.50.187.168 with SMTP id ft8mr2608517igc.55.1330562613625 (num_hops = 1); Wed, 29 Feb 2012 16:43:33 -0800 (PST) Received: by 10.50.187.168 with SMTP id ft8mr2163130igc.55.1330562613354; Wed, 29 Feb 2012 16:43:33 -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.53.18 with SMTP id k18csp4438ibg; Wed, 29 Feb 2012 16:43:32 -0800 (PST) Received: by 10.101.128.2 with SMTP id f2mr980932ann.20.1330562612285; Wed, 29 Feb 2012 16:43:32 -0800 (PST) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by mx.google.com with ESMTPS id t5si119718yht.106.2012.02.29.16.43.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Feb 2012 16:43:32 -0800 (PST) Received-SPF: neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.213.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.50 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-yw0-f50.google.com with SMTP id j63so13870yhj.37 for ; Wed, 29 Feb 2012 16:43:32 -0800 (PST) Received-SPF: pass (google.com: domain of rob.lee@linaro.org designates 10.236.37.132 as permitted sender) client-ip=10.236.37.132; Received: from mr.google.com ([10.236.37.132]) by 10.236.37.132 with SMTP id y4mr4119091yha.10.1330562612137 (num_hops = 1); Wed, 29 Feb 2012 16:43:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.37.132 with SMTP id y4mr3235243yha.10.1330562609408; Wed, 29 Feb 2012 16:43:29 -0800 (PST) Received: from b18647-20 ([67.23.168.160]) by mx.google.com with ESMTPS id v21sm429898yhk.3.2012.02.29.16.43.24 (version=SSLv3 cipher=OTHER); Wed, 29 Feb 2012 16:43:28 -0800 (PST) From: Robert Lee To: rjw@sisk.pl, len.brown@intel.com Cc: 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-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 v7 7/9] ARM: omap: Consolidate OMAP4 time keeping and irq enable Date: Wed, 29 Feb 2012 18:42:56 -0600 Message-Id: <1330562578-3410-8-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330562578-3410-1-git-send-email-rob.lee@linaro.org> References: <1330562578-3410-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQmFQZg2ps4fNe8zI4WuWUP6fy/KYnWrawfkv/7KfDCvWI4WKttd5AXggg3i7SFMfnFf58Gm 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..e2ff9f6 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,