michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pm: Better name for cpus state variable

Browse source 
A better name for array tracking cpus pm state.
s/z_power_states/z_cpus_pm_state/g

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2022-01-11 20:44:05 -08:00 • committed by Anas Nashif
commit 06bdd1001c
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
subsys/pm/pm.c
View file

@ -31,12 +31,12 @@ static sys_slist_t pm_notifiers = SYS_SLIST_STATIC_INIT(&pm_notifiers);
*/
#define CPU_PM_STATE_INIT(_, __) \
{ .state = PM_STATE_ACTIVE },
static struct pm_state_info z_power_states[] = {
static struct pm_state_info z_cpus_pm_state[] = {
UTIL_LISTIFY(CONFIG_MP_NUM_CPUS, CPU_PM_STATE_INIT)
};
/* bitmask to check if a power state was forced. */
static ATOMIC_DEFINE(z_power_states_forced, CONFIG_MP_NUM_CPUS);
static ATOMIC_DEFINE(z_cpus_pm_state_forced, CONFIG_MP_NUM_CPUS);
#ifdef CONFIG_PM_DEVICE
static atomic_t z_cpus_active = ATOMIC_INIT(CONFIG_MP_NUM_CPUS);
#endif
@ -150,7 +150,7 @@ static inline void pm_state_notify(bool entering_state)
}
if (callback) {
callback(z_power_states[_current_cpu->id].state);
callback(z_cpus_pm_state[_current_cpu->id].state);
}
}
k_spin_unlock(&pm_notifier_lock, pm_notifier_key);
@ -173,9 +173,9 @@ void pm_system_resume(void)
* and it may schedule another thread.
*/
if (atomic_test_and_clear_bit(z_post_ops_required, id)) {
exit_pos_ops(z_power_states[id]);
exit_pos_ops(z_cpus_pm_state[id]);
pm_state_notify(false);
z_power_states[id] = (struct pm_state_info){PM_STATE_ACTIVE,
z_cpus_pm_state[id] = (struct pm_state_info){PM_STATE_ACTIVE,
0, 0};
}
}
@ -188,8 +188,8 @@ bool pm_power_state_force(uint8_t cpu, struct pm_state_info info)
"Invalid power state %d!", info.state);
if (!atomic_test_and_set_bit(z_power_states_forced, cpu)) {
z_power_states[cpu] = info;
if (!atomic_test_and_set_bit(z_cpus_pm_state_forced, cpu)) {
z_cpus_pm_state[cpu] = info;
ret = true;
}
@ -203,19 +203,19 @@ bool pm_system_suspend(int32_t ticks)
SYS_PORT_TRACING_FUNC_ENTER(pm, system_suspend, ticks);
if (!atomic_test_and_set_bit(z_power_states_forced, id)) {
if (!atomic_test_and_set_bit(z_cpus_pm_state_forced, id)) {
const struct pm_state_info *info;
info = pm_policy_next_state(id, ticks);
if (info != NULL) {
z_power_states[id] = *info;
z_cpus_pm_state[id] = *info;
}
}
if (z_power_states[id].state == PM_STATE_ACTIVE) {
if (z_cpus_pm_state[id].state == PM_STATE_ACTIVE) {
LOG_DBG("No PM operations done.");
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_power_states[id].state);
z_cpus_pm_state[id].state);
ret = false;
goto end;
}
@ -227,19 +227,19 @@ bool pm_system_suspend(int32_t ticks)
*/
z_set_timeout_expiry(ticks -
k_us_to_ticks_ceil32(
z_power_states[id].exit_latency_us),
z_cpus_pm_state[id].exit_latency_us),
true);
}
#if CONFIG_PM_DEVICE
if ((z_power_states[id].state != PM_STATE_RUNTIME_IDLE) &&
if ((z_cpus_pm_state[id].state != PM_STATE_RUNTIME_IDLE) &&
(atomic_sub(&z_cpus_active, 1) == 1)) {
if (pm_suspend_devices()) {
pm_resume_devices();
z_power_states[id].state = PM_STATE_ACTIVE;
z_cpus_pm_state[id].state = PM_STATE_ACTIVE;
(void)atomic_add(&z_cpus_active, 1);
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_power_states[id].state);
z_cpus_pm_state[id].state);
ret = false;
goto end;
}
@ -259,7 +259,7 @@ bool pm_system_suspend(int32_t ticks)
/* Enter power state */
pm_state_notify(true);
atomic_set_bit(z_post_ops_required, id);
pm_state_set(z_power_states[id]);
pm_state_set(z_cpus_pm_state[id]);
pm_stats_stop();
/* Wake up sequence starts here */
@ -268,14 +268,14 @@ bool pm_system_suspend(int32_t ticks)
pm_resume_devices();
}
#endif
pm_stats_update(z_power_states[id].state);
pm_stats_update(z_cpus_pm_state[id].state);
pm_system_resume();
k_sched_unlock();
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_power_states[id].state);
z_cpus_pm_state[id].state);
end:
atomic_clear_bit(z_power_states_forced, id);
atomic_clear_bit(z_cpus_pm_state_forced, id);
return ret;
}
@ -303,5 +303,5 @@ int pm_notifier_unregister(struct pm_notifier *notifier)
struct pm_state_info pm_power_state_next_get(uint8_t cpu)
{
return z_power_states[cpu];
return z_cpus_pm_state[cpu];
}