From: Hans Petter Selasky <hps@selasky.org>
Date: Tue, 23 Aug 2016 11:39:49 +0000 (+0200)
Subject: xhci: Fix remainder field for TR_SETUP completion event.
X-Git-Tag: v2.8.0-rc0~139^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b66ad1f1aa4dba4e8e242ad8339dd01f4ee77c5e;p=thirdparty%2Fqemu.git

xhci: Fix remainder field for TR_SETUP completion event.

Previously the code would incorrectly report the remainder as 8 bytes. A
remainder of 0 bytes should be reported when the SETUP packet is
successfully transferred. Found using FreeBSD's XHCI driver.

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

[ kraxel: codestyle fixup ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 188f95416ac..37c14938a7a 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1753,6 +1753,12 @@ static void xhci_xfer_report(XHCITransfer *xfer)
         unsigned int chunk = 0;
 
         switch (TRB_TYPE(*trb)) {
+        case TR_SETUP:
+            chunk = trb->status & 0x1ffff;
+            if (chunk > 8) {
+                chunk = 8;
+            }
+            break;
         case TR_DATA:
         case TR_NORMAL:
         case TR_ISOCH: