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 D3A431A5BBB; Tue, 29 Apr 2025 18:05:59 +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=1745949959; cv=none; b=noRcJp8Q+nPeuti6jbbPpfFh/79GgTkihwp4RdV7uCfbC/Ugk3QlXPOAjrnbKjmzkqcfXGaIGhxgvGxB+CcNrSnGMXYJO/qjhCx2QXogg7MN873KTlJ2eqK7iI8GpSNERqD/CqRgTbiB4tgdtbJak97EQ1IcjUGvYW3T/xUpNto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949959; c=relaxed/simple; bh=HpNivqKXuPeLY6kL9ohi130PDzwzUxAq72FuonNKQUw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lDHBK8vmJ/hFeUmrV+/mDZfxf2b8/d7przHP3KwXJo/8JCZXVrkr9z75+sTeB5uN5g1T99AqnItoEGNbYodF2qKGq3KqBgAdCYrqgaSElaoLASBUkvk3rnudB1iJyIOnmGvX1thWwcMguvMhLy3x/Rd2OeLZRqkr/PLeeIt0BYc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k0BtmsVr; 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="k0BtmsVr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F78CC4CEE3; Tue, 29 Apr 2025 18:05:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949959; bh=HpNivqKXuPeLY6kL9ohi130PDzwzUxAq72FuonNKQUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k0BtmsVreOjBiaSynfiS/o2cZp8jifJ3ZOUTqly2LFCWAR/qI+CybT0OQ953SNjoY izJ1BxUCOp38dUeMKMn9ZJJSXIQ/kKle2lTMUpVs5W/ttH5Lyf0UI44dvyPALS8bCp cEnRTqxL6HBfHCtDYlCEUgIeUDe6K2QLryWoE+yI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michal Pecio , Mathias Nyman , Sasha Levin Subject: [PATCH 6.1 111/167] usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running Date: Tue, 29 Apr 2025 18:43:39 +0200 Message-ID: <20250429161056.231495776@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161051.743239894@linuxfoundation.org> References: <20250429161051.743239894@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Pecio [ Upstream commit 28a76fcc4c85dd39633fb96edb643c91820133e3 ] Nothing prevents a broken HC from claiming that an endpoint is Running and repeatedly rejecting Stop Endpoint with Context State Error. Avoid infinite retries and give back cancelled TDs. No such cases known so far, but HCs have bugs. Signed-off-by: Michal Pecio Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20250311154551.4035726-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-ring.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 85a2b3ca05075..0862fdd3e5682 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1175,16 +1175,19 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, * Stopped state, but it will soon change to Running. * * Assume this bug on unexpected Stop Endpoint failures. - * Keep retrying until the EP starts and stops again, on - * chips where this is known to help. Wait for 100ms. + * Keep retrying until the EP starts and stops again. */ - if (time_is_before_jiffies(ep->stop_time + msecs_to_jiffies(100))) - break; fallthrough; case EP_STATE_RUNNING: /* Race, HW handled stop ep cmd before ep was running */ xhci_dbg(xhci, "Stop ep completion ctx error, ctx_state %d\n", GET_EP_CTX_STATE(ep_ctx)); + /* + * Don't retry forever if we guessed wrong or a defective HC never starts + * the EP or says 'Running' but fails the command. We must give back TDs. + */ + if (time_is_before_jiffies(ep->stop_time + msecs_to_jiffies(100))) + break; command = xhci_alloc_command(xhci, false, GFP_ATOMIC); if (!command) { -- 2.39.5