ll_schedule_domain: pass task during unregistration

tlauda · lgirdwood · commit b734091d6380 · 2019-11-19T10:56:15.000Z
Changes domain_unregister operation to also receive task
being unregistered.

Signed-off-by: Tomasz Lauda &lt;tomasz.lauda@linux.intel.com&gt;
diff --git a/src/include/sof/schedule/ll_schedule_domain.h b/src/include/sof/schedule/ll_schedule_domain.h
@@ -30,7 +30,7 @@ struct ll_schedule_domain_ops {
 			       uint64_t period, struct task *task,
 			       void (*handler)(void *arg), void *arg);
 	void (*domain_unregister)(struct ll_schedule_domain *domain,
-				  uint32_t num_tasks);
+				  struct task *task, uint32_t num_tasks);
 	void (*domain_enable)(struct ll_schedule_domain *domain, int core);
 	void (*domain_disable)(struct ll_schedule_domain *domain, int core);
 	void (*domain_set)(struct ll_schedule_domain *domain, uint64_t start);
@@ -85,11 +85,11 @@ static inline int domain_register(struct ll_schedule_domain *domain,
 }
 
 static inline void domain_unregister(struct ll_schedule_domain *domain,
-				     uint32_t num_tasks)
+				     struct task *task, uint32_t num_tasks)
 {
 	assert(domain->ops->domain_unregister);
 
-	domain->ops->domain_unregister(domain, num_tasks);
+	domain->ops->domain_unregister(domain, task, num_tasks);
 }
 
 static inline void domain_enable(struct ll_schedule_domain *domain, int core)
