From: Mikulas Patocka Date: Wed, 8 Jul 2015 17:06:12 +0000 (-0400) Subject: libata: increase the timeout when setting transfer mode X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9432c6758b566f25d611293bd2a1d7d021bed53;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git libata: increase the timeout when setting transfer mode commit d531be2ca2f27cca5f041b6a140504999144a617 upstream. 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 Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4284d2b4f0d..a440a2034df 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4505,7 +4505,8 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) 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;