test: rename usb_pe_drp to usb_pe_drp_old

Rename the current usb_pe_drp test to usb_pe_drp_old. There will be
a new usb_pe_drp test that uses mocks and we will move the tests over
in a controlled fashion.

BUG=b:163421994
BRANCH=None
TEST=`TEST_LIST_HOST=usb_pe_drp_old make runhosttests` works.

Signed-off-by: Paul Fagerburg <pfagerburg@google.com>
Change-Id: I2e0f79eb793d888109d00a96567042356c770502
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2357519
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>

8 files changed, 377 insertions, 8 deletions

diff --git a/test/build.mk b/test/build.mk
index 392dfa423a..8aa9059f23 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -91,8 +91,8 @@ test-list-host += usb_prl_old
 test-list-host += usb_tcpmv2_tcpci
 test-list-host += usb_prl
 test-list-host += usb_prl_noextended
-test-list-host += usb_pe_drp
-test-list-host += usb_pe_drp_noextended
+test-list-host += usb_pe_drp_old
+test-list-host += usb_pe_drp_old_noextended
 test-list-host += utils
 test-list-host += utils_str
 test-list-host += vboot
@@ -202,8 +202,9 @@ usb_typec_drp_acc_trysrc-y=usb_typec_drp_acc_trysrc.o vpd_api.o \
 usb_prl_old-y=usb_prl_old.o usb_sm_checks.o fake_usbc.o
 usb_prl-y=usb_prl.o usb_sm_checks.o
 usb_prl_noextended-y=usb_prl_noextended.o usb_sm_checks.o fake_usbc.o
-usb_pe_drp-y=usb_pe_drp.o usb_sm_checks.o fake_prl.o fake_usbc.o
-usb_pe_drp_noextended-y=usb_pe_drp.o usb_sm_checks.o fake_prl.o fake_usbc.o
+usb_pe_drp_old-y=usb_pe_drp_old.o usb_sm_checks.o fake_prl.o fake_usbc.o
+usb_pe_drp_old_noextended-y=usb_pe_drp_old.o usb_sm_checks.o fake_prl.o \
+	fake_usbc.o
 usb_tcpmv2_tcpci-y=usb_tcpmv2_tcpci.o vpd_api.o usb_sm_checks.o
 utils-y=utils.o
 utils_str-y=utils_str.o
diff --git a/test/test_config.h b/test/test_config.h
index 0c74657d2a..97a8c3e951 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -346,7 +346,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #define CONFIG_USB_POWER_DELIVERY
 #endif
 
-#if defined(TEST_USB_PE_DRP) || defined(TEST_USB_PE_DRP_NOEXTENDED)
+#if defined(TEST_USB_PE_DRP_OLD) || defined(TEST_USB_PE_DRP_OLD_NOEXTENDED)
 #define CONFIG_TEST_USB_PE_SM
 #define CONFIG_USB_PD_PORT_MAX_COUNT 1
 #define CONFIG_USB_PE_SM
@@ -355,7 +355,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #undef CONFIG_USB_PRL_SM
 #define CONFIG_USB_PD_REV30
 
-#if defined(TEST_USB_PE_DRP)
+#if defined(TEST_USB_PE_DRP_OLD)
 #define CONFIG_USB_PD_EXTENDED_MESSAGES
 #endif
 
diff --git a/test/usb_pe_drp_noextended.c b/test/usb_pe_drp_noextended.c
deleted file mode 120000
index 8351ef8a31..0000000000
--- a/test/usb_pe_drp_noextended.c
+++ /dev/null
@@ -1 +0,0 @@
-usb_pe_drp.c
\ No newline at end of file
diff --git a/test/usb_pe_drp_noextended.tasklist b/test/usb_pe_drp_noextended.tasklist
deleted file mode 120000
index 6d5bcd140f..0000000000
--- a/test/usb_pe_drp_noextended.tasklist
+++ /dev/null
@@ -1 +0,0 @@
-usb_pe_drp.tasklist
\ No newline at end of file
diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp_old.c
index 3cf1eceece..3cf1eceece 100644
--- a/test/usb_pe_drp.c
+++ b/test/usb_pe_drp_old.c
diff --git a/test/usb_pe_drp.tasklist b/test/usb_pe_drp_old.tasklist
index eb41326e3e..eb41326e3e 100644
--- a/test/usb_pe_drp.tasklist
+++ b/test/usb_pe_drp_old.tasklist
diff --git a/test/usb_pe_drp_old_noextended.c b/test/usb_pe_drp_old_noextended.c
new file mode 100644
index 0000000000..b57f0c09bd
--- /dev/null
+++ b/test/usb_pe_drp_old_noextended.c
@@ -0,0 +1,360 @@
+/* Copyright 2019 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.
+ *
+ * Test USB PE module.
+ */
+#include "battery.h"
+#include "common.h"
+#include "task.h"
+#include "test_util.h"
+#include "timer.h"
+#include "usb_emsg.h"
+#include "usb_mux.h"
+#include "usb_pe.h"
+#include "usb_pe_sm.h"
+#include "usb_prl_sm.h"
+#include "usb_sm_checks.h"
+#include "usb_tc_sm.h"
+
+/**
+ * STUB Section
+ */
+const struct svdm_response svdm_rsp = {
+	.identity = NULL,
+	.svids = NULL,
+	.modes = NULL,
+};
+
+const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT];
+const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT];
+
+int board_vbus_source_enabled(int port)
+{
+	return 0;
+}
+void tc_request_power_swap(int port)
+{
+	/* Do nothing */
+}
+
+void pd_set_vbus_discharge(int port, int enable)
+{
+	gpio_set_level(GPIO_USB_C0_DISCHARGE, enable);
+}
+
+test_static uint8_t tc_enabled = 1;
+
+uint8_t tc_get_pd_enabled(int port)
+{
+	return tc_enabled;
+}
+
+void pd_comm_enable(int port, int enable)
+{
+	tc_enabled = !!enable;
+}
+
+bool pd_alt_mode_capable(int port)
+{
+	return 1;
+}
+
+void pd_set_suspend(int port, int suspend)
+{
+
+}
+
+test_static void setup_source(void)
+{
+	/* Start PE. */
+	task_wait_event(10 * MSEC);
+	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
+	set_state_pe(PORT0, PE_SRC_READY);
+	task_wait_event(10 * MSEC);
+	/* At this point, the PE should be running in PE_SRC_Ready. */
+}
+
+test_static void setup_sink(void)
+{
+	tc_set_power_role(PORT0, PD_ROLE_SINK);
+	pd_comm_enable(PORT0, 0);
+	task_wait_event(10 * MSEC);
+	pd_comm_enable(PORT0, 1);
+	task_wait_event(10 * MSEC);
+	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
+	set_state_pe(PORT0, PE_SNK_READY);
+	task_wait_event(10 * MSEC);
+	/* At this point, the PE should be running in PE_SNK_Ready. */
+}
+/**
+ * Test section
+ */
+/* PE Fast Role Swap */
+static int test_pe_frs(void)
+{
+	/*
+	 * TODO: This test should validate PE boundary API differences -- not
+	 * internal state changes.
+	 */
+
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(pe_is_running(PORT0));
+
+	/*
+	 * FRS will only trigger when we are SNK, with an Explicit
+	 * contract.  So set this state up manually.  Also ensure any
+	 * background tasks (ex. discovery) aren't running.
+	 */
+	tc_prs_src_snk_assert_rd(PORT0);
+	pe_set_flag(PORT0, PE_FLAGS_VDM_SETUP_DONE);
+	pe_set_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT);
+	set_state_pe(PORT0, PE_SNK_READY);
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(get_state_pe(PORT0) == PE_SNK_READY);
+
+	/*
+	 * Trigger the Fast Role Switch from simulated ISR
+	 */
+	pd_got_frs_signal(PORT0);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_SIGNALED));
+
+	/*
+	 * Verify we detected FRS and ready to start swap
+	 */
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SEND_SWAP);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_EXPLICIT_CONTRACT));
+
+	/*
+	 * Make sure that we sent FR_Swap
+	 */
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(fake_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_FR_SWAP);
+	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SEND_SWAP);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+
+	/*
+	 * Accept the partners PS_RDY control message
+	 */
+	rx_emsg[PORT0].header = PD_HEADER(PD_CTRL_ACCEPT, 0, 0, 0, 0, 0, 0);
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_MSG_RECEIVED));
+	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_TRANSITION_TO_OFF);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+
+	/*
+	 * Send back our PS_RDY
+	 */
+	rx_emsg[PORT0].header = PD_HEADER(PD_CTRL_PS_RDY, 0, 0, 0, 0, 0, 0);
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	TEST_ASSERT(!tc_is_attached_src(PORT0));
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_MSG_RECEIVED));
+	TEST_ASSERT(tc_is_attached_src(PORT0));
+	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SOURCE_ON);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+
+	/*
+	 * After delay we are ready to send our PS_RDY
+	 */
+	task_wait_event(PD_POWER_SUPPLY_TURN_ON_DELAY);
+	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SOURCE_ON);
+	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+	TEST_ASSERT(fake_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_PS_RDY);
+
+	/*
+	 * Fake the Transmit complete and this will bring us to Source Startup
+	 */
+	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
+	task_wait_event(10 * MSEC);
+	TEST_ASSERT(get_state_pe(PORT0) == PE_SRC_STARTUP);
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
+
+	return EC_SUCCESS;
+}
+
+static int test_snk_give_source_cap(void)
+{
+	setup_sink();
+
+	/*
+	 * Receive a Get_Source_Cap message; respond with Source_Capabilities
+	 * and return to PE_SNK_Ready once sent.
+	 */
+	rx_emsg[PORT0].header =
+		PD_HEADER(PD_CTRL_GET_SOURCE_CAP, 0, 0, 0, 0, 0, 0);
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	task_wait_event(10 * MSEC);
+
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_MSG_RECEIVED));
+	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_TX_COMPLETE));
+	TEST_EQ(fake_prl_get_last_sent_data_msg_type(PORT0),
+		PD_DATA_SOURCE_CAP, "%d");
+	TEST_EQ(get_state_pe(PORT0), PE_DR_SNK_GIVE_SOURCE_CAP, "%d");
+
+	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(get_state_pe(PORT0), PE_SNK_READY, "%d");
+
+	return EC_SUCCESS;
+}
+
+static int test_vbus_gpio_discharge(void)
+{
+	pd_set_vbus_discharge(PORT0, 1);
+	TEST_EQ(gpio_get_level(GPIO_USB_C0_DISCHARGE), 1, "%d");
+
+	pd_set_vbus_discharge(PORT0, 0);
+	TEST_EQ(gpio_get_level(GPIO_USB_C0_DISCHARGE), 0, "%d");
+
+	return EC_SUCCESS;
+}
+
+test_static int test_extended_message_not_supported(void)
+{
+	memset(rx_emsg[PORT0].buf, 0, ARRAY_SIZE(rx_emsg[PORT0].buf));
+
+	/*
+	 * Receive an extended, non-chunked message; expect a Not Supported
+	 * response.
+	 */
+	rx_emsg[PORT0].header = PD_HEADER(
+			PD_DATA_BATTERY_STATUS, PD_ROLE_SINK, PD_ROLE_UFP, 0,
+			PDO_MAX_OBJECTS, PD_REV30, 1);
+	*(uint16_t *)rx_emsg[PORT0].buf =
+		PD_EXT_HEADER(0, 0, ARRAY_SIZE(rx_emsg[PORT0].buf)) & ~BIT(15);
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	task_wait_event(10 * MSEC);
+
+	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+			"%d");
+	/* At this point, the PE should again be running in PE_SRC_Ready. */
+
+	/*
+	 * Receive an extended, chunked, single-chunk message; expect a Not
+	 * Supported response.
+	 */
+	rx_emsg[PORT0].header = PD_HEADER(
+			PD_DATA_BATTERY_STATUS, PD_ROLE_SINK, PD_ROLE_UFP, 0,
+			PDO_MAX_OBJECTS, PD_REV30, 1);
+	*(uint16_t *)rx_emsg[PORT0].buf =
+		PD_EXT_HEADER(0, 0, PD_MAX_EXTENDED_MSG_CHUNK_LEN);
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	task_wait_event(10 * MSEC);
+
+	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+			"%d");
+	/* At this point, the PE should again be running in PE_SRC_Ready. */
+
+	/*
+	 * Receive an extended, chunked, multi-chunk message; expect a Not
+	 * Supported response after tChunkingNotSupported (not earlier).
+	 */
+	rx_emsg[PORT0].header = PD_HEADER(
+			PD_DATA_BATTERY_STATUS, PD_ROLE_SINK, PD_ROLE_UFP, 0,
+			PDO_MAX_OBJECTS, PD_REV30, 1);
+	*(uint16_t *)rx_emsg[PORT0].buf =
+		PD_EXT_HEADER(0, 0, ARRAY_SIZE(rx_emsg[PORT0].buf));
+	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
+	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	task_wait_event(10 * MSEC);
+	/*
+	 * The PE should stay in PE_SRC_Chunk_Received for
+	 * tChunkingNotSupported.
+	 */
+	task_wait_event(10 * MSEC);
+	TEST_NE(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+			"%d");
+
+	task_wait_event(PD_T_CHUNKING_NOT_SUPPORTED);
+	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+			"%d");
+	/* At this point, the PE should again be running in PE_SRC_Ready. */
+
+	/*
+	 * TODO(b/160374787): Test responding with Not Supported to control
+	 * messages requesting extended messages as responses.
+	 */
+
+	return EC_SUCCESS;
+}
+
+test_static int test_extended_message_not_supported_src(void)
+{
+	setup_source();
+	return test_extended_message_not_supported();
+}
+
+test_static int test_extended_message_not_supported_snk(void)
+{
+	setup_sink();
+	return test_extended_message_not_supported();
+}
+
+static int test_send_caps_error(void)
+{
+	/*
+	 * See section 8.3.3.4.1.1 PE_SRC_Send_Soft_Reset State and section
+	 * 8.3.3.2.3 PE_SRC_Send_Capabilities State.
+	 *
+	 * Transition to the PE_SRC_Discovery state when:
+	 *  1) The Protocol Layer indicates that the Message has not been sent
+	 *     and we are presently not Connected
+	 */
+	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	pe_set_flag(PORT0, PE_FLAGS_PROTOCOL_ERROR);
+	pe_clr_flag(PORT0, PE_FLAGS_PD_CONNECTION);
+	set_state_pe(PORT0, PE_SRC_SEND_CAPABILITIES);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), 0, "%d");
+	TEST_EQ(get_state_pe(PORT0), PE_SRC_DISCOVERY, "%d");
+
+	/*
+	 * Send soft reset when:
+	 *  1) The Protocol Layer indicates that the Message has not been sent
+	 *     and we are already Connected
+	 */
+	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	pe_set_flag(PORT0, PE_FLAGS_PROTOCOL_ERROR);
+	pe_set_flag(PORT0, PE_FLAGS_PD_CONNECTION);
+	set_state_pe(PORT0, PE_SRC_SEND_CAPABILITIES);
+	task_wait_event(10 * MSEC);
+	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0),
+		PD_CTRL_SOFT_RESET, "%d");
+	TEST_EQ(get_state_pe(PORT0), PE_SEND_SOFT_RESET, "%d");
+
+	return EC_SUCCESS;
+}
+
+void run_test(int argc, char **argv)
+{
+	test_reset();
+
+	RUN_TEST(test_pe_frs);
+	RUN_TEST(test_snk_give_source_cap);
+	RUN_TEST(test_vbus_gpio_discharge);
+#ifndef CONFIG_USB_PD_EXTENDED_MESSAGES
+	RUN_TEST(test_extended_message_not_supported_src);
+	RUN_TEST(test_extended_message_not_supported_snk);
+#endif
+	RUN_TEST(test_send_caps_error);
+
+	/* Do basic state machine validity checks last. */
+	RUN_TEST(test_pe_no_parent_cycles);
+	RUN_TEST(test_pe_no_empty_state);
+
+	test_print_result();
+}
diff --git a/test/usb_pe_drp_old_noextended.tasklist b/test/usb_pe_drp_old_noextended.tasklist
new file mode 100644
index 0000000000..eb41326e3e
--- /dev/null
+++ b/test/usb_pe_drp_old_noextended.tasklist
@@ -0,0 +1,10 @@
+/* Copyright 2019 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.
+ */
+
+/**
+ * See CONFIG_TEST_TASK_LIST in config.h for details.
+ */
+#define CONFIG_TEST_TASK_LIST \
+	TASK_TEST(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE)