topology2: change HDMI_ID according to dai links

.github/workflows/build_all.yml

@@ -61,4 +61,4 @@ jobs:
           cd workspace
           clang --verbose
           set -x
-          sof/scripts/fuzz.sh -b -c stub_build_all_${{ matrix.IPC }}.conf -- "$cmake_arg"
+          sof/scripts/fuzz.sh -b -- -DOVERLAY_CONFIG=stub_build_all_${{ matrix.IPC }}.conf

.github/workflows/rimage.yml

@@ -0,0 +1,60 @@
+---
+# SPDX-License-Identifier: BSD-3-Clause
+# Tools that can save round-trips to github and a lot of time:
+#
+# yamllint -f parsable this.yml
+# pip3 install ruamel.yaml.cmd
+# yaml merge-expand this.yml exp.yml && diff -w -u this.yml exp.yml
+#
+# github.com also has a powerful web editor that can be used without
+# committing.
+
+name: rimage
+
+# yamllint disable-line rule:truthy
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - tools/rimage/**
+  push:
+    paths:
+      - tools/rimage/**
+
+jobs:
+
+  # Basic build test
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      # FIXME: add  -Wpointer-arith
+      _CFLGS: -Werror -Wall -Wmissing-prototypes
+        -Wimplicit-fallthrough=3
+
+
+    steps:
+      - uses: actions/checkout@v4
+        with: {submodules: recursive, fetch-depth: 0, filter: 'tree:0'}
+
+      - run: cmake -B build-rimage/ -S tools/rimage/ -DCMAKE_C_FLAGS="${_CFLGS}"
+
+      # VERBOSE because CFLAGS (and -Wpointer-arith) used to be ignored
+      # for years and no one noticed
+      - run: cmake --build build-rimage/ --  -j$(nproc) VERBOSE=1
+
+
+  # cppcheck
+  cppcheck:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with: {submodules: recursive, fetch-depth: 0, filter: 'tree:0'}
+
+      - name: apt install cppcheck
+        run: sudo apt update && sudo apt-get -y install cppcheck
+
+        # TODO enable more types of checks as they are fixed
+      - name: run cppcheck
+        run: cppcheck --platform=unix32 --force --max-configs=1024
+          --inconclusive --inline-suppr
+          --error-exitcode=1 tools/rimage/

.github/workflows/sparse-zephyr.yml

@@ -57,12 +57,15 @@ jobs:
       # --pristine is important to reproduce _warnings_. It makes no
       # difference for github but it's useful for anyone trying to
       # reproduce and copying the command from the logs.
+      # "sparse" is currently incompatible with PICOLIBC (the new Zephyr default),
+      # see https://github.com/zephyrproject-rtos/zephyr/issues/63003
       - name: analyze zephyr
         working-directory: ./workspace
         run: |
              ./sof/zephyr/docker-run.sh                          \
              ./sof/zephyr/docker-build.sh ${{ matrix.platform }}          \
              --cmake-args=-DZEPHYR_SCA_VARIANT=sparse --cmake-args=-DCONFIG_LOG_USE_VLA=n  \
+             --cmake-args=-DCONFIG_MINIMAL_LIBC=y  \
              --pristine 2>&1 | tee _.log
 
              printf '\n\n\t\t\t  ---- Messages below are treated as sparse errors --- \n\n\n'

.github/workflows/zephyr.yml

@@ -107,11 +107,10 @@ jobs:
         IPC_platforms: [
           # - IPC3 default
           imx8 imx8x imx8m,
-          tgl tgl-h,  # UNSUPPORTED! Will be removed
           # - IPC4 default
           mtl, lnl,
           # Temporary testbed for Zephyr development.
-          -i IPC4 tgl tgl-h,
+          tgl tgl-h,
         ]
         build_opts: [""]
         # Sparse matrices are complicated, you must read this page slowly:
@@ -134,7 +133,7 @@ jobs:
       - name: west clones
 
         run: pip3 install west && cd workspace/sof/ && west init -l &&
-               west update --narrow --fetch-opt=--filter=tree:0
+               time west update --narrow --fetch-opt=--filter=tree:0
 
       - name: select zephyr revision
         run: |
@@ -150,7 +149,7 @@ jobs:
                sed -e "s#=sof_zephyr_revision_override=#${rem_rev}#" \
                  sof-ci-jenkins/zephyr-override-template.yml > test-zephyr-main.yml
              )
-             west update --narrow  --fetch-opt=--filter=tree:0
+             time west update --narrow  --fetch-opt=--filter=tree:0
           fi
 
           # Because we used git tricks to speed things up, we now have two git
@@ -168,7 +167,7 @@ jobs:
           #     both issues in no time.
 
           cd zephyr
-          git fetch --filter=tree:0 zephyrproject "$rem_rev":_branch_placeholder
+          time git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder
           git branch -D _branch_placeholder
 
           set -x
@@ -213,11 +212,9 @@ jobs:
         platforms: [
           # - IPC3 default
           imx8 imx8x imx8m,
-          tgl tgl-h,  # UNSUPPORTED! Will be removed
           # - IPC4 default
           mtl,
-          # Very few IPC3 platforms support IPC4 too.
-          -i IPC4 tgl tgl-h,
+          tgl tgl-h,
         ]
         build_opts: [""]
         # Sparse matrices are complicated, see comments on Linux matrix above.
@@ -311,7 +308,7 @@ jobs:
           # Get some tags to fix `git describe`, see build-linux comments above.
           cd zephyr
           $_rev = "$(git rev-parse HEAD)"
-          git fetch --filter=tree:0 zephyrproject "${_rev}:_branch_placeholder"
+          git fetch --filter=tree:0 "$(west list -f '{url}' zephyr)" "${_rev}:_branch_placeholder"
           git branch -D _branch_placeholder
 
 
@@ -329,7 +326,18 @@ jobs:
         working-directory: ${{ github.workspace }}/workspace
         run: pip install -r zephyr/scripts/requirements.txt
 
+      # Ninja has been coming and going, see #8250
+      - name: choco install ninja
+        run: |
+          choco install ninja
+          ninja.exe --version
+
       # MSYS2 provides gcc x64_86 toolchain & openssl
+      # Installs in D:/a/_temp/msys64
+      #
+      # Note there is already C:/msys64/ provided by
+      # https://github.com/actions/runner-images/blob/win22/20230918.1/images/win/Windows2022-Readme.md
+      # Is it not good enough? Maybe it could save 20-30s.
       - name: Initialize MSYS2
         uses: msys2/setup-msys2@v2
         with:
@@ -397,7 +405,7 @@ jobs:
           # http://mywiki.wooledge.org/ParsingLs
           for regdir in 'linux-build *mtl' \
                         'windows-build *mtl' \
-                        'windows-build *-i IPC4 tgl tgl-h'; do
+                        'windows-build *tgl tgl-h'; do
             find . -maxdepth 1 | grep -q "\./${regdir}\$" ||
               { >&2 printf 'Missing %s\n' "${regdir}"; exit 1; }
           done

.gitmodules

@@ -1,19 +1,17 @@
-[submodule "rimage"]
-	path = rimage
-# This is a _relative_ submodule URL. In some use cases it's better than
-# an _absolute_ submodule URL, in other cases it's not. One size does
-# unfortunately not fit all.
-#
-# Among other pages, http://blog.tremily.us/posts/Relative_submodules/
-# has a good comparison
-#
-# If you use Zephyr you must also look at the comments in sof/west.yml.
-#
-# If you want to fork or mirror sof.git _without_ doing the same for
-# rimage.git then your automation may want you to change and git commit
-# an absolute URL in your branch. No need to git commit for interactive
-# use; a local and temporary edit of this file is enough for interactive
-# use because .gitmodules is used only once to --init[ialize]
-# .git/config the first time. Then .gitmodules is never used again after
-# cloning.
-	url = ../rimage
+# This is required for non-Zephyr ("XTOS") configurations. Zephyr
+# configs also get it from sof/west.yml which adds the burden of keeping
+# both tomlc99 SHA1s synchronized but in practice this barely ever moves.
+[submodule "tomlc99"]
+	path = tools/rimage/tomlc99
+	# This is a _absolute_ submodule URL. In some use cases it's
+	# better than an _relative_ submodule URL, in other cases it's
+	# not. One size does unfortunately not fit all.  Among other
+	# pages, http://blog.tremily.us/posts/Relative_submodules/ has a
+	# good comparison.
+	#
+	# A local and temporary edit of this url can be enough because
+	# .gitmodules is used _only once_ to submodule --init[ialize]
+	# .git/config the first time. Then .gitmodules is never used
+	# again after cloning tomlc99 the first time.
+	url = https://github.com/thesofproject/tomlc99.git
+	branch = master

CMakeLists.txt

@@ -43,6 +43,8 @@ project(SOF C ASM)
 set(SOF_ROOT_SOURCE_DIRECTORY "${PROJECT_SOURCE_DIR}")
 set(SOF_ROOT_BINARY_DIRECTORY "${PROJECT_BINARY_DIR}")
 
+set(RIMAGE_TOP "${PROJECT_SOURCE_DIR}/tools/rimage")
+
 # check git hooks
 include(scripts/cmake/git-hooks.cmake)
 
@@ -159,8 +161,8 @@ install(
 		${PROJECT_SOURCE_DIR}/src/include/ipc
 		${PROJECT_SOURCE_DIR}/src/include/kernel
 		${PROJECT_SOURCE_DIR}/src/include/user
-		${PROJECT_SOURCE_DIR}/rimage/src/include/sof/kernel
-		${PROJECT_SOURCE_DIR}/rimage/src/include/sof/user
+		${RIMAGE_TOP}/src/include/sof/kernel
+		${RIMAGE_TOP}/src/include/sof/user
 	DESTINATION include/sof
 	PATTERN "*.h"
 )

app/boards/intel_adsp_ace15_mtpm.conf

@@ -3,6 +3,7 @@ CONFIG_IPC_MAJOR_4=y
 
 CONFIG_COMP_SRC=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
+CONFIG_COMP_SRC_LITE=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_MULTIBAND_DRC=y
@@ -67,6 +68,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
 
 CONFIG_LOG_BACKEND_ADSP_MTRACE=y
+CONFIG_LOG_BACKEND_SOF_PROBE=n
 CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_ZEPHYR_LOG=y
 CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y

app/boards/intel_adsp_ace20_lnl.conf

@@ -30,7 +30,6 @@ CONFIG_DAI_INTEL_SSP=y
 CONFIG_ZEPHYR_DP_SCHEDULER=y
 CONFIG_DMA=y
 CONFIG_DMA_INTEL_ADSP_GPDMA=n
-CONFIG_DMA_DW_SUSPEND_DRAIN=y
 CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
 CONFIG_INTEL_ADSP_TIMER=y
@@ -58,6 +57,7 @@ CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_COMP_UP_DOWN_MIXER=y
 CONFIG_COMP_CHAIN_DMA=y
+CONFIG_SAMPLE_KEYPHRASE=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
 

app/boards/intel_adsp_cavs25.conf

@@ -30,6 +30,7 @@ CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_ARIA=y
 
 # route SOF logs to Zephyr logging subsystem
 CONFIG_SOF_LOG_LEVEL_INF=y

app/boards/intel_adsp_cavs25_tgph.conf

@@ -29,6 +29,7 @@ CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_MULTIBAND_DRC=y
+CONFIG_COMP_ARIA=y
 
 # route SOF logs to Zephyr logging subsystem
 CONFIG_SOF_LOG_LEVEL_INF=y

app/overlays/lnl/fpga_overlay.conf

@@ -1,2 +1,3 @@
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=19200000
 CONFIG_DAI_DMIC_HW_IOCLK=19200000
+CONFIG_XTENSA_CCOUNT_HZ=40000000

app/overlays/mtl/fpga_overlay.conf

@@ -1,2 +1,3 @@
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=19200000
 CONFIG_DAI_DMIC_HW_IOCLK=19200000
+CONFIG_XTENSA_CCOUNT_HZ=40000000

app/perf_overlay.conf

@@ -1,2 +1,3 @@
 CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_SYS_HEAP_RUNTIME_STATS=y
+CONFIG_TIMING_FUNCTIONS=y

app/prj.conf

@@ -14,6 +14,10 @@ CONFIG_OUTPUT_DISASSEMBLY=y
 
 CONFIG_HAVE_AGENT=n
 
+# Since Zephyr commit f0daf904bb0202c PICOLIBC is the new default.
+# We need more time to test and evaluate.
+CONFIG_MINIMAL_LIBC=y
+
 CONFIG_LOG=y
 CONFIG_LOG_PRINTK=y
 # Log processing is offloaded to a low-priority thread.

app/stub_build_all_ipc3.conf

@@ -1,14 +1,17 @@
 CONFIG_COMP_STUBS=y
 CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
-CONFIG_COMP_TONE=y
+CONFIG_COMP_TONE=n
 CONFIG_COMP_CROSSOVER=y
 CONFIG_COMP_DRC=y
 CONFIG_COMP_MULTIBAND_DRC=y
-CONFIG_COMP_SMART_AMP=y
 CONFIG_PASSTHROUGH_CODEC=y
 CONFIG_WAVES_CODEC=y
 CONFIG_DTS_CODEC=y
 CONFIG_COMP_IGO_NR=y
 CONFIG_COMP_RTNR=y
-CONFIG_COMP_SMART_AMP=y
+# temporarily disabled until it compiles:
+# sof/src/audio/smart_amp/smart_amp.c:748:9: error:
+#    no member named 'in_channels' in 'struct smart_amp_data'
+#              sad->in_channels = audio_stream_get_channels(&source_buffer->stream);
+CONFIG_COMP_SMART_AMP=n
 CONFIG_MAXIM_DSM=y

app/stub_build_all_ipc4.conf

@@ -1,5 +1,5 @@
--DCONFIG_COMP_STUBS=y
--DCONFIG_COMP_ARIA=y
--DCONFIG_COMP_CHAIN_DMA=y
--DCONFIG_COMP_UP_DOWN_MIXER=y
--DCONFIG_IPC_MAJOR_4=y
+CONFIG_COMP_STUBS=y
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_CHAIN_DMA=y
+CONFIG_COMP_UP_DOWN_MIXER=y
+CONFIG_IPC_MAJOR_4=y

installer/GNUmakefile

@@ -301,10 +301,8 @@ COMPARE_REFS ?= /lib/firmware/intel
 checktree:
 	cd ${STAGING_SOF_VERSION} && \
              tree -a -v --dirsfirst . >  ${BUILDS_ROOT}/staging_sof_tree.txt
-	# Update sof-cavs-nocodec.tplg when adding or removing a default platform
 	diff -u tests/staging_sof${IPC_VERSION}_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt
 	# Check two random topologies are there
-	test -f ${STAGING_SOF_TPLG}/sof-tgl-nocodec.tplg
 	test -f ${STAGING_SOF_TPLG}/sof-imx8-wm8960.tplg
 	for t in sof-ctl sof-logger sof-probes; do \
 	   test -f ${STAGING_TOOLS}${VERSION_SUFFIX}/$${t}; done

posix/include/CMakeLists.txt

@@ -0,0 +1 @@
+target_include_directories(sof_public_headers INTERFACE include)