svn commit: r212718 - stable/8/sys/dev/ata/chipsets

[Alexander Motin]

Author: mav
Date: Thu Sep 16 02:42:52 2010
New Revision: 212718
URL: http://svn.freebsd.org/changeset/base/212718

Log:
  MFC r212081:
  Increase device reset timeout from 10 to 15 seconds, same as in ahci(4).
  Some devices found need about 10-12 seconds to spinup.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-ahci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-ahci.c	Thu Sep 16 01:38:13 2010	(r212717)
+++ stable/8/sys/dev/ata/chipsets/ata-ahci.c	Thu Sep 16 02:42:52 2010	(r212718)
@@ -815,7 +815,7 @@ ata_ahci_hardreset(device_t dev, int por
     if (!ata_sata_phy_reset(dev, port, 0))
 	return (ENOENT);
     /* Wait for clearing busy status. */
-    if (ata_ahci_wait_ready(dev, 10000)) {
+    if (ata_ahci_wait_ready(dev, 15000)) {
 	device_printf(dev, "hardware reset timeout\n");
 	return (EBUSY);
     }