OSDN Git Service

platform/chrome: cros_ec_typec: Configure Retimer cable type
authorUtkarsh Patel <utkarsh.h.patel@intel.com>
Tue, 18 Jul 2023 02:47:02 +0000 (19:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Aug 2023 09:11:07 +0000 (11:11 +0200)
Connector class driver only configure cable type active or passive.
Configure if the cable type is retimer or redriver with this change.
This detail will be provided as a part of cable discover mode VDO.

Signed-off-by: Utkarsh Patel <utkarsh.h.patel@intel.com>
Acked-by: Prashant Malani <pmalani@chromium.org>
Link: https://lore.kernel.org/r/20230718024703.1013367-2-utkarsh.h.patel@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/chrome/cros_ec_typec.c

index 25f9767..d0b4d3f 100644 (file)
@@ -406,6 +406,27 @@ static int cros_typec_usb_safe_state(struct cros_typec_port *port)
        return ret;
 }
 
+/**
+ * cros_typec_get_cable_vdo() - Get Cable VDO of the connected cable
+ * @port: Type-C port data
+ * @svid: Standard or Vendor ID to match
+ *
+ * Returns the Cable VDO if match is found and returns 0 if match is not found.
+ */
+static int cros_typec_get_cable_vdo(struct cros_typec_port *port, u16 svid)
+{
+       struct list_head *head = &port->plug_mode_list;
+       struct cros_typec_altmode_node *node;
+       u32 ret = 0;
+
+       list_for_each_entry(node, head, list) {
+               if (node->amode->svid == svid)
+                       return node->amode->vdo;
+       }
+
+       return ret;
+}
+
 /*
  * Spoof the VDOs that were likely communicated by the partner for TBT alt
  * mode.
@@ -432,6 +453,9 @@ static int cros_typec_enable_tbt(struct cros_typec_data *typec,
 
        /* Cable Discover Mode VDO */
        data.cable_mode = TBT_MODE;
+
+       data.cable_mode |= cros_typec_get_cable_vdo(port, USB_TYPEC_TBT_SID);
+
        data.cable_mode |= TBT_SET_CABLE_SPEED(pd_ctrl->cable_speed);
 
        if (pd_ctrl->control_flags & USB_PD_CTRL_OPTICAL_CABLE)
@@ -522,8 +546,10 @@ static int cros_typec_enable_usb4(struct cros_typec_data *typec,
        /* Cable Type */
        if (pd_ctrl->control_flags & USB_PD_CTRL_OPTICAL_CABLE)
                data.eudo |= EUDO_CABLE_TYPE_OPTICAL << EUDO_CABLE_TYPE_SHIFT;
-       else if (pd_ctrl->control_flags & USB_PD_CTRL_ACTIVE_CABLE)
+       else if (cros_typec_get_cable_vdo(port, USB_TYPEC_TBT_SID) & TBT_CABLE_RETIMER)
                data.eudo |= EUDO_CABLE_TYPE_RE_TIMER << EUDO_CABLE_TYPE_SHIFT;
+       else if (pd_ctrl->control_flags & USB_PD_CTRL_ACTIVE_CABLE)
+               data.eudo |= EUDO_CABLE_TYPE_RE_DRIVER << EUDO_CABLE_TYPE_SHIFT;
 
        data.active_link_training = !!(pd_ctrl->control_flags &
                                       USB_PD_CTRL_ACTIVE_LINK_UNIDIR);