diff options
| author | Stefan Bosch <stefan_b@posteo.net> | 2021-01-23 15:37:41 +0300 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2021-02-19 10:04:15 +0300 |
| commit | 8e2b0af7216d78b60fccb46a107a4a047938aea9 (patch) | |
| tree | 0873aa2c1e0e584812d6d0301a5fa8dbf9742eb2 | |
| parent | 37e1362efc2ba9be5355b3c55f9f4f7a43f02de2 (diff) | |
| download | u-boot-8e2b0af7216d78b60fccb46a107a4a047938aea9.tar.xz | |
mmc: fix response timeout after switch command
After issuing the switch command: Wait until 'current state' of the card
status becomes 'tran'. This prevents from response timeout at the next
command because of 'current state' = 'data'.
Signed-off-by: Stefan Bosch <stefan_b@posteo.net>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/mmc/mmc.c | 3 | ||||
| -rw-r--r-- | include/mmc.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d67af80c01..b4c8e7f293 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -841,7 +841,8 @@ static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value, value); return -EIO; } - if (!ret && (status & MMC_STATUS_RDY_FOR_DATA)) + if (!ret && (status & MMC_STATUS_RDY_FOR_DATA) && + (status & MMC_STATUS_CURR_STATE) == MMC_STATE_TRANS) return 0; udelay(100); } while (get_timer(start) < timeout_ms); diff --git a/include/mmc.h b/include/mmc.h index c12c7a0b5c..effccaaca0 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -178,6 +178,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx) #define MMC_STATUS_ERROR (1 << 19) #define MMC_STATE_PRG (7 << 9) +#define MMC_STATE_TRANS (4 << 9) #define MMC_VDD_165_195 0x00000080 /* VDD voltage 1.65 - 1.95 */ #define MMC_VDD_20_21 0x00000100 /* VDD voltage 2.0 ~ 2.1 */ |