From nobody Thu Dec 18 12:17:03 2025 Received: from mx3.molgen.mpg.de (mx3.molgen.mpg.de [141.14.17.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C74B25695; Wed, 24 Jul 2024 11:17:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=141.14.17.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721819837; cv=none; b=D6gIrhfBEsAUwNCbyLuFwVgaK7V6HfgyytuNy6kpTJA5DURQSfa51Q6diYUif/BEmDTW+Rn8OX5oOsO3y1E6MqIL+MfgBjn+RKK0T+pptRV4+j9T3Emb+EjA6PsELhFVzF1qsOXCTHU5gsMU5zT7MxDoB3NNVmytt+p7CeljUpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721819837; c=relaxed/simple; bh=NXMjWIjkbyNP+GMCDU/nnlIK03u7fA8we18RZAAGeHY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=CqkQyBVR8q4/mykFfP8L/dvLKjYklD+YBf5NX5TNyvsbgmJw9676eDdK4C39w76FiWkWUPAsvtQwxSr5CzbzQMHJo9DkIacNF0nWAjAlS/knWwXXXrX8b0dygtnjzyjZwmv81GbrN+/1T7XQSsX9hzJo991nKiUO3+dKebHNPE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=molgen.mpg.de; spf=pass smtp.mailfrom=molgen.mpg.de; arc=none smtp.client-ip=141.14.17.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=molgen.mpg.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=molgen.mpg.de Received: from abreu.molgen.mpg.de (g45.guest.molgen.mpg.de [141.14.220.45]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: pmenzel) by mx.molgen.mpg.de (Postfix) with ESMTPSA id 5A16E61E5FE01; Wed, 24 Jul 2024 13:16:46 +0200 (CEST) From: Paul Menzel To: Greg Kroah-Hartman , David Brownell Cc: Paul Menzel , Kai-Heng Feng , Hans de Goede , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] USB: core: hub_port_reset: Remove extra 40 ms reset recovery time Date: Wed, 24 Jul 2024 13:15:23 +0200 Message-ID: <20240724111524.25441-1-pmenzel@molgen.mpg.de> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This basically reverts commit b789696af8b4102b7cc26dec30c2c51ce51ee18b ("[PATCH] USB: relax usbcore reset timings") from 2005. This adds unneeded 40 ms during resume from suspend on a majority of devices, where it=E2=80=99s not needed, like the Dell XPS 13 9360/0596KF, B= IOS 2.21.0 06/02/2022 with $ usb-devices T: Bus=3D01 Lev=3D00 Prnt=3D00 Port=3D00 Cnt=3D00 Dev#=3D 1 Spd=3D480= MxCh=3D12 D: Ver=3D 2.00 Cls=3D09(hub ) Sub=3D00 Prot=3D01 MxPS=3D64 #Cfgs=3D 1 P: Vendor=3D1d6b ProdID=3D0002 Rev=3D06.09 S: Manufacturer=3DLinux 6.9.0-rc6-00047-g25a99e110f17 xhci-hcd S: Product=3DxHCI Host Controller S: SerialNumber=3D0000:00:14.0 C: #Ifs=3D 1 Cfg#=3D 1 Atr=3De0 MxPwr=3D0mA I: If#=3D 0 Alt=3D 0 #EPs=3D 1 Cls=3D09(hub ) Sub=3D00 Prot=3D00 Driv= er=3Dhub E: Ad=3D81(I) Atr=3D03(Int.) MxPS=3D 4 Ivl=3D256ms T: Bus=3D01 Lev=3D01 Prnt=3D01 Port=3D02 Cnt=3D01 Dev#=3D 2 Spd=3D12 = MxCh=3D 0 D: Ver=3D 2.01 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 MxPS=3D64 #Cfgs=3D 1 P: Vendor=3D0cf3 ProdID=3De300 Rev=3D00.01 C: #Ifs=3D 2 Cfg#=3D 1 Atr=3De0 MxPwr=3D100mA I: If#=3D 0 Alt=3D 0 #EPs=3D 3 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 Driv= er=3Dbtusb E: Ad=3D02(O) Atr=3D02(Bulk) MxPS=3D 64 Ivl=3D0ms E: Ad=3D81(I) Atr=3D03(Int.) MxPS=3D 16 Ivl=3D1ms E: Ad=3D82(I) Atr=3D02(Bulk) MxPS=3D 64 Ivl=3D0ms I: If#=3D 1 Alt=3D 0 #EPs=3D 2 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 Driv= er=3Dbtusb E: Ad=3D03(O) Atr=3D01(Isoc) MxPS=3D 0 Ivl=3D1ms E: Ad=3D83(I) Atr=3D01(Isoc) MxPS=3D 0 Ivl=3D1ms T: Bus=3D01 Lev=3D01 Prnt=3D02 Port=3D03 Cnt=3D01 Dev#=3D 3 Spd=3D12 = MxCh=3D 0 D: Ver=3D 2.00 Cls=3D00(>ifc ) Sub=3D00 Prot=3D00 MxPS=3D 8 #Cfgs=3D 1 P: Vendor=3D04f3 ProdID=3D2234 Rev=3D11.11 S: Manufacturer=3DELAN S: Product=3DTouchscreen C: #Ifs=3D 1 Cfg#=3D 1 Atr=3De0 MxPwr=3D100mA I: If#=3D 0 Alt=3D 0 #EPs=3D 2 Cls=3D03(HID ) Sub=3D00 Prot=3D00 Driv= er=3Dusbhid E: Ad=3D02(O) Atr=3D03(Int.) MxPS=3D 32 Ivl=3D2ms E: Ad=3D81(I) Atr=3D03(Int.) MxPS=3D 64 Ivl=3D1ms T: Bus=3D01 Lev=3D01 Prnt=3D03 Port=3D04 Cnt=3D01 Dev#=3D 4 Spd=3D480= MxCh=3D 0 D: Ver=3D 2.01 Cls=3Def(misc ) Sub=3D02 Prot=3D01 MxPS=3D64 #Cfgs=3D 1 P: Vendor=3D0c45 ProdID=3D670c Rev=3D56.26 S: Manufacturer=3DCN09GTFMLOG008C8B7FWA01 S: Product=3DIntegrated_Webcam_HD C: #Ifs=3D 2 Cfg#=3D 1 Atr=3D80 MxPwr=3D500mA I: If#=3D 0 Alt=3D 0 #EPs=3D 1 Cls=3D0e(video) Sub=3D01 Prot=3D00 Driv= er=3Duvcvideo E: Ad=3D83(I) Atr=3D03(Int.) MxPS=3D 16 Ivl=3D4ms I: If#=3D 1 Alt=3D 0 #EPs=3D 1 Cls=3D0e(video) Sub=3D02 Prot=3D00 Driv= er=3Duvcvideo E: Ad=3D82(I) Atr=3D02(Bulk) MxPS=3D 512 Ivl=3D0ms T: Bus=3D02 Lev=3D00 Prnt=3D00 Port=3D00 Cnt=3D00 Dev#=3D 1 Spd=3D500= 0 MxCh=3D 6 D: Ver=3D 3.00 Cls=3D09(hub ) Sub=3D00 Prot=3D03 MxPS=3D 9 #Cfgs=3D 1 P: Vendor=3D1d6b ProdID=3D0003 Rev=3D06.09 S: Manufacturer=3DLinux 6.9.0-rc6-00047-g25a99e110f17 xhci-hcd S: Product=3DxHCI Host Controller S: SerialNumber=3D0000:00:14.0 C: #Ifs=3D 1 Cfg#=3D 1 Atr=3De0 MxPwr=3D0mA I: If#=3D 0 Alt=3D 0 #EPs=3D 1 Cls=3D09(hub ) Sub=3D00 Prot=3D00 Driv= er=3Dhub E: Ad=3D81(I) Atr=3D03(Int.) MxPS=3D 4 Ivl=3D256ms The commit messages unfortunately does not list the devices needing this. Should they surface again, these should be added to the quirk list for USB_QUIRK_HUB_SLOW_RESET. Fixes: b789696af8b4 ("[PATCH] USB: relax usbcore reset timings") Cc: Kai-Heng Feng Cc: Hans de Goede Cc: David Brownell Signed-off-by: Paul Menzel --- drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 4b93c0bd1d4b..487d5fe60f0c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3110,7 +3110,7 @@ static int hub_port_reset(struct usb_hub *hub, int po= rt1, usleep_range(10000, 12000); else { /* TRSTRCY =3D 10 ms; plus some extra */ - reset_recovery_time =3D 10 + 40; + reset_recovery_time =3D 10; =20 /* Hub needs extra delay after resetting its port. */ if (hub->hdev->quirks & USB_QUIRK_HUB_SLOW_RESET) --=20 2.45.2