Skip to content

Commit

Permalink
[fix] type error & code format
Browse files Browse the repository at this point in the history
  • Loading branch information
@polarvid
polarvid committed Jan 3, 2023
1 parent a16d05a commit bdc7092
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 55 deletions.
5 changes: 0 additions & 5 deletions components/lwp/arch/aarch64/cortex-a/lwp_arch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ void *arch_kernel_mmu_table_get(void)
return (void *)NULL;
}

/**
* @brief vtable is allocated by `arch_user_space_init`
* and is free by aspace delete
* @param lwp
*/
void arch_user_space_vtable_free(struct rt_lwp *lwp)
{
if (lwp && lwp->aspace->page_table)
Expand Down
31 changes: 16 additions & 15 deletions components/lwp/lwp_user_mm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ int lwp_user_space_init(struct rt_lwp *lwp, rt_bool_t is_fork)
if (!is_fork && err == RT_EOK)
{
void *addr = (void *)USER_STACK_VSTART;
err = rt_aspace_map(lwp->aspace, &addr, USER_STACK_VEND - USER_STACK_VSTART,
MMU_MAP_U_RWCB, 0, &lwp->lwp_obj->mem_obj, 0);
err = rt_aspace_map(lwp->aspace, &addr,
USER_STACK_VEND - USER_STACK_VSTART,
MMU_MAP_U_RWCB, 0, &lwp->lwp_obj->mem_obj, 0);
}
}
return err;
Expand Down Expand Up @@ -96,7 +97,7 @@ static const char *user_get_name(rt_varea_t varea)
name = "user.stack";
}
else if (varea->start >= (void *)USER_HEAP_VADDR &&
varea->start < (void *)USER_HEAP_VEND)
varea->start < (void *)USER_HEAP_VEND)
{
name = "user.heap";
}
Expand Down Expand Up @@ -135,8 +136,8 @@ static void user_page_fault(struct rt_varea *varea, struct mm_fault_msg *msg)
}
else
{
LOG_W("%s: page alloc failed at %p", __func__,
varea->start);
LOG_W("%s: page alloc failed at %p", __func__,
varea->start);
}
}
else
Expand All @@ -148,7 +149,6 @@ static void user_page_fault(struct rt_varea *varea, struct mm_fault_msg *msg)
msg->response.vaddr = vaddr;
msg->response.size = ARCH_PAGE_SIZE;
}

}
else if (!(varea->flag & MMF_TEXT))
{
Expand Down Expand Up @@ -185,8 +185,8 @@ static void *_lwp_map_user(struct rt_lwp *lwp, void *map_va, size_t map_size,
rt_mem_obj_t mem_obj = &lwp->lwp_obj->mem_obj;
va = map_va ? map_va : ARCH_MAP_FAILED;

ret = rt_aspace_map(lwp->aspace, &va, map_size, MMU_MAP_U_RWCB,
flags, mem_obj, 0);
ret = rt_aspace_map(lwp->aspace, &va, map_size, MMU_MAP_U_RWCB, flags,
mem_obj, 0);
if (ret != MM_EOK)
{
va = RT_NULL;
Expand All @@ -204,7 +204,8 @@ int lwp_unmap_user(struct rt_lwp *lwp, void *va)
return err;
}

static void _dup_varea(rt_varea_t varea, struct rt_lwp *src_lwp, rt_aspace_t dst)
static void _dup_varea(rt_varea_t varea, struct rt_lwp *src_lwp,
rt_aspace_t dst)
{
void *vaddr = varea->start;
void *vend = vaddr + varea->size;
Expand Down Expand Up @@ -262,7 +263,7 @@ int lwp_dup_user(rt_varea_t varea, void *arg)
int err;
va = varea->start;
err = rt_aspace_map(new_lwp->aspace, &va, varea->size, varea->attr,
varea->flag, &new_lwp->lwp_obj->mem_obj,
varea->flag, &new_lwp->lwp_obj->mem_obj,
varea->offset);
if (err != MM_EOK)
{
Expand Down Expand Up @@ -338,7 +339,7 @@ static void *_lwp_map_user_type(struct rt_lwp *lwp, void *map_va, void *map_pa,
attr = MMU_MAP_U_RW;
}

struct rt_mem_obj *mem_obj = lwp->lwp_obj ? &lwp->lwp_obj->mem_obj: NULL;
struct rt_mem_obj *mem_obj = lwp->lwp_obj ? &lwp->lwp_obj->mem_obj : NULL;

if (map_pa == ARCH_MAP_FAILED)
{
Expand All @@ -350,10 +351,10 @@ static void *_lwp_map_user_type(struct rt_lwp *lwp, void *map_va, void *map_pa,
if (!map_va)
map_va = ARCH_MAP_FAILED;
struct rt_mm_va_hint hint = {.flags = 0,
.limit_range_size = lwp->aspace->size,
.limit_start = lwp->aspace->start,
.prefer = map_va,
.map_size = map_size};
.limit_range_size = lwp->aspace->size,
.limit_start = lwp->aspace->start,
.prefer = map_va,
.map_size = map_size};
ret = rt_aspace_map_phy(lwp->aspace, &hint, attr,
(uintptr_t)map_pa >> MM_PAGE_SHIFT, &map_va);
}
Expand Down
30 changes: 15 additions & 15 deletions components/mm/mm_aspace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static inline void _varea_post_install(rt_varea_t varea, rt_aspace_t aspace,
varea->mem_obj->on_varea_open(varea);
}

rt_err_t _init_lock(rt_aspace_t aspace)
int _init_lock(rt_aspace_t aspace)
{
MM_PGTBL_LOCK_INIT(aspace);
rt_mutex_init(&aspace->bst_lock, "", RT_IPC_FLAG_FIFO);
Expand Down Expand Up @@ -224,11 +224,11 @@ static int _do_prefetch(rt_aspace_t aspace, rt_varea_t varea, void *start,
return err;
}

rt_err_t _varea_install(rt_aspace_t aspace, rt_varea_t varea,
int _varea_install(rt_aspace_t aspace, rt_varea_t varea,
rt_mm_va_hint_t hint)
{
void *alloc_va;
rt_err_t err = RT_EOK;
int err = RT_EOK;

/**
* find a suitable va range.
Expand All @@ -253,11 +253,11 @@ rt_err_t _varea_install(rt_aspace_t aspace, rt_varea_t varea,
return err;
}

static rt_err_t _mm_aspace_map(rt_aspace_t aspace, rt_varea_t varea,
static int _mm_aspace_map(rt_aspace_t aspace, rt_varea_t varea,
size_t attr, mm_flag_t flags,
rt_mem_obj_t mem_obj, size_t offset)
{
rt_err_t err = RT_EOK;
int err = RT_EOK;

WR_LOCK(aspace);
struct rt_mm_va_hint hint = {.prefer = varea->start,
Expand Down Expand Up @@ -312,12 +312,12 @@ static inline int _not_support(size_t flags)
return flags & ~(support_ops | _MMF_ALIGN_MASK);
}

rt_err_t rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
int rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
size_t attr, mm_flag_t flags, rt_mem_obj_t mem_obj,
size_t offset)
{
// TODO check not in atomic context: irq, spinlock, local intr disable...
rt_err_t err;
int err;
rt_varea_t varea;

// filter invalid input
Expand Down Expand Up @@ -357,7 +357,7 @@ rt_err_t rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
return err;
}

rt_err_t rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
int rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
size_t length, size_t attr, mm_flag_t flags,
rt_mem_obj_t mem_obj, size_t offset)
{
Expand Down Expand Up @@ -392,11 +392,11 @@ rt_err_t rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
return err;
}

rt_err_t _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
int _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
rt_mm_va_hint_t hint, size_t attr, size_t pa_off,
void **ret_va)
{
rt_err_t err;
int err;
void *vaddr;

// filter invalid input
Expand Down Expand Up @@ -444,10 +444,10 @@ rt_err_t _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
return err;
}

rt_err_t rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr,
int rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr,
size_t pa_off, void **ret_va)
{
rt_err_t err;
int err;

if (hint)
{
Expand All @@ -473,11 +473,11 @@ rt_err_t rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr
return err;
}

rt_err_t rt_aspace_map_phy_static(rt_aspace_t aspace, rt_varea_t varea,
int rt_aspace_map_phy_static(rt_aspace_t aspace, rt_varea_t varea,
rt_mm_va_hint_t hint, size_t attr,
size_t pa_off, void **ret_va)
{
rt_err_t err;
int err;

if (varea && hint)
{
Expand Down Expand Up @@ -520,7 +520,7 @@ void _aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
}
}

rt_err_t rt_aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
int rt_aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
{
if (!aspace)
{
Expand Down
2 changes: 1 addition & 1 deletion components/mm/mm_aspace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ int rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,

/**
* @brief Memory Map on Virtual Address Space to Physical Memory
*
*
* @param aspace target virtual address space
* @param hint hint of mapping va
* @param attr MMU attribution
Expand Down
1 change: 0 additions & 1 deletion components/mm/mm_page.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "mm_fault.h"
#include "mm_private.h"
#include "mm_rmem.h"
#include <mm_aspace.h>
#include <mm_flag.h>
#include <mm_page.h>
Expand Down
2 changes: 1 addition & 1 deletion components/mm/mm_page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct rt_page *rt_page_addr2page(void *addr);
/**
* @brief Install page frames at run-time
* Region size must be aligned to 2^(RT_PAGE_MAX_ORDER + ARCH_PAGE_SHIFT - 1)
* bytes currently (typically 2 MB).
* bytes currently (typically 2 MB).
*
* !WARNING this API will NOT check whether region is valid or not in list
*
Expand Down
15 changes: 0 additions & 15 deletions libcpu/arm/cortex-a/mmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,21 +331,6 @@ void rt_hw_mmu_unmap(rt_aspace_t aspace, void *v_addr, size_t size)
}
}

/*
orr r0, #0x18
mcr p15, 0, r0, c2, c0, 0 // ttbr0
//invalid tlb
mov r0, #0
mcr p15, 0, r0, c8, c7, 0
mcr p15, 0, r0, c7, c5, 0 //iciallu
mcr p15, 0, r0, c7, c5, 6 //bpiall
dsb
isb
mov pc, lr
*/

void rt_hw_aspace_switch(rt_aspace_t aspace)
{
if (aspace != &rt_kernel_space)
Expand Down
2 changes: 1 addition & 1 deletion libcpu/risc-v/t-head/c906/riscv_mmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

#define PTE_USED(pte) __MASKVALUE(pte, PTE_V)

/**
/**
* encoding of SATP (Supervisor Address Translation and Protection register)
*/
#define SATP_MODE_OFFSET 60
Expand Down
2 changes: 1 addition & 1 deletion libcpu/risc-v/virt64/riscv_mmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

#define PTE_USED(pte) __MASKVALUE(pte, PTE_V)

/**
/**
* encoding of SATP (Supervisor Address Translation and Protection register)
*/
#define SATP_MODE_OFFSET 60
Expand Down

0 comments on commit bdc7092

Please sign in to comment.