From: Peng Fan <peng.fan@nxp.com>
To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
o.rempel@pengutronix.de, robh+dt@kernel.org
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH 09/10] remoteproc: imx_proc: enable virtio/mailbox
Date: Fri, 24 Jul 2020 16:08:12 +0800 [thread overview]
Message-ID: <20200724080813.24884-10-peng.fan@nxp.com> (raw)
In-Reply-To: <20200724080813.24884-1-peng.fan@nxp.com>
Use virtio/mailbox to build connection between Remote Proccessors
and Linux. Add delayed work to handle incoming messages.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 102 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 99 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 03382290d6a5..a8ce97c04e1e 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -8,6 +8,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_address.h>
@@ -91,6 +92,10 @@ struct imx_rproc {
struct imx_rproc_mem mem[IMX7D_RPROC_MEM_MAX];
struct clk *clk;
void *rsc_va;
+ struct mbox_client cl;
+ struct mbox_chan *tx_ch;
+ struct mbox_chan *rx_ch;
+ struct delayed_work rproc_work;
};
static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
@@ -452,9 +457,25 @@ static int imx_rproc_elf_load_segments(struct rproc *rproc, const struct firmwar
return ret;
}
+static void imx_rproc_kick(struct rproc *rproc, int vqid)
+{
+ struct imx_rproc *priv = rproc->priv;
+ int err;
+ __u32 mmsg;
+
+ mmsg = vqid << 16;
+
+ priv->cl.tx_tout = 20;
+ err = mbox_send_message(priv->tx_ch, (void *)&mmsg);
+ if (err < 0)
+ dev_err(priv->dev, "%s: failed (%d, err:%d)\n",
+ __func__, vqid, err);
+}
+
static const struct rproc_ops imx_rproc_ops = {
.start = imx_rproc_start,
.stop = imx_rproc_stop,
+ .kick = imx_rproc_kick,
.da_to_va = imx_rproc_da_to_va,
.load = imx_rproc_elf_load_segments,
.parse_fw = imx_rproc_parse_fw,
@@ -527,6 +548,67 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
return 0;
}
+static void imx_rproc_vq_work(struct work_struct *work)
+{
+ struct delayed_work *dwork = to_delayed_work(work);
+ struct imx_rproc *priv = container_of(dwork, struct imx_rproc,
+ rproc_work);
+
+ rproc_vq_interrupt(priv->rproc, 0);
+ rproc_vq_interrupt(priv->rproc, 1);
+}
+
+static void imx_rproc_rx_callback(struct mbox_client *cl, void *msg)
+{
+ struct rproc *rproc = dev_get_drvdata(cl->dev);
+ struct imx_rproc *priv = rproc->priv;
+
+ schedule_delayed_work(&(priv->rproc_work), 0);
+}
+
+static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ struct device *dev = priv->dev;
+ struct mbox_client *cl;
+ int ret = 0;
+
+ cl = &priv->cl;
+ cl->dev = dev;
+ cl->tx_block = true;
+ cl->tx_tout = 20;
+ cl->knows_txdone = false;
+ cl->rx_callback = imx_rproc_rx_callback;
+
+ priv->tx_ch = mbox_request_channel_byname(cl, "tx");
+ if (IS_ERR(priv->tx_ch)) {
+ if (PTR_ERR(priv->tx_ch) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ ret = PTR_ERR(priv->tx_ch);
+ dev_dbg(cl->dev, "failed to request mbox tx chan, ret %d\n",
+ ret);
+ goto err_out;
+ }
+
+ priv->rx_ch = mbox_request_channel_byname(cl, "rx");
+ if (IS_ERR(priv->rx_ch)) {
+ ret = PTR_ERR(priv->rx_ch);
+ dev_dbg(cl->dev, "failed to request mbox rx chan, ret %d\n",
+ ret);
+ goto err_out;
+ }
+
+ return ret;
+
+err_out:
+ if (!IS_ERR(priv->tx_ch))
+ mbox_free_channel(priv->tx_ch);
+ if (!IS_ERR(priv->rx_ch))
+ mbox_free_channel(priv->rx_ch);
+
+ return ret;
+}
+
static int imx_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -566,17 +648,24 @@ static int imx_rproc_probe(struct platform_device *pdev)
dev_set_drvdata(dev, rproc);
+ ret = imx_rproc_xtr_mbox_init(rproc);
+ if (ret) {
+ if (ret == -EPROBE_DEFER)
+ goto err_put_rproc;
+ /* mbox is optional, so not fail here */
+ }
+
ret = imx_rproc_addr_init(priv, pdev);
if (ret) {
dev_err(dev, "failed on imx_rproc_addr_init\n");
- goto err_put_rproc;
+ goto err_put_mbox;
}
priv->clk = devm_clk_get_optional(dev, NULL);
if (IS_ERR(priv->clk)) {
dev_err(dev, "Failed to get clock\n");
ret = PTR_ERR(priv->clk);
- goto err_put_rproc;
+ goto err_put_mbox;
}
/*
@@ -586,9 +675,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(priv->clk);
if (ret) {
dev_err(&rproc->dev, "Failed to enable clock\n");
- goto err_put_rproc;
+ goto err_put_mbox;
}
+ INIT_DELAYED_WORK(&(priv->rproc_work), imx_rproc_vq_work);
+
ret = rproc_add(rproc);
if (ret) {
dev_err(dev, "rproc_add failed\n");
@@ -599,6 +690,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
err_put_clk:
clk_disable_unprepare(priv->clk);
+err_put_mbox:
+ if (!IS_ERR(priv->tx_ch))
+ mbox_free_channel(priv->tx_ch);
+ if (!IS_ERR(priv->rx_ch))
+ mbox_free_channel(priv->rx_ch);
err_put_rproc:
rproc_free(rproc);
--
2.16.4
WARNING: multiple messages have this Message-ID (diff)
From: Peng Fan <peng.fan@nxp.com>
To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
o.rempel@pengutronix.de, robh+dt@kernel.org
Cc: devicetree@vger.kernel.org, Peng Fan <peng.fan@nxp.com>,
festevam@gmail.com, s.hauer@pengutronix.de,
linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-imx@nxp.com, kernel@pengutronix.de, shawnguo@kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/10] remoteproc: imx_proc: enable virtio/mailbox
Date: Fri, 24 Jul 2020 16:08:12 +0800 [thread overview]
Message-ID: <20200724080813.24884-10-peng.fan@nxp.com> (raw)
In-Reply-To: <20200724080813.24884-1-peng.fan@nxp.com>
Use virtio/mailbox to build connection between Remote Proccessors
and Linux. Add delayed work to handle incoming messages.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 102 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 99 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 03382290d6a5..a8ce97c04e1e 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -8,6 +8,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_address.h>
@@ -91,6 +92,10 @@ struct imx_rproc {
struct imx_rproc_mem mem[IMX7D_RPROC_MEM_MAX];
struct clk *clk;
void *rsc_va;
+ struct mbox_client cl;
+ struct mbox_chan *tx_ch;
+ struct mbox_chan *rx_ch;
+ struct delayed_work rproc_work;
};
static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
@@ -452,9 +457,25 @@ static int imx_rproc_elf_load_segments(struct rproc *rproc, const struct firmwar
return ret;
}
+static void imx_rproc_kick(struct rproc *rproc, int vqid)
+{
+ struct imx_rproc *priv = rproc->priv;
+ int err;
+ __u32 mmsg;
+
+ mmsg = vqid << 16;
+
+ priv->cl.tx_tout = 20;
+ err = mbox_send_message(priv->tx_ch, (void *)&mmsg);
+ if (err < 0)
+ dev_err(priv->dev, "%s: failed (%d, err:%d)\n",
+ __func__, vqid, err);
+}
+
static const struct rproc_ops imx_rproc_ops = {
.start = imx_rproc_start,
.stop = imx_rproc_stop,
+ .kick = imx_rproc_kick,
.da_to_va = imx_rproc_da_to_va,
.load = imx_rproc_elf_load_segments,
.parse_fw = imx_rproc_parse_fw,
@@ -527,6 +548,67 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
return 0;
}
+static void imx_rproc_vq_work(struct work_struct *work)
+{
+ struct delayed_work *dwork = to_delayed_work(work);
+ struct imx_rproc *priv = container_of(dwork, struct imx_rproc,
+ rproc_work);
+
+ rproc_vq_interrupt(priv->rproc, 0);
+ rproc_vq_interrupt(priv->rproc, 1);
+}
+
+static void imx_rproc_rx_callback(struct mbox_client *cl, void *msg)
+{
+ struct rproc *rproc = dev_get_drvdata(cl->dev);
+ struct imx_rproc *priv = rproc->priv;
+
+ schedule_delayed_work(&(priv->rproc_work), 0);
+}
+
+static int imx_rproc_xtr_mbox_init(struct rproc *rproc)
+{
+ struct imx_rproc *priv = rproc->priv;
+ struct device *dev = priv->dev;
+ struct mbox_client *cl;
+ int ret = 0;
+
+ cl = &priv->cl;
+ cl->dev = dev;
+ cl->tx_block = true;
+ cl->tx_tout = 20;
+ cl->knows_txdone = false;
+ cl->rx_callback = imx_rproc_rx_callback;
+
+ priv->tx_ch = mbox_request_channel_byname(cl, "tx");
+ if (IS_ERR(priv->tx_ch)) {
+ if (PTR_ERR(priv->tx_ch) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ ret = PTR_ERR(priv->tx_ch);
+ dev_dbg(cl->dev, "failed to request mbox tx chan, ret %d\n",
+ ret);
+ goto err_out;
+ }
+
+ priv->rx_ch = mbox_request_channel_byname(cl, "rx");
+ if (IS_ERR(priv->rx_ch)) {
+ ret = PTR_ERR(priv->rx_ch);
+ dev_dbg(cl->dev, "failed to request mbox rx chan, ret %d\n",
+ ret);
+ goto err_out;
+ }
+
+ return ret;
+
+err_out:
+ if (!IS_ERR(priv->tx_ch))
+ mbox_free_channel(priv->tx_ch);
+ if (!IS_ERR(priv->rx_ch))
+ mbox_free_channel(priv->rx_ch);
+
+ return ret;
+}
+
static int imx_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -566,17 +648,24 @@ static int imx_rproc_probe(struct platform_device *pdev)
dev_set_drvdata(dev, rproc);
+ ret = imx_rproc_xtr_mbox_init(rproc);
+ if (ret) {
+ if (ret == -EPROBE_DEFER)
+ goto err_put_rproc;
+ /* mbox is optional, so not fail here */
+ }
+
ret = imx_rproc_addr_init(priv, pdev);
if (ret) {
dev_err(dev, "failed on imx_rproc_addr_init\n");
- goto err_put_rproc;
+ goto err_put_mbox;
}
priv->clk = devm_clk_get_optional(dev, NULL);
if (IS_ERR(priv->clk)) {
dev_err(dev, "Failed to get clock\n");
ret = PTR_ERR(priv->clk);
- goto err_put_rproc;
+ goto err_put_mbox;
}
/*
@@ -586,9 +675,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(priv->clk);
if (ret) {
dev_err(&rproc->dev, "Failed to enable clock\n");
- goto err_put_rproc;
+ goto err_put_mbox;
}
+ INIT_DELAYED_WORK(&(priv->rproc_work), imx_rproc_vq_work);
+
ret = rproc_add(rproc);
if (ret) {
dev_err(dev, "rproc_add failed\n");
@@ -599,6 +690,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
err_put_clk:
clk_disable_unprepare(priv->clk);
+err_put_mbox:
+ if (!IS_ERR(priv->tx_ch))
+ mbox_free_channel(priv->tx_ch);
+ if (!IS_ERR(priv->rx_ch))
+ mbox_free_channel(priv->rx_ch);
err_put_rproc:
rproc_free(rproc);
--
2.16.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-24 7:44 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 8:08 [PATCH 00/10] remoteproc: imx_rproc: support iMX8M and early boot Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-24 8:08 ` [PATCH 01/10] dt-bindings: remoteproc: imx_rproc: add i.MX8MQ/M Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-31 20:14 ` Rob Herring
2020-07-31 20:14 ` Rob Herring
2020-07-24 8:08 ` [PATCH 02/10] remoteproc: imx_rproc: correct err message Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-08-11 19:56 ` Mathieu Poirier
2020-08-11 19:56 ` Mathieu Poirier
2020-07-24 8:08 ` [PATCH 03/10] remoteproc: imx: use devm_ioremap Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-27 6:23 ` Oleksij Rempel
2020-07-27 6:23 ` Oleksij Rempel
2020-07-27 6:28 ` Peng Fan
2020-07-27 6:28 ` Peng Fan
2020-07-27 6:41 ` Oleksij Rempel
2020-07-27 6:41 ` Oleksij Rempel
2020-07-27 6:51 ` Peng Fan
2020-07-27 6:51 ` Peng Fan
2020-07-27 7:37 ` Oleksij Rempel
2020-07-27 7:37 ` Oleksij Rempel
2020-07-27 8:11 ` Peng Fan
2020-07-27 8:11 ` Peng Fan
2020-07-28 7:20 ` Oleksij Rempel
2020-07-28 7:20 ` Oleksij Rempel
2020-07-24 8:08 ` [PATCH 04/10] remoteproc: imx_rproc: make syscon optional Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-08-11 22:40 ` Mathieu Poirier
2020-08-11 22:40 ` Mathieu Poirier
2020-08-18 21:43 ` Mathieu Poirier
2020-08-18 21:43 ` Mathieu Poirier
2020-08-19 0:51 ` Peng Fan
2020-08-19 0:51 ` Peng Fan
2020-08-19 19:45 ` Mathieu Poirier
2020-08-19 19:45 ` Mathieu Poirier
2020-08-20 2:04 ` Peng Fan
2020-08-20 2:04 ` Peng Fan
2020-08-20 19:27 ` Mathieu Poirier
2020-08-20 19:27 ` Mathieu Poirier
2020-07-24 8:08 ` [PATCH 05/10] remoteproc: imx_rproc: make clk optional Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-24 8:08 ` [PATCH 06/10] remoteproc: imx_rproc: add load hook Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-27 5:20 ` Oleksij Rempel
2020-07-27 5:20 ` Oleksij Rempel
2020-08-11 21:40 ` Mathieu Poirier
2020-08-11 21:40 ` Mathieu Poirier
2020-07-24 8:08 ` [PATCH 07/10] remoteproc: imx_rproc: add i.MX specific parse fw hook Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-08-11 21:56 ` Mathieu Poirier
2020-08-11 21:56 ` Mathieu Poirier
2020-07-24 8:08 ` [PATCH 08/10] remoteproc: imx_rproc: support i.MX8MQ/M Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-07-24 8:08 ` Peng Fan [this message]
2020-07-24 8:08 ` [PATCH 09/10] remoteproc: imx_proc: enable virtio/mailbox Peng Fan
2020-07-24 8:08 ` [PATCH 10/10] remoteproc: imx_rproc: support coproc booting before Linux Peng Fan
2020-07-24 8:08 ` Peng Fan
2020-08-11 22:36 ` Mathieu Poirier
2020-08-11 22:36 ` Mathieu Poirier
2020-07-27 6:38 ` [PATCH 00/10] remoteproc: imx_rproc: support iMX8M and early boot Oleksij Rempel
2020-07-27 6:38 ` Oleksij Rempel
2020-07-27 6:44 ` Peng Fan
2020-07-27 6:44 ` Peng Fan
2020-07-27 7:54 ` Oleksij Rempel
2020-07-27 7:54 ` Oleksij Rempel
2020-07-27 9:18 ` Peng Fan
2020-07-27 9:18 ` Peng Fan
2020-07-28 7:26 ` Oleksij Rempel
2020-07-28 7:26 ` Oleksij Rempel
2020-07-28 7:50 ` Peng Fan
2020-07-28 7:50 ` Peng Fan
2020-07-28 7:55 ` Oleksij Rempel
2020-07-28 7:55 ` Oleksij Rempel
2020-07-28 9:36 ` Peng Fan
2020-07-28 9:36 ` Peng Fan
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=20200724080813.24884-10-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=o.rempel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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.