Commit 826c3390 authored by Clement Leger's avatar Clement Leger Committed by Bjorn Andersson

remoteproc: Rename rproc_elf_sanity_check for elf32

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).
Signed-off-by: default avatarClement Leger <cleger@kalray.eu>
Link: https://lore.kernel.org/r/20200302093902.27849-6-cleger@kalray.euSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 73516a33
...@@ -2061,7 +2061,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, ...@@ -2061,7 +2061,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
rproc->ops->load = rproc_elf_load_segments; rproc->ops->load = rproc_elf_load_segments;
rproc->ops->parse_fw = rproc_elf_load_rsc_table; rproc->ops->parse_fw = rproc_elf_load_rsc_table;
rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_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; rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;
} }
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
#include "remoteproc_internal.h" #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 * @rproc: the remote processor handle
* @fw: the ELF firmware image * @fw: the ELF firmware image
* *
* Make sure this fw image is sane. * 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; const char *name = rproc->firmware;
struct device *dev = &rproc->dev; struct device *dev = &rproc->dev;
...@@ -89,7 +89,7 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) ...@@ -89,7 +89,7 @@ int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
return 0; return 0;
} }
EXPORT_SYMBOL(rproc_elf_sanity_check); EXPORT_SYMBOL(rproc_elf32_sanity_check);
/** /**
* rproc_elf_get_boot_addr() - Get rproc's boot address. * rproc_elf_get_boot_addr() - Get rproc's boot address.
......
...@@ -54,7 +54,7 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len); ...@@ -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); phys_addr_t rproc_va_to_pa(void *cpu_addr);
int rproc_trigger_recovery(struct rproc *rproc); 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); 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_segments(struct rproc *rproc, const struct firmware *fw);
int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw); int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw);
......
...@@ -233,7 +233,7 @@ static const struct rproc_ops st_rproc_ops = { ...@@ -233,7 +233,7 @@ static const struct rproc_ops st_rproc_ops = {
.parse_fw = st_rproc_parse_fw, .parse_fw = st_rproc_parse_fw,
.load = rproc_elf_load_segments, .load = rproc_elf_load_segments,
.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, .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, .get_boot_addr = rproc_elf_get_boot_addr,
}; };
......
...@@ -203,7 +203,7 @@ static const struct rproc_ops slim_rproc_ops = { ...@@ -203,7 +203,7 @@ static const struct rproc_ops slim_rproc_ops = {
.da_to_va = slim_rproc_da_to_va, .da_to_va = slim_rproc_da_to_va,
.get_boot_addr = rproc_elf_get_boot_addr, .get_boot_addr = rproc_elf_get_boot_addr,
.load = rproc_elf_load_segments, .load = rproc_elf_load_segments,
.sanity_check = rproc_elf_sanity_check, .sanity_check = rproc_elf32_sanity_check,
}; };
/** /**
......
...@@ -505,7 +505,7 @@ static struct rproc_ops st_rproc_ops = { ...@@ -505,7 +505,7 @@ static struct rproc_ops st_rproc_ops = {
.load = rproc_elf_load_segments, .load = rproc_elf_load_segments,
.parse_fw = stm32_rproc_parse_fw, .parse_fw = stm32_rproc_parse_fw,
.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, .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, .get_boot_addr = rproc_elf_get_boot_addr,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment