*** DNM*** PoC for no wait in multi-pipeline-set-state

posix/include/rtos/task.h

@@ -58,7 +58,7 @@ struct task {
 	uint64_t start;		/**< start time in [ms] since now (LL only) */
 	const struct sof_uuid_entry *uid; /**< Uuid */
 	uint16_t type;		/**< type of the task (LL or EDF) */
-	uint16_t priority;	/**< priority of the task (used by LL) */
+	int16_t priority;	/**< priority of the task (used by LL); lower runs first */
 	uint16_t core;		/**< execution core */
 	uint16_t flags;		/**< custom flags */
 	struct schedule_data *sch;	/**< scheduler bound to task */

src/include/sof/schedule/ll_schedule.h

@@ -40,14 +40,14 @@ int scheduler_init_ll(struct ll_schedule_domain *domain);
 
 int schedule_task_init_ll(struct task *task,
 			  const struct sof_uuid_entry *uid, uint16_t type,
-			  uint16_t priority, enum task_state (*run)(void *data),
+			  int16_t priority, enum task_state (*run)(void *data),
 			  void *data, uint16_t core, uint32_t flags);
 #else
 int zephyr_ll_scheduler_init(struct ll_schedule_domain *domain);
 
 int zephyr_ll_task_init(struct task *task,
 			const struct sof_uuid_entry *uid, uint16_t type,
-			uint16_t priority, enum task_state (*run)(void *data),
+			int16_t priority, enum task_state (*run)(void *data),
 			void *data, uint16_t core, uint32_t flags);
 
 #define scheduler_init_ll zephyr_ll_scheduler_init

src/include/sof/schedule/schedule.h

@@ -359,7 +359,7 @@ static inline struct k_thread *scheduler_init_context(struct task *task)
  */
 int schedule_task_init(struct task *task,
 		       const struct sof_uuid_entry *uid, uint16_t type,
-		       uint16_t priority, enum task_state (*run)(void *data),
+		       int16_t priority, enum task_state (*run)(void *data),
 		       void *data, uint16_t core, uint32_t flags);
 
 /**

src/platform/library/include/platform/lib/ll_schedule.h

@@ -19,7 +19,7 @@ int scheduler_init_ll(struct ll_schedule_domain *domain);
 
 int schedule_task_init_ll(struct task *task,
 			  const struct sof_uuid_entry *uid, uint16_t type,
-			  uint16_t priority, enum task_state (*run)(void *data),
+			  int16_t priority, enum task_state (*run)(void *data),
 			  void *data, uint16_t core, uint32_t flags);
 
 #endif /* __LIBRARY_INCLUDE_LIB_SCHEDULE_H__ */

src/platform/library/schedule/ll_schedule.c

@@ -105,7 +105,7 @@ static struct scheduler_ops schedule_ll_ops = {
 
 int schedule_task_init_ll(struct task *task,
 			  const struct sof_uuid_entry *uid, uint16_t type,
-			  uint16_t priority, enum task_state (*run)(void *data),
+			  int16_t priority, enum task_state (*run)(void *data),
 			  void *data, uint16_t core, uint32_t flags)
 {
 	return schedule_task_init(task, uid, SOF_SCHEDULE_LL_TIMER, 0, run,

src/platform/library/schedule/schedule.c

@@ -22,7 +22,7 @@ struct schedulers **arch_schedulers_get(void)
 
 int schedule_task_init(struct task *task,
 		       const struct sof_uuid_entry *uid, uint16_t type,
-		       uint16_t priority, enum task_state (*run)(void *data),
+		       int16_t priority, enum task_state (*run)(void *data),
 		       void *data, uint16_t core, uint32_t flags)
 {
 	struct schedulers *schedulers = *arch_schedulers_get();

src/schedule/ll_schedule_xtos.c

@@ -607,7 +607,7 @@ static int schedule_ll_task_after(void *data, struct task *task, uint64_t start,
 
 int schedule_task_init_ll(struct task *task,
 			  const struct sof_uuid_entry *uid, uint16_t type,
-			  uint16_t priority, enum task_state (*run)(void *data),
+			  int16_t priority, enum task_state (*run)(void *data),
 			  void *data, uint16_t core, uint32_t flags)
 {
 	struct ll_task_pdata *ll_pdata;

src/schedule/schedule.c

@@ -35,7 +35,7 @@ static inline bool scheduler_is_user(int type)
 
 int schedule_task_init(struct task *task,
 		       const struct sof_uuid_entry *uid, uint16_t type,
-		       uint16_t priority, enum task_state (*run)(void *data),
+		       int16_t priority, enum task_state (*run)(void *data),
 		       void *data, uint16_t core, uint32_t flags)
 {
 	struct schedulers *schedulers;

src/schedule/zephyr_ll.c

@@ -160,8 +160,8 @@ static void zephyr_ll_task_insert_unlocked(struct zephyr_ll *sch, struct task *t
 
 	/*
 	 * Tasks are added into the list in priority order. List order
-	 * defines schedule order. Priority 0 indicates highest
-	 * priority and is run first. Tasks with the same priority are
+	 * defines schedule order. Lower values indicate higher priority
+	 * and run first. Tasks with the same priority are
 	 * served on a first-come-first-served basis.
 	 */
 	list_for_item(list, &sch->tasks) {
@@ -662,7 +662,7 @@ void user_ll_unlock_sched(int core)
 
 int zephyr_ll_task_init(struct task *task,
 			const struct sof_uuid_entry *uid, uint16_t type,
-			uint16_t priority, enum task_state (*run)(void *data),
+			int16_t priority, enum task_state (*run)(void *data),
 			void *data, uint16_t core, uint32_t flags)
 {
 	struct zephyr_ll_pdata *pdata;

test/cmocka/src/common_mocks.c

@@ -312,7 +312,7 @@ struct schedulers ** WEAK arch_schedulers_get(void)
 
 int WEAK schedule_task_init(struct task *task,
 			    const struct sof_uuid_entry *uid, uint16_t type,
-			    uint16_t priority, enum task_state (*run)(void *data),
+			    int16_t priority, enum task_state (*run)(void *data),
 			    void *data, uint16_t core, uint32_t flags)
 {
 	(void)task;
@@ -329,7 +329,7 @@ int WEAK schedule_task_init(struct task *task,
 
 int WEAK schedule_task_init_ll(struct task *task,
 			       const struct sof_uuid_entry *uid, uint16_t type,
-			       uint16_t priority, enum task_state (*run)(void *data),
+			       int16_t priority, enum task_state (*run)(void *data),
 			       void *data, uint16_t core, uint32_t flags)
 {
 	return 0;

zephyr/include/rtos/task.h

@@ -57,7 +57,7 @@ struct task {
 	uint64_t start;		/**< start time in [ms] since now (LL only) */
 	const struct sof_uuid_entry *uid; /**< Uuid */
 	uint16_t type;		/**< type of the task (LL or EDF) */
-	uint16_t priority;	/**< priority of the task (used by LL) */
+	int16_t priority;	/**< priority of the task (used by LL); lower runs first */
 	uint16_t core;		/**< execution core */
 	uint16_t flags;		/**< custom flags */
 	struct schedule_data *sch;	/**< scheduler bound to task */

zephyr/test/userspace/test_ll_task.c

@@ -49,7 +49,7 @@ static enum task_state task_callback(void *arg)
 static void ll_task_test(void)
 {
 	struct task *task;
-	int priority = 0;
+	int16_t priority = -1;
 	int core = 0;
 	int ret;
 
@@ -67,6 +67,7 @@ static void ll_task_test(void)
 				    priority, task_callback,
 				    (void *)&test_runs, core, 0);
 	zassert_equal(ret, 0);
+	zassert_equal(task->priority, priority, "negative priority was not preserved");
 
 	LOG_INF("task init done");