base_fw: Include codec_info into the fw_config message payload

the sof_info (param id 35) contains SOF specific information in a
tuple based array.

The first such info block is the codec_info (sub ID: 0) to hold
information about the codecs supported fro compress offload.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Author: ujfalusi

src/audio/base_fw.c

@@ -12,6 +12,7 @@
 #include <ipc4/pipeline.h>
 #include <ipc4/logging.h>
 #include <ipc/topology.h>
+#include <ipc/compress_params.h>
 #include <sof_versions.h>
 #include <sof/lib/cpu-clk-manager.h>
 #include <sof/lib/cpu.h>
@@ -65,6 +66,63 @@ __cold static uint32_t get_host_buffer_size(void)
 	return periods;
 }
 
+struct sof_ipc4_codec_info_data {
+	uint32_t count;
+	uint32_t items[32];
+} __packed __aligned(4);
+
+#define SET_CODEC_INFO_ITEM(codec, dir)	(((codec) & 0xff) | (((dir) & 0xff) << 16))
+
+static void get_codec_info(struct sof_tlv **tuple)
+{
+	struct sof_ipc4_codec_info_data codec_info = { 0 };
+
+#ifdef CONFIG_CADENCE_CODEC_AAC_DEC
+	codec_info.items[codec_info.count++] =
+		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_AAC, SOF_IPC_STREAM_PLAYBACK);
+#endif
+#ifdef CONFIG_CADENCE_CODEC_MP3_DEC
+	codec_info.items[codec_info.count++] =
+		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_MP3, SOF_IPC_STREAM_PLAYBACK);
+#endif
+#ifdef CONFIG_CADENCE_CODEC_MP3_ENC
+	codec_info.items[codec_info.count++] =
+		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_MP3, SOF_IPC_STREAM_CAPTURE);
+#endif
+#ifdef CONFIG_CADENCE_CODEC_VORBIS_DEC
+	codec_info.items[codec_info.count++] =
+		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_VORBIS, SOF_IPC_STREAM_PLAYBACK);
+#endif
+
+	if (!codec_info.count)
+		return;
+
+	tlv_value_set(*tuple, IPC4_SOF_CODEC_INFO, sizeof(codec_info.count) +
+		      sizeof(codec_info.items[0]) * codec_info.count, &codec_info);
+
+	*tuple = tlv_next(*tuple);
+}
+
+#define SOF_CONFIG_MEMBER_SIZE(struct_name)	(sizeof(struct sof_tlv) + \
+						 sizeof(struct struct_name))
+#define SOF_CONFIG_SIZE_MAX	(SOF_CONFIG_MEMBER_SIZE(sof_ipc4_codec_info_data))
+
+static void base_fw_sof_config(struct sof_tlv **tuple)
+{
+	char sof_config_data[SOF_CONFIG_SIZE_MAX] = { 0 };
+	struct sof_tlv *sof_config_tuple = (struct sof_tlv *)sof_config_data;
+	uint32_t sof_config_size;
+
+	get_codec_info(&sof_config_tuple);
+	sof_config_size = (uint32_t)((char *)sof_config_tuple - sof_config_data);
+	if (sof_config_size == 0)
+		return;
+
+	tlv_value_set(*tuple, IPC4_FW_SOF_INFO, sof_config_size, sof_config_data);
+
+	*tuple = tlv_next(*tuple);
+}
+
 __cold static int basefw_config(uint32_t *data_offset, char *data)
 {
 	uint16_t version[4] = {SOF_MAJOR, SOF_MINOR, SOF_MICRO, SOF_BUILD};
@@ -150,6 +208,8 @@ __cold static int basefw_config(uint32_t *data_offset, char *data)
 
 	tuple = tlv_next(tuple);
 
+	base_fw_sof_config(&tuple);
+
 	/* add platform specific tuples */
 	basefw_vendor_fw_config(&plat_data_offset, (char *)tuple);
 

src/include/ipc4/base_fw.h

@@ -376,12 +376,28 @@ enum ipc4_fw_config_params {
 	IPC4_FW_CONTEXT_SAVE = 29,
 	/* Minimum size of host buffer in ms */
 	IPC4_FW_MIN_HOST_BUFFER_PERIODS = 33,
+	/* decoder/encoder codec information */
+	IPC4_FW_SOF_INFO = 35,
 	/* Total number of FW config parameters  */
 	IPC4_FW_CFG_PARAMS_COUNT,
 	/* Max config parameter id */
 	IPC4_MAX_FW_CFG_PARAM = IPC4_FW_CFG_PARAMS_COUNT - 1,
 };
 
+/*
+ * tuple based array for SOF specific information under IPC4_FW_SOF_INFO
+ * tuple of fw_config
+ */
+enum ipc4_fw_sof_info_params {
+	/* decoder/encoder codec information */
+	IPC4_SOF_CODEC_INFO = 0,
+
+	/* Total number of SOF config parameters  */
+	IPC4_SOF_CFG_PARAMS_COUNT,
+	/* Max config parameter id */
+	IPC4_MAX_SOF_CFG_PARAM = IPC4_SOF_CFG_PARAMS_COUNT - 1,
+};
+
 enum ipc4_hw_config_params {
 	/* Version of cAVS implemented by FW (from ROMInfo) */
 	IPC4_CAVS_VER_HW_CFG             = 0,