From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org, arnaud.pouliquen@st.com
Cc: devicetree@vger.kernel.org, alexandre.torgue@st.com,
linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
robh+dt@kernel.org, mcoquelin.stm32@gmail.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 16/19] remoteproc: Properly deal with a stop request when attached
Date: Thu, 11 Feb 2021 16:46:24 -0700 [thread overview]
Message-ID: <20210211234627.2669674-17-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210211234627.2669674-1-mathieu.poirier@linaro.org>
This patch introduces the capability to stop a remote processor
that has been attached to by the remoteproc core. For that to
happen a rproc::ops::stop() operation need to be available.
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_cdev.c | 5 +++--
drivers/remoteproc/remoteproc_core.c | 6 +++++-
drivers/remoteproc/remoteproc_sysfs.c | 5 +++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
index b19ea3057bde..d06f8d4919c7 100644
--- a/drivers/remoteproc/remoteproc_cdev.c
+++ b/drivers/remoteproc/remoteproc_cdev.c
@@ -37,10 +37,11 @@ static ssize_t rproc_cdev_write(struct file *filp, const char __user *buf, size_
ret = rproc_boot(rproc);
} else if (!strncmp(cmd, "stop", len)) {
- if (rproc->state != RPROC_RUNNING)
+ if (rproc->state != RPROC_RUNNING &&
+ rproc->state != RPROC_ATTACHED)
return -EINVAL;
- rproc_shutdown(rproc);
+ ret = rproc_shutdown(rproc);
} else {
dev_err(&rproc->dev, "Unrecognized option\n");
ret = -EINVAL;
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 0dd9f02f52b6..12bd177aa8cd 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1740,6 +1740,10 @@ static int rproc_stop(struct rproc *rproc, bool crashed)
struct device *dev = &rproc->dev;
int ret;
+ /* No need to continue if a stop() operation has not been provided */
+ if (!rproc->ops->stop)
+ return -EINVAL;
+
/* Stop any subdevices for the remote processor */
rproc_stop_subdevices(rproc, crashed);
@@ -1977,7 +1981,7 @@ int rproc_shutdown(struct rproc *rproc)
return ret;
}
- if (rproc->state != RPROC_RUNNING) {
+ if (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED) {
ret = -EPERM;
goto out;
}
diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c
index f9694def9b54..3696f2ccc785 100644
--- a/drivers/remoteproc/remoteproc_sysfs.c
+++ b/drivers/remoteproc/remoteproc_sysfs.c
@@ -201,10 +201,11 @@ static ssize_t state_store(struct device *dev,
if (ret)
dev_err(&rproc->dev, "Boot failed: %d\n", ret);
} else if (sysfs_streq(buf, "stop")) {
- if (rproc->state != RPROC_RUNNING)
+ if (rproc->state != RPROC_RUNNING &&
+ rproc->state != RPROC_ATTACHED)
return -EINVAL;
- rproc_shutdown(rproc);
+ ret = rproc_shutdown(rproc);
} else {
dev_err(&rproc->dev, "Unrecognised option: %s\n", buf);
ret = -EINVAL;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-11 23:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 23:46 [PATCH v5 00/19] remoteproc: Add support for detaching a remote processor Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 01/19] dt-bindings: remoteproc: Add bindind to support autonomous processors Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 02/19] remoteproc: Re-check state in rproc_shutdown() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 03/19] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 04/19] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 05/19] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 06/19] remoteproc: Properly represent the attached state Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 07/19] remoteproc: Add new get_loaded_rsc_table() to rproc_ops Mathieu Poirier
2021-02-15 13:10 ` Arnaud POULIQUEN
2021-02-17 21:22 ` Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 08/19] remoteproc: stm32: Move resource table setup " Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 09/19] remoteproc: stm32: Move memory parsing " Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 10/19] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 11/19] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 12/19] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 13/19] remoteproc: Properly deal with the resource table Mathieu Poirier
2021-02-15 12:06 ` Dan Carpenter
2021-02-15 13:19 ` Arnaud POULIQUEN
2021-02-11 23:46 ` [PATCH v5 14/19] remoteproc: Add return value to function rproc_shutdown() Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 15/19] remoteproc: Properly deal with a kernel panic when attached Mathieu Poirier
2021-02-11 23:46 ` Mathieu Poirier [this message]
2021-02-11 23:46 ` [PATCH v5 17/19] remoteproc: Properly deal with a start request " Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 18/19] remoteproc: Properly deal with detach request Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 19/19] remoteproc: Refactor rproc delete and cdev release path 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=20210211234627.2669674-17-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--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).