Tee-dev September 2020

tee-dev@lists.linaro.org

3 participants
4 discussions

[PATCH v1] tee: optee: Use UUID API for exporting the UUID

by Andy Shevchenko

There is export_uuid() function which exports uuid_t to the u8 array. Use it instead of open coding variant. This allows to hide the uuid_t internals. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/tee/optee/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c index e3a148521ec1d..2ecc6993f48bb 100644 --- a/drivers/tee/optee/device.c +++ b/drivers/tee/optee/device.c @@ -107,7 +107,7 @@ int optee_enumerate_devices(void) return -ENODEV; /* Open session with device enumeration pseudo TA */ - memcpy(sess_arg.uuid, pta_uuid.b, TEE_IOCTL_UUID_LEN); + export_uuid(sess_arg.uuid, &pta_uuid); sess_arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC; sess_arg.num_params = 0; -- 2.26.1

4 years, 1 month

[PATCH] drivers: optee: i2c: add bus retry configuration

by Jorge Ramirez-Ortiz

Allow OP-TEE to specify the number of retries in the adaptor. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- drivers/tee/optee/rpc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 1e3614e4798f..2d46a9ecb1de 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -58,6 +58,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, struct tee_param *params; size_t i; int ret = -EOPNOTSUPP; + int retries = 0; u8 attr[] = { TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT, TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT, @@ -102,12 +103,17 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, client.addr = params[0].u.value.c; snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr); + /* cache the current value */ + retries = client.adapter->retries; + switch (params[0].u.value.a) { case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD: + client.adapter->retries = params[1].u.value.b; 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: + client.adapter->retries = params[1].u.value.b; ret = i2c_master_send(&client, params[2].u.memref.shm->kaddr, params[2].u.memref.size); break; @@ -126,6 +132,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, arg->ret = TEEC_SUCCESS; } + client.adapter->retries = retries; i2c_put_adapter(client.adapter); kfree(params); return; -- 2.17.1

4 years, 2 months

[PATCH] optee: fix noderef.cocci warnings

by kernel test robot

From: kernel test robot <lkp(a)intel.com> drivers/tee/optee/shm_pool.c:34:28-34: ERROR: application of sizeof to pointer sizeof when applied to a pointer typed expression gives the size of the pointer Generated by: scripts/coccinelle/misc/noderef.cocci Fixes: 5a769f6ff439 ("optee: Fix multi page dynamic shm pool alloc") CC: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: kernel test robot <lkp(a)intel.com> --- tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master head: 856deb866d16e29bd65952e0289066f6078af773 commit: 5a769f6ff439cedc547395a6dc78faa26108f741 optee: Fix multi page dynamic shm pool alloc shm_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tee/optee/shm_pool.c +++ b/drivers/tee/optee/shm_pool.c @@ -31,7 +31,7 @@ static int pool_op_alloc(struct tee_shm_ unsigned int nr_pages = 1 << order, i; struct page **pages; - pages = kcalloc(nr_pages, sizeof(pages), GFP_KERNEL); + pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL); if (!pages) return -ENOMEM;

4 years, 2 months

[PATCHv2] drivers: optee: fix i2c build issue

by Jorge Ramirez-Ortiz

When the optee driver is compiled into the kernel while the i2c core is configured as a module, the i2c symbols are not available. This commit addresses the situation by disabling the i2c support for this use case while allowing it in all other scenarios: i2c=y, optee=y i2c=m, optee=m i2c=y, optee=m i2c=m, optee=y (not supported) Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- v2: uses IS_REACHABLE instead of macro combination This patch applies on top of https://git.linaro.org/people/jens.wiklander/linux-tee.git/tag/?h=optee-i2c… drivers/tee/optee/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 64a206c56264..1e3614e4798f 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -50,7 +50,7 @@ static void handle_rpc_func_cmd_get_time(struct optee_msg_arg *arg) arg->ret = TEEC_ERROR_BAD_PARAMETERS; } -#if IS_ENABLED(CONFIG_I2C) +#if IS_REACHABLE(CONFIG_I2C) static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, struct optee_msg_arg *arg) { -- 2.17.1

4 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Tee-dev September 2020