Merge branch 'main' into imx8qm_qxp_fix

Signed-off-by: Laurentiu Mihalcea <laurentiumihalcea111@gmail.com>

Author: LaurentiuM1234

lmdk/cmake/build.cmake

@@ -13,7 +13,8 @@ foreach(MODULE ${MODULES_LIST})
 	add_executable(${MODULE})
 	add_subdirectory(${LMDK_BASE}/modules/${MODULE} ${MODULE}_module)
 
-###	set_target_properties(${MODULE} PROPERTIES OUTPUT_NAME ${MODULE}.mod)
+	# uncomment line below to compile module with debug information
+	#target_compile_options(${MODULE} PUBLIC  "-g3")
 
 	target_include_directories(${MODULE} PRIVATE
 		"${LMDK_BASE}/include"
@@ -35,9 +36,9 @@ foreach(MODULE ${MODULES_LIST})
 	)
 
 	target_link_options(${MODULE} PRIVATE
-		"-nostdlib" "-nodefaultlibs"
+		"-nostartfiles"
 		"-Wl,--no-undefined" "-Wl,--unresolved-symbols=report-all" "-Wl,--error-unresolved-symbols"
-		#"-Wl,--gc-sections"	# may remove .bss and that will result in rimage error, do not use for now
+		"-Wl,--gc-sections"
 		"-Wl,-Map,$<TARGET_FILE:${MODULE}>.map"	# optional: just for debug
 		"-T" "${MODULE}_ldscripts/elf32xtensa.x"
 	)
@@ -55,13 +56,26 @@ cmake_path(APPEND SOF_BASE "../build-rimage" OUTPUT_VARIABLE RIMAGE_SOF_INSTALL_
 cmake_path(NORMAL_PATH RIMAGE_SOF_INSTALL_DIR)
 cmake_path(ABSOLUTE_PATH SIGNING_KEY BASE_DIRECTORY ${CMAKE_SOURCE_DIR} NORMALIZE)
 
+foreach(MOD_NAME IN LISTS MODULES_LIST)
+	list(APPEND RIMAGE_MODULES_LIST ${MOD_NAME}.mod)
+
+	# Change .module section flags to tell rimage to not include it in a final image
+	add_custom_target(${MOD_NAME}.mod
+		COMMENT "Preparing .mod(ule) files for rimage"
+		DEPENDS ${MOD_NAME}
+		COMMAND ${CMAKE_OBJCOPY}
+			--set-section-flags .module=noload,readonly
+			${MOD_NAME} ${MOD_NAME}.mod
+)
+endforeach()
+
 find_program(RIMAGE_COMMAND NAMES rimage
   PATHS "${RIMAGE_INSTALL_DIR}"
   HINTS "${RIMAGE_SOF_INSTALL_DIR}"
   REQUIRED)
 
 add_custom_target(${PROJECT_NAME}_target ALL
-	DEPENDS ${MODULES_LIST}
-	COMMAND ${RIMAGE_COMMAND} -k ${SIGNING_KEY} -f 2.0.0 -b 1 -o ${RIMAGE_OUTPUT_FILE} -c ${TOML} -e ${MODULES_LIST}
+	DEPENDS ${RIMAGE_MODULES_LIST}
+	COMMAND ${RIMAGE_COMMAND} -k ${SIGNING_KEY} -f 2.0.0 -b 1 -o ${RIMAGE_OUTPUT_FILE} -c ${TOML} -e ${RIMAGE_MODULES_LIST}
 	COMMAND ${CMAKE_COMMAND} -E cat ${RIMAGE_OUTPUT_FILE}.xman ${RIMAGE_OUTPUT_FILE} > ${OUTPUT_FILE}
 )

lmdk/cmake/config.cmake

@@ -14,5 +14,5 @@ cmake_path(ABSOLUTE_PATH LMDK_BASE NORMALIZE)
 set(SOF_BASE ${LMDK_BASE}/..)
 cmake_path(ABSOLUTE_PATH SOF_BASE NORMALIZE)
 
-set(RIMAGE_INCLUDE_DIR ${SOF_BASE}/rimage/src/include)
+set(RIMAGE_INCLUDE_DIR ${SOF_BASE}/tools/rimage/src/include)
 cmake_path(ABSOLUTE_PATH RIMAGE_INCLUDE_DIR NORMALIZE)

lmdk/cmake/ldscripts/bss_linker_script.txt

@@ -16,5 +16,18 @@ SECTIONS {
         _next_end = ABSOLUTE(.);
         *(.bss)
         *(.bss.*)
+
+        /* Heap memory */
+        . = ALIGN(4);
+        __stack = .;
+        _end = .;
+        KEEP(*(.heap_mem))
+
+        /* Use the unused rest of the memory page as a heap */
+        . = ALIGN(4096);
+
+        /* The sbrk function implementation by xtensa incorrectly checks whether the allocated
+           memory block fits in the heap, so we have to add 1 to the end of the heap marker. */
+        _heap_sentry = . + 1;
     } >HPSRAM_seg : bss_phdr
 }

lmdk/cmake/ldscripts/data_linker_script.txt

@@ -11,10 +11,11 @@ SECTIONS {
         _data_start = ABSOLUTE(.);
         *(.data)
         *(.data.*)
+        *(.*.data)
         _data_end = ABSOLUTE(.);
     } >HPSRAM_seg : data_phdr
 
-    .rodata : ALIGN(4096) {
+    .rodata : {
         _rodata_start = ABSOLUTE(.);
         *(.gnu.linkonce.r.*)
         *(.rodata)
@@ -24,7 +25,7 @@ SECTIONS {
     } >HPSRAM_seg : rodata_phdr
 
     /* Module manifest is here */
-    .module : ALIGN(4096) {
+    .module 0 : {
         KEEP(*(.module))
-    } >HPSRAM_seg : rodata_phdr
+    }
 }

lmdk/cmake/ldscripts/text_linker_script.txt

@@ -11,7 +11,7 @@ PHDRS {
 SECTIONS {
     .text : ALIGN(4096) {
         _text_start = ABSOLUTE(.);
-        *(.buildinfo)
+        KEEP(*(.buildinfo))
         *(.gnu.linkonce.literal.*)
         *(.gnu.linkonce.lit4)
         *(.literal)

lmdk/cmake/xtensa-toolchain.cmake

@@ -18,11 +18,11 @@ cmake_path(APPEND XTENSA_TOOLCHAIN_PATH "XtensaTools" OUTPUT_VARIABLE TOOLCHAIN_
 set(CROSS_COMPILE xt-)
 
 # clang or xcc
-find_program(CMAKE_C_COMPILER NAMES ${CROSS_COMPILE}xcc
+find_program(CMAKE_C_COMPILER NAMES ${CROSS_COMPILE}clang
 	PATHS ${TOOLCHAIN_BASE} PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH
 )
 # clang++ or xc++
-find_program(CMAKE_CXX_COMPILER NAMES ${CROSS_COMPILE}xc++
+find_program(CMAKE_CXX_COMPILER NAMES ${CROSS_COMPILE}clang++
 	PATHS ${TOOLCHAIN_BASE} PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH
 )
 find_program(CMAKE_LD NAMES ${CROSS_COMPILE}ld

scripts/cmake/misc.cmake

@@ -40,6 +40,15 @@ function(get_optimization_flag OUT_VAR)
 	endif()
 endfunction()
 
+# Zephyr duplicate in sof/zephyr/CMakeLists.txt; keep in sync
+macro(is_zephyr ret)
+	if(CONFIG_ZEPHYR_SOF_MODULE)
+		set(${ret} TRUE)
+	else()
+		set(${ret} FALSE)
+	endif()
+endmacro()
+
 # Adds sources to target like target_sources, but assumes that
 # paths are relative to subdirectory.
 # Works like:

scripts/rebuild-testbench.sh

@@ -57,6 +57,7 @@ setup_xtensa_tools_build()
     BUILD_TYPE=xt
     BUILD_TARGET=
     BUILD_DIR_NAME=build_xt_testbench
+    COMPILER="xt-xcc"
 
     # check needed environment variables
     test -n "${XTENSA_TOOLS_ROOT}" || die "XTENSA_TOOLS_ROOT need to be set.\n"
@@ -72,11 +73,10 @@ setup_xtensa_tools_build()
     test -n "${XTENSA_CORE}" ||
         die "Illegal platform $BUILD_PLATFORM, no XTENSA_CORE found.\n"
 
-    compiler="xt-xcc"
     install_bin=install/tools/$XTENSA_TOOLS_VERSION/XtensaTools/bin
     tools_bin=$XTENSA_TOOLS_ROOT/$install_bin
     testbench_sections="-Wl,--sections-placement $BUILD_TESTBENCH_DIR/testbench_xcc_sections.txt"
-    export CC=$tools_bin/$compiler
+    export CC=$tools_bin/$COMPILER
     export LD=$tools_bin/xt-ld
     export OBJDUMP=$tools_bin/xt-objdump
     export LDFLAGS="-mlsp=sim $testbench_sections"

scripts/set_xtensa_params.sh

@@ -81,4 +81,10 @@ case "$platform" in
 	HOST="xtensa-mt8195-elf"
 	XTENSA_TOOLS_VERSION="RI-2019.1-linux"
 	;;
+    mtl)
+	PLATFORM="mtl"
+	XTENSA_CORE="ace10_LX7HiFi4_2022_10"
+	XTENSA_TOOLS_VERSION="RI-2022.10-linux"
+	COMPILER="xt-clang"
+	;;
 esac

src/audio/copier/copier.c

@@ -84,7 +84,9 @@ static int copier_init(struct processing_module *mod)
 	for (i = 0; i < IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT; i++)
 		cd->out_fmt[i] = cd->config.out_fmt;
 
-	ipc_pipe = ipc_get_comp_by_ppl_id(ipc, COMP_TYPE_PIPELINE, config->pipeline_id);
+	ipc_pipe = ipc_get_comp_by_ppl_id(ipc, COMP_TYPE_PIPELINE,
+					  config->pipeline_id,
+					  IPC_COMP_IGNORE_REMOTE);
 	if (!ipc_pipe) {
 		comp_err(dev, "pipeline %d is not existed", config->pipeline_id);
 		ret = -EPIPE;