SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "xhci: generate a Transfer Event for each Transfer TRB with the IOC bit set"

Browse Source 
This makes xhci generate multiple short packet events in case of
multi-trb transfers.  Which is wrong.  We need to fix this in a
different way.

This reverts commit aa6857891df614c620e6e9fc4bc4af6e0e49cafd.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2015-04-28 09:19:35 +02:00
parent 4e8cfbe114
commit 88dbed3f59
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/usb/hcd-xhci.c
View File

@ -1767,18 +1767,9 @@ static void xhci_xfer_report(XHCITransfer *xfer)
break; break;
} }
/* if (!reported && ((trb->control & TRB_TR_IOC) ||
* XHCI 1.1, 4.11.3.1 Transfer Event TRB -- "each Transfer TRB (shortpkt && (trb->control & TRB_TR_ISP)) ||
* encountered with its IOC flag set to '1' shall generate a Transfer (xfer->status != CC_SUCCESS && left == 0))) {
* Event."
*
* Otherwise, longer transfers can have multiple data TRBs (for scatter
* gather). Short transfers and errors should be reported once per
* transfer only.
*/
if ((trb->control & TRB_TR_IOC) ||
(!reported && ((shortpkt && (trb->control & TRB_TR_ISP)) ||
(xfer->status != CC_SUCCESS && left == 0)))) {
event.slotid = xfer->slotid; event.slotid = xfer->slotid;
event.epid = xfer->epid; event.epid = xfer->epid;
event.length = (trb->status & 0x1ffff) - chunk; event.length = (trb->status & 0x1ffff) - chunk;