Drives connected to pcscp0 disappeared.

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Drives connected to pcscp0 disappeared.

Matthias Kilian
Hi,

I just noticed that the cd and dvd drives connected to my Tekram
DC-390 host adapter aren't detected since a few days.

What follows are the dmesg of my current system and a diff against a
dmesg some months ago. Please note that

a) in my current system, Ottos patch to sys/sys/queue.h is applied,
b) I roughly remember to used one of the drives a week ago.

If this is neither a PEBKAC nor a known issue, I'll have a look at my
recent backups and search for the very last time the drives have been
detected.

Ciao,
        Kili

OpenBSD 3.8-current (GENERIC) #110: Fri Nov 18 20:57:14 CET 2005
    [hidden email]:/var/compile/GENERIC
cpu0: AMD Athlon(TM) XP 2400+ ("AuthenticAMD" 686-class, 256KB L2 cache) 1.99 GHz
cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE
cpu0: AMD Powernow: TS
real mem  = 1073307648 (1048152K)
avail mem = 972795904 (949996K)
using 4278 buffers containing 53768192 bytes (52508K) of memory
mainbus0 (root)
bios0 at mainbus0: AT/286+(bf) BIOS, date 04/21/04, BIOS32 rev. 0 @ 0xf1aa0
apm0 at bios0: Power Management spec V1.2
apm0: AC on, battery charge unknown
apm0: flags 30102 dobusy 0 doidle 1
pcibios0 at bios0: rev 2.1 @ 0xf0000/0x2162
pcibios0: PCI bus #1 is the last bus
bios0: ROM list: 0xc0000/0xd000 0xd0000/0x6000! 0xd8000/0x1800 0xdc000/0x400 0xe0000/0x8000
cpu0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "VIA VT8377 PCI" rev 0x00
ppb0 at pci0 dev 1 function 0 "VIA VT8235 AGP" rev 0x00
pci1 at ppb0 bus 1
vga1 at pci1 dev 0 function 0 "ATI Radeon 9200 SE Sec" rev 0x01
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
"ATI Radeon 9200 SE" rev 0x01 at pci1 dev 0 function 1 not configured
bce0 at pci0 dev 9 function 0 "Broadcom BCM4401" rev 0x01: irq 6, address 00:e0:18:9a:2a:7d
bmtphy0 at bce0 phy 1: BCM4401 10/100baseTX PHY, rev. 0
pcscp0 at pci0 dev 13 function 0 "AMD 53c974 PCscsi-PCI" rev 0x10: irq 9
pcscp0: AM53C974, 40MHz, SCSI ID 7
pcscp0: SCSI bus reset
scsibus0 at pcscp0: 8 targets
trm0 at pci0 dev 14 function 0 "Tekram DC-3x5U" rev 0x01: irq 5
scsibus1 at trm0: 16 targets
trm0: target 1 using 16 bit 20.83 MHz, Offset 15 data transfers
st0 at scsibus1 targ 1 lun 0: <HP, C5683A, C104> SCSI2 1/sequential removable
st0: drive empty or not ready
ral0 at pci0 dev 15 function 0 "Ralink RT2560" rev 0x01: irq 6, address 00:0f:ea:0c:84:5a
ral0: MAC/BBP RT2560 (rev 0x04), RF RT2525
uhci0 at pci0 dev 16 function 0 "VIA VT83C572 USB" rev 0x80: irq 5
usb0 at uhci0: USB revision 1.0
uhub0 at usb0
uhub0: VIA UHCI root hub, rev 1.00/1.00, addr 1
uhub0: 2 ports with 2 removable, self powered
uhci1 at pci0 dev 16 function 1 "VIA VT83C572 USB" rev 0x80: irq 5
usb1 at uhci1: USB revision 1.0
uhub1 at usb1
uhub1: VIA UHCI root hub, rev 1.00/1.00, addr 1
uhub1: 2 ports with 2 removable, self powered
uhci2 at pci0 dev 16 function 2 "VIA VT83C572 USB" rev 0x80: irq 5
usb2 at uhci2: USB revision 1.0
uhub2 at usb2
uhub2: VIA UHCI root hub, rev 1.00/1.00, addr 1
uhub2: 2 ports with 2 removable, self powered
ehci0 at pci0 dev 16 function 3 "VIA VT6202 USB" rev 0x82: irq 5
usb3 at ehci0: USB revision 2.0
uhub3 at usb3
uhub3: VIA EHCI root hub, rev 2.00/1.00, addr 1
uhub3: 6 ports with 6 removable, self powered
pcib0 at pci0 dev 17 function 0 "VIA VT8235 ISA" rev 0x00
pciide0 at pci0 dev 17 function 1 "VIA VT82C571 IDE" rev 0x06: ATA133, channel 0 configured to compatibility, channel 1 configured to compatibility
wd0 at pciide0 channel 0 drive 0: <Maxtor 6Y080L0>
wd0: 16-sector PIO, LBA, 78167MB, 160086528 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 6
pciide0: channel 1 disabled (no drives)
auvia0 at pci0 dev 17 function 5 "VIA VT8233 AC97" rev 0x50: irq 6
ac97: codec id 0x414c4720 (Avance Logic ALC650)
ac97: codec features 20 bit DAC, 18 bit ADC, Realtek 3D
audio0 at auvia0
isa0 at pcib0
isadma0 at isa0
pcppi0 at isa0 port 0x61
midi0 at pcppi0: <PC speaker>
spkr0 at pcppi0
sysbeep0 at pcppi0
lpt0 at isa0 port 0x378/4 irq 7
npx0 at isa0 port 0xf0/16: using exception 16
pccom0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
pccom1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
biomask ff27 netmask ff67 ttymask ffe7
pctr: user-level cycle counter enabled
mtrr: Pentium Pro MTRR support
umass0 at uhub3 port 3 configuration 1 interface 0
umass0: Genesyslogic USB Mass Storage Device, rev 2.00/0.33, addr 2
umass0: using SCSI over Bulk-Only
scsibus2 at umass0: 2 targets
sd0 at scsibus2 targ 1 lun 0: <SAMSUNG, SV1604N, 0811> SCSI0 0/direct fixed
sd0: 152627MB, 152627 cyl, 64 head, 32 sec, 512 bytes/sec, 312581808 sec total
uhub4 at uhub0 port 1
uhub4: Chicony Generic USB Hub, rev 1.10/1.00, addr 2
uhub4: 3 ports with 2 removable, bus powered
uhidev0 at uhub4 port 1 configuration 1 interface 0
uhidev0: Chicony PFU-65 USB Keyboard, rev 1.10/1.00, addr 3, iclass 3/1
ukbd0 at uhidev0: 8 modifier keys, 6 key codes
wskbd0 at ukbd0 mux 1
wskbd0: connecting to wsdisplay0
uhidev1 at uhub4 port 2 configuration 1 interface 0
uhidev1: Logitech Trackball, rev 1.10/2.20, addr 4, iclass 3/1
ums0 at uhidev1: 3 buttons and Z dir.
wsmouse0 at ums0 mux 0
udsbr0 at uhub0 port 2
udsbr0: GemTek Corp USB FM Radio, rev 1.00/4.10, addr 5
radio0 at udsbr0
dkcsum: wd0 matches BIOS drive 0x80
root on wd0a
rootdev=0x0 rrootdev=0x300 rawdev=0x302


