[src/nick-nhusb]: src/sys/dev/usb Simplify treatment of WRC condition and add...

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

details:   https://anonhg.NetBSD.org/src/rev/f2c7fec0efab
branches:  nick-nhusb
changeset: 334218:f2c7fec0efab
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jun 06 15:24:18 2015 +0000

description:
Simplify treatment of WRC condition and add comments.

>From t-hash.

diffstat:

 sys/dev/usb/uhub.c |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 2dd2727f0486 -r f2c7fec0efab sys/dev/usb/uhub.c
--- a/sys/dev/usb/uhub.c        Sat Jun 06 15:21:57 2015 +0000
+++ b/sys/dev/usb/uhub.c        Sat Jun 06 15:24:18 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhub.c,v 1.126.2.12 2015/05/28 06:15:47 skrll Exp $    */
+/*     $NetBSD: uhub.c,v 1.126.2.13 2015/06/06 15:24:18 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.12 2015/05/28 06:15:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.13 2015/06/06 15:24:18 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -586,11 +586,17 @@
                                            port);
                        }
                }
-               int is_wrc = 0;
-               if (change & UPS_C_PORT_RESET)
+               if (change & UPS_C_PORT_RESET) {
                        usbd_clear_port_feature(dev, port, UHF_C_PORT_RESET);
+               }
                if (change & UPS_C_BH_PORT_RESET) {
-                       is_wrc = 1;
+                       /*
+                        * some xHCs set WarmResetChange 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_BH_PORT_RESET);
                }
@@ -603,9 +609,7 @@
 
                /* XXX handle overcurrent and resume events! */
 
-               /* xHCI sets WRC instead of CSC when port is reset */
-               if (!reconnect && !(change & UPS_C_CONNECT_STATUS) &&
-                   !(is_wrc && (status & UPS_CURRENT_CONNECT_STATUS))) {
+               if (!reconnect && !(change & UPS_C_CONNECT_STATUS)) {
                        /* No status change, just do recursive explore. */
                        if (up->up_dev != NULL && up->up_dev->ud_hub != NULL)
                                up->up_dev->ud_hub->uh_explore(up->up_dev);