TCPMv2: Unit Test TD.PD.SNK3.E12

Add PD compliance test TD.PD.SNK3.E12.Soft_Reset sent regardless of
Rp value.

As Provider (DFP), the Tester forces the UUT to send Soft_Reset and
verifies Soft_Reset is sent regardless even though the Rp value is
SinkTxNG.

BUG=b:161835483
BRANCH=none
TEST=make run-usb_tcpmv2_compliance

Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I13bc474e361cb385dbda58c5142fdd36a9974c45
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2595543
Reviewed-by: Denis Brockus <dbrockus@chromium.org>

5 files changed, 61 insertions, 4 deletions

diff --git a/test/build.mk b/test/build.mk
index 738602e494..212c3e8915 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -220,7 +220,7 @@ usb_pe_drp_noextended-y=usb_pe_drp_noextended.o usb_sm_checks.o
 usb_tcpmv2_tcpci-y=usb_tcpmv2_tcpci.o vpd_api.o usb_sm_checks.o
 usb_tcpmv2_compliance-y=usb_tcpmv2_compliance.o vpd_api.o usb_sm_checks.o \
 	usb_tcpmv2_compliance_common.o usb_tcpmv2_td_pd_ll_e3.o \
-	usb_tcpmv2_td_pd_src3_e26.o
+	usb_tcpmv2_td_pd_src3_e26.o usb_tcpmv2_td_pd_snk3_e12.o
 utils-y=utils.o
 utils_str-y=utils_str.o
 vboot-y=vboot.o
diff --git a/test/usb_tcpmv2_compliance.c b/test/usb_tcpmv2_compliance.c
index 730478222f..08e75e44d3 100644
--- a/test/usb_tcpmv2_compliance.c
+++ b/test/usb_tcpmv2_compliance.c
@@ -30,6 +30,7 @@ void run_test(int argc, char **argv)
 	RUN_TEST(test_td_pd_ll_e3_dfp);
 	RUN_TEST(test_td_pd_ll_e3_ufp);
 	RUN_TEST(test_td_pd_src3_e26);
+	RUN_TEST(test_td_pd_snk3_e12);
 
 	test_print_result();
 }
diff --git a/test/usb_tcpmv2_compliance.h b/test/usb_tcpmv2_compliance.h
index 6fd0e7b95e..7423210ce3 100644
--- a/test/usb_tcpmv2_compliance.h
+++ b/test/usb_tcpmv2_compliance.h
@@ -66,5 +66,6 @@ int proc_pd_e3(void);
 int test_td_pd_ll_e3_dfp(void);
 int test_td_pd_ll_e3_ufp(void);
 int test_td_pd_src3_e26(void);
+int test_td_pd_snk3_e12(void);
 
 #endif /* USB_TCPMV2_COMPLIANCE_H */
diff --git a/test/usb_tcpmv2_compliance_common.c b/test/usb_tcpmv2_compliance_common.c
index 0dac1e3238..ea6babf921 100644
--- a/test/usb_tcpmv2_compliance_common.c
+++ b/test/usb_tcpmv2_compliance_common.c
@@ -185,12 +185,13 @@ int proc_pd_e1(enum pd_data_role data_role)
 	switch (data_role) {
 	case PD_ROLE_UFP:
 		/*
-		 * b) The tester applies Rp (3A) and waits for the UUT
-		 *    attachment.
+		 * b) The tester applies Rp (PD3=1.5A, PD2=3A) and waits for
+		 * the UUT attachment.
 		 */
 		mock_set_cc(MOCK_CC_DUT_IS_SNK,
 			    MOCK_CC_SNK_OPEN,
-			    MOCK_CC_SNK_RP_3_0);
+			    (partner_get_pd_rev() == PD_REV30 ?
+			    MOCK_CC_SNK_RP_1_5 : MOCK_CC_SNK_RP_3_0));
 		mock_set_alert(TCPC_REG_ALERT_CC_STATUS);
 		task_wait_event(5 * MSEC);
 
diff --git a/test/usb_tcpmv2_td_pd_snk3_e12.c b/test/usb_tcpmv2_td_pd_snk3_e12.c
new file mode 100644
index 0000000000..2de58f915e
--- /dev/null
+++ b/test/usb_tcpmv2_td_pd_snk3_e12.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "mock/tcpci_i2c_mock.h"
+#include "task.h"
+#include "tcpci.h"
+#include "test_util.h"
+#include "timer.h"
+#include "usb_tcpmv2_compliance.h"
+
+/*****************************************************************************
+ * TD.PD.SNK3.E12.Soft_Reset sent regardless of Rp value
+ *
+ * Description:
+ *	As Provider (DFP), the Tester forces the UUT to send Soft_Reset and
+ *	verifies Soft_Reset is sent regardless even though the Rp value is
+ *	SinkTxNG.
+ */
+int test_td_pd_snk3_e12(void)
+{
+	/*
+	 * TD.PD.SNK3.E12.Soft_Reset sent regardless of Rp value
+	 * a) Run PROC.PD.E1 Bring-up according to the UUT role.
+	 */
+	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
+	TEST_EQ(proc_pd_e1(PD_ROLE_UFP), EC_SUCCESS, "%d");
+
+	/*
+	 * b) The Tester keeps the Rp value as SinkTXNG and sends a
+	 * Get_Sink_Cap message to the UUT.
+	 */
+	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SINK_CAP, 0, 0, NULL);
+
+	/*
+	 * c) Upon receipt of the Sink_Capabilities Message, the Tester doesn't
+	 * reply with GoodCRC.
+	 */
+	TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, 0, PD_DATA_SINK_CAP),
+		EC_SUCCESS, "%d");
+	mock_set_alert(TCPC_REG_ALERT_TX_FAILED);
+
+	/*
+	 * d) The Tester verifies that a Soft_Reset message is sent by the UUT
+	 * within tReceive max + tSoftReset max
+	 */
+	TEST_EQ(verify_tcpci_tx_timeout(
+			TCPC_TX_SOP, PD_CTRL_SOFT_RESET, 0, 16 * MSEC),
+		EC_SUCCESS, "%d");
+	mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+
+	return EC_SUCCESS;
+}