PSCI: Check early for invalid CPU state during CPU ON

This patch moves the check for valid CPU state during
PSCI_CPU_ON to before the non secure entry point is programmed
so as to enable it to return early on error.

Change-Id: I1b1a21be421e2b2a6e33db236e91dee8688efffa

diff --git a/services/std_svc/psci/psci_afflvl_on.c b/services/std_svc/psci/psci_afflvl_on.c
index d6e35f73a0b757eb69d8a16427e40d52e741e697..04529d2fc86a5f51490f0d76103b628ecc6af126 100644 (file)
--- a/services/std_svc/psci/psci_afflvl_on.c
+++ b/services/std_svc/psci/psci_afflvl_on.c
@@ -48,13 +48,8 @@ typedef int (*afflvl_on_handler_t)(unsigned long target_cpu,
  * This function checks whether a cpu which has been requested to be turned on
  * is OFF to begin with.
  ******************************************************************************/
-static int cpu_on_validate_state(aff_map_node_t *node)
+static int cpu_on_validate_state(unsigned int psci_state)
 {
-       unsigned int psci_state;
-
-       /* Get the raw psci state */
-       psci_state = psci_get_state(node);
-
        if (psci_state == PSCI_STATE_ON || psci_state == PSCI_STATE_SUSPEND)
                return PSCI_E_ALREADY_ON;
 
@@ -83,14 +78,6 @@ static int psci_afflvl0_on(unsigned long target_cpu,
        /* Sanity check to safeguard against data corruption */
        assert(cpu_node->level == MPIDR_AFFLVL0);
 
-       /*
-        * Generic management: Ensure that the cpu is off to be
-        * turned on
-        */
-       rc = cpu_on_validate_state(cpu_node);
-       if (rc != PSCI_E_SUCCESS)
-               return rc;
-
        /*
         * Call the cpu on handler registered by the Secure Payload Dispatcher
         * to let it do any bookeeping. If the handler encounters an error, it's
@@ -290,6 +277,15 @@ int psci_afflvl_on(unsigned long target_cpu,
                                  end_afflvl,
                                  target_cpu_nodes);
 
+       /*
+        * Generic management: Ensure that the cpu is off to be
+        * turned on.
+        */
+       rc = cpu_on_validate_state(psci_get_state(
+                       (aff_map_node_t *)target_cpu_nodes[MPIDR_AFFLVL0]));
+       if (rc != PSCI_E_SUCCESS)
+               goto exit;
+
        /* Perform generic, architecture and platform specific handling. */
        rc = psci_call_on_handlers(target_cpu_nodes,
                                   start_afflvl,
@@ -309,6 +305,7 @@ int psci_afflvl_on(unsigned long target_cpu,
                                          target_cpu_nodes,
                                          PSCI_STATE_ON_PENDING);
 
+exit:
        /*
         * This loop releases the lock corresponding to each affinity level
         * in the reverse order to which they were acquired.