diff mbox

libata: increase the timeout when setting transfer mode

Message ID alpine.LRH.2.02.1507081304050.5355@file01.intranet.prod.int.rdu2.redhat.com
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Mikulas Patocka July 8, 2015, 5:06 p.m. UTC 
I have a ST4000DM000 disk. If Linux is booted while the disk is spun down,
the command that sets transfer mode causes the disk to spin up. The
spin-up takes longer than the default 5s timeout, so the command fails and
timeout is reported.

Fix this by increasing the timeout to 15s, which is enough for the disk to
spin up.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org

---
 drivers/ata/libata-core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Tejun Heo July 15, 2015, 3:57 p.m. UTC | #1 
On Wed, Jul 08, 2015 at 01:06:12PM -0400, Mikulas Patocka wrote:
> I have a ST4000DM000 disk. If Linux is booted while the disk is spun down,
> the command that sets transfer mode causes the disk to spin up. The
> spin-up takes longer than the default 5s timeout, so the command fails and
> timeout is reported.
> 
> Fix this by increasing the timeout to 15s, which is enough for the disk to
> spin up.
> 
> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
> Cc: stable@vger.kernel.org

Applied to libata/for-4.2-fixes.

Thanks!
diff mbox

Patch

Index: linux-4.1.1/drivers/ata/libata-core.c
===================================================================
--- linux-4.1.1.orig/drivers/ata/libata-core.c	2015-07-07 22:21:39.962112941 +0200
+++ linux-4.1.1/drivers/ata/libata-core.c	2015-07-08 18:59:03.852951057 +0200
@@ -4501,7 +4501,8 @@  static unsigned int ata_dev_set_xfermode
 	else /* In the ancient relic department - skip all of this */
 		return 0;
 
-	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);
+	/* On some disks, this command causes spin-up, so we need longer timeout */
+	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000);
 
 	DPRINTK("EXIT, err_mask=%x\n", err_mask);
 	return err_mask;