Skip to content

Commit 744270b

Browse files
3V3RYONEmathieupoirier
authored andcommitted
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 <[email protected]> Tested-by: Judith Mendez <[email protected]> Reviewed-by: Andrew Davis <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mathieu Poirier <[email protected]>
1 parent c172402 commit 744270b

File tree

5 files changed

+12
-24
lines changed

5 files changed

+12
-24
lines changed

drivers/remoteproc/ti_k3_common.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,5 +461,13 @@ int k3_rproc_of_get_memories(struct platform_device *pdev,
461461
}
462462
EXPORT_SYMBOL_GPL(k3_rproc_of_get_memories);
463463

464+
void k3_mem_release(void *data)
465+
{
466+
struct device *dev = data;
467+
468+
of_reserved_mem_device_release(dev);
469+
}
470+
EXPORT_SYMBOL_GPL(k3_mem_release);
471+
464472
MODULE_LICENSE("GPL");
465473
MODULE_DESCRIPTION("TI K3 common Remoteproc code");

drivers/remoteproc/ti_k3_common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,5 @@ void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len,
112112
bool *is_iomem);
113113
int k3_rproc_of_get_memories(struct platform_device *pdev,
114114
struct k3_rproc *kproc);
115+
void k3_mem_release(void *data);
115116
#endif /* REMOTEPROC_TI_K3_COMMON_H */

drivers/remoteproc/ti_k3_dsp_remoteproc.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ static const struct rproc_ops k3_dsp_rproc_ops = {
6666
.get_loaded_rsc_table = k3_get_loaded_rsc_table,
6767
};
6868

69-
static void k3_dsp_mem_release(void *data)
70-
{
71-
struct device *dev = data;
72-
73-
of_reserved_mem_device_release(dev);
74-
}
75-
7669
static int k3_dsp_reserved_mem_init(struct k3_rproc *kproc)
7770
{
7871
struct device *dev = kproc->dev;
@@ -102,7 +95,7 @@ static int k3_dsp_reserved_mem_init(struct k3_rproc *kproc)
10295
ERR_PTR(ret));
10396
return ret;
10497
}
105-
ret = devm_add_action_or_reset(dev, k3_dsp_mem_release, dev);
98+
ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
10699
if (ret)
107100
return ret;
108101

drivers/remoteproc/ti_k3_m4_remoteproc.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
#include "ti_sci_proc.h"
2222
#include "ti_k3_common.h"
2323

24-
static void k3_m4_rproc_dev_mem_release(void *data)
25-
{
26-
struct device *dev = data;
27-
28-
of_reserved_mem_device_release(dev);
29-
}
30-
3124
static int k3_m4_reserved_mem_init(struct k3_rproc *kproc)
3225
{
3326
struct device *dev = kproc->dev;
@@ -56,7 +49,7 @@ static int k3_m4_reserved_mem_init(struct k3_rproc *kproc)
5649
dev_err(dev, "device cannot initialize DMA pool (%d)\n", ret);
5750
return ret;
5851
}
59-
ret = devm_add_action_or_reset(dev, k3_m4_rproc_dev_mem_release, dev);
52+
ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
6053
if (ret)
6154
return ret;
6255

drivers/remoteproc/ti_k3_r5_remoteproc.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -761,13 +761,6 @@ static int k3_r5_rproc_configure(struct k3_rproc *kproc)
761761
return ret;
762762
}
763763

764-
static void k3_r5_mem_release(void *data)
765-
{
766-
struct device *dev = data;
767-
768-
of_reserved_mem_device_release(dev);
769-
}
770-
771764
static int k3_r5_reserved_mem_init(struct k3_rproc *kproc)
772765
{
773766
struct device *dev = kproc->dev;
@@ -798,7 +791,7 @@ static int k3_r5_reserved_mem_init(struct k3_rproc *kproc)
798791
return ret;
799792
}
800793

801-
ret = devm_add_action_or_reset(dev, k3_r5_mem_release, dev);
794+
ret = devm_add_action_or_reset(dev, k3_mem_release, dev);
802795
if (ret)
803796
return ret;
804797

0 commit comments

Comments
 (0)