[PATCH v2 1/3] remoteproc: core: Add multiple components to remoteproc ops

Gurbir Arora
2020-09-03T02:52:16Z

Each remoteproc might have different requirements for coredumps and might
want to choose the type of dumps it wants to collect. This change allows
remoteproc drivers to specify their own custom dump function to be executed
in place of rproc_coredump. If the coredump op is not specified by the
remoteproc driver it will be set to rproc_coredump by default.The
priv_cleanup op cleans up the private resources used by the
remoteproc.

Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
Signed-off-by: Gurbir Arora <gurbaror@codeaurora.org>
---
drivers/remoteproc/remoteproc_core.c | 6 +++++-
include/linux/remoteproc.h | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 7f90eee..dcc1341 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1681,7 +1681,7 @@ int rproc_trigger_recovery(struct rproc *rproc)
goto unlock_mutex;

/* generate coredump */
- rproc_coredump(rproc);
+ rproc->ops->coredump(rproc);

/* load firmware */
ret = request_firmware(&firmware_p, rproc->firmware, dev);
@@ -2103,6 +2103,10 @@ static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops)
if (!rproc->ops)
return -ENOMEM;

+ /* Default to rproc_coredump if no coredump function is specified */
+ if (!rproc->ops->coredump)
+ rproc->ops->coredump = rproc_coredump;
+
if (rproc->ops->load)
return 0;

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 2fa68bf..747d7e3 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -373,8 +373,10 @@ enum rsc_handling_status {
* expects to find it
* @sanity_check: sanity check the fw image
* @get_boot_addr: get boot address to entry point specified in firmware
+ * @coredump: collect firmware dump after the subsystem is shutdown
* @panic: optional callback to react to system panic, core will delay
* panic at least the returned number of milliseconds
+ * @priv_cleanup: cleans up the private resources used by the rproc
*/
struct rproc_ops {
int (*prepare)(struct rproc *rproc);
@@ -392,7 +394,9 @@ struct rproc_ops {
int (*load)(struct rproc *rproc, const struct firmware *fw);
int (*sanity_check)(struct rproc *rproc, const struct firmware *fw);
u64 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw);
+ void (*coredump)(struct rproc *rproc);
unsigned long (*panic)(struct rproc *rproc);
+ void (*priv_cleanup)(struct rproc *rproc);
};

/**
--
2.7.4