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 28A2F306491; Mon, 27 Oct 2025 19:01:40 +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=1761591700; cv=none; b=XEqbQoe/ltM9hwQ9GE3g4htrgg2PQd/ZO06c878Lmr6j31uQCc4JxLUYhW4lu736GAW44sWhvlWWnwz4/hWkdOtmb+ED/D5dcRQOHQ0LJf1T/cTX6oiPxoAtgVpGUXQcB9ddlRfWPD9nAYSIRKTzFUlrVhVjZLmAzNiJaxsYEkc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761591700; c=relaxed/simple; bh=ZLgqcztuowXN47H34Ck/F064fUk8I6W1KppOPHyBZ9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DnBMqyyp+PWdqIyq9CHxBbjnx6u8/3WGxKKTVn7Z3ZO0mw2mvfpu8ZbblMwEY7ExUIK8hEF/olbASJ51YvtfLgWHcjYEB1FlIMn0EPeDh5ljC34UryLuCKDAuVe/zZ2OJiUJXgrJOQLkZAb8+JiMuegSlDHYYijZiJfr5N5eWrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JFBrxbF7; 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="JFBrxbF7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE127C4CEF1; Mon, 27 Oct 2025 19:01:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761591700; bh=ZLgqcztuowXN47H34Ck/F064fUk8I6W1KppOPHyBZ9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JFBrxbF7yRFg0sAafMtLoEVvmmxY0ZbrhxSD3UwCPnRHYotIyGK85oCJNc7k9wbTF Mqi6cu8eGpGMG8yYyCXhubG3DnPFPmmuGnP7Zwv09XFzHfTFr+Q5AYP7HyFDU+f+hz OYleHxmTng4OyiQb10dr6+3kOUHqErlEMr2iJt9s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , =?UTF-8?q?=C5=81ukasz=20Bartosik?= , Mathias Nyman Subject: [PATCH 5.10 296/332] xhci: dbc: enable back DbC in resume if it was enabled before suspend Date: Mon, 27 Oct 2025 19:35:49 +0100 Message-ID: <20251027183532.668152141@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183524.611456697@linuxfoundation.org> References: <20251027183524.611456697@linuxfoundation.org> User-Agent: quilt/0.69 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathias Nyman commit 2bbd38fcd29670e46c0fdb9cd0e90507a8a1bf6a upstream. DbC is currently only enabled back if it's in configured state during suspend. If system is suspended after DbC is enabled, but before the device is properly enumerated by the host, then DbC would not be enabled back in resume. Always enable DbC back in resume if it's suspended in enabled, connected, or configured state Cc: stable Fixes: dfba2174dc42 ("usb: xhci: Add DbC support in xHCI driver") Tested-by: Łukasz Bartosik Signed-off-by: Mathias Nyman Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-dbgcap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/usb/host/xhci-dbgcap.c +++ b/drivers/usb/host/xhci-dbgcap.c @@ -1147,8 +1147,15 @@ int xhci_dbc_suspend(struct xhci_hcd *xh if (!dbc) return 0; - if (dbc->state == DS_CONFIGURED) + switch (dbc->state) { + case DS_ENABLED: + case DS_CONNECTED: + case DS_CONFIGURED: dbc->resume_required = 1; + break; + default: + break; + } xhci_dbc_stop(dbc);