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

arch: qemu-rv: Fix qemu_rv_start_s() for S-mode

Browse Source 
Summary:
- I found inappropriate SET_CSR() usage in the function.
- This PR fixes this issue.

Impact:
- None

Testing:
- tested with rv-virt:knsh64

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2022-10-02 19:15:00 +09:00 committed by Xiang Xiao
parent 0aa0394ca2
commit b3e300f8e6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/risc-v/src/qemu-rv/qemu_rv_start.c
View File

@ -131,14 +131,14 @@ void qemu_rv_start_s(int mhartid)
{
/* Disable MMU and enable PMP */
SET_CSR(satp, 0x0);
SET_CSR(pmpaddr0, 0x3fffffffffffffull);
SET_CSR(pmpcfg0, 0xf);
WRITE_CSR(satp, 0x0);
WRITE_CSR(pmpaddr0, 0x3fffffffffffffull);
WRITE_CSR(pmpcfg0, 0xf);
/* Set exception and interrupt delegation for S-mode */
SET_CSR(medeleg, 0xffff);
SET_CSR(mideleg, 0xffff);
WRITE_CSR(medeleg, 0xffff);
WRITE_CSR(mideleg, 0xffff);
/* Allow to write satp from S-mode */
@ -152,11 +152,11 @@ void qemu_rv_start_s(int mhartid)
/* Set the trap vector for S-mode */
extern void __trap_vec(void);
SET_CSR(stvec, (uintptr_t)__trap_vec);
WRITE_CSR(stvec, (uintptr_t)__trap_vec);
/* Set mepc to the entry */
SET_CSR(mepc, (uintptr_t)qemu_rv_start);
WRITE_CSR(mepc, (uintptr_t)qemu_rv_start);
asm volatile("mret");
}
#endif