arch: use same syntax for custom arch calls

nashif · carlescufi · commit a91c6e56c8be · 2024-08-12T12:43:36.000+02:00
Use same Kconfig syntax for those  custom arch call.

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/arch/Kconfig b/arch/Kconfig
@@ -1078,16 +1078,14 @@ config TOOLCHAIN_HAS_BUILTIN_FFS
 	help
 	  Hidden option to signal that toolchain has __builtin_ffs*().
 
-config ARCH_CPU_IDLE_CUSTOM
-	bool "Custom arch_cpu_idle implementation"
-	default n
+config ARCH_HAS_CUSTOM_CPU_IDLE
+	bool
 	help
 	  This options allows applications to override the default arch idle implementation with
 	  a custom one.
 
-config ARCH_CPU_ATOMIC_IDLE_CUSTOM
-	bool "Custom arch_cpu_atomic_idle implementation"
-	default n
+config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
+	bool
 	help
 	  This options allows applications to override the default arch idle implementation with
 	  a custom one.
diff --git a/arch/arc/core/cpu_idle.S b/arch/arc/core/cpu_idle.S
@@ -26,7 +26,7 @@ SECTION_VAR(BSS, z_arc_cpu_sleep_mode)
 	.align 4
 	.word 0
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 /*
  * @brief Put the CPU in low-power mode
  *
@@ -51,7 +51,7 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
 	nop
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 /*
  * @brief Put the CPU in low-power mode, entered with IRQs locked
  *
diff --git a/arch/arm/core/cortex_a_r/cpu_idle.S b/arch/arm/core/cortex_a_r/cpu_idle.S
@@ -49,7 +49,7 @@ _skip_\@:
 #endif /* CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK */
 .endm
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 SECTION_FUNC(TEXT, arch_cpu_idle)
 #ifdef CONFIG_TRACING
 	push	{r0, lr}
@@ -71,7 +71,7 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
 
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 #ifdef CONFIG_TRACING
 	push	{r0, lr}
