Commit 6509dc74 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: mvebu: fix cpuidle implementation to work on big-endian systems 



On Marvell Armada XP, when a CPU comes back from deep idle state of
cpuidle, it restarts its execution at armada_370_xp_cpu_resume(),
which puts back the CPU into the coherency, and then calls the generic
cpu_resume() function.

While this works on little-endian configurations, it doesn't work on
big-endian configurations because the CPU restarts in little-endian,
and therefore must be switched back to big-endian to operate
properly. To achieve this, a 'setend be' instruction must be executed
in big-endian configurations. However, the ARM_BE8() macro that is
used to implement nice compile-time conditional for ARM LE vs. ARM BE8
is not easily usable in inline assembly.

Therefore, this patch moves the armada_370_xp_cpu_resume() C function,
which was anyway just a block of inline assembly, into a proper
pmsu_ll.S file, and adds the appropriate ARM_BE8(setend be)
instruction.

Without this patch, an Armada XP big endian configuration with cpuidle
enabled fails to boot, as it hangs as soon as one of the CPU hits the
deep idle state.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1404130165-3593-1-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 01178890

arch/arm/mach-mvebu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ CFLAGS_pmsu.o := -march=armv7-a 
obj-y				 += system-controller.o mvebu-soc-id.o



ifeq ($(CONFIG_MACH_MVEBU_V7),y)

obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o

obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o

obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o

obj-$(CONFIG_HOTPLUG_CPU)	 += hotplug.o

endif

arch/arm/mach-mvebu/pmsu.c

+2 −7
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ static void __iomem *pmsu_mp_base; 
extern void ll_disable_coherency(void);

extern void ll_enable_coherency(void);



extern void armada_370_xp_cpu_resume(void);



static struct platform_device armada_xp_cpuidle_device = {

	.name = "cpuidle-armada-370-xp",

};
@@ -140,13 +142,6 @@ static void armada_370_xp_pmsu_enable_l2_powerdown_onidle(void) 
	writel(reg, pmsu_mp_base + L2C_NFABRIC_PM_CTL);

}



static void armada_370_xp_cpu_resume(void)

{

	asm volatile("bl    ll_add_cpu_to_smp_group\n\t"

		     "bl    ll_enable_coherency\n\t"

		     "b	    cpu_resume\n\t");

}



/* No locking is needed because we only access per-CPU registers */

void armada_370_xp_pmsu_idle_prepare(bool deepidle)

{

arch/arm/mach-mvebu/pmsu_ll.S

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Marvell

 *

 * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 * Gregory Clement <gregory.clement@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <linux/linkage.h>

#include <asm/assembler.h>



/*

 * This is the entry point through which CPUs exiting cpuidle deep

 * idle state are going.

 */

ENTRY(armada_370_xp_cpu_resume)

ARM_BE8(setend	be )			@ go BE8 if entered LE

	bl	ll_add_cpu_to_smp_group

	bl	ll_enable_coherency

	b	cpu_resume

ENDPROC(armada_370_xp_cpu_resume)

CRA Git | Maintained and supported by SUSTech CRA and CCSE