Commit dbebc8bf authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Introduce check for OP-TEE in omap_secure_init() 



This check and associated flag can be used to signal the presence
of OP-TEE on the platform. This can be used to determine which
SMC calls to make to perform secure operations.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Reviewed-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent db711893

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

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

#include <linux/io.h>

#include <linux/memblock.h>

#include <linux/of.h>



#include <asm/cacheflush.h>

#include <asm/memblock.h>
@@ -20,6 +21,23 @@ 


static phys_addr_t omap_secure_memblock_base;



bool optee_available;



static void __init omap_optee_init_check(void)

{

	struct device_node *np;



	/*

	 * We only check that the OP-TEE node is present and available. The

	 * OP-TEE kernel driver is not needed for the type of interaction made

	 * with OP-TEE here so the driver's status is not checked.

	 */

	np = of_find_node_by_path("/firmware/optee");

	if (np && of_device_is_available(np))

		optee_available = true;

	of_node_put(np);

}



/**

 * omap_sec_dispatcher: Routine to dispatch low power secure

 * service routines
@@ -166,4 +184,5 @@ u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag) 


void __init omap_secure_init(void)

{

	omap_optee_init_check();

}

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

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef OMAP_ARCH_OMAP_SECURE_H

#define OMAP_ARCH_OMAP_SECURE_H



#include <linux/types.h>



/* Monitor error code */

#define  API_HAL_RET_VALUE_NS2S_CONVERSION_ERROR	0xFFFFFFFE

#define  API_HAL_RET_VALUE_SERVICE_UNKNWON		0xFFFFFFFF
@@ -72,6 +74,7 @@ extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs, 
extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);

extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag);



extern bool optee_available;

void omap_secure_init(void);



#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER

CRA Git | Maintained and supported by SUSTech CRA and CCSE