mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
ARM: kirkwood: Consolidate time keeping and irq enable
Enable core cpuidle timekeeping and irq enabling and remove that handling from this code. Signed-off-by: Robert Lee <rob.lee@linaro.org> Reviewed-by: Kevin Hilman <khilman@ti.com> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Jean Pihet <j-pihet@ti.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
7e348b9012
commit
b334648db0
1 changed files with 21 additions and 51 deletions
|
@ -20,77 +20,47 @@
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
#include <asm/proc-fns.h>
|
#include <asm/proc-fns.h>
|
||||||
|
#include <asm/cpuidle.h>
|
||||||
#include <mach/kirkwood.h>
|
#include <mach/kirkwood.h>
|
||||||
|
|
||||||
#define KIRKWOOD_MAX_STATES 2
|
#define KIRKWOOD_MAX_STATES 2
|
||||||
|
|
||||||
static struct cpuidle_driver kirkwood_idle_driver = {
|
|
||||||
.name = "kirkwood_idle",
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
};
|
|
||||||
|
|
||||||
static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
|
|
||||||
|
|
||||||
/* Actual code that puts the SoC in different idle states */
|
/* Actual code that puts the SoC in different idle states */
|
||||||
static int kirkwood_enter_idle(struct cpuidle_device *dev,
|
static int kirkwood_enter_idle(struct cpuidle_device *dev,
|
||||||
struct cpuidle_driver *drv,
|
struct cpuidle_driver *drv,
|
||||||
int index)
|
int index)
|
||||||
{
|
{
|
||||||
struct timeval before, after;
|
writel(0x7, DDR_OPERATION_BASE);
|
||||||
int idle_time;
|
cpu_do_idle();
|
||||||
|
|
||||||
local_irq_disable();
|
|
||||||
do_gettimeofday(&before);
|
|
||||||
if (index == 0)
|
|
||||||
/* Wait for interrupt state */
|
|
||||||
cpu_do_idle();
|
|
||||||
else if (index == 1) {
|
|
||||||
/*
|
|
||||||
* Following write will put DDR in self refresh.
|
|
||||||
* Note that we have 256 cycles before DDR puts it
|
|
||||||
* self in self-refresh, so the wait-for-interrupt
|
|
||||||
* call afterwards won't get the DDR from self refresh
|
|
||||||
* mode.
|
|
||||||
*/
|
|
||||||
writel(0x7, DDR_OPERATION_BASE);
|
|
||||||
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);
|
|
||||||
|
|
||||||
/* Update last residency */
|
|
||||||
dev->last_residency = idle_time;
|
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct cpuidle_driver kirkwood_idle_driver = {
|
||||||
|
.name = "kirkwood_idle",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.en_core_tk_irqen = 1,
|
||||||
|
.states[0] = ARM_CPUIDLE_WFI_STATE,
|
||||||
|
.states[1] = {
|
||||||
|
.enter = kirkwood_enter_idle,
|
||||||
|
.exit_latency = 10,
|
||||||
|
.target_residency = 100000,
|
||||||
|
.flags = CPUIDLE_FLAG_TIME_VALID,
|
||||||
|
.name = "DDR SR",
|
||||||
|
.desc = "WFI and DDR Self Refresh",
|
||||||
|
},
|
||||||
|
.state_count = KIRKWOOD_MAX_STATES,
|
||||||
|
};
|
||||||
|
|
||||||
|
static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);
|
||||||
|
|
||||||
/* Initialize CPU idle by registering the idle states */
|
/* Initialize CPU idle by registering the idle states */
|
||||||
static int kirkwood_init_cpuidle(void)
|
static int kirkwood_init_cpuidle(void)
|
||||||
{
|
{
|
||||||
struct cpuidle_device *device;
|
struct cpuidle_device *device;
|
||||||
struct cpuidle_driver *driver = &kirkwood_idle_driver;
|
|
||||||
|
|
||||||
device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
|
device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
|
||||||
device->state_count = KIRKWOOD_MAX_STATES;
|
device->state_count = KIRKWOOD_MAX_STATES;
|
||||||
driver->state_count = KIRKWOOD_MAX_STATES;
|
|
||||||
|
|
||||||
/* Wait for interrupt state */
|
|
||||||
driver->states[0].enter = kirkwood_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 DDR self refresh state */
|
|
||||||
driver->states[1].enter = kirkwood_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, "DDR SR");
|
|
||||||
strcpy(driver->states[1].desc, "WFI and DDR Self Refresh");
|
|
||||||
|
|
||||||
cpuidle_register_driver(&kirkwood_idle_driver);
|
cpuidle_register_driver(&kirkwood_idle_driver);
|
||||||
if (cpuidle_register_device(device)) {
|
if (cpuidle_register_device(device)) {
|
||||||
|
|
Loading…
Reference in a new issue