lib_manager: modules: Unification of loadable module initialization functions

Move module allocation and system agent call from modules_init to
lib_manager_module_create to unify the module loading process.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>

Author: softwarecki

src/audio/module_adapter/iadk/system_agent.cpp

@@ -126,7 +126,7 @@ typedef int (*create_instance_f)(uint32_t module_id, uint32_t instance_id, uint3
 
 int system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
 		       uint32_t core_id, uint32_t log_handle, void* mod_cfg,
-		       void **adapter)
+		       const void **adapter)
 {
 	uint32_t ret;
 	SystemAgent system_agent(module_id, instance_id, core_id, log_handle);

src/audio/module_adapter/module/modules.c

@@ -9,7 +9,6 @@
 #include <sof/audio/module_adapter/module/modules.h>
 #include <utilities/array.h>
 #include <iadk_module_adapter.h>
-#include <system_agent.h>
 #include <sof/lib_manager.h>
 #include <sof/audio/module_adapter/module/module_interface.h>
 
@@ -56,46 +55,16 @@ static int modules_init(struct processing_module *mod)
 {
 	struct module_data *md = &mod->priv;
 	struct comp_dev *dev = mod->dev;
-	const struct comp_driver *const drv = dev->drv;
 	const struct ipc4_base_module_cfg *src_cfg = &md->cfg.base_cfg;
-	const struct comp_ipc_config *config = &dev->ipc_config;
-	void *adapter;
-	int ret;
-
-	uintptr_t module_entry_point = lib_manager_allocate_module(config, src_cfg);
-
-	if (module_entry_point == 0) {
-		comp_err(dev, "modules_init(), lib_manager_allocate_module() failed!");
-		return -EINVAL;
-	}
 
 	/* At this point module resources are allocated and it is moved to L2 memory. */
 	comp_info(dev, "modules_init() start");
 
-	const uint32_t module_id = IPC4_MOD_ID(config->id);
-	const uint32_t instance_id = IPC4_INST_ID(config->id);
-	const uint32_t log_handle = (uint32_t)drv->tctx;
-
-	byte_array_t mod_cfg = {
-		.data = (uint8_t *)md->cfg.init_data,
-		/* Intel modules expects DW size here */
-		.size = md->cfg.size >> 2,
-	};
-
-	ret = system_agent_start(module_entry_point, module_id, instance_id, 0, log_handle,
-				 &mod_cfg, &adapter);
-	if (ret) {
-		comp_info(dev, "System agent failed");
-		return ret;
-	}
-
-	module_set_private_data(mod, adapter);
-
 	md->mpd.in_buff_size = src_cfg->ibs;
 	md->mpd.out_buff_size = src_cfg->obs;
 
 	mod->proc_type = MODULE_PROCESS_TYPE_SOURCE_SINK;
-	return iadk_wrapper_init(adapter);
+	return iadk_wrapper_init(module_get_private_data(mod));
 }
 
 /**

src/include/sof/audio/module_adapter/iadk/system_agent.h

@@ -108,7 +108,7 @@ extern "C" {
  * the agent system. The system_agent_start function returns it in the variable adapter.
  */
 int system_agent_start(uintptr_t entry_point, uint32_t module_id, uint32_t instance_id,
-		       uint32_t core_id, uint32_t log_handle, void *mod_cfg, void **adapter);
+		       uint32_t core_id, uint32_t log_handle, void *mod_cfg, const void **adapter);
 #ifdef __cplusplus
 }
 #endif

src/include/sof/audio/module_adapter/library/native_system_agent.h

@@ -11,6 +11,10 @@
 #include <sof/audio/module_adapter/module/module_interface.h>
 #include <native_system_service.h>
 
+typedef int (*system_agent_start_fn)(uintptr_t entry_point, uint32_t module_id,
+				     uint32_t instance_id, uint32_t core_id, uint32_t log_handle,
+				     void *mod_cfg, const void **adapter);
+
 struct native_system_agent {
 	struct system_service system_service;
 	uint32_t log_handle;

src/include/sof/lib_manager.h

@@ -186,21 +186,6 @@ int lib_manager_register_module(const uint32_t component_id);
  */
 const struct sof_man_fw_desc *lib_manager_get_library_manifest(int module_id);
 
-struct processing_module;
-struct comp_ipc_config;
-/*
- * \brief Allocate module
- *
- * param[in] drv - component driver
- * param[in] ipc_config - audio component base configuration from IPC at creation
- * param[in] ipc_specific_config - ipc4 base configuration
- *
- * Function is responsible to allocate module in available free memory and assigning proper address.
- * (WIP) These feature will contain module validation and proper memory management.
- */
-uintptr_t lib_manager_allocate_module(const struct comp_ipc_config *ipc_config,
-				      const void *ipc_specific_config);
-
 /*
  * \brief Free module
  *