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

risc-v/k230: initial rv64ilp32 support

Browse Source 
This enables NuttX FLAT build with rv64ilp32 on CanMV230 device.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
This commit is contained in:
Yanfeng Liu 2024-06-19 06:59:20 +08:00 committed by Xiang Xiao
parent caa94ef64b
commit 8720594f4d
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/risc-v/src/k230/hardware/k230_memorymap.h
View File

@ -27,7 +27,7 @@
/* Devices Base Address */
#define K230_PLIC_BASE 0xF00000000UL
#define K230_PLIC_BASE UINT64_C(0xF00000000)
#define K230_CLINT_BASE (K230_PLIC_BASE + 0x04000000)
#define K230_CPU1_BOOTA 0x91102104UL
#define K230_CPU1_RESET 0x9110100cUL
@ -46,5 +46,5 @@
/* Enable RV PBMT */
#define MENVCFG_PBMT (1ul << 62)
#define MENVCFG_PBMT (UINT64_C(1) << 62)
#endif /* __ARCH_RISCV_SRC_K230_HARDWARE_K230_MEMORYMAP_H */

4
arch/risc-v/src/k230/k230_hart.c
View File

@ -169,7 +169,7 @@ void k230_hart_big_stop(void)
putreg32(RESET_RQST_BIT | RESET_RQST_ENW, K230_CPU1_RESET);
up_udelay(RESET_WAIT_USEC);
sinfo("reg: %x\n", getreg32(K230_CPU1_RESET));
sinfo("reg: %" PRIx32 "\n", getreg32(K230_CPU1_RESET));
}
/****************************************************************************
@ -184,7 +184,7 @@ void k230_hart_big_boot(uintptr_t addr)
/* learned from U-Boot baremetal and RTT sysctl_reset_cpu */
if (addr) putreg32(addr, K230_CPU1_BOOTA);
sinfo("addr=%lx\n", addr);
sinfo("addr=%"PRIxPTR"\n", addr);
/* 0x10001000 clear DONE bit */

20
arch/risc-v/src/k230/k230_irq.c
View File

@ -36,7 +36,15 @@
#include "riscv_ipi.h"
#include "chip.h"
#define STATUS_LOW (READ_CSR(CSR_STATUS) & 0xffffffff) /* STATUS low part */
/****************************************************************************
* Preprocessor definitions
****************************************************************************/
/* lower word of STATUS register */
#define STATUS_LOW (uint32_t)(READ_CSR(CSR_STATUS) & UINT32_MAX)
#define IE_STS_IRQ "ie=%"PRIxREG" sts=%"PRIx32" irq=%d\n"
#define IE_STS_CTX "ie=%"PRIxREG" sts=%"PRIx32" ctx=%d\n"
/****************************************************************************
* Public Functions
@ -70,7 +78,7 @@ void up_irqinitialize(void)
for (id = 1; id <= NR_IRQS; id++)
{
putreg32(1, (uintptr_t)(K230_PLIC_PRIORITY + 4 * id));
putreg32(1, K230_PLIC_PRIORITY + 4 * id);
}
sinfo("prioritized %d irqs\n", NR_IRQS);
@ -140,7 +148,7 @@ void up_disable_irq(int irq)
}
}
sinfo("ie=%lx sts=%lx irq=%d\n", READ_CSR(CSR_IE), STATUS_LOW, irq);
sinfo(IE_STS_IRQ, READ_CSR(CSR_IE), STATUS_LOW, irq);
}
/****************************************************************************
@ -184,7 +192,7 @@ void up_enable_irq(int irq)
}
}
sinfo("ie=%lx sts=%lx irq=%d\n", READ_CSR(CSR_IE), STATUS_LOW, irq);
sinfo(IE_STS_IRQ, READ_CSR(CSR_IE), STATUS_LOW, irq);
}
irqstate_t up_irq_enable(void)
@ -198,8 +206,6 @@ irqstate_t up_irq_enable(void)
/* Read and enable global interrupts (M/SIE) in m/sstatus */
oldstat = READ_AND_SET_CSR(CSR_STATUS, STATUS_IE);
sinfo("ie=%lx sts=%lx ctx=%d\n", READ_CSR(CSR_IE), STATUS_LOW,
XCPTCONTEXT_SIZE);
sinfo(IE_STS_CTX, READ_CSR(CSR_IE), STATUS_LOW, XCPTCONTEXT_SIZE);
return oldstat;
}

2
arch/risc-v/src/k230/k230_irq_dispatch.c
View File

@ -53,7 +53,7 @@
* riscv_dispatch_irq
****************************************************************************/
void *riscv_dispatch_irq(uintptr_t vector, uintptr_t *regs)
void *riscv_dispatch_irq(uintreg_t vector, uintreg_t *regs)
{
int irq = (vector >> RV_IRQ_MASK) | (vector & 0xf);