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, 31 insertions, 9 deletions

diff --git a/common/mock/tcpci_i2c_mock.c b/common/mock/tcpci_i2c_mock.c
index a0aa40dba4..09864cc2d2 100644
--- a/common/mock/tcpci_i2c_mock.c
+++ b/common/mock/tcpci_i2c_mock.c
@@ -10,6 +10,7 @@
 #include "timer.h"
 
 #define BUFFER_SIZE 100
+#define MOCK_WAIT_TIMEOUT (5 * SECOND)
 
 struct tcpci_reg {
 	uint8_t		offset;
@@ -137,14 +138,11 @@ static void print_header(const char *prefix, uint16_t header)
 		 id, cnt, ext);
 }
 
-int mock_tcpci_wait_for_transmit(enum tcpm_transmit_type tx_type,
+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 want_tx_reg = (tx_type == TCPC_TX_SOP_PRIME) ?
-				TCPC_REG_TRANSMIT_SET_WITHOUT_RETRY(tx_type) :
-				TCPC_REG_TRANSMIT_SET_WITH_RETRY(tx_type);
-	uint64_t timeout = get_time().val + 5 * SECOND;
+	uint64_t timeout = get_time().val + MOCK_WAIT_TIMEOUT;
 
 	TEST_EQ(tcpci_regs[TCPC_REG_TRANSMIT].value, 0, "%d");
 	while (get_time().val < timeout) {
@@ -153,14 +151,17 @@ int mock_tcpci_wait_for_transmit(enum tcpm_transmit_type tx_type,
 						tx_buffer, 1);
 			int type  = PD_HEADER_TYPE(header);
 			int cnt   = PD_HEADER_CNT(header);
+			const uint16_t want_tx_reg = tx_type;
+			const uint16_t tx_wo_retry =
+				tcpci_regs[TCPC_REG_TRANSMIT].value & ~0x0030;
 
-			TEST_EQ(tcpci_regs[TCPC_REG_TRANSMIT].value,
-				want_tx_reg, "%d");
+			/* Don't validate the retry portion of reg */
+			TEST_EQ(tx_wo_retry, want_tx_reg, "0x%x");
 			if (ctrl_msg != 0) {
-				TEST_EQ(ctrl_msg, type, "%d");
+				TEST_EQ(ctrl_msg, type, "0x%x");
 				TEST_EQ(cnt, 0, "%d");
 			} else {
-				TEST_EQ(data_msg, type, "%d");
+				TEST_EQ(data_msg, type, "0x%x");
 				TEST_GE(cnt, 1, "%d");
 			}
 			tcpci_regs[TCPC_REG_TRANSMIT].value = 0;
@@ -172,6 +173,27 @@ int mock_tcpci_wait_for_transmit(enum tcpm_transmit_type tx_type,
 	return EC_ERROR_UNKNOWN;
 }
 
+int verify_tcpci_tx_retry_count(const uint8_t retry_count)
+{
+	uint64_t timeout = get_time().val + MOCK_WAIT_TIMEOUT;
+
+	TEST_EQ(tcpci_regs[TCPC_REG_TRANSMIT].value, 0, "%d");
+	while (get_time().val < timeout) {
+		if (tcpci_regs[TCPC_REG_TRANSMIT].value != 0) {
+			const uint16_t tx_retry = TCPC_REG_TRANSMIT_RETRY(
+				tcpci_regs[TCPC_REG_TRANSMIT].value);
+
+			TEST_EQ(tx_retry, retry_count, "%d");
+
+			tcpci_regs[TCPC_REG_TRANSMIT].value = 0;
+			return EC_SUCCESS;
+		}
+		task_wait_event(5 * MSEC);
+	}
+	TEST_ASSERT(0);
+	return EC_ERROR_UNKNOWN;
+}
+
 void mock_tcpci_receive(enum pd_msg_type sop, uint16_t header,
 			uint32_t *payload)
 {