Commit 5d324e51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB/Thunderbolt fixes from Greg KH:
 "Here are some last-minutes USB and Thunderbolt driver fixes and new
  device ids for 6.18-rc8. Included in here are:

   - usb storage quirk fixup

   - xhci driver fixes for reported issues

   - usb gadget driver fixes

   - dwc3 driver fixes

   - UAS driver fixup

   - thunderbolt new device ids

   - usb-serial driver new ids

  All of these have been in linux-next with no reported issues, many for
  many weeks"

* tag 'usb-6.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (21 commits)
  usb: gadget: renesas_usbf: Handle devm_pm_runtime_enable() errors
  USB: storage: Remove subclass and protocol overrides from Novatek quirk
  usb: uas: fix urb unmapping issue when the uas device is remove during ongoing data transfer
  usb: dwc3: Fix race condition between concurrent dwc3_remove_requests() call paths
  xhci: dbgtty: fix device unregister
  usb: storage: sddr55: Reject out-of-bound new_pba
  USB: serial: option: add support for Rolling RW101R-GL
  usb: typec: ucsi: psy: Set max current to zero when disconnected
  usb: gadget: f_eem: Fix memory leak in eem_unwrap
  usb: dwc3: pci: Sort out the Intel device IDs
  usb: dwc3: pci: add support for the Intel Nova Lake -S
  drivers/usb/dwc3: fix PCI parent check
  usb: storage: Fix memory leak in USB bulk transport
  xhci: sideband: Fix race condition in sideband unregister
  xhci: dbgtty: Fix data corruption when transmitting data form DbC to host
  xhci: fix stale flag preventig URBs after link state error is cleared
  USB: serial: ftdi_sio: add support for u-blox EVK-M101
  usb: cdns3: Fix double resource release in cdns3_pci_probe
  usb: gadget: udc: fix use-after-free in usb_gadget_state_work
  usb: renesas_usbhs: Fix synchronous external abort on unbind
  ...
parents 24a84ea4 74851fbb

drivers/thunderbolt/nhi.c

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

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_PTL_P_NHI1),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_WCL_NHI0),

	  .driver_data = (kernel_ulong_t)&icl_nhi_ops },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BARLOW_RIDGE_HOST_80G_NHI) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BARLOW_RIDGE_HOST_40G_NHI) },

drivers/thunderbolt/nhi.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ extern const struct tb_nhi_ops icl_nhi_ops; 
#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_BRIDGE	0x15ef

#define PCI_DEVICE_ID_INTEL_ADL_NHI0			0x463e

#define PCI_DEVICE_ID_INTEL_ADL_NHI1			0x466d

#define PCI_DEVICE_ID_INTEL_WCL_NHI0			0x4d33

#define PCI_DEVICE_ID_INTEL_BARLOW_RIDGE_HOST_80G_NHI	0x5781

#define PCI_DEVICE_ID_INTEL_BARLOW_RIDGE_HOST_40G_NHI	0x5784

#define PCI_DEVICE_ID_INTEL_BARLOW_RIDGE_HUB_80G_BRIDGE 0x5786

drivers/usb/cdns3/cdns3-pci-wrap.c

+1 −4
Original line number Diff line number Diff line
@@ -98,11 +98,9 @@ static int cdns3_pci_probe(struct pci_dev *pdev, 
		wrap = pci_get_drvdata(func);

	} else {

		wrap = kzalloc(sizeof(*wrap), GFP_KERNEL);

		if (!wrap) {

			pci_disable_device(pdev);

		if (!wrap)

			return -ENOMEM;

	}

	}



	res = wrap->dev_res;
@@ -160,7 +158,6 @@ static int cdns3_pci_probe(struct pci_dev *pdev, 
		/* register platform device */

		wrap->plat_dev = platform_device_register_full(&plat_info);

		if (IS_ERR(wrap->plat_dev)) {

			pci_disable_device(pdev);

			err = PTR_ERR(wrap->plat_dev);

			kfree(wrap);

			return err;

drivers/usb/dwc3/core.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/of.h>

#include <linux/of_graph.h>

#include <linux/acpi.h>

#include <linux/pci.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/devinfo.h>

#include <linux/reset.h>
@@ -2241,7 +2242,7 @@ int dwc3_core_probe(const struct dwc3_probe_data *data) 
	dev_set_drvdata(dev, dwc);

	dwc3_cache_hwparams(dwc);



	if (!dwc->sysdev_is_parent &&

	if (!dev_is_pci(dwc->sysdev) &&

	    DWC3_GHWPARAMS0_AWIDTH(dwc->hwparams.hwparams0) == 64) {

		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));

		if (ret)

drivers/usb/dwc3/dwc3-pci.c

+41 −39
Original line number Diff line number Diff line
@@ -21,40 +21,41 @@ 
#include <linux/acpi.h>

#include <linux/delay.h>



#define PCI_DEVICE_ID_INTEL_CMLLP		0x02ee

#define PCI_DEVICE_ID_INTEL_CMLH		0x06ee

#define PCI_DEVICE_ID_INTEL_BXT			0x0aaa

#define PCI_DEVICE_ID_INTEL_BYT			0x0f37

#define PCI_DEVICE_ID_INTEL_MRFLD		0x119e

#define PCI_DEVICE_ID_INTEL_BSW			0x22b7

#define PCI_DEVICE_ID_INTEL_SPTLP		0x9d30

#define PCI_DEVICE_ID_INTEL_SPTH		0xa130

#define PCI_DEVICE_ID_INTEL_BXT			0x0aaa

#define PCI_DEVICE_ID_INTEL_BXT_M		0x1aaa

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa

#define PCI_DEVICE_ID_INTEL_KBP			0xa2b0

#define PCI_DEVICE_ID_INTEL_CMLLP		0x02ee

#define PCI_DEVICE_ID_INTEL_CMLH		0x06ee

#define PCI_DEVICE_ID_INTEL_BSW			0x22b7

#define PCI_DEVICE_ID_INTEL_GLK			0x31aa

#define PCI_DEVICE_ID_INTEL_CNPLP		0x9dee

#define PCI_DEVICE_ID_INTEL_CNPH		0xa36e

#define PCI_DEVICE_ID_INTEL_CNPV		0xa3b0

#define PCI_DEVICE_ID_INTEL_ICLLP		0x34ee

#define PCI_DEVICE_ID_INTEL_EHL			0x4b7e

#define PCI_DEVICE_ID_INTEL_TGPLP		0xa0ee

#define PCI_DEVICE_ID_INTEL_TGPH		0x43ee

#define PCI_DEVICE_ID_INTEL_JSP			0x4dee

#define PCI_DEVICE_ID_INTEL_WCL			0x4d7e

#define PCI_DEVICE_ID_INTEL_ADL			0x460e

#define PCI_DEVICE_ID_INTEL_ADL_PCH		0x51ee

#define PCI_DEVICE_ID_INTEL_ADLN		0x465e

#define PCI_DEVICE_ID_INTEL_EHL			0x4b7e

#define PCI_DEVICE_ID_INTEL_WCL			0x4d7e

#define PCI_DEVICE_ID_INTEL_JSP			0x4dee

#define PCI_DEVICE_ID_INTEL_ADL_PCH		0x51ee

#define PCI_DEVICE_ID_INTEL_ADLN_PCH		0x54ee

#define PCI_DEVICE_ID_INTEL_ADLS		0x7ae1

#define PCI_DEVICE_ID_INTEL_RPL			0xa70e

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa

#define PCI_DEVICE_ID_INTEL_NVLS_PCH		0x6e6f

#define PCI_DEVICE_ID_INTEL_ARLH_PCH		0x777e

#define PCI_DEVICE_ID_INTEL_RPLS		0x7a61

#define PCI_DEVICE_ID_INTEL_MTL			0x7e7e

#define PCI_DEVICE_ID_INTEL_ADLS		0x7ae1

#define PCI_DEVICE_ID_INTEL_MTLM		0x7eb1

#define PCI_DEVICE_ID_INTEL_MTLP		0x7ec1

#define PCI_DEVICE_ID_INTEL_MTLS		0x7f6f

#define PCI_DEVICE_ID_INTEL_MTL			0x7e7e

#define PCI_DEVICE_ID_INTEL_ARLH_PCH		0x777e

#define PCI_DEVICE_ID_INTEL_TGL			0x9a15

#define PCI_DEVICE_ID_INTEL_SPTLP		0x9d30

#define PCI_DEVICE_ID_INTEL_CNPLP		0x9dee

#define PCI_DEVICE_ID_INTEL_TGPLP		0xa0ee

#define PCI_DEVICE_ID_INTEL_SPTH		0xa130

#define PCI_DEVICE_ID_INTEL_KBP			0xa2b0

#define PCI_DEVICE_ID_INTEL_CNPH		0xa36e

#define PCI_DEVICE_ID_INTEL_CNPV		0xa3b0

#define PCI_DEVICE_ID_INTEL_RPL			0xa70e

#define PCI_DEVICE_ID_INTEL_PTLH		0xe332

#define PCI_DEVICE_ID_INTEL_PTLH_PCH		0xe37e

#define PCI_DEVICE_ID_INTEL_PTLU		0xe432
@@ -412,40 +413,41 @@ static void dwc3_pci_remove(struct pci_dev *pci) 
}



static const struct pci_device_id dwc3_pci_id_table[] = {

	{ PCI_DEVICE_DATA(INTEL, BSW, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, BYT, &dwc3_pci_intel_byt_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MRFLD, &dwc3_pci_intel_mrfld_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CMLLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CMLH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, SPTLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, SPTH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, BXT, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, BYT, &dwc3_pci_intel_byt_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MRFLD, &dwc3_pci_intel_mrfld_swnode) },

	{ PCI_DEVICE_DATA(INTEL, BXT_M, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, APL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, KBP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, BSW, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, GLK, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPV, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ICLLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, EHL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, TGPLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, TGPH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, JSP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, WCL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADL_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADLN, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, EHL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, WCL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, JSP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADL_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADLN_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADLS, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, RPL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, APL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, NVLS_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ARLH_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, RPLS, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MTL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ADLS, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MTLM, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MTLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MTL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, MTLS, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ARLH_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, TGL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, SPTLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, TGPLP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, SPTH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, KBP, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, CNPV, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, RPL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLH_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLU, &dwc3_pci_intel_swnode) },