* [PATCH v3] remoteproc/mediatek: unprepare clk if scp_before_load fails
@ 2020-12-03 15:59 Tzung-Bi Shih
2020-12-03 16:34 ` Mathieu Poirier
0 siblings, 1 reply; 2+ messages in thread
From: Tzung-Bi Shih @ 2020-12-03 15:59 UTC (permalink / raw)
To: ohad, bjorn.andersson
Cc: mathieu.poirier, linux-remoteproc, tzungbi, linux-mediatek,
pihsun, matthias.bgg, linux-arm-kernel
Fixes the error handling to unprepare clk if scp_before_load fails.
Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP")
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
Changes from v2[2]:
- fix the "Fixes" tag format
Changes from v1[1]:
- add "Fixes" tag
- remove an unneeded change
[1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201202044537.2500497-1-tzungbi@google.com/
[2]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201203030436.3583198-1-tzungbi@google.com/
drivers/remoteproc/mtk_scp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 5f42b9ce7185..5e5705fe35a8 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -350,9 +350,10 @@ static int scp_load(struct rproc *rproc, const struct firmware *fw)
ret = scp->data->scp_before_load(scp);
if (ret < 0)
- return ret;
+ goto leave;
ret = scp_elf_load_segments(rproc, fw);
+leave:
clk_disable_unprepare(scp->clk);
return ret;
--
2.29.2.454.gaff20da3a2-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] remoteproc/mediatek: unprepare clk if scp_before_load fails
2020-12-03 15:59 [PATCH v3] remoteproc/mediatek: unprepare clk if scp_before_load fails Tzung-Bi Shih
@ 2020-12-03 16:34 ` Mathieu Poirier
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Poirier @ 2020-12-03 16:34 UTC (permalink / raw)
To: Tzung-Bi Shih
Cc: ohad, linux-remoteproc, bjorn.andersson, linux-mediatek, pihsun,
matthias.bgg, linux-arm-kernel
On Thu, Dec 03, 2020 at 11:59:14PM +0800, Tzung-Bi Shih wrote:
> Fixes the error handling to unprepare clk if scp_before_load fails.
>
> Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP")
> Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> Changes from v2[2]:
> - fix the "Fixes" tag format
>
> Changes from v1[1]:
> - add "Fixes" tag
> - remove an unneeded change
>
> [1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201202044537.2500497-1-tzungbi@google.com/
> [2]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201203030436.3583198-1-tzungbi@google.com/
>
> drivers/remoteproc/mtk_scp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 5f42b9ce7185..5e5705fe35a8 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -350,9 +350,10 @@ static int scp_load(struct rproc *rproc, const struct firmware *fw)
>
> ret = scp->data->scp_before_load(scp);
> if (ret < 0)
> - return ret;
> + goto leave;
>
> ret = scp_elf_load_segments(rproc, fw);
> +leave:
> clk_disable_unprepare(scp->clk);
>
> return ret;
> --
> 2.29.2.454.gaff20da3a2-goog
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-03 16:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-03 15:59 [PATCH v3] remoteproc/mediatek: unprepare clk if scp_before_load fails Tzung-Bi Shih
2020-12-03 16:34 ` Mathieu Poirier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).