1 files changed, 59 insertions, 0 deletions

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 34ce2703d29a..d2cb5c634392 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -57,6 +57,42 @@ int mmc_deselect_cards(struct mmc_host *host)
         return _mmc_select_card(host, NULL);
 }
 
+int mmc_card_sleepawake(struct mmc_host *host, int sleep)
+{
+        struct mmc_command cmd;
+        struct mmc_card *card = host->card;
+        int err;
+
+        if (sleep)
+                mmc_deselect_cards(host);
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SLEEP_AWAKE;
+        cmd.arg = card->rca << 16;
+        if (sleep)
+                cmd.arg |= 1 << 15;
+
+        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+        if (err)
+                return err;
+
+        /*
+         * If the host does not wait while the card signals busy, then we will
+         * will have to wait the sleep/awake timeout.  Note, we cannot use the
+         * SEND_STATUS command to poll the status because that command (and most
+         * others) is invalid while the card sleeps.
+         */
+        if (!(host->caps & MMC_CAP_WAIT_WHILE_BUSY))
+                mmc_delay(DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000));
+
+        if (!sleep)
+                err = mmc_select_card(card);
+
+        return err;
+}
+
 int mmc_go_idle(struct mmc_host *host)
 {
         int err;
@@ -354,6 +390,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
 {
         int err;
         struct mmc_command cmd;
+        u32 status;
 
         BUG_ON(!card);
         BUG_ON(!card->host);
@@ -371,6 +408,28 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
         if (err)
                 return err;
 
+        /* Must check status to be sure of no errors */
+        do {
+                err = mmc_send_status(card, &status);
+                if (err)
+                        return err;
+                if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
+                        break;
+                if (mmc_host_is_spi(card->host))
+                        break;
+        } while (R1_CURRENT_STATE(status) == 7);
+
+        if (mmc_host_is_spi(card->host)) {
+                if (status & R1_SPI_ILLEGAL_COMMAND)
+                        return -EBADMSG;
+        } else {
+                if (status & 0xFDFFA000)
+                        printk(KERN_WARNING "%s: unexpected status %#x after "
+                               "switch", mmc_hostname(card->host), status);
+                if (status & R1_SWITCH_ERROR)
+                        return -EBADMSG;
+        }
+
         return 0;
 }