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

bugfix: remove the workaround implemented in MR 22773 about the lp_timer

Browse Source
This commit is contained in:
Lou Tianhao
2023-06-02 14:19:01 +08:00
parent 6e15f589cc
commit 7599d07c3f
3 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/bootloader_support/src/bootloader_random.c
View File

@ -8,7 +8,7 @@
#include "esp_cpu.h" #include "esp_cpu.h"
#include "soc/wdev_reg.h" #include "soc/wdev_reg.h"
#if defined CONFIG_IDF_TARGET_ESP32C6 #if SOC_LP_TIMER_SUPPORTED
#include "hal/lp_timer_hal.h" #include "hal/lp_timer_hal.h"
#endif #endif
@ -34,20 +34,6 @@
#define RNG_CPU_WAIT_CYCLE_NUM (80 * 23) /* 45 KHz reading frequency is the maximum we have tested so far on S3 */ #define RNG_CPU_WAIT_CYCLE_NUM (80 * 23) /* 45 KHz reading frequency is the maximum we have tested so far on S3 */
#endif #endif
#if defined CONFIG_IDF_TARGET_ESP32H2
// TODO: temporary definition until IDF-6270 is implemented
#include "soc/lp_timer_reg.h"
static inline uint32_t lp_timer_hal_get_cycle_count(void)
{
REG_SET_BIT(LP_TIMER_UPDATE_REG, LP_TIMER_MAIN_TIMER_UPDATE);
uint32_t lo = REG_GET_FIELD(LP_TIMER_MAIN_BUF0_LOW_REG, LP_TIMER_MAIN_TIMER_BUF0_LOW);
return lo;
}
#endif
__attribute__((weak)) void bootloader_fill_random(void *buffer, size_t length) __attribute__((weak)) void bootloader_fill_random(void *buffer, size_t length)
{ {
uint8_t *buffer_bytes = (uint8_t *)buffer; uint8_t *buffer_bytes = (uint8_t *)buffer;
@ -57,7 +43,7 @@ static inline uint32_t lp_timer_hal_get_cycle_count(void)
assert(buffer != NULL); assert(buffer != NULL);
for (size_t i = 0; i < length; i++) { for (size_t i = 0; i < length; i++) {
#if (defined CONFIG_IDF_TARGET_ESP32C6 || defined CONFIG_IDF_TARGET_ESP32H2) #if SOC_LP_TIMER_SUPPORTED
random = REG_READ(WDEV_RND_REG); random = REG_READ(WDEV_RND_REG);
start = esp_cpu_get_cycle_count(); start = esp_cpu_get_cycle_count();
do { do {

18
components/esp_hw_support/hw_random.c
View File

@ -14,7 +14,7 @@
#include "soc/wdev_reg.h" #include "soc/wdev_reg.h"
#include "esp_private/esp_clk.h" #include "esp_private/esp_clk.h"
#if defined CONFIG_IDF_TARGET_ESP32C6 #if SOC_LP_TIMER_SUPPORTED
#include "hal/lp_timer_hal.h" #include "hal/lp_timer_hal.h"
#endif #endif
@ -34,20 +34,6 @@
#define APB_CYCLE_WAIT_NUM (16) #define APB_CYCLE_WAIT_NUM (16)
#endif #endif
#if defined CONFIG_IDF_TARGET_ESP32H2
// TODO: temporary definition until IDF-6270 is implemented
#include "soc/lp_timer_reg.h"
static uint32_t IRAM_ATTR lp_timer_hal_get_cycle_count(void)
{
REG_SET_BIT(LP_TIMER_UPDATE_REG, LP_TIMER_MAIN_TIMER_UPDATE);
uint32_t lo = REG_GET_FIELD(LP_TIMER_MAIN_BUF0_LOW_REG, LP_TIMER_MAIN_TIMER_BUF0_LOW);
return lo;
}
#endif
uint32_t IRAM_ATTR esp_random(void) uint32_t IRAM_ATTR esp_random(void)
{ {
/* The PRNG which implements WDEV_RANDOM register gets 2 bits /* The PRNG which implements WDEV_RANDOM register gets 2 bits
@ -73,7 +59,7 @@ uint32_t IRAM_ATTR esp_random(void)
static uint32_t last_ccount = 0; static uint32_t last_ccount = 0;
uint32_t ccount; uint32_t ccount;
uint32_t result = 0; uint32_t result = 0;
#if (defined CONFIG_IDF_TARGET_ESP32C6 || defined CONFIG_IDF_TARGET_ESP32H2) #if SOC_LP_TIMER_SUPPORTED
for (size_t i = 0; i < sizeof(result); i++) { for (size_t i = 0; i < sizeof(result); i++) {
do { do {
ccount = esp_cpu_get_cycle_count(); ccount = esp_cpu_get_cycle_count();

8
components/hal/CMakeLists.txt
View File

@ -25,6 +25,10 @@ if(NOT ${target} STREQUAL "esp32" AND NOT CONFIG_APP_BUILD_TYPE_PURE_RAM_APP)
list(APPEND srcs "cache_hal.c") list(APPEND srcs "cache_hal.c")
endif() endif()
if(CONFIG_SOC_LP_TIMER_SUPPORTED)
list(APPEND srcs "lp_timer_hal.c")
endif()
if(NOT BOOTLOADER_BUILD) if(NOT BOOTLOADER_BUILD)
list(APPEND srcs list(APPEND srcs
"rtc_io_hal.c" "rtc_io_hal.c"
@ -129,10 +133,6 @@ if(NOT BOOTLOADER_BUILD)
list(APPEND srcs "${target}/modem_clock_hal.c") list(APPEND srcs "${target}/modem_clock_hal.c")
endif() endif()
if(CONFIG_SOC_LP_TIMER_SUPPORTED)
list(APPEND srcs "lp_timer_hal.c")
endif()
if(CONFIG_SOC_PAU_SUPPORTED) if(CONFIG_SOC_PAU_SUPPORTED)
list(APPEND srcs "${target}/pau_hal.c") list(APPEND srcs "${target}/pau_hal.c")
endif() endif()