remoteproc: core: Do pm_relax when in RPROC_OFFLINE state

Make sure that pm_relax() happens even when the remoteproc
is stopped before the crash handler work is scheduled.

Signed-off-by: Maria Yu <quic_aiquny@quicinc.com>
Cc: stable <stable@vger.kernel.org>
Fixes: a781e5aa5911 ("remoteproc: core: Prevent system suspend during remoteproc recovery")
Link: https://lore.kernel.org/r/20221206015957.2616-2-quic_aiquny@quicinc.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 11c165d..1cd4815 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1868,12 +1868,18 @@ static void rproc_crash_handler_work(struct work_struct *work)
 
        mutex_lock(&rproc->lock);
 
-       if (rproc->state == RPROC_CRASHED || rproc->state == RPROC_OFFLINE) {
+       if (rproc->state == RPROC_CRASHED) {
                /* handle only the first crash detected */
                mutex_unlock(&rproc->lock);
                return;
        }
 
+       if (rproc->state == RPROC_OFFLINE) {
+               /* Don't recover if the remote processor was stopped */
+               mutex_unlock(&rproc->lock);
+               goto out;
+       }
+
        rproc->state = RPROC_CRASHED;
        dev_err(dev, "handling crash #%u in %s\n", ++rproc->crash_cnt,
                rproc->name);
@@ -1883,6 +1889,7 @@ static void rproc_crash_handler_work(struct work_struct *work)
        if (!rproc->recovery_disabled)
                rproc_trigger_recovery(rproc);
 
+out:
        pm_relax(rproc->dev.parent);
 }