patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

arch: arm: cortex_m: enable interrupts before entering application’s main

Browse source 
This also fixes a typo in `z_arm_switch_to_main_no_multithreading` making
it unlock irq instead of locking them when main returns.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
This commit is contained in:
Wilfried Chauveau 2024-04-23 19:02:42 +01:00 committed by Anas Nashif
parent e4747b28a8
commit 00ddd8a81a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/core/cortex_m/thread.c
View file

@ -595,6 +595,10 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
__used void arch_irq_unlock_outlined(unsigned int key) __used void arch_irq_unlock_outlined(unsigned int key)
{ {
#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
__enable_fault_irq(); /* alters FAULTMASK */
__enable_irq(); /* alters PRIMASK */
#endif
arch_irq_unlock(key); arch_irq_unlock(key);
} }
@ -646,9 +650,8 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
"mov r2, %[_p3]\n" "mov r2, %[_p3]\n"
"blx %[_main_entry]\n" /* main_entry(p1, p2, p3) */ "blx %[_main_entry]\n" /* main_entry(p1, p2, p3) */
"mov r0, #0\n" "ldr r0, =arch_irq_lock_outlined\n"
"ldr r1, =arch_irq_unlock_outlined\n" "blx r0\n"
"blx r1\n"
"loop: b loop\n\t" /* while (true); */ "loop: b loop\n\t" /* while (true); */
: :
: [_p1]"r" (p1), [_p2]"r" (p2), [_p3]"r" (p3), : [_p1]"r" (p1), [_p2]"r" (p2), [_p3]"r" (p3),