Merge branch 'main' into patch-1

.github/workflows/bsim-tests.yaml

@@ -80,7 +80,7 @@ jobs:
           west forall -c 'git reset --hard HEAD'
 
       - name: Check common triggering files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-common-files
         with:
           files: |
@@ -95,7 +95,7 @@ jobs:
             tests/bsim/*
 
       - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-bluetooth-files
         with:
           files: |
@@ -104,7 +104,7 @@ jobs:
             subsys/bluetooth/**
 
       - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-networking-files
         with:
           files: |

.github/workflows/do_not_merge.yml

@@ -7,12 +7,14 @@ on:
 jobs:
   do-not-merge:
     if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
-            contains(github.event.*.labels.*.name, 'TSC') }}
+            contains(github.event.*.labels.*.name, 'TSC') ||
+            contains(github.event.*.labels.*.name, 'Architecture Review') ||
+            contains(github.event.*.labels.*.name, 'dev-review') }}
     name: Prevent Merging
     runs-on: ubuntu-22.04
     steps:
       - name: Check for label
         run: |
-          echo "Pull request is labeled as 'DNM' or 'TSC'"
-          echo "This workflow fails so that the pull request cannot be merged"
+          echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
+          echo "This workflow fails so that the pull request cannot be merged."
           exit 1

.github/workflows/twister.yaml

@@ -179,6 +179,12 @@ jobs:
           west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
           west forall -c 'git reset --hard HEAD'
 
+          # Hotfix until we have kitware ninja in the docker image.
+          # Needed for full functionality of the job server functionality in twister which only works with
+          # kitware supplied ninja version.
+          wget -c    https://github.com/Kitware/ninja/releases/download/v1.11.1.g95dee.kitware.jobserver-1/ninja-1.11.1.g95dee.kitware.jobserver-1_x86_64-linux-gnu.tar.gz -O - | tar xz --strip-components=1
+          sudo cp ninja /usr/local/bin
+
       - name: Check Environment
         run: |
           cmake --version

CMakeLists.txt

@@ -1622,18 +1622,20 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_META)
+  set(KERNEL_META_PATH  ${PROJECT_BINARY_DIR}/${KERNEL_META_NAME} CACHE INTERNAL "")
+
   list(APPEND
     post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
             ${WEST_ARG}
             ${ZEPHYR_MODULES_ARG}
             ${EXTRA_ZEPHYR_MODULES_ARG}
-            --meta-out ${KERNEL_META_NAME}
+            --meta-out ${KERNEL_META_PATH}
             $<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate>
   )
   list(APPEND
     post_build_byproducts
-    ${KERNEL_META_NAME}
+    ${KERNEL_META_PATH}
   )
 endif()
 

CODEOWNERS

@@ -133,6 +133,7 @@
 /boards/shields/inventek_eswifi/          @nandojve
 /boards/xtensa/odroid_go/                 @ydamigos
 /boards/xtensa/nxp_adsp_imx8/             @iuliana-prodan @dbaluta
+/boards/xtensa/kincony_kc868_a32/         @bbilas
 /boards/arm64/qemu_cortex_a53/            @carlocaione
 /boards/arm64/bcm958402m2_a72/            @abhishek-brcm
 /boards/arm64/mimx8mm_evk/                @MrVan @JiafeiPan

Kconfig.zephyr

@@ -872,7 +872,7 @@ config IS_BOOTLOADER
 	  a separate Zephyr image payload.
 
 config BOOTLOADER_SRAM_SIZE
-	int "SRAM reserved for bootloader"
+	int "SRAM reserved for bootloader [DEPRECATED]"
 	default 0
 	depends on !XIP || IS_BOOTLOADER
 	depends on ARM || XTENSA
@@ -883,6 +883,20 @@ config BOOTLOADER_SRAM_SIZE
 	  - Zephyr is a !XIP image, which implicitly assumes existence of a
 	  bootloader that loads the Zephyr !XIP image onto SRAM.
 
+	  This option is deprecated, users should transition to using DTS to set this, if needed.
+	  To be removed after Zephyr 3.7 release.
+
+config BOOTLOADER_SRAM_SIZE_DEPRECATED
+	bool
+	default y
+	select DEPRECATED
+	depends on BOOTLOADER_SRAM_SIZE != 0
+	depends on !XIP || IS_BOOTLOADER
+	depends on ARM || XTENSA
+	help
+	  Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
+	  non-0 value. Please transition to using devicetree.
+
 config BOOTLOADER_ESP_IDF
 	bool "ESP-IDF bootloader support"
 	depends on SOC_FAMILY_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT

MAINTAINERS.yml

@@ -252,8 +252,10 @@ Ambiq Platforms:
     - soc/arm/ambiq/
     - boards/arm/apollo*/
     - dts/arm/ambiq/
