Skip to content

Commit 3bbe5ec

Browse files
softwareckisoftwarecki
committed
lib_manager: lib_manager_get_library_manifest
1 parent 9d6705d commit 3bbe5ec

5 files changed

Lines changed: 53 additions & 54 deletions

File tree

‎src/audio/module_adapter/module/modules.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,16 @@ static int modules_init(struct processing_module *mod)
8787
uint32_t log_handle = (uint32_t) mod->dev->drv->tctx;
8888
/* Connect loadable module interfaces with module adapter entity. */
8989
/* Check if native Zephyr lib is loaded */
90-
struct sof_man_fw_desc *desc;
9190

92-
desc = lib_manager_get_library_module_desc(module_id);
93-
if (!desc) {
91+
const struct sof_man_module *const module_entry =
92+
lib_manager_get_library_manifest(module_id);
93+
94+
if (!module_entry) {
9495
comp_err(dev, "modules_init(): Failed to load manifest");
9596
return -ENOMEM;
9697
}
97-
struct sof_man_module *module_entry =
98-
(struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(0));
9998

100-
struct sof_module_api_build_info *mod_buildinfo =
99+
const struct sof_module_api_build_info *const mod_buildinfo =
101100
(struct sof_module_api_build_info *)
102101
(module_entry->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr);
103102

‎src/include/sof/lib_manager.h‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,27 @@ static inline struct lib_manager_mod_ctx *lib_manager_get_mod_ctx(int module_id)
117117

118118
return _ext_lib->desc[lib_id];
119119
}
120+
121+
/*
122+
* \brief Get library manifest for given module id
123+
*
124+
* param[in] module_id - used to get library manifest
125+
*
126+
* Gets library manifest descriptor using module_id to locate it
127+
*/
128+
static inline const struct sof_man_module *lib_manager_get_library_manifest(const uint32_t module_id)
129+
{
130+
const uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
131+
132+
const struct lib_manager_mod_ctx *const ctx = lib_manager_get_mod_ctx(module_id);
133+
134+
if (!ctx || ctx->desc)
135+
return NULL;
136+
137+
return (const struct sof_man_module *)((const char *)ctx->desc +
138+
SOF_MAN_ELF_TEXT_OFFSET +
139+
SOF_MAN_MODULE_OFFSET(entry_index));
140+
}
120141
#endif
121142

122143
/*
@@ -134,15 +155,6 @@ void lib_manager_init(void);
134155
*/
135156
int lib_manager_register_module(const struct sof_man_module *const mod);
136157

137-
/*
138-
* \brief Get library module manifest descriptor
139-
*
140-
* param[in] module_id - used to get text manifest offset
141-
*
142-
* Gets firmware manifest descriptor using module_id to locate it
143-
*/
144-
struct sof_man_fw_desc *lib_manager_get_library_module_desc(int module_id);
145-
146158
/*
147159
* \brief Allocate module
148160
*

‎src/ipc/ipc4/helper.c‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -944,20 +944,20 @@ static const struct comp_driver *ipc4_library_get_drv(int module_id)
944944

945945
const struct comp_driver *ipc4_get_comp_drv(int module_id)
946946
{
947-
struct sof_man_fw_desc *desc = NULL;
947+
const struct sof_man_fw_desc *desc = NULL;
948948
const struct comp_driver *drv;
949-
struct sof_man_module *mod;
950-
int entry_index;
949+
const struct sof_man_module *mod;
950+
uint32_t entry_index;
951951

952952
#if CONFIG_LIBRARY
953953
return ipc4_library_get_drv(module_id);
954954
#endif
955955

956956
#ifdef RIMAGE_MANIFEST
957-
desc = (struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
957+
desc = (const struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
958958
#else
959-
/* Non-rimage platforms have no component facility yet. This
960-
* needs to move to the platform layer.
959+
/* Non-rimage platforms have no component facility yet.
960+
* This needs to move to the platform layer.
961961
*/
962962
return NULL;
963963
#endif
@@ -970,21 +970,33 @@ const struct comp_driver *ipc4_get_comp_drv(int module_id)
970970
entry_index = 1;
971971
else
972972
entry_index = module_id;
973+
974+
if (entry_index >= desc->header.num_module_entries) {
975+
tr_err(&comp_tr, "Error: entry index %d out of bounds.", entry_index);
976+
return NULL;
977+
}
978+
979+
mod = (const struct sof_man_module *)((const char *)desc +
980+
SOF_MAN_MODULE_OFFSET(entry_index));
973981
} else {
974982
/* Library index greater than 0 possible only when LIBRARY_MANAGER
975983
* support enabled.
976984
*/
977985
#if CONFIG_LIBRARY_MANAGER
978-
desc = lib_manager_get_library_module_desc(module_id);
979-
entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
986+
mod = lib_manager_get_library_manifest(module_id);
987+
988+
if (!mod) {
989+
tr_err(&comp_tr, "Error: Couldn't find loadable module with id %d.",
990+
module_id);
991+
return NULL;
992+
}
980993
#else
981994
tr_err(&comp_tr, "Error: lib index:%d, while loadable libraries are not supported!!!",
982995
lib_idx);
983996
return NULL;
984997
#endif
985998
}
986999
/* Check already registered components */
987-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
9881000
drv = ipc4_get_drv(mod->uuid);
9891001

