ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

Browse Source 
Simplify i2c acess in OP-TEE driver

* tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: simplify i2c access

Link: https://lore.kernel.org/soc/20210208125853.GA288348%40jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-02-09 16:09:32 +01:00
parent 7deff441f5 67bc809752
commit d0236f17c3
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/tee/optee/rpc.c
View File

@@ -55,8 +55,9 @@ bad:
static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx, static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
struct optee_msg_arg *arg) struct optee_msg_arg *arg)
{ {
struct i2c_client client = { 0 };
struct tee_param *params; struct tee_param *params;
struct i2c_adapter *adapter;
struct i2c_msg msg = { };
size_t i; size_t i;
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
u8 attr[] = { u8 attr[] = {
@@ -86,48 +87,48 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
goto bad; goto bad;
} }
client.adapter = i2c_get_adapter(params[0].u.value.b); adapter = i2c_get_adapter(params[0].u.value.b);
if (!client.adapter) if (!adapter)
goto bad; goto bad;
if (params[1].u.value.a & OPTEE_RPC_I2C_FLAGS_TEN_BIT) { if (params[1].u.value.a & OPTEE_RPC_I2C_FLAGS_TEN_BIT) {
if (!i2c_check_functionality(client.adapter, if (!i2c_check_functionality(adapter,
I2C_FUNC_10BIT_ADDR)) { I2C_FUNC_10BIT_ADDR)) {
i2c_put_adapter(client.adapter); i2c_put_adapter(adapter);
goto bad; goto bad;
} }
client.flags = I2C_CLIENT_TEN; msg.flags = I2C_M_TEN;
} }
client.addr = params[0].u.value.c; msg.addr = params[0].u.value.c;
snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr); msg.buf = params[2].u.memref.shm->kaddr;
msg.len = params[2].u.memref.size;
switch (params[0].u.value.a) { switch (params[0].u.value.a) {
case OPTEE_RPC_I2C_TRANSFER_RD: case OPTEE_RPC_I2C_TRANSFER_RD:
ret = i2c_master_recv(&client, params[2].u.memref.shm->kaddr, msg.flags |= I2C_M_RD;
params[2].u.memref.size);
break; break;
case OPTEE_RPC_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; break;
default: default:
i2c_put_adapter(client.adapter); i2c_put_adapter(adapter);
goto bad; goto bad;
} }
ret = i2c_transfer(adapter, &msg, 1);
if (ret < 0) { if (ret < 0) {
arg->ret = TEEC_ERROR_COMMUNICATION; arg->ret = TEEC_ERROR_COMMUNICATION;
} else { } else {
params[3].u.value.a = ret; params[3].u.value.a = msg.len;
if (optee_to_msg_param(arg->params, arg->num_params, params)) if (optee_to_msg_param(arg->params, arg->num_params, params))
arg->ret = TEEC_ERROR_BAD_PARAMETERS; arg->ret = TEEC_ERROR_BAD_PARAMETERS;
else else
arg->ret = TEEC_SUCCESS; arg->ret = TEEC_SUCCESS;
} }
i2c_put_adapter(client.adapter); i2c_put_adapter(adapter);
kfree(params); kfree(params);
return; return;
bad: bad: