Commit edbabd86 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: add 5s sleep between resets 



Some devices react badly if resets are performed back-to-back.  Give
devices some time to breath and tell user that we're taking a nap.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 90dac02c

drivers/scsi/libata-core.c

+14 −1
Original line number Diff line number Diff line
@@ -2582,6 +2582,9 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit, 
		rc = ata_do_reset(ap, softreset, postreset, 0, classes);

		if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN)

			goto done;

		printk(KERN_INFO "ata%u: softreset failed, will try "

		       "hardreset in 5 secs\n", ap->id);

		ssleep(5);

	}



	if (!hardreset)
@@ -2597,10 +2600,20 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit, 


		if (ata_down_sata_spd_limit(ap))

			goto done;



		printk(KERN_INFO "ata%u: hardreset failed, will retry "

		       "in 5 secs\n", ap->id);

		ssleep(5);

	}



	if (softreset)

	if (softreset) {

		printk(KERN_INFO "ata%u: hardreset succeeded without "

		       "classification, will retry softreset in 5 secs\n",

		       ap->id);

		ssleep(5);



		rc = ata_do_reset(ap, softreset, postreset, 0, classes);

	}



 done:

	if (rc == 0 && classes[0] == ATA_DEV_UNKNOWN)