Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LLEXT: libraries with multiple modules #9688

Merged
merged 7 commits into from
Dec 6, 2024
Merged

LLEXT: libraries with multiple modules #9688

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95c4be7
rimage: split a function
lyakh Nov 25, 2024
2d2c5bf
rimage: split man_module_create_reloc()
lyakh Nov 25, 2024
d3cd367
rimage: add support for multi-part llext libraries
lyakh Nov 25, 2024
3bd6ba4
llext: add per-module contexts
lyakh Nov 26, 2024
50f82a9
llext: fix potential NULL dereference
lyakh Nov 26, 2024
3853ab1
llext: support libraries with multiple modules
lyakh Nov 26, 2024
1e3f9ab
mux: remove DEMUX entry from LLEXT build
lyakh Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/library_manager/llext_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,27 +316,27 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
{
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"varoable definition" in git commit message

struct sof_man_fw_desc *desc = (struct sof_man_fw_desc *)lib_manager_get_library_manifest(module_id);
struct sof_man_module *mod_array;
int ret;
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
const struct sof_module_api_build_info *buildinfo;
const struct sof_man_module_manifest *mod_manifest;

if (!ctx || !desc) {
tr_err(&lib_manager_tr, "failed to get module descriptor");
return 0;
}

struct sof_man_module *mod_array = (struct sof_man_module *)((char *)desc +
SOF_MAN_MODULE_OFFSET(0));
size_t mod_size = desc->header.preload_page_count * PAGE_SZ - FILE_TEXT_OFFSET_V1_8;
uintptr_t dram_base = (uintptr_t)desc - SOF_MAN_ELF_TEXT_OFFSET;
struct llext_buf_loader ebl = LLEXT_BUF_LOADER((uint8_t *)dram_base + FILE_TEXT_OFFSET_V1_8,
mod_size);
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
const struct sof_man_module_manifest *mod_manifest;
const struct sof_module_api_build_info *buildinfo;
struct module_data *md = &proc->priv;
int ret;

tr_dbg(&lib_manager_tr, "mod_id: %#x", ipc_config->id);

if (!ctx || !desc) {
tr_err(&lib_manager_tr, "failed to get module descriptor");
return 0;
}

mod_array = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(0));

if (!ctx->mod)
llext_manager_mod_init(ctx, desc, mod_array);

Expand Down