From dfa50ddeb40dbd65bdfe01ef68f6f0ba462aade7 Mon Sep 17 00:00:00 2001 From: gaoxu Date: Thu, 26 Mar 2026 15:23:42 +0800 Subject: [PATCH] fix(tsens): fix temp_sensor affect by adc reset --- .../src/bootloader_random_esp32c5.c | 13 +++++ .../src/bootloader_random_esp32c6.c | 14 ++++- .../src/bootloader_random_esp32c61.c | 15 ++++- .../src/bootloader_random_esp32h2.c | 15 ++++- .../src/bootloader_random_esp32p4.c | 8 ++- components/esp_adc/adc_continuous.c | 8 +-- components/esp_hw_support/adc_share_hw_ctrl.c | 2 +- .../include/esp_private/sar_periph_ctrl.h | 30 +++++++++- .../port/esp32/sar_periph_ctrl.c | 25 ++++++++- .../port/esp32c2/sar_periph_ctrl.c | 24 +++++++- .../port/esp32c3/sar_periph_ctrl.c | 39 ++++++++++++- .../port/esp32c5/sar_periph_ctrl.c | 40 ++++++++++++- .../port/esp32c6/sar_periph_ctrl.c | 40 ++++++++++++- .../port/esp32c61/sar_periph_ctrl.c | 40 ++++++++++++- .../port/esp32h2/sar_periph_ctrl.c | 40 ++++++++++++- .../port/esp32p4/sar_periph_ctrl.c | 25 ++++++++- .../port/esp32s2/sar_periph_ctrl.c | 24 +++++++- .../port/esp32s3/sar_periph_ctrl.c | 24 +++++++- .../include/hal/temperature_sensor_ll.h | 32 ++++++++++- .../include/hal/temperature_sensor_ll.h | 38 ++++++++++++- .../include/hal/temperature_sensor_ll.h | 56 ++++++++++++++++++- .../include/hal/temperature_sensor_ll.h | 38 ++++++++++++- .../include/hal/temperature_sensor_ll.h | 38 ++++++++++++- 23 files changed, 602 insertions(+), 26 deletions(-) diff --git a/components/bootloader_support/src/bootloader_random_esp32c5.c b/components/bootloader_support/src/bootloader_random_esp32c5.c index 826aa785eed..e3b70d25cda 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c5.c +++ b/components/bootloader_support/src/bootloader_random_esp32c5.c @@ -11,12 +11,25 @@ #include "hal/rng_ll.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 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 de45f07c327..09e4204aa7f 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c6.c +++ b/components/bootloader_support/src/bootloader_random_esp32c6.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,12 +9,24 @@ #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 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 1f1e2ad9ffa..7914a9f5c8e 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c61.c +++ b/components/bootloader_support/src/bootloader_random_esp32c61.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,12 +9,25 @@ #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 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 4c4f5155a70..8bd0ab58fa1 100644 --- a/components/bootloader_support/src/bootloader_random_esp32h2.c +++ b/components/bootloader_support/src/bootloader_random_esp32h2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,12 +9,25 @@ #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 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 0a9f90ac9df..ee9d67c97ff 100644 --- a/components/bootloader_support/src/bootloader_random_esp32p4.c +++ b/components/bootloader_support/src/bootloader_random_esp32p4.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -12,6 +12,7 @@ #include "esp_private/periph_ctrl.h" #include "esp_private/adc_share_hw_ctrl.h" +#include "esp_private/sar_periph_ctrl.h" #if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300 #include "hal/trng_ll.h" @@ -24,7 +25,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 ef59ad56712..d7455f1063b 100644 --- a/components/esp_adc/adc_continuous.c +++ b/components/esp_adc/adc_continuous.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2016-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -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 (handle->pm_lock) { ESP_RETURN_ON_ERROR(esp_pm_lock_acquire(handle->pm_lock), ADC_TAG, "acquire pm_lock failed"); @@ -359,7 +357,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_hw_support/adc_share_hw_ctrl.c b/components/esp_hw_support/adc_share_hw_ctrl.c index a9054d47a13..4cfce311f40 100644 --- a/components/esp_hw_support/adc_share_hw_ctrl.c +++ b/components/esp_hw_support/adc_share_hw_ctrl.c @@ -210,7 +210,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 b6a0fdf7419..9736a7bb7d3 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 @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -102,6 +102,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 e14cbc40a85..9f9dab410fd 100644 --- a/components/esp_hw_support/port/esp32/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -18,7 +18,10 @@ #include "esp_log.h" #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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; @@ -115,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 72291ca7523..e9c4c8bd0c8 100644 --- a/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,6 +20,8 @@ #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" @@ -122,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 3cc9f2ee54f..06fa7b53f40 100644 --- a/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -15,16 +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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -131,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 2e93cd24702..ad4d8b5dc25 100644 --- a/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,16 +14,22 @@ * - PWDET */ +#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/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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) { @@ -119,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 0e000a05032..28f6a16588e 100644 --- a/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,16 +14,22 @@ * - PWDET */ +#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/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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -120,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 cdbfa91b9de..c2564e887a5 100644 --- a/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,16 +14,22 @@ * - PWDET */ +#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/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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) { @@ -119,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 c233f4dd40f..0110bfb804d 100644 --- a/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,15 +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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; +static _lock_t adc_reset_lock; void sar_periph_ctrl_init(void) @@ -119,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 8317b56e515..a571b8a6423 100644 --- a/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,7 +20,10 @@ #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" static const char *TAG = "sar_periph_ctrl"; extern portMUX_TYPE rtc_spinlock; @@ -117,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 19bc7eeddf6..36bccf0f68d 100644 --- a/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,6 +20,8 @@ #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" @@ -117,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 2592dc718d3..159f0fd2126 100644 --- a/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c +++ b/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,6 +20,8 @@ #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" @@ -120,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/hal/esp32c3/include/hal/temperature_sensor_ll.h b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h index 38902bac730..4eca525059a 100644 --- a/components/hal/esp32c3/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c3/include/hal/temperature_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -151,6 +151,36 @@ static inline void temperature_sensor_ll_set_clk_div(uint8_t clk_div) HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.apb_tsens_ctrl, tsens_clk_div, clk_div); } +/** + * @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 4c73df1a1fa..c055004823e 100644 --- a/components/hal/esp32c5/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c5/include/hal/temperature_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -266,6 +266,42 @@ static inline void temperature_sensor_ll_set_sample_rate(uint16_t rate) HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.tsens_sample, saradc_tsens_sample_rate, rate); } +/** + * @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 4c73df1a1fa..bb351094690 100644 --- a/components/hal/esp32c6/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c6/include/hal/temperature_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -266,6 +266,60 @@ static inline void temperature_sensor_ll_set_sample_rate(uint16_t rate) HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.tsens_sample, saradc_tsens_sample_rate, rate); } +/** + * @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 1e6d3b013f0..db9c2a43069 100644 --- a/components/hal/esp32c61/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32c61/include/hal/temperature_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -266,6 +266,42 @@ static inline void temperature_sensor_ll_set_sample_rate(uint16_t rate) HAL_FORCE_MODIFY_U32_REG_FIELD(ADC.tsens_sample, saradc_tsens_sample_rate, rate); } +/** + * @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 71e9d875072..e32b1fec05a 100644 --- a/components/hal/esp32h2/include/hal/temperature_sensor_ll.h +++ b/components/hal/esp32h2/include/hal/temperature_sensor_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -265,6 +265,42 @@ static inline void temperature_sensor_ll_set_sample_rate(uint16_t rate) HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.tsens_sample, saradc_tsens_sample_rate, rate); } +/** + * @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