linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/9] remoteproc: core: Add function to amend an existing resource table entry
Date: Thu,  4 Aug 2016 10:21:49 +0100	[thread overview]
Message-ID: <20160804092153.23032-6-lee.jones@linaro.org> (raw)
In-Reply-To: <20160804092153.23032-1-lee.jones@linaro.org>

Sometimes the firmware does not know best.

When a firmware is built, it can be loaded with a resource table, usually
detailing shared; memory, virtual device, trace log information etc.
However, some vendors require this hard-coded information to be amended
with new/improved information obtained from Device Tree for instance.

Until now, no method exists which allows the resource table to be amended.
The addition of this function changes that.  It is now possible to pull in
a resource table and amend it before it is finally shared with the remote
device.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/remoteproc/remoteproc_core.c | 63 ++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 0abfa2b..3318ebd 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -917,6 +917,69 @@ int rproc_request_resource(struct rproc *rproc, u32 type, void *resource)
 }
 EXPORT_SYMBOL(rproc_request_resource);
 
+static int rproc_update_resource_table_entry(struct rproc *rproc,
+				struct rproc_request_resource *request,
+				struct resource_table *table, int size)
+{
+	struct fw_rsc_carveout *tblc, *newc;
+	struct fw_rsc_devmem *tbld, *newd;
+	struct fw_rsc_trace *tblt, *newt;
+	int updated = true;
+	int i;
+
+	for (i = 0; i < table->num; i++) {
+		int offset = table->offset[i];
+		struct fw_rsc_hdr *hdr = (void *)table + offset;
+		void *rsc = (void *)hdr + sizeof(*hdr);
+
+		if (request->type != hdr->type)
+			continue;
+
+		switch (hdr->type) {
+		case RSC_CARVEOUT:
+			tblc = rsc;
+			newc = request->resource;
+
+			if (strncmp(newc->name, tblc->name,
+				    sizeof(*tblc->name)))
+				break;
+
+			memcpy(tblc, newc, request->size);
+
+			return updated;
+		case RSC_DEVMEM:
+			tbld = rsc;
+			newd = request->resource;
+
+			if (strncmp(newd->name, tbld->name,
+				    sizeof(*tbld->name)))
+				break;
+
+			memcpy(tbld, newd, request->size);
+
+			return updated;
+		case RSC_TRACE:
+			tblt = rsc;
+			newt = request->resource;
+
+			if (strncmp(newt->name, tblt->name,
+				    sizeof(*tblt->name)))
+				break;
+
+			memcpy(tblt, newt, request->size);
+
+			return updated;
+		default:
+			dev_err(&rproc->dev,
+				"Unsupported resource type: %d\n",
+				hdr->type);
+			return -EINVAL;
+		}
+	}
+
+	return !updated;
+}
+
 /*
  * take a firmware and boot a remote processor with it.
  */
-- 
2.9.0

  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 ` Lee Jones [this message]
2016-08-04  9:21 ` [PATCH 6/9] remoteproc: core: Add function to append a new resource table entry 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 ` [PATCH 9/9] remoteproc: core: Support empty resource tables Lee Jones
2016-08-05  7:38   ` 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-6-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).