usb: typec: intel_pmc_mux: Configure Displayport Alternate mode 2.1

Mux agent driver can configure cable details such as cable type and
cable speed received as a part of displayport configuration to support
Displayport Alternate mode 2.1.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Utkarsh Patel <utkarsh.h.patel@intel.com>
Link: https://lore.kernel.org/r/20230920023243.2494410-6-utkarsh.h.patel@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
index 12a4f49e870e83d9c48982f5ffa5e4c7276370a9..56989a0d0f43e0476fdc6a31f87c0e2c025fff29 100644 (file)
--- a/drivers/usb/typec/mux/intel_pmc_mux.c
+++ b/drivers/usb/typec/mux/intel_pmc_mux.c
@@ -191,6 +191,12 @@ static int hsl_orientation(struct pmc_usb_port *port)
        return port->orientation - 1;
 }
 
+static bool is_pmc_mux_tbt(struct acpi_device *adev)
+{
+       return acpi_dev_hid_uid_match(adev, "INTC1072", NULL) ||
+              acpi_dev_hid_uid_match(adev, "INTC1079", NULL);
+}
+
 static int pmc_usb_send_command(struct intel_scu_ipc_dev *ipc, u8 *msg, u32 len)
 {
        u8 response[4];
@@ -293,6 +299,24 @@ pmc_usb_mux_dp(struct pmc_usb_port *port, struct typec_mux_state *state)
        req.mode_data |= (state->mode - TYPEC_STATE_MODAL) <<
                         PMC_USB_ALTMODE_DP_MODE_SHIFT;
 
+       if (!is_pmc_mux_tbt(port->pmc->iom_adev)) {
+               u8 cable_speed = (data->conf & DP_CONF_SIGNALLING_MASK) >>
+                                 DP_CONF_SIGNALLING_SHIFT;
+
+               u8 cable_type = (data->conf & DP_CONF_CABLE_TYPE_MASK) >>
+                                DP_CONF_CABLE_TYPE_SHIFT;
+
+               req.mode_data |= PMC_USB_ALTMODE_CABLE_SPD(cable_speed);
+
+               if (cable_type == DP_CONF_CABLE_TYPE_OPTICAL)
+                       req.mode_data |= PMC_USB_ALTMODE_CABLE_TYPE;
+               else if (cable_type == DP_CONF_CABLE_TYPE_RE_TIMER)
+                       req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE |
+                                        PMC_USB_ALTMODE_RETIMER_CABLE;
+               else if (cable_type == DP_CONF_CABLE_TYPE_RE_DRIVER)
+                       req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE;
+       }
+
        ret = pmc_usb_command(port, (void *)&req, sizeof(req));
        if (ret)
                return ret;