4 files changed, 58 insertions, 0 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 02f2b1871a3..be1fc013fbe 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1151,6 +1151,40 @@ void mmc_stop_host(struct mmc_host *host)
         mmc_power_off(host);
 }
 
+void mmc_power_save_host(struct mmc_host *host)
+{
+        mmc_bus_get(host);
+
+        if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+                mmc_bus_put(host);
+                return;
+        }
+
+        if (host->bus_ops->power_save)
+                host->bus_ops->power_save(host);
+
+        mmc_bus_put(host);
+
+        mmc_power_off(host);
+}
+EXPORT_SYMBOL(mmc_power_save_host);
+
+void mmc_power_restore_host(struct mmc_host *host)
+{
+        mmc_bus_get(host);
+
+        if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+                mmc_bus_put(host);
+                return;
+        }
+
+        mmc_power_up(host);
+        host->bus_ops->power_restore(host);
+
+        mmc_bus_put(host);
+}
+EXPORT_SYMBOL(mmc_power_restore_host);
+
 #ifdef CONFIG_PM
 
 /**
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index c819effa103..f7eb4c4ca01 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -20,6 +20,8 @@ struct mmc_bus_ops {
         void (*detect)(struct mmc_host *);
         void (*suspend)(struct mmc_host *);
         void (*resume)(struct mmc_host *);
+        void (*power_save)(struct mmc_host *);
+        void (*power_restore)(struct mmc_host *);
 };
 
 void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 995db1853a8..27e842df6a6 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -549,6 +549,14 @@ static void mmc_resume(struct mmc_host *host)
 
 }
 
+static void mmc_power_restore(struct mmc_host *host)
+{
+        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        mmc_claim_host(host);
+        mmc_init_card(host, host->ocr, host->card);
+        mmc_release_host(host);
+}
+
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 static const struct mmc_bus_ops mmc_ops = {
@@ -556,6 +564,7 @@ static const struct mmc_bus_ops mmc_ops = {
         .detect = mmc_detect,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
+        .power_restore = mmc_power_restore,
 };
 
 static void mmc_attach_bus_ops(struct mmc_host *host)
@@ -570,6 +579,7 @@ static const struct mmc_bus_ops mmc_ops = {
         .detect = mmc_detect,
         .suspend = NULL,
         .resume = NULL,
+        .power_restore = mmc_power_restore,
 };
 
 static const struct mmc_bus_ops mmc_ops_unsafe = {
@@ -577,6 +587,7 @@ static const struct mmc_bus_ops mmc_ops_unsafe = {
         .detect = mmc_detect,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
+        .power_restore = mmc_power_restore,
 };
 
 static void mmc_attach_bus_ops(struct mmc_host *host)
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 92fa9dceca7..222a60928cd 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -603,6 +603,14 @@ static void mmc_sd_resume(struct mmc_host *host)
 
 }
 
+static void mmc_sd_power_restore(struct mmc_host *host)
+{
+        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        mmc_claim_host(host);
+        mmc_sd_init_card(host, host->ocr, host->card);
+        mmc_release_host(host);
+}
+
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 static const struct mmc_bus_ops mmc_sd_ops = {
@@ -610,6 +618,7 @@ static const struct mmc_bus_ops mmc_sd_ops = {
         .detect = mmc_sd_detect,
         .suspend = mmc_sd_suspend,
         .resume = mmc_sd_resume,
+        .power_restore = mmc_sd_power_restore,
 };
 
 static void mmc_sd_attach_bus_ops(struct mmc_host *host)
@@ -624,6 +633,7 @@ static const struct mmc_bus_ops mmc_sd_ops = {
         .detect = mmc_sd_detect,
         .suspend = NULL,
         .resume = NULL,
+        .power_restore = mmc_sd_power_restore,
 };
 
 static const struct mmc_bus_ops mmc_sd_ops_unsafe = {
@@ -631,6 +641,7 @@ static const struct mmc_bus_ops mmc_sd_ops_unsafe = {
         .detect = mmc_sd_detect,
         .suspend = mmc_sd_suspend,
         .resume = mmc_sd_resume,
+        .power_restore = mmc_sd_power_restore,
 };
 
 static void mmc_sd_attach_bus_ops(struct mmc_host *host)