espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

sdmmc host: when parameter validation fails, exit cleanly

Browse Source 
This fixes lock-up which happened when sending a command, if the
previous command has failed.
This commit is contained in:
Ivan Grokhotkov
2018-04-23 14:38:00 +08:00
parent 92a16ac6e6
commit 829c6cef39
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/driver/sdmmc_transaction.c
View File

@@ -112,6 +112,7 @@ void sdmmc_host_transaction_handler_deinit()
esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo) esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo)
{ {
esp_err_t ret;
xSemaphoreTake(s_request_mutex, portMAX_DELAY); xSemaphoreTake(s_request_mutex, portMAX_DELAY);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_acquire(s_pm_lock); esp_pm_lock_acquire(s_pm_lock);
@@ -124,12 +125,14 @@ esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo)
if (cmdinfo->datalen < 4 || cmdinfo->blklen % 4 != 0) { if (cmdinfo->datalen < 4 || cmdinfo->blklen % 4 != 0) {
ESP_LOGD(TAG, "%s: invalid size: total=%d block=%d", ESP_LOGD(TAG, "%s: invalid size: total=%d block=%d",
__func__, cmdinfo->datalen, cmdinfo->blklen); __func__, cmdinfo->datalen, cmdinfo->blklen);
return ESP_ERR_INVALID_SIZE; ret = ESP_ERR_INVALID_SIZE;
goto out;
} }
if ((intptr_t) cmdinfo->data % 4 != 0 || if ((intptr_t) cmdinfo->data % 4 != 0 ||
!esp_ptr_dma_capable(cmdinfo->data)) { !esp_ptr_dma_capable(cmdinfo->data)) {
ESP_LOGD(TAG, "%s: buffer %p can not be used for DMA", __func__, cmdinfo->data); ESP_LOGD(TAG, "%s: buffer %p can not be used for DMA", __func__, cmdinfo->data);
return ESP_ERR_INVALID_ARG; ret = ESP_ERR_INVALID_ARG;
goto out;
} }
// this clears "owned by IDMAC" bits // this clears "owned by IDMAC" bits
memset(s_dma_desc, 0, sizeof(s_dma_desc)); memset(s_dma_desc, 0, sizeof(s_dma_desc));
@@ -146,10 +149,9 @@ esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo)
sdmmc_host_dma_prepare(&s_dma_desc[0], cmdinfo->blklen, cmdinfo->datalen); sdmmc_host_dma_prepare(&s_dma_desc[0], cmdinfo->blklen, cmdinfo->datalen);
} }
// write command into hardware, this also sends the command to the card // write command into hardware, this also sends the command to the card
esp_err_t ret = sdmmc_host_start_command(slot, hw_cmd, cmdinfo->arg); ret = sdmmc_host_start_command(slot, hw_cmd, cmdinfo->arg);
if (ret != ESP_OK) { if (ret != ESP_OK) {
xSemaphoreGive(s_request_mutex); goto out;
return ret;
} }
// process events until transfer is complete // process events until transfer is complete
cmdinfo->error = ESP_OK; cmdinfo->error = ESP_OK;
@@ -161,6 +163,8 @@ esp_err_t sdmmc_host_do_transaction(int slot, sdmmc_command_t* cmdinfo)
} }
} }
s_is_app_cmd = (ret == ESP_OK && cmdinfo->opcode == MMC_APP_CMD); s_is_app_cmd = (ret == ESP_OK && cmdinfo->opcode == MMC_APP_CMD);
out:
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_release(s_pm_lock); esp_pm_lock_release(s_pm_lock);
#endif #endif