Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Peng Fan <peng.fan@nxp.com>
To:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
CC:     "ohad@wizery.com" <ohad@wizery.com>,
        "bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>,
        "o.rempel@pengutronix.de" <o.rempel@pengutronix.de>,
        "robh+dt@kernel.org" <robh+dt@kernel.org>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        "shawnguo@kernel.org" <shawnguo@kernel.org>,
        "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
        "kernel@pengutronix.de" <kernel@pengutronix.de>,
        "festevam@gmail.com" <festevam@gmail.com>,
        "linux-remoteproc@vger.kernel.org" <linux-remoteproc@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH V5 7/8] remoteproc: imx_rproc: support i.MX7ULP
Thread-Topic: [PATCH V5 7/8] remoteproc: imx_rproc: support i.MX7ULP
Thread-Index: AQHXNlcbdnM4ul09mECETdVhOJQp4KrSBlOAgAPoqiA=
Date:   Thu, 6 May 2021 04:11:46 +0000
Message-ID: <DB6PR0402MB2760B8377D023ACFFED9F51988589@DB6PR0402MB2760.eurprd04.prod.outlook.com>
References: <1618971622-30539-1-git-send-email-peng.fan@oss.nxp.com>
 <1618971622-30539-8-git-send-email-peng.fan@oss.nxp.com>
 <20210503162935.GB1699665@xps15>
In-Reply-To: <20210503162935.GB1699665@xps15>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d0104854-1e9a-43a3-4075-08d9104510c1
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 May 2021 04:11:46.7495
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: C4jLiuvXA+E6+FW18+YVN9hlgzAEweSs4n+2t9awwLPHUWbeLUteoT9CqoYivK7HJbf5MZDm2wqa4ed/quyt4w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2376
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> Subject: Re: [PATCH V5 7/8] remoteproc: imx_rproc: support i.MX7ULP
>=20
> On Wed, Apr 21, 2021 at 10:20:21AM +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
>=20
> s/serivces/services
>=20
> I pointed that out on V4 - why do I have to do so again?

I forgot that comment, sorry. Thanks for your time.

Thanks,
Peng.

>=20
> With that:
>=20
> Reviwed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
>=20
> > 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 | 49
> > ++++++++++++++++++++++++++--------
> >  1 file changed, 38 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/remoteproc/imx_rproc.c
> > b/drivers/remoteproc/imx_rproc.c index e9d9860e4fce..d26254609a52
> > 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[] =3D {
> >  	{ 0x40000000, 0x40000000, 0x80000000, 0 },  };
> >
> > +static const struct imx_rproc_att imx_rproc_att_imx7ulp[] =3D {
> > +	{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[] =3D {
> >  	/* 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 =3D {
> >  	.method		=3D IMX_RPROC_MMIO,
> >  };
> >
> > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp =3D {
> > +	.att		=3D imx_rproc_att_imx7ulp,
> > +	.att_size	=3D ARRAY_SIZE(imx_rproc_att_imx7ulp),
> > +	.method		=3D IMX_RPROC_NONE,
> > +};
> > +
> >  static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d =3D {
> >  	.src_reg	=3D IMX7D_SRC_SCR,
> >  	.src_mask	=3D IMX7D_M4_RST_MASK,
> > @@ -238,6 +252,9 @@ static int imx_rproc_stop(struct rproc *rproc)
> >  	struct device *dev =3D priv->dev;
> >  	int ret;
> >
> > +	if (dcfg->method =3D=3D IMX_RPROC_NONE)
> > +		return -EOPNOTSUPP;
> > +
> >  	ret =3D regmap_update_bits(priv->regmap, dcfg->src_reg,
> >  				 dcfg->src_mask, dcfg->src_stop);
> >  	if (ret)
> > @@ -573,12 +590,31 @@ static void imx_rproc_free_mbox(struct rproc
> > *rproc)
> >
> >  static int imx_rproc_detect_mode(struct imx_rproc *priv)  {
> > +	struct regmap_config config =3D { .name =3D "imx-rproc" };
> >  	const struct imx_rproc_dcfg *dcfg =3D priv->dcfg;
> >  	struct device *dev =3D priv->dev;
> > +	struct regmap *regmap;
> >  	int ret;
> >  	u32 val;
> >
> > -	ret =3D regmap_read(priv->regmap, dcfg->src_reg, &val);
> > +	switch (dcfg->method) {
> > +	case IMX_RPROC_NONE:
> > +		priv->rproc->state =3D RPROC_DETACHED;
> > +		return 0;
> > +	default:
> > +		break;
> > +	}
> > +
> > +	regmap =3D syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");
> > +	if (IS_ERR(regmap)) {
> > +		dev_err(dev, "failed to find syscon\n");
> > +		return PTR_ERR(regmap);
> > +	}
> > +
> > +	priv->regmap =3D regmap;
> > +	regmap_attach_dev(dev, regmap, &config);
> > +
> > +	ret =3D regmap_read(regmap, dcfg->src_reg, &val);
> >  	if (ret) {
> >  		dev_err(dev, "Failed to read src\n");
> >  		return ret;
> > @@ -625,18 +661,9 @@ static int imx_rproc_probe(struct platform_device
> *pdev)
> >  	struct device_node *np =3D dev->of_node;
> >  	struct imx_rproc *priv;
> >  	struct rproc *rproc;
> > -	struct regmap_config config =3D { .name =3D "imx-rproc" };
> >  	const struct imx_rproc_dcfg *dcfg;
> > -	struct regmap *regmap;
> >  	int ret;
> >
> > -	regmap =3D syscon_regmap_lookup_by_phandle(np, "syscon");
> > -	if (IS_ERR(regmap)) {
> > -		dev_err(dev, "failed to find syscon\n");
> > -		return PTR_ERR(regmap);
> > -	}
> > -	regmap_attach_dev(dev, regmap, &config);
> > -
> >  	/* set some other name then imx */
> >  	rproc =3D rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
> >  			    NULL, sizeof(*priv));
> > @@ -651,7 +678,6 @@ static int imx_rproc_probe(struct platform_device
> > *pdev)
> >
> >  	priv =3D rproc->priv;
> >  	priv->rproc =3D rproc;
> > -	priv->regmap =3D regmap;
> >  	priv->dcfg =3D dcfg;
> >  	priv->dev =3D dev;
> >
> > @@ -720,6 +746,7 @@ static int imx_rproc_remove(struct platform_device
> > *pdev)  }
> >
> >  static const struct of_device_id imx_rproc_of_match[] =3D {
> > +	{ .compatible =3D "fsl,imx7ulp-cm4", .data =3D &imx_rproc_cfg_imx7ulp=
 },
> >  	{ .compatible =3D "fsl,imx7d-cm4", .data =3D &imx_rproc_cfg_imx7d },
> >  	{ .compatible =3D "fsl,imx6sx-cm4", .data =3D &imx_rproc_cfg_imx6sx }=
,
> >  	{ .compatible =3D "fsl,imx8mq-cm4", .data =3D &imx_rproc_cfg_imx8mq }=
,
> > --
> > 2.30.0
> >