linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaud POULIQUEN <arnaud.pouliquen@st.com>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
	<bjorn.andersson@linaro.org>, <ohad@wizery.com>,
	<mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com>
Cc: <loic.pallardy@st.com>, <linux-remoteproc@vger.kernel.org>,
	<linux-stm32@st-md-mailman.stormreply.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 06/12] remoteproc: stm32: Get coprocessor state
Date: Wed, 29 Apr 2020 15:38:24 +0200	[thread overview]
Message-ID: <faa9b0e1-2e2f-609f-c436-2a58223f5f72@st.com> (raw)
In-Reply-To: <20200424202505.29562-7-mathieu.poirier@linaro.org>



On 4/24/20 10:24 PM, Mathieu Poirier wrote:
> Introduce the required mechanic to get the state of the M4 when the
> remoteproc core is initialising.
> 
> 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: Loic Pallardy <loic.pallardy@st.com>
> ---
>  drivers/remoteproc/stm32_rproc.c | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index a285f338bed8..89fbd2ffac93 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -38,6 +38,15 @@
>  #define STM32_MBX_VQ1_ID	1
>  #define STM32_MBX_SHUTDOWN	"shutdown"
>  
> +#define RSC_TBL_SIZE		(1024)
> +
> +#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 +644,23 @@ 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)
> +		return -EINVAL;
> +
> +	return regmap_read(ddata->m4_state.map, ddata->m4_state.reg, state);
> +}
i would manage here the default state depending on the error types
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;
>  	bool auto_boot = false;
>  	int ret;
>  
> @@ -664,6 +684,15 @@ static int stm32_rproc_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto free_rproc;
>  
> +	ret = stm32_rproc_get_m4_status(ddata, &state);
> +	if (ret) {
> +		/*
> +		 * We couldn't get the coprocessor's state, assume
> +		 * it is not running.
> +		 */
> +		state = M4_STATE_OFF;

So here just handle the error;

Regards
Arnaud
> +	}
> +
>  	rproc->auto_boot = auto_boot;
>  	rproc->has_iommu = false;
>  	ddata->workqueue = create_workqueue(dev_name(dev));
> 

  reply	other threads:[~2020-04-29 13:38 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-24 20:24 [PATCH v2 00/12] remoteproc: stm32: Add support for synchronising with M4 Mathieu Poirier
2020-04-24 20:24 ` [PATCH v2 01/12] remoteproc: stm32: Decouple rproc from memory translation Mathieu Poirier
2020-05-14  4:57   ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 02/12] remoteproc: stm32: Request IRQ with platform device Mathieu Poirier
2020-05-14  4:57   ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 03/12] remoteproc: stm32: Decouple rproc from DT parsing Mathieu Poirier
2020-04-29 13:37   ` Arnaud POULIQUEN
2020-04-30 20:58     ` Mathieu Poirier
2020-05-14  4:59   ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 04/12] remoteproc: stm32: Remove memory translation " Mathieu Poirier
2020-05-14  5:03   ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 05/12] remoteproc: stm32: Parse syscon that will manage M4 synchronisation Mathieu Poirier
2020-05-14  5:03   ` Bjorn Andersson
2020-04-24 20:24 ` [PATCH v2 06/12] remoteproc: stm32: Get coprocessor state Mathieu Poirier
2020-04-29 13:38   ` Arnaud POULIQUEN [this message]
2020-05-01 17:40     ` Mathieu Poirier
2020-04-24 20:25 ` [PATCH v2 07/12] remoteproc: stm32: Get loaded resource table for synchronisation Mathieu Poirier
2020-04-24 20:25 ` [PATCH v2 08/12] remoteproc: stm32: Introduce new start ops " Mathieu Poirier
2020-04-29 14:50   ` Arnaud POULIQUEN
2020-04-24 20:25 ` [PATCH v2 09/12] remoteproc: stm32: Update M4 state in stm32_rproc_stop() Mathieu Poirier
2020-04-29 14:52   ` Arnaud POULIQUEN
2020-04-24 20:25 ` [PATCH v2 10/12] remoteproc: stm32: Introduce new parse fw ops for synchronisation Mathieu Poirier
2020-05-14  5:13   ` Bjorn Andersson
2020-04-24 20:25 ` [PATCH v2 11/12] remoteproc: stm32: Introduce new loaded rsc " Mathieu Poirier
2020-05-14  5:15   ` Bjorn Andersson
2020-04-24 20:25 ` [PATCH v2 12/12] remoteproc: stm32: Set synchronisation state machine if needed Mathieu Poirier
2020-04-29 14:47   ` Arnaud POULIQUEN
2020-05-01 17:54     ` Mathieu Poirier
2020-04-29 15:08 ` [PATCH v2 00/12] remoteproc: stm32: Add support for synchronising with M4 Arnaud POULIQUEN
2020-05-01 17:59   ` 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=faa9b0e1-2e2f-609f-c436-2a58223f5f72@st.com \
    --to=arnaud.pouliquen@st.com \
    --cc=alexandre.torgue@st.com \
    --cc=bjorn.andersson@linaro.org \
    --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;
as well as URLs for NNTP newsgroup(s).