summaryrefslogtreecommitdiff
path: root/libcpu
diff options
context:
space:
mode:
authorYuqiang Wang <[email protected]>2024-02-21 11:45:04 +0800
committerGitHub <[email protected]>2024-02-20 22:45:04 -0500
commitc6bdee3c503a287a0967fd0e3cb6b7a1eb6d0b5e (patch)
tree884d88b13750c2a0aa50d7cd7da495730f511605 /libcpu
parent52a5b5cc48d9ca784f1728f97e2b8b9abc82aa0e (diff)
[ci] open ci check with function declaration warning (#8546)
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/aarch64/common/mmu.c7
-rw-r--r--libcpu/aarch64/common/mmu.h8
-rw-r--r--libcpu/arm/cortex-a/mmu.h2
-rw-r--r--libcpu/risc-v/t-head/c906/cpuport.h6
-rw-r--r--libcpu/risc-v/t-head/c906/mmu.h2
-rw-r--r--libcpu/risc-v/t-head/c906/riscv_mmu.c4
-rw-r--r--libcpu/risc-v/t-head/c906/riscv_mmu.h4
-rw-r--r--libcpu/risc-v/virt64/cpuport.h6
-rw-r--r--libcpu/risc-v/virt64/mmu.h2
-rw-r--r--libcpu/risc-v/virt64/riscv_mmu.c4
-rw-r--r--libcpu/risc-v/virt64/riscv_mmu.h4
11 files changed, 25 insertions, 24 deletions
diff --git a/libcpu/aarch64/common/mmu.c b/libcpu/aarch64/common/mmu.c
index 68270df4ef..d870a73b0f 100644
--- a/libcpu/aarch64/common/mmu.c
+++ b/libcpu/aarch64/common/mmu.c
@@ -602,6 +602,13 @@ static int _map_single_page_2M(unsigned long *lv0_tbl, unsigned long va,
return 0;
}
+void *rt_hw_mmu_tbl_get()
+{
+ uintptr_t tbl;
+ __asm__ volatile("MRS %0, TTBR0_EL1" : "=r"(tbl));
+ return rt_kmem_p2v((void *)(tbl & ((1ul << 48) - 2)));
+}
+
void *rt_ioremap_early(void *paddr, size_t size)
{
volatile size_t count;
diff --git a/libcpu/aarch64/common/mmu.h b/libcpu/aarch64/common/mmu.h
index a441a526e3..f780c5eb97 100644
--- a/libcpu/aarch64/common/mmu.h
+++ b/libcpu/aarch64/common/mmu.h
@@ -109,13 +109,7 @@ 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);
-
-rt_inline void *rt_hw_mmu_tbl_get()
-{
- uintptr_t tbl;
- __asm__ volatile("MRS %0, TTBR0_EL1" : "=r"(tbl));
- return rt_kmem_p2v((void *)(tbl & ((1ul << 48) - 2)));
-}
+void *rt_hw_mmu_tbl_get(void);
static inline void *rt_hw_mmu_kernel_v2p(void *v_addr)
{
diff --git a/libcpu/arm/cortex-a/mmu.h b/libcpu/arm/cortex-a/mmu.h
index 8712a0f489..a79e3a6e9b 100644
--- a/libcpu/arm/cortex-a/mmu.h
+++ b/libcpu/arm/cortex-a/mmu.h
@@ -122,7 +122,7 @@ 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 *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/t-head/c906/cpuport.h b/libcpu/risc-v/t-head/c906/cpuport.h
index 68780bfe6d..349cba3089 100644
--- a/libcpu/risc-v/t-head/c906/cpuport.h
+++ b/libcpu/risc-v/t-head/c906/cpuport.h
@@ -39,17 +39,17 @@
#ifndef __ASSEMBLY__
#include <rtdef.h>
-rt_inline void rt_hw_dsb()
+rt_inline void rt_hw_dsb(void)
{
__asm__ volatile("fence":::"memory");
}
-rt_inline void rt_hw_dmb()
+rt_inline void rt_hw_dmb(void)
{
__asm__ volatile("fence":::"memory");
}
-rt_inline void rt_hw_isb()
+rt_inline void rt_hw_isb(void)
{
__asm__ volatile(OPC_FENCE_I:::"memory");
}
diff --git a/libcpu/risc-v/t-head/c906/mmu.h b/libcpu/risc-v/t-head/c906/mmu.h
index 58229464cd..dee72c8624 100644
--- a/libcpu/risc-v/t-head/c906/mmu.h
+++ b/libcpu/risc-v/t-head/c906/mmu.h
@@ -56,7 +56,7 @@ struct mem_desc
#define MMU_MAP_ERROR_NOPAGE -3
#define MMU_MAP_ERROR_CONFLICT -4
-void *rt_hw_mmu_tbl_get();
+void *rt_hw_mmu_tbl_get(void);
int rt_hw_mmu_map_init(rt_aspace_t aspace, void *v_address, rt_size_t size,
rt_size_t *vtable, rt_size_t pv_off);
void rt_hw_mmu_setup(rt_aspace_t aspace, struct mem_desc *mdesc, int desc_nr);
diff --git a/libcpu/risc-v/t-head/c906/riscv_mmu.c b/libcpu/risc-v/t-head/c906/riscv_mmu.c
index e648c52269..0139364774 100644
--- a/libcpu/risc-v/t-head/c906/riscv_mmu.c
+++ b/libcpu/risc-v/t-head/c906/riscv_mmu.c
@@ -18,12 +18,12 @@
#include "riscv_mmu.h"
-void mmu_enable_user_page_access()
+void mmu_enable_user_page_access(void)
{
set_csr(sstatus,SSTATUS_SUM);
}
-void mmu_disable_user_page_access()
+void mmu_disable_user_page_access(void)
{
clear_csr(sstatus,SSTATUS_SUM);
}
diff --git a/libcpu/risc-v/t-head/c906/riscv_mmu.h b/libcpu/risc-v/t-head/c906/riscv_mmu.h
index 406ed9a562..983a86956c 100644
--- a/libcpu/risc-v/t-head/c906/riscv_mmu.h
+++ b/libcpu/risc-v/t-head/c906/riscv_mmu.h
@@ -108,8 +108,8 @@
#define ARCH_MAP_FAILED ((void *)0x8000000000000000)
void mmu_set_pagetable(rt_ubase_t addr);
-void mmu_enable_user_page_access();
-void mmu_disable_user_page_access();
+void mmu_enable_user_page_access(void);
+void mmu_disable_user_page_access(void);
#define RT_HW_MMU_PROT_READ 1
#define RT_HW_MMU_PROT_WRITE 2
diff --git a/libcpu/risc-v/virt64/cpuport.h b/libcpu/risc-v/virt64/cpuport.h
index 35a47d987c..92a3af32d7 100644
--- a/libcpu/risc-v/virt64/cpuport.h
+++ b/libcpu/risc-v/virt64/cpuport.h
@@ -61,17 +61,17 @@ typedef union {
#ifndef __ASSEMBLY__
#include <rtdef.h>
-rt_inline void rt_hw_dsb()
+rt_inline void rt_hw_dsb(void)
{
asm volatile("fence":::"memory");
}
-rt_inline void rt_hw_dmb()
+rt_inline void rt_hw_dmb(void)
{
asm volatile("fence":::"memory");
}
-rt_inline void rt_hw_isb()
+rt_inline void rt_hw_isb(void)
{
asm volatile(".long 0x0000100F":::"memory");
}
diff --git a/libcpu/risc-v/virt64/mmu.h b/libcpu/risc-v/virt64/mmu.h
index 58229464cd..dee72c8624 100644
--- a/libcpu/risc-v/virt64/mmu.h
+++ b/libcpu/risc-v/virt64/mmu.h
@@ -56,7 +56,7 @@ struct mem_desc
#define MMU_MAP_ERROR_NOPAGE -3
#define MMU_MAP_ERROR_CONFLICT -4
-void *rt_hw_mmu_tbl_get();
+void *rt_hw_mmu_tbl_get(void);
int rt_hw_mmu_map_init(rt_aspace_t aspace, void *v_address, rt_size_t size,
rt_size_t *vtable, rt_size_t pv_off);
void rt_hw_mmu_setup(rt_aspace_t aspace, struct mem_desc *mdesc, int desc_nr);
diff --git a/libcpu/risc-v/virt64/riscv_mmu.c b/libcpu/risc-v/virt64/riscv_mmu.c
index 7c4f886345..0438641ad7 100644
--- a/libcpu/risc-v/virt64/riscv_mmu.c
+++ b/libcpu/risc-v/virt64/riscv_mmu.c
@@ -18,12 +18,12 @@
#include "riscv_mmu.h"
-void mmu_enable_user_page_access()
+void mmu_enable_user_page_access(void)
{
set_csr(sstatus, SSTATUS_SUM);
}
-void mmu_disable_user_page_access()
+void mmu_disable_user_page_access(void)
{
clear_csr(sstatus, SSTATUS_SUM);
}
diff --git a/libcpu/risc-v/virt64/riscv_mmu.h b/libcpu/risc-v/virt64/riscv_mmu.h
index 2d32ec0e48..3c998beadf 100644
--- a/libcpu/risc-v/virt64/riscv_mmu.h
+++ b/libcpu/risc-v/virt64/riscv_mmu.h
@@ -91,8 +91,8 @@
#define ARCH_MAP_FAILED ((void *)0x8000000000000000)
void mmu_set_pagetable(rt_ubase_t addr);
-void mmu_enable_user_page_access();
-void mmu_disable_user_page_access();
+void mmu_enable_user_page_access(void);
+void mmu_disable_user_page_access(void);
#define RT_HW_MMU_PROT_READ 1
#define RT_HW_MMU_PROT_WRITE 2