3 files changed, 15 insertions, 10 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7f5dc26865de..f631f5a9bf79 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1577,11 +1577,13 @@ static int mmc_shutdown(struct mmc_host *host)
  */
 static int mmc_resume(struct mmc_host *host)
 {
-        int err;
+        int err = 0;
 
-        err = _mmc_resume(host);
-        pm_runtime_set_active(&host->card->dev);
-        pm_runtime_mark_last_busy(&host->card->dev);
+        if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {
+                err = _mmc_resume(host);
+                pm_runtime_set_active(&host->card->dev);
+                pm_runtime_mark_last_busy(&host->card->dev);
+        }
         pm_runtime_enable(&host->card->dev);
 
         return err;
@@ -1612,7 +1614,7 @@ static int mmc_runtime_resume(struct mmc_host *host)
 {
         int err;
 
-        if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
+        if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME)))
                 return 0;
 
         err = _mmc_resume(host);
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 447fa8e9f322..6f42050b7ccc 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1139,11 +1139,13 @@ out:
  */
 static int mmc_sd_resume(struct mmc_host *host)
 {
-        int err;
+        int err = 0;
 
-        err = _mmc_sd_resume(host);
-        pm_runtime_set_active(&host->card->dev);
-        pm_runtime_mark_last_busy(&host->card->dev);
+        if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {
+                err = _mmc_sd_resume(host);
+                pm_runtime_set_active(&host->card->dev);
+                pm_runtime_mark_last_busy(&host->card->dev);
+        }
         pm_runtime_enable(&host->card->dev);
 
         return err;
@@ -1174,7 +1176,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
 {
         int err;
 
-        if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
+        if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME)))
                 return 0;
 
         err = _mmc_sd_resume(host);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f18669e15d4d..99f5709ac343 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -254,6 +254,7 @@ struct mmc_host {
 #define MMC_CAP_UHS_SDR50       (1 << 17)       /* Host supports UHS SDR50 mode */
 #define MMC_CAP_UHS_SDR104      (1 << 18)       /* Host supports UHS SDR104 mode */
 #define MMC_CAP_UHS_DDR50       (1 << 19)       /* Host supports UHS DDR50 mode */
+#define MMC_CAP_RUNTIME_RESUME  (1 << 20)       /* Resume at runtime_resume. */
 #define MMC_CAP_DRIVER_TYPE_A   (1 << 23)       /* Host supports Driver Type A */
 #define MMC_CAP_DRIVER_TYPE_C   (1 << 24)       /* Host supports Driver Type C */
 #define MMC_CAP_DRIVER_TYPE_D   (1 << 25)       /* Host supports Driver Type D */