audio: base_fw: add platform layer to IPC4 hw_config data

Some of the IPC4 HW_CONFIG fields are platform specific and cannot be filled with generic code. Handle this functionality by separating platform specific parts of base_fw to a new base_fw_platform.h interface. Move out existing code for Intel cAVS and ACE platforms. Add a new stub implementation for posix platform. This posix stub can be also used as a starting point when adding IPC4 support to new platforms. This platform construct can be later used to move out other vendor and platform data out from base_fw.c. Signed-off-by: Kai Vehmanen <[email protected]>
thesofproject · Apr 17, 2024 · 14c4e86 · 14c4e86
1 parent f1afff0
commit 14c4e86
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 11 deletions.
diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c
@@ -6,6 +6,7 @@
 #include <sof/ut.h>
 #include <sof/tlv.h>
 #include <ipc4/base_fw.h>
+#include <ipc4/base_fw_platform.h>
 #include <ipc4/pipeline.h>
 #include <ipc4/logging.h>
 #include <sof_versions.h>
@@ -141,6 +142,7 @@ static int basefw_config(uint32_t *data_offset, char *data)
 static int basefw_hw_config(uint32_t *data_offset, char *data)
 {
 	struct sof_tlv *tuple = (struct sof_tlv *)data;
+	uint32_t plat_data_offset = 0;
 	uint32_t value;
 
 	tlv_value_uint32_set(tuple, IPC4_CAVS_VER_HW_CFG, HW_CFG_VERSION);
@@ -159,19 +161,11 @@ static int basefw_hw_config(uint32_t *data_offset, char *data)
 	tlv_value_uint32_set(tuple, IPC4_TOTAL_PHYS_MEM_PAGES_HW_CFG, value);
 
 	tuple = tlv_next(tuple);
-	tlv_value_uint32_set(tuple, IPC4_HP_EBB_COUNT_HW_CFG, PLATFORM_HPSRAM_EBB_COUNT);
 
-	tuple = tlv_next(tuple);
-	/* 2 DMIC dais */
-	value =  DAI_NUM_SSP_BASE + DAI_NUM_HDA_IN + DAI_NUM_HDA_OUT +
-			DAI_NUM_ALH_BI_DIR_LINKS + 2;
-	tlv_value_uint32_set(tuple, IPC4_GATEWAY_COUNT_HW_CFG, value);
-
-	tuple = tlv_next(tuple);
-	tlv_value_uint32_set(tuple, IPC4_LP_EBB_COUNT_HW_CFG, PLATFORM_LPSRAM_EBB_COUNT);
+	/* add platform specific tuples */
+	platform_basefw_hw_config(&plat_data_offset, (char *)tuple);
 
-	tuple = tlv_next(tuple);
-	*data_offset = (int)((char *)tuple - data);
+	*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
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2024 Intel Corporation.
+ *
+ * Author: Kai Vehmanen <[email protected]>
+ */
+
+/**
+ * \file include/ipc4/base_fw_platform.h
+ * \brief Platform specific IPC4 base firmware functionality.
+ */
+
+#ifndef __SOF_IPC4_BASE_FW_PLATFORM_H__
+#define __SOF_IPC4_BASE_FW_PLATFORM_H__
+
+/**
+ * \brief Platform specific routine to add data tuples to HW_CONFIG
+ * structure sent to host via IPC.
+ * \param[out] data_offset data offset after tuples added
+ * \parma[in] data pointer where to add new entries
+ * \return 0 if successful, error code otherwise.
+ */
+int platform_basefw_hw_config(uint32_t *data_offset, char *data);
+
+#endif
diff --git a/src/platform/intel/ace/lib/base_fw_platform.c b/src/platform/intel/ace/lib/base_fw_platform.c
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2024 Intel Corporation.
+//
+// Author: Kai Vehmanen <[email protected]>
+
+#include <rtos/string.h>
+#include <sof/tlv.h>
+#include <sof/lib/dai.h>
+#include <ipc4/base_fw.h>
+
+int platform_basefw_hw_config(uint32_t *data_offset, char *data)
+{
+	struct sof_tlv *tuple = (struct sof_tlv *)data;
+	uint32_t value;
+
+	tlv_value_uint32_set(tuple, IPC4_HP_EBB_COUNT_HW_CFG, PLATFORM_HPSRAM_EBB_COUNT);
+
+	tuple = tlv_next(tuple);
+	/* 2 DMIC dais */
+	value =  DAI_NUM_SSP_BASE + DAI_NUM_HDA_IN + DAI_NUM_HDA_OUT +
+			DAI_NUM_ALH_BI_DIR_LINKS + 2;
+	tlv_value_uint32_set(tuple, IPC4_GATEWAY_COUNT_HW_CFG, value);
+
+	tuple = tlv_next(tuple);
+	tlv_value_uint32_set(tuple, IPC4_LP_EBB_COUNT_HW_CFG, PLATFORM_LPSRAM_EBB_COUNT);
+
+	tuple = tlv_next(tuple);
+	*data_offset = (int)((char *)tuple - data);
+
+	return 0;
+}
diff --git a/src/platform/posix/base_fw_platform.c b/src/platform/posix/base_fw_platform.c
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2024 Intel Corporation.
+//
+// Author: Kai Vehmanen <[email protected]>
+
+#include <stdint.h>
+#include <ipc4/base_fw_platform.h>
+
+int platform_basefw_hw_config(uint32_t *data_offset, char *data)
+{
+	*data_offset = 0;
+
+	return 0;
+}
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -163,6 +163,7 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
 	# Platform sources
 	zephyr_library_sources(
 		${SOF_PLATFORM_PATH}/intel/cavs/platform.c
+		${SOF_PLATFORM_PATH}/intel/ace/lib/base_fw_platform.c
 		${SOF_PLATFORM_PATH}/tigerlake/lib/clk.c
 		lib/pm_runtime.c
 		lib/clk.c
@@ -184,6 +185,7 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	# Platform sources
 	zephyr_library_sources(
 		${SOF_PLATFORM_PATH}/intel/ace/platform.c
+		${SOF_PLATFORM_PATH}/intel/ace/lib/base_fw_platform.c
 		lib/pm_runtime.c
 		lib/clk.c
 		lib/dma.c
@@ -346,6 +348,7 @@ zephyr_library_sources_ifdef(CONFIG_ZEPHYR_POSIX
 	${SOF_PLATFORM_PATH}/posix/dai.c
 	${SOF_PLATFORM_PATH}/posix/ipc.c
 	${SOF_PLATFORM_PATH}/posix/posix.c
+	${SOF_PLATFORM_PATH}/posix/base_fw_platform.c
 )
 
 zephyr_library_sources_ifdef(CONFIG_LIBRARY