Merge tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens...

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 <[email protected]>

diff --combined drivers/tee/optee/rpc.c
index a0c30b664e53cd775af3ccbfd9574e8cc6a9ecd3,6cbb3643c6c48f600612d1172d3045080a95698d..1849180b0278b7112289d270a16ed7f9ad3b1629
--- 1/drivers/tee/optee/rpc.c
--- 2/drivers/tee/optee/rpc.c
+++ b/drivers/tee/optee/rpc.c
@@@ -12,7 -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;
@@@ -55,8 -54,9 +55,9 @@@ bad
  static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
                                             struct optee_msg_arg *arg)
  {
-       struct i2c_client client = { 0 };
        struct tee_param *params;
+       struct i2c_adapter *adapter;
+       struct i2c_msg msg = { };
        size_t i;
        int ret = -EOPNOTSUPP;
        u8 attr[] = {
@@@ -86,48 -86,48 +87,48 @@@
                        goto bad;
        }
  
-       client.adapter = i2c_get_adapter(params[0].u.value.b);
-       if (!client.adapter)
+       adapter = i2c_get_adapter(params[0].u.value.b);
+       if (!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,
+               if (!i2c_check_functionality(adapter,
                                             I2C_FUNC_10BIT_ADDR)) {
-                       i2c_put_adapter(client.adapter);
+                       i2c_put_adapter(adapter);
                        goto bad;
                }
  
-               client.flags = I2C_CLIENT_TEN;
+               msg.flags = I2C_M_TEN;
        }
  
-       client.addr = params[0].u.value.c;
-       snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr);
+       msg.addr = params[0].u.value.c;
+       msg.buf  = params[2].u.memref.shm->kaddr;
+       msg.len  = params[2].u.memref.size;
  
        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);
+               msg.flags |= I2C_M_RD;
                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;
        default:
-               i2c_put_adapter(client.adapter);
+               i2c_put_adapter(adapter);
                goto bad;
        }
  
+       ret = i2c_transfer(adapter, &msg, 1);
+ 
        if (ret < 0) {
                arg->ret = TEEC_ERROR_COMMUNICATION;
        } 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))
                        arg->ret = TEEC_ERROR_BAD_PARAMETERS;
                else
                        arg->ret = TEEC_SUCCESS;
        }
  
-       i2c_put_adapter(client.adapter);
+       i2c_put_adapter(adapter);
        kfree(params);
        return;
  bad:
@@@ -195,10 -195,10 +196,10 @@@ static void handle_rpc_func_cmd_wq(stru
                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:
@@@ -268,11 -268,11 +269,11 @@@ static struct tee_shm *cmd_alloc_suppl(
        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);
  
@@@ -309,10 -309,10 +310,10 @@@ static void handle_rpc_func_cmd_shm_all
  
        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:
@@@ -384,7 -384,7 +385,7 @@@ static void cmd_free_suppl(struct tee_c
        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;
  
@@@ -401,7 -401,7 +402,7 @@@
         */
        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,
@@@ -419,10 -419,10 +420,10 @@@
  
        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:
@@@ -459,23 -459,23 +460,23 @@@ static void handle_rpc_func_cmd(struct 
        }
  
        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: