mmc: core: Hold re-tuning while bkops ongoing

Hold re-tuning during bkops to prevent
it from conflicting with the busy state.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2015-05-07 13:10:17 +03:00 committed by Ulf Hansson
parent 8f11d1064e
commit 66073d8671
1 changed files with 6 additions and 0 deletions

View File

@ -318,12 +318,15 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
use_busy_signal = false; use_busy_signal = false;
} }
mmc_retune_hold(card->host);
err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_BKOPS_START, 1, timeout, EXT_CSD_BKOPS_START, 1, timeout,
use_busy_signal, true, false); use_busy_signal, true, false);
if (err) { if (err) {
pr_warn("%s: Error %d starting bkops\n", pr_warn("%s: Error %d starting bkops\n",
mmc_hostname(card->host), err); mmc_hostname(card->host), err);
mmc_retune_release(card->host);
goto out; goto out;
} }
@ -334,6 +337,8 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
*/ */
if (!use_busy_signal) if (!use_busy_signal)
mmc_card_set_doing_bkops(card); mmc_card_set_doing_bkops(card);
else
mmc_retune_release(card->host);
out: out:
mmc_release_host(card->host); mmc_release_host(card->host);
} }
@ -749,6 +754,7 @@ int mmc_stop_bkops(struct mmc_card *card)
*/ */
if (!err || (err == -EINVAL)) { if (!err || (err == -EINVAL)) {
mmc_card_clr_doing_bkops(card); mmc_card_clr_doing_bkops(card);
mmc_retune_release(card->host);
err = 0; err = 0;
} }