The .attach rproc ops implementations in ti_k3_dsp_remoteproc.c and
ti_k3_m4_remoteproc.c drivers set the "is_attach_ongoing" flag to
signify that the core is undergoing transition from detached to
attached state. Refactor the implementations into ti_k3_common.c driver
as k3_rproc_attach() and align DSP and M4 drivers to register this
common function as .attach ops.
Signed-off-by: Beleswar Padhi <b-padhi@xxxxxx>
---
drivers/remoteproc/ti_k3_common.c | 20 ++++++++++++++++++++
drivers/remoteproc/ti_k3_common.h | 1 +
drivers/remoteproc/ti_k3_dsp_remoteproc.c | 21 +--------------------
drivers/remoteproc/ti_k3_m4_remoteproc.c | 20 +-------------------
4 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/drivers/remoteproc/ti_k3_common.c b/drivers/remoteproc/ti_k3_common.c
index 799152d1a736..296a47de9d72 100644
--- a/drivers/remoteproc/ti_k3_common.c
+++ b/drivers/remoteproc/ti_k3_common.c
@@ -310,5 +310,25 @@ int k3_rproc_stop(struct rproc *rproc)
}
EXPORT_SYMBOL_GPL(k3_rproc_stop);
+/*
+ * Attach to a running remote processor (IPC-only mode)
+ *
+ * This rproc attach callback only needs to set the "is_attach_ongoing" flag to
+ * notify k3_rproc_{kick/mbox_callback} functions that the core is in the
+ * process of getting attached in IPC-only mode. The remote processor is already
+ * booted, and all required resources have been acquired during probe routine,
+ * so there is no need to issue any TI-SCI commands to boot the remote core.
+ * This callback is invoked only in IPC-only mode.
+ */
+int k3_rproc_attach(struct rproc *rproc)
+{
+ struct k3_rproc *kproc = rproc->priv;
+
+ kproc->is_attach_ongoing = true;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(k3_rproc_attach);
+
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 bfcb5d086cff..89175cb5a006 100644
--- a/drivers/remoteproc/ti_k3_common.h
+++ b/drivers/remoteproc/ti_k3_common.h
@@ -97,4 +97,5 @@ int k3_rproc_prepare(struct rproc *rproc);
int k3_rproc_unprepare(struct rproc *rproc);
int k3_rproc_start(struct rproc *rproc);
int k3_rproc_stop(struct rproc *rproc);
+int k3_rproc_attach(struct rproc *rproc);
#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 a9896ba51399..43c1eda47be2 100644
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -58,25 +58,6 @@ static int k3_dsp_rproc_start(struct rproc *rproc)
return 0;
}
-/*
- * Attach to a running DSP remote processor (IPC-only mode)
- *
- * This rproc attach callback only needs to set the "is_attach_ongoing" flag to
- * notify k3_rproc_{kick/mbox_callback} functions that the core is in the
- * process of getting attached in IPC-only mode. The remote processor is already
- * booted, and all required resources have been acquired during probe routine,
- * so there is no need to issue any TI-SCI commands to boot the DSP core. This
- * callback is invoked only in IPC-only mode.
- */
-static int k3_dsp_rproc_attach(struct rproc *rproc)
-{
- struct k3_rproc *kproc = rproc->priv;
-
- kproc->is_attach_ongoing = true;
-
- return 0;
-}
-
/*
* Detach from a running DSP remote processor (IPC-only mode)
*
@@ -189,6 +170,7 @@ static void *k3_dsp_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool
static const struct rproc_ops k3_dsp_rproc_ops = {
.start = k3_dsp_rproc_start,
.stop = k3_rproc_stop,
+ .attach = k3_rproc_attach,
.kick = k3_rproc_kick,
.da_to_va = k3_dsp_rproc_da_to_va,
};
@@ -414,7 +396,6 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev)
dev_info(dev, "configured DSP for IPC-only mode\n");
rproc->state = RPROC_DETACHED;
/* override rproc ops with only required IPC-only mode ops */
- rproc->ops->attach = k3_dsp_rproc_attach;
rproc->ops->detach = k3_dsp_rproc_detach;
rproc->ops->get_loaded_rsc_table = k3_dsp_get_loaded_rsc_table;
} else {
diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
index 27bf8ed49f59..e78e35c1375c 100644
--- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
@@ -244,24 +244,6 @@ static void k3_m4_release_tsp(void *data)
ti_sci_proc_release(tsp);
}
-/*
- * Attach to a running M4 remote processor (IPC-only mode)
- *
- * This rproc attach callback only needs to set the "is_attach_ongoing" flag to
- * notify k3_rproc_{kick/mbox_callback} functions that the core is in the
- * process of getting attached in IPC-only mode. The remote processor is already
- * booted, so there is no need to issue any TI-SCI commands to boot the M4 core.
- * This callback is used only in IPC-only mode.
- */
-static int k3_m4_rproc_attach(struct rproc *rproc)
-{
- struct k3_rproc *kproc = rproc->priv;
-
- kproc->is_attach_ongoing = true;
-
- return 0;
-}
-
/*
* Detach from a running M4 remote processor (IPC-only mode)
*
@@ -285,7 +267,7 @@ static const struct rproc_ops k3_m4_rproc_ops = {
.unprepare = k3_rproc_unprepare,
.start = k3_rproc_start,
.stop = k3_rproc_stop,
- .attach = k3_m4_rproc_attach,
+ .attach = k3_rproc_attach,
.detach = k3_m4_rproc_detach,
.kick = k3_rproc_kick,
.da_to_va = k3_m4_rproc_da_to_va,
--
2.34.1
