alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

I2C: patch for solving watchdog timeout issue

Browse Source
This commit is contained in:
Cao Sen Miao 2022-05-17 16:36:40 +08:00
parent 9f2d407105
commit 04f7c342f0
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/driver/i2c.c
View File

@ -476,6 +476,14 @@ static void IRAM_ATTR i2c_isr_handler_default(void *arg)
{ {
i2c_obj_t *p_i2c = (i2c_obj_t *) arg; i2c_obj_t *p_i2c = (i2c_obj_t *) arg;
int i2c_num = p_i2c->i2c_num; int i2c_num = p_i2c->i2c_num;
// Interrupt protection.
// On C3 and S3 targets, the I2C may trigger a spurious interrupt,
// in order to detect these false positive, check the I2C's hardware interrupt mask
uint32_t int_mask;
i2c_hal_get_intsts_mask(&(i2c_context[i2c_num].hal), &int_mask);
if (int_mask == 0) {
return;
}
i2c_intr_event_t evt_type = I2C_INTR_EVENT_ERR; i2c_intr_event_t evt_type = I2C_INTR_EVENT_ERR;
portBASE_TYPE HPTaskAwoken = pdFALSE; portBASE_TYPE HPTaskAwoken = pdFALSE;
if (p_i2c->mode == I2C_MODE_MASTER) { if (p_i2c->mode == I2C_MODE_MASTER) {
@ -499,6 +507,9 @@ static void IRAM_ATTR i2c_isr_handler_default(void *arg)
if (p_i2c->status != I2C_STATUS_ACK_ERROR && p_i2c->status != I2C_STATUS_IDLE) { if (p_i2c->status != I2C_STATUS_ACK_ERROR && p_i2c->status != I2C_STATUS_IDLE) {
i2c_master_cmd_begin_static(i2c_num); i2c_master_cmd_begin_static(i2c_num);
} }
} else {
// Do nothing if there is no proper event.
return;
} }
i2c_cmd_evt_t evt = { i2c_cmd_evt_t evt = {
.type = I2C_CMD_EVT_ALIVE .type = I2C_CMD_EVT_ALIVE
@ -596,6 +607,8 @@ static esp_err_t i2c_master_clear_bus(i2c_port_t i2c_num)
**/ **/
static esp_err_t i2c_hw_fsm_reset(i2c_port_t i2c_num) static esp_err_t i2c_hw_fsm_reset(i2c_port_t i2c_num)
{ {
// A workaround for avoiding cause timeout issue when using
// hardware reset.
#if !SOC_I2C_SUPPORT_HW_FSM_RST #if !SOC_I2C_SUPPORT_HW_FSM_RST
int scl_low_period, scl_high_period; int scl_low_period, scl_high_period;
int scl_start_hold, scl_rstart_setup; int scl_start_hold, scl_rstart_setup;

2
components/soc/esp32c3/include/soc/soc_caps.h
View File

@ -127,7 +127,7 @@
#define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */ #define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */
#define SOC_I2C_SUPPORT_HW_FSM_RST (1) // FSM_RST only resets the FSM, not using it. So SOC_I2C_SUPPORT_HW_FSM_RST not defined.
#define SOC_I2C_SUPPORT_HW_CLR_BUS (1) #define SOC_I2C_SUPPORT_HW_CLR_BUS (1)
#define SOC_I2C_SUPPORT_XTAL (1) #define SOC_I2C_SUPPORT_XTAL (1)

2
components/soc/esp32h2/include/soc/soc_caps.h
View File

@ -115,7 +115,7 @@
#define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */ #define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */
#define SOC_I2C_SUPPORT_HW_FSM_RST (1) // FSM_RST only resets the FSM, not using it. So SOC_I2C_SUPPORT_HW_FSM_RST not defined.
#define SOC_I2C_SUPPORT_HW_CLR_BUS (1) #define SOC_I2C_SUPPORT_HW_CLR_BUS (1)
#define SOC_I2C_SUPPORT_XTAL (1) #define SOC_I2C_SUPPORT_XTAL (1)

3
components/soc/esp32s2/include/soc/soc_caps.h
View File

@ -127,8 +127,7 @@
#define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */ #define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */
//ESP32-S2 support hardware FSM reset // FSM_RST only resets the FSM, not using it. So SOC_I2C_SUPPORT_HW_FSM_RST not defined.
#define SOC_I2C_SUPPORT_HW_FSM_RST (1)
//ESP32-S2 support hardware clear bus //ESP32-S2 support hardware clear bus
#define SOC_I2C_SUPPORT_HW_CLR_BUS (1) #define SOC_I2C_SUPPORT_HW_CLR_BUS (1)

3
components/soc/esp32s3/include/soc/i2c_caps.h
View File

@ -23,8 +23,7 @@ extern "C" {
#define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */ #define SOC_I2C_FIFO_LEN (32) /*!< I2C hardware FIFO depth */
//ESP32-S3 support hardware FSM reset // FSM_RST only resets the FSM, not using it. So SOC_I2C_SUPPORT_HW_FSM_RST not defined.
#define SOC_I2C_SUPPORT_HW_FSM_RST (1)
//ESP32-S3 support hardware clear bus //ESP32-S3 support hardware clear bus
#define SOC_I2C_SUPPORT_HW_CLR_BUS (1) #define SOC_I2C_SUPPORT_HW_CLR_BUS (1)