Skip to content

IDC: fix a race #10655

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

Merged
lgirdwood merged 2 commits into from
Mar 27, 2026
+21 −4
Merged

IDC: fix a race #10655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3177564
idc: fix a race
lyakh Mar 26, 2026
e6c73bf
dai: (cosmetic) fix an open-coded notifier call
lyakh Mar 26, 2026
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
2 changes: 1 addition & 1 deletion src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ int dai_common_trigger(struct dai_data *dd, struct comp_dev *dev, int cmd)

irq_local_disable(irq_flags);
notifier_event(group, NOTIFIER_ID_DAI_TRIGGER,
BIT(cpu_get_id()), NULL, 0);
NOTIFIER_TARGET_CORE_LOCAL, NULL, 0);
irq_local_enable(irq_flags);

/* return error of last trigger */
Expand Down
23 changes: 20 additions & 3 deletions src/idc/zephyr_idc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,23 +115,38 @@ static void idc_handler(struct k_p4wq_work *work)

/*
* Used for *target* CPUs, since the initiator (usually core 0) can launch
* several IDC messages at once
* several IDC messages at once. Also we need 2 work items per target core,
* because the p4wq thread might just have returned from the work handler, but
* hasn't released the work buffer yet (hasn't set thread pointer to NULL).
* Then submitting the same work item again can result in an assertion failure.
*/
static struct zephyr_idc_msg idc_work[CONFIG_CORE_COUNT];
static struct zephyr_idc_msg idc_work[CONFIG_CORE_COUNT * 2];
/* Protect the above array */
static K_MUTEX_DEFINE(idc_mutex);

int idc_send_msg(struct idc_msg *msg, uint32_t mode)
{
struct idc *idc = *idc_get();
struct idc_payload *payload = idc_payload_get(idc, msg->core);
unsigned int target_cpu = msg->core;
struct zephyr_idc_msg *zmsg = idc_work + target_cpu;
struct zephyr_idc_msg *zmsg = idc_work + target_cpu * 2;
struct idc_msg *msg_cp = &zmsg->msg;
struct k_p4wq_work *work = &zmsg->work;
int ret;
int idc_send_memcpy_err __unused;

k_mutex_lock(&idc_mutex, K_FOREVER);

if (unlikely(work->thread)) {
/* See comment above the idc_work[] array. */
zmsg++;
work = &zmsg->work;
msg_cp = &zmsg->msg;
}

idc_send_memcpy_err = memcpy_s(msg_cp, sizeof(*msg_cp), msg, sizeof(*msg));
assert(!idc_send_memcpy_err);

/* Same priority as the IPC thread which is an EDF task and under Zephyr */
work->priority = CONFIG_EDF_THREAD_PRIORITY;
work->deadline = 0;
Expand All @@ -158,6 +173,8 @@ int idc_send_msg(struct idc_msg *msg, uint32_t mode)

k_p4wq_submit(q_zephyr_idc + target_cpu, work);

k_mutex_unlock(&idc_mutex);

#ifdef CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS
/* Increment performance counters */
io_perf_monitor_update_data(idc->io_perf_out_msg_count, 1);
Expand Down
Loading