acp: add native Zephyr drivers for AMD ACP 7.X

app/boards/acp_7_x_adsp.conf

@@ -0,0 +1,52 @@
+CONFIG_ACP_7_X=y
+CONFIG_HAVE_AGENT=n
+CONFIG_DCACHE_LINE_SIZE_DETECT=n
+CONFIG_DCACHE_LINE_SIZE=128
+CONFIG_DYNAMIC_INTERRUPTS=y
+CONFIG_SHARED_INTERRUPTS=n
+CONFIG_ZEPHYR_LOG=y
+CONFIG_LOG_MODE_DEFERRED=n
+CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_DMA=y
+CONFIG_DMA_DOMAIN=n
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_INTC_AMD_ACP=y
+CONFIG_DMA_AMD_ACP_HOST=y
+CONFIG_DMA_AMD_ACP_SDW=y
+CONFIG_DAI_AMD_SDW=y
+CONFIG_AMS=n
+CONFIG_WRAP_ACTUAL_POSITION=y
+CONFIG_TRACE=n
+CONFIG_COMP_VOLUME=y
+CONFIG_COMP_SRC=n
+CONFIG_COMP_FIR=n
+CONFIG_COMP_IIR=n
+CONFIG_COMP_DCBLOCK=n
+CONFIG_COMP_CROSSOVER=n
+CONFIG_COMP_DRC=n
+CONFIG_COMP_MULTIBAND_DRC=n
+CONFIG_COMP_TONE=n
+CONFIG_COMP_KPB=n
+CONFIG_MAXIM_DSM=n
+CONFIG_COMP_ASRC=n
+CONFIG_COMP_IGO_NR=n
+CONFIG_COMP_COPIER=n
+CONFIG_COMP_RTNR=n
+CONFIG_COMP_ARIA=n
+CONFIG_COMP_BASEFW_IPC4=n
+CONFIG_COMP_UP_DOWN_MIXER=n
+CONFIG_COMP_TDFB=n
+CONFIG_COMP_SEL=n
+CONFIG_COMP_MIXER=n
+CONFIG_ASRC_SUPPORT_CONVERSION_24000_TO_08000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_24000_TO_16000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_08000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_11025=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_12000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_16000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_22050=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_24000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_32000=n
+CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_44100=n
+CONFIG_CORE_COUNT=1
+CONFIG_FORMAT_CONVERT_HIFI3=n

scripts/xtensa-build-zephyr.py

@@ -117,6 +117,12 @@ class PlatformConfig:
 		"ACP_7_0_HiFi5_NNE_PROD",
 		RIMAGE_KEY = "key param ignored by acp_7_0"
 	),
