diff options
author | mjacob <mjacob@FreeBSD.org> | 2001-07-02 17:48:59 +0000 |
---|---|---|
committer | mjacob <mjacob@FreeBSD.org> | 2001-07-02 17:48:59 +0000 |
commit | 214a2d49f58fd8b7f804f4b375affacba9900a53 (patch) | |
tree | a00efc42394b8a4bf1c6ac50320d87d8aff2ada6 /sys/conf | |
parent | e4ef9e1284c3742de10d0e13ebb453cd8491b788 (diff) | |
download | FreeBSD-src-214a2d49f58fd8b7f804f4b375affacba9900a53.zip FreeBSD-src-214a2d49f58fd8b7f804f4b375affacba9900a53.tar.gz |
A slightly more complete change to timeouts:
1. Add SA_IO_TIMEOUT as an option (4 minutes default) to cover reads,
writes, wfm, test unit ready.
2. Add internal SCSIOP_TIMEOUT (e.g., for mode sense) at 1 minute. This
should not require an option, but is cleaner to parameterize.
MFC after: 1 week
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 4 | ||||
-rw-r--r-- | sys/conf/options | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ec3e9c9..ead1d18 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -917,6 +917,8 @@ device pass #CAM passthrough driver # CAM_DEBUG_SUBTRACE, and CAM_DEBUG_CDB # # CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds +# CAM_NEW_TRAN_CODE: this is the new transport layer code that will be switched +# to soon # SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions # SCSI_NO_OP_STRINGS: When defined disables opcode descriptions # SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter) @@ -947,10 +949,12 @@ options CHANGER_MIN_BUSY_SECONDS=2 options CHANGER_MAX_BUSY_SECONDS=10 # Options for the CAM sequential access driver: +# SA_IO_TIMEOUT: Timeout for read/write/wfm operations, in minutes # SA_SPACE_TIMEOUT: Timeout for space operations, in minutes # SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes # SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes # SA_1FM_AT_EOD: Default to model which only has a default one filemark at EOT. +options SA_IO_TIMEOUT="(4)" options SA_SPACE_TIMEOUT="(60)" options SA_REWIND_TIMEOUT="(2*60)" options SA_ERASE_TIMEOUT="(4*60)" diff --git a/sys/conf/options b/sys/conf/options index 6fc2289..4d295bb 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -189,6 +189,7 @@ CHANGER_MIN_BUSY_SECONDS opt_cd.h CHANGER_MAX_BUSY_SECONDS opt_cd.h # Options used only in cam/scsi/scsi_sa.c. +SA_IO_TIMEOUT opt_sa.h SA_SPACE_TIMEOUT opt_sa.h SA_REWIND_TIMEOUT opt_sa.h SA_ERASE_TIMEOUT opt_sa.h |