diff options
| author |   uaa <uaa@openbsd.org> | 2019-01-19 18:50:24 +0000 |
|---|---|---|
| committer | uaa <uaa@openbsd.org> | 2019-01-19 18:50:24 +0000 |
| commit | b08fa7eea91d95bde754307afe43f1bd2550dfe1 (patch) | |
| tree | 947bb78b5ebd9750926aaec7105f7db9cf26b7b7 | |
| parent | remove mmap test for now (diff) | |
| download | wireguard-openbsd-b08fa7eea91d95bde754307afe43f1bd2550dfe1.tar.xz wireguard-openbsd-b08fa7eea91d95bde754307afe43f1bd2550dfe1.zip | |
Change transfer schedule of split interrupt transfer,
to avoid confilicting with split isochronous transfer which use same TT.
ok mpi@
| -rw-r--r-- | sys/dev/usb/ehci.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 76127805460..b75c47db7cc 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.201 2019/01/08 13:49:47 uaa Exp $ */ +/* $OpenBSD: ehci.c,v 1.202 2019/01/19 18:50:24 uaa Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1429,15 +1429,30 @@ ehci_open(struct usbd_pipe *pipe) EHCI_QH_CTL : 0) | EHCI_QH_SET_NRL(naks) ); + /* + * To reduce conflict with split isochronous transfer, + * schedule (split) interrupt trasnfer at latter half of + * 1ms frame: + * + * |<-------------- H-Frame -------------->| + * .H0 :H1 H2 H3 H4 H5 H6 H7 .H0" :H1" + * . : . : + * [HS] . : SS CS CS' CS" . : + * [FS/LS] . : |<== >>>> >>>| . : + * . : . : + * .B7' :B0 B1 B2 B3 B4 B5 B6 .B7 :B0" + * |<-------------- B-Frame -------------->| + * + */ sqh->qh.qh_endphub = htole32( EHCI_QH_SET_MULT(1) | - EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x01 : 0) + EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x08 : 0) ); if (speed != EHCI_QH_SPEED_HIGH) { sqh->qh.qh_endphub |= htole32( EHCI_QH_SET_HUBA(hshubaddr) | EHCI_QH_SET_PORT(hshubport) | - EHCI_QH_SET_CMASK(0x1c) /* XXX */ + EHCI_QH_SET_CMASK(0xe0) ); } sqh->qh.qh_curqtd = htole32(EHCI_LINK_TERMINATE); |