| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1330589497-4139-8-git-send-email-ohad@wizery.com>
Date: Thu, 1 Mar 2012 10:11:37 +0200
From: Ohad Ben-Cohen <ohad@...ery.com>
To: <linux-omap@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>
Cc: Ohad Ben-Cohen <ohad@...ery.com>,
Brian Swetland <swetland@...gle.com>,
Iliyan Malchev <malchev@...gle.com>,
Arnd Bergmann <arnd@...db.de>,
Grant Likely <grant.likely@...retlab.ca>,
Rusty Russell <rusty@...tcorp.com.au>,
Mark Grosen <mgrosen@...com>,
John Williams <john.williams@...alogix.com>,
Michal Simek <monstr@...str.eu>,
Loic PALLARDY <loic.pallardy@...ricsson.com>,
Ludovic BARRE <ludovic.barre@...ricsson.com>,
Omar Ramirez Luna <omar.luna@...aro.org>,
Guzman Lugo Fernando <fernando.lugo@...com>,
Anna Suman <s-anna@...com>, Clark Rob <rob@...com>,
Stephen Boyd <sboyd@...eaurora.org>,
Saravana Kannan <skannan@...eaurora.org>,
David Brown <davidb@...eaurora.org>,
Kieran Bingham <kieranbingham@...il.com>,
Tony Lindgren <tony@...mide.com>
Subject: [PATCH 7/7] remoteproc: cleanup resource table parsing paths
rproc_handle_resources() looks for the resource table and then
invokes a resource handler function which it took as a parameter.
This works, but it's a bit unintuitive to follow.
Instead of passing around function pointers, this patch changes
rproc_handle_resource() to just find and return the resource table,
and then the calling sites of rproc_handle_resource() invoke their
resource handlers directly.
Signed-off-by: Ohad Ben-Cohen <ohad@...ery.com>
Cc: Brian Swetland <swetland@...gle.com>
Cc: Iliyan Malchev <malchev@...gle.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Grant Likely <grant.likely@...retlab.ca>
Cc: Rusty Russell <rusty@...tcorp.com.au>
Cc: Mark Grosen <mgrosen@...com>
Cc: John Williams <john.williams@...alogix.com>
Cc: Michal Simek <monstr@...str.eu>
Cc: Loic PALLARDY <loic.pallardy@...ricsson.com>
Cc: Ludovic BARRE <ludovic.barre@...ricsson.com>
Cc: Omar Ramirez Luna <omar.luna@...aro.org>
Cc: Guzman Lugo Fernando <fernando.lugo@...com>
Cc: Anna Suman <s-anna@...com>
Cc: Clark Rob <rob@...com>
Cc: Stephen Boyd <sboyd@...eaurora.org>
Cc: Saravana Kannan <skannan@...eaurora.org>
Cc: David Brown <davidb@...eaurora.org>
Cc: Kieran Bingham <kieranbingham@...il.com>
Cc: Tony Lindgren <tony@...mide.com>
---
drivers/remoteproc/remoteproc_core.c | 70 ++++++++++++++++++---------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 9be5dad..ee15c68 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -822,32 +822,31 @@ rproc_handle_virtio_rsc(struct rproc *rproc, struct resource_table *table, int l
}
/**
- * rproc_handle_resources() - find and handle the resource table
+ * rproc_find_rsc_table() - find the resource table
* @rproc: the rproc handle
* @elf_data: the content of the ELF firmware image
* @len: firmware size (in bytes)
- * @handler: function that should be used to handle the resource table
+ * @tablesz: place holder for providing back the table size
*
* This function finds the resource table inside the remote processor's
- * firmware, and invoke a user-supplied handler with it (we have two
- * possible handlers: one is invoked upon registration of @rproc,
- * in order to register the supported virito devices, and the other is
- * invoked when @rproc is actually booted).
- *
- * Currently this function fails if a resource table doesn't exist.
- * This restriction will be removed when we'll start supporting remote
- * processors that don't need a resource table.
+ * firmware. It is used both upon the registration of @rproc (in order
+ * to look for and register the supported virito devices), and when the
+ * @rproc is booted.
+ *
+ * Returns the pointer to the resource table if it is found, and write its
+ * size into @tablesz. If a valid table isn't found, NULL is returned
+ * (and @tablesz isn't set).
*/
-static int rproc_handle_resources(struct rproc *rproc, const u8 *elf_data,
- size_t len, rproc_handle_resources_t handler)
-
+static struct resource_table *
+rproc_find_rsc_table(struct rproc *rproc, const u8 *elf_data, size_t len,
+ int *tablesz)
{
struct elf32_hdr *ehdr;
struct elf32_shdr *shdr;
const char *name_table;
struct device *dev = rproc->dev;
- int i, ret = -EINVAL;
- struct resource_table *table;
+ struct resource_table *table = NULL;
+ int i;
ehdr = (struct elf32_hdr *)elf_data;
shdr = (struct elf32_shdr *)(elf_data + ehdr->e_shoff);
@@ -866,39 +865,39 @@ static int rproc_handle_resources(struct rproc *rproc, const u8 *elf_data,
/* make sure we have the entire table */
if (offset + size > len) {
dev_err(dev, "resource table truncated\n");
- return -EINVAL;
+ return NULL;
}
/* make sure table has at least the header */
if (sizeof(struct resource_table) > size) {
dev_err(dev, "header-less resource table\n");
- return -EINVAL;
+ return NULL;
}
/* we don't support any version beyond the first */
if (table->ver != 1) {
dev_err(dev, "unsupported fw ver: %d\n", table->ver);
- return -EINVAL;
+ return NULL;
}
/* make sure reserved bytes are zeroes */
if (table->reserved[0] || table->reserved[1]) {
dev_err(dev, "non zero reserved bytes\n");
- return -EINVAL;
+ return NULL;
}
/* make sure the offsets array isn't truncated */
if (table->num * sizeof(table->offset[0]) +
sizeof(struct resource_table) > size) {
dev_err(dev, "resource table incomplete\n");
- return -EINVAL;
+ return NULL;
}
- ret = handler(rproc, table, shdr->sh_size);
+ *tablesz = shdr->sh_size;
break;
}
- return ret;
+ return table;
}
/**
@@ -1012,7 +1011,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
struct device *dev = rproc->dev;
const char *name = rproc->firmware;
struct elf32_hdr *ehdr;
- int ret;
+ struct resource_table *table;
+ int ret, tablesz;
ret = rproc_fw_sanity_check(rproc, fw);
if (ret)
@@ -1039,9 +1039,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
*/
rproc->bootaddr = ehdr->e_entry;
+ /* look for the resource table */
+ table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
+ if (!table)
+ goto clean_up;
+
/* handle fw resources which are required to boot rproc */
- ret = rproc_handle_resources(rproc, fw->data, fw->size,
- rproc_handle_boot_rsc);
+ ret = rproc_handle_boot_rsc(rproc, table, tablesz);
if (ret) {
dev_err(dev, "Failed to process resources: %d\n", ret);
goto clean_up;
@@ -1084,19 +1088,21 @@ clean_up:
static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
{
struct rproc *rproc = context;
- struct device *dev = rproc->dev;
- int ret;
+ struct resource_table *table;
+ int ret, tablesz;
if (rproc_fw_sanity_check(rproc, fw) < 0)
goto out;
- /* does the fw support any virtio devices ? */
- ret = rproc_handle_resources(rproc, fw->data, fw->size,
- rproc_handle_virtio_rsc);
- if (ret) {
- dev_info(dev, "No fw virtio device was found\n");
+ /* look for the resource table */
+ table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
+ if (!table)
+ goto out;
+
+ /* look for virtio devices and register them */
+ ret = rproc_handle_virtio_rsc(rproc, table, tablesz);
+ if (ret)
goto out;
- }
out:
if (fw)
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists