|
 |
218e99 |
From 13b8b9eda753aa5bc1758627f9148e4fff91f90f Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 12:17:00 +0100
|
|
|
218e99 |
Subject: [PATCH 65/81] usb-host-libusb: Detach kernel drivers earlier
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
Message-id: <1383740220-2049-4-git-send-email-kraxel@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55515
|
|
|
218e99 |
O-Subject: [RHEL-7 qemu-kvm PATCH 3/3] usb-host-libusb: Detach kernel drivers earlier
|
|
|
218e99 |
Bugzilla: 980383
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
If we detach the kernel drivers on the first set_config, then they will
|
|
|
218e99 |
be still attached when the device gets its initial reset. Causing the drivers
|
|
|
218e99 |
to re-initialize the device after the reset, dirtying the device state.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
218e99 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
(cherry picked from commit f34d5c750897abb3853910ce73f63d88d74dc827)
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/usb/host-libusb.c | 7 +++++--
|
|
|
218e99 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/usb/host-libusb.c | 7 +++++--
|
|
|
218e99 |
1 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
|
|
|
218e99 |
index 9b226e4..8510902 100644
|
|
|
218e99 |
--- a/hw/usb/host-libusb.c
|
|
|
218e99 |
+++ b/hw/usb/host-libusb.c
|
|
|
218e99 |
@@ -137,6 +137,7 @@ static QTAILQ_HEAD(, USBHostDevice) hostdevs =
|
|
|
218e99 |
static void usb_host_auto_check(void *unused);
|
|
|
218e99 |
static void usb_host_release_interfaces(USBHostDevice *s);
|
|
|
218e99 |
static void usb_host_nodev(USBHostDevice *s);
|
|
|
218e99 |
+static void usb_host_detach_kernel(USBHostDevice *s);
|
|
|
218e99 |
static void usb_host_attach_kernel(USBHostDevice *s);
|
|
|
218e99 |
|
|
|
218e99 |
/* ------------------------------------------------------------------------ */
|
|
|
218e99 |
@@ -787,10 +788,13 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev)
|
|
|
218e99 |
goto fail;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
- libusb_get_device_descriptor(dev, &s->ddesc);
|
|
|
218e99 |
s->dev = dev;
|
|
|
218e99 |
s->bus_num = bus_num;
|
|
|
218e99 |
s->addr = addr;
|
|
|
218e99 |
+
|
|
|
218e99 |
+ usb_host_detach_kernel(s);
|
|
|
218e99 |
+
|
|
|
218e99 |
+ libusb_get_device_descriptor(dev, &s->ddesc);
|
|
|
218e99 |
usb_host_get_port(s->dev, s->port, sizeof(s->port));
|
|
|
218e99 |
|
|
|
218e99 |
usb_ep_init(udev);
|
|
|
218e99 |
@@ -1051,7 +1055,6 @@ static void usb_host_set_config(USBHostDevice *s, int config, USBPacket *p)
|
|
|
218e99 |
trace_usb_host_set_config(s->bus_num, s->addr, config);
|
|
|
218e99 |
|
|
|
218e99 |
usb_host_release_interfaces(s);
|
|
|
218e99 |
- usb_host_detach_kernel(s);
|
|
|
218e99 |
rc = libusb_set_configuration(s->dh, config);
|
|
|
218e99 |
if (rc != 0) {
|
|
|
218e99 |
usb_host_libusb_error("libusb_set_configuration", rc);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|