tcpmc2: fix TD.PD.LL3.E2 Retransmission test

We are retrying in both the TCPC hardware (4 total) and
in the Protocol layer (3 total) when we do not get a GoodCRC back from
the port partner. We are only suppose to retry up to nRetryCount times
which is 2. This means we should be sending 3 total replies.

Also correct a misinterpretation of the spec around SOP' and SOP"
retries. We were not retrying those packets, but we should be retry them
as the SOP. The SOP' device will not retry, but we (as the SOP) should
retry packet that we are sending to them.

The TCPM is not fast enough to meet the timing for tRetry (195 usec), so
we need to perform the retries in the TCPC hardware layer.

BRANCH=none
BUG=b:150617035
TEST=Verify passing compliance test with GRL-C2 on Trembyle

Change-Id: I55c4ab2f5ce8f64acf21af943862d96d9088622d
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2248960

1 files changed, 5 insertions, 3 deletions

diff --git a/include/mock/tcpci_i2c_mock.h b/include/mock/tcpci_i2c_mock.h
index 06cb0ca5f4..4734a2e1e2 100644
--- a/include/mock/tcpci_i2c_mock.h
+++ b/include/mock/tcpci_i2c_mock.h
@@ -14,9 +14,11 @@ void mock_tcpci_set_reg(int reg, uint16_t value);
 
 uint16_t mock_tcpci_get_reg(int reg_offset);
 
-int mock_tcpci_wait_for_transmit(enum tcpm_transmit_type tx_type,
-				 enum pd_ctrl_msg_type ctrl_msg,
-				 enum pd_data_msg_type data_msg);
+int verify_tcpci_transmit(enum tcpm_transmit_type tx_type,
+			  enum pd_ctrl_msg_type ctrl_msg,
+			  enum pd_data_msg_type data_msg);
+
+int verify_tcpci_tx_retry_count(uint8_t retry_count);
 
 void mock_tcpci_receive(enum pd_msg_type sop, uint16_t header,
 			uint32_t *payload);