-    - dts/bindings/*/ambiq*
-    - drivers/*/*_ambiq*
+    - dts/bindings/*/ambiq,*
+    - drivers/*/*ambiq*
+    - drivers/*/*/*ambiq*
+    - drivers/*/*/*apollo*
   labels:
     - "platform: Ambiq"
 
@@ -351,17 +353,14 @@ Bluetooth controller:
 Bluetooth Host:
   status: maintained
   maintainers:
+    - jori-nordic
     - jhedberg
   collaborators:
     - hermabe
-    - jori-nordic
     - alwa-nordic
-    - Vudentz
     - Thalley
-    - asbjornsabo
     - sjanc
     - theob-pro
-    - kruithofa
   files:
     - drivers/bluetooth/
     - subsys/bluetooth/host/
@@ -383,6 +382,7 @@ Bluetooth Mesh:
     - alxelax
     - Andrewpini
     - akredalen
+    - HaavardRei
   files:
     - subsys/bluetooth/mesh/
     - include/zephyr/bluetooth/mesh/
@@ -2728,6 +2728,8 @@ POSIX API layer:
   status: maintained
   maintainers:
     - cfriedt
+  collaborators:
+    - ycsin
   files:
     - include/zephyr/posix/
     - lib/posix/
@@ -2995,7 +2997,7 @@ GD32 Platforms:
     - dts/*/gigadevice/
     - dts/bindings/*/*gd32*
     - soc/arm/gigadevice/
-    - soc/riscv/riscv-privileged/gd32vf103/
+    - soc/riscv/gd_gd32/
     - scripts/west_commands/*/*gd32*
   labels:
     - "platform: GD32"
@@ -3384,7 +3386,7 @@ ITE Platforms:
     - drivers/*/*it8xxx2*.c
     - dts/bindings/*/*ite*
     - dts/riscv/ite/
-    - soc/riscv/riscv-ite/
+    - soc/riscv/ite_ec/
   labels:
     - "platform: ITE"
 
@@ -3474,6 +3476,15 @@ Infineon Platforms:
     Infineon SOCs, dts files and related drivers. Infineon Proto, Pioneer, Eval and Relax
     boards.
 
+Panasonic Platforms:
+  status: maintained
+  maintainers:
+    - pideu-sj
+  files:
+    - boards/arm/pan17*/
+  labels:
+    - "platform: Panasonic"
+
 RTIO:
   status: maintained
   maintainers:

arch/arc/core/CMakeLists.txt

@@ -26,7 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
 zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c)
-zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_smp.c)
+zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT smp.c)
 
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
 

arch/arc/core/cache.c

@@ -218,8 +218,7 @@ int arch_icache_flush_and_invd_range(void *addr, size_t size)
 
 static int init_dcache(void)
 {
-
-	arch_dcache_enable();
+	sys_cache_data_enable();
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
 	init_dcache_line_size();

arch/arc/core/reset.S

@@ -174,7 +174,7 @@ _slave_core_wait:
 	jl z_arc_firq_stack_set
 	pop r0
 #endif
-	j z_arc_slave_start
+	j arch_secondary_cpu_init
 
 _master_core_startup:
 #endif

arch/arc/core/arc_smp.c → arch/arc/core/smp.c

@@ -89,7 +89,7 @@ static void arc_connect_debug_mask_update(int cpu_num)
 void arc_core_private_intc_init(void);
 
 /* the C entry of slave cores */
-void z_arc_slave_start(int cpu_num)
+void arch_secondary_cpu_init(int cpu_num)
 {
 	arch_cpustart_t fn;
 
@@ -145,7 +145,7 @@ void arch_sched_ipi(void)
 	}
 }
 
-static int arc_smp_init(void)
+int arch_smp_init(void)
 {
 	struct arc_connect_bcr bcr;
 
@@ -188,6 +188,5 @@ static int arc_smp_init(void)
 
 	return 0;
 }
