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

Commit 8e56130d authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson
Browse files

ARM: highbank: Add smc calls to enable/disable the L2 



Linux runs in non-secure mode on highbank, so we need secure monitor calls
to enable and disable the PL310. Rather than invent new smc calls, the same
calling convention used by OMAP is used here.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 6f4b3bf5

arch/arm/mach-highbank/Makefile

+5 −1
Original line number Diff line number Diff line 
obj-y					:= clock.o highbank.o system.o

obj-y					:= clock.o highbank.o system.o smc.o



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)



obj-$(CONFIG_DEBUG_HIGHBANK_UART)	+= lluart.o

obj-$(CONFIG_SMP)			+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

arch/arm/mach-highbank/core.h

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ extern void highbank_lluart_map_io(void); 
static inline void highbank_lluart_map_io(void) {}

#endif



extern void highbank_smc1(int fn, int arg);

arch/arm/mach-highbank/highbank.c

+14 −0
Original line number Diff line number Diff line
@@ -85,10 +85,24 @@ const static struct of_device_id irq_match[] = { 
	{}

};



#ifdef CONFIG_CACHE_L2X0

static void highbank_l2x0_disable(void)

{

	/* Disable PL310 L2 Cache controller */

	highbank_smc1(0x102, 0x0);

}

#endif



static void __init highbank_init_irq(void)

{

	of_irq_init(irq_match);



#ifdef CONFIG_CACHE_L2X0

	/* Enable PL310 L2 Cache controller */

	highbank_smc1(0x102, 0x1);

	l2x0_of_init(0, ~0UL);

	outer_cache.disable = highbank_l2x0_disable;

#endif

}



static void __init highbank_timer_init(void)

arch/arm/mach-highbank/smc.S

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

 * Copied from omap44xx-smc.S Copyright (C) 2010 Texas Instruments, Inc.

 * Copyright 2012 Calxeda, Inc.

 *

 * This program is free software,you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/linkage.h>



/*

 * This is common routine to manage secure monitor API

 * used to modify the PL310 secure registers.

 * 'r0' contains the value to be modified and 'r12' contains

 * the monitor API number.

 * Function signature : void highbank_smc1(u32 fn, u32 arg)

 */



ENTRY(highbank_smc1)

	stmfd   sp!, {r4-r11, lr}

	mov	r12, r0

	mov 	r0, r1

	dsb

	smc	#0

	ldmfd   sp!, {r4-r11, pc}

ENDPROC(highbank_smc1)