From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: ohad@wizery.com, bjorn.andersson@linaro.org
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 4/9] remoteproc: Introducing function rproc_actuate()
Date: Tue, 7 Jul 2020 15:00:09 -0600 [thread overview]
Message-ID: <20200707210014.927691-5-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200707210014.927691-1-mathieu.poirier@linaro.org>
Introduce function rproc_actuate() that provides the same
functionatlity as rproc_fw_boot(), but without the steps that
involve interaction with the firmware image. That way we can
deal with scenarios where the remoteproc core is attaching
to a remote processor that has already been started by another
entity.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/remoteproc/remoteproc_core.c | 59 +++++++++++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1e8e66a25bd6..fd424662801f 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1369,7 +1369,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
return ret;
}
-static int __maybe_unused rproc_attach(struct rproc *rproc)
+static int rproc_attach(struct rproc *rproc)
{
struct device *dev = &rproc->dev;
int ret;
@@ -1490,6 +1490,63 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
return ret;
}
+/*
+ * Attach to remote processor - similar to rproc_fw_boot() but without
+ * the steps that deal with the firmware image.
+ */
+static int __maybe_unused rproc_actuate(struct rproc *rproc)
+{
+ struct device *dev = &rproc->dev;
+ int ret;
+
+ /*
+ * if enabling an IOMMU isn't relevant for this rproc, this is
+ * just a nop
+ */
+ ret = rproc_enable_iommu(rproc);
+ if (ret) {
+ dev_err(dev, "can't enable iommu: %d\n", ret);
+ return ret;
+ }
+
+ /* reset max_notifyid */
+ rproc->max_notifyid = -1;
+
+ /* reset handled vdev */
+ rproc->nb_vdev = 0;
+
+ /*
+ * Handle firmware resources required to attach to a remote processor.
+ * Because we are attaching rather than booting the remote processor,
+ * we expect the platform driver to properly set rproc->table_ptr.
+ */
+ ret = rproc_handle_resources(rproc, rproc_loading_handlers);
+ if (ret) {
+ dev_err(dev, "Failed to process resources: %d\n", ret);
+ goto disable_iommu;
+ }
+
+ /* Allocate carveout resources associated to rproc */
+ ret = rproc_alloc_registered_carveouts(rproc);
+ if (ret) {
+ dev_err(dev, "Failed to allocate associated carveouts: %d\n",
+ ret);
+ goto clean_up_resources;
+ }
+
+ ret = rproc_attach(rproc);
+ if (ret)
+ goto clean_up_resources;
+
+ return 0;
+
+clean_up_resources:
+ rproc_resource_cleanup(rproc);
+disable_iommu:
+ rproc_disable_iommu(rproc);
+ return ret;
+}
+
/*
* take a firmware and boot it up.
*
--
2.25.1
next prev parent reply other threads:[~2020-07-07 21:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 21:00 [PATCH v5 0/9] remoteproc: Add support for attaching with rproc Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 1/9] remoteproc: Add new RPROC_DETACHED state Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 2/9] remoteproc: Add new attach() remoteproc operation Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 3/9] remoteproc: Introducing function rproc_attach() Mathieu Poirier
2020-07-07 21:00 ` Mathieu Poirier [this message]
2020-07-09 8:29 ` [PATCH v5 4/9] remoteproc: Introducing function rproc_actuate() Arnaud POULIQUEN
2020-07-07 21:00 ` [PATCH v5 5/9] remoteproc: Introducing function rproc_validate() Mathieu Poirier
2020-07-09 8:32 ` Arnaud POULIQUEN
2020-07-07 21:00 ` [PATCH v5 6/9] remoteproc: Refactor function rproc_boot() Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 7/9] remoteproc: Refactor function rproc_trigger_auto_boot() Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 8/9] remoteproc: Refactor function rproc_free_vring() Mathieu Poirier
2020-07-07 21:00 ` [PATCH v5 9/9] remoteproc: Properly handle firmware name when attaching Mathieu Poirier
2020-07-09 8:58 ` Arnaud POULIQUEN
2020-07-09 16:23 ` [PATCH v5 0/9] remoteproc: Add support for attaching with rproc Arnaud POULIQUEN
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=20200707210014.927691-5-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.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).