From bf08f082c69d42bfb4e4774548662a12ef90acfa Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Tue, 24 Mar 2020 17:07:33 +0800 Subject: [PATCH 1/2] ASoC: SOF: add probe support extend data Add new probe support extend date to show the probe support info. Signed-off-by: Pan Xiuli --- include/sound/sof/info.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 438a11fcf272b2..68e92b55043942 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -31,6 +31,7 @@ enum sof_ipc_ext_data { SOF_IPC_EXT_UNUSED = 0, SOF_IPC_EXT_WINDOW = 1, SOF_IPC_EXT_CC_INFO = 2, + SOF_IPC_EXT_PROBE_INFO = 3, }; /* FW version - SOF_IPC_GLB_VERSION */ @@ -114,4 +115,15 @@ struct sof_ipc_cc_version { char desc[]; /* null terminated compiler description */ } __packed; +/* extended data: Probe setup */ +struct sof_ipc_probe_support { + struct sof_ipc_ext_data_hdr ext_hdr; + + uint32_t probe_points_max; + uint32_t injection_dmas_max; + + /* reserved for future use */ + uint32_t reserved[2]; +} __packed; + #endif From d1342018ef326b7f43d3102beaad5b16bf22b58a Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Tue, 24 Mar 2020 16:42:15 +0800 Subject: [PATCH 2/2] ASoC: SOF: add debug ABI version Add new debug ABI version to be increased when changing user space debug interfaces while the the main ABI is not affected. Signed-off-by: Pan Xiuli --- include/sound/sof/info.h | 8 ++++++++ include/uapi/sound/sof/abi.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 68e92b55043942..6910aa3bcc4b38 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -32,6 +32,7 @@ enum sof_ipc_ext_data { SOF_IPC_EXT_WINDOW = 1, SOF_IPC_EXT_CC_INFO = 2, SOF_IPC_EXT_PROBE_INFO = 3, + SOF_IPC_EXT_USER_ABI_INFO = 4, }; /* FW version - SOF_IPC_GLB_VERSION */ @@ -126,4 +127,11 @@ struct sof_ipc_probe_support { uint32_t reserved[2]; } __packed; +/* extended data: user abi version(s) */ +struct sof_ipc_user_abi_version { + struct sof_ipc_ext_data_hdr ext_hdr; + + uint32_t abi_dbg_version; +} __packed; + #endif diff --git a/include/uapi/sound/sof/abi.h b/include/uapi/sound/sof/abi.h index 5995b79d6df13c..e0fa2939d49c2f 100644 --- a/include/uapi/sound/sof/abi.h +++ b/include/uapi/sound/sof/abi.h @@ -26,7 +26,7 @@ /* SOF ABI version major, minor and patch numbers */ #define SOF_ABI_MAJOR 3 -#define SOF_ABI_MINOR 13 +#define SOF_ABI_MINOR 14 #define SOF_ABI_PATCH 0 /* SOF ABI version number. Format within 32bit word is MMmmmppp */