svn commit: r227230 - stable/9/sys/dev/mpt

Marius Strobl marius at FreeBSD.org
Sun Nov 6 17:25:23 UTC 2011


Author: marius
Date: Sun Nov  6 17:25:22 2011
New Revision: 227230
URL: http://svn.freebsd.org/changeset/base/227230

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
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/mpt/mpt.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/mpt/mpt.c
==============================================================================
--- stable/9/sys/dev/mpt/mpt.c	Sun Nov  6 17:23:49 2011	(r227229)
+++ stable/9/sys/dev/mpt/mpt.c	Sun Nov  6 17:25:22 2011	(r227230)
@@ -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);


More information about the svn-src-all mailing list