Re: [PATCH v2 03/12] remoteproc: stm32: Decouple rproc from DT parsing
On Fri 24 Apr 13:24 PDT 2020, Mathieu Poirier wrote:
> Remove the remote processor from the process of parsing the device tree
> since (1) there is no correlation between them and (2) to use the
> information that was gathered to make a decision on whether to
> synchronise with the M4 or not.
>
> Signed-off-by: Mathieu Poirier
Reviewed-by: Bjorn Andersson
> ---
> drivers/remoteproc/stm32_rproc.c | 25 ++---
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/remoteproc/stm32_rproc.c
> b/drivers/remoteproc/stm32_rproc.c
> index 1ac90adba9b1..57a426ea620b 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -538,12 +538,11 @@ static int stm32_rproc_get_syscon(struct device_node
> *np, const char *prop,
> return err;
> }
>
> -static int stm32_rproc_parse_dt(struct platform_device *pdev)
> +static int stm32_rproc_parse_dt(struct platform_device *pdev,
> + struct stm32_rproc *ddata, bool *auto_boot)
> {
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> - struct rproc *rproc = platform_get_drvdata(pdev);
> - struct stm32_rproc *ddata = rproc->priv;
> struct stm32_syscon tz;
> unsigned int tzen;
> int err, irq;
> @@ -589,7 +588,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> *pdev)
>
> err = regmap_read(tz.map, tz.reg, &tzen);
> if (err) {
> - dev_err(&rproc->dev, "failed to read tzen\n");
> + dev_err(dev, "failed to read tzen\n");
> return err;
> }
> ddata->secured_soc = tzen & tz.mask;
> @@ -605,7 +604,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> *pdev)
> if (err)
> dev_info(dev, "failed to get pdds\n");
>
> - rproc->auto_boot = of_property_read_bool(np, "st,auto-boot");
> + *auto_boot = of_property_read_bool(np, "st,auto-boot");
>
> return stm32_rproc_of_memory_translations(pdev, ddata);
> }
> @@ -616,6 +615,7 @@ static int stm32_rproc_probe(struct platform_device *pdev)
> struct stm32_rproc *ddata;
> struct device_node *np = dev->of_node;
> struct rproc *rproc;
> + bool auto_boot = false;
> int ret;
>
> ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
> @@ -626,9 +626,16 @@ static int stm32_rproc_probe(struct platform_device
> *pdev)
> if (!rproc)
> return -ENOMEM;
>
> + ddata = rproc->priv;
> +
> rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
> +
> + ret = stm32_rproc_parse_dt(pdev, ddata, &auto_boot);
> + if (ret)
> + goto free_rproc;
> +
> + rproc->auto_boot = auto_boot;
> rproc->has_iommu = false;
> - ddata = rproc->priv;
> ddata->workqueue = create_workqueue(dev_name(dev));
> if (!ddata->workqueue) {
> dev_err(dev, "cannot create workqueue\n");
> @@ -638,13 +645,9 @@ static int stm32_rproc_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, rproc);
>
> - ret = stm32_rproc_parse_dt(pdev);
> - if (ret)
> - goto free_wkq;
> -
> ret = stm32_rproc_request_mbox(rproc);
> if (ret)
> - goto free_rproc;
> + goto free_wkq;
>
> ret = rproc_add(rproc);
> if (ret)
> --
> 2.20.1
>
Re: [PATCH v2 03/12] remoteproc: stm32: Decouple rproc from DT parsing
On Wed, Apr 29, 2020 at 03:37:58PM +0200, Arnaud POULIQUEN wrote:
> Hi Mathieu,
>
> On 4/24/20 10:24 PM, Mathieu Poirier wrote:
> > Remove the remote processor from the process of parsing the device tree
> > since (1) there is no correlation between them and (2) to use the
> > information that was gathered to make a decision on whether to
> > synchronise with the M4 or not.
> >
> > Signed-off-by: Mathieu Poirier
> > ---
> > drivers/remoteproc/stm32_rproc.c | 25 ++---
> > 1 file changed, 14 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/remoteproc/stm32_rproc.c
> > b/drivers/remoteproc/stm32_rproc.c
> > index 1ac90adba9b1..57a426ea620b 100644
> > --- a/drivers/remoteproc/stm32_rproc.c
> > +++ b/drivers/remoteproc/stm32_rproc.c
> > @@ -538,12 +538,11 @@ static int stm32_rproc_get_syscon(struct device_node
> > *np, const char *prop,
> > return err;
> > }
> >
> > -static int stm32_rproc_parse_dt(struct platform_device *pdev)
> > +static int stm32_rproc_parse_dt(struct platform_device *pdev,
> > + struct stm32_rproc *ddata, bool *auto_boot)
> > {
> > struct device *dev = &pdev->dev;
> > struct device_node *np = dev->of_node;
> > - struct rproc *rproc = platform_get_drvdata(pdev);
> > - struct stm32_rproc *ddata = rproc->priv;
> > struct stm32_syscon tz;
> > unsigned int tzen;
> > int err, irq;
> > @@ -589,7 +588,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> > *pdev)
> >
> > err = regmap_read(tz.map, tz.reg, &tzen);
> > if (err) {
> > - dev_err(&rproc->dev, "failed to read tzen\n");
> > + dev_err(dev, "failed to read tzen\n");
> > return err;
> > }
> > ddata->secured_soc = tzen & tz.mask;
> > @@ -605,7 +604,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> > *pdev)
> > if (err)
> > dev_info(dev, "failed to get pdds\n");
> >
> > - rproc->auto_boot = of_property_read_bool(np, "st,auto-boot");
> > + *auto_boot = of_property_read_bool(np, "st,auto-boot");
> >
> > return stm32_rproc_of_memory_translations(pdev, ddata);
> > }
> > @@ -616,6 +615,7 @@ static int stm32_rproc_probe(struct platform_device
> > *pdev)
> > struct stm32_rproc *ddata;
> > struct device_node *np = dev->of_node;
> > struct rproc *rproc;
> > + bool auto_boot = false;
>
> Nitpicking: Seems that you don't need to initialize it.
I think you are correct.
> Perhaps you can simply suppress the local variable and directly use
> rproc->auto_boot.
... and change the value of rproc->auto_boot if state == M4_STATE_CRUN? Sure,
that's possible.
Thanks for all the comments, it really helps to have a different perspective. I
am out of time for today but will continue with the rest of your comments
tomorrow.
Mathieu
>
> else LGTM
>
>
> Thanks,
> Arnaud
>
> > int ret;
> >
> > ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
> > @@ -626,9 +626,16 @@ static int stm32_rproc_probe(struct platform_device
> > *pdev)
> > if (!rproc)
> > return -ENOMEM;
> >
> > + ddata = rproc->priv;
> > +
> > rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
> > +
> > + ret = stm32_rproc_parse_dt(pdev, ddata, &auto_boot);
> > + if (ret)
> > + goto free_rproc;
> > +
> > + rproc->auto_boot = auto_boot;
> > rproc->has_iommu = false;
> > - ddata = rproc->priv;
> > ddata->workqueue = create_workqueue(dev_name(dev));
> > if (!ddata->workqueue) {
> > dev_err(dev, "cannot create workqueue\n");
> > @@ -638,13 +645,9 @@ static int stm32_rproc_probe(struct platform_device
> > *pdev)
> >
> > platform_set_drvdata(pdev, rproc);
> >
> > - ret = stm32_rproc_parse_dt(pdev);
> > - if (ret)
> > - goto free_wkq;
> > -
> > ret = stm32_rproc_request_mbox(rproc);
> > if (ret)
> > - goto free_rproc;
> > + goto free_wkq;
> >
> > ret = rproc_add(rproc);
> > if (ret)
> >
Re: [PATCH v2 03/12] remoteproc: stm32: Decouple rproc from DT parsing
Hi Mathieu,
On 4/24/20 10:24 PM, Mathieu Poirier wrote:
> Remove the remote processor from the process of parsing the device tree
> since (1) there is no correlation between them and (2) to use the
> information that was gathered to make a decision on whether to
> synchronise with the M4 or not.
>
> Signed-off-by: Mathieu Poirier
> ---
> drivers/remoteproc/stm32_rproc.c | 25 ++---
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/remoteproc/stm32_rproc.c
> b/drivers/remoteproc/stm32_rproc.c
> index 1ac90adba9b1..57a426ea620b 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -538,12 +538,11 @@ static int stm32_rproc_get_syscon(struct device_node
> *np, const char *prop,
> return err;
> }
>
> -static int stm32_rproc_parse_dt(struct platform_device *pdev)
> +static int stm32_rproc_parse_dt(struct platform_device *pdev,
> + struct stm32_rproc *ddata, bool *auto_boot)
> {
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> - struct rproc *rproc = platform_get_drvdata(pdev);
> - struct stm32_rproc *ddata = rproc->priv;
> struct stm32_syscon tz;
> unsigned int tzen;
> int err, irq;
> @@ -589,7 +588,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> *pdev)
>
> err = regmap_read(tz.map, tz.reg, &tzen);
> if (err) {
> - dev_err(&rproc->dev, "failed to read tzen\n");
> + dev_err(dev, "failed to read tzen\n");
> return err;
> }
> ddata->secured_soc = tzen & tz.mask;
> @@ -605,7 +604,7 @@ static int stm32_rproc_parse_dt(struct platform_device
> *pdev)
> if (err)
> dev_info(dev, "failed to get pdds\n");
>
> - rproc->auto_boot = of_property_read_bool(np, "st,auto-boot");
> + *auto_boot = of_property_read_bool(np, "st,auto-boot");
>
> return stm32_rproc_of_memory_translations(pdev, ddata);
> }
> @@ -616,6 +615,7 @@ static int stm32_rproc_probe(struct platform_device *pdev)
> struct stm32_rproc *ddata;
> struct device_node *np = dev->of_node;
> struct rproc *rproc;
> + bool auto_boot = false;
Nitpicking: Seems that you don't need to initialize it.
Perhaps you can simply suppress the local variable and directly use
rproc->auto_boot.
else LGTM
Thanks,
Arnaud
> int ret;
>
> ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
> @@ -626,9 +626,16 @@ static int stm32_rproc_probe(struct platform_device
> *pdev)
> if (!rproc)
> return -ENOMEM;
>
> + ddata = rproc->priv;
> +
> rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
> +
> + ret = stm32_rproc_parse_dt(pdev, ddata, &auto_boot);
> + if (ret)
> + goto free_rproc;
> +
> + rproc->auto_boot = auto_boot;
> rproc->has_iommu = false;
> - ddata = rproc->priv;
> ddata->workqueue = create_workqueue(dev_name(dev));
> if (!ddata->workqueue) {
> dev_err(dev, "cannot create workqueue\n");
> @@ -638,13 +645,9 @@ static int stm32_rproc_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, rproc);
>
> - ret = stm32_rproc_parse_dt(pdev);
> - if (ret)
> - goto free_wkq;
> -
> ret = stm32_rproc_request_mbox(rproc);
> if (ret)
> - goto free_rproc;
> + goto free_wkq;
>
> ret = rproc_add(rproc);
> if (ret)
>