And here's the diff to my system's dmesg some months ago:

--- dmesg.petunia-20050717 Sun Jul 17 16:48:11 2005
+++ dmesg.petunia Fri Nov 18 21:43:08 2005
@@ -1,10 +1,10 @@
-OpenBSD 3.7-current (GENERIC) #58: Fri Jul  8 14:45:36 CEST 2005
+OpenBSD 3.8-current (GENERIC) #110: Fri Nov 18 20:57:14 CET 2005
     [hidden email]:/var/compile/GENERIC
 cpu0: AMD Athlon(TM) XP 2400+ ("AuthenticAMD" 686-class, 256KB L2 cache) 1.99 GHz
 cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE
-cpu0: AMD Powernow: FID
+cpu0: AMD Powernow: TS
 real mem  = 1073307648 (1048152K)
-avail mem = 972824576 (950024K)
+avail mem = 972795904 (949996K)
 using 4278 buffers containing 53768192 bytes (52508K) of memory
 mainbus0 (root)
 bios0 at mainbus0: AT/286+(bf) BIOS, date 04/21/04, BIOS32 rev. 0 @ 0xf1aa0
@@ -13,13 +13,13 @@
 apm0: flags 30102 dobusy 0 doidle 1
 pcibios0 at bios0: rev 2.1 @ 0xf0000/0x2162
 pcibios0: PCI bus #1 is the last bus
