From: Loic Pallardy <loic.pallardy@st.com>
To: bjorn.andersson@linaro.org, ohad@wizery.com, lee.jones@linaro.org
Cc: loic.pallardy@st.com, linux-remoteproc@vger.kernel.org,
kernel@stlinux.com, patrice.chotard@st.com
Subject: [PATCH v2 1/3] remoteproc: st: add virtio communication support
Date: Fri, 6 Jan 2017 18:16:11 +0100 [thread overview]
Message-ID: <1483722973-21531-2-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1483722973-21531-1-git-send-email-loic.pallardy@st.com>
This patch provides virtio communication support based on mailbox
for ST coprocessors.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/Kconfig | 3 +
drivers/remoteproc/st_remoteproc.c | 120 ++++++++++++++++++++++++++++++++++++-
2 files changed, 122 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 8f9cf0b..108add8 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -111,6 +111,9 @@ config ST_REMOTEPROC
tristate "ST remoteproc support"
depends on ARCH_STI
depends on REMOTEPROC
+ select MAILBOX
+ select STI_MBOX
+ select RPMSG_VIRTIO
help
Say y here to support ST's adjunct processors via the remote
processor framework.
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index da4e152..2d99111 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -15,6 +15,7 @@
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
+#include <linux/mailbox_client.h>
#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -25,6 +26,14 @@
#include <linux/remoteproc.h>
#include <linux/reset.h>
+#include "remoteproc_internal.h"
+
+#define ST_RPROC_MAX_VRING 2
+
+#define MBOX_RX 0
+#define MBOX_TX 1
+#define MBOX_MAX 2
+
struct st_rproc_config {
bool sw_reset;
bool pwr_reset;
@@ -39,8 +48,47 @@ struct st_rproc {
u32 clk_rate;
struct regmap *boot_base;
u32 boot_offset;
+ struct mbox_chan *mbox_chan[ST_RPROC_MAX_VRING][MBOX_MAX];
+ struct mbox_client mbox_client_vq0;
+ struct mbox_client mbox_client_vq1;
};
+static void st_rproc_mbox_callback(struct device *dev, u32 msg)
+{
+ struct rproc *rproc = dev_get_drvdata(dev);
+
+ if (rproc_vq_interrupt(rproc, msg) == IRQ_NONE)
+ dev_dbg(dev, "no message was found in vqid %d\n", msg);
+}
+
+static void st_rproc_mbox_callback_vq0(struct mbox_client *mbox_client,
+ void *data)
+{
+ st_rproc_mbox_callback(mbox_client->dev, 0);
+}
+
+static void st_rproc_mbox_callback_vq1(struct mbox_client *mbox_client,
+ void *data)
+{
+ st_rproc_mbox_callback(mbox_client->dev, 1);
+}
+
+static void st_rproc_kick(struct rproc *rproc, int vqid)
+{
+ struct st_rproc *ddata = rproc->priv;
+ struct device *dev = rproc->dev.parent;
+ int ret;
+
+ /* send the index of the triggered virtqueue in the mailbox payload */
+ if (vqid < ST_RPROC_MAX_VRING) {
+ ret = mbox_send_message(ddata->mbox_chan[vqid][MBOX_TX],
+ (void *)&vqid);
+ if (ret < 0)
+ dev_err(dev,
+ "failed to send message via mbox: %d\n", ret);
+ }
+}
+
static int st_rproc_start(struct rproc *rproc)
{
struct st_rproc *ddata = rproc->priv;
@@ -108,6 +156,7 @@ static int st_rproc_stop(struct rproc *rproc)
}
static struct rproc_ops st_rproc_ops = {
+ .kick = st_rproc_kick,
.start = st_rproc_start,
.stop = st_rproc_stop,
};
@@ -221,6 +270,7 @@ static int st_rproc_probe(struct platform_device *pdev)
struct st_rproc *ddata;
struct device_node *np = dev->of_node;
struct rproc *rproc;
+ struct mbox_chan *chan;
int enabled;
int ret;
@@ -257,13 +307,76 @@ static int st_rproc_probe(struct platform_device *pdev)
clk_set_rate(ddata->clk, ddata->clk_rate);
}
+ if (of_get_property(np, "mbox-names", NULL)) {
+ ddata->mbox_client_vq0.dev = dev;
+ ddata->mbox_client_vq0.tx_done = NULL;
+ ddata->mbox_client_vq0.tx_block = false;
+ ddata->mbox_client_vq0.knows_txdone = false;
+ ddata->mbox_client_vq0.rx_callback = st_rproc_mbox_callback_vq0;
+
+ ddata->mbox_client_vq1.dev = dev;
+ ddata->mbox_client_vq1.tx_done = NULL;
+ ddata->mbox_client_vq1.tx_block = false;
+ ddata->mbox_client_vq1.knows_txdone = false;
+ ddata->mbox_client_vq1.rx_callback = st_rproc_mbox_callback_vq1;
+
+ /*
+ * To control a co-processor without IPC mechanism.
+ * This driver can be used without mbox and rpmsg.
+ */
+ chan = mbox_request_channel_byname(&ddata->mbox_client_vq0, "vq0_rx");
+ if (IS_ERR(chan)) {
+ dev_err(&rproc->dev, "failed to request mbox chan 0\n");
+ ret = PTR_ERR(chan);
+ goto free_rproc;
+ } else {
+ ddata->mbox_chan[0][MBOX_RX] = chan;
+ }
+
+ chan = mbox_request_channel_byname(&ddata->mbox_client_vq0, "vq0_tx");
+ if (IS_ERR(chan)) {
+ dev_err(&rproc->dev, "failed to request mbox chan 0\n");
+ ret = PTR_ERR(chan);
+ goto free_one;
+ } else {
+ ddata->mbox_chan[0][MBOX_TX] = chan;
+ }
+
+ chan = mbox_request_channel_byname(&ddata->mbox_client_vq1, "vq1_rx");
+ if (IS_ERR(chan)) {
+ dev_err(&rproc->dev, "failed to request mbox chan 1\n");
+ ret = PTR_ERR(chan);
+ goto free_two;
+ } else {
+ ddata->mbox_chan[1][MBOX_RX] = chan;
+ }
+
+ chan = mbox_request_channel_byname(&ddata->mbox_client_vq1, "vq1_tx");
+ if (IS_ERR(chan)) {
+ dev_err(&rproc->dev, "failed to request mbox chan 1\n");
+ ret = PTR_ERR(chan);
+ goto free_three;
+ } else {
+ ddata->mbox_chan[1][MBOX_TX] = chan;
+ }
+ }
+
ret = rproc_add(rproc);
if (ret)
- goto free_rproc;
+ goto free_four;
return 0;
+free_four:
+ mbox_free_channel(ddata->mbox_chan[1][MBOX_TX]);
+free_three:
+ mbox_free_channel(ddata->mbox_chan[1][MBOX_RX]);
+free_two:
+ mbox_free_channel(ddata->mbox_chan[0][MBOX_TX]);
+free_one:
+ mbox_free_channel(ddata->mbox_chan[0][MBOX_RX]);
free_rproc:
+ clk_unprepare(ddata->clk);
rproc_free(rproc);
return ret;
}
@@ -279,6 +392,11 @@ static int st_rproc_remove(struct platform_device *pdev)
of_reserved_mem_device_release(&pdev->dev);
+ mbox_free_channel(ddata->mbox_chan[0][MBOX_RX]);
+ mbox_free_channel(ddata->mbox_chan[1][MBOX_RX]);
+ mbox_free_channel(ddata->mbox_chan[0][MBOX_TX]);
+ mbox_free_channel(ddata->mbox_chan[1][MBOX_TX]);
+
rproc_free(rproc);
return 0;
--
1.9.1
next prev parent reply other threads:[~2017-01-06 17:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 17:16 [PATCH v2 0/3] remoteproc: st: add virtio_rpmsg support Loic Pallardy
2017-01-06 17:16 ` Loic Pallardy [this message]
2017-01-16 9:34 ` [PATCH v2 1/3] remoteproc: st: add virtio communication support Lee Jones
2017-01-06 17:16 ` [PATCH v2 2/3] remoteproc: st: add da to va support Loic Pallardy
2017-01-06 17:16 ` [PATCH v2 3/3] remoteproc: core: don't allocate carveout if pa or da are defined Loic Pallardy
2017-01-11 10:19 ` [PATCH v2 0/3] remoteproc: st: add virtio_rpmsg support Patrice Chotard
2017-01-13 13:25 ` loic pallardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483722973-21531-2-git-send-email-loic.pallardy@st.com \
--to=loic.pallardy@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=kernel@stlinux.com \
--cc=lee.jones@linaro.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=patrice.chotard@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.