Skip to content

fix(risc-v, mmu): fix type mismatch of return type of _query #10656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2025
Merged

fix(risc-v, mmu): fix type mismatch of return type of _query #10656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libcpu/risc-v/common64/mmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,17 +525,17 @@ void *rt_hw_mmu_v2p(struct rt_aspace *aspace, void *vaddr)
return (void *)paddr;
}

static int _noncache(rt_base_t *pte)
static int _noncache(rt_ubase_t *pte)
{
return 0;
}

static int _cache(rt_base_t *pte)
static int _cache(rt_ubase_t *pte)
{
return 0;
}

static int (*control_handler[MMU_CNTL_DUMMY_END])(rt_base_t *pte)=
static int (*control_handler[MMU_CNTL_DUMMY_END])(rt_ubase_t *pte)=
{
[MMU_CNTL_CACHE] = _cache,
[MMU_CNTL_NONCACHE] = _noncache,
Expand Down Expand Up @@ -565,14 +565,14 @@ int rt_hw_mmu_control(struct rt_aspace *aspace, void *vaddr, size_t size,
int err = -RT_EINVAL;
void *vend = vaddr + size;

int (*handler)(rt_base_t *pte);
int (*handler)(rt_ubase_t *pte);
if (cmd >= 0 && cmd < MMU_CNTL_DUMMY_END)
{
handler = control_handler[cmd];

while (vaddr < vend)
{
rt_base_t *pte = _query(aspace, vaddr, &level);
rt_ubase_t *pte = _query(aspace, vaddr, &level);
void *range_end = vaddr + _get_level_size(level);
RT_ASSERT(range_end <= vend);

Expand Down Expand Up @@ -755,4 +755,4 @@ void *rt_hw_mmu_pgtbl_create(void)
void rt_hw_mmu_pgtbl_delete(void *pgtbl)
{
rt_pages_free(pgtbl, 0);
}
}