958e1b
From 356cd0ad58931df9374324eeceff760a6310db27 Mon Sep 17 00:00:00 2001
958e1b
From: Gerd Hoffmann <kraxel@redhat.com>
958e1b
Date: Fri, 11 Jul 2014 14:20:50 +0200
958e1b
Subject: [PATCH 16/43] usb-hcd-xhci: Report completion of active transfer with
958e1b
 CC_STOPPED on ep stop
958e1b
958e1b
Message-id: <1405088470-24115-18-git-send-email-kraxel@redhat.com>
958e1b
Patchwork-id: 59832
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 17/37] usb-hcd-xhci: Report completion of active transfer with CC_STOPPED on ep stop
958e1b
Bugzilla: 980747
958e1b
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
958e1b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
958e1b
958e1b
From: Hans de Goede <hdegoede@redhat.com>
958e1b
958e1b
As we should per the XHCI spec "4.6.9 Stop Endpoint".
958e1b
958e1b
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
958e1b
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
958e1b
(cherry picked from commit 582d6f4aba0ff24604a82b48aee2db17b100d4b4)
958e1b
---
958e1b
 hw/usb/hcd-xhci.c | 26 ++++++++++++++++++--------
958e1b
 1 file changed, 18 insertions(+), 8 deletions(-)
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 hw/usb/hcd-xhci.c | 26 ++++++++++++++++++--------
958e1b
 1 file changed, 18 insertions(+), 8 deletions(-)
958e1b
958e1b
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
958e1b
index 3b4cd01..fc3b330 100644
958e1b
--- a/hw/usb/hcd-xhci.c
958e1b
+++ b/hw/usb/hcd-xhci.c
958e1b
@@ -507,6 +507,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,
958e1b
                          unsigned int epid, unsigned int streamid);
958e1b
 static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid,
958e1b
                                 unsigned int epid);
958e1b
+static void xhci_xfer_report(XHCITransfer *xfer);
958e1b
 static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v);
958e1b
 static void xhci_write_event(XHCIState *xhci, XHCIEvent *event, int v);
958e1b
 static USBEndpoint *xhci_epid_to_usbep(XHCIState *xhci,
958e1b
@@ -1304,10 +1305,15 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
958e1b
     return CC_SUCCESS;
958e1b
 }
958e1b
 
958e1b
-static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
958e1b
+static int xhci_ep_nuke_one_xfer(XHCITransfer *t, TRBCCode report)
958e1b
 {
958e1b
     int killed = 0;
958e1b
 
958e1b
+    if (report && (t->running_async || t->running_retry)) {
958e1b
+        t->status = report;
958e1b
+        xhci_xfer_report(t);
958e1b
+    }
958e1b
+
958e1b
     if (t->running_async) {
958e1b
         usb_cancel_packet(&t->packet);
958e1b
         t->running_async = 0;
958e1b
@@ -1320,6 +1326,7 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
958e1b
             qemu_del_timer(epctx->kick_timer);
958e1b
         }
958e1b
         t->running_retry = 0;
958e1b
+        killed = 1;
958e1b
     }
958e1b
     if (t->trbs) {
958e1b
         g_free(t->trbs);
958e1b
@@ -1332,7 +1339,7 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
958e1b
 }
958e1b
 
958e1b
 static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid,
958e1b
-                               unsigned int epid)
958e1b
+                               unsigned int epid, TRBCCode report)
958e1b
 {
958e1b
     XHCISlot *slot;
958e1b
     XHCIEPContext *epctx;
958e1b
@@ -1353,7 +1360,10 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid,
958e1b
 
958e1b
     xferi = epctx->next_xfer;
958e1b
     for (i = 0; i < TD_QUEUE; i++) {
958e1b
-        killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]);
958e1b
+        killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi], report);
958e1b
+        if (killed) {
958e1b
+            report = 0; /* Only report once */
958e1b
+        }
958e1b
         epctx->transfers[xferi].packet.ep = NULL;
958e1b
         xferi = (xferi + 1) % TD_QUEUE;
958e1b
     }
958e1b
@@ -1383,7 +1393,7 @@ static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid,
958e1b
         return CC_SUCCESS;
958e1b
     }
958e1b
 
958e1b
-    xhci_ep_nuke_xfers(xhci, slotid, epid);
958e1b
+    xhci_ep_nuke_xfers(xhci, slotid, epid, 0);
958e1b
 
958e1b
     epctx = slot->eps[epid-1];
958e1b
 
958e1b
@@ -1425,7 +1435,7 @@ static TRBCCode xhci_stop_ep(XHCIState *xhci, unsigned int slotid,
958e1b
         return CC_EP_NOT_ENABLED_ERROR;
958e1b
     }
958e1b
 
958e1b
-    if (xhci_ep_nuke_xfers(xhci, slotid, epid) > 0) {
958e1b
+    if (xhci_ep_nuke_xfers(xhci, slotid, epid, CC_STOPPED) > 0) {
958e1b
         fprintf(stderr, "xhci: FIXME: endpoint stopped w/ xfers running, "
958e1b
                 "data might be lost\n");
958e1b
     }
958e1b
@@ -1470,7 +1480,7 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned int slotid,
958e1b
         return CC_CONTEXT_STATE_ERROR;
958e1b
     }
958e1b
 
958e1b
-    if (xhci_ep_nuke_xfers(xhci, slotid, epid) > 0) {
958e1b
+    if (xhci_ep_nuke_xfers(xhci, slotid, epid, 0) > 0) {
958e1b
         fprintf(stderr, "xhci: FIXME: endpoint reset w/ xfers running, "
958e1b
                 "data might be lost\n");
958e1b
     }
958e1b
@@ -2463,7 +2473,7 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort *uport)
958e1b
 
958e1b
     for (ep = 0; ep < 31; ep++) {
958e1b
         if (xhci->slots[slot].eps[ep]) {
958e1b
-            xhci_ep_nuke_xfers(xhci, slot+1, ep+1);
958e1b
+            xhci_ep_nuke_xfers(xhci, slot + 1, ep + 1, 0);
958e1b
         }
958e1b
     }
958e1b
     xhci->slots[slot].uport = NULL;
958e1b
@@ -3286,7 +3296,7 @@ static void xhci_complete(USBPort *port, USBPacket *packet)
958e1b
     XHCITransfer *xfer = container_of(packet, XHCITransfer, packet);
958e1b
 
958e1b
     if (packet->status == USB_RET_REMOVE_FROM_QUEUE) {
958e1b
-        xhci_ep_nuke_one_xfer(xfer);
958e1b
+        xhci_ep_nuke_one_xfer(xfer, 0);
958e1b
         return;
958e1b
     }
958e1b
     xhci_complete_packet(xfer);
958e1b
-- 
958e1b
1.8.3.1
958e1b