6023d6a142
ramfunc region is copied into RAM from FLASH region during XIP init. We copy from the loadaddr of the region, and were previously loading to the symbol __ramfunc_start. This is incorrect when using an MPU with alignment requirements, as the __ramfunc_start symbol may have padding placed before it in the region. The __ramfunc_start symbol still needs to be aligned in order to be used by the MPU though, so define a new symbol __ramfunc_region_start, and use that symbol when copying the __ramfunc region from FLASH to RAM. Fixes #75296 Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
75 lines
2.3 KiB
C
75 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2010-2014 Wind River Systems, Inc.
|
|
* Copyright (c) 2020 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <kernel_internal.h>
|
|
#include <zephyr/linker/linker-defs.h>
|
|
|
|
#ifdef CONFIG_STACK_CANARIES
|
|
#ifdef CONFIG_STACK_CANARIES_TLS
|
|
extern Z_THREAD_LOCAL volatile uintptr_t __stack_chk_guard;
|
|
#else
|
|
extern volatile uintptr_t __stack_chk_guard;
|
|
#endif /* CONFIG_STACK_CANARIES_TLS */
|
|
#endif /* CONFIG_STACK_CANARIES */
|
|
|
|
/**
|
|
* @brief Copy the data section from ROM to RAM
|
|
*
|
|
* This routine copies the data section from ROM to RAM.
|
|
*/
|
|
void z_data_copy(void)
|
|
{
|
|
z_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,
|
|
__ramfunc_end - __ramfunc_region_start);
|
|
#endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
|
|
#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
|
|
z_early_memcpy(&__ccm_data_start, &__ccm_data_rom_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,
|
|
(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,
|
|
__dtcm_data_end - __dtcm_data_start);
|
|
#endif
|
|
#ifdef CONFIG_CODE_DATA_RELOCATION
|
|
extern void data_copy_xip_relocation(void);
|
|
|
|
data_copy_xip_relocation();
|
|
#endif /* CONFIG_CODE_DATA_RELOCATION */
|
|
#ifdef CONFIG_USERSPACE
|
|
#ifdef CONFIG_STACK_CANARIES
|
|
/* stack canary checking is active for all C functions.
|
|
* __stack_chk_guard is some uninitialized value living in the
|
|
* app shared memory sections. Preserve it, and don't make any
|
|
* function calls to perform the memory copy. The true canary
|
|
* value gets set later in z_cstart().
|
|
*/
|
|
uintptr_t guard_copy = __stack_chk_guard;
|
|
uint8_t *src = (uint8_t *)&_app_smem_rom_start;
|
|
uint8_t *dst = (uint8_t *)&_app_smem_start;
|
|
uint32_t count = _app_smem_end - _app_smem_start;
|
|
|
|
guard_copy = __stack_chk_guard;
|
|
while (count > 0) {
|
|
*(dst++) = *(src++);
|
|
count--;
|
|
}
|
|
__stack_chk_guard = guard_copy;
|
|
#else
|
|
z_early_memcpy(&_app_smem_start, &_app_smem_rom_start,
|
|
_app_smem_end - _app_smem_start);
|
|
#endif /* CONFIG_STACK_CANARIES */
|
|
#endif /* CONFIG_USERSPACE */
|
|
}
|