All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org
Cc: arnaud.pouliquen@st.com, linux-remoteproc@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 14/17] remoteproc: Properly deal with a stop request when attached
Date: Fri, 18 Dec 2020 10:32:25 -0700	[thread overview]
Message-ID: <20201218173228.2277032-15-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20201218173228.2277032-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 90057ad1bb6c..2fe42ac7ca89 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1648,6 +1648,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);
 
@@ -1897,7 +1901,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 99ff51fd9707..96751c087585 100644
--- a/drivers/remoteproc/remoteproc_sysfs.c
+++ b/drivers/remoteproc/remoteproc_sysfs.c
@@ -230,10 +230,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


  parent reply	other threads:[~2020-12-18 17:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18 17:32 [PATCH v4 00/17] remoteproc: Add support for detaching a rproc Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 01/17] dt-bindings: remoteproc: Add bindind to support autonomous processors Mathieu Poirier
2021-01-20 15:53   ` Rob Herring
2020-12-18 17:32 ` [PATCH v4 02/17] remoteproc: Re-check state in rproc_shutdown() Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 03/17] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 04/17] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 05/17] remoteproc: Add new get_loaded_rsc_table() remoteproc operation Mathieu Poirier
2021-01-27  8:44   ` Arnaud POULIQUEN
2021-01-29 21:37     ` Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 06/17] remoteproc: stm32: Move resource table setup to rproc_ops Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 07/17] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 08/17] remoteproc: Properly represent the attached state Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 09/17] remoteproc: Properly deal with a kernel panic when attached Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 10/17] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 11/17] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2021-01-27  8:46   ` Arnaud POULIQUEN
2021-01-29 22:17     ` Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 12/17] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2021-01-27  8:50   ` Arnaud POULIQUEN
2021-01-29 22:31     ` Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 13/17] remoteproc: Add return value to function rproc_shutdown() Mathieu Poirier
2020-12-18 17:32 ` Mathieu Poirier [this message]
2020-12-18 17:32 ` [PATCH v4 15/17] remoteproc: Properly deal with a start request when attached Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 16/17] remoteproc: Properly deal with detach request Mathieu Poirier
2020-12-18 17:32 ` [PATCH v4 17/17] remoteproc: Refactor rproc delete and cdev release path Mathieu Poirier
2021-01-27  8:56   ` Arnaud POULIQUEN
2021-01-27  9:21 ` [PATCH v4 00/17] remoteproc: Add support for detaching a rproc Arnaud POULIQUEN
2021-02-02  0:49   ` Mathieu Poirier
2021-02-02  8:54     ` Arnaud POULIQUEN
2021-02-02 22:42       ` Mathieu Poirier
2021-02-03  7:58         ` Arnaud POULIQUEN
2021-02-08 23:43           ` 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=20201218173228.2277032-15-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.