len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-09-08 15:17:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix SEC_STAT.IRM bit handling in ARC SEM interrupt entry/exit

Browse source 
Related to #331

Fix the Memory Read Protection Violation from Secure MPU exception on exit from interrupt.

* Add `lr r3, [0x09] /* store SEC_STAT.IRM */` and `and r3, r3, 0x8` before `PUSH r3` in `EXCEPTION_PROLOGUE` and `INTERRUPT_PROLOGUE`.
* Add `POP r3 /* restore SEC_STAT.IRM */` and `sflag r3` before `POP r30` in `EXCEPTION_EPILOGUE` and `INTERRUPT_EPILOGUE`.
This commit is contained in:
Vishwanath Martur 2024-11-02 10:00:56 +05:30
parent 7d76dceaad
commit 01ac098a07
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
portable/ThirdParty/GCC/ARC_EM_HS/arc_support.s vendored
View file

@ -148,6 +148,9 @@ start_r:
exc_entry_cpu: exc_entry_cpu:
EXCEPTION_PROLOGUE EXCEPTION_PROLOGUE
lr r3, [0x09] /* store SEC_STAT.IRM */
and r3, r3, 0x8
PUSH r3
mov blink, sp mov blink, sp
mov r3, sp /* as exception handler's para(p_excinfo) */ mov r3, sp /* as exception handler's para(p_excinfo) */
@ -185,6 +188,8 @@ ret_exc:
ret_exc_1: /* return from non-task context, interrupts or exceptions are nested */ ret_exc_1: /* return from non-task context, interrupts or exceptions are nested */
EXCEPTION_EPILOGUE EXCEPTION_EPILOGUE
POP r3 /* restore SEC_STAT.IRM */
sflag r3
rtie rtie
/* there is a dispatch request */ /* there is a dispatch request */
@ -215,6 +220,8 @@ ret_exc_r:
RESTORE_CALLEE_REGS /* recover registers */ RESTORE_CALLEE_REGS /* recover registers */
EXCEPTION_EPILOGUE EXCEPTION_EPILOGUE
POP r3 /* restore SEC_STAT.IRM */
sflag r3
rtie rtie
/****** entry for normal interrupt exception handling ******/ /****** entry for normal interrupt exception handling ******/
@ -235,6 +242,9 @@ exc_entry_int:
#endif #endif
#endif #endif
INTERRUPT_PROLOGUE INTERRUPT_PROLOGUE
lr r3, [0x09] /* store SEC_STAT.IRM */
and r3, r3, 0x8
PUSH r3
mov blink, sp mov blink, sp
@ -294,6 +304,8 @@ ret_int:
brne r0, 0, ret_int_2 brne r0, 0, ret_int_2
ret_int_1: /* return from non-task context */ ret_int_1: /* return from non-task context */
INTERRUPT_EPILOGUE INTERRUPT_EPILOGUE
POP r3 /* restore SEC_STAT.IRM */
sflag r3
rtie rtie
/* there is a dispatch request */ /* there is a dispatch request */
ret_int_2: ret_int_2:
@ -319,6 +331,8 @@ ret_int_r:
RESTORE_CALLEE_REGS /* recover registers */ RESTORE_CALLEE_REGS /* recover registers */
POPAX AUX_IRQ_ACT POPAX AUX_IRQ_ACT
INTERRUPT_EPILOGUE INTERRUPT_EPILOGUE
POP r3 /* restore SEC_STAT.IRM */
sflag r3
rtie rtie
#if ARC_FEATURE_FIRQ == 1 #if ARC_FEATURE_FIRQ == 1