sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/risc-v: revise MMIO for rv64ilp32

Browse Source 
This revises `getregXX` and `setregXX` for rv64ilp32 to overcome
the limitation of compiler generated addresses and reach devices
in a larger range.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
This commit is contained in:
Yanfeng Liu 2024-06-16 07:27:18 +08:00 committed by Xiang Xiao
parent 66df96e384
commit 28ae3b3849
5 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
arch/risc-v/src/common/riscv_internal.h
View File

@ -125,14 +125,55 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define getreg8(a) (*(volatile uint8_t *)(a)) /* Use ASM as rv64ilp32 compiler generated address is limited */
#define putreg8(v,a) (*(volatile uint8_t *)(a) = (v))
#define getreg16(a) (*(volatile uint16_t *)(a)) static inline uint8_t getreg8(const volatile uintreg_t a)
#define putreg16(v,a) (*(volatile uint16_t *)(a) = (v)) {
#define getreg32(a) (*(volatile uint32_t *)(a)) uint8_t v;
#define putreg32(v,a) (*(volatile uint32_t *)(a) = (v)) __asm__ __volatile__("lb %0, 0(%1)" : "=r" (v) : "r" (a));
#define getreg64(a) (*(volatile uint64_t *)(a)) return v;
#define putreg64(v,a) (*(volatile uint64_t *)(a) = (v)) }
static inline void putreg8(uint8_t v, const volatile uintreg_t a)
{
__asm__ __volatile__("sb %0, 0(%1)" : : "r" (v), "r" (a));
}
static inline uint16_t getreg16(const volatile uintreg_t a)
{
uint16_t v;
__asm__ __volatile__("lh %0, 0(%1)" : "=r" (v) : "r" (a));
return v;
}
static inline void putreg16(uint16_t v, const volatile uintreg_t a)
{
__asm__ __volatile__("sh %0, 0(%1)" : : "r" (v), "r" (a));
}
static inline uint32_t getreg32(const volatile uintreg_t a)
{
uint32_t v;
__asm__ __volatile__("lw %0, 0(%1)" : "=r" (v) : "r" (a));
return v;
}
static inline void putreg32(uint32_t v, const volatile uintreg_t a)
{
__asm__ __volatile__("sw %0, 0(%1)" : : "r" (v), "r" (a));
}
static inline uint64_t getreg64(const volatile uintreg_t a)
{
uint64_t v;
__asm__ __volatile__("ld %0, 0(%1)" : "=r" (v) : "r" (a));
return v;
}
static inline void putreg64(uint64_t v, const volatile uintreg_t a)
{
__asm__ __volatile__("sd %0, 0(%1)" : : "r" (v), "r" (a));
}
#define READ_CSR(reg) \ #define READ_CSR(reg) \
({ \ ({ \
@ -222,7 +263,7 @@ extern "C"
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Atomic modification of registers */ /* Atomic modification of registers */
void modifyreg32(uintptr_t addr, uint32_t clearbits, uint32_t setbits); void modifyreg32(uintreg_t addr, uint32_t clearbits, uint32_t setbits);
/* Memory allocation ********************************************************/ /* Memory allocation ********************************************************/

2
arch/risc-v/src/common/riscv_modifyreg32.c
View File

@ -43,7 +43,7 @@
* *
****************************************************************************/ ****************************************************************************/
void modifyreg32(uintptr_t addr, uint32_t clearbits, uint32_t setbits) void modifyreg32(uintreg_t addr, uint32_t clearbits, uint32_t setbits)
{ {
irqstate_t flags; irqstate_t flags;
uint32_t regval; uint32_t regval;

2
arch/risc-v/src/k210/k210_fpioa.c
View File

@ -39,5 +39,5 @@ void k210_fpioa_config(uint32_t io, uint32_t ioflags)
{ {
uint32_t *fpioa = (uint32_t *)K210_FPIOA_BASE; uint32_t *fpioa = (uint32_t *)K210_FPIOA_BASE;
DEBUGASSERT(io < K210_IO_NUMBER); DEBUGASSERT(io < K210_IO_NUMBER);
putreg32(ioflags, &fpioa[io]); putreg32(ioflags, (uintptr_t)&fpioa[io]);
} }

2
arch/risc-v/src/mpfs/mpfs_dsn.c
View File

@ -78,7 +78,7 @@
int mpfs_read_dsn(uint8_t *dsn, size_t len) int mpfs_read_dsn(uint8_t *dsn, size_t len)
{ {
uint32_t reg; uint32_t reg;
uint8_t *p = (uint8_t *)MSS_SCBMAILBOX; uintptr_t p = MSS_SCBMAILBOX;
irqstate_t flags = enter_critical_section(); irqstate_t flags = enter_critical_section();
unsigned retries = RETRIES; unsigned retries = RETRIES;

4
arch/risc-v/src/mpfs/mpfs_ethernet.c
View File

@ -412,7 +412,7 @@ static void mpfs_interrupt_work(void *arg);
static inline void mac_putreg(struct mpfs_ethmac_s *priv, static inline void mac_putreg(struct mpfs_ethmac_s *priv,
uint32_t offset, uint32_t val) uint32_t offset, uint32_t val)
{ {
uint32_t *addr = (uint32_t *)(priv->regbase + offset); uintptr_t addr = (uintptr_t)(priv->regbase + offset);
#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_MPFS_ETHMAC_REGDEBUG) #if defined(CONFIG_DEBUG_NET) && defined(CONFIG_MPFS_ETHMAC_REGDEBUG)
ninfo("0x%08x <- 0x%08x\n", addr, val); ninfo("0x%08x <- 0x%08x\n", addr, val);
#endif #endif
@ -437,7 +437,7 @@ static inline void mac_putreg(struct mpfs_ethmac_s *priv,
static inline uint32_t mac_getreg(struct mpfs_ethmac_s *priv, static inline uint32_t mac_getreg(struct mpfs_ethmac_s *priv,
uint32_t offset) uint32_t offset)
{ {
uint32_t *addr = (uint32_t *)(priv->regbase + offset); uintptr_t addr = (uintptr_t)(priv->regbase + offset);
uint32_t value = getreg32(addr); uint32_t value = getreg32(addr);
#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_MPFS_ETHMAC_REGDEBUG) #if defined(CONFIG_DEBUG_NET) && defined(CONFIG_MPFS_ETHMAC_REGDEBUG)
ninfo("0x%08x -> 0x%08x\n", addr, value); ninfo("0x%08x -> 0x%08x\n", addr, value);