diff --git a/arch/arm/core/cortex_m/cpu_idle.c b/arch/arm/core/cortex_m/cpu_idle.c
@@ -53,7 +53,7 @@ void z_arm_cpu_idle_init(void)
 } while (false)
 #endif
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 void arch_cpu_idle(void)
 {
 #if defined(CONFIG_TRACING)
@@ -99,7 +99,7 @@ void arch_cpu_idle(void)
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 void arch_cpu_atomic_idle(unsigned int key)
 {
 #if defined(CONFIG_TRACING)
diff --git a/arch/arm64/core/cpu_idle.S b/arch/arm64/core/cpu_idle.S
@@ -13,7 +13,7 @@
 #include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 GTEXT(arch_cpu_idle)
 SECTION_FUNC(TEXT, arch_cpu_idle)
 #ifdef CONFIG_TRACING
@@ -27,7 +27,7 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
 	ret
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 GTEXT(arch_cpu_atomic_idle)
 SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 #ifdef CONFIG_TRACING
diff --git a/arch/mips/core/cpu_idle.c b/arch/mips/core/cpu_idle.c
@@ -19,14 +19,14 @@ static ALWAYS_INLINE void mips_idle(unsigned int key)
 	__asm__ volatile("wait");
 }
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 void arch_cpu_idle(void)
 {
 	mips_idle(1);
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 void arch_cpu_atomic_idle(unsigned int key)
 {
 	mips_idle(key);
diff --git a/arch/nios2/core/cpu_idle.c b/arch/nios2/core/cpu_idle.c
@@ -7,7 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 void arch_cpu_idle(void)
 {
 	/* Do nothing but unconditionally unlock interrupts and return to the
@@ -17,7 +17,7 @@ void arch_cpu_idle(void)
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 void arch_cpu_atomic_idle(unsigned int key)
 {
 	/* Do nothing but restore IRQ state. This CPU does not have any
diff --git a/arch/riscv/core/cpu_idle.c b/arch/riscv/core/cpu_idle.c
@@ -7,7 +7,7 @@
 #include <zephyr/irq.h>
 #include <zephyr/tracing/tracing.h>
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 void arch_cpu_idle(void)
 {
 	sys_trace_idle();
@@ -16,7 +16,7 @@ void arch_cpu_idle(void)
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 void arch_cpu_atomic_idle(unsigned int key)
 {
 	sys_trace_idle();
diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c
@@ -7,7 +7,7 @@
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/arch/cpu.h>
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 __pinned_func
 void arch_cpu_idle(void)
 {
@@ -18,7 +18,7 @@ void arch_cpu_idle(void)
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 __pinned_func
 void arch_cpu_atomic_idle(unsigned int key)
 {
diff --git a/arch/xtensa/core/cpu_idle.c b/arch/xtensa/core/cpu_idle.c
@@ -6,15 +6,15 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/tracing/tracing.h>
 
-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 void arch_cpu_idle(void)
 {
 	sys_trace_idle();
 	__asm__ volatile ("waiti 0");
 }
 #endif
 
-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM
+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 void arch_cpu_atomic_idle(unsigned int key)
 {
 	sys_trace_idle();
diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig
@@ -8,7 +8,7 @@ config SOC_SERIES_INTEL_ADSP_ACE
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
 	select ARCH_HAS_COHERENCE
 	select SCHED_IPI_SUPPORTED
-	select ARCH_CPU_IDLE_CUSTOM
+	select ARCH_HAS_CUSTOM_CPU_IDLE
 	select DW_ICTL_ACE
 	select SOC_HAS_RUNTIME_NUM_CPUS
 	select HAS_PM
diff --git a/soc/intel/intel_adsp/ace/power.c b/soc/intel/intel_adsp/ace/power.c
@@ -445,7 +445,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 
 #endif /* CONFIG_PM */
 
-#ifdef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifdef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 
 __no_optimization
 void arch_cpu_idle(void)
@@ -465,4 +465,4 @@ void arch_cpu_idle(void)
 	__asm__ volatile ("waiti 0");
 }
 
-#endif /* CONFIG_ARCH_CPU_IDLE_CUSTOM */
+#endif /* CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE */
diff --git a/soc/intel/intel_adsp/cavs/power.c b/soc/intel/intel_adsp/cavs/power.c
@@ -194,7 +194,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 }
 #endif /* CONFIG_PM */
 
-#ifdef CONFIG_ARCH_CPU_IDLE_CUSTOM
+#ifdef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 /* xt-clang removes any NOPs more than 8. So we need to set
  * no optimization to avoid those NOPs from being removed.
  *
diff --git a/soc/ite/ec/it8xxx2/Kconfig b/soc/ite/ec/it8xxx2/Kconfig
@@ -4,8 +4,8 @@
 config SOC_SERIES_IT8XXX2
 	select CPU_HAS_FPU if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "zephyr" || RISCV_ISA_EXT_M
 	select HAS_PM
-	select ARCH_CPU_IDLE_CUSTOM
-	select ARCH_CPU_ATOMIC_IDLE_CUSTOM
+	select ARCH_HAS_CUSTOM_CPU_IDLE
+	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 
 if SOC_SERIES_IT8XXX2
 
diff --git a/soc/nordic/common/vpr/Kconfig b/soc/nordic/common/vpr/Kconfig
@@ -17,8 +17,8 @@ config RISCV_CORE_NORDIC_VPR
 	select RISCV_HAS_CLIC
 	select RISCV_SOC_CONTEXT_SAVE
 	select HAS_FLASH_LOAD_OFFSET
-	select ARCH_CPU_IDLE_CUSTOM
-	select ARCH_CPU_ATOMIC_IDLE_CUSTOM
+	select ARCH_HAS_CUSTOM_CPU_IDLE
+	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 	select INCLUDE_RESET_VECTOR
 	help
 	  Enable support for the RISC-V Nordic VPR core.

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void z_arm_cpu_idle_init(void)`
`53`	`53`	`} while (false)`
`54`	`54`	`#endif`
`55`	`55`
`56`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`56`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`57`	`57`	`void arch_cpu_idle(void)`
`58`	`58`	`{`
`59`	`59`	`#if defined(CONFIG_TRACING)`
`@@ -99,7 +99,7 @@ void arch_cpu_idle(void)`
`99`	`99`	`}`
`100`	`100`	`#endif`
`101`	`101`
`102`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`102`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`103`	`103`	`void arch_cpu_atomic_idle(unsigned int key)`
`104`	`104`	`{`
`105`	`105`	`#if defined(CONFIG_TRACING)`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ static ALWAYS_INLINE void mips_idle(unsigned int key)`
`19`	`19`	`__asm__ volatile("wait");`
`20`	`20`	`}`
`21`	`21`
`22`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`22`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`23`	`23`	`void arch_cpu_idle(void)`
`24`	`24`	`{`
`25`	`25`	`mips_idle(1);`
`26`	`26`	`}`
`27`	`27`	`#endif`
`28`	`28`
`29`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`29`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`30`	`30`	`void arch_cpu_atomic_idle(unsigned int key)`
`31`	`31`	`{`
`32`	`32`	`mips_idle(key);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <zephyr/kernel.h>`
`8`	`8`	`#include <zephyr/kernel_structs.h>`
`9`	`9`
`10`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`10`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`11`	`11`	`void arch_cpu_idle(void)`
`12`	`12`	`{`
`13`	`13`	`/* Do nothing but unconditionally unlock interrupts and return to the`
`@@ -17,7 +17,7 @@ void arch_cpu_idle(void)`
`17`	`17`	`}`
`18`	`18`	`#endif`
`19`	`19`
`20`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`20`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`21`	`21`	`void arch_cpu_atomic_idle(unsigned int key)`
`22`	`22`	`{`
`23`	`23`	`/* Do nothing but restore IRQ state. This CPU does not have any`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <zephyr/irq.h>`
`8`	`8`	`#include <zephyr/tracing/tracing.h>`
`9`	`9`
`10`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`10`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`11`	`11`	`void arch_cpu_idle(void)`
`12`	`12`	`{`
`13`	`13`	`sys_trace_idle();`
`@@ -16,7 +16,7 @@ void arch_cpu_idle(void)`
`16`	`16`	`}`
`17`	`17`	`#endif`
`18`	`18`
`19`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`19`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`20`	`20`	`void arch_cpu_atomic_idle(unsigned int key)`
`21`	`21`	`{`
`22`	`22`	`sys_trace_idle();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <zephyr/tracing/tracing.h>`
`8`	`8`	`#include <zephyr/arch/cpu.h>`
`9`	`9`
`10`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`10`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`11`	`11`	`__pinned_func`
`12`	`12`	`void arch_cpu_idle(void)`
`13`	`13`	`{`
`@@ -18,7 +18,7 @@ void arch_cpu_idle(void)`
`18`	`18`	`}`
`19`	`19`	`#endif`
`20`	`20`
`21`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`21`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`22`	`22`	`__pinned_func`
`23`	`23`	`void arch_cpu_atomic_idle(unsigned int key)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`	`#include <zephyr/toolchain.h>`
`7`	`7`	`#include <zephyr/tracing/tracing.h>`
`8`	`8`
`9`		`-#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`9`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`10`	`10`	`void arch_cpu_idle(void)`
`11`	`11`	`{`
`12`	`12`	`sys_trace_idle();`
`13`	`13`	`__asm__ volatile ("waiti 0");`
`14`	`14`	`}`
`15`	`15`	`#endif`
`16`	`16`
`17`		`-#ifndef CONFIG_ARCH_CPU_ATOMIC_IDLE_CUSTOM`
	`17`	`+#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE`
`18`	`18`	`void arch_cpu_atomic_idle(unsigned int key)`
`19`	`19`	`{`
`20`	`20`	`sys_trace_idle();`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)`
`194`	`194`	`}`
`195`	`195`	`#endif /* CONFIG_PM */`
`196`	`196`
`197`		`-#ifdef CONFIG_ARCH_CPU_IDLE_CUSTOM`
	`197`	`+#ifdef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE`
`198`	`198`	`/* xt-clang removes any NOPs more than 8. So we need to set`
`199`	`199`	`* no optimization to avoid those NOPs from being removed.`
`200`	`200`	`*`