Commit f1f5a807 authored Aug 27, 2010 by Tejun Heo Committed by Jeff Garzik Sep 09, 2010

ahci: fix hang on failed softreset



ahci_do_softreset() compared the current time and deadline in reverse
when calculating timeout for SRST issue.  The result is that if
@deadline is in future, SRST is issued with 0 timeout, which hasn't
caused any problem because it later waits for DRDY with the correct
timeout.  If deadline is already exceeded by the time SRST is about to
be issued, the timeout calculation underflows and if the device
doesn't respond, timeout doesn't trigger for a _very_ long time.

Reverse the incorrect comparison order.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Anssi Hannula <anssi.hannula@iki.fi>
Tested-by: Gwendal Grignou <gwendal@google.com>
Cc: stable@kernel.org
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 673424c0

drivers/ata/libahci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1326,7 +1326,7 @@ int ahci_do_softreset(struct ata_link link, unsigned int class,
		/* issue the first D2H Register FIS */
		msecs = 0;
		now = jiffies;
		if (time_after(now, deadline))
		if (time_after(deadline, now))
		msecs = jiffies_to_msecs(deadline - now);

		tf.ctl \|= ATA_SRST;

Admin message