usb pd: Resend request after receiving a WAIT in response to a request

When a WAIT is received in response to a request, wait SinkRequestTime
before resending the request.

BUG=chrome-os-partner:34984
TEST=make -j buildall
BRANCH=none

Change-Id: I5c8429c4a7b9cf06609996f924b8d9d535ab6b5f
Reviewed-on: https://chromium-review.googlesource.com/414533
Commit-Ready: Sam Hurst <shurst@google.com>
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>

1 files changed, 365 insertions, 34 deletions

diff --git a/test/usb_pd.c b/test/usb_pd.c
index ea68c66599..233714e3ad 100644
--- a/test/usb_pd.c
+++ b/test/usb_pd.c
@@ -14,6 +14,9 @@
 #include "usb_pd_test_util.h"
 #include "util.h"
 
+#define PORT0	0
+#define PORT1	1
+
 struct pd_port_t {
 	int host_mode;
 	int has_vbus;
@@ -113,12 +116,42 @@ static void simulate_rx_msg(int port, uint16_t header, int cnt,
 	pd_simulate_rx(port);
 }
 
-static void simulate_source_cap(int port)
+static void simulate_wait(int port)
+{
+	uint16_t header = PD_HEADER(PD_CTRL_WAIT, PD_ROLE_SOURCE,
+				    PD_ROLE_DFP, pd_port[port].msg_rx_id,
+				    0);
+
+	simulate_rx_msg(port, header, 0, NULL);
+}
+
+static void simulate_accept(int port)
 {
+	uint16_t header = PD_HEADER(PD_CTRL_ACCEPT, PD_ROLE_SOURCE,
+				PD_ROLE_DFP, pd_port[port].msg_rx_id,
+				0);
+
+	simulate_rx_msg(port, header, 0, NULL);
+}
+
+static void simulate_reject(int port)
+{
+	uint16_t header = PD_HEADER(PD_CTRL_REJECT, PD_ROLE_SOURCE,
+				PD_ROLE_DFP, pd_port[port].msg_rx_id,
+				0);
+
+	simulate_rx_msg(port, header, 0, NULL);
+}
+
+static void simulate_source_cap(int port, uint32_t cnt)
+{
+	uint32_t src_pdo_cnt = (cnt == 0) ? 1 : pd_src_pdo_cnt;
+
 	uint16_t header = PD_HEADER(PD_DATA_SOURCE_CAP, PD_ROLE_SOURCE,
 				    PD_ROLE_DFP, pd_port[port].msg_rx_id,
-				    pd_src_pdo_cnt);
-	simulate_rx_msg(port, header, pd_src_pdo_cnt, pd_src_pdo);
+				    src_pdo_cnt);
+
+	simulate_rx_msg(port, header, src_pdo_cnt, pd_src_pdo);
 }
 
 static void simulate_goodcrc(int port, int role, int id)
@@ -129,11 +162,11 @@ static void simulate_goodcrc(int port, int role, int id)
 
 static int verify_goodcrc(int port, int role, int id)
 {
-	return pd_test_tx_msg_verify_sop(0) &&
-	       pd_test_tx_msg_verify_short(0, PD_HEADER(PD_CTRL_GOOD_CRC,
+	return pd_test_tx_msg_verify_sop(port) &&
+	       pd_test_tx_msg_verify_short(port, PD_HEADER(PD_CTRL_GOOD_CRC,
 							role, role, id, 0)) &&
-	       pd_test_tx_msg_verify_crc(0) &&
-	       pd_test_tx_msg_verify_eop(0);
+	       pd_test_tx_msg_verify_crc(port) &&
+	       pd_test_tx_msg_verify_eop(port);
 }
 
 static void plug_in_source(int port, int polarity)
@@ -152,74 +185,369 @@ static void plug_in_sink(int port, int polarity)
 
 static void unplug(int port)
 {
+	pd_port[port].msg_tx_id = 0;
+	pd_port[port].msg_rx_id = 0;
 	pd_port[port].has_vbus = 0;
 	pd_port[port].partner_role = -1;
 	task_wake(PD_PORT_TO_TASK_ID(port));
 	usleep(30 * MSEC);
 }
 
-static int test_request(void)
+static int test_request_with_wait_and_contract(void)
+{
+	uint32_t expected_rdo = RDO_FIXED(2, 3000, 3000, 0);
+	uint8_t port = PORT0;
+
+	plug_in_source(port, 0);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(2 * PD_T_CC_DEBOUNCE + 100 * MSEC);
+	TEST_ASSERT(pd_port[port].polarity == 0);
+
+	/* We're in SNK_DISCOVERY now. Let's send the source cap. */
+	simulate_source_cap(port, 1);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port, PD_ROLE_SINK,
+						pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request was good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're in SNK_REQUESTED. Send accept */
+	simulate_accept(port);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_rx_id(port);
+
+	/*
+	 * We're in SNK_TRANSITION.
+	 * And we have an explicit power contract.
+	 */
+	simulate_source_cap(port, 1);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port, PD_ROLE_SINK,
+					pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request was good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're in SNK_REQUESTED. Send wait */
+	simulate_wait(port);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	/* PD_T_SINK_REQUEST. Request is sent again after 100 ms */
+	task_wait_event(100 * MSEC);
+	inc_rx_id(port);
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* We had an explicit contract. So request should have been resent. */
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request was good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're in SNK_REQUESTED. Send accept */
+	simulate_accept(port);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	/* We're done */
+	unplug(port);
+
+	return EC_SUCCESS;
+}
+
+static int test_request_with_wait(void)
 {
 	uint32_t expected_rdo = RDO_FIXED(1, 900, 900, RDO_CAP_MISMATCH);
+	uint8_t port = PORT0;
+
+	plug_in_source(port, 0);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(2 * PD_T_CC_DEBOUNCE + 100 * MSEC);
+	TEST_ASSERT(pd_port[port].polarity == 0);
 
-	plug_in_source(0, 0);
+	/* We're in SNK_DISCOVERY now. Let's send the source cap. */
+	simulate_source_cap(port, 0);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port,
+			PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request is good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
 	task_wake(PD_PORT_TO_TASK_ID(0));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're in SNK_REQUESTED. Send wait */
+	simulate_wait(port);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_rx_id(port);
+
+	/* We didn't have an explicit contract. So we're in SNK_DISCOVERY. */
+	/* Resend Source Cap. */
+	simulate_source_cap(port, 0);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port,
+			PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request was good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're done */
+	unplug(port);
+	return EC_SUCCESS;
+}
+
+static int test_request_with_reject(void)
+{
+	uint32_t expected_rdo = RDO_FIXED(1, 900, 900, RDO_CAP_MISMATCH);
+	uint8_t port = PORT0;
+
+	plug_in_source(port, 0);
+	task_wake(PD_PORT_TO_TASK_ID(port));
 	task_wait_event(2 * PD_T_CC_DEBOUNCE + 100 * MSEC);
-	TEST_ASSERT(pd_port[0].polarity == 0);
+	TEST_ASSERT(pd_port[port].polarity == 0);
 
 	/* We're in SNK_DISCOVERY now. Let's send the source cap. */
-	simulate_source_cap(0);
+	simulate_source_cap(port, 0);
 	task_wait_event(30 * MSEC);
-	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[0].msg_rx_id));
+	TEST_ASSERT(verify_goodcrc(port,
+			PD_ROLE_SINK, pd_port[port].msg_rx_id));
 
 	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request is good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
 	task_wake(PD_PORT_TO_TASK_ID(0));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
+
+	/* We're in SNK_REQUESTED. Send reject */
+	simulate_reject(port);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_rx_id(port);
+
+	/* We're in SNK_READY. Send source cap. again. */
+	simulate_source_cap(port, 0);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port,
+			PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
+	inc_rx_id(port);
+
+	/* Process the request */
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
+			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	/* We're done */
+	unplug(port);
+	return EC_SUCCESS;
+}
+
+static int test_request(void)
+{
+	uint32_t expected_rdo = RDO_FIXED(1, 900, 900, RDO_CAP_MISMATCH);
+	uint8_t port = PORT0;
+
+	plug_in_source(port, 0);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(2 * PD_T_CC_DEBOUNCE + 100 * MSEC);
+	TEST_ASSERT(pd_port[port].polarity == 0);
+
+	/* We're in SNK_DISCOVERY now. Let's send the source cap. */
+	simulate_source_cap(port, 0);
+	task_wait_event(30 * MSEC);
+	TEST_ASSERT(verify_goodcrc(port,
+				PD_ROLE_SINK, pd_port[port].msg_rx_id));
+
+	/* Wait for the power request */
+	task_wake(PD_PORT_TO_TASK_ID(port));
 	task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */
-	inc_rx_id(0);
+	inc_rx_id(port);
 
 	/* Process the request */
-	TEST_ASSERT(pd_test_tx_msg_verify_sop(0));
-	TEST_ASSERT(pd_test_tx_msg_verify_short(0,
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
 			PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
-				  pd_port[0].msg_tx_id, 1)));
-	TEST_ASSERT(pd_test_tx_msg_verify_word(0, expected_rdo));
-	TEST_ASSERT(pd_test_tx_msg_verify_crc(0));
-	TEST_ASSERT(pd_test_tx_msg_verify_eop(0));
-	inc_tx_id(0);
+			pd_port[port].msg_tx_id, 1)));
+	TEST_ASSERT(pd_test_tx_msg_verify_word(port, expected_rdo));
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
+
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+
+	/* Request was good. Send GoodCRC */
+	simulate_goodcrc(port, PD_ROLE_SOURCE, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
+	task_wait_event(30 * MSEC);
+	inc_tx_id(port);
 
 	/* We're done */
-	unplug(0);
+	unplug(port);
+
 	return EC_SUCCESS;
 }
 
+
 static int test_sink(void)
 {
 	int i;
+	uint8_t port = PORT1;
 
-	plug_in_sink(1, 1);
-	task_wake(PD_PORT_TO_TASK_ID(1));
+	plug_in_sink(port, 1);
+	task_wake(PD_PORT_TO_TASK_ID(port));
 	task_wait_event(250 * MSEC); /* tTypeCSinkWaitCap: 210~250 ms */
-	TEST_ASSERT(pd_port[1].polarity == 1);
+	TEST_ASSERT(pd_port[port].polarity == 1);
 
 	/* The source cap should be sent */
-	TEST_ASSERT(pd_test_tx_msg_verify_sop(1));
-	TEST_ASSERT(pd_test_tx_msg_verify_short(1,
+	TEST_ASSERT(pd_test_tx_msg_verify_sop(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_short(port,
 			PD_HEADER(PD_DATA_SOURCE_CAP, PD_ROLE_SOURCE,
-				  PD_ROLE_DFP, pd_port[1].msg_tx_id,
+				  PD_ROLE_DFP, pd_port[port].msg_tx_id,
 				  pd_src_pdo_cnt)));
 	for (i = 0; i < pd_src_pdo_cnt; ++i)
-		TEST_ASSERT(pd_test_tx_msg_verify_word(1, pd_src_pdo[i]));
-	TEST_ASSERT(pd_test_tx_msg_verify_crc(1));
-	TEST_ASSERT(pd_test_tx_msg_verify_eop(1));
+		TEST_ASSERT(pd_test_tx_msg_verify_word(port, pd_src_pdo[i]));
+
+	TEST_ASSERT(pd_test_tx_msg_verify_crc(port));
+	TEST_ASSERT(pd_test_tx_msg_verify_eop(port));
 
 	/* Looks good. Ack the source cap. */
-	simulate_goodcrc(1, PD_ROLE_SINK, pd_port[1].msg_tx_id);
-	task_wake(PD_PORT_TO_TASK_ID(1));
+	simulate_goodcrc(port, PD_ROLE_SINK, pd_port[port].msg_tx_id);
+	task_wake(PD_PORT_TO_TASK_ID(port));
 	usleep(30 * MSEC);
-	inc_tx_id(1);
+	inc_tx_id(port);
 
 	/* We're done */
-	unplug(1);
+	unplug(port);
 	return EC_SUCCESS;
 }
 
@@ -231,6 +559,9 @@ void run_test(void)
 
 	RUN_TEST(test_request);
 	RUN_TEST(test_sink);
+	RUN_TEST(test_request_with_wait);
+	RUN_TEST(test_request_with_wait_and_contract);
+	RUN_TEST(test_request_with_reject);
 
 	test_print_result();
 }