Skip to contentSkip to conversation

remoteproc/mediatek: unprepare clk if scp_before_load fails

PATCH Superseded Tzung-Bi Shih 2 participants 3 messages Dec 3, 2020

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 remoteproc/mediatek: unprepare clk if scp_before_load fails

Fixes the error handling to unprepare clk if scp_before_load fails.

Fixes fd0b6c1ff85a4 ("remoteproc/mediatek: Add support for mt8192 SCP")

---
Changes from v1[1]:
- add "Fixes" tag
- remove an unneeded change

[1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/[email protected]/

 drivers/remoteproc/mtk_scp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/remoteproc/mtk_scp.c +2 -1
index 5f42b9ce7185..5e5705fe35a8 100644
@@ -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;
Signature · 7 lines
2.29.2.454.gaff20da3a2-goog


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
maintainer
#1 lore raw
Quoted 3 lines · Tzung-Bi Shih

Fixes the error handling to unprepare clk if scp_before_load fails.

Fixes fd0b6c1ff85a4 ("remoteproc/mediatek: Add support for mt8192 SCP")

https://elixir.bootlin.com/linux/v5.10-rc6/source/Documentation/process/submitting-patches.rst#L122

Quoted 30 lines

---
Changes from v1[1]:
- add "Fixes" tag
- remove an unneeded change

[1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/[email protected]/

 drivers/remoteproc/mtk_scp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/remoteproc/mtk_scp.c +2 -1
index 5f42b9ce7185..5e5705fe35a8 100644
@@ -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;
Signature · 1 line
2.29.2.454.gaff20da3a2-goog

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#2 lore raw
Quoted 7 lines · Mathieu Poirier
Quoted 3 lines · Tzung-Bi Shih

Fixes the error handling to unprepare clk if scp_before_load fails.

Fixes fd0b6c1ff85a4 ("remoteproc/mediatek: Add support for mt8192 SCP")

https://elixir.bootlin.com/linux/v5.10-rc6/source/Documentation/process/submitting-patches.rst#L122

Fixed in v3[1], not sure what happened when copying the hash.

[1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/[email protected]/

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek