Commit 7756a96d authored by Yi Sun's avatar Yi Sun Committed by Ulf Hansson

mmc: sdhci: execute tuning when device is not busy

We find tuning timeout because of the secure erase operation lasts too
long, so don't do tuning when device is busy.
Signed-off-by: default avatarYi Sun <yi.y.sun@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 528bc780
...@@ -1366,11 +1366,12 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -1366,11 +1366,12 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
present_state = sdhci_readl(host, SDHCI_PRESENT_STATE); present_state = sdhci_readl(host, SDHCI_PRESENT_STATE);
/* /*
* Check if the re-tuning timer has already expired and there * Check if the re-tuning timer has already expired and there
* is no on-going data transfer. If so, we need to execute * is no on-going data transfer and DAT0 is not busy. If so,
* tuning procedure before sending command. * we need to execute tuning procedure before sending command.
*/ */
if ((host->flags & SDHCI_NEEDS_RETUNING) && if ((host->flags & SDHCI_NEEDS_RETUNING) &&
!(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) { !(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ)) &&
(present_state & SDHCI_DATA_0_LVL_MASK)) {
if (mmc->card) { if (mmc->card) {
/* eMMC uses cmd21 but sd and sdio use cmd19 */ /* eMMC uses cmd21 but sd and sdio use cmd19 */
tuning_opcode = tuning_opcode =
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#define SDHCI_WRITE_PROTECT 0x00080000 #define SDHCI_WRITE_PROTECT 0x00080000
#define SDHCI_DATA_LVL_MASK 0x00F00000 #define SDHCI_DATA_LVL_MASK 0x00F00000
#define SDHCI_DATA_LVL_SHIFT 20 #define SDHCI_DATA_LVL_SHIFT 20
#define SDHCI_DATA_0_LVL_MASK 0x00100000
#define SDHCI_HOST_CONTROL 0x28 #define SDHCI_HOST_CONTROL 0x28
#define SDHCI_CTRL_LED 0x01 #define SDHCI_CTRL_LED 0x01
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment