Skip to content

[Ipc4] add fw panic notification support#7597

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
kv2019i merged 2 commits into from
May 23, 2023
Merged

[Ipc4] add fw panic notification support #7597

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
ee05e96
ipc: add ipc_msg_send_direct support
kv2019i Feb 7, 2023
076cf68
ipc4 : send panic on Zephyr OS panic
kv2019i Feb 7, 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
5 changes: 5 additions & 0 deletions src/drivers/amd/rembrandt/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,6 +210,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return ret;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
Comment thread
RanderWang marked this conversation as resolved.
Outdated
{
/* TODO: add support */
}

int platform_ipc_init(struct ipc *ipc)
{
ipc_set_drvdata(ipc, NULL);
Expand Down
5 changes: 5 additions & 0 deletions src/drivers/amd/renoir/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

int platform_ipc_init(struct ipc *ipc)
{
ipc_set_drvdata(ipc, NULL);
Expand Down
5 changes: 5 additions & 0 deletions src/drivers/imx/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,6 +161,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

#if CONFIG_HOST_PTABLE
struct ipc_data_host_buffer *ipc_platform_get_host_buffer(struct ipc *ipc)
{
Expand Down
5 changes: 5 additions & 0 deletions src/drivers/intel/cavs/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,6 +196,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

int platform_ipc_init(struct ipc *ipc)
{
int irq;
Expand Down
5 changes: 5 additions & 0 deletions src/drivers/mediatek/mt818x/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

#if CONFIG_HOST_PTABLE
struct ipc_data_host_buffer *ipc_platform_get_host_buffer(struct ipc *ipc)
{
Expand Down
5 changes: 5 additions & 0 deletions src/drivers/mediatek/mt8195/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

#if CONFIG_HOST_PTABLE
struct ipc_data_host_buffer *ipc_platform_get_host_buffer(struct ipc *ipc)
{
Expand Down
6 changes: 6 additions & 0 deletions src/include/sof/ipc/common.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,12 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev);
*/
void ipc_boot_complete_msg(struct ipc_cmd_hdr *header, uint32_t data);

/**
* \brief Send a IPC notification that FW has hit
* a DSP notification.
*/
void ipc_send_panic_notification(void);

/**
* \brief Read a compact IPC message or return NULL for normal message.
* @return Pointer to the compact message data.
Expand Down
6 changes: 6 additions & 0 deletions src/include/sof/ipc/driver.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,12 @@ void ipc_platform_complete_cmd(struct ipc *ipc);
*/
int ipc_platform_send_msg(const struct ipc_msg *msg);

/**
* \brief Send IPC message to host direct without inserting in msg_list.
* @param msg The IPC message to send to host.
*/
void ipc_platform_send_msg_direct(const struct ipc_msg *msg);

/**
* \brief Retrieves the ipc_data_host_buffer allocated by the platform ipc.
* @return Pointer to the data.
Expand Down
7 changes: 7 additions & 0 deletions src/include/sof/ipc/msg.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,13 @@ void ipc_send_queued_msg(void);
*/
void ipc_msg_send(struct ipc_msg *msg, void *data, bool high_priority);

/**
* \brief Send an IPC message directly for emergency.
* @param msg The IPC message to be freed.
* @param data The message data.
*/
void ipc_msg_send_direct(struct ipc_msg *msg, void *data);

/**
* \brief Build stream position IPC message.
* @param[in,out] posn Stream position message
Expand Down
20 changes: 20 additions & 0 deletions src/ipc/ipc-common.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,6 +178,26 @@ static void schedule_ipc_worker(void)
#endif
}

void ipc_msg_send_direct(struct ipc_msg *msg, void *data)
{
struct ipc *ipc = ipc_get();
k_spinlock_key_t key;
int ret;

key = k_spin_lock(&ipc->lock);

/* copy mailbox data to message if not already copied */
if (msg->tx_size > 0 && msg->tx_size <= SOF_IPC_MSG_MAX_SIZE &&
msg->tx_data != data) {
ret = memcpy_s(msg->tx_data, msg->tx_size, data, msg->tx_size);
assert(!ret);
}

ipc_platform_send_msg_direct(msg);

k_spin_unlock(&ipc->lock, key);
}

void ipc_msg_send(struct ipc_msg *msg, void *data, bool high_priority)
{
struct ipc *ipc = ipc_get();
Expand Down
8 changes: 8 additions & 0 deletions src/ipc/ipc-zephyr.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,14 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* prepare the message and copy to mailbox */
struct ipc_cmd_hdr *hdr = ipc_prepare_to_send(msg);

intel_adsp_ipc_send_message_emergency(INTEL_ADSP_IPC_HOST_DEV, hdr->pri, hdr->ext);
}

int platform_ipc_init(struct ipc *ipc)
{
ipc_set_drvdata(ipc, NULL);
Expand Down
5 changes: 5 additions & 0 deletions src/ipc/ipc3/handler.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1603,6 +1603,11 @@ void ipc_boot_complete_msg(struct ipc_cmd_hdr *header, uint32_t data)
header->dat[1] = data;
}

void ipc_send_panic_notification(void)
{
/* nothing to do */
}

static int ipc_fw_ready(void)
{
#ifdef CONFIG_IMX93_A55
Expand Down
13 changes: 11 additions & 2 deletions src/ipc/ipc4/handler.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,9 +67,7 @@ static struct ipc4_msg_data msg_data;
/* fw sends a fw ipc message to send the status of the last host ipc message */
static struct ipc_msg msg_reply;

#ifdef CONFIG_LOG_BACKEND_ADSP_MTRACE
static struct ipc_msg msg_notify;
#endif

/*
* Global IPC Operations.
Expand DownExpand Up@@ -1063,6 +1061,17 @@ void ipc_boot_complete_msg(struct ipc_cmd_hdr *header, uint32_t data)
header->ext = 0;
}

void ipc_send_panic_notification(void)
{
msg_notify.header = SOF_IPC4_NOTIF_HEADER(SOF_IPC4_EXCEPTION_CAUGHT);
Comment thread
RanderWang marked this conversation as resolved.
Outdated
msg_notify.extension = cpu_get_id();
msg_notify.tx_size = 0;
msg_notify.tx_data = NULL;
list_init(&msg_notify.list);

ipc_msg_send_direct(&msg_notify, NULL);
Comment thread
RanderWang marked this conversation as resolved.
Outdated
}

#ifdef CONFIG_LOG_BACKEND_ADSP_MTRACE

static bool is_notification_queued(void)
Expand Down
2 changes: 2 additions & 0 deletions src/platform/library/include/platform/platform.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,8 @@ static inline void platform_wait_for_interrupt(int level) {}

static inline int ipc_platform_send_msg(const struct ipc_msg *msg) { return 0; }

static inline void ipc_platform_send_msg_direct(const struct ipc_msg *msg) {}

#endif /* __PLATFORM_PLATFORM_H__ */

#else
Expand Down
5 changes: 5 additions & 0 deletions src/platform/posix/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,6 +196,11 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)
return 0;
}

void ipc_platform_send_msg_direct(const struct ipc_msg *msg)
{
/* TODO: add support */
}

int platform_ipc_init(struct ipc *ipc)
{
IRQ_CONNECT(CONFIG_ARCH_POSIX_FUZZ_IRQ, 0, fuzz_isr, NULL, 0);
Expand Down
15 changes: 15 additions & 0 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,11 +23,16 @@
#include <rtos/clk.h>

/* Zephyr includes */
#include <zephyr/arch/cpu.h>
#include <zephyr/device.h>
#include <zephyr/fatal.h>
#include <zephyr/kernel_structs.h>
#include <zephyr/kernel.h>
#include <zephyr/pm/policy.h>
#include <version.h>
#include <zephyr/sys/__assert.h>
#include <zephyr/logging/log_ctrl.h>
#include <zephyr/logging/log.h>

LOG_MODULE_REGISTER(zephyr, CONFIG_SOF_LOG_LEVEL);

Expand DownExpand Up@@ -322,3 +327,13 @@ int poll_for_register_delay(uint32_t reg, uint32_t mask,
return 0;
}

void k_sys_fatal_error_handler(unsigned int reason,
const z_arch_esf_t *esf)
{
ARG_UNUSED(esf);
LOG_PANIC();

ipc_send_panic_notification();

LOG_ERR("Halting system");
}