lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/10] remoteproc: imx_proc: enable virtio/mailbox
    Date
    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
    \
     
     \ /
      Last update: 2020-07-24 09:45    [W:2.345 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site