From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org,
loic.pallardy@st.com, arnaud.pouliquen@st.com,
mcoquelin.stm32@gmail.com, alexandre.torgue@st.com
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com
Subject: [PATCH v5 08/11] remoteproc: stm32: Split function stm32_rproc_parse_fw()
Date: Tue, 7 Jul 2020 15:31:09 -0600 [thread overview]
Message-ID: <20200707213112.928383-9-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200707213112.928383-1-mathieu.poirier@linaro.org>
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@linaro.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;
+ }
+
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);
--
2.25.1
next prev parent reply other threads:[~2020-07-07 21:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 21:31 [PATCH v5 00/11] remoteproc: stm32: Add support for attaching to M4 Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 01/11] remoteproc: stm32: Decouple rproc from memory translation Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 02/11] remoteproc: stm32: Request IRQ with platform device Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 03/11] remoteproc: stm32: Decouple rproc from DT parsing Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 04/11] remoteproc: stm32: Remove memory translation " Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 05/11] remoteproc: stm32: Parse syscon that will manage M4 synchronisation Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 06/11] remoteproc: stm32: Properly set co-processor state when attaching Mathieu Poirier
2020-07-09 16:13 ` Arnaud POULIQUEN
2020-07-14 20:30 ` kernel test robot
2020-07-15 22:19 ` Mathieu Poirier
2020-07-16 0:48 ` [kbuild-all] " Rong Chen
2020-07-07 21:31 ` [PATCH v5 07/11] remoteproc: Make function rproc_resource_cleanup() public Mathieu Poirier
2020-07-07 21:31 ` Mathieu Poirier [this message]
2020-07-09 16:15 ` [PATCH v5 08/11] remoteproc: stm32: Split function stm32_rproc_parse_fw() Arnaud POULIQUEN
2020-07-07 21:31 ` [PATCH v5 09/11] remoteproc: stm32: Properly handle the resource table when attaching Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 10/11] remoteproc: stm32: Introduce new attach() operation Mathieu Poirier
2020-07-07 21:31 ` [PATCH v5 11/11] remoteproc: stm32: Update M4 state in stm32_rproc_stop() Mathieu Poirier
2020-07-09 16:33 ` [PATCH v5 00/11] remoteproc: stm32: Add support for attaching to M4 Arnaud POULIQUEN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200707213112.928383-9-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=loic.pallardy@st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).