diff --git a/src/schedule/dma_multi_chan_domain.c b/src/schedule/dma_multi_chan_domain.c
@@ -172,9 +172,11 @@ static void dma_multi_chan_domain_irq_unregister(struct dma_domain_data *data)
 /**
  * \brief Unregisters task from DMA domain.
  * \param[in,out] domain Pointer to schedule domain.
+ * \param[in,out] task Task to be unregistered from the domain..
  * \param[in] num_tasks Number of currently scheduled tasks.
  */
 static void dma_multi_chan_domain_unregister(struct ll_schedule_domain *domain,
+					     struct task *task,
 					     uint32_t num_tasks)
 {
 	struct dma_domain *dma_domain = ll_sch_domain_get_pdata(domain);
diff --git a/src/schedule/dma_single_chan_domain.c b/src/schedule/dma_single_chan_domain.c
@@ -333,9 +333,11 @@ static void dma_domain_unregister_owner(struct ll_schedule_domain *domain,
 /**
  * \brief Unregisters task from DMA domain.
  * \param[in,out] domain Pointer to schedule domain.
+ * \param[in,out] task Task to be unregistered from the domain.
  * \param[in] num_tasks Number of currently scheduled tasks.
  */
 static void dma_single_chan_domain_unregister(struct ll_schedule_domain *domain,
+					      struct task *task,
 					      uint32_t num_tasks)
 {
 	struct dma_domain *dma_domain = ll_sch_domain_get_pdata(domain);
diff --git a/src/schedule/ll_schedule.c b/src/schedule/ll_schedule.c
@@ -191,7 +191,8 @@ static int schedule_ll_domain_set(struct ll_schedule_data *sch,
 	return 0;
 }
 
-static void schedule_ll_domain_clear(struct ll_schedule_data *sch)
+static void schedule_ll_domain_clear(struct ll_schedule_data *sch,
+				     struct task *task)
 {
 	spin_lock(sch->domain->lock);
 
@@ -212,7 +213,7 @@ static void schedule_ll_domain_clear(struct ll_schedule_data *sch)
 
 	spin_unlock(sch->domain->lock);
 
-	domain_unregister(sch->domain, atomic_read(&sch->num_tasks));
+	domain_unregister(sch->domain, task, atomic_read(&sch->num_tasks));
 }
 
 static void schedule_ll_task_insert(struct task *task, struct list_item *tasks)
@@ -339,7 +340,7 @@ static void schedule_ll_task_cancel(void *data, struct task *task)
 
 		/* found it */
 		if (curr_task == task) {
-			schedule_ll_domain_clear(sch);
+			schedule_ll_domain_clear(sch, task);
 			break;
 		}
 	}
diff --git a/src/schedule/timer_domain.c b/src/schedule/timer_domain.c
@@ -56,7 +56,7 @@ static int timer_domain_register(struct ll_schedule_domain *domain,
 }
 
 static void timer_domain_unregister(struct ll_schedule_domain *domain,
-				    uint32_t num_tasks)
+				    struct task *task, uint32_t num_tasks)
 {
 	struct timer_domain *timer_domain = ll_sch_domain_get_pdata(domain);
 	int core = cpu_get_id();

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct ll_schedule_domain_ops {`
`30`	`30`	`uint64_t period, struct task *task,`
`31`	`31`	`void (handler)(void arg), void *arg);`
`32`	`32`	`void (domain_unregister)(struct ll_schedule_domain domain,`
`33`		`- uint32_t num_tasks);`
	`33`	`+ struct task *task, uint32_t num_tasks);`
`34`	`34`	`void (domain_enable)(struct ll_schedule_domain domain, int core);`
`35`	`35`	`void (domain_disable)(struct ll_schedule_domain domain, int core);`
`36`	`36`	`void (domain_set)(struct ll_schedule_domain domain, uint64_t start);`
`@@ -85,11 +85,11 @@ static inline int domain_register(struct ll_schedule_domain *domain,`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`static inline void domain_unregister(struct ll_schedule_domain *domain,`
`88`		`- uint32_t num_tasks)`
	`88`	`+ struct task *task, uint32_t num_tasks)`
`89`	`89`	`{`
`90`	`90`	`assert(domain->ops->domain_unregister);`
`91`	`91`
`92`		`- domain->ops->domain_unregister(domain, num_tasks);`
	`92`	`+ domain->ops->domain_unregister(domain, task, num_tasks);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`static inline void domain_enable(struct ll_schedule_domain *domain, int core)`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,8 @@ static int schedule_ll_domain_set(struct ll_schedule_data *sch,`
`191`	`191`	`return 0;`
`192`	`192`	`}`
`193`	`193`
`194`		`-static void schedule_ll_domain_clear(struct ll_schedule_data *sch)`
	`194`	`+static void schedule_ll_domain_clear(struct ll_schedule_data *sch,`
	`195`	`+ struct task *task)`
`195`	`196`	`{`
`196`	`197`	`spin_lock(sch->domain->lock);`
`197`	`198`
`@@ -212,7 +213,7 @@ static void schedule_ll_domain_clear(struct ll_schedule_data *sch)`
`212`	`213`
`213`	`214`	`spin_unlock(sch->domain->lock);`
`214`	`215`
`215`		`- domain_unregister(sch->domain, atomic_read(&sch->num_tasks));`
	`216`	`+ domain_unregister(sch->domain, task, atomic_read(&sch->num_tasks));`
`216`	`217`	`}`
`217`	`218`
`218`	`219`	`static void schedule_ll_task_insert(struct task task, struct list_item tasks)`
`@@ -339,7 +340,7 @@ static void schedule_ll_task_cancel(void data, struct task task)`
`339`	`340`
`340`	`341`	`/* found it */`
`341`	`342`	`if (curr_task == task) {`
`342`		`- schedule_ll_domain_clear(sch);`
	`343`	`+ schedule_ll_domain_clear(sch, task);`
`343`	`344`	`break;`
`344`	`345`	`}`
`345`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static int timer_domain_register(struct ll_schedule_domain *domain,`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static void timer_domain_unregister(struct ll_schedule_domain *domain,`
`59`		`- uint32_t num_tasks)`
	`59`	`+ struct task *task, uint32_t num_tasks)`
`60`	`60`	`{`
`61`	`61`	`struct timer_domain *timer_domain = ll_sch_domain_get_pdata(domain);`
`62`	`62`	`int core = cpu_get_id();`