OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't convert ROM addresses to cached aliases 

We don't include ROM sections into the output image. If conversion is
applied to them, they end up in the SRAM address range, which then
generates corrupted images.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2023-02-13 12:29:29 +01:00 committed by Kai Vehmanen
parent 1e0a85b44a
commit 3863e94fa5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/elf.c
View File

@ -14,7 +14,7 @@
static unsigned long uncache_to_cache(const struct image *image, unsigned long address)
{
return ((address & ~image->adsp->alias_mask) | image->adsp->alias_cached);
return (address & ~image->adsp->alias_mask) | image->adsp->alias_cached;
}
static int elf_read_sections(struct image *image, struct module *module,
@ -25,6 +25,8 @@ static int elf_read_sections(struct image *image, struct module *module,
size_t count;
int i, ret;
uint32_t valid = (SHF_WRITE | SHF_ALLOC | SHF_EXECINSTR);
unsigned long rom_base = image->adsp->mem_zones[SOF_FW_BLK_TYPE_ROM].base;
size_t rom_size = image->adsp->mem_zones[SOF_FW_BLK_TYPE_ROM].size;
/* read in section header */
ret = fseek(module->fd, hdr->shoff, SEEK_SET);
@ -115,7 +117,13 @@ static int elf_read_sections(struct image *image, struct module *module,
continue;
}
section[i].vaddr = uncache_to_cache(image, section[i].vaddr);
/*
* Don't convert ROM addresses, ROM sections aren't included in
* the output image
*/
if (section[i].vaddr < rom_base || section[i].vaddr >= rom_base + rom_size)
section[i].vaddr = uncache_to_cache(image, section[i].vaddr);
module->num_sections++;
if (!image->verbose)