Skip to content

Commit 9a70551

Browse files
lweiss-fairphoneandersson
authored andcommitted
remoteproc: qcom_q6v5_pas: disable wakeup on probe fail or remove
Leaving wakeup enabled during probe fail (-EPROBE_DEFER) or remove makes the subsequent probe fail. [ 3.749454] remoteproc remoteproc0: releasing 3000000.remoteproc [ 3.752949] qcom_q6v5_pas: probe of 3000000.remoteproc failed with error -17 [ 3.878935] remoteproc remoteproc0: releasing 4080000.remoteproc [ 3.887602] qcom_q6v5_pas: probe of 4080000.remoteproc failed with error -17 [ 4.319552] remoteproc remoteproc0: releasing 8300000.remoteproc [ 4.332716] qcom_q6v5_pas: probe of 8300000.remoteproc failed with error -17 Fix this by disabling wakeup in both cases so the driver can properly probe on the next try. Fixes: a781e5a ("remoteproc: core: Prevent system suspend during remoteproc recovery") Fixes: dc86c12 ("remoteproc: qcom: pas: Mark devices as wakeup capable") Reviewed-by: Mukesh Ojha <[email protected]> Signed-off-by: Luca Weiss <[email protected]> Reviewed-by: Caleb Connolly <[email protected]> Reviewed-by: Sibi Sankar <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f360e2b commit 9a70551

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/remoteproc/qcom_q6v5_pas.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ static int adsp_probe(struct platform_device *pdev)
556556
detach_proxy_pds:
557557
adsp_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
558558
free_rproc:
559+
device_init_wakeup(adsp->dev, false);
559560
rproc_free(rproc);
560561

561562
return ret;
@@ -572,6 +573,7 @@ static int adsp_remove(struct platform_device *pdev)
572573
qcom_remove_sysmon_subdev(adsp->sysmon);
573574
qcom_remove_smd_subdev(adsp->rproc, &adsp->smd_subdev);
574575
qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev);
576+
device_init_wakeup(adsp->dev, false);
575577
rproc_free(adsp->rproc);
576578

577579
return 0;

0 commit comments

Comments
 (0)