firmware: arm_ffa: Make memory apis ffa_device independent

There is a requirement to make memory APIs independent of the ffa_device.
One of the use-case is to have a common memory driver that manages the
memory for all the ffa_devices. That common memory driver won't be a
ffa_driver or won't have any ffa_device associated with it. So having
these memory APIs accessible without a ffa_device is needed and should
be possible as most of these are handled by the partition manager(SPM
or hypervisor).

Drop the ffa_device argument to the memory APIs and make them ffa_device
independent.

Link: https://lore.kernel.org/r/20220907145240.1683088-7-sudeep.holla@arm.com
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index 37a8ee304508b91a37e756fe18d36afefbf672c1..e4fd357730713811eacd2b47dedce3d07d86ad3f 100644 (file)
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -643,8 +643,7 @@ static int ffa_sync_send_receive(struct ffa_device *dev,
                                       dev->mode_32bit, data);
 }
 
-static int
-ffa_memory_share(struct ffa_device *dev, struct ffa_mem_ops_args *args)
+static int ffa_memory_share(struct ffa_mem_ops_args *args)
 {
        if (drv_info->mem_ops_native)
                return ffa_memory_ops(FFA_FN_NATIVE(MEM_SHARE), args);
@@ -652,8 +651,7 @@ ffa_memory_share(struct ffa_device *dev, struct ffa_mem_ops_args *args)
        return ffa_memory_ops(FFA_MEM_SHARE, args);
 }
 
-static int
-ffa_memory_lend(struct ffa_device *dev, struct ffa_mem_ops_args *args)
+static int ffa_memory_lend(struct ffa_mem_ops_args *args)
 {
        /* Note that upon a successful MEM_LEND request the caller
         * must ensure that the memory region specified is not accessed

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index 3d4079575ccd0602d4c0c099811aecb779a2fd46..7257b42d0545ffdc88c3a0b7ec2c5b68ecf17960 100644 (file)
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -294,7 +294,7 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
        if (rc)
                return rc;
        args.sg = sgt.sgl;
-       rc = ffa_ops->memory_share(ffa_dev, &args);
+       rc = ffa_ops->memory_share(&args);
        sg_free_table(&sgt);
        if (rc)
                return rc;

diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h
index 556f50f27fb164c5a130cd5b96cc0ad77a5d02f0..eafab07c9f58695e70b6c2d7a54bd137832b3fba 100644 (file)
--- a/include/linux/arm_ffa.h
+++ b/include/linux/arm_ffa.h
@@ -262,10 +262,8 @@ struct ffa_dev_ops {
        int (*sync_send_receive)(struct ffa_device *dev,
                                 struct ffa_send_direct_data *data);
        int (*memory_reclaim)(u64 g_handle, u32 flags);
-       int (*memory_share)(struct ffa_device *dev,
-                           struct ffa_mem_ops_args *args);
-       int (*memory_lend)(struct ffa_device *dev,
-                          struct ffa_mem_ops_args *args);
+       int (*memory_share)(struct ffa_mem_ops_args *args);
+       int (*memory_lend)(struct ffa_mem_ops_args *args);
 };
 
 #endif /* _LINUX_ARM_FFA_H */