lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/76] ARM: kirkwood: Consolidate time keeping and irq enable
    Date
    From: Robert Lee <rob.lee@linaro.org>

    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>
    ---
    arch/arm/mach-kirkwood/cpuidle.c | 72 +++++++++++---------------------------
    1 file changed, 21 insertions(+), 51 deletions(-)

    diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c
    index 7088180..0f17109 100644
    --- a/arch/arm/mach-kirkwood/cpuidle.c
    +++ b/arch/arm/mach-kirkwood/cpuidle.c
    @@ -20,77 +20,47 @@
    #include <linux/io.h>
    #include <linux/export.h>
    #include <asm/proc-fns.h>
    +#include <asm/cpuidle.h>
    #include <mach/kirkwood.h>

    #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 */
    static int kirkwood_enter_idle(struct cpuidle_device *dev,
    struct cpuidle_driver *drv,
    int index)
    {
    - struct timeval before, after;
    - int idle_time;
    -
    - 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;
    + writel(0x7, DDR_OPERATION_BASE);
    + cpu_do_idle();

    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 */
    static int kirkwood_init_cpuidle(void)
    {
    struct cpuidle_device *device;
    - struct cpuidle_driver *driver = &kirkwood_idle_driver;

    device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id());
    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);
    if (cpuidle_register_device(device)) {
    --
    1.7.10.rc2.19.gfae9d


    \
     
     \ /
      Last update: 2012-03-30 13:17    [W:3.484 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site