mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-10 11:17:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: sdhci: Added auto increment for command timeout

Browse source 
Change-Id: I79a2ec29e5623e12838e82581324c41dab78b872
Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
This commit is contained in:
Gokul Sriram Palanisamy 2017-12-06 11:53:49 +05:30 • committed by Gerrit - the friendly Code Review server
parent 4ffdd3caaf
commit 0c3cc6d7e7
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/mmc/sdhci.c
View file

@ -223,9 +223,9 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
* in board config file.
*/
#ifndef CONFIG_SDHCI_CMD_MAX_TIMEOUT
#define CONFIG_SDHCI_CMD_MAX_TIMEOUT 3200
#define CONFIG_SDHCI_CMD_MAX_TIMEOUT 5000
#endif
#define CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT 200
#define CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT 1000
static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data)
@ -341,16 +341,27 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
flush_cache(start_addr, trans_bytes);
#endif
udelay(5);
cmd_timeout = CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT;
sdhci_writew(host, SDHCI_MAKE_CMD(cmd->cmdidx, flags), SDHCI_COMMAND);
start = get_timer(0);
do {
stat = sdhci_readl(host, SDHCI_INT_STATUS);
if (stat & SDHCI_INT_ERROR)
break;
} while (((stat & mask) != mask) &&
(get_timer(start) < CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT));
if (get_timer(start) > cmd_timeout) {
if (2 * cmd_timeout <= CONFIG_SDHCI_CMD_MAX_TIMEOUT) {
cmd_timeout += cmd_timeout;
printf("%s: MMC: %d busy "
"timeout increasing to: %u ms.\n",
__func__, mmc_dev, cmd_timeout);
} else {
printf("timeout.\n");
return TIMEOUT;
}
}
} while ((stat & mask) != mask);
if (get_timer(start) >= CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT) {
if (get_timer(start) >= CONFIG_SDHCI_CMD_MAX_TIMEOUT) {
if (host->quirks & SDHCI_QUIRK_BROKEN_R1B)
return 0;
else {