hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: mmc: Hold re-tuning in mmc_sleep() 

The sleep command is issued after deselecting the
card, but re-tuning won't work on a deselected card
so re-tuning must be held.

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:18 +03:00 committed by Ulf Hansson
parent 66073d8671
commit 436f8daa6f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/core/mmc.c
View File

@ -21,6 +21,7 @@
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
#include "core.h" #include "core.h"
#include "host.h"
#include "bus.h" #include "bus.h"
#include "mmc_ops.h" #include "mmc_ops.h"
#include "sd_ops.h" #include "sd_ops.h"
@ -1511,9 +1512,12 @@ static int mmc_sleep(struct mmc_host *host)
unsigned int timeout_ms = DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000); unsigned int timeout_ms = DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000);
int err; int err;
/* Re-tuning can't be done once the card is deselected */
mmc_retune_hold(host);
err = mmc_deselect_cards(host); err = mmc_deselect_cards(host);
if (err) if (err)
return err; goto out_release;
cmd.opcode = MMC_SLEEP_AWAKE; cmd.opcode = MMC_SLEEP_AWAKE;
cmd.arg = card->rca << 16; cmd.arg = card->rca << 16;
@ -1534,7 +1538,7 @@ static int mmc_sleep(struct mmc_host *host)
err = mmc_wait_for_cmd(host, &cmd, 0); err = mmc_wait_for_cmd(host, &cmd, 0);
if (err) if (err)
return err; goto out_release;
/* /*
* If the host does not wait while the card signals busy, then we will * If the host does not wait while the card signals busy, then we will
@ -1545,6 +1549,8 @@ static int mmc_sleep(struct mmc_host *host)
if (!cmd.busy_timeout || !(host->caps & MMC_CAP_WAIT_WHILE_BUSY)) if (!cmd.busy_timeout || !(host->caps & MMC_CAP_WAIT_WHILE_BUSY))
mmc_delay(timeout_ms); mmc_delay(timeout_ms);
out_release:
mmc_retune_release(host);
return err; return err;
} }