Skip to content

DP: application: cleanup #10461

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 4 commits into
base: main
Choose a base branch
from
+14 −30
Open

DP: application: cleanup #10461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd2e00
dp: application: log when starting the thread
lyakh Dec 24, 2025
e787a27
dp: application: remove unneeded operations copy
lyakh Dec 24, 2025
65a928b
dp:application: embed IPC flattening buffer in module data
lyakh Dec 24, 2025
f471a53
dp: application: remove left-over code
lyakh Dec 24, 2025
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
3 changes: 2 additions & 1 deletion src/schedule/zephyr_dp_schedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ struct scheduler_dp_data {

enum sof_dp_part_type {
SOF_DP_PART_HEAP,
SOF_DP_PART_IPC,
SOF_DP_PART_CFG,
SOF_DP_PART_TYPE_COUNT,
};

struct ipc4_flat;
struct task_dp_pdata {
k_tid_t thread_id; /* zephyr thread ID */
struct k_thread *thread; /* pointer to the kernels' thread object */
Expand All @@ -44,6 +44,7 @@ struct task_dp_pdata {
#else
struct k_sem *sem; /* pointer to semaphore for task scheduling */
struct k_sem sem_struct; /* semaphore for task scheduling for kernel threads */
struct ipc4_flat *flat;
unsigned char pend_ipc;
unsigned char pend_proc;
struct k_mem_partition mpart[SOF_DP_PART_TYPE_COUNT];
Expand Down
41 changes: 12 additions & 29 deletions src/schedule/zephyr_dp_schedule_application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ static struct k_mem_domain dp_mdom[CONFIG_CORE_COUNT];
#define DP_SYNC_INIT_LIST LISTIFY(CONFIG_CORE_COUNT, DP_SYNC_INIT, (,))
static STRUCT_SECTION_ITERABLE_ARRAY(k_sem, dp_sync, CONFIG_CORE_COUNT) = { DP_SYNC_INIT_LIST };

/* TODO: make this a shared kernel->module buffer for IPC parameters */
static uint8_t ipc_buf[4096] __aligned(4096);

struct ipc4_flat {
unsigned int cmd;
int ret;
Expand All @@ -52,7 +49,7 @@ struct ipc4_flat {
enum ipc4_pipeline_state state;
int n_sources;
int n_sinks;
void *source_sink[];
void *source_sink[2 * CONFIG_MODULE_MAX_CONNECTIONS];
} pipeline_state;
};
};
Expand All @@ -79,15 +76,14 @@ static int ipc_thread_flatten(unsigned int cmd, const union scheduler_dp_thread_
case COMP_TRIGGER_STOP:
break;
case COMP_TRIGGER_PREPARE:
if (sizeof(flat->cmd) + sizeof(flat->ret) + sizeof(flat->pipeline_state) +
sizeof(void *) * (param->pipeline_state.n_sources +
param->pipeline_state.n_sinks) >
sizeof(ipc_buf))
if (param->pipeline_state.n_sources > CONFIG_MODULE_MAX_CONNECTIONS ||
param->pipeline_state.n_sinks > CONFIG_MODULE_MAX_CONNECTIONS)
return -ENOMEM;

flat->pipeline_state.state = param->pipeline_state.state;
flat->pipeline_state.n_sources = param->pipeline_state.n_sources;
flat->pipeline_state.n_sinks = param->pipeline_state.n_sinks;
/* Up to 2 * CONFIG_MODULE_MAX_CONNECTIONS */
memcpy(flat->pipeline_state.source_sink, param->pipeline_state.sources,
flat->pipeline_state.n_sources *
sizeof(flat->pipeline_state.source_sink[0]));
Expand Down Expand Up @@ -178,12 +174,10 @@ int scheduler_dp_thread_ipc(struct processing_module *pmod, unsigned int cmd,

unsigned int lock_key = scheduler_dp_lock(pmod->dev->task->core);

struct ipc4_flat *flat = (struct ipc4_flat *)ipc_buf;

/* IPCs are serialised */
flat->ret = -ENOSYS;
pdata->flat->ret = -ENOSYS;

ret = ipc_thread_flatten(cmd, param, flat);
ret = ipc_thread_flatten(cmd, param, pdata->flat);
if (!ret) {
pdata->pend_ipc++;
k_sem_give(pdata->sem);
Expand All @@ -197,7 +191,7 @@ int scheduler_dp_thread_ipc(struct processing_module *pmod, unsigned int cmd,
if (ret < 0)
tr_err(&dp_tr, "Failed waiting for DP thread: %d", ret);
else
ret = flat->ret;
ret = pdata->flat->ret;
}

return ret;
Expand Down Expand Up @@ -283,6 +277,7 @@ void dp_thread_fn(void *p1, void *p2, void *p3)

/* The IPC thread is waiting for the thread to be started, it can proceed now. */
k_sem_give(&dp_sync[task->core]);
comp_info(pmod->dev, "userspace thread started");
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The log message "userspace thread started" is misleading because this function is used for both userspace and kernel threads depending on the CONFIG_USERSPACE configuration and the K_USER flag. Consider using a more generic message like "DP thread started" to accurately reflect that this thread may be either a userspace or kernel thread.

Suggested change
comp_info(pmod->dev, "userspace thread started");
comp_info(pmod->dev, "DP thread started");

Copilot uses AI. Check for mistakes.

do {
/*
Expand Down Expand Up @@ -315,7 +310,7 @@ void dp_thread_fn(void *p1, void *p2, void *p3)
if (pend_ipc) {
/* handle IPC */
tr_dbg(&dp_tr, "got IPC wake up for %p state %d", pmod, task->state);
ipc_thread_unflatten_run(pmod, (struct ipc4_flat *)ipc_buf);
ipc_thread_unflatten_run(pmod, task_pdata->flat);
k_sem_give(&dp_sync[task->core]);
}

Expand Down Expand Up @@ -400,7 +395,6 @@ void scheduler_dp_domain_free(struct processing_module *pmod)
struct task_dp_pdata *pdata = pmod->dev->task->priv_data;

k_mem_domain_remove_partition(dp_mdom + core, pdata->mpart + SOF_DP_PART_HEAP);
k_mem_domain_remove_partition(dp_mdom + core, pdata->mpart + SOF_DP_PART_IPC);
k_mem_domain_remove_partition(dp_mdom + core, pdata->mpart + SOF_DP_PART_CFG);
#endif
}
Expand All @@ -415,12 +409,12 @@ int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
struct task task;
struct task_dp_pdata pdata;
struct comp_driver drv;
struct module_interface ops;
struct ipc4_flat flat;
} *task_memory;

int ret;

/* must be called on the same core the task will be binded to */
/* must be called on the same core the task will be bound to */
assert(cpu_get_id() == core);

/*
Expand All @@ -440,8 +434,6 @@ int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
memset(task_memory, 0, sizeof(*task_memory));

task_memory->drv = *mod->dev->drv;
task_memory->ops = *mod->dev->drv->adapter_ops; // FIXME: is this needed?
task_memory->drv.adapter_ops = &task_memory->ops;
mod->dev->drv = &task_memory->drv;

/* allocate stack - must be aligned and cached so a separate alloc */
Expand All @@ -467,6 +459,7 @@ int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
/* It will be overwritten for K_USER threads to dynamic ones. */
pdata->sem = &pdata->sem_struct;
pdata->thread = &pdata->thread_struct;
pdata->flat = &task_memory->flat;

#ifdef CONFIG_USERSPACE
if (options & K_USER) {
Expand Down Expand Up @@ -517,10 +510,6 @@ int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
unsigned int pidx;
size_t size;
uintptr_t start;
struct k_mem_partition *ppart[SOF_DP_PART_TYPE_COUNT];

for (pidx = 0; pidx < ARRAY_SIZE(ppart); pidx++)
ppart[pidx] = pdata->mpart + pidx;

/* Module heap partition */
mod_heap_info(mod, &size, &start);
Expand All @@ -529,12 +518,6 @@ int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
.size = size,
.attr = K_MEM_PARTITION_P_RW_U_RW,
};
/* IPC flattening buffer partition */
pdata->mpart[SOF_DP_PART_IPC] = (struct k_mem_partition){
.start = (uintptr_t)&ipc_buf,
.size = sizeof(ipc_buf),
.attr = K_MEM_PARTITION_P_RW_U_RW,
};
/* Host mailbox partition for additional IPC parameters: read-only */
pdata->mpart[SOF_DP_PART_CFG] = (struct k_mem_partition){
.start = (uintptr_t)MAILBOX_HOSTBOX_BASE,
Expand Down
Loading