diff options
Diffstat (limited to 'common/psci')
| -rw-r--r-- | common/psci/psci_common.c | 7 | ||||
| -rw-r--r-- | common/psci/psci_setup.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/common/psci/psci_common.c b/common/psci/psci_common.c index e6be2f86..193655dd 100644 --- a/common/psci/psci_common.c +++ b/common/psci/psci_common.c @@ -37,6 +37,7 @@ #include <psci.h> #include <psci_private.h> #include <runtime_svc.h> +#include "debug.h" /******************************************************************************* * Arrays that contains information needs to resume a cpu's execution when woken @@ -511,7 +512,8 @@ void psci_afflvl_power_on_finish(unsigned long mpidr, start_afflvl, end_afflvl, mpidr_nodes); - assert (rc == PSCI_E_SUCCESS); + if (rc != PSCI_E_SUCCESS) + panic(); /* * This function acquires the lock corresponding to each affinity @@ -529,7 +531,8 @@ void psci_afflvl_power_on_finish(unsigned long mpidr, end_afflvl, pon_handlers, mpidr); - assert (rc == PSCI_E_SUCCESS); + if (rc != PSCI_E_SUCCESS) + panic(); /* * This loop releases the lock corresponding to each affinity level diff --git a/common/psci/psci_setup.c b/common/psci/psci_setup.c index c0d29f24..4c32b411 100644 --- a/common/psci/psci_setup.c +++ b/common/psci/psci_setup.c @@ -255,7 +255,7 @@ static unsigned int psci_init_aff_map(unsigned long mpidr, ******************************************************************************/ void psci_setup(unsigned long mpidr) { - int afflvl, affmap_idx, rc, max_afflvl; + int afflvl, affmap_idx, max_afflvl; aff_map_node *node; /* Initialize psci's internal state */ @@ -314,8 +314,7 @@ void psci_setup(unsigned long mpidr) psci_set_state(node, PSCI_STATE_ON); } - rc = platform_setup_pm(&psci_plat_pm_ops); - assert(rc == 0); + platform_setup_pm(&psci_plat_pm_ops); assert(psci_plat_pm_ops); return; |