* [PATCH v3 0/3] ARM: IMX5: cpuidle driver
@ 2011-02-17 9:01 yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 1/3] ARM: IMX: add tzic_enable_wake in the head file yong.shen at linaro.org
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: yong.shen at linaro.org @ 2011-02-17 9:01 UTC (permalink / raw)
To: linux-arm-kernel
change log:
addressed some comments in previous cycle.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/3] ARM: IMX: add tzic_enable_wake in the head file
2011-02-17 9:01 [PATCH v3 0/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
@ 2011-02-17 9:01 ` yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 2/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 3/3] ARM: IMX5 bbg: add cpuidle parameters yong.shen at linaro.org
2 siblings, 0 replies; 4+ messages in thread
From: yong.shen at linaro.org @ 2011-02-17 9:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Yong Shen <yong.shen@freescale.com>
Add tzic_enable_wake in the head file, so other code can call it.
Signed-off-by: Yong Shen <yong.shen@freescale.com>
---
arch/arm/plat-mxc/include/mach/mxc.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 04c7a26..962d742 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -182,6 +182,7 @@ struct cpu_op {
};
extern struct cpu_op *(*get_cpu_op)(int *op);
+extern int tzic_enable_wake(int is_idle);
#endif
#if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/3] ARM: IMX5: cpuidle driver
2011-02-17 9:01 [PATCH v3 0/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 1/3] ARM: IMX: add tzic_enable_wake in the head file yong.shen at linaro.org
@ 2011-02-17 9:01 ` yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 3/3] ARM: IMX5 bbg: add cpuidle parameters yong.shen at linaro.org
2 siblings, 0 replies; 4+ messages in thread
From: yong.shen at linaro.org @ 2011-02-17 9:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Yong Shen <yong.shen@freescale.com>
implement cpuidle driver for iMX5 SOCs, leave cpuidle params to board
related code.
Signed-off-by: Yong Shen <yong.shen@freescale.com>
---
arch/arm/mach-mx5/Makefile | 1 +
arch/arm/mach-mx5/cpuidle.c | 112 +++++++++++++++++++++++++++++++++++++++++++
arch/arm/mach-mx5/cpuidle.h | 25 ++++++++++
3 files changed, 138 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-mx5/cpuidle.c
create mode 100644 arch/arm/mach-mx5/cpuidle.h
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile
index 0d43be9..12239e0 100644
--- a/arch/arm/mach-mx5/Makefile
+++ b/arch/arm/mach-mx5/Makefile
@@ -7,6 +7,7 @@ obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
+obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
diff --git a/arch/arm/mach-mx5/cpuidle.c b/arch/arm/mach-mx5/cpuidle.c
new file mode 100644
index 0000000..64bfb6f
--- /dev/null
+++ b/arch/arm/mach-mx5/cpuidle.c
@@ -0,0 +1,112 @@
+/*
+ * arch/arm/mach-mx5/cpuidle.c
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/io.h>
+#include <linux/cpuidle.h>
+#include <asm/proc-fns.h>
+#include <mach/hardware.h>
+#include "cpuidle.h"
+#include "crm_regs.h"
+
+static struct mx5_cpuidle_params *mx5_cpuidle_params;
+void mx5_cpuidle_board_params(struct mx5_cpuidle_params *cpuidle_params)
+{
+ mx5_cpuidle_params = cpuidle_params;
+}
+
+static int mx5_enter_idle(struct cpuidle_device *dev,
+ struct cpuidle_state *state)
+{
+ struct timeval before, after;
+ int idle_time;
+ u32 plat_lpc, arm_srpgcr, ccm_clpcr;
+ u32 empgc0, empgc1;
+
+ local_irq_disable();
+ do_gettimeofday(&before);
+
+ plat_lpc = __raw_readl(MXC_CORTEXA8_PLAT_LPC) &
+ ~(MXC_CORTEXA8_PLAT_LPC_DSM);
+ ccm_clpcr = __raw_readl(MXC_CCM_CLPCR) & ~(MXC_CCM_CLPCR_LPM_MASK);
+ arm_srpgcr = __raw_readl(MXC_SRPG_ARM_SRPGCR) & ~(MXC_SRPGCR_PCR);
+ empgc0 = __raw_readl(MXC_SRPG_EMPGC0_SRPGCR) & ~(MXC_SRPGCR_PCR);
+ empgc1 = __raw_readl(MXC_SRPG_EMPGC1_SRPGCR) & ~(MXC_SRPGCR_PCR);
+
+ /* for WAIT_CLK_ON, we do nothing but cpu_do_idle() */
+ if (state == &dev->states[WAIT_CLK_OFF])
+ ccm_clpcr |= (0x1 << MXC_CCM_CLPCR_LPM_OFFSET);
+ else if (state == &dev->states[WAIT_CLK_OFF_POWER_OFF]) {
+ /* Wait unclocked, power off */
+ plat_lpc |= MXC_CORTEXA8_PLAT_LPC_DSM
+ | MXC_CORTEXA8_PLAT_LPC_DBG_DSM;
+ arm_srpgcr |= MXC_SRPGCR_PCR;
+ ccm_clpcr |= (0x1 << MXC_CCM_CLPCR_LPM_OFFSET);
+ ccm_clpcr &= ~MXC_CCM_CLPCR_VSTBY;
+ ccm_clpcr &= ~MXC_CCM_CLPCR_SBYOS;
+ if (tzic_enable_wake(1) != 0) {
+ local_irq_enable();
+ return 0;
+ }
+ }
+
+ __raw_writel(plat_lpc, MXC_CORTEXA8_PLAT_LPC);
+ __raw_writel(ccm_clpcr, MXC_CCM_CLPCR);
+ __raw_writel(arm_srpgcr, MXC_SRPG_ARM_SRPGCR);
+
+ cpu_do_idle();
+
+ do_gettimeofday(&after);
+ local_irq_enable();
+ idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
+ (after.tv_usec - before.tv_usec);
+ return idle_time;
+}
+
+static struct cpuidle_driver mx5_cpuidle_driver = {
+ .name = "mx5_idle",
+ .owner = THIS_MODULE,
+};
+
+static DEFINE_PER_CPU(struct cpuidle_device, mx5_cpuidle_device);
+
+static int __init mx5_cpuidle_init(void)
+{
+ struct cpuidle_device *device;
+ int i;
+
+ if (mx5_cpuidle_params == NULL) {
+ printk(KERN_ERR "mx5_cpuidle_init: no cpuidle params\n");
+ return -ENODEV;
+ }
+
+ cpuidle_register_driver(&mx5_cpuidle_driver);
+
+ device = &per_cpu(mx5_cpuidle_device, smp_processor_id());
+ device->state_count = MX5_MAX_CPUIDLE_STATE;
+
+ for (i = 0; i < MX5_MAX_CPUIDLE_STATE && i < CPUIDLE_STATE_MAX; i++) {
+ device->states[i].enter = mx5_enter_idle;
+ device->states[i].exit_latency = mx5_cpuidle_params[i].latency;
+ device->states[i].flags = CPUIDLE_FLAG_TIME_VALID;
+ }
+
+ strcpy(device->states[WAIT_CLK_ON].name, "WFI 0");
+ strcpy(device->states[WAIT_CLK_ON].desc, "Wait with clock on");
+ strcpy(device->states[WAIT_CLK_OFF].name, "WFI 1");
+ strcpy(device->states[WAIT_CLK_OFF].desc, "Wait with clock off");
+ strcpy(device->states[WAIT_CLK_OFF_POWER_OFF].name, "WFI 2");
+ strcpy(device->states[WAIT_CLK_OFF_POWER_OFF].desc,
+ "Wait with clock off and power gating");
+
+ if (cpuidle_register_device(device)) {
+ printk(KERN_ERR "mx5_cpuidle_init: Failed registering\n");
+ return -ENODEV;
+ }
+ return 0;
+}
+late_initcall(mx5_cpuidle_init);
diff --git a/arch/arm/mach-mx5/cpuidle.h b/arch/arm/mach-mx5/cpuidle.h
new file mode 100644
index 0000000..ffd7314
--- /dev/null
+++ b/arch/arm/mach-mx5/cpuidle.h
@@ -0,0 +1,25 @@
+/*
+ * arch/arm/mach-mx5/cpuidle.h
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+enum {
+ WAIT_CLK_ON, /* c1 */
+ WAIT_CLK_OFF, /* c2 */
+ WAIT_CLK_OFF_POWER_OFF, /* c3 */
+ MX5_MAX_CPUIDLE_STATE,
+};
+
+struct mx5_cpuidle_params {
+ unsigned int latency;
+};
+
+#ifdef CONFIG_CPU_IDLE
+extern void mx5_cpuidle_board_params(struct mx5_cpuidle_params *cpuidle_params);
+#else
+inline void mx5_cpuidle_board_params(struct mx5_cpuidle_params *cpuidle_params)
+{}
+#endif
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 3/3] ARM: IMX5 bbg: add cpuidle parameters
2011-02-17 9:01 [PATCH v3 0/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 1/3] ARM: IMX: add tzic_enable_wake in the head file yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 2/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
@ 2011-02-17 9:01 ` yong.shen at linaro.org
2 siblings, 0 replies; 4+ messages in thread
From: yong.shen at linaro.org @ 2011-02-17 9:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Yong Shen <yong.shen@freescale.com>
This parameters are workable, but need further tuning.
Signed-off-by: Yong Shen <yong.shen@freescale.com>
---
arch/arm/mach-mx5/board-mx51_babbage.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index d9d402e..bb6fda0 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -37,6 +37,7 @@
#include "devices-imx51.h"
#include "devices.h"
#include "cpu_op-mx51.h"
+#include "cpuidle.h"
#define BABBAGE_USB_HUB_RESET IMX_GPIO_NR(1, 7)
#define BABBAGE_USBH1_STP IMX_GPIO_NR(1, 27)
@@ -333,6 +334,11 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = {
.num_chipselect = ARRAY_SIZE(mx51_babbage_spi_cs),
};
+static struct mx5_cpuidle_params babbage_cpuidle_params[] = {
+ {100,},
+ {150,},
+ {1000,},
+};
/*
* Board specific initialization.
*/
@@ -383,6 +389,8 @@ static void __init mxc_board_init(void)
ARRAY_SIZE(mx51_babbage_spi_board_info));
imx51_add_ecspi(0, &mx51_babbage_spi_pdata);
imx51_add_imx2_wdt(0, NULL);
+
+ mx5_cpuidle_board_params(babbage_cpuidle_params);
}
static void __init mx51_babbage_timer_init(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-17 9:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 9:01 [PATCH v3 0/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 1/3] ARM: IMX: add tzic_enable_wake in the head file yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 2/3] ARM: IMX5: cpuidle driver yong.shen at linaro.org
2011-02-17 9:01 ` [PATCH v3 3/3] ARM: IMX5 bbg: add cpuidle parameters yong.shen at linaro.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).