Merge branch 'rk3568' of https://gitlink.org.cn/tuyuyang/xiuos into rk3568

Ubiquitous/XiZi_AIoT/softkernel/main.c

@@ -89,7 +89,6 @@ int main(void)
         char* fs_server_task_param[2] = { "/app/fs_server", 0 };
         sys_spawn((char*)_binary_default_fs_start, "memfs", fs_server_task_param);
     }
-
     /* start scheduler */
     struct SchedulerRightGroup scheduler_rights;
     assert(AchieveResourceTag(&scheduler_rights.mmu_driver_tag, &hardkernel_tag, "mmu-ac-resource"));

Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile

@@ -2,7 +2,7 @@
 
 #include $(KERNEL_ROOT)/compiler.mk
 
-ifneq ($(findstring $(BOARD), ok1028a-c), )
+ifneq ($(findstring $(BOARD), 3568), )
 SRC_FILES := kalloc.c pagetable.c pagetable_level3.c buddy.c object_allocator.c share_page.c
 endif
 ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), )

Ubiquitous/XiZi_AIoT/softkernel/memory/kalloc.c

@@ -43,6 +43,7 @@ bool module_phymem_init()
     uintptr_t kern_freemem_end = PHY_USER_FREEMEM_BASE;
     uintptr_t user_freemem_start = PHY_USER_FREEMEM_BASE;
     uintptr_t user_freemem_end = PHY_MEM_STOP;
+    user_phy_freemem_buddy.pages = NULL;
     KBuddySysInit(&kern_virtmem_buddy, kern_freemem_start, kern_freemem_end);
     KBuddyInit(&user_phy_freemem_buddy, user_freemem_start, user_freemem_end);
     return true;

Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c

@@ -61,12 +61,12 @@ static bool _map_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, int l
     while (true) {
         uintptr_t* pte = NULL;
         if ((pte = _page_walk(pgdir, vaddr, true)) == NULL) {
-            ERROR("pte not found for vaddr %x.\n", vaddr);
+            ERROR("pte not found for vaddr %p.\n", vaddr);
             return false;
         }
 
         if (UNLIKELY(*pte != 0)) {
-            ERROR("remapping: vaddr: %x | paddr: %x | pte: %x |\n", vaddr, paddr, *pte);
+            ERROR("remapping: vaddr: %p | paddr: %p | pte: %p |\n", vaddr, paddr, *pte);
             return false;
         }
 
@@ -93,12 +93,12 @@ static bool _unmap_pages(uintptr_t* pgdir, uintptr_t vaddr, int len)
     while (true) {
         uintptr_t* pte = NULL;
         if ((pte = _page_walk(pgdir, vaddr, false)) == NULL) {
-            ERROR("pte not found for vaddr %x.\n", vaddr);
+            ERROR("pte not found for vaddr %p.\n", vaddr);
             return false;
         }
 
         if (*pte == 0) {
-            ERROR("unmap a unmapped page, vaddr: %x, pte: %x\n", vaddr, *pte);
+            ERROR("unmap a unmapped page, vaddr: %p, pte: %p\n", vaddr, *pte);
             return false;
         }
 
@@ -269,7 +269,7 @@ void load_kern_pgdir(struct TraceTag* mmu_driver_tag, struct TraceTag* intr_driv
     // kern mem
     _map_pages((uintptr_t*)kern_pgdir.pd_addr, KERN_MEM_BASE, PHY_MEM_BASE, (PHY_MEM_STOP - PHY_MEM_BASE), kern_attr);
     // dev mem
-    _map_pages((uintptr_t*)kern_pgdir.pd_addr, DEV_VRTMEM_BASE, DEV_PHYMEM_BASE, DEV_MEM_SZ, dev_attr);
+    _map_pages((uintptr_t*)kern_pgdir.pd_addr, DEV_VRTMEM_BASE, DEV_PHYMEM_BASE, DEV_MEM_SIZE, dev_attr);
 
     _p_pgtbl_mmu_access->LoadPgdir((uintptr_t)V2P(kern_pgdir.pd_addr));
 }

Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c

@@ -48,7 +48,7 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc)
 
     uintptr_t* l3_pde_vaddr;
     if (*l2_pde_ptr != 0) {
-        uintptr_t l3_table_paddr = (*l2_pde_ptr) & ~pde_attr;
+        uintptr_t l3_table_paddr = ALIGNDOWN(*l2_pde_ptr, PAGE_SIZE);
         l3_pde_vaddr = (uintptr_t*)P2V(l3_table_paddr);
     } else {
         if (!alloc || !(l3_pde_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL3_PDE))) {
@@ -63,7 +63,7 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc)
 
     uintptr_t* l4_pte_vaddr;
     if (*l3_pde_ptr != 0) {
-        uintptr_t l4_table_paddr = (*l3_pde_ptr) & ~pde_attr;
+        uintptr_t l4_table_paddr = ALIGNDOWN(*l3_pde_ptr, PAGE_SIZE);
         l4_pte_vaddr = (uintptr_t*)P2V(l4_table_paddr);
     } else {
         if (!alloc || !(l4_pte_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL4_PTE))) {

Ubiquitous/XiZi_AIoT/softkernel/trap/clock_irq_handler.c

@@ -34,8 +34,6 @@ Modification:
 #include "multicores.h"
 #include "task.h"
 
-#include "log.h"
-
 static struct TraceTag clock_driver_tag;
 static struct XiziClockDriver* p_clock_driver = NULL;