ohci not detected on at91rm9200?

[M. Warner Losh]

In message: <4A5C92DB.7030701 at bulinfo.net>
            Krassimir Slavchev <krassi at bulinfo.net> writes:
: -----BEGIN PGP SIGNED MESSAGE-----
: Hash: SHA1
: 
: Hans Petter Selasky wrote:
: > On Tuesday 14 July 2009 13:36:12 Krassimir Slavchev wrote:
: >> Hans Petter Selasky wrote:
: >>> On Tuesday 14 July 2009 10:04:05 Krassimir Slavchev wrote:
: >>>> Hi,
: >>>>
: >>>> The ohci controller is not detected by FreeBSD 8.0-BETA1 r195653.
: >>>> Last working kernel I have is r187522 (~ Jan 2009) with old USB stack.
: >>>> I have only removed the 'ugen' device from my kernel config file.
: >>>>
: >>>> Can someone confirm this? Or may be I miss something?
: >>> Does your kernel contain: "device ohci". Also diff the example config
: >>> files for AT91RM9200 with yours under /sys/arm/conf .
: >>>
: >>> --HPS
: >> This fixes the problem:
: >>
: >> --- files.at91  (revision 195653)
: >> +++ files.at91  (working copy)
: >> @@ -18,6 +18,7 @@
: >>  arm/at91/uart_bus_at91usart.c  optional        uart
: >>  arm/at91/uart_cpu_at91rm9200usart.c    optional        uart
: >>  arm/at91/uart_dev_at91usart.c  optional        uart
: >> +dev/usb/controller/ohci_atmelarm.c     optional        ohci
: >>  #
: >>  # All the boards we support
: >>  #
: > 
: > Hi,
: > 
: > %grep -d recurse ohci_atmelarm.c .
: > ./files:dev/usb/controller/ohci_atmelarm.c      optional ohci at91rm9200
: > 
: > The option is already there, but you need to add:
: > 
: > device at91rm9200
: > 
: > To your kernel config file.
: 
: Ahh, where this is documented? This device is missing in other
: at91rm9200 kernel config files in sys/arm/conf .

It is bogus.

: > 
: > Maybe you also want to test the device port:
: > 
: > ./files:dev/usb/controller/at91dci_atmelarm.c   optional at91dci at91rm9200
: > 
: > Requires usb_template module and ustorage module.
: 
: You mean:
: device	at91dci
: device	usb_template
: device	usfs
: 
: ugen0.2: <FreeBSD foundation> at usbus0
: ugen0.2: <FreeBSD foundation> at usbus0 (disconnected)
: ugen0.2: <FreeBSD foundation> at usbus0
: ustorage_fs0: <USB Mass Storage Interface> on usbus0
: 
: umass0: FreeBSD foundation USB Memory Stick, rev 1.10/1.00, addr 5
: da0 at umass-sim0 bus 0 target 0 lun 0
: da0: <FreeBSD File-Stor Gadget 0101> Removable Direct Access SCSI-2 device
: da0: 1.000MB/s transfers
: da0: 4MB (8192 512 byte sectors: 64H 32S/T 4C)
: 
: Reading produces only zeros but I am not sure whether device port is
: initialized or not, most probably not.
: 
: > 
: > BTW: Does the OHCI part work like expected?
: 
: At least the most memory sticks I have work. Only one does not work:
: ugen1.2: <Corsair> at usbus1
: umass0: <Corsair Flash Voyager, class 0/0, rev 2.00/11.00, addr 2> on usbus1
: umass0:  SCSI over Bulk-Only; quirks = 0x0000
: umass0:0:0:-1: Attached to scbus0
: 
: This memory stick works on i386 6.x and 7.x
: umass0: Corsair Flash Voyager, rev 2.00/11.00, addr 2
: da0 at umass-sim0 bus 0 target 0 lun 0
: da0: <Corsair Flash Voyager 1100> Removable Direct Access SCSI-0 device
: da0: 40.000MB/s transfers
: da0: 967MB (1981440 512 byte sectors: 64H 32S/T 967C)

Please try the patch enclosed.

Warner
-------------- next part --------------
Index: conf/files
===================================================================
--- conf/files	(revision 195560)
+++ conf/files	(working copy)
@@ -1565,19 +1565,14 @@
 #
 # USB controller drivers
 #
-dev/usb/controller/at91dci.c		optional at91dci
-dev/usb/controller/at91dci_atmelarm.c	optional at91dci at91rm9200
 dev/usb/controller/musb_otg.c		optional musb
-dev/usb/controller/musb_otg_atmelarm.c	optional musb at91rm9200
 dev/usb/controller/ehci.c		optional ehci
 dev/usb/controller/ehci_pci.c		optional ehci pci
 dev/usb/controller/ohci.c		optional ohci
-dev/usb/controller/ohci_atmelarm.c	optional ohci at91rm9200
 dev/usb/controller/ohci_pci.c		optional ohci pci
 dev/usb/controller/uhci.c		optional uhci
 dev/usb/controller/uhci_pci.c		optional uhci pci
 dev/usb/controller/uss820dci.c		optional uss820dci
-dev/usb/controller/uss820dci_atmelarm.c	optional uss820dci at91rm9200
 dev/usb/controller/usb_controller.c	optional usb
 #
 # USB storage drivers
Index: arm/at91/files.at91
===================================================================
--- arm/at91/files.at91	(revision 195560)
+++ arm/at91/files.at91	(working copy)
@@ -25,3 +25,12 @@
 arm/at91/board_hl200.c		optional	at91_board_hl200
 arm/at91/board_kb920x.c		optional	at91_board_kb920x
 arm/at91/board_tsc4370.c	optional	at91_board_tsc4370
+#
+# new usb has the usb support file in dev/usb rather than under
+# at91.
+#
+dev/usb/controller/at91dci.c		optional at91dci
+dev/usb/controller/at91dci_atmelarm.c	optional at91dci
+dev/usb/controller/musb_otg_atmelarm.c	optional musb
+dev/usb/controller/ohci_atmelarm.c	optional ohci
+dev/usb/controller/uss820dci_atmelarm.c	optional uss820dci