remoteproc: core: Do pm_relax when in RPROC_OFFLINE state
commit11c7f9e313
upstream. 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:a781e5aa59
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
9b615f957c
Коммит
2c1881f081
|
@ -1955,12 +1955,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);
|
||||
|
@ -1970,6 +1976,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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче