diff options
Diffstat (limited to 'cpukit/score/cpu/arm/cpu_asm.S')
| -rw-r--r-- | cpukit/score/cpu/arm/cpu_asm.S | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/cpukit/score/cpu/arm/cpu_asm.S b/cpukit/score/cpu/arm/cpu_asm.S index bae7207f2c..f2c4afe39e 100644 --- a/cpukit/score/cpu/arm/cpu_asm.S +++ b/cpukit/score/cpu/arm/cpu_asm.S @@ -67,12 +67,32 @@ DEFINE_FUNCTION_ARM(_CPU_Context_switch) str r3, [r0, #ARM_CONTEXT_CONTROL_THREAD_ID_OFFSET] #endif +#ifdef RTEMS_SMP + /* Indicate that this context is no longer executing */ + dmb + mov r3, #0 + strb r3, [r0, #ARM_CONTEXT_CONTROL_IS_EXECUTING_OFFSET] +#endif + /* Start restoring context */ _restore: #ifdef ARM_MULTILIB_HAS_LOAD_STORE_EXCLUSIVE clrex #endif +#ifdef RTEMS_SMP + /* Wait for context to stop execution if necessary */ +1: + ldrb r3, [r1, #ARM_CONTEXT_CONTROL_IS_EXECUTING_OFFSET] + cmp r3, #0 + bne 1b + + /* Indicate that this context is executing */ + dmb + mov r3, #1 + strb r3, [r1, #ARM_CONTEXT_CONTROL_IS_EXECUTING_OFFSET] +#endif + #ifdef ARM_MULTILIB_HAS_THREAD_ID_REGISTER ldr r3, [r1, #ARM_CONTEXT_CONTROL_THREAD_ID_OFFSET] mcr p15, 0, r3, c13, c0, 3 |