-bios0: ROM list: 0xc0000/0xd000 0xd0000/0x1800 0xd4000/0x400 0xd8000/0x8000
+bios0: ROM list: 0xc0000/0xd000 0xd0000/0x6000! 0xd8000/0x1800 0xdc000/0x400 0xe0000/0x8000
 cpu0 at mainbus0
 pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
 pchb0 at pci0 dev 0 function 0 "VIA VT8377 PCI" rev 0x00
 ppb0 at pci0 dev 1 function 0 "VIA VT8235 AGP" rev 0x00
 pci1 at ppb0 bus 1
-vga1 at pci1 dev 0 function 0 "ATI Radeon 9200 SE 2nd" rev 0x01
+vga1 at pci1 dev 0 function 0 "ATI Radeon 9200 SE Sec" rev 0x01
 wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
 wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
 "ATI Radeon 9200 SE" rev 0x01 at pci1 dev 0 function 1 not configured
@@ -29,34 +29,32 @@
 pcscp0: AM53C974, 40MHz, SCSI ID 7
 pcscp0: SCSI bus reset
 scsibus0 at pcscp0: 8 targets
-cd0 at scsibus0 targ 0 lun 0: <PIONEER, DVD-ROM DVD-303R, 1.10> SCSI2 5/cdrom removable
-cd1 at scsibus0 targ 2 lun 0: <TEAC, CD-R55S, 1.0J> SCSI2 5/cdrom removable
 trm0 at pci0 dev 14 function 0 "Tekram DC-3x5U" rev 0x01: irq 5
 scsibus1 at trm0: 16 targets
 trm0: target 1 using 16 bit 20.83 MHz, Offset 15 data transfers
 st0 at scsibus1 targ 1 lun 0: <HP, C5683A, C104> SCSI2 1/sequential removable
 st0: drive empty or not ready
-ath0 at pci0 dev 15 function 0 "Atheros AR5212" rev 0x01: irq 6
-ath0: AR5212 7.9 phy 4.5 rf2112 5.6 rf2112 5.6ath0: no valid channels for regdomain NONE(32976)
+ral0 at pci0 dev 15 function 0 "Ralink RT2560" rev 0x01: irq 6, address 00:0f:ea:0c:84:5a
+ral0: MAC/BBP RT2560 (rev 0x04), RF RT2525
 uhci0 at pci0 dev 16 function 0 "VIA VT83C572 USB" rev 0x80: irq 5
 usb0 at uhci0: USB revision 1.0
 uhub0 at usb0
-uhub0: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub0: VIA UHCI root hub, rev 1.00/1.00, addr 1
 uhub0: 2 ports with 2 removable, self powered
 uhci1 at pci0 dev 16 function 1 "VIA VT83C572 USB" rev 0x80: irq 5
 usb1 at uhci1: USB revision 1.0
 uhub1 at usb1
-uhub1: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub1: VIA UHCI root hub, rev 1.00/1.00, addr 1
 uhub1: 2 ports with 2 removable, self powered
 uhci2 at pci0 dev 16 function 2 "VIA VT83C572 USB" rev 0x80: irq 5
 usb2 at uhci2: USB revision 1.0
 uhub2 at usb2
-uhub2: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
+uhub2: VIA UHCI root hub, rev 1.00/1.00, addr 1
 uhub2: 2 ports with 2 removable, self powered
 ehci0 at pci0 dev 16 function 3 "VIA VT6202 USB" rev 0x82: irq 5
 usb3 at ehci0: USB revision 2.0
 uhub3 at usb3
