Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a193ff authored by Liviu Dudau's avatar Liviu Dudau Committed by Catalin Marinas
Browse files

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



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: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 0359b0e2

arch/arm64/kernel/smp_psci.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/smp.h>



#include <asm/psci.h>

#include <asm/smp_plat.h>



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;

	}



	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) {

		pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err);

		return err;