Merge branch 'zephyrproject-rtos:main' into fix_double_set_random_addr

Author: LingaoM

.editorconfig

@@ -86,6 +86,10 @@ indent_size = 8
 [COMMIT_EDITMSG]
 max_line_length = 75
 
+# Patches
+[{*.patch,*.diff}]
+trim_trailing_whitespace = false
+
 # Kconfig
 [Kconfig*]
 indent_style = tab

MAINTAINERS.yml

@@ -337,6 +337,7 @@ Arduino Platforms:
     - boards/arduino/
     - boards/shields/arduino_*/
     - drivers/*/*modulino*
+    - dts/vendor/arduino/
 
 Base OS:
   status: maintained
@@ -855,8 +856,6 @@ CPU Frequency Scaling:
     - seankyer
   files:
     - include/zephyr/cpu_freq/
-    - include/zephyr/cpu_load/
-    - subsys/cpu_load/
     - subsys/cpu_freq/
     - dts/bindings/p_state/
   labels:
@@ -1275,6 +1274,7 @@ Documentation Infrastructure:
     - martinjaeger
     - str4t0m
   files:
+    - boards/shields/canis_canpico/
     - boards/shields/mcp2515/
     - boards/shields/tcan4550evm/
     - doc/connectivity/canbus/
@@ -3047,9 +3047,10 @@ JSON Web Token:
     - libraries.encoding.jwt
 
 Kconfig:
-  status: odd fixes
-  collaborators:
+  status: maintained
+  maintainers:
     - tejlmand
+  collaborators:
     - nashif
   files:
     - scripts/kconfig/
@@ -4882,10 +4883,13 @@ TI SimpleLink Platforms:
   status: maintained
   maintainers:
     - vaishnavachath
+  collaborators:
+    - bogdanovs
   files:
     - boards/ti/cc*/
     - boards/ti/msp*/
     - drivers/*/*cc13*
+    - drivers/*/*cc23*
     - drivers/*/*cc25*
     - drivers/*/*cc26*
     - drivers/*/*cc32*
@@ -6099,10 +6103,7 @@ West:
     - thrift
 
 "West project: trusted-firmware-a":
-  status: maintained
-  maintainers:
-    - povergoing
-    - sgrrzhf
+  status: odd fixes
   collaborators:
     - wearyzen
     - ithinuel

arch/Kconfig

@@ -57,6 +57,7 @@ config ARM64
 	select ARCH_HAS_DEMAND_MAPPING
 	select ARCH_SUPPORTS_EVICTION_TRACKING
 	select EVICTION_TRACKING if DEMAND_PAGING
+	select MEM_DOMAIN_HAS_THREAD_LIST if ARM_MPU
 	help
 	  ARM64 (AArch64) architecture
 

arch/arm/core/mpu/arm_mpu_regions.c

@@ -7,7 +7,7 @@
 #include <zephyr/sys/slist.h>
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 #ifdef CONFIG_XIP

arch/arm64/core/cortex_r/arm_mpu.c

@@ -760,8 +760,8 @@ static int configure_domain_partitions(struct k_mem_domain *domain)
 	struct k_thread *thread;
 	int ret;
 
-	SYS_DLIST_FOR_EACH_CONTAINER(&domain->mem_domain_q, thread,
-				     mem_domain_info.mem_domain_q_node) {
+	SYS_DLIST_FOR_EACH_CONTAINER(&domain->thread_mem_domain_list, thread,
+				     mem_domain_info.thread_mem_domain_node) {
 		ret = configure_dynamic_mpu_regions(thread);
 		if (ret != 0) {
 			return ret;

arch/riscv/core/pmp.c

@@ -168,20 +168,35 @@ static inline void z_riscv_pmp_write_config(unsigned long *pmp_cfg, size_t pmp_c
 #endif
 }
 
-static void dump_pmp_regs(const char *banner)
+/**
+ * @brief Reads the PMP address CSRs (pmpaddrX) for all configured slots.
+ *
+ * This helper function abstracts the iterative logic required to read the
+ * individual PMP address registers (pmpaddr0, pmpaddr1, ..., pmpaddrN)
+ * up to the total number of PMP slots configured by CONFIG_PMP_SLOTS.
+ *
+ * @param pmp_addr Pointer to the array where the CSR contents will be stored.
+ * @param pmp_addr_size The size of the pmp_addr array, measured in unsigned long entries.
+ */
+static inline void z_riscv_pmp_read_addr(unsigned long *pmp_addr, size_t pmp_addr_size)
 {
-	unsigned long pmp_addr[CONFIG_PMP_SLOTS];
-	unsigned long pmp_cfg[CONFIG_PMP_SLOTS / PMPCFG_STRIDE];
+	__ASSERT(pmp_addr_size == (size_t)(CONFIG_PMP_SLOTS), "PMP address array size mismatch");
 
 #define PMPADDR_READ(x) pmp_addr[x] = csr_read(pmpaddr##x)
-
 	FOR_EACH(PMPADDR_READ, (;), 0, 1, 2, 3, 4, 5, 6, 7);
+
 #if CONFIG_PMP_SLOTS > 8
 	FOR_EACH(PMPADDR_READ, (;), 8, 9, 10, 11, 12, 13, 14, 15);
 #endif
-
 #undef PMPADDR_READ
+}
+
+static void dump_pmp_regs(const char *banner)
+{
+	unsigned long pmp_addr[CONFIG_PMP_SLOTS];
+	unsigned long pmp_cfg[CONFIG_PMP_SLOTS / PMPCFG_STRIDE];
 
+	z_riscv_pmp_read_addr(pmp_addr, (size_t)(CONFIG_PMP_SLOTS));
 	z_riscv_pmp_read_config(pmp_cfg, (size_t)(CONFIG_PMP_SLOTS / PMPCFG_STRIDE));
 	print_pmp_entries(0, CONFIG_PMP_SLOTS, pmp_addr, pmp_cfg, banner);
 }

