[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/ff6d9ff95045
branches:  netbsd-9
changeset: 963426:ff6d9ff95045
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 14 12:35:58 2019 +0000

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

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

Preserve the toggleCarry bit in the Endpoint Descriptor in
ohci_abort_xfer().  Fixes the OHCI part of PR kern/50278.

diffstat:

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

diffs (29 lines):

diff -r f5f278c9be0a -r ff6d9ff95045 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sat Dec 14 12:32:11 2019 +0000
+++ b/sys/dev/usb/ohci.c        Sat Dec 14 12:35:58 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $    */
+/*     $NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 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.2 2019/12/14 12:30:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2349,7 +2349,9 @@
        if (hit) {
                DPRINTFN(1, "set hd=0x%08jx, tl=0x%08jx",  (int)p->physaddr,
                    (int)O32TOH(sed->ed.ed_tailp), 0, 0);
-               sed->ed.ed_headp = HTOO32(p->physaddr); /* unlink TDs */
+               /* unlink TDs, 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),