redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

remoteproc: Pass struct fw to load_segments and find_rsc_table.

Browse source 
Prepare for introduction of custom firmware loaders by changing
the functions rproc_find_rcs_table() and rproc_load_segments()
to use struct firmware as parameter.

When the custom loader framework is introduced all calls into
the firmware specific function must use struct firmware as
parameter.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
This commit is contained in:
Sjur Brændeland 2012-06-19 09:55:34 +03:00 committed by Ohad Ben-Cohen
parent 160e7c840f
commit bd48498487
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/remoteproc/remoteproc_core.c
View file

@ -176,8 +176,7 @@ static void *rproc_da_to_va(struct rproc *rproc, u64 da, int len)
/** /**
* rproc_load_segments() - load firmware segments to memory * rproc_load_segments() - load firmware segments to memory
* @rproc: remote processor which will be booted using these fw segments * @rproc: remote processor which will be booted using these fw segments
* @elf_data: the content of the ELF firmware image * @fw: the ELF firmware image
* @len: firmware size (in bytes)
* *
* This function loads the firmware segments to memory, where the remote * This function loads the firmware segments to memory, where the remote
* processor expects them. * processor expects them.
@ -199,12 +198,13 @@ static void *rproc_da_to_va(struct rproc *rproc, u64 da, int len)
* supported, though. * supported, though.
*/ */
static int static int
rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len) rproc_load_segments(struct rproc *rproc, const struct firmware *fw)
{ {
struct device *dev = &rproc->dev; struct device *dev = &rproc->dev;
struct elf32_hdr *ehdr; struct elf32_hdr *ehdr;
struct elf32_phdr *phdr; struct elf32_phdr *phdr;
int i, ret = 0; int i, ret = 0;
const u8 *elf_data = fw->data;
ehdr = (struct elf32_hdr *)elf_data; ehdr = (struct elf32_hdr *)elf_data;
phdr = (struct elf32_phdr *)(elf_data + ehdr->e_phoff); phdr = (struct elf32_phdr *)(elf_data + ehdr->e_phoff);
@ -230,9 +230,9 @@ rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len)
break; break;
} }
if (offset + filesz > len) { if (offset + filesz > fw->size) {
dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n", dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n",
offset + filesz, len); offset + filesz, fw->size);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
@ -819,8 +819,7 @@ rproc_handle_virtio_rsc(struct rproc *rproc, struct resource_table *table, int l
/** /**
* rproc_find_rsc_table() - find the resource table * rproc_find_rsc_table() - find the resource table
* @rproc: the rproc handle * @rproc: the rproc handle
* @elf_data: the content of the ELF firmware image * @fw: the ELF firmware image
* @len: firmware size (in bytes)
* @tablesz: place holder for providing back the table size * @tablesz: place holder for providing back the table size
* *
* This function finds the resource table inside the remote processor's * This function finds the resource table inside the remote processor's
@ -833,7 +832,7 @@ rproc_handle_virtio_rsc(struct rproc *rproc, struct resource_table *table, int l
* (and @tablesz isn't set). * (and @tablesz isn't set).
*/ */
static struct resource_table * static struct resource_table *
rproc_find_rsc_table(struct rproc *rproc, const u8 *elf_data, size_t len, rproc_find_rsc_table(struct rproc *rproc, const struct firmware *fw,
int *tablesz) int *tablesz)
{ {
struct elf32_hdr *ehdr; struct elf32_hdr *ehdr;
@ -842,6 +841,7 @@ rproc_find_rsc_table(struct rproc *rproc, const u8 *elf_data, size_t len,
struct device *dev = &rproc->dev; struct device *dev = &rproc->dev;
struct resource_table *table = NULL; struct resource_table *table = NULL;
int i; int i;
const u8 *elf_data = fw->data;
ehdr = (struct elf32_hdr *)elf_data; ehdr = (struct elf32_hdr *)elf_data;
shdr = (struct elf32_shdr *)(elf_data + ehdr->e_shoff); shdr = (struct elf32_shdr *)(elf_data + ehdr->e_shoff);
@ -858,7 +858,7 @@ rproc_find_rsc_table(struct rproc *rproc, const u8 *elf_data, size_t len,
table = (struct resource_table *)(elf_data + offset); table = (struct resource_table *)(elf_data + offset);
/* make sure we have the entire table */ /* make sure we have the entire table */
if (offset + size > len) { if (offset + size > fw->size) {
dev_err(dev, "resource table truncated\n"); dev_err(dev, "resource table truncated\n");
return NULL; return NULL;
} }
@ -1035,7 +1035,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
rproc->bootaddr = ehdr->e_entry; rproc->bootaddr = ehdr->e_entry;
/* look for the resource table */ /* look for the resource table */
table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz); table = rproc_find_rsc_table(rproc, fw, &tablesz);
if (!table) if (!table)
goto clean_up; goto clean_up;
@ -1047,7 +1047,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
} }
/* load the ELF segments to memory */ /* load the ELF segments to memory */
ret = rproc_load_segments(rproc, fw->data, fw->size); ret = rproc_load_segments(rproc, fw);
if (ret) { if (ret) {
dev_err(dev, "Failed to load program segments: %d\n", ret); dev_err(dev, "Failed to load program segments: %d\n", ret);
goto clean_up; goto clean_up;
@ -1090,7 +1090,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
goto out; goto out;
/* look for the resource table */ /* look for the resource table */
table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz); table = rproc_find_rsc_table(rproc, fw, &tablesz);
if (!table) if (!table)
goto out; goto out;