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 v6 06/11] remoteproc: stm32: Properly set co-processor state when attaching
Date: Tue, 14 Jul 2020 14:04:40 -0600 [thread overview]
Message-ID: <20200714200445.1427257-7-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200714200445.1427257-1-mathieu.poirier@linaro.org>
Introduce the required mechanic to set the state of the M4 in order
to properly deal with scenarios where the co-processor has been
started by another entity.
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>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/remoteproc/stm32_rproc.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 961a53f67ec5..f393f2503106 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -39,6 +39,13 @@
#define STM32_MBX_VQ1_ID 1
#define STM32_MBX_SHUTDOWN "shutdown"
+#define M4_STATE_OFF 0
+#define M4_STATE_INI 1
+#define M4_STATE_CRUN 2
+#define M4_STATE_CSTOP 3
+#define M4_STATE_STANDBY 4
+#define M4_STATE_CRASH 5
+
struct stm32_syscon {
struct regmap *map;
u32 reg;
@@ -636,12 +643,29 @@ static int stm32_rproc_parse_dt(struct platform_device *pdev,
return 0;
}
+static int stm32_rproc_get_m4_status(struct stm32_rproc *ddata,
+ unsigned int *state)
+{
+ /* See stm32_rproc_parse_dt() */
+ if (!ddata->m4_state.map) {
+ /*
+ * We couldn't get the coprocessor's state, assume
+ * it is not running.
+ */
+ state = M4_STATE_OFF;
+ return 0;
+ }
+
+ return regmap_read(ddata->m4_state.map, ddata->m4_state.reg, state);
+}
+
static int stm32_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct stm32_rproc *ddata;
struct device_node *np = dev->of_node;
struct rproc *rproc;
+ unsigned int state;
int ret;
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
@@ -664,6 +688,13 @@ static int stm32_rproc_probe(struct platform_device *pdev)
if (ret)
goto free_rproc;
+ ret = stm32_rproc_get_m4_status(ddata, &state);
+ if (ret)
+ goto free_rproc;
+
+ if (state == M4_STATE_CRUN)
+ rproc->state = RPROC_DETACHED;
+
rproc->has_iommu = false;
ddata->workqueue = create_workqueue(dev_name(dev));
if (!ddata->workqueue) {
--
2.25.1
next prev parent reply other threads:[~2020-07-14 20:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 20:04 [PATCH v6 00/11] remoteproc: stm32: Add support for attaching to M4 Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 01/11] remoteproc: stm32: Decouple rproc from memory translation Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 02/11] remoteproc: stm32: Request IRQ with platform device Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 03/11] remoteproc: stm32: Decouple rproc from DT parsing Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 04/11] remoteproc: stm32: Remove memory translation " Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 05/11] remoteproc: stm32: Parse syscon that will manage M4 synchronisation Mathieu Poirier
2020-07-14 20:04 ` Mathieu Poirier [this message]
2020-07-14 20:04 ` [PATCH v6 07/11] remoteproc: Make function rproc_resource_cleanup() public Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 08/11] remoteproc: stm32: Parse memory regions when attaching to M4 Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 09/11] remoteproc: stm32: Properly handle the resource table when attaching Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 10/11] remoteproc: stm32: Introduce new attach() operation Mathieu Poirier
2020-07-14 20:04 ` [PATCH v6 11/11] remoteproc: stm32: Update M4 state in stm32_rproc_stop() Mathieu Poirier
2020-07-15 6:51 ` [PATCH v6 00/11] remoteproc: stm32: Add support for attaching to M4 Arnaud POULIQUEN
2020-07-15 15:32 ` Mathieu Poirier
2020-07-22 0:00 ` patchwork-bot+linux-remoteproc
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=20200714200445.1427257-7-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).