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

Commit 02a3250f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB fixes and new device ids for 3.12-rc6

  The largest change here is a bunch of new device ids for the option
  USB serial driver for new Huawei devices.  Other than that, just some
  small bug fixes for issues that people have reported (run-time and
  build-time), nothing major"

* tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register
  usb: misc: usb3503: Fix compile error due to incorrect regmap depedency
  usb/chipidea: fix oops on memory allocation failure
  usb-storage: add quirk for mandatory READ_CAPACITY_16
  usb: serial: option: blacklist Olivetti Olicard200
  USB: quirks: add touchscreen that is dazzeled by remote wakeup
  Revert "usb: musb: gadget: fix otg active status flag"
  USB: quirks.c: add one device that cannot deal with suspension
  USB: serial: option: add support for Inovia SEW858 device
  USB: serial: ti_usb_3410_5052: add Abbott strip port ID to combined table as well.
  USB: support new huawei devices in option.c
  usb: musb: start musb on the udc side, too
  xhci: Fix spurious wakeups after S5 on Haswell
  xhci: fix write to USB3_PSSEN and XUSB2PRM pci config registers
  xhci: quirk for extra long delay for S4
  xhci: Don't enable/disable RWE on bus suspend/resume.
parents 7b4a5155 94468783

drivers/usb/chipidea/host.c

+4 −2
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ static void host_stop(struct ci_hdrc *ci) 
{

	struct usb_hcd *hcd = ci->hcd;



	if (hcd) {

		usb_remove_hcd(hcd);

		usb_put_hcd(hcd);

	}

	if (ci->platdata->reg_vbus)

		regulator_disable(ci->platdata->reg_vbus);

}

drivers/usb/core/quirks.c

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Alcor Micro Corp. Hub */

	{ USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME },



	/* MicroTouch Systems touchscreen */

	{ USB_DEVICE(0x0596, 0x051e), .driver_info = USB_QUIRK_RESET_RESUME },



	/* appletouch */

	{ USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -130,6 +133,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Broadcom BCM92035DGROM BT dongle */

	{ USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },



	/* MAYA44USB sound device */

	{ USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/host/pci-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) 
	 * switchable ports.

	 */

	pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,

			cpu_to_le32(ports_available));

			ports_available);



	pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,

			&ports_available);
@@ -821,7 +821,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) 
	 * host.

	 */

	pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,

			cpu_to_le32(ports_available));

			ports_available);



	pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,

			&ports_available);

drivers/usb/host/xhci-hub.c

+0 −26
Original line number Diff line number Diff line
@@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
		t1 = xhci_port_state_to_neutral(t1);

		if (t1 != t2)

			xhci_writel(xhci, t2, port_array[port_index]);



		if (hcd->speed != HCD_USB3) {

			/* enable remote wake up for USB 2.0 */

			__le32 __iomem *addr;

			u32 tmp;



			/* Get the port power control register address. */

			addr = port_array[port_index] + PORTPMSC;

			tmp = xhci_readl(xhci, addr);

			tmp |= PORT_RWE;

			xhci_writel(xhci, tmp, addr);

		}

	}

	hcd->state = HC_STATE_SUSPENDED;

	bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
@@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) 
				xhci_ring_device(xhci, slot_id);

		} else

			xhci_writel(xhci, temp, port_array[port_index]);



		if (hcd->speed != HCD_USB3) {

			/* disable remote wake up for USB 2.0 */

			__le32 __iomem *addr;

			u32 tmp;



			/* Add one to the port status register address to get

			 * the port power control register address.

			 */

			addr = port_array[port_index] + PORTPMSC;

			tmp = xhci_readl(xhci, addr);

			tmp &= ~PORT_RWE;

			xhci_writel(xhci, tmp, addr);

		}

	}



	(void) xhci_readl(xhci, &xhci->op_regs->command);

drivers/usb/host/xhci-pci.c

+25 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#define PCI_VENDOR_ID_ETRON		0x1b6f

#define PCI_DEVICE_ID_ASROCK_P67	0x7023



#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI	0x8c31

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI	0x9c31



static const char hcd_name[] = "xhci_hcd";



/* called after powerup, by probe or system-pm "wakeup" */
@@ -69,6 +72,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
				"QUIRK: Fresco Logic xHC needs configure"

				" endpoint cmd after reset endpoint");

		}

		if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&

				pdev->revision == 0x4) {

			xhci->quirks |= XHCI_SLOW_SUSPEND;

			xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,

				"QUIRK: Fresco Logic xHC revision %u"

				"must be suspended extra slowly",

				pdev->revision);

		}

		/* Fresco Logic confirms: all revisions of this chip do not

		 * support MSI, even though some of them claim to in their PCI

		 * capabilities.
@@ -110,6 +121,15 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		xhci->quirks |= XHCI_SPURIOUS_REBOOT;

		xhci->quirks |= XHCI_AVOID_BEI;

	}

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

	    (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) {

		/* Workaround for occasional spurious wakeups from S5 (or

		 * any other sleep) on Haswell machines with LPT and LPT-LP

		 * with the new Intel BIOS

		 */

		xhci->quirks |= XHCI_SPURIOUS_WAKEUP;

	}

	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&

			pdev->device == PCI_DEVICE_ID_ASROCK_P67) {

		xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -217,6 +237,11 @@ static void xhci_pci_remove(struct pci_dev *dev) 
		usb_put_hcd(xhci->shared_hcd);

	}

	usb_hcd_pci_remove(dev);



	/* Workaround for spurious wakeups at shutdown with HSW */

	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)

		pci_set_power_state(dev, PCI_D3hot);



	kfree(xhci);

}