svn commit: r220860 - stable/8/sys/dev/siis

[Alexander Motin]

Author: mav
Date: Tue Apr 19 17:14:57 2011
New Revision: 220860
URL: http://svn.freebsd.org/changeset/base/220860

Log:
  MFC r220591:
  As soon as siis_reset() doesn't waits for device readiness, but only for
  controller port readiness (that should set just after PHY ready signal),
  reduce wait time from 10s to 1s before trying more aggressive reset method.
  
  This should improve system responsibility in some failure conditions.

Modified:
  stable/8/sys/dev/siis/siis.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)

Modified: stable/8/sys/dev/siis/siis.c
==============================================================================
--- stable/8/sys/dev/siis/siis.c	Tue Apr 19 17:13:14 2011	(r220859)
+++ stable/8/sys/dev/siis/siis.c	Tue Apr 19 17:14:57 2011	(r220860)
@@ -1631,9 +1631,9 @@ retry:
 		xpt_release_simq(ch->sim, TRUE);
 		return;
 	}
-	/* Wait for clearing busy status. */
-	if (siis_wait_ready(dev, 10000)) {
-		device_printf(dev, "device ready timeout\n");
+	/* Wait for port ready status. */
+	if (siis_wait_ready(dev, 1000)) {
+		device_printf(dev, "port ready timeout\n");
 		if (!retry) {
 			device_printf(dev, "trying full port reset ...\n");
 			/* Get port to the reset state. */