feat(arm): convert arm platforms to expect a wakeup
Newer cores in upcoming platforms may refuse to power down. The PSCI
library is already prepared for this so convert platform code to also
allow this. This is simple - drop the `wfi` + panic and let common code
deal with the fallout. The end result will be the same (sans the
message) except the platform will have fewer responsibilities. The only
exception is for cores being signalled to power off gracefully ahead of
system reset. That path must also be terminal so replace the end with
the same psci_pwrdown_cpu_end() to behave the same as the generic
implementation. It will handle wakeups and panic, hoping that the system
gets reset from under it. The dmb is upgraded to a dsb so no functional
change.
Change-Id: I381f96bec8532bda6ccdac65de57971aac42e7e8
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
diff --git a/drivers/arm/css/scp/css_pm_scmi.c b/drivers/arm/css/scp/css_pm_scmi.c
index 84b8bd2..b310ff4 100644
--- a/drivers/arm/css/scp/css_pm_scmi.c
+++ b/drivers/arm/css/scp/css_pm_scmi.c
@@ -298,7 +298,7 @@
#endif
}
-void __dead2 css_scp_system_off(int state)
+void css_scp_system_off(int state)
{
int ret;
@@ -340,15 +340,12 @@
/* Powerdown of primary core */
psci_pwrdown_cpu_start(PLAT_MAX_PWR_LVL);
- wfi();
- ERROR("CSS set power state: operation not handled.\n");
- panic();
}
/*
* Helper function to shutdown the system via SCMI.
*/
-void __dead2 css_scp_sys_shutdown(void)
+void css_scp_sys_shutdown(void)
{
css_scp_system_off(SCMI_SYS_PWR_SHUTDOWN);
}
@@ -356,7 +353,7 @@
/*
* Helper function to reset the system via SCMI.
*/
-void __dead2 css_scp_sys_reboot(void)
+void css_scp_sys_reboot(void)
{
css_scp_system_off(SCMI_SYS_PWR_COLD_RESET);
}
@@ -472,12 +469,8 @@
return PSCI_E_INVALID_PARAMS;
css_scp_system_off(SCMI_SYS_PWR_WARM_RESET);
- /*
- * css_scp_system_off cannot return (it is a __dead function),
- * but css_system_reset2 has to return some value, even in
- * this case.
- */
- return 0;
+ /* return SUCCESS to finish the powerdown */
+ return PSCI_E_SUCCESS;
}
#if PROGRAMMABLE_RESET_ADDRESS