Rebase amd-acp7b-stable Branch to Include Merged and Validated I2S PRs

.github/workflows/testbench.yml

@@ -49,12 +49,27 @@ jobs:
                   octave octave-signal automake autoconf libtool
                   gettext libasound2-dev
 
+      # Ubuntu 24.04 ships autoconf 2.71, but current alsa-lib/alsa-utils
+      # require >= 2.72. Build a newer autoconf from the GNU release
+      # tarball and install it into /usr/local (ahead of /usr/bin in PATH).
+      - name: Install autoconf 2.72
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          wget -q https://ftp.gnu.org/gnu/autoconf/autoconf-2.72.tar.gz
+          tar xf autoconf-2.72.tar.gz
+          cd autoconf-2.72
+          ./configure --prefix=/usr/local
+          make -j"$(nproc)"
+          sudo make install
+          hash -r
+          autoconf --version | head -n1
+
       - name: Build Alsa-lib
         run: |
           cd ${GITHUB_WORKSPACE}
           git clone https://github.com/thesofproject/alsa-lib.git
           cd alsa-lib
-          git checkout df8f1cc1ec9d9ee15be5e2c23ad25b9389fd8766 -b build
+          git checkout 08b532cd3da9ac8f683bcb4e4beb9b74c39c1782 -b build
           ./gitcompile --prefix=${GITHUB_WORKSPACE}/tools
           make install
 
@@ -63,7 +78,7 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           git clone https://github.com/thesofproject/alsa-utils.git
           cd alsa-utils
-          git checkout 0ffa105942a06cdfa98e5918b8dc82e3cac12792 -b build
+          git checkout 9feb22ba45b48729729c8d194aaf1bc082a6842a -b build
           ./gitcompile --prefix=${GITHUB_WORKSPACE}/tools \
              --with-alsa-prefix=${GITHUB_WORKSPACE}/tools \
              --with-alsa-inc-prefix=${GITHUB_WORKSPACE}/tools/include \

.github/workflows/tools.yml

@@ -13,25 +13,71 @@ permissions:
 jobs:
   # This is not the same as building every ./build-tools.sh option.
   top-level_default_CMake_target_ALL:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
           filter: 'tree:0'
+          path: sof
+
+      - name: apt get
+        run: sudo apt-get update &&
+               sudo apt-get -y install ninja-build
+                  automake autoconf libtool gettext libasound2-dev
+                  pkg-config
+
+      # Ubuntu 24.04 ships autoconf 2.71, but current alsa-lib/alsa-utils
+      # require >= 2.72. Build a newer autoconf from the GNU release
+      # tarball and install it into /usr/local (ahead of /usr/bin in PATH).
+      - name: Install autoconf 2.72
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          wget -q https://ftp.gnu.org/gnu/autoconf/autoconf-2.72.tar.gz
+          tar xf autoconf-2.72.tar.gz
+          cd autoconf-2.72
+          ./configure --prefix=/usr/local
+          make -j"$(nproc)"
+          sudo make install
+          hash -r
+          autoconf --version | head -n1
+
+      - name: Build Alsa-lib
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          git clone https://github.com/thesofproject/alsa-lib.git
+          cd alsa-lib
+          git checkout 08b532cd3da9ac8f683bcb4e4beb9b74c39c1782 -b build
+          ./gitcompile --prefix=${GITHUB_WORKSPACE}/tools
+          make install
 
