From patchwork Tue Dec 6 04:38:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 5504 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 001B623E10 for ; Tue, 6 Dec 2011 04:38:22 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id D9864A1862B for ; Tue, 6 Dec 2011 04:38:22 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id m6so727409lag.11 for ; Mon, 05 Dec 2011 20:38:22 -0800 (PST) Received: by 10.152.104.206 with SMTP id gg14mr7908943lab.41.1323146302769; Mon, 05 Dec 2011 20:38:22 -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.152.41.198 with SMTP id h6cs296304lal; Mon, 5 Dec 2011 20:38:22 -0800 (PST) Received: by 10.229.68.234 with SMTP id w42mr2644306qci.251.1323146300510; Mon, 05 Dec 2011 20:38:20 -0800 (PST) Received: from mail-qw0-f50.google.com (mail-qw0-f50.google.com [209.85.216.50]) by mx.google.com with ESMTPS id w6si6554759qcv.55.2011.12.05.20.38.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 20:38:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.50 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.216.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.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 qaea17 with SMTP id a17so472697qae.16 for ; Mon, 05 Dec 2011 20:38:19 -0800 (PST) Received: by 10.224.192.10 with SMTP id do10mr10499001qab.50.1323146298663; Mon, 05 Dec 2011 20:38:18 -0800 (PST) Received: from b18647-20 ([23.19.172.17]) by mx.google.com with ESMTPS id fm5sm29806936qab.20.2011.12.05.20.38.17 (version=SSLv3 cipher=OTHER); Mon, 05 Dec 2011 20:38:18 -0800 (PST) From: Robert Lee To: linux@arm.linux.org.uk, s.hauer@pengutronix.de Cc: shawn.guo@freescale.com, nicolas.ferre@atmel.com, linux@maxim.org.za, kgene.kim@samsung.com, amit.kachhap@linaro.org, magnus.damm@gmail.com, khilman@ti.com, nsekhar@ti.com, daniel.lezcano@linaro.org, mturquette@linaro.org, vincent.guittot@linaro.org, arnd.bergmann@linaro.org, amit.kucheria@linaro.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org Subject: [RFC PATCH 2/8] ARM: at91: Replace init with new common ARM cpuidle init code Date: Mon, 5 Dec 2011 22:38:05 -0600 Message-Id: <1323146291-10676-3-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1323146291-10676-1-git-send-email-rob.lee@linaro.org> References: <1323146291-10676-1-git-send-email-rob.lee@linaro.org> Replace duplicated cpuidle init functionality with common ARM cpuidle init implementation. Signed-off-by: Robert Lee --- arch/arm/mach-at91/cpuidle.c | 68 ++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 45 deletions(-) diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c index a851e6c..bd0bbfc 100644 --- a/arch/arm/mach-at91/cpuidle.c +++ b/arch/arm/mach-at91/cpuidle.c @@ -1,6 +1,4 @@ /* - * based on arch/arm/mach-kirkwood/cpuidle.c - * * CPU idle support for AT91 SoC * * This file is licensed under the terms of the GNU General Public @@ -17,19 +15,32 @@ #include #include #include -#include #include #include - +#include +#include #include "pm.h" -#define AT91_MAX_STATES 2 - -static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device); +#define AT91_MAX_STATES 2 static struct cpuidle_driver at91_idle_driver = { .name = "at91_idle", .owner = THIS_MODULE, + .states[0] = { + .exit_latency = 1, + .target_residency = 100000, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "WFI", + .desc = "Wait for interrupt", + }, + .states[1] = { + .exit_latency = 10, + .target_residency = 100000, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "RAM_SR", + .desc = "WFI and RAM Self Refresh", + }, + .state_count = AT91_MAX_STATES, }; /* Actual code that puts the SoC in different idle states */ @@ -37,12 +48,8 @@ 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(); @@ -53,48 +60,19 @@ static int at91_enter_idle(struct cpuidle_device *dev, 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); - dev->last_residency = idle_time; return index; } /* 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; + int ret; - device = &per_cpu(at91_cpuidle_device, smp_processor_id()); - device->state_count = AT91_MAX_STATES; - driver->state_count = AT91_MAX_STATES; + ret = arm_cpuidle_init(&at91_idle_driver, + at91_enter_idle, + NULL); - /* 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); - - if (cpuidle_register_device(device)) { - printk(KERN_ERR "at91_init_cpuidle: Failed registering\n"); - return -EIO; - } - return 0; + return ret; } - device_initcall(at91_init_cpuidle);