arch: mark z_prep_c as FUNC_NORETURN

nashif · nashif · commit 2701f995e69b · 2025-09-01T07:46:48.000-04:00
z_prep_c does not return, mark it as such consistently across architectures.
We had some arches do that, others not. This resolves a few coding guideline
violations in arch code.

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/arch/arc/core/prep_c.c b/arch/arc/core/prep_c.c
@@ -82,7 +82,7 @@ extern void arc_secureshield_init(void);
  * This routine prepares for the execution of and runs C code.
  */
 
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/arm/core/cortex_a_r/prep_c.c b/arch/arm/core/cortex_a_r/prep_c.c
@@ -98,7 +98,7 @@ extern FUNC_NORETURN void z_cstart(void);
  * This routine prepares for the execution of and runs C code.
  *
  */
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
@@ -195,7 +195,7 @@ extern FUNC_NORETURN void z_cstart(void);
  * This routine prepares for the execution of and runs C code.
  *
  */
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/arm64/core/prep_c.c b/arch/arm64/core/prep_c.c
@@ -31,7 +31,7 @@ __weak void z_arm64_mm_init(bool is_primary_core) { }
  * This routine prepares for the execution of and runs C code.
  *
  */
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/mips/core/prep_c.c b/arch/mips/core/prep_c.c
@@ -45,7 +45,7 @@ static void interrupt_init(void)
  * @return N/A
  */
 
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/riscv/core/prep_c.c b/arch/riscv/core/prep_c.c
@@ -34,7 +34,7 @@ void soc_interrupt_init(void);
  * This routine prepares for the execution of and runs C code.
  */
 
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/rx/core/prep_c.c b/arch/rx/core/prep_c.c
@@ -31,7 +31,7 @@ K_KERNEL_PINNED_STACK_ARRAY_DEFINE(z_initialization_process_stacks, CONFIG_MP_MA
  *
  * @return N/A
  */
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 	arch_bss_zero();
 
diff --git a/arch/sparc/core/prep_c.c b/arch/sparc/core/prep_c.c
@@ -20,7 +20,7 @@
  * This routine prepares for the execution of and runs C code.
  */
 
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/arch/xtensa/core/prep_c.c b/arch/xtensa/core/prep_c.c
@@ -29,7 +29,7 @@ BUILD_ASSERT(CONFIG_DCACHE_LINE_SIZE == XCHAL_DCACHE_LINESIZE);
  * This routine prepares for the execution of and runs C code.
  *
  */
-void z_prep_c(void)
+FUNC_NORETURN void z_prep_c(void)
 {
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
diff --git a/soc/espressif/esp32/soc.c b/soc/espressif/esp32/soc.c
@@ -16,7 +16,7 @@
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
 
-extern void z_prep_c(void);
+extern FUNC_NORETURN void z_prep_c(void);
 extern void esp_reset_reason_init(void);
 
 void IRAM_ATTR __esp_platform_app_start(void)
diff --git a/soc/espressif/esp32/soc_appcpu.c b/soc/espressif/esp32/soc_appcpu.c
@@ -38,7 +38,7 @@
 void __appcpu_start(void);
 static HDR_ATTR void (*_entry_point)(void) = &__appcpu_start;
 
-extern void z_prep_c(void);
+extern FUNC_NORETURN void z_prep_c(void);
 
 static void core_intr_matrix_clear(void)
 {
diff --git a/soc/espressif/esp32s2/soc.c b/soc/espressif/esp32s2/soc.c
@@ -15,7 +15,7 @@
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
 
-extern void z_prep_c(void);
+extern FUNC_NORETURN void z_prep_c(void);
 extern void esp_reset_reason_init(void);
 
 void IRAM_ATTR __esp_platform_app_start(void)
diff --git a/soc/espressif/esp32s3/soc.c b/soc/espressif/esp32s3/soc.c
@@ -16,7 +16,7 @@
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
 
-extern void z_prep_c(void);
+extern FUNC_NORETURN void z_prep_c(void);
 extern void esp_reset_reason_init(void);
 
 static void IRAM_ATTR esp_errata(void)
diff --git a/soc/espressif/esp32s3/soc_appcpu.c b/soc/espressif/esp32s3/soc_appcpu.c
@@ -38,7 +38,7 @@
 void __appcpu_start(void);
 static HDR_ATTR void (*_entry_point)(void) = &__appcpu_start;
 
-extern void z_prep_c(void);
+extern FUNC_NORETURN void z_prep_c(void);
 
 static void core_intr_matrix_clear(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ extern void arc_secureshield_init(void);`
`82`	`82`	`* This routine prepares for the execution of and runs C code.`
`83`	`83`	`*/`
`84`	`84`
`85`		`-void z_prep_c(void)`
	`85`	`+FUNC_NORETURN void z_prep_c(void)`
`86`	`86`	`{`
`87`	`87`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`88`	`88`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ extern FUNC_NORETURN void z_cstart(void);`
`98`	`98`	`* This routine prepares for the execution of and runs C code.`
`99`	`99`	`*`
`100`	`100`	`*/`
`101`		`-void z_prep_c(void)`
	`101`	`+FUNC_NORETURN void z_prep_c(void)`
`102`	`102`	`{`
`103`	`103`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`104`	`104`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ extern FUNC_NORETURN void z_cstart(void);`
`195`	`195`	`* This routine prepares for the execution of and runs C code.`
`196`	`196`	`*`
`197`	`197`	`*/`
`198`		`-void z_prep_c(void)`
	`198`	`+FUNC_NORETURN void z_prep_c(void)`
`199`	`199`	`{`
`200`	`200`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`201`	`201`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ __weak void z_arm64_mm_init(bool is_primary_core) { }`
`31`	`31`	`* This routine prepares for the execution of and runs C code.`
`32`	`32`	`*`
`33`	`33`	`*/`
`34`		`-void z_prep_c(void)`
	`34`	`+FUNC_NORETURN void z_prep_c(void)`
`35`	`35`	`{`
`36`	`36`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`37`	`37`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static void interrupt_init(void)`
`45`	`45`	`* @return N/A`
`46`	`46`	`*/`
`47`	`47`
`48`		`-void z_prep_c(void)`
	`48`	`+FUNC_NORETURN void z_prep_c(void)`
`49`	`49`	`{`
`50`	`50`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`51`	`51`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ void soc_interrupt_init(void);`
`34`	`34`	`* This routine prepares for the execution of and runs C code.`
`35`	`35`	`*/`
`36`	`36`
`37`		`-void z_prep_c(void)`
	`37`	`+FUNC_NORETURN void z_prep_c(void)`
`38`	`38`	`{`
`39`	`39`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`40`	`40`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ K_KERNEL_PINNED_STACK_ARRAY_DEFINE(z_initialization_process_stacks, CONFIG_MP_MA`
`31`	`31`	`*`
`32`	`32`	`* @return N/A`
`33`	`33`	`*/`
`34`		`-void z_prep_c(void)`
	`34`	`+FUNC_NORETURN void z_prep_c(void)`
`35`	`35`	`{`
`36`	`36`	`arch_bss_zero();`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* This routine prepares for the execution of and runs C code.`
`21`	`21`	`*/`
`22`	`22`
`23`		`-void z_prep_c(void)`
	`23`	`+FUNC_NORETURN void z_prep_c(void)`
`24`	`24`	`{`
`25`	`25`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`26`	`26`	`soc_prep_hook();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ BUILD_ASSERT(CONFIG_DCACHE_LINE_SIZE == XCHAL_DCACHE_LINESIZE);`
`29`	`29`	`* This routine prepares for the execution of and runs C code.`
`30`	`30`	`*`
`31`	`31`	`*/`
`32`		`-void z_prep_c(void)`
	`32`	`+FUNC_NORETURN void z_prep_c(void)`
`33`	`33`	`{`
`34`	`34`	`#if defined(CONFIG_SOC_PREP_HOOK)`
`35`	`35`	`soc_prep_hook();`