From 5fc6fb58eabf5a5de0f12657517cfd5fd1b85365 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 18 Aug 2017 00:25:17 +0800 Subject: [PATCH] sdmmc: don't whitelist the opcodes when handling response timeout All the commands which do not have a response must have their flags set accordingly. Therefore the host will not send RTO interrupt if response is not expected. It is a bug in the code logic if it happens otherwise. --- components/driver/sdmmc_transaction.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/driver/sdmmc_transaction.c b/components/driver/sdmmc_transaction.c index 78e3e2872..7039b74e7 100644 --- a/components/driver/sdmmc_transaction.c +++ b/components/driver/sdmmc_transaction.c @@ -287,18 +287,16 @@ static void process_command_response(uint32_t status, sdmmc_command_t* cmd) cmd->response[3] = 0; } } - - if ((status & SDMMC_INTMASK_RTO) && - cmd->opcode != MMC_ALL_SEND_CID && - cmd->opcode != MMC_SELECT_CARD && - cmd->opcode != MMC_STOP_TRANSMISSION) { + if (status & SDMMC_INTMASK_RTO) { + // response timeout is only possible when response is expected + assert(cmd->flags & SCF_RSP_PRESENT); cmd->error = ESP_ERR_TIMEOUT; } else if ((cmd->flags & SCF_RSP_CRC) && (status & SDMMC_INTMASK_RCRC)) { cmd->error = ESP_ERR_INVALID_CRC; } else if (status & SDMMC_INTMASK_RESP_ERR) { cmd->error = ESP_ERR_INVALID_RESPONSE; } - if (cmd->error != 0) { + if (cmd->error != ESP_OK) { if (cmd->data) { sdmmc_host_dma_stop(); }