openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP4: cpuidle - Declare the states with the driver declaration 

The cpuidle API allows to declare statically the states in the driver
structure. Let's use it.
We do no longer need the fill_cstate function called at runtime and
by the way adding more instructions at boot time.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Jean Pihet <j-pihet@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Daniel Lezcano 2012-04-24 16:05:23 +02:00 committed by Kevin Hilman
parent 65d284d573
commit 78e9016fa4
1 changed files with 33 additions and 27 deletions
arch/arm/mach-omap2
cpuidle44xx.c

56
arch/arm/mach-omap2/cpuidle44xx.c
View File

@ -132,20 +132,38 @@ struct cpuidle_driver omap4_idle_driver = {
.name = "omap4_idle", .name = "omap4_idle",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.en_core_tk_irqen = 1, .en_core_tk_irqen = 1,
}; .states = {
static inline void _fill_cstate(struct cpuidle_driver *drv,
int idx, const char *descr)
{ {
struct cpuidle_state *state = &drv->states[idx]; /* C1 - CPU0 ON + CPU1 ON + MPU ON */
.exit_latency = 2 + 2,
state->exit_latency = cpuidle_params_table[idx].exit_latency; .target_residency = 5,
state->target_residency = cpuidle_params_table[idx].target_residency; .flags = CPUIDLE_FLAG_TIME_VALID,
state->flags = CPUIDLE_FLAG_TIME_VALID; .enter = omap4_enter_idle,
state->enter = omap4_enter_idle; .name = "C1",
sprintf(state->name, "C%d", idx + 1); .desc = "MPUSS ON"
strncpy(state->desc, descr, CPUIDLE_DESC_LEN); },
} {
/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
.exit_latency = 328 + 440,
.target_residency = 960,
.flags = CPUIDLE_FLAG_TIME_VALID,
.enter = omap4_enter_idle,
.name = "C2",
.desc = "MPUSS CSWR",
},
{
/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
.exit_latency = 460 + 518,
.target_residency = 1100,
.flags = CPUIDLE_FLAG_TIME_VALID,
.enter = omap4_enter_idle,
.name = "C3",
.desc = "MPUSS OSWR",
},
},
.state_count = OMAP4_NUM_STATES,
.safe_state_index = 0,
};
static inline struct omap4_idle_statedata *_fill_cstate_usage( static inline struct omap4_idle_statedata *_fill_cstate_usage(
struct cpuidle_device *dev, struct cpuidle_device *dev,
@ -171,7 +189,6 @@ int __init omap4_idle_init(void)
{ {
struct omap4_idle_statedata *cx; struct omap4_idle_statedata *cx;
struct cpuidle_device *dev; struct cpuidle_device *dev;
struct cpuidle_driver *drv = &omap4_idle_driver;
unsigned int cpu_id = 0; unsigned int cpu_id = 0;
mpu_pd = pwrdm_lookup("mpu_pwrdm"); mpu_pd = pwrdm_lookup("mpu_pwrdm");
@ -180,37 +197,26 @@ int __init omap4_idle_init(void)
if ((!mpu_pd) || (!cpu0_pd) || (!cpu1_pd)) if ((!mpu_pd) || (!cpu0_pd) || (!cpu1_pd))
return -ENODEV; return -ENODEV;
drv->safe_state_index = -1;
dev = &per_cpu(omap4_idle_dev, cpu_id); dev = &per_cpu(omap4_idle_dev, cpu_id);
dev->cpu = cpu_id; dev->cpu = cpu_id;
/* C1 - CPU0 ON + CPU1 ON + MPU ON */
_fill_cstate(drv, 0, "MPUSS ON");
drv->safe_state_index = 0;
cx = _fill_cstate_usage(dev, 0); cx = _fill_cstate_usage(dev, 0);
cx->cpu_state = PWRDM_POWER_ON; cx->cpu_state = PWRDM_POWER_ON;
cx->mpu_state = PWRDM_POWER_ON; cx->mpu_state = PWRDM_POWER_ON;
cx->mpu_logic_state = PWRDM_POWER_RET; cx->mpu_logic_state = PWRDM_POWER_RET;
/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
_fill_cstate(drv, 1, "MPUSS CSWR");
cx = _fill_cstate_usage(dev, 1); cx = _fill_cstate_usage(dev, 1);
cx->cpu_state = PWRDM_POWER_OFF; cx->cpu_state = PWRDM_POWER_OFF;
cx->mpu_state = PWRDM_POWER_RET; cx->mpu_state = PWRDM_POWER_RET;
cx->mpu_logic_state = PWRDM_POWER_RET; cx->mpu_logic_state = PWRDM_POWER_RET;
/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
_fill_cstate(drv, 2, "MPUSS OSWR");
cx = _fill_cstate_usage(dev, 2); cx = _fill_cstate_usage(dev, 2);
cx->cpu_state = PWRDM_POWER_OFF; cx->cpu_state = PWRDM_POWER_OFF;
cx->mpu_state = PWRDM_POWER_RET; cx->mpu_state = PWRDM_POWER_RET;
cx->mpu_logic_state = PWRDM_POWER_OFF; cx->mpu_logic_state = PWRDM_POWER_OFF;
drv->state_count = OMAP4_NUM_STATES;
cpuidle_register_driver(&omap4_idle_driver); cpuidle_register_driver(&omap4_idle_driver);
dev->state_count = OMAP4_NUM_STATES;
if (cpuidle_register_device(dev)) { if (cpuidle_register_device(dev)) {
pr_err("%s: CPUidle register device failed\n", __func__); pr_err("%s: CPUidle register device failed\n", __func__);
return -EIO; return -EIO;