diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c index e4ddcb14568b..c4fb9a3449c7 100644 --- a/src/audio/base_fw.c +++ b/src/audio/base_fw.c @@ -56,6 +56,7 @@ static int basefw_config(uint32_t *data_offset, char *data) uint16_t version[4] = {SOF_MAJOR, SOF_MINOR, SOF_MICRO, SOF_BUILD}; struct sof_tlv *tuple = (struct sof_tlv *)data; struct ipc4_scheduler_config sche_cfg; + uint32_t plat_data_offset = 0; uint32_t log_bytes_size = 0; tlv_value_set(tuple, IPC4_FW_VERSION_FW_CFG, sizeof(version), version); @@ -71,15 +72,6 @@ static int basefw_config(uint32_t *data_offset, char *data) IPC4_SLOW_CLOCK_FREQ_HZ_FW_CFG, clock_get_freq(CPU_LOWEST_FREQ_IDX)); - tuple = tlv_next(tuple); - tlv_value_uint32_set(tuple, IPC4_SLOW_CLOCK_FREQ_HZ_FW_CFG, IPC4_ALH_CAVS_1_8); - - tuple = tlv_next(tuple); - tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, 0); - - tuple = tlv_next(tuple); - tlv_value_uint32_set(tuple, IPC4_ALH_SUPPORT_LEVEL_FW_CFG, IPC4_ALH_CAVS_1_8); - tuple = tlv_next(tuple); tlv_value_uint32_set(tuple, IPC4_DL_MAILBOX_BYTES_FW_CFG, MAILBOX_HOSTBOX_SIZE); @@ -134,7 +126,11 @@ static int basefw_config(uint32_t *data_offset, char *data) IS_ENABLED(CONFIG_ADSP_IMR_CONTEXT_SAVE)); tuple = tlv_next(tuple); - *data_offset = (int)((char *)tuple - data); + + /* add platform specific tuples */ + platform_basefw_fw_config(&plat_data_offset, (char *)tuple); + + *data_offset = (int)((char *)tuple - data) + plat_data_offset; return 0; } diff --git a/src/include/ipc4/base_fw_platform.h b/src/include/ipc4/base_fw_platform.h index 51e560a37693..f720a5345930 100644 --- a/src/include/ipc4/base_fw_platform.h +++ b/src/include/ipc4/base_fw_platform.h @@ -13,6 +13,15 @@ #ifndef __SOF_IPC4_BASE_FW_PLATFORM_H__ #define __SOF_IPC4_BASE_FW_PLATFORM_H__ +/** + * \brief Platform specific routine to add data tuples to FW_CONFIG + * structure sent to host via IPC. + * \param[out] data_offset data offset after tuples added + * \param[in] data pointer where to add new entries + * \return 0 if successful, error code otherwise. + */ +int platform_basefw_fw_config(uint32_t *data_offset, char *data); + /** * \brief Platform specific routine to add data tuples to HW_CONFIG * structure sent to host via IPC. diff --git a/src/platform/intel/ace/lib/base_fw_platform.c b/src/platform/intel/ace/lib/base_fw_platform.c index 3a7ff02b0675..03f1955ecd86 100644 --- a/src/platform/intel/ace/lib/base_fw_platform.c +++ b/src/platform/intel/ace/lib/base_fw_platform.c @@ -9,6 +9,24 @@ #include #include +int platform_basefw_fw_config(uint32_t *data_offset, char *data) +{ + struct sof_tlv *tuple = (struct sof_tlv *)data; + + tlv_value_uint32_set(tuple, IPC4_SLOW_CLOCK_FREQ_HZ_FW_CFG, IPC4_ALH_CAVS_1_8); + + tuple = tlv_next(tuple); + tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, 0); + + tuple = tlv_next(tuple); + tlv_value_uint32_set(tuple, IPC4_ALH_SUPPORT_LEVEL_FW_CFG, IPC4_ALH_CAVS_1_8); + + tuple = tlv_next(tuple); + *data_offset = (int)((char *)tuple - data); + + return 0; +} + int platform_basefw_hw_config(uint32_t *data_offset, char *data) { struct sof_tlv *tuple = (struct sof_tlv *)data; diff --git a/src/platform/posix/base_fw_platform.c b/src/platform/posix/base_fw_platform.c index c398449e4988..d41868ae524b 100644 --- a/src/platform/posix/base_fw_platform.c +++ b/src/platform/posix/base_fw_platform.c @@ -7,6 +7,13 @@ #include #include +int platform_basefw_fw_config(uint32_t *data_offset, char *data) +{ + *data_offset = 0; + + return 0; +} + int platform_basefw_hw_config(uint32_t *data_offset, char *data) { *data_offset = 0;