svn commit: r265646 - stable/9/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Thu May  8 08:08:24 2014
New Revision: 265646
URL: http://svnweb.freebsd.org/changeset/base/265646

Log:
  MFC r255043 (by ken):
  Bump up the default timeouts for move commands in the ch(4) driver
  to 15 minutes, and 5 minutes for things like READ ELEMENT STATUS.
  
  This is needed to account for the worst case scenarios on at least
  some Spectra Logic tape libraries.

Modified:
  stable/9/sys/cam/scsi/scsi_ch.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_ch.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_ch.c	Thu May  8 07:56:05 2014	(r265645)
+++ stable/9/sys/cam/scsi/scsi_ch.c	Thu May  8 08:08:24 2014	(r265646)
@@ -99,10 +99,10 @@ __FBSDID("$FreeBSD$");
  */
 
 static const u_int32_t	CH_TIMEOUT_MODE_SENSE                = 6000;
-static const u_int32_t	CH_TIMEOUT_MOVE_MEDIUM               = 100000;
-static const u_int32_t	CH_TIMEOUT_EXCHANGE_MEDIUM           = 100000;
-static const u_int32_t	CH_TIMEOUT_POSITION_TO_ELEMENT       = 100000;
-static const u_int32_t	CH_TIMEOUT_READ_ELEMENT_STATUS       = 60000;
+static const u_int32_t	CH_TIMEOUT_MOVE_MEDIUM               = 15 * 60 * 1000;
+static const u_int32_t	CH_TIMEOUT_EXCHANGE_MEDIUM           = 15 * 60 * 1000;
+static const u_int32_t	CH_TIMEOUT_POSITION_TO_ELEMENT       = 15 * 60 * 1000;
+static const u_int32_t	CH_TIMEOUT_READ_ELEMENT_STATUS       = 5 * 60 * 1000;
 static const u_int32_t	CH_TIMEOUT_SEND_VOLTAG		     = 10000;
 static const u_int32_t	CH_TIMEOUT_INITIALIZE_ELEMENT_STATUS = 500000;