[src/nick-nhusb]: src/sys/dev/usb From t-hash

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

details:   https://anonhg.NetBSD.org/src/rev/5c8c1028482c
branches:  nick-nhusb
changeset: 334252:5c8c1028482c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Sep 23 13:49:59 2015 +0000

description:
>From t-hash
    + Fix devices were not recognized at boot on some xhci
      (AFAIK Intel PCHs).

diffstat:

 sys/dev/usb/uhub.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 979b6d0b96b6 -r 5c8c1028482c sys/dev/usb/uhub.c
--- a/sys/dev/usb/uhub.c        Wed Sep 23 13:44:58 2015 +0000
+++ b/sys/dev/usb/uhub.c        Wed Sep 23 13:49:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhub.c,v 1.126.2.13 2015/06/06 15:24:18 skrll Exp $    */
+/*     $NetBSD: uhub.c,v 1.126.2.14 2015/09/23 13:49:59 skrll Exp $    */
 /*     $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $       */
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.13 2015/06/06 15:24:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.14 2015/09/23 13:49:59 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -587,6 +587,13 @@
                        }
                }
                if (change & UPS_C_PORT_RESET) {
+                       /*
+                        * some xHCs set PortResetChange instead of CSC
+                        * when port is reset.
+                        */
+                       if ((status & UPS_CURRENT_CONNECT_STATUS) != 0) {
+                               change |= UPS_C_CONNECT_STATUS;
+                       }
                        usbd_clear_port_feature(dev, port, UHF_C_PORT_RESET);
                }
                if (change & UPS_C_BH_PORT_RESET) {