From e5c6b87c10ba989e5da156466681788087003dce Mon Sep 17 00:00:00 2001 From: gaoxu Date: Fri, 19 Sep 2025 11:56:44 +0800 Subject: [PATCH] fix(tsens): fix temp_sensor affect by adc reset --- .../src/bootloader_random_esp32c5.c | 13 +++++ .../src/bootloader_random_esp32c6.c | 12 +++++ .../src/bootloader_random_esp32c61.c | 13 +++++ .../src/bootloader_random_esp32h2.c | 13 +++++ .../src/bootloader_random_esp32p4.c | 6 +++ components/esp_adc/adc_continuous.c | 6 +-- .../test_apps/adc/main/test_adc_tsens.c | 4 +- components/esp_hw_support/adc_share_hw_ctrl.c | 2 +- .../include/esp_private/sar_periph_ctrl.h | 28 ++++++++++ .../port/esp32/sar_periph_ctrl.c | 22 ++++++++ .../port/esp32c2/sar_periph_ctrl.c | 21 ++++++++ .../port/esp32c3/sar_periph_ctrl.c | 36 +++++++++++++ .../port/esp32c5/sar_periph_ctrl.c | 37 +++++++++++++ .../port/esp32c6/sar_periph_ctrl.c | 37 +++++++++++++ .../port/esp32c61/sar_periph_ctrl.c | 37 +++++++++++++ .../port/esp32h2/sar_periph_ctrl.c | 37 +++++++++++++ .../port/esp32p4/sar_periph_ctrl.c | 22 ++++++++ .../port/esp32s2/sar_periph_ctrl.c | 21 ++++++++ .../port/esp32s3/sar_periph_ctrl.c | 21 ++++++++ components/esp_hw_support/sar_tsens_ctrl.c | 3 ++ .../include/hal/temperature_sensor_ll.h | 30 +++++++++++ .../include/hal/temperature_sensor_ll.h | 36 +++++++++++++ .../include/hal/temperature_sensor_ll.h | 54 +++++++++++++++++++ .../include/hal/temperature_sensor_ll.h | 36 +++++++++++++ .../include/hal/temperature_sensor_ll.h | 36 +++++++++++++ 25 files changed, 577 insertions(+), 6 deletions(-) diff --git a/components/bootloader_support/src/bootloader_random_esp32c5.c b/components/bootloader_support/src/bootloader_random_esp32c5.c index 908e2f51d7..dd6fcc2698 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c5.c +++ b/components/bootloader_support/src/bootloader_random_esp32c5.c @@ -10,6 +10,8 @@ #include "hal/adc_types.h" #include "esp_private/regi2c_ctrl.h" #include "soc/lpperi_reg.h" +#include "hal/temperature_sensor_ll.h" +#include "esp_private/sar_periph_ctrl.h" #define I2C_SAR_ADC_INIT_CODE_VAL 2150 #define ADC_RNG_CLKM_DIV_NUM 0 @@ -18,7 +20,18 @@ void bootloader_random_enable(void) { +#ifndef BOOTLOADER_BUILD + sar_periph_ctrl_adc_reset(); +#else + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); +#endif + adc_ll_enable_bus_clock(true); adc_ll_enable_func_clock(true); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); diff --git a/components/bootloader_support/src/bootloader_random_esp32c6.c b/components/bootloader_support/src/bootloader_random_esp32c6.c index edaaef7723..8479d5ed8b 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c6.c +++ b/components/bootloader_support/src/bootloader_random_esp32c6.c @@ -9,6 +9,8 @@ #include "hal/adc_ll.h" #include "hal/adc_types.h" #include "esp_private/regi2c_ctrl.h" +#include "hal/temperature_sensor_ll.h" +#include "esp_private/sar_periph_ctrl.h" #define I2C_SAR_ADC_INIT_CODE_VAL 2150 #define ADC_RNG_CLKM_DIV_NUM 0 @@ -17,7 +19,17 @@ void bootloader_random_enable(void) { +#ifndef BOOTLOADER_BUILD + sar_periph_ctrl_adc_reset(); +#else + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); +#endif + adc_ll_enable_bus_clock(true); adc_ll_enable_func_clock(true); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); diff --git a/components/bootloader_support/src/bootloader_random_esp32c61.c b/components/bootloader_support/src/bootloader_random_esp32c61.c index b86fb0a965..de19fd9d5d 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c61.c +++ b/components/bootloader_support/src/bootloader_random_esp32c61.c @@ -9,6 +9,8 @@ #include "hal/adc_ll.h" #include "hal/adc_types.h" #include "esp_private/regi2c_ctrl.h" +#include "hal/temperature_sensor_ll.h" +#include "esp_private/sar_periph_ctrl.h" #define I2C_SAR_ADC_INIT_CODE_VAL 2150 #define ADC_RNG_CLKM_DIV_NUM 0 @@ -17,7 +19,18 @@ void bootloader_random_enable(void) { +#ifndef BOOTLOADER_BUILD + sar_periph_ctrl_adc_reset(); +#else + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); +#endif + adc_ll_enable_bus_clock(true); adc_ll_enable_func_clock(true); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); diff --git a/components/bootloader_support/src/bootloader_random_esp32h2.c b/components/bootloader_support/src/bootloader_random_esp32h2.c index f6576962ce..704da67826 100644 --- a/components/bootloader_support/src/bootloader_random_esp32h2.c +++ b/components/bootloader_support/src/bootloader_random_esp32h2.c @@ -9,6 +9,8 @@ #include "hal/adc_ll.h" #include "hal/adc_types.h" #include "esp_private/regi2c_ctrl.h" +#include "hal/temperature_sensor_ll.h" +#include "esp_private/sar_periph_ctrl.h" #define I2C_SAR_ADC_INIT_CODE_VAL 2150 #define ADC_RNG_CLKM_DIV_NUM 0 @@ -17,7 +19,18 @@ void bootloader_random_enable(void) { +#ifndef BOOTLOADER_BUILD + sar_periph_ctrl_adc_reset(); +#else + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); +#endif + adc_ll_enable_bus_clock(true); adc_ll_enable_func_clock(true); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); diff --git a/components/bootloader_support/src/bootloader_random_esp32p4.c b/components/bootloader_support/src/bootloader_random_esp32p4.c index c3aa42d120..9ea6237dd9 100644 --- a/components/bootloader_support/src/bootloader_random_esp32p4.c +++ b/components/bootloader_support/src/bootloader_random_esp32p4.c @@ -11,6 +11,7 @@ #include "esp_private/periph_ctrl.h" #include "esp_private/adc_share_hw_ctrl.h" +#include "esp_private/sar_periph_ctrl.h" #define I2C_SAR_ADC_INIT_CODE_VAL 2166 #define ADC_RNG_CLKM_DIV_NUM 0 @@ -19,7 +20,12 @@ void bootloader_random_enable(void) { +#ifndef BOOTLOADER_BUILD + sar_periph_ctrl_adc_reset(); +#else _adc_ll_reset_register(); +#endif + _adc_ll_enable_bus_clock(true); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); diff --git a/components/esp_adc/adc_continuous.c b/components/esp_adc/adc_continuous.c index 07bbb836bc..719fdc9791 100644 --- a/components/esp_adc/adc_continuous.c +++ b/components/esp_adc/adc_continuous.c @@ -260,9 +260,7 @@ esp_err_t adc_continuous_start(adc_continuous_handle_t handle) ANALOG_CLOCK_ENABLE(); //reset ADC digital part to reset ADC sampling EOF counter - ADC_BUS_CLK_ATOMIC() { - adc_ll_reset_register(); - } + sar_periph_ctrl_adc_reset(); #if CONFIG_PM_ENABLE if (handle->pm_lock) { @@ -357,7 +355,7 @@ esp_err_t adc_continuous_stop(adc_continuous_handle_t handle) adc_hal_digi_enable(false); adc_hal_digi_connect(false); #if ADC_LL_WORKAROUND_CLEAR_EOF_COUNTER - periph_module_reset(PERIPH_SARADC_MODULE); + sar_periph_ctrl_adc_reset(); adc_hal_digi_clr_eof(); #endif diff --git a/components/esp_adc/test_apps/adc/main/test_adc_tsens.c b/components/esp_adc/test_apps/adc/main/test_adc_tsens.c index 3a37a41e72..a3ad136b1c 100644 --- a/components/esp_adc/test_apps/adc/main/test_adc_tsens.c +++ b/components/esp_adc/test_apps/adc/main/test_adc_tsens.c @@ -85,6 +85,7 @@ TEST_CASE("Test temperature sensor work with ADC oneshot", "[adc]") TEST_ESP_OK(temperature_sensor_uninstall(temp_sensor)); } +#if SOC_ADC_DMA_SUPPORTED #if (SOC_ADC_DIGI_RESULT_BYTES == 2) #define ADC_DRIVER_TEST_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE1 #define ADC_DRIVER_TEST_GET_CHANNEL(p_data) ((p_data)->type1.channel) @@ -160,4 +161,5 @@ TEST_CASE("Test temperature sensor work with ADC continuous", "[adc]") free(result); } -#endif +#endif // SOC_ADC_DMA_SUPPORTED +#endif // SOC_TEMP_SENSOR_SUPPORTED && SOC_ADC_SUPPORTED diff --git a/components/esp_hw_support/adc_share_hw_ctrl.c b/components/esp_hw_support/adc_share_hw_ctrl.c index 15a6bfd235..6b151e044e 100644 --- a/components/esp_hw_support/adc_share_hw_ctrl.c +++ b/components/esp_hw_support/adc_share_hw_ctrl.c @@ -211,7 +211,7 @@ void adc_apb_periph_claim(void) #if SOC_RCC_IS_INDEPENDENT adc_ll_enable_func_clock(true); #endif - adc_ll_reset_register(); + sar_periph_ctrl_adc_reset(); } } diff --git a/components/esp_hw_support/include/esp_private/sar_periph_ctrl.h b/components/esp_hw_support/include/esp_private/sar_periph_ctrl.h index 58bb70e0c0..f4a7b7bb22 100644 --- a/components/esp_hw_support/include/esp_private/sar_periph_ctrl.h +++ b/components/esp_hw_support/include/esp_private/sar_periph_ctrl.h @@ -95,6 +95,34 @@ void sar_periph_ctrl_power_enable(void); */ void sar_periph_ctrl_power_disable(void); +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ + +/** +* @note For chips that temperature sensor uses part of ADC registers, +* ADC reset will reset these temperature sensor registers. +* So we need to backup and restore these temperature sensor registers when ADC reset. +* And in case temperature sensor result error during ADC reset, +* we need to acquire a lock to prevent temperature sensor readings during ADC reset. +*/ + +/** + * @brief Acquire ADC reset lock + */ +void adc_reset_lock_acquire(void); + +/** + * @brief Release ADC reset lock + */ +void adc_reset_lock_release(void); + +/** + * @brief Reset ADC module + * + */ +void sar_periph_ctrl_adc_reset(void); + #ifdef __cplusplus } #endif diff --git a/components/esp_hw_support/port/esp32/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32/sar_periph_ctrl.c index 3aef42c374..44b8c342e0 100644 --- a/components/esp_hw_support/port/esp32/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32/sar_periph_ctrl.c @@ -19,7 +19,9 @@ #include "freertos/FreeRTOS.h" #include "esp_private/sar_periph_ctrl.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; @@ -116,3 +118,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + ADC_BUS_CLK_ATOMIC() { + adc_ll_reset_register(); + } +} + +void adc_reset_lock_acquire(void) +{ + // Empty implementation +} + +void adc_reset_lock_release(void) +{ + // Empty implementation +} diff --git a/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c index 8601bf5097..c66ea25098 100644 --- a/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c @@ -21,6 +21,7 @@ #include "esp_private/sar_periph_ctrl.h" #include "esp_private/regi2c_ctrl.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" #include "hal/adc_ll.h" @@ -123,6 +124,26 @@ void sar_periph_ctrl_adc_oneshot_power_release(void) s_sar_adc_power_release(); } +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + ADC_BUS_CLK_ATOMIC() { + adc_ll_reset_register(); + } +} + +void adc_reset_lock_acquire(void) +{ + // Empty implementation +} + +void adc_reset_lock_release(void) +{ + // Empty implementation +} + void sar_periph_ctrl_adc_continuous_power_acquire(void) { abort(); //c2 not supported, should never reach here diff --git a/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c index 125af75b9c..6785577619 100644 --- a/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c @@ -15,17 +15,21 @@ * - Temp Sensor */ +#include #include "sdkconfig.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" #include "esp_private/sar_periph_ctrl.h" #include "esp_private/regi2c_ctrl.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" #include "hal/adc_ll.h" +#include "hal/temperature_sensor_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -132,3 +136,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_adc_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + // Acquire ADC reset lock to prevent temperature sensor readings during ADC reset + adc_reset_lock_acquire(); + + ADC_BUS_CLK_ATOMIC() { + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); + adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); + } + + // Release ADC reset lock after ADC reset is complete + adc_reset_lock_release(); +} + +void adc_reset_lock_acquire(void) +{ + _lock_acquire(&adc_reset_lock); +} + +void adc_reset_lock_release(void) +{ + _lock_release(&adc_reset_lock); +} diff --git a/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c index 06aef6010e..1d207b310e 100644 --- a/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c @@ -14,6 +14,7 @@ * - PWDET */ +#include #include "sdkconfig.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" @@ -21,10 +22,14 @@ #include "esp_private/regi2c_ctrl.h" #include "esp_private/esp_modem_clock.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" +#include "hal/temperature_sensor_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) { @@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + // Acquire ADC reset lock to prevent temperature sensor readings during ADC reset + adc_reset_lock_acquire(); + + ADC_BUS_CLK_ATOMIC() { + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); + adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); + } + + // Release ADC reset lock after ADC reset is complete + adc_reset_lock_release(); +} + +void adc_reset_lock_acquire(void) +{ + _lock_acquire(&adc_reset_lock); +} + +void adc_reset_lock_release(void) +{ + _lock_release(&adc_reset_lock); +} diff --git a/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c index 88f6c05506..239b744f88 100644 --- a/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c @@ -14,6 +14,7 @@ * - PWDET */ +#include #include "sdkconfig.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" @@ -21,10 +22,14 @@ #include "esp_private/regi2c_ctrl.h" #include "esp_private/esp_modem_clock.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" +#include "hal/temperature_sensor_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -121,3 +126,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + // Acquire ADC reset lock to prevent temperature sensor readings during ADC reset + adc_reset_lock_acquire(); + + ADC_BUS_CLK_ATOMIC() { + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); + adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); + } + + // Release ADC reset lock after ADC reset is complete + adc_reset_lock_release(); +} + +void adc_reset_lock_acquire(void) +{ + _lock_acquire(&adc_reset_lock); +} + +void adc_reset_lock_release(void) +{ + _lock_release(&adc_reset_lock); +} diff --git a/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c index ad07d62f33..a95c0781c6 100644 --- a/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c @@ -14,6 +14,7 @@ * - PWDET */ +#include #include "sdkconfig.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" @@ -21,10 +22,14 @@ #include "esp_private/regi2c_ctrl.h" #include "esp_private/esp_modem_clock.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" +#include "hal/temperature_sensor_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) { @@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + // Acquire ADC reset lock to prevent temperature sensor readings during ADC reset + adc_reset_lock_acquire(); + + ADC_BUS_CLK_ATOMIC() { + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); + adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); + } + + // Release ADC reset lock after ADC reset is complete + adc_reset_lock_release(); +} + +void adc_reset_lock_acquire(void) +{ + _lock_acquire(&adc_reset_lock); +} + +void adc_reset_lock_release(void) +{ + _lock_release(&adc_reset_lock); +} diff --git a/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c index 69c9d85316..93bd05ca72 100644 --- a/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c @@ -14,16 +14,21 @@ * - PWDET */ +#include #include "esp_log.h" #include "freertos/FreeRTOS.h" #include "esp_private/sar_periph_ctrl.h" #include "esp_private/regi2c_ctrl.h" #include "esp_private/esp_modem_clock.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" +#include "hal/temperature_sensor_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + // Acquire ADC reset lock to prevent temperature sensor readings during ADC reset + adc_reset_lock_acquire(); + + ADC_BUS_CLK_ATOMIC() { + // Save temperature sensor related register values before ADC reset + tsens_ll_reg_values_t saved_tsens_regs = {}; + tsens_ll_backup_registers(&saved_tsens_regs); + adc_ll_reset_register(); + // Restore temperature sensor related register values after ADC reset + temperature_sensor_ll_reset_module(); + tsens_ll_restore_registers(&saved_tsens_regs); + } + + // Release ADC reset lock after ADC reset is complete + adc_reset_lock_release(); +} + +void adc_reset_lock_acquire(void) +{ + _lock_acquire(&adc_reset_lock); +} + +void adc_reset_lock_release(void) +{ + _lock_release(&adc_reset_lock); +} diff --git a/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c index 29822ef7aa..60c6761345 100644 --- a/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c @@ -21,7 +21,9 @@ #include "esp_private/regi2c_ctrl.h" #include "esp_private/esp_modem_clock.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" +#include "hal/adc_ll.h" ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); extern portMUX_TYPE rtc_spinlock; @@ -118,3 +120,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + ADC_BUS_CLK_ATOMIC() { + adc_ll_reset_register(); + } +} + +void adc_reset_lock_acquire(void) +{ + // Empty implementation +} + +void adc_reset_lock_release(void) +{ + // Empty implementation +} diff --git a/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c index a79cc0d168..6c063298c3 100644 --- a/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c @@ -21,6 +21,7 @@ #include "esp_private/sar_periph_ctrl.h" #include "esp_private/regi2c_ctrl.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" #include "hal/adc_ll.h" @@ -118,3 +119,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { adc_ll_digi_set_power_manage(ADC_LL_POWER_BY_FSM); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + ADC_BUS_CLK_ATOMIC() { + adc_ll_reset_register(); + } +} + +void adc_reset_lock_acquire(void) +{ + // Empty implementation +} + +void adc_reset_lock_release(void) +{ + // Empty implementation +} diff --git a/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c index ee6f697dde..9d4bbc12bf 100644 --- a/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c @@ -21,6 +21,7 @@ #include "esp_private/sar_periph_ctrl.h" #include "esp_private/regi2c_ctrl.h" #include "esp_private/critical_section.h" +#include "esp_private/adc_share_hw_ctrl.h" #include "hal/sar_ctrl_ll.h" #include "hal/adc_ll.h" @@ -121,3 +122,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void) { s_sar_power_release(); } + +/*------------------------------------------------------------------------------ +* ADC Reset +*----------------------------------------------------------------------------*/ +void sar_periph_ctrl_adc_reset(void) +{ + ADC_BUS_CLK_ATOMIC() { + adc_ll_reset_register(); + } +} + +void adc_reset_lock_acquire(void) +{ + // Empty implementation +} + +void adc_reset_lock_release(void) +{ + // Empty implementation +} diff --git a/components/esp_hw_support/sar_tsens_ctrl.c b/components/esp_hw_support/sar_tsens_ctrl.c index 10daf85b95..0865c4798d 100644 --- a/components/esp_hw_support/sar_tsens_ctrl.c +++ b/components/esp_hw_support/sar_tsens_ctrl.c @@ -103,7 +103,10 @@ int16_t temp_sensor_get_raw_value(bool *range_changed) s_first_temp_read = false; } + adc_reset_lock_acquire(); result = temperature_sensor_hal_get_degree(range_changed); + adc_reset_lock_release(); + esp_os_exit_critical(&rtc_spinlock); return result; diff --git a/components/hal/esp32c3/include/hal/temperature_sensor_ll.h b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h index 9b319bfba4..15acca6ed7 100644 --- a/components/hal/esp32c3/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h @@ -172,6 +172,36 @@ static inline int temperature_sensor_ll_load_calib_param(void) return tsens_cal; } +/** + * @brief Structure for temperature sensor related register values + */ +typedef struct { + uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG) + uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_THRES1_HIGH_INT_ST_M) +} tsens_ll_reg_values_t; + +/** + * @brief Read temperature sensor related ADC register values for backup + * + * @param reg_values Output parameter, pointer to structure for storing register values + */ +static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values) +{ + reg_values->tsens_ctrl = APB_SARADC.apb_tsens_ctrl.val; + reg_values->tsens_ctrl2 = APB_SARADC.apb_tsens_ctrl2.val; +} + +/** + * @brief Restore temperature sensor related ADC register values from backup + * + * @param reg_values Input parameter, pointer to structure containing register values to restore + */ +static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values) +{ + APB_SARADC.apb_tsens_ctrl.val = reg_values->tsens_ctrl; + APB_SARADC.apb_tsens_ctrl2.val = reg_values->tsens_ctrl2; +} + #ifdef __cplusplus } #endif diff --git a/components/hal/esp32c5/include/hal/temperature_sensor_ll.h b/components/hal/esp32c5/include/hal/temperature_sensor_ll.h index b14a2a05de..7e204535b8 100644 --- a/components/hal/esp32c5/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c5/include/hal/temperature_sensor_ll.h @@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void) return tsens_cal; } +/** + * @brief Structure for temperature sensor related register values + */ +typedef struct { + uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG) + uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG) + uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG) + uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG) +} tsens_ll_reg_values_t; + +/** + * @brief Read temperature sensor related ADC register values for backup + * + * @param reg_values Output parameter, pointer to structure for storing register values + */ +static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values) +{ + reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val; + reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val; + reg_values->tsens_wake = APB_SARADC.tsens_wake.val; + reg_values->tsens_sample = APB_SARADC.tsens_sample.val; +} + +/** + * @brief Restore temperature sensor related ADC register values from backup + * + * @param reg_values Input parameter, pointer to structure containing register values to restore + */ +static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values) +{ + APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl; + APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2; + APB_SARADC.tsens_wake.val = reg_values->tsens_wake; + APB_SARADC.tsens_sample.val = reg_values->tsens_sample; +} + #ifdef __cplusplus } #endif diff --git a/components/hal/esp32c6/include/hal/temperature_sensor_ll.h b/components/hal/esp32c6/include/hal/temperature_sensor_ll.h index 82a228b75c..e9633274d1 100644 --- a/components/hal/esp32c6/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c6/include/hal/temperature_sensor_ll.h @@ -284,6 +284,60 @@ static inline int temperature_sensor_ll_load_calib_param(void) return tsens_cal; } +/** + * @brief Structure for temperature sensor related register values + */ +typedef struct { + uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG) + uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG) + uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG) + uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG) + uint32_t cali; // ADC calibration register + uint32_t clkm_conf; // ADC clock configuration register + uint32_t int_ena; // ADC interrupt enable register + uint32_t int_raw; // ADC interrupt raw status register + uint32_t int_st; // ADC interrupt status register + uint32_t int_clr; // ADC interrupt clear register +} tsens_ll_reg_values_t; + +/** + * @brief Read temperature sensor related ADC register values for backup + * + * @param reg_values Output parameter, pointer to structure for storing register values + */ +static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values) +{ + reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val; + reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val; + reg_values->tsens_wake = APB_SARADC.tsens_wake.val; + reg_values->tsens_sample = APB_SARADC.tsens_sample.val; + reg_values->cali = APB_SARADC.saradc_cali.val; + reg_values->clkm_conf = APB_SARADC.saradc_clkm_conf.val; + reg_values->int_ena = APB_SARADC.saradc_int_ena.val; + reg_values->int_raw = APB_SARADC.saradc_int_raw.val; + reg_values->int_st = APB_SARADC.saradc_int_st.val; + reg_values->int_clr = APB_SARADC.saradc_int_clr.val; +} + +/** + * @brief Restore temperature sensor related ADC register values from backup + * + * @param reg_values Input parameter, pointer to structure containing register values to restore + */ +static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values) +{ + APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl; + APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2; + APB_SARADC.tsens_wake.val = reg_values->tsens_wake; + APB_SARADC.tsens_sample.val = reg_values->tsens_sample; + APB_SARADC.saradc_cali.val = reg_values->cali; + APB_SARADC.saradc_clkm_conf.val = reg_values->clkm_conf; + APB_SARADC.saradc_int_ena.val = reg_values->int_ena; + APB_SARADC.saradc_int_raw.val = reg_values->int_raw; + APB_SARADC.saradc_int_st.val = reg_values->int_st; + APB_SARADC.saradc_int_clr.val = reg_values->int_clr; +} + #ifdef __cplusplus } #endif diff --git a/components/hal/esp32c61/include/hal/temperature_sensor_ll.h b/components/hal/esp32c61/include/hal/temperature_sensor_ll.h index 59412b75ed..db7f4f9a22 100644 --- a/components/hal/esp32c61/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c61/include/hal/temperature_sensor_ll.h @@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void) return tsens_cal; } +/** + * @brief Structure for temperature sensor related register values + */ +typedef struct { + uint32_t tsens_ctrl; // Temperature sensor control register (SARADC_APB_TSENS_CTRL_REG) + uint32_t tsens_ctrl2; // Temperature sensor control register 2 (SARADC_TSENS_CTRL2_REG) + uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG) + uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG) +} tsens_ll_reg_values_t; + +/** + * @brief Read temperature sensor related ADC register values for backup + * + * @param reg_values Output parameter, pointer to structure for storing register values + */ +static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values) +{ + reg_values->tsens_ctrl = ADC.saradc_apb_tsens_ctrl.val; + reg_values->tsens_ctrl2 = ADC.saradc_tsens_ctrl2.val; + reg_values->tsens_wake = ADC.tsens_wake.val; + reg_values->tsens_sample = ADC.tsens_sample.val; +} + +/** + * @brief Restore temperature sensor related ADC register values from backup + * + * @param reg_values Input parameter, pointer to structure containing register values to restore + */ +static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values) +{ + ADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl; + ADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2; + ADC.tsens_wake.val = reg_values->tsens_wake; + ADC.tsens_sample.val = reg_values->tsens_sample; +} + #ifdef __cplusplus } #endif diff --git a/components/hal/esp32h2/include/hal/temperature_sensor_ll.h b/components/hal/esp32h2/include/hal/temperature_sensor_ll.h index df0edc2fed..af55ad1c2e 100644 --- a/components/hal/esp32h2/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32h2/include/hal/temperature_sensor_ll.h @@ -283,6 +283,42 @@ static inline int temperature_sensor_ll_load_calib_param(void) return tsens_cal; } +/** + * @brief Structure for temperature sensor related register values + */ +typedef struct { + uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG) + uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG) + uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG) + uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG) +} tsens_ll_reg_values_t; + +/** + * @brief Read temperature sensor related ADC register values for backup + * + * @param reg_values Output parameter, pointer to structure for storing register values + */ +static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values) +{ + reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val; + reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val; + reg_values->tsens_wake = APB_SARADC.tsens_wake.val; + reg_values->tsens_sample = APB_SARADC.tsens_sample.val; +} + +/** + * @brief Restore temperature sensor related ADC register values from backup + * + * @param reg_values Input parameter, pointer to structure containing register values to restore + */ +static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values) +{ + APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl; + APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2; + APB_SARADC.tsens_wake.val = reg_values->tsens_wake; + APB_SARADC.tsens_sample.val = reg_values->tsens_sample; +} + #ifdef __cplusplus } #endif