Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp634542pxx; Mon, 26 Oct 2020 17:36:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRqjXaKSB6wgK0vKV876slR0eHPJmO7tyA99nzQvCRYYGInlLN/hOnSS27I1LUnaj6FEWF X-Received: by 2002:a17:906:a444:: with SMTP id cb4mr19276431ejb.416.1603758968178; Mon, 26 Oct 2020 17:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603758968; cv=none; d=google.com; s=arc-20160816; b=eiptgwHzX+d9uVMUaKe+D+Uqzd3YPzWB13DcpLVzHdPNbzjCfweX68o1WgudyHUYJv qGCN4SJCZXrzK2tejHaPANFGuybKLxEzB/v4cbrcDrWdqJ+54unOaoRrfmwjBNIWcsUS PpADOX5E8iYyd8DO2T5qLVdQdNdcHP6swC2cbZEqGf3uJEzGnTy0Z6RZpZ7PA95KVzmp js8lgsWQlrLuF68Cv3e6L4DPEPMh/+q4PovLpi4CczLIYHlE1JCw5CSF5SAr0cId4Mz9 Iw9uriK7CsNTE0jI/Bye+KL1LOiqIns/TeZhfSqyX+QOMBFXFmcpKnMPXnu+b0/whk1v 6njw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f5yWrkg8daKtBKJbwOHqKc2dMmbFCh9KcAi7nHR8AmQ=; b=DC53BMp+nqXt6tsbPH0w85z0A7L8QVN/Xhr/X8YT6/8bDK2mTcZ4ADmJ8gmkTm+oid ZQAzCtvHTgk8szVJf4v+SwHyEF9hTNdS5hFikDYJiqp7X3vwZDfIimzlkCYACBLh/i5Q K4Ury4Sx3yinIuPDV75xiMTmsTYFQql/pgBgrR12V+stej3SzqKUFzgwXwwbLORbFNDs DF97oeFmO7dMcwoIgcmA+Nt5ctwmH6Y99wNjxve9WHRxFITI+4wSg07CeB2LZw4W2QH8 uA4T/ApTGkvWF5ezxzSB4M4MhqOdjuQGxoMBOREDEOKMybLIUtOYxhSZ7Xd802SMX/Af ukOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="eg/Qs3+y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o10si8223282eja.154.2020.10.26.17.35.46; Mon, 26 Oct 2020 17:36:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="eg/Qs3+y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441274AbgJ0AWG (ORCPT + 99 others); Mon, 26 Oct 2020 20:22:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:33740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410156AbgJZXzr (ORCPT ); Mon, 26 Oct 2020 19:55:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1534223C6; Mon, 26 Oct 2020 23:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756545; bh=88ZR/nZX0n9SVuXjV50KDmM60WBLqdgb41ca2fSLwms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eg/Qs3+yzt+7w0eiD0+zp64u+5oWee0z9+H4USXpT3qJARUGZs7FDKWyTXHYBVseY 4/yu12AkGHnW4Q+jkF5RWLhGeQjYGQR0ek2QJ60yUBaQIalT4ToPVl5Isw5vuhdsBX 0Ob4v2/DSwGjwKpwMNUbfYlhtJMmQBplm36azQqM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Badhri Jagan Sridharan , Guenter Roeck , Heikki Krogerus , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 23/80] usb: typec: tcpm: During PR_SWAP, source caps should be sent only after tSwapSourceStart Date: Mon, 26 Oct 2020 19:54:19 -0400 Message-Id: <20201026235516.1025100-23-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235516.1025100-1-sashal@kernel.org> References: <20201026235516.1025100-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Badhri Jagan Sridharan [ Upstream commit 6bbe2a90a0bb4af8dd99c3565e907fe9b5e7fd88 ] The patch addresses the compliance test failures while running TD.PD.CP.E3, TD.PD.CP.E4, TD.PD.CP.E5 of the "Deterministic PD Compliance MOI" test plan published in https://www.usb.org/usbc. For a product to be Type-C compliant, it's expected that these tests are run on usb.org certified Type-C compliance tester as mentioned in https://www.usb.org/usbc. The purpose of the tests TD.PD.CP.E3, TD.PD.CP.E4, TD.PD.CP.E5 is to verify the PR_SWAP response of the device. While doing so, the test asserts that Source Capabilities message is NOT received from the test device within tSwapSourceStart min (20 ms) from the time the last bit of GoodCRC corresponding to the RS_RDY message sent by the UUT was sent. If it does then the test fails. This is in line with the requirements from the USB Power Delivery Specification Revision 3.0, Version 1.2: "6.6.8.1 SwapSourceStartTimer The SwapSourceStartTimer Shall be used by the new Source, after a Power Role Swap or Fast Role Swap, to ensure that it does not send Source_Capabilities Message before the new Sink is ready to receive the Source_Capabilities Message. The new Source Shall Not send the Source_Capabilities Message earlier than tSwapSourceStart after the last bit of the EOP of GoodCRC Message sent in response to the PS_RDY Message sent by the new Source indicating that its power supply is ready." The patch makes sure that TCPM does not send the Source_Capabilities Message within tSwapSourceStart(20ms) by transitioning into SRC_STARTUP only after tSwapSourceStart(20ms). Signed-off-by: Badhri Jagan Sridharan Reviewed-by: Guenter Roeck Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20200817183828.1895015-1-badhri@google.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/tcpm/tcpm.c | 2 +- include/linux/usb/pd.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 355a2c7fac0b4..16e124753df72 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -3482,7 +3482,7 @@ static void run_state_machine(struct tcpm_port *port) */ tcpm_set_pwr_role(port, TYPEC_SOURCE); tcpm_pd_send_control(port, PD_CTRL_PS_RDY); - tcpm_set_state(port, SRC_STARTUP, 0); + tcpm_set_state(port, SRC_STARTUP, PD_T_SWAP_SRC_START); break; case VCONN_SWAP_ACCEPT: diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h index 145c38e351c25..6655ce32feff1 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -442,6 +442,7 @@ static inline unsigned int rdo_max_power(u32 rdo) #define PD_T_ERROR_RECOVERY 100 /* minimum 25 is insufficient */ #define PD_T_SRCSWAPSTDBY 625 /* Maximum of 650ms */ #define PD_T_NEWSRC 250 /* Maximum of 275ms */ +#define PD_T_SWAP_SRC_START 20 /* Minimum of 20ms */ #define PD_T_DRP_TRY 100 /* 75 - 150 ms */ #define PD_T_DRP_TRYWAIT 600 /* 400 - 800 ms */ -- 2.25.1