svn commit: r227264 - stable/8/sys/dev/mpt

[Marius Strobl]

Author: marius
Date: Sun Nov  6 19:57:14 2011
New Revision: 227264
URL: http://svn.freebsd.org/changeset/base/227264

Log:
  MFC: r227001
  
  Increase the IOC port initialization timeouts by ten times to what the
  corresponding Linux driver uses. This allows mpt(4) to still recognize
  all good SATA devices in presence of a defective one, which takes about
  45 seconds.
  In the long term we probably should implement the logic used by mpt2sas(4)
  allowing IOC port initialization to complete at a later time.
  
  Submitted by:	Andrew Boyer

Modified:
  stable/8/sys/dev/mpt/mpt.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/mpt/mpt.c
==============================================================================
--- stable/8/sys/dev/mpt/mpt.c	Sun Nov  6 19:05:42 2011	(r227263)
+++ stable/8/sys/dev/mpt/mpt.c	Sun Nov  6 19:57:14 2011	(r227264)
@@ -2084,7 +2084,7 @@ mpt_send_port_enable(struct mpt_softc *m
 
 	mpt_send_cmd(mpt, req);
 	error = mpt_wait_req(mpt, req, REQ_STATE_DONE, REQ_STATE_DONE,
-	    FALSE, (mpt->is_sas || mpt->is_fc)? 30000 : 3000);
+	    FALSE, (mpt->is_sas || mpt->is_fc)? 300000 : 30000);
 	if (error != 0) {
 		mpt_prt(mpt, "port %d enable timed out\n", port);
 		return (-1);