d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configure the correct bMaxPacketSize for control endpoints before

Browse Source 
requesting the initial complete device descriptor and not as part of
the subsequent babble error recovery. Babble means that the received
USB packet was bigger than than configured maximum packet size. This
only affects enumeration of FULL speed USB devices which use a
bMaxPacketSize different from 8 bytes. This patch might help fix
enumeration of USB devices which exhibit USB I/O errors in dmesg
during boot.

MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2016-02-23 18:17:01 +00:00
parent 6e0efc6a39
commit b265897c37
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/usb/controller/xhci.c
View File

@ -2358,6 +2358,8 @@ xhci_configure_endpoint(struct usb_device *udev,
/* store endpoint mode */ /* store endpoint mode */
pepext->trb_ep_mode = ep_mode; pepext->trb_ep_mode = ep_mode;
/* store bMaxPacketSize for control endpoints */
pepext->trb_ep_maxp = edesc->wMaxPacketSize[0];
usb_pc_cpu_flush(pepext->page_cache); usb_pc_cpu_flush(pepext->page_cache);
if (ep_mode == USB_EP_MODE_STREAMS) { if (ep_mode == USB_EP_MODE_STREAMS) {
@ -2904,6 +2906,17 @@ xhci_transfer_insert(struct usb_xfer *xfer)
return (USB_ERR_NOMEM); return (USB_ERR_NOMEM);
} }
/* check if bMaxPacketSize changed */
if (xfer->flags_int.control_xfr != 0 &&
pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) {
DPRINTFN(8, "Reconfigure control endpoint\n");
/* force driver to reconfigure endpoint */
pepext->trb_halted = 1;
pepext->trb_running = 0;
}
/* check for stopped condition, after putting transfer on interrupt queue */ /* check for stopped condition, after putting transfer on interrupt queue */
if (pepext->trb_running == 0) { if (pepext->trb_running == 0) {
struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus); struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);

1
sys/dev/usb/controller/xhci.h
View File

@ -383,6 +383,7 @@ struct xhci_endpoint_ext {
uint8_t trb_halted; uint8_t trb_halted;
uint8_t trb_running; uint8_t trb_running;
uint8_t trb_ep_mode; uint8_t trb_ep_mode;
uint8_t trb_ep_maxp;
}; };
enum { enum {