tcpmv2: move function from TC layer to PE

- Move pd_ function that belong in PE layer to PE layer. Remove the extra
pe_ layer.
- Remove unnecessary PE and Vconn ifdef guards in TC layer
- Remove unused print_dev_info function
- Move host commands in TC layer to host command file
- Move RW hash stuff from TC to PE, since this only has to do with VDO
(Which is a PE layer thing)
- Removed dependency for tc_drp test on usbc_fake as we don't really
need it anymore once we don't pull in the PRL and PE layers anymore
(based on previously landed CLs)

BRANCH=none
BUG=b:153071799
TEST=everything still builds and passes tests

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

5 files changed, 34 insertions, 16 deletions

diff --git a/test/build.mk b/test/build.mk
index aff698f125..2c7bc455f7 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -170,7 +170,7 @@ usb_sm_framework_h0-y=usb_sm_framework_h3.o
 usb_typec_vpd-y=usb_typec_ctvpd.o vpd_api.o usb_sm_checks.o fake_usbc.o
 usb_typec_ctvpd-y=usb_typec_ctvpd.o vpd_api.o usb_sm_checks.o fake_usbc.o
 usb_typec_drp_acc_trysrc-y=usb_typec_drp_acc_trysrc.o vpd_api.o \
-	usb_sm_checks.o fake_usbc.o
+	usb_sm_checks.o
 usb_prl-y=usb_prl.o usb_sm_checks.o fake_usbc.o
 usb_pe_drp-y=usb_pe_drp.o usb_sm_checks.o \
 	fake_battery.o fake_prl.o fake_usbc.o
diff --git a/test/fake_usbc.c b/test/fake_usbc.c
index a096652020..e62fa5ac62 100644
--- a/test/fake_usbc.c
+++ b/test/fake_usbc.c
@@ -130,22 +130,11 @@ __overridable void pe_invalidate_explicit_contract(int port)
 {
 }
 
-int pd_dev_store_rw_hash(int port, uint16_t dev_id, uint32_t *rw_hash,
-			 uint32_t ec_image)
-{
-	return 0;
-}
-
 enum pd_dual_role_states pd_get_dual_role(int port)
 {
 	return PD_DRP_TOGGLE_ON;
 }
 
-void pd_dev_get_rw_hash(int port, uint16_t *dev_id, uint8_t *rw_hash,
-			uint32_t *current_image)
-{
-}
-
 int pd_comm_is_enabled(int port)
 {
 	return 0;
diff --git a/test/test_config.h b/test/test_config.h
index 626cacccc5..cefaf55974 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -316,6 +316,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #define CONFIG_USB_PD_TCPMV2
 #undef CONFIG_USB_PE_SM
 #undef CONFIG_USB_TYPEC_SM
+#undef CONFIG_USB_PD_HOST_CMD
 #define CONFIG_USB_PRL_SM
 #define CONFIG_USB_PD_TCPC
 #define CONFIG_USB_PD_TCPM_STUB
@@ -336,6 +337,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #define CONFIG_USBC_VCONN
 #define PD_VCONN_SWAP_DELAY 5000 /* us */
 #define CONFIG_USB_PD_DISCHARGE_GPIO
+#undef CONFIG_USB_PD_HOST_CMD
 #endif
 
 /* Common TypeC tests defines */
@@ -361,6 +363,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #define CONFIG_USB_PD_TCPM_STUB
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_SW_CRC
+#undef CONFIG_USB_PD_HOST_CMD
 #endif /* Common TypeC test defines */
 
 #ifdef TEST_USB_TYPEC_VPD
@@ -383,6 +386,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
 #define CONFIG_USB_POWER_DELIVERY
 #undef CONFIG_USB_PRL_SM
 #undef CONFIG_USB_PE_SM
+#undef CONFIG_USB_PD_HOST_CMD
 #endif
 
 #ifdef TEST_USB_PD_INT
diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp.c
index f757adf8ec..2bd05047ad 100644
--- a/test/usb_pe_drp.c
+++ b/test/usb_pe_drp.c
@@ -68,7 +68,7 @@ static int test_pe_frs(void)
 	/*
 	 * Trigger the Fast Role Switch from simulated ISR
 	 */
-	pe_got_frs_signal(PORT0);
+	pd_got_frs_signal(PORT0);
 	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_SIGNALED));
 
 	/*
diff --git a/test/usb_typec_drp_acc_trysrc.c b/test/usb_typec_drp_acc_trysrc.c
index 6957cb6093..5711334a1b 100644
--- a/test/usb_typec_drp_acc_trysrc.c
+++ b/test/usb_typec_drp_acc_trysrc.c
@@ -17,6 +17,29 @@
 
 #define PORT0 0
 
+/* TODO(b/153071799): Move these pd_* and pe_* function into mock */
+__overridable void pd_request_power_swap(int port)
+{}
+
+uint8_t pd_get_src_cap_cnt(int port)
+{
+	return 0;
+}
+
+const uint32_t * const pd_get_src_caps(int port)
+{
+	return NULL;
+}
+
+void pd_set_src_caps(int port, int cnt, uint32_t *src_caps)
+{
+}
+
+__overridable void pe_invalidate_explicit_contract(int port)
+{
+}
+/* End pd_ mock section */
+
 /* Install Mock TCPC and MUX drivers */
 const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
 	{
@@ -81,9 +104,11 @@ __maybe_unused static int test_mux_con_dis_as_snk(void)
 	/* This wait will go through AttachWait.SNK to Attached.SNK */
 	task_wait_event(5 * SECOND);
 
-	/* We are in Attached.SNK now */
-	TEST_EQ(mock_usb_mux.state, USB_PD_MUX_USB_ENABLED, "%d");
-	TEST_EQ(mock_usb_mux.num_set_calls, 1, "%d");
+	/*
+	 * We are in Attached.SNK now, but the port partner isn't data capable
+	 * so we should not connect the USB data mux.
+	 */
+	TEST_EQ(mock_usb_mux.state, USB_PD_MUX_NONE, "%d");
 
 	mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
 	mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;