Merge pull request #355 from xiulipan/taskpri

Enable scheduler task priority

Author: lgirdwood

src/arch/xtensa/task.c

@@ -53,13 +53,13 @@ static inline uint32_t task_get_irq(struct task *task)
 	uint32_t irq;
 
 	switch (task->priority) {
-	case TASK_PRI_MED + 1 ... TASK_PRI_LOW:
+	case TASK_PRI_MED + 6 ... TASK_PRI_LOW:
 		irq = PLATFORM_IRQ_TASK_LOW;
 		break;
-	case TASK_PRI_HIGH ... TASK_PRI_MED - 1:
+	case TASK_PRI_HIGH ... TASK_PRI_MED - 6:
 		irq = PLATFORM_IRQ_TASK_HIGH;
 		break;
-	case TASK_PRI_MED:
+	case TASK_PRI_MED - 5 ... TASK_PRI_MED + 5:
 	default:
 		irq = PLATFORM_IRQ_TASK_MED;
 		break;
@@ -72,26 +72,38 @@ static inline void task_set_data(struct task *task)
 {
 	struct list_item *dst = NULL;
 	struct irq_task *irq_task;
+	struct list_item *clist;
+	struct task *ctask;
 	uint32_t flags;
 
 	switch (task->priority) {
-	case TASK_PRI_MED + 1 ... TASK_PRI_LOW:
+	case TASK_PRI_MED + 6 ... TASK_PRI_LOW:
 		irq_task = irq_low_task;
 		dst = &irq_task->list;
 		break;
-	case TASK_PRI_HIGH ... TASK_PRI_MED - 1:
+	case TASK_PRI_HIGH ... TASK_PRI_MED - 6:
 		irq_task = irq_high_task;
 		dst = &irq_task->list;
 		break;
-	case TASK_PRI_MED:
+	case TASK_PRI_MED - 5 ... TASK_PRI_MED + 5:
 	default:
 		irq_task = irq_med_task;
 		dst = &irq_task->list;
 		break;
 	}
 
+	/* find position in the list to append the item */
+	list_for_item(clist, &irq_task->list) {
+		trace_event(TRACE_CLASS_PIPE, "ins");
+		ctask = container_of(clist, struct task, irq_list);
+		if (task->priority >= ctask->priority)
+			dst = clist;
+		else
+			break;
+	}
+
 	spin_lock_irq(&irq_task->lock, flags);
-	list_item_append(&task->irq_list, dst);
+	list_item_insert(&task->irq_list, dst);
 	spin_unlock_irq(&irq_task->lock, flags);
 }
 

src/include/sof/list.h

@@ -72,6 +72,18 @@ static inline void list_item_append(struct list_item *item,
 	list->prev = item;
 }
 
+/* insert new item to the position of the list */
+static inline void list_item_insert(struct list_item *item,
+				    struct list_item *pos)
+{
+	struct list_item *tmp = pos->next;
+
+	item->next = tmp;
+	item->prev = pos;
+	pos->next = item;
+	tmp->prev = item;
+}
+
 /* delete item from the list leaves deleted list item
  *in undefined state list_is_empty won't return true
  */

src/include/sof/schedule.h

@@ -56,6 +56,8 @@ struct sof;
 #define TASK_PRI_MED	0
 #define TASK_PRI_HIGH	-20
 
+#define TASK_PRI_IPC	1
+
 /* maximun task time slice in microseconds */
 #define SCHEDULE_TASK_MAX_TIME_SLICE	5000
 

src/ipc/apl-ipc.c

@@ -199,7 +199,7 @@ int platform_ipc_init(struct ipc *ipc)
 
 	/* schedule */
 	schedule_task_init(&_ipc->ipc_task, ipc_process_task, _ipc);
-	schedule_task_config(&_ipc->ipc_task, 0, 0);
+	schedule_task_config(&_ipc->ipc_task, TASK_PRI_IPC, 0);
 
 	/* allocate page table buffer */
 	iipc->page_table = rballoc(RZONE_SYS, SOF_MEM_CAPS_RAM,

src/ipc/byt-ipc.c

@@ -221,7 +221,7 @@ int platform_ipc_init(struct ipc *ipc)
 
 	/* schedule */
 	schedule_task_init(&_ipc->ipc_task, ipc_process_task, _ipc);
-	schedule_task_config(&_ipc->ipc_task, 0, 0);
+	schedule_task_config(&_ipc->ipc_task, TASK_PRI_IPC, 0);
 
 	/* allocate page table buffer */
 	iipc->page_table = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM,

src/ipc/cnl-ipc.c

@@ -201,7 +201,7 @@ int platform_ipc_init(struct ipc *ipc)
 
 	/* schedule */
 	schedule_task_init(&_ipc->ipc_task, ipc_process_task, _ipc);
-	schedule_task_config(&_ipc->ipc_task, 0, 0);
+	schedule_task_config(&_ipc->ipc_task, TASK_PRI_IPC, 0);
 
 	/* allocate page table buffer */
 	iipc->page_table = rballoc(RZONE_SYS, SOF_MEM_CAPS_RAM,

src/ipc/hsw-ipc.c

@@ -216,7 +216,7 @@ int platform_ipc_init(struct ipc *ipc)
 
 	/* schedule */
 	schedule_task_init(&_ipc->ipc_task, ipc_process_task, _ipc);
-	schedule_task_config(&_ipc->ipc_task, 0, 0);
+	schedule_task_config(&_ipc->ipc_task, TASK_PRI_IPC, 0);
 
 	/* allocate page table buffer */
 	iipc->page_table = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM,

src/lib/schedule.c

@@ -99,6 +99,7 @@ static inline struct task *edf_get_next(uint64_t current,
 	struct list_item *clist;
 	struct list_item *tlist;
 	uint64_t next_delta = UINT64_MAX;
+	int next_priority = TASK_PRI_LOW;
 	uint64_t delta;
 	uint64_t deadline;
 	int reschedule = 0;
@@ -127,15 +128,21 @@ static inline struct task *edf_get_next(uint64_t current,
 		/* include the length of task in deadline calc */
 		deadline = task->deadline - task->max_rtime;
 
-		/* get earliest deadline */
 		if (current < deadline) {
 			delta = deadline - current;
 
-			if (delta < next_delta) {
+			/* get highest priority */
+			if (task->priority < next_priority) {
+				next_priority = task->priority;
 				next_delta = delta;
 				next_task = task;
+			} else if (task->priority == next_priority) {
+				/* get earliest deadline */
+				if (delta < next_delta) {
+					next_delta = delta;
+					next_task = task;
+				}
 			}
-
 		} else {
 			/* missed scheduling - will be rescheduled */
 			trace_pipe("ed!");