Date: Wed, 20 Oct 2010 01:27:11 +0000 From: Alexander Best <arundel@freebsd.org> To: freebsd-scsi@freebsd.org Subject: Re: set kern.cam.scsi_delay to 2000ms on all platforms Message-ID: <20101020012711.GA132@freebsd.org> In-Reply-To: <20101019221131.GA75368@freebsd.org> References: <20101019221131.GA75368@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue Oct 19 10, Alexander Best wrote:
> hi there,
>
> i've posted this patch on freebsd-hackers@, but jhb@ recommended i should also
> send it to freebsd-scsi@. basically what this patch does is to populate
> kern.cam.scsi_delay=2000 as the default value throughout the entire source
> tree. in addition to that it gets rid of some legacy Makefile entries, where
> kern.cam.scsi_delay was set to 150000.
Warner Losh pointed out that opt_scsi.h could be removed from the module
makefiles of aha, ahb and trm.
cheers.
alex
>
> cheers.
> alex
>
> --
> a13x
> diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
> index ad52663..3087aec 100644
> --- a/share/man/man4/scsi.4
> +++ b/share/man/man4/scsi.4
> @@ -24,7 +24,7 @@
> .\" SUCH DAMAGE.
> .\"
> .\" $FreeBSD$
> -.Dd March 4, 2010
> +.Dd October 19, 2010
> .Dt CAM 4
> .Os
> .Sh NAME
> @@ -47,7 +47,7 @@
> .Cd "options CAM_MAX_HIGHPOWER=4"
> .Cd "options SCSI_NO_SENSE_STRINGS"
> .Cd "options SCSI_NO_OP_STRINGS"
> -.Cd "options SCSI_DELAY=8000"
> +.Cd "options SCSI_DELAY=2000"
> .Sh DESCRIPTION
> The
> .Nm
> @@ -116,7 +116,7 @@ Enabling this option for normal use is not recommended, since it slows
> debugging of
> .Tn SCSI
> problems.
> -.It Dv SCSI_DELAY=8000
> +.It Dv SCSI_DELAY=2000
> This is the
> .Tn SCSI
> "bus settle delay."
> diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
> index 3bc6299..df26ea6 100644
> --- a/sys/amd64/conf/GENERIC
> +++ b/sys/amd64/conf/GENERIC
> @@ -49,7 +49,6 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
> options COMPAT_FREEBSD5 # Compatible with FreeBSD5
> options COMPAT_FREEBSD6 # Compatible with FreeBSD6
> options COMPAT_FREEBSD7 # Compatible with FreeBSD7
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
> diff --git a/sys/amd64/conf/XENHVM b/sys/amd64/conf/XENHVM
> index 51f1256..47cdc83 100644
> --- a/sys/amd64/conf/XENHVM
> +++ b/sys/amd64/conf/XENHVM
> @@ -50,7 +50,6 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
> options COMPAT_FREEBSD5 # Compatible with FreeBSD5
> options COMPAT_FREEBSD6 # Compatible with FreeBSD6
> options COMPAT_FREEBSD7 # Compatible with FreeBSD7
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
> diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
> index 0fb3b87..a2ecc07 100644
> --- a/sys/arm/conf/BWCT
> +++ b/sys/arm/conf/BWCT
> @@ -57,7 +57,6 @@ options BOOTP
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
> index 76db42b..b14b1b2 100644
> --- a/sys/arm/conf/CNS11XXNAS
> +++ b/sys/arm/conf/CNS11XXNAS
> @@ -74,7 +74,6 @@ options MSDOSFS #MSDOS Filesystem
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
> index 2afd080..ff7fc1d 100644
> --- a/sys/arm/conf/CRB
> +++ b/sys/arm/conf/CRB
> @@ -49,7 +49,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options INTR_FILTER
> options SYSVSHM #SYSV-style shared memory
> diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
> index 3c2c1aa..24cf837 100644
> --- a/sys/arm/conf/EP80219
> +++ b/sys/arm/conf/EP80219
> @@ -48,7 +48,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
> index e7900f5..973f6e3 100644
> --- a/sys/arm/conf/GUMSTIX
> +++ b/sys/arm/conf/GUMSTIX
> @@ -53,7 +53,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
> index dd46a61..1c06f24 100644
> --- a/sys/arm/conf/HL200
> +++ b/sys/arm/conf/HL200
> @@ -53,7 +53,6 @@ options BOOTP_COMPAT
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
> index 6524cc6..194f454 100644
> --- a/sys/arm/conf/HL201
> +++ b/sys/arm/conf/HL201
> @@ -55,7 +55,6 @@ options ALT_BREAK_TO_DEBUGGER
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
> index 8b79497..a2e4687 100644
> --- a/sys/arm/conf/IQ31244
> +++ b/sys/arm/conf/IQ31244
> @@ -49,7 +49,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
> index f47e9ac..75980aa 100644
> --- a/sys/arm/conf/KB920X
> +++ b/sys/arm/conf/KB920X
> @@ -51,7 +51,6 @@ options NFSCLIENT #Network Filesystem Client
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
> index e4f3a54..17a1088 100644
> --- a/sys/arm/conf/LN2410SBC
> +++ b/sys/arm/conf/LN2410SBC
> @@ -49,7 +49,6 @@ options ROOTDEVNAME=\"ufs:da0s1\"
> #options NFS_ROOT #NFS usable as root device
>
> options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
> index d921e34..1585689 100644
> --- a/sys/arm/conf/NSLU
> +++ b/sys/arm/conf/NSLU
> @@ -66,7 +66,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
> index 55839ce..e1858fd 100644
> --- a/sys/arm/conf/QILA9G20
> +++ b/sys/arm/conf/QILA9G20
> @@ -57,7 +57,6 @@ options ALT_BREAK_TO_DEBUGGER
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> #options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
> index 6c2e94e..21a3f74 100644
> --- a/sys/arm/conf/SAM9G20EK
> +++ b/sys/arm/conf/SAM9G20EK
> @@ -56,7 +56,6 @@ options ALT_BREAK_TO_DEBUGGER
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> #options PSEUDOFS #Pseudo-filesystem framework
> -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE
> index b3aad2a..e7c843e 100644
> --- a/sys/arm/conf/SKYEYE
> +++ b/sys/arm/conf/SKYEYE
> @@ -50,7 +50,6 @@ options NFS_ROOT #NFS usable as /, requires NFSCLIENT
> options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> options PSEUDOFS #Pseudo-filesystem framework
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
> index 85f4697..e1c0673 100644
> --- a/sys/i386/conf/GENERIC
> +++ b/sys/i386/conf/GENERIC
> @@ -50,7 +50,6 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
> options COMPAT_FREEBSD5 # Compatible with FreeBSD5
> options COMPAT_FREEBSD6 # Compatible with FreeBSD6
> options COMPAT_FREEBSD7 # Compatible with FreeBSD7
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
> diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
> index 71af42c..ff43121 100644
> --- a/sys/ia64/conf/GENERIC
> +++ b/sys/ia64/conf/GENERIC
> @@ -54,7 +54,6 @@ options PRINTF_BUFR_SIZE=128 # Printf buffering to limit interspersion
> options PROCFS # Process filesystem (/proc)
> options PSEUDOFS # Pseudo-filesystem framework
> options SCHED_ULE # ULE scheduler
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options SCTP # Stream Control Transmission Protocol
> options SMP # Symmetric Multi-Processor support
> options SOFTUPDATES # Enable FFS soft updates support
> diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
> index a00e95d..db56e7c 100644
> --- a/sys/mips/conf/OCTEON1
> +++ b/sys/mips/conf/OCTEON1
> @@ -65,7 +65,6 @@ options PSEUDOFS # Pseudo-filesystem framework
> options GEOM_PART_GPT # GUID Partition Tables.
> options GEOM_LABEL # Provides labelization
> #options COMPAT_FREEBSD32 # Compatible with o32 binaries (not yet)
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
> diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
> index 24d356c..052c020 100644
> --- a/sys/modules/aha/Makefile
> +++ b/sys/modules/aha/Makefile
> @@ -6,9 +6,4 @@ KMOD= aha
> SRCS= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \
> opt_scsi.h isa_if.h
>
> -.if !defined(KERNBUILDDIR)
> -opt_scsi.h:
> - echo "#define SCSI_DELAY 15000" > ${.TARGET}
> -.endif
> -
> .include <bsd.kmod.mk>
> diff --git a/sys/modules/ahb/Makefile b/sys/modules/ahb/Makefile
> index 2616226..afb36f3 100644
> --- a/sys/modules/ahb/Makefile
> +++ b/sys/modules/ahb/Makefile
> @@ -5,9 +5,4 @@
> KMOD= ahb
> SRCS= ahb.c opt_cam.h device_if.h bus_if.h eisa_if.h opt_scsi.h
>
> -.if !defined(KERNBUILDDIR)
> -opt_scsi.h:
> - echo "#define SCSI_DELAY 15000" > ${.TARGET}
> -.endif
> -
> .include <bsd.kmod.mk>
> diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
> index df0d77d..4391b15 100644
> --- a/sys/modules/cam/Makefile
> +++ b/sys/modules/cam/Makefile
> @@ -35,9 +35,4 @@ SRCS+= ata_pmp.c
>
> EXPORT_SYMS= YES # XXX evaluate
>
> -.if !defined(KERNBUILDDIR)
> -opt_scsi.h:
> - echo "#define SCSI_DELAY 15000" > ${.TARGET}
> -.endif
> -
> .include <bsd.kmod.mk>
> diff --git a/sys/modules/trm/Makefile b/sys/modules/trm/Makefile
> index 48df9f5..7c42e40 100644
> --- a/sys/modules/trm/Makefile
> +++ b/sys/modules/trm/Makefile
> @@ -6,9 +6,4 @@ KMOD= trm
> SRCS= trm.c trm.h opt_cam.h device_if.h bus_if.h \
> opt_scsi.h pci_if.h
>
> -.if !defined(KERNBUILDDIR)
> -opt_scsi.h:
> - echo "#define SCSI_DELAY 15000" > ${.TARGET}
> -.endif
> -
> .include <bsd.kmod.mk>
> diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
> index e137297..df937c6 100644
> --- a/sys/pc98/conf/GENERIC
> +++ b/sys/pc98/conf/GENERIC
> @@ -50,7 +50,6 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4
> options COMPAT_FREEBSD5 # Compatible with FreeBSD5
> options COMPAT_FREEBSD6 # Compatible with FreeBSD6
> options COMPAT_FREEBSD7 # Compatible with FreeBSD7
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options EPSON_BOUNCEDMA # use bounce buffer for 15-16M
> #options EPSON_MEMWIN # EPSON memory window support
> #options LINE30
> diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
> index c23e9ac..5f44ee8 100644
> --- a/sys/powerpc/conf/GENERIC
> +++ b/sys/powerpc/conf/GENERIC
> @@ -54,7 +54,6 @@ options COMPAT_FREEBSD4 #Keep this for a while
> options COMPAT_FREEBSD5 #Compatible with FreeBSD5
> options COMPAT_FREEBSD6 #Compatible with FreeBSD6
> options COMPAT_FREEBSD7 #Compatible with FreeBSD7
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) syscall trace support
> options STACK #stack(9) support
> options SYSVSHM #SYSV-style shared memory
> diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
> index b861e51..9127c01 100644
> --- a/sys/powerpc/conf/GENERIC64
> +++ b/sys/powerpc/conf/GENERIC64
> @@ -53,7 +53,6 @@ options COMPAT_FREEBSD32 #Compatible with FreeBSD/powerpc binaries
> options COMPAT_FREEBSD5 #Compatible with FreeBSD5
> options COMPAT_FREEBSD6 #Compatible with FreeBSD6
> options COMPAT_FREEBSD7 #Compatible with FreeBSD7
> -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> options KTRACE #ktrace(1) syscall trace support
> options STACK #stack(9) support
> options SYSVSHM #SYSV-style shared memory
> diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
> index 6bbd4e1..60226d0 100644
> --- a/sys/sparc64/conf/GENERIC
> +++ b/sys/sparc64/conf/GENERIC
> @@ -50,7 +50,6 @@ options GEOM_LABEL # Provides labelization
> options COMPAT_FREEBSD5 # Compatible with FreeBSD5
> options COMPAT_FREEBSD6 # Compatible with FreeBSD6
> options COMPAT_FREEBSD7 # Compatible with FreeBSD7
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
> diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
> index 74fc036..0508048 100644
> --- a/sys/sun4v/conf/GENERIC
> +++ b/sys/sun4v/conf/GENERIC
> @@ -51,7 +51,6 @@ options PROCFS # Process filesystem (requires PSEUDOFS)
> options PSEUDOFS # Pseudo-filesystem framework
> options GEOM_PART_GPT # GUID Partition Tables.
> options GEOM_LABEL # Provides labelization
> -options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
> options KTRACE # ktrace(1) support
> options STACK # stack(9) support
> options SYSVSHM # SYSV-style shared memory
--
a13x
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101020012711.GA132>