Merge branch 'main' into tmo-main

Author: nightly-merge

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,10 +7,18 @@ assignees: ''
 
 ---
 
+**Notes (delete this)**
+Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
+are available to first verify that the issue is a genuine Zephyr bug and not a
+consequence of Zephyr services misuse.
+
+This issue list is only for bugs in the main Zephyr code base
+(https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
+fork (such as NCS) specific feature, please open an issue in the fork project
+instead.
+
 **Describe the bug**
 A clear and concise description of what the bug is.
-(Note that [Github Discussions](https://github.com/zephyrproject-rtos/zephyr/discussions) are available to first verify that the issue
-is a genuine Zephyr bug and not a consequence of Zephyr services misuse.)
 
 Please also mention any information which could help others to understand
 the problem you're facing:

boards/xtensa/intel_adsp_ace15_mtpm/board.cmake

@@ -3,3 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_set_rimage_target(mtl)
+
+set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace15_mtpm/board.cmake")

boards/xtensa/intel_adsp_ace20_lnl/board.cmake

@@ -3,3 +3,5 @@
 set(SUPPORTED_EMU_PLATFORMS acesim)
 
 board_set_rimage_target(lnl)
+
+set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace20_lnl/board.cmake")

boards/xtensa/intel_adsp_cavs25/board.cmake

@@ -7,7 +7,7 @@ endif()
 
 board_set_flasher_ifnset(intel_adsp)
 
-set(RIMAGE_SIGN_KEY otc_private_key_3k.pem)
+set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake")
 
 if(CONFIG_BOARD_INTEL_ADSP_CAVS25)
 board_set_rimage_target(tgl)

doc/develop/west/sign.rst

@@ -117,3 +117,54 @@ signing system or extending the default behaviour.
 
 .. _imgtool:
    https://pypi.org/project/imgtool/
+
+
+rimage
+******
+
+rimage configuration uses a different approach that does not rely on Kconfig or CMake
+but on :ref:`west config<west-config>` instead, similar to
+:ref:`west-building-cmake-config`.
+
+Signing involves a number of "wrapper" scripts stacked on top of each other: ``west
+flash`` invokes ``west build`` which invokes ``cmake`` and ``ninja`` which invokes
+``west sign`` which invokes ``imgtool`` or `rimage`_. As long as the signing
+parameters desired are the default ones and fairly static, these indirections are
+not a problem. On the other hand, passing ``imgtool`` or ``rimage`` options through
+all these layers can causes issues typical when the layers don't abstract
+anything. First, this usually requires boilerplate code in each layer. Quoting
+whitespace or other special characters through all the wrappers can be
+difficult. Reproducing a lower ``west sign`` command to debug some build-time issue
+can be very time-consuming: it requires at least enabling and searching verbose
+build logs to find which exact options were used. Copying these options from the
+build logs can be unreliable: it may produce different results because of subtle
+environment differences. Last and worst: new signing feature and options are
+impossible to use until more boilerplate code has been added in each layer.
+
+To avoid these issues, ``rimage`` parameters can bet set in ``west config``
+instead. Here's a ``workspace/.west/config`` example:
+
+.. code-block:: ini
+
+   [sign]
+   # Not needed when invoked from CMake
+   tool = rimage
+
+   [rimage]
+   # Quoting is optional and works like in Unix shells
+   # Not needed when rimage can be found in the default PATH
+   path = "/home/me/zworkspace/build-rimage/rimage"
+
+   # Not needed when using the default development key
+   extra-args = -i 4 -k 'keys/key argument with space.pem'
+
+In order to support quoting, values are parsed by Python's ``shlex.split()`` like in
+:ref:`west-building-cmake-args`.
+
+The ``extra-args`` are passed directly to the ``rimage`` command. The example
+above has the same effect as appending them on command line after ``--`` like this:
+``west sign --tool rimage -- -i 4 -k 'keys/key argument with space.pem'``. In case
+both are used, the command-line arguments go last.
+
+.. _rimage:
+   https://github.com/thesofproject/rimage

doc/releases/release-notes-3.4.rst

@@ -431,6 +431,11 @@ Libraries / Subsystems
     correctly, allowing other transports or other parts of the application
     code to use it.
 
+* RTIO
+
+  * Added policy that every ``sqe`` will generate a ``cqe`` (previously an RTIO_SQE_TRANSACTION
+    entry would only trigger a ``cqe`` on the last ``sqe`` in the transaction.
+
 HALs
 ****