topology2: add ALC5650 codec support

.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:
@@ -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.
@@ -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

@@ -67,6 +67,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/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/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,6 +1,6 @@
 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

posix/include/CMakeLists.txt

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

posix/include/rtos/alloc.h

@@ -0,0 +1,172 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <[email protected]>
+ *         Keyon Jie <[email protected]>
+ */
+
+/**
+ * \file xtos/include/rtos/alloc.h
+ * \brief Memory Allocation API definition
+ * \author Liam Girdwood <[email protected]>
+ * \author Keyon Jie <[email protected]>
+ */
+
+#ifndef __SOF_LIB_ALLOC_H__
+#define __SOF_LIB_ALLOC_H__
+
+#include <rtos/bit.h>
+#include <rtos/string.h>
+#include <sof/trace/trace.h>
+#include <user/trace.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+/** \addtogroup alloc_api Memory Allocation API
+ *  @{
+ */
+
+/**
+ * \brief Heap Memory Zones
+ *
+ * The heap has three different zones from where memory can be allocated :-
+ *
+ * 1) System Zone. Fixed size heap where alloc always succeeds and is never
+ * freed. Used by any init code that will never give up the memory.
+ *
+ * 2) System Runtime Zone. Heap zone intended for runtime objects allocated
+ * by the kernel part of the code.
+ *
+ * 3) Runtime Zone. Main and larger heap zone where allocs are not guaranteed to
+ * succeed. Memory can be freed here.
+ *
+ * 4) Buffer Zone. Largest heap zone intended for audio buffers.
+ *
+ * 5) Runtime Shared Zone. Similar to Runtime Zone, but content may be used and
+ * fred from any enabled core.
+ *
+ * 6) System Shared Zone. Similar to System Zone, but content may be used from
+ * any enabled core.
+ *
+ * See platform/memory.h for heap size configuration and mappings.
+ */
+enum mem_zone {
+	SOF_MEM_ZONE_SYS = 0,		/**< System zone */
+	SOF_MEM_ZONE_SYS_RUNTIME,	/**< System-runtime zone */
+	SOF_MEM_ZONE_RUNTIME,		/**< Runtime zone */
+	SOF_MEM_ZONE_BUFFER,		/**< Buffer zone */
+	SOF_MEM_ZONE_RUNTIME_SHARED,	/**< Runtime shared zone */
+	SOF_MEM_ZONE_SYS_SHARED,	/**< System shared zone */
+};
+
+/** \name Heap zone flags
+ *  @{
+ */
+
+/** \brief Indicates that original content should not be copied by realloc. */
+#define SOF_MEM_FLAG_NO_COPY	BIT(1)
+/** \brief Indicates that if we should return uncached address. */
+#define SOF_MEM_FLAG_COHERENT  BIT(2)
+
+/** @} */
+
+/**
+ * Allocates memory block.
+ * @param zone Zone to allocate memory from, see enum mem_zone.
+ * @param flags Flags, see SOF_MEM_FLAG_...
+ * @param caps Capabilities, see SOF_MEM_CAPS_...
+ * @param bytes Size in bytes.
+ * @return Pointer to the allocated memory or NULL if failed.
+ *
+ * @note Do not use for buffers (SOF_MEM_ZONE_BUFFER zone).
+ *       Use rballoc(), rballoc_align() to allocate memory for buffers.
+ */
+void *rmalloc(enum mem_zone zone, uint32_t flags, uint32_t caps, size_t bytes);
+
+/**
+ * Similar to rmalloc(), guarantees that returned block is zeroed.
+ *
+ * @note Do not use  for buffers (SOF_MEM_ZONE_BUFFER zone).
+ *       rballoc(), rballoc_align() to allocate memory for buffers.
+ */
+void *rzalloc(enum mem_zone zone, uint32_t flags, uint32_t caps, size_t bytes);
+
+/**
+ * Allocates memory block from SOF_MEM_ZONE_BUFFER.
+ * @param flags Flags, see SOF_MEM_FLAG_...
+ * @param caps Capabilities, see SOF_MEM_CAPS_...
+ * @param bytes Size in bytes.
+ * @param alignment Alignment in bytes.
+ * @return Pointer to the allocated memory or NULL if failed.
+ */
+void *rballoc_align(uint32_t flags, uint32_t caps, size_t bytes,
+		    uint32_t alignment);
+
+/**
+ * Similar to rballoc_align(), returns buffer aligned to PLATFORM_DCACHE_ALIGN.
+ */
+static inline void *rballoc(uint32_t flags, uint32_t caps, size_t bytes)
+{
+	return rballoc_align(flags, caps, bytes, PLATFORM_DCACHE_ALIGN);
+}
+
+/**
+ * Changes size of the memory block allocated from SOF_MEM_ZONE_BUFFER.
+ * @param ptr Address of the block to resize.
+ * @param flags Flags, see SOF_MEM_FLAG_...
+ * @param caps Capabilities, see SOF_MEM_CAPS_...
+ * @param bytes New size in bytes.
+ * @param old_bytes Old size in bytes.
+ * @param alignment Alignment in bytes.
+ * @return Pointer to the resized memory of NULL if failed.
+ */
+void *rbrealloc_align(void *ptr, uint32_t flags, uint32_t caps, size_t bytes,
+		      size_t old_bytes, uint32_t alignment);
+
+/**
+ * Similar to rballoc_align(), returns resized buffer aligned to
+ * PLATFORM_DCACHE_ALIGN.
+ */
+static inline void *rbrealloc(void *ptr, uint32_t flags, uint32_t caps,
+			      size_t bytes, size_t old_bytes)
+{
+	return rbrealloc_align(ptr, flags, caps, bytes, old_bytes,
+			       PLATFORM_DCACHE_ALIGN);
+}
+
+/**
+ * Frees the memory block.
+ * @param ptr Pointer to the memory block.
+ *
+ * @note Blocks from SOF_MEM_ZONE_SYS cannot be freed, such a call causes
+ *       panic.
+ */
+void rfree(void *ptr);
+
+/**
+ * Allocates memory block from the system heap reserved for the specified core.
+ * @param core Core id.
+ * @param bytes Size in bytes.
+ */
+void *rzalloc_core_sys(int core, size_t bytes);
+
+/**
+ * Calculates length of the null-terminated string.
+ * @param s String.
+ * @return Length of the string in bytes.
+ */
+int rstrlen(const char *s);
+
+/**
+ * Compares two strings, see man strcmp.
+ * @param s1 First string to compare.
+ * @param s2 Second string to compare.
+ * @return See man strcmp.
+ */
+int rstrcmp(const char *s1, const char *s2);
+
+/** @}*/
+
+#endif /* __SOF_LIB_ALLOC_H__ */

posix/include/rtos/atomic.h

@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2018 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <[email protected]>
+ */
+
+#ifndef __SOF_ATOMIC_H__
+#define __SOF_ATOMIC_H__
+
+#include <arch/atomic.h>
+#include <stdint.h>
+
+static inline void atomic_init(atomic_t *a, int32_t value)
+{
+	arch_atomic_init(a, value);
+}
+
+static inline int32_t atomic_read(const atomic_t *a)
+{
+	return arch_atomic_read(a);
+}
+
+static inline void atomic_set(atomic_t *a, int32_t value)
+{
+	arch_atomic_set(a, value);
+}
+
+static inline int32_t atomic_add(atomic_t *a, int32_t value)
+{
+	return arch_atomic_add(a, value);
+}
+
+static inline int32_t atomic_sub(atomic_t *a, int32_t value)
+{
+	return arch_atomic_sub(a, value);
+}
+
+#endif /* __SOF_ATOMIC_H__ */