Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions src/audio/aria/aria.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,8 @@ static const struct module_interface aria_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(aria, &aria_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, SOF_REG_UUID(aria), 8);
SOF_LLEXT_MODULE_MANIFEST("ARIA", &aria_interface, 1, SOF_REG_UUID(aria), 8);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/asrc/asrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -892,10 +892,8 @@ static const struct module_interface asrc_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(asrc, &asrc_interface);

static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, SOF_REG_UUID(asrc4), 2),
SOF_LLEXT_MODULE_MANIFEST("ASRC", &asrc_interface, 1, SOF_REG_UUID(asrc4), 2),
};

SOF_LLEXT_BUILDINFO;
Expand Down
4 changes: 1 addition & 3 deletions src/audio/codec/dts/dts.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,8 @@ static const struct module_interface dts_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(dts, &dts_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, SOF_REG_UUID(dts), 40);
SOF_LLEXT_MODULE_MANIFEST("DTS", &dts_interface, 1, SOF_REG_UUID(dts), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/crossover/crossover.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,10 +642,8 @@ static const struct module_interface crossover_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(crossover, &crossover_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, SOF_REG_UUID(crossover), 40);
SOF_LLEXT_MODULE_MANIFEST("XOVER", &crossover_interface, 1, SOF_REG_UUID(crossover), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/dcblock/dcblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,8 @@ static const struct module_interface dcblock_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(dcblock, &dcblock_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, SOF_REG_UUID(dcblock), 40);
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", &dcblock_interface, 1, SOF_REG_UUID(dcblock), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/drc/drc.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,8 @@ static const struct module_interface drc_interface = {
#include <module/module/api_ver.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(drc, &drc_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, SOF_REG_UUID(drc), 40);
SOF_LLEXT_MODULE_MANIFEST("DRC", &drc_interface, 1, SOF_REG_UUID(drc), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/eq_fir/eq_fir.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,8 @@ static const struct module_interface eq_fir_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(eq_fir, &eq_fir_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, SOF_REG_UUID(eq_fir), 40);
SOF_LLEXT_MODULE_MANIFEST("EQFIR", &eq_fir_interface, 1, SOF_REG_UUID(eq_fir), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/eq_iir/eq_iir.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,8 @@ static const struct module_interface eq_iir_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(eq_iir, &eq_iir_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, SOF_REG_UUID(eq_iir), 40);
SOF_LLEXT_MODULE_MANIFEST("EQIIR", &eq_iir_interface, 1, SOF_REG_UUID(eq_iir), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/google/google_ctc_audio_processing.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,8 @@ static const struct module_interface google_ctc_audio_processing_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(google_ctc_audio_processing, &google_ctc_audio_processing_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("CTC", google_ctc_audio_processing_llext_entry,
SOF_LLEXT_MODULE_MANIFEST("CTC", &google_ctc_audio_processing_interface,
1, SOF_REG_UUID(google_ctc_audio_processing), 40);

SOF_LLEXT_BUILDINFO;
Expand Down
4 changes: 1 addition & 3 deletions src/audio/google/google_rtc_audio_processing.c
Original file line number Diff line number Diff line change
Expand Up @@ -856,10 +856,8 @@ static const struct module_interface google_rtc_audio_processing_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(google_rtc_audio_processing, &google_rtc_audio_processing_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", google_rtc_audio_processing_llext_entry,
SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", &google_rtc_audio_processing_interface,
7, SOF_REG_UUID(google_rtc_audio_processing), 1);

SOF_LLEXT_BUILDINFO;
Expand Down
4 changes: 1 addition & 3 deletions src/audio/igo_nr/igo_nr.c
Original file line number Diff line number Diff line change
Expand Up @@ -895,10 +895,8 @@ static const struct module_interface igo_nr_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(igo_nr, &igo_nr_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("IGO_NR", igo_nr_llext_entry, 1, SOF_REG_UUID(igo_nr), 40);
SOF_LLEXT_MODULE_MANIFEST("IGO_NR", &igo_nr_interface, 1, SOF_REG_UUID(igo_nr), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/mfcc/mfcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,8 @@ static const struct module_interface mfcc_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(mfcc, &mfcc_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("MFCC", mfcc_llext_entry, 1, SOF_REG_UUID(mfcc), 40);
SOF_LLEXT_MODULE_MANIFEST("MFCC", &mfcc_interface, 1, SOF_REG_UUID(mfcc), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
7 changes: 2 additions & 5 deletions src/audio/mixin_mixout/mixin_mixout.c
Original file line number Diff line number Diff line change
Expand Up @@ -1020,13 +1020,10 @@ static const struct module_interface mixout_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(mixin, &mixin_interface);
SOF_LLEXT_MOD_ENTRY(mixout, &mixout_interface);

static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used =
{
SOF_LLEXT_MODULE_MANIFEST("MIXIN", mixin_llext_entry, 1, SOF_REG_UUID(mixin), 30),
SOF_LLEXT_MODULE_MANIFEST("MIXOUT", mixout_llext_entry, 1, SOF_REG_UUID(mixout), 30),
SOF_LLEXT_MODULE_MANIFEST("MIXIN", &mixin_interface, 1, SOF_REG_UUID(mixin), 30),
SOF_LLEXT_MODULE_MANIFEST("MIXOUT", &mixout_interface, 1, SOF_REG_UUID(mixout), 30),
};

SOF_LLEXT_BUILDINFO;
Expand Down
4 changes: 1 addition & 3 deletions src/audio/module_adapter/module/waves/waves.c
Original file line number Diff line number Diff line change
Expand Up @@ -913,10 +913,8 @@ static const struct module_interface waves_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(waves, &waves_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("WAVES", waves_llext_entry, 7, SOF_REG_UUID(waves), 8);
SOF_LLEXT_MODULE_MANIFEST("WAVES", &waves_interface, 7, SOF_REG_UUID(waves), 8);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/multiband_drc/multiband_drc.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,8 @@ static const struct module_interface multiband_drc_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(multiband_drc, &multiband_drc_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("MB_DRC", multiband_drc_llext_entry, 1,
SOF_LLEXT_MODULE_MANIFEST("MB_DRC", &multiband_drc_interface, 1,
SOF_REG_UUID(multiband_drc), 40);

SOF_LLEXT_BUILDINFO;
Expand Down
15 changes: 4 additions & 11 deletions src/audio/mux/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,19 +479,12 @@ static const struct module_interface demux_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(mux, &mux_interface);

/*
* The demux entry is removed because mtl.toml doesn't have an entry
* for it. Once that is fixed, the manifest line below can be
* re-activated:
* SOF_LLEXT_MOD_ENTRY(demux, &demux_interface);
*/

static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
SOF_LLEXT_MODULE_MANIFEST("MUX", mux_llext_entry, 1, SOF_REG_UUID(mux4), 15),
SOF_LLEXT_MODULE_MANIFEST("MUX", &mux_interface, 1, SOF_REG_UUID(mux4), 15),
/*
* See comment above for a demux deactivation reason
* The demux entry is removed because mtl.toml doesn't have an entry
* for it. Once that is fixed, the manifest line below can be
* re-activated:
* SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, SOF_REG_UUID(demux), 15),
*/
};
Expand Down
4 changes: 1 addition & 3 deletions src/audio/rtnr/rtnr.c
Original file line number Diff line number Diff line change
Expand Up @@ -880,10 +880,8 @@ static const struct module_interface rtnr_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(rtnr, &rtnr_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("RTNR", rtnr_llext_entry, 1, SOF_REG_UUID(rtnr), 40);
SOF_LLEXT_MODULE_MANIFEST("RTNR", &rtnr_interface, 1, SOF_REG_UUID(rtnr), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
5 changes: 1 addition & 4 deletions src/audio/selector/selector.c
Original file line number Diff line number Diff line change
Expand Up @@ -930,11 +930,8 @@ static const struct module_interface selector_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(selector, &selector_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("MICSEL", selector_llext_entry, 1, SOF_REG_UUID(selector4),
8);
SOF_LLEXT_MODULE_MANIFEST("MICSEL", &selector_interface, 1, SOF_REG_UUID(selector4), 8);

SOF_LLEXT_BUILDINFO;

Expand Down
8 changes: 2 additions & 6 deletions src/audio/src/src.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,14 @@ static const struct module_interface src_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(src, &src_interface);

#if CONFIG_COMP_SRC_LITE
extern const struct module_interface src_lite_interface;
SOF_LLEXT_MOD_ENTRY(src_lite, &src_lite_interface);
#endif

static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
SOF_LLEXT_MODULE_MANIFEST("SRC", src_llext_entry, 1, SOF_REG_UUID(src4), 1),
SOF_LLEXT_MODULE_MANIFEST("SRC", &src_interface, 1, SOF_REG_UUID(src4), 1),
#if CONFIG_COMP_SRC_LITE
SOF_LLEXT_MODULE_MANIFEST("SRC_LITE", src_lite_llext_entry, 1, SOF_REG_UUID(src_lite),
1),
SOF_LLEXT_MODULE_MANIFEST("SRC_LITE", &src_lite_interface, 1, SOF_REG_UUID(src_lite), 1),
#endif
};

Expand Down
4 changes: 1 addition & 3 deletions src/audio/tdfb/tdfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -833,10 +833,8 @@ static const struct module_interface tdfb_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(tdfb, &tdfb_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("TDFB", tdfb_llext_entry, 1, SOF_REG_UUID(tdfb), 40);
SOF_LLEXT_MODULE_MANIFEST("TDFB", &tdfb_interface, 1, SOF_REG_UUID(tdfb), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
4 changes: 1 addition & 3 deletions src/audio/template_comp/template.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,8 @@ static const struct module_interface template_comp_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(template_comp, &template_comp_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("TEMPLATE", template_comp_llext_entry, 1,
SOF_LLEXT_MODULE_MANIFEST("TEMPLATE", &template_comp_interface, 1,
SOF_REG_UUID(template_comp), 40);

SOF_LLEXT_BUILDINFO;
Expand Down
4 changes: 1 addition & 3 deletions src/audio/tensorflow/tflm-classify.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,8 @@ SOF_MODULE_INIT(tflmcly, sys_comp_module_tflmcly_interface_init);
#include <module/module/api_ver.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(tflmcly, &tflmcly_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("TFLMCLY", tflmcly_llext_entry, 1, SOF_REG_UUID(tflmcly), 40);
SOF_LLEXT_MODULE_MANIFEST("TFLMCLY", &tflmcly_interface, 1, SOF_REG_UUID(tflmcly), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
12 changes: 2 additions & 10 deletions src/audio/volume/volume.c
Original file line number Diff line number Diff line change
Expand Up @@ -812,20 +812,12 @@ static const struct module_interface gain_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

#if CONFIG_COMP_PEAK_VOL
SOF_LLEXT_MOD_ENTRY(peakvol, &volume_interface);
#endif

#if CONFIG_COMP_GAIN
SOF_LLEXT_MOD_ENTRY(gain, &gain_interface);
#endif

static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
#if CONFIG_COMP_PEAK_VOL
SOF_LLEXT_MODULE_MANIFEST("PEAKVOL", peakvol_llext_entry, 1, SOF_REG_UUID(volume4), 10),
SOF_LLEXT_MODULE_MANIFEST("PEAKVOL", &volume_interface, 1, SOF_REG_UUID(volume4), 10),
#endif
#if CONFIG_COMP_GAIN
SOF_LLEXT_MODULE_MANIFEST("GAIN", gain_llext_entry, 1, SOF_REG_UUID(gain), 40),
SOF_LLEXT_MODULE_MANIFEST("GAIN", &gain_interface, 1, SOF_REG_UUID(gain), 40),
#endif
};

Expand Down
4 changes: 1 addition & 3 deletions src/debug/tester/tester.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,8 @@ static const struct module_interface tester_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(tester, &tester_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("TESTER", tester_llext_entry, 1, SOF_REG_UUID(tester), 40);
SOF_LLEXT_MODULE_MANIFEST("TESTER", &tester_interface, 1, SOF_REG_UUID(tester), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
7 changes: 0 additions & 7 deletions src/include/module/module/llext.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@
} \
}

#define SOF_LLEXT_MOD_ENTRY(name, interface) \
static const struct module_interface *name##_llext_entry(void *mod_cfg, \
void *parent_ppl, void **mod_ptr) \
{ \
return interface; \
}

#define SOF_LLEXT_BUILDINFO \
static const struct sof_module_api_build_info buildinfo __section(".mod_buildinfo") __used = { \
.format = SOF_MODULE_API_BUILD_INFO_FORMAT, \
Expand Down
29 changes: 17 additions & 12 deletions src/library_manager/lib_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,18 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
mod = (const struct sof_man_module *)
((const uint8_t *)desc + SOF_MAN_MODULE_OFFSET(entry_index));

const uintptr_t module_entry_point = lib_manager_allocate_module(mod, config, args->data);

if (!module_entry_point) {
tr_err(&lib_manager_tr, "lib_manager_allocate_module() failed!");
return NULL;
}

switch (lib_manager_get_module_type(desc, mod)) {
case MOD_TYPE_LLEXT:
agent = NULL;
ops = (const struct module_interface *)module_entry_point;
break;
case MOD_TYPE_LMDK:
agent = &native_system_agent_start;
agent_iface = (const void **)&ops;
Expand All @@ -617,21 +627,16 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
agent_iface = (const void **)&adapter_priv;
break;
case MOD_TYPE_INVALID:
return NULL;
}

const uintptr_t module_entry_point = lib_manager_allocate_module(mod, config, args->data);
if (!module_entry_point) {
tr_err(&lib_manager_tr, "lib_manager_allocate_module() failed!");
return NULL;
goto err;
}

/* At this point module resources are allocated and it is moved to L2 memory. */

ret = lib_manager_start_agent(drv, config->id, args, module_entry_point, agent,
agent_iface);
if (ret)
goto err;
if (agent) {
ret = lib_manager_start_agent(drv, config->id, args, module_entry_point, agent,
agent_iface);
if (ret)
goto err;
}

if (ops && comp_set_adapter_ops(drv, ops) < 0)
goto err;
Expand Down
4 changes: 1 addition & 3 deletions src/probe/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1660,10 +1660,8 @@ static const struct module_interface probe_interface = {
#include <module/module/llext.h>
#include <rimage/sof/user/manifest.h>

SOF_LLEXT_MOD_ENTRY(probe, &probe_interface);

static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
SOF_LLEXT_MODULE_MANIFEST("PROBE", probe_llext_entry, 1, SOF_REG_UUID(probe4), 40);
SOF_LLEXT_MODULE_MANIFEST("PROBE", &probe_interface, 1, SOF_REG_UUID(probe4), 40);

SOF_LLEXT_BUILDINFO;

Expand Down
Loading
Loading