| Message ID | 20201229033019.25899-5-peng.fan@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | remoteproc: imx_rproc: support iMX8MQ/M | expand |
On Tue, Dec 29, 2020 at 11:30:15AM +0800, peng.fan@nxp.com wrote: > From: Peng Fan <peng.fan@nxp.com> > > 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 | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 2a093cea4997..47fc1d06be6a 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -296,7 +296,8 @@ 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, "failed to remap %pr\n", &res); > err = PTR_ERR(priv->mem[b].cpu_addr); > -- > 2.28.0 >
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 2a093cea4997..47fc1d06be6a 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -296,7 +296,8 @@ 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, "failed to remap %pr\n", &res); err = PTR_ERR(priv->mem[b].cpu_addr);