Skip to content

Commit 972361e

Browse files
3V3RYONEmathieupoirier
authored andcommitted
remoteproc: k3-r5: 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: 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>
1 parent dbb9c37 commit 972361e

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

drivers/remoteproc/ti_k3_r5_remoteproc.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,13 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc)
955955
return ret;
956956
}
957957

958+
static void k3_r5_mem_release(void *data)
959+
{
960+
struct device *dev = data;
961+
962+
of_reserved_mem_device_release(dev);
963+
}
964+
958965
static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
959966
{
960967
struct device *dev = kproc->dev;
@@ -985,12 +992,14 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
985992
return ret;
986993
}
987994

995+
ret = devm_add_action_or_reset(dev, k3_r5_mem_release, dev);
996+
if (ret)
997+
return ret;
998+
988999
num_rmems--;
9891000
kproc->rmem = kcalloc(num_rmems, sizeof(*kproc->rmem), GFP_KERNEL);
990-
if (!kproc->rmem) {
991-
ret = -ENOMEM;
992-
goto release_rmem;
993-
}
1001+
if (!kproc->rmem)
1002+
return -ENOMEM;
9941003

9951004
/* use remaining reserved memory regions for static carveouts */
9961005
for (i = 0; i < num_rmems; i++) {
@@ -1041,8 +1050,6 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
10411050
for (i--; i >= 0; i--)
10421051
iounmap(kproc->rmem[i].cpu_addr);
10431052
kfree(kproc->rmem);
1044-
release_rmem:
1045-
of_reserved_mem_device_release(dev);
10461053
return ret;
10471054
}
10481055

@@ -1053,8 +1060,6 @@ static void k3_r5_reserved_mem_exit(struct k3_r5_rproc *kproc)
10531060
for (i = 0; i < kproc->num_rmems; i++)
10541061
iounmap(kproc->rmem[i].cpu_addr);
10551062
kfree(kproc->rmem);
1056-
1057-
of_reserved_mem_device_release(kproc->dev);
10581063
}
10591064

10601065
/*

0 commit comments

Comments
 (0)