switch to event

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

Author: softwarecki

src/audio/module_adapter/library/userspace_proxy.c

@@ -27,6 +27,7 @@
 
 #include <sof/lib_manager.h>
 #include <sof/audio/component.h>
+#include <sof/schedule/dp_schedule.h>
 #include <rtos/userspace_helper.h>
 #include <utilities/array.h>
 #include <zephyr/sys/sem.h>
@@ -53,8 +54,7 @@ struct user_worker {
 	uint32_t reference_count;		/* module reference count		*/
 	void *stack_ptr;			/* pointer to worker stack		*/
 	struct k_work_user_q work_queue;
-	struct k_msgq *in_msgq;				/* pointer to input message queue	*/
-	struct k_msgq *out_msgq;			/* pointer to output message queue	*/
+	struct k_event event;
 };
 
 /* 
@@ -84,53 +84,9 @@ uint32_t ptable_size(struct k_mem_domain *domain)
 
 	return cnt;
 }
-#if 0
-static int userspace_proxy_msgq_alloc(struct userspace_context *context)
-{
-	char *buffer;
-
-	buffer = rzalloc(SOF_MEM_FLAG_USER_SHARED_BUFFER, MAX_PARAM_SIZE * 2);
-	if (!buffer)
-		return -ENOMEM;
-
-	context->in_msgq = k_object_alloc(K_OBJ_MSGQ);
-	if (!context->in_msgq) {
-		rfree(buffer);
-		return -ENOMEM;
-	}
-
-	context->out_msgq = k_object_alloc(K_OBJ_MSGQ);
-	if (!context->out_msgq) {
-		k_object_free(context->in_msgq);
-		rfree(buffer);
-		return -ENOMEM;
-	}
-	/* k_msgq_alloc_init */
-	k_msgq_init(context->in_msgq, buffer, MAX_PARAM_SIZE, 1);
-	k_msgq_init(context->out_msgq, (buffer + MAX_PARAM_SIZE), MAX_PARAM_SIZE, 1);
 
-	return 0;
-}
-
-static void user_worker_msgq_free()
-{
-	int ret;
-	/* in_msgq->buffer_start points to whole buffer allocated for message queues */
-	/* TODO: Assert error code */
-	ret = k_msgq_cleanup(worker.in_msgq);
-	assert(!ret);
-	ret = k_msgq_cleanup(worker.out_msgq);
-	assert(!ret);
-
-	rfree(worker.in_msgq->buffer_start);
-	k_object_free(worker.in_msgq);
-	k_object_free(worker.out_msgq);
-}
-#endif
 static int user_worker_create()
 {
-	char *buffer = NULL;
-
 	if (worker.reference_count)
 		return 0;
 
@@ -142,66 +98,36 @@ static int user_worker_create()
 		return -ENOMEM;
 	}
 
-	buffer = rzalloc(SOF_MEM_FLAG_USER_SHARED_BUFFER, MAX_PARAM_SIZE * 2);
-	if (!buffer)
-		goto error;
-
-	worker.in_msgq = k_object_alloc(K_OBJ_MSGQ);
-	if (!worker.in_msgq)
-		goto error;
-
-	worker.out_msgq = k_object_alloc(K_OBJ_MSGQ);
-	if (!worker.out_msgq)
-		goto error;
-
-	/* k_msgq_alloc_init */
-	k_msgq_init(worker.in_msgq, buffer, MAX_PARAM_SIZE, 1);
-	k_msgq_init(worker.out_msgq, (buffer + MAX_PARAM_SIZE), MAX_PARAM_SIZE, 1);
-
+	k_event_init(&worker.event);
 	k_work_user_queue_start(&worker.work_queue, worker.stack_ptr, CONFIG_SOF_STACK_SIZE, 0,
 				"Userspace proxy worker");
 
 	worker.thread_id = k_work_user_queue_thread_get(&worker.work_queue);
 
 	/* Grant a thread access to a kernel object (IPC msg. data). */
-	k_thread_access_grant(worker.thread_id, worker.in_msgq, worker.out_msgq);
+	k_thread_access_grant(worker.thread_id, &worker.event);
 
 	worker.reference_count++;
 	return 0;
-
+#if 0
 error:
 	/* TODO: Moze wspolna funckja free? */
-	k_object_free(worker.in_msgq);
-	k_object_free(worker.out_msgq);
-	rfree(buffer);
 	user_stack_free(worker.stack_ptr);
 	return -ENOMEM;
+#endif
 }
 
 static void user_worker_free()
 {
-	int ret;
-
 	/* Module removed so decrement counter */
 	worker.reference_count--;
 
 	/* Free worker resources if no more active user space modules */
 	if (worker.reference_count == 0) {
 		tr_dbg(&userspace_proxy_tr, "free");
 
-		/* in_msgq->buffer_start points to whole buffer allocated for message queues */
-		/* TODO: Assert error code */
-		ret = k_msgq_cleanup(worker.in_msgq);
-		assert(!ret);
-		ret = k_msgq_cleanup(worker.out_msgq);
-		assert(!ret);
-
 		k_thread_abort(worker.thread_id);
 		user_stack_free(worker.stack_ptr);
-
-		rfree(worker.in_msgq->buffer_start);
-		k_object_free(worker.in_msgq);
-		k_object_free(worker.out_msgq);
 	}
 }
 
