summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Brockus <dbrockus@google.com>2020-12-17 13:46:09 -0700
committerCommit Bot <commit-bot@chromium.org>2020-12-18 00:46:23 +0000
commit28ffaeaf6ba9db8bdb99c9235ff699a1f8a0bf66 (patch)
tree940cc5cae94b1134c90f92460c36fad7d28c1bfa
parent4d4b1307e02c4b1faf56fa5918ab2962a4a42aea (diff)
downloadchrome-ec-28ffaeaf6ba9db8bdb99c9235ff699a1f8a0bf66.tar.gz
TCPMv2: Unit Test TD.PD.LL.E4 Hard Reset Usage
BUG=b:175878572 BRANCH=none TEST=make run-usb_tcpmv2_compliance Signed-off-by: Denis Brockus <dbrockus@google.com> Change-Id: I5828b4c7938481f9f9dc8613132dc55858e5ba79 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2597495 Reviewed-by: Denis Brockus <dbrockus@chromium.org> Commit-Queue: Denis Brockus <dbrockus@chromium.org> Tested-by: Denis Brockus <dbrockus@chromium.org> Auto-Submit: Denis Brockus <dbrockus@chromium.org>
-rw-r--r--test/build.mk7
-rw-r--r--test/usb_tcpmv2_compliance.c2
-rw-r--r--test/usb_tcpmv2_compliance.h2
-rw-r--r--test/usb_tcpmv2_td_pd_ll_e4.c180
4 files changed, 189 insertions, 2 deletions
diff --git a/test/build.mk b/test/build.mk
index 212c3e8915..20e7146e20 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -219,8 +219,11 @@ usb_pe_drp-y=usb_pe_drp.o usb_sm_checks.o
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_snk3_e12.o
+ usb_tcpmv2_compliance_common.o \
+ usb_tcpmv2_td_pd_ll_e3.o \
+ usb_tcpmv2_td_pd_ll_e4.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 08e75e44d3..4fbb9d32e0 100644
--- a/test/usb_tcpmv2_compliance.c
+++ b/test/usb_tcpmv2_compliance.c
@@ -29,6 +29,8 @@ 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_ll_e4_dfp);
+ RUN_TEST(test_td_pd_ll_e4_ufp);
RUN_TEST(test_td_pd_src3_e26);
RUN_TEST(test_td_pd_snk3_e12);
diff --git a/test/usb_tcpmv2_compliance.h b/test/usb_tcpmv2_compliance.h
index 7423210ce3..165344d721 100644
--- a/test/usb_tcpmv2_compliance.h
+++ b/test/usb_tcpmv2_compliance.h
@@ -65,6 +65,8 @@ 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_ll_e4_dfp(void);
+int test_td_pd_ll_e4_ufp(void);
int test_td_pd_src3_e26(void);
int test_td_pd_snk3_e12(void);
diff --git a/test/usb_tcpmv2_td_pd_ll_e4.c b/test/usb_tcpmv2_td_pd_ll_e4.c
new file mode 100644
index 0000000000..e79714ed9d
--- /dev/null
+++ b/test/usb_tcpmv2_td_pd_ll_e4.c
@@ -0,0 +1,180 @@
+/* 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.LL.E4. Hard Reset Usage
+ *
+ * Description:
+ * Check that the UUT will issue a Soft Reset after unsuccessful retries,
+ * and that the link can be successfully recovered after that.
+ * Check that the UUT will issue a Hard Reset if the Soft Reset fails,
+ * and that the link can be successfully recovered after that.
+ */
+static int td_pd_ll_e4(enum pd_data_role data_role)
+{
+ int retries;
+
+ partner_set_pd_rev(PD_REV20);
+
+ TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
+
+ /*
+ * a) Run PROC.PD.E1 Bring-up according to the UUT role.
+ */
+ TEST_EQ(proc_pd_e1(data_role), EC_SUCCESS, "%d");
+
+ /*
+ * Make sure we are idle. Reject everything that is pending
+ */
+ if (data_role == PD_ROLE_DFP) {
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP_PRIME, 0,
+ PD_DATA_VENDOR_DEF),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP_PRIME, PD_CTRL_NOT_SUPPORTED, 0, 0,
+ NULL);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, 0,
+ PD_DATA_VENDOR_DEF),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_NOT_SUPPORTED, 0, 0, NULL);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
+ PD_CTRL_GET_SOURCE_CAP, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_DATA_SOURCE_CAP, 1, 0, &pdo);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
+ PD_CTRL_GET_SINK_CAP, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_DATA_SINK_CAP, 1, 0, &pdo);
+ } else if (data_role == PD_ROLE_UFP) {
+ int vcs;
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, PD_CTRL_DR_SWAP, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_REJECT, 0, 0, NULL);
+
+ for (vcs = 0; vcs < 4; vcs++) {
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
+ PD_CTRL_VCONN_SWAP, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_REJECT, 0, 0,
+ NULL);
+ }
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
+ PD_CTRL_GET_SINK_CAP, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_DATA_SINK_CAP, 1, 0, &pdo);
+ }
+
+ /* Should be idle now. */
+ task_wait_event(10 * SECOND);
+
+ /*
+ * b) Send a Get_Sink_Cap message to the UUT, wait for a reply
+ * and do not send GoodCrc for nRetryCount + 1 times
+ * (nRetryCount equals 3 since PD 2.1).
+ */
+ partner_send_msg(PD_MSG_SOP,
+ PD_CTRL_GET_SINK_CAP,
+ 0, 0, NULL);
+
+ retries = 3;
+ TEST_EQ(verify_tcpci_tx_retry_count(TCPC_TX_SOP, 0, PD_DATA_SINK_CAP,
+ retries),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_FAILED);
+
+ /*
+ * c) Wait the nRetryCount + 1 (four) Soft Resets from the UUT and do
+ * not reply GoodCrc.
+ */
+ retries = 3;
+ TEST_EQ(verify_tcpci_tx_retry_count(TCPC_TX_SOP, PD_CTRL_SOFT_RESET, 0,
+ retries),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_FAILED);
+ task_wait_event(1 * MSEC);
+
+ /*
+ * d) Check that the UUT issues a Hard Reset.
+ */
+ TEST_EQ(mock_tcpci_get_reg(TCPC_REG_TRANSMIT),
+ TCPC_TX_HARD_RESET, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS | TCPC_REG_ALERT_TX_FAILED);
+ mock_tcpci_set_reg(TCPC_REG_TRANSMIT, 0);
+ task_wait_event(1 * MSEC);
+
+ /*
+ * e) Do the bring-up procedure for Link tests and check that the link
+ * is successfully established.
+ */
+ if (partner_get_power_role() == PD_ROLE_SINK) {
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
+ 0,
+ PD_DATA_SOURCE_CAP),
+ EC_SUCCESS, "%d");
+
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(10 * MSEC);
+
+ partner_send_msg(PD_MSG_SOP, PD_DATA_REQUEST, 1, 0, &rdo);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, PD_CTRL_ACCEPT, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, PD_CTRL_PS_RDY, 0),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+ task_wait_event(5 * MSEC);
+
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_ACCEPT, 0, 0, NULL);
+ task_wait_event(1 * MSEC);
+ } else {
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_DATA_SOURCE_CAP, 1, 0, &pdo);
+
+ TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, 0, PD_DATA_REQUEST),
+ EC_SUCCESS, "%d");
+ mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
+
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_ACCEPT, 0, 0, NULL);
+ task_wait_event(10 * MSEC);
+ partner_send_msg(PD_MSG_SOP, PD_CTRL_PS_RDY, 0, 0, NULL);
+ task_wait_event(1 * MSEC);
+ }
+ return EC_SUCCESS;
+}
+int test_td_pd_ll_e4_dfp(void)
+{
+ return td_pd_ll_e4(PD_ROLE_DFP);
+}
+int test_td_pd_ll_e4_ufp(void)
+{
+ return td_pd_ll_e4(PD_ROLE_UFP);
+}