ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove counter from nordic critical HAL implementation 

hal_critical_section_enter() is safe to call multiple times, however
hal_critical_section_exit() is only called on the last exit from a
critical section. This will cause a mismatch in the counter and the
interrupt state will never be restored if the critical section is
nested. Change this to a bool so that the interrupt save state is
tracked for hal_in_critical_section() to work correctly.
pull/5346/head
Steven Cartmell 2018-01-09 15:35:12 +00:00
parent 061795c489
commit 643c8926d5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
targets/TARGET_NORDIC/TARGET_NRF5/nordic_critical.c
View File

@ -19,7 +19,7 @@
#include "app_util_platform.h" #include "app_util_platform.h"
#if defined(SOFTDEVICE_PRESENT) #if defined(SOFTDEVICE_PRESENT)
static volatile uint32_t nordic_cr_nested = 0; static volatile bool state_saved = false;
static void nordic_nvic_critical_region_enter(void); static void nordic_nvic_critical_region_enter(void);
static void nordic_nvic_critical_region_exit(void); static void nordic_nvic_critical_region_exit(void);
@ -56,7 +56,7 @@ void hal_critical_section_exit()
bool hal_in_critical_section(void) bool hal_in_critical_section(void)
{ {
return (nordic_cr_nested != 0); return (state_saved != 0);
} }
@ -70,7 +70,7 @@ static inline void nordic_nvic_critical_region_enter(void)
{ {
int was_masked = __sd_nvic_irq_disable(); int was_masked = __sd_nvic_irq_disable();
if (nordic_cr_nested == 0) { if (state_saved == false) {
nrf_nvic_state.__irq_masks[0] = ( NVIC->ICER[0] & __NRF_NVIC_APP_IRQS_0 ); nrf_nvic_state.__irq_masks[0] = ( NVIC->ICER[0] & __NRF_NVIC_APP_IRQS_0 );
NVIC->ICER[0] = __NRF_NVIC_APP_IRQS_0; NVIC->ICER[0] = __NRF_NVIC_APP_IRQS_0;
#ifdef NRF52 #ifdef NRF52
@ -79,7 +79,7 @@ static inline void nordic_nvic_critical_region_enter(void)
#endif #endif
} }
nordic_cr_nested++; state_saved = true;
if (!was_masked) { if (!was_masked) {
__sd_nvic_irq_enable(); __sd_nvic_irq_enable();
@ -93,17 +93,15 @@ static inline void nordic_nvic_critical_region_enter(void)
*/ */
static inline void nordic_nvic_critical_region_exit(void) static inline void nordic_nvic_critical_region_exit(void)
{ {
nordic_cr_nested--; state_saved = false;
if (nordic_cr_nested == 0) { int was_masked = __sd_nvic_irq_disable();
int was_masked = __sd_nvic_irq_disable(); NVIC->ISER[0] = nrf_nvic_state.__irq_masks[0];
NVIC->ISER[0] = nrf_nvic_state.__irq_masks[0];
#ifdef NRF52 #ifdef NRF52
NVIC->ISER[1] = nrf_nvic_state.__irq_masks[1]; NVIC->ISER[1] = nrf_nvic_state.__irq_masks[1];
#endif #endif
if (!was_masked) { if (!was_masked) {
__sd_nvic_irq_enable(); __sd_nvic_irq_enable();
}
} }
} }
#endif #endif