Skip to content
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

Ipc4 multicore issue fixes #8143

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Ipc4 multicore issue fixes #8143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a67152
ipc4: msg: avoid sending duplicated reply message
RanderWang Sep 1, 2023
793cd28
ipc4: msg: simplify ipc message check for notification
RanderWang Sep 4, 2023
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
81 changes: 60 additions & 21 deletions src/ipc/ipc4/handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ struct ipc4_msg_data {
static struct ipc4_msg_data msg_data;
RanderWang marked this conversation as resolved.
Show resolved Hide resolved

/* fw sends a fw ipc message to send the status of the last host ipc message */
static struct ipc_msg msg_reply;
static struct ipc_msg msg_reply = {0, 0, 0, 0, LIST_INIT(msg_reply.list)};

static struct ipc_msg msg_notify;
static struct ipc_msg msg_notify = {0, 0, 0, 0, LIST_INIT(msg_notify.list)};

/*
* Global IPC Operations.
Expand Down Expand Up @@ -1235,28 +1235,15 @@ void ipc_send_panic_notification(void)

#ifdef CONFIG_LOG_BACKEND_ADSP_MTRACE

static bool is_notification_queued(void)
static bool is_notification_queued(struct ipc_msg *msg)
{
struct ipc *ipc = ipc_get();
struct list_item *slist;
struct ipc_msg *msg;
k_spinlock_key_t key;
bool queued = false;

key = k_spin_lock(&ipc->lock);
if (list_is_empty(&ipc->msg_list))
goto out;

list_for_item(slist, &ipc->msg_list) {
msg = container_of(slist, struct ipc_msg, list);

if (msg == &msg_notify) {
queued = true;
break;
}
}

out:
if (!list_is_empty(&msg->list))
queued = true;
k_spin_unlock(&ipc->lock, key);

return queued;
Expand All @@ -1265,13 +1252,12 @@ static bool is_notification_queued(void)
void ipc_send_buffer_status_notify(void)
{
/* a single msg_notify object is used */
if (is_notification_queued())
if (is_notification_queued(&msg_notify))
return;

msg_notify.header = SOF_IPC4_NOTIF_HEADER(SOF_IPC4_NOTIFY_LOG_BUFFER_STATUS);
msg_notify.extension = 0;
msg_notify.tx_size = 0;
list_init(&msg_notify.list);

tr_dbg(&ipc_tr, "tx-notify\t: %#x|%#x", msg_notify.header, msg_notify.extension);

Expand Down Expand Up @@ -1303,7 +1289,6 @@ void ipc_cmd(struct ipc_cmd_hdr *_hdr)
msg_reply.tx_size = 0;
msg_reply.header = in->primary.dat;
msg_reply.extension = in->extension.dat;
list_init(&msg_reply.list);

target = in->primary.r.msg_tgt;

Expand All @@ -1330,9 +1315,63 @@ void ipc_cmd(struct ipc_cmd_hdr *_hdr)
char *data = ipc->comp_data;
struct ipc4_message_reply reply;

/* Process flow and time stamp for IPC4 msg processed on secondary core :
* core 0 (primary core) core x (secondary core)
* # IPC msg thread #IPC delayed worker #core x idc thread
* ipc_task_ops.run()
* ipc_do_cmd()
* msg_reply.header = in->primary.dat
* ipc4_process_on_core(x)
* mask |= SECONDARY_CORE
* idc_send_message()
* Case 1:
* // Ipc msg processed by secondary core idc_ipc()
* if ((mask & SECONDARY_CORE)) ipc_cmd()
* return; ipc_msg_send()
* mask &= ~SECONDARY_CORE
*
* ipc_platform_send_msg
* ----------------------------------------------------------------------------
* Case 2:
* idc_ipc()
* ipc_cmd()
* //Prepare reply msg
* msg_reply.header =
* reply.primary.dat;
* ipc_msg_send()
* mask &= ~SECONDARY_CORE
*
* if ((mask & IPC_TASK_SECONDARY_CORE))
* return;
* // Ipc reply msg was prepared, so return
* if (msg_reply.header != in->primary.dat)
* return;
* ipc_platform_send_msg
* ----------------------------------------------------------------------------
* Case 3:
* idc_ipc()
* ipc_cmd()
* //Prepare reply msg
* msg_reply.header =
* reply.primary.dat;
* ipc_msg_send()
* mask &= ~SECONDARY_CORE
*
* ipc_platform_send_msg
*
* if ((mask & IPC_TASK_SECONDARY_CORE))
RanderWang marked this conversation as resolved.
Show resolved Hide resolved
* return;
* // Ipc reply msg was prepared, so return
* if (msg_reply.header != in->primary.dat)
* return;
*/

/* Reply prepared by secondary core */
if ((ipc->task_mask & IPC_TASK_SECONDARY_CORE) && cpu_is_primary(cpu_get_id()))
return;
/* Reply has been prepared by secondary core */
if (msg_reply.header != in->primary.dat)
return;

/* Do not send reply for SET_DX if we are going to enter D3
* The reply is going to be sent as part of the power down
Expand Down
Loading