Merge remote-tracking branch 'upstream/main'

Author: ljq-ctrl

.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

.github/workflows/doc-build.yml

@@ -4,9 +4,9 @@
 name: Documentation Build
 
 on:
-  schedule:
-  - cron: '0 */3 * * *'
   push:
+    branches:
+    - main
     tags:
     - v*
   pull_request:
@@ -61,7 +61,7 @@ jobs:
     container:
       image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
       options: '--entrypoint /bin/bash'
-    timeout-minutes: 20
+    timeout-minutes: 60
     concurrency:
       group: doc-build-html-${{ github.ref }}
       cancel-in-progress: true

MAINTAINERS.yml

@@ -3047,9 +3047,10 @@ JSON Web Token:
     - libraries.encoding.jwt
 
 Kconfig:
-  status: odd fixes
-  collaborators:
+  status: maintained
+  maintainers:
     - tejlmand
+  collaborators:
     - nashif
   files:
     - scripts/kconfig/

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/mmu/arm_mmu.c

@@ -890,6 +890,9 @@ static int __arch_mem_map(void *virt, uintptr_t phys, size_t size, uint32_t flag
 
 	switch (flags & K_MEM_CACHE_MASK) {
 
+	case K_MEM_ARM_NORMAL_NC:
+		conv_flags |= MT_NORMAL;
+		break;
 	case K_MEM_CACHE_NONE:
 	default:
 		conv_flags |= MT_DEVICE;

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

@@ -48,8 +48,6 @@ LOG_MODULE_REGISTER(mpu);
 #define PMP_NA4_SUPPORTED	!IS_ENABLED(CONFIG_PMP_NO_NA4)
 #define PMP_NAPOT_SUPPORTED	!IS_ENABLED(CONFIG_PMP_NO_NAPOT)
 
-#define PMPCFG_STRIDE sizeof(unsigned long)
-
 #define PMP_ADDR(addr)			((addr) >> 2)
 #define NAPOT_RANGE(size)		(((size) - 1) >> 1)
 #define PMP_ADDR_NAPOT(addr, size)	PMP_ADDR(addr | NAPOT_RANGE(size))
@@ -170,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);
 }
@@ -596,7 +609,7 @@ void z_riscv_pmp_stackguard_disable(void)
 {
 
 	unsigned long pmp_addr[CONFIG_PMP_SLOTS];
-	unsigned long pmp_cfg[CONFIG_PMP_SLOTS / sizeof(unsigned long)];
+	unsigned long pmp_cfg[CONFIG_PMP_SLOTS / PMPCFG_STRIDE];
 	unsigned int index = global_pmp_end_index;
 
 	/* Retrieve the pmpaddr value matching the last global PMP slot. */

arch/riscv/include/pmp.h

@@ -7,6 +7,8 @@
 #ifndef PMP_H_
 #define PMP_H_
 
+#define PMPCFG_STRIDE (__riscv_xlen / 8)
+
 void z_riscv_pmp_init(void);
 void z_riscv_pmp_stackguard_prepare(struct k_thread *thread);
 void z_riscv_pmp_stackguard_enable(struct k_thread *thread);

boards/adafruit/trinkey_qt2040/adafruit_trinkey_qt2040.yaml

@@ -15,6 +15,5 @@ supported:
   - gpio
   - hwinfo
   - i2c
-  - usb
   - watchdog
   - zephyr_i2c

boards/adi/max32658evkit/Kconfig.defconfig

@@ -0,0 +1,48 @@
+# Copyright (c) 2024-2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_MAX32658EVKIT
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+if BOARD_MAX32658EVKIT_MAX32658_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+# MAX32658 has one UART interface,
+# It can be used either on TFM or Zephyr
+# Enabling debug (TFM_SPM_LOG_LEVEL || TFM_PARTITION_LOG_LEVEL) will transfer it to the TFM side
+# Disabling TFM debug will transfer it to the Zephyr side.
+
+choice TFM_SPM_LOG_LEVEL
+	default TFM_SPM_LOG_LEVEL_SILENCE
+endchoice
+
+choice TFM_PARTITION_LOG_LEVEL
+	default TFM_PARTITION_LOG_LEVEL_SILENCE
+endchoice
+
+endif # BOARD_MAX32658EVKIT_MAX32658_NS
+
+config I3C
+	default y if ADXL367
+
+endif # BOARD_MAX32658EVKIT