mmc: enable runtime PM support for block driver

PATCH Superseded Yunpeng Gao 2 participants 2 messages Nov 28, 2010 – Nov 30, 2010 MMC, SD and SDIO

lore

Share & tools

lore

Yunpeng Gao

author

2010-11-28 06:14 UTC #0 lore raw

PATCH 1/3 mmc: enable runtime PM support for block driver

Quoted 2 lines

From 51e4d34f19b48552a10a9f6b69f51c5aeed18d03 Mon Sep 17 00:00:00 2001

From: Yunpeng Gao <[email protected]>
Date: Sun, 28 Nov 2010 08:01:01 +0800
Subject: [PATCH] Enable runtime pm support for block driver of mmc stack.

Follow the kernel runtime pm framework, this patch enable runtime pm support for block driver of mmc stack. To validate it, it needs runtime pm support for mmc bus and host controller to be enabled also.

Signed-off-by Yunpeng Gao <[email protected]>

---
 drivers/mmc/card/block.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

drivers/mmc/card/block.c +21 -3

index 217f820..8a35814 100644
@@ -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(&card->dev);
+
+	return ret;
 }
 
 static inline int mmc_blk_readonly(struct mmc_card *card)

@@ -709,6 +720,11 @@ 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);
+
 	return 0;
 
  out:

@@ -732,6 +748,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

Signature · 1 line

1.6.6.1

Adrian Hunter

2010-11-30 18:08 UTC #1 lore raw

Quoted 29 lines · ext Yunpeng Gao

Quoted 2 lines
From 51e4d34f19b48552a10a9f6b69f51c5aeed18d03 Mon Sep 17 00:00:00 2001
From: Yunpeng Gao<[email protected]>
Date: Sun, 28 Nov 2010 08:01:01 +0800
Subject: [PATCH] Enable runtime pm support for block driver of mmc stack.
Follow the kernel runtime pm framework, this patch enable runtime pm support for block driver of mmc stack. To validate it, it needs runtime pm support for mmc bus and host controller to be enabled also.
Signed-off-by Yunpeng Gao<[email protected]>
---
  drivers/mmc/card/block.c |   24 +++++++++++++++++++++---
  1 files changed, 21 insertions(+), 3 deletions(-)
drivers/mmc/card/block.c +1 -0
index 217f820..8a35814 100644
@@ -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>

drivers/mmc/card/block.c static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *req) · line 568

Quoted 8 lines

drivers/mmc/card/block.c +5 -0

@@ -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);

Wouldn't it be better to "get" when the queue thread wakes up and "put" before it goes to sleep?

Quoted 40 lines

drivers/mmc/card/block.c +15 -3

+
  	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(&card->dev);
+
+	return ret;
  }
 
  static inline int mmc_blk_readonly(struct mmc_card *card)

@@ -709,6 +720,11 @@ 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);
+
  	return 0;
 
   out:

@@ -732,6 +748,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