[src/netbsd-9]: src/sys/dev/usb Pull up following revision(s) (requested by g...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c2fefd360d2
branches:  netbsd-9
changeset: 466161:4c2fefd360d2
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 14 12:30:57 2019 +0000

description:
Pull up following revision(s) (requested by gson in ticket #553):

        sys/dev/usb/ohci.c: revision 1.291

Preserve the toggleCarry bit in the Endpoint Descriptor when handling
a DataUnderrun condition.  Fixes PR kern/54070.

diffstat:

 sys/dev/usb/ohci.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 7e21b4e763a5 -r 4c2fefd360d2 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sat Dec 14 12:29:13 2019 +0000
+++ b/sys/dev/usb/ohci.c        Sat Dec 14 12:30:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.289.4.1 2019/09/01 13:00:37 martin Exp $    */
+/*     $NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.1 2019/09/01 13:00:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1515,8 +1515,9 @@
 
                        ohci_soft_ed_t *sed = opipe->sed;
 
-                       /* clear halt and TD chain */
-                       sed->ed.ed_headp = HTOO32(p->physaddr);
+                       /* clear halt and TD chain, preserving toggle carry */
+                       sed->ed.ed_headp = HTOO32(p->physaddr |
+                           (O32TOH(sed->ed.ed_headp) & OHCI_TOGGLECARRY));
                        usb_syncmem(&sed->dma,
                            sed->offs + offsetof(ohci_ed_t, ed_headp),
                            sizeof(sed->ed.ed_headp),