+	"acp_7_x" : PlatformConfig(
+		"amd", "acp_7_x_adsp/acp_7_x",
+		f"RI-2022.9{xtensa_tools_version_postfix}",
+		"ACP73x_HiFi5_NNE_PROD",
+		RIMAGE_KEY = "key param ignored by acp_7_x"
+	),
 	# MediaTek platforms
 	# (move to platform_configs_all on next Zephyr SDK release after 0.17.0)
 	"mt8195" : PlatformConfig(
@@ -1324,7 +1330,7 @@ def gzip_compress(fname, gzdst=None):
 RI_INFO_UNSUPPORTED = []
 
 RI_INFO_UNSUPPORTED += ['imx8', 'imx8x', 'imx8m', 'imx8m_cm7', 'imx8ulp', 'imx95']
-RI_INFO_UNSUPPORTED += ['rn', 'acp_6_0', 'acp_7_0']
+RI_INFO_UNSUPPORTED += ['rn', 'acp_6_0', 'acp_7_0', 'acp_7_x']
 RI_INFO_UNSUPPORTED += ['mt8186', 'mt8188', 'mt8195', 'mt8196', 'mt8365']
 RI_INFO_UNSUPPORTED += ['qemu_xtensa', 'qemu_xtensa_mmu']
 

src/arch/xtensa/configs/acp_7_x_defconfig

@@ -0,0 +1,32 @@
+CONFIG_ACP_7_X=y
+CONFIG_RIMAGE_SIGNING_SCHEMA="acp_7_3"
+CONFIG_TRACE_CHANNEL=7
+CONFIG_WRAP_ACTUAL_POSITION=y
+CONFIG_CORE_COUNT=1
+CONFIG_FORMAT_CONVERT_HIFI3=n
+CONFIG_LP_SRAM=n
+CONFIG_HAVE_AGENT=n
+CONFIG_COMP_VOLUME=y
+CONFIG_COMP_SRC=n
+CONFIG_COMP_FIR=n
+CONFIG_COMP_IIR=n
+CONFIG_COMP_DCBLOCK=n
+CONFIG_COMP_CROSSOVER=n
+CONFIG_COMP_DRC=n
+CONFIG_COMP_MULTIBAND_DRC=n
+CONFIG_COMP_TONE=n
+CONFIG_COMP_SWITCH=n
+CONFIG_COMP_KPB=n
+CONFIG_MAXIM_DSM=n
+CONFIG_COMP_ASRC=n
+CONFIG_COMP_IGO_NR=n
+CONFIG_COMP_COPIER=n
+CONFIG_COMP_RTNR=n
+CONFIG_COMP_ARIA=n
+CONFIG_COMP_BASEFW_IPC4=n
+CONFIG_COMP_UP_DOWN_MIXER=n
+CONFIG_COMP_TDFB=n
+CONFIG_COMP_MUX=n
+CONFIG_COMP_SEL=n
+CONFIG_COMP_MIXER=n
+CONFIG_PROBE=n

src/audio/pcm_converter/pcm_converter_generic.c

@@ -712,8 +712,13 @@ const struct pcm_func_map pcm_func_map[] = {
 	{ SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, pcm_convert_s32_to_s16 },
 #endif /* CONFIG_PCM_CONVERTER_FORMAT_S32LE && CONFIG_PCM_CONVERTER_FORMAT_S16LE */
 #if CONFIG_PCM_CONVERTER_FORMAT_S32LE && CONFIG_PCM_CONVERTER_FORMAT_S24LE
+#if defined(CONFIG_SOC_ACP_7_X)
+	{ SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, just_copy },
+	{ SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, pcm_convert_s32_to_s24_be },
+#else
 	{ SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, pcm_convert_s24_to_s32 },
 	{ SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, pcm_convert_s32_to_s24 },
+#endif
 #endif /* CONFIG_PCM_CONVERTER_FORMAT_S32LE && CONFIG_PCM_CONVERTER_FORMAT_S24LE */
 #if CONFIG_PCM_CONVERTER_FORMAT_FLOAT
 	{ SOF_IPC_FRAME_FLOAT, SOF_IPC_FRAME_FLOAT, just_copy },

src/audio/volume/volume_ipc3.c

@@ -219,6 +219,13 @@ int volume_set_config(struct processing_module *mod, uint32_t config_id,
 		volume_set_ramp_channel_counter(cd, cd->channels);
 
 		volume_ramp_check(mod);
+#if defined(CONFIG_AMD)
+		/* Update function pointer after all volume changes */
+		if (comp_dev_get_first_data_consumer(dev) != NULL) {
+			cd->is_passthrough = false;
+			set_volume_process(cd, dev, false);
+		}
+#endif
 		break;
 
 	case SOF_CTRL_CMD_SWITCH:

src/drivers/amd/CMakeLists.txt

@@ -1,9 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
-add_subdirectory(common)
+if(CONFIG_RENOIR OR CONFIG_VANGOGH OR CONFIG_REMBRANDT OR CONFIG_ACP_6_3 OR CONFIG_ACP_7_0)
+	add_subdirectory(common)
+endif()
 if(CONFIG_RENOIR)
 	add_subdirectory(renoir)
 elseif(CONFIG_REMBRANDT OR CONFIG_ACP_6_3 OR CONFIG_ACP_7_0)
 	add_subdirectory(rembrandt)
 elseif(CONFIG_VANGOGH)
 	add_subdirectory(vangogh)
+elseif(CONFIG_ACP_7_X)
+	add_subdirectory(acp_7_x)
 endif()

src/drivers/amd/acp_7_x/CMakeLists.txt

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_local_sources(sof
+	ipc.c
+)