Recover from potential USB stuck

This commit has changes to recover from potential USB stuck after
USB retransmission timeout.

RM #4604090

Author: lsun100

src/rshim_usb.c

@@ -18,7 +18,7 @@
 #define USB_BLUEFIELD_2_PRODUCT_ID  0x0214   /* Mellanox Bluefield-2 */
 #define USB_BLUEFIELD_3_PRODUCT_ID  0x021c   /* Mellanox Bluefield-3 */
 
-#define READ_RETRIES       5
+#define READ_RETRIES       2
 #define WRITE_RETRIES      5
 
 #define BF_MMIO_BASE 0x1000
@@ -341,6 +341,7 @@ static void rshim_usb_fifo_read_callback(struct libusb_transfer *urb)
   rshim_usb_t *dev = urb->user_data;
   rshim_backend_t *bd = &dev->bd;
   bool lock;
+  int rc;
 
   RSHIM_DBG("rshim%d(fifo_read_callback) %s urb completed, status %d, "
             "actual length %d, intr buf 0x%x\n",
@@ -389,8 +390,6 @@ static void rshim_usb_fifo_read_callback(struct libusb_transfer *urb)
        * handle partial reads; it's hard, and we haven't really
        * seen them.
        */
-      int rc;
-
       dev->read_or_intr_retries++;
       rc = libusb_submit_transfer(urb);
       if (rc) {
@@ -405,6 +404,14 @@ static void rshim_usb_fifo_read_callback(struct libusb_transfer *urb)
         bd->spin_flags |= RSH_SFLG_READING;
       }
       break;
+    } else {
+      RSHIM_ERR("rshim%d(fifo_read_callback) retry timeout\n", bd->index);
+      libusb_free_transfer(urb);
+      rc = libusb_clear_halt(dev->handle, urb->endpoint);
+      if (rc) {
+        RSHIM_ERR("rshim%d clear_halt failed: %s\n",
+                  bd->index, libusb_error_name(rc));
+      }
     }
 
   case LIBUSB_TRANSFER_CANCELLED:
@@ -1017,6 +1024,10 @@ static void rshim_usb_disconnect(struct libusb_device *usb_dev)
   libusb_cancel_transfer(dev->write_urb);
   dev->write_urb = NULL;
 
+  pthread_mutex_lock(&bd->ringlock);
+  bd->spin_flags &= ~RSH_SFLG_READING;
+  pthread_mutex_unlock(&bd->ringlock);
+
   free(dev->intr_buf);
   dev->intr_buf = NULL;