[Sound-open-firmware] [PATCH] arch: sw task irq handlers de-duplicated.

[Liam Girdwood]

From: Marcin Maka <marcin.maka at linux.intel.com>

There is no need to implement dedicated irq handler per each sw irq level.
A single implementation may use the context passed by XTOS.

Signed-off-by: Marcin Maka <marcin.maka at linux.intel.com>
---
 src/arch/xtensa/task.c     | 82 ++++++--------------------------------
 src/include/sof/schedule.h |  4 +-
 2 files changed, 13 insertions(+), 73 deletions(-)

diff --git a/src/arch/xtensa/task.c b/src/arch/xtensa/task.c
index 0072b1a..98e01eb 100644
--- a/src/arch/xtensa/task.c
+++ b/src/arch/xtensa/task.c
@@ -70,21 +70,23 @@ static inline uint32_t task_get_irq(struct task *task)
 
 static inline void task_set_data(struct task *task)
 {
+	struct list_item *dst = NULL;
 	switch (task->priority) {
 	case TASK_PRI_MED + 1 ... TASK_PRI_LOW:
-		list_item_append(&task->irq_low_list, &irq_low_task->list);
+		dst = &irq_low_task->list;
 		break;
 	case TASK_PRI_HIGH ... TASK_PRI_MED - 1:
-		list_item_append(&task->irq_high_list, &irq_high_task->list);
+		dst = &irq_high_task->list;
 		break;
 	case TASK_PRI_MED:
 	default:
-		list_item_append(&task->irq_med_list, &irq_med_task->list);
+		dst = &irq_med_task->list;
 		break;
 	}
+	list_item_append(&task->irq_list, dst);
 }
 
-static void _irq_low(void *arg)
+static void _irq_task(void *arg)
 {
 	struct irq_task *irq_task = *(struct irq_task **)arg;
 	struct list_item *tlist;
@@ -94,7 +96,7 @@ static void _irq_low(void *arg)
 
 	/* intentionally don't lock list to have task added from schedule irq */
 	list_for_item(tlist, &irq_task->list) {
-		task = container_of(tlist, struct task, irq_low_list);
+		task = container_of(tlist, struct task, irq_list);
 
 		if (task->func)
 			task->func(task->data);
@@ -105,68 +107,8 @@ static void _irq_low(void *arg)
 	spin_lock_irq(&irq_task->lock, flags);
 
 	list_for_item_safe(clist, tlist, &irq_task->list) {
-		task = container_of(clist, struct task, irq_low_list);
-		list_item_del(&task->irq_low_list);
-	}
-
-	interrupt_clear(irq_task->irq);
-
-	spin_unlock_irq(&irq_task->lock, flags);
-}
-
-static void _irq_med(void *arg)
-{
-	struct irq_task *irq_task = *(struct irq_task **)arg;
-	struct list_item *tlist;
-	struct list_item *clist;
-	struct task *task;
-	uint32_t flags;
-
-	/* intentionally don't lock list to have task added from schedule irq */
-	list_for_item(tlist, &irq_task->list) {
-		task = container_of(tlist, struct task, irq_med_list);
-
-		if (task->func)
-			task->func(task->data);
-
-		schedule_task_complete(task);
-	}
-
-	spin_lock_irq(&irq_task->lock, flags);
-
-	list_for_item_safe(clist, tlist, &irq_task->list) {
-		task = container_of(clist, struct task, irq_med_list);
-		list_item_del(&task->irq_med_list);
-	}
-
-	interrupt_clear(irq_task->irq);
-
-	spin_unlock_irq(&irq_task->lock, flags);
-}
-
-static void _irq_high(void *arg)
-{
-	struct irq_task *irq_task = *(struct irq_task **)arg;
-	struct list_item *tlist;
-	struct list_item *clist;
-	struct task *task;
-	uint32_t flags;
-
-	/* intentionally don't lock list to have task added from schedule irq */
-	list_for_item(tlist, &irq_task->list) {
-		task = container_of(tlist, struct task, irq_high_list);
-
-		if (task->func)
-			task->func(task->data);
-
-		schedule_task_complete(task);
-	}
-
-	spin_lock_irq(&irq_task->lock, flags);
-
-	list_for_item_safe(clist, tlist, &irq_task->list) {
-		task = container_of(clist, struct task, irq_high_list);
-		list_item_del(&task->irq_high_list);
+		task = container_of(clist, struct task, irq_list);
+		list_item_del(&task->irq_list);
 	}
 
 	interrupt_clear(irq_task->irq);
@@ -211,15 +153,15 @@ void arch_allocate_tasks(void)
 int arch_assign_tasks(void)
 {
 	/* irq low */
-	interrupt_register(PLATFORM_IRQ_TASK_LOW, _irq_low, &irq_low_task);
+	interrupt_register(PLATFORM_IRQ_TASK_LOW, _irq_task, &irq_low_task);
 	interrupt_enable(PLATFORM_IRQ_TASK_LOW);
 
 	/* irq medium */
-	interrupt_register(PLATFORM_IRQ_TASK_MED, _irq_med, &irq_med_task);
+	interrupt_register(PLATFORM_IRQ_TASK_MED, _irq_task, &irq_med_task);
 	interrupt_enable(PLATFORM_IRQ_TASK_MED);
 
 	/* irq high */
-	interrupt_register(PLATFORM_IRQ_TASK_HIGH, _irq_high, &irq_high_task);
+	interrupt_register(PLATFORM_IRQ_TASK_HIGH, _irq_task, &irq_high_task);
 	interrupt_enable(PLATFORM_IRQ_TASK_HIGH);
 
 	return 0;
diff --git a/src/include/sof/schedule.h b/src/include/sof/schedule.h
index 7e5b3b2..83d8345 100644
--- a/src/include/sof/schedule.h
+++ b/src/include/sof/schedule.h
@@ -64,9 +64,7 @@ struct task {
 	uint64_t deadline;		/* scheduling deadline */
 	uint32_t state;			/* TASK_STATE_ */
 	struct list_item list;		/* list in scheduler */
-	struct list_item irq_low_list;	/* list for low irq level */
-	struct list_item irq_med_list;	/* list for medium irq level */
-	struct list_item irq_high_list;	/* list for high irq level */
+	struct list_item irq_list;	/* list for assigned irq level */
 
 	/* task function and private data */
 	void *data;
-- 
2.17.0