From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org, arnaud.pouliquen@st.com
Cc: robh+dt@kernel.org, mcoquelin.stm32@gmail.com,
alexandre.torgue@st.com, linux-remoteproc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 12/19] remoteproc: Introduce function rproc_detach()
Date: Thu, 11 Feb 2021 16:46:20 -0700 [thread overview]
Message-ID: <20210211234627.2669674-13-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210211234627.2669674-1-mathieu.poirier@linaro.org>
Introduce function rproc_detach() to enable the remoteproc
core to release the resources associated with a remote processor
without stopping its operation.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
New for V5:
- Fixed comment about rproc_actuate() that no longer exists.
- Added call to rproc_unprepare_device() to balance rproc_prepare_device() in
function rproc_attach().
- Removed RB from Peng and Arnaud because of the above.
---
drivers/remoteproc/remoteproc_core.c | 66 +++++++++++++++++++++++++++-
include/linux/remoteproc.h | 1 +
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index b150138542d4..660dcc002ff6 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1712,7 +1712,7 @@ static int rproc_stop(struct rproc *rproc, bool crashed)
/*
* __rproc_detach(): Does the opposite of __rproc_attach()
*/
-static int __maybe_unused __rproc_detach(struct rproc *rproc)
+static int __rproc_detach(struct rproc *rproc)
{
struct device *dev = &rproc->dev;
int ret;
@@ -1954,6 +1954,70 @@ void rproc_shutdown(struct rproc *rproc)
}
EXPORT_SYMBOL(rproc_shutdown);
+/**
+ * rproc_detach() - Detach the remote processor from the
+ * remoteproc core
+ *
+ * @rproc: the remote processor
+ *
+ * Detach a remote processor (previously attached to with rproc_attach()).
+ *
+ * In case @rproc is still being used by an additional user(s), then
+ * this function will just decrement the power refcount and exit,
+ * without disconnecting the device.
+ *
+ * Function rproc_detach() calls __rproc_detach() in order to let a remote
+ * processor know that services provided by the application processor are
+ * no longer available. From there it should be possible to remove the
+ * platform driver and even power cycle the application processor (if the HW
+ * supports it) without needing to switch off the remote processor.
+ */
+int rproc_detach(struct rproc *rproc)
+{
+ struct device *dev = &rproc->dev;
+ int ret;
+
+ ret = mutex_lock_interruptible(&rproc->lock);
+ if (ret) {
+ dev_err(dev, "can't lock rproc %s: %d\n", rproc->name, ret);
+ return ret;
+ }
+
+ if (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED) {
+ ret = -EPERM;
+ goto out;
+ }
+
+ /* if the remote proc is still needed, bail out */
+ if (!atomic_dec_and_test(&rproc->power)) {
+ ret = -EBUSY;
+ goto out;
+ }
+
+ ret = __rproc_detach(rproc);
+ if (ret) {
+ atomic_inc(&rproc->power);
+ goto out;
+ }
+
+ /* clean up all acquired resources */
+ rproc_resource_cleanup(rproc);
+
+ /* release HW resources if needed */
+ rproc_unprepare_device(rproc);
+
+ rproc_disable_iommu(rproc);
+
+ /* Follow the same sequence as in rproc_shutdown() */
+ kfree(rproc->cached_table);
+ rproc->cached_table = NULL;
+ rproc->table_ptr = NULL;
+out:
+ mutex_unlock(&rproc->lock);
+ return ret;
+}
+EXPORT_SYMBOL(rproc_detach);
+
/**
* rproc_get_by_phandle() - find a remote processor by phandle
* @phandle: phandle to the rproc
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index eff55ec72e80..e1c843c19cc6 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -662,6 +662,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len,
int rproc_boot(struct rproc *rproc);
void rproc_shutdown(struct rproc *rproc);
+int rproc_detach(struct rproc *rproc);
int rproc_set_firmware(struct rproc *rproc, const char *fw_name);
void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type);
void rproc_coredump_using_sections(struct rproc *rproc);
--
2.25.1
next prev parent reply other threads:[~2021-02-11 23:52 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 ` Mathieu Poirier [this message]
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 ` [PATCH v5 16/19] remoteproc: Properly deal with a stop request " Mathieu Poirier
2021-02-11 23:46 ` [PATCH v5 17/19] remoteproc: Properly deal with a start " 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-13-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).