remoteproc: k3: Refactor mem_release() functions into common driver

The mem_release() implementations in the TI K3 R5, DSP and M4 remoteproc
drivers release the reserved memory of the device, which get auto
triggered upon device removal.

Refactor these functions into ti_k3_common.c driver as k3_mem_release()
and use this common function in R5, DSP and M4 drivers.

Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
Tested-by: Judith Mendez <jm@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250513054510.3439842-35-b-padhi@ti.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/ti_k3_common.c b/drivers/remoteproc/ti_k3_common.c
index 2200af4edaf85041b0c5aa39a1f0cf642f85b9f0..5d257242d5752cba300bf8d52e042f6386952e4f 100644 (file)
--- a/drivers/remoteproc/ti_k3_common.c
+++ b/drivers/remoteproc/ti_k3_common.c
@@ -461,5 +461,13 @@ int k3_rproc_of_get_memories(struct platform_device *pdev,
 }
 EXPORT_SYMBOL_GPL(k3_rproc_of_get_memories);
 
+void k3_mem_release(void *data)
+{
+       struct device *dev = data;
+
+       of_reserved_mem_device_release(dev);
+}
+EXPORT_SYMBOL_GPL(k3_mem_release);
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("TI K3 common Remoteproc code");

diff --git a/drivers/remoteproc/ti_k3_common.h b/drivers/remoteproc/ti_k3_common.h
index d05f53bd9073a026c8ef84a3cb024b50ee0e77d3..63f094a375604bde1150378d14ded0eab61c9abc 100644 (file)
--- a/drivers/remoteproc/ti_k3_common.h
+++ b/drivers/remoteproc/ti_k3_common.h
@@ -112,4 +112,5 @@ void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len,
                        bool *is_iomem);
 int k3_rproc_of_get_memories(struct platform_device *pdev,
                             struct k3_rproc *kproc);
+void k3_mem_release(void *data);
 #endif /* REMOTEPROC_TI_K3_COMMON_H */

diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
index 5ba82944a537f34adc7aa588cd5adc5928816d84..6c79b347a610a336ae5d2cfb896ec12247fae3bb 100644 (file)
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -66,13 +66,6 @@ static const struct rproc_ops k3_dsp_rproc_ops = {
        .get_loaded_rsc_table   = k3_get_loaded_rsc_table,
 };
 
-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_rproc *kproc)
 {
        struct device *dev = kproc->dev;
@@ -102,7 +95,7 @@ static int k3_dsp_reserved_mem_init(struct k3_rproc *kproc)
                        ERR_PTR(ret));
                return ret;
        }
-       ret = devm_add_action_or_reset(dev, k3_dsp_mem_release, dev);
+       ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
index 30453aca3c7b095ac0f485692057d549f0eeb7c2..1a87d012ed42eeef3b5b102189f73eaa18c6c059 100644 (file)
--- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
@@ -21,13 +21,6 @@
 #include "ti_sci_proc.h"
 #include "ti_k3_common.h"
 
-static void k3_m4_rproc_dev_mem_release(void *data)
-{
-       struct device *dev = data;
-
-       of_reserved_mem_device_release(dev);
-}
-
 static int k3_m4_reserved_mem_init(struct k3_rproc *kproc)
 {
        struct device *dev = kproc->dev;
@@ -56,7 +49,7 @@ static int k3_m4_reserved_mem_init(struct k3_rproc *kproc)
                dev_err(dev, "device cannot initialize DMA pool (%d)\n", ret);
                return ret;
        }
-       ret = devm_add_action_or_reset(dev, k3_m4_rproc_dev_mem_release, dev);
+       ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 86b4135a5d31d3462535f194bf8e45c3a129173a..1e770121e09918fdddc8a14b7a86fa663fedab4b 100644 (file)
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -761,13 +761,6 @@ 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_rproc *kproc)
 {
        struct device *dev = kproc->dev;
@@ -798,7 +791,7 @@ static int k3_r5_reserved_mem_init(struct k3_rproc *kproc)
                return ret;
        }
 
-       ret = devm_add_action_or_reset(dev, k3_r5_mem_release, dev);
+       ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
        if (ret)
                return ret;