UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware: arm_ffa: Add pointer to the ffa_dev_ops in struct ffa_dev 

Currently ffa_dev_ops_get() is the way to fetch the ffa_dev_ops pointer.
It checks if the ffa_dev structure pointer is valid before returning the
ffa_dev_ops pointer.

Instead, the pointer can be made part of the ffa_dev structure and since
the core driver is incharge of creating ffa_device for each identified
partition, there is no need to check for the validity explicitly if the
pointer is embedded in the structure.

Add the pointer to the ffa_dev_ops in the ffa_dev structure itself and
initialise the same as part of creation of the device.

Link: https://lore.kernel.org/r/20220907145240.1683088-2-sudeep.holla@arm.com
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Sudeep Holla 2022-09-07 15:52:31 +01:00
parent 568035b01c
commit d01387fc16
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/arm_ffa/bus.c
View File

@ -167,7 +167,8 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev)
return valid; return valid;
} }
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id) struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
const struct ffa_dev_ops *ops)
{ {
int ret; int ret;
struct device *dev; struct device *dev;
@ -183,6 +184,7 @@ struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id)
dev_set_name(&ffa_dev->dev, "arm-ffa-%04x", vm_id); dev_set_name(&ffa_dev->dev, "arm-ffa-%04x", vm_id);
ffa_dev->vm_id = vm_id; ffa_dev->vm_id = vm_id;
ffa_dev->ops = ops;
uuid_copy(&ffa_dev->uuid, uuid); uuid_copy(&ffa_dev->uuid, uuid);
ret = device_register(&ffa_dev->dev); ret = device_register(&ffa_dev->dev);

2
drivers/firmware/arm_ffa/driver.c
View File

@ -688,7 +688,7 @@ static void ffa_setup_partitions(void)
* as part of the discovery API, we need to pass the * as part of the discovery API, we need to pass the
* discovered UUID here instead. * discovered UUID here instead.
*/ */
ffa_dev = ffa_device_register(&uuid_null, tpbuf->id); ffa_dev = ffa_device_register(&uuid_null, tpbuf->id, &ffa_ops);
if (!ffa_dev) { if (!ffa_dev) {
pr_err("%s: failed to register partition ID 0x%x\n", pr_err("%s: failed to register partition ID 0x%x\n",
__func__, tpbuf->id); __func__, tpbuf->id);

7
include/linux/arm_ffa.h
View File

@ -17,6 +17,7 @@ struct ffa_device {
bool mode_32bit; bool mode_32bit;
uuid_t uuid; uuid_t uuid;
struct device dev; struct device dev;
const struct ffa_dev_ops *ops;
}; };
#define to_ffa_dev(d) container_of(d, struct ffa_device, dev) #define to_ffa_dev(d) container_of(d, struct ffa_device, dev)
@ -47,7 +48,8 @@ static inline void *ffa_dev_get_drvdata(struct ffa_device *fdev)
} }
#if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT) #if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id); struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
const struct ffa_dev_ops *ops);
void ffa_device_unregister(struct ffa_device *ffa_dev); void ffa_device_unregister(struct ffa_device *ffa_dev);
int ffa_driver_register(struct ffa_driver *driver, struct module *owner, int ffa_driver_register(struct ffa_driver *driver, struct module *owner,
const char *mod_name); const char *mod_name);
@ -57,7 +59,8 @@ const struct ffa_dev_ops *ffa_dev_ops_get(struct ffa_device *dev);
#else #else
static inline static inline
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id) struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
const struct ffa_dev_ops *ops)
{ {
return NULL; return NULL;
} }