[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] usb-hcd-xhci: Report completion of active trans
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 6/7] usb-hcd-xhci: Report completion of active transfer with CC_STOPPED on ep stop |
Date: |
Mon, 23 Sep 2013 20:54:06 +0200 |
As we should per the XHCI spec "4.6.9 Stop Endpoint".
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-xhci.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 9845554..4890344 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -497,6 +497,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int
slotid,
unsigned int epid, unsigned int streamid);
static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid,
unsigned int epid);
+static void xhci_xfer_report(XHCITransfer *xfer);
static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v);
static void xhci_write_event(XHCIState *xhci, XHCIEvent *event, int v);
static USBEndpoint *xhci_epid_to_usbep(XHCIState *xhci,
@@ -1339,10 +1340,15 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci,
unsigned int slotid,
return CC_SUCCESS;
}
-static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
+static int xhci_ep_nuke_one_xfer(XHCITransfer *t, TRBCCode report)
{
int killed = 0;
+ if (report && (t->running_async || t->running_retry)) {
+ t->status = report;
+ xhci_xfer_report(t);
+ }
+
if (t->running_async) {
usb_cancel_packet(&t->packet);
t->running_async = 0;
@@ -1355,6 +1361,7 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
qemu_del_timer(epctx->kick_timer);
}
t->running_retry = 0;
+ killed = 1;
}
if (t->trbs) {
g_free(t->trbs);
@@ -1367,7 +1374,7 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
}
static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid,
- unsigned int epid)
+ unsigned int epid, TRBCCode report)
{
XHCISlot *slot;
XHCIEPContext *epctx;
@@ -1388,7 +1395,9 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned
int slotid,
xferi = epctx->next_xfer;
for (i = 0; i < TD_QUEUE; i++) {
- killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]);
+ killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi], report);
+ if (killed)
+ report = 0; /* Only report once */
epctx->transfers[xferi].packet.ep = NULL;
xferi = (xferi + 1) % TD_QUEUE;
}
@@ -1418,7 +1427,7 @@ static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned
int slotid,
return CC_SUCCESS;
}
- xhci_ep_nuke_xfers(xhci, slotid, epid);
+ xhci_ep_nuke_xfers(xhci, slotid, epid, 0);
epctx = slot->eps[epid-1];
@@ -1460,7 +1469,7 @@ static TRBCCode xhci_stop_ep(XHCIState *xhci, unsigned
int slotid,
return CC_EP_NOT_ENABLED_ERROR;
}
- if (xhci_ep_nuke_xfers(xhci, slotid, epid) > 0) {
+ if (xhci_ep_nuke_xfers(xhci, slotid, epid, CC_STOPPED) > 0) {
fprintf(stderr, "xhci: FIXME: endpoint stopped w/ xfers running, "
"data might be lost\n");
}
@@ -1505,7 +1514,7 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned
int slotid,
return CC_CONTEXT_STATE_ERROR;
}
- if (xhci_ep_nuke_xfers(xhci, slotid, epid) > 0) {
+ if (xhci_ep_nuke_xfers(xhci, slotid, epid, 0) > 0) {
fprintf(stderr, "xhci: FIXME: endpoint reset w/ xfers running, "
"data might be lost\n");
}
@@ -2498,7 +2507,7 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort
*uport)
for (ep = 0; ep < 31; ep++) {
if (xhci->slots[slot].eps[ep]) {
- xhci_ep_nuke_xfers(xhci, slot+1, ep+1);
+ xhci_ep_nuke_xfers(xhci, slot + 1, ep + 1, 0);
}
}
xhci->slots[slot].uport = NULL;
@@ -3311,7 +3320,7 @@ static void xhci_complete(USBPort *port, USBPacket
*packet)
XHCITransfer *xfer = container_of(packet, XHCITransfer, packet);
if (packet->status == USB_RET_REMOVE_FROM_QUEUE) {
- xhci_ep_nuke_one_xfer(xfer);
+ xhci_ep_nuke_one_xfer(xfer, 0);
return;
}
xhci_complete_packet(xfer);
--
1.8.3.1
- [Qemu-devel] [PATCH 0/7] usb: host-libusb and xhci fixes, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 1/7] usb-host-libusb: Fix reset handling, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 2/7] usb-host-libusb: Configuration 0 may be a valid configuration, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 3/7] usb-host-libusb: Detach kernel drivers earlier, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 4/7] usb-hcd-xhci: Remove unused sstreamsm member from XHCIStreamContext, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 5/7] usb-hcd-xhci: Remove unused cancelled member from XHCITransfer, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 6/7] usb-hcd-xhci: Report completion of active transfer with CC_STOPPED on ep stop,
Hans de Goede <=
- [Qemu-devel] [PATCH 7/7] usb-hcd-xhci: Update endpoint context dequeue pointer for streams too, Hans de Goede, 2013/09/23