Skip to content

Commit 587b67c

Browse files
joehattoriandersson
authored andcommitted
remoteproc: qcom: pas: Remove subdevs on the error path of adsp_probe()
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: 4b48921 ("remoteproc: qcom: Use common SMD edge handler") Signed-off-by: Joe Hattori <[email protected]> Link: https://lore.kernel.org/r/a1cabc64240022a7f1d5237aa2aa6f72d8fb7052.1731038950.git.joe@pf.is.s.u-tokyo.ac.jp Signed-off-by: Bjorn Andersson <[email protected]>
1 parent ad64a7c commit 587b67c

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

drivers/remoteproc/qcom_q6v5_pas.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -759,16 +759,16 @@ static int adsp_probe(struct platform_device *pdev)
759759

760760
ret = adsp_init_clock(adsp);
761761
if (ret)
762-
goto free_rproc;
762+
goto unassign_mem;
763763

764764
ret = adsp_init_regulator(adsp);
765765
if (ret)
766-
goto free_rproc;
766+
goto unassign_mem;
767767

768768
ret = adsp_pds_attach(&pdev->dev, adsp->proxy_pds,
769769
desc->proxy_pd_names);
770770
if (ret < 0)
771-
goto free_rproc;
771+
goto unassign_mem;
772772
adsp->proxy_pd_count = ret;
773773

774774
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)
784784
desc->ssctl_id);
785785
if (IS_ERR(adsp->sysmon)) {
786786
ret = PTR_ERR(adsp->sysmon);
787-
goto detach_proxy_pds;
787+
goto deinit_remove_pdm_smd_glink;
788788
}
789789

790790
qcom_add_ssr_subdev(rproc, &adsp->ssr_subdev, desc->ssr_name);
791791
ret = rproc_add(rproc);
792792
if (ret)
793-
goto detach_proxy_pds;
793+
goto remove_ssr_sysmon;
794794

795795
return 0;
796796

797+
remove_ssr_sysmon:
798+
qcom_remove_ssr_subdev(rproc, &adsp->ssr_subdev);
799+
qcom_remove_sysmon_subdev(adsp->sysmon);
800+
deinit_remove_pdm_smd_glink:
801+
qcom_remove_pdm_subdev(rproc, &adsp->pdm_subdev);
802+
qcom_remove_smd_subdev(rproc, &adsp->smd_subdev);
803+
qcom_remove_glink_subdev(rproc, &adsp->glink_subdev);
804+
qcom_q6v5_deinit(&adsp->q6v5);
797805
detach_proxy_pds:
798806
adsp_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
807+
unassign_mem:
808+
adsp_unassign_memory_region(adsp);
799809
free_rproc:
800810
device_init_wakeup(adsp->dev, false);
801811

0 commit comments

Comments
 (0)