- OP-TEE - lists.trustedfirmware.org

[PATCH] hwrng: optee -: Use device-managed registration API

by Tian Tao

Use devm_hwrng_register to get rid of manual unregistration. Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> --- drivers/char/hw_random/optee-rng.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c index a99d829..135a825 100644 --- a/drivers/char/hw_random/optee-rng.c +++ b/drivers/char/hw_random/optee-rng.c @@ -243,7 +243,7 @@ static int optee_rng_probe(struct device *dev) if (err) goto out_sess; - err = hwrng_register(&pvt_data.optee_rng); + err = devm_hwrng_register(dev, &pvt_data.optee_rng); if (err) { dev_err(dev, "hwrng registration failed (%d)\n", err); goto out_sess; @@ -263,7 +263,6 @@ static int optee_rng_probe(struct device *dev) static int optee_rng_remove(struct device *dev) { - hwrng_unregister(&pvt_data.optee_rng); tee_client_close_session(pvt_data.ctx, pvt_data.session_id); tee_client_close_context(pvt_data.ctx); -- 2.7.4

4 years, 4 months

2
1
0 0

[PATCH] tee: fix some comment typos in header files

by Elvira Khabirova

struct tee_param: revc -> recv. TEE_IOC_SUPPL_SEND: typo introduced by copy-pasting, replace invalid description with description from the according argument struct. Signed-off-by: Elvira Khabirova <e.khabirova(a)omprussia.ru> --- include/linux/tee_drv.h | 2 +- include/uapi/linux/tee.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index d074302989dd..61557bc0e29f 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -85,7 +85,7 @@ struct tee_param { * @close_session: close a session * @invoke_func: invoke a trusted function * @cancel_req: request cancel of an ongoing invoke or open - * @supp_revc: called for supplicant to get a command + * @supp_recv: called for supplicant to get a command * @supp_send: called for supplicant to send a response * @shm_register: register shared memory buffer in TEE * @shm_unregister: unregister shared memory buffer in TEE diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index b619f37ee03e..7546be5ed4f8 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -342,7 +342,7 @@ struct tee_iocl_supp_send_arg { }; /** - * TEE_IOC_SUPPL_SEND - Receive a request for a supplicant function + * TEE_IOC_SUPPL_SEND - Send a response to a received request * * Takes a struct tee_ioctl_buf_data which contains a struct * tee_iocl_supp_send_arg followed by any array of struct tee_param -- 2.28.0

4 years, 4 months

3
2
0 0

[PATCH] tee: optee: fix 'physical' typos

by Bjorn Helgaas

From: Bjorn Helgaas <bhelgaas(a)google.com> Fix misspellings of "physical". Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> --- drivers/tee/optee/optee_smc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index 777ad54d4c2c..b52eb34b4237 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -139,7 +139,7 @@ struct optee_smc_call_get_os_revision_result { * optee_msg_arg. * OPTEE_SMC_RETURN_ETHREAD_LIMIT Number of Trusted OS threads exceeded, * try again later. - * OPTEE_SMC_RETURN_EBADADDR Bad physcial pointer to struct + * OPTEE_SMC_RETURN_EBADADDR Bad physical pointer to struct * optee_msg_arg. * OPTEE_SMC_RETURN_EBADCMD Bad/unknown cmd in struct optee_msg_arg * OPTEE_SMC_RETURN_IS_RPC() Call suspended by RPC call to normal -- 2.25.1

4 years, 4 months

2
1
0 0

Re: [PATCH] tee: optee: remove need_resched() before cond_resched()

by Jens Wiklander

Hi Rouven and Sumit, On Mon, Jan 25, 2021 at 10:58 AM Jens Wiklander via OP-TEE <op-tee(a)lists.trustedfirmware.org> wrote: > > Hi Rouven and Sumit, > > On Mon, Jan 25, 2021 at 10:55 AM Jens Wiklander > <jens.wiklander(a)linaro.org> wrote: > > > > Testing need_resched() before cond_resched() is not needed as an > > equivalent test is done internally in cond_resched(). So drop the > > need_resched() test. > > > > Fixes: dcb3b06d9c34 ("tee: optee: replace might_sleep with cond_resched") > > Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> > > --- > > drivers/tee/optee/call.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > Can you please test to see that this works in your setups too? Does this work for you? I'd like to get this patch ready for v5.12. Thanks, Jens

4 years, 4 months

3
4
0 0

Re: [PATCH] optee: sync OP-TEE headers

by Sumit Garg

On Fri, 29 Jan 2021 at 19:13, Jens Wiklander via OP-TEE <op-tee(a)lists.trustedfirmware.org> wrote: > > Pulls in updates in the internal headers from OP-TEE OS [1]. A few > defines has been shortened, hence the changes in rpc.c. Defines not used > by the driver in tee_rpc_cmd.h has been filtered out. > > Note that this does not change the ABI. > > Link: [1] https://github.com/OP-TEE/optee_os > Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> > --- > drivers/tee/optee/optee_msg.h | 154 ++---------------------------- > drivers/tee/optee/optee_rpc_cmd.h | 103 ++++++++++++++++++++ > drivers/tee/optee/optee_smc.h | 70 +++++++++----- > drivers/tee/optee/rpc.c | 39 ++++---- > 4 files changed, 178 insertions(+), 188 deletions(-) > create mode 100644 drivers/tee/optee/optee_rpc_cmd.h > Looks good to me apart from the minor nit below. Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> > diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h > index 7b2d919da2ac..7c4723b66668 100644 > --- a/drivers/tee/optee/optee_msg.h > +++ b/drivers/tee/optee/optee_msg.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ > /* > - * Copyright (c) 2015-2019, Linaro Limited > + * Copyright (c) 2015-2021, Linaro Limited > */ > #ifndef _OPTEE_MSG_H > #define _OPTEE_MSG_H > @@ -12,11 +12,9 @@ > * This file defines the OP-TEE message protocol used to communicate > * with an instance of OP-TEE running in secure world. > * > - * This file is divided into three sections. > + * This file is divided into two sections. > * 1. Formatting of messages. > * 2. Requests from normal world > - * 3. Requests from secure world, Remote Procedure Call (RPC), handled by > - * tee-supplicant. > */ > > /***************************************************************************** > @@ -54,8 +52,8 @@ > * Every entry in buffer should point to a 4k page beginning (12 least > * significant bits must be equal to zero). > * > - * 12 least significant bints of optee_msg_param.u.tmem.buf_ptr should hold page > - * offset of the user buffer. > + * 12 least significant bits of optee_msg_param.u.tmem.buf_ptr should hold > + * page offset of user buffer. > * > * So, entries should be placed like members of this structure: > * > @@ -176,17 +174,9 @@ struct optee_msg_param { > * @params: the parameters supplied to the OS Command > * > * All normal calls to Trusted OS uses this struct. If cmd requires further > - * information than what these field holds it can be passed as a parameter > + * information than what these fields hold it can be passed as a parameter > * tagged as meta (setting the OPTEE_MSG_ATTR_META bit in corresponding > - * attrs field). All parameters tagged as meta has to come first. > - * > - * Temp memref parameters can be fragmented if supported by the Trusted OS > - * (when optee_smc.h is bearer of this protocol this is indicated with > - * OPTEE_SMC_SEC_CAP_UNREGISTERED_SHM). If a logical memref parameter is > - * fragmented then has all but the last fragment the > - * OPTEE_MSG_ATTR_FRAGMENT bit set in attrs. Even if a memref is fragmented > - * it will still be presented as a single logical memref to the Trusted > - * Application. > + * attrs field). All parameters tagged as meta have to come first. > */ > struct optee_msg_arg { > u32 cmd; > @@ -290,13 +280,10 @@ struct optee_msg_arg { > * OPTEE_MSG_CMD_REGISTER_SHM registers a shared memory reference. The > * information is passed as: > * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_TMEM_INPUT > - * [| OPTEE_MSG_ATTR_FRAGMENT] > + * [| OPTEE_MSG_ATTR_NONCONTIG] > * [in] param[0].u.tmem.buf_ptr physical address (of first fragment) > * [in] param[0].u.tmem.size size (of first fragment) > * [in] param[0].u.tmem.shm_ref holds shared memory reference > - * ... > - * The shared memory can optionally be fragmented, temp memrefs can follow > - * each other with all but the last with the OPTEE_MSG_ATTR_FRAGMENT bit set. > * > * OPTEE_MSG_CMD_UNREGISTER_SHM unregisteres a previously registered shared nit: since you are touching this file, s/unregisteres/unregisters/ -Sumit > * memory reference. The information is passed as: > @@ -313,131 +300,4 @@ struct optee_msg_arg { > #define OPTEE_MSG_CMD_UNREGISTER_SHM 5 > #define OPTEE_MSG_FUNCID_CALL_WITH_ARG 0x0004 > > -/***************************************************************************** > - * Part 3 - Requests from secure world, RPC > - *****************************************************************************/ > - > -/* > - * All RPC is done with a struct optee_msg_arg as bearer of information, > - * struct optee_msg_arg::arg holds values defined by OPTEE_MSG_RPC_CMD_* below > - * > - * RPC communication with tee-supplicant is reversed compared to normal > - * client communication desribed above. The supplicant receives requests > - * and sends responses. > - */ > - > -/* > - * Load a TA into memory, defined in tee-supplicant > - */ > -#define OPTEE_MSG_RPC_CMD_LOAD_TA 0 > - > -/* > - * Reserved > - */ > -#define OPTEE_MSG_RPC_CMD_RPMB 1 > - > -/* > - * File system access, defined in tee-supplicant > - */ > -#define OPTEE_MSG_RPC_CMD_FS 2 > - > -/* > - * Get time > - * > - * Returns number of seconds and nano seconds since the Epoch, > - * 1970-01-01 00:00:00 +0000 (UTC). > - * > - * [out] param[0].u.value.a Number of seconds > - * [out] param[0].u.value.b Number of nano seconds. > - */ > -#define OPTEE_MSG_RPC_CMD_GET_TIME 3 > - > -/* > - * Wait queue primitive, helper for secure world to implement a wait queue. > - * > - * If secure world need to wait for a secure world mutex it issues a sleep > - * request instead of spinning in secure world. Conversely is a wakeup > - * request issued when a secure world mutex with a thread waiting thread is > - * unlocked. > - * > - * Waiting on a key > - * [in] param[0].u.value.a OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP > - * [in] param[0].u.value.b wait key > - * > - * Waking up a key > - * [in] param[0].u.value.a OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP > - * [in] param[0].u.value.b wakeup key > - */ > -#define OPTEE_MSG_RPC_CMD_WAIT_QUEUE 4 > -#define OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP 0 > -#define OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP 1 > - > -/* > - * Suspend execution > - * > - * [in] param[0].value .a number of milliseconds to suspend > - */ > -#define OPTEE_MSG_RPC_CMD_SUSPEND 5 > - > -/* > - * Allocate a piece of shared memory > - * > - * Shared memory can optionally be fragmented, to support that additional > - * spare param entries are allocated to make room for eventual fragments. > - * The spare param entries has .attr = OPTEE_MSG_ATTR_TYPE_NONE when > - * unused. All returned temp memrefs except the last should have the > - * OPTEE_MSG_ATTR_FRAGMENT bit set in the attr field. > - * > - * [in] param[0].u.value.a type of memory one of > - * OPTEE_MSG_RPC_SHM_TYPE_* below > - * [in] param[0].u.value.b requested size > - * [in] param[0].u.value.c required alignment > - * > - * [out] param[0].u.tmem.buf_ptr physical address (of first fragment) > - * [out] param[0].u.tmem.size size (of first fragment) > - * [out] param[0].u.tmem.shm_ref shared memory reference > - * ... > - * [out] param[n].u.tmem.buf_ptr physical address > - * [out] param[n].u.tmem.size size > - * [out] param[n].u.tmem.shm_ref shared memory reference (same value > - * as in param[n-1].u.tmem.shm_ref) > - */ > -#define OPTEE_MSG_RPC_CMD_SHM_ALLOC 6 > -/* Memory that can be shared with a non-secure user space application */ > -#define OPTEE_MSG_RPC_SHM_TYPE_APPL 0 > -/* Memory only shared with non-secure kernel */ > -#define OPTEE_MSG_RPC_SHM_TYPE_KERNEL 1 > - > -/* > - * Free shared memory previously allocated with OPTEE_MSG_RPC_CMD_SHM_ALLOC > - * > - * [in] param[0].u.value.a type of memory one of > - * OPTEE_MSG_RPC_SHM_TYPE_* above > - * [in] param[0].u.value.b value of shared memory reference > - * returned in param[0].u.tmem.shm_ref > - * above > - */ > -#define OPTEE_MSG_RPC_CMD_SHM_FREE 7 > - > -/* > - * Access a device on an i2c bus > - * > - * [in] param[0].u.value.a mode: RD(0), WR(1) > - * [in] param[0].u.value.b i2c adapter > - * [in] param[0].u.value.c i2c chip > - * > - * [in] param[1].u.value.a i2c control flags > - * > - * [in/out] memref[2] buffer to exchange the transfer data > - * with the secure world > - * > - * [out] param[3].u.value.a bytes transferred by the driver > - */ > -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER 21 > -/* I2C master transfer modes */ > -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD 0 > -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER_WR 1 > -/* I2C master control flags */ > -#define OPTEE_MSG_RPC_CMD_I2C_FLAGS_TEN_BIT BIT(0) > - > #endif /* _OPTEE_MSG_H */ > diff --git a/drivers/tee/optee/optee_rpc_cmd.h b/drivers/tee/optee/optee_rpc_cmd.h > new file mode 100644 > index 000000000000..b8275140cef8 > --- /dev/null > +++ b/drivers/tee/optee/optee_rpc_cmd.h > @@ -0,0 +1,103 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > +/* > + * Copyright (c) 2016-2021, Linaro Limited > + */ > + > +#ifndef __OPTEE_RPC_CMD_H > +#define __OPTEE_RPC_CMD_H > + > +/* > + * All RPC is done with a struct optee_msg_arg as bearer of information, > + * struct optee_msg_arg::arg holds values defined by OPTEE_RPC_CMD_* below. > + * Only the commands handled by the kernel driver are defined here. > + * > + * RPC communication with tee-supplicant is reversed compared to normal > + * client communication described above. The supplicant receives requests > + * and sends responses. > + */ > + > +/* > + * Get time > + * > + * Returns number of seconds and nano seconds since the Epoch, > + * 1970-01-01 00:00:00 +0000 (UTC). > + * > + * [out] value[0].a Number of seconds > + * [out] value[0].b Number of nano seconds. > + */ > +#define OPTEE_RPC_CMD_GET_TIME 3 > + > +/* > + * Wait queue primitive, helper for secure world to implement a wait queue. > + * > + * If secure world needs to wait for a secure world mutex it issues a sleep > + * request instead of spinning in secure world. Conversely is a wakeup > + * request issued when a secure world mutex with a thread waiting thread is > + * unlocked. > + * > + * Waiting on a key > + * [in] value[0].a OPTEE_RPC_WAIT_QUEUE_SLEEP > + * [in] value[0].b Wait key > + * > + * Waking up a key > + * [in] value[0].a OPTEE_RPC_WAIT_QUEUE_WAKEUP > + * [in] value[0].b Wakeup key > + */ > +#define OPTEE_RPC_CMD_WAIT_QUEUE 4 > +#define OPTEE_RPC_WAIT_QUEUE_SLEEP 0 > +#define OPTEE_RPC_WAIT_QUEUE_WAKEUP 1 > + > +/* > + * Suspend execution > + * > + * [in] value[0].a Number of milliseconds to suspend > + */ > +#define OPTEE_RPC_CMD_SUSPEND 5 > + > +/* > + * Allocate a piece of shared memory > + * > + * [in] value[0].a Type of memory one of > + * OPTEE_RPC_SHM_TYPE_* below > + * [in] value[0].b Requested size > + * [in] value[0].c Required alignment > + * [out] memref[0] Buffer > + */ > +#define OPTEE_RPC_CMD_SHM_ALLOC 6 > +/* Memory that can be shared with a non-secure user space application */ > +#define OPTEE_RPC_SHM_TYPE_APPL 0 > +/* Memory only shared with non-secure kernel */ > +#define OPTEE_RPC_SHM_TYPE_KERNEL 1 > + > +/* > + * Free shared memory previously allocated with OPTEE_RPC_CMD_SHM_ALLOC > + * > + * [in] value[0].a Type of memory one of > + * OPTEE_RPC_SHM_TYPE_* above > + * [in] value[0].b Value of shared memory reference or cookie > + */ > +#define OPTEE_RPC_CMD_SHM_FREE 7 > + > +/* > + * Issue master requests (read and write operations) to an I2C chip. > + * > + * [in] value[0].a Transfer mode (OPTEE_RPC_I2C_TRANSFER_*) > + * [in] value[0].b The I2C bus (a.k.a adapter). > + * 16 bit field. > + * [in] value[0].c The I2C chip (a.k.a address). > + * 16 bit field (either 7 or 10 bit effective). > + * [in] value[1].a The I2C master control flags (ie, 10 bit address). > + * 16 bit field. > + * [in/out] memref[2] Buffer used for data transfers. > + * [out] value[3].a Number of bytes transferred by the REE. > + */ > +#define OPTEE_RPC_CMD_I2C_TRANSFER 21 > + > +/* I2C master transfer modes */ > +#define OPTEE_RPC_I2C_TRANSFER_RD 0 > +#define OPTEE_RPC_I2C_TRANSFER_WR 1 > + > +/* I2C master control flags */ > +#define OPTEE_RPC_I2C_FLAGS_TEN_BIT BIT(0) > + > +#endif /*__OPTEE_RPC_CMD_H*/ > diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h > index 777ad54d4c2c..821e1c30c150 100644 > --- a/drivers/tee/optee/optee_smc.h > +++ b/drivers/tee/optee/optee_smc.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ > /* > - * Copyright (c) 2015-2019, Linaro Limited > + * Copyright (c) 2015-2021, Linaro Limited > */ > #ifndef OPTEE_SMC_H > #define OPTEE_SMC_H > @@ -39,10 +39,10 @@ > /* > * Function specified by SMC Calling convention > * > - * Return one of the following UIDs if using API specified in this file > - * without further extentions: > - * 65cb6b93-af0c-4617-8ed6-644a8d1140f8 > - * see also OPTEE_SMC_UID_* in optee_msg.h > + * Return the following UID if using API specified in this file > + * without further extensions: > + * 384fb3e0-e7f8-11e3-af63-0002a5d5c51b. > + * see also OPTEE_MSG_UID_* in optee_msg.h > */ > #define OPTEE_SMC_FUNCID_CALLS_UID OPTEE_MSG_FUNCID_CALLS_UID > #define OPTEE_SMC_CALLS_UID \ > @@ -53,7 +53,7 @@ > /* > * Function specified by SMC Calling convention > * > - * Returns 2.0 if using API specified in this file without further extentions. > + * Returns 2.0 if using API specified in this file without further extensions. > * see also OPTEE_MSG_REVISION_* in optee_msg.h > */ > #define OPTEE_SMC_FUNCID_CALLS_REVISION OPTEE_MSG_FUNCID_CALLS_REVISION > @@ -109,8 +109,8 @@ struct optee_smc_call_get_os_revision_result { > * > * Call register usage: > * a0 SMC Function ID, OPTEE_SMC*CALL_WITH_ARG > - * a1 Upper 32bit of a 64bit physical pointer to a struct optee_msg_arg > - * a2 Lower 32bit of a 64bit physical pointer to a struct optee_msg_arg > + * a1 Upper 32 bits of a 64-bit physical pointer to a struct optee_msg_arg > + * a2 Lower 32 bits of a 64-bit physical pointer to a struct optee_msg_arg > * a3 Cache settings, not used if physical pointer is in a predefined shared > * memory area else per OPTEE_SMC_SHM_* > * a4-6 Not used > @@ -214,8 +214,9 @@ struct optee_smc_get_shm_config_result { > * secure world accepts command buffers located in any parts of non-secure RAM > */ > #define OPTEE_SMC_SEC_CAP_DYNAMIC_SHM BIT(2) > - > -/* Secure world supports Shared Memory with a NULL buffer reference */ > +/* Secure world is built with virtualization support */ > +#define OPTEE_SMC_SEC_CAP_VIRTUALIZATION BIT(3) > +/* Secure world supports Shared Memory with a NULL reference */ > #define OPTEE_SMC_SEC_CAP_MEMREF_NULL BIT(4) > > #define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9 > @@ -245,8 +246,8 @@ struct optee_smc_exchange_capabilities_result { > * > * Normal return register usage: > * a0 OPTEE_SMC_RETURN_OK > - * a1 Upper 32bit of a 64bit Shared memory cookie > - * a2 Lower 32bit of a 64bit Shared memory cookie > + * a1 Upper 32 bits of a 64-bit Shared memory cookie > + * a2 Lower 32 bits of a 64-bit Shared memory cookie > * a3-7 Preserved > * > * Cache empty return register usage: > @@ -293,6 +294,31 @@ struct optee_smc_disable_shm_cache_result { > #define OPTEE_SMC_ENABLE_SHM_CACHE \ > OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) > > +/* > + * Query OP-TEE about number of supported threads > + * > + * Normal World OS or Hypervisor issues this call to find out how many > + * threads OP-TEE supports. That is how many standard calls can be issued > + * in parallel before OP-TEE will return OPTEE_SMC_RETURN_ETHREAD_LIMIT. > + * > + * Call requests usage: > + * a0 SMC Function ID, OPTEE_SMC_GET_THREAD_COUNT > + * a1-6 Not used > + * a7 Hypervisor Client ID register > + * > + * Normal return register usage: > + * a0 OPTEE_SMC_RETURN_OK > + * a1 Number of threads > + * a2-7 Preserved > + * > + * Error return: > + * a0 OPTEE_SMC_RETURN_UNKNOWN_FUNCTION Requested call is not implemented > + * a1-7 Preserved > + */ > +#define OPTEE_SMC_FUNCID_GET_THREAD_COUNT 15 > +#define OPTEE_SMC_GET_THREAD_COUNT \ > + OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_THREAD_COUNT) > + > /* > * Resume from RPC (for example after processing a foreign interrupt) > * > @@ -341,16 +367,16 @@ struct optee_smc_disable_shm_cache_result { > * > * "Return" register usage: > * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. > - * a1 Upper 32bits of 64bit physical pointer to allocated > + * a1 Upper 32 bits of 64-bit physical pointer to allocated > * memory, (a1 == 0 && a2 == 0) if size was 0 or if memory can't > * be allocated. > - * a2 Lower 32bits of 64bit physical pointer to allocated > + * a2 Lower 32 bits of 64-bit physical pointer to allocated > * memory, (a1 == 0 && a2 == 0) if size was 0 or if memory can't > * be allocated > * a3 Preserved > - * a4 Upper 32bits of 64bit Shared memory cookie used when freeing > + * a4 Upper 32 bits of 64-bit Shared memory cookie used when freeing > * the memory or doing an RPC > - * a5 Lower 32bits of 64bit Shared memory cookie used when freeing > + * a5 Lower 32 bits of 64-bit Shared memory cookie used when freeing > * the memory or doing an RPC > * a6-7 Preserved > */ > @@ -363,9 +389,9 @@ struct optee_smc_disable_shm_cache_result { > * > * "Call" register usage: > * a0 This value, OPTEE_SMC_RETURN_RPC_FREE > - * a1 Upper 32bits of 64bit shared memory cookie belonging to this > + * a1 Upper 32 bits of 64-bit shared memory cookie belonging to this > * argument memory > - * a2 Lower 32bits of 64bit shared memory cookie belonging to this > + * a2 Lower 32 bits of 64-bit shared memory cookie belonging to this > * argument memory > * a3-7 Resume information, must be preserved > * > @@ -379,7 +405,7 @@ struct optee_smc_disable_shm_cache_result { > OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) > > /* > - * Deliver foreign interrupt to normal world. > + * Deliver a foreign interrupt in normal world. > * > * "Call" register usage: > * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR > @@ -389,7 +415,7 @@ struct optee_smc_disable_shm_cache_result { > * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. > * a1-7 Preserved > */ > -#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 > +#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 > #define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \ > OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR) > > @@ -405,10 +431,10 @@ struct optee_smc_disable_shm_cache_result { > * > * "Call" register usage: > * a0 OPTEE_SMC_RETURN_RPC_CMD > - * a1 Upper 32bit of a 64bit Shared memory cookie holding a > + * a1 Upper 32 bits of a 64-bit Shared memory cookie holding a > * struct optee_msg_arg, must be preserved, only the data should > * be updated > - * a2 Lower 32bit of a 64bit Shared memory cookie holding a > + * a2 Lower 32 bits of a 64-bit Shared memory cookie holding a > * struct optee_msg_arg, must be preserved, only the data should > * be updated > * a3-7 Resume information, must be preserved > diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c > index 1e3614e4798f..a0c30b664e53 100644 > --- a/drivers/tee/optee/rpc.c > +++ b/drivers/tee/optee/rpc.c > @@ -12,6 +12,7 @@ > #include <linux/tee_drv.h> > #include "optee_private.h" > #include "optee_smc.h" > +#include "optee_rpc_cmd.h" > > struct wq_entry { > struct list_head link; > @@ -89,7 +90,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, > if (!client.adapter) > goto bad; > > - if (params[1].u.value.a & OPTEE_MSG_RPC_CMD_I2C_FLAGS_TEN_BIT) { > + if (params[1].u.value.a & OPTEE_RPC_I2C_FLAGS_TEN_BIT) { > if (!i2c_check_functionality(client.adapter, > I2C_FUNC_10BIT_ADDR)) { > i2c_put_adapter(client.adapter); > @@ -103,11 +104,11 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, > snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr); > > switch (params[0].u.value.a) { > - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD: > + case OPTEE_RPC_I2C_TRANSFER_RD: > ret = i2c_master_recv(&client, params[2].u.memref.shm->kaddr, > params[2].u.memref.size); > break; > - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_WR: > + case OPTEE_RPC_I2C_TRANSFER_WR: > ret = i2c_master_send(&client, params[2].u.memref.shm->kaddr, > params[2].u.memref.size); > break; > @@ -194,10 +195,10 @@ static void handle_rpc_func_cmd_wq(struct optee *optee, > goto bad; > > switch (arg->params[0].u.value.a) { > - case OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP: > + case OPTEE_RPC_WAIT_QUEUE_SLEEP: > wq_sleep(&optee->wait_queue, arg->params[0].u.value.b); > break; > - case OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP: > + case OPTEE_RPC_WAIT_QUEUE_WAKEUP: > wq_wakeup(&optee->wait_queue, arg->params[0].u.value.b); > break; > default: > @@ -267,11 +268,11 @@ static struct tee_shm *cmd_alloc_suppl(struct tee_context *ctx, size_t sz) > struct tee_shm *shm; > > param.attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT; > - param.u.value.a = OPTEE_MSG_RPC_SHM_TYPE_APPL; > + param.u.value.a = OPTEE_RPC_SHM_TYPE_APPL; > param.u.value.b = sz; > param.u.value.c = 0; > > - ret = optee_supp_thrd_req(ctx, OPTEE_MSG_RPC_CMD_SHM_ALLOC, 1, &param); > + ret = optee_supp_thrd_req(ctx, OPTEE_RPC_CMD_SHM_ALLOC, 1, &param); > if (ret) > return ERR_PTR(-ENOMEM); > > @@ -308,10 +309,10 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx, > > sz = arg->params[0].u.value.b; > switch (arg->params[0].u.value.a) { > - case OPTEE_MSG_RPC_SHM_TYPE_APPL: > + case OPTEE_RPC_SHM_TYPE_APPL: > shm = cmd_alloc_suppl(ctx, sz); > break; > - case OPTEE_MSG_RPC_SHM_TYPE_KERNEL: > + case OPTEE_RPC_SHM_TYPE_KERNEL: > shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED); > break; > default: > @@ -383,7 +384,7 @@ static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm) > struct tee_param param; > > param.attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT; > - param.u.value.a = OPTEE_MSG_RPC_SHM_TYPE_APPL; > + param.u.value.a = OPTEE_RPC_SHM_TYPE_APPL; > param.u.value.b = tee_shm_get_id(shm); > param.u.value.c = 0; > > @@ -400,7 +401,7 @@ static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm) > */ > tee_shm_put(shm); > > - optee_supp_thrd_req(ctx, OPTEE_MSG_RPC_CMD_SHM_FREE, 1, &param); > + optee_supp_thrd_req(ctx, OPTEE_RPC_CMD_SHM_FREE, 1, &param); > } > > static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx, > @@ -418,10 +419,10 @@ static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx, > > shm = (struct tee_shm *)(unsigned long)arg->params[0].u.value.b; > switch (arg->params[0].u.value.a) { > - case OPTEE_MSG_RPC_SHM_TYPE_APPL: > + case OPTEE_RPC_SHM_TYPE_APPL: > cmd_free_suppl(ctx, shm); > break; > - case OPTEE_MSG_RPC_SHM_TYPE_KERNEL: > + case OPTEE_RPC_SHM_TYPE_KERNEL: > tee_shm_free(shm); > break; > default: > @@ -458,23 +459,23 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee, > } > > switch (arg->cmd) { > - case OPTEE_MSG_RPC_CMD_GET_TIME: > + case OPTEE_RPC_CMD_GET_TIME: > handle_rpc_func_cmd_get_time(arg); > break; > - case OPTEE_MSG_RPC_CMD_WAIT_QUEUE: > + case OPTEE_RPC_CMD_WAIT_QUEUE: > handle_rpc_func_cmd_wq(optee, arg); > break; > - case OPTEE_MSG_RPC_CMD_SUSPEND: > + case OPTEE_RPC_CMD_SUSPEND: > handle_rpc_func_cmd_wait(arg); > break; > - case OPTEE_MSG_RPC_CMD_SHM_ALLOC: > + case OPTEE_RPC_CMD_SHM_ALLOC: > free_pages_list(call_ctx); > handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx); > break; > - case OPTEE_MSG_RPC_CMD_SHM_FREE: > + case OPTEE_RPC_CMD_SHM_FREE: > handle_rpc_func_cmd_shm_free(ctx, arg); > break; > - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER: > + case OPTEE_RPC_CMD_I2C_TRANSFER: > handle_rpc_func_cmd_i2c_transfer(ctx, arg); > break; > default: > -- > 2.25.1 >

4 years, 4 months

2
1
0 0

[PATCH] tee: optee: remove need_resched() before cond_resched()

by Jens Wiklander

Testing need_resched() before cond_resched() is not needed as an equivalent test is done internally in cond_resched(). So drop the need_resched() test. Fixes: dcb3b06d9c34 ("tee: optee: replace might_sleep with cond_resched") Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/optee/call.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 780d7c4fd756..7a77e375b503 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -149,8 +149,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg) */ optee_cq_wait_for_completion(&optee->call_queue, &w); } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) { - if (need_resched()) - cond_resched(); + cond_resched(); param.a0 = res.a0; param.a1 = res.a1; param.a2 = res.a2; -- 2.25.1

4 years, 4 months

2
2
0 0

[PATCH] optee: sync OP-TEE headers

by Jens Wiklander

Pulls in updates in the internal headers from OP-TEE OS [1]. A few defines has been shortened, hence the changes in rpc.c. Defines not used by the driver in tee_rpc_cmd.h has been filtered out. Note that this does not change the ABI. Link: [1] https://github.com/OP-TEE/optee_os Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/optee/optee_msg.h | 154 ++---------------------------- drivers/tee/optee/optee_rpc_cmd.h | 103 ++++++++++++++++++++ drivers/tee/optee/optee_smc.h | 70 +++++++++----- drivers/tee/optee/rpc.c | 39 ++++---- 4 files changed, 178 insertions(+), 188 deletions(-) create mode 100644 drivers/tee/optee/optee_rpc_cmd.h diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h index 7b2d919da2ac..7c4723b66668 100644 --- a/drivers/tee/optee/optee_msg.h +++ b/drivers/tee/optee/optee_msg.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (c) 2015-2019, Linaro Limited + * Copyright (c) 2015-2021, Linaro Limited */ #ifndef _OPTEE_MSG_H #define _OPTEE_MSG_H @@ -12,11 +12,9 @@ * This file defines the OP-TEE message protocol used to communicate * with an instance of OP-TEE running in secure world. * - * This file is divided into three sections. + * This file is divided into two sections. * 1. Formatting of messages. * 2. Requests from normal world - * 3. Requests from secure world, Remote Procedure Call (RPC), handled by - * tee-supplicant. */ /***************************************************************************** @@ -54,8 +52,8 @@ * Every entry in buffer should point to a 4k page beginning (12 least * significant bits must be equal to zero). * - * 12 least significant bints of optee_msg_param.u.tmem.buf_ptr should hold page - * offset of the user buffer. + * 12 least significant bits of optee_msg_param.u.tmem.buf_ptr should hold + * page offset of user buffer. * * So, entries should be placed like members of this structure: * @@ -176,17 +174,9 @@ struct optee_msg_param { * @params: the parameters supplied to the OS Command * * All normal calls to Trusted OS uses this struct. If cmd requires further - * information than what these field holds it can be passed as a parameter + * information than what these fields hold it can be passed as a parameter * tagged as meta (setting the OPTEE_MSG_ATTR_META bit in corresponding - * attrs field). All parameters tagged as meta has to come first. - * - * Temp memref parameters can be fragmented if supported by the Trusted OS - * (when optee_smc.h is bearer of this protocol this is indicated with - * OPTEE_SMC_SEC_CAP_UNREGISTERED_SHM). If a logical memref parameter is - * fragmented then has all but the last fragment the - * OPTEE_MSG_ATTR_FRAGMENT bit set in attrs. Even if a memref is fragmented - * it will still be presented as a single logical memref to the Trusted - * Application. + * attrs field). All parameters tagged as meta have to come first. */ struct optee_msg_arg { u32 cmd; @@ -290,13 +280,10 @@ struct optee_msg_arg { * OPTEE_MSG_CMD_REGISTER_SHM registers a shared memory reference. The * information is passed as: * [in] param[0].attr OPTEE_MSG_ATTR_TYPE_TMEM_INPUT - * [| OPTEE_MSG_ATTR_FRAGMENT] + * [| OPTEE_MSG_ATTR_NONCONTIG] * [in] param[0].u.tmem.buf_ptr physical address (of first fragment) * [in] param[0].u.tmem.size size (of first fragment) * [in] param[0].u.tmem.shm_ref holds shared memory reference - * ... - * The shared memory can optionally be fragmented, temp memrefs can follow - * each other with all but the last with the OPTEE_MSG_ATTR_FRAGMENT bit set. * * OPTEE_MSG_CMD_UNREGISTER_SHM unregisteres a previously registered shared * memory reference. The information is passed as: @@ -313,131 +300,4 @@ struct optee_msg_arg { #define OPTEE_MSG_CMD_UNREGISTER_SHM 5 #define OPTEE_MSG_FUNCID_CALL_WITH_ARG 0x0004 -/***************************************************************************** - * Part 3 - Requests from secure world, RPC - *****************************************************************************/ - -/* - * All RPC is done with a struct optee_msg_arg as bearer of information, - * struct optee_msg_arg::arg holds values defined by OPTEE_MSG_RPC_CMD_* below - * - * RPC communication with tee-supplicant is reversed compared to normal - * client communication desribed above. The supplicant receives requests - * and sends responses. - */ - -/* - * Load a TA into memory, defined in tee-supplicant - */ -#define OPTEE_MSG_RPC_CMD_LOAD_TA 0 - -/* - * Reserved - */ -#define OPTEE_MSG_RPC_CMD_RPMB 1 - -/* - * File system access, defined in tee-supplicant - */ -#define OPTEE_MSG_RPC_CMD_FS 2 - -/* - * Get time - * - * Returns number of seconds and nano seconds since the Epoch, - * 1970-01-01 00:00:00 +0000 (UTC). - * - * [out] param[0].u.value.a Number of seconds - * [out] param[0].u.value.b Number of nano seconds. - */ -#define OPTEE_MSG_RPC_CMD_GET_TIME 3 - -/* - * Wait queue primitive, helper for secure world to implement a wait queue. - * - * If secure world need to wait for a secure world mutex it issues a sleep - * request instead of spinning in secure world. Conversely is a wakeup - * request issued when a secure world mutex with a thread waiting thread is - * unlocked. - * - * Waiting on a key - * [in] param[0].u.value.a OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP - * [in] param[0].u.value.b wait key - * - * Waking up a key - * [in] param[0].u.value.a OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP - * [in] param[0].u.value.b wakeup key - */ -#define OPTEE_MSG_RPC_CMD_WAIT_QUEUE 4 -#define OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP 0 -#define OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP 1 - -/* - * Suspend execution - * - * [in] param[0].value .a number of milliseconds to suspend - */ -#define OPTEE_MSG_RPC_CMD_SUSPEND 5 - -/* - * Allocate a piece of shared memory - * - * Shared memory can optionally be fragmented, to support that additional - * spare param entries are allocated to make room for eventual fragments. - * The spare param entries has .attr = OPTEE_MSG_ATTR_TYPE_NONE when - * unused. All returned temp memrefs except the last should have the - * OPTEE_MSG_ATTR_FRAGMENT bit set in the attr field. - * - * [in] param[0].u.value.a type of memory one of - * OPTEE_MSG_RPC_SHM_TYPE_* below - * [in] param[0].u.value.b requested size - * [in] param[0].u.value.c required alignment - * - * [out] param[0].u.tmem.buf_ptr physical address (of first fragment) - * [out] param[0].u.tmem.size size (of first fragment) - * [out] param[0].u.tmem.shm_ref shared memory reference - * ... - * [out] param[n].u.tmem.buf_ptr physical address - * [out] param[n].u.tmem.size size - * [out] param[n].u.tmem.shm_ref shared memory reference (same value - * as in param[n-1].u.tmem.shm_ref) - */ -#define OPTEE_MSG_RPC_CMD_SHM_ALLOC 6 -/* Memory that can be shared with a non-secure user space application */ -#define OPTEE_MSG_RPC_SHM_TYPE_APPL 0 -/* Memory only shared with non-secure kernel */ -#define OPTEE_MSG_RPC_SHM_TYPE_KERNEL 1 - -/* - * Free shared memory previously allocated with OPTEE_MSG_RPC_CMD_SHM_ALLOC - * - * [in] param[0].u.value.a type of memory one of - * OPTEE_MSG_RPC_SHM_TYPE_* above - * [in] param[0].u.value.b value of shared memory reference - * returned in param[0].u.tmem.shm_ref - * above - */ -#define OPTEE_MSG_RPC_CMD_SHM_FREE 7 - -/* - * Access a device on an i2c bus - * - * [in] param[0].u.value.a mode: RD(0), WR(1) - * [in] param[0].u.value.b i2c adapter - * [in] param[0].u.value.c i2c chip - * - * [in] param[1].u.value.a i2c control flags - * - * [in/out] memref[2] buffer to exchange the transfer data - * with the secure world - * - * [out] param[3].u.value.a bytes transferred by the driver - */ -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER 21 -/* I2C master transfer modes */ -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD 0 -#define OPTEE_MSG_RPC_CMD_I2C_TRANSFER_WR 1 -/* I2C master control flags */ -#define OPTEE_MSG_RPC_CMD_I2C_FLAGS_TEN_BIT BIT(0) - #endif /* _OPTEE_MSG_H */ diff --git a/drivers/tee/optee/optee_rpc_cmd.h b/drivers/tee/optee/optee_rpc_cmd.h new file mode 100644 index 000000000000..b8275140cef8 --- /dev/null +++ b/drivers/tee/optee/optee_rpc_cmd.h @@ -0,0 +1,103 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (c) 2016-2021, Linaro Limited + */ + +#ifndef __OPTEE_RPC_CMD_H +#define __OPTEE_RPC_CMD_H + +/* + * All RPC is done with a struct optee_msg_arg as bearer of information, + * struct optee_msg_arg::arg holds values defined by OPTEE_RPC_CMD_* below. + * Only the commands handled by the kernel driver are defined here. + * + * RPC communication with tee-supplicant is reversed compared to normal + * client communication described above. The supplicant receives requests + * and sends responses. + */ + +/* + * Get time + * + * Returns number of seconds and nano seconds since the Epoch, + * 1970-01-01 00:00:00 +0000 (UTC). + * + * [out] value[0].a Number of seconds + * [out] value[0].b Number of nano seconds. + */ +#define OPTEE_RPC_CMD_GET_TIME 3 + +/* + * Wait queue primitive, helper for secure world to implement a wait queue. + * + * If secure world needs to wait for a secure world mutex it issues a sleep + * request instead of spinning in secure world. Conversely is a wakeup + * request issued when a secure world mutex with a thread waiting thread is + * unlocked. + * + * Waiting on a key + * [in] value[0].a OPTEE_RPC_WAIT_QUEUE_SLEEP + * [in] value[0].b Wait key + * + * Waking up a key + * [in] value[0].a OPTEE_RPC_WAIT_QUEUE_WAKEUP + * [in] value[0].b Wakeup key + */ +#define OPTEE_RPC_CMD_WAIT_QUEUE 4 +#define OPTEE_RPC_WAIT_QUEUE_SLEEP 0 +#define OPTEE_RPC_WAIT_QUEUE_WAKEUP 1 + +/* + * Suspend execution + * + * [in] value[0].a Number of milliseconds to suspend + */ +#define OPTEE_RPC_CMD_SUSPEND 5 + +/* + * Allocate a piece of shared memory + * + * [in] value[0].a Type of memory one of + * OPTEE_RPC_SHM_TYPE_* below + * [in] value[0].b Requested size + * [in] value[0].c Required alignment + * [out] memref[0] Buffer + */ +#define OPTEE_RPC_CMD_SHM_ALLOC 6 +/* Memory that can be shared with a non-secure user space application */ +#define OPTEE_RPC_SHM_TYPE_APPL 0 +/* Memory only shared with non-secure kernel */ +#define OPTEE_RPC_SHM_TYPE_KERNEL 1 + +/* + * Free shared memory previously allocated with OPTEE_RPC_CMD_SHM_ALLOC + * + * [in] value[0].a Type of memory one of + * OPTEE_RPC_SHM_TYPE_* above + * [in] value[0].b Value of shared memory reference or cookie + */ +#define OPTEE_RPC_CMD_SHM_FREE 7 + +/* + * Issue master requests (read and write operations) to an I2C chip. + * + * [in] value[0].a Transfer mode (OPTEE_RPC_I2C_TRANSFER_*) + * [in] value[0].b The I2C bus (a.k.a adapter). + * 16 bit field. + * [in] value[0].c The I2C chip (a.k.a address). + * 16 bit field (either 7 or 10 bit effective). + * [in] value[1].a The I2C master control flags (ie, 10 bit address). + * 16 bit field. + * [in/out] memref[2] Buffer used for data transfers. + * [out] value[3].a Number of bytes transferred by the REE. + */ +#define OPTEE_RPC_CMD_I2C_TRANSFER 21 + +/* I2C master transfer modes */ +#define OPTEE_RPC_I2C_TRANSFER_RD 0 +#define OPTEE_RPC_I2C_TRANSFER_WR 1 + +/* I2C master control flags */ +#define OPTEE_RPC_I2C_FLAGS_TEN_BIT BIT(0) + +#endif /*__OPTEE_RPC_CMD_H*/ diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index 777ad54d4c2c..821e1c30c150 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (c) 2015-2019, Linaro Limited + * Copyright (c) 2015-2021, Linaro Limited */ #ifndef OPTEE_SMC_H #define OPTEE_SMC_H @@ -39,10 +39,10 @@ /* * Function specified by SMC Calling convention * - * Return one of the following UIDs if using API specified in this file - * without further extentions: - * 65cb6b93-af0c-4617-8ed6-644a8d1140f8 - * see also OPTEE_SMC_UID_* in optee_msg.h + * Return the following UID if using API specified in this file + * without further extensions: + * 384fb3e0-e7f8-11e3-af63-0002a5d5c51b. + * see also OPTEE_MSG_UID_* in optee_msg.h */ #define OPTEE_SMC_FUNCID_CALLS_UID OPTEE_MSG_FUNCID_CALLS_UID #define OPTEE_SMC_CALLS_UID \ @@ -53,7 +53,7 @@ /* * Function specified by SMC Calling convention * - * Returns 2.0 if using API specified in this file without further extentions. + * Returns 2.0 if using API specified in this file without further extensions. * see also OPTEE_MSG_REVISION_* in optee_msg.h */ #define OPTEE_SMC_FUNCID_CALLS_REVISION OPTEE_MSG_FUNCID_CALLS_REVISION @@ -109,8 +109,8 @@ struct optee_smc_call_get_os_revision_result { * * Call register usage: * a0 SMC Function ID, OPTEE_SMC*CALL_WITH_ARG - * a1 Upper 32bit of a 64bit physical pointer to a struct optee_msg_arg - * a2 Lower 32bit of a 64bit physical pointer to a struct optee_msg_arg + * a1 Upper 32 bits of a 64-bit physical pointer to a struct optee_msg_arg + * a2 Lower 32 bits of a 64-bit physical pointer to a struct optee_msg_arg * a3 Cache settings, not used if physical pointer is in a predefined shared * memory area else per OPTEE_SMC_SHM_* * a4-6 Not used @@ -214,8 +214,9 @@ struct optee_smc_get_shm_config_result { * secure world accepts command buffers located in any parts of non-secure RAM */ #define OPTEE_SMC_SEC_CAP_DYNAMIC_SHM BIT(2) - -/* Secure world supports Shared Memory with a NULL buffer reference */ +/* Secure world is built with virtualization support */ +#define OPTEE_SMC_SEC_CAP_VIRTUALIZATION BIT(3) +/* Secure world supports Shared Memory with a NULL reference */ #define OPTEE_SMC_SEC_CAP_MEMREF_NULL BIT(4) #define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9 @@ -245,8 +246,8 @@ struct optee_smc_exchange_capabilities_result { * * Normal return register usage: * a0 OPTEE_SMC_RETURN_OK - * a1 Upper 32bit of a 64bit Shared memory cookie - * a2 Lower 32bit of a 64bit Shared memory cookie + * a1 Upper 32 bits of a 64-bit Shared memory cookie + * a2 Lower 32 bits of a 64-bit Shared memory cookie * a3-7 Preserved * * Cache empty return register usage: @@ -293,6 +294,31 @@ struct optee_smc_disable_shm_cache_result { #define OPTEE_SMC_ENABLE_SHM_CACHE \ OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) +/* + * Query OP-TEE about number of supported threads + * + * Normal World OS or Hypervisor issues this call to find out how many + * threads OP-TEE supports. That is how many standard calls can be issued + * in parallel before OP-TEE will return OPTEE_SMC_RETURN_ETHREAD_LIMIT. + * + * Call requests usage: + * a0 SMC Function ID, OPTEE_SMC_GET_THREAD_COUNT + * a1-6 Not used + * a7 Hypervisor Client ID register + * + * Normal return register usage: + * a0 OPTEE_SMC_RETURN_OK + * a1 Number of threads + * a2-7 Preserved + * + * Error return: + * a0 OPTEE_SMC_RETURN_UNKNOWN_FUNCTION Requested call is not implemented + * a1-7 Preserved + */ +#define OPTEE_SMC_FUNCID_GET_THREAD_COUNT 15 +#define OPTEE_SMC_GET_THREAD_COUNT \ + OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_THREAD_COUNT) + /* * Resume from RPC (for example after processing a foreign interrupt) * @@ -341,16 +367,16 @@ struct optee_smc_disable_shm_cache_result { * * "Return" register usage: * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. - * a1 Upper 32bits of 64bit physical pointer to allocated + * a1 Upper 32 bits of 64-bit physical pointer to allocated * memory, (a1 == 0 && a2 == 0) if size was 0 or if memory can't * be allocated. - * a2 Lower 32bits of 64bit physical pointer to allocated + * a2 Lower 32 bits of 64-bit physical pointer to allocated * memory, (a1 == 0 && a2 == 0) if size was 0 or if memory can't * be allocated * a3 Preserved - * a4 Upper 32bits of 64bit Shared memory cookie used when freeing + * a4 Upper 32 bits of 64-bit Shared memory cookie used when freeing * the memory or doing an RPC - * a5 Lower 32bits of 64bit Shared memory cookie used when freeing + * a5 Lower 32 bits of 64-bit Shared memory cookie used when freeing * the memory or doing an RPC * a6-7 Preserved */ @@ -363,9 +389,9 @@ struct optee_smc_disable_shm_cache_result { * * "Call" register usage: * a0 This value, OPTEE_SMC_RETURN_RPC_FREE - * a1 Upper 32bits of 64bit shared memory cookie belonging to this + * a1 Upper 32 bits of 64-bit shared memory cookie belonging to this * argument memory - * a2 Lower 32bits of 64bit shared memory cookie belonging to this + * a2 Lower 32 bits of 64-bit shared memory cookie belonging to this * argument memory * a3-7 Resume information, must be preserved * @@ -379,7 +405,7 @@ struct optee_smc_disable_shm_cache_result { OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) /* - * Deliver foreign interrupt to normal world. + * Deliver a foreign interrupt in normal world. * * "Call" register usage: * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR @@ -389,7 +415,7 @@ struct optee_smc_disable_shm_cache_result { * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. * a1-7 Preserved */ -#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 +#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 #define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \ OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR) @@ -405,10 +431,10 @@ struct optee_smc_disable_shm_cache_result { * * "Call" register usage: * a0 OPTEE_SMC_RETURN_RPC_CMD - * a1 Upper 32bit of a 64bit Shared memory cookie holding a + * a1 Upper 32 bits of a 64-bit Shared memory cookie holding a * struct optee_msg_arg, must be preserved, only the data should * be updated - * a2 Lower 32bit of a 64bit Shared memory cookie holding a + * a2 Lower 32 bits of a 64-bit Shared memory cookie holding a * struct optee_msg_arg, must be preserved, only the data should * be updated * a3-7 Resume information, must be preserved diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 1e3614e4798f..a0c30b664e53 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -12,6 +12,7 @@ #include <linux/tee_drv.h> #include "optee_private.h" #include "optee_smc.h" +#include "optee_rpc_cmd.h" struct wq_entry { struct list_head link; @@ -89,7 +90,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, if (!client.adapter) goto bad; - if (params[1].u.value.a & OPTEE_MSG_RPC_CMD_I2C_FLAGS_TEN_BIT) { + if (params[1].u.value.a & OPTEE_RPC_I2C_FLAGS_TEN_BIT) { if (!i2c_check_functionality(client.adapter, I2C_FUNC_10BIT_ADDR)) { i2c_put_adapter(client.adapter); @@ -103,11 +104,11 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr); switch (params[0].u.value.a) { - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD: + case OPTEE_RPC_I2C_TRANSFER_RD: ret = i2c_master_recv(&client, params[2].u.memref.shm->kaddr, params[2].u.memref.size); break; - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_WR: + case OPTEE_RPC_I2C_TRANSFER_WR: ret = i2c_master_send(&client, params[2].u.memref.shm->kaddr, params[2].u.memref.size); break; @@ -194,10 +195,10 @@ static void handle_rpc_func_cmd_wq(struct optee *optee, goto bad; switch (arg->params[0].u.value.a) { - case OPTEE_MSG_RPC_WAIT_QUEUE_SLEEP: + case OPTEE_RPC_WAIT_QUEUE_SLEEP: wq_sleep(&optee->wait_queue, arg->params[0].u.value.b); break; - case OPTEE_MSG_RPC_WAIT_QUEUE_WAKEUP: + case OPTEE_RPC_WAIT_QUEUE_WAKEUP: wq_wakeup(&optee->wait_queue, arg->params[0].u.value.b); break; default: @@ -267,11 +268,11 @@ static struct tee_shm *cmd_alloc_suppl(struct tee_context *ctx, size_t sz) struct tee_shm *shm; param.attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT; - param.u.value.a = OPTEE_MSG_RPC_SHM_TYPE_APPL; + param.u.value.a = OPTEE_RPC_SHM_TYPE_APPL; param.u.value.b = sz; param.u.value.c = 0; - ret = optee_supp_thrd_req(ctx, OPTEE_MSG_RPC_CMD_SHM_ALLOC, 1, &param); + ret = optee_supp_thrd_req(ctx, OPTEE_RPC_CMD_SHM_ALLOC, 1, &param); if (ret) return ERR_PTR(-ENOMEM); @@ -308,10 +309,10 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx, sz = arg->params[0].u.value.b; switch (arg->params[0].u.value.a) { - case OPTEE_MSG_RPC_SHM_TYPE_APPL: + case OPTEE_RPC_SHM_TYPE_APPL: shm = cmd_alloc_suppl(ctx, sz); break; - case OPTEE_MSG_RPC_SHM_TYPE_KERNEL: + case OPTEE_RPC_SHM_TYPE_KERNEL: shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED); break; default: @@ -383,7 +384,7 @@ static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm) struct tee_param param; param.attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT; - param.u.value.a = OPTEE_MSG_RPC_SHM_TYPE_APPL; + param.u.value.a = OPTEE_RPC_SHM_TYPE_APPL; param.u.value.b = tee_shm_get_id(shm); param.u.value.c = 0; @@ -400,7 +401,7 @@ static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm) */ tee_shm_put(shm); - optee_supp_thrd_req(ctx, OPTEE_MSG_RPC_CMD_SHM_FREE, 1, &param); + optee_supp_thrd_req(ctx, OPTEE_RPC_CMD_SHM_FREE, 1, &param); } static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx, @@ -418,10 +419,10 @@ static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx, shm = (struct tee_shm *)(unsigned long)arg->params[0].u.value.b; switch (arg->params[0].u.value.a) { - case OPTEE_MSG_RPC_SHM_TYPE_APPL: + case OPTEE_RPC_SHM_TYPE_APPL: cmd_free_suppl(ctx, shm); break; - case OPTEE_MSG_RPC_SHM_TYPE_KERNEL: + case OPTEE_RPC_SHM_TYPE_KERNEL: tee_shm_free(shm); break; default: @@ -458,23 +459,23 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee, } switch (arg->cmd) { - case OPTEE_MSG_RPC_CMD_GET_TIME: + case OPTEE_RPC_CMD_GET_TIME: handle_rpc_func_cmd_get_time(arg); break; - case OPTEE_MSG_RPC_CMD_WAIT_QUEUE: + case OPTEE_RPC_CMD_WAIT_QUEUE: handle_rpc_func_cmd_wq(optee, arg); break; - case OPTEE_MSG_RPC_CMD_SUSPEND: + case OPTEE_RPC_CMD_SUSPEND: handle_rpc_func_cmd_wait(arg); break; - case OPTEE_MSG_RPC_CMD_SHM_ALLOC: + case OPTEE_RPC_CMD_SHM_ALLOC: free_pages_list(call_ctx); handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx); break; - case OPTEE_MSG_RPC_CMD_SHM_FREE: + case OPTEE_RPC_CMD_SHM_FREE: handle_rpc_func_cmd_shm_free(ctx, arg); break; - case OPTEE_MSG_RPC_CMD_I2C_TRANSFER: + case OPTEE_RPC_CMD_I2C_TRANSFER: handle_rpc_func_cmd_i2c_transfer(ctx, arg); break; default: -- 2.25.1

4 years, 4 months

1
0
0 0

[GIT PULL] OP-TEE driver fix for v5.11

by Jens Wiklander

Hello arm-soc maintainers, Please pull this small patch taking care of a rcu_sched trace in some corner cases when OP-TEE is invoked. Thanks, Jens The following changes since commit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62: Linux 5.11-rc2 (2021-01-03 15:55:30 -0800) are available in the Git repository at: git://git.linaro.org/people/jens.wiklander/linux-tee.git tags/optee-rcu-sched-trace-for-v5.11 for you to fetch changes up to dcb3b06d9c34f33a249f65c08805461fb0c4325b: tee: optee: replace might_sleep with cond_resched (2021-01-21 10:36:48 +0100) ---------------------------------------------------------------- Fix rcu_sched trace from OP-TEE invoke Replaces might_sleep() with a conditional call to cond_resched() in order to avoid the rcu_sched trace in some corner cases. ---------------------------------------------------------------- Rouven Czerwinski (1): tee: optee: replace might_sleep with cond_resched drivers/tee/optee/call.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

4 years, 4 months

2
1
0 0

[PATCH v2] tee: optee: replace might_sleep with cond_resched

by Rouven Czerwinski

might_sleep() is a debugging aid and triggers rescheduling only for certain kernel configurations. Replace with an explicit check and reschedule to work for all kernel configurations. Fixes the following trace: [ 572.945146] rcu: INFO: rcu_sched self-detected stall on CPU [ 572.949275] rcu: 0-....: (2099 ticks this GP) idle=572/1/0x40000002 softirq=7412/7412 fqs=974 [ 572.957964] (t=2100 jiffies g=10393 q=21) [ 572.962054] NMI backtrace for cpu 0 [ 572.965540] CPU: 0 PID: 165 Comm: xtest Not tainted 5.8.7 #1 [ 572.971188] Hardware name: STM32 (Device Tree Support) [ 572.976354] [<c011163c>] (unwind_backtrace) from [<c010b7f8>] (show_stack+0x10/0x14) [ 572.984080] [<c010b7f8>] (show_stack) from [<c0511e4c>] (dump_stack+0xc4/0xd8) [ 572.991300] [<c0511e4c>] (dump_stack) from [<c0519abc>] (nmi_cpu_backtrace+0x90/0xc4) [ 572.999130] [<c0519abc>] (nmi_cpu_backtrace) from [<c0519bdc>] (nmi_trigger_cpumask_backtrace+0xec/0x130) [ 573.008706] [<c0519bdc>] (nmi_trigger_cpumask_backtrace) from [<c01a5184>] (rcu_dump_cpu_stacks+0xe8/0x110) [ 573.018453] [<c01a5184>] (rcu_dump_cpu_stacks) from [<c01a4234>] (rcu_sched_clock_irq+0x7fc/0xa88) [ 573.027416] [<c01a4234>] (rcu_sched_clock_irq) from [<c01acdd0>] (update_process_times+0x30/0x8c) [ 573.036291] [<c01acdd0>] (update_process_times) from [<c01bfb90>] (tick_sched_timer+0x4c/0xa8) [ 573.044905] [<c01bfb90>] (tick_sched_timer) from [<c01adcc8>] (__hrtimer_run_queues+0x174/0x358) [ 573.053696] [<c01adcc8>] (__hrtimer_run_queues) from [<c01aea2c>] (hrtimer_interrupt+0x118/0x2bc) [ 573.062573] [<c01aea2c>] (hrtimer_interrupt) from [<c09ad664>] (arch_timer_handler_virt+0x28/0x30) [ 573.071536] [<c09ad664>] (arch_timer_handler_virt) from [<c0190f50>] (handle_percpu_devid_irq+0x8c/0x240) [ 573.081109] [<c0190f50>] (handle_percpu_devid_irq) from [<c018ab8c>] (generic_handle_irq+0x34/0x44) [ 573.090156] [<c018ab8c>] (generic_handle_irq) from [<c018b194>] (__handle_domain_irq+0x5c/0xb0) [ 573.098857] [<c018b194>] (__handle_domain_irq) from [<c052ac50>] (gic_handle_irq+0x4c/0x90) [ 573.107209] [<c052ac50>] (gic_handle_irq) from [<c0100b0c>] (__irq_svc+0x6c/0x90) [ 573.114682] Exception stack(0xd90dfcf8 to 0xd90dfd40) [ 573.119732] fce0: ffff0004 00000000 [ 573.127917] fd00: 00000000 00000000 00000000 00000000 00000000 00000000 d93493cc ffff0000 [ 573.136098] fd20: d2bc39c0 be926998 d90dfd58 d90dfd48 c09f3384 c01151f0 400d0013 ffffffff [ 573.144281] [<c0100b0c>] (__irq_svc) from [<c01151f0>] (__arm_smccc_smc+0x10/0x20) [ 573.151854] [<c01151f0>] (__arm_smccc_smc) from [<c09f3384>] (optee_smccc_smc+0x3c/0x44) [ 573.159948] [<c09f3384>] (optee_smccc_smc) from [<c09f4170>] (optee_do_call_with_arg+0xb8/0x154) [ 573.168735] [<c09f4170>] (optee_do_call_with_arg) from [<c09f4638>] (optee_invoke_func+0x110/0x190) [ 573.177786] [<c09f4638>] (optee_invoke_func) from [<c09f1ebc>] (tee_ioctl+0x10b8/0x11c0) [ 573.185879] [<c09f1ebc>] (tee_ioctl) from [<c029f62c>] (ksys_ioctl+0xe0/0xa4c) [ 573.193101] [<c029f62c>] (ksys_ioctl) from [<c0100060>] (ret_fast_syscall+0x0/0x54) [ 573.200750] Exception stack(0xd90dffa8 to 0xd90dfff0) [ 573.205803] ffa0: be926bf4 be926a78 00000003 8010a403 be926908 004e3cf8 [ 573.213987] ffc0: be926bf4 be926a78 00000000 00000036 be926908 be926918 be9269b0 bffdf0f8 [ 573.222162] ffe0: b6d76fb0 be9268fc b6d66621 b6c7e0d8 seen on STM32 DK2 with CONFIG_PREEMPT_NONE. Signed-off-by: Rouven Czerwinski <r.czerwinski(a)pengutronix.de> Tested-by: Sumit Garg <sumit.garg(a)linaro.org> --- v2: - Add tested-by from Sumit Garg - Adjust commit message as agreed upon with Lucas Stach drivers/tee/optee/call.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index c981757ba0d4..f889bc97bed7 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -8,6 +8,7 @@ #include <linux/errno.h> #include <linux/mm.h> #include <linux/slab.h> +#include <linux/sched.h> #include <linux/tee_drv.h> #include <linux/types.h> #include <linux/uaccess.h> @@ -148,7 +149,8 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg) */ optee_cq_wait_for_completion(&optee->call_queue, &w); } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) { - might_sleep(); + if(need_resched()) + cond_resched(); param.a0 = res.a0; param.a1 = res.a1; param.a2 = res.a2; -- 2.29.2

4 years, 4 months

2
1
0 0

OP-TEE 3.12.0 has been released

by Joakim Bech

Hi, I'm pleased to let you know that I've just wrapped up the v3.12.0 release for OP-TEE. As usual, the list of changes can be found in the changelog [1]. Thanks to everyone who participated with contributions and helping out with testing the release candidate [2]. [1] https://github.com/OP-TEE/optee_os/blob/master/CHANGELOG.md [2] https://github.com/OP-TEE/optee_os/commit/3d47a131bca1d9ed511bfd516aa5e7026… Regards, Joakim

4 years, 4 months

2
1
0 0

2025

2024

2023

2022

2021

2020

OP-TEE