tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

usb: typec: intel_pmc_mux: Configure Active and Retimer Cable type

Cable type such as active and retimer received as a part of Thunderbolt3
or Thunderbolt4 cable discover mode VDO needs to be configured in the
thunderbolt alternate mode.

Configuring the register bits for this cable type is changed with Intel
Meteor Lake platform. BIT2 for Retimer/Redriver cable and BIT22 for
Active/Passive cable.

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/20230718024703.1013367-3-utkarsh.h.patel@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Utkarsh Patel and committed by
Greg Kroah-Hartman 8405bc52 451054c3

+24 -4
+24 -4
drivers/usb/typec/mux/intel_pmc_mux.c
··· 59 59 }; 60 60 61 61 /* Common Mode Data bits */ 62 - #define PMC_USB_ALTMODE_ACTIVE_CABLE BIT(2) 62 + #define PMC_USB_ALTMODE_RETIMER_CABLE BIT(2) 63 63 64 64 #define PMC_USB_ALTMODE_ORI_SHIFT 1 65 65 #define PMC_USB_ALTMODE_UFP_SHIFT 3 ··· 71 71 #define PMC_USB_ALTMODE_TBT_TYPE BIT(17) 72 72 #define PMC_USB_ALTMODE_CABLE_TYPE BIT(18) 73 73 #define PMC_USB_ALTMODE_ACTIVE_LINK BIT(20) 74 + #define PMC_USB_ALTMODE_ACTIVE_CABLE BIT(22) 74 75 #define PMC_USB_ALTMODE_FORCE_LSR BIT(23) 75 76 #define PMC_USB_ALTMODE_CABLE_SPD(_s_) (((_s_) & GENMASK(2, 0)) << 25) 76 77 #define PMC_USB_ALTMODE_CABLE_USB31 1 ··· 331 330 if (data->cable_mode & TBT_CABLE_LINK_TRAINING) 332 331 req.mode_data |= PMC_USB_ALTMODE_ACTIVE_LINK; 333 332 334 - if (data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) 335 - req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; 333 + if (acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || 334 + acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) { 335 + if ((data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) || 336 + (data->cable_mode & TBT_CABLE_RETIMER)) 337 + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; 338 + } else { 339 + if (data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) 340 + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; 341 + 342 + if (data->cable_mode & TBT_CABLE_RETIMER) 343 + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; 344 + } 336 345 337 346 req.mode_data |= PMC_USB_ALTMODE_CABLE_SPD(cable_speed); 338 347 ··· 381 370 case EUDO_CABLE_TYPE_OPTICAL: 382 371 req.mode_data |= PMC_USB_ALTMODE_CABLE_TYPE; 383 372 fallthrough; 373 + case EUDO_CABLE_TYPE_RE_TIMER: 374 + if (!acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || 375 + !acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) 376 + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; 377 + fallthrough; 384 378 default: 385 - req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; 379 + if (acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || 380 + acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) 381 + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; 382 + else 383 + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; 386 384 387 385 /* Configure data rate to rounded in the case of Active TBT3 388 386 * and USB4 cables.