From bf559e7ad0c96a3636aa8ae443e8084f4ef40a86 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Thu, 10 Apr 2025 13:57:27 +0800 Subject: [PATCH 1/2] libcpu: cleanup undefined rt_hw_mmu_kernel_map_init rt_hw_mmu_kernel_map_init() is declared in header files but no definition found, cleanup the code. Signed-off-by: Chen Wang --- libcpu/aarch64/common/include/mmu.h | 2 -- libcpu/arm/cortex-a/mmu.h | 1 - libcpu/risc-v/common64/mmu.h | 2 -- 3 files changed, 5 deletions(-) diff --git a/libcpu/aarch64/common/include/mmu.h b/libcpu/aarch64/common/include/mmu.h index 6710d405449..eac43331528 100644 --- a/libcpu/aarch64/common/include/mmu.h +++ b/libcpu/aarch64/common/include/mmu.h @@ -115,8 +115,6 @@ void *rt_hw_mmu_map(struct rt_aspace *aspace, void *v_addr, void *p_addr, void rt_hw_mmu_unmap(struct rt_aspace *aspace, void *v_addr, size_t size); void rt_hw_aspace_switch(struct rt_aspace *aspace); void *rt_hw_mmu_v2p(struct rt_aspace *aspace, void *vaddr); -void rt_hw_mmu_kernel_map_init(struct rt_aspace *aspace, rt_size_t vaddr_start, - rt_size_t size); void *rt_hw_mmu_pgtbl_create(void); void rt_hw_mmu_pgtbl_delete(void *pgtbl); void *rt_hw_mmu_tbl_get(void); diff --git a/libcpu/arm/cortex-a/mmu.h b/libcpu/arm/cortex-a/mmu.h index 51158d8c208..9f5e81b12dd 100644 --- a/libcpu/arm/cortex-a/mmu.h +++ b/libcpu/arm/cortex-a/mmu.h @@ -121,7 +121,6 @@ void rt_hw_aspace_switch(struct rt_aspace *aspace); void rt_hw_mmu_switch(void *tbl); void *rt_hw_mmu_v2p(struct rt_aspace *aspace, void *vaddr); -void rt_hw_mmu_kernel_map_init(struct rt_aspace *aspace, size_t vaddr_start, size_t size); void *rt_hw_mmu_tbl_get(void); int rt_hw_mmu_control(struct rt_aspace *aspace, void *vaddr, size_t size, enum rt_mmu_cntl cmd); diff --git a/libcpu/risc-v/common64/mmu.h b/libcpu/risc-v/common64/mmu.h index 97d2cd0f32c..cb9ae45fa4a 100644 --- a/libcpu/risc-v/common64/mmu.h +++ b/libcpu/risc-v/common64/mmu.h @@ -60,8 +60,6 @@ void *rt_hw_mmu_tbl_get(void); int rt_hw_mmu_map_init(rt_aspace_t aspace, void *v_address, rt_ubase_t size, rt_ubase_t *vtable, rt_ubase_t pv_off); void rt_hw_mmu_setup(rt_aspace_t aspace, struct mem_desc *mdesc, int desc_nr); -void rt_hw_mmu_kernel_map_init(rt_aspace_t aspace, rt_ubase_t vaddr_start, - rt_ubase_t size); void *rt_hw_mmu_map(rt_aspace_t aspace, void *v_addr, void *p_addr, size_t size, size_t attr); void rt_hw_mmu_unmap(rt_aspace_t aspace, void *v_addr, size_t size); From df40f6811b91f79bee55518da9b719c38f72ac2e Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Thu, 10 Apr 2025 13:59:24 +0800 Subject: [PATCH 2/2] bsp: allwinner: d1: remove calling of rt_hw_mmu_kernel_map_init rt_hw_mmu_kernel_map_init is an undefined function, calling it is meaningless. Signed-off-by: Chen Wang --- bsp/allwinner/d1/board/board.c | 1 - 1 file changed, 1 deletion(-) diff --git a/bsp/allwinner/d1/board/board.c b/bsp/allwinner/d1/board/board.c index 0035a3f7520..f60390efeb0 100644 --- a/bsp/allwinner/d1/board/board.c +++ b/bsp/allwinner/d1/board/board.c @@ -83,7 +83,6 @@ void rt_hw_board_init(void) #ifdef RT_USING_SMART rt_page_init(init_page_region); rt_hw_mmu_map_init(&mmu_info,(void *)USER_VADDR_START, USER_VADDR_TOP - USER_VADDR_START, (rt_size_t *)MMUTable, 0); - rt_hw_mmu_kernel_map_init(&mmu_info, 0x00000000UL, USER_VADDR_START - 1); //将低1GB MMIO区域设置为无Cache与Strong Order访存模式 MMUTable[0] &= ~PTE_CACHE; MMUTable[0] &= ~PTE_SHARE;