fix(tsens): fix temp_sensor affect by adc reset

This commit is contained in:
gaoxu
2025-09-19 11:56:44 +08:00
committed by Gao Xu
parent 9619d2b05a
commit e5c6b87c10
25 changed files with 577 additions and 6 deletions

View File

@@ -10,6 +10,8 @@
#include "hal/adc_types.h" #include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "soc/lpperi_reg.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 I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0 #define ADC_RNG_CLKM_DIV_NUM 0
@@ -18,7 +20,18 @@
void bootloader_random_enable(void) 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(); 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_bus_clock(true);
adc_ll_enable_func_clock(true); adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
#include "hal/adc_types.h" #include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.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 I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0 #define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,17 @@
void bootloader_random_enable(void) 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(); 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_bus_clock(true);
adc_ll_enable_func_clock(true); adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
#include "hal/adc_types.h" #include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.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 I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0 #define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,18 @@
void bootloader_random_enable(void) 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(); 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_bus_clock(true);
adc_ll_enable_func_clock(true); adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
#include "hal/adc_types.h" #include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.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 I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0 #define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,18 @@
void bootloader_random_enable(void) 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(); 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_bus_clock(true);
adc_ll_enable_func_clock(true); adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

View File

@@ -11,6 +11,7 @@
#include "esp_private/periph_ctrl.h" #include "esp_private/periph_ctrl.h"
#include "esp_private/adc_share_hw_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 I2C_SAR_ADC_INIT_CODE_VAL 2166
#define ADC_RNG_CLKM_DIV_NUM 0 #define ADC_RNG_CLKM_DIV_NUM 0
@@ -19,7 +20,12 @@
void bootloader_random_enable(void) void bootloader_random_enable(void)
{ {
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
_adc_ll_reset_register(); _adc_ll_reset_register();
#endif
_adc_ll_enable_bus_clock(true); _adc_ll_enable_bus_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL); adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

View File

@@ -260,9 +260,7 @@ esp_err_t adc_continuous_start(adc_continuous_handle_t handle)
ANALOG_CLOCK_ENABLE(); ANALOG_CLOCK_ENABLE();
//reset ADC digital part to reset ADC sampling EOF counter //reset ADC digital part to reset ADC sampling EOF counter
ADC_BUS_CLK_ATOMIC() { sar_periph_ctrl_adc_reset();
adc_ll_reset_register();
}
#if CONFIG_PM_ENABLE #if CONFIG_PM_ENABLE
if (handle->pm_lock) { 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_enable(false);
adc_hal_digi_connect(false); adc_hal_digi_connect(false);
#if ADC_LL_WORKAROUND_CLEAR_EOF_COUNTER #if ADC_LL_WORKAROUND_CLEAR_EOF_COUNTER
periph_module_reset(PERIPH_SARADC_MODULE); sar_periph_ctrl_adc_reset();
adc_hal_digi_clr_eof(); adc_hal_digi_clr_eof();
#endif #endif

View File

@@ -85,6 +85,7 @@ TEST_CASE("Test temperature sensor work with ADC oneshot", "[adc]")
TEST_ESP_OK(temperature_sensor_uninstall(temp_sensor)); TEST_ESP_OK(temperature_sensor_uninstall(temp_sensor));
} }
#if SOC_ADC_DMA_SUPPORTED
#if (SOC_ADC_DIGI_RESULT_BYTES == 2) #if (SOC_ADC_DIGI_RESULT_BYTES == 2)
#define ADC_DRIVER_TEST_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE1 #define ADC_DRIVER_TEST_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE1
#define ADC_DRIVER_TEST_GET_CHANNEL(p_data) ((p_data)->type1.channel) #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); free(result);
} }
#endif #endif // SOC_ADC_DMA_SUPPORTED
#endif // SOC_TEMP_SENSOR_SUPPORTED && SOC_ADC_SUPPORTED

View File

@@ -211,7 +211,7 @@ void adc_apb_periph_claim(void)
#if SOC_RCC_IS_INDEPENDENT #if SOC_RCC_IS_INDEPENDENT
adc_ll_enable_func_clock(true); adc_ll_enable_func_clock(true);
#endif #endif
adc_ll_reset_register(); sar_periph_ctrl_adc_reset();
} }
} }

View File

@@ -95,6 +95,34 @@ void sar_periph_ctrl_power_enable(void);
*/ */
void sar_periph_ctrl_power_disable(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 #ifdef __cplusplus
} }
#endif #endif

View File

@@ -19,7 +19,9 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
@@ -116,3 +118,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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
}

View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_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(); 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) void sar_periph_ctrl_adc_continuous_power_acquire(void)
{ {
abort(); //c2 not supported, should never reach here abort(); //c2 not supported, should never reach here

View File

@@ -15,17 +15,21 @@
* - Temp Sensor * - Temp Sensor
*/ */
#include <sys/lock.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void) void sar_periph_ctrl_init(void)
@@ -132,3 +136,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_adc_power_release(); 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);
}

View File

@@ -14,6 +14,7 @@
* - PWDET * - PWDET
*/ */
#include <sys/lock.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.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"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void) void sar_periph_ctrl_init(void)
{ {
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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);
}

View File

@@ -14,6 +14,7 @@
* - PWDET * - PWDET
*/ */
#include <sys/lock.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.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"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void) void sar_periph_ctrl_init(void)
@@ -121,3 +126,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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);
}

View File

@@ -14,6 +14,7 @@
* - PWDET * - PWDET
*/ */
#include <sys/lock.h>
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.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"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void) void sar_periph_ctrl_init(void)
{ {
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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);
}

View File

@@ -14,16 +14,21 @@
* - PWDET * - PWDET
*/ */
#include <sys/lock.h>
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.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"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void) void sar_periph_ctrl_init(void)
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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);
}

View File

@@ -21,7 +21,9 @@
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl"); ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock; extern portMUX_TYPE rtc_spinlock;
@@ -118,3 +120,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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
}

View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_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_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
}

View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h" #include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h" #include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h" #include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h" #include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h" #include "hal/adc_ll.h"
@@ -121,3 +122,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{ {
s_sar_power_release(); 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
}

View File

@@ -103,7 +103,10 @@ int16_t temp_sensor_get_raw_value(bool *range_changed)
s_first_temp_read = false; s_first_temp_read = false;
} }
adc_reset_lock_acquire();
result = temperature_sensor_hal_get_degree(range_changed); result = temperature_sensor_hal_get_degree(range_changed);
adc_reset_lock_release();
esp_os_exit_critical(&rtc_spinlock); esp_os_exit_critical(&rtc_spinlock);
return result; return result;

View File

@@ -172,6 +172,36 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal; 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 #ifdef __cplusplus
} }
#endif #endif

View File

@@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal; 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 #ifdef __cplusplus
} }
#endif #endif

View File

@@ -284,6 +284,60 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal; 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 #ifdef __cplusplus
} }
#endif #endif

View File

@@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal; 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 #ifdef __cplusplus
} }
#endif #endif

View File

@@ -283,6 +283,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal; 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 #ifdef __cplusplus
} }
#endif #endif