Commit 281b3ec3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB and Thunderbolt fixes from Greg KH:
 "Here are some small Thunderbolt and USB driver fixes for 5.10-rc4 to
  solve some reported issues.

  Nothing huge in here, just small things:

   - thunderbolt memory leaks fixed and new device ids added

   - revert of problem patch for the musb driver

   - new quirks added for USB devices

   - typec power supply fixes to resolve much reported problems about
     charging notifications not working anymore

  All except the cdc-acm driver quirk addition have been in linux-next
  with no reported issues (the quirk patch was applied on Friday, and is
  self-contained)"

* tag 'usb-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: cdc-acm: Add DISABLE_ECHO for Renesas USB Download mode
  MAINTAINERS: add usb raw gadget entry
  usb: typec: ucsi: Report power supply changes
  xhci: hisilicon: fix refercence leak in xhci_histb_probe
  Revert "usb: musb: convert to devm_platform_ioremap_resource_byname"
  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 0062442e 6d853c9e

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -18173,6 +18173,14 @@ L: linux-usb@vger.kernel.org 
S:	Supported

F:	drivers/usb/class/usblp.c













USB RAW GADGET DRIVER













R:	Andrey Konovalov <andreyknvl@gmail.com>













L:	linux-usb@vger.kernel.org













S:	Maintained













F:	Documentation/usb/raw-gadget.rst













F:	drivers/usb/gadget/legacy/raw_gadget.c













F:	include/uapi/linux/usb/raw_gadget.h



























USB QMI WWAN NETWORK DRIVER















M:	Bjørn Mork <bjorn@mork.no>















L:	netdev@vger.kernel.org

























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

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE