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

Commit a7928c15 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move PM request support to IDE 



This removes the request types and hacks from the block code and into the
old IDE driver.  There is a small amunt of code duplication due to this,
but it's not too bad.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent ac7cdff0

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ inline void __blk_run_queue_uncond(struct request_queue *q) 
	q->request_fn(q);

	q->request_fn_active--;

}

EXPORT_SYMBOL_GPL(__blk_run_queue_uncond);



/**

 * __blk_run_queue - run a single device queue

block/blk-exec.c

+0 −10
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 
			   rq_end_io_fn *done)

{

	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;

	bool is_pm_resume;



	WARN_ON(irqs_disabled());

	WARN_ON(rq->cmd_type == REQ_TYPE_FS);
@@ -70,12 +69,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 
		return;

	}



	/*

	 * need to check this before __blk_run_queue(), because rq can

	 * be freed before that returns.

	 */

	is_pm_resume = rq->cmd_type == REQ_TYPE_PM_RESUME;



	spin_lock_irq(q->queue_lock);



	if (unlikely(blk_queue_dying(q))) {
@@ -88,9 +81,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 


	__elv_add_request(q, rq, where);

	__blk_run_queue(q);

	/* the queue is stopped so it won't be run */

	if (is_pm_resume)

		__blk_run_queue_uncond(q);

	spin_unlock_irq(q->queue_lock);

}

EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);

block/blk.h

+0 −2
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ int blk_try_merge(struct request *rq, struct bio *bio); 


void blk_queue_congestion_threshold(struct request_queue *q);



void __blk_run_queue_uncond(struct request_queue *q);



int blk_dev_init(void);

drivers/ide/ide-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat) 


			if (cmd)

				ide_complete_cmd(drive, cmd, stat, err);

		} else if (blk_pm_request(rq)) {

		} else if (ata_pm_request(rq)) {

			rq->errors = 1;

			ide_complete_pm_rq(drive, rq);

			return ide_stopped;

drivers/ide/ide-io.c

+4 −4
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
		goto kill_rq;

	}



	if (blk_pm_request(rq))

	if (ata_pm_request(rq))

		ide_check_pm_state(drive, rq);



	drive->hwif->tp_ops->dev_select(drive);
@@ -342,8 +342,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 


		if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)

			return execute_drive_cmd(drive, rq);

		else if (blk_pm_request(rq)) {

			struct request_pm_state *pm = rq->special;

		else if (ata_pm_request(rq)) {

			struct ide_pm_state *pm = rq->special;

#ifdef DEBUG_PM

			printk("%s: start_power_step(step: %d)\n",

				drive->name, pm->pm_step);
@@ -538,7 +538,7 @@ void do_ide_request(struct request_queue *q) 
		 * state machine.

		 */

		if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&

		    blk_pm_request(rq) == 0 &&

		    ata_pm_request(rq) == 0 &&

		    (rq->cmd_flags & REQ_PREEMPT) == 0) {

			/* there should be no pending command at this point */

			ide_unlock_port(hwif);