OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zephyr: ll-domain: fix domain unregistration 

When the .domain_unregister() method is called, .total_num_tasks is
still positive, it will only become 0 for the last task after
.domain_unregister() returns. When cleaning up also set the user
pointer to NULL.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2021-06-22 16:42:10 +02:00 committed by Liam Girdwood
parent f9e07679b9
commit a971f85c1a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/schedule/zephyr_domain.c
View File

@ -69,7 +69,7 @@ static void zephyr_domain_thread_fn(void *p1, void *p2, void *p3)
/* Timer callback: runs in timer IRQ context */
static void zephyr_domain_timer_fn(struct k_timer *timer)
{
struct zephyr_domain *zephyr_domain = timer->user_data;
struct zephyr_domain *zephyr_domain = k_timer_user_data_get(timer);
int core;
if (!zephyr_domain)
@ -113,11 +113,11 @@ static int zephyr_domain_register(struct ll_schedule_domain *domain,
k_thread_start(thread);
if (!zephyr_domain->timer.user_data) {
if (!k_timer_user_data_get(&zephyr_domain->timer)) {
k_timeout_t start = {0};
k_timer_init(&zephyr_domain->timer, zephyr_domain_timer_fn, NULL);
zephyr_domain->timer.user_data = zephyr_domain;
k_timer_user_data_set(&zephyr_domain->timer, zephyr_domain);
k_timer_start(&zephyr_domain->timer, start, K_USEC(LL_TIMER_PERIOD_US));
}
@ -140,8 +140,10 @@ static int zephyr_domain_unregister(struct ll_schedule_domain *domain,
if (num_tasks)
return 0;
if (!atomic_read(&domain->total_num_tasks))
if (atomic_read(&domain->total_num_tasks) == 1) {
k_timer_stop(&zephyr_domain->timer);
k_timer_user_data_set(&zephyr_domain->timer, NULL);
}
k_thread_abort(&zephyr_domain->domain_thread[core].ll_thread);
zephyr_domain->domain_thread[core].handler = NULL;