Commit 8b09c0839080caacffaeb1f983c932cc591ca6a2
2013-12-09T13:46:36
Attempt USB device resets on usb read/write errors that will normally cause the device to drop out.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/usbutils.c b/usbutils.c
index 8030ed0..aa3ae4e 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2607,6 +2607,18 @@ int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t
if (end != NULL)
eom = strstr((const char *)usbbuf, end);
+ /* Attempt a usb reset for an error that will otherwise cause
+ * this device to drop out provided we know the device still
+ * might exist. */
+ if (err && err != LIBUSB_ERROR_TIMEOUT) {
+ applog(LOG_WARNING, "%s %i %s usb read err:(%d) %s", cgpu->drv->name,
+ cgpu->device_id, usb_cmdname(cmd), err, libusb_error_name(err));
+ if (err != LIBUSB_ERROR_NO_DEVICE) {
+ err = libusb_reset_device(usbdev->handle);
+ applog(LOG_WARNING, "%s %i attempted reset got err:(%d) %s",
+ cgpu->drv->name, cgpu->device_id, err, libusb_error_name(err));
+ }
+ }
if (err || readonce)
break;
@@ -2646,12 +2658,6 @@ int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t
*processed = tot;
memcpy((char *)buf, (const char *)usbbuf, (tot < (int)bufsiz) ? tot + 1 : (int)bufsiz);
- if (err && err != LIBUSB_ERROR_TIMEOUT) {
- applog(LOG_WARNING, "%s %i %s usb read err:(%d) %s", cgpu->drv->name, cgpu->device_id, usb_cmdname(cmd),
- err, libusb_error_name(err));
- if (cgpu->usbinfo.continuous_ioerr_count > USB_RETRY_MAX)
- err = LIBUSB_ERROR_OTHER;
- }
out_noerrmsg:
if (NODEV(err)) {
cg_ruwlock(&cgpu->usbinfo.devlock);
@@ -2721,6 +2727,17 @@ int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_
tot += sent;
+ /* Unlike reads, even a timeout error is unrecoverable on
+ * writes. */
+ if (err) {
+ applog(LOG_WARNING, "%s %i %s usb write err:(%d) %s", cgpu->drv->name,
+ cgpu->device_id, usb_cmdname(cmd), err, libusb_error_name(err));
+ if (err != LIBUSB_ERROR_NO_DEVICE) {
+ err = libusb_reset_device(usbdev->handle);
+ applog(LOG_WARNING, "%s %i attempted reset got err:(%d) %s",
+ cgpu->drv->name, cgpu->device_id, err, libusb_error_name(err));
+ }
+ }
if (err)
break;
@@ -2738,12 +2755,6 @@ int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_
*processed = tot;
- if (err) {
- applog(LOG_WARNING, "%s %i %s usb write err:(%d) %s", cgpu->drv->name, cgpu->device_id, usb_cmdname(cmd),
- err, libusb_error_name(err));
- if (cgpu->usbinfo.continuous_ioerr_count > USB_RETRY_MAX)
- err = LIBUSB_ERROR_OTHER;
- }
out_noerrmsg:
if (NODEV(err)) {
cg_ruwlock(&cgpu->usbinfo.devlock);