The .kick rproc ops implementations in ti_k3_dsp_remoteproc.c and
ti_k3_m4_remoteproc.c drivers sends a mailbox message to the remote
processor in the same way. Refactor the implementations into a common
function 'k3_rproc_kick()' in the ti_k3_common.c driver.
Signed-off-by: Beleswar Padhi <b-padhi@xxxxxx>
---
drivers/remoteproc/ti_k3_common.c | 31 +++++++++++++++++++++
drivers/remoteproc/ti_k3_common.h | 1 +
drivers/remoteproc/ti_k3_dsp_remoteproc.c | 31 ++-------------------
drivers/remoteproc/ti_k3_m4_remoteproc.c | 34 ++---------------------
4 files changed, 36 insertions(+), 61 deletions(-)
diff --git a/drivers/remoteproc/ti_k3_common.c b/drivers/remoteproc/ti_k3_common.c
index a87a06744f71..bd6353283078 100644
--- a/drivers/remoteproc/ti_k3_common.c
+++ b/drivers/remoteproc/ti_k3_common.c
@@ -86,5 +86,36 @@ void k3_rproc_mbox_callback(struct mbox_client *client, void *data)
}
EXPORT_SYMBOL_GPL(k3_rproc_mbox_callback);
+/*
+ * Kick the remote processor to notify about pending unprocessed messages.
+ * The vqid usage is not used and is inconsequential, as the kick is performed
+ * through a simulated GPIO (a bit in an IPC interrupt-triggering register),
+ * the remote processor is expected to process both its Tx and Rx virtqueues.
+ */
+void k3_rproc_kick(struct rproc *rproc, int vqid)
+{
+ struct k3_rproc *kproc = rproc->priv;
+ struct device *dev = kproc->dev;
+ u32 msg = (u32)vqid;
+ int ret;
+
+ /*
+ * Do not forward messages to a detached core, except when the core
+ * is in the process of being attached in IPC-only mode.
+ */
+ if (!kproc->is_attach_ongoing && kproc->rproc->state == RPROC_DETACHED)
+ return;
+ /*
+ * Send the index of the triggered virtqueue in the mailbox payload.
+ * NOTE: msg is cast to uintptr_t to prevent compiler warnings when
+ * void* is 64bit. It is safely cast back to u32 in the mailbox driver.
+ */
+ ret = mbox_send_message(kproc->mbox, (void *)(uintptr_t)msg);
+ if (ret < 0)
+ dev_err(dev, "failed to send mailbox message, status = %d\n",
+ ret);
+}
+EXPORT_SYMBOL_GPL(k3_rproc_kick);
+
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 251ecc2df1dd..57792d68b7ef 100644
--- a/drivers/remoteproc/ti_k3_common.h
+++ b/drivers/remoteproc/ti_k3_common.h
@@ -89,4 +89,5 @@ struct k3_rproc {
};
void k3_rproc_mbox_callback(struct mbox_client *client, void *data);
+void k3_rproc_kick(struct rproc *rproc, int vqid);
#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 70fbceccbac2..b2551b5171a9 100644
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -24,33 +24,6 @@
#define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK (SZ_16M - 1)
-/*
- * Kick the remote processor to notify about pending unprocessed messages.
- * The vqid usage is not used and is inconsequential, as the kick is performed
- * through a simulated GPIO (a bit in an IPC interrupt-triggering register),
- * the remote processor is expected to process both its Tx and Rx virtqueues.
- */
-static void k3_dsp_rproc_kick(struct rproc *rproc, int vqid)
-{
- struct k3_rproc *kproc = rproc->priv;
- struct device *dev = rproc->dev.parent;
- mbox_msg_t msg = (mbox_msg_t)vqid;
- int ret;
-
- /*
- * Do not forward messages to a detached core, except when the core is
- * in the process of being attached in IPC-only mode.
- */
- if (!kproc->is_attach_ongoing && kproc->rproc->state == RPROC_DETACHED)
- return;
-
- /* send the index of the triggered virtqueue in the mailbox payload */
- ret = mbox_send_message(kproc->mbox, (void *)msg);
- if (ret < 0)
- dev_err(dev, "failed to send mailbox message (%pe)\n",
- ERR_PTR(ret));
-}
-
/* Put the DSP processor into reset */
static int k3_dsp_rproc_reset(struct k3_rproc *kproc)
{
@@ -239,7 +212,7 @@ static int k3_dsp_rproc_stop(struct rproc *rproc)
* 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_dsp_rproc_{kick/mbox_callback} functions that the core is in the
+ * 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
@@ -366,7 +339,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_dsp_rproc_stop,
- .kick = k3_dsp_rproc_kick,
+ .kick = k3_rproc_kick,
.da_to_va = k3_dsp_rproc_da_to_va,
};
diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
index f1fe7d462d2a..953c3999019f 100644
--- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
@@ -24,36 +24,6 @@
#define K3_M4_IRAM_DEV_ADDR 0x00000
#define K3_M4_DRAM_DEV_ADDR 0x30000
-/*
- * Kick the remote processor to notify about pending unprocessed messages.
- * The vqid usage is not used and is inconsequential, as the kick is performed
- * through a simulated GPIO (a bit in an IPC interrupt-triggering register),
- * the remote processor is expected to process both its Tx and Rx virtqueues.
- */
-static void k3_m4_rproc_kick(struct rproc *rproc, int vqid)
-{
- struct k3_rproc *kproc = rproc->priv;
- struct device *dev = kproc->dev;
- u32 msg = (u32)vqid;
- int ret;
-
- /*
- * Do not forward messages to a detached core, except when the core
- * is in the process of being attached in IPC-only mode.
- */
- if (!kproc->is_attach_ongoing && kproc->rproc->state == RPROC_DETACHED)
- return;
- /*
- * Send the index of the triggered virtqueue in the mailbox payload.
- * NOTE: msg is cast to uintptr_t to prevent compiler warnings when
- * void* is 64bit. It is safely cast back to u32 in the mailbox driver.
- */
- ret = mbox_send_message(kproc->mbox, (void *)(uintptr_t)msg);
- if (ret < 0)
- dev_err(dev, "failed to send mailbox message, status = %d\n",
- ret);
-}
-
static int k3_m4_rproc_ping_mbox(struct k3_rproc *kproc)
{
struct device *dev = kproc->dev;
@@ -424,7 +394,7 @@ static int k3_m4_rproc_stop(struct rproc *rproc)
* 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_m4_rproc_{kick/mbox_callback} functions that the core is in the
+ * 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.
@@ -468,7 +438,7 @@ static const struct rproc_ops k3_m4_rproc_ops = {
.stop = k3_m4_rproc_stop,
.attach = k3_m4_rproc_attach,
.detach = k3_m4_rproc_detach,
- .kick = k3_m4_rproc_kick,
+ .kick = k3_rproc_kick,
.da_to_va = k3_m4_rproc_da_to_va,
.get_loaded_rsc_table = k3_m4_get_loaded_rsc_table,
};
--
2.34.1