-      # The ALSA version in Ubuntu 20.04 is buggy
-      # (https://github.com/thesofproject/sof/issues/2543) and likely
-      # getting out of date soon
-      - name: docker
-        run: docker pull thesofproject/sof && docker tag thesofproject/sof sof
+      - name: Build Alsa-utils
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          git clone https://github.com/thesofproject/alsa-utils.git
+          cd alsa-utils
+          git checkout 9feb22ba45b48729729c8d194aaf1bc082a6842a -b build
+          ./gitcompile --prefix=${GITHUB_WORKSPACE}/tools \
+             --with-alsa-prefix=${GITHUB_WORKSPACE}/tools \
+             --with-alsa-inc-prefix=${GITHUB_WORKSPACE}/tools/include \
+             --with-sysroot=${GITHUB_WORKSPACE}/tools \
+             --with-udev-rules-dir=${GITHUB_WORKSPACE}/tools \
+             PKG_CONFIG_PATH=${GITHUB_WORKSPACE}/tools \
+             LDFLAGS=-L${GITHUB_WORKSPACE}/tools/lib \
+             --disable-old-symbols \
+             --enable-alsatopology \
+             --with-asound-state-dir=${GITHUB_WORKSPACE}/tools/var/lib/alsa \
+             --with-systemdsystemunitdir=${GITHUB_WORKSPACE}/tools/lib/systemd/system
+          make install
 
       # For some reason gcc has more warnings in Release mode
       - name: build-tools
-        run: CMAKE_BUILD_TYPE=Release ./scripts/docker-run.sh
-          ./scripts/build-tools.sh ||
+        env:
+          PKG_CONFIG_PATH: ${{ github.workspace }}/tools/lib/pkgconfig
+          LD_LIBRARY_PATH: ${{ github.workspace }}/tools/lib
+          PATH: ${{ github.workspace }}/tools/bin:/usr/local/bin:/usr/bin:/bin
+        run: CMAKE_BUILD_TYPE=Release ./sof/scripts/build-tools.sh ||
              VERBOSE=1 NO_PROCESSORS=1 USE_XARGS=no
-             CMAKE_BUILD_TYPE=Release ./scripts/docker-run.sh
-          ./scripts/build-tools.sh
+             CMAKE_BUILD_TYPE=Release ./sof/scripts/build-tools.sh
 
 
   SOF-alsa-plugin:

app/boards/acp_7_0_adsp.conf

@@ -14,6 +14,8 @@ CONFIG_INTC_AMD_ACP=y
 CONFIG_DMA_AMD_ACP_HOST=y
 CONFIG_DMA_AMD_ACP_SDW=y
 CONFIG_DAI_AMD_SDW=y
+CONFIG_DMA_AMD_ACP_TDM=y
+CONFIG_DAI_AMD_TDM=y
 CONFIG_AMS=n
 CONFIG_WRAP_ACTUAL_POSITION=y
 CONFIG_TRACE=n
@@ -50,3 +52,4 @@ 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
+CONFIG_COMP_MFCC=n

app/boards/acp_7_x_adsp.conf

@@ -14,7 +14,9 @@ CONFIG_INTC_AMD_ACP=y
 CONFIG_DMA_AMD_ACP_HOST=y
 CONFIG_DMA_AMD_ACP_SDW=y
 CONFIG_DMA_AMD_ACP_SDW_CHANNEL_COUNT=64
+CONFIG_DMA_AMD_ACP_TDM=y
 CONFIG_DAI_AMD_SDW=y
+CONFIG_DAI_AMD_TDM=y
 CONFIG_AMS=n
 CONFIG_WRAP_ACTUAL_POSITION=y
 CONFIG_TRACE=n
@@ -52,3 +54,4 @@ CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_44100=n
 CONFIG_CORE_COUNT=1
 CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_PCM_CONVERTER_FORMAT_S24_4LE_MSB=y
+CONFIG_XTENSA_INTERRUPT_NONPREEMPTABLE=y

app/boards/imx95_evk_mimx9596_m7_ddr.overlay

@@ -26,6 +26,10 @@
 	status = "okay";
 };
 
