[RFC 2/2] remoteproc: core: keep rproc in crash state in case of recovery failure

Loic Pallardy
2020-03-11T10:54:48Z

When an error occurs during recovery procedure, internal rproc
variables may be unaligned:
- state is set to RPROC_OFFLINE
- power atomic not equal to 0
which is normal as only rproc_stop() has been executed and not
rproc_shutdown()

In such case, rproc_boot() can be re-executed by client to
reboot co-processor.

This patch proposes to keep rproc in RPROC_CRASHED state in case
of recovery failure to be coherent with recovery disabled mode.

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 7ac87a75cd1b..def4f9fc881d 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1679,6 +1679,12 @@ int rproc_trigger_recovery(struct rproc *rproc)
release_firmware(firmware_p);

unlock_mutex:
+ /*
+ * In case of error during recovery sequence restore rproc
+ * state in CRASHED
+ */
+ if (ret)
+ rproc->state = RPROC_CRASHED;
mutex_unlock(&rproc->lock);
return ret;
}
--
2.7.4