From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org
Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, arnaud.pouliquen@st.com
Subject: [PATCH v3 05/15] remoteproc: Properly represent the attached state
Date: Thu, 26 Nov 2020 14:06:32 -0700 [thread overview]
Message-ID: <20201126210642.897302-6-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20201126210642.897302-1-mathieu.poirier@linaro.org>
There is a need to know when a remote processor has been attached
to rather than booted by the remoteproc core. In order to avoid
manipulating two variables, i.e rproc::autonomous and
rproc::state, get rid of the former and simply use the newly
introduced RPROC_ATTACHED state.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
---
drivers/remoteproc/remoteproc_core.c | 20 +-------------------
drivers/remoteproc/remoteproc_sysfs.c | 5 +----
include/linux/remoteproc.h | 2 --
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index a2b9cd541315..300785a18f03 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1444,7 +1444,7 @@ static int rproc_attach(struct rproc *rproc)
goto stop_rproc;
}
- rproc->state = RPROC_RUNNING;
+ rproc->state = RPROC_ATTACHED;
dev_info(dev, "remote processor %s is now attached\n", rproc->name);
@@ -1659,14 +1659,6 @@ static int rproc_stop(struct rproc *rproc, bool crashed)
rproc->state = RPROC_OFFLINE;
- /*
- * The remote processor has been stopped and is now offline, which means
- * that the next time it is brought back online the remoteproc core will
- * be responsible to load its firmware. As such it is no longer
- * autonomous.
- */
- rproc->autonomous = false;
-
dev_info(dev, "stopped remote processor %s\n", rproc->name);
return 0;
@@ -2080,16 +2072,6 @@ int rproc_add(struct rproc *rproc)
if (ret < 0)
return ret;
- /*
- * Remind ourselves the remote processor has been attached to rather
- * than booted by the remoteproc core. This is important because the
- * RPROC_DETACHED state will be lost as soon as the remote processor
- * has been attached to. Used in firmware_show() and reset in
- * rproc_stop().
- */
- if (rproc->state == RPROC_DETACHED)
- rproc->autonomous = true;
-
/* if rproc is marked always-on, request it to boot */
if (rproc->auto_boot) {
ret = rproc_trigger_auto_boot(rproc);
diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c
index 4b4aab0d4c4b..f9694def9b54 100644
--- a/drivers/remoteproc/remoteproc_sysfs.c
+++ b/drivers/remoteproc/remoteproc_sysfs.c
@@ -138,11 +138,8 @@ static ssize_t firmware_show(struct device *dev, struct device_attribute *attr,
* If the remote processor has been started by an external
* entity we have no idea of what image it is running. As such
* simply display a generic string rather then rproc->firmware.
- *
- * Here we rely on the autonomous flag because a remote processor
- * may have been attached to and currently in a running state.
*/
- if (rproc->autonomous)
+ if (rproc->state == RPROC_ATTACHED)
firmware = "unknown";
return sprintf(buf, "%s\n", firmware);
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 71d531c64dfd..9be112b5c09d 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -510,7 +510,6 @@ struct rproc_dump_segment {
* @table_sz: size of @cached_table
* @has_iommu: flag to indicate if remote processor is behind an MMU
* @auto_boot: flag to indicate if remote processor should be auto-started
- * @autonomous: true if an external entity has booted the remote processor
* @dump_segments: list of segments in the firmware
* @nb_vdev: number of vdev currently handled by rproc
* @char_dev: character device of the rproc
@@ -547,7 +546,6 @@ struct rproc {
size_t table_sz;
bool has_iommu;
bool auto_boot;
- bool autonomous;
struct list_head dump_segments;
int nb_vdev;
u8 elf_class;
--
2.25.1
next prev parent reply other threads:[~2020-11-26 21:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 21:06 [PATCH v3 00/15] remoteproc: Add support for detaching from rproc Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 01/15] dt-bindings: remoteproc: Add bindind to support autonomous processors Mathieu Poirier
2020-11-30 17:23 ` Rob Herring
2020-11-30 17:33 ` Rob Herring
2020-12-01 23:43 ` Mathieu Poirier
2020-12-10 23:10 ` Rob Herring
2020-11-26 21:06 ` [PATCH v3 02/15] remoteproc: Re-check state in rproc_shutdown() Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 03/15] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 04/15] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2020-11-26 21:06 ` Mathieu Poirier [this message]
2020-11-26 21:06 ` [PATCH v3 06/15] remoteproc: Properly deal with a kernel panic when attached Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 07/15] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2020-12-02 18:13 ` Arnaud POULIQUEN
2020-11-26 21:06 ` [PATCH v3 08/15] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 09/15] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2020-12-08 18:35 ` Arnaud POULIQUEN
2020-12-08 20:25 ` Mathieu Poirier
2020-12-09 0:53 ` Mathieu Poirier
2020-12-09 8:45 ` Arnaud POULIQUEN
2020-12-09 21:18 ` Mathieu Poirier
2020-12-10 8:51 ` Arnaud POULIQUEN
2020-11-26 21:06 ` [PATCH v3 10/15] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 11/15] remoteproc: Add return value to function rproc_shutdown() Mathieu Poirier
2020-12-02 18:14 ` Arnaud POULIQUEN
2020-11-26 21:06 ` [PATCH v3 12/15] remoteproc: Properly deal with a stop request when attached Mathieu Poirier
2020-11-26 21:06 ` [PATCH v3 13/15] remoteproc: Properly deal with a start " Mathieu Poirier
2020-12-02 18:14 ` Arnaud POULIQUEN
2020-11-26 21:06 ` [PATCH v3 14/15] remoteproc: Properly deal with detach request Mathieu Poirier
2020-12-09 8:47 ` Arnaud POULIQUEN
2020-11-26 21:06 ` [PATCH v3 15/15] remoteproc: Refactor rproc delete and cdev release path Mathieu Poirier
2020-12-09 10:13 ` Arnaud POULIQUEN
2020-12-09 21:34 ` 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=20201126210642.897302-6-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=robh+dt@kernel.org \
/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).