mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: tee: apply v14 delta

Browse Source 
Applies the v12 of the generic TEE subsystem patch set.

Change-Id: I018f04c7d57a2552dda5ee48a8cdcbabca32ff69
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
(cherry picked from https://git.linaro.org/kernel/linux-linaro-stable.git
v3.18/topic/optee commit bdcf1e47508bd77291171b7ac2e3c6826ab71f83)
This commit is contained in:
Jens Wiklander
2017-01-20 12:19:18 +01:00
committed by Zhang Zhijie
parent c34d1cafa0
commit ed65a3fbd1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tee/optee/optee_smc.h
View File

@@ -438,9 +438,13 @@ struct optee_smc_disable_shm_cache_result {
#define OPTEE_SMC_RETURN_EBADCMD 0x5
#define OPTEE_SMC_RETURN_ENOMEM 0x6
#define OPTEE_SMC_RETURN_ENOTAVAIL 0x7
#define OPTEE_SMC_RETURN_IS_RPC(ret) \
(((ret) != OPTEE_SMC_RETURN_UNKNOWN_FUNCTION) && \
((((ret) & OPTEE_SMC_RETURN_RPC_PREFIX_MASK) == \
OPTEE_SMC_RETURN_RPC_PREFIX)))
#define OPTEE_SMC_RETURN_IS_RPC(ret) __optee_smc_return_is_rpc((ret))
static inline bool __optee_smc_return_is_rpc(u32 ret)
{
return ret != OPTEE_SMC_RETURN_UNKNOWN_FUNCTION &&
(ret & OPTEE_SMC_RETURN_RPC_PREFIX_MASK) ==
OPTEE_SMC_RETURN_RPC_PREFIX;
}
#endif /* OPTEE_SMC_H */