espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/sdio_slave_recv_isr_load' into 'master'

Browse Source 
sdio_slave: fix the recv crash when trans finish and load at the same time

See merge request idf/esp-idf!3217
This commit is contained in:
Ivan Grokhotkov
2018-09-10 14:37:18 +08:00
parent 27d1b04500 8f88a81f30
commit c76b6d07f0
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/driver/sdio_slave.c
View File

@@ -155,7 +155,7 @@ typedef struct {
SemaphoreHandle_t remain_cnt; SemaphoreHandle_t remain_cnt;
} sdio_ringbuf_t; } sdio_ringbuf_t;
#define offset_of(type, field) ((unsigned int)&(((type *)(0))->field)) #define offset_of(type, field) ((unsigned int)&(((type *)(0))->field))
typedef enum { typedef enum {
ringbuf_write_ptr = offset_of(sdio_ringbuf_t, write_ptr), ringbuf_write_ptr = offset_of(sdio_ringbuf_t, write_ptr),
ringbuf_read_ptr = offset_of(sdio_ringbuf_t, read_ptr), ringbuf_read_ptr = offset_of(sdio_ringbuf_t, read_ptr),
@@ -266,7 +266,7 @@ no_mem:
} }
//calculate a pointer with offset to a original pointer of the specific ringbuffer //calculate a pointer with offset to a original pointer of the specific ringbuffer
static inline uint8_t* sdio_ringbuf_offset_ptr(sdio_ringbuf_t *buf, sdio_ringbuf_pointer_t ptr, uint32_t offset) static inline uint8_t* sdio_ringbuf_offset_ptr(sdio_ringbuf_t *buf, sdio_ringbuf_pointer_t ptr, uint32_t offset)
{ {
uint8_t *buf_ptr = (uint8_t*)*(uint32_t*)(((uint8_t*)buf)+ptr); //get the specific pointer of the buffer uint8_t *buf_ptr = (uint8_t*)*(uint32_t*)(((uint8_t*)buf)+ptr); //get the specific pointer of the buffer
uint8_t *offset_ptr=buf_ptr+offset; uint8_t *offset_ptr=buf_ptr+offset;
@@ -492,9 +492,9 @@ static inline esp_err_t sdio_slave_hw_init(sdio_slave_config_t *config)
configure_pin(slot->d0_gpio, slot->func, pullup); configure_pin(slot->d0_gpio, slot->func, pullup);
if ((config->flags & SDIO_SLAVE_FLAG_HOST_INTR_DISABLED)==0) { if ((config->flags & SDIO_SLAVE_FLAG_HOST_INTR_DISABLED)==0) {
configure_pin(slot->d1_gpio, slot->func, pullup); configure_pin(slot->d1_gpio, slot->func, pullup);
} }
if ((config->flags & SDIO_SLAVE_FLAG_DAT2_DISABLED)==0) { if ((config->flags & SDIO_SLAVE_FLAG_DAT2_DISABLED)==0) {
configure_pin(slot->d2_gpio, slot->func, pullup); configure_pin(slot->d2_gpio, slot->func, pullup);
} }
configure_pin(slot->d3_gpio, slot->func, pullup); configure_pin(slot->d3_gpio, slot->func, pullup);
@@ -1143,9 +1143,12 @@ static void sdio_intr_recv(void* arg)
// This may cause the ``cur_ret`` pointer to be NULL, indicating the list is empty, // This may cause the ``cur_ret`` pointer to be NULL, indicating the list is empty,
// in this case the ``tx_done`` should happen no longer until new desc is appended. // in this case the ``tx_done`` should happen no longer until new desc is appended.
// The app is responsible to place the pointer to the right place again when appending new desc. // The app is responsible to place the pointer to the right place again when appending new desc.
critical_enter_recv();
context.recv_cur_ret = STAILQ_NEXT(context.recv_cur_ret, qe); context.recv_cur_ret = STAILQ_NEXT(context.recv_cur_ret, qe);
critical_exit_recv();
ESP_EARLY_LOGV(TAG, "intr_recv: Give"); ESP_EARLY_LOGV(TAG, "intr_recv: Give");
xSemaphoreGiveFromISR(context.recv_event, &yield); xSemaphoreGiveFromISR(context.recv_event, &yield);
SLC.slc0_int_clr.tx_done = 1;
}; };
} }
if (yield) portYIELD_FROM_ISR(); if (yield) portYIELD_FROM_ISR();
@@ -1166,19 +1169,9 @@ esp_err_t sdio_slave_recv_load_buf(sdio_slave_buf_handle_t handle)
buf_desc_t *const tail = STAILQ_LAST(queue, buf_desc_s, qe); buf_desc_t *const tail = STAILQ_LAST(queue, buf_desc_s, qe);
STAILQ_INSERT_TAIL(queue, desc, qe); STAILQ_INSERT_TAIL(queue, desc, qe);
if (tail == NULL || (tail->owner == 0)) { if (context.recv_cur_ret == NULL) {
//in this case we have to set the ret pointer
if (tail != NULL) {
/* if the owner of the tail is returned to the software, the ISR is
* expect to write this pointer to NULL in a short time, wait until
* that and set new value for this pointer
*/
while (context.recv_cur_ret != NULL) {}
}
assert(context.recv_cur_ret == NULL);
context.recv_cur_ret = desc; context.recv_cur_ret = desc;
} }
assert(context.recv_cur_ret != NULL);
if (tail == NULL) { if (tail == NULL) {
//no one in the ll, start new ll operation. //no one in the ll, start new ll operation.