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 4A644256D for ; Thu, 24 Jul 2025 00:36:26 +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=1753317387; cv=none; b=jCY3jmTi94ljKApbtF3B99KdCI6utpwY76TkWIA7ILm1P6GKTXfjWptRpkSMq0irffvxCaa2WlZbje64wPiR3AfKwL3sKN1DRPbReRYMrd+CAEORZhfVE0Z0yGHYAFuwgz946LrVp2U0Y1RDmIL7oXXpfRcNnOPBVESTbqLqkhM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753317387; c=relaxed/simple; bh=MNytIwPwAnqdLi/5UvXvUFnFFzrVkhpfrBvW4AL0UU8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WrgwddR01DRqtdS6Wj1AwILbfaELZusPpbIMCmQ6KsyO+cZenVsm9tcQyiKXsCQna/+FEippCtKvfEGOWbTiKEG82bkkKay20qMbfbkkwRLm9vHIyWmUu0/THWHkBySZdSoQoKbWfMc0gNC9JS8mzKw09ZXuPsncrK02jcLUrng= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DIIupvsg; 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="DIIupvsg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A396FC4CEE7; Thu, 24 Jul 2025 00:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753317386; bh=MNytIwPwAnqdLi/5UvXvUFnFFzrVkhpfrBvW4AL0UU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DIIupvsgKDRh4eMprQznNRKTpc6ujP/4XjXGDE/H9dl1ZmtX4/xuYZZ9LyhJp5bIe y1av1TqobnDEjvnaEO5xw1mg3kqu13epWgudd6V0Gnnpr/+Vg1FfVw9KzpwtzAya7T ArQhuW7twvEWVLFQf1pBVUwuMA1gMacH2Y8CARbYo+aoUUAXOJmQLt/ztQJqhUy5V2 dkI+hBAA2TI/7tM7JVKys5n3bvc/f1A/AAI6p/g7L800wEXcB3lxhcG8bHnxiTFPDR 5OiJFMyjuIZL5yy7UCV8UXvSBBUbqyNA8cBgEnRZwQS1vTDgLWz1IPg/hWnKENGvDJ 6wzK+G7+IkCLw== From: Sasha Levin To: stable@vger.kernel.org Cc: RD Babiera , stable , Badhri Jagan Sridharan , Heikki Krogerus , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 3/3] usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach Date: Wed, 23 Jul 2025 20:36:19 -0400 Message-Id: <20250724003619.1211156-3-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250724003619.1211156-1-sashal@kernel.org> References: <2025070814-evict-shelf-8b8d@gregkh> <20250724003619.1211156-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: RD Babiera [ Upstream commit bec15191d52300defa282e3fd83820f69e447116 ] This patch fixes Type-C compliance test TD 4.7.6 - Try.SNK DRP Connect SNKAS. tVbusON has a limit of 275ms when entering SRC_ATTACHED. Compliance testers can interpret the TryWait.Src to Attached.Src transition after Try.Snk as being in Attached.Src the entire time, so ~170ms is lost to the debounce timer. Setting the data role can be a costly operation in host mode, and when completed after 100ms can cause Type-C compliance test check TD 4.7.5.V.4 to fail. Turn VBUS on before tcpm_set_roles to meet timing requirement. Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)") Cc: stable Signed-off-by: RD Babiera Reviewed-by: Badhri Jagan Sridharan Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20250618230606.3272497-2-rdbabiera@google.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/tcpm/tcpm.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 09b43d5260fa4..9d8fcfac57610 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -3686,17 +3686,6 @@ static int tcpm_src_attach(struct tcpm_port *port) tcpm_enable_auto_vbus_discharge(port, true); - ret = tcpm_set_roles(port, true, TYPEC_STATE_USB, - TYPEC_SOURCE, tcpm_data_role_for_source(port)); - if (ret < 0) - return ret; - - if (port->pd_supported) { - ret = port->tcpc->set_pd_rx(port->tcpc, true); - if (ret < 0) - goto out_disable_mux; - } - /* * USB Type-C specification, version 1.2, * chapter 4.5.2.2.8.1 (Attached.SRC Requirements) @@ -3706,13 +3695,24 @@ static int tcpm_src_attach(struct tcpm_port *port) (polarity == TYPEC_POLARITY_CC2 && port->cc1 == TYPEC_CC_RA)) { ret = tcpm_set_vconn(port, true); if (ret < 0) - goto out_disable_pd; + return ret; } ret = tcpm_set_vbus(port, true); if (ret < 0) goto out_disable_vconn; + ret = tcpm_set_roles(port, true, TYPEC_STATE_USB, TYPEC_SOURCE, + tcpm_data_role_for_source(port)); + if (ret < 0) + goto out_disable_vbus; + + if (port->pd_supported) { + ret = port->tcpc->set_pd_rx(port->tcpc, true); + if (ret < 0) + goto out_disable_mux; + } + port->pd_capable = false; port->partner = NULL; @@ -3722,14 +3722,14 @@ static int tcpm_src_attach(struct tcpm_port *port) return 0; -out_disable_vconn: - tcpm_set_vconn(port, false); -out_disable_pd: - if (port->pd_supported) - port->tcpc->set_pd_rx(port->tcpc, false); out_disable_mux: tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE, TYPEC_ORIENTATION_NONE); +out_disable_vbus: + tcpm_set_vbus(port, false); +out_disable_vconn: + tcpm_set_vconn(port, false); + return ret; } -- 2.39.5