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

riscv/k230: minor revision on PMP settings

Browse Source 
This patch simplifies PMP handling for K230 using common APIs.
It also uses `g_misa` variable to expose the MISA issue.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
This commit is contained in:
Yanfeng Liu 2024-03-08 15:01:28 +08:00 committed by Xiang Xiao
parent b1fd3da0f6
commit 02d097ac4d
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@
#if !defined(CONFIG_BUILD_KERNEL) || defined(CONFIG_NUTTSBI)
static bool g_big = false; /* true if running on big core */
static volatile uint64_t g_misa = 0;
/****************************************************************************
* Private Functions
@ -127,28 +127,21 @@ static void k230_hart_cleanup(void)
void k230_hart_init(void)
{
/* TODO: when called from sbi_start(), MISA is 0 somehow. */
g_big = (READ_CSR(CSR_MISA) & (1 << 21));
k230_hart_cleanup();
WRITE_CSR(CSR_MXSTATUS, XSTATUS);
WRITE_CSR(CSR_MHCR, MHCR);
WRITE_CSR(CSR_MCOR, MCOR);
WRITE_CSR(CSR_MSMPR, MSMPR);
WRITE_CSR(CSR_MCCR2, g_big ? MCCR2_BIG : MCCR2);
WRITE_CSR(CSR_MHINT, g_big ? MHINT_BIG : MHINT);
WRITE_CSR(CSR_MCCR2, MCCR2);
WRITE_CSR(CSR_MHINT, MHINT);
#ifdef RISCV_PBMT
SET_CSR(CSR_MENVCFG, MENVCFG_PBMT);
#endif
/* TODO: why 0 when reading from NuttSBI S-mode? */
#ifdef CONFIG_NUTTSBI
/* Some PMP entries might have been locked */
k230_add_pmp(PMPCFG_A_NAPOT | PMPCFG_RWX_MASK, 0, 1024ul << 30);
#endif
while (!(g_misa = READ_CSR(CSR_MISA)));
}
/****************************************************************************
@ -158,7 +151,8 @@ void k230_hart_init(void)
bool k230_hart_is_big(void)
{
return g_big;
sinfo("g_misa=%lx\n", g_misa);
return g_misa & (1 << 21);
}
/****************************************************************************

5
arch/risc-v/src/k230/k230_hart.h
View File

@ -25,11 +25,6 @@
* Preprocessor Macros
****************************************************************************/
/* add PMP entry with (attr, base, size) */
#define k230_add_pmp(a, b, s) riscv_config_pmp_region( \
riscv_next_free_pmp_region(), a, b, s)
#define CSR_MSECCFG 0x747
#define CSR_MSECCFGH 0x757

5
arch/risc-v/src/k230/k230_userspace.c
View File

@ -34,7 +34,6 @@
#include "k230_userspace.h"
#include "riscv_internal.h"
#include "k230_hart.h"
#ifdef CONFIG_BUILD_PROTECTED
@ -128,8 +127,8 @@ void k230_userspace(void)
static void configure_mpu(void)
{
k230_add_pmp(UFLASH_F, UFLASH_START, UFLASH_SIZE);
k230_add_pmp(USRAM_F, USRAM_START, USRAM_SIZE);
riscv_append_pmp_region(UFLASH_F, UFLASH_START, UFLASH_SIZE);
riscv_append_pmp_region(USRAM_F, USRAM_START, USRAM_SIZE);
}
#endif /* CONFIG_BUILD_PROTECTED */