boards/01space/esp32c3_042_oled/doc/index.rst

@@ -3,7 +3,7 @@
 Overview
 ********
 
-ESP32C3 0.42 OLED is a mini development board based on the `Espressif ESP32-C3`_
+ESP32-C3 0.42 OLED is a mini development board based on the `Espressif ESP32-C3`_
 RISC-V WiFi/Bluetooth dual-mode chip.
 
 For more details see the `01space ESP32C3 0.42 OLED`_ Github repo.
@@ -31,10 +31,8 @@ It features:
    The ESP32-C3 does not have native USB, it has an on-chip USB-serial converter
    instead.
 
-Supported Features
-==================
-
-.. zephyr:board-supported-hw::
+.. include:: ../../../espressif/common/soc-esp32c3-features.rst
+   :start-after: espressif-soc-esp32c3-features
 
 Connections and IOs
 ===================
@@ -50,87 +48,28 @@ See the following image:
 It also features a 0.42 inch OLED display, driven by a SSD1306-compatible chip.
 It is connected over I2C: SDA on GPIO5, SCL on GPIO6.
 
-Prerequisites
-=============
-
-Espressif HAL requires WiFi and Bluetooth binary blobs. Run the command below to
-retrieve those files.
-
-.. code-block:: console
-
-   west blobs fetch hal_espressif
-
-.. note::
+System Requirements
+*******************
 
-   It is recommended running the command above after :file:`west update`.
+.. include:: ../../../espressif/common/system-requirements.rst
+   :start-after: espressif-system-requirements
 
 Programming and Debugging
 *************************
 
 .. zephyr:board-supported-runners::
 
-Standalone application
-======================
-
-The board can be loaded using a single binary image, without 2nd stage bootloader.
-It is the default option when building the application without additional configuration.
-
-.. note::
-
-   This mode does not provide any security features nor OTA updates.
-
-Use the following command to build a sample hello_world application:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: esp32c3_042_oled
-   :goals: build
-
-Sysbuild
-========
-
-:ref:`sysbuild` makes it possible to build and flash all necessary images needed to
-bootstrap the board.
-
-By default, the ESP32 sysbuild configuration creates bootloader (MCUboot) and
-application images.
-
-To build the sample application using sysbuild, use this command:
-
-.. zephyr-app-commands::
-   :tool: west
-   :zephyr-app: samples/hello_world
-   :board: esp32c3_042_oled
-   :goals: build
-   :west-args: --sysbuild
-   :compact:
-
-Flashing
-========
-
-For the :code:`Hello, world!` application, follow the instructions below.
-Assuming the board is connected to ``/dev/ttyACM0`` on Linux.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: esp32c3_042_oled
-   :goals: flash
-   :flash-args: --esp-device /dev/ttyACM0
-
-Since the Zephyr console is by default on the ``usb_serial`` device, we use
-the espressif monitor utility to connect to the console.
-
-.. code-block:: console
-
-   $ west espressif monitor -p /dev/ttyACM0
+.. include:: ../../../espressif/common/building-flashing.rst
+   :start-after: espressif-building-flashing
 
-After the board has automatically reset and booted, you should see the following
-message in the monitor:
+.. include:: ../../../espressif/common/board-variants.rst
+   :start-after: espressif-board-variants
 
-.. code-block:: console
+Debugging
+=========
 
-   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
-   Hello World! esp32c3_042_oled
+.. include:: ../../../espressif/common/openocd-debugging.rst
+   :start-after: espressif-openocd-debugging
 
 References
 **********

boards/96boards/meerkat96/doc/index.rst

@@ -1,4 +1,4 @@
-.. _96b_meerkat96:
+.. zephyr:board:: 96b_meerkat96
 
 96Boards Meerkat96
 ##################
@@ -35,10 +35,6 @@ Zephyr OS is ported to run on the Cortex®-M4 core.
     - 1x Blue Bluetooth LED
     - 1x Yellow WiFi LED
 
-.. image:: img/96b_meerkat96.jpg
-   :align: center
-   :alt: 96Boards Meerkat96
-
 More information about the board can be found at the
 `96Boards website`_.
 
@@ -91,27 +87,7 @@ More information about the i.MX7 SoC can be found here:
 Supported Features
 ==================
 
-The Zephyr 96b_meerkat96 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/96boards/meerkat96/96b_meerkat96_mcimx7d_m4_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================