From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: ohad@wizery.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@st.com, loic.pallardy@st.com,
arnaud.pouliquen@st.com, linux-remoteproc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 06/11] remoteproc: stm32: Properly set co-processor state when attaching
Date: Mon, 22 Jun 2020 11:05:45 -0700 [thread overview]
Message-ID: <20200622180545.GL149351@builder.lan> (raw)
In-Reply-To: <20200601175552.22286-7-mathieu.poirier@linaro.org>
On Mon 01 Jun 10:55 PDT 2020, Mathieu Poirier wrote:
> Introduce the required mechanic to set the state of the M4 in order
> to properly deal with scenarios where the co-processor has been
> stated 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 | 32 ++++++++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index 80fd8fd831da..2154c8b90a2a 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -38,6 +38,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;
> @@ -635,12 +642,30 @@ 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));
> @@ -663,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)
I presume this won't ever be e.g. M4_STATE_CRASH or M4_STATE_STANDBY?
Regards,
Bjorn
> + rproc->state = RPROC_DETACHED;
> +
> rproc->has_iommu = false;
> ddata->workqueue = create_workqueue(dev_name(dev));
> if (!ddata->workqueue) {
> --
> 2.20.1
>
next prev parent reply other threads:[~2020-06-22 18:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 17:55 [PATCH v4 00/11] remoteproc: stm32: Add support for attaching to M4 Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 01/11] remoteproc: stm32: Decouple rproc from memory translation Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 02/11] remoteproc: stm32: Request IRQ with platform device Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 03/11] remoteproc: stm32: Decouple rproc from DT parsing Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 04/11] remoteproc: stm32: Remove memory translation " Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 05/11] remoteproc: stm32: Parse syscon that will manage M4 synchronisation Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 06/11] remoteproc: stm32: Properly set co-processor state when attaching Mathieu Poirier
2020-06-22 18:05 ` Bjorn Andersson [this message]
2020-06-01 17:55 ` [PATCH v4 07/11] remoteproc: Make function rproc_resource_cleanup() public Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 08/11] remoteproc: stm32: Split function stm32_rproc_parse_fw() Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 09/11] remoteproc: stm32: Properly handle the resource table when attaching Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 10/11] remoteproc: stm32: Introduce new attach() operation Mathieu Poirier
2020-06-01 17:55 ` [PATCH v4 11/11] remoteproc: stm32: Update M4 state in stm32_rproc_stop() Mathieu Poirier
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=20200622180545.GL149351@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=linux-arm-kernel@lists.infradead.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=mathieu.poirier@linaro.org \
--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