diff --git a/include/uapi/sound/sof-ipc.h b/include/uapi/sound/sof-ipc.h
index b520e3b24ed6c7..bbf5cca3405986 100644
--- a/include/uapi/sound/sof-ipc.h
+++ b/include/uapi/sound/sof-ipc.h
@@ -110,16 +110,17 @@
 #define SOF_IPC_PANIC_MAGIC			0x0dead000
 #define SOF_IPC_PANIC_MAGIC_MASK		0x0ffff000
 #define SOF_IPC_PANIC_CODE_MASK			0x00000fff
-#define SOF_IPC_PANIC_MEM			(SOF_IPC_PANIC_MAGIC | 0)
-#define SOF_IPC_PANIC_WORK			(SOF_IPC_PANIC_MAGIC | 1)
-#define SOF_IPC_PANIC_IPC			(SOF_IPC_PANIC_MAGIC | 2)
-#define SOF_IPC_PANIC_ARCH			(SOF_IPC_PANIC_MAGIC | 3)
-#define SOF_IPC_PANIC_PLATFORM			(SOF_IPC_PANIC_MAGIC | 4)
-#define SOF_IPC_PANIC_TASK			(SOF_IPC_PANIC_MAGIC | 5)
-#define SOF_IPC_PANIC_EXCEPTION			(SOF_IPC_PANIC_MAGIC | 6)
-#define SOF_IPC_PANIC_DEADLOCK			(SOF_IPC_PANIC_MAGIC | 7)
-#define SOF_IPC_PANIC_STACK			(SOF_IPC_PANIC_MAGIC | 8)
-#define SOF_IPC_PANIC_IDLE			(SOF_IPC_PANIC_MAGIC | 9)
+#define SOF_IPC_PANIC_MEM			(SOF_IPC_PANIC_MAGIC | 0x0)
+#define SOF_IPC_PANIC_WORK			(SOF_IPC_PANIC_MAGIC | 0x1)
+#define SOF_IPC_PANIC_IPC			(SOF_IPC_PANIC_MAGIC | 0x2)
+#define SOF_IPC_PANIC_ARCH			(SOF_IPC_PANIC_MAGIC | 0x3)
+#define SOF_IPC_PANIC_PLATFORM			(SOF_IPC_PANIC_MAGIC | 0x4)
+#define SOF_IPC_PANIC_TASK			(SOF_IPC_PANIC_MAGIC | 0x5)
+#define SOF_IPC_PANIC_EXCEPTION			(SOF_IPC_PANIC_MAGIC | 0x6)
+#define SOF_IPC_PANIC_DEADLOCK			(SOF_IPC_PANIC_MAGIC | 0x7)
+#define SOF_IPC_PANIC_STACK			(SOF_IPC_PANIC_MAGIC | 0x8)
+#define SOF_IPC_PANIC_IDLE			(SOF_IPC_PANIC_MAGIC | 0x9)
+#define SOF_IPC_PANIC_WFI			(SOF_IPC_PANIC_MAGIC | 0xa)
 
 /*
  * SOF memory capabilities, add new ones at the end
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index e6e40d4e7f3017..f5f3aef1977f5a 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -150,6 +150,7 @@ static const struct sof_panic_msg panic_msg[] = {
 	{SOF_IPC_PANIC_DEADLOCK, "deadlock"},
 	{SOF_IPC_PANIC_STACK, "stack overflow"},
 	{SOF_IPC_PANIC_IDLE, "can't enter idle"},
+	{SOF_IPC_PANIC_WFI, "invalid wait state"},
 };
 
 int snd_sof_get_status(struct snd_sof_dev *sdev, u32 panic_code,