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

Commit 0bd82ade authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode 



scu_power_mode changes the power mode for the current CPU, which it
determines from smp_processor_id(). However, this assumes that the
physical CPU number is equal to Linux's logical CPU number and if this
is not true, we will power off the wrong CPU.

This patch uses cpu_logical_map to translate the logical CPU number
into a physical one in scu_power_mode.

Reported-by: default avatarLorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0693bf68

arch/arm/kernel/smp_scu.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/init.h>

#include <linux/io.h>



#include <asm/smp_plat.h>

#include <asm/smp_scu.h>

#include <asm/cacheflush.h>

#include <asm/cputype.h>
@@ -74,7 +75,7 @@ void scu_enable(void __iomem *scu_base) 
int scu_power_mode(void __iomem *scu_base, unsigned int mode)

{

	unsigned int val;

	int cpu = smp_processor_id();

	int cpu = cpu_logical_map(smp_processor_id());



	if (mode > 3 || mode == 1 || cpu > 3)

		return -EINVAL;