Module Name: src
Committed By: martin
Date: Wed Aug 2 10:20:38 UTC 2023
Modified Files:
src/sys/dev/usb [netbsd-10]: ehci.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #301):
sys/dev/usb/ehci.c: revision 1.317
PR 57518: usb keyboard causes host controller to miss microframe
As per the USB 2.0 specification section 11.18.4; paragraph 3.b
For interrupt IN/OUT full-/low-speed transactions, the host must schedule a
complete-split transaction in each of the two microframes following the
first microframe in which the full-/low-speed transaction is budgeted. An
additional complete-split must also be scheduled in the third following
microframe unless the full-/low-speed transaction was budgeted to start
in microframe Y6.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.315.2.1 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.315 src/sys/dev/usb/ehci.c:1.315.2.1
--- src/sys/dev/usb/ehci.c:1.315 Tue Dec 13 21:29:04 2022
+++ src/sys/dev/usb/ehci.c Wed Aug 2 10:20:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.315 2022/12/13 21:29:04 jakllsch Exp $ */
+/* $NetBSD: ehci.c,v 1.315.2.1 2023/08/02 10:20:38 martin Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315 2022/12/13 21:29:04 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.1 2023/08/02 10:20:38 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2032,14 +2032,17 @@ ehci_open(struct usbd_pipe *pipe)
);
sqh->qh.qh_endphub = htole32(
EHCI_QH_SET_MULT(1) |
- EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x02 : 0)
+ (xfertype == UE_INTERRUPT ?
+ EHCI_QH_SET_SMASK(__BIT(1)) /* Start Split Y1 */
+ : 0)
);
if (speed != EHCI_QH_SPEED_HIGH)
sqh->qh.qh_endphub |= htole32(
EHCI_QH_SET_PORT(hshubport) |
EHCI_QH_SET_HUBA(hshubaddr) |
(xfertype == UE_INTERRUPT ?
- EHCI_QH_SET_CMASK(0x08) : 0)
+ EHCI_QH_SET_CMASK(__BITS(3,5)) /* CS Y[345] */
+ : 0)
);
sqh->qh.qh_curqtd = EHCI_NULL;
/* Fill the overlay qTD */
