tcpmv2: retool start/end AMS

- Drop start and end ams function in favor of a flag based approach
- Don't clear RX queue on TX reset. We are supposed to drop any pending
TX messages (not RX messages). This should also help us to process
partner messages if we get a collision
- Drop prl_tx_phy_layer_reset_run and call next state directly in entry
- Dropping retry_counter reset to 0 since that happens in entry method
- Dropping flags reset to 0 because it is most likely dropping more
flags than we want.

BRANCH=none
BUG=b:158248741,b:157228506,b:157661566
TEST=DUT accepts soft resets

Change-Id: Ice8721a6c81452584f8d4ec474cb4f4a487b713b
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2233794
Tested-by: Diana Z <dzigterman@chromium.org>
Tested-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>

2 files changed, 7 insertions, 11 deletions

diff --git a/test/fake_prl.c b/test/fake_prl.c
index ac64594e61..b4e2aaa11a 100644
--- a/test/fake_prl.c
+++ b/test/fake_prl.c
@@ -52,9 +52,6 @@ void prl_set_rev(int port, enum tcpm_transmit_type partner,
 	enum pd_rev_type rev)
 {}
 
-void prl_start_ams(int port)
-{}
-
 
 enum pd_ctrl_msg_type fake_prl_get_last_sent_ctrl_msg(int port)
 {
diff --git a/test/usb_prl.c b/test/usb_prl.c
index 3ada5adfdb..51b40d25d7 100644
--- a/test/usb_prl.c
+++ b/test/usb_prl.c
@@ -769,6 +769,12 @@ void pe_got_soft_reset(int port)
 	pd_port[port].mock_got_soft_reset = 1;
 }
 
+bool pe_in_local_ams(int port)
+{
+	/* We will probably want to change this in the future */
+	return false;
+}
+
 static int test_prl_reset(void)
 {
 	int port = PORT0;
@@ -1072,11 +1078,6 @@ static int test_send_extended_data_msg(void)
 static int test_receive_soft_reset_msg(void)
 {
 	int port = PORT0;
-	int expected_header = PD_HEADER(PD_CTRL_SOFT_RESET,
-				pd_port[port].power_role,
-				pd_port[port].data_role,
-				pd_port[port].msg_rx_id,
-				0, pd_port[port].rev, 0);
 
 	enable_prl(port, 1);
 
@@ -1103,9 +1104,7 @@ static int test_receive_soft_reset_msg(void)
 
 	TEST_ASSERT(pd_port[port].mock_got_soft_reset);
 	TEST_ASSERT(pd_port[port].mock_pe_error < 0);
-	TEST_ASSERT(pd_port[port].mock_pe_message_received);
-	TEST_ASSERT(expected_header == rx_emsg[port].header);
-	TEST_ASSERT(rx_emsg[port].len == 0);
+	TEST_EQ(pd_port[port].mock_pe_message_received, 0, "%d");
 
 	enable_prl(port, 0);