summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGovindraj Raja <govindraj.raja@arm.com>2026-01-06 15:44:33 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2026-01-06 15:44:33 +0000
commit2ea40164835cf2d48ff751b37d7327a766da1c3f (patch)
treeb186d2f06a15a8e91d3d6b679d35add229889b50
parent496ad2785da6407a3d78addac53ad222f2667472 (diff)
parent5e7b6c795d89da1d77da5f6e2a5940398e6e9341 (diff)
downloadarm-trusted-firmware-2ea40164835cf2d48ff751b37d7327a766da1c3f.tar.gz
arm-trusted-firmware-2ea40164835cf2d48ff751b37d7327a766da1c3f.zip
Merge "fix(psci): set requested local power states in failure path" into integration
-rw-r--r--lib/psci/psci_suspend.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/psci/psci_suspend.c b/lib/psci/psci_suspend.c
index 5c3319e4a..d73903e7b 100644
--- a/lib/psci/psci_suspend.c
+++ b/lib/psci/psci_suspend.c
@@ -174,6 +174,12 @@ int psci_cpu_suspend_start(unsigned int idx,
if (psci_plat_pm_ops->pwr_domain_validate_suspend != NULL) {
rc = psci_plat_pm_ops->pwr_domain_validate_suspend(state_info);
if (rc != PSCI_E_SUCCESS) {
+#ifdef PLAT_MAX_CPU_SUSPEND_PWR_LVL
+ unsigned int max_pwrlvl = PLAT_MAX_CPU_SUSPEND_PWR_LVL;
+#else
+ unsigned int max_pwrlvl = PLAT_MAX_PWR_LVL;
+#endif
+ psci_set_pwr_domains_to_run(idx, max_pwrlvl);
goto suspend_exit;
}
}