SEO

----- Original Message -----
From: "David Gwynne" <loki@animata.net>
To: <tech@openbsd.org>
Sent: Tuesday, June 22, 2004 1:06 AM
Subject: endian fix for ehci


> The diff below allows ehci to work on sparc64. I haven't tested this on
i386
> or amd64 (I lack amd64 hardware and I lack the motivation to plug a
monitor
> into an i386). However I'm confident that it will continue to work.
>
> Many thanks to Chris Pascoe who found and fixed the problem.
>
> If my mail client munges the spaces below it is also available at
> http://www.animata.net/~loki/openbsd...endianfix.diff.

I got bored so I decided to test the diff on i386 and give you a dmesg from
both the i386 and sparc64. Before the diff ehci on sparc64 would stop
working after emitting something like "ehci0: Unrecoverable error" and would
stop working. They both work as well as each other now.

Regards,
DG

OpenBSD 3.5-current (GENERIC) #0: Wed Jun 23 19:57:52 EST 2004

dlg@external.bytecomm.com.au:/home/dlg/usb2/src/sys/arch/i386/compile/GENERI
C
cpu0: Intel Celeron ("GenuineIntel" 686-class, 128KB L2 cache) 501 MHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MC A,CMOV,PAT,PSE36,MMX,FXSR
real mem = 132685824 (129576K)
avail mem = 114556928 (111872K)
using 1645 buffers containing 6737920 bytes (6580K) of memory
mainbus0 (root)
bios0 at mainbus0: AT/286+(01) BIOS, date 04/07/00, BIOS32 rev. 0 @ 0xfb0c0
apm0 at bios0: Power Management spec V1.2
apm0: AC on, battery charge unknown
pcibios0 at bios0: rev. 2.1 @ 0xf0000/0xb540
pcibios0: PCI IRQ Routing Table rev. 1.0 @ 0xfde90/96 (4 entries)
pcibios0: bad IRQ table checksum
pcibios0: PCI BIOS has 4 Interrupt Routing table entries
pcibios0: PCI Exclusive IRQs: 5 11 12
pcibios0: PCI Interrupt Router at 000:31:0 ("Intel 82801AA LPC" rev 0x00)
pcibios0: PCI bus #1 is the last bus
bios0: ROM list: 0xc0000/0x8000
cpu0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "Intel 82810" rev 0x03: rng active, 9Kb/sec
vga1 at pci0 dev 1 function 0 "Intel 82810 Graphics" rev 0x03: aperture at
0xd8000000, size 0x4000000
wsdisplay0 at vga1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
ppb0 at pci0 dev 30 function 0 "Intel 82801AA Hub-to-PCI" rev 0x02
pci1 at ppb0 bus 1
ne3 at pci1 dev 0 function 0 "Realtek 8029" rev 0x00: irq 11
ne3: address 52:54:05:e4:41:9b
uhci0 at pci1 dev 2 function 0 "VIA VT83C572 USB" rev 0x50: 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: 2 ports with 2 removable, self powered
uhci1 at pci1 dev 2 function 1 "VIA VT83C572 USB" rev 0x50: 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: 2 ports with 2 removable, self powered
ehci0 at pci1 dev 2 function 2 "VIA VT6202 USB 2.0" rev 0x51: irq 11
ehci0: EHCI version 0.95
ehci0: companion controllers, 2 ports each: uhci0 uhci1
usb2 at ehci0: USB revision 2.0
uhub2 at usb2
uhub2: VIA EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
uhub2: 4 ports with 4 removable, self powered
ichpcib0 at pci0 dev 31 function 0 "Intel 82801AA LPC" rev 0x02
pciide0 at pci0 dev 31 function 1 "Intel 82801AA IDE" rev 0x02: DMA, channel
0 wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: <FUJITSU MPD3043AT>
wd0: 16-sector PIO, LBA, 4125MB, 8448300 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 4
atapiscsi0 at pciide0 channel 1 drive 0
scsibus0 at atapiscsi0: 2 targets
cd0 at scsibus0 targ 0 lun 0: <LG, CD-ROM CRD-8322B, 1.05> SCSI0 5/cdrom
removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
uhci2 at pci0 dev 31 function 2 "Intel 82801AA USB" rev 0x02: irq 5
usb3 at uhci2: USB revision 1.0
uhub3 at usb3
uhub3: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub3: 2 ports with 2 removable, self powered
"Intel 82801AA SMBus" rev 0x02 at pci0 dev 31 function 3 not configured
auich0 at pci0 dev 31 function 5 "Intel 82801AA AC97 Audio" rev 0x02: irq
12, ICH AC97
ac97: codec id 0x41445340 (Analog Devices AD1881)
ac97: codec features headphone, Analog Devices Phat Stereo
audio0 at auich0
auich0: measured ac97 link rate at 47992 Hz, will use 48000 Hz
isa0 at ichpcib0
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
pcppi0 at isa0 port 0x61
midi0 at pcppi0: <PC speaker>
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
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
biomask ef65 netmask ef65 ttymask efe7
pctr: 686-class user-level performance counters enabled
mtrr: Pentium Pro MTRR support
dkcsum: wd0 matched BIOS disk 80
root on wd0a
rootdev=0x0 rrootdev=0x300 rawdev=0x302
umass0 at uhub2 port 4 configuration 1 interface 0
umass0: Genesys Logic USB TO IDE, rev 2.00/0.02, addr 2
umass0: using SCSI over Bulk-Only
scsibus1 at umass0: 2 targets
sd0 at scsibus1 targ 1 lun 0: <ST340016, A, 0811> SCSI0 0/direct fixed
sd0: 38166MB, 38166 cyl, 64 head, 32 sec, 512 bytes/sec, 78165360 sec total

