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 v3 14/20] remoteproc: core: Add force mode to resource amending function
Date: Wed, 12 Oct 2016 18:00:32 +0200 [thread overview]
Message-ID: <1476288038-24909-15-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1476288038-24909-1-git-send-email-loic.pallardy@st.com>
This patch adds force mode to rproc_update_resource_table_entry function.
When force is unset, resource will be updated only if no specific
addresses are requested by firmware.
When force is set, resource is directly overwritten.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 26fc647..3847fd4 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -980,7 +980,8 @@ static int rproc_verify_resource_table_entry(struct rproc *rproc,
static int rproc_update_resource_table_entry(struct rproc *rproc,
struct rproc_request_resource *request,
- struct resource_table *table, int size)
+ struct resource_table *table, int size,
+ bool force)
{
struct fw_rsc_carveout *tblc, *newc;
struct fw_rsc_devmem *tbld, *newd;
@@ -1005,7 +1006,8 @@ static int rproc_update_resource_table_entry(struct rproc *rproc,
if (strncmp(newc->name, tblc->name, 32))
break;
- memcpy(tblc, newc, request->size);
+ if (tblc->pa == FW_RSC_ADDR_ANY || force)
+ memcpy(tblc, newc, request->size);
return updated;
case RSC_DEVMEM:
@@ -1143,7 +1145,7 @@ rproc_apply_resource_overrides(struct rproc *rproc,
/* If we already have a table, update it with the new values. */
updated = rproc_update_resource_table_entry(rproc, resource,
- table, size);
+ table, size, false);
if (updated < 0) {
table = ERR_PTR(updated);
goto out;
--
1.9.1
next prev parent reply other threads:[~2016-10-12 16:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 16:00 [PATCH v3 00/20] remoteproc: Allow platform-specific drivers to request resources Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 01/20] remoteproc: core: New API to add new resources to the resource table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 02/20] remoteproc: core: Add function to dump " Loic Pallardy
2016-10-14 8:37 ` Matt Redfearn
2016-10-17 16:26 ` loic pallardy
2016-10-12 16:00 ` [PATCH v3 03/20] remoteproc: core: Add function to amend an existing resource table entry Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 04/20] remoteproc: core: Add function to append a new " Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 05/20] remoteproc: core: Add function to over-ride current resource table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 06/20] remoteproc: core: Associate action to resource request Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 07/20] remoteproc: core: Add RSC_VDEV support to rproc_request_resource Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 08/20] remoteproc: core: Complete VDEV support in rproc_dump_resource_table function Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 09/20] remoteproc: core: Unify rproc_dump_resource_table debug messages Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 10/20] remoteproc: core: Call rproc_dump_resource_table only if debug is activated Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 11/20] remoteproc: core: Correction carveout name comparison in rproc_update_resource_table_entry Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 12/20] remoteproc: core: Add function to verify an existing resource in rsc table Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 13/20] remoteproc: core: Add vdev support to resource amending function Loic Pallardy
2016-10-12 16:00 ` Loic Pallardy [this message]
2016-10-12 16:00 ` [PATCH v3 15/20] remoteproc: core: Append resource only if .resource_table section is large enough Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 16/20] remoteproc: core: Add resource request action support Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 17/20] remoteproc: core: Add function to verify resource table consistency Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 18/20] remoteproc: core: Clean-up resource table sanity checks Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 19/20] remotecore: core: Add resource table pointer argument to rproc_handle_resource Loic Pallardy
2016-10-12 16:00 ` [PATCH v3 20/20] 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=1476288038-24909-15-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
all inboxes | Powered by JetHome®