tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 972361e397797320a624d1a5b457520c10ab4a28 ]

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: Beleswar Padhi <b-padhi@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20241219110545.1898883-2-b-padhi@ti.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Stable-dep-of: 701177511abd ("remoteproc: k3-r5: Refactor sequential core power up/down operations")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Beleswar Padhi
2024-12-19 16:35:41 +05:30
committed by Greg Kroah-Hartman
parent 5eec92eb4f
commit f802fb717d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/remoteproc/ti_k3_r5_remoteproc.c
+13 -8
View File
@@ -947,6 +947,13 @@ out:
return ret; return ret;
} }
static void k3_r5_mem_release(void *data)
{
struct device *dev = data;
of_reserved_mem_device_release(dev);
}
static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
{ {
struct device *dev = kproc->dev; struct device *dev = kproc->dev;
@@ -977,12 +984,14 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
return ret; return ret;
} }
ret = devm_add_action_or_reset(dev, k3_r5_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++) {
@@ -1033,8 +1042,6 @@ unmap_rmem:
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(dev);
return ret; return ret;
} }
@@ -1045,8 +1052,6 @@ static void k3_r5_reserved_mem_exit(struct k3_r5_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);
} }
/* /*