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 03/11] remoteproc: stm32: Decouple rproc from DT parsing
Date: Tue, 7 Jul 2020 15:31:04 -0600 [thread overview]
Message-ID: <20200707213112.928383-4-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200707213112.928383-1-mathieu.poirier@linaro.org>
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 <mathieu.poirier@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/remoteproc/stm32_rproc.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index c00f60d42ab6..cbba995a80a2 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -539,12 +539,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;
@@ -590,7 +589,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;
@@ -606,7 +605,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);
}
@@ -627,9 +626,15 @@ 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, &rproc->auto_boot);
+ if (ret)
+ goto free_rproc;
+
rproc->has_iommu = false;
- ddata = rproc->priv;
ddata->workqueue = create_workqueue(dev_name(dev));
if (!ddata->workqueue) {
dev_err(dev, "cannot create workqueue\n");
@@ -639,13 +644,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.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 ` Mathieu Poirier [this message]
2020-07-07 21:31 ` [PATCH v5 04/11] remoteproc: stm32: Remove memory translation from DT parsing 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 ` [PATCH v5 08/11] remoteproc: stm32: Split function stm32_rproc_parse_fw() Mathieu Poirier
2020-07-09 16:15 ` 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-4-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).