arch: init: rename z_data_copy -> arch_data_copy

nashif · cfriedt · commit 25938ec2bfd6 · 2025-09-08T15:51:07.000-04:00
Do not use private API prefix and move to architecture interface as
those functions are primarily used across arches and can be defined by
the architecture.

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
@@ -96,7 +96,7 @@ void z_prep_c(void)
 #ifdef __CCAC__
 	dev_state_zero();
 #endif
-	z_data_copy();
+	arch_data_copy();
 #if CONFIG_ARCH_CACHE
 	arch_cache_init();
 #endif
diff --git a/arch/arm/core/cortex_a_r/prep_c.c b/arch/arm/core/cortex_a_r/prep_c.c
@@ -110,7 +110,7 @@ void z_prep_c(void)
 	z_arm_floating_point_init();
 #endif
 	arch_bss_zero();
-	z_data_copy();
+	arch_data_copy();
 #if ((defined(CONFIG_ARMV7_R) || defined(CONFIG_ARMV7_A)) && defined(CONFIG_INIT_STACKS))
 	z_arm_init_stacks();
 #endif
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
@@ -206,7 +206,7 @@ void z_prep_c(void)
 	z_arm_floating_point_init();
 #endif
 	arch_bss_zero();
-	z_data_copy();
+	arch_data_copy();
 #if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
 	/* Invoke SoC-specific interrupt controller initialization */
 	z_soc_irq_init();
diff --git a/arch/arm64/core/prep_c.c b/arch/arm64/core/prep_c.c
@@ -41,7 +41,7 @@ void z_prep_c(void)
 	write_tpidrro_el0((uintptr_t)&_kernel.cpus[0]);
 
 	arch_bss_zero();
-	z_data_copy();
+	arch_data_copy();
 #ifdef CONFIG_ARM64_SAFE_EXCEPTION_STACK
 	/* After bss clean, _kernel.cpus is in bss section */
 	z_arm64_safe_exception_stack_init();
diff --git a/arch/common/xip.c b/arch/common/xip.c
@@ -24,7 +24,7 @@ extern volatile uintptr_t __stack_chk_guard;
  *
  * This routine copies the data section from ROM to RAM.
  */
