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

Merge branch 'fix/spi_hd_seg_fix_iwdt_timeout_v5.1' into 'release/v5.1'

Browse Source 
fix(spi_slave_hd): fix seg mode potential iwdt timeout when multi task call (v5.1)

See merge request espressif/esp-idf!31844
This commit is contained in:
Jiang Jiang Jian 2024-09-20 13:34:59 +08:00
commit a28a3a460d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/driver/spi/gpspi/spi_slave_hd.c
View File

@ -42,8 +42,8 @@ typedef struct {
QueueHandle_t tx_ret_queue;
QueueHandle_t rx_trans_queue;
QueueHandle_t rx_ret_queue;
QueueHandle_t tx_cnting_sem;
QueueHandle_t rx_cnting_sem;
SemaphoreHandle_t tx_cnting_sem;
SemaphoreHandle_t rx_cnting_sem;
spi_slave_hd_data_t *tx_desc;
spi_slave_hd_data_t *rx_desc;
@ -291,16 +291,14 @@ static IRAM_ATTR void spi_slave_hd_intr_segment(void *arg)
awoken |= intr_check_clear_callback(host, SPI_EV_CMD9, callback->cb_cmd9);
awoken |= intr_check_clear_callback(host, SPI_EV_CMDA, callback->cb_cmdA);
bool tx_done = false;
bool rx_done = false;
bool tx_done = false, rx_done = false;
bool tx_event = false, rx_event = false;
portENTER_CRITICAL_ISR(&host->int_spinlock);
if (host->tx_desc && spi_slave_hd_hal_check_disable_event(hal, SPI_EV_SEND)) {
tx_done = true;
}
if (host->rx_desc && spi_slave_hd_hal_check_disable_event(hal, SPI_EV_RECV)) {
rx_done = true;
}
tx_event = spi_slave_hd_hal_check_disable_event(hal, SPI_EV_SEND);
rx_event = spi_slave_hd_hal_check_disable_event(hal, SPI_EV_RECV);
tx_done = host->tx_desc && tx_event;
rx_done = host->rx_desc && rx_event;
portEXIT_CRITICAL_ISR(&host->int_spinlock);
if (tx_done) {