From b572fe334663aaa055f37448b0b39724aefa9b0c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Jan 2012 12:39:24 +0100 Subject: [PATCH 3/7] usb-host: add usb_host_do_reset function. RH-Author: Gerd Hoffmann Message-id: <1326199166-8305-3-git-send-email-kraxel@redhat.com> Patchwork-id: 36311 O-Subject: [RHEL-6.3 qemu-kvm PATCH 2/4] usb-host: add usb_host_do_reset function. Bugzilla: 769745 RH-Acked-by: Hans de Goede RH-Acked-by: Markus Armbruster RH-Acked-by: Alex Williamson Add a special function to reset the host usb device. It tracks the time needed by the USBDEVFS_RESET ioctl and prints a warning in case it needs too long. Usually it should be finished in 200 - 300 miliseconds. Warning threshold is one second. Intention is to help troubleshooting by indicating that the usb device stopped responding even to a reset request and is possibly broken. Signed-off-by: Gerd Hoffmann (cherry picked from commit c7662daaa2898fa5a9a39bc51985cd1dd08af988) --- usb-linux.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) Signed-off-by: Michal Novotny --- usb-linux.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 5ab8e30..41c2dbb 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -148,6 +148,25 @@ static int usb_host_read_file(char *line, size_t line_size, const char *device_file, const char *device_name); static int usb_linux_update_endp_table(USBHostDevice *s); +static int usb_host_do_reset(USBHostDevice *dev) +{ + struct timeval s, e; + uint32_t usecs; + int ret; + + gettimeofday(&s, NULL); + ret = ioctl(dev->fd, USBDEVFS_RESET); + gettimeofday(&e, NULL); + usecs = (e.tv_sec - s.tv_sec) * 1000000; + usecs += e.tv_usec - s.tv_usec; + if (usecs > 1000000) { + /* more than a second, something is fishy, broken usb device? */ + fprintf(stderr, "husb: device %d:%d reset took %d.%06d seconds\n", + dev->bus_num, dev->addr, usecs / 1000000, usecs % 1000000); + } + return ret; +} + static struct endp_data *get_endp(USBHostDevice *s, int pid, int ep) { struct endp_data *eps = pid == USB_TOKEN_IN ? s->ep_in : s->ep_out; @@ -602,7 +621,7 @@ static void usb_host_handle_reset(USBDevice *dev) DPRINTF("husb: reset device %u.%u\n", s->bus_num, s->addr); - ioctl(s->fd, USBDEVFS_RESET); + usb_host_do_reset(s);; usb_host_claim_interfaces(s, 0); usb_linux_update_endp_table(s); @@ -1332,7 +1351,7 @@ static int usb_host_close(USBHostDevice *dev) if (dev->dev.attached) { usb_device_detach(&dev->dev); } - ioctl(dev->fd, USBDEVFS_RESET); + usb_host_do_reset(dev); close(dev->fd); dev->fd = -1; return 0; @@ -1343,7 +1362,7 @@ static void usb_host_exit_notifier(struct Notifier* n) USBHostDevice *s = container_of(n, USBHostDevice, exit); if (s->fd != -1) { - ioctl(s->fd, USBDEVFS_RESET); + usb_host_do_reset(s);; } } -- 1.7.7.5