| Message ID | 20230320221826.2728078-6-mathieu.poirier@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | remoteproc: Call of_node_put() on iteration error | expand |
On Mon, Mar 20, 2023 at 7:18 PM Mathieu Poirier <mathieu.poirier@linaro.org> wrote: > > Function of_phandle_iterator_next() calls of_node_put() on the last > device_node it iterated over, but when the loop exits prematurely it has > to be called explicitly. Typo on the Subject: s/retmoteproc/remoteproc
> > Function of_phandle_iterator_next() calls of_node_put() on the last > device_node it iterated over, but when the loop exits prematurely it has to > be called explicitly. > > Fixes: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver > for DSP on i.MX") > Cc: stable@vger.kernel.org > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards Wang Shengjiu > --- > drivers/remoteproc/imx_dsp_rproc.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/imx_dsp_rproc.c > b/drivers/remoteproc/imx_dsp_rproc.c > index b8f268d41773..21759d9e5b7b 100644 > --- a/drivers/remoteproc/imx_dsp_rproc.c > +++ b/drivers/remoteproc/imx_dsp_rproc.c > @@ -650,15 +650,19 @@ static int imx_dsp_rproc_add_carveout(struct > imx_dsp_rproc *priv) > > rmem = of_reserved_mem_lookup(it.node); > if (!rmem) { > + of_node_put(it.node); > dev_err(dev, "unable to acquire memory-region\n"); > return -EINVAL; > } > > - if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) > + if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) > { > + of_node_put(it.node); > return -EINVAL; > + } > > cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size); > if (!cpu_addr) { > + of_node_put(it.node); > dev_err(dev, "failed to map memory %p\n", &rmem->base); > return -ENOMEM; > } > @@ -667,10 +671,12 @@ static int imx_dsp_rproc_add_carveout(struct > imx_dsp_rproc *priv) > mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, > (dma_addr_t)rmem->base, > rmem->size, da, NULL, NULL, it.node->name); > > - if (mem) > + if (mem) { > rproc_coredump_add_segment(rproc, da, rmem->size); > - else > + } else { > + of_node_put(it.node); > return -ENOMEM; > + } > > rproc_add_carveout(rproc, mem); > } > -- > 2.25.1
On Mon, Mar 20, 2023 at 08:02:04PM -0300, Fabio Estevam wrote: > On Mon, Mar 20, 2023 at 7:18 PM Mathieu Poirier > <mathieu.poirier@linaro.org> wrote: > > > > Function of_phandle_iterator_next() calls of_node_put() on the last > > device_node it iterated over, but when the loop exits prematurely it has > > to be called explicitly. > > Typo on the Subject: s/retmoteproc/remoteproc Thanks for pointing that out, I'll fix it.
diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c index b8f268d41773..21759d9e5b7b 100644 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@ -650,15 +650,19 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) rmem = of_reserved_mem_lookup(it.node); if (!rmem) { + of_node_put(it.node); dev_err(dev, "unable to acquire memory-region\n"); return -EINVAL; } - if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) + if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) { + of_node_put(it.node); return -EINVAL; + } cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size); if (!cpu_addr) { + of_node_put(it.node); dev_err(dev, "failed to map memory %p\n", &rmem->base); return -ENOMEM; } @@ -667,10 +671,12 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base, rmem->size, da, NULL, NULL, it.node->name); - if (mem) + if (mem) { rproc_coredump_add_segment(rproc, da, rmem->size); - else + } else { + of_node_put(it.node); return -ENOMEM; + } rproc_add_carveout(rproc, mem); }
Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly. Fixes: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX") Cc: stable@vger.kernel.org Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- drivers/remoteproc/imx_dsp_rproc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)