diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-12-30 08:33:51 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-12-30 08:33:51 +0000 |
| commit | c09b4d39dfd5cb4225b71feb5b6d79c8c8b2945c (patch) | |
| tree | bd28d625f5c7ca908a83644800784deb8e2d90bf /sys/dev/usb/controller/xhci.c | |
| parent | 4b8f0ab3e8ebb22c41dbbe5e24a3c23747aa6de4 (diff) | |
| download | FreeBSD-src-c09b4d39dfd5cb4225b71feb5b6d79c8c8b2945c.zip FreeBSD-src-c09b4d39dfd5cb4225b71feb5b6d79c8c8b2945c.tar.gz | |
Add missed flushing of data which can happen when "xhci_configure_mask()"
is called from "xhci_configure_reset_endpoint()". Ensure the 3-strikes
error feature is always enabled except for ISOCHRONOUS transfers.
MFC after: 1 week
Suggested by: marius@
Diffstat (limited to 'sys/dev/usb/controller/xhci.c')
| -rw-r--r-- | sys/dev/usb/controller/xhci.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 8676c0f..524e820 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -2283,6 +2283,7 @@ xhci_configure_mask(struct usb_device *udev, uint32_t mask, uint8_t drop) temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1); xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp); } + usb_pc_cpu_flush(&sc->sc_hw.devs[index].input_pc); return (0); } @@ -2387,10 +2388,14 @@ xhci_configure_endpoint(struct usb_device *udev, XHCI_EPCTX_1_MAXB_SET(max_packet_count) | XHCI_EPCTX_1_MAXP_SIZE_SET(max_packet_size); - if ((udev->parent_hs_hub != NULL) || (udev->address != 0)) { - if (type != UE_ISOCHRONOUS) - temp |= XHCI_EPCTX_1_CERR_SET(3); - } + /* + * Always enable the "three strikes and you are gone" feature + * except for ISOCHRONOUS endpoints. This is suggested by + * section 4.3.3 in the XHCI specification about device slot + * initialisation. + */ + if (type != UE_ISOCHRONOUS) + temp |= XHCI_EPCTX_1_CERR_SET(3); switch (type) { case UE_CONTROL: |
