summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhub.c
Commit message (Collapse)AuthorAgeFilesLines
* When a port cannot be set up, report the error code in the `disablingIan Dowse2004-11-091-2/+2
| | | | | | | port X' message. Notes: svn path=/head/; revision=137474
* Merge recent USB2/EHCI related changes from NetBSD:Ian Dowse2004-11-031-4/+44
| | | | | | | | | | | | | | | | | | | o Reduce the interrupt delay to 2 microframes. o Follow the spec more closely when updating the overlay qTD in the QH. o No need to generate an interrupt at the data part of a control transfer, it's generated by the status transfer. o Make sure to update the data toggle on short transfers. o Turn the printf about needing toggle update into a DPRINTF. o Keep track of what high speed port (if any) a device belongs to so we can set the transaction translator fields for the transfer. o Verbosely refuse to open low/full speed pipes that depend on unimplemented split transaction support. o Fix various typos in comments. Obtained from: NetBSD Notes: svn path=/head/; revision=137144
* We don't need a uhub_child_detached() routine now that we don't detachWarner Losh2004-09-091-34/+2
| | | | | | | | | | | | | | | | | device_t instances when no driver attaches. They are left around, and we need to remember them. # The usbd_device_handle->subdevs[] array likely is completely bogus # at this point, but one change at a time, since its removal will need # to have similar code replace it extracted from newbus. Part of the patch submitted by Peter Pentchev after an excellent analysis of the underlying problems. MFC After: 1 week Notes: svn path=/head/; revision=135009
* Tweak the compatibility macros a little so that the device printing isWarner Losh2004-08-151-1/+0
| | | | | | | moved into them. Notes: svn path=/head/; revision=133787
* Next step in making usb more newbus:Warner Losh2004-08-141-26/+14
| | | | | | | | | | | | | | | | o reprobe children when a new driver is added to uhub o fix the usbd_probe_and_attach to set the ivars to a malloc'd area, as well as freeing the ivars on child destruction. o Don't delete children that don't attach. Evidentally, the need to do this is a common misconception. o minor formatting foo that may violate style(9) at the moment, but keeps the diffs against my p4 tree smaller. This does not solve the ugen gobbling things up problem, but the fixes I have for that expose bugs in other parts of the tree... Notes: svn path=/head/; revision=133730
* Make the USB subsystem unloadable and detachable, though currentlyIan Dowse2004-08-021-1/+2
| | | | | | | | a significant amount of memory may be leaked each time a host controller is detached. Notes: svn path=/head/; revision=133018
* Remove redundant inclusion of bus_if.h. It isn't needed in this file, asWarner Losh2004-07-221-1/+0
| | | | | | | sys/bus.h includes it. Notes: svn path=/head/; revision=132559
* MFp4:Warner Losh2004-07-221-30/+29
| | | | | | | | | | Improve child_detached a little and make it conform better to style(9). Also, improve comment about what we'll be doing in the future about driver_added. Soon it will be possible to kldload usb drivers and have them attach w/o a need to disconnect/reconnect them. Notes: svn path=/head/; revision=132558
* MFNetBSD.Lukas Ertl2004-07-011-2/+5
| | | | | | | | | | | rev. 1.68, author: mycroft Ignore a port error that happens to come in at the same time as a connect status change. Some root hubs seem to report both. Obtained from: NetBSD Notes: svn path=/head/; revision=131422
* Add pnpinfo and location information to uhub. We also keep track ofWarner Losh2004-06-301-0/+107
| | | | | | | | | the subdevices of uhub better now to accomplish this. Submitted by: Bernd Walter Notes: svn path=/head/; revision=131305
* Initialise `restartcnt' in the newly malloc'd usbd_port structure,Ian Dowse2004-06-101-0/+1
| | | | | | | | | | | | as otherwise the junk it contains may cause uhub_explore to give up without ever trying to restart the port. This fixes the following errors I was seeing with a VIA UHCI controller: uhub0: port error, restarting port 1 uhub0: port error, giving up port 1 Notes: svn path=/head/; revision=130291
* Use __FBSDID().David E. O'Brien2003-08-241-1/+3
| | | | | | | Also some minor style cleanups. Notes: svn path=/head/; revision=119418
* Merge up-to-date with NetBSD. No functional changes.Josef Karthauser2003-07-141-6/+2
| | | | Notes: svn path=/head/; revision=117571
* MFNetBSD:Josef Karthauser2003-07-141-5/+3
| | | | | | | | | | date: 2002/10/01 01:25:25; author: thorpej; Use CFATTACH_DECL(). Not a functional change on FreeBSD. Notes: svn path=/head/; revision=117570
* MFNetBSD:Josef Karthauser2003-07-141-2/+1
| | | | | | | | | date: 2002/09/23 05:51:20; author: simonb; Remove breaks after returns, unreachable returns and returns after returns(!). Notes: svn path=/head/; revision=117569
* MFNetBSD:Josef Karthauser2003-07-141-1/+5
| | | | | | | | date: 2003/02/08 03:32:51; author: ichiro; change URL pointers of USB[1,2] specification Notes: svn path=/head/; revision=117567
* As defined by USB Specification Rev 2.0 (in section 11.24.2.5), toJosef Karthauser2003-07-141-1/+1
| | | | | | | | | | | | | | | | | get a Hub descriptor, we have to set req.wValue to "Descriptor Type and Descriptor Index". In this case, Descriptor Type is 0x29 (UDESC_HUB), Descriptor Index should be 0. If I don't do a check (dev->address > 1 ... ), root hub fails. A new Cytronix 4-port USB 2.0 Hub (Cypress CY7C65640 chip) now works after this patch. Submitted by: Alexander Pohoyda <alexander.pohoyda@gmx.net> MFC after: 7 days Notes: svn path=/head/; revision=117564
* WARNING: white space diffJohn-Mark Gurney2003-07-041-15/+15
| | | | | | | | | This code reduces the number of trailing white space to be more in line w/ NetBSD. I don't regenerate usbdevs, saving that for when it really changes. Notes: svn path=/head/; revision=117213
* Use the hw.usb sysctl tree instead of debug.usb.Josef Karthauser2002-08-081-1/+2
| | | | | | | Requested by: imp Notes: svn path=/head/; revision=101521
* Replace the FOO_DEBUG definitions with USB_DEBUG, and switch theJosef Karthauser2002-07-311-1/+1
| | | | | | | | | debugging levels to off by default. Now that debug levels can be tweaked by sysctl we don't need to go through hoops to get the different usb parts to produce debug data. Notes: svn path=/head/; revision=101060
* Wake up Joe! It would help if I included sys/sysctl.h.Josef Karthauser2002-07-311-0/+1
| | | | Notes: svn path=/head/; revision=101058
* Add a sysctl (debug.usb.uhub) for tweaking the uhub debug levels.Josef Karthauser2002-07-311-1/+3
| | | | Notes: svn path=/head/; revision=101055
* Avoid reprobing on loading a driver. This does not work as the ivars setNick Hibma2002-06-171-0/+15
| | | | | | | | | | | | during the previous probe are stale. What really should be done is route the probe through device_probe_and_attach bit this is one of those ICBBATIASS (I can't be bothered as there is a simpler solution). The user can easily replug the device after kldloading a new device driver. Notes: svn path=/head/; revision=98358
* Reduce the difference between our version and NetBSD's. (NoJosef Karthauser2002-04-071-11/+10
| | | | | | | functional changes.) Notes: svn path=/head/; revision=94070
* MFNetBSD:Josef Karthauser2002-04-071-1/+2
| | | | | | | | | revision 1.57 date: 2001/11/20 16:08:37; author: augustss; state: Exp; lines: +3 -2 Add a comment. Notes: svn path=/head/; revision=94069
* MFNetBSD: ohci.c (1.109), uhci.c (1.144), uhub.c (1.56), usb.c (1.57),Josef Karthauser2002-04-071-1/+1
| | | | | | | | | | | usbdi.c (1.86), usbdivar.h (1.66) [Some partial, because most of this was merged in a while ago] date: 2001/11/20 13:48:03; author: augustss; Keep track of device speed for USB 2.0. Notes: svn path=/head/; revision=94068
* MFNetBSD:Josef Karthauser2002-04-071-3/+3
| | | | | | | | | revision 1.55 date: 2001/11/16 02:21:54; author: augustss; state: Exp; lines: +4 -4 Better error message. Notes: svn path=/head/; revision=94067
* MFNetBSD: uhub.c (1.54), usb_subr.c (1.92)Josef Karthauser2002-04-071-1/+18
| | | | | | | | date: 2001/11/16 01:57:47; author: augustss; Handle devices that disappear during reset gracefully. Notes: svn path=/head/; revision=94066
* MFNetBSD:Josef Karthauser2002-04-071-2/+8
| | | | | | | | | revision 1.52 date: 2001/10/26 17:53:59; author: augustss; state: Exp; lines: +8 -2 Compare pointer with NULL instead of using them as a condition. Notes: svn path=/head/; revision=94058
* MFNetBSD:Josef Karthauser2002-04-071-3/+3
| | | | | | | | | revision 1.51 date: 2001/10/24 15:30:17; author: augustss; state: Exp; lines: +3 -3 Better debug message. Notes: svn path=/head/; revision=94057
* MFNetBSD: uhub.c (1.49), usb.c (1.51), usbdi.h (1.48), usbdivar.h (1.63)Josef Karthauser2002-04-021-2/+3
| | | | | | | | | | | | date: 2001/01/21 19:00:06; author: augustss; Change the operation of the USB event thread. Before it only performed USB device discovery, now it can also perform (short) tasks for device drivers that need a process context, but don't have one. This is not pretty, but better than using busy-wait in an interrupt context. Notes: svn path=/head/; revision=93639
* Merge from NetBSD:Josef Karthauser2002-02-191-4/+13
| | | | | | | | * rev 1.47: Update a URL * rev 1.56: Keep track of device speed for USB 2.0. Notes: svn path=/head/; revision=90883
* Merge from NetBSD.Josef Karthauser2002-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | uhub.c: revision 1.37 usb.4: revision 1.30 usb.c: revision 1.38 usb.h: revision 1.40 usb_port.h: revision 1.21 usb_subr.c: revision 1.65 usbdi.h: revision 1.40 Split the attach/detach events up into device, driver and controller attach and detach events. The commit message from NetBSD was: date: 2000/02/02 07:34:00; author: augustss; state: Exp; Change the USB event mechanism to include more information about devices and drivers. Partly from FreeBSD. Also rework usbd to take these new event types into account. Notes: svn path=/head/; revision=89892
* Rearrange the code in USB_DETACH, so that it's like NetBSD's. NoJosef Karthauser2002-01-261-6/+6
| | | | | | | functional change. Notes: svn path=/head/; revision=89819
* Sync with NetBSD:Josef Karthauser2002-01-021-1/+1
| | | | | | | | | date: 2000/02/29 21:37:01; author: augustss; state: Exp; Distinguish between device and interface classes. (I finally found a document that said that they were different.) Notes: svn path=/head/; revision=88824
* Only clear endpoint stall if status was USBD_STALLED.Nick Hibma2001-09-021-3/+3
| | | | | | | | This avoids panicing the system by unplugging a hub. The interrupt transfer would sometimes arrive after the driver had been removed. Notes: svn path=/head/; revision=82786
* Do NOT allocate a 1K buffer on the kernel stack.Julian Elischer2001-08-101-2/+12
| | | | | | | | Found by: Smashed u-area and hardware watch points. MFC after: 1 week Notes: svn path=/head/; revision=81461
* Bugfix: device_resume should be connected to bus_generic_resume notNick Hibma2001-01-051-1/+1
| | | | | | | | | *_suspend. Submitted by: kazu Notes: svn path=/head/; revision=70683
* Sync with NetBSD:Nick Hibma2000-10-161-22/+14
| | | | | | | | | Add seatbelts. Be more lenient towards restarting the ports: If a port manages to connect successfully reset the restartcount. Notes: svn path=/head/; revision=67215
* Remove __P prototypes to reduce diffs between the NetBSD and FreeBSDNick Hibma2000-07-171-2/+2
| | | | | | | versions. Notes: svn path=/head/; revision=63319
* Sync with NetBSD:Nick Hibma2000-05-141-88/+79
| | | | | | | | Make the behaviour more similar to what the Microsoft uhub driver does. Notes: svn path=/head/; revision=60560
* Change Lennart's e-mail address.Nick Hibma2000-05-141-1/+1
| | | | Notes: svn path=/head/; revision=60545
* Initialise the debug value.Nick Hibma2000-05-071-1/+1
| | | | Notes: svn path=/head/; revision=60178
* OpenBSD has a broken debugger that does not grok static. Use aNick Hibma2000-04-031-7/+7
| | | | | | | | | #define Static static that the OpenBSD folks can define it to be empty if they like. Notes: svn path=/head/; revision=58986
* Add support for DEVICE_SUSPEND, DEVICE_RESUME and DEVICE_SHUTDOWNNick Hibma2000-01-201-2/+8
| | | | | | | | | | | | | methods for USB devices. However: with none of the devices I have here suspend seems to work properly. This is probably a bug in uhci_power which I still have to look at. Prodded and pushed by: Christopher Masto <chris@netmonger.net> Notes: svn path=/head/; revision=56348
* More USB ethernet tweaks:Bill Paul2000-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the following improvements: o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP quirk. This allows drivers to specify busy waiting only for certain transfers (namely control transfers for reading/writing registers and stuff). o New USBD_FORCE_SHORT_XFER flag can be used to deal with devices like the ADMtek Pegasus that sense the end of bulk OUT transfers in a special way (if a transfer is exactly a multiple of 64 bytes in size, you need to send an extra empty packet to terminate the transfer). o usbd_open_pipe_intr() now accepts an interval argument which can be used to change the rate at which the interrupt callback routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the value specified in the device's config data, but drivers can override it if needed. - Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions. - Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all control transfers. We no longer force the non-tsleep hack for bulk transfers since these are done asynchronously anyway. - Removed quirk entry fiddling from if_aue and if_kue since we don't need it anymore now that we have the USBD_NO_TSLEEP flag. - Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to usbd_open_pipe_intr(). - Add a flag to the softc struct in the ethernet drivers to indicate when a device has been detached, and use this flag to perform tests to prevent the drivers from trying to do control transfers if this is the case. This is necessary because calling if_detach() with INET6 enabled will eventually result in a call to the driver's ioctl() routine to delete the multicast groups on the interface, which will result in attempts to perform control transfers. (It's possible this also happens even without INET6 support enabled.) This is pointless since we know that if the detach method has been called, the hardware has been unplugged. - Changed watchdog timeout routines to just call the driver init routines to initialize the device states without trying to close and re-open the pipes. This is partly because we don't want to frob things at interrupt context, but also because this doesn't seem to work right and I don't want to panic the system just because a USB device may have stopped responding. - Fix aue_rxeof() to be a little smarter about detecting when a double transfer is needed. Unfortunately, the design of the chip makes it hard to get this exactly right. Hopefully, this will go away once either Nick or Lennart finds the bug in the uhci driver that makes this ugly hack necessary. - Also sync usbdevs with NetBSD. Notes: svn path=/head/; revision=56318
* Synchronisation with NetBSD 1999/11/27Nick Hibma1999-11-281-13/+21
| | | | | | | | | | | | | | | | | | | | - more req[uest]->xfer changes. - get the corresponding NetBSD Id's right ohci.c - move untimeout above print statement - remove usb_delay that panics the system (tsleep in intr context) when ohcidebug > 5. ugen.c - create the devices for endpoints with make_dev. uhub.c - change from using usbdebug to uhubdebug - add more debugging statements Notes: svn path=/head/; revision=53853
* Synchronisation with NetBSD as of 1999/11/16:Nick Hibma1999-11-171-185/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer. Notes: svn path=/head/; revision=53313
* Remove superfluous header file includesNick Hibma1999-11-081-4/+7
| | | | | | | | | Remove definition of initialiser. Some clean up. Notes: svn path=/head/; revision=53028
* Major synchronisation with the NetBSD USB stack:Nick Hibma1999-10-071-99/+212
| | | | | | | | | | | | | | - Some cleanup and improvements in the uhci and ohci drivers - Support for plugging and unplugging devices improved - Now available is bulk transport over OHCI controllers - Resume and suspend have been temporarily been disabled again. Proper support for it is available in the uhci.c and ohci.c files but I have not yet spent the brain cycles to use it. - OpenBSD now uses the USB stack as well - Add FreeBSD tags Notes: svn path=/head/; revision=51991