[PATCH v10 16/33] remoteproc: k3-dsp: Correct Reset deassert logic for devices w/o lresets

From: Beleswar Padhi
Date: Thu Apr 17 2025 - 14:24:06 EST


The k3_dsp_rproc_release() function erroneously deasserts the local
reset even for devices which do not support it. Even though it results
in a no-operation, Update the logic to explicitly deassert the local
reset for devices that support it and only the global reset for those
that do not.

Signed-off-by: Beleswar Padhi <b-padhi@xxxxxx>
---
v10: Changelog:
1. Split [v9 13/26] into [v10 16/33] and [v10 17/33] patches.

Link to v9:
https://lore.kernel.org/all/20250317120622.1746415-14-b-padhi@xxxxxx/

drivers/remoteproc/ti_k3_dsp_remoteproc.c | 26 +++++++++++------------
1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
index f8a5282df5b71..b10b35326bd6b 100644
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -30,24 +30,22 @@ static int k3_dsp_rproc_release(struct k3_rproc *kproc)
struct device *dev = kproc->dev;
int ret;

- if (kproc->data->uses_lreset)
- goto lreset;
+ if (kproc->data->uses_lreset) {
+ ret = reset_control_deassert(kproc->reset);
+ if (ret) {
+ dev_err(dev, "local-reset deassert failed, (%pe)\n", ERR_PTR(ret));
+ if (kproc->ti_sci->ops.dev_ops.put_device(kproc->ti_sci,
+ kproc->ti_sci_id))
+ dev_warn(dev, "module-reset assert back failed\n");
+ }

- ret = kproc->ti_sci->ops.dev_ops.get_device(kproc->ti_sci,
- kproc->ti_sci_id);
- if (ret) {
- dev_err(dev, "module-reset deassert failed (%pe)\n", ERR_PTR(ret));
return ret;
}

-lreset:
- ret = reset_control_deassert(kproc->reset);
- if (ret) {
- dev_err(dev, "local-reset deassert failed, (%pe)\n", ERR_PTR(ret));
- if (kproc->ti_sci->ops.dev_ops.put_device(kproc->ti_sci,
- kproc->ti_sci_id))
- dev_warn(dev, "module-reset assert back failed\n");
- }
+ ret = kproc->ti_sci->ops.dev_ops.get_device(kproc->ti_sci,
+ kproc->ti_sci_id);
+ if (ret)
+ dev_err(dev, "module-reset deassert failed (%pe)\n", ERR_PTR(ret));

return ret;
}
--
2.34.1