-uhub3: VIA EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
+uhub3: VIA EHCI root hub, rev 2.00/1.00, addr 1
 uhub3: 6 ports with 6 removable, self powered
 pcib0 at pci0 dev 17 function 0 "VIA VT8235 ISA" rev 0x00
 pciide0 at pci0 dev 17 function 1 "VIA VT82C571 IDE" rev 0x06: ATA133, channel 0 configured to compatibility, channel 1 configured to compatibility
@@ -70,13 +68,6 @@
 audio0 at auvia0
 isa0 at pcib0
 isadma0 at isa0
-pckbc0 at isa0 port 0x60/5
-pckbd0 at pckbc0 (kbd slot)
-pckbc0: using irq 1 for kbd slot
-wskbd0 at pckbd0: console keyboard, using wsdisplay0
-pmsi0 at pckbc0 (aux slot)
-pckbc0: using irq 12 for aux slot
-wsmouse0 at pmsi0 mux 0
 pcppi0 at isa0 port 0x61
 midi0 at pcppi0: <PC speaker>
 spkr0 at pcppi0
@@ -85,12 +76,30 @@
 npx0 at isa0 port 0xf0/16: using exception 16
 pccom0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
 pccom1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
-biomask ef25 netmask ef65 ttymask ffe7
+biomask ff27 netmask ff67 ttymask ffe7
 pctr: user-level cycle counter enabled
 mtrr: Pentium Pro MTRR support
-dkcsum: wd0 matched BIOS disk 80
+umass0 at uhub3 port 3 configuration 1 interface 0
+umass0: Genesyslogic USB Mass Storage Device, rev 2.00/0.33, addr 2
+umass0: using SCSI over Bulk-Only
+scsibus2 at umass0: 2 targets
+sd0 at scsibus2 targ 1 lun 0: <SAMSUNG, SV1604N, 0811> SCSI0 0/direct fixed
+sd0: 152627MB, 152627 cyl, 64 head, 32 sec, 512 bytes/sec, 312581808 sec total
+uhub4 at uhub0 port 1
+uhub4: Chicony Generic USB Hub, rev 1.10/1.00, addr 2
+uhub4: 3 ports with 2 removable, bus powered
+uhidev0 at uhub4 port 1 configuration 1 interface 0
+uhidev0: Chicony PFU-65 USB Keyboard, rev 1.10/1.00, addr 3, iclass 3/1
+ukbd0 at uhidev0: 8 modifier keys, 6 key codes
+wskbd0 at ukbd0 mux 1
+wskbd0: connecting to wsdisplay0
+uhidev1 at uhub4 port 2 configuration 1 interface 0
+uhidev1: Logitech Trackball, rev 1.10/2.20, addr 4, iclass 3/1
+ums0 at uhidev1: 3 buttons and Z dir.
+wsmouse0 at ums0 mux 0
+udsbr0 at uhub0 port 2
+udsbr0: GemTek Corp USB FM Radio, rev 1.00/4.10, addr 5
+radio0 at udsbr0
+dkcsum: wd0 matches BIOS drive 0x80
 root on wd0a
 rootdev=0x0 rrootdev=0x300 rawdev=0x302
-udsbr0 at uhub0 port 1
-udsbr0: GemTek Corp USB FM Radio, rev 1.00/4.10, addr 2
-radio0 at udsbr0

Reply | Threaded
Open this post in threaded view
|

Re: Drives connected to pcscp0 disappeared.

Martin Reindl
Matthias Kilian <[hidden email]> wrote:

> Hi,
>
> I just noticed that the cd and dvd drives connected to my Tekram
> DC-390 host adapter aren't detected since a few days.
>
> What follows are the dmesg of my current system and a diff against a
> dmesg some months ago. Please note that
>
> a) in my current system, Ottos patch to sys/sys/queue.h is applied,
> b) I roughly remember to used one of the drives a week ago.
>
> If this is neither a PEBKAC nor a known issue, I'll have a look at my
> recent backups and search for the very last time the drives have been
> detected.

Cannot reproduce here on amd64, need more details.

Martin

