!227 [BSP] update riscv-virt64 bsp for lwP.

Merge pull request !227 from bernard/bernard_rt-smart

bsp/qemu-virt-rv64/qemu-nographic.sh

@@ -1 +1 @@
-qemu-system-riscv64 -nographic -machine virt -m 256M -kernel rtthread.bin
+qemu-system-riscv64 -nographic -machine virt -m 256M -kernel rtthread.bin -bios default 

components/lwp/SConscript

@@ -5,7 +5,7 @@ cwd     = GetCurrentDir()
 src     = []
 CPPPATH = [cwd]
 
-support_arch  = {"arm": ["cortex-m3", "cortex-m4", "cortex-m7", "arm926", "cortex-a"],"aarch64":["cortex-a"],"risc-v": ["virt64"]}
+support_arch  = {"arm": ["cortex-m3", "cortex-m4", "cortex-m7", "arm926", "cortex-a"],"aarch64":["cortex-a"],"risc-v": ["virt64", "c906"]}
 platform_file = {'armcc': 'rvds.S', 'gcc': 'gcc.S', 'iar': 'iar.S'}
 
 if GetDepend('LWP_UNIX98_PTY'):

components/lwp/arch/risc-v/virt64/arch.h

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2006-2020, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2021-02-03     lizhirui     first version
- */
-
-#ifndef __ARCH_H__
-#define __ARCH_H__
-
-#include "riscv_mmu.h"
-
-#define ARCH_PAGE_SIZE PAGE_SIZE
-#define ARCH_PAGE_MASK PAGE_OFFSET_MASK
-#define ARCH_PAGE_SHIFT PAGE_OFFSET_BIT
-
-#define dsb()
-
-#endif

components/lwp/arch/risc-v/virt64/arch_user_space_init.c

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2019-10-28     Jesven       first version
- * 2021-02-03     lizhirui     port to riscv64
- */
-
-#include <rtthread.h>
-#include <rthw.h>
-
-#ifdef RT_USING_USERSPACE
-
-#include <mmu.h>
-#include <page.h>
-#include <lwp_mm_area.h>
-#include <lwp_user_mm.h>
-#include <lwp_arch.h>
-
-extern size_t MMUTable[];
-
-int arch_user_space_init(struct rt_lwp *lwp)
-{
-    size_t *mmu_table;
-
-    mmu_table = (size_t*)rt_pages_alloc(0);
-    if (!mmu_table)
-    {
-        return -1;
-    }
-
-    lwp->end_heap = USER_HEAP_VADDR;
-    memcpy(mmu_table, MMUTable, PAGE_SIZE);
-    rt_hw_cpu_dcache_ops(RT_HW_CACHE_FLUSH, mmu_table, 4 * PAGE_SIZE);
-    rt_hw_mmu_map_init(&lwp->mmu_info,(void *)0x100000000UL,0xFFFFFFFEFFFFFFFFUL,(rt_size_t *)mmu_table,0);
-
-    return 0;
-}
-
-void *arch_kernel_mmu_table_get(void)
-{
-    return (void*)((char*)MMUTable);
-}
-
-void arch_user_space_vtable_free(struct rt_lwp *lwp)
-{
-    if (lwp && lwp->mmu_info.vtable)
-    {
-        rt_pages_free(lwp->mmu_info.vtable, 0);
-    }
-}
-#endif

components/lwp/arch/risc-v/virt64/arch_user_stack.c

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2020-11-18     Jesven       first version
- * 2021-02-03     lizhirui     port to riscv64
- * 2021-02-06     lizhirui     add thread filter
- * 2021-02-19     lizhirui     port to new version of rt-smart
- * 2021-03-02     lizhirui     add a auxillary function for interrupt
- * 2021-03-04     lizhirui     delete thread filter
- * 2021-03-04     lizhirui     modify for new version of rt-smart
- */
-
-#include <rtthread.h>
-#include <rthw.h>
-#include <stddef.h>
-
-#ifdef RT_USING_USERSPACE
-
-#include <mmu.h>
-#include <page.h>
-#include <lwp_mm_area.h>
-#include <lwp_user_mm.h>
-#include <lwp_arch.h>
-
-int arch_expand_user_stack(void *addr)
-{
-    int ret = 0;
-    size_t stack_addr = (size_t)addr;
-
-    stack_addr &= ~PAGE_OFFSET_MASK;
-    if ((stack_addr >= (size_t)USER_STACK_VSTART) && (stack_addr < (size_t)USER_STACK_VEND))
-    {
-        void *map = lwp_map_user(lwp_self(), (void*)stack_addr, PAGE_SIZE, RT_FALSE);
-
-        if (map || lwp_user_accessable(addr, 1))
-        {
-            ret = 1;
-        }
-    }
-    return ret;
-}
-#endif
-
-#ifdef RT_USING_USERSPACE
-    void *lwp_copy_return_code_to_user_stack()
-    {
-        void lwp_thread_return();
-        void lwp_thread_return_end();
-        rt_thread_t tid = rt_thread_self();
-
-        if(tid -> user_stack != RT_NULL)
-        {
-            size_t size = (size_t)lwp_thread_return_end - (size_t)lwp_thread_return;
-            size_t userstack = (size_t)tid -> user_stack + tid -> user_stack_size - size;
-            memcpy((void *)userstack,lwp_thread_return,size);
-            return (void *)userstack;
-        }
-
-        return RT_NULL;
-    }
-
-    uint32_t lwp_fix_sp(uint32_t cursp)
-    {
-        void lwp_thread_return();
-        void lwp_thread_return_end();
-
-        if(cursp == 0)
-        {
-            return 0;
-        }
-
-        return cursp - ((size_t)lwp_thread_return_end - (size_t)lwp_thread_return);
-    }
-#endif
-
-rt_thread_t rt_thread_sp_to_thread(void *spmember_addr)
-{
-    return (rt_thread_t)(((rt_ubase_t)spmember_addr) - (offsetof(struct rt_thread,sp)));
-}
-
-void *get_thread_kernel_stack_top(rt_thread_t thread)
-{
-    return (void *)(((rt_size_t)thread -> stack_addr) + ((rt_size_t)thread -> stack_size));
-}
-
-//don't support this temporarily in riscv
-void *lwp_get_user_sp()
-{
-    return RT_NULL;
-}

