From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 9/9] remoteproc: core: Support empty resource tables
Date: Thu, 4 Aug 2016 10:21:53 +0100 [thread overview]
Message-ID: <20160804092153.23032-10-lee.jones@linaro.org> (raw)
In-Reply-To: <20160804092153.23032-1-lee.jones@linaro.org>
Currently, when a remote processor does not require resources, the
platform-specific remoteproc driver has to create a fake resource
table in order to by-pass the strict checking. But there is no hard
requirement for a remote processor so require or support shared
resources. This patch removes the strict checking and skips
resource table related operations if one is not provided.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/remoteproc/remoteproc_core.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 9a077e4..366e197 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1104,9 +1104,6 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
struct resource_table *table, *loaded_table;
int ret, tablesz;
- if (!rproc->table_ptr)
- return -ENOMEM;
-
ret = rproc_fw_sanity_check(rproc, fw);
if (ret)
return ret;
@@ -1130,12 +1127,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
if (!list_empty(&rproc->override_resources))
goto skip_table_check;
- /* look for the resource table */
+ /* Resource tables aren't compulsory. */
table = rproc_find_rsc_table(rproc, fw, &tablesz);
- if (!table) {
- dev_err(dev, "Failed to find resource table\n");
- goto clean_up;
- }
+ if (!table)
+ goto skip_resources;
/* Verify that resource table in loaded fw is unchanged */
if (rproc->table_csum != crc32(0, table, tablesz)) {
@@ -1152,6 +1147,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
goto clean_up;
}
+ skip_resources:
+
/* load the ELF segments to memory */
ret = rproc_load_segments(rproc, fw);
if (ret) {
@@ -1213,8 +1210,12 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
if (rproc_fw_sanity_check(rproc, fw) < 0)
goto out;
- /* look for the resource table */
table = rproc_find_rsc_table(rproc, fw, &tablesz);
+ if (IS_ERR(table)) {
+ dev_err(&rproc->dev, "Resource table expected, but failed\n");
+ goto out;
+ }
+
if (!table)
goto out;
--
2.9.0
next prev parent reply other threads:[~2016-08-04 9:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 9:21 [PATCH 0/9] remoteproc: Allow platform-specific drivers to request resources Lee Jones
2016-08-04 9:21 ` [PATCH 1/9] remoteproc: core: Ensure error message is clear Lee Jones
2016-08-09 17:28 ` Bjorn Andersson
2016-08-09 18:12 ` Lee Jones
2016-08-10 20:11 ` Suman Anna
2016-08-11 7:36 ` Lee Jones
2016-08-11 19:19 ` Bjorn Andersson
2016-08-11 20:09 ` Suman Anna
2016-08-04 9:21 ` [PATCH 2/9] remoteproc: core: Trivial: Improve error checking, spelling and debug prints Lee Jones
2016-08-09 17:32 ` Bjorn Andersson
2016-08-09 18:12 ` Lee Jones
2016-08-04 9:21 ` [PATCH 3/9] remoteproc: core: Remove pointless OOM print Lee Jones
2016-08-09 17:36 ` Bjorn Andersson
2016-08-09 18:10 ` Lee Jones
2016-08-10 17:47 ` Bjorn Andersson
2016-08-04 9:21 ` [PATCH 4/9] remoteproc: core: New API to add new resources to the resource table Lee Jones
2016-08-04 14:00 ` Lee Jones
2016-08-08 13:41 ` loic pallardy
2016-08-09 12:48 ` Lee Jones
2016-08-04 9:21 ` [PATCH 5/9] remoteproc: core: Add function to amend an existing resource table entry Lee Jones
2016-08-04 9:21 ` [PATCH 6/9] remoteproc: core: Add function to append a new " Lee Jones
2016-08-11 7:51 ` loic pallardy
2016-08-11 20:20 ` Bjorn Andersson
2016-08-12 11:54 ` loic pallardy
2016-08-04 9:21 ` [PATCH 7/9] remoteproc: core: Add function to over-ride current resource table Lee Jones
2016-08-08 13:47 ` loic pallardy
2016-08-09 12:46 ` Lee Jones
2016-08-04 9:21 ` [PATCH 8/9] remoteproc: core: Skip resource table integrity checks if there are amendments Lee Jones
2016-08-09 17:40 ` Bjorn Andersson
2016-08-04 9:21 ` Lee Jones [this message]
2016-08-05 7:38 ` [PATCH 9/9] remoteproc: core: Support empty resource tables Lee Jones
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=20160804092153.23032-10-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).