958e1b
From 2eb03118784d98cc6cd1d1cadd2badc0cfd19469 Mon Sep 17 00:00:00 2001
958e1b
From: Gerd Hoffmann <kraxel@redhat.com>
958e1b
Date: Fri, 11 Jul 2014 14:21:08 +0200
958e1b
Subject: [PATCH 28/43] usb: add usb_pick_speed
958e1b
958e1b
Message-id: <1405088470-24115-36-git-send-email-kraxel@redhat.com>
958e1b
Patchwork-id: 59839
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 35/37] usb: add usb_pick_speed
958e1b
Bugzilla: 1075846
958e1b
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
958e1b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
958e1b
958e1b
We can pick the usb port speed in generic code, by looking at the port
958e1b
and device speed masks and looking for the fastest match.  So add a
958e1b
function to do exactly that, and drop the speed setting code from
958e1b
usb_desc_attach as it isn't needed any more.
958e1b
958e1b
This way we can set the device speed before calling port->ops->attach,
958e1b
which fixes some xhci hotplug issues.
958e1b
958e1b
https://bugzilla.redhat.com/show_bug.cgi?id=1046873
958e1b
958e1b
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
958e1b
(cherry picked from commit b791c3b38c7969cb9f4acda8229e19fd865a1c08)
958e1b
---
958e1b
 hw/usb/core.c    | 21 +++++++++++++++++++++
958e1b
 hw/usb/desc.c    | 12 ------------
958e1b
 include/hw/usb.h |  1 +
958e1b
 3 files changed, 22 insertions(+), 12 deletions(-)
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 hw/usb/core.c    | 21 +++++++++++++++++++++
958e1b
 hw/usb/desc.c    | 12 ------------
958e1b
 include/hw/usb.h |  1 +
958e1b
 3 files changed, 22 insertions(+), 12 deletions(-)
958e1b
958e1b
diff --git a/hw/usb/core.c b/hw/usb/core.c
958e1b
index 67ba7d6..cf34755 100644
958e1b
--- a/hw/usb/core.c
958e1b
+++ b/hw/usb/core.c
958e1b
@@ -28,6 +28,26 @@
958e1b
 #include "qemu/iov.h"
958e1b
 #include "trace.h"
958e1b
 
958e1b
+void usb_pick_speed(USBPort *port)
958e1b
+{
958e1b
+    static const int speeds[] = {
958e1b
+        USB_SPEED_SUPER,
958e1b
+        USB_SPEED_HIGH,
958e1b
+        USB_SPEED_FULL,
958e1b
+        USB_SPEED_LOW,
958e1b
+    };
958e1b
+    USBDevice *udev = port->dev;
958e1b
+    int i;
958e1b
+
958e1b
+    for (i = 0; i < ARRAY_SIZE(speeds); i++) {
958e1b
+        if ((udev->speedmask & (1 << speeds[i])) &&
958e1b
+            (port->speedmask & (1 << speeds[i]))) {
958e1b
+            udev->speed = speeds[i];
958e1b
+            return;
958e1b
+        }
958e1b
+    }
958e1b
+}
958e1b
+
958e1b
 void usb_attach(USBPort *port)
958e1b
 {
958e1b
     USBDevice *dev = port->dev;
958e1b
@@ -35,6 +55,7 @@ void usb_attach(USBPort *port)
958e1b
     assert(dev != NULL);
958e1b
     assert(dev->attached);
958e1b
     assert(dev->state == USB_STATE_NOTATTACHED);
958e1b
+    usb_pick_speed(port);
958e1b
     port->ops->attach(port);
958e1b
     dev->state = USB_STATE_ATTACHED;
958e1b
     usb_device_handle_attach(dev);
958e1b
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
958e1b
index f133ddb..138881f 100644
958e1b
--- a/hw/usb/desc.c
958e1b
+++ b/hw/usb/desc.c
958e1b
@@ -518,18 +518,6 @@ void usb_desc_init(USBDevice *dev)
958e1b
 
958e1b
 void usb_desc_attach(USBDevice *dev)
958e1b
 {
958e1b
-    const USBDesc *desc = usb_device_get_usb_desc(dev);
958e1b
-
958e1b
-    assert(desc != NULL);
958e1b
-    if (desc->super && (dev->port->speedmask & USB_SPEED_MASK_SUPER)) {
958e1b
-        dev->speed = USB_SPEED_SUPER;
958e1b
-    } else if (desc->high && (dev->port->speedmask & USB_SPEED_MASK_HIGH)) {
958e1b
-        dev->speed = USB_SPEED_HIGH;
958e1b
-    } else if (desc->full && (dev->port->speedmask & USB_SPEED_MASK_FULL)) {
958e1b
-        dev->speed = USB_SPEED_FULL;
958e1b
-    } else {
958e1b
-        return;
958e1b
-    }
958e1b
     usb_desc_setdefaults(dev);
958e1b
 }
958e1b
 
958e1b
diff --git a/include/hw/usb.h b/include/hw/usb.h
958e1b
index 000001b..ebbff47 100644
958e1b
--- a/include/hw/usb.h
958e1b
+++ b/include/hw/usb.h
958e1b
@@ -453,6 +453,7 @@ void usb_ep_combine_input_packets(USBEndpoint *ep);
958e1b
 void usb_combined_input_packet_complete(USBDevice *dev, USBPacket *p);
958e1b
 void usb_combined_packet_cancel(USBDevice *dev, USBPacket *p);
958e1b
 
958e1b
+void usb_pick_speed(USBPort *port);
958e1b
 void usb_attach(USBPort *port);
958e1b
 void usb_detach(USBPort *port);
958e1b
 void usb_port_reset(USBPort *port);
958e1b
-- 
958e1b
1.8.3.1
958e1b