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

fix(sdmmc): Send status (CMD13) even if write/read command fails

Browse Source
This commit is contained in:
Adam Múdry
2024-10-15 23:22:27 +02:00
committed by BOT
parent 3f838d7843
commit 9c7609a0e7
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/sdmmc/include/sd_protocol_defs.h
View File

@@ -108,7 +108,7 @@ extern "C" {
#define MMC_R1_CURRENT_STATE_POS (9) #define MMC_R1_CURRENT_STATE_POS (9)
#define MMC_R1_CURRENT_STATE_MASK (0x1E00)/* card current state */ #define MMC_R1_CURRENT_STATE_MASK (0x1E00)/* card current state */
#define MMC_R1_CURRENT_STATE_TRAN (4) #define MMC_R1_CURRENT_STATE_TRAN (4)
#define MMC_R1_CURRENT_STATE_STATUS(status) ((status & MMC_R1_CURRENT_STATE_MASK) >> MMC_R1_CURRENT_STATE_POS) #define MMC_R1_CURRENT_STATE_STATUS(status) (((status) & MMC_R1_CURRENT_STATE_MASK) >> MMC_R1_CURRENT_STATE_POS)
/* SPI mode R1 response type bits */ /* SPI mode R1 response type bits */
#define SD_SPI_R1_IDLE_STATE (1<<0) #define SD_SPI_R1_IDLE_STATE (1<<0)

30
components/sdmmc/sdmmc_cmd.c
View File

@@ -444,7 +444,7 @@ esp_err_t sdmmc_write_sectors(sdmmc_card_t* card, const void* src,
return err; return err;
} }
static bool mmc_ready_for_data(uint32_t status) static bool sdmmc_ready_for_data(uint32_t status)
{ {
return (status & MMC_R1_READY_FOR_DATA) && (MMC_R1_CURRENT_STATE_STATUS(status) == MMC_R1_CURRENT_STATE_TRAN); return (status & MMC_R1_READY_FOR_DATA) && (MMC_R1_CURRENT_STATE_STATUS(status) == MMC_R1_CURRENT_STATE_TRAN);
} }
@@ -474,18 +474,26 @@ esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src,
} else { } else {
cmd.arg = start_block * block_size; cmd.arg = start_block * block_size;
} }
uint32_t status = 0;
esp_err_t err = sdmmc_send_cmd(card, &cmd); esp_err_t err = sdmmc_send_cmd(card, &cmd);
esp_err_t err_cmd13 = sdmmc_send_cmd_send_status(card, &status);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err); if (err_cmd13 == ESP_OK) {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x, status 0x%" PRIx32, __func__, err, status);
} else {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x, failed to get status (0x%x)", __func__, err, err_cmd13);
}
return err; return err;
} }
uint32_t status = 0;
size_t count = 0; size_t count = 0;
int64_t yield_delay_us = 100 * 1000; // initially 100ms int64_t yield_delay_us = 100 * 1000; // initially 100ms
int64_t t0 = esp_timer_get_time(); int64_t t0 = esp_timer_get_time();
int64_t t1 = 0; int64_t t1 = 0;
/* SD mode: wait for the card to become idle based on R1 status */ /* SD mode: wait for the card to become idle based on R1 status */
while (!host_is_spi(card) && !mmc_ready_for_data(status)) { while (!host_is_spi(card) && !sdmmc_ready_for_data(status)) {
t1 = esp_timer_get_time(); t1 = esp_timer_get_time();
if (t1 - t0 > SDMMC_READY_FOR_DATA_TIMEOUT_US) { if (t1 - t0 > SDMMC_READY_FOR_DATA_TIMEOUT_US) {
ESP_LOGE(TAG, "write sectors dma - timeout"); ESP_LOGE(TAG, "write sectors dma - timeout");
@@ -596,18 +604,26 @@ esp_err_t sdmmc_read_sectors_dma(sdmmc_card_t* card, void* dst,
} else { } else {
cmd.arg = start_block * block_size; cmd.arg = start_block * block_size;
} }
uint32_t status = 0;
esp_err_t err = sdmmc_send_cmd(card, &cmd); esp_err_t err = sdmmc_send_cmd(card, &cmd);
esp_err_t err_cmd13 = sdmmc_send_cmd_send_status(card, &status);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err); if (err_cmd13 == ESP_OK) {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x, status 0x%" PRIx32, __func__, err, status);
} else {
ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x, failed to get status (0x%x)", __func__, err, err_cmd13);
}
return err; return err;
} }
uint32_t status = 0;
size_t count = 0; size_t count = 0;
int64_t yield_delay_us = 100 * 1000; // initially 100ms int64_t yield_delay_us = 100 * 1000; // initially 100ms
int64_t t0 = esp_timer_get_time(); int64_t t0 = esp_timer_get_time();
int64_t t1 = 0; int64_t t1 = 0;
/* SD mode: wait for the card to become idle based on R1 status */ /* SD mode: wait for the card to become idle based on R1 status */
while (!host_is_spi(card) && !mmc_ready_for_data(status)) { while (!host_is_spi(card) && !sdmmc_ready_for_data(status)) {
t1 = esp_timer_get_time(); t1 = esp_timer_get_time();
if (t1 - t0 > SDMMC_READY_FOR_DATA_TIMEOUT_US) { if (t1 - t0 > SDMMC_READY_FOR_DATA_TIMEOUT_US) {
ESP_LOGE(TAG, "read sectors dma - timeout"); ESP_LOGE(TAG, "read sectors dma - timeout");