From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A360418787A for ; Wed, 13 May 2026 04:42:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778647380; cv=none; b=GU7bYWTrbQDEtXsue6QbcKSVSlC5GI3NWiWrwlphSjdEaBl4SuqMa/kfVzfw0gzHDWA+a+CSWu1ssZbP623eO18Wps3fVQYm4ws4OwtIBGepW5lqvdOmG/20kmnAtgsGGC0yuYSNwryv1Oo93suISiDTdJ47eQWsvuDw3n77Ma8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778647380; c=relaxed/simple; bh=5cHhcj35f2X+ib4lWQ7yYzd8fJmz3lMT65RhPz3N0v0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TOzp2py81h16grqt4sJg/MZciBj+jIzAXDFrAFYNQWIcHtHxz3aZ1f3dWE9OrG9Ec+M/CH531i4OZG4VZyQifEzilyIbM8ikEKi70HGmNZv84TZigvZ9nHze5i4oD668m5N97AXtQc0hFJnW7eYsrOv6f2GCvy7m5pOtgdMepKU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--amitsd.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=GHVomdX5; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--amitsd.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GHVomdX5" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-13312af37fdso9689480c88.0 for ; Tue, 12 May 2026 21:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778647378; x=1779252178; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=M5MavqidYKA5Hl3+Xn6475nEpmRetlYvYy9oz+S0lmc=; b=GHVomdX57A7kdOVlpLag0W4KB7BSANTqwCT6MMfCo0IuLKsPpdk3F32U28Z1DoOe2k YnemCm4ksDqLwkDtvdRURoZyEUmWALtd9AAZOmGSkNBya5yALPcRoJ2aMPeGL9RgttzH 2pb9zHLRK1PBLvJx/A9PX42nRkJxCrdbpEkrclon85p0TROoReXelqMhYXx6b6op4jaa 9X7asIrkfnXktNH6Z18T2/3eXcvs98CdT5hkXaJrYeqBsw8K5YKApgSkN4ROwoDuNhUz j4W3RXOc9/3fBJ7J92h4Ypo+9spzaMQ2oyLCJJF+dT5PkEjMqwNEpTo0gAhpY6GxDpEv SHCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778647378; x=1779252178; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=M5MavqidYKA5Hl3+Xn6475nEpmRetlYvYy9oz+S0lmc=; b=BfGdvH9ioI5kzNzqvcUxEI/nO9vG/afMecbdIrDr/fZFIX56zpitkhRbmCwpqU8dG5 97iXYcJpKSpcSShWvp9I5aN/WvzccG804bp3mc7Qal1zhUSMO2zovsHFA/Zbuv9blEj9 zNWiHiFbQ4DUpUiNHXsTGirr5PsCafypFHknjymgyawTqskOxpPkzQ4IPdhtoZ3B/uip 3qoOrMz4lwd2ostDFeK4tNSBbk6SGNe3J9JQ1hksVBVPf4YDzFbRNemYQx/9V5170PCy YvxOTGRIh3rSww8aoxlajKG7EcjVL2kpL7iWxRIT3tIdy43LjuFvbtsHaLDOs/twn0i/ Mgvw== X-Gm-Message-State: AOJu0YyX9rGG31VNTLGMlsFfZ4s0BAzlLpBbS5jTrvSqfpnLsim3R7ut JjW/SwCilyrJpgg6u30I/nCIgIuTsI/HhPbbhtKCbMnNqf02ROnExlunOQ454GV5Dy/wK5BzM1i Uchm2fPU4yPYt6hKeYfKAJ60tqPdQc91JlaIn/MGFgwJzZbnZZlh0Q7B5aDHwpCOiCqXmSssQAq xNr8feLjGv8ilKYjLZSUjIB9L8hlk+G+PIoAK7 X-Received: from dlbvv20.prod.google.com ([2002:a05:7022:5f14:b0:132:8d92:4d66]) (user=amitsd job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6886:b0:130:6936:dcde with SMTP id a92af1059eb24-1342ef432a1mr1108067c88.14.1778647377312; Tue, 12 May 2026 21:42:57 -0700 (PDT) Date: Wed, 13 May 2026 04:41:38 +0000 In-Reply-To: <20260512173932.810559588@linuxfoundation.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512173932.810559588@linuxfoundation.org> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260513044138.3681247-1-amitsd@google.com> Subject: [PATCH 6.12.y] usb: typec: tcpm: reset internal port states on soft reset AMS From: Amit Sunil Dhamne To: stable@vger.kernel.org Cc: Amit Sunil Dhamne , stable , Badhri Jagan Sridharan , Heikki Krogerus , Greg Kroah-Hartman Content-Type: text/plain; charset="UTF-8" Reset internal port states (such as vdm_sm_running and explicit_contract) on soft reset AMS as the port needs to negotiate a new contract. The consequence of leaving the states in as-is cond are as follows: * port is in SRC power role and an explicit contract is negotiated with the port partner (in sink role) * port partner sends a Soft Reset AMS while VDM State Machine is running * port accepts the Soft Reset request and the port advertises src caps * port partner sends a Request message but since the explicit_contract and vdm_sm_running are true from previous negotiation, the port ends up sending Soft Reset instead of Accept msg. Stub Log: [ 203.653942] AMS DISCOVER_IDENTITY start [ 203.653947] PD TX, header: 0x176f [ 203.655901] PD TX complete, status: 0 [ 203.657470] PD RX, header: 0x124f [1] [ 203.657477] Rx VDM cmd 0xff008081 type 2 cmd 1 len 1 [ 203.657482] AMS DISCOVER_IDENTITY finished [ 203.657484] cc:=4 [ 204.155698] PD RX, header: 0x144f [1] [ 204.155718] Rx VDM cmd 0xeeee8001 type 0 cmd 1 len 1 [ 204.155741] PD TX, header: 0x196f [ 204.157622] PD TX complete, status: 0 [ 204.160060] PD RX, header: 0x4d [1] [ 204.160066] state change SRC_READY -> SOFT_RESET [rev2 SOFT_RESET_AMS] [ 204.160076] PD TX, header: 0x163 [ 204.162486] PD TX complete, status: 0 [ 204.162832] AMS SOFT_RESET_AMS finished [ 204.162840] cc:=4 [ 204.162891] AMS POWER_NEGOTIATION start [ 204.162896] state change SOFT_RESET -> AMS_START [rev2 POWER_NEGOTIATION] [ 204.162908] state change AMS_START -> SRC_SEND_CAPABILITIES [rev2 POWER_NEGOTIATION] [ 204.162913] PD TX, header: 0x1361 [ 204.165529] PD TX complete, status: 0 [ 204.165571] pending state change SRC_SEND_CAPABILITIES -> SRC_SEND_CAPABILITIES_TIMEOUT @ 60 ms [rev2 POWER_NEGOTIATION] [ 204.166996] PD RX, header: 0x1242 [1] [ 204.167009] state change SRC_SEND_CAPABILITIES -> SRC_SOFT_RESET_WAIT_SNK_TX [rev2 POWER_NEGOTIATION] [ 204.167019] AMS POWER_NEGOTIATION finished [ 204.167020] cc:=4 [ 204.167083] AMS SOFT_RESET_AMS start [ 204.167086] state change SRC_SOFT_RESET_WAIT_SNK_TX -> SOFT_RESET_SEND [rev2 SOFT_RESET_AMS] [ 204.167092] PD TX, header: 0x16d [ 204.168824] PD TX complete, status: 0 [ 204.168854] pending state change SOFT_RESET_SEND -> HARD_RESET_SEND @ 60 ms [rev2 SOFT_RESET_AMS] [ 204.171876] PD RX, header: 0x43 [1] [ 204.171879] AMS SOFT_RESET_AMS finished This causes COMMON.PROC.PD.11.2 check failure for TEST.PD.VDM.SRC.2_Rev2Src test on the PD compliance tester. Signed-off-by: Amit Sunil Dhamne Fixes: 8d3a0578ad1a ("usb: typec: tcpm: Respond Wait if VDM state machine is running") Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)") Cc: stable Reviewed-by: Badhri Jagan Sridharan Acked-by: Heikki Krogerus Link: https://patch.msgid.link/20260414-fix-soft-reset-v1-1-01d7cb9764e2@google.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 2909f0d4994fb4306bf116df5ccee797791fce2c) Signed-off-by: Amit Sunil Dhamne --- drivers/usb/typec/tcpm/tcpm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index b0e6c58e6a59..c0306b00256b 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -5407,6 +5407,8 @@ static void run_state_machine(struct tcpm_port *port) usb_power_delivery_unregister_capabilities(port->partner_source_caps); port->partner_source_caps = NULL; tcpm_pd_send_control(port, PD_CTRL_ACCEPT, TCPC_TX_SOP); + port->vdm_sm_running = false; + port->explicit_contract = false; tcpm_ams_finish(port); if (port->pwr_role == TYPEC_SOURCE) { port->upcoming_state = SRC_SEND_CAPABILITIES; -- 2.54.0.563.g4f69b47b94-goog