dp: thread: Remove user_memory_init_shared()

Remove the no longer needed user_memory_init_shared(). Add the dp thread to
the memory domain directly in the dp scheduler.

The function originally added the common partition to the memory domain and
added thread to that domain. The userspace proxy now adds the common
partition to memory domain, so the function cannot perform this step.

Grant access to thread only when userspace is used. Kernel threads have
access to all the memory, no need to additionally grant access to them.

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

Author: softwarecki

src/schedule/zephyr_dp_schedule_thread.c

@@ -8,6 +8,7 @@
 #include <rtos/task.h>
 
 #include <sof/audio/module_adapter/module/generic.h>
+#include <sof/audio/module_adapter/library/userspace_proxy.h>
 #include <sof/common.h>
 #include <sof/list.h>
 #include <sof/schedule/ll_schedule_domain.h>
@@ -277,13 +278,13 @@ int scheduler_dp_task_init(struct task **task,
 	}
 
 #ifdef CONFIG_USERSPACE
-	k_thread_access_grant(pdata->thread_id, pdata->event);
-	scheduler_dp_grant(pdata->thread_id, cpu_get_id());
+	if (options & K_USER) {
+		k_thread_access_grant(pdata->thread_id, pdata->event);
+		scheduler_dp_grant(pdata->thread_id, core);
 
-	if (task_memory->task.flags & K_USER) {
-		ret = user_memory_init_shared(pdata->thread_id, pdata->mod);
+		ret = k_mem_domain_add_thread(pdata->mod->user_ctx->comp_dom, pdata->thread_id);
 		if (ret < 0) {
-			tr_err(&dp_tr, "user_memory_init_shared() failed");
+			tr_err(&dp_tr, "k_mem_domain_add_thread() failed %d", ret);
 			goto e_thread;
 		}
 	}

zephyr/include/rtos/userspace_helper.h

@@ -42,18 +42,6 @@ struct userspace_context;
  */
 struct k_heap *module_driver_heap_init(void);
 
-/**
- * Add DP scheduler created thread to module memory domain.
- * @param thread_id - id of thread to be added to memory domain.
- * @param module    - processing module structure
- *
- * @return 0 for success, error otherwise.
- *
- * @note
- * Function used only when CONFIG_USERSPACE is set.
- */
-int user_memory_init_shared(k_tid_t thread_id, struct processing_module *mod);
-
 /**
  * Attach common userspace memory partition to a module memory domain.
  * @param dom - memory domain to attach the common partition to.

zephyr/lib/userspace_helper.c

@@ -77,18 +77,6 @@ int user_stack_free(void *p_stack)
 	return k_thread_stack_free(p_stack);
 }
 
-int user_memory_init_shared(k_tid_t thread_id, struct processing_module *mod)
-{
-	struct k_mem_domain *comp_dom = mod->user_ctx->comp_dom;
-	int ret;
-
-	ret = k_mem_domain_add_partition(comp_dom, &common_partition);
-	if (ret < 0)
-		return ret;
-
-	return k_mem_domain_add_thread(comp_dom, thread_id);
-}
-
 int user_memory_attach_common_partition(struct k_mem_domain *dom)
 {
 	return k_mem_domain_add_partition(dom, &common_partition);