Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5f9eb5 authored by Sjur Brændeland's avatar Sjur Brændeland Committed by Ohad Ben-Cohen
Browse files

remoteproc: Add function rproc_get_boot_addr 



Prepare for introduction of custom firmware loaders by
moving the function operating on ELF data-structures into
separate functions. Move lookup of the boot_addr in the
ELF binary to the function rproc_get_boot_addr().

Signed-off-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
[rproc_get_boot_addr's kerneldoc: add missing @rproc line]
[rproc_get_boot_addr's kerneldoc: minor style changes]
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent bd484984

drivers/remoteproc/remoteproc_core.c

+19 −9
Original line number Diff line number Diff line
@@ -998,6 +998,24 @@ static int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw) 
	return 0;

}



/**

 * rproc_get_boot_addr() - Get rproc's boot address.

 * @rproc: the remote processor handle

 * @fw: the ELF firmware image

 *

 * This function returns the entry point address of the ELF

 * image.

 *

 * Note that the boot address is not a configurable property of all remote

 * processors. Some will always boot at a specific hard-coded address.

 */

u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)

{

	struct elf32_hdr *ehdr  = (struct elf32_hdr *)fw->data;



	return ehdr->e_entry;

}



/*

 * take a firmware and boot a remote processor with it.

 */
@@ -1005,7 +1023,6 @@ 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;

	struct resource_table *table;

	int ret, tablesz;
@@ -1013,8 +1030,6 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) 
	if (ret)

		return ret;



	ehdr = (struct elf32_hdr *)fw->data;



	dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);



	/*
@@ -1027,12 +1042,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) 
		return ret;

	}



	/*

	 * The ELF entry point is the rproc's boot addr (though this is not

	 * a configurable property of all remote processors: some will always

	 * boot at a specific hardcoded address).

	 */

	rproc->bootaddr = ehdr->e_entry;

	rproc->bootaddr = rproc_get_boot_addr(rproc, fw);



	/* look for the resource table */

	table = rproc_find_rsc_table(rproc, fw, &tablesz);