Commit 8c3812c8 authored by Sudeep Holla's avatar Sudeep Holla

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.comAcked-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent e57fba91
...@@ -643,8 +643,7 @@ static int ffa_sync_send_receive(struct ffa_device *dev, ...@@ -643,8 +643,7 @@ static int ffa_sync_send_receive(struct ffa_device *dev,
dev->mode_32bit, data); dev->mode_32bit, data);
} }
static int static int ffa_memory_share(struct ffa_mem_ops_args *args)
ffa_memory_share(struct ffa_device *dev, struct ffa_mem_ops_args *args)
{ {
if (drv_info->mem_ops_native) if (drv_info->mem_ops_native)
return ffa_memory_ops(FFA_FN_NATIVE(MEM_SHARE), args); 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) ...@@ -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); return ffa_memory_ops(FFA_MEM_SHARE, args);
} }
static int static int ffa_memory_lend(struct ffa_mem_ops_args *args)
ffa_memory_lend(struct ffa_device *dev, struct ffa_mem_ops_args *args)
{ {
/* Note that upon a successful MEM_LEND request the caller /* Note that upon a successful MEM_LEND request the caller
* must ensure that the memory region specified is not accessed * must ensure that the memory region specified is not accessed
......
...@@ -294,7 +294,7 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm, ...@@ -294,7 +294,7 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
if (rc) if (rc)
return rc; return rc;
args.sg = sgt.sgl; args.sg = sgt.sgl;
rc = ffa_ops->memory_share(ffa_dev, &args); rc = ffa_ops->memory_share(&args);
sg_free_table(&sgt); sg_free_table(&sgt);
if (rc) if (rc)
return rc; return rc;
......
...@@ -262,10 +262,8 @@ struct ffa_dev_ops { ...@@ -262,10 +262,8 @@ struct ffa_dev_ops {
int (*sync_send_receive)(struct ffa_device *dev, int (*sync_send_receive)(struct ffa_device *dev,
struct ffa_send_direct_data *data); struct ffa_send_direct_data *data);
int (*memory_reclaim)(u64 g_handle, u32 flags); int (*memory_reclaim)(u64 g_handle, u32 flags);
int (*memory_share)(struct ffa_device *dev, int (*memory_share)(struct ffa_mem_ops_args *args);
struct ffa_mem_ops_args *args); int (*memory_lend)(struct ffa_mem_ops_args *args);
int (*memory_lend)(struct ffa_device *dev,
struct ffa_mem_ops_args *args);
}; };
#endif /* _LINUX_ARM_FFA_H */ #endif /* _LINUX_ARM_FFA_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment