diff options
| author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-10-04 12:14:43 (GMT) |
|---|---|---|
| committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-10-17 08:14:00 (GMT) |
| commit | 6c83f77278f17a7679001027e9231291c20f0d8a (patch) | |
| tree | 343f7abf16c1f7e5bb09958073c8e6f22274c22c | |
| parent | bbe097f092b0d13e9736bd2794d0ab24547d0e5d (diff) | |
| download | linux-6c83f77278f17a7679001027e9231291c20f0d8a.tar.xz | |
usb: gadget: function: u_ether: don't starve tx request queue
If we don't guarantee that we will always get an
interrupt at least when we're queueing our very last
request, we could fall into situation where we queue
every request with 'no_interrupt' set. This will
cause the link to get stuck.
The behavior above has been triggered with g_ether
and dwc3.
Cc: <stable@vger.kernel.org>
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 9c8c9ed..fe18116 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -590,8 +590,9 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, /* throttle high/super speed IRQ rate back slightly */ if (gadget_is_dualspeed(dev->gadget)) - req->no_interrupt = (dev->gadget->speed == USB_SPEED_HIGH || - dev->gadget->speed == USB_SPEED_SUPER) + req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH || + dev->gadget->speed == USB_SPEED_SUPER)) && + !list_empty(&dev->tx_reqs)) ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0) : 0; |