Commit e29ff72b authored by Clement Leger's avatar Clement Leger Committed by Bjorn Andersson
Browse files

remoteproc: remove rproc_elf32_sanity_check 



Since checks are present in the remoteproc elf loader before calling
da_to_va, loading a elf64 will work on 32bits flavors of kernel.
Indeed, if a segment size is larger than what size_t can hold, the
loader will return an error so the functionality is equivalent to
what exists today.

Acked-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarClement Leger <cleger@kalray.eu>
Link: https://lore.kernel.org/r/20200422093017.10985-1-cleger@kalray.eu


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 305ac5a7

drivers/remoteproc/remoteproc_core.c

+1 −2
Original line number Diff line number Diff line
@@ -2069,8 +2069,7 @@ static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops) 
	rproc->ops->load = rproc_elf_load_segments;

	rproc->ops->parse_fw = rproc_elf_load_rsc_table;

	rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table;

	if (!rproc->ops->sanity_check)

		rproc->ops->sanity_check = rproc_elf32_sanity_check;

	rproc->ops->sanity_check = rproc_elf_sanity_check;

	rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;



	return 0;

drivers/remoteproc/remoteproc_elf_loader.c

+0 −21
Original line number Diff line number Diff line
@@ -112,27 +112,6 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) 
}

EXPORT_SYMBOL(rproc_elf_sanity_check);



/**

 * rproc_elf_sanity_check() - Sanity Check ELF32 firmware image

 * @rproc: the remote processor handle

 * @fw: the ELF32 firmware image

 *

 * Make sure this fw image is sane.

 */

int rproc_elf32_sanity_check(struct rproc *rproc, const struct firmware *fw)

{

	int ret = rproc_elf_sanity_check(rproc, fw);



	if (ret)

		return ret;



	if (fw_elf_get_class(fw) == ELFCLASS32)

		return 0;



	return -EINVAL;

}

EXPORT_SYMBOL(rproc_elf32_sanity_check);



/**

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

 * @rproc: the remote processor handle

drivers/remoteproc/remoteproc_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len); 
phys_addr_t rproc_va_to_pa(void *cpu_addr);

int rproc_trigger_recovery(struct rproc *rproc);



int rproc_elf32_sanity_check(struct rproc *rproc, const struct firmware *fw);

int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw);

u64 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw);

int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw);

drivers/remoteproc/st_remoteproc.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static const struct rproc_ops st_rproc_ops = { 
	.parse_fw		= st_rproc_parse_fw,

	.load			= rproc_elf_load_segments,

	.find_loaded_rsc_table	= rproc_elf_find_loaded_rsc_table,

	.sanity_check		= rproc_elf32_sanity_check,

	.sanity_check		= rproc_elf_sanity_check,

	.get_boot_addr		= rproc_elf_get_boot_addr,

};

drivers/remoteproc/st_slim_rproc.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static const struct rproc_ops slim_rproc_ops = { 
	.da_to_va       = slim_rproc_da_to_va,

	.get_boot_addr	= rproc_elf_get_boot_addr,

	.load		= rproc_elf_load_segments,

	.sanity_check	= rproc_elf32_sanity_check,

	.sanity_check	= rproc_elf_sanity_check,

};



/**