From: Loic Pallardy <loic.pallardy@st.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>, <lee.jones@linaro.org>
Cc: <loic.pallardy@st.com>, <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <kernel@stlinux.com>
Subject: [PATCH v2 13/19] remoteproc: core: Append resource only if spare resource present
Date: Wed, 31 Aug 2016 22:50:16 +0200 [thread overview]
Message-ID: <1472676622-32533-14-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com>
This patch renames rproc_add_resource_table_entry in __add_rsc_tbl_entry
to have shorter function name and adds spare resource support.
To guarantee remoteproc won't overwrite firmware data when copying
back modified resource table, __add_rsc_tbl_entry verifies first that
resource table owns a spare resource and uses spare bytes to create
a new resource entry. Spare resource is updated according to changes.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 54 ++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index aff1a00..25a429b 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1107,39 +1107,34 @@ static int __update_rsc_tbl_entry(struct rproc *rproc,
return !updated;
}
-static struct resource_table*
-rproc_add_resource_table_entry(struct rproc *rproc,
+static int __add_rsc_tbl_entry(struct rproc *rproc,
struct rproc_request_resource *request,
- struct resource_table *old_table, int *tablesz)
+ struct resource_table *table, int tablesz)
{
- struct resource_table *table;
struct fw_rsc_hdr h;
+ struct fw_rsc_spare spare;
void *new_rsc_loc;
void *fw_header_loc;
void *start_of_rscs;
int new_rsc_offset;
- int size = *tablesz;
- int i;
+ int new_spare_offset;
+ int i, spare_index = 0;
h.type = request->type;
- new_rsc_offset = size;
+ /* check available spare size */
+ spare.len = __get_rsc_tbl_spare_size(rproc, table, tablesz, &spare_index);
+ if (spare.len < (sizeof(h) + request->size + 4)) /* new offset entry */
+ return -EPERM;
- /*
- * Allocate another contiguous chunk of memory, large enough to
- * contain the new, expanded resource table.
- *
- * The +4 is for the extra offset[] element in the top level header
- */
- size += sizeof(struct fw_rsc_hdr) + request->size + 4;
- table = devm_kmemdup(&rproc->dev, old_table, size, GFP_KERNEL);
- if (!table)
- return ERR_PTR(-ENOMEM);
+ new_rsc_offset = table->offset[spare_index];
/* Shunt table by 4 Bytes to account for the extra offset[] element */
start_of_rscs = (void *)table + table->offset[0];
memmove(start_of_rscs + 4,
start_of_rscs, new_rsc_offset - table->offset[0]);
+
+ spare.len -= 4;
new_rsc_offset += 4;
/* Update existing resource entry's offsets */
@@ -1153,13 +1148,27 @@ rproc_add_resource_table_entry(struct rproc *rproc,
/* Copy new firmware header into table */
fw_header_loc = (void *)table + new_rsc_offset;
memcpy(fw_header_loc, &h, sizeof(h));
+ spare.len -= sizeof(h);
/* Copy new resource entry into table */
new_rsc_loc = (void *)fw_header_loc + sizeof(h);
memcpy(new_rsc_loc, request->resource, request->size);
+ spare.len -= request->size;
- *tablesz = size;
- return table;
+ /* create new rsc spare resource at the end of remaining spare */
+ new_spare_offset = new_rsc_offset + sizeof(h) + request->size;
+ h.type = RSC_SPARE;
+
+ fw_header_loc = (void *)table + new_spare_offset;
+ memcpy(fw_header_loc, &h, sizeof(h));
+
+ new_rsc_loc = (void *)fw_header_loc + sizeof(h);
+ memcpy(new_rsc_loc, &spare, sizeof(spare));
+
+ /* update spare offset */
+ table->offset[spare_index] = new_spare_offset;
+
+ return 0;
}
static struct resource_table*
@@ -1203,12 +1212,9 @@ rproc_apply_resource_overrides(struct rproc *rproc,
continue;
/* Didn't find matching resource entry -- creating a new one. */
- table = rproc_add_resource_table_entry(rproc, resource,
- table, &size);
- if (IS_ERR(table))
+ updated = __add_rsc_tbl_entry(rproc, resource, table, size);
+ if (updated)
goto out;
-
- *orig_table = table;
}
rproc_dump_resource_table(rproc, table, size);
--
1.9.1
next prev parent reply other threads:[~2016-08-31 20:52 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-31 20:50 [PATCH v2 00/19] remoteproc: Allow platform-specific drivers to request resources Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 01/19] remoteproc: core: New API to add new resources to the resource table Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 02/19] remoteproc: core: Add function to dump " Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 03/19] remoteproc: core: Add function to amend an existing resource table entry Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 04/19] remoteproc: core: Add function to append a new " Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 05/19] remoteproc: core: Add function to over-ride current resource table Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 06/19] remoteproc: core: Add explicit message error if cached table failed Loic Pallardy
2016-09-01 7:09 ` Lee Jones
2016-09-08 9:40 ` loic pallardy
2016-08-31 20:50 ` [PATCH v2 07/19] remoteproc: Add new resource type for resource table spare bytes Loic Pallardy
2016-09-15 17:54 ` Bjorn Andersson
2016-09-16 9:02 ` loic pallardy
2016-09-16 17:12 ` Bjorn Andersson
2016-09-19 7:50 ` loic pallardy
2016-08-31 20:50 ` [PATCH v2 08/19] remoteproc: core: Associate action to resource request Loic Pallardy
2016-09-01 7:23 ` Lee Jones
2016-09-08 9:43 ` loic pallardy
2016-09-08 11:03 ` Lee Jones
2016-08-31 20:50 ` [PATCH v2 09/19] remoteproc: core: Finalize dump resource table function Loic Pallardy
2016-09-08 8:26 ` Lee Jones
2016-09-08 9:46 ` loic pallardy
2016-08-31 20:50 ` [PATCH v2 10/19] remoteproc: core: Add function to verify an existing resource in rsc table Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 11/19] remoteproc: core: Add function to get resource table spare bytes information Loic Pallardy
2016-09-08 8:32 ` Lee Jones
2016-09-08 9:47 ` loic pallardy
2016-08-31 20:50 ` [PATCH v2 12/19] remoteproc: core: Add vdev support and force mode to resource amending function Loic Pallardy
2016-09-08 8:48 ` Lee Jones
2016-09-08 9:49 ` loic pallardy
2016-09-08 11:02 ` Lee Jones
2016-09-08 13:11 ` loic pallardy
2016-08-31 20:50 ` Loic Pallardy [this message]
2016-09-08 9:33 ` [PATCH v2 13/19] remoteproc: core: Append resource only if spare resource present Lee Jones
2016-09-08 9:54 ` loic pallardy
2016-09-08 11:00 ` Lee Jones
2016-08-31 20:50 ` [PATCH v2 14/19] remoteproc: core: Add resource request action support Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 15/19] remoteproc: core: Add function to verify resource table consistency Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 16/19] remoteproc: core: Clean-up resource table sanity checks Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 17/19] remotecore: core: Add resource table pointer argument to rproc_handle_resource Loic Pallardy
2016-08-31 20:50 ` [PATCH v2 18/19] remoteproc: core: Add function to create remoteproc local resource table Loic Pallardy
2016-09-08 10:20 ` Lee Jones
2016-09-08 13:15 ` loic pallardy
2016-09-15 18:58 ` Bjorn Andersson
2016-09-19 7:46 ` loic pallardy
2016-08-31 20:50 ` [PATCH v2 19/19] remoteproc: core: Support empty resource tables Loic Pallardy
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=1472676622-32533-14-git-send-email-loic.pallardy@st.com \
--to=loic.pallardy@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=kernel@stlinux.com \
--cc=lee.jones@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).