9901002
#if CONFIG_LIBRARY_MANAGER

‎src/library_manager/lib_manager.c‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -346,25 +346,21 @@ uint32_t lib_manager_allocate_module(const struct comp_driver *drv,
346346
struct comp_ipc_config *ipc_config,
347347
const void *ipc_specific_config)
348348
{
349-
struct sof_man_fw_desc *desc;
350349
const struct sof_man_module *mod;
351350
const struct ipc4_base_module_cfg *base_cfg = ipc_specific_config;
352351
int ret;
353352
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
354-
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
355353

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

359-
desc = lib_manager_get_library_module_desc(module_id);
360-
if (!desc) {
357+
mod = lib_manager_get_library_manifest(module_id);
358+
if (!mod) {
361359
tr_err(&lib_manager_tr,
362360
"lib_manager_allocate_module(): failed to get module descriptor");
363361
return 0;
364362
}
365363

366-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
367-
368364
if (module_is_llext(mod))
369365
return llext_manager_allocate_module(drv, ipc_config, ipc_specific_config);
370366

@@ -398,16 +394,13 @@ uint32_t lib_manager_allocate_module(const struct comp_driver *drv,
398394
int lib_manager_free_module(const struct comp_driver *drv,
399395
struct comp_ipc_config *ipc_config)
400396
{
401-
struct sof_man_fw_desc *desc;
402397
const struct sof_man_module *mod;
403398
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
404-
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
405399
int ret;
406400

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

409-
desc = lib_manager_get_library_module_desc(module_id);
410-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
403+
mod = lib_manager_get_library_manifest(module_id);
411404

412405
if (module_is_llext(mod))
413406
return llext_manager_free_module(drv, ipc_config);
@@ -462,16 +455,6 @@ void lib_manager_init(void)
462455
sof->ext_library = &loader_ext_lib;
463456
}
464457

465-
struct sof_man_fw_desc *lib_manager_get_library_module_desc(int module_id)
466-
{
467-
struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
468-
uint8_t *buffptr = (uint8_t *)(ctx ? ctx->desc : NULL);
469-
470-
if (!buffptr)
471-
return NULL;
472-
return (struct sof_man_fw_desc *)(buffptr + SOF_MAN_ELF_TEXT_OFFSET);
473-
}
474-
475458
static void lib_manager_update_sof_ctx(struct sof_man_fw_desc *desc, uint32_t lib_id)
476459
{
477460
struct ext_library *_ext_lib = ext_lib_get();

‎src/library_manager/llext_manager.c‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,26 +172,22 @@ uint32_t llext_manager_allocate_module(const struct comp_driver *drv,
172172
struct comp_ipc_config *ipc_config,
173173
const void *ipc_specific_config)
174174
{
175-
struct sof_man_fw_desc *desc;
176175
const struct sof_man_module *mod;
177176
const struct ipc4_base_module_cfg *base_cfg = ipc_specific_config;
178177
int ret;
179178
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
180-
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
181179
struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
182180

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

186-
desc = lib_manager_get_library_module_desc(module_id);
187-
if (!ctx || !desc) {
184+
mod = lib_manager_get_library_manifest(module_id);
185+
if (!ctx || !mod) {
188186
tr_err(&lib_manager_tr,
189187
"llext_manager_allocate_module(): failed to get module descriptor");
190188
return 0;
191189
}
192190

193-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
194-
195191
for (unsigned int i = 0; i < ARRAY_SIZE(ctx->segment_size); i++)
196192
ctx->segment_size[i] = mod->segment[i].flags.r.length * PAGE_SZ;
197193

@@ -211,16 +207,13 @@ uint32_t llext_manager_allocate_module(const struct comp_driver *drv,
211207
int llext_manager_free_module(const struct comp_driver *drv,
212208
struct comp_ipc_config *ipc_config)
213209
{
214-
struct sof_man_fw_desc *desc;
215210
const struct sof_man_module *mod;
216211
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
217-
uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
218212
int ret;
219213

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

222-
desc = lib_manager_get_library_module_desc(module_id);
223-
mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
216+
mod = lib_manager_get_library_manifest(module_id);
224217

225218
ret = llext_manager_unload_module(module_id, mod);
226219
if (ret < 0)

0 commit comments

Comments
 (0)