@@ -31,6 +31,7 @@
#include <linux/mutex.h>
#include <linux/scatterlist.h>
#include <linux/string_helpers.h>
+#include <linux/pm_runtime.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
@@ -560,14 +561,24 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *req)
static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
{
+ struct mmc_blk_data *md = mq->data;
+ struct mmc_card *card = md->queue.card;
+ int ret;
+
+ pm_runtime_get_sync(&card->dev);
+
if (req->cmd_flags & REQ_DISCARD) {
if (req->cmd_flags & REQ_SECURE)
- return mmc_blk_issue_secdiscard_rq(mq, req);
+ ret = mmc_blk_issue_secdiscard_rq(mq, req);
else
- return mmc_blk_issue_discard_rq(mq, req);
+ ret = mmc_blk_issue_discard_rq(mq, req);
} else {
- return mmc_blk_issue_rw_rq(mq, req);
+ ret = mmc_blk_issue_rw_rq(mq, req);
}
+
+ pm_runtime_put_autosuspend(&card->dev);
+
+ return ret;
}
static inline int mmc_blk_readonly(struct mmc_card *card)
@@ -709,6 +720,14 @@ static int mmc_blk_probe(struct mmc_card *card)
mmc_set_drvdata(card, md);
add_disk(md->disk);
+
+ /* Indicate to runtime PM core that our device is active */
+ pm_runtime_set_active(&card->dev);
+ pm_runtime_enable(&card->dev);
+
+ /* Set its autosuspend_delay to 100ms */
+ pm_runtime_set_autosuspend_delay(&card->dev, 100);
+
return 0;
out:
@@ -732,6 +751,8 @@ static void mmc_blk_remove(struct mmc_card *card)
mmc_blk_put(md);
}
mmc_set_drvdata(card, NULL);
+
+ pm_runtime_disable(&card->dev);
}
#ifdef CONFIG_PM