fix(tsens): fix temp_sensor affect by adc reset

This commit is contained in:
gaoxu
2026-04-16 19:23:17 +08:00
committed by BOT
parent 512be3eabf
commit dfa50ddeb4
23 changed files with 602 additions and 26 deletions
@@ -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();
}
}
@@ -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
@@ -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
}
@@ -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
@@ -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 <sys/lock.h>
#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);
}
@@ -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 <sys/lock.h>
#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);
}
@@ -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 <sys/lock.h>
#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);
}
@@ -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 <sys/lock.h>
#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);
}
@@ -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 <sys/lock.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);
}
@@ -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
}
@@ -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
}
@@ -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
}