Commit 19bb5467 authored Nov 03, 2015 by Peter Maydell

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20151103-1' into staging



usb: two bugfixes for ehci & usb-host.

# gpg: Signature made Tue 03 Nov 2015 10:57:28 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20151103-1:
  usb-host: fix usb3ep0quirk test
  ehci: clear suspend bit on detach

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 130d0bc6 a9be4e7c

hw/usb/hcd-ehci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -726,7 +726,7 @@ static void ehci_detach(USBPort *port)
		ehci_queues_rip_device(s, port->dev, 0);
		ehci_queues_rip_device(s, port->dev, 1);

		*portsc &= ~(PORTSC_CONNECT\|PORTSC_PED);
		*portsc &= ~(PORTSC_CONNECT\|PORTSC_PED\|PORTSC_SUSPEND);
		*portsc \|= PORTSC_CSC;

		ehci_raise_irq(s, USBSTS_PCD);

hw/usb/host-libusb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1240,7 +1240,7 @@ static void usb_host_handle_control(USBDevice udev, USBPacket p,

		/* Fix up USB-3 ep0 maxpacket size to allow superspeed connected devices
		* to work redirected to a not superspeed capable hcd */
		if (udev->speed == USB_SPEED_SUPER &&
		if ((udev->speedmask & USB_SPEED_MASK_SUPER) &&
		!(udev->port->speedmask & USB_SPEED_MASK_SUPER) &&
		request == 0x8006 && value == 0x100 && index == 0) {
		r->usb3ep0quirk = true;