Skip to content

Commit 2433961

Browse files
tititiou36mathieupoirier
authored andcommitted
remoteproc: k3: Correctly release some resources allocated in k3_rproc_request_mbox()
If an error occurs after a successful k3_rproc_request_mbox() call, mbox_free_channel() should be called to avoid a leak. Such a call is missing in the error handling path of k3_dsp_rproc_probe(). It is also missing both in the error handling path of k3_m4_rproc_probe() and in the (in-existent) corresponding remove function. Switch to managed resources to avoid these leaks and simplify the code. Remove the now unneeded mbox_free_channel(). Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Beleswar Padhi <b-padhi@ti.com> Tested-by: Beleswar Padhi <b-padhi@ti.com> Link: https://lore.kernel.org/r/df853ede72e9972c464415990b196289680e6acb.1756065142.git.christophe.jaillet@wanadoo.fr Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent 3df0bee commit 2433961

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

drivers/remoteproc/ti_k3_common.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,19 @@ int k3_rproc_release(struct k3_rproc *kproc)
155155
}
156156
EXPORT_SYMBOL_GPL(k3_rproc_release);
157157

158+
static void k3_rproc_free_channel(void *data)
159+
{
160+
struct k3_rproc *kproc = data;
161+
162+
mbox_free_channel(kproc->mbox);
163+
}
164+
158165
int k3_rproc_request_mbox(struct rproc *rproc)
159166
{
160167
struct k3_rproc *kproc = rproc->priv;
161168
struct mbox_client *client = &kproc->client;
162169
struct device *dev = kproc->dev;
170+
int ret;
163171

164172
client->dev = dev;
165173
client->tx_done = NULL;
@@ -172,6 +180,10 @@ int k3_rproc_request_mbox(struct rproc *rproc)
172180
return dev_err_probe(dev, PTR_ERR(kproc->mbox),
173181
"mbox_request_channel failed\n");
174182

183+
ret = devm_add_action_or_reset(dev, k3_rproc_free_channel, kproc);
184+
if (ret)
185+
return ret;
186+
175187
return 0;
176188
}
177189
EXPORT_SYMBOL_GPL(k3_rproc_request_mbox);

drivers/remoteproc/ti_k3_dsp_remoteproc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ static void k3_dsp_rproc_remove(struct platform_device *pdev)
175175
if (ret)
176176
dev_err(dev, "failed to detach proc (%pe)\n", ERR_PTR(ret));
177177
}
178-
179-
mbox_free_channel(kproc->mbox);
180178
}
181179

182180
static const struct k3_rproc_mem_data c66_mems[] = {

drivers/remoteproc/ti_k3_r5_remoteproc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,8 +1206,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
12061206
return;
12071207
}
12081208
}
1209-
1210-
mbox_free_channel(kproc->mbox);
12111209
}
12121210
}
12131211

0 commit comments

Comments
 (0)