Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/spi_concurrency_3.2' into 'release/v3.2'

Browse source 
spi: fix a possible concurrency issue (port to v3.2)

See merge request idf/esp-idf!5278
This commit is contained in:
Angus Gratton 2019-06-21 13:22:22 +08:00
commit b34a0874b1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/driver/spi_slave.c
View file

@ -429,12 +429,14 @@ static void SPI_SLAVE_ISR_ATTR spi_intr(void *arg)
} }
} }
//Disable interrupt before checking to avoid concurrency issue.
esp_intr_disable(host->intr);
//Grab next transaction //Grab next transaction
r = xQueueReceiveFromISR(host->trans_queue, &trans, &do_yield); r = xQueueReceiveFromISR(host->trans_queue, &trans, &do_yield);
if (!r) { if (r) {
//No packet waiting. Disable interrupt. //enable the interrupt again if there is packet to send
esp_intr_disable(host->intr); esp_intr_enable(host->intr);
} else {
//We have a transaction. Send it. //We have a transaction. Send it.
host->hw->slave.trans_done = 0; //clear int bit host->hw->slave.trans_done = 0; //clear int bit
host->cur_trans = trans; host->cur_trans = trans;