michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: riscv: pmp: simplify pmp region number computation

Browse source 
Simplify multiple ifdef case in computing region number. Also move these
macros to core_pmp.c because they are only used in one file.

Signed-off-by: Jim Shu <cwshu@andestech.com>
This commit is contained in:
Jim Shu 2021-06-21 12:46:01 +08:00 • committed by Carles Cufí
commit b13dd54fb4
2 changed files with 22 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

22
arch/riscv/core/pmp/core_pmp.c
View file

@ -31,10 +31,32 @@ LOG_MODULE_REGISTER(mpu);
#if defined(CONFIG_PMP_POWER_OF_TWO_ALIGNMENT) #if defined(CONFIG_PMP_POWER_OF_TWO_ALIGNMENT)
# define PMP_MODE_DEFAULT PMP_MODE_NAPOT # define PMP_MODE_DEFAULT PMP_MODE_NAPOT
# define PMP_USED_ENTRY_DEFAULT 1 /* NAPOT region use 1 PMP entry */
#else #else
# define PMP_MODE_DEFAULT PMP_MODE_TOR # define PMP_MODE_DEFAULT PMP_MODE_TOR
# define PMP_USED_ENTRY_DEFAULT 2 /* TOR region use 2 PMP entry */
#endif #endif
#ifdef CONFIG_USERSPACE
/*
* Define the used PMP regions before memory domain/partition.
*
* Already used PMP regions:
* 1. 0/1 entry for interrupt stack guard: None
* 2. 1 entry for MCU state: R
* 3. 1/2 entry for program and read only data: RX
* 4. 1/2 entry for user thread stack: RW
*/
#define PMP_REGION_NUM_FOR_U_THREAD ( \
(IS_ENABLED(CONFIG_PMP_STACK_GUARD) ? 1 : 0) + \
1 + (2 * PMP_USED_ENTRY_DEFAULT))
#define PMP_MAX_DYNAMIC_REGION ( \
(CONFIG_PMP_SLOT - PMP_REGION_NUM_FOR_U_THREAD) \
/ PMP_USED_ENTRY_DEFAULT)
#endif /* CONFIG_USERSPACE */
enum pmp_region_mode { enum pmp_region_mode {
PMP_MODE_NA4, PMP_MODE_NA4,
/* If NAPOT mode region size is 4, apply NA4 region to PMP CSR. */ /* If NAPOT mode region size is 4, apply NA4 region to PMP CSR. */

45
include/arch/riscv/thread.h
View file

@ -50,51 +50,6 @@
#define PMP_CFG_CSR_NUM_FOR_STACK_GUARD 2 #define PMP_CFG_CSR_NUM_FOR_STACK_GUARD 2
#endif /* CONFIG_PMP_STACK_GUARD */ #endif /* CONFIG_PMP_STACK_GUARD */
#ifdef CONFIG_PMP_POWER_OF_TWO_ALIGNMENT
#ifdef CONFIG_USERSPACE
#ifdef CONFIG_PMP_STACK_GUARD
/*
* 1 for interrupt stack guard: None
* 1 for core state: R
* 1 for program and read only data: RX
* 1 for user thread stack: RW
*/
#define PMP_REGION_NUM_FOR_U_THREAD 4
#else /* CONFIG_PMP_STACK_GUARD */
/*
* 1 for core state: R
* 1 for program and read only data: RX
* 1 for user thread stack: RW
*/
#define PMP_REGION_NUM_FOR_U_THREAD 3
#endif /* CONFIG_PMP_STACK_GUARD */
#define PMP_MAX_DYNAMIC_REGION (CONFIG_PMP_SLOT - PMP_REGION_NUM_FOR_U_THREAD)
#endif /* CONFIG_USERSPACE */
#else /* CONFIG_PMP_POWER_OF_TWO_ALIGNMENT */
#ifdef CONFIG_USERSPACE
#ifdef CONFIG_PMP_STACK_GUARD
/*
* 1 for interrupt stack guard: None
* 1 for core state: R
* 2 for program and read only data: RX
* 2 for user thread stack: RW
*/
#define PMP_REGION_NUM_FOR_U_THREAD 6
#else /* CONFIG_PMP_STACK_GUARD */
/*
* 1 for core state: R
* 2 for program and read only data: RX
* 2 for user thread stack: RW
*/
#define PMP_REGION_NUM_FOR_U_THREAD 5
#endif /* CONFIG_PMP_STACK_GUARD */
#define PMP_MAX_DYNAMIC_REGION ((CONFIG_PMP_SLOT - \
PMP_REGION_NUM_FOR_U_THREAD) >> 1)
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_PMP_POWER_OF_TWO_ALIGNMENT */
/* /*
* The following structure defines the list of registers that need to be * The following structure defines the list of registers that need to be
* saved/restored when a cooperative context switch occurs. * saved/restored when a cooperative context switch occurs.