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

Merge tag 'thunderbolt-for-v5.10-rc4' of... 

Merge tag 'thunderbolt-for-v5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fixes for v5.10-rc4

This includes two fixes for resource leaks that have been around for a
while. Then two fixes for code that was added during v5.10 merge window
and PCI IDs for Intel Tiger Lake-H.

All these have been in linux-next without reported issues.

* tag 'thunderbolt-for-v5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Add support for Intel Tiger Lake-H
  thunderbolt: Only configure USB4 wake for lane 0 adapters
  thunderbolt: Add uaccess dependency to debugfs interface
  thunderbolt: Fix memory leak if ida_simple_get() fails in enumerate_services()
  thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()
parents f8394f23 f6439c53

drivers/thunderbolt/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/debugfs.h>

#include <linux/pm_runtime.h>

#include <linux/uaccess.h>



#include "tb.h"

drivers/thunderbolt/icm.c

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


	case PCI_DEVICE_ID_INTEL_TGL_NHI0:

	case PCI_DEVICE_ID_INTEL_TGL_NHI1:

	case PCI_DEVICE_ID_INTEL_TGL_H_NHI0:

	case PCI_DEVICE_ID_INTEL_TGL_H_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

+19 −4
Original line number Diff line number Diff line
@@ -406,12 +406,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend) 


	ring->vector = ret;



	ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);

	if (ring->irq < 0)

		return ring->irq;

	ret = pci_irq_vector(ring->nhi->pdev, ring->vector);

	if (ret < 0)

		goto err_ida_remove;



	ring->irq = ret;



	irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;

	return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);

	ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);

	if (ret)

		goto err_ida_remove;



	return 0;



err_ida_remove:

	ida_simple_remove(&nhi->msix_ida, ring->vector);



	return ret;

}



static void ring_release_msix(struct tb_ring *ring)
@@ -1334,6 +1345,10 @@ static struct pci_device_id nhi_ids[] = { 
	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_NHI1),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_H_NHI0),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL_H_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
@@ -75,6 +75,8 @@ extern const struct tb_nhi_ops icl_nhi_ops; 
#define PCI_DEVICE_ID_INTEL_ICL_NHI0			0x8a17

#define PCI_DEVICE_ID_INTEL_TGL_NHI0			0x9a1b

#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_CLASS_SERIAL_USB_USB4			0x0c0340

drivers/thunderbolt/tb.h

+2 −0
Original line number Diff line number Diff line
@@ -784,6 +784,8 @@ static inline bool tb_switch_is_tiger_lake(const struct tb_switch *sw) 
		switch (sw->config.device_id) {

		case PCI_DEVICE_ID_INTEL_TGL_NHI0:

		case PCI_DEVICE_ID_INTEL_TGL_NHI1:

		case PCI_DEVICE_ID_INTEL_TGL_H_NHI0:

		case PCI_DEVICE_ID_INTEL_TGL_H_NHI1:

			return true;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE