Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64813520 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some remaining USB fixes for 4.13-rc1. They were originally
  scheduled for 4.12-final, but I didn't send them to you in time.
  Because of that, they were in a separate branch from the larger USB
  set of patches, so here they are in a separate pull request.

  Nothing major here a all, just three small patches:

   - some usb-serial new device ids
   - xhci bugfix for some crazy AMD hardware

  All of these have been in linux-next for a long time with no reported
  issues"

* tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: Limit USB2 port wake support for AMD Promontory hosts
  USB: serial: qcserial: new Sierra Wireless EM7305 device ID
  USB: serial: option: add two Longcheer device ids
parents df7cb187 dec08194

drivers/usb/host/xhci-hub.c

+3 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
				t2 |= PORT_WKOC_E | PORT_WKCONN_E;

				t2 &= ~PORT_WKDISC_E;

			}

			if ((xhci->quirks & XHCI_U2_DISABLE_WAKE) &&

			    (hcd->speed < HCD_USB3))

				t2 &= ~PORT_WAKE_BITS;

		} else

			t2 &= ~PORT_WAKE_BITS;

drivers/usb/host/xhci-pci.c

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ 
#define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8

#define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0



#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba

#define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb

#define PCI_DEVICE_ID_AMD_PROMONTORYA_1			0x43bc



static const char hcd_name[] = "xhci_hcd";



static struct hc_driver __read_mostly xhci_pci_hc_driver;
@@ -135,6 +140,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	if (pdev->vendor == PCI_VENDOR_ID_AMD)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;



	if ((pdev->vendor == PCI_VENDOR_ID_AMD) &&

		((pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_3) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_2) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1)))

		xhci->quirks |= XHCI_U2_DISABLE_WAKE;



	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {

		xhci->quirks |= XHCI_LPM_SUPPORT;

		xhci->quirks |= XHCI_INTEL_HOST;

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,7 @@ struct xhci_hcd { 
/* For controller with a broken Port Disable implementation */

#define XHCI_BROKEN_PORT_PED	(1 << 25)

#define XHCI_LIMIT_ENDPOINT_INTERVAL_7	(1 << 26)

#define XHCI_U2_DISABLE_WAKE	(1 << 27)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;

drivers/usb/serial/option.c

+4 −0
Original line number Diff line number Diff line
@@ -1877,6 +1877,10 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = (kernel_ulong_t)&four_g_w100_blacklist

	},

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),

	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },

	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },

drivers/usb/serial/qcserial.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x1199, 0x9056)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9060)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9061)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9063)},	/* Sierra Wireless EM7305 */

	{DEVICE_SWI(0x1199, 0x9070)},	/* Sierra Wireless MC74xx */

	{DEVICE_SWI(0x1199, 0x9071)},	/* Sierra Wireless MC74xx */

	{DEVICE_SWI(0x1199, 0x9078)},	/* Sierra Wireless EM74xx */