diff mbox series

[V4,7/8] remoteproc: imx_rproc: support i.MX7ULP

Message ID 1618493261-32606-8-git-send-email-peng.fan@oss.nxp.com
State New
Headers show
Series remoteproc: imx_rproc: support i.MX7ULP/8MN/8MP | expand

Commit Message

Peng Fan (OSS) April 15, 2021, 1:27 p.m. UTC 
From: Peng Fan <peng.fan@nxp.com>


i.MX7ULP A7 core runs under control of M4 core, M4 core starts by ROM
and powers most serivces used by A7 core, so A7 core has no power to
start and stop M4 core. And the M4 core's state is default RPROC_DETACHED
and remoteproc framework not able to stop the M4 core.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

---
 drivers/remoteproc/imx_rproc.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

-- 
2.7.4

Comments

Mathieu Poirier April 16, 2021, 5:47 p.m. UTC | #1 
On Thu, Apr 15, 2021 at 09:27:40PM +0800, peng.fan@oss.nxp.com wrote:
> From: Peng Fan <peng.fan@nxp.com>

> 

> i.MX7ULP A7 core runs under control of M4 core, M4 core starts by ROM

> and powers most serivces used by A7 core, so A7 core has no power to


s/serivces/services

> start and stop M4 core. And the M4 core's state is default RPROC_DETACHED

> and remoteproc framework not able to stop the M4 core.

> 

> Signed-off-by: Peng Fan <peng.fan@nxp.com>

> ---

>  drivers/remoteproc/imx_rproc.c | 25 ++++++++++++++++++++++++-

>  1 file changed, 24 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c

> index 56dfcc1..0592865 100644

> --- a/drivers/remoteproc/imx_rproc.c

> +++ b/drivers/remoteproc/imx_rproc.c

> @@ -136,6 +136,14 @@ static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {

>  	{ 0x40000000, 0x40000000, 0x80000000, 0 },

>  };

>  

> +static const struct imx_rproc_att imx_rproc_att_imx7ulp[] = {

> +	{0x1FFD0000, 0x1FFD0000, 0x30000, ATT_OWN},

> +	{0x20000000, 0x20000000, 0x10000, ATT_OWN},

> +	{0x2F000000, 0x2F000000, 0x20000, ATT_OWN},

> +	{0x2F020000, 0x2F020000, 0x20000, ATT_OWN},

> +	{0x60000000, 0x60000000, 0x40000000, 0}

> +};

> +

>  static const struct imx_rproc_att imx_rproc_att_imx7d[] = {

>  	/* dev addr , sys addr  , size	    , flags */

>  	/* OCRAM_S (M4 Boot code) - alias */

> @@ -196,6 +204,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {

>  	.method		= IMX_RPROC_MMIO,

>  };

>  

> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp = {

> +	.att		= imx_rproc_att_imx7ulp,

> +	.att_size	= ARRAY_SIZE(imx_rproc_att_imx7ulp),

> +	.method		= IMX_RPROC_NONE,

> +};

> +

>  static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {

>  	.src_reg	= IMX7D_SRC_SCR,

>  	.src_mask	= IMX7D_M4_RST_MASK,

> @@ -238,6 +252,9 @@ static int imx_rproc_stop(struct rproc *rproc)

>  	struct device *dev = priv->dev;

>  	int ret;

>  

> +	if (dcfg->method == IMX_RPROC_NONE)

> +		return -EOPNOTSUPP;

> +

>  	ret = regmap_update_bits(priv->regmap, dcfg->src_reg,

>  				 dcfg->src_mask, dcfg->src_stop);

>  	if (ret)

> @@ -580,8 +597,13 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)

>  	int ret;

>  	u32 val;

>  

> -	if (dcfg->method != IMX_RPROC_MMIO)

> +	switch (dcfg->method) {

> +	case IMX_RPROC_NONE:

> +		priv->rproc->state = RPROC_DETACHED;

>  		return 0;

> +	default:

> +		break;

> +	}

>  

>  	regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");

>  	if (IS_ERR(regmap)) {

> @@ -726,6 +748,7 @@ static int imx_rproc_remove(struct platform_device *pdev)

>  }

>  

>  static const struct of_device_id imx_rproc_of_match[] = {

> +	{ .compatible = "fsl,imx7ulp-cm4", .data = &imx_rproc_cfg_imx7ulp },

>  	{ .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d },

>  	{ .compatible = "fsl,imx6sx-cm4", .data = &imx_rproc_cfg_imx6sx },

>  	{ .compatible = "fsl,imx8mq-cm4", .data = &imx_rproc_cfg_imx8mq },

> -- 

> 2.7.4

>
diff mbox series

Patch

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 56dfcc1..0592865 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -136,6 +136,14 @@  static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
 	{ 0x40000000, 0x40000000, 0x80000000, 0 },
 };
 
+static const struct imx_rproc_att imx_rproc_att_imx7ulp[] = {
+	{0x1FFD0000, 0x1FFD0000, 0x30000, ATT_OWN},
+	{0x20000000, 0x20000000, 0x10000, ATT_OWN},
+	{0x2F000000, 0x2F000000, 0x20000, ATT_OWN},
+	{0x2F020000, 0x2F020000, 0x20000, ATT_OWN},
+	{0x60000000, 0x60000000, 0x40000000, 0}
+};
+
 static const struct imx_rproc_att imx_rproc_att_imx7d[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* OCRAM_S (M4 Boot code) - alias */
@@ -196,6 +204,12 @@  static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
 	.method		= IMX_RPROC_MMIO,
 };
 
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp = {
+	.att		= imx_rproc_att_imx7ulp,
+	.att_size	= ARRAY_SIZE(imx_rproc_att_imx7ulp),
+	.method		= IMX_RPROC_NONE,
+};
+
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
 	.src_reg	= IMX7D_SRC_SCR,
 	.src_mask	= IMX7D_M4_RST_MASK,
@@ -238,6 +252,9 @@  static int imx_rproc_stop(struct rproc *rproc)
 	struct device *dev = priv->dev;
 	int ret;
 
+	if (dcfg->method == IMX_RPROC_NONE)
+		return -EOPNOTSUPP;
+
 	ret = regmap_update_bits(priv->regmap, dcfg->src_reg,
 				 dcfg->src_mask, dcfg->src_stop);
 	if (ret)
@@ -580,8 +597,13 @@  static int imx_rproc_detect_mode(struct imx_rproc *priv)
 	int ret;
 	u32 val;
 
-	if (dcfg->method != IMX_RPROC_MMIO)
+	switch (dcfg->method) {
+	case IMX_RPROC_NONE:
+		priv->rproc->state = RPROC_DETACHED;
 		return 0;
+	default:
+		break;
+	}
 
 	regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");
 	if (IS_ERR(regmap)) {
@@ -726,6 +748,7 @@  static int imx_rproc_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id imx_rproc_of_match[] = {
+	{ .compatible = "fsl,imx7ulp-cm4", .data = &imx_rproc_cfg_imx7ulp },
 	{ .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d },
 	{ .compatible = "fsl,imx6sx-cm4", .data = &imx_rproc_cfg_imx6sx },
 	{ .compatible = "fsl,imx8mq-cm4", .data = &imx_rproc_cfg_imx8mq },