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 D22811C4A2D for ; Wed, 17 Sep 2025 14:00:43 +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=1758117643; cv=none; b=QjUdw7Yj7OVx3Covx5NE83f24Q783fgnPFGrXlHwcF8rVQQuzoCe2FtNEE90ws7CGGrBpgM9mgE99IK3fUCetFKWtw8Xr14XJ0/PRfAQ2zEP9TsFHmzoJQ5ZbVfW6kg6X7yZL775Wl/bMp+YnqMCOBVAnybvcDnqjoGwBWQVQcE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758117643; c=relaxed/simple; bh=Hv6+RBEVEKA+BZPhd7bMjJfRdYpeSEQ03BKL0ic2rYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JBeZqvcnAdbJFjV8sTjcA37RugZ2zKWQ3ofTJUl5amSuOrGLlOpljU30wIGDOGLQhxKxQr32z6/LPAsSQ1K8immH0dKeIyOgcsJe5rRNmqOfWnS1MppyGUG+jSHIfY5fqkq28AEMiK++fgGcsQFwPAfH00y9eydutv8d9erQpGo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ATph8kIT; 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="ATph8kIT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1056C4CEF7; Wed, 17 Sep 2025 14:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758117643; bh=Hv6+RBEVEKA+BZPhd7bMjJfRdYpeSEQ03BKL0ic2rYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ATph8kITbQoM0Qvc7f7vJkk9bU5q2lBGCF70fwQNREdrtgTxZx+11NxJh9c7nn417 trtlKr98gtD3KWMIMipDpEMw4esaEKnEos8hfha4/Qt3riNUu5WyJu8VfVkHNSvdPu 3/xCMLWW3UXxV1T6SBr1gkyoPAPqfhgxGe5f1kxKoSWMzS3s8l+IqydJCxSIdi7gh9 xKkjZHjAxi3h76aehrtTRpSsta9YIJ3CK8aElYr7Y3KhdSs1PXsdztdu2cPVZyIZ2k kjO6GqRCF1GOYkAcmd2uE7phNNlPWMSdjB2+St3QDTXEAmAcfZsi/sXnneYQeyY6X1 F45L5nOrJWcDA== From: Sasha Levin To: stable@vger.kernel.org Cc: Mathias Nyman , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 2/2] xhci: dbc: Fix full DbC transfer ring after several reconnects Date: Wed, 17 Sep 2025 10:00:40 -0400 Message-ID: <20250917140040.569374-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917140040.569374-1-sashal@kernel.org> References: <2025091706-savings-chatroom-9c46@gregkh> <20250917140040.569374-1-sashal@kernel.org> 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 a5c98e8b1398534ae1feb6e95e2d3ee5215538ed ] Pending requests will be flushed on disconnect, and the corresponding TRBs will be turned into No-op TRBs, which are ignored by the xHC controller once it starts processing the ring. If the USB debug cable repeatedly disconnects before ring is started then the ring will eventually be filled with No-op TRBs. No new transfers can be queued when the ring is full, and driver will print the following error message: "xhci_hcd 0000:00:14.0: failed to queue trbs" This is a normal case for 'in' transfers where TRBs are always enqueued in advance, ready to take on incoming data. If no data arrives, and device is disconnected, then ring dequeue will remain at beginning of the ring while enqueue points to first free TRB after last cancelled No-op TRB. s Solve this by reinitializing the rings when the debug cable disconnects and DbC is leaving the configured state. Clear the whole ring buffer and set enqueue and dequeue to the beginning of ring, and set cycle bit to its initial state. Cc: stable@vger.kernel.org Fixes: dfba2174dc42 ("usb: xhci: Add DbC support in xHCI driver") Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20250902105306.877476-3-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-dbgcap.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c index f3b114155cbed..1963d9a45b673 100644 --- a/drivers/usb/host/xhci-dbgcap.c +++ b/drivers/usb/host/xhci-dbgcap.c @@ -447,6 +447,25 @@ static void xhci_dbc_ring_init(struct xhci_ring *ring) xhci_initialize_ring_info(ring, 1); } +static int xhci_dbc_reinit_ep_rings(struct xhci_dbc *dbc) +{ + struct xhci_ring *in_ring = dbc->eps[BULK_IN].ring; + struct xhci_ring *out_ring = dbc->eps[BULK_OUT].ring; + + if (!in_ring || !out_ring || !dbc->ctx) { + dev_warn(dbc->dev, "Can't re-init unallocated endpoints\n"); + return -ENODEV; + } + + xhci_dbc_ring_init(in_ring); + xhci_dbc_ring_init(out_ring); + + /* set ep context enqueue, dequeue, and cycle to initial values */ + xhci_dbc_init_ep_contexts(dbc); + + return 0; +} + static struct xhci_ring * xhci_dbc_ring_alloc(struct device *dev, enum xhci_ring_type type, gfp_t flags) { @@ -871,7 +890,7 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc) dev_info(dbc->dev, "DbC cable unplugged\n"); dbc->state = DS_ENABLED; xhci_dbc_flush_requests(dbc); - + xhci_dbc_reinit_ep_rings(dbc); return EVT_DISC; } @@ -881,7 +900,7 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc) writel(portsc, &dbc->regs->portsc); dbc->state = DS_ENABLED; xhci_dbc_flush_requests(dbc); - + xhci_dbc_reinit_ep_rings(dbc); return EVT_DISC; } -- 2.51.0