* [PATCH v2 0/2] Fix the error path of probe functions in
@ 2024-11-08 3:42 Joe Hattori
2024-11-08 3:42 ` [PATCH v2 1/2] remoteproc: qcom: pas: Remove subdevs on the error path of adsp_probe() Joe Hattori
2024-11-08 3:42 ` [PATCH v2 2/2] remoteproc: qcom: adsp: " Joe Hattori
0 siblings, 2 replies; 3+ messages in thread
From: Joe Hattori @ 2024-11-08 3:42 UTC (permalink / raw)
To: andersson, mathieu.poirier; +Cc: linux-remoteproc, Joe Hattori
This patch set fixes the error path of adsp_probe() in qcom_q6v5_adsp.c
and qcom_q6v5_pas.c by removnig subdevs and deinitializing qcom_q6v5.
Changes since v1:
- Fix the error path of adsp_probe() in qcom_q6v5_adsp.c
- Add appropriate Fixes tags.
Joe Hattori (2):
remoteproc: qcom: pas: Remove subdevs on the error path of
adsp_probe()
remoteproc: qcom: adsp: Remove subdevs on the error path of
adsp_probe()
drivers/remoteproc/qcom_q6v5_adsp.c | 11 +++++++++--
drivers/remoteproc/qcom_q6v5_pas.c | 20 +++++++++++++++-----
2 files changed, 24 insertions(+), 7 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] remoteproc: qcom: pas: Remove subdevs on the error path of adsp_probe()
2024-11-08 3:42 [PATCH v2 0/2] Fix the error path of probe functions in Joe Hattori
@ 2024-11-08 3:42 ` Joe Hattori
2024-11-08 3:42 ` [PATCH v2 2/2] remoteproc: qcom: adsp: " Joe Hattori
1 sibling, 0 replies; 3+ messages in thread
From: Joe Hattori @ 2024-11-08 3:42 UTC (permalink / raw)
To: andersson, mathieu.poirier; +Cc: linux-remoteproc, Joe Hattori
Current implementation of adsp_probe() in qcom_q6v5_pas.c does not
remove the subdevs of adsp on the error path. Fix this bug by calling
qcom_remove_{ssr,sysmon,pdm,smd,glink}_subdev(), qcom_q6v5_deinit(), and
adsp_unassign_memory_region() appropriately.
Fixes: 4b48921a8f74 ("remoteproc: qcom: Use common SMD edge handler")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
---
drivers/remoteproc/qcom_q6v5_pas.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index ef82835e98a4..27b23a000c7a 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -759,16 +759,16 @@ static int adsp_probe(struct platform_device *pdev)
ret = adsp_init_clock(adsp);
if (ret)
- goto free_rproc;
+ goto unassign_mem;
ret = adsp_init_regulator(adsp);
if (ret)
- goto free_rproc;
+ goto unassign_mem;
ret = adsp_pds_attach(&pdev->dev, adsp->proxy_pds,
desc->proxy_pd_names);
if (ret < 0)
- goto free_rproc;
+ goto unassign_mem;
adsp->proxy_pd_count = ret;
ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, desc->crash_reason_smem, desc->load_state,
@@ -784,18 +784,28 @@ static int adsp_probe(struct platform_device *pdev)
desc->ssctl_id);
if (IS_ERR(adsp->sysmon)) {
ret = PTR_ERR(adsp->sysmon);
- goto detach_proxy_pds;
+ goto deinit_remove_pdm_smd_glink;
}
qcom_add_ssr_subdev(rproc, &adsp->ssr_subdev, desc->ssr_name);
ret = rproc_add(rproc);
if (ret)
- goto detach_proxy_pds;
+ goto remove_ssr_sysmon;
return 0;
+remove_ssr_sysmon:
+ qcom_remove_ssr_subdev(rproc, &adsp->ssr_subdev);
+ qcom_remove_sysmon_subdev(adsp->sysmon);
+deinit_remove_pdm_smd_glink:
+ qcom_remove_pdm_subdev(rproc, &adsp->pdm_subdev);
+ qcom_remove_smd_subdev(rproc, &adsp->smd_subdev);
+ qcom_remove_glink_subdev(rproc, &adsp->glink_subdev);
+ qcom_q6v5_deinit(&adsp->q6v5);
detach_proxy_pds:
adsp_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
+unassign_mem:
+ adsp_unassign_memory_region(adsp);
free_rproc:
device_init_wakeup(adsp->dev, false);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] remoteproc: qcom: adsp: Remove subdevs on the error path of adsp_probe()
2024-11-08 3:42 [PATCH v2 0/2] Fix the error path of probe functions in Joe Hattori
2024-11-08 3:42 ` [PATCH v2 1/2] remoteproc: qcom: pas: Remove subdevs on the error path of adsp_probe() Joe Hattori
@ 2024-11-08 3:42 ` Joe Hattori
1 sibling, 0 replies; 3+ messages in thread
From: Joe Hattori @ 2024-11-08 3:42 UTC (permalink / raw)
To: andersson, mathieu.poirier; +Cc: linux-remoteproc, Joe Hattori
Current implementation of adsp_probe() in qcom_q6v5_adsp.c and does not
remove the subdevs of adsp on the error path. Fix this bug by calling
qcom_remove_{ssr,sysmon,pdm,smd,glink}_subdev(), and qcom_q6v5_deinit()
appropriately.
Fixes: dc160e449122 ("remoteproc: qcom: Introduce Non-PAS ADSP PIL driver")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
---
drivers/remoteproc/qcom_q6v5_adsp.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 572dcb0f055b..223f6ca0745d 100644
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -734,15 +734,22 @@ static int adsp_probe(struct platform_device *pdev)
desc->ssctl_id);
if (IS_ERR(adsp->sysmon)) {
ret = PTR_ERR(adsp->sysmon);
- goto disable_pm;
+ goto deinit_remove_glink_pdm_ssr;
}
ret = rproc_add(rproc);
if (ret)
- goto disable_pm;
+ goto remove_sysmon;
return 0;
+remove_sysmon:
+ qcom_remove_sysmon_subdev(adsp->sysmon);
+deinit_remove_glink_pdm_ssr:
+ qcom_q6v5_deinit(&adsp->q6v5);
+ qcom_remove_glink_subdev(rproc, &adsp->glink_subdev);
+ qcom_remove_pdm_subdev(rproc, &adsp->pdm_subdev);
+ qcom_remove_ssr_subdev(rproc, &adsp->ssr_subdev);
disable_pm:
qcom_rproc_pds_detach(adsp);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-08 3:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-08 3:42 [PATCH v2 0/2] Fix the error path of probe functions in Joe Hattori
2024-11-08 3:42 ` [PATCH v2 1/2] remoteproc: qcom: pas: Remove subdevs on the error path of adsp_probe() Joe Hattori
2024-11-08 3:42 ` [PATCH v2 2/2] remoteproc: qcom: adsp: " Joe Hattori
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 read-only IMAP folder(s) and NNTP newsgroup(s).