openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: mmc: Use ->card_busy() to detect busy cards in __mmc_switch() 

Some MMC hosts do not support MMC_CAP_WAIT_WHILE_BUSY, but implements the
->card_busy() callback. In such cases, extend __mmc_switch() to use this
method to check card status after switch command.

Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Chaotian Jing 2016-05-19 16:47:40 +08:00 committed by Ulf Hansson
parent e613cc477c
commit 87a18a6a56
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/mmc/core/mmc_ops.c
View File

@ -480,6 +480,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
u32 status = 0; u32 status = 0;
bool use_r1b_resp = use_busy_signal; bool use_r1b_resp = use_busy_signal;
bool expired = false; bool expired = false;
bool busy = false;
mmc_retune_hold(host); mmc_retune_hold(host);
@ -535,19 +536,24 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
/* Must check status to be sure of no errors. */ /* Must check status to be sure of no errors. */
timeout = jiffies + msecs_to_jiffies(timeout_ms); timeout = jiffies + msecs_to_jiffies(timeout_ms);
do { do {
/*
* Due to the possibility of being preempted after
* sending the status command, check the expiration
* time first.
*/
expired = time_after(jiffies, timeout);
if (send_status) { if (send_status) {
/*
* Due to the possibility of being preempted after
* sending the status command, check the expiration
* time first.
*/
expired = time_after(jiffies, timeout);
err = __mmc_send_status(card, &status, ignore_crc); err = __mmc_send_status(card, &status, ignore_crc);
if (err) if (err)
goto out; goto out;
} }
if ((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp) if ((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp)
break; break;
if (host->ops->card_busy) {
if (!host->ops->card_busy(host))
break;
busy = true;
}
if (mmc_host_is_spi(host)) if (mmc_host_is_spi(host))
break; break;
@ -556,19 +562,20 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
* does'nt support MMC_CAP_WAIT_WHILE_BUSY, then we can only * does'nt support MMC_CAP_WAIT_WHILE_BUSY, then we can only
* rely on waiting for the stated timeout to be sufficient. * rely on waiting for the stated timeout to be sufficient.
*/ */
if (!send_status) { if (!send_status && !host->ops->card_busy) {
mmc_delay(timeout_ms); mmc_delay(timeout_ms);
goto out; goto out;
} }
/* Timeout if the device never leaves the program state. */ /* Timeout if the device never leaves the program state. */
if (expired && R1_CURRENT_STATE(status) == R1_STATE_PRG) { if (expired &&
(R1_CURRENT_STATE(status) == R1_STATE_PRG || busy)) {
pr_err("%s: Card stuck in programming state! %s\n", pr_err("%s: Card stuck in programming state! %s\n",
mmc_hostname(host), __func__); mmc_hostname(host), __func__);
err = -ETIMEDOUT; err = -ETIMEDOUT;
goto out; goto out;
} }
} while (R1_CURRENT_STATE(status) == R1_STATE_PRG); } while (R1_CURRENT_STATE(status) == R1_STATE_PRG || busy);
err = mmc_switch_status_error(host, status); err = mmc_switch_status_error(host, status);
out: out: