arch: boot: rename z_early_memcpy -> arch_early_memcpy

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 <[email protected]>

Author: nashif

arch/arm/core/cortex_m/prep_c.c

@@ -61,7 +61,7 @@ void __weak relocate_vector_table(void)
 	/* Copy vector table to its location in SRAM */
 	size_t vector_size = (size_t)_vector_end - (size_t)_vector_start;
 
-	z_early_memcpy(_sram_vector_start, _vector_start, vector_size);
+	arch_early_memcpy(_sram_vector_start, _vector_start, vector_size);
 #endif
 	SCB->VTOR = VECTOR_ADDRESS & VTOR_MASK;
 	barrier_dsync_fence_full();

arch/arm64/core/early_mem_funcs.S

@@ -51,9 +51,9 @@ SECTION_FUNC(TEXT, arch_early_memset)
 
 4:	ret
 
-/* void z_early_memcpy(void *dst, const void *src, size_t n) */
-GTEXT(z_early_memcpy)
-SECTION_FUNC(TEXT, z_early_memcpy)
+/* void arch_early_memcpy(void *dst, const void *src, size_t n) */
+GTEXT(arch_early_memcpy)
+SECTION_FUNC(TEXT, arch_early_memcpy)
 
 	/* are dst and src pointers 8-bytes aligned? */
 	orr	x8, x1, x0

arch/common/init.c

@@ -37,7 +37,7 @@ void __weak arch_early_memset(void *dst, int c, size_t n)
  * may override this with their own safe implementation.
  */
 __boot_func
-void __weak z_early_memcpy(void *dst, const void *src, size_t n)
+void __weak arch_early_memcpy(void *dst, const void *src, size_t n)
 {
 	(void) memcpy(dst, src, n);
 }

arch/common/xip.c

@@ -26,28 +26,28 @@ extern volatile uintptr_t __stack_chk_guard;
  */
 void z_data_copy(void)
 {
-	z_early_memcpy(&__data_region_start, &__data_region_load_start,
+	arch_early_memcpy(&__data_region_start, &__data_region_load_start,
 		       __data_region_end - __data_region_start);
 #ifdef CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
-	z_early_memcpy(&__ramfunc_region_start, &__ramfunc_load_start,
+	arch_early_memcpy(&__ramfunc_region_start, &__ramfunc_load_start,
 		       __ramfunc_end - __ramfunc_region_start);
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
 #ifdef CONFIG_ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 #if CONFIG_NOCACHE_MEMORY
-	z_early_memcpy(&_nocache_load_ram_start, &_nocache_load_rom_start,
+	arch_early_memcpy(&_nocache_load_ram_start, &_nocache_load_rom_start,
 		       (uintptr_t) &_nocache_load_ram_size);
 #endif /* CONFIG_NOCACHE_MEMORY */
 #endif /* CONFIG_ARCH_HAS_NOCACHE_MEMORY_SUPPORT */
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
-	z_early_memcpy(&__ccm_data_start, &__ccm_data_load_start,
+	arch_early_memcpy(&__ccm_data_start, &__ccm_data_load_start,
 		       __ccm_data_end - __ccm_data_start);
 #endif
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
-	z_early_memcpy(&__itcm_start, &__itcm_load_start,
+	arch_early_memcpy(&__itcm_start, &__itcm_load_start,
 		       (uintptr_t) &__itcm_size);
 #endif
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
-	z_early_memcpy(&__dtcm_data_start, &__dtcm_data_load_start,
+	arch_early_memcpy(&__dtcm_data_start, &__dtcm_data_load_start,
 		       __dtcm_data_end - __dtcm_data_start);
 #endif
 #ifdef CONFIG_CODE_DATA_RELOCATION
@@ -75,7 +75,7 @@ void z_data_copy(void)
 	}
 	__stack_chk_guard = guard_copy;
 #else
-	z_early_memcpy(&_app_smem_start, &_app_smem_rom_start,
+	arch_early_memcpy(&_app_smem_start, &_app_smem_rom_start,
 		       _app_smem_end - _app_smem_start);
 #endif /* CONFIG_REQUIRES_STACK_CANARIES */
 #endif /* CONFIG_USERSPACE */

include/zephyr/arch/common/init.h

@@ -10,7 +10,7 @@ FUNC_NORETURN void z_cstart(void);
 
 /* Early boot functions */
 void arch_early_memset(void *dst, int c, size_t n);
-void z_early_memcpy(void *dst, const void *src, size_t n);
+void arch_early_memcpy(void *dst, const void *src, size_t n);
 
 void z_bss_zero(void);
 

kernel/init.c

@@ -518,7 +518,7 @@ void __weak z_early_rand_get(uint8_t *buf, size_t length)
 		state = state * 2862933555777941757ULL + 3037000493ULL;
 		val = (uint32_t)(state >> 32);
 		rc = MIN(length, sizeof(val));
-		z_early_memcpy((void *)buf, &val, rc);
+		arch_early_memcpy((void *)buf, &val, rc);
 
 		length -= rc;
 		buf += rc;

scripts/build/gen_relocate_app.py

@@ -205,7 +205,7 @@ class OutputSection(NamedTuple):
 """
 
 MEMCPY_TEMPLATE = """
-	z_early_memcpy(&__{mem}_{kind}_reloc_start, &__{mem}_{kind}_rom_start,
+	arch_early_memcpy(&__{mem}_{kind}_reloc_start, &__{mem}_{kind}_rom_start,
 		           (size_t) &__{mem}_{kind}_reloc_size);
 
 """

tests/application_development/code_relocation/src/main.c

@@ -42,7 +42,7 @@ void disable_mpu_rasr_xn(void)
 
 /* override the default memcpy as zephyr will call this before relocation happens */
 __boot_func
-void  z_early_memcpy(void *dst, const void *src, size_t n)
+void  arch_early_memcpy(void *dst, const void *src, size_t n)
 {
 	/* attempt word-sized copying only if buffers have identical alignment */
 	unsigned char *d_byte = (unsigned char *)dst;