2 files changed, 32 insertions, 12 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 85944b938637..1f9521dc6d8d 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.448 1998/08/03 19:14:31 msmith Exp $
+#	$Id: LINT,v 1.449 1998/08/04 21:44:08 brian Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1560,6 +1560,10 @@ options		SPX_HACK
 
 # The 'dpt' driver provides support for DPT controllers (http://www.dpt.com/).
 # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
+# The DPT controllers are commonly re-licensed under other brand-names -
+# some controllers by Olivetti, Dec, HP, AT&T, SNI, AST, Alphatronic, NEC and
+# Compaq are actually DPT controllers.
+#
 # See sys/dev/dpt for debugging and other subtle options.
 #   DPT_VERIFY_HINTR        Performs some strict hardware interrupts testing.
 #                           Only use if you suspect PCI bus corruption problems
@@ -1569,9 +1573,9 @@ options		SPX_HACK
 #                           slots to exactly what the DPT can hold at one time,
 #                           enable this option.
 #   DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
-#                           instruments are enabled.  Assumed to be enabled by
-#                           /usr/sbin/dpt_* tools.
-#   DPT_FREELIST_IS_STACK   For optimat L{1,2} CPU cache utilization, enable
+#                           instruments are enabled.  The tools in 
+#                           /usr/sbin/dpt_* assume these to be enabled.
+#   DPT_FREELIST_IS_STACK   For optimal L{1,2} CPU cache utilization, enable
 #                           this option.  Otherwise, the transaction queue is
 #                           a LIFO.  I cannot measure the performance gain.
 #   DPT_HANDLE_TIMEOUTS     Normally device timeouts are handled by the DPT.
@@ -1585,6 +1589,15 @@ options		SPX_HACK
 #                           any interrupt that got lost.  Seems to help in some
 #                           DPT-firmware/Motherboard combinations.  Minimal
 #                           cost, great benefit.
+#  DPT_RESET_HBA            Make "reset" actually reset the controller
+#                           instead of fudging it.  Only enable this if you
+#			    are 100% certain you need it.
+#  DPT_SHUTDOWN_SLEEP       Reset controller if a request take more than
+#                           this number of seconds.  Do NOT enable this
+#			    unless you are really, really, really certain
+#			    you need it.  You are advised to call Simon (the
+#			    driver author) before setting it, and NEVER,
+#			    EVER set it to less than 300s (5 minutes).
 
 controller      dpt0
 
@@ -1597,3 +1610,8 @@ options DPT_HANDLE_TIMEOUTS
 options DPT_TIMEOUT_FACTOR=4
 options	DPT_INTR_DELAY=200      # Some motherboards need that
 options DPT_LOST_IRQ
+options DPT_RESET_HBA
+
+# Don't EVER set this without having talked to Simon Shapiro on the phone
+# first.
+options DPT_SHUTDOWN_SLEEP=500
diff --git a/sys/conf/options b/sys/conf/options
index 315ad27d3722..e2b0d84bb36e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.87 1998/07/06 04:55:22 julian Exp $
+#	$Id: options,v 1.88 1998/07/12 01:48:14 bde Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -192,15 +192,17 @@ IPFILTER_LKM		opt_ipfilter.h
 NATM			opt_natm.h
 
 # DPT driver debug flags
-DPT_VERIFY_HINTR        opt_dpt.h
-DPT_USE_SINTR           opt_dpt.h
-DPT_RESTRICTED_FREELIST opt_dpt.h
-DPT_MEASURE_PERFORMANCE opt_dpt.h
-DPT_FREELIST_IS_STACK   opt_dpt.h
-DPT_HANDLE_TIMEOUTS     opt_dpt.h
-DPT_TIMEOUT_FACTOR      opt_dpt.h
+DPT_VERIFY_HINTR	opt_dpt.h
+DPT_USE_SINTR		opt_dpt.h
+DPT_RESTRICTED_FREELIST	opt_dpt.h
+DPT_MEASURE_PERFORMANCE	opt_dpt.h
+DPT_FREELIST_IS_STACK	opt_dpt.h
+DPT_HANDLE_TIMEOUTS	opt_dpt.h
+DPT_TIMEOUT_FACTOR	opt_dpt.h
 DPT_INTR_DELAY		opt_dpt.h
 DPT_LOST_IRQ		opt_dpt.h
+DPT_SHUTDOWN_SLEEP	opt_dpt.h
+DPT_RESET_HBA		opt_dpt.h
 
 # Misc debug flags.  Most of these should probably be replaced with
 # 'DEBUG', and then let people recompile just the interesting modules