From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com
Cc: loic.pallardy@st.com, arnaud.pouliquen@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: [PATCH v3 04/14] remoteproc: Refactor function rproc_boot()
Date: Fri, 24 Apr 2020 14:01:25 -0600 [thread overview]
Message-ID: <20200424200135.28825-5-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200424200135.28825-1-mathieu.poirier@linaro.org>
Refactoring function rproc_boot() in order to properly handle
cases where the core needs to synchronise with a remote processor
rather than booting it.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/remoteproc/remoteproc_core.c | 25 ++++++++++++++++--------
drivers/remoteproc/remoteproc_internal.h | 5 +++++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1b4756909584..a02593b75bec 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1762,7 +1762,9 @@ static void rproc_crash_handler_work(struct work_struct *work)
* rproc_boot() - boot a remote processor
* @rproc: handle of a remote processor
*
- * Boot a remote processor (i.e. load its firmware, power it on, ...).
+ * Boot or synchronise with a remote processor. In the former case the
+ * firmware is loaded and the remote processor powered on, in the latter
+ * those steps are simply skipped.
*
* If the remote processor is already powered on, this function immediately
* returns (successfully).
@@ -1771,8 +1773,9 @@ static void rproc_crash_handler_work(struct work_struct *work)
*/
int rproc_boot(struct rproc *rproc)
{
- const struct firmware *firmware_p;
+ const struct firmware *firmware_p = NULL;
struct device *dev;
+ bool syncing;
int ret;
if (!rproc) {
@@ -1788,6 +1791,8 @@ int rproc_boot(struct rproc *rproc)
return ret;
}
+ syncing = rproc_needs_syncing(rproc);
+
if (rproc->state == RPROC_DELETED) {
ret = -ENODEV;
dev_err(dev, "can't boot deleted rproc %s\n", rproc->name);
@@ -1800,13 +1805,17 @@ int rproc_boot(struct rproc *rproc)
goto unlock_mutex;
}
- dev_info(dev, "powering up %s\n", rproc->name);
+ dev_info(dev, "%s %s\n",
+ !syncing ? "powering up" : "syncing with", rproc->name);
- /* load firmware */
- ret = request_firmware(&firmware_p, rproc->firmware, dev);
- if (ret < 0) {
- dev_err(dev, "request_firmware failed: %d\n", ret);
- goto downref_rproc;
+
+ /* load firmware if not syncing with remote processor */
+ if (!syncing) {
+ ret = request_firmware(&firmware_p, rproc->firmware, dev);
+ if (ret < 0) {
+ dev_err(dev, "request_firmware failed: %d\n", ret);
+ goto downref_rproc;
+ }
}
ret = rproc_fw_boot(rproc, firmware_p);
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index 59fc871743c7..47b500e40dd9 100644
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -64,6 +64,11 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
struct rproc_mem_entry *
rproc_find_carveout_by_name(struct rproc *rproc, const char *name, ...);
+static inline bool rproc_needs_syncing(struct rproc *rproc)
+{
+ return rproc->sync_with_rproc;
+}
+
static inline
int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
{
--
2.20.1
next prev parent reply other threads:[~2020-04-24 20:01 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 ` Mathieu Poirier [this message]
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
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=20200424200135.28825-5-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=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=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).