| Message ID | 20200927064131.24101-5-peng.fan@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | remoteproc: imx_rproc: support iMX8MQ/M | expand |
On Sun, Sep 27, 2020 at 02:41:28PM +0800, Peng Fan wrote: > We might need to map an region multiple times, becaue the region might > be shared between remote processors, such i.MX8QM with dual M4 cores. > So use devm_ioremap, not devm_ioremap_resource. > > Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de> > Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com> > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/remoteproc/imx_rproc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index aa5fbd0c7768..48ce09e857ee 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -298,9 +298,10 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, > if (b >= IMX7D_RPROC_MEM_MAX) > break; > > - priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res); > + /* Not use resource version, because we might share region*/ s/"region*"/"region *" > + priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, res.start, resource_size(&res)); > if (IS_ERR(priv->mem[b].cpu_addr)) { > - dev_err(dev, "devm_ioremap_resource failed\n"); > + dev_err(dev, "devm_ioremap %pR failed\n", &res); > err = PTR_ERR(priv->mem[b].cpu_addr); > return err; > } > -- > 2.28.0 >
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index aa5fbd0c7768..48ce09e857ee 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -298,9 +298,10 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, if (b >= IMX7D_RPROC_MEM_MAX) break; - priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res); + /* Not use resource version, because we might share region*/ + priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, res.start, resource_size(&res)); if (IS_ERR(priv->mem[b].cpu_addr)) { - dev_err(dev, "devm_ioremap_resource failed\n"); + dev_err(dev, "devm_ioremap %pR failed\n", &res); err = PTR_ERR(priv->mem[b].cpu_addr); return err; }