* [PATCH V5 1/4] dt-bindings: mailbox: imx-mu: add SCU MU support
2020-03-03 7:42 [PATCH V5 0/4] mailbox/firmware: imx: support SCU channel type peng.fan
@ 2020-03-03 7:42 ` peng.fan
2020-03-03 7:54 ` Oleksij Rempel
2020-03-03 7:42 ` [PATCH V5 2/4] mailbox: imx: restructure code to make easy for new MU peng.fan
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: peng.fan @ 2020-03-03 7:42 UTC (permalink / raw)
To: shawnguo, s.hauer, jassisinghbrar, o.rempel
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
i.MX8/8X SCU MU is dedicated for communication between SCU
and Cortex-A cores from hardware design, it could not be reused
for other purpose. To use SCU MU more effectivly, add "fsl,imx8-scu-mu"
compatile to support fast IPC.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V5:
None
V4:
None
V3:
New patch
Documentation/devicetree/bindings/mailbox/fsl,mu.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/mailbox/fsl,mu.txt b/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
index 9c43357c5924..31486c9f6443 100644
--- a/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
+++ b/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
@@ -23,6 +23,8 @@ Required properties:
be included together with SoC specific compatible.
There is a version 1.0 MU on imx7ulp, use "fsl,imx7ulp-mu"
compatible to support it.
+ To communicate with i.MX8 SCU, "fsl,imx8-mu-scu" could be
+ used for fast IPC
- reg : Should contain the registers location and length
- interrupts : Interrupt number. The interrupt specifier format depends
on the interrupt controller parent.
--
2.16.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V5 1/4] dt-bindings: mailbox: imx-mu: add SCU MU support
2020-03-03 7:42 ` [PATCH V5 1/4] dt-bindings: mailbox: imx-mu: add SCU MU support peng.fan
@ 2020-03-03 7:54 ` Oleksij Rempel
0 siblings, 0 replies; 10+ messages in thread
From: Oleksij Rempel @ 2020-03-03 7:54 UTC (permalink / raw)
To: peng.fan, shawnguo, s.hauer, jassisinghbrar
Cc: aisheng.dong, Anson.Huang, linux-kernel, linux-imx, kernel,
leonard.crestez, festevam, linux-arm-kernel
On 03.03.20 08:42, peng.fan@nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> i.MX8/8X SCU MU is dedicated for communication between SCU
> and Cortex-A cores from hardware design, it could not be reused
> for other purpose. To use SCU MU more effectivly, add "fsl,imx8-scu-mu"
> compatile to support fast IPC.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>
> V5:
> None
> V4:
> None
> V3:
> New patch
>
> Documentation/devicetree/bindings/mailbox/fsl,mu.txt | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mailbox/fsl,mu.txt b/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
> index 9c43357c5924..31486c9f6443 100644
> --- a/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
> +++ b/Documentation/devicetree/bindings/mailbox/fsl,mu.txt
> @@ -23,6 +23,8 @@ Required properties:
> be included together with SoC specific compatible.
> There is a version 1.0 MU on imx7ulp, use "fsl,imx7ulp-mu"
> compatible to support it.
> + To communicate with i.MX8 SCU, "fsl,imx8-mu-scu" could be
> + used for fast IPC
> - reg : Should contain the registers location and length
> - interrupts : Interrupt number. The interrupt specifier format depends
> on the interrupt controller parent.
>
Kind regards,
Oleksij Rempel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V5 2/4] mailbox: imx: restructure code to make easy for new MU
2020-03-03 7:42 [PATCH V5 0/4] mailbox/firmware: imx: support SCU channel type peng.fan
2020-03-03 7:42 ` [PATCH V5 1/4] dt-bindings: mailbox: imx-mu: add SCU MU support peng.fan
@ 2020-03-03 7:42 ` peng.fan
2020-03-03 7:55 ` Oleksij Rempel
2020-03-03 7:42 ` [PATCH V5 3/4] mailbox: imx: add SCU MU support peng.fan
2020-03-03 7:42 ` [PATCH V5 4/4] firmware: imx-scu: Support one TX and one RX peng.fan
3 siblings, 1 reply; 10+ messages in thread
From: peng.fan @ 2020-03-03 7:42 UTC (permalink / raw)
To: shawnguo, s.hauer, jassisinghbrar, o.rempel
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Add imx_mu_generic_tx for data send and imx_mu_generic_rx for interrupt
data receive.
Pack original mu chans related code into imx_mu_init_generic
Add tx/rx/init hooks into imx_mu_dcfg
With these, it will be a bit easy to introduce i.MX8/8X SCU type
MU dedicated to communicate with SCU.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V5:
imx_mu_dcfg moved to below imx_mu_priv
Add init hooks
V4:
Pack MU chans init to imx_mu_init_generic
V3:
New patch, restructure code.
drivers/mailbox/imx-mailbox.c | 137 +++++++++++++++++++++++++-----------------
1 file changed, 83 insertions(+), 54 deletions(-)
diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 2cdcdc5f1119..df6c4ecd913c 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -36,13 +36,6 @@ enum imx_mu_chan_type {
IMX_MU_TYPE_RXDB, /* Rx doorbell */
};
-struct imx_mu_dcfg {
- u32 xTR[4]; /* Transmit Registers */
- u32 xRR[4]; /* Receive Registers */
- u32 xSR; /* Status Register */
- u32 xCR; /* Control Register */
-};
-
struct imx_mu_con_priv {
unsigned int idx;
char irq_desc[IMX_MU_CHAN_NAME_SIZE];
@@ -67,18 +60,14 @@ struct imx_mu_priv {
bool side_b;
};
-static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = {
- .xTR = {0x0, 0x4, 0x8, 0xc},
- .xRR = {0x10, 0x14, 0x18, 0x1c},
- .xSR = 0x20,
- .xCR = 0x24,
-};
-
-static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
- .xTR = {0x20, 0x24, 0x28, 0x2c},
- .xRR = {0x40, 0x44, 0x48, 0x4c},
- .xSR = 0x60,
- .xCR = 0x64,
+struct imx_mu_dcfg {
+ int (*tx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp, void *data);
+ int (*rx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp);
+ void (*init)(struct imx_mu_priv *priv);
+ u32 xTR[4]; /* Transmit Registers */
+ u32 xRR[4]; /* Receive Registers */
+ u32 xSR; /* Status Register */
+ u32 xCR; /* Control Register */
};
static struct imx_mu_priv *to_imx_mu_priv(struct mbox_controller *mbox)
@@ -111,6 +100,40 @@ static u32 imx_mu_xcr_rmw(struct imx_mu_priv *priv, u32 set, u32 clr)
return val;
}
+static int imx_mu_generic_tx(struct imx_mu_priv *priv,
+ struct imx_mu_con_priv *cp,
+ void *data)
+{
+ u32 *arg = data;
+
+ switch (cp->type) {
+ case IMX_MU_TYPE_TX:
+ imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]);
+ imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
+ break;
+ case IMX_MU_TYPE_TXDB:
+ imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0);
+ tasklet_schedule(&cp->txdb_tasklet);
+ break;
+ default:
+ dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int imx_mu_generic_rx(struct imx_mu_priv *priv,
+ struct imx_mu_con_priv *cp)
+{
+ u32 dat;
+
+ dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]);
+ mbox_chan_received_data(cp->chan, (void *)&dat);
+
+ return 0;
+}
+
static void imx_mu_txdb_tasklet(unsigned long data)
{
struct imx_mu_con_priv *cp = (struct imx_mu_con_priv *)data;
@@ -123,7 +146,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
struct mbox_chan *chan = p;
struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox);
struct imx_mu_con_priv *cp = chan->con_priv;
- u32 val, ctrl, dat;
+ u32 val, ctrl;
ctrl = imx_mu_read(priv, priv->dcfg->xCR);
val = imx_mu_read(priv, priv->dcfg->xSR);
@@ -152,8 +175,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx));
mbox_chan_txdone(chan, 0);
} else if (val == IMX_MU_xSR_RFn(cp->idx)) {
- dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]);
- mbox_chan_received_data(chan, (void *)&dat);
+ priv->dcfg->rx(priv, cp);
} else if (val == IMX_MU_xSR_GIPn(cp->idx)) {
imx_mu_write(priv, IMX_MU_xSR_GIPn(cp->idx), priv->dcfg->xSR);
mbox_chan_received_data(chan, NULL);
@@ -169,23 +191,8 @@ static int imx_mu_send_data(struct mbox_chan *chan, void *data)
{
struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox);
struct imx_mu_con_priv *cp = chan->con_priv;
- u32 *arg = data;
-
- switch (cp->type) {
- case IMX_MU_TYPE_TX:
- imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]);
- imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
- break;
- case IMX_MU_TYPE_TXDB:
- imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0);
- tasklet_schedule(&cp->txdb_tasklet);
- break;
- default:
- dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
- return -EINVAL;
- }
- return 0;
+ return priv->dcfg->tx(priv, cp, data);
}
static int imx_mu_startup(struct mbox_chan *chan)
@@ -280,6 +287,22 @@ static struct mbox_chan * imx_mu_xlate(struct mbox_controller *mbox,
static void imx_mu_init_generic(struct imx_mu_priv *priv)
{
+ unsigned int i;
+
+ for (i = 0; i < IMX_MU_CHANS; i++) {
+ struct imx_mu_con_priv *cp = &priv->con_priv[i];
+
+ cp->idx = i % 4;
+ cp->type = i >> 2;
+ cp->chan = &priv->mbox_chans[i];
+ priv->mbox_chans[i].con_priv = cp;
+ snprintf(cp->irq_desc, sizeof(cp->irq_desc),
+ "imx_mu_chan[%i-%i]", cp->type, cp->idx);
+ }
+
+ priv->mbox.num_chans = IMX_MU_CHANS;
+ priv->mbox.of_xlate = imx_mu_xlate;
+
if (priv->side_b)
return;
@@ -293,7 +316,6 @@ static int imx_mu_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node;
struct imx_mu_priv *priv;
const struct imx_mu_dcfg *dcfg;
- unsigned int i;
int ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -329,32 +351,19 @@ static int imx_mu_probe(struct platform_device *pdev)
return ret;
}
- for (i = 0; i < IMX_MU_CHANS; i++) {
- struct imx_mu_con_priv *cp = &priv->con_priv[i];
-
- cp->idx = i % 4;
- cp->type = i >> 2;
- cp->chan = &priv->mbox_chans[i];
- priv->mbox_chans[i].con_priv = cp;
- snprintf(cp->irq_desc, sizeof(cp->irq_desc),
- "imx_mu_chan[%i-%i]", cp->type, cp->idx);
- }
-
priv->side_b = of_property_read_bool(np, "fsl,mu-side-b");
+ priv->dcfg->init(priv);
+
spin_lock_init(&priv->xcr_lock);
priv->mbox.dev = dev;
priv->mbox.ops = &imx_mu_ops;
priv->mbox.chans = priv->mbox_chans;
- priv->mbox.num_chans = IMX_MU_CHANS;
- priv->mbox.of_xlate = imx_mu_xlate;
priv->mbox.txdone_irq = true;
platform_set_drvdata(pdev, priv);
- imx_mu_init_generic(priv);
-
return devm_mbox_controller_register(dev, &priv->mbox);
}
@@ -367,6 +376,26 @@ static int imx_mu_remove(struct platform_device *pdev)
return 0;
}
+static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = {
+ .tx = imx_mu_generic_tx,
+ .rx = imx_mu_generic_rx,
+ .init = imx_mu_init_generic,
+ .xTR = {0x0, 0x4, 0x8, 0xc},
+ .xRR = {0x10, 0x14, 0x18, 0x1c},
+ .xSR = 0x20,
+ .xCR = 0x24,
+};
+
+static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
+ .tx = imx_mu_generic_tx,
+ .rx = imx_mu_generic_rx,
+ .init = imx_mu_init_generic,
+ .xTR = {0x20, 0x24, 0x28, 0x2c},
+ .xRR = {0x40, 0x44, 0x48, 0x4c},
+ .xSR = 0x60,
+ .xCR = 0x64,
+};
+
static const struct of_device_id imx_mu_dt_ids[] = {
{ .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp },
{ .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx },
--
2.16.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V5 2/4] mailbox: imx: restructure code to make easy for new MU
2020-03-03 7:42 ` [PATCH V5 2/4] mailbox: imx: restructure code to make easy for new MU peng.fan
@ 2020-03-03 7:55 ` Oleksij Rempel
0 siblings, 0 replies; 10+ messages in thread
From: Oleksij Rempel @ 2020-03-03 7:55 UTC (permalink / raw)
To: peng.fan, shawnguo, s.hauer, jassisinghbrar
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel
On 03.03.20 08:42, peng.fan@nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Add imx_mu_generic_tx for data send and imx_mu_generic_rx for interrupt
> data receive.
>
> Pack original mu chans related code into imx_mu_init_generic
>
> Add tx/rx/init hooks into imx_mu_dcfg
>
> With these, it will be a bit easy to introduce i.MX8/8X SCU type
> MU dedicated to communicate with SCU.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> V5:
> imx_mu_dcfg moved to below imx_mu_priv
> Add init hooks
>
> V4:
> Pack MU chans init to imx_mu_init_generic
> V3:
> New patch, restructure code.
>
> drivers/mailbox/imx-mailbox.c | 137 +++++++++++++++++++++++++-----------------
> 1 file changed, 83 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
> index 2cdcdc5f1119..df6c4ecd913c 100644
> --- a/drivers/mailbox/imx-mailbox.c
> +++ b/drivers/mailbox/imx-mailbox.c
> @@ -36,13 +36,6 @@ enum imx_mu_chan_type {
> IMX_MU_TYPE_RXDB, /* Rx doorbell */
> };
>
> -struct imx_mu_dcfg {
> - u32 xTR[4]; /* Transmit Registers */
> - u32 xRR[4]; /* Receive Registers */
> - u32 xSR; /* Status Register */
> - u32 xCR; /* Control Register */
> -};
> -
> struct imx_mu_con_priv {
> unsigned int idx;
> char irq_desc[IMX_MU_CHAN_NAME_SIZE];
> @@ -67,18 +60,14 @@ struct imx_mu_priv {
> bool side_b;
> };
>
> -static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = {
> - .xTR = {0x0, 0x4, 0x8, 0xc},
> - .xRR = {0x10, 0x14, 0x18, 0x1c},
> - .xSR = 0x20,
> - .xCR = 0x24,
> -};
> -
> -static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
> - .xTR = {0x20, 0x24, 0x28, 0x2c},
> - .xRR = {0x40, 0x44, 0x48, 0x4c},
> - .xSR = 0x60,
> - .xCR = 0x64,
> +struct imx_mu_dcfg {
> + int (*tx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp, void *data);
> + int (*rx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp);
> + void (*init)(struct imx_mu_priv *priv);
> + u32 xTR[4]; /* Transmit Registers */
> + u32 xRR[4]; /* Receive Registers */
> + u32 xSR; /* Status Register */
> + u32 xCR; /* Control Register */
> };
>
> static struct imx_mu_priv *to_imx_mu_priv(struct mbox_controller *mbox)
> @@ -111,6 +100,40 @@ static u32 imx_mu_xcr_rmw(struct imx_mu_priv *priv, u32 set, u32 clr)
> return val;
> }
>
> +static int imx_mu_generic_tx(struct imx_mu_priv *priv,
> + struct imx_mu_con_priv *cp,
> + void *data)
> +{
> + u32 *arg = data;
> +
> + switch (cp->type) {
> + case IMX_MU_TYPE_TX:
> + imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]);
> + imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
> + break;
> + case IMX_MU_TYPE_TXDB:
> + imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0);
> + tasklet_schedule(&cp->txdb_tasklet);
> + break;
> + default:
> + dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int imx_mu_generic_rx(struct imx_mu_priv *priv,
> + struct imx_mu_con_priv *cp)
> +{
> + u32 dat;
> +
> + dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]);
> + mbox_chan_received_data(cp->chan, (void *)&dat);
> +
> + return 0;
> +}
> +
> static void imx_mu_txdb_tasklet(unsigned long data)
> {
> struct imx_mu_con_priv *cp = (struct imx_mu_con_priv *)data;
> @@ -123,7 +146,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
> struct mbox_chan *chan = p;
> struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox);
> struct imx_mu_con_priv *cp = chan->con_priv;
> - u32 val, ctrl, dat;
> + u32 val, ctrl;
>
> ctrl = imx_mu_read(priv, priv->dcfg->xCR);
> val = imx_mu_read(priv, priv->dcfg->xSR);
> @@ -152,8 +175,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
> imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx));
> mbox_chan_txdone(chan, 0);
> } else if (val == IMX_MU_xSR_RFn(cp->idx)) {
> - dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]);
> - mbox_chan_received_data(chan, (void *)&dat);
> + priv->dcfg->rx(priv, cp);
> } else if (val == IMX_MU_xSR_GIPn(cp->idx)) {
> imx_mu_write(priv, IMX_MU_xSR_GIPn(cp->idx), priv->dcfg->xSR);
> mbox_chan_received_data(chan, NULL);
> @@ -169,23 +191,8 @@ static int imx_mu_send_data(struct mbox_chan *chan, void *data)
> {
> struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox);
> struct imx_mu_con_priv *cp = chan->con_priv;
> - u32 *arg = data;
> -
> - switch (cp->type) {
> - case IMX_MU_TYPE_TX:
> - imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]);
> - imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
> - break;
> - case IMX_MU_TYPE_TXDB:
> - imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0);
> - tasklet_schedule(&cp->txdb_tasklet);
> - break;
> - default:
> - dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
> - return -EINVAL;
> - }
>
> - return 0;
> + return priv->dcfg->tx(priv, cp, data);
> }
>
> static int imx_mu_startup(struct mbox_chan *chan)
> @@ -280,6 +287,22 @@ static struct mbox_chan * imx_mu_xlate(struct mbox_controller *mbox,
>
> static void imx_mu_init_generic(struct imx_mu_priv *priv)
> {
> + unsigned int i;
> +
> + for (i = 0; i < IMX_MU_CHANS; i++) {
> + struct imx_mu_con_priv *cp = &priv->con_priv[i];
> +
> + cp->idx = i % 4;
> + cp->type = i >> 2;
> + cp->chan = &priv->mbox_chans[i];
> + priv->mbox_chans[i].con_priv = cp;
> + snprintf(cp->irq_desc, sizeof(cp->irq_desc),
> + "imx_mu_chan[%i-%i]", cp->type, cp->idx);
> + }
> +
> + priv->mbox.num_chans = IMX_MU_CHANS;
> + priv->mbox.of_xlate = imx_mu_xlate;
> +
> if (priv->side_b)
> return;
>
> @@ -293,7 +316,6 @@ static int imx_mu_probe(struct platform_device *pdev)
> struct device_node *np = dev->of_node;
> struct imx_mu_priv *priv;
> const struct imx_mu_dcfg *dcfg;
> - unsigned int i;
> int ret;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> @@ -329,32 +351,19 @@ static int imx_mu_probe(struct platform_device *pdev)
> return ret;
> }
>
> - for (i = 0; i < IMX_MU_CHANS; i++) {
> - struct imx_mu_con_priv *cp = &priv->con_priv[i];
> -
> - cp->idx = i % 4;
> - cp->type = i >> 2;
> - cp->chan = &priv->mbox_chans[i];
> - priv->mbox_chans[i].con_priv = cp;
> - snprintf(cp->irq_desc, sizeof(cp->irq_desc),
> - "imx_mu_chan[%i-%i]", cp->type, cp->idx);
> - }
> -
> priv->side_b = of_property_read_bool(np, "fsl,mu-side-b");
>
> + priv->dcfg->init(priv);
> +
> spin_lock_init(&priv->xcr_lock);
>
> priv->mbox.dev = dev;
> priv->mbox.ops = &imx_mu_ops;
> priv->mbox.chans = priv->mbox_chans;
> - priv->mbox.num_chans = IMX_MU_CHANS;
> - priv->mbox.of_xlate = imx_mu_xlate;
> priv->mbox.txdone_irq = true;
>
> platform_set_drvdata(pdev, priv);
>
> - imx_mu_init_generic(priv);
> -
> return devm_mbox_controller_register(dev, &priv->mbox);
> }
>
> @@ -367,6 +376,26 @@ static int imx_mu_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = {
> + .tx = imx_mu_generic_tx,
> + .rx = imx_mu_generic_rx,
> + .init = imx_mu_init_generic,
> + .xTR = {0x0, 0x4, 0x8, 0xc},
> + .xRR = {0x10, 0x14, 0x18, 0x1c},
> + .xSR = 0x20,
> + .xCR = 0x24,
> +};
> +
> +static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
> + .tx = imx_mu_generic_tx,
> + .rx = imx_mu_generic_rx,
> + .init = imx_mu_init_generic,
> + .xTR = {0x20, 0x24, 0x28, 0x2c},
> + .xRR = {0x40, 0x44, 0x48, 0x4c},
> + .xSR = 0x60,
> + .xCR = 0x64,
> +};
> +
> static const struct of_device_id imx_mu_dt_ids[] = {
> { .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp },
> { .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx },
>
Kind regards,
Oleksij Rempel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V5 3/4] mailbox: imx: add SCU MU support
2020-03-03 7:42 [PATCH V5 0/4] mailbox/firmware: imx: support SCU channel type peng.fan
2020-03-03 7:42 ` [PATCH V5 1/4] dt-bindings: mailbox: imx-mu: add SCU MU support peng.fan
2020-03-03 7:42 ` [PATCH V5 2/4] mailbox: imx: restructure code to make easy for new MU peng.fan
@ 2020-03-03 7:42 ` peng.fan
2020-03-03 7:57 ` Oleksij Rempel
2020-03-03 15:14 ` kbuild test robot
2020-03-03 7:42 ` [PATCH V5 4/4] firmware: imx-scu: Support one TX and one RX peng.fan
3 siblings, 2 replies; 10+ messages in thread
From: peng.fan @ 2020-03-03 7:42 UTC (permalink / raw)
To: shawnguo, s.hauer, jassisinghbrar, o.rempel
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
i.MX8/8X SCU MU is dedicated for communication between SCU and Cortex-A
cores from hardware design, and could not be reused for other purpose.
Per i.MX8/8X Reference mannual, Chapter "12.9.2.3.2 Messaging Examples",
Passing short messages: Transmit register(s) can be used to pass
short messages from one to four words in length. For example, when
a four-word message is desired, only one of the registers needs to
have its corresponding interrupt enable bit set at the receiver side;
the message’s first three words are written to the registers whose
interrupt is masked, and the fourth word is written to the other
register (which triggers an interrupt at the receiver side).
i.MX8/8X SCU firmware IPC is an implementation of passing short
messages. But current imx-mailbox driver only support one word
message, i.MX8/8X linux side firmware has to request four TX
and four RX to support IPC to SCU firmware. This is low efficent
and more interrupts triggered compared with one TX and
one RX.
To make SCU MU work,
- parse the size of msg.
- Only enable TR0/RR0 interrupt for transmit/receive message.
- For TX/RX, only support one TX channel and one RX channel
- For RX, support receive msg larger than 4 u32 words.
- Support 6 channels, TX0/RX0/RXDB[0-3], not support TXDB.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V5:
Code style cleanup
Add more debug msg
Drop __packed aligned
idx santity check in scu xlate
V4:
Added separate chans init and xlate function for SCU MU
Limit chans to TX0/RX0/RXDB[0-3], max 6 chans.
Santity check to msg size
V3:
Added scu type tx/rx and SCU MU type
drivers/mailbox/imx-mailbox.c | 134 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 134 insertions(+)
diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index df6c4ecd913c..3f28c769a1c1 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -4,6 +4,7 @@
*/
#include <linux/clk.h>
+#include <linux/firmware/imx/ipc.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
@@ -27,6 +28,8 @@
#define IMX_MU_xCR_GIRn(x) BIT(16 + (3 - (x)))
#define IMX_MU_CHANS 16
+/* TX0/RX0/RXDB[0-3] */
+#define IMX_MU_SCU_CHANS 6
#define IMX_MU_CHAN_NAME_SIZE 20
enum imx_mu_chan_type {
@@ -36,6 +39,11 @@ enum imx_mu_chan_type {
IMX_MU_TYPE_RXDB, /* Rx doorbell */
};
+struct imx_sc_rpc_msg_max {
+ struct imx_sc_rpc_msg hdr;
+ u32 data[7];
+};
+
struct imx_mu_con_priv {
unsigned int idx;
char irq_desc[IMX_MU_CHAN_NAME_SIZE];
@@ -134,6 +142,63 @@ static int imx_mu_generic_rx(struct imx_mu_priv *priv,
return 0;
}
+static int imx_mu_scu_tx(struct imx_mu_priv *priv,
+ struct imx_mu_con_priv *cp,
+ void *data)
+{
+ struct imx_sc_rpc_msg_max *msg = data;
+ u32 *arg = data;
+ int i;
+
+ switch (cp->type) {
+ case IMX_MU_TYPE_TX:
+ if (msg->hdr.size > sizeof(*msg)) {
+ /*
+ * The real message size can be different to
+ * struct imx_sc_rpc_msg_max size
+ */
+ dev_err(priv->dev, "Exceed max msg size (%li) on TX, got: %i\n", sizeof(*msg), msg->hdr.size);
+ return -EINVAL;
+ }
+
+ for (i = 0; i < msg->hdr.size; i++)
+ imx_mu_write(priv, *arg++, priv->dcfg->xTR[i % 4]);
+
+ imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
+ break;
+ default:
+ dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int imx_mu_scu_rx(struct imx_mu_priv *priv,
+ struct imx_mu_con_priv *cp)
+{
+ struct imx_sc_rpc_msg_max msg;
+ u32 *data = (u32 *)&msg;
+ int i;
+
+ imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_RIEn(0));
+ *data++ = imx_mu_read(priv, priv->dcfg->xRR[0]);
+
+ if (msg.hdr.size > sizeof(msg)) {
+ dev_err(priv->dev, "Exceed max msg size (%li) on RX, got: %i\n",
+ sizeof(msg), msg.hdr.size);
+ return -EINVAL;
+ }
+
+ for (i = 1; i < msg.hdr.size; i++)
+ *data++ = imx_mu_read(priv, priv->dcfg->xRR[i % 4]);
+
+ imx_mu_xcr_rmw(priv, IMX_MU_xCR_RIEn(0), 0);
+ mbox_chan_received_data(cp->chan, (void *)&msg);
+
+ return 0;
+}
+
static void imx_mu_txdb_tasklet(unsigned long data)
{
struct imx_mu_con_priv *cp = (struct imx_mu_con_priv *)data;
@@ -263,6 +328,42 @@ static const struct mbox_chan_ops imx_mu_ops = {
.shutdown = imx_mu_shutdown,
};
+static struct mbox_chan *imx_mu_scu_xlate(struct mbox_controller *mbox,
+ const struct of_phandle_args *sp)
+{
+ u32 type, idx, chan;
+
+ if (sp->args_count != 2) {
+ dev_err(mbox->dev, "Invalid argument count %d\n", sp->args_count);
+ return ERR_PTR(-EINVAL);
+ }
+
+ type = sp->args[0]; /* channel type */
+ idx = sp->args[1]; /* index */
+
+ switch (type) {
+ case IMX_MU_TYPE_TX:
+ case IMX_MU_TYPE_RX:
+ if (idx != 0)
+ dev_err(mbox->dev, "Invalid chan idx: %d\n", idx);
+ chan = type;
+ break;
+ case IMX_MU_TYPE_RXDB:
+ chan = 2 + idx;
+ break;
+ default:
+ dev_err(mbox->dev, "Invalid chan type: %d\n", type);
+ return NULL;
+ }
+
+ if (chan >= mbox->num_chans) {
+ dev_err(mbox->dev, "Not supported channel number: %d. (type: %d, idx: %d)\n", chan, type, idx);
+ return ERR_PTR(-EINVAL);
+ }
+
+ return &mbox->chans[chan];
+}
+
static struct mbox_chan * imx_mu_xlate(struct mbox_controller *mbox,
const struct of_phandle_args *sp)
{
@@ -310,6 +411,28 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
imx_mu_write(priv, 0, priv->dcfg->xCR);
}
+static void imx_mu_init_scu(struct imx_mu_priv *priv)
+{
+ unsigned int i;
+
+ for (i = 0; i < IMX_MU_SCU_CHANS; i++) {
+ struct imx_mu_con_priv *cp = &priv->con_priv[i];
+
+ cp->idx = i < 2 ? 0 : i - 2;
+ cp->type = i < 2 ? i : IMX_MU_TYPE_RXDB;
+ cp->chan = &priv->mbox_chans[i];
+ priv->mbox_chans[i].con_priv = cp;
+ snprintf(cp->irq_desc, sizeof(cp->irq_desc),
+ "imx_mu_chan[%i-%i]", cp->type, cp->idx);
+ }
+
+ priv->mbox.num_chans = IMX_MU_SCU_CHANS;
+ priv->mbox.of_xlate = imx_mu_scu_xlate;
+
+ /* Set default MU configuration */
+ imx_mu_write(priv, 0, priv->dcfg->xCR);
+}
+
static int imx_mu_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -396,9 +519,20 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
.xCR = 0x64,
};
+static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
+ .tx = imx_mu_scu_tx,
+ .rx = imx_mu_scu_rx,
+ .init = imx_mu_init_scu,
+ .xTR = {0x0, 0x4, 0x8, 0xc},
+ .xRR = {0x10, 0x14, 0x18, 0x1c},
+ .xSR = 0x20,
+ .xCR = 0x24,
+};
+
static const struct of_device_id imx_mu_dt_ids[] = {
{ .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp },
{ .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx },
+ { .compatible = "fsl,imx8-mu-scu", .data = &imx_mu_cfg_imx8_scu },
{ },
};
MODULE_DEVICE_TABLE(of, imx_mu_dt_ids);
--
2.16.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V5 3/4] mailbox: imx: add SCU MU support
2020-03-03 7:42 ` [PATCH V5 3/4] mailbox: imx: add SCU MU support peng.fan
@ 2020-03-03 7:57 ` Oleksij Rempel
2020-03-03 15:14 ` kbuild test robot
1 sibling, 0 replies; 10+ messages in thread
From: Oleksij Rempel @ 2020-03-03 7:57 UTC (permalink / raw)
To: peng.fan, shawnguo, s.hauer, jassisinghbrar
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel
On 03.03.20 08:42, peng.fan@nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> i.MX8/8X SCU MU is dedicated for communication between SCU and Cortex-A
> cores from hardware design, and could not be reused for other purpose.
>
> Per i.MX8/8X Reference mannual, Chapter "12.9.2.3.2 Messaging Examples",
> Passing short messages: Transmit register(s) can be used to pass
> short messages from one to four words in length. For example, when
> a four-word message is desired, only one of the registers needs to
> have its corresponding interrupt enable bit set at the receiver side;
> the message’s first three words are written to the registers whose
> interrupt is masked, and the fourth word is written to the other
> register (which triggers an interrupt at the receiver side).
>
> i.MX8/8X SCU firmware IPC is an implementation of passing short
> messages. But current imx-mailbox driver only support one word
> message, i.MX8/8X linux side firmware has to request four TX
> and four RX to support IPC to SCU firmware. This is low efficent
> and more interrupts triggered compared with one TX and
> one RX.
>
> To make SCU MU work,
> - parse the size of msg.
> - Only enable TR0/RR0 interrupt for transmit/receive message.
> - For TX/RX, only support one TX channel and one RX channel
> - For RX, support receive msg larger than 4 u32 words.
> - Support 6 channels, TX0/RX0/RXDB[0-3], not support TXDB.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> V5:
> Code style cleanup
> Add more debug msg
> Drop __packed aligned
> idx santity check in scu xlate
>
> V4:
> Added separate chans init and xlate function for SCU MU
> Limit chans to TX0/RX0/RXDB[0-3], max 6 chans.
> Santity check to msg size
>
> V3:
> Added scu type tx/rx and SCU MU type
>
> drivers/mailbox/imx-mailbox.c | 134 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 134 insertions(+)
>
> diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
> index df6c4ecd913c..3f28c769a1c1 100644
> --- a/drivers/mailbox/imx-mailbox.c
> +++ b/drivers/mailbox/imx-mailbox.c
> @@ -4,6 +4,7 @@
> */
>
> #include <linux/clk.h>
> +#include <linux/firmware/imx/ipc.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/kernel.h>
> @@ -27,6 +28,8 @@
> #define IMX_MU_xCR_GIRn(x) BIT(16 + (3 - (x)))
>
> #define IMX_MU_CHANS 16
> +/* TX0/RX0/RXDB[0-3] */
> +#define IMX_MU_SCU_CHANS 6
> #define IMX_MU_CHAN_NAME_SIZE 20
>
> enum imx_mu_chan_type {
> @@ -36,6 +39,11 @@ enum imx_mu_chan_type {
> IMX_MU_TYPE_RXDB, /* Rx doorbell */
> };
>
> +struct imx_sc_rpc_msg_max {
> + struct imx_sc_rpc_msg hdr;
> + u32 data[7];
> +};
> +
> struct imx_mu_con_priv {
> unsigned int idx;
> char irq_desc[IMX_MU_CHAN_NAME_SIZE];
> @@ -134,6 +142,63 @@ static int imx_mu_generic_rx(struct imx_mu_priv *priv,
> return 0;
> }
>
> +static int imx_mu_scu_tx(struct imx_mu_priv *priv,
> + struct imx_mu_con_priv *cp,
> + void *data)
> +{
> + struct imx_sc_rpc_msg_max *msg = data;
> + u32 *arg = data;
> + int i;
> +
> + switch (cp->type) {
> + case IMX_MU_TYPE_TX:
> + if (msg->hdr.size > sizeof(*msg)) {
> + /*
> + * The real message size can be different to
> + * struct imx_sc_rpc_msg_max size
> + */
> + dev_err(priv->dev, "Exceed max msg size (%li) on TX, got: %i\n", sizeof(*msg), msg->hdr.size);
> + return -EINVAL;
> + }
> +
> + for (i = 0; i < msg->hdr.size; i++)
> + imx_mu_write(priv, *arg++, priv->dcfg->xTR[i % 4]);
> +
> + imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
> + break;
> + default:
> + dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int imx_mu_scu_rx(struct imx_mu_priv *priv,
> + struct imx_mu_con_priv *cp)
> +{
> + struct imx_sc_rpc_msg_max msg;
> + u32 *data = (u32 *)&msg;
> + int i;
> +
> + imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_RIEn(0));
> + *data++ = imx_mu_read(priv, priv->dcfg->xRR[0]);
> +
> + if (msg.hdr.size > sizeof(msg)) {
> + dev_err(priv->dev, "Exceed max msg size (%li) on RX, got: %i\n",
> + sizeof(msg), msg.hdr.size);
> + return -EINVAL;
> + }
> +
> + for (i = 1; i < msg.hdr.size; i++)
> + *data++ = imx_mu_read(priv, priv->dcfg->xRR[i % 4]);
> +
> + imx_mu_xcr_rmw(priv, IMX_MU_xCR_RIEn(0), 0);
> + mbox_chan_received_data(cp->chan, (void *)&msg);
> +
> + return 0;
> +}
> +
> static void imx_mu_txdb_tasklet(unsigned long data)
> {
> struct imx_mu_con_priv *cp = (struct imx_mu_con_priv *)data;
> @@ -263,6 +328,42 @@ static const struct mbox_chan_ops imx_mu_ops = {
> .shutdown = imx_mu_shutdown,
> };
>
> +static struct mbox_chan *imx_mu_scu_xlate(struct mbox_controller *mbox,
> + const struct of_phandle_args *sp)
> +{
> + u32 type, idx, chan;
> +
> + if (sp->args_count != 2) {
> + dev_err(mbox->dev, "Invalid argument count %d\n", sp->args_count);
> + return ERR_PTR(-EINVAL);
> + }
> +
> + type = sp->args[0]; /* channel type */
> + idx = sp->args[1]; /* index */
> +
> + switch (type) {
> + case IMX_MU_TYPE_TX:
> + case IMX_MU_TYPE_RX:
> + if (idx != 0)
> + dev_err(mbox->dev, "Invalid chan idx: %d\n", idx);
> + chan = type;
> + break;
> + case IMX_MU_TYPE_RXDB:
> + chan = 2 + idx;
> + break;
> + default:
> + dev_err(mbox->dev, "Invalid chan type: %d\n", type);
> + return NULL;
> + }
> +
> + if (chan >= mbox->num_chans) {
> + dev_err(mbox->dev, "Not supported channel number: %d. (type: %d, idx: %d)\n", chan, type, idx);
> + return ERR_PTR(-EINVAL);
> + }
> +
> + return &mbox->chans[chan];
> +}
> +
> static struct mbox_chan * imx_mu_xlate(struct mbox_controller *mbox,
> const struct of_phandle_args *sp)
> {
> @@ -310,6 +411,28 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
> imx_mu_write(priv, 0, priv->dcfg->xCR);
> }
>
> +static void imx_mu_init_scu(struct imx_mu_priv *priv)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < IMX_MU_SCU_CHANS; i++) {
> + struct imx_mu_con_priv *cp = &priv->con_priv[i];
> +
> + cp->idx = i < 2 ? 0 : i - 2;
> + cp->type = i < 2 ? i : IMX_MU_TYPE_RXDB;
> + cp->chan = &priv->mbox_chans[i];
> + priv->mbox_chans[i].con_priv = cp;
> + snprintf(cp->irq_desc, sizeof(cp->irq_desc),
> + "imx_mu_chan[%i-%i]", cp->type, cp->idx);
> + }
> +
> + priv->mbox.num_chans = IMX_MU_SCU_CHANS;
> + priv->mbox.of_xlate = imx_mu_scu_xlate;
> +
> + /* Set default MU configuration */
> + imx_mu_write(priv, 0, priv->dcfg->xCR);
> +}
> +
> static int imx_mu_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -396,9 +519,20 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
> .xCR = 0x64,
> };
>
> +static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
> + .tx = imx_mu_scu_tx,
> + .rx = imx_mu_scu_rx,
> + .init = imx_mu_init_scu,
> + .xTR = {0x0, 0x4, 0x8, 0xc},
> + .xRR = {0x10, 0x14, 0x18, 0x1c},
> + .xSR = 0x20,
> + .xCR = 0x24,
> +};
> +
> static const struct of_device_id imx_mu_dt_ids[] = {
> { .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp },
> { .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx },
> + { .compatible = "fsl,imx8-mu-scu", .data = &imx_mu_cfg_imx8_scu },
> { },
> };
> MODULE_DEVICE_TABLE(of, imx_mu_dt_ids);
>
Kind regards,
Oleksij Rempel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH V5 3/4] mailbox: imx: add SCU MU support
2020-03-03 7:42 ` [PATCH V5 3/4] mailbox: imx: add SCU MU support peng.fan
2020-03-03 7:57 ` Oleksij Rempel
@ 2020-03-03 15:14 ` kbuild test robot
1 sibling, 0 replies; 10+ messages in thread
From: kbuild test robot @ 2020-03-03 15:14 UTC (permalink / raw)
To: peng.fan
Cc: kbuild-all, shawnguo, s.hauer, jassisinghbrar, o.rempel, kernel,
festevam, linux-imx, Anson.Huang, leonard.crestez, aisheng.dong,
linux-arm-kernel, linux-kernel, Peng Fan
[-- Attachment #1: Type: text/plain, Size: 3405 bytes --]
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on 770fbb32d34e5d6298cc2be590c9d2fd6069aa17]
url: https://github.com/0day-ci/linux/commits/peng-fan-nxp-com/mailbox-firmware-imx-support-SCU-channel-type/20200303-201748
base: 770fbb32d34e5d6298cc2be590c9d2fd6069aa17
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 7.5.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from include/linux/device.h:15:0,
from include/linux/firmware/imx/ipc.h:11,
from drivers//mailbox/imx-mailbox.c:7:
drivers//mailbox/imx-mailbox.c: In function 'imx_mu_scu_tx':
>> drivers//mailbox/imx-mailbox.c:160:23: warning: format '%li' expects argument of type 'long int', but argument 3 has type 'unsigned int' [-Wformat=]
dev_err(priv->dev, "Exceed max msg size (%li) on TX, got: %i\n", sizeof(*msg), msg->hdr.size);
^
include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
#define dev_fmt(fmt) fmt
^~~
>> drivers//mailbox/imx-mailbox.c:160:4: note: in expansion of macro 'dev_err'
dev_err(priv->dev, "Exceed max msg size (%li) on TX, got: %i\n", sizeof(*msg), msg->hdr.size);
^~~~~~~
drivers//mailbox/imx-mailbox.c: In function 'imx_mu_scu_rx':
drivers//mailbox/imx-mailbox.c:188:22: warning: format '%li' expects argument of type 'long int', but argument 3 has type 'unsigned int' [-Wformat=]
dev_err(priv->dev, "Exceed max msg size (%li) on RX, got: %i\n",
^
include/linux/dev_printk.h:19:22: note: in definition of macro 'dev_fmt'
#define dev_fmt(fmt) fmt
^~~
drivers//mailbox/imx-mailbox.c:188:3: note: in expansion of macro 'dev_err'
dev_err(priv->dev, "Exceed max msg size (%li) on RX, got: %i\n",
^~~~~~~
vim +/dev_err +160 drivers//mailbox/imx-mailbox.c
144
145 static int imx_mu_scu_tx(struct imx_mu_priv *priv,
146 struct imx_mu_con_priv *cp,
147 void *data)
148 {
149 struct imx_sc_rpc_msg_max *msg = data;
150 u32 *arg = data;
151 int i;
152
153 switch (cp->type) {
154 case IMX_MU_TYPE_TX:
155 if (msg->hdr.size > sizeof(*msg)) {
156 /*
157 * The real message size can be different to
158 * struct imx_sc_rpc_msg_max size
159 */
> 160 dev_err(priv->dev, "Exceed max msg size (%li) on TX, got: %i\n", sizeof(*msg), msg->hdr.size);
161 return -EINVAL;
162 }
163
164 for (i = 0; i < msg->hdr.size; i++)
165 imx_mu_write(priv, *arg++, priv->dcfg->xTR[i % 4]);
166
167 imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0);
168 break;
169 default:
170 dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type);
171 return -EINVAL;
172 }
173
174 return 0;
175 }
176
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 53127 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V5 4/4] firmware: imx-scu: Support one TX and one RX
2020-03-03 7:42 [PATCH V5 0/4] mailbox/firmware: imx: support SCU channel type peng.fan
` (2 preceding siblings ...)
2020-03-03 7:42 ` [PATCH V5 3/4] mailbox: imx: add SCU MU support peng.fan
@ 2020-03-03 7:42 ` peng.fan
2020-03-03 7:59 ` Oleksij Rempel
3 siblings, 1 reply; 10+ messages in thread
From: peng.fan @ 2020-03-03 7:42 UTC (permalink / raw)
To: shawnguo, s.hauer, jassisinghbrar, o.rempel
Cc: kernel, festevam, linux-imx, Anson.Huang, leonard.crestez,
aisheng.dong, linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Current imx-scu requires four TX and four RX to communicate with
SCU. This is low efficient and causes lots of mailbox interrupts.
With imx-mailbox driver could support one TX to use all four transmit
registers and one RX to use all four receive registers, imx-scu
could use one TX and one RX.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V5:
None
V4:
None
V3:
Check mbox fsl,imx8-mu-scu for fast_ipc
drivers/firmware/imx/imx-scu.c | 54 +++++++++++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 11 deletions(-)
diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c
index f71eaa5bf52d..e94a5585b698 100644
--- a/drivers/firmware/imx/imx-scu.c
+++ b/drivers/firmware/imx/imx-scu.c
@@ -38,6 +38,7 @@ struct imx_sc_ipc {
struct device *dev;
struct mutex lock;
struct completion done;
+ bool fast_ipc;
/* temporarily store the SCU msg */
u32 *msg;
@@ -115,6 +116,7 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
struct imx_sc_ipc *sc_ipc = sc_chan->sc_ipc;
struct imx_sc_rpc_msg *hdr;
u32 *data = msg;
+ int i;
if (!sc_ipc->msg) {
dev_warn(sc_ipc->dev, "unexpected rx idx %d 0x%08x, ignore!\n",
@@ -122,6 +124,19 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
return;
}
+ if (sc_ipc->fast_ipc) {
+ hdr = msg;
+ sc_ipc->rx_size = hdr->size;
+ sc_ipc->msg[0] = *data++;
+
+ for (i = 1; i < sc_ipc->rx_size; i++)
+ sc_ipc->msg[i] = *data++;
+
+ complete(&sc_ipc->done);
+
+ return;
+ }
+
if (sc_chan->idx == 0) {
hdr = msg;
sc_ipc->rx_size = hdr->size;
@@ -147,6 +162,7 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
struct imx_sc_chan *sc_chan;
u32 *data = msg;
int ret;
+ int size;
int i;
/* Check size */
@@ -156,7 +172,8 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
dev_dbg(sc_ipc->dev, "RPC SVC %u FUNC %u SIZE %u\n", hdr->svc,
hdr->func, hdr->size);
- for (i = 0; i < hdr->size; i++) {
+ size = sc_ipc->fast_ipc ? 1 : hdr->size;
+ for (i = 0; i < size; i++) {
sc_chan = &sc_ipc->chans[i % 4];
/*
@@ -168,8 +185,10 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
* Wait for tx_done before every send to ensure that no
* queueing happens at the mailbox channel level.
*/
- wait_for_completion(&sc_chan->tx_done);
- reinit_completion(&sc_chan->tx_done);
+ if (!sc_ipc->fast_ipc) {
+ wait_for_completion(&sc_chan->tx_done);
+ reinit_completion(&sc_chan->tx_done);
+ }
ret = mbox_send_message(sc_chan->ch, &data[i]);
if (ret < 0)
@@ -246,6 +265,8 @@ static int imx_scu_probe(struct platform_device *pdev)
struct imx_sc_chan *sc_chan;
struct mbox_client *cl;
char *chan_name;
+ struct of_phandle_args args;
+ int num_channel;
int ret;
int i;
@@ -253,11 +274,20 @@ static int imx_scu_probe(struct platform_device *pdev)
if (!sc_ipc)
return -ENOMEM;
- for (i = 0; i < SCU_MU_CHAN_NUM; i++) {
- if (i < 4)
+ ret = of_parse_phandle_with_args(pdev->dev.of_node, "mboxes",
+ "#mbox-cells", 0, &args);
+ if (ret)
+ return ret;
+
+ sc_ipc->fast_ipc = of_device_is_compatible(args.np, "fsl,imx8-mu-scu");
+
+ num_channel = sc_ipc->fast_ipc ? 2 : SCU_MU_CHAN_NUM;
+ for (i = 0; i < num_channel; i++) {
+ if (i < num_channel / 2)
chan_name = kasprintf(GFP_KERNEL, "tx%d", i);
else
- chan_name = kasprintf(GFP_KERNEL, "rx%d", i - 4);
+ chan_name = kasprintf(GFP_KERNEL, "rx%d",
+ i - num_channel / 2);
if (!chan_name)
return -ENOMEM;
@@ -269,13 +299,15 @@ static int imx_scu_probe(struct platform_device *pdev)
cl->knows_txdone = true;
cl->rx_callback = imx_scu_rx_callback;
- /* Initial tx_done completion as "done" */
- cl->tx_done = imx_scu_tx_done;
- init_completion(&sc_chan->tx_done);
- complete(&sc_chan->tx_done);
+ if (!sc_ipc->fast_ipc) {
+ /* Initial tx_done completion as "done" */
+ cl->tx_done = imx_scu_tx_done;
+ init_completion(&sc_chan->tx_done);
+ complete(&sc_chan->tx_done);
+ }
sc_chan->sc_ipc = sc_ipc;
- sc_chan->idx = i % 4;
+ sc_chan->idx = i % (num_channel / 2);
sc_chan->ch = mbox_request_channel_byname(cl, chan_name);
if (IS_ERR(sc_chan->ch)) {
ret = PTR_ERR(sc_chan->ch);
--
2.16.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V5 4/4] firmware: imx-scu: Support one TX and one RX
2020-03-03 7:42 ` [PATCH V5 4/4] firmware: imx-scu: Support one TX and one RX peng.fan
@ 2020-03-03 7:59 ` Oleksij Rempel
0 siblings, 0 replies; 10+ messages in thread
From: Oleksij Rempel @ 2020-03-03 7:59 UTC (permalink / raw)
To: peng.fan, shawnguo, s.hauer, jassisinghbrar
Cc: aisheng.dong, Anson.Huang, linux-kernel, linux-imx, kernel,
leonard.crestez, festevam, linux-arm-kernel
On 03.03.20 08:42, peng.fan@nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> Current imx-scu requires four TX and four RX to communicate with
> SCU. This is low efficient and causes lots of mailbox interrupts.
>
> With imx-mailbox driver could support one TX to use all four transmit
> registers and one RX to use all four receive registers, imx-scu
> could use one TX and one RX.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
This driver should be review by some one else.
> ---
> V5:
> None
> V4:
> None
> V3:
> Check mbox fsl,imx8-mu-scu for fast_ipc
>
> drivers/firmware/imx/imx-scu.c | 54 +++++++++++++++++++++++++++++++++---------
> 1 file changed, 43 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c
> index f71eaa5bf52d..e94a5585b698 100644
> --- a/drivers/firmware/imx/imx-scu.c
> +++ b/drivers/firmware/imx/imx-scu.c
> @@ -38,6 +38,7 @@ struct imx_sc_ipc {
> struct device *dev;
> struct mutex lock;
> struct completion done;
> + bool fast_ipc;
>
> /* temporarily store the SCU msg */
> u32 *msg;
> @@ -115,6 +116,7 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
> struct imx_sc_ipc *sc_ipc = sc_chan->sc_ipc;
> struct imx_sc_rpc_msg *hdr;
> u32 *data = msg;
> + int i;
>
> if (!sc_ipc->msg) {
> dev_warn(sc_ipc->dev, "unexpected rx idx %d 0x%08x, ignore!\n",
> @@ -122,6 +124,19 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg)
> return;
> }
>
> + if (sc_ipc->fast_ipc) {
> + hdr = msg;
> + sc_ipc->rx_size = hdr->size;
> + sc_ipc->msg[0] = *data++;
> +
> + for (i = 1; i < sc_ipc->rx_size; i++)
> + sc_ipc->msg[i] = *data++;
> +
> + complete(&sc_ipc->done);
> +
> + return;
> + }
> +
> if (sc_chan->idx == 0) {
> hdr = msg;
> sc_ipc->rx_size = hdr->size;
> @@ -147,6 +162,7 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
> struct imx_sc_chan *sc_chan;
> u32 *data = msg;
> int ret;
> + int size;
> int i;
>
> /* Check size */
> @@ -156,7 +172,8 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
> dev_dbg(sc_ipc->dev, "RPC SVC %u FUNC %u SIZE %u\n", hdr->svc,
> hdr->func, hdr->size);
>
> - for (i = 0; i < hdr->size; i++) {
> + size = sc_ipc->fast_ipc ? 1 : hdr->size;
> + for (i = 0; i < size; i++) {
> sc_chan = &sc_ipc->chans[i % 4];
>
> /*
> @@ -168,8 +185,10 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg)
> * Wait for tx_done before every send to ensure that no
> * queueing happens at the mailbox channel level.
> */
> - wait_for_completion(&sc_chan->tx_done);
> - reinit_completion(&sc_chan->tx_done);
> + if (!sc_ipc->fast_ipc) {
> + wait_for_completion(&sc_chan->tx_done);
> + reinit_completion(&sc_chan->tx_done);
> + }
>
> ret = mbox_send_message(sc_chan->ch, &data[i]);
> if (ret < 0)
> @@ -246,6 +265,8 @@ static int imx_scu_probe(struct platform_device *pdev)
> struct imx_sc_chan *sc_chan;
> struct mbox_client *cl;
> char *chan_name;
> + struct of_phandle_args args;
> + int num_channel;
> int ret;
> int i;
>
> @@ -253,11 +274,20 @@ static int imx_scu_probe(struct platform_device *pdev)
> if (!sc_ipc)
> return -ENOMEM;
>
> - for (i = 0; i < SCU_MU_CHAN_NUM; i++) {
> - if (i < 4)
> + ret = of_parse_phandle_with_args(pdev->dev.of_node, "mboxes",
> + "#mbox-cells", 0, &args);
> + if (ret)
> + return ret;
> +
> + sc_ipc->fast_ipc = of_device_is_compatible(args.np, "fsl,imx8-mu-scu");
> +
> + num_channel = sc_ipc->fast_ipc ? 2 : SCU_MU_CHAN_NUM;
> + for (i = 0; i < num_channel; i++) {
> + if (i < num_channel / 2)
> chan_name = kasprintf(GFP_KERNEL, "tx%d", i);
> else
> - chan_name = kasprintf(GFP_KERNEL, "rx%d", i - 4);
> + chan_name = kasprintf(GFP_KERNEL, "rx%d",
> + i - num_channel / 2);
>
> if (!chan_name)
> return -ENOMEM;
> @@ -269,13 +299,15 @@ static int imx_scu_probe(struct platform_device *pdev)
> cl->knows_txdone = true;
> cl->rx_callback = imx_scu_rx_callback;
>
> - /* Initial tx_done completion as "done" */
> - cl->tx_done = imx_scu_tx_done;
> - init_completion(&sc_chan->tx_done);
> - complete(&sc_chan->tx_done);
> + if (!sc_ipc->fast_ipc) {
> + /* Initial tx_done completion as "done" */
> + cl->tx_done = imx_scu_tx_done;
> + init_completion(&sc_chan->tx_done);
> + complete(&sc_chan->tx_done);
> + }
>
> sc_chan->sc_ipc = sc_ipc;
> - sc_chan->idx = i % 4;
> + sc_chan->idx = i % (num_channel / 2);
> sc_chan->ch = mbox_request_channel_byname(cl, chan_name);
> if (IS_ERR(sc_chan->ch)) {
> ret = PTR_ERR(sc_chan->ch);
>
Kind regards,
Oleksij Rempel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread