usb_pd: Move USB4 functions to common file

Added a check for CONFIG_USB_PD_ALT_MODE_DFP in pd_send_enter_usb() and
added separate configs for USB4 DRD and USB3.2 DRD

BUG=b:148528713
BRANCH=none
TEST=Able to enter USB4 mode with following passive cables -
     a. Rev 3 USB3.2 Gen 1, USB3.2 Gen 2 and USB4 Gen 3
     b. Rev 2 USB3.1 Gen1/Gen2

Change-Id: I80c9b7569429bc54db08d78b5a6eee16780d6fe1
Signed-off-by: Ayushee <ayushee.shah@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2051631
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>

5 files changed, 90 insertions, 78 deletions

diff --git a/common/usb_pd_alt_mode_dfp.c b/common/usb_pd_alt_mode_dfp.c
index 42b21a6fa8..9fc6dfc5aa 100644
--- a/common/usb_pd_alt_mode_dfp.c
+++ b/common/usb_pd_alt_mode_dfp.c
@@ -881,6 +881,23 @@ __overridable enum tbt_compat_cable_speed board_get_max_tbt_speed(int port)
  * ############################################################################
  */
 
+bool is_usb4_vdo(int port, int cnt, uint32_t *payload)
+{
+	enum idh_ptype ptype = PD_IDH_PTYPE(payload[VDO_I(IDH)]);
+
+	if (IS_PD_IDH_UFP_PTYPE(ptype)) {
+		/*
+		 * Ref: USB Type-C Cable and Connector Specification
+		 * Figure 5-1 USB4 Discovery and Entry Flow Model
+		 * Device USB4 VDO detection.
+		 */
+		return IS_ENABLED(CONFIG_USB_PD_USB4) &&
+			is_vdo_present(cnt, VDO_INDEX_PTYPE_UFP1_VDO) &&
+			PD_PRODUCT_IS_USB4(payload[VDO_INDEX_PTYPE_UFP1_VDO]);
+	}
+	return false;
+}
+
 /*
  * For Cable rev 3.0: USB4 cable speed is set according to speed supported by
  * the port and the response received from the cable, whichever is least.
@@ -924,6 +941,58 @@ enum usb_rev30_ss get_usb4_cable_speed(int port)
 		USB_R30_SS_U40_GEN3 : USB_R30_SS_U32_U40_GEN2;
 }
 
+uint32_t get_enter_usb_msg_payload(int port)
+{
+	/*
+	 * Ref: USB Power Delivery Specification Revision 3.0, Version 2.0
+	 * Table 6-47 Enter_USB Data Object
+	 */
+	union enter_usb_data_obj eudo;
+	struct pd_cable *cable;
+
+	if (!IS_ENABLED(CONFIG_USB_PD_USB4))
+		return 0;
+
+	cable = pd_get_cable_attributes(port);
+	eudo.mode = USB_PD_40;
+	eudo.usb4_drd_cap = IS_ENABLED(CONFIG_USB_PD_USB4_DRD);
+	eudo.usb3_drd_cap = IS_ENABLED(CONFIG_USB_PD_USB32_DRD);
+	eudo.cable_speed = get_usb4_cable_speed(port);
+
+	if ((cable->rev == PD_REV30) &&
+	    (get_usb_pd_cable_type(port) == IDH_PTYPE_ACABLE)) {
+		eudo.cable_type = (cable->attr2.a2_rev30.active_elem ==
+			ACTIVE_RETIMER) ? CABLE_TYPE_ACTIVE_RETIMER :
+			CABLE_TYPE_ACTIVE_REDRIVER;
+	/* TODO: Add eudo.cable_type for Revisiosn 2 active cables */
+	} else {
+		eudo.cable_type = CABLE_TYPE_PASSIVE;
+	}
+
+	switch (cable[port].attr.p_rev20.vbus_cur) {
+	case USB_VBUS_CUR_3A:
+		eudo.cable_current = USB4_CABLE_CURRENT_3A;
+		break;
+	case USB_VBUS_CUR_5A:
+		eudo.cable_current = USB4_CABLE_CURRENT_5A;
+		break;
+	default:
+		eudo.cable_current = USB4_CABLE_CURRENT_INVALID;
+		break;
+	}
+	eudo.pcie_supported = IS_ENABLED(CONFIG_USB_PD_PCIE_TUNNELING);
+	eudo.dp_supported = IS_ENABLED(CONFIG_USB_PD_ALT_MODE_DFP);
+	eudo.tbt_supported = IS_ENABLED(CONFIG_USB_PD_TBT_COMPAT_MODE);
+	eudo.host_present = 1;
+
+	return eudo.raw_value;
+}
+
+__overridable bool board_is_tbt_usb4_port(int port)
+{
+	return true;
+}
+
 __overridable void svdm_safe_dp_mode(int port)
 {
 	/* make DP interface safe until configure */
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 8a92ac879f..b8ca3d53ab 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -217,51 +217,6 @@ enum tbt_compat_rounded_support get_tbt_rounded_support(int port)
 	return cable[port].cable_mode_resp.tbt_rounded;
 }
 
-uint32_t get_enter_usb_msg_payload(int port)
-{
-	/*
-	 * Ref: USB Power Delivery Specification Revision 3.0, Version 2.0
-	 * Table 6-47 Enter_USB Data Object
-	 */
-	union enter_usb_data_obj eudo;
-
-	if (!IS_ENABLED(CONFIG_USB_PD_USB4))
-		return 0;
-
-	eudo.mode = USB_PD_40;
-	eudo.usb4_drd_cap = IS_ENABLED(CONFIG_USB_PD_USB4);
-	eudo.usb3_drd_cap = IS_ENABLED(CONFIG_USB_PD_USB32);
-	eudo.cable_speed = get_usb4_cable_speed(port);
-
-	if ((cable[port].rev == PD_REV30) &&
-	    (get_usb_pd_cable_type(port) == IDH_PTYPE_ACABLE)) {
-		eudo.cable_type = (cable[port].attr2.a2_rev30.active_elem ==
-			ACTIVE_RETIMER) ? CABLE_TYPE_ACTIVE_RETIMER :
-			CABLE_TYPE_ACTIVE_REDRIVER;
-	/* TODO: Add eudo.cable_type for Revisiosn 2 active cables */
-	} else {
-		eudo.cable_type = CABLE_TYPE_PASSIVE;
-	}
-
-	switch (cable[port].attr.p_rev20.vbus_cur) {
-	case USB_VBUS_CUR_3A:
-		eudo.cable_current = USB4_CABLE_CURRENT_3A;
-		break;
-	case USB_VBUS_CUR_5A:
-		eudo.cable_current = USB4_CABLE_CURRENT_5A;
-		break;
-	default:
-		eudo.cable_current = USB4_CABLE_CURRENT_INVALID;
-		break;
-	}
-	eudo.pcie_supported = IS_ENABLED(CONFIG_USB_PD_PCIE_TUNNELING);
-	eudo.dp_supported = IS_ENABLED(CONFIG_USB_PD_ALT_MODE_DFP);
-	eudo.tbt_supported = IS_ENABLED(CONFIG_USB_PD_TBT_COMPAT_MODE);
-	eudo.host_present = 1;
-
-	return eudo.raw_value;
-}
-
 bool should_enter_usb4_mode(int port)
 {
 	return IS_ENABLED(CONFIG_USB_PD_USB4) &&
@@ -419,23 +374,6 @@ static bool is_cable_ready_to_enter_usb4(int port, int cnt)
 	return false;
 }
 
-static bool is_usb4_vdo(int port, int cnt, uint32_t *payload)
-{
-	enum idh_ptype ptype = PD_IDH_PTYPE(payload[VDO_I(IDH)]);
-
-	if (IS_PD_IDH_UFP_PTYPE(ptype)) {
-		/*
-		 * Ref: USB Type-C Cable and Connector Specification
-		 * Figure 5-1 USB4 Discovery and Entry Flow Model
-		 * Device USB4 VDO detection.
-		 */
-		return IS_ENABLED(CONFIG_USB_PD_USB4) &&
-			is_vdo_present(cnt, VDO_INDEX_PTYPE_UFP1_VDO) &&
-			PD_PRODUCT_IS_USB4(payload[VDO_INDEX_PTYPE_UFP1_VDO]);
-	}
-	return false;
-}
-
 void pd_dfp_discovery_init(int port)
 {
 	memset(&discovery[port], 0, sizeof(struct pd_discovery));
@@ -472,11 +410,6 @@ struct pd_cable *pd_get_cable_attributes(int port)
 	return &cable[port];
 }
 
-__overridable bool board_is_tbt_usb4_port(int port)
-{
-	return true;
-}
-
 static enum tcpm_transmit_type get_tcpm_transmit_msg_type(int port)
 {
 	if (is_transmit_msg_sop_prime(port))
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 81f796c246..032e559199 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -2810,7 +2810,7 @@ void pd_interrupt_handler_task(void *p)
 
 static void pd_send_enter_usb(int port, int *timeout)
 {
-	uint32_t usb4_payload = get_enter_usb_msg_payload(port);
+	uint32_t usb4_payload;
 	uint16_t header;
 	int res;
 
@@ -2818,9 +2818,13 @@ static void pd_send_enter_usb(int port, int *timeout)
 	 * TODO: Enable Enter USB for cables (SOP').
 	 * This is needed for active cables
 	 */
-	if (!IS_ENABLED(CONFIG_USBC_SS_MUX) || !IS_ENABLED(CONFIG_USB_PD_USB4))
+	if (!IS_ENABLED(CONFIG_USBC_SS_MUX) ||
+	    !IS_ENABLED(CONFIG_USB_PD_USB4) ||
+	    !IS_ENABLED(CONFIG_USB_PD_ALT_MODE_DFP))
 		return;
 
+	usb4_payload = get_enter_usb_msg_payload(port);
+
 	header = PD_HEADER(PD_DATA_ENTER_USB,
 		pd[port].power_role,
 		pd[port].data_role,
diff --git a/include/config.h b/include/config.h
index bd86cae579..a593956d58 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3891,8 +3891,11 @@
 /* Enable to enter into USB4 mode between two port partners */
 #undef CONFIG_USB_PD_USB4
 
-/* Enable if the board supports USB3.2 devices */
-#undef CONFIG_USB_PD_USB32
+/* Enable if port is cable of operating as an USB4 device */
+#undef CONFIG_USB_PD_USB4_DRD
+
+/* Enable if port is cable of operating as an USB3.2 device */
+#undef CONFIG_USB_PD_USB32_DRD
 
 /* Enable if the board is Thunderbolt Gen 3 capable */
 #undef CONFIG_USB_PD_TBT_GEN3_CAPABLE
@@ -5142,13 +5145,6 @@
 #endif /* CONFIG_USB_PD_TBT_COMPAT_MODE */
 
 /*****************************************************************************/
-/*
- * The board is Gen3 compatible and supports USB3.2 devices if it supports
- * USB4 mode.
- */
-#ifdef CONFIG_USB_PD_USB4
-#define CONFIG_USB_PD_USB32
-#endif /* CONFIG_USB_PD_USB4 */
 
 /*
  * Apply fuzzer and test config overrides last, since fuzzers and tests need to
diff --git a/include/usb_pd.h b/include/usb_pd.h
index 6765a44abb..49998097c1 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -1996,6 +1996,16 @@ void dfp_consume_cable_response(int port, int cnt, uint32_t *payload,
 enum usb_rev30_ss get_usb4_cable_speed(int port);
 
 /**
+ * Check if attached device has USB4 VDO
+ *
+ * @param port      USB-C port number
+ * @param cnt       number of data objects in payload
+ * @param payload   payload data
+ * @return          True if device has USB4 VDO
+ */
+bool is_usb4_vdo(int port, int cnt, uint32_t *payload);
+
+/**
  * Return enter USB message payload
  *
  * @param port	USB-C port number