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

Commit ba9456ac authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Kevin Hilman
Browse files

ARM: OMAP: Add Secure HAL and monitor mode API infrastructure. 



On OMAP secure/emulation devices, certain APIs are exported by secure
code. Add an infrastructure so that relevant operations on secure
devices can be implemented using it.

While at this, rename omap44xx-smc.S to omap-smc.S since the common APIs
can be used on other OMAP's too.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarVishwanath BS <vishwanath.bs@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 3c50729b

arch/arm/mach-omap2/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ hwmod-common = omap_hwmod.o \ 
					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \

					  clkt_dpll.o clkt_clksel.o

secure-common                          = omap-smc.o omap-secure.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
@@ -24,11 +25,11 @@ obj-$(CONFIG_TWL4030_CORE) += omap_twl.o 
obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_LOCAL_TIMERS)		+= timer-mpu.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap44xx-smc.o omap4-common.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o



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

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

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

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



# Functions loaded to SRAM

obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o

arch/arm/mach-omap2/include/mach/omap-secure.h

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

 * omap-secure.h: OMAP Secure infrastructure header.

 *

 * Copyright (C) 2011 Texas Instruments, Inc.

 *	Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * 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.

 */

#ifndef OMAP_ARCH_OMAP_SECURE_H

#define OMAP_ARCH_OMAP_SECURE_H



/* Monitor error code */

#define  API_HAL_RET_VALUE_NS2S_CONVERSION_ERROR	0xFFFFFFFE

#define  API_HAL_RET_VALUE_SERVICE_UNKNWON		0xFFFFFFFF



/* HAL API error codes */

#define  API_HAL_RET_VALUE_OK		0x00

#define  API_HAL_RET_VALUE_FAIL		0x01



/* Secure HAL API flags */

#define FLAG_START_CRITICAL		0x4

#define FLAG_IRQFIQ_MASK		0x3

#define FLAG_IRQ_ENABLE			0x2

#define FLAG_FIQ_ENABLE			0x1

#define NO_FLAG				0x0





/* Secure low power HAL API index */

#define OMAP4_HAL_SAVESECURERAM_INDEX	0x1a

#define OMAP4_HAL_SAVEHW_INDEX		0x1b

#define OMAP4_HAL_SAVEALL_INDEX		0x1c

#define OMAP4_HAL_SAVEGIC_INDEX		0x1d



extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,

				u32 arg1, u32 arg2, u32 arg3, u32 arg4);

extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);



#endif /* OMAP_ARCH_OMAP_SECURE_H */

arch/arm/mach-omap2/omap-secure.c

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

 * OMAP Secure API infrastructure.

 *

 * Copyright (C) 2011 Texas Instruments, Inc.

 *	Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 *

 * 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/kernel.h>

#include <linux/init.h>

#include <linux/io.h>



#include <asm/cacheflush.h>



#include <mach/omap-secure.h>



/**

 * omap_sec_dispatcher: Routine to dispatch low power secure

 * service routines

 * @idx: The HAL API index

 * @flag: The flag indicating criticality of operation

 * @nargs: Number of valid arguments out of four.

 * @arg1, arg2, arg3 args4: Parameters passed to secure API

 *

 * Return the non-zero error value on failure.

 */

u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,

							 u32 arg3, u32 arg4)

{

	u32 ret;

	u32 param[5];



	param[0] = nargs;

	param[1] = arg1;

	param[2] = arg2;

	param[3] = arg3;

	param[4] = arg4;



	/*

	 * Secure API needs physical address

	 * pointer for the parameters

	 */

	flush_cache_all();

	outer_clean_range(__pa(param), __pa(param + 5));

	ret = omap_smc2(idx, flag, __pa(param));



	return ret;

}

arch/arm/mach-omap2/omap44xx-smc.S→arch/arm/mach-omap2/omap-smc.S

+23 −0
Original line number Diff line number Diff line
@@ -31,6 +31,29 @@ ENTRY(omap_smc1) 
	ldmfd   sp!, {r2-r12, pc}

ENDPROC(omap_smc1)



/**

 * u32 omap_smc2(u32 id, u32 falg, u32 pargs)

 * Low level common routine for secure HAL and PPA APIs.

 * @id: Application ID of HAL APIs

 * @flag: Flag to indicate the criticality of operation

 * @pargs: Physical address of parameter list starting

 *	    with number of parametrs

 */

ENTRY(omap_smc2)

	stmfd   sp!, {r4-r12, lr}

	mov	r3, r2

	mov	r2, r1

	mov	r1, #0x0	@ Process ID

	mov	r6, #0xff

	mov	r12, #0x00	@ Secure Service ID

	mov	r7, #0

	mcr	p15, 0, r7, c7, c5, 6

	dsb

	dmb

	smc	#0

	ldmfd   sp!, {r4-r12, pc}

ENDPROC(omap_smc2)



ENTRY(omap_modify_auxcoreboot0)

	stmfd   sp!, {r1-r12, lr}

	ldr	r12, =0x104