diff options
| author | Achin Gupta <achin.gupta@arm.com> | 2016-06-28 16:46:15 +0100 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2016-07-25 15:53:00 +0100 |
| commit | 61eae524b6e452fd1be931c6e1ff8f7cf3ae969c (patch) | |
| tree | 8c194b98602c38799ef0c1b0078b04c2dd590f10 /lib/psci/psci_suspend.c | |
| parent | 3dd9835f8ab3c2e7f57ddc92505d6c800bbacd47 (diff) | |
Fix use of stale power states in PSCI standby finisher
A PSCI CPU_SUSPEND request to place a CPU in retention states at power levels
higher than the CPU power level is subject to the same state coordination as a
power down state. A CPU could implement multiple retention states at a
particular power level. When exiting WFI, the non-CPU power levels may be in a
different retention state to what was initially requested, therefore each CPU
should refresh its view of the states of all power levels.
Previously, a CPU re-used the state of the power levels when it entered the
retention state. This patch fixes this issue by ensuring that a CPU upon exit
from retention reads the state of each power level afresh.
Change-Id: I93b5f5065c63400c6fd2598dbaafac385748f989
Diffstat (limited to 'lib/psci/psci_suspend.c')
| -rw-r--r-- | lib/psci/psci_suspend.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/psci/psci_suspend.c b/lib/psci/psci_suspend.c index 904a4e75..0887e3b2 100644 --- a/lib/psci/psci_suspend.c +++ b/lib/psci/psci_suspend.c @@ -45,17 +45,25 @@ * from standby/retention states at multiple power levels. ******************************************************************************/ static void psci_suspend_to_standby_finisher(unsigned int cpu_idx, - psci_power_state_t *state_info, unsigned int end_pwrlvl) { + psci_power_state_t state_info; + psci_acquire_pwr_domain_locks(end_pwrlvl, cpu_idx); /* + * Find out which retention states this CPU has exited from until the + * 'end_pwrlvl'. The exit retention state could be deeper than the entry + * state as a result of state coordination amongst other CPUs post wfi. + */ + psci_get_target_local_pwr_states(end_pwrlvl, &state_info); + + /* * Plat. management: Allow the platform to do operations * on waking up from retention. */ - psci_plat_pm_ops->pwr_domain_suspend_finish(state_info); + psci_plat_pm_ops->pwr_domain_suspend_finish(&state_info); /* * Set the requested and target state of this CPU and all the higher @@ -222,7 +230,7 @@ exit: * After we wake up from context retaining suspend, call the * context retaining suspend finisher. */ - psci_suspend_to_standby_finisher(idx, state_info, end_pwrlvl); + psci_suspend_to_standby_finisher(idx, end_pwrlvl); } /******************************************************************************* |