+&edma1 {
+	status = "disabled";
+};
+
 &edma2 {
 	compatible = "nxp,edma";
 	reg = <0x42000000 (DT_SIZE_K(64) * 33)>;

app/boards/intel_adsp_ace15_mtpm.conf

@@ -15,6 +15,7 @@ CONFIG_COMP_MFCC=y
 CONFIG_COMP_MULTIBAND_DRC=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_SAMPLE_KEYPHRASE=y
+CONFIG_COMP_PHASE_VOCODER=y
 CONFIG_COMP_STFT_PROCESS=y
 
 # SOF / audio modules / mocks
@@ -55,6 +56,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
 CONFIG_WATCHDOG=y

app/boards/intel_adsp_ace20_lnl.conf

@@ -11,6 +11,7 @@ CONFIG_COMP_TESTER=m
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_SAMPLE_KEYPHRASE=y
+CONFIG_COMP_PHASE_VOCODER=y
 CONFIG_COMP_STFT_PROCESS=y
 
 # SOF / infrastructure
@@ -38,6 +39,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
 

app/boards/intel_adsp_ace30_ptl.conf

@@ -42,6 +42,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers

app/boards/intel_adsp_ace30_wcl.conf

@@ -28,6 +28,7 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
 # SOF / loadable modules
 CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
+CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_LIBRARY_BUILD_LIB=y
 CONFIG_LIBRARY_DEFAULT_MODULAR=y
@@ -40,6 +41,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers

app/boards/intel_adsp_ace40_nvl.conf

@@ -12,6 +12,12 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_TESTER=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 
+# SOF / audio modules / mocks
+# This mock is part of official sof-bin releases because the CI that
+# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
+CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+
 # SOF / infrastructure
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
@@ -33,6 +39,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
@@ -47,7 +54,6 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
 CONFIG_SRAM_RETENTION_MODE=n
 CONFIG_PM_DEVICE_RUNTIME_ASYNC=n

app/boards/intel_adsp_ace40_nvls.conf

@@ -12,6 +12,12 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_TESTER=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 
+# SOF / audio modules / mocks
+# This mock is part of official sof-bin releases because the CI that
+# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
+CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
+CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
+
 # SOF / infrastructure
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
@@ -33,6 +39,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y
+CONFIG_LLEXT_EDK=n
 CONFIG_MODULES=y
 
 # Zephyr / device drivers
@@ -47,7 +54,6 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 
 # Zephyr / power settings
 CONFIG_ADSP_IMR_CONTEXT_SAVE=y
-CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
 CONFIG_SRAM_RETENTION_MODE=n
 CONFIG_PM_DEVICE_RUNTIME_ASYNC=n

app/boards/native_sim.conf

@@ -0,0 +1,4 @@
+CONFIG_ZEPHYR_POSIX=y
+CONFIG_SYS_HEAP_BIG_ONLY=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_ZEPHYR_LOG=y

app/boards/native_sim_libfuzzer.conf

@@ -5,6 +5,8 @@ CONFIG_ASSERT=y
 CONFIG_EXCEPTION_DEBUG=y
 CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
 CONFIG_SYS_HEAP_BIG_ONLY=y
+CONFIG_SYS_HEAP_HARDENING_EXTREME=y
+CONFIG_STACK_SENTINEL=y
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 CONFIG_ARCH_POSIX_LIBFUZZER=y
 CONFIG_ZEPHYR_POSIX_FUZZ_TICKS=100

app/compr/README.txt

@@ -16,7 +16,8 @@ cadence.conf      - Base Cadence codec module only (no individual codecs)
 mp3.conf          - MP3 decoder and encoder
 aac.conf          - AAC decoder
 vorbis.conf       - Vorbis decoder
-all_codecs.conf   - All supported codecs (MP3, AAC, Vorbis)
+pcm.conf          - PCM (WAV) decoder
+all_codecs.conf   - All supported codecs (MP3, AAC, Vorbis, PCM)
 
 Usage Examples
 --------------

app/compr/all_codecs.conf

@@ -1,4 +1,4 @@
-# All Cadence codecs (MP3, AAC, Vorbis)
+# All Cadence codecs (MP3, AAC, Vorbis) plus SOF PCM/WAV decoder
 CONFIG_CADENCE_CODEC=y
 CONFIG_CADENCE_CODEC_MP3_DEC=y
 CONFIG_CADENCE_CODEC_MP3_DEC_LIB="../cadence_libs/xa_mp3_dec.a"
@@ -8,4 +8,4 @@ CONFIG_CADENCE_CODEC_AAC_DEC=y
 CONFIG_CADENCE_CODEC_AAC_DEC_LIB="../cadence_libs/xa_aac_dec.a"
 CONFIG_CADENCE_CODEC_VORBIS_DEC=y
 CONFIG_CADENCE_CODEC_VORBIS_DEC_LIB="../cadence_libs/xa_vorbis_dec.a"
-
+CONFIG_SOF_COMPRESS_CODEC_PCM_DEC=y

app/compr/pcm.conf

@@ -0,0 +1,3 @@
+# PCM (wav) decoder
+CONFIG_CADENCE_CODEC=y
+CONFIG_SOF_COMPRESS_CODEC_PCM_DEC=y

app/overlays/ptl/ll_userspace_overlay.conf

@@ -0,0 +1,38 @@
+# This is overlay configuration file to enable user-space LL audio
+# pipeline support. This overlay is intended for development
+# purposes. If user-space LL is enabled for some build target by
+# default, the settings should be made in the SOF board file directly.
+
+# Enable user-space LL support in SOF
+# -----------------------------------
+
+CONFIG_SOF_USERSPACE_LL=y
+
+# make the drivers work in user-space
+CONFIG_SOF_USERSPACE_INTERFACE_DMA=y
+CONFIG_DAI_USERSPACE=y
+
+# Temporary settings that are needed currently to enable user-space LL
+# --------------------------------------------------------------------
+
+# problem with DSP panics due to illegal instruction hit in user-space if cold
+# store execution is enabled. Disable it for now until rootcause is found.
+CONFIG_COLD_STORE_EXECUTE_DRAM=n
+CONFIG_COLD_STORE_EXECUTE_DEBUG=n
+
+# telemetry not yet user-space compatible
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=n
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=n
+
+# disable loadable modules (hits privilege issues in user-space now)
+CONFIG_LLEXT_STORAGE_WRITABLE=n
+CONFIG_LLEXT_EXPERIMENTAL=n
+CONFIG_MODULES=n
+
+# some of current boot tests interfere with user-space setup
+CONFIG_SOF_BOOT_TEST_ALLOWED=n
+
+# misc features not yet compatible with user-space
+CONFIG_CROSS_CORE_STREAM=n
+CONFIG_INTEL_ADSP_MIC_PRIVACY=n
+CONFIG_XRUN_NOTIFICATIONS_ENABLE=n

app/src/main.c

@@ -57,7 +57,7 @@ static int sof_app_main(void)
 	return 0;
 }
 
