Skip to content

platform: ace: watchdog: send primary timeout via ipc_service critica… #11018

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
tmleman wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −4
Open

platform: ace: watchdog: send primary timeout via ipc_service critica… #11018

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
19 changes: 15 additions & 4 deletions src/platform/intel/ace/lib/watchdog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <sof/lib/uuid.h>
#include <rtos/idc.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/ipc/driver.h>
#include <sof/ipc/msg.h>
#include <ipc4/notification.h>

Expand All @@ -17,8 +18,6 @@

#if DT_NODE_HAS_STATUS(DT_NODELABEL(adsp_watchdog), okay)
#include <adsp_watchdog.h>
#include <intel_adsp_ipc.h>
#include <intel_adsp_ipc_devtree.h>

LOG_MODULE_REGISTER(wdt, CONFIG_SOF_LOG_LEVEL);

Expand All @@ -27,6 +26,7 @@ SOF_DEFINE_REG_UUID(wdt);
DECLARE_TR_CTX(wdt_tr, SOF_UUID(wdt_uuid), LOG_LEVEL_INFO);

static const struct device *const watchdog = DEVICE_DT_GET(DT_NODELABEL(adsp_watchdog));
static struct ipc_msg primary_timeout_ipc;
static struct ipc_msg secondary_timeout_ipc;

static void watchdog_primary_core_action_on_timeout(void)
Expand All @@ -35,8 +35,15 @@ static void watchdog_primary_core_action_on_timeout(void)

/* Send Watchdog Timeout IPC notification */
ipc4_notification_watchdog_init(&notif, cpu_get_id(), true);
intel_adsp_ipc_send_message_emergency(INTEL_ADSP_IPC_HOST_DEV,
notif.primary.dat, notif.extension.dat);
primary_timeout_ipc.header = notif.primary.dat;
primary_timeout_ipc.extension = notif.extension.dat;

/*
* The primary core low latency scheduler is stalled, so bypass the IPC
* queue and push the notification straight to the host using the direct
* (critical) send path.
*/
ipc_platform_send_msg_direct(&primary_timeout_ipc);
}

static void watchdog_secondary_core_action_on_timeout(void)
Expand Down Expand Up @@ -83,6 +90,10 @@ __cold void watchdog_init(void)

assert_can_be_cold();

primary_timeout_ipc.tx_data = NULL;
primary_timeout_ipc.tx_size = 0;
list_init(&primary_timeout_ipc.list);

secondary_timeout_ipc.tx_data = NULL;
secondary_timeout_ipc.tx_size = 0;
list_init(&secondary_timeout_ipc.list);
Expand Down
Loading