kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-15 01:23:49 +01:00
Code Releases Activity

cpu/cortexm: add stack limit support for CM33

Browse Source 
Signed-off-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
This commit is contained in:
Dylan Laduranty 2024-04-27 18:55:06 +02:00
parent 690ce96234
commit 683d4a249d
7 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/thread.c
View File

@ -285,7 +285,7 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
thread->sp = thread_stack_init(function, arg, stack, stacksize);
#if defined(DEVELHELP) || IS_ACTIVE(SCHED_TEST_STACK) || \
defined(MODULE_MPU_STACK_GUARD)
defined(MODULE_MPU_STACK_GUARD) || defined(MODULE_CORTEXM_STACK_LIMIT)
thread->stack_start = stack;
#endif

1
cpu/cortexm_common/Makefile.features
View File

@ -36,6 +36,7 @@ else ifeq ($(CPU_CORE),cortex-m3)
RUST_TARGET = thumbv7m-none-eabi
else ifeq ($(CPU_CORE),cortex-m33)
CPU_ARCH := armv8m
FEATURES_PROVIDED += cortexm_stack_limit
#RUST_TARGET = thumbv8m.main-none-eabi
else ifeq ($(CPU_CORE),cortex-m4)
CPU_ARCH := armv7m

17
cpu/cortexm_common/thread_arch.c
View File

@ -297,6 +297,13 @@ void NORETURN cpu_switch_context_exit(void)
UNREACHABLE();
}
#ifdef MODULE_CORTEXM_STACK_LIMIT
static void* __attribute__((used)) _get_new_stacksize(unsigned int *args) {
thread_t* t = (thread_t*) args;
return thread_get_stackstart(t);
}
#endif
#if CPU_CORE_CORTEXM_FULL_THUMB
void __attribute__((naked)) __attribute__((used)) isr_pendsv(void) {
__asm__ volatile (
@ -337,8 +344,14 @@ void __attribute__((naked)) __attribute__((used)) isr_pendsv(void) {
/* current thread context is now saved */
"restore_context: \n" /* Label to skip thread state saving */
"ldr r0, [r0] \n" /* load tcb->sp to register 1 */
#ifdef MODULE_CORTEXM_STACK_LIMIT
"mov r4, r0 \n" /* Save content of R0 into R4*/
"bl _get_new_stacksize \n" /* Get the new lower limit stack in R0 */
"msr psplim, r0 \n" /* Set the PSP lower limit stack */
"ldr r0, [r4] \n" /* Load tcb->sp to register 0 */
#else
"ldr r0, [r0] \n" /* load tcb->sp to register 0 */
#endif
"ldmia r0!, {r4-r11,lr} \n" /* restore other registers, including lr */
#ifdef MODULE_CORTEXM_FPU
"tst lr, #0x10 \n"

5
cpu/cortexm_common/vectors_cortexm.c
View File

@ -99,6 +99,11 @@ void reset_handler_default(void)
uint32_t *dst;
const uint32_t *src = &_etext;
#ifdef __ARM_ARCH_8M_MAIN__
/* Set the lower limit of the exception stack into MSPLIM register */
__set_MSPLIM((uint32_t)&_sstack);
#endif
cortexm_init_fpu();
#ifdef MODULE_PUF_SRAM

1
makefiles/features_existing.inc.mk
View File

@ -46,6 +46,7 @@ FEATURES_EXISTING := \
can_rx_mailbox \
cortexm_fpu \
cortexm_mpu \
cortexm_stack_limit \
cortexm_svc \
cpp \
cpu_arm7tdmi_gba \

4
makefiles/features_modules.inc.mk
View File

@ -78,6 +78,10 @@ ifneq (,$(filter periph_rtc,$(USEMODULE)))
USEMODULE += rtc_utils
endif
# select cortexm_stack_limit pseudomodule if the corresponding
# feature is used
USEMODULE += $(filter cortexm_stack_limit, $(FEATURES_USED))
# select cortexm_svc pseudomodule if the corresponding feature is used
USEMODULE += $(filter cortexm_svc, $(FEATURES_USED))

10
makefiles/pseudomodules.inc.mk
View File

@ -35,6 +35,16 @@ PSEUDOMODULES += board_software_reset
PSEUDOMODULES += arduino_pwm
PSEUDOMODULES += arduino_serial_stdio
## @defgroup pseudomodule_arm_stack_limit arm_stack_limit
## @{
## @brief Set MSP/PSP stack lower limit
##
## Use PSPLIM and MSPLIM ARM registers to set the lower limit of a stack
## This is a protection mechanism to catch stack overflow early before it
## can corrupt adjacent memory. Only available on ARMv8-M architecture.
PSEUDOMODULES += cortexm_stack_limit
## @}
PSEUDOMODULES += can_mbox
PSEUDOMODULES += can_pm
PSEUDOMODULES += can_raw