From nobody Wed Feb 02 12:01:53 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 3387018CD1DA; Wed, 2 Feb 2022 12:01:54 +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 4JpgQB11gxz3gxw; Wed, 2 Feb 2022 12:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643803314; 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=FXN51mu5pWmZ7C9rE3Q1eiep7KZEC2l+HoXuO+l8wng=; b=qSLtv/UNh5M/AERySJvdpd7OkKj7MXHtjBvu7CvYEqFZvCysSpnJ3o/i4oT3V8LlcQ4OUa ca0J+Oz9PiS/yP8fFiBk+lU2a3MG5CUlhQXACIIVEpkD++eSITh1fp8oxUiMroK4rIJKTW Q6PBDhgp2vk36esJqg7y7+WwDxNrGYXkrW4zV8atED76RVKWHOIjVcXssyWmCkYSlY5JqK KLG6jYiaCwwTkRsUaFCHnNHV+3CMDaYSfV4mjPUr2rtF072hsBsW14rvVVoABHT/+ebD6u 97u8U9nxw4SW3UtaRjoguz5HzY90AaacbdaVPNfd/vCtqaik8vxr8rNiBKn0Kg== 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 039A223BA5; Wed, 2 Feb 2022 12:01:54 +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 212C1rlZ010350; Wed, 2 Feb 2022 12:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212C1rPH010349; Wed, 2 Feb 2022 12:01:53 GMT (envelope-from git) Date: Wed, 2 Feb 2022 12:01:53 GMT Message-Id: <202202021201.212C1rPH010349@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: a88e1a04df8b - main - usb(4): Ignore port resume failures. 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: a88e1a04df8bf192da607cfb068020c357a4c3ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643803314; 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=FXN51mu5pWmZ7C9rE3Q1eiep7KZEC2l+HoXuO+l8wng=; b=kH2UYezSpqTcZzyamhP8hJ8SfmXR1Hup/qVl43sfiIaQT63K4VSlJXO0YcCFyNgnvFeTrM ua9AESx31YW1+KwQB9wAvNRt+u1tDhqCSNQIEfQhQZZZucBXSpn378Kd1P/nWNliZ2Wsit 55G5/mUC84qIYvx2xwDNzdhbHl9qgRD/jtcHK7D4bWQqhTXtdS92I182dPU7vDClyZVZk+ 5qlpEFDH5oJo7L8sUusRpLktKvOFnJbztdScpRR5tIL++Hajzmj6WFQ896h4hWOkrUEWXm vEqXSes2Z0GdaEwNO9+oWaT+FW6Nwth3cp+kSwZ+KeZnrFM3jUZaUdIqY6pfzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643803314; a=rsa-sha256; cv=none; b=dntyvlAQSKNHzf5ocXFXuJY1N2SfCRPiDdGOnV3O8m5uLCve1L5jv0pFIN2+/cw1nkZC1g gKu6ooJHExaxe6jD4cejYmfcukTmmB8NZLMeBzlgy5arK9JKhE8y1ORse50vXWSrlYDln3 NDJPHngUhLg+upq8wAtr8vAKpQTngyTHtI0Z9D6N+TN6lJ7Up715rFddbpXdF1h15IQ3cb VbP7ILtifJT7A4AyHDJZWL0h9GXiN45lR9TnduX1aEdoIs0Yv8ISnk4OHrX+Wac4Nt6by1 2n9y1ShE24pMtmRtXN4fGW37m5fBLXnLLsNubllb7NrE41m03C2VEZJnz3dGsQ== 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=a88e1a04df8bf192da607cfb068020c357a4c3ce commit a88e1a04df8bf192da607cfb068020c357a4c3ce Author: Hans Petter Selasky AuthorDate: 2022-02-02 11:59:00 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-02 12:00:48 +0000 usb(4): Ignore port resume failures. If port resume fails, likely the USB device is detached. Ignore such errors, because else the USB stack might try forever trying to resume the device, before it will proceed detaching it. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/usb/usb_hub.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index 1f0c053ad674..554f7203d225 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-2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -2651,18 +2651,15 @@ usb_dev_resume_peer(struct usb_device *udev) /* resume current port (Valid in Host and Device Mode) */ err = usbd_req_clear_port_feature(udev->parent_hub, NULL, udev->port_no, UHF_PORT_SUSPEND); - if (err) { - DPRINTFN(0, "Resuming port failed\n"); - return; - } } else { /* resume current port (Valid in Host and Device Mode) */ err = usbd_req_set_port_link_state(udev->parent_hub, NULL, udev->port_no, UPS_PORT_LS_U0); - if (err) { - DPRINTFN(0, "Resuming port failed\n"); - return; - } + } + + if (err != 0) { + DPRINTFN(0, "Resuming port failed: %s (ignored)\n", + usbd_errstr(err)); } /* resume settle time */