From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793210965; b=WlAPCpH0y0jBe5d3Mc2QWEnDQExY2CAP2cXjwJucCucwl/tdYcfx7QYu9ea7r0I2CRhb ArEw+DSrKLrHHLhiXopL3EAh8/1NputpSKYhHwfH5wFbESuAMwr9LzgJPpQK/e8tEFYGt QJUd7F+hHCK0m8b0XQg+NkqAMQMxUFHcm60777ZVqLLwtSOP89GLRmsoFS0dpdkKpC5Ek +QdaEImFO0mpMmGJPF+aDz8Z9HqxaZHHHZ1GhDh2GIA4O8ebWqEhEitdhNcX2FspIdl6d DhVTIyn+ujnC5g8EPayIAtyHxzGw/qcKKRJG6hsS5z8GKeOdhhSKwnKgTRSGoR1UUFQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793210965; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=8y1O3SvUq45mmQbThr+kz/c8NFBcJX4HUZ00m+HG89U=; b=FHUr2ajOBMorrviXzbe2saV1kcRr5HLq13VJNeeP1Cuz4i5MVpoWhxAva4LfqnzY68bi VMlKPP23nMpQmTu3YmPo8JdE3CkytagWQhrWlpQZQguAxv3/jZ7l95N7cIum6f6apjtYw 8+ULsL9YhJxjUNAWxv/jd3wzHbM6S2C1fWkj1oVDDW7MhnyCz4i4+hHDDo+L7bXUYumCq KePDgig0EPbF4YDa6wQV1/Y6+IxD6o+aE+F0z7sSArMziI7gqL6bHsqiPX8qV7umKsEWR 93v8aNiBXwzcIt0yE/oq+XZXPAxmmrvqwkoGkGoX39sqQmf+GOkg66oSrRVV9I9nt1Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wP4AEOD6; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1C1F606A31C; Wed, 28 Oct 2026 18:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wP4AEOD6 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F16C01F01825; Wed, 28 Oct 2026 18:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793210964; bh=8y1O3SvUq45mmQbThr+kz/c8NFBcJX4HUZ00m+HG89U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wP4AEOD6Ia6EeHYNcfxIA7L8H+neX6IxvpOJoWK6DDo2RlnSGA5ANvWqjZw8IbsRA 6qD7gUDZ0KOSZcTqFfPAUgJUfqii72zqPPeH1iXdFLEoS14qZcczRwWnsPlIf+BSiz S+jyfX66I8AID4srIKMLsEcu9YCsZz4Z+eR/q7Hw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Amit Sunil Dhamne , Badhri Jagan Sridharan , Heikki Krogerus Subject: [PATCH 5.15 210/571] usb: typec: tcpm: recover after failure to start the frs ams Date: Wed, 28 Oct 2026 17:55:57 +0100 Message-ID: <20261028170012.984699597@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170008.009143722@linuxfoundation.org> References: <20261028170008.009143722@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Amit Sunil Dhamne commit 90156585765b29304f07b0e4a1c56a969876fcfc upstream. Reset the port if the tcpm fails to start the FAST_ROLE_SWAP AMS by initiating error recovery on it. This helps in cases where some cables (incorrectly) signal an FRS to an FRS capable port during disconnection. The TCPC autonomously starts sourcing VBUS on detecting the FRS signal. However, the VBUS sourcing is left on when the FAST_ROLE_SWAP AMS fails to start (as tcpm_sink_tx_ok is 0 as CC is open due to the cable disconnect). This is because the code sets the state to INVALID_STATE without resetting the port state. Log snippet before changes: [ 101.401960] AMS FAST_ROLE_SWAP start [ 101.401971] Sink TX No Go [ 101.401982] sourcing vbus [ 101.401987] VBUS on [ 101.402159] VBUS on [ 109.257809] CC1: 0 -> 0, CC2: 5 -> 0 [state SNK_READY, polarity 1, disconnected] [ 111.267442] VBUS on After changes: [ 70.541211] AMS FAST_ROLE_SWAP start [ 70.541220] Sink TX No Go [ 70.541228] state change SNK_READY -> ERROR_RECOVERY [rev3 NONE_AMS] [ 70.541362] VBUS on [ 70.541365] sourcing vbus [ 70.541367] VBUS on [ 70.541374] state change ERROR_RECOVERY -> PORT_RESET [rev3 NONE_AMS] [ 70.541410] disable vbus discharge ret:0 [ 70.543028] Setting usb_comm capable false [ 70.544009] Setting voltage/current limit 0 mV 0 mA [ 70.544034] polarity 0 [ 70.544239] Requesting mux state 0, usb-role 0, orientation 0 [ 70.555550] cc:=0 [ 70.555595] pending state change PORT_RESET -> PORT_RESET_WAIT_OFF @ 100 ms [rev3 NONE_AMS] [ 70.555697] VBUS off [ 70.555702] VBUS VSAFE0V [ 70.555762] CC1: 5 -> 0, CC2: 0 -> 0 [state PORT_RESET, polarity 0, disconnected] [ 70.587794] VBUS off [ 70.587799] VBUS VSAFE0V [ 70.655672] state change PORT_RESET -> PORT_RESET_WAIT_OFF [delayed 100 ms] [ 70.655682] state change PORT_RESET_WAIT_OFF -> SNK_UNATTACHED [rev3 NONE_AMS] [ 70.655686] Start toggling [ 70.656274] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] Fixes: 0908c5aca31e ("usb: typec: tcpm: AMS and Collision Avoidance") Cc: stable Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan Acked-by: Heikki Krogerus Link: https://patch.msgid.link/20260903-frs-error-handling-v1-1-ad0fee541847@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -5459,7 +5459,7 @@ static void tcpm_pd_event_handler(struct port->upcoming_state = FR_SWAP_SEND; ret = tcpm_ams_start(port, FAST_ROLE_SWAP); if (ret == -EAGAIN) - port->upcoming_state = INVALID_STATE; + tcpm_set_state(port, ERROR_RECOVERY, 0); } else { tcpm_log(port, "Discarding FRS_SIGNAL! Not in sink ready"); }