Commit 961a919a authored by Andrew Davis's avatar Andrew Davis Committed by Mathieu Poirier

remoteproc: k3-dsp: Add devm action to release reserved memory

Use a device lifecycle managed action to release reserved memory. This
helps prevent mistakes like releasing out of order in cleanup functions
and forgetting to release on error paths.
Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240123184913.725435-2-afd@ti.comSigned-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 64e17ec2
...@@ -550,6 +550,13 @@ static int k3_dsp_rproc_of_get_memories(struct platform_device *pdev, ...@@ -550,6 +550,13 @@ static int k3_dsp_rproc_of_get_memories(struct platform_device *pdev,
return 0; return 0;
} }
static void k3_dsp_mem_release(void *data)
{
struct device *dev = data;
of_reserved_mem_device_release(dev);
}
static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc) static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
{ {
struct device *dev = kproc->dev; struct device *dev = kproc->dev;
...@@ -579,13 +586,14 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc) ...@@ -579,13 +586,14 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
ERR_PTR(ret)); ERR_PTR(ret));
return ret; return ret;
} }
ret = devm_add_action_or_reset(dev, k3_dsp_mem_release, dev);
if (ret)
return ret;
num_rmems--; num_rmems--;
kproc->rmem = kcalloc(num_rmems, sizeof(*kproc->rmem), GFP_KERNEL); kproc->rmem = kcalloc(num_rmems, sizeof(*kproc->rmem), GFP_KERNEL);
if (!kproc->rmem) { if (!kproc->rmem)
ret = -ENOMEM; return -ENOMEM;
goto release_rmem;
}
/* use remaining reserved memory regions for static carveouts */ /* use remaining reserved memory regions for static carveouts */
for (i = 0; i < num_rmems; i++) { for (i = 0; i < num_rmems; i++) {
...@@ -628,8 +636,6 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc) ...@@ -628,8 +636,6 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
for (i--; i >= 0; i--) for (i--; i >= 0; i--)
iounmap(kproc->rmem[i].cpu_addr); iounmap(kproc->rmem[i].cpu_addr);
kfree(kproc->rmem); kfree(kproc->rmem);
release_rmem:
of_reserved_mem_device_release(kproc->dev);
return ret; return ret;
} }
...@@ -640,8 +646,6 @@ static void k3_dsp_reserved_mem_exit(struct k3_dsp_rproc *kproc) ...@@ -640,8 +646,6 @@ static void k3_dsp_reserved_mem_exit(struct k3_dsp_rproc *kproc)
for (i = 0; i < kproc->num_rmems; i++) for (i = 0; i < kproc->num_rmems; i++)
iounmap(kproc->rmem[i].cpu_addr); iounmap(kproc->rmem[i].cpu_addr);
kfree(kproc->rmem); kfree(kproc->rmem);
of_reserved_mem_device_release(kproc->dev);
} }
static static
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment