libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9202 from polarvid/shell/arm64-setup-pvoff 

[libcpu] quality: call PV_OFFSET on entry for once
This commit is contained in:
Bernard Xiong 2024-07-17 22:27:14 +08:00 committed by GitHub
parent a974cde8f9 2d1eba8bf3
commit 861e32490f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libcpu/aarch64/common/setup.c
View File

@ -208,11 +208,12 @@ void rt_hw_common_setup(void)
rt_region_t init_page_region = { 0 }; rt_region_t init_page_region = { 0 };
rt_region_t platform_mem_region = { 0 }; rt_region_t platform_mem_region = { 0 };
static struct mem_desc platform_mem_desc; static struct mem_desc platform_mem_desc;
const rt_ubase_t pv_off = PV_OFFSET;
system_vectors_init(); system_vectors_init();
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
rt_hw_mmu_map_init(&rt_kernel_space, (void*)0xfffffffff0000000, 0x10000000, MMUTable, PV_OFFSET); rt_hw_mmu_map_init(&rt_kernel_space, (void*)0xfffffffff0000000, 0x10000000, MMUTable, pv_off);
#else #else
rt_hw_mmu_map_init(&rt_kernel_space, (void*)0xffffd0000000, 0x10000000, MMUTable, 0); rt_hw_mmu_map_init(&rt_kernel_space, (void*)0xffffd0000000, 0x10000000, MMUTable, 0);
#endif #endif
@ -234,13 +235,13 @@ void rt_hw_common_setup(void)
rt_memblock_reserve_memory("init-page", init_page_start, init_page_end, MEMBLOCK_NONE); rt_memblock_reserve_memory("init-page", init_page_start, init_page_end, MEMBLOCK_NONE);
rt_memblock_reserve_memory("fdt", fdt_start, fdt_end, MEMBLOCK_NONE); rt_memblock_reserve_memory("fdt", fdt_start, fdt_end, MEMBLOCK_NONE);
rt_memmove((void *)(fdt_start - PV_OFFSET), (void *)(fdt_ptr - PV_OFFSET), fdt_size); rt_memmove((void *)(fdt_start - pv_off), (void *)(fdt_ptr - pv_off), fdt_size);
fdt_ptr = (void *)fdt_start - PV_OFFSET; fdt_ptr = (void *)fdt_start - pv_off;
rt_system_heap_init((void *)(heap_start - PV_OFFSET), (void *)(heap_end - PV_OFFSET)); rt_system_heap_init((void *)(heap_start - pv_off), (void *)(heap_end - pv_off));
init_page_region.start = init_page_start - PV_OFFSET; init_page_region.start = init_page_start - pv_off;
init_page_region.end = init_page_end - PV_OFFSET; init_page_region.end = init_page_end - pv_off;
rt_page_init(init_page_region); rt_page_init(init_page_region);
/* create MMU mapping of kernel memory */ /* create MMU mapping of kernel memory */
@ -248,8 +249,8 @@ void rt_hw_common_setup(void)
platform_mem_region.end = RT_ALIGN(platform_mem_region.end, ARCH_PAGE_SIZE); platform_mem_region.end = RT_ALIGN(platform_mem_region.end, ARCH_PAGE_SIZE);
platform_mem_desc.paddr_start = platform_mem_region.start; platform_mem_desc.paddr_start = platform_mem_region.start;
platform_mem_desc.vaddr_start = platform_mem_region.start - PV_OFFSET; platform_mem_desc.vaddr_start = platform_mem_region.start - pv_off;
platform_mem_desc.vaddr_end = platform_mem_region.end - PV_OFFSET - 1; platform_mem_desc.vaddr_end = platform_mem_region.end - pv_off - 1;
platform_mem_desc.attr = NORMAL_MEM; platform_mem_desc.attr = NORMAL_MEM;
rt_hw_mmu_setup(&rt_kernel_space, &platform_mem_desc, 1); rt_hw_mmu_setup(&rt_kernel_space, &platform_mem_desc, 1);