mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
remoteproc: elf-loader: Add 64 bit elf loading support
The current rproc-elf-loader supports loading of only 32 bit elf files. Introduce support for loading of 64 bit elf files in rproc-elf-loader. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Fabien Dessenne <fabien.dessenne@st.com>
This commit is contained in:
parent
14d963d1b5
commit
e3c4d6f01f
@ -64,6 +64,62 @@ int rproc_elf32_sanity_check(ulong addr, ulong size)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Basic function to verify ELF64 image format */
|
||||||
|
int rproc_elf64_sanity_check(ulong addr, ulong size)
|
||||||
|
{
|
||||||
|
Elf64_Ehdr *ehdr = (Elf64_Ehdr *)addr;
|
||||||
|
char class;
|
||||||
|
|
||||||
|
if (!addr) {
|
||||||
|
pr_debug("Invalid fw address?\n");
|
||||||
|
return -EFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (size < sizeof(Elf64_Ehdr)) {
|
||||||
|
pr_debug("Image is too small\n");
|
||||||
|
return -ENOSPC;
|
||||||
|
}
|
||||||
|
|
||||||
|
class = ehdr->e_ident[EI_CLASS];
|
||||||
|
|
||||||
|
if (!IS_ELF(*ehdr) || ehdr->e_type != ET_EXEC || class != ELFCLASS64) {
|
||||||
|
pr_debug("Not an executable ELF64 image\n");
|
||||||
|
return -EPROTONOSUPPORT;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* We assume the firmware has the same endianness as the host */
|
||||||
|
# ifdef __LITTLE_ENDIAN
|
||||||
|
if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
|
||||||
|
# else /* BIG ENDIAN */
|
||||||
|
if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) {
|
||||||
|
# endif
|
||||||
|
pr_debug("Unsupported firmware endianness\n");
|
||||||
|
return -EILSEQ;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (size < ehdr->e_shoff + sizeof(Elf64_Shdr)) {
|
||||||
|
pr_debug("Image is too small\n");
|
||||||
|
return -ENOSPC;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG)) {
|
||||||
|
pr_debug("Image is corrupted (bad magic)\n");
|
||||||
|
return -EBADF;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ehdr->e_phnum == 0) {
|
||||||
|
pr_debug("No loadable segments\n");
|
||||||
|
return -ENOEXEC;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ehdr->e_phoff > size) {
|
||||||
|
pr_debug("Firmware size is too small\n");
|
||||||
|
return -ENOSPC;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size)
|
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size)
|
||||||
{
|
{
|
||||||
Elf32_Ehdr *ehdr; /* Elf header structure pointer */
|
Elf32_Ehdr *ehdr; /* Elf header structure pointer */
|
||||||
@ -110,3 +166,57 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int rproc_elf64_load_image(struct udevice *dev, ulong addr, ulong size)
|
||||||
|
{
|
||||||
|
const struct dm_rproc_ops *ops = rproc_get_ops(dev);
|
||||||
|
u64 da, memsz, filesz, offset;
|
||||||
|
Elf64_Ehdr *ehdr;
|
||||||
|
Elf64_Phdr *phdr;
|
||||||
|
int i, ret = 0;
|
||||||
|
void *ptr;
|
||||||
|
|
||||||
|
dev_dbg(dev, "%s: addr = 0x%lx size = 0x%lx\n", __func__, addr, size);
|
||||||
|
|
||||||
|
if (rproc_elf64_sanity_check(addr, size))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
ehdr = (Elf64_Ehdr *)addr;
|
||||||
|
phdr = (Elf64_Phdr *)(addr + (ulong)ehdr->e_phoff);
|
||||||
|
|
||||||
|
/* go through the available ELF segments */
|
||||||
|
for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
|
||||||
|
da = phdr->p_paddr;
|
||||||
|
memsz = phdr->p_memsz;
|
||||||
|
filesz = phdr->p_filesz;
|
||||||
|
offset = phdr->p_offset;
|
||||||
|
|
||||||
|
if (phdr->p_type != PT_LOAD)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dev_dbg(dev, "%s:phdr: type %d da 0x%llx memsz 0x%llx filesz 0x%llx\n",
|
||||||
|
__func__, phdr->p_type, da, memsz, filesz);
|
||||||
|
|
||||||
|
ptr = (void *)(uintptr_t)da;
|
||||||
|
if (ops->device_to_virt) {
|
||||||
|
ptr = ops->device_to_virt(dev, da, phdr->p_memsz);
|
||||||
|
if (!ptr) {
|
||||||
|
dev_err(dev, "bad da 0x%llx mem 0x%llx\n", da,
|
||||||
|
memsz);
|
||||||
|
ret = -EINVAL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (filesz)
|
||||||
|
memcpy(ptr, (void *)addr + offset, filesz);
|
||||||
|
if (filesz != memsz)
|
||||||
|
memset(ptr + filesz, 0x00, memsz - filesz);
|
||||||
|
|
||||||
|
flush_cache(rounddown((ulong)ptr, ARCH_DMA_MINALIGN),
|
||||||
|
roundup((ulong)ptr + filesz, ARCH_DMA_MINALIGN) -
|
||||||
|
rounddown((ulong)ptr, ARCH_DMA_MINALIGN));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@ -214,6 +214,18 @@ int rproc_is_running(int id);
|
|||||||
*/
|
*/
|
||||||
int rproc_elf32_sanity_check(ulong addr, ulong size);
|
int rproc_elf32_sanity_check(ulong addr, ulong size);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rproc_elf64_sanity_check() - Verify if an image is a valid ELF32 one
|
||||||
|
*
|
||||||
|
* Check if a valid ELF64 image exists at the given memory location. Verify
|
||||||
|
* basic ELF64 format requirements like magic number and sections size.
|
||||||
|
*
|
||||||
|
* @addr: address of the image to verify
|
||||||
|
* @size: size of the image
|
||||||
|
* @return 0 if the image looks good, else appropriate error value.
|
||||||
|
*/
|
||||||
|
int rproc_elf64_sanity_check(ulong addr, ulong size);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* rproc_elf32_load_image() - load an ELF32 image
|
* rproc_elf32_load_image() - load an ELF32 image
|
||||||
* @dev: device loading the ELF32 image
|
* @dev: device loading the ELF32 image
|
||||||
@ -222,6 +234,15 @@ int rproc_elf32_sanity_check(ulong addr, ulong size);
|
|||||||
* @return 0 if the image is successfully loaded, else appropriate error value.
|
* @return 0 if the image is successfully loaded, else appropriate error value.
|
||||||
*/
|
*/
|
||||||
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size);
|
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rproc_elf64_load_image() - load an ELF64 image
|
||||||
|
* @dev: device loading the ELF64 image
|
||||||
|
* @addr: valid ELF64 image address
|
||||||
|
* @size: size of the image
|
||||||
|
* @return 0 if the image is successfully loaded, else appropriate error value.
|
||||||
|
*/
|
||||||
|
int rproc_elf64_load_image(struct udevice *dev, ulong addr, ulong size);
|
||||||
#else
|
#else
|
||||||
static inline int rproc_init(void) { return -ENOSYS; }
|
static inline int rproc_init(void) { return -ENOSYS; }
|
||||||
static inline int rproc_dev_init(int id) { return -ENOSYS; }
|
static inline int rproc_dev_init(int id) { return -ENOSYS; }
|
||||||
@ -234,9 +255,14 @@ static inline int rproc_ping(int id) { return -ENOSYS; }
|
|||||||
static inline int rproc_is_running(int id) { return -ENOSYS; }
|
static inline int rproc_is_running(int id) { return -ENOSYS; }
|
||||||
static inline int rproc_elf32_sanity_check(ulong addr,
|
static inline int rproc_elf32_sanity_check(ulong addr,
|
||||||
ulong size) { return -ENOSYS; }
|
ulong size) { return -ENOSYS; }
|
||||||
|
static inline int rproc_elf64_sanity_check(ulong addr,
|
||||||
|
ulong size) { return -ENOSYS; }
|
||||||
static inline int rproc_elf32_load_image(struct udevice *dev,
|
static inline int rproc_elf32_load_image(struct udevice *dev,
|
||||||
unsigned long addr, ulong size)
|
unsigned long addr, ulong size)
|
||||||
{ return -ENOSYS; }
|
{ return -ENOSYS; }
|
||||||
|
static inline int rproc_elf64_load_image(struct udevice *dev, ulong addr,
|
||||||
|
ulong size)
|
||||||
|
{ return -ENOSYS; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _RPROC_H_ */
|
#endif /* _RPROC_H_ */
|
||||||
|
Loading…
Reference in New Issue
Block a user