mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-host: add usb_host_do_reset function.

Browse Source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-11-16 12:37:17 +01:00
parent 335b8d2068
commit c7662daaa2
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usb-linux.c
View File

@ -148,6 +148,25 @@ static int usb_host_read_file(char *line, size_t line_size,
const char *device_file, const char *device_name); const char *device_file, const char *device_name);
static int usb_linux_update_endp_table(USBHostDevice *s); 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) 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; struct endp_data *eps = pid == USB_TOKEN_IN ? s->ep_in : s->ep_out;
@ -606,7 +625,7 @@ static void usb_host_handle_reset(USBDevice *dev)
trace_usb_host_reset(s->bus_num, s->addr); trace_usb_host_reset(s->bus_num, s->addr);
ioctl(s->fd, USBDEVFS_RESET); usb_host_do_reset(s);;
usb_host_claim_interfaces(s, 0); usb_host_claim_interfaces(s, 0);
usb_linux_update_endp_table(s); usb_linux_update_endp_table(s);
@ -1370,7 +1389,7 @@ static int usb_host_close(USBHostDevice *dev)
if (dev->dev.attached) { if (dev->dev.attached) {
usb_device_detach(&dev->dev); usb_device_detach(&dev->dev);
} }
ioctl(dev->fd, USBDEVFS_RESET); usb_host_do_reset(dev);
close(dev->fd); close(dev->fd);
dev->fd = -1; dev->fd = -1;
return 0; return 0;
@ -1381,7 +1400,7 @@ static void usb_host_exit_notifier(struct Notifier *n, void *data)
USBHostDevice *s = container_of(n, USBHostDevice, exit); USBHostDevice *s = container_of(n, USBHostDevice, exit);
if (s->fd != -1) { if (s->fd != -1) {
ioctl(s->fd, USBDEVFS_RESET); usb_host_do_reset(s);;
} }
} }