ipc: add the DP case to module initialization

ipc4_init_module_instance() should be called when
CONFIG_SOF_USERSPACE_LL isn't selected but also when initializing a
DP module.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/ipc/ipc4/handler-user.c

@@ -1556,6 +1556,7 @@ __cold static int ipc4_delete_module_instance(struct ipc4_message_request *ipc4)
 __cold int ipc4_user_process_module_message(struct ipc4_message_request *ipc4,
 					    struct ipc_msg *reply)
 {
+	struct ipc4_module_init_instance *mi;
 	uint32_t type;
 	int ret;
 
@@ -1566,36 +1567,37 @@ __cold int ipc4_user_process_module_message(struct ipc4_message_request *ipc4,
 
 	switch (type) {
 	case SOF_IPC4_MOD_INIT_INSTANCE:
+		mi = (struct ipc4_module_init_instance *)ipc4;
+
+		if (mi->extension.r.proc_domain || !IS_ENABLED(CONFIG_SOF_USERSPACE_LL)) {
+			ret = ipc4_init_module_instance(ipc4);
+		} else {
 #ifdef CONFIG_SOF_USERSPACE_LL
-	{
-		/* User-space init: kernel does driver lookup only (requires
-		 * access to IMR manifest and driver list in kernel memory).
-		 * Component creation (drv->ops.create) runs in user thread
-		 * so untrusted module code does not execute in kernel context.
-		 */
-		struct ipc4_module_init_instance *mi = (struct ipc4_module_init_instance *)ipc4;
-		struct ipc *ipc = ipc_get();
-		uint32_t comp_id = IPC4_COMP_ID(mi->primary.r.module_id,
-						mi->primary.r.instance_id);
-		const struct comp_driver *drv = ipc4_get_comp_drv(IPC4_MOD_ID(comp_id));
+			/* User-space init: kernel does driver lookup only (requires
+			 * access to IMR manifest and driver list in kernel memory).
+			 * Component creation (drv->ops.create) runs in user thread
+			 * so untrusted module code does not execute in kernel context.
+			 */
+			struct ipc *ipc = ipc_get();
+			uint32_t comp_id = IPC4_COMP_ID(mi->primary.r.module_id,
+							mi->primary.r.instance_id);
+			const struct comp_driver *drv = ipc4_get_comp_drv(IPC4_MOD_ID(comp_id));
 
-		if (!drv) {
-			ret = IPC4_MOD_NOT_INITIALIZED;
-			break;
-		}
+			if (!drv) {
+				ret = IPC4_MOD_NOT_INITIALIZED;
+				break;
+			}
 
-		struct ipc_user *pdata = ipc->ipc_user_pdata;
+			ret = llext_manager_map_lib(comp_id);
+			if (ret < 0)
+				break;
 
-		ret = llext_manager_map_lib(comp_id);
-		if (ret < 0)
-			break;
+			struct ipc_user *pdata = ipc->ipc_user_pdata;
 
-		pdata->init_drv = drv;
-		ret = ipc_user_forward_cmd(ipc4, mi->extension.r.core_id);
-	}
-#else
-		ret = ipc4_init_module_instance(ipc4);
+			pdata->init_drv = drv;
+			ret = ipc_user_forward_cmd(ipc4, mi->extension.r.core_id);
 #endif
+		}
 		break;
 	case SOF_IPC4_MOD_CONFIG_GET:
 #ifdef CONFIG_SOF_USERSPACE_LL

src/ipc/ipc4/helper.c

@@ -161,18 +161,16 @@ __cold struct comp_dev *comp_new_ipc4(const struct ipc4_module_init_instance *mo
 	if (!drv)
 		return NULL;
 
-#if CONFIG_ZEPHYR_DP_SCHEDULER
-	if (module_init->extension.r.proc_domain)
-		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_DP;
-	else
+	if (!module_init->extension.r.proc_domain) {
 		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_LL;
-#else /* CONFIG_ZEPHYR_DP_SCHEDULER */
-	if (module_init->extension.r.proc_domain) {
-		tr_err(&ipc_tr, "ipc: DP scheduling is disabled, cannot create comp 0x%x", comp_id);
+	} else if (IS_ENABLED(CONFIG_ZEPHYR_DP_SCHEDULER)) {
+		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_DP;
+	} else {
+		tr_err(&ipc_tr,
+		       "ipc: DP scheduling is disabled, cannot create comp 0x%x",
+		       comp_id);
 		return NULL;
 	}
-	ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_LL;
-#endif /* CONFIG_ZEPHYR_DP_SCHEDULER */
 
 	if (drv->type == SOF_COMP_MODULE_ADAPTER) {
 		const struct ipc_config_process spec = {
@@ -272,20 +270,16 @@ __cold struct comp_dev *comp_new_ipc4_user(struct ipc4_message_request *ipc4,
 #endif
 	data = ipc4_get_comp_new_data();
 
-#if CONFIG_ZEPHYR_DP_SCHEDULER
-	if (module_init.extension.r.proc_domain)
-		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_DP;
-	else
+	if (!module_init.extension.r.proc_domain) {
 		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_LL;
-#else
-	if (module_init.extension.r.proc_domain) {
+	} else if (IS_ENABLED(CONFIG_ZEPHYR_DP_SCHEDULER)) {
+		ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_DP;
+	} else {
 		tr_err(&ipc_tr,
 		       "ipc: DP scheduling is disabled, cannot create comp 0x%x",
 		       comp_id);
 		return NULL;
 	}
-	ipc_config.proc_domain = COMP_PROCESSING_DOMAIN_LL;
-#endif
 
 	if (drv->type == SOF_COMP_MODULE_ADAPTER) {
 		const struct ipc_config_process spec = {