module_adapter: Add user_ctx parameter to module_adapter_new_ext

Extend the module_adapter_new_ext function with an additional user_ctx
parameter. This enables the caller to explicitly set the userspace context
field within the processing module structure during module adapter
initialization.

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

Author: softwarecki

src/audio/module_adapter/module_adapter.c

@@ -41,7 +41,7 @@ LOG_MODULE_REGISTER(module_adapter, CONFIG_SOF_LOG_LEVEL);
 struct comp_dev *module_adapter_new(const struct comp_driver *drv,
 				    const struct comp_ipc_config *config, const void *spec)
 {
-	return module_adapter_new_ext(drv, config, spec, NULL);
+	return module_adapter_new_ext(drv, config, spec, NULL, NULL);
 }
 
 static struct processing_module *module_adapter_mem_alloc(const struct comp_driver *drv,
@@ -108,7 +108,7 @@ static void module_adapter_mem_free(struct processing_module *mod)
  */
 struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
 					const struct comp_ipc_config *config, const void *spec,
-					void *mod_priv)
+					void *mod_priv, struct userspace_context *user_ctx)
 {
 	int ret;
 	struct module_config *dst;
@@ -127,14 +127,16 @@ struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
 	if (!mod)
 		return NULL;
 
-	dst = &mod->priv.cfg;
 
 	module_set_private_data(mod, mod_priv);
-
-	struct comp_dev *dev = mod->dev;
-
+#if CONFIG_USERSPACE
+	mod->user_ctx = user_ctx;
+#endif /* CONFIG_USERSPACE */
+		
 	list_init(&mod->raw_data_buffers_list);
 
+	struct comp_dev *dev = mod->dev;
+	dst = &mod->priv.cfg;
 	ret = module_adapter_init_data(dev, dst, config, spec);
 	if (ret) {
 		comp_err(dev, "%d: module init data failed",

src/include/sof/audio/module_adapter/module/generic.h

@@ -300,9 +300,10 @@ int module_unbind(struct processing_module *mod, struct bind_info *unbind_data);
 
 struct comp_dev *module_adapter_new(const struct comp_driver *drv,
 				    const struct comp_ipc_config *config, const void *spec);
+struct userspace_context;
 struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
 					const struct comp_ipc_config *config, const void *spec,
-					void *mod_priv);
+					void *mod_priv, struct userspace_context *user_ctx);
 int module_adapter_prepare(struct comp_dev *dev);
 int module_adapter_params(struct comp_dev *dev, struct sof_ipc_stream_params *params);
 int module_adapter_copy(struct comp_dev *dev);

src/library_manager/lib_manager.c

@@ -645,7 +645,7 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
 	if (ops && comp_set_adapter_ops(drv, ops) < 0)
 		goto err;
 
-	dev = module_adapter_new_ext(drv, config, spec, adapter_priv);
+	dev = module_adapter_new_ext(drv, config, spec, adapter_priv, NULL);
 	if (!dev)
 		goto err;