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

[ 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>

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 6cbe74486ebd48afdb96e18296ae5d2df7b184aa..a9ec65c12fb939d3332ce53b9958db46f556b2a7 100644 (file)
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -947,6 +947,13 @@ out:
        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)
 {
        struct device *dev = kproc->dev;
@@ -977,12 +984,14 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
                return ret;
        }
 
+       ret = devm_add_action_or_reset(dev, k3_r5_mem_release, dev);
+       if (ret)
+               return ret;
+
        num_rmems--;
        kproc->rmem = kcalloc(num_rmems, sizeof(*kproc->rmem), GFP_KERNEL);
-       if (!kproc->rmem) {
-               ret = -ENOMEM;
-               goto release_rmem;
-       }
+       if (!kproc->rmem)
+               return -ENOMEM;
 
        /* use remaining reserved memory regions for static carveouts */
        for (i = 0; i < num_rmems; i++) {
@@ -1033,8 +1042,6 @@ unmap_rmem:
        for (i--; i >= 0; i--)
                iounmap(kproc->rmem[i].cpu_addr);
        kfree(kproc->rmem);
-release_rmem:
-       of_reserved_mem_device_release(dev);
        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++)
                iounmap(kproc->rmem[i].cpu_addr);
        kfree(kproc->rmem);
-
-       of_reserved_mem_device_release(kproc->dev);
 }
 
 /*