Commit 849f3542 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.20-rc1' of... 

Merge tag 'thunderbolt-for-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Changes for v5.20 merge window

This includes following Thunderbolt/USB4 changes for the v5.20 merge
window:

  * Enable CL1 low power link state
  * Add support for Intel Raptor Lake Thunderbolt/USB4 controller
  * A couple of typos fixed.

All these have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix typo in comment
  thunderbolt: Add support for Intel Raptor Lake
  thunderbolt: Fix some kernel-doc comments
  thunderbolt: Change TMU mode to HiFi uni-directional once DisplayPort tunneled
  thunderbolt: Add CL1 support for USB4 and Titan Ridge routers
  thunderbolt: Change downstream router's TMU rate in both TMU uni/bidir mode
  thunderbolt: Fix typos in CLx enabling
  thunderbolt: CLx disable before system suspend only if previously enabled
  thunderbolt: Silently ignore CLx enabling in case CLx is not supported
parents ebc4969a 34b9715b

drivers/thunderbolt/ctl.c

+3 −3
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ void tb_ctl_free(struct tb_ctl *ctl) 
}



/**

 * tb_cfg_start() - start/resume the control channel

 * tb_ctl_start() - start/resume the control channel

 * @ctl: Control channel to start

 */

void tb_ctl_start(struct tb_ctl *ctl)
@@ -710,7 +710,7 @@ void tb_ctl_start(struct tb_ctl *ctl) 
}



/**

 * tb_ctrl_stop() - pause the control channel

 * tb_ctl_stop() - pause the control channel

 * @ctl: Control channel to stop

 *

 * All invocations of ctl->callback will have finished after this method
@@ -912,7 +912,7 @@ struct tb_cfg_result tb_cfg_read_raw(struct tb_ctl *ctl, void *buffer, 
}



/**

 * tb_cfg_write() - write from buffer into config space

 * tb_cfg_write_raw() - write from buffer into config space

 * @ctl: Pointer to the control channel

 * @buffer: Data to write

 * @route: Route string of the router

drivers/thunderbolt/ctl.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct tb_cfg_result { 
			    * If err = 1 then this is the port that send the

			    * error.

			    * If err = 0 and if this was a cfg_read/write then

			    * this is the the upstream port of the responding

			    * this is the upstream port of the responding

			    * switch.

			    * Otherwise the field is set to zero.

			    */

drivers/thunderbolt/icm.c

+2 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,8 @@ struct tb *icm_probe(struct tb_nhi *nhi) 
	case PCI_DEVICE_ID_INTEL_TGL_H_NHI1:

	case PCI_DEVICE_ID_INTEL_ADL_NHI0:

	case PCI_DEVICE_ID_INTEL_ADL_NHI1:

	case PCI_DEVICE_ID_INTEL_RPL_NHI0:

	case PCI_DEVICE_ID_INTEL_RPL_NHI1:

		icm->is_supported = icm_tgl_is_supported;

		icm->driver_ready = icm_icl_driver_ready;

		icm->set_uuid = icm_icl_set_uuid;

drivers/thunderbolt/nhi.c

+4 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,10 @@ static struct pci_device_id nhi_ids[] = { 
	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADL_NHI1),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPL_NHI0),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPL_NHI1),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },



	/* Any USB4 compliant host */

	{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_USB4, ~0) },

drivers/thunderbolt/nhi.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ extern const struct tb_nhi_ops icl_nhi_ops; 
#define PCI_DEVICE_ID_INTEL_TGL_NHI1			0x9a1d

#define PCI_DEVICE_ID_INTEL_TGL_H_NHI0			0x9a1f

#define PCI_DEVICE_ID_INTEL_TGL_H_NHI1			0x9a21

#define PCI_DEVICE_ID_INTEL_RPL_NHI0			0xa73e

#define PCI_DEVICE_ID_INTEL_RPL_NHI1			0xa76d



#define PCI_CLASS_SERIAL_USB_USB4			0x0c0340