Hi Bjorn,
----- On 3 Mar, 2020, at 00:13, Bjorn Andersson bjorn.andersson@xxxxxxxxxx wrote:
> On Mon 02 Mar 01:38 PST 2020, Clement Leger wrote:
>
>> Since this function will be modified to support both elf32 and elf64,
>> rename the existing one to elf32 (which is the only supported format
>> at the moment). This will allow not to introduce possible side effect
>> when adding elf64 support (ie: all backends will still support only
>> elf32 if not requested explicitely using rproc_elf_sanity_check).
>>
>
> Is there a reason for preventing ELF64 binaries be loaded?
I decided to go this way to let driver maintainer decide if they want
to support elf64 to avoid problems with 64bits addresses/sizes which do
not fit in their native type (size_t for instance). This is probably
not going to happen and there are additionnal checks before calling
rproc_da_to_va. And addresses should be filtered by rproc_da_to_va.
So, actually it seems there is no reason to forbid supporting elf32/64
for all drivers.
Regards,
Clément
>
> Regards,
> Bjorn
>
>> Signed-off-by: Clement Leger <cleger@xxxxxxxxx>
>> ---
>> drivers/remoteproc/remoteproc_core.c | 2 +-
>> drivers/remoteproc/remoteproc_elf_loader.c | 6 +++---
>> drivers/remoteproc/remoteproc_internal.h | 2 +-
>> drivers/remoteproc/st_remoteproc.c | 2 +-
>> drivers/remoteproc/st_slim_rproc.c | 2 +-
>> drivers/remoteproc/stm32_rproc.c | 2 +-
>> 6 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/remoteproc/remoteproc_core.c
>> b/drivers/remoteproc/remoteproc_core.c
>> index 4bfaf4a3c4a3..99f0b796fbc7 100644
>> --- a/drivers/remoteproc/remoteproc_core.c
>> +++ b/drivers/remoteproc/remoteproc_core.c
>> @@ -2055,7 +2055,7 @@ struct rproc *rproc_alloc(struct device *dev, const char
>> *name,
>> 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;
>> - rproc->ops->sanity_check = rproc_elf_sanity_check;
>> + rproc->ops->sanity_check = rproc_elf32_sanity_check;
>> rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;
>> }
>>
>> diff --git a/drivers/remoteproc/remoteproc_elf_loader.c
>> b/drivers/remoteproc/remoteproc_elf_loader.c
>> index c2a9783cfb9a..5a67745f2638 100644
>> --- a/drivers/remoteproc/remoteproc_elf_loader.c
>> +++ b/drivers/remoteproc/remoteproc_elf_loader.c
>> @@ -25,13 +25,13 @@
>> #include "remoteproc_internal.h"
>>
>> /**
>> - * rproc_elf_sanity_check() - Sanity Check ELF firmware image
>> + * rproc_elf_sanity_check() - Sanity Check ELF32 firmware image
>> * @rproc: the remote processor handle
>> * @fw: the ELF firmware image
>> *
>> * Make sure this fw image is sane.
>> */
>> -int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
>> +int rproc_elf32_sanity_check(struct rproc *rproc, const struct firmware *fw)
>> {
>> const char *name = rproc->firmware;
>> struct device *dev = &rproc->dev;
>> @@ -89,7 +89,7 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct
>> firmware *fw)
>>
>> return 0;
>> }
>> -EXPORT_SYMBOL(rproc_elf_sanity_check);
>> +EXPORT_SYMBOL(rproc_elf32_sanity_check);
>>
>> /**
>> * rproc_elf_get_boot_addr() - Get rproc's boot address.
>> diff --git a/drivers/remoteproc/remoteproc_internal.h
>> b/drivers/remoteproc/remoteproc_internal.h
>> index 0deae5f237b8..28639c588d58 100644
>> --- a/drivers/remoteproc/remoteproc_internal.h
>> +++ b/drivers/remoteproc/remoteproc_internal.h
>> @@ -54,7 +54,7 @@ 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_elf_sanity_check(struct rproc *rproc, const struct firmware *fw);
>> +int rproc_elf32_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);
>> int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw);
>> diff --git a/drivers/remoteproc/st_remoteproc.c
>> b/drivers/remoteproc/st_remoteproc.c
>> index a3268d95a50e..a6cbfa452764 100644
>> --- a/drivers/remoteproc/st_remoteproc.c
>> +++ b/drivers/remoteproc/st_remoteproc.c
>> @@ -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_elf_sanity_check,
>> + .sanity_check = rproc_elf32_sanity_check,
>> .get_boot_addr = rproc_elf_get_boot_addr,
>> };
>>
>> diff --git a/drivers/remoteproc/st_slim_rproc.c
>> b/drivers/remoteproc/st_slim_rproc.c
>> index 09bcb4d8b9e0..3cca8b65a8db 100644
>> --- a/drivers/remoteproc/st_slim_rproc.c
>> +++ b/drivers/remoteproc/st_slim_rproc.c
>> @@ -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_elf_sanity_check,
>> + .sanity_check = rproc_elf32_sanity_check,
>> };
>>
>> /**
>> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
>> index a18f88044111..9a8b5f5e2572 100644
>> --- a/drivers/remoteproc/stm32_rproc.c
>> +++ b/drivers/remoteproc/stm32_rproc.c
>> @@ -505,7 +505,7 @@ static struct rproc_ops st_rproc_ops = {
>> .load = rproc_elf_load_segments,
>> .parse_fw = stm32_rproc_parse_fw,
>> .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
>> - .sanity_check = rproc_elf_sanity_check,
>> + .sanity_check = rproc_elf32_sanity_check,
>> .get_boot_addr = rproc_elf_get_boot_addr,
>> };
>>
>> --
>> 2.15.0.276.g89ea799
