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

module: fix cache synchronisation 

Buffers, where modules are stored originally, don't need their caches
to be synchronised - they're only used as a data storage and only
accessed via cached aliases. But when final buffers are allocated,
from which modules are actually run, those buffers do indeed need
cache synchronisation.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2023-10-24 17:56:31 +02:00 committed by Kai Vehmanen
parent 70fa6f30a9
commit a8397dec44
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/library_manager/lib_manager.c
View File

@ -686,9 +686,6 @@ static void __sparse_cache *lib_manager_allocate_store_mem(uint32_t size,
return NULL;
}
dcache_invalidate_region(local_add, size);
icache_invalidate_region(local_add, size);
return local_add;
}

17
src/library_manager/llext_manager.c
View File

@ -64,16 +64,8 @@ static int llext_manager_load_data_from_storage(void __sparse_cache *vma, void *
return ret;
}
ret = memcpy_s((__sparse_force void *)vma, size, s_addr, size);
if (ret < 0)
return ret;
/* Some data can be accessed as uncached, in fact that's the default */
/* Both D- and I-caches have been invalidated */
dcache_writeback_region(vma, size);
/* TODO: Change attributes for memory to FLAGS */
return 0;
return memcpy_s((__sparse_force void *)vma, size, s_addr, size);
}
static int llext_manager_load_module(uint32_t module_id, struct sof_man_module *mod,
@ -98,12 +90,19 @@ static int llext_manager_load_module(uint32_t module_id, struct sof_man_module *
if (ret < 0)
return ret;
/* .text contains instructions and it also often contains local data */
dcache_writeback_region(va_base_text, st_text_size);
icache_invalidate_region(va_base_text, st_text_size);
/* Copy RODATA */
ret = llext_manager_load_data_from_storage(va_base_rodata, src_rodata,
st_rodata_size, SYS_MM_MEM_PERM_RW);
if (ret < 0)
goto e_text;
/* Some data can be accessed as uncached, in fact that's the default */
dcache_writeback_region(va_base_rodata, st_rodata_size);
return 0;
e_text: