From f778157aa60818bc4f92e14f7f8b545d3d59a3fa Mon Sep 17 00:00:00 2001 From: Edward Hill Date: Thu, 17 Dec 2020 07:12:34 -0700 Subject: TCPMv2: Unit Test TD.PD.SRC3.E26 Add PD compliance test TD.PD.SRC3.E26.Soft_Reset sent regardless of Rp value. As Consumer (UFP), the Tester forces the UUT to send Soft_Reset and verifies Soft_Reset is sent regardless of the Rp value is SinkTxOK or SinkTxNG. BUG=b:161835483 BRANCH=none TEST=make run-usb_tcpmv2_compliance Signed-off-by: Edward Hill Change-Id: I2bdd61abad611edc41400f6b96d65bd840e70e6e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2595539 Reviewed-by: Denis Brockus --- test/build.mk | 3 +- test/usb_tcpmv2_compliance.c | 1 + test/usb_tcpmv2_compliance.h | 2 ++ test/usb_tcpmv2_compliance_common.c | 52 ++++++++++++++++++++++++++++++++++- test/usb_tcpmv2_td_pd_ll_e3.c | 8 ------ test/usb_tcpmv2_td_pd_src3_e26.c | 55 +++++++++++++++++++++++++++++++++++++ 6 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 test/usb_tcpmv2_td_pd_src3_e26.c (limited to 'test') diff --git a/test/build.mk b/test/build.mk index 0684f995d1..738602e494 100644 --- a/test/build.mk +++ b/test/build.mk @@ -219,7 +219,8 @@ 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_compliance_common.o usb_tcpmv2_td_pd_ll_e3.o \ + usb_tcpmv2_td_pd_src3_e26.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 2ca08308ca..730478222f 100644 --- a/test/usb_tcpmv2_compliance.c +++ b/test/usb_tcpmv2_compliance.c @@ -29,6 +29,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); test_print_result(); } diff --git a/test/usb_tcpmv2_compliance.h b/test/usb_tcpmv2_compliance.h index fb869a509c..6fd0e7b95e 100644 --- a/test/usb_tcpmv2_compliance.h +++ b/test/usb_tcpmv2_compliance.h @@ -61,8 +61,10 @@ void partner_send_msg(enum pd_msg_type sop, uint32_t *payload); int proc_pd_e1(enum pd_data_role data_role); +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); #endif /* USB_TCPMV2_COMPLIANCE_H */ diff --git a/test/usb_tcpmv2_compliance_common.c b/test/usb_tcpmv2_compliance_common.c index 2c3d6e0546..0dac1e3238 100644 --- a/test/usb_tcpmv2_compliance_common.c +++ b/test/usb_tcpmv2_compliance_common.c @@ -11,6 +11,7 @@ #include "test_util.h" #include "timer.h" #include "usb_tcpmv2_compliance.h" +#include "usb_tc_sm.h" int partner_tx_id; @@ -127,7 +128,8 @@ void partner_send_msg(enum pd_msg_type sop, partner_tx_id &= 7; header = PD_HEADER(type, - partner_get_power_role(), + sop == PD_MSG_SOP ? partner_get_power_role() + : PD_PLUG_FROM_CABLE, partner_get_data_role(), partner_tx_id, cnt, @@ -174,6 +176,9 @@ int proc_pd_e1(enum pd_data_role data_role) /* * a) The test starts in a disconnected state. */ + mock_tcpci_set_reg(TCPC_REG_EXT_STATUS, TCPC_REG_EXT_STATUS_SAFE0V); + mock_set_alert(TCPC_REG_ALERT_EXT_STATUS); + task_wait_event(10 * SECOND); TEST_EQ(pd_get_data_role(I2C_PORT_HOST_TCPC), PD_ROLE_DISCONNECTED, "%d"); @@ -287,3 +292,48 @@ int proc_pd_e1(enum pd_data_role data_role) TEST_EQ(pd_get_data_role(I2C_PORT_HOST_TCPC), data_role, "%d"); return EC_SUCCESS; } + +/***************************************************************************** + * PROC.PD.E3. Wait to Start AMS for DFP(Source) UUT + */ +int proc_pd_e3(void) +{ + /* + * PROC.PD.E3. Wait to Start AMS for DFP(Source) UUT: + * a) The Tester keeps monitoring the Rp value and if the UUT doesn't + * set the value to SinkTXOK if it doesn't have anything to send in 1s, + * the test fails. During this period, the Tester replies any message + * sent from the UUT with a proper response. + */ + 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); + + task_wait_event(1 * SECOND); + TEST_EQ(tc_is_attached_src(PORT0), true, "%d"); + TEST_EQ(TCPC_REG_ROLE_CTRL_RP(mock_tcpci_get_reg(TCPC_REG_ROLE_CTRL)), + SINK_TX_OK, "%d"); + + task_wait_event(10 * SECOND); + return EC_SUCCESS; +} diff --git a/test/usb_tcpmv2_td_pd_ll_e3.c b/test/usb_tcpmv2_td_pd_ll_e3.c index d2aedf2b9d..7bc86cd1e7 100644 --- a/test/usb_tcpmv2_td_pd_ll_e3.c +++ b/test/usb_tcpmv2_td_pd_ll_e3.c @@ -23,14 +23,6 @@ static int td_pd_ll_e3(enum pd_data_role data_role) TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d"); - /* - * Set Vbus to Safe0V - */ - mock_tcpci_set_reg_bits(TCPC_REG_EXT_STATUS, - TCPC_REG_EXT_STATUS_SAFE0V); - mock_set_alert(TCPC_REG_ALERT_EXT_STATUS); - task_wait_event(10 * SECOND); - /* * a) Run PROC.PD.E1 Bring-up according to the UUT role. */ diff --git a/test/usb_tcpmv2_td_pd_src3_e26.c b/test/usb_tcpmv2_td_pd_src3_e26.c new file mode 100644 index 0000000000..cd54ce82a5 --- /dev/null +++ b/test/usb_tcpmv2_td_pd_src3_e26.c @@ -0,0 +1,55 @@ +/* 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.SRC3.E26.Soft_Reset sent regardless of Rp value + * + * Description: + * As Consumer (UFP), the Tester forces the UUT to send Soft_Reset and + * verifies Soft_Reset is sent regardless of the Rp value is SinkTxOK or + * SinkTxNG. + */ +int test_td_pd_src3_e26(void) +{ + /* + * TD.PD.SRC3.E26.Soft_Reset sent regardless of Rp value + * a) Run PROC.PD.E1 Bring-up according to the UUT role. + * b) The Tester waits until it can start an AMS (Run PROC.PD.E3)... + */ + TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d"); + TEST_EQ(proc_pd_e1(PD_ROLE_DFP), EC_SUCCESS, "%d"); + TEST_EQ(proc_pd_e3(), EC_SUCCESS, "%d"); + + /* + * ...and sends a Get_Source_Cap message to the UUT. + */ + partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP, 0, 0, NULL); + + /* + * c) Upon receipt of the Source_Capabilities Message, the Tester + * doesn’t reply with GoodCRC. + */ + TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, 0, PD_DATA_SOURCE_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 (1.1 ms) + tSoftReset max (15 ms). + */ + TEST_EQ(verify_tcpci_tx_timeout( + TCPC_TX_SOP, PD_CTRL_SOFT_RESET, 0, 15 * MSEC), + EC_SUCCESS, "%d"); + mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS); + + return EC_SUCCESS; +} -- cgit v1.2.1