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

module-adapter: add Zephyr extension context 

Module adapter drivers can be loaded and unloaded, using the Zephyr
loadable extension API. Add its context to struct struct module_data.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2023-10-27 17:00:25 +02:00 committed by Kai Vehmanen
parent 6de605d737
commit bf1dfb40fb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/module/module/base.h
View File

@ -37,6 +37,8 @@ struct module_config {
#endif #endif
}; };
struct llext;
/* /*
* A structure containing a module's private data, intended for its exclusive use. * A structure containing a module's private data, intended for its exclusive use.
* *
@ -61,6 +63,7 @@ struct module_data {
struct module_processing_data mpd; /**< shared data comp <-> module */ struct module_processing_data mpd; /**< shared data comp <-> module */
void *module_adapter; /**<loadable module interface handle */ void *module_adapter; /**<loadable module interface handle */
uint32_t module_entry_point; /**<loadable module entry point address */ uint32_t module_entry_point; /**<loadable module entry point address */
struct llext *llext; /**< Zephyr loadable extension context */
#endif /* SOF_MODULE_PRIVATE */ #endif /* SOF_MODULE_PRIVATE */
}; };

13
src/library_manager/llext_manager.c
View File

@ -169,7 +169,7 @@ static int llext_manager_free_module_bss(uint32_t module_id,
} }
static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_module *mod, static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_module *mod,
uint32_t module_id, const void **buildinfo, uint32_t module_id, struct module_data *md, const void **buildinfo,
const struct sof_man_module_manifest **mod_manifest) const struct sof_man_module_manifest **mod_manifest)
{ {
size_t mod_size = desc->header.preload_page_count * PAGE_SZ; size_t mod_size = desc->header.preload_page_count * PAGE_SZ;
@ -177,16 +177,16 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
struct llext_buf_loader ebl = LLEXT_BUF_LOADER((uint8_t *)desc - struct llext_buf_loader ebl = LLEXT_BUF_LOADER((uint8_t *)desc -
SOF_MAN_ELF_TEXT_OFFSET + 0x8000, SOF_MAN_ELF_TEXT_OFFSET + 0x8000,
mod_size); mod_size);
struct llext *ext;
struct llext_load_param ldr_parm = {false}; struct llext_load_param ldr_parm = {false};
struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id); struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
int ret = llext_load(&ebl.loader, mod->name, &ext, &ldr_parm); int ret = llext_load(&ebl.loader, mod->name, &md->llext, &ldr_parm);
if (ret < 0) if (ret < 0)
return ret; return ret;
mod->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr = ebl.loader.sects[LLEXT_MEM_TEXT].sh_addr; mod->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr = ebl.loader.sects[LLEXT_MEM_TEXT].sh_addr;
mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset = (uintptr_t)ext->mem[LLEXT_MEM_TEXT] - mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset =
(uintptr_t)md->llext->mem[LLEXT_MEM_TEXT] -
(uintptr_t)desc + SOF_MAN_ELF_TEXT_OFFSET; (uintptr_t)desc + SOF_MAN_ELF_TEXT_OFFSET;
ctx->segment_size[SOF_MAN_SEGMENT_TEXT] = ebl.loader.sects[LLEXT_MEM_TEXT].sh_size; ctx->segment_size[SOF_MAN_SEGMENT_TEXT] = ebl.loader.sects[LLEXT_MEM_TEXT].sh_size;
@ -198,7 +198,8 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
/* This contains all other sections, except .text, it might contain .bss too */ /* This contains all other sections, except .text, it might contain .bss too */
mod->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = mod->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr =
ebl.loader.sects[LLEXT_MEM_RODATA].sh_addr; ebl.loader.sects[LLEXT_MEM_RODATA].sh_addr;
mod->segment[SOF_MAN_SEGMENT_RODATA].file_offset = (uintptr_t)ext->mem[LLEXT_MEM_RODATA] - mod->segment[SOF_MAN_SEGMENT_RODATA].file_offset =
(uintptr_t)md->llext->mem[LLEXT_MEM_RODATA] -
(uintptr_t)desc + SOF_MAN_ELF_TEXT_OFFSET; (uintptr_t)desc + SOF_MAN_ELF_TEXT_OFFSET;
ctx->segment_size[SOF_MAN_SEGMENT_RODATA] = mod_size - ctx->segment_size[SOF_MAN_SEGMENT_RODATA] = mod_size -
ebl.loader.sects[LLEXT_MEM_TEXT].sh_size; ebl.loader.sects[LLEXT_MEM_TEXT].sh_size;
@ -252,7 +253,7 @@ uint32_t llext_manager_allocate_module(struct processing_module *proc,
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index)); mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
ret = llext_manager_link(desc, mod, module_id, buildinfo, &mod_manifest); ret = llext_manager_link(desc, mod, module_id, &proc->priv, buildinfo, &mod_manifest);
if (ret < 0) if (ret < 0)
return 0; return 0;