sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

esp32_rt_timer.c: Don't nest calls to spin_lock_irqsave with a device

Browse Source 
specific spinlock, this will lead to deadlocks.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-09-09 23:26:47 +02:00 committed by Xiang Xiao
parent e847c61801
commit 11216257cf
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/xtensa/src/esp32/esp32_rt_timer.c
View File

@ -99,14 +99,11 @@ static void start_rt_timer(struct rt_timer_s *timer,
uint64_t timeout, uint64_t timeout,
bool repeat) bool repeat)
{ {
irqstate_t flags;
struct rt_timer_s *p; struct rt_timer_s *p;
bool inserted = false; bool inserted = false;
uint64_t counter; uint64_t counter;
struct esp32_tim_dev_s *tim = s_esp32_tim_dev; struct esp32_tim_dev_s *tim = s_esp32_tim_dev;
flags = spin_lock_irqsave(&g_lock);
/* Only idle timer can be started */ /* Only idle timer can be started */
if (timer->state == RT_TIMER_IDLE) if (timer->state == RT_TIMER_IDLE)
@ -161,8 +158,6 @@ static void start_rt_timer(struct rt_timer_s *timer,
ESP32_TIM_SETALRM(tim, true); ESP32_TIM_SETALRM(tim, true);
} }
} }
spin_unlock_irqrestore(&g_lock, flags);
} }
/**************************************************************************** /****************************************************************************
@ -182,14 +177,11 @@ static void start_rt_timer(struct rt_timer_s *timer,
static void stop_rt_timer(struct rt_timer_s *timer) static void stop_rt_timer(struct rt_timer_s *timer)
{ {
irqstate_t flags;
bool ishead; bool ishead;
struct rt_timer_s *next_timer; struct rt_timer_s *next_timer;
uint64_t alarm; uint64_t alarm;
struct esp32_tim_dev_s *tim = s_esp32_tim_dev; struct esp32_tim_dev_s *tim = s_esp32_tim_dev;
flags = spin_lock_irqsave(&g_lock);
/* "start" function can set the timer's repeat flag, and function "stop" /* "start" function can set the timer's repeat flag, and function "stop"
* should remove this flag. * should remove this flag.
*/ */
@ -234,8 +226,6 @@ static void stop_rt_timer(struct rt_timer_s *timer)
} }
} }
} }
spin_unlock_irqrestore(&g_lock, flags);
} }
/**************************************************************************** /****************************************************************************
@ -509,9 +499,14 @@ void rt_timer_start(struct rt_timer_s *timer,
uint64_t timeout, uint64_t timeout,
bool repeat) bool repeat)
{ {
stop_rt_timer(timer); irqstate_t flags;
flags = spin_lock_irqsave(&g_lock);
stop_rt_timer(timer);
start_rt_timer(timer, timeout, repeat); start_rt_timer(timer, timeout, repeat);
spin_unlock_irqrestore(&g_lock, flags);
} }
/**************************************************************************** /****************************************************************************
@ -530,7 +525,11 @@ void rt_timer_start(struct rt_timer_s *timer,
void rt_timer_stop(struct rt_timer_s *timer) void rt_timer_stop(struct rt_timer_s *timer)
{ {
irqstate_t flags;
flags = spin_lock_irqsave(&g_lock);
stop_rt_timer(timer); stop_rt_timer(timer);
spin_unlock_irqrestore(&g_lock, flags);
} }
/**************************************************************************** /****************************************************************************