[Qemu-devel] [PULL for-1.6 0/1] usb patch queue

[Qemu-devel] [PULL for-1.6 0/1] usb patch queue

[Gerd Hoffmann]

  Hi,

Tiny queue this time, with a single xhci fix for 1.6

please pull,
  Gerd

The following changes since commit 6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f:

  fw_cfg: the I/O port variant expects little-endian (2013-08-07 12:48:15 -0500)

are available in the git repository at:

  git://git.kraxel.org/qemu usb.87

for you to fetch changes up to dad5b9ea0895c227bc9d48b7f0a6fa51eaaa8661:

  xhci: implement warm port reset (2013-08-08 13:29:25 +0200)

----------------------------------------------------------------
Gerd Hoffmann (1):
      xhci: implement warm port reset

 hw/usb/hcd-xhci.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/1] xhci: implement warm port reset

[Gerd Hoffmann]

Without this patch windows can't do port resets for usb3 devices.

https://bugzilla.redhat.com/show_bug.cgi?id=949514

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/hcd-xhci.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index ff5f681..58c88b8 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2672,7 +2672,7 @@ static void xhci_port_update(XHCIPort *port, int is_detach)
     xhci_port_notify(port, PORTSC_CSC);
 }
 
-static void xhci_port_reset(XHCIPort *port)
+static void xhci_port_reset(XHCIPort *port, bool warm_reset)
 {
     trace_usb_xhci_port_reset(port->portnr);
 
@@ -2683,6 +2683,11 @@ static void xhci_port_reset(XHCIPort *port)
     usb_device_reset(port->uport->dev);
 
     switch (port->uport->dev->speed) {
+    case USB_SPEED_SUPER:
+        if (warm_reset) {
+            port->portsc |= PORTSC_WRC;
+        }
+        /* fall through */
     case USB_SPEED_LOW:
     case USB_SPEED_FULL:
     case USB_SPEED_HIGH:
@@ -2845,8 +2850,12 @@ static void xhci_port_write(void *ptr, hwaddr reg,
     switch (reg) {
     case 0x00: /* PORTSC */
         /* write-1-to-start bits */
+        if (val & PORTSC_WPR) {
+            xhci_port_reset(port, true);
+            break;
+        }
         if (val & PORTSC_PR) {
-            xhci_port_reset(port);
+            xhci_port_reset(port, false);
             break;
         }
 
-- 
1.7.9.7