espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_hw_support: esp_clk should use spinlock instead of mutex

Browse Source 
esp_clk used to be protected using _lock_t (i.e., a FreeRTOS Mutex). However, esp_clk API is current called from
from critical sections, thus mutex should not be used (as they can be blocking).

This commit updates esp_clk to use spinlocks for critical sections instead.
This commit is contained in:
Darian Leung
2022-07-28 13:49:44 +08:00
parent 83b1dd1c11
commit 1fded0234c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_hw_support/esp_clk.c
View File

@ -8,6 +8,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/lock.h> #include <sys/lock.h>
#include "freertos/FreeRTOS.h"
#include "esp_attr.h" #include "esp_attr.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
@ -46,7 +47,7 @@ extern uint32_t g_ticks_per_us_app;
#endif #endif
#endif #endif
static _lock_t s_esp_rtc_time_lock; static portMUX_TYPE s_esp_rtc_time_lock = portMUX_INITIALIZER_UNLOCKED;
// TODO: IDF-4239 // TODO: IDF-4239
static RTC_DATA_ATTR uint64_t s_esp_rtc_time_us = 0, s_rtc_last_ticks = 0; static RTC_DATA_ATTR uint64_t s_esp_rtc_time_us = 0, s_rtc_last_ticks = 0;
@ -94,7 +95,7 @@ uint64_t esp_rtc_get_time_us(void)
//IDF-3901 //IDF-3901
return 0; return 0;
#endif #endif
_lock_acquire(&s_esp_rtc_time_lock); portENTER_CRITICAL_SAFE(&s_esp_rtc_time_lock);
const uint32_t cal = esp_clk_slowclk_cal_get(); const uint32_t cal = esp_clk_slowclk_cal_get();
const uint64_t rtc_this_ticks = rtc_time_get(); const uint64_t rtc_this_ticks = rtc_time_get();
const uint64_t ticks = rtc_this_ticks - s_rtc_last_ticks; const uint64_t ticks = rtc_this_ticks - s_rtc_last_ticks;
@ -115,7 +116,7 @@ uint64_t esp_rtc_get_time_us(void)
((ticks_high * cal) << (32 - RTC_CLK_CAL_FRACT)); ((ticks_high * cal) << (32 - RTC_CLK_CAL_FRACT));
s_esp_rtc_time_us += delta_time_us; s_esp_rtc_time_us += delta_time_us;
s_rtc_last_ticks = rtc_this_ticks; s_rtc_last_ticks = rtc_this_ticks;
_lock_release(&s_esp_rtc_time_lock); portEXIT_CRITICAL_SAFE(&s_esp_rtc_time_lock);
return s_esp_rtc_time_us; return s_esp_rtc_time_us;
} }