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 05/17] remoteproc: Add new get_loaded_rsc_table() to rproc_ops
Date: Fri, 12 Mar 2021 09:24:41 -0700 [thread overview]
Message-ID: <20210312162453.1234145-6-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20210312162453.1234145-1-mathieu.poirier@linaro.org>
Add a new get_loaded_rsc_table() operation in order to support
scenarios where the remoteproc core has booted a remote processor
and detaches from it. When re-attaching to the remote processor,
the core needs to know where the resource table has been placed
in memory.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
---
drivers/remoteproc/remoteproc_core.c | 32 ++++++++++++++++++++++++
drivers/remoteproc/remoteproc_internal.h | 10 ++++++++
include/linux/remoteproc.h | 6 ++++-
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8c7e9f1d50d7..bf6f6d15b1c3 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1537,6 +1537,32 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
return ret;
}
+static int rproc_set_rsc_table(struct rproc *rproc)
+{
+ struct resource_table *table_ptr;
+ struct device *dev = &rproc->dev;
+ size_t table_sz;
+ int ret;
+
+ table_ptr = rproc_get_loaded_rsc_table(rproc, &table_sz);
+ if (!table_ptr) {
+ /* Not having a resource table is acceptable */
+ return 0;
+ }
+
+ if (IS_ERR(table_ptr)) {
+ ret = PTR_ERR(table_ptr);
+ dev_err(dev, "can't load resource table: %d\n", ret);
+ return ret;
+ }
+
+ rproc->cached_table = NULL;
+ rproc->table_ptr = table_ptr;
+ rproc->table_sz = table_sz;
+
+ return 0;
+}
+
/*
* Attach to remote processor - similar to rproc_fw_boot() but without
* the steps that deal with the firmware image.
@@ -1556,6 +1582,12 @@ static int rproc_attach(struct rproc *rproc)
return ret;
}
+ ret = rproc_set_rsc_table(rproc);
+ if (ret) {
+ dev_err(dev, "can't load resource table: %d\n", ret);
+ goto disable_iommu;
+ }
+
/* reset max_notifyid */
rproc->max_notifyid = -1;
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index c34002888d2c..4f73aac7e60d 100644
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -177,6 +177,16 @@ struct resource_table *rproc_find_loaded_rsc_table(struct rproc *rproc,
return NULL;
}
+static inline
+struct resource_table *rproc_get_loaded_rsc_table(struct rproc *rproc,
+ size_t *size)
+{
+ if (rproc->ops->get_loaded_rsc_table)
+ return rproc->ops->get_loaded_rsc_table(rproc, size);
+
+ return NULL;
+}
+
static inline
bool rproc_u64_fit_in_size_t(u64 val)
{
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 6b0a0ed30a03..51538a7d120d 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -368,7 +368,9 @@ enum rsc_handling_status {
* RSC_HANDLED if resource was handled, RSC_IGNORED if not handled and a
* negative value on error
* @load_rsc_table: load resource table from firmware image
- * @find_loaded_rsc_table: find the loaded resouce table
+ * @find_loaded_rsc_table: find the loaded resource table from firmware image
+ * @get_loaded_rsc_table: get resource table installed in memory
+ * by external entity
* @load: load firmware to memory, where the remote processor
* expects to find it
* @sanity_check: sanity check the fw image
@@ -390,6 +392,8 @@ struct rproc_ops {
int offset, int avail);
struct resource_table *(*find_loaded_rsc_table)(
struct rproc *rproc, const struct firmware *fw);
+ struct resource_table *(*get_loaded_rsc_table)(
+ struct rproc *rproc, size_t *size);
int (*load)(struct rproc *rproc, const struct firmware *fw);
int (*sanity_check)(struct rproc *rproc, const struct firmware *fw);
u64 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw);
--
2.25.1
next prev parent reply other threads:[~2021-03-12 16:26 UTC|newest]
Thread overview: 18+ 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 ` [PATCH v8 01/17] remoteproc: Remove useless check in rproc_del() Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 02/17] remoteproc: Rename function rproc_actuate() Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 03/17] remoteproc: Add new RPROC_ATTACHED state 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 [this message]
2021-03-12 16:24 ` [PATCH v8 06/17] remoteproc: stm32: Move resource table setup to rproc_ops Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 07/17] remoteproc: stm32: Move memory parsing " Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 08/17] remoteproc: Add new detach() remoteproc operation Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 09/17] remoteproc: Introduce function __rproc_detach() Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 10/17] remoteproc: Introduce function rproc_detach() 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 ` [PATCH v8 12/17] remoteproc: Properly deal with the resource table when stopping 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 ` [PATCH v8 14/17] remoteproc: Properly deal with a start request " Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 15/17] remoteproc: Properly deal with a stop " Mathieu Poirier
2021-03-12 16:24 ` [PATCH v8 16/17] remoteproc: Properly deal with a detach " Mathieu Poirier
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-6-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 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).