components/lwp/arch/risc-v/virt64/lwp_arch.c

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-11-18     Jesven       first version
+ * 2021-02-03     lizhirui     port to riscv64
+ * 2021-02-06     lizhirui     add thread filter
+ * 2021-02-19     lizhirui     port to new version of rt-smart
+ * 2021-03-02     lizhirui     add a auxillary function for interrupt
+ * 2021-03-04     lizhirui     delete thread filter
+ * 2021-03-04     lizhirui     modify for new version of rt-smart
+ */
+
+#include <rthw.h>
+#include <stddef.h>
+
+#ifdef RT_USING_USERSPACE
+
+#include <mmu.h>
+#include <page.h>
+#include <lwp_mm_area.h>
+#include <lwp_user_mm.h>
+#include <lwp_arch.h>
+
+extern size_t MMUTable[];
+
+//该函数用于支持用户栈扩展功能
+int arch_expand_user_stack(void *addr)
+{
+    int ret = 0;
+    size_t stack_addr = (size_t)addr;
+
+    stack_addr &= ~PAGE_OFFSET_MASK;
+    if ((stack_addr >= (size_t)USER_STACK_VSTART) && (stack_addr < (size_t)USER_STACK_VEND))
+    {
+        void *map = lwp_map_user(lwp_self(), (void *)stack_addr, PAGE_SIZE, RT_FALSE);
+
+        if (map || lwp_user_accessable(addr, 1))
+        {
+            ret = 1;
+        }
+    }
+    return ret;
+}
+
+void *lwp_copy_return_code_to_user_stack()
+{
+    void lwp_thread_return();
+    void lwp_thread_return_end();
+    rt_thread_t tid = rt_thread_self();
+
+    if (tid->user_stack != RT_NULL)
+    {
+        size_t size = (size_t)lwp_thread_return_end - (size_t)lwp_thread_return;
+        size_t userstack = (size_t)tid->user_stack + tid->user_stack_size - size;
+        memcpy((void *)userstack, lwp_thread_return, size);
+        return (void *)userstack;
+    }
+
+    return RT_NULL;
+}
+
+uint32_t lwp_fix_sp(uint32_t cursp)
+{
+    void lwp_thread_return();
+    void lwp_thread_return_end();
+
+    if (cursp == 0)
+    {
+        return 0;
+    }
+
+    return cursp - ((size_t)lwp_thread_return_end - (size_t)lwp_thread_return);
+}
+
+rt_thread_t rt_thread_sp_to_thread(void *spmember_addr)
+{
+    return (rt_thread_t)(((rt_ubase_t)spmember_addr) - (offsetof(struct rt_thread, sp)));
+}
+
+void *get_thread_kernel_stack_top(rt_thread_t thread)
+{
+    return (void *)(((rt_size_t)thread->stack_addr) + ((rt_size_t)thread->stack_size));
+}
+
+//don't support this temporarily in riscv
+void *lwp_get_user_sp()
+{
+    return RT_NULL;
+}
+
+//该函数负责初始化lwp的页表和堆
+int arch_user_space_init(struct rt_lwp *lwp)
+{
+    size_t *mmu_table;
+
+    mmu_table = (size_t *)rt_pages_alloc(0);
+    if (!mmu_table)
+    {
+        return -1;
+    }
+
+    lwp->end_heap = USER_HEAP_VADDR;
+    memcpy(mmu_table, MMUTable, PAGE_SIZE);
+    rt_hw_cpu_dcache_ops(RT_HW_CACHE_FLUSH, mmu_table, 4 * PAGE_SIZE);
+    rt_hw_mmu_map_init(&lwp->mmu_info, (void *)0x100000000UL, 0xFFFFFFFEFFFFFFFFUL, (rt_size_t *)mmu_table, 0);
+
+    return 0;
+}
+
+//该函数负责返回内核页表指针
+void *arch_kernel_mmu_table_get(void)
+{
+    return (void *)((char *)MMUTable);
+}
+
+void arch_user_space_vtable_free(struct rt_lwp *lwp)
+{
+    if (lwp && lwp->mmu_info.vtable)
+    {
+        rt_pages_free(lwp->mmu_info.vtable, 0);
+    }
+}
+
+#endif

libcpu/risc-v/virt64/page.h

@@ -19,6 +19,7 @@ typedef struct tag_region
 
 rt_size_t rt_page_bits(rt_size_t size);
 void *rt_pages_alloc(rt_size_t size_bits);
+void rt_page_ref_inc(void *addr, uint32_t size_bits);
 void rt_pages_free(void *addr,rt_size_t size_bits);
 void rt_pageinfo_dump();
 void rt_page_get_info(size_t *total_nr, size_t *free_nr);