commit da68ba03bf38213ccf8a2d93179259bf265e7347
author Manish Pandey <manish.pandey2@arm.com> Mon Oct 18 18:28:55 2021 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Oct 18 18:28:55 2021 +0200
tree c22794bbec9ede2ef7d8bd2aee8affec62d00ec4
parent cc85d99585a36a0f4bc61aaee9a5d9d442a0f230
parent e7e2afde35d51ad8be56217841d1841a4499b55f

Merge "feat(psci): require validate_power_state to expose CPU_SUSPEND" into integration

lib/psci/psci_setup.c

diff --git a/lib/psci/psci_setup.c b/lib/psci/psci_setup.c
index 9c37d63..3cb4f7e 100644
--- a/lib/psci/psci_setup.c
+++ b/lib/psci/psci_setup.c
@@ -250,7 +250,8 @@
 		psci_caps |=  define_psci_cap(PSCI_CPU_ON_AARCH64);
 	if ((psci_plat_pm_ops->pwr_domain_suspend != NULL) &&
 	    (psci_plat_pm_ops->pwr_domain_suspend_finish != NULL)) {
-		psci_caps |=  define_psci_cap(PSCI_CPU_SUSPEND_AARCH64);
+		if (psci_plat_pm_ops->validate_power_state != NULL)
+			psci_caps |=  define_psci_cap(PSCI_CPU_SUSPEND_AARCH64);
 		if (psci_plat_pm_ops->get_sys_suspend_power_state != NULL)
 			psci_caps |=  define_psci_cap(PSCI_SYSTEM_SUSPEND_AARCH64);
 	}