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 504C8321F22; Mon, 18 Aug 2025 13:23:06 +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=1755523386; cv=none; b=Mb5azbo/w7gBGGmSZ28m4WJJY3RuNCS6a5UzxLcubbota41s/gO2tjhlT1c1A3eIjSSfm/GGOO9hzGKZ13pky2+RyWBcetpXsU1YM1xdoxHtuK7KXnAJLG2gwLgYSLAbRCwQ30nqo3pKcshCklu8PgFapcULTP3Zr3/Wy5hNzW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523386; c=relaxed/simple; bh=Jsf4DuWJvpzMUmEivupzEIWHEGwFPo4G8icVciS2sBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t8ngDg91zGudCP26YgLPiUIemWwRpAeWex/BxpBOwsJ4EiLrViIAqocxVzYb3uVd7F2MCPAnxPm6U+7ALv5z77lFgwThDlqFxWzmu7MDzlv6QfM5z2vfAcXMcPn/YS9P3qPNEhQSzVgRa4i0IhEv8HHDa7wkTQ22O55Xl+r8rWE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WLhyvJVA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WLhyvJVA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC1A8C4CEEB; Mon, 18 Aug 2025 13:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523386; bh=Jsf4DuWJvpzMUmEivupzEIWHEGwFPo4G8icVciS2sBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WLhyvJVARl13pNF42kcPYxsCL0kCh2kb6ikUrR1pbhi163wwuY/Sjd8wB6nJKUu7X JrlXRv5F7Gl40GkT+kMDwmBz7G2rfrErU12SoM95v/UJ1HPricGu+CqfXRPt5tdigz N8YPCDHPsIHNBt/HCFLHHLb4fRseh+hl6qudhvf0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Mathias Nyman , Sasha Levin Subject: [PATCH 6.15 122/515] usb: xhci: Avoid showing errors during surprise removal Date: Mon, 18 Aug 2025 14:41:48 +0200 Message-ID: <20250818124503.050722078@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mario Limonciello [ Upstream commit 4b9c60e440525b729ac5f071e00bcee12e0a7e84 ] When a USB4 dock is unplugged from a system it won't respond to ring events. The PCI core handles the surprise removal event and notifies all PCI drivers. The XHCI PCI driver sets a flag that the device is being removed as well. When that flag is set don't show messages in the cleanup path for marking the controller dead. Signed-off-by: Mario Limonciello Signed-off-by: Mathias Nyman Acked-by: Mathias Nyman Link: https://lore.kernel.org/r/20250717073107.488599-2-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-ring.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 8be033f1877d..fc3ae7318046 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1376,12 +1376,15 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci, */ void xhci_hc_died(struct xhci_hcd *xhci) { + bool notify; int i, j; if (xhci->xhc_state & XHCI_STATE_DYING) return; - xhci_err(xhci, "xHCI host controller not responding, assume dead\n"); + notify = !(xhci->xhc_state & XHCI_STATE_REMOVING); + if (notify) + xhci_err(xhci, "xHCI host controller not responding, assume dead\n"); xhci->xhc_state |= XHCI_STATE_DYING; xhci_cleanup_command_queue(xhci); @@ -1395,7 +1398,7 @@ void xhci_hc_died(struct xhci_hcd *xhci) } /* inform usb core hc died if PCI remove isn't already handling it */ - if (!(xhci->xhc_state & XHCI_STATE_REMOVING)) + if (notify) usb_hc_died(xhci_to_hcd(xhci)); } -- 2.39.5