Commit 499e63ff authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

arm/arm64: psci: avoid calling halt directly



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's avatarAndrew Jones <drjones@redhat.com>
Message-Id: <20170529135804.22891-4-drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d556c4a8
......@@ -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))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment