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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

4 files changed, 49 insertions, 19 deletions

diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index 19d809c48a8d..d6da011299f5 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -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;
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8e55abd03a24..669ea1e45795 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -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 @@ repeat:
                  * 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);
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index 8d1e32d7cd97..081e43458d50 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -8,7 +8,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
         ide_drive_t *pair = ide_get_pair_dev(drive);
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq;
-        struct request_pm_state rqpm;
+        struct ide_pm_state rqpm;
         int ret;
 
         if (ide_port_acpi(hwif)) {
@@ -19,7 +19,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 
         memset(&rqpm, 0, sizeof(rqpm));
         rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
-        rq->cmd_type = REQ_TYPE_PM_SUSPEND;
+        rq->cmd_type = REQ_TYPE_ATA_PM_SUSPEND;
         rq->special = &rqpm;
         rqpm.pm_step = IDE_PM_START_SUSPEND;
         if (mesg.event == PM_EVENT_PRETHAW)
@@ -38,13 +38,43 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
         return ret;
 }
 
+static void ide_end_sync_rq(struct request *rq, int error)
+{
+        complete(rq->end_io_data);
+}
+
+static int ide_pm_execute_rq(struct request *rq)
+{
+        struct request_queue *q = rq->q;
+        DECLARE_COMPLETION_ONSTACK(wait);
+
+        rq->end_io_data = &wait;
+        rq->end_io = ide_end_sync_rq;
+
+        spin_lock_irq(q->queue_lock);
+        if (unlikely(blk_queue_dying(q))) {
+                rq->cmd_flags |= REQ_QUIET;
+                rq->errors = -ENXIO;
+                __blk_end_request_all(rq, rq->errors);
+                spin_unlock_irq(q->queue_lock);
+                return -ENXIO;
+        }
+        __elv_add_request(q, rq, ELEVATOR_INSERT_FRONT);
+        __blk_run_queue_uncond(q);
+        spin_unlock_irq(q->queue_lock);
+
+        wait_for_completion_io(&wait);
+
+        return rq->errors ? -EIO : 0;
+}
+
 int generic_ide_resume(struct device *dev)
 {
         ide_drive_t *drive = to_ide_device(dev);
         ide_drive_t *pair = ide_get_pair_dev(drive);
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq;
-        struct request_pm_state rqpm;
+        struct ide_pm_state rqpm;
         int err;
 
         if (ide_port_acpi(hwif)) {
@@ -59,13 +89,13 @@ int generic_ide_resume(struct device *dev)
 
         memset(&rqpm, 0, sizeof(rqpm));
         rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
-        rq->cmd_type = REQ_TYPE_PM_RESUME;
+        rq->cmd_type = REQ_TYPE_ATA_PM_RESUME;
         rq->cmd_flags |= REQ_PREEMPT;
         rq->special = &rqpm;
         rqpm.pm_step = IDE_PM_START_RESUME;
         rqpm.pm_state = PM_EVENT_ON;
 
-        err = blk_execute_rq(drive->queue, NULL, rq, 1);
+        err = ide_pm_execute_rq(rq);
         blk_put_request(rq);
 
         if (err == 0 && dev->driver) {
@@ -80,7 +110,7 @@ int generic_ide_resume(struct device *dev)
 
 void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
 {
-        struct request_pm_state *pm = rq->special;
+        struct ide_pm_state *pm = rq->special;
 
 #ifdef DEBUG_PM
         printk(KERN_INFO "%s: complete_power_step(step: %d)\n",
@@ -110,7 +140,7 @@ void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
 
 ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *rq)
 {
-        struct request_pm_state *pm = rq->special;
+        struct ide_pm_state *pm = rq->special;
         struct ide_cmd cmd = { };
 
         switch (pm->pm_step) {
@@ -182,7 +212,7 @@ out_do_tf:
 void ide_complete_pm_rq(ide_drive_t *drive, struct request *rq)
 {
         struct request_queue *q = drive->queue;
-        struct request_pm_state *pm = rq->special;
+        struct ide_pm_state *pm = rq->special;
         unsigned long flags;
 
         ide_complete_power_step(drive, rq);
@@ -191,10 +221,10 @@ void ide_complete_pm_rq(ide_drive_t *drive, struct request *rq)
 
 #ifdef DEBUG_PM
         printk("%s: completing PM request, %s\n", drive->name,
-               (rq->cmd_type == REQ_TYPE_PM_SUSPEND) ? "suspend" : "resume");
+               (rq->cmd_type == REQ_TYPE_ATA_PM_SUSPEND) ? "suspend" : "resume");
 #endif
         spin_lock_irqsave(q->queue_lock, flags);
-        if (rq->cmd_type == REQ_TYPE_PM_SUSPEND)
+        if (rq->cmd_type == REQ_TYPE_ATA_PM_SUSPEND)
                 blk_stop_queue(q);
         else
                 drive->dev_flags &= ~IDE_DFLAG_BLOCKED;
@@ -208,13 +238,13 @@ void ide_complete_pm_rq(ide_drive_t *drive, struct request *rq)
 
 void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
 {
-        struct request_pm_state *pm = rq->special;
+        struct ide_pm_state *pm = rq->special;
 
-        if (rq->cmd_type == REQ_TYPE_PM_SUSPEND &&
+        if (rq->cmd_type == REQ_TYPE_ATA_PM_SUSPEND &&
             pm->pm_step == IDE_PM_START_SUSPEND)
                 /* Mark drive blocked when starting the suspend sequence. */
                 drive->dev_flags |= IDE_DFLAG_BLOCKED;
-        else if (rq->cmd_type == REQ_TYPE_PM_RESUME &&
+        else if (rq->cmd_type == REQ_TYPE_ATA_PM_RESUME &&
                  pm->pm_step == IDE_PM_START_RESUME) {
                 /*
                  * The first thing we do on wakeup is to wait for BSY bit to
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index dabb88b1cbec..0979e126fff1 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -186,7 +186,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
             tf->command == ATA_CMD_CHK_POWER) {
                 struct request *rq = hwif->rq;
 
-                if (blk_pm_request(rq))
+                if (ata_pm_request(rq))
                         ide_complete_pm_rq(drive, rq);
                 else
                         ide_finish_cmd(drive, cmd, stat);