| Message ID | 1588183482-21146-1-git-send-email-rishabhb@codeaurora.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | a781e5aa59110d002a56bd41a397c0c8892f0609 |
| Headers | show |
| Series | remoteproc: core: Prevent system suspend during remoteproc recovery | expand |
On Wed 29 Apr 11:04 PDT 2020, Rishabh Bhatnagar wrote: > The system might go into suspend during recovery of any remoteproc. > This will interrupt the recovery process in between increasing the > recovery time. Make the platform device as wakeup capable and > use pm_stay_wake/pm_relax APIs to avoid system from going into > suspend during recovery. > > Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> > Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- Please don't forget to add a version to $subject and provide a Changelog here next time you're respinning something. I've picked this up now. Thanks, Bjorn > drivers/remoteproc/qcom_q6v5_pas.c | 2 ++ > drivers/remoteproc/remoteproc_core.c | 5 +++++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > index edf9d0e..e608578 100644 > --- a/drivers/remoteproc/qcom_q6v5_pas.c > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > @@ -398,6 +398,8 @@ static int adsp_probe(struct platform_device *pdev) > adsp->has_aggre2_clk = desc->has_aggre2_clk; > platform_set_drvdata(pdev, adsp); > > + device_wakeup_enable(adsp->dev); > + > ret = adsp_alloc_memory_region(adsp); > if (ret) > goto free_rproc; > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 097f33e..6a1cb98 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -1712,6 +1712,8 @@ static void rproc_crash_handler_work(struct work_struct *work) > > if (!rproc->recovery_disabled) > rproc_trigger_recovery(rproc); > + > + pm_relax(rproc->dev.parent); > } > > /** > @@ -2208,6 +2210,9 @@ void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type) > return; > } > > + /* Prevent suspend while the remoteproc is being recovered */ > + pm_stay_awake(rproc->dev.parent); > + > dev_err(&rproc->dev, "crash detected in %s: type %s\n", > rproc->name, rproc_crash_to_string(type)); > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project
Hello: This patch was applied to andersson/remoteproc.git (refs/heads/for-next). On Wed, 29 Apr 2020 11:04:42 -0700 you wrote: > The system might go into suspend during recovery of any remoteproc. > This will interrupt the recovery process in between increasing the > recovery time. Make the platform device as wakeup capable and > use pm_stay_wake/pm_relax APIs to avoid system from going into > suspend during recovery. > > Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org> > Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > [...] Here is a summary with links: - remoteproc: core: Prevent system suspend during remoteproc recovery https://git.kernel.org/andersson/remoteproc/c/a781e5aa59110d002a56bd41a397c0c8892f0609 You are awesome, thank you!
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index edf9d0e..e608578 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -398,6 +398,8 @@ static int adsp_probe(struct platform_device *pdev) adsp->has_aggre2_clk = desc->has_aggre2_clk; platform_set_drvdata(pdev, adsp); + device_wakeup_enable(adsp->dev); + ret = adsp_alloc_memory_region(adsp); if (ret) goto free_rproc; diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 097f33e..6a1cb98 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1712,6 +1712,8 @@ static void rproc_crash_handler_work(struct work_struct *work) if (!rproc->recovery_disabled) rproc_trigger_recovery(rproc); + + pm_relax(rproc->dev.parent); } /** @@ -2208,6 +2210,9 @@ void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type) return; } + /* Prevent suspend while the remoteproc is being recovered */ + pm_stay_awake(rproc->dev.parent); + dev_err(&rproc->dev, "crash detected in %s: type %s\n", rproc->name, rproc_crash_to_string(type));