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

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

Merge tag 'for-usb-linus-2012-04-11' of... 

Merge tag 'for-usb-linus-2012-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

Hi Greg,

Here's 11 xHCI bug fixes for 3.4.

Some of the patches fix issues with crashes on system resume related to
VIA xHCI host controllers accessing bad memory addresses.  The patches
change the register restore ordering, so I had several vendors confirm
that the patches don't break their xHCI hosts.

Elric Fu confirms this patchset fixes the VIA issue, Alex He confirms
the changes does not break suspend/resume on AMD xHCI systems, and I've
made sure it doesn't break Intel host controllers.  I have not heard
back from Felipe about the TI host, so at this point, I'm just going to
send them off.

Several of the patches are marked for stable.  Please pull.

Sarah Sharp
parents a65a6f14 95018a53

drivers/usb/core/hub.c

+16 −0
Original line number Diff line number Diff line
@@ -3163,6 +3163,22 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
	if (retval)

		goto fail;



	/*

	 * Some superspeed devices have finished the link training process

	 * and attached to a superspeed hub port, but the device descriptor

	 * got from those devices show they aren't superspeed devices. Warm

	 * reset the port attached by the devices can fix them.

	 */

	if ((udev->speed == USB_SPEED_SUPER) &&

			(le16_to_cpu(udev->descriptor.bcdUSB) < 0x0300)) {

		dev_err(&udev->dev, "got a wrong device descriptor, "

				"warm reset device\n");

		hub_port_reset(hub, port1, udev,

				HUB_BH_RESET_TIME, true);

		retval = -EINVAL;

		goto fail;

	}



	if (udev->descriptor.bMaxPacketSize0 == 0xff ||

			udev->speed == USB_SPEED_SUPER)

		i = 512;

drivers/usb/host/pci-quirks.c

+7 −3
Original line number Diff line number Diff line
@@ -825,9 +825,13 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev) 
		}

	}



	/* Disable any BIOS SMIs */

	writel(XHCI_LEGACY_DISABLE_SMI,

			base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);

	val = readl(base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);

	/* Mask off (turn off) any enabled SMIs */

	val &= XHCI_LEGACY_DISABLE_SMI;

	/* Mask all SMI events bits, RW1C */

	val |= XHCI_LEGACY_SMI_EVENTS;

	/* Disable any BIOS SMIs and clear all SMI events*/

	writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);



	if (usb_is_intel_switchable_xhci(pdev))

		usb_enable_xhci_ports(pdev);

drivers/usb/host/xhci-dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void xhci_print_command_reg(struct xhci_hcd *xhci) 
	xhci_dbg(xhci, "  Event Interrupts %s\n",

			(temp & CMD_EIE) ? "enabled " : "disabled");

	xhci_dbg(xhci, "  Host System Error Interrupts %s\n",

			(temp & CMD_EIE) ? "enabled " : "disabled");

			(temp & CMD_HSEIE) ? "enabled " : "disabled");

	xhci_dbg(xhci, "  HC has %sfinished light reset\n",

			(temp & CMD_LRESET) ? "not " : "");

}

drivers/usb/host/xhci-ext-caps.h

+3 −2
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ 
/* USB Legacy Support Control and Status Register  - section 7.1.2 */

/* Add this offset, plus the value of xECP in HCCPARAMS to the base address */

#define XHCI_LEGACY_CONTROL_OFFSET	(0x04)

/* bits 1:2, 5:12, and 17:19 need to be preserved; bits 21:28 should be zero */

#define	XHCI_LEGACY_DISABLE_SMI		((0x3 << 1) + (0xff << 5) + (0x7 << 17))

/* bits 1:3, 5:12, and 17:19 need to be preserved; bits 21:28 should be zero */

#define	XHCI_LEGACY_DISABLE_SMI		((0x7 << 1) + (0xff << 5) + (0x7 << 17))

#define XHCI_LEGACY_SMI_EVENTS		(0x7 << 29)



/* USB 2.0 xHCI 0.96 L1C capability - section 7.2.2.1.3.2 */

#define XHCI_L1C               (1 << 16)

drivers/usb/host/xhci-mem.c

+2 −7
Original line number Diff line number Diff line
@@ -1796,11 +1796,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	int i;



	/* Free the Event Ring Segment Table and the actual Event Ring */

	if (xhci->ir_set) {

		xhci_writel(xhci, 0, &xhci->ir_set->erst_size);

		xhci_write_64(xhci, 0, &xhci->ir_set->erst_base);

		xhci_write_64(xhci, 0, &xhci->ir_set->erst_dequeue);

	}

	size = sizeof(struct xhci_erst_entry)*(xhci->erst.num_entries);

	if (xhci->erst.entries)

		dma_free_coherent(&pdev->dev, size,
@@ -1812,7 +1807,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	xhci->event_ring = NULL;

	xhci_dbg(xhci, "Freed event ring\n");



	xhci_write_64(xhci, 0, &xhci->op_regs->cmd_ring);

	if (xhci->cmd_ring)

		xhci_ring_free(xhci, xhci->cmd_ring);

	xhci->cmd_ring = NULL;
@@ -1841,7 +1835,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	xhci->medium_streams_pool = NULL;

	xhci_dbg(xhci, "Freed medium stream array pool\n");



	xhci_write_64(xhci, 0, &xhci->op_regs->dcbaa_ptr);

	if (xhci->dcbaa)

		dma_free_coherent(&pdev->dev, sizeof(*xhci->dcbaa),

				xhci->dcbaa, xhci->dcbaa->dma);
@@ -2459,6 +2452,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 


fail:

	xhci_warn(xhci, "Couldn't initialize memory\n");

	xhci_halt(xhci);

	xhci_reset(xhci);

	xhci_mem_cleanup(xhci);

	return -ENOMEM;

}