[src/trunk]: src/sys/dev/usb PR/52154: xHCI Slot Context Not Include in confi...

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

details:   https://anonhg.NetBSD.org/src/rev/f8c494b04719
branches:  trunk
changeset: 823146:f8c494b04719
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Apr 13 19:54:22 2017 +0000

description:
PR/52154: xHCI Slot Context Not Include in configure endpoint process

eXtensible Host Controller Interface Specification(rev 1.1), 4.6.6:

"A0 shall be set to 1 and refer to section 6.2.2.2 for the Slot Context fields
used by the Configure Endpoint Command."

diffstat:

 sys/dev/usb/xhci.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 1dbb01ced3e7 -r f8c494b04719 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Thu Apr 13 19:17:15 2017 +0000
+++ b/sys/dev/usb/xhci.c        Thu Apr 13 19:54:22 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.70 2017/01/21 07:39:30 skrll Exp $  */
+/*     $NetBSD: xhci.c,v 1.71 2017/04/13 19:54:22 skrll Exp $  */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.70 2017/01/21 07:39:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.71 2017/04/13 19:54:22 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2956,8 +2956,7 @@
        cp = xhci_slot_get_icv(sc, xs, XHCI_ICI_INPUT_CONTROL);
        cp[0] = htole32(0);
        cp[1] = htole32(XHCI_INCTX_1_ADD_MASK(dci));
-       if (dci == XHCI_DCI_EP_CONTROL)
-               cp[1] |= htole32(XHCI_INCTX_1_ADD_MASK(XHCI_DCI_SLOT));
+       cp[1] |= htole32(XHCI_INCTX_1_ADD_MASK(XHCI_DCI_SLOT));
        cp[7] = htole32(0);
 
        /* set up input slot context */