UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: OHCI: fix logic for scheduling isochronous URBs 

The isochronous scheduling logic in ohci-hcd has a bug.  The
calculation for skipping TDs that are too late should be carried out
only in the !URB_ISO_ASAP case.  When URB_ISO_ASAP is set, the URB is
pushed back so that none of the TDs are too late, which would cause
the calculation to overflow.

The patch also fixes the calculation to avoid overflow in the case
where the frame value wraps around.

This should be applied to -stable kernels going back to 3.8.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Stern 2013-05-14 13:57:51 -04:00 committed by Greg Kroah-Hartman
parent e194401783
commit 815fa7b917
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/host/ohci-hcd.c
View File

@ -240,7 +240,7 @@ static int ohci_urb_enqueue (
if (unlikely(tick_before(frame, next))) { if (unlikely(tick_before(frame, next))) {
/* USB_ISO_ASAP: Round up to the first available slot */ /* USB_ISO_ASAP: Round up to the first available slot */
if (urb->transfer_flags & URB_ISO_ASAP) if (urb->transfer_flags & URB_ISO_ASAP) {
frame += (next - frame + ed->interval - 1) & frame += (next - frame + ed->interval - 1) &
-ed->interval; -ed->interval;
@ -248,21 +248,25 @@ static int ohci_urb_enqueue (
* Not ASAP: Use the next slot in the stream. If * Not ASAP: Use the next slot in the stream. If
* the entire URB falls before the threshold, fail. * the entire URB falls before the threshold, fail.
*/ */
else if (tick_before(frame + ed->interval * } else {
if (tick_before(frame + ed->interval *
(urb->number_of_packets - 1), next)) { (urb->number_of_packets - 1), next)) {
retval = -EXDEV; retval = -EXDEV;
usb_hcd_unlink_urb_from_ep(hcd, urb); usb_hcd_unlink_urb_from_ep(hcd, urb);
goto fail; goto fail;
} }
/* /*
* Some OHCI hardware doesn't handle late TDs * Some OHCI hardware doesn't handle late TDs
* correctly. After retiring them it proceeds to * correctly. After retiring them it proceeds
* the next ED instead of the next TD. Therefore * to the next ED instead of the next TD.
* we have to omit the late TDs entirely. * Therefore we have to omit the late TDs
*/ * entirely.
urb_priv->td_cnt = DIV_ROUND_UP(next - frame, */
ed->interval); urb_priv->td_cnt = DIV_ROUND_UP(
(u16) (next - frame),
ed->interval);
}
} }
urb->start_frame = frame; urb->start_frame = frame;
} }