From nobody Tue Mar 08 19:00:39 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 48D1F1A128FE; Tue, 8 Mar 2022 19:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KCl5h1X5Xz3K14; Tue, 8 Mar 2022 19:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646766040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ds7iXSI2rt37BJYrzuu8gP+LbxbuHoOJjjfF8iRLPTo=; b=dHoCNYz/GGTReYkRb+45y+rgSO7TBfgaXUJgvmhGyabe9baOClBcdpTyuAcZUC4mRGyXlG /Y+zNZwKZ3ztZquvteHmx25Ur1oscqrCPcaz+WuE4OOaY8H+OYktjHmrbfwH1POYibhcva bCQbgeaH6b1D/ejoRylRemwDCi954twlUxo2XVs4JzvTZvgm6ybStWsIaWv4YE5OukVLJW hlnRyjLLZTHMmReA43dWt6KCgYz3fMRDPewvbymDUAamZH+1k4MPE/kI3Q5ouEwOAgU1er H0MiIHYVFn27Y5m9oSwGcu1ocbeUnhie5i0kD5aSrfG5ZJKg0IDFABO9rflOTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1267C22183; Tue, 8 Mar 2022 19:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 228J0dRM077634; Tue, 8 Mar 2022 19:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228J0duo077633; Tue, 8 Mar 2022 19:00:39 GMT (envelope-from git) Date: Tue, 8 Mar 2022 19:00:39 GMT Message-Id: <202203081900.228J0duo077633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: c7cd6f809d2c - main - usb(4): Don't skip calling uhub_explore_sub() even on HUB port errors. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7cd6f809d2ce6b7d331717c31ce51c631ae00d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646766040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ds7iXSI2rt37BJYrzuu8gP+LbxbuHoOJjjfF8iRLPTo=; b=jl13uj0sl93iex1qv01tWOo56TL2oVPUBxYqj91M1iKApj4zNHJXxeldRBfDGT5vZTC0Xx Abj3tu/PurSzgDYIfoBtg9jjX8r3yllzB+xFV1vtp10xj9xM9XOH+gAGIvPdM2eu+7WJRa O5gw58oNOeR75h3Sfek2uc32Xnp+Vj2t71B3el6V+gxTC3rIY5y9pIfTlgg5vDK9UT62Qf 7OUrMQM8jqmizXIwTNQRj3z9MqawZFHrTx373ST5q36UnLBar7/wJhn0/Udf+FDisR8vyZ 1HiujxmH9Rx6FjICBbmiiwyuyGy5jCEXBS3QFU2ndXXZ9n8c0I6S4VP0jOMSJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646766040; a=rsa-sha256; cv=none; b=aRHYlpJFbGRHq1JlI5UDy+32qv+nPVZf1382qxWXsVlpoJNSNu1wsTf01OHcCPyKCB+fzQ 5SxeITzVPXbjoylgpTR85ISzSJPf2m0ECwg9VaNe7a0omgpPTEO+gtcnmeT2VOUowcJ2MY zKtT2Lfxkl/ACe5PQPUG+j68CJIWyk2r2ZyexIa13/51d5ADdOUR72lSkgpF8btK/Qey6g RxifYl1YAujDR8x7r7ytt7Txslif+ACY2cBcG2B5THCJ6Tey76JTVqVuLOb/dRCbms+nvS Id5pCCs9zHHA2FJo5jUnuC/V+ZnNrnKEAT8r99fl4ba3oTphTMhHrnLFBocM8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=c7cd6f809d2ce6b7d331717c31ce51c631ae00d7 commit c7cd6f809d2ce6b7d331717c31ce51c631ae00d7 Author: Hans Petter Selasky AuthorDate: 2022-03-08 18:57:38 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-08 18:59:23 +0000 usb(4): Don't skip calling uhub_explore_sub() even on HUB port errors. This should fix an issue where the "udev->re_enumerate_wait" field never gets processed and reset. In this case usbconfig will wait forever and never return. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/usb/usb_hub.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index bdeee5e8d96c..77e519126567 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -4,7 +4,7 @@ * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. - * Copyright (c) 2008-2022 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -997,6 +997,7 @@ uhub_explore(struct usb_device *udev) struct usb_hub *hub; struct uhub_softc *sc; struct usb_port *up; + usb_error_t retval; usb_error_t err; uint8_t portno; uint8_t x; @@ -1028,25 +1029,22 @@ uhub_explore(struct usb_device *udev) * Set default error code to avoid compiler warnings. * Note that hub->nports cannot be zero. */ - err = USB_ERR_NORMAL_COMPLETION; + retval = USB_ERR_NORMAL_COMPLETION; for (x = 0; x != hub->nports; x++) { up = hub->ports + x; portno = x + 1; err = uhub_read_port_status(sc, portno); - if (err) { - /* most likely the HUB is gone */ - break; - } + if (err != USB_ERR_NORMAL_COMPLETION) + retval = err; + if (sc->sc_st.port_change & UPS_C_OVERCURRENT_INDICATOR) { DPRINTF("Overcurrent on port %u.\n", portno); err = usbd_req_clear_port_feature( udev, NULL, portno, UHF_C_PORT_OVER_CURRENT); - if (err) { - /* most likely the HUB is gone */ - break; - } + if (err != USB_ERR_NORMAL_COMPLETION) + retval = err; } if (!(sc->sc_flags & UHUB_FLAG_DID_EXPLORE)) { /* @@ -1059,10 +1057,8 @@ uhub_explore(struct usb_device *udev) if (sc->sc_st.port_change & UPS_C_PORT_ENABLED) { err = usbd_req_clear_port_feature( udev, NULL, portno, UHF_C_PORT_ENABLE); - if (err) { - /* most likely the HUB is gone */ - break; - } + if (err != USB_ERR_NORMAL_COMPLETION) + retval = err; if (sc->sc_st.port_change & UPS_C_CONNECT_STATUS) { /* * Ignore the port error if the device @@ -1085,18 +1081,14 @@ uhub_explore(struct usb_device *udev) } if (sc->sc_st.port_change & UPS_C_CONNECT_STATUS) { err = uhub_reattach_port(sc, portno); - if (err) { - /* most likely the HUB is gone */ - break; - } + if (err != USB_ERR_NORMAL_COMPLETION) + retval = err; } if (sc->sc_st.port_change & (UPS_C_SUSPEND | UPS_C_PORT_LINK_STATE)) { err = uhub_suspend_resume_port(sc, portno); - if (err) { - /* most likely the HUB is gone */ - break; - } + if (err != USB_ERR_NORMAL_COMPLETION) + retval = err; } if (uhub_explore_sub(sc, up) == USB_ERR_NORMAL_COMPLETION) { @@ -1111,7 +1103,7 @@ uhub_explore(struct usb_device *udev) /* initial status checked */ sc->sc_flags |= UHUB_FLAG_DID_EXPLORE; - return (err); + return (retval); } int