[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <c28c34be-6650-6a07-d7ed-9d6c5e673b0c@st.com>
Date: Thu, 9 Jul 2020 18:15:07 +0200
From: Arnaud POULIQUEN <arnaud.pouliquen@...com>
To: Mathieu Poirier <mathieu.poirier@...aro.org>,
"ohad@...ery.com" <ohad@...ery.com>,
"bjorn.andersson@...aro.org" <bjorn.andersson@...aro.org>,
Loic PALLARDY <loic.pallardy@...com>,
"mcoquelin.stm32@...il.com" <mcoquelin.stm32@...il.com>,
Alexandre TORGUE <alexandre.torgue@...com>
CC: "linux-remoteproc@...r.kernel.org" <linux-remoteproc@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-stm32@...md-mailman.stormreply.com"
<linux-stm32@...md-mailman.stormreply.com>
Subject: Re: [PATCH v5 08/11] remoteproc: stm32: Split function
stm32_rproc_parse_fw()
On 7/7/20 11:31 PM, Mathieu Poirier wrote:
> Split function stm32_rproc_parse_fw() in two parts, the first one
> to parse the memory regions and the second one to load the
> resource table. That way parsing of the memory regions can be
> re-used when attaching to the remote processor.
>
> Mainly based on the work published by Arnaud Pouliquen [1].
>
> [1]. https://patchwork.kernel.org/project/linux-remoteproc/list/?series=239877
>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@...aro.org>
> ---
> drivers/remoteproc/stm32_rproc.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index cbeb5ceb15c5..9ab58fae252f 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -213,7 +213,7 @@ static int stm32_rproc_elf_load_rsc_table(struct rproc *rproc,
> return 0;
> }
>
> -static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +static int stm32_rproc_parse_memory_regions(struct rproc *rproc)
> {
> struct device *dev = rproc->dev.parent;
> struct device_node *np = dev->of_node;
> @@ -266,6 +266,16 @@ static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> index++;
> }
>
> + return 0;
> +}
> +
> +static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +{
> + int ret = stm32_rproc_parse_memory_regions(rproc);
> +
> + if (ret)
> + return ret;
> +
> return stm32_rproc_elf_load_rsc_table(rproc, fw);
> }
>
> @@ -693,15 +703,20 @@ static int stm32_rproc_probe(struct platform_device *pdev)
> if (ret)
> goto free_rproc;
>
> - if (state == M4_STATE_CRUN)
> + if (state == M4_STATE_CRUN) {
> rproc->state = RPROC_DETACHED;
>
> + ret = stm32_rproc_parse_memory_regions(rproc);
> + if (ret)
> + goto free_resources;
> + }
> +
Here you do more than the split, you add the memory registration in the probe
i think updating the commit title and message should be sufficient
> rproc->has_iommu = false;
> ddata->workqueue = create_workqueue(dev_name(dev));
> if (!ddata->workqueue) {
> dev_err(dev, "cannot create workqueue\n");
> ret = -ENOMEM;
> - goto free_rproc;
> + goto free_resources;
> }
>
> platform_set_drvdata(pdev, rproc);
> @@ -720,6 +735,8 @@ static int stm32_rproc_probe(struct platform_device *pdev)
> stm32_rproc_free_mbox(rproc);
> free_wkq:
> destroy_workqueue(ddata->workqueue);
> +free_resources:
> + rproc_resource_cleanup(rproc);
> free_rproc:
> if (device_may_wakeup(dev)) {
> dev_pm_clear_wake_irq(dev);
>
Powered by blists - more mailing lists