summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2013-04-10 23:20:09 +0000
committersbruno <sbruno@FreeBSD.org>2013-04-10 23:20:09 +0000
commit182d1a1c6784541d3388a56f135066bc4dfaead1 (patch)
treec77fe6c932c805ba507bbadf5d6228dc28a1aed1 /sys/conf
parent2e36122e63be842feeab6d01ac190f987e2bc2d2 (diff)
downloadFreeBSD-src-182d1a1c6784541d3388a56f135066bc4dfaead1.zip
FreeBSD-src-182d1a1c6784541d3388a56f135066bc4dfaead1.tar.gz
options DPT_HANDLE_TIMEOUTS hasn't worked since dpt(4) was converted to CAM
somewhere around svn r39402 to r39234. I don't know of anyone who really wants to test these changes, but they only remove the deprecated code in question. This shreds the driver down a bit and *removes* options from the kernel configs. These don't appear to be referenced in the man page, so no need to check it there. PR: kern/44587 Obtained from: Yahoo! Inc. MFC after: 2 weeks
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES15
-rw-r--r--sys/conf/options3
2 files changed, 1 insertions, 17 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c65a8a4..435f4b9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1623,20 +1623,10 @@ options ISP_DEFAULT_ROLES=0
# Compaq are actually DPT controllers.
#
# See src/sys/dev/dpt for debugging and other subtle options.
-# DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
+# DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
# instruments are enabled. The tools in
# /usr/sbin/dpt_* assume these to be enabled.
-# DPT_HANDLE_TIMEOUTS Normally device timeouts are handled by the DPT.
-# If you want the driver to handle timeouts, enable
-# this option. If your system is very busy, this
-# option will create more trouble than solve.
-# DPT_TIMEOUT_FACTOR Used to compute the excessive amount of time to
-# wait when timing out with the above option.
# DPT_DEBUG_xxxx These are controllable from sys/dev/dpt/dpt.h
-# DPT_LOST_IRQ When enabled, will try, once per second, to catch
-# 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.
@@ -1645,9 +1635,6 @@ device dpt
# DPT options
#!CAM# options DPT_MEASURE_PERFORMANCE
-#!CAM# options DPT_HANDLE_TIMEOUTS
-options DPT_TIMEOUT_FACTOR=4
-options DPT_LOST_IRQ
options DPT_RESET_HBA
#
diff --git a/sys/conf/options b/sys/conf/options
index 63688b7..e584e0c 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -534,9 +534,6 @@ NATM
# DPT driver debug flags
DPT_MEASURE_PERFORMANCE opt_dpt.h
-DPT_HANDLE_TIMEOUTS opt_dpt.h
-DPT_TIMEOUT_FACTOR opt_dpt.h
-DPT_LOST_IRQ opt_dpt.h
DPT_RESET_HBA opt_dpt.h
# Misc debug flags. Most of these should probably be replaced with
OpenPOWER on IntegriCloud