ide: fix suspend regression (2ea55210) · Commits · 戴 / test

On Monday 12 January 2009, Simon Holm Thøgersen wrote: > commit ("ide: don't execute the next queued command from the > hard-IRQ context (v2)") breaks suspend to disk for me. On > 'echo disk > /sys/power/state' the systems hangs, letting me switch > virtual consoles, but not responding to Alt+SysRq Restart the request queue early for REQ_TYPE_PM_RESUME requests (though there is only one resume request for the whole resume sequence it stays in the queue until is fully completed and now depends on kblockd for processing consequential resume states). Reported-and-bisected-by:

Simon Holm Thøgersen <odie@cs.aau.dk> Tested-by:

Simon Holm Thøgersen <odie@cs.aau.dk> Signed-off-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-pm.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -186,12 +186,10 @@ void ide_complete_pm_request(ide_drive_t drive, struct request rq)
		blk_pm_suspend_request(rq) ? "suspend" : "resume");
		#endif
		spin_lock_irqsave(q->queue_lock, flags);
		if (blk_pm_suspend_request(rq)) {
		if (blk_pm_suspend_request(rq))
		blk_stop_queue(q);
		} else {
		else
		drive->dev_flags &= ~IDE_DFLAG_BLOCKED;
		blk_start_queue(q);
		}
		spin_unlock_irqrestore(q->queue_lock, flags);

		drive->hwif->rq = NULL;
		@@ -219,6 +217,8 @@ void ide_check_pm_state(ide_drive_t drive, struct request rq)
		* point.
		*/
		ide_hwif_t *hwif = drive->hwif;
		struct request_queue *q = drive->queue;
		unsigned long flags;
		int rc;
		#ifdef DEBUG_PM
		printk("%s: Wakeup request inited, waiting for !BSY...\n", drive->name);
		@@ -231,5 +231,9 @@ void ide_check_pm_state(ide_drive_t drive, struct request rq)
		rc = ide_wait_not_busy(hwif, 100000);
		if (rc)
		printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);

		spin_lock_irqsave(q->queue_lock, flags);
		blk_start_queue(q);
		spin_unlock_irqrestore(q->queue_lock, flags);
		}
		}

Admin message