From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4BA372868BE for ; Tue, 22 Jul 2025 22:50:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753224656; cv=none; b=JiNxmiul970TxxJSC0kQ/ao7KfEh8jDp7E9tLlI/g0eoBBeiuraeiBIb9KlyBfujQPBQXYuKWRR92ykfheeuXlcrDM0NtUTdWmAFKgbORSbpIyEFmEvTOBgXqCKiw06714BJxehPg6+C7vsbjdq659FkdbzJgnF4NiUnWwTvwHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753224656; c=relaxed/simple; bh=Ekvh3czOSBgmEChcw3KCGFyhViQXDS/X9hzSzU7QxkY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PYuPqxuN0S7vfbIoVDff4/tAxz1REmYPzZNv1aVTgfkoP2NrWLz448fsie369sBtbdytwY0Z8pnnZ6zUP/qdhSl8gy0N8BwQHSnDEU6HzwaiBsMJkEG5Aj6vZZ4MZb3y9gwctIclOEumi7a/RUgSTWNU5QxfGw6TxDjuLJHX3gI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ogTXPWt1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ogTXPWt1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF9B7C4CEEB; Tue, 22 Jul 2025 22:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753224654; bh=Ekvh3czOSBgmEChcw3KCGFyhViQXDS/X9hzSzU7QxkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ogTXPWt1Z8TakijPB27refEwieYOk9fmCvxCF2oogyn8ujpILZUEwE6nIyp08uqPt ZHWJ1PJ3SXSxXCFiseFFbaINQeoBVuTQPaoCHkpSLxkLZI87UsPVFrA+ebkx0fFmo3 feidMLsq0MPIwJbuAqZFA3dcgGRyXLVml4buHEBRXs3YSh5sFsIJQm7wmhKAZZYRzg zfEeonj7T309ZoOJ9dA22uAhgBjz+ZjkExOmhtPoKFXe0cGTcFSIXZ4Pt1kPANeu6T QsEokz7+lJmXfZiT6hoFfPBbq9fbmVslswUGCo1q941NMYmbDxUgLYCSLJXHu7dpFY G+IwtjqoesBXA== From: Sasha Levin To: stable@vger.kernel.org Cc: Mathias Nyman , Mark Pearson , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.10.y 1/2] usb: hub: avoid warm port reset during USB3 disconnect Date: Tue, 22 Jul 2025 18:50:49 -0400 Message-Id: <20250722225050.997941-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <2025072257-ranging-salvaging-2f13@gregkh> References: <2025072257-ranging-salvaging-2f13@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mathias Nyman [ Upstream commit f59f93cd1d720809466c7fd5aa16a236156c672b ] During disconnect USB-3 ports often go via SS.Inactive link error state before the missing terminations are noticed, and link finally goes to RxDetect state Avoid immediately warm-resetting ports in SS.Inactive state. Let ports settle for a while and re-read the link status a few times 20ms apart to see if the ports transitions out of SS.Inactive. According to USB 3.x spec 7.5.2, a port in SS.Inactive should automatically check for missing far-end receiver termination every 12 ms (SSInactiveQuietTimeout) The futile multiple warm reset retries of a disconnected device takes a lot of time, also the resetting of a removed devices has caused cases where the reset bit got stuck for a long time on xHCI roothub. This lead to issues in detecting new devices connected to the same port shortly after. Tested-by: Mark Pearson Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20211210111653.1378381-1-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 2521106fc732 ("usb: hub: Don't try to recover devices lost during warm reset.") Signed-off-by: Sasha Levin --- drivers/usb/core/hub.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index b88e3a5e86168..434ad066a7160 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2856,6 +2856,8 @@ static unsigned hub_is_wusb(struct usb_hub *hub) #define PORT_INIT_TRIES 4 #endif /* CONFIG_USB_FEW_INIT_RETRIES */ +#define DETECT_DISCONNECT_TRIES 5 + #define HUB_ROOT_RESET_TIME 60 /* times are in msec */ #define HUB_SHORT_RESET_TIME 10 #define HUB_BH_RESET_TIME 50 @@ -5657,6 +5659,7 @@ static void port_event(struct usb_hub *hub, int port1) struct usb_device *udev = port_dev->child; struct usb_device *hdev = hub->hdev; u16 portstatus, portchange; + int i = 0; connect_change = test_bit(port1, hub->change_bits); clear_bit(port1, hub->event_bits); @@ -5733,17 +5736,27 @@ static void port_event(struct usb_hub *hub, int port1) connect_change = 1; /* - * Warm reset a USB3 protocol port if it's in - * SS.Inactive state. + * Avoid trying to recover a USB3 SS.Inactive port with a warm reset if + * the device was disconnected. A 12ms disconnect detect timer in + * SS.Inactive state transitions the port to RxDetect automatically. + * SS.Inactive link error state is common during device disconnect. */ - if (hub_port_warm_reset_required(hub, port1, portstatus)) { - dev_dbg(&port_dev->dev, "do warm reset\n"); - if (!udev || !(portstatus & USB_PORT_STAT_CONNECTION) + while (hub_port_warm_reset_required(hub, port1, portstatus)) { + if ((i++ < DETECT_DISCONNECT_TRIES) && udev) { + u16 unused; + + msleep(20); + hub_port_status(hub, port1, &portstatus, &unused); + dev_dbg(&port_dev->dev, "Wait for inactive link disconnect detect\n"); + continue; + } else if (!udev || !(portstatus & USB_PORT_STAT_CONNECTION) || udev->state == USB_STATE_NOTATTACHED) { + dev_dbg(&port_dev->dev, "do warm reset, port only\n"); if (hub_port_reset(hub, port1, NULL, HUB_BH_RESET_TIME, true) < 0) hub_port_disable(hub, port1, 1); } else { + dev_dbg(&port_dev->dev, "do warm reset, full device\n"); usb_unlock_port(port_dev); usb_lock_device(udev); usb_reset_device(udev); @@ -5751,6 +5764,7 @@ static void port_event(struct usb_hub *hub, int port1) usb_lock_port(port_dev); connect_change = 0; } + break; } if (connect_change) -- 2.39.5