usb: typec: intel_pmc_mux: Do not configure SBU and HSL Orientation in Alternate modes (7c6bbdf0) · Commits · 戴 / test

According to the PMC Type C Subsystem (TCSS) Mux programming guide rev 0.7, bits 4 and 5 are reserved in Alternate modes. SBU Orientation and HSL Orientation needs to be configured only during initial cable detection in USB connect flow based on device property of "sbu-orientation" and "hsl-orientation". Configuring these reserved bits in the Alternate modes may result in delay in display link training or some unexpected behaviour. So do not configure them while issuing Alternate Mode requests. Fixes: ("usb: typec: mux: intel_pmc_mux: Support for static SBU/HSL orientation") Signed-off-by:

Utkarsh Patel <utkarsh.h.patel@intel.com> Cc: stable <stable@vger.kernel.org> Signed-off-by:

Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20200907142152.35678-3-heikki.krogerus@linux.intel.com Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/typec/mux/intel_pmc_mux.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@ enum {

		#define PMC_USB_ALTMODE_ORI_SHIFT 1
		#define PMC_USB_ALTMODE_UFP_SHIFT 3
		#define PMC_USB_ALTMODE_ORI_AUX_SHIFT 4
		#define PMC_USB_ALTMODE_ORI_HSL_SHIFT 5

		/* DP specific Mode Data bits */
		#define PMC_USB_ALTMODE_DP_MODE_SHIFT 8
		@@ -178,9 +176,6 @@ pmc_usb_mux_dp(struct pmc_usb_port port, struct typec_mux_state state)
		req.mode_data = (port->orientation - 1) << PMC_USB_ALTMODE_ORI_SHIFT;
		req.mode_data \|= (port->role - 1) << PMC_USB_ALTMODE_UFP_SHIFT;

		req.mode_data \|= sbu_orientation(port) << PMC_USB_ALTMODE_ORI_AUX_SHIFT;
		req.mode_data \|= hsl_orientation(port) << PMC_USB_ALTMODE_ORI_HSL_SHIFT;

		req.mode_data \|= (state->mode - TYPEC_STATE_MODAL) <<
		PMC_USB_ALTMODE_DP_MODE_SHIFT;

		@@ -208,9 +203,6 @@ pmc_usb_mux_tbt(struct pmc_usb_port port, struct typec_mux_state state)
		req.mode_data = (port->orientation - 1) << PMC_USB_ALTMODE_ORI_SHIFT;
		req.mode_data \|= (port->role - 1) << PMC_USB_ALTMODE_UFP_SHIFT;

		req.mode_data \|= sbu_orientation(port) << PMC_USB_ALTMODE_ORI_AUX_SHIFT;
		req.mode_data \|= hsl_orientation(port) << PMC_USB_ALTMODE_ORI_HSL_SHIFT;

		if (TBT_ADAPTER(data->device_mode) == TBT_ADAPTER_TBT3)
		req.mode_data \|= PMC_USB_ALTMODE_TBT_TYPE;

Admin message