Skip to content

Revert "schedule: zephyr_ll: convert pdata->sem into sys_sem" #11035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lyakh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "schedule: zephyr_ll: convert pdata->sem into sys_sem" #11035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions posix/include/rtos/mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,4 @@ static inline int sys_mutex_unlock(struct sys_mutex *mutex)
return 0;
}

/* provide a no-op implementation for zephyr/sys/sem.h */

struct sys_sem {
};

static inline int sys_sem_init(struct sys_sem *sem, unsigned int initial_count,
unsigned int limit)
{
return 0;
}

static inline int sys_sem_give(struct sys_sem *sem)
{
return 0;
}

static inline int sys_sem_take(struct sys_sem *sem, k_timeout_t timeout)
{
return 0;
}

#endif
9 changes: 4 additions & 5 deletions src/schedule/zephyr_ll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <rtos/task.h>
#include <sof/lib/perf_cnt.h>
#include <zephyr/kernel.h>
#include <zephyr/sys/sem.h>
#include <ipc4/base_fw.h>
#include <sof/debug/telemetry/telemetry.h>

Expand All @@ -42,7 +41,7 @@ struct zephyr_ll {
struct zephyr_ll_pdata {
bool run;
bool freeing;
struct sys_sem sem;
struct k_sem sem;
};

#if CONFIG_SOF_USERSPACE_LL
Expand Down Expand Up @@ -137,7 +136,7 @@ static void zephyr_ll_task_done(struct zephyr_ll *sch,
* zephyr_ll_task_free() is trying to free this task. Complete
* it and signal the semaphore to let the function proceed
*/
sys_sem_give(&pdata->sem);
k_sem_give(&pdata->sem);

tr_info(&ll_tr, "task complete %p %pU", task, task->uid);
tr_info(&ll_tr, "num_tasks %d total_num_tasks %ld",
Expand Down Expand Up @@ -506,7 +505,7 @@ static int zephyr_ll_task_free(void *data, struct task *task)

if (must_wait)
/* Wait for up to 100 periods */
sys_sem_take(&pdata->sem, K_USEC(LL_TIMER_PERIOD_US * 100));
k_sem_take(&pdata->sem, K_USEC(LL_TIMER_PERIOD_US * 100));
Comment thread
lyakh marked this conversation as resolved.

/* Protect against racing with schedule_task() */
zephyr_ll_lock(sch, &flags);
Expand Down Expand Up @@ -699,7 +698,7 @@ int zephyr_ll_task_init(struct task *task,

memset(pdata, 0, sizeof(*pdata));

sys_sem_init(&pdata->sem, 0, 1);
k_sem_init(&pdata->sem, 0, 1);

task->priv_data = pdata;

Expand Down
Loading