@@ -222,8 +148,7 @@ static int user_work_item_init(struct userspace_context *context, struct k_heap
 
 	k_work_user_init(&work_item->work_item, userspace_proxy_worker_handler);
 
-	work_item->in_msgq = worker.in_msgq;
-	work_item->out_msgq = worker.out_msgq;
+	work_item->event = &worker.event;
 	work_item->params.context = context;
 	context->work_item = work_item;
 
@@ -275,23 +200,20 @@ static int userspace_proxy_invoke(struct userspace_context *context, struct proc
 		return ret;
 	}
 
-	ret = k_msgq_put(worker.in_msgq, params, K_FOREVER);
-	if (ret < 0) {
-		comp_err(mod->dev, "k_msgq_put(): error: %d", ret);
-		return ret;
-	}
-
 	ret = k_work_user_submit_to_queue(&worker.work_queue, &context->work_item->work_item);
 	if (ret < 0) {
 		comp_err(mod->dev, "k_work_user_submit_to_queue(): error: %d", ret);
 		return ret;
 	}
 
-	ret = k_msgq_get(worker.out_msgq, params, K_FOREVER);
-	if (ret < 0)
-		comp_err(mod->dev, "k_msgq_get(): error: %d", ret);
+	/* Timeout value is aligned with the ipc_wait_for_compound_msg function */
+	if (!k_event_wait_safe(&worker.event, DP_TASK_EVENT_IPC_DONE, false,
+			       Z_TIMEOUT_US(250 * 20))) {
+		comp_err(mod->dev, "ipc processing timedout.");
+		return -ETIMEDOUT;
+	}
 
-	return ret;
+	return 0;
 }
 
 extern struct k_mem_partition ipc_partition;

src/audio/module_adapter/library/userspace_proxy_user.c

@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include <sof/audio/component.h>
+#include <sof/schedule/dp_schedule.h>
 #include <utilities/array.h>
 #include <zephyr/sys/sem.h>
 #include <sof/audio/module_adapter/module/generic.h>
@@ -122,11 +123,8 @@ void userspace_proxy_worker_handler(struct k_work_user *work_item)
 {
 	struct user_work_item *user_work_item = CONTAINER_OF(work_item, struct user_work_item,
 							     work_item);
-	struct module_params *params = (struct module_params *)user_work_item->ipc_params;
+	struct module_params *params = &user_work_item->params;
 
-	k_msgq_get(user_work_item->in_msgq, params, K_FOREVER);
 	userspace_proxy_handle_request(params->mod, params);
-	k_msgq_put(user_work_item->out_msgq, params, K_FOREVER);
-
-	k_yield();
+	k_event_post(user_work_item->event, DP_TASK_EVENT_IPC_DONE);
 }

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

@@ -9,11 +9,6 @@
 #define __SOF_AUDIO_USERSPACE_PROXY_USER_H__
 
 #if CONFIG_SOF_USERSPACE_PROXY
-
-/* IPC works synchronously so single message queue is ok */
-#define MSGQ_LEN	1
-#define MAX_PARAM_SIZE	0x200
-
 struct module_agent_params {
 	system_agent_start_fn start_fn;
 	struct system_agent_params params;
@@ -54,7 +49,6 @@ enum userspace_proxy_cmd {
 	MODULE_CMD_INIT,
 	MODULE_CMD_PREPARE,
 	MODULE_CMD_PROC_READY,
-	MODULE_CMD_PROCESS,
 	MODULE_CMD_SET_PROCMOD,
 	MODULE_CMD_GET_PROCMOD,
 	MODULE_CMD_SET_CONF,
@@ -84,13 +78,10 @@ struct module_params {
 
 struct user_work_item {
 	struct k_work_user work_item;		/* ipc worker workitem			*/
-	struct k_msgq *in_msgq;			/* pointer to input message queue owned by worker */
-	struct k_msgq *out_msgq;		/* pointer to output message queue owned by worker*/
-	uint8_t ipc_params[MAX_PARAM_SIZE];	/* ipc parameter buffer			*/
+	struct k_event *event;			/* ipc worker done event		*/
 	struct module_params params;
 };
 
-
 void userspace_proxy_handle_request(struct processing_module *mod, struct module_params *params);
 
 void userspace_proxy_worker_handler(struct k_work_user *work_item);

src/include/sof/schedule/dp_schedule.h

@@ -86,4 +86,8 @@ int scheduler_dp_task_init(struct task **task,
 void scheduler_get_task_info_dp(struct scheduler_props *scheduler_props,
 				uint32_t *data_off_size);
 
+enum {
+	DP_TASK_EVENT_IPC_DONE	= BIT(3),	/* IPC processing has completed. */
+};
+
 #endif /* __SOF_SCHEDULE_DP_SCHEDULE_H__ */

src/schedule/zephyr_dp_schedule.h

@@ -22,6 +22,10 @@ struct scheduler_dp_data {
 
 };
 
+enum {
+	DP_EVENT_IPC_DONE = BIT(3),
+};
+
 struct task_dp_pdata {
 	k_tid_t thread_id;		/* zephyr thread ID */
 	struct k_thread *thread;	/* pointer to the kernels' thread object */