Eventually we'll allow calling functions on cpus more than once, to allow multiple subtests to run in a single execution. But that'll only work if the subtests don't halt the cpus... Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx> --- arm/psci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arm/psci.c b/arm/psci.c index f1004339b30f..4e6bc58dbe42 100644 --- a/arm/psci.c +++ b/arm/psci.c @@ -78,9 +78,8 @@ static void cpu_on_secondary_entry(void) cpumask_set_cpu(cpu, &cpu_on_ready); while (!cpu_on_start) cpu_relax(); - cpu_on_ret[cpu] = psci_cpu_on(cpus[1], __pa(halt)); + cpu_on_ret[cpu] = psci_cpu_on(cpus[1], __pa(cpu_psci_cpu_die)); cpumask_set_cpu(cpu, &cpu_on_done); - halt(); } static bool psci_cpu_on_test(void) @@ -104,7 +103,7 @@ static bool psci_cpu_on_test(void) cpu_on_start = 1; smp_mb(); - cpu_on_ret[0] = psci_cpu_on(cpus[1], __pa(halt)); + cpu_on_ret[0] = psci_cpu_on(cpus[1], __pa(cpu_psci_cpu_die)); cpumask_set_cpu(0, &cpu_on_done); while (!cpumask_full(&cpu_on_done)) -- 2.9.4
