tee: optee: Drop ffa_ops in optee_ffa structure using ffa_dev->ops directly

Now that the ffa_device structure holds the pointer to ffa_dev_ops,
there is no need to obtain the same through ffa_dev_ops_get().

Just use the ffa_dev->ops directly. Since the ffa_device itself carries
ffa_dev_ops now, there is no need to keep a copy in optee_ffa structure.

Drop ffa_ops in the optee_ffa structure as it is not needed anymore.

Link: https://lore.kernel.org/r/20220907145240.1683088-3-sudeep.holla@arm.com
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index 7ab31740cff84b9c88c738b1f3c05c77d160d531..3d4079575ccd0602d4c0c099811aecb779a2fd46 100644 (file)
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -271,8 +271,8 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
                                  unsigned long start)
 {
        struct optee *optee = tee_get_drvdata(ctx->teedev);
-       const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
        struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
+       const struct ffa_dev_ops *ffa_ops = ffa_dev->ops;
        struct ffa_mem_region_attributes mem_attr = {
                .receiver = ffa_dev->vm_id,
                .attrs = FFA_MEM_RW,
@@ -314,8 +314,8 @@ static int optee_ffa_shm_unregister(struct tee_context *ctx,
                                    struct tee_shm *shm)
 {
        struct optee *optee = tee_get_drvdata(ctx->teedev);
-       const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
        struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
+       const struct ffa_dev_ops *ffa_ops = ffa_dev->ops;
        u64 global_handle = shm->sec_world_id;
        struct ffa_send_direct_data data = {
                .data0 = OPTEE_FFA_UNREGISTER_SHM,
@@ -342,7 +342,7 @@ static int optee_ffa_shm_unregister_supp(struct tee_context *ctx,
                                         struct tee_shm *shm)
 {
        struct optee *optee = tee_get_drvdata(ctx->teedev);
-       const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
+       const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_dev->ops;
        u64 global_handle = shm->sec_world_id;
        int rc;
 
@@ -529,8 +529,8 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
                                   struct optee_msg_arg *rpc_arg)
 {
        struct optee *optee = tee_get_drvdata(ctx->teedev);
-       const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
        struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
+       const struct ffa_dev_ops *ffa_ops = ffa_dev->ops;
        struct optee_call_waiter w;
        u32 cmd = data->data0;
        u32 w4 = data->data1;
@@ -793,11 +793,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
        u32 sec_caps;
        int rc;
 
-       ffa_ops = ffa_dev_ops_get(ffa_dev);
-       if (!ffa_ops) {
-               pr_warn("failed \"method\" init: ffa\n");
-               return -ENOENT;
-       }
+       ffa_ops = ffa_dev->ops;
 
        if (!optee_ffa_api_is_compatbile(ffa_dev, ffa_ops))
                return -EINVAL;
@@ -821,7 +817,6 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
 
        optee->ops = &optee_ffa_ops;
        optee->ffa.ffa_dev = ffa_dev;
-       optee->ffa.ffa_ops = ffa_ops;
        optee->rpc_param_count = rpc_param_count;
 
        teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,

diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index a33d98d17cfd5f7a5dfcd10e261363b4f8e3c32d..04ae58892608c6b7e2627b156030fb39a3c5b5a2 100644 (file)
--- a/drivers/tee/optee/optee_private.h
+++ b/drivers/tee/optee/optee_private.h
@@ -111,7 +111,6 @@ struct optee_smc {
  */
 struct optee_ffa {
        struct ffa_device *ffa_dev;
-       const struct ffa_dev_ops *ffa_ops;
        /* Serializes access to @global_ids */
        struct mutex mutex;
        struct rhashtable global_ids;