From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org
Cc: linux-remoteproc@vger.kernel.org
Subject: [RFC v2 14/14] remoteproc: Refactor rproc delete and cdev release path
Date: Fri, 30 Oct 2020 13:57:13 -0600 [thread overview]
Message-ID: <20201030195713.1366341-15-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20201030195713.1366341-1-mathieu.poirier@linaro.org>
Refactor function rproc_del() and rproc_cdev_release() to take
into account the policy specified in the device tree.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/remoteproc/remoteproc_cdev.c | 13 ++++++++++++-
drivers/remoteproc/remoteproc_core.c | 12 ++++++++++--
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
index 3a3830e27050..2e3f85920e5b 100644
--- a/drivers/remoteproc/remoteproc_cdev.c
+++ b/drivers/remoteproc/remoteproc_cdev.c
@@ -87,7 +87,18 @@ static int rproc_cdev_release(struct inode *inode, struct file *filp)
{
struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev);
- if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING)
+ if (!rproc->cdev_put_on_release)
+ return 0;
+
+ /*
+ * The application has crashed or is releasing its file handle. Detach
+ * or shutdown the remote processor based on the policy specified in the
+ * DT. No need to check rproc->state right away, it will be done
+ * in either rproc_detach() or rproc_shutdown().
+ */
+ if (rproc->autonomous_on_core_reboot)
+ rproc_detach(rproc);
+ else
rproc_shutdown(rproc);
return 0;
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index d024367c63e5..9652e543c1ed 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2393,8 +2393,16 @@ int rproc_del(struct rproc *rproc)
if (!rproc)
return -EINVAL;
- /* TODO: make sure this works with rproc->power > 1 */
- rproc_shutdown(rproc);
+ /*
+ * TODO: make sure this works with rproc->power > 1
+ *
+ * No need to check rproc->state right away, it will be done in either
+ * rproc_detach() or rproc_shutdown().
+ */
+ if (rproc->autonomous_on_core_reboot)
+ rproc_detach(rproc);
+ else
+ rproc_shutdown(rproc);
mutex_lock(&rproc->lock);
rproc->state = RPROC_DELETED;
--
2.25.1
next prev parent reply other threads:[~2020-10-30 19:57 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 19:56 [PATCH v2 00/14] remoteproc: Add support for detaching from rproc Mathieu Poirier
2020-10-30 19:57 ` [PATCH v2 01/14] remoteproc: Re-check state in rproc_shutdown() Mathieu Poirier
2020-11-09 9:40 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 02/14] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2020-11-09 9:40 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 03/14] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2020-11-09 9:41 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 04/14] remoteproc: Properly represent the attached state Mathieu Poirier
2020-11-09 9:41 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 05/14] remoteproc: Properly deal with a kernel panic when attached Mathieu Poirier
2020-11-09 9:41 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 06/14] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2020-11-06 17:31 ` Arnaud POULIQUEN
2020-11-19 23:06 ` Mathieu Poirier
2020-10-30 19:57 ` [PATCH v2 07/14] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2020-11-06 17:43 ` Arnaud POULIQUEN
2020-11-19 23:27 ` Mathieu Poirier
2020-10-30 19:57 ` [PATCH v2 08/14] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2020-11-09 9:05 ` Arnaud POULIQUEN
2020-11-19 23:40 ` Mathieu Poirier
2020-10-30 19:57 ` [PATCH v2 09/14] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2020-11-09 9:41 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 10/14] remoteproc: Add return value to function rproc_shutdown() Mathieu Poirier
2020-11-09 9:14 ` Arnaud POULIQUEN
2020-11-19 23:46 ` Mathieu Poirier
2020-10-30 19:57 ` [PATCH v2 11/14] remoteproc: Properly deal with a stop request when attached Mathieu Poirier
2020-11-09 9:42 ` Arnaud POULIQUEN
2020-11-12 17:36 ` Arnaud POULIQUEN
2020-10-30 19:57 ` [PATCH v2 12/14] remoteproc: Properly deal with detach request Mathieu Poirier
2020-10-30 19:57 ` [RFC v2 13/14] remoteproc: Add automation flags Mathieu Poirier
2020-11-06 14:38 ` Arnaud POULIQUEN
2020-11-06 17:20 ` Mathieu Poirier
2020-11-12 13:56 ` Arnaud POULIQUEN
2020-11-13 21:27 ` Mathieu Poirier
2020-11-16 10:21 ` Arnaud POULIQUEN
2020-11-20 20:40 ` Mathieu Poirier
2020-10-30 19:57 ` Mathieu Poirier [this message]
2020-11-12 18:20 ` [PATCH v2 00/14] remoteproc: Add support for detaching from rproc Arnaud POULIQUEN
2020-11-12 18:41 ` 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=20201030195713.1366341-15-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.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).