Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986d413b authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Enable support for runtime power management 



Now that the blk-mq core processes power management requests
(marked with RQF_PREEMPT) in other states than RPM_ACTIVE, enable
runtime power management for blk-mq.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Jianchao Wang <jianchao.w.wang@oracle.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7cedffec

block/blk-mq.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "blk-mq.h"

#include "blk-mq-debugfs.h"

#include "blk-mq-tag.h"

#include "blk-pm.h"

#include "blk-stat.h"

#include "blk-mq-sched.h"

#include "blk-rq-qos.h"
@@ -475,6 +476,7 @@ static void __blk_mq_free_request(struct request *rq) 
	struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu);

	const int sched_tag = rq->internal_tag;



	blk_pm_mark_last_busy(rq);

	if (rq->tag != -1)

		blk_mq_put_tag(hctx, hctx->tags, ctx, rq->tag);

	if (sched_tag != -1)

block/blk-pm.c

+0 −6
Original line number Diff line number Diff line
@@ -30,12 +30,6 @@ 
 */

void blk_pm_runtime_init(struct request_queue *q, struct device *dev)

{

	/* Don't enable runtime PM for blk-mq until it is ready */

	if (q->mq_ops) {

		pm_runtime_disable(dev);

		return;

	}



	q->dev = dev;

	q->rpm_status = RPM_ACTIVE;

	pm_runtime_set_autosuspend_delay(q->dev, -1);