From f79bbb296d77bf0d8fda7146972aba88da4b2de3 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Wed, 9 Jun 2021 18:19:51 +0800 Subject: [PATCH] fw_ready: add D3_PERSISTENT to indicate if restoring from D3 supported Add flag SOF_IPC_INFO_D3_PERSISTENT to inform host driver if the IMR restore feature is supported to the fw_ready message, then the host driver can decide whether to choose it or not. Signed-off-by: Keyon Jie --- src/include/ipc/info.h | 1 + src/include/kernel/abi.h | 4 ++-- src/include/sof/debug/debug.h | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/include/ipc/info.h b/src/include/ipc/info.h index 0afd3b1bb..5693079b3 100644 --- a/src/include/ipc/info.h +++ b/src/include/ipc/info.h @@ -33,6 +33,7 @@ #define SOF_IPC_INFO_LOCKS BIT(1) #define SOF_IPC_INFO_LOCKSV BIT(2) #define SOF_IPC_INFO_GDB BIT(3) +#define SOF_IPC_INFO_D3_PERSISTENT BIT(4) /* extended data types that can be appended onto end of sof_ipc_fw_ready */ enum sof_ipc_ext_data { diff --git a/src/include/kernel/abi.h b/src/include/kernel/abi.h index b5ef6fcf1..b9847c7de 100644 --- a/src/include/kernel/abi.h +++ b/src/include/kernel/abi.h @@ -29,8 +29,8 @@ /** \brief SOF ABI version major, minor and patch numbers */ #define SOF_ABI_MAJOR 3 -#define SOF_ABI_MINOR 18 -#define SOF_ABI_PATCH 1 +#define SOF_ABI_MINOR 19 +#define SOF_ABI_PATCH 0 /** \brief SOF ABI version number. Format within 32bit word is MMmmmppp */ #define SOF_ABI_MAJOR_SHIFT 24 diff --git a/src/include/sof/debug/debug.h b/src/include/sof/debug/debug.h index 0712c482a..40816707e 100644 --- a/src/include/sof/debug/debug.h +++ b/src/include/sof/debug/debug.h @@ -35,7 +35,8 @@ SOF_IPC_INFO_BUILD | \ (IS_ENABLED(CONFIG_DEBUG_LOCKS) ? SOF_IPC_INFO_LOCKS : 0) | \ (IS_ENABLED(CONFIG_DEBUG_LOCKS_VERBOSE) ? SOF_IPC_INFO_LOCKSV : 0) | \ - (IS_ENABLED(CONFIG_GDB_DEBUG) ? SOF_IPC_INFO_GDB : 0) \ + (IS_ENABLED(CONFIG_GDB_DEBUG) ? SOF_IPC_INFO_GDB : 0) | \ + (IS_ENABLED(CONFIG_CAVS) ? SOF_IPC_INFO_D3_PERSISTENT : 0) \ ) /* dump file and line to start of mailbox or shared memory */ @@ -126,7 +127,8 @@ ( \ (IS_ENABLED(CONFIG_DEBUG_LOCKS) ? SOF_IPC_INFO_LOCKS : 0) | \ (IS_ENABLED(CONFIG_DEBUG_LOCKS_VERBOSE) ? SOF_IPC_INFO_LOCKSV : 0) | \ - (IS_ENABLED(CONFIG_GDB_DEBUG) ? SOF_IPC_INFO_GDB : 0) \ + (IS_ENABLED(CONFIG_GDB_DEBUG) ? SOF_IPC_INFO_GDB : 0) | \ + (IS_ENABLED(CONFIG_CAVS) ? SOF_IPC_INFO_D3_PERSISTENT : 0) \ ) #define dbg() do {} while (0)