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

Commit eaa142ca authored by Will Deacon's avatar Will Deacon
Browse files

ARM: mach-imx: convert logical CPU numbers to physical numbers 



This patch uses the new cpu_logical_map() macro for converting logical
CPU numbers into physical numbers when releasing CPUs during the SMP
boot and CPU hotplug paths.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent bf14fc54

arch/arm/mach-imx/src.c

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <asm/unified.h>



#define SRC_SCR				0x000
@@ -23,10 +24,15 @@ 


static void __iomem *src_base;



#ifndef CONFIG_SMP

#define cpu_logical_map(cpu)		0

#endif



void imx_enable_cpu(int cpu, bool enable)

{

	u32 mask, val;



	cpu = cpu_logical_map(cpu);

	mask = 1 << (BP_SRC_SCR_CORE1_ENABLE + cpu - 1);

	val = readl_relaxed(src_base + SRC_SCR);

	val = enable ? val | mask : val & ~mask;
@@ -35,6 +41,7 @@ void imx_enable_cpu(int cpu, bool enable) 


void imx_set_cpu_jump(int cpu, void *jump_addr)

{

	cpu = cpu_logical_map(cpu);

	writel_relaxed(BSYM(virt_to_phys(jump_addr)),

		       src_base + SRC_GPR1 + cpu * 8);

}