asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: psci: Use the MPIDR values from cpu_logical_map for cpu ids.

Browse source 
With the (re)introduction of cpu_logical_map in arm64 we switch to
the use of MPIDR values to identify CPUs. Update the psci code to
do that.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Liviu Dudau 2013-03-26 11:02:51 +00:00 committed by Catalin Marinas
parent 0359b0e2d0
commit a9a193ffe5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm64/kernel/smp_psci.c
View file

@ -21,6 +21,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/psci.h> #include <asm/psci.h>
#include <asm/smp_plat.h>
static int __init smp_psci_init_cpu(struct device_node *dn, int cpu) static int __init smp_psci_init_cpu(struct device_node *dn, int cpu)
{ {
@ -36,7 +37,7 @@ static int __init smp_psci_prepare_cpu(int cpu)
return -ENODEV; return -ENODEV;
} }
err = psci_ops.cpu_on(cpu, __pa(secondary_holding_pen)); err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa(secondary_holding_pen));
if (err) { if (err) {
pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err); pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err);
return err; return err;
@ -47,6 +48,6 @@ static int __init smp_psci_prepare_cpu(int cpu)
const struct smp_enable_ops smp_psci_ops __initconst = { const struct smp_enable_ops smp_psci_ops __initconst = {
.name = "psci", .name = "psci",
.init_cpu = smp_psci_init_cpu, .init_cpu = smp_psci_init_cpu,
.prepare_cpu = smp_psci_prepare_cpu, .prepare_cpu = smp_psci_prepare_cpu,
}; };