[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/18] usb-host: workaround libusb bug
From: |
Gerd Hoffmann |
Subject: |
[PULL 17/18] usb-host: workaround libusb bug |
Date: |
Mon, 31 Aug 2020 10:33:00 +0200 |
libusb_get_device_speed() does not work for
libusb_wrap_sys_device() devices in v1.0.23.
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1871090
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200824110057.32089-1-kraxel@redhat.com
---
hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c474551d8456..08604f787fdf 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -39,6 +39,11 @@
#endif
#include <libusb.h>
+#ifdef CONFIG_LINUX
+#include <sys/ioctl.h>
+#include <linux/usbdevice_fs.h>
+#endif
+
#include "qapi/error.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
@@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)
static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
{
USBDevice *udev = USB_DEVICE(s);
+ int libusb_speed;
int bus_num = 0;
int addr = 0;
int rc;
@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device
*dev, int hostfd)
usb_ep_init(udev);
usb_host_ep_update(s);
- udev->speed = speed_map[libusb_get_device_speed(dev)];
+ libusb_speed = libusb_get_device_speed(dev);
+#ifdef CONFIG_LINUX
+ if (hostfd && libusb_speed == 0) {
+ /*
+ * Workaround libusb bug: libusb_get_device_speed() does not
+ * work for libusb_wrap_sys_device() devices in v1.0.23.
+ *
+ * Speeds are defined in linux/usb/ch9.h, file not included
+ * due to name conflicts.
+ */
+ int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
+ switch (rc) {
+ case 1: /* low */
+ libusb_speed = LIBUSB_SPEED_LOW;
+ break;
+ case 2: /* full */
+ libusb_speed = LIBUSB_SPEED_FULL;
+ break;
+ case 3: /* high */
+ case 4: /* wireless */
+ libusb_speed = LIBUSB_SPEED_HIGH;
+ break;
+ case 5: /* super */
+ case 6: /* super plus */
+ libusb_speed = LIBUSB_SPEED_SUPER;
+ break;
+ }
+ }
+#endif
+ udev->speed = speed_map[libusb_speed];
usb_host_speed_compat(s);
if (s->ddesc.iProduct) {
--
2.27.0
- [PULL 00/18] Usb 20200831 patches, Gerd Hoffmann, 2020/08/31
- [PULL 04/18] ehci: drop pointless warn_report for guest bugs., Gerd Hoffmann, 2020/08/31
- [PULL 02/18] hw: ehci: destroy sglist in error path, Gerd Hoffmann, 2020/08/31
- [PULL 03/18] hw: ehci: check return value of 'usb_packet_map', Gerd Hoffmann, 2020/08/31
- [PULL 08/18] hw/usb: Add U2F key base class implementation, Gerd Hoffmann, 2020/08/31
- [PULL 07/18] hw/usb: Add U2F key base class, Gerd Hoffmann, 2020/08/31
- [PULL 17/18] usb-host: workaround libusb bug,
Gerd Hoffmann <=
- [PULL 16/18] hw/usb: Add U2F device autoscan to passthru mode, Gerd Hoffmann, 2020/08/31
- [PULL 18/18] usb: fix setup_len init (CVE-2020-14364), Gerd Hoffmann, 2020/08/31
- [PULL 10/18] hw/usb: Add U2F key emulated mode, Gerd Hoffmann, 2020/08/31
- [PULL 01/18] hw: xhci: check return value of 'usb_packet_map', Gerd Hoffmann, 2020/08/31
- [PULL 06/18] docs: Add USB U2F key device documentation, Gerd Hoffmann, 2020/08/31
- [PULL 09/18] hw/usb: Add U2F key passthru mode, Gerd Hoffmann, 2020/08/31
- [PULL 15/18] hw/usb: Add U2F device check to passthru mode, Gerd Hoffmann, 2020/08/31
- [PULL 05/18] hw/usb: Regroup USB HID protocol values, Gerd Hoffmann, 2020/08/31
- [PULL 14/18] scripts: Add u2f-setup-gen script, Gerd Hoffmann, 2020/08/31
- [PULL 12/18] docs/system: Add U2F key to the USB devices examples, Gerd Hoffmann, 2020/08/31