-
-SYS_INIT(arc_smp_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+SYS_INIT(arch_smp_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 #endif

arch/arm/core/cortex_a_r/reset.S

@@ -217,7 +217,7 @@ EL1_Reset_Handler:
     bne 1b
 
     /* we can now move on */
-    ldr r4, =z_arm_secondary_start
+    ldr r4, =arch_secondary_cpu_init
     ldr r5, [r0, #BOOT_PARAM_FIQ_SP_OFFSET]
     ldr r6, [r0, #BOOT_PARAM_IRQ_SP_OFFSET]
     ldr r7, [r0, #BOOT_PARAM_ABT_SP_OFFSET]

arch/arm/core/cortex_a_r/smp.c

@@ -148,7 +148,7 @@ void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz, arch_cpustart_
 	 *  \todo Support PSCI
 	 */
 
-	/* Wait secondary cores up, see z_arm64_secondary_start */
+	/* Wait secondary cores up, see arch_secondary_cpu_init */
 	while (arm_cpu_boot_params.fn) {
 		wfe();
 	}
@@ -159,7 +159,7 @@ void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz, arch_cpustart_
 }
 
 /* the C entry of secondary cores */
-void z_arm_secondary_start(void)
+void arch_secondary_cpu_init(void)
 {
 	int cpu_num = arm_cpu_boot_params.cpu_num;
 	arch_cpustart_t fn;
@@ -245,7 +245,7 @@ void arch_sched_ipi(void)
 	broadcast_ipi(SGI_SCHED_IPI);
 }
 
-static int arm_smp_init(void)
+int arch_smp_init(void)
 {
 	cpu_map[0] = MPIDR_TO_CORE(GET_MPIDR());
 
@@ -259,6 +259,6 @@ static int arm_smp_init(void)
 	return 0;
 }
 
-SYS_INIT(arm_smp_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+SYS_INIT(arch_smp_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif

arch/arm/core/cortex_m/scb.c

@@ -21,6 +21,7 @@
 #include <cmsis_core.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/cache.h>
+#include <zephyr/arch/cache.h>
 
 #if defined(CONFIG_CPU_HAS_NXP_MPU)
 #include <fsl_sysmpu.h>
@@ -120,15 +121,27 @@ void z_arm_init_arch_hw_at_boot(void)
 	 * reset it to a known clean state.
 	 */
 	if (SCB->CCR & SCB_CCR_DC_Msk) {
-		sys_cache_data_disable();
+		/*
+		 * Do not use sys_cache_data_disable at this point, but instead
+		 * the architecture specific function. This ensures that the
+		 * cache is disabled although CONFIG_CACHE_MANAGEMENT might be
+		 * disabled.
+		 */
+		SCB_DisableDCache();
 	} else {
-		sys_cache_data_invd_all();
+		SCB_InvalidateDCache();
 	}
 #endif /* CONFIG_DCACHE */
 
 #if defined(CONFIG_ICACHE)
-	/* Reset I-Cache settings. */
-	sys_cache_instr_disable();
+	/*
+	 * Reset I-Cache settings.
+	 * Do not use sys_cache_data_disable at this point, but instead
+	 * the architecture specific function. This ensures that the
+	 * cache is disabled although CONFIG_CACHE_MANAGEMENT might be
+	 * disabled.
+	 */
+	SCB_DisableICache();
 #endif /* CONFIG_ICACHE */
 #endif /* CONFIG_ARCH_CACHE */
 

arch/arm64/core/fatal.c

@@ -250,7 +250,7 @@ static bool z_arm64_stack_corruption_check(z_arch_esf_t *esf, uint64_t esr, uint
 			 * so flush the fpu context to its owner, and then set no fpu trap to avoid
 			 * a new nested exception triggered by FPU accessing (var_args).
 			 */
-			z_arm64_flush_local_fpu();
+			arch_flush_local_fpu();
 			write_cpacr_el1(read_cpacr_el1() | CPACR_EL1_FPEN_NOTRAP);
 #endif
 			arch_curr_cpu()->arch.corrupted_sp = 0UL;

arch/arm64/core/fpu.c

@@ -64,7 +64,7 @@ static inline void DBG(char *msg, struct k_thread *t) { }
  * Flush FPU content and disable access.
  * This is called locally and also from flush_fpu_ipi_handler().
  */
-void z_arm64_flush_local_fpu(void)
+void arch_flush_local_fpu(void)
 {
 	__ASSERT(read_daif() & DAIF_IRQ_BIT, "must be called with IRQs disabled");
 
@@ -107,10 +107,10 @@ static void flush_owned_fpu(struct k_thread *thread)
 		}
 		/* we found it live on CPU i */
 		if (i == _current_cpu->id) {
-			z_arm64_flush_local_fpu();
+			arch_flush_local_fpu();
 		} else {
 			/* the FPU context is live on another CPU */
-			z_arm64_flush_fpu_ipi(i);
+			arch_flush_fpu_ipi(i);
 
 			/*
 			 * Wait for it only if this is about the thread
@@ -126,7 +126,7 @@ static void flush_owned_fpu(struct k_thread *thread)
 			 * two CPUs want to pull each other's FPU context.
 			 */
 			if (thread == _current) {
-				z_arm64_flush_local_fpu();
+				arch_flush_local_fpu();
 				while (atomic_ptr_get(&_kernel.cpus[i].arch.fpu_owner) == thread) {
 					barrier_dsync_fence_full();
 				}
@@ -334,7 +334,7 @@ int arch_float_disable(struct k_thread *thread)
 		flush_owned_fpu(thread);
 #else
 		if (thread == atomic_ptr_get(&_current_cpu->arch.fpu_owner)) {
-			z_arm64_flush_local_fpu();
+			arch_flush_local_fpu();
 		}
 #endif