From: Arnaud POULIQUEN <arnaud.pouliquen@st.com>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
<bjorn.andersson@linaro.org>, <ohad@wizery.com>
Cc: <loic.pallardy@st.com>, <s-anna@ti.com>,
<linux-remoteproc@vger.kernel.org>, <corbet@lwn.net>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 09/14] remoteproc: Deal with synchronisation when crashing
Date: Wed, 29 Apr 2020 09:44:02 +0200 [thread overview]
Message-ID: <d9df5905-ad8b-881c-5950-481722bd0f3b@st.com> (raw)
In-Reply-To: <20200424200135.28825-10-mathieu.poirier@linaro.org>
Hi Mathieu,
On 4/24/20 10:01 PM, Mathieu Poirier wrote:
> Refactor function rproc_trigger_recovery() in order to avoid
> reloading the firmware image when synchronising with a remote
> processor rather than booting it. Also part of the process,
> properly set the synchronisation flag in order to properly
> recover the system.
>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> drivers/remoteproc/remoteproc_core.c | 23 ++++++++++++++------
> drivers/remoteproc/remoteproc_internal.h | 27 ++++++++++++++++++++++++
> 2 files changed, 43 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index ef88d3e84bfb..3a84a38ba37b 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -1697,7 +1697,7 @@ static void rproc_coredump(struct rproc *rproc)
> */
> int rproc_trigger_recovery(struct rproc *rproc)
> {
> - const struct firmware *firmware_p;
> + const struct firmware *firmware_p = NULL;
> struct device *dev = &rproc->dev;
> int ret;
>
> @@ -1718,14 +1718,16 @@ int rproc_trigger_recovery(struct rproc *rproc)
> /* generate coredump */
> rproc_coredump(rproc);
>
> - /* load firmware */
> - ret = request_firmware(&firmware_p, rproc->firmware, dev);
> - if (ret < 0) {
> - dev_err(dev, "request_firmware failed: %d\n", ret);
> - goto unlock_mutex;
> + /* load firmware if need be */
> + if (!rproc_needs_syncing(rproc)) {
> + ret = request_firmware(&firmware_p, rproc->firmware, dev);
> + if (ret < 0) {
> + dev_err(dev, "request_firmware failed: %d\n", ret);
> + goto unlock_mutex;
> + }
If we started in syncing mode then rpoc->firmware is null
rproc_set_sync_flag(rproc, RPROC_SYNC_STATE_CRASHED) can make rproc_needs_syncing(rproc)
false.
In this case here we fail the recovery an leave in RPROC_STOP state.
As you proposed in Loic RFC[1], what about adding a more explicit message to inform that the recovery
failed.
[1]https://lkml.org/lkml/2020/3/11/402
Regards,
Arnaud
> }
>
> - /* boot the remote processor up again */
> + /* boot up or synchronise with the remote processor again */
> ret = rproc_start(rproc, firmware_p);
>
> release_firmware(firmware_p);
> @@ -1761,6 +1763,13 @@ static void rproc_crash_handler_work(struct work_struct *work)
> dev_err(dev, "handling crash #%u in %s\n", ++rproc->crash_cnt,
> rproc->name);
>
> + /*
> + * The remote processor has crashed - tell the core what operation
> + * to use from hereon, i.e whether an external entity will reboot
> + * the MCU or it is now the remoteproc core's responsability.
> + */
> + rproc_set_sync_flag(rproc, RPROC_SYNC_STATE_CRASHED);
> +
> mutex_unlock(&rproc->lock);
>
> if (!rproc->recovery_disabled)
> diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
> index 3985c084b184..61500981155c 100644
> --- a/drivers/remoteproc/remoteproc_internal.h
> +++ b/drivers/remoteproc/remoteproc_internal.h
> @@ -24,6 +24,33 @@ struct rproc_debug_trace {
> struct rproc_mem_entry trace_mem;
> };
>
> +/*
> + * enum rproc_sync_states - remote processsor sync states
> + *
> + * @RPROC_SYNC_STATE_CRASHED state to use after the remote processor
> + * has crashed but has not been recovered by
> + * the remoteproc core yet.
> + *
> + * Keeping these separate from the enum rproc_state in order to avoid
> + * introducing coupling between the state of the MCU and the synchronisation
> + * operation to use.
> + */
> +enum rproc_sync_states {
> + RPROC_SYNC_STATE_CRASHED,
> +};
> +
> +static inline void rproc_set_sync_flag(struct rproc *rproc,
> + enum rproc_sync_states state)
> +{
> + switch (state) {
> + case RPROC_SYNC_STATE_CRASHED:
> + rproc->sync_with_rproc = rproc->sync_flags.after_crash;
> + break;
> + default:
> + break;
> + }
> +}
> +
> /* from remoteproc_core.c */
> void rproc_release(struct kref *kref);
> irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id);
>
next prev parent reply other threads:[~2020-04-29 7:44 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 20:01 [PATCH v3 00/14] remoteproc: Add support for synchronisaton with rproc Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 01/14] remoteproc: Make core operations optional Mathieu Poirier
2020-04-28 16:18 ` Arnaud POULIQUEN
2020-04-30 19:39 ` Mathieu Poirier
2020-05-05 22:16 ` Bjorn Andersson
2020-05-08 19:09 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 02/14] remoteproc: Introduce function rproc_alloc_internals() Mathieu Poirier
2020-05-05 22:31 ` Bjorn Andersson
2020-05-08 19:37 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 03/14] remoteproc: Add new operation and flags for synchronistation Mathieu Poirier
2020-04-28 16:38 ` Arnaud POULIQUEN
2020-04-30 19:49 ` Mathieu Poirier
2020-05-06 0:22 ` Bjorn Andersson
2020-05-08 21:01 ` Mathieu Poirier
2020-05-14 1:32 ` Bjorn Andersson
2020-05-15 19:24 ` Mathieu Poirier
2020-05-19 0:55 ` Bjorn Andersson
2020-05-20 22:06 ` Mathieu Poirier
2020-05-21 5:21 ` Bjorn Andersson
2020-05-21 21:55 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 04/14] remoteproc: Refactor function rproc_boot() Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 05/14] remoteproc: Refactor function rproc_fw_boot() Mathieu Poirier
2020-05-06 0:33 ` Bjorn Andersson
2020-05-08 21:27 ` Mathieu Poirier
2020-05-14 2:10 ` Bjorn Andersson
2020-05-15 19:46 ` Mathieu Poirier
2020-05-19 0:22 ` Bjorn Andersson
2020-04-24 20:01 ` [PATCH v3 06/14] remoteproc: Refactor function rproc_trigger_auto_boot() Mathieu Poirier
2020-04-28 17:00 ` Arnaud POULIQUEN
2020-04-24 20:01 ` [PATCH v3 07/14] remoteproc: Introducting new start and stop functions Mathieu Poirier
2020-05-06 0:42 ` Bjorn Andersson
2020-04-24 20:01 ` [PATCH v3 08/14] remoteproc: Call core functions based on synchronisation flag Mathieu Poirier
2020-04-28 17:27 ` Arnaud POULIQUEN
2020-04-30 19:57 ` Mathieu Poirier
2020-05-04 11:14 ` Arnaud POULIQUEN
2020-05-05 22:10 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 09/14] remoteproc: Deal with synchronisation when crashing Mathieu Poirier
2020-04-29 7:44 ` Arnaud POULIQUEN [this message]
2020-04-30 20:11 ` Mathieu Poirier
2020-05-06 1:01 ` Bjorn Andersson
2020-05-08 21:47 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 10/14] remoteproc: Deal with synchronisation when shutting down Mathieu Poirier
2020-04-29 8:19 ` Arnaud POULIQUEN
2020-04-30 20:23 ` Mathieu Poirier
2020-05-04 11:34 ` Arnaud POULIQUEN
2020-05-05 22:03 ` Mathieu Poirier
2020-05-06 7:51 ` Arnaud POULIQUEN
2020-05-06 1:10 ` Bjorn Andersson
2020-04-24 20:01 ` [PATCH v3 11/14] remoteproc: Deal with synchronisation when changing FW image Mathieu Poirier
2020-04-29 8:52 ` Arnaud POULIQUEN
2020-04-30 20:32 ` Mathieu Poirier
2020-05-06 1:27 ` Bjorn Andersson
2020-04-24 20:01 ` [PATCH v3 12/14] remoteproc: Introducing function rproc_set_state_machine() Mathieu Poirier
2020-04-29 9:22 ` Arnaud POULIQUEN
2020-04-29 14:38 ` Arnaud POULIQUEN
2020-04-30 20:51 ` Mathieu Poirier
2020-05-04 12:00 ` Arnaud POULIQUEN
2020-04-30 20:42 ` Mathieu Poirier
2020-05-04 11:57 ` Arnaud POULIQUEN
2020-05-05 21:43 ` Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 13/14] remoteproc: Document " Mathieu Poirier
2020-04-24 20:01 ` [PATCH v3 14/14] remoteproc: Expose synchronisation flags via debugfs Mathieu Poirier
2020-05-18 13:28 ` [PATCH v3 00/14] remoteproc: Add support for synchronisaton with rproc Peng Fan
2020-05-18 16:29 ` 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=d9df5905-ad8b-881c-5950-481722bd0f3b@st.com \
--to=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=loic.pallardy@st.com \
--cc=mathieu.poirier@linaro.org \
--cc=ohad@wizery.com \
--cc=s-anna@ti.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).