-void z_data_copy(void)
+void arch_data_copy(void)
 {
 	arch_early_memcpy(&__data_region_start, &__data_region_load_start,
 		       __data_region_end - __data_region_start);
diff --git a/arch/riscv/core/prep_c.c b/arch/riscv/core/prep_c.c
@@ -41,7 +41,7 @@ void z_prep_c(void)
 #endif
 
 	arch_bss_zero();
-	z_data_copy();
+	arch_data_copy();
 #if defined(CONFIG_RISCV_SOC_INTERRUPT_INIT)
 	soc_interrupt_init();
 #endif
diff --git a/arch/rx/core/prep_c.c b/arch/rx/core/prep_c.c
@@ -35,7 +35,7 @@ void z_prep_c(void)
 {
 	arch_bss_zero();
 
-	z_data_copy();
+	arch_data_copy();
 
 	z_cstart();
 	CODE_UNREACHABLE;
diff --git a/arch/sparc/core/prep_c.c b/arch/sparc/core/prep_c.c
@@ -25,7 +25,7 @@ void z_prep_c(void)
 #if defined(CONFIG_SOC_PREP_HOOK)
 	soc_prep_hook();
 #endif
-	z_data_copy();
+	arch_data_copy();
 #if CONFIG_ARCH_CACHE
 	arch_cache_init();
 #endif
diff --git a/arch/x86/core/ia32/crt0.S b/arch/x86/core/ia32/crt0.S
@@ -31,7 +31,7 @@
 	/* externs */
 	GTEXT(z_prep_c)
 	GTEXT(arch_bss_zero)
-	GTEXT(z_data_copy)
+	GTEXT(arch_data_copy)
 
 	GDATA(_idt_base_address)
 	GDATA(z_interrupt_stacks)
@@ -226,11 +226,11 @@ __csSet:
 	 * This is a must is CONFIG_GDT_DYNAMIC is enabled,
 	 * as _gdt needs to be in RAM.
 	 */
-	call	z_data_copy
+	call	arch_data_copy
 #endif
 
 	/* Note that installing page tables must be done after
-	 * z_data_copy() as the page tables are being copied into
+	 * arch_data_copy() as the page tables are being copied into
 	 * RAM there.
 	 */
 	install_page_tables
diff --git a/arch/x86/core/intel64/cpu.c b/arch/x86/core/intel64/cpu.c
@@ -119,7 +119,7 @@ FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot)
 	if (cpuboot->cpu_id == 0U) {
 		/* Only need to do these once per boot */
 		arch_bss_zero();
-		z_data_copy();
+		arch_data_copy();
 	}
 
 	z_loapic_enable(cpuboot->cpu_id);
diff --git a/cmake/linker/iar/linker_flags.cmake b/cmake/linker/iar/linker_flags.cmake
@@ -27,7 +27,7 @@ set_property(TARGET linker PROPERTY optimization_size_aggressive --entry_list_in
 string(APPEND CMAKE_C_LINK_FLAGS --no-wrap-diagnostics)
 
 if(CONFIG_IAR_DATA_INIT)
-  string(APPEND CMAKE_C_LINK_FLAGS " --redirect z_data_copy=__iar_data_init3")
+  string(APPEND CMAKE_C_LINK_FLAGS " --redirect arch_data_copy=__iar_data_init3")
 endif()
 foreach(lang C CXX ASM)
   set(commands "--log modules,libraries,initialization,redirects,sections")
diff --git a/cmake/linker_script/arm/linker.cmake b/cmake/linker_script/arm/linker.cmake
@@ -149,7 +149,7 @@ zephyr_linker_section(NAME .ramfunc GROUP RAM_REGION SUBALIGN 8)
 if(CONFIG_USERSPACE)
   # This is where the app_mem_partition stuff is going to be placed, once it
   # is generated by gen_app_partitions.py. _app_smem has its own init-copy
-  # handling in z_data_copy, so put it in RAM_REGIOM rather than DATA_REGION
+  # handling in arch_data_copy, so put it in RAM_REGION rather than DATA_REGION
   zephyr_linker_group(NAME APP_SMEM_GROUP GROUP RAM_REGION SYMBOL SECTION)
   zephyr_linker_symbol(SYMBOL "_app_smem_size" EXPR "@__app_smem_group_size@")
 	zephyr_linker_symbol(SYMBOL "_app_smem_rom_start" EXPR "@__app_smem_group_load_start@")
diff --git a/cmake/toolchain/iar/Kconfig b/cmake/toolchain/iar/Kconfig
@@ -21,15 +21,15 @@ config IAR_DATA_INIT
 	select SKIP_BSS_CLEAR # IAR handles zeroing.
 	help
 	  IAR handles initialization of static variables.
-	  Instead of `z_prep_c` calling Zephyrs `z_data_copy`
+	  Instead of `z_prep_c` calling Zephyrs `arch_data_copy`
 	  we call IARs own proprietary initialization method
 	  which can save time and space.
 
 config IAR_ZEPHYR_INIT
 	bool "Zephyr"
 	help
 	  Zephyr handles initialization of static variables.
-	  This is the regular `z_data_copy`.
+	  This is the regular `arch_data_copy`.
 
 endchoice
 
diff --git a/include/zephyr/arch/common/xip.h b/include/zephyr/arch/common/xip.h
@@ -12,9 +12,9 @@ extern "C" {
 #endif
 
 #ifdef CONFIG_XIP
-void z_data_copy(void);
+void arch_data_copy(void);
 #else
-static inline void z_data_copy(void)
+static inline void arch_data_copy(void)
 {
 	/* Do nothing */
 }
diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h
@@ -135,7 +135,7 @@ extern char __kernel_ram_size[];
 extern char __bss_start[];
 extern char __bss_end[];
 
-/* Used by z_data_copy() or arch-specific implementation */
+/* Used by arch_data_copy() or arch-specific implementation */
 #ifdef CONFIG_XIP
 extern char __data_region_load_start[];
 extern char __data_region_start[];

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ extern volatile uintptr_t __stack_chk_guard;`
`24`	`24`	`*`
`25`	`25`	`* This routine copies the data section from ROM to RAM.`
`26`	`26`	`*/`
`27`		`-void z_data_copy(void)`
	`27`	`+void arch_data_copy(void)`
`28`	`28`	`{`
`29`	`29`	`arch_early_memcpy(&__data_region_start, &__data_region_load_start,`
`30`	`30`	`__data_region_end - __data_region_start);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void z_prep_c(void)`
`35`	`35`	`{`
`36`	`36`	`arch_bss_zero();`
`37`	`37`
`38`		`- z_data_copy();`
	`38`	`+ arch_data_copy();`
`39`	`39`
`40`	`40`	`z_cstart();`
`41`	`41`	`CODE_UNREACHABLE;`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot)`
`119`	`119`	`if (cpuboot->cpu_id == 0U) {`
`120`	`120`	`/* Only need to do these once per boot */`
`121`	`121`	`arch_bss_zero();`
`122`		`- z_data_copy();`
	`122`	`+ arch_data_copy();`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`z_loapic_enable(cpuboot->cpu_id);`