From 6cf060eba435bd96a3f9b464ada076cfffbf092c Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Thu, 20 Aug 2020 17:45:54 +0000 Subject: [PATCH] Fix regression after r364379. The AMD's Ryzen 3 3200g XHCI controllers apparently need the evaluate control endpoint context command, but we don't need to issue this command when the bMaxPacketSize is received after the read of the USB device descriptor, because this part should be handled automatically. PR: 248784 Tested by: emaste, hselasky MFC after: 1 week Sponsored by: Mellanox Technologies --- sys/dev/usb/controller/xhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 432c419c1f82..1656e622d70f 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3904,10 +3904,8 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) if (!(sc->sc_hw.devs[index].ep_configured & mask)) { sc->sc_hw.devs[index].ep_configured |= mask; err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index); - } else if (epno != 1) { - err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index); } else { - err = 0; + err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index); } if (err != 0) {