console is /pci@1f,0/pci@1,1/ebus@1/se@14,400000:b
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
Copyright (c) 1995-2004 OpenBSD. All rights reserved.
http://www.OpenBSD.org

OpenBSD 3.5-current (USB) #1: Tue Jun 22 23:05:14 EST 2004
root@ehci.home.animata.net:/usr/src/sys/arch/sparc64/compile/USB
total memory = 268435456
avail memory = 235347968
using 1638 buffers containing 13418496 bytes of memory
bootpath: /pci@1f,0/pci@1,1/ide@3,0/disk@0,0
mainbus0 (root): Sun Ultra 5/10 UPA/PCI (UltraSPARC-IIi 440MHz)
cpu0 at mainbus0: SUNW,UltraSPARC-IIi @ 440 MHz, version 0 FPU
cpu0: physical 32K instruction (32 b/l), 16K data (32 b/l), 2048K external
(64 b/l)
psycho0 at mainbus0 addr 0xfffc4000
SUNW,sabre: impl 0, version 0: ign 7c0 bus range 0 to 2; PCI bus 0
DVMA map: c0000000 to e0000000
IOTDB: 1362000 to 13e2000
pci0 at psycho0
ppb0 at pci0 dev 1 function 1 "Sun Simba PCI-PCI" rev 0x13
pci1 at ppb0 bus 1
ebus0 at pci1 dev 1 function 0 "Sun PCIO Ebus2" rev 0x01
auxio0 at ebus0 addr 726000-726003, 728000-728003, 72a000-72a003,
72c000-72c003, 72f000-72f003
power at ebus0 addr 724000-724003 ipl 37 not configured
SUNW,pll at ebus0 addr 504000-504002 not configured
sab0 at ebus0 addr 400000-40007f ipl 43: rev 3.2
sabtty0 at sab0 port 0
sabtty1 at sab0 port 1: console i/o
comkbd0 at ebus0 addr 3083f8-3083ff ipl 41: reset timeout
comkbd0: no keyboard
com0 at ebus0 addr 3062f8-3062ff ipl 42, mouse: ns16550a, 16 byte fifo
lpt0 at ebus0 addr 3043bc-3043cb, 30015c-30015d, 700000-70000f ipl 34:
polled
fdthree at ebus0 addr 3023f0-3023f7, 706000-70600f, 720000-720003 ipl 39 not
configured
clock0 at ebus0 addr 0-1fff: mk48t59: hostid 80d1745b
flashprom at ebus0 addr 0-fffff not configured
audioce0 at ebus0 addr 200000-2000ff, 702000-70200f, 704000-70400f,
722000-722003 ipl 35 ipl 36: nvaddrs 0
audio0 at audioce0
hme0 at pci1 dev 1 function 1 "Sun HME" rev 0x01: address 08:00:20:d1:74:5b
nsphy0 at hme0 phy 1: DP83840 10/100 media interface, rev. 1
hme0: using ivec 3021 for interrupt
vgafb0 at pci1 dev 2 function 0 "ATI Mach64 GP" rev 0x5c
wsdisplay0 at vgafb0
wsdisplay0: screen 0 added (std, sun emulation)
pciide0 at pci1 dev 3 function 0 "CMD Technology PCI0646" rev 0x03: DMA,
channel 0 configured to native-PCI, channel 1 configured to native-PCI
pciide0: using ivec 1820 for native-PCI interrupt
wd0 at pciide0 channel 0 drive 0: <ST39120A>
wd0: 16-sector PIO, LBA, 8693MB, 17803297 sectors
wd0(pciide0:0:0): using PIO mode 4, DMA mode 2
pciide0: channel 1 disabled (no drives)
ppb1 at pci0 dev 1 function 0 "Sun Simba PCI-PCI" rev 0x13
pci2 at ppb1 bus 2
uhci0 at pci2 dev 1 function 0 "VIA VT83C572 USB" rev 0x50: ivec 10
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: 2 ports with 2 removable, self powered
uhci1 at pci2 dev 1 function 1 "VIA VT83C572 USB" rev 0x50: ivec 11
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: 2 ports with 2 removable, self powered
ehci0 at pci2 dev 1 function 2 "VIA VT6202 USB 2.0" rev 0x51PCI_CBMEM:
0x80000
: ivec 12
ehci0: EHCI version 0.95
ehci0: companion controllers, 2 ports each: uhci0 uhci1
usb2 at ehci0: USB revision 2.0
uhub2 at usb2
uhub2: VIA EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
uhub2: 4 ports with 4 removable, self powered
pcons at mainbus0 not configured
No counter-timer -- using %tick at 440MHz as system clock.
root on wd0a
rootdev=0xc00 rrootdev=0x1a00 rawdev=0x1a02
umass0 at uhub2 port 4 configuration 1 interface 0
umass0: Genesys Logic USB TO IDE, rev 2.00/0.02, addr 2
umass0: using SCSI over Bulk-Only
scsibus0 at umass0: 2 targets
sd0 at scsibus0 targ 1 lun 0: <ST340016, A, 0811> SCSI0 0/direct fixed
sd0: 38166MB, 38166 cyl, 64 head, 32 sec, 512 bytes/sec, 78165360 sec total