Date: Fri, 6 Feb 2009 22:40:15 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r188252 - user/thompsa/usb/sys/dev/usb2/controller Message-ID: <200902062240.n16MeFAZ073339@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Fri Feb 6 22:40:15 2009 New Revision: 188252 URL: http://svn.freebsd.org/changeset/base/188252 Log: Fix OHCI and EHCI counting bug when multiple TD's are involved in a short USB transfer and a short packet happens on the non-last TD in the USB transfer frame. Submitted by: Hans Petter Selasky Modified: user/thompsa/usb/sys/dev/usb2/controller/ehci2.c user/thompsa/usb/sys/dev/usb2/controller/ohci2.c Modified: user/thompsa/usb/sys/dev/usb2/controller/ehci2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/ehci2.c Fri Feb 6 22:24:03 2009 (r188251) +++ user/thompsa/usb/sys/dev/usb2/controller/ehci2.c Fri Feb 6 22:40:15 2009 (r188252) @@ -1144,6 +1144,9 @@ ehci_non_isoc_done_sub(struct usb2_xfer td = xfer->td_transfer_cache; td_alt_next = td->alt_next; + if (xfer->aframes != xfer->nframes) { + xfer->frlengths[xfer->aframes] = 0; + } while (1) { usb2_pc_cpu_invalidate(td->page_cache); @@ -1152,8 +1155,8 @@ ehci_non_isoc_done_sub(struct usb2_xfer len = EHCI_QTD_GET_BYTES(status); /* - * Verify the status length and subtract - * the remainder from "frlengths[]": + * Verify the status length and + * add the length to "frlengths[]": */ if (len > td->len) { /* should not happen */ @@ -1161,7 +1164,7 @@ ehci_non_isoc_done_sub(struct usb2_xfer "0x%04x/0x%04x bytes\n", len, td->len); status |= EHCI_QTD_HALTED; } else if (xfer->aframes != xfer->nframes) { - xfer->frlengths[xfer->aframes] -= len; + xfer->frlengths[xfer->aframes] += td->len - len; } /* Check for last transfer */ if (((void *)td) == xfer->td_transfer_last) { Modified: user/thompsa/usb/sys/dev/usb2/controller/ohci2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/ohci2.c Fri Feb 6 22:24:03 2009 (r188251) +++ user/thompsa/usb/sys/dev/usb2/controller/ohci2.c Fri Feb 6 22:40:15 2009 (r188252) @@ -836,6 +836,9 @@ ohci_non_isoc_done_sub(struct usb2_xfer td_alt_next = td->alt_next; td_flags = 0; + if (xfer->aframes != xfer->nframes) { + xfer->frlengths[xfer->aframes] = 0; + } while (1) { usb2_pc_cpu_invalidate(td->page_cache); @@ -859,10 +862,15 @@ ohci_non_isoc_done_sub(struct usb2_xfer cc = OHCI_CC_STALL; } else if (xfer->aframes != xfer->nframes) { /* - * subtract remaining length from - * "frlengths[]" + * Sum up total transfer length + * in "frlengths[]": */ - xfer->frlengths[xfer->aframes] -= temp; + xfer->frlengths[xfer->aframes] += td->len - temp; + } + } else{ + if (xfer->aframes != xfer->nframes) { + /* transfer was complete */ + xfer->frlengths[xfer->aframes] += td->len; } } /* Check for last transfer */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902062240.n16MeFAZ073339>