FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 22:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

USB: EHCI: fix handling of unusual interrupt intervals

Browse Source 
This patch (as1320) fixes two problems related to interrupt-URB
scheduling in ehci-hcd.

	URBs with an interval of 2 or 4 microframes aren't handled.
	For the time being, the patch reduces to interval to 1 uframe.

	URBs are constrained to have an interval no larger than 1024
	frames by usb_submit_urb().  But some EHCI controllers allow
	use of a schedule as short as 256 frames; for these
	controllers we may have to decrease the interval to the
	actual schedule length.

The second problem isn't very significant since few devices expose
interrupt endpoints with an interval larger than 256 frames.  But the
first problem is critical; it will prevent the kernel from working
with devices having interrupt intervals of 2 or 4 uframes.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Tested-by: Glynn Farrow <farrowg@sg.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2010-01-08 11:17:55 -05:00 committed by Greg Kroah-Hartman
parent acbe2febe7
commit 1b9a38bfa6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/host/ehci-q.c
View File

@ -849,9 +849,10 @@ qh_make (
* But interval 1 scheduling is simpler, and * But interval 1 scheduling is simpler, and
* includes high bandwidth. * includes high bandwidth.
*/ */
dbg ("intr period %d uframes, NYET!", urb->interval = 1;
urb->interval); } else if (qh->period > ehci->periodic_size) {
goto done; qh->period = ehci->periodic_size;
urb->interval = qh->period << 3;
} }
} else { } else {
int think_time; int think_time;
@ -874,6 +875,10 @@ qh_make (
usb_calc_bus_time (urb->dev->speed, usb_calc_bus_time (urb->dev->speed,
is_input, 0, max_packet (maxp))); is_input, 0, max_packet (maxp)));
qh->period = urb->interval; qh->period = urb->interval;
if (qh->period > ehci->periodic_size) {
qh->period = ehci->periodic_size;
urb->interval = qh->period;
}
} }
} }