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, arnaud.pouliquen@st.com
Cc: 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 v6 16/16] remoteproc: Refactor rproc delete and cdev release path
Date: Tue, 23 Feb 2021 16:35:15 -0700	[thread overview]
Message-ID: <20210223233515.3468677-17-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210223233515.3468677-1-mathieu.poirier@linaro.org>

Refactor function rproc_del() and 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>
---
New for V6:
- The RPROC_RUNNING -> RPROC_DETACHED transition is no longer permitted.
  to avoid dealing with complex resource table management problems.
- Transition to the next state is no longer dictated by a DT binding for
  the same reason as above.
- Removed Peng and Arnaud's RB tags because of the above.
---

 drivers/remoteproc/remoteproc_cdev.c | 10 ++++++++--
 drivers/remoteproc/remoteproc_core.c |  9 +++++++--
 2 files changed, 15 insertions(+), 4 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 = {
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 00452da25fba..a05d5fec43b1 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2542,11 +2542,16 @@ EXPORT_SYMBOL(rproc_put);
  */
 int rproc_del(struct rproc *rproc)
 {
+	int ret = 0;
+
 	if (!rproc)
 		return -EINVAL;
 
 	/* TODO: make sure this works with rproc->power > 1 */
-	rproc_shutdown(rproc);
+	if (rproc->state == RPROC_RUNNING)
+		rproc_shutdown(rproc);
+	else if (rproc->state == RPROC_ATTACHED)
+		ret = rproc_detach(rproc);
 
 	mutex_lock(&rproc->lock);
 	rproc->state = RPROC_DELETED;
@@ -2565,7 +2570,7 @@ int rproc_del(struct rproc *rproc)
 
 	device_del(&rproc->dev);
 
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(rproc_del);
 
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org, arnaud.pouliquen@st.com
Cc: linux-arm-kernel@lists.infradead.org,
	linux-remoteproc@vger.kernel.org, alexandre.torgue@st.com,
	mcoquelin.stm32@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH v6 16/16] remoteproc: Refactor rproc delete and cdev release path
Date: Tue, 23 Feb 2021 16:35:15 -0700	[thread overview]
Message-ID: <20210223233515.3468677-17-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210223233515.3468677-1-mathieu.poirier@linaro.org>

Refactor function rproc_del() and 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>
---
New for V6:
- The RPROC_RUNNING -> RPROC_DETACHED transition is no longer permitted.
  to avoid dealing with complex resource table management problems.
- Transition to the next state is no longer dictated by a DT binding for
  the same reason as above.
- Removed Peng and Arnaud's RB tags because of the above.
---

 drivers/remoteproc/remoteproc_cdev.c | 10 ++++++++--
 drivers/remoteproc/remoteproc_core.c |  9 +++++++--
 2 files changed, 15 insertions(+), 4 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 = {
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 00452da25fba..a05d5fec43b1 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2542,11 +2542,16 @@ EXPORT_SYMBOL(rproc_put);
  */
 int rproc_del(struct rproc *rproc)
 {
+	int ret = 0;
+
 	if (!rproc)
 		return -EINVAL;
 
 	/* TODO: make sure this works with rproc->power > 1 */
-	rproc_shutdown(rproc);
+	if (rproc->state == RPROC_RUNNING)
+		rproc_shutdown(rproc);
+	else if (rproc->state == RPROC_ATTACHED)
+		ret = rproc_detach(rproc);
 
 	mutex_lock(&rproc->lock);
 	rproc->state = RPROC_DELETED;
@@ -2565,7 +2570,7 @@ int rproc_del(struct rproc *rproc)
 
 	device_del(&rproc->dev);
 
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(rproc_del);
 
-- 
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-02-23 23:46 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-23 23:34 [PATCH v6 00/16] remoteproc: Add support for detaching a remote processor Mathieu Poirier
2021-02-23 23:34 ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 01/16] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 02/16] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 03/16] remoteproc: Add new RPROC_ATTACHED state Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 04/16] remoteproc: Properly represent the attached state Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 05/16] remoteproc: Add new get_loaded_rsc_table() to rproc_ops Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:14   ` Arnaud POULIQUEN
2021-02-26 16:14     ` Arnaud POULIQUEN
2021-03-01 18:03     ` Mathieu Poirier
2021-03-01 18:03       ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 06/16] remoteproc: stm32: Move resource table setup " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:14   ` Arnaud POULIQUEN
2021-02-26 16:14     ` Arnaud POULIQUEN
2021-02-23 23:35 ` [PATCH v6 07/16] remoteproc: stm32: Move memory parsing " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 08/16] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 09/16] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:15   ` Arnaud POULIQUEN
2021-02-26 16:15     ` Arnaud POULIQUEN
2021-02-23 23:35 ` [PATCH v6 10/16] remoteproc: Introduce function rproc_detach() Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:15   ` Arnaud POULIQUEN
2021-02-26 16:15     ` Arnaud POULIQUEN
2021-02-23 23:35 ` [PATCH v6 11/16] remoteproc: Properly deal with the resource table when attached Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:21   ` Arnaud POULIQUEN
2021-02-26 16:21     ` Arnaud POULIQUEN
2021-03-01 18:41     ` Mathieu Poirier
2021-03-01 18:41       ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 12/16] remoteproc: Properly deal with a kernel panic " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 13/16] remoteproc: Properly deal with a start request " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-23 23:35 ` [PATCH v6 14/16] remoteproc: Properly deal with a stop " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:21   ` Arnaud POULIQUEN
2021-02-26 16:21     ` Arnaud POULIQUEN
2021-02-23 23:35 ` [PATCH v6 15/16] remoteproc: Properly deal with a detach " Mathieu Poirier
2021-02-23 23:35   ` Mathieu Poirier
2021-02-26 16:21   ` Arnaud POULIQUEN
2021-02-26 16:21     ` Arnaud POULIQUEN
2021-02-23 23:35 ` Mathieu Poirier [this message]
2021-02-23 23:35   ` [PATCH v6 16/16] remoteproc: Refactor rproc delete and cdev release path Mathieu Poirier
2021-02-26 16:23   ` Arnaud POULIQUEN
2021-02-26 16:23     ` Arnaud POULIQUEN
2021-03-01 18:58     ` Mathieu Poirier
2021-03-01 18:58       ` Mathieu Poirier
2021-02-26 16:40 ` [PATCH v6 00/16] remoteproc: Add support for detaching a remote processor Arnaud POULIQUEN
2021-02-26 16:40   ` Arnaud POULIQUEN
2021-03-01 18:58   ` Mathieu Poirier
2021-03-01 18:58     ` 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=20210223233515.3468677-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=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 \
    /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.