-#if CONFIG_SOF_BOOT_TEST && defined(QEMU_BOOT_TESTS)
+#if defined(QEMU_BOOT_TESTS)
 /* cleanly exit qemu so CI can continue and check test results */
 static inline void qemu_xtensa_exit(int status)
 {
@@ -73,14 +73,31 @@ static inline void qemu_xtensa_exit(int status)
 }
 #endif
 
+#ifdef CONFIG_REBOOT
+void sys_arch_reboot(int type)
+{
+#if defined(QEMU_BOOT_TESTS)
+	qemu_xtensa_exit(type);
+#endif
+	while (1) {
+		k_cpu_idle();
+	}
+}
+#endif
+
 #if CONFIG_ZTEST
 void test_main(void)
 {
 	sof_app_main();
-#if CONFIG_SOF_BOOT_TEST && defined(QEMU_BOOT_TESTS)
+#if CONFIG_SOF_BOOT_TEST && (defined(QEMU_BOOT_TESTS) || CONFIG_SOF_BOOT_TEST_STANDALONE)
 	sof_run_boot_tests();
+#if defined(QEMU_BOOT_TESTS)
+	/* qemu_xtensa_exit() only exists for QEMU targets; a standalone
+	 * boot test (e.g. native_sim) just returns from test_main()
+	 */
 	qemu_xtensa_exit(0);
 #endif
+#endif
 }
 #else
 int main(void)