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 09/19] remoteproc: core: Finalize dump resource table function
Date: Wed, 31 Aug 2016 22:50:12 +0200 [thread overview]
Message-ID: <1472676622-32533-10-git-send-email-loic.pallardy@st.com> (raw)
In-Reply-To: <1472676622-32533-1-git-send-email-loic.pallardy@st.com>
Diverse updates:
- add cfg field display of vdev struct
- add support of spare resource
- put rproc_dump_resource_table under DEBUG compilation flag
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
---
drivers/remoteproc/remoteproc_core.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index cd64fae..345bdfb 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -791,15 +791,17 @@ static void rproc_resource_cleanup(struct rproc *rproc)
rproc_remove_virtio_dev(rvdev);
}
+#if defined(DEBUG)
static void rproc_dump_resource_table(struct rproc *rproc,
struct resource_table *table, int size)
{
- const char *types[] = {"carveout", "devmem", "trace", "vdev"};
+ static const char *types[] = {"carveout", "devmem", "trace", "vdev", "spare"};
struct device *dev = &rproc->dev;
struct fw_rsc_carveout *c;
struct fw_rsc_devmem *d;
struct fw_rsc_trace *t;
struct fw_rsc_vdev *v;
+ struct fw_rsc_spare *s;
int i, j;
if (!table) {
@@ -814,6 +816,8 @@ static void rproc_dump_resource_table(struct rproc *rproc,
int offset = table->offset[i];
struct fw_rsc_hdr *hdr = (void *)table + offset;
void *rsc = (void *)hdr + sizeof(*hdr);
+ unsigned char *cfg;
+ int len;
switch (hdr->type) {
case RSC_CARVEOUT:
@@ -867,14 +871,35 @@ static void rproc_dump_resource_table(struct rproc *rproc,
dev_dbg(dev, " Reserved (should be zero) [%d]\n\n",
v->vring[j].reserved);
}
+
+ dev_dbg(dev, " Config table\n");
+ cfg = (unsigned char *)(&v->vring[v->num_of_vrings]);
+ len = 0;
+ do {
+ j = min(16, v->config_len - len);
+ dev_dbg(dev, " Config[%2d-%2d] = %*phC\n",
+ len, len + j - 1, j, cfg + len);
+ len += j;
+ } while (len < v->config_len);
+
+ break;
+ case RSC_SPARE:
+ s = rsc;
+ dev_dbg(dev, "Entry %d is of type %s\n", i, types[hdr->type]);
+ dev_dbg(dev, " Spare size: 0x%x bytes\n\n", s->len);
break;
default:
- dev_dbg(dev, "Invalid resource type found: %d [hdr: %p]\n",
- hdr->type, hdr);
+ dev_dbg(dev, "Entry %d: Invalid resource type found: %d [hdr: %p]\n",
+ i, hdr->type, hdr);
return;
}
}
}
+#else
+static inline void rproc_dump_resource_table(struct rproc *rproc,
+ struct resource_table *table, int size)
+{}
+#endif
int rproc_request_resource(struct rproc *rproc, u32 type, u32 action, void *resource)
{
--
1.9.1
next prev parent reply other threads:[~2016-08-31 20:51 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 ` Loic Pallardy [this message]
2016-09-08 8:26 ` [PATCH v2 09/19] remoteproc: core: Finalize dump resource table function 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 ` [PATCH v2 13/19] remoteproc: core: Append resource only if spare resource present Loic Pallardy
2016-09-08 9:33 ` 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-10-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).