OpenBSD 3.8-current (GENERIC) #4: Fri Nov 18 23:39:43 CET 2005
    [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC
real mem = 536145920 (523580K)
avail mem = 448176128 (437672K)
using 13140 buffers containing 53821440 bytes (52560K) of memory
mainbus0 (root)
cpu0 at mainbus0: (uniprocessor)
cpu0: AMD Athlon(tm) 64 Processor 3000+, 1995.85 MHz
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,NXE,MMXX,LONG,3DNOW2,3DNOW
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB
64b/line 16-way L2 cache cpu0: ITLB 32 4KB entries fully associative, 8
4MB entries fully associative cpu0: DTLB 32 4KB entries fully
associative, 8 4MB entries fully associative [...] pcscp0 at pci0 dev
12 function 0 "AMD 53c974 PCscsi-PCI" rev 0x10: irq 11 pcscp0:
AM53C974, 40MHz, SCSI ID 7 scsibus1 at pcscp0: 8 targets
cd1 at scsibus1 targ 2 lun 0: <PLEXTOR, CD-ROM PX-32TS, 1.03> SCSI2
5/cdrom removable sd0 at scsibus1 targ 6 lun 0: <SEAGATE, ST34371W,
HP03> SCSI2 0/direct fixed sd0: 4095MB, 5172 cyl, 10 head, 162 sec, 512 bytes/sec, 8388314 sec total
[...]

Reply | Threaded
Open this post in threaded view
|

Re: Drives connected to pcscp0 disappeared.

Matthias Kilian
On Sat, Nov 19, 2005 at 12:02:47AM +0100, Martin Reindl wrote:
> Cannot reproduce here on amd64, need more details.
[...]
> OpenBSD 3.8-current (GENERIC) #4: Fri Nov 18 23:39:43 CET 2005
>     [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC
[...]
> associative, 8 4MB entries fully associative [...] pcscp0 at pci0 dev
> 12 function 0 "AMD 53c974 PCscsi-PCI" rev 0x10: irq 11 pcscp0:
> AM53C974, 40MHz, SCSI ID 7 scsibus1 at pcscp0: 8 targets
> cd1 at scsibus1 targ 2 lun 0: <PLEXTOR, CD-ROM PX-32TS, 1.03> SCSI2

That's odd.

I've tried some kernels from my backups, and it seems that the
problem occured somewhere between nov. 12th and nov. 15th (see
below).

What additional details could help? I could boot with verbose
autoconfig, but I have to do it via serial console, since the output
is too large for the dmesg buffer.

Ciao,
        Kili


$ diff -uw dmesg.petunia-2005111{2,5}

--- dmesg.petunia-20051112 Sat Nov 19 10:31:45 2005
+++ dmesg.petunia-20051115 Sat Nov 19 10:34:21 2005
@@ -1,10 +1,10 @@
-OpenBSD 3.8-current (GENERIC) #107: Sat Nov 12 21:23:07 CET 2005
+OpenBSD 3.8-current (GENERIC) #108: Tue Nov 15 20:57:57 CET 2005
     [hidden email]:/var/compile/GENERIC
 cpu0: AMD Athlon(TM) XP 2400+ ("AuthenticAMD" 686-class, 256KB L2 cache) 1.99 GHz
 cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE
 cpu0: AMD Powernow: TS
 real mem  = 1073307648 (1048152K)
-avail mem = 972791808 (949992K)
+avail mem = 972795904 (949996K)
 using 4278 buffers containing 53768192 bytes (52508K) of memory
 mainbus0 (root)
 bios0 at mainbus0: AT/286+(bf) BIOS, date 04/21/04, BIOS32 rev. 0 @ 0xf1aa0
@@ -29,8 +29,6 @@
 pcscp0: AM53C974, 40MHz, SCSI ID 7
 pcscp0: SCSI bus reset
 scsibus0 at pcscp0: 8 targets
-cd0 at scsibus0 targ 0 lun 0: <PIONEER, DVD-ROM DVD-303R, 1.10> SCSI2 5/cdrom removable
-cd1 at scsibus0 targ 2 lun 0: <TEAC, CD-R55S, 1.0J> SCSI2 5/cdrom removable
 trm0 at pci0 dev 14 function 0 "Tekram DC-3x5U" rev 0x01: irq 5
 scsibus1 at trm0: 16 targets
 trm0: target 1 using 16 bit 20.83 MHz, Offset 15 data transfers

Reply | Threaded
Open this post in threaded view
|

Re: Drives connected to pcscp0 disappeared.

Martin Reindl
Matthias Kilian <[hidden email]> wrote:

> On Sat, Nov 19, 2005 at 12:02:47AM +0100, Martin Reindl wrote:
> > Cannot reproduce here on amd64, need more details.
> [...]
> > OpenBSD 3.8-current (GENERIC) #4: Fri Nov 18 23:39:43 CET 2005
> >     [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC
> [...]
> > associative, 8 4MB entries fully associative [...] pcscp0 at pci0 dev
> > 12 function 0 "AMD 53c974 PCscsi-PCI" rev 0x10: irq 11 pcscp0:
> > AM53C974, 40MHz, SCSI ID 7 scsibus1 at pcscp0: 8 targets
> > cd1 at scsibus1 targ 2 lun 0: <PLEXTOR, CD-ROM PX-32TS, 1.03> SCSI2
>
> That's odd.
>
> I've tried some kernels from my backups, and it seems that the
> problem occured somewhere between nov. 12th and nov. 15th (see
> below).
>
> What additional details could help? I could boot with verbose
> autoconfig, but I have to do it via serial console, since the output
> is too large for the dmesg buffer.

No changes happened to pcscp in this timeframe. Try with CVS sources in
src/sys/scsi from 12th and then from 15th (or in between as necessary).

martin

Reply | Threaded
Open this post in threaded view
|

Re: Drives connected to pcscp0 disappeared.

Matthias Kilian
On Sat, Nov 19, 2005 at 12:27:14PM +0100, Martin Reindl wrote:
> No changes happened to pcscp in this timeframe. Try with CVS sources in
> src/sys/scsi from 12th and then from 15th (or in between as necessary).

The change by krw@ below caused my problem. Seems that my hardware
can't live without the delay.

Ciao,
        Kili


Index: scsi_base.c
===================================================================
RCS file: /var/cvs/OpenBSD/src/sys/scsi/scsi_base.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -u -w -r1.95 -r1.96
--- scsi_base.c 13 Nov 2005 02:39:45 -0000 1.95
+++ scsi_base.c 13 Nov 2005 03:27:42 -0000 1.96
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.95 2005/11/13 02:39:45 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.96 2005/11/13 03:27:42 krw Exp $ */
 /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
 
 /*
@@ -78,6 +78,11 @@
  if (scsi_init_done)
  return;
  scsi_init_done = 1;
+
+#if defined(SCSI_DELAY) && SCSI_DELAY > 0
+ /* Historical. Older buses may need a moment to stabilize. */
+ delay(1000000 * SCSI_DELAY);
+#endif
 
  /* Initialize the scsi_xfer pool. */
  pool_init(&scsi_xfer_pool, sizeof(struct scsi_xfer), 0,
Index: scsiconf.c
===================================================================
RCS file: /var/cvs/OpenBSD/src/sys/scsi/scsiconf.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -u -w -r1.97 -r1.98
--- scsiconf.c 10 Oct 2005 20:06:12 -0000 1.97
+++ scsiconf.c 13 Nov 2005 03:27:42 -0000 1.98
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.97 2005/10/10 20:06:12 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.98 2005/11/13 03:27:42 krw Exp $ */
 /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
 
 /*
@@ -178,15 +178,6 @@
  panic("scsibusattach: can't allocate lun links");
  bzero(sb->sc_link[i], nbytes);
  }
-
-#if defined(SCSI_DELAY) && SCSI_DELAY > 2
- printf("%s: waiting for scsi devices to settle\n",
- sb->sc_dev.dv_xname);
-#else /* SCSI_DELAY > 2 */
-#undef SCSI_DELAY
-#define SCSI_DELAY 2
-#endif /* SCSI_DELAY */
- delay(1000000 * SCSI_DELAY);
 
  scsi_probe_bus(sb->sc_dev.dv_unit, -1, -1);
 }