All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com
Cc: arnaud.pouliquen@st.com, mcoquelin.stm32@gmail.com,
	alexandre.torgue@st.com, linux-remoteproc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 17/17] remoteproc: Refactor function rproc_cdev_release()
Date: Fri, 12 Mar 2021 09:24:53 -0700	[thread overview]
Message-ID: <20210312162453.1234145-18-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210312162453.1234145-1-mathieu.poirier@linaro.org>

Refactor function rproc_cdev_release() to take into account the
current state of the remote processor when choosing the state to
transition to.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/remoteproc/remoteproc_cdev.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
index 2db494816d5f..0b8a84c04f76 100644
--- a/drivers/remoteproc/remoteproc_cdev.c
+++ b/drivers/remoteproc/remoteproc_cdev.c
@@ -86,11 +86,17 @@ static long rproc_device_ioctl(struct file *filp, unsigned int ioctl, unsigned l
 static int rproc_cdev_release(struct inode *inode, struct file *filp)
 {
 	struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev);
+	int ret = 0;
+
+	if (!rproc->cdev_put_on_release)
+		return 0;
 
-	if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING)
+	if (rproc->state == RPROC_RUNNING)
 		rproc_shutdown(rproc);
+	else if (rproc->state == RPROC_ATTACHED)
+		ret = rproc_detach(rproc);
 
-	return 0;
+	return ret;
 }
 
 static const struct file_operations rproc_fops = {
-- 
2.25.1


WARNING: multiple messages have this Message-ID
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com
Cc: arnaud.pouliquen@st.com, mcoquelin.stm32@gmail.com,
	alexandre.torgue@st.com, linux-remoteproc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 17/17] remoteproc: Refactor function rproc_cdev_release()
Date: Fri, 12 Mar 2021 09:24:53 -0700	[thread overview]
Message-ID: <20210312162453.1234145-18-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210312162453.1234145-1-mathieu.poirier@linaro.org>

Refactor function rproc_cdev_release() to take into account the
current state of the remote processor when choosing the state to
transition to.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/remoteproc/remoteproc_cdev.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
index 2db494816d5f..0b8a84c04f76 100644
--- a/drivers/remoteproc/remoteproc_cdev.c
+++ b/drivers/remoteproc/remoteproc_cdev.c
@@ -86,11 +86,17 @@ static long rproc_device_ioctl(struct file *filp, unsigned int ioctl, unsigned l
 static int rproc_cdev_release(struct inode *inode, struct file *filp)
 {
 	struct rproc *rproc = container_of(inode->i_cdev, struct rproc, cdev);
+	int ret = 0;
+
+	if (!rproc->cdev_put_on_release)
+		return 0;
 
-	if (rproc->cdev_put_on_release && rproc->state == RPROC_RUNNING)
+	if (rproc->state == RPROC_RUNNING)
 		rproc_shutdown(rproc);
+	else if (rproc->state == RPROC_ATTACHED)
+		ret = rproc_detach(rproc);
 
-	return 0;
+	return ret;
 }
 
 static const struct file_operations rproc_fops = {
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-03-12 16:26 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 16:24 [PATCH v8 00/17] remoteproc: Add support for detaching a remote processor Mathieu Poirier
2021-03-12 16:24 ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 01/17] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 02/17] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 03/17] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 04/17] remoteproc: Properly represent the attached state Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 05/17] remoteproc: Add new get_loaded_rsc_table() to rproc_ops Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 06/17] remoteproc: stm32: Move resource table setup " Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 07/17] remoteproc: stm32: Move memory parsing " Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 08/17] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 09/17] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 10/17] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 11/17] remoteproc: Properly deal with the resource table when detaching Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 12/17] remoteproc: Properly deal with the resource table when stopping Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 13/17] remoteproc: Properly deal with a kernel panic when attached Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 14/17] remoteproc: Properly deal with a start request " Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 15/17] remoteproc: Properly deal with a stop " Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 16/17] remoteproc: Properly deal with a detach " Mathieu Poirier
2021-03-12 16:24   ` Mathieu Poirier
2021-03-12 16:24 ` Mathieu Poirier [this message]
2021-03-12 16:24   ` [PATCH v8 17/17] remoteproc: Refactor function rproc_cdev_release() 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=20210312162453.1234145-18-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=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 \
    --subject='Re: [PATCH v8 17/17] remoteproc: Refactor function rproc_cdev_release()' \
    /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

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.