core: OCALL capability

Adds a new capability that reports whether OP-TEE was built with OCALL support. Signed-off-by: Hernan Gatta <hegatta@microsoft.com>
OP-TEE · Mar 26, 2020 · a269d46 · a269d46
1 parent 3a5d978
commit a269d46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/arch/arm/include/sm/optee_smc.h b/core/arch/arm/include/sm/optee_smc.h
@@ -276,7 +276,8 @@
 #define OPTEE_SMC_SEC_CAP_DYNAMIC_SHM		BIT(2)
 /* Secure world is built with virtualization support */
 #define OPTEE_SMC_SEC_CAP_VIRTUALIZATION	BIT(3)
-
+/* Secure world is built with OCALL support */
+#define OPTEE_SMC_SEC_CAP_OCALL			BIT(5)
 
 #define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES	9
 #define OPTEE_SMC_EXCHANGE_CAPABILITIES \

diff --git a/core/arch/arm/tee/entry_fast.c b/core/arch/arm/tee/entry_fast.c
@@ -91,6 +91,9 @@ static void tee_entry_exchange_capabilities(struct thread_smc_args *args)
 #ifdef CFG_VIRTUALIZATION
 	args->a1 |= OPTEE_SMC_SEC_CAP_VIRTUALIZATION;
 #endif
+#if defined(CFG_OCALL)
+	args->a1 |= OPTEE_SMC_SEC_CAP_OCALL;
+#endif
 
 #if defined(CFG_CORE_DYN_SHM)
 	dyn_shm_en = core_mmu_nsec_ddr_is_defined();