From patchwork Mon Feb 27 04:47:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 6948 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 7FE4323E01 for ; Mon, 27 Feb 2012 04:48:21 +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 37BD9A185F5 for ; Mon, 27 Feb 2012 04:48:21 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so7824105iab.11 for ; Sun, 26 Feb 2012 20:48:21 -0800 (PST) Received: from mr.google.com ([10.42.131.129]) by 10.42.131.129 with SMTP id z1mr12153068ics.53.1330318101068 (num_hops = 1); Sun, 26 Feb 2012 20:48:21 -0800 (PST) Received: by 10.42.131.129 with SMTP id z1mr9851783ics.53.1330318100965; Sun, 26 Feb 2012 20:48:20 -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 r10csp57817ibr; Sun, 26 Feb 2012 20:48:20 -0800 (PST) Received: by 10.236.192.138 with SMTP id i10mr14461972yhn.3.1330318100132; Sun, 26 Feb 2012 20:48:20 -0800 (PST) Received: from mail-gy0-f178.google.com (mail-gy0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id t5si13961339yht.93.2012.02.26.20.48.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Feb 2012 20:48:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.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-gy0-f178.google.com with SMTP id f1so185830ghb.37 for ; Sun, 26 Feb 2012 20:48:19 -0800 (PST) Received-SPF: pass (google.com: domain of rob.lee@linaro.org designates 10.236.144.133 as permitted sender) client-ip=10.236.144.133; Received: from mr.google.com ([10.236.144.133]) by 10.236.144.133 with SMTP id n5mr18572076yhj.54.1330318099989 (num_hops = 1); Sun, 26 Feb 2012 20:48:19 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.144.133 with SMTP id n5mr13845583yhj.54.1330318097384; Sun, 26 Feb 2012 20:48:17 -0800 (PST) Received: from b18647-20 ([67.23.168.6]) by mx.google.com with ESMTPS id w44sm35245363yhk.17.2012.02.26.20.48.15 (version=SSLv3 cipher=OTHER); Sun, 26 Feb 2012 20:48:16 -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 Subject: [PATCH v5 9/9] ARM: at91: Consolidate cpuidle functionality Date: Sun, 26 Feb 2012 22:47:43 -0600 Message-Id: <1330318063-25460-10-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1330318063-25460-1-git-send-email-rob.lee@linaro.org> References: <1330318063-25460-1-git-send-email-rob.lee@linaro.org> X-Gm-Message-State: ALoCoQke4LNwO+GeL04XK6mjSC2GOfjsvPvBWyzCdJYW9hVLZ7V22sRQbIdT6EwlISlcRa48oM4u Use newly added core cpuidle functionality and remove this duplicated code from the platform cpuidle. Signed-off-by: Robert Lee --- arch/arm/mach-at91/cpuidle.c | 64 ++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c index a851e6c..10c1564 100644 --- a/arch/arm/mach-at91/cpuidle.c +++ b/arch/arm/mach-at91/cpuidle.c @@ -27,66 +27,46 @@ static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device); -static struct cpuidle_driver at91_idle_driver = { - .name = "at91_idle", - .owner = THIS_MODULE, -}; - /* Actual code that puts the SoC in different idle states */ static int at91_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct timeval before, after; - int idle_time; u32 saved_lpr; - local_irq_disable(); - do_gettimeofday(&before); - if (index == 0) - /* Wait for interrupt state */ - cpu_do_idle(); - else if (index == 1) { - asm("b 1f; .align 5; 1:"); - asm("mcr p15, 0, r0, c7, c10, 4"); /* drain write buffer */ - saved_lpr = sdram_selfrefresh_enable(); - cpu_do_idle(); - sdram_selfrefresh_disable(saved_lpr); - } - do_gettimeofday(&after); - local_irq_enable(); - idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + - (after.tv_usec - before.tv_usec); + __asm__("b 1f; .align 5; 1:\n" + " mcr p15, 0, r0, c7, c10, 4"); /* drain write buffer */ + + saved_lpr = sdram_selfrefresh_enable(); + cpu_do_idle(); + sdram_selfrefresh_disable(saved_lpr); - dev->last_residency = idle_time; return index; } +static struct cpuidle_driver at91_idle_driver = { + .name = "at91_idle", + .owner = THIS_MODULE, + .en_core_tk_irqen = 1, + .states[0] = CPUIDLE_ARM_WFI_STATE, + .states[1] = { + .enter = at91_enter_idle, + .exit_latency = 10, + .target_residency = 100000, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "RAM_SR", + .desc = "WFI and DDR Self Refresh", + }, + .state_count = AT91_MAX_STATES, +}; + /* Initialize CPU idle by registering the idle states */ static int at91_init_cpuidle(void) { struct cpuidle_device *device; - struct cpuidle_driver *driver = &at91_idle_driver; device = &per_cpu(at91_cpuidle_device, smp_processor_id()); device->state_count = AT91_MAX_STATES; - driver->state_count = AT91_MAX_STATES; - - /* Wait for interrupt state */ - driver->states[0].enter = at91_enter_idle; - driver->states[0].exit_latency = 1; - driver->states[0].target_residency = 10000; - driver->states[0].flags = CPUIDLE_FLAG_TIME_VALID; - strcpy(driver->states[0].name, "WFI"); - strcpy(driver->states[0].desc, "Wait for interrupt"); - - /* Wait for interrupt and RAM self refresh state */ - driver->states[1].enter = at91_enter_idle; - driver->states[1].exit_latency = 10; - driver->states[1].target_residency = 10000; - driver->states[1].flags = CPUIDLE_FLAG_TIME_VALID; - strcpy(driver->states[1].name, "RAM_SR"); - strcpy(driver->states[1].desc, "WFI and RAM Self Refresh"); cpuidle_register_driver(&at91_idle_driver);