[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] xhci: nuke transfe5rs on detach
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/6] xhci: nuke transfe5rs on detach |
Date: |
Mon, 14 Jan 2013 12:50:16 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 5b2e7f8..5fb0c48 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1197,6 +1197,7 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned
int slotid,
ep = epctx->transfers[xferi].packet.ep;
}
killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]);
+ epctx->transfers[xferi].packet.ep = NULL;
xferi = (xferi + 1) % TD_QUEUE;
}
if (ep) {
@@ -2201,7 +2202,7 @@ static unsigned int xhci_get_slot(XHCIState *xhci,
XHCIEvent *event, XHCITRB *tr
/* cleanup slot state on usb device detach */
static void xhci_detach_slot(XHCIState *xhci, USBPort *uport)
{
- int slot;
+ int slot, ep;
for (slot = 0; slot < xhci->numslots; slot++) {
if (xhci->slots[slot].uport == uport) {
@@ -2212,6 +2213,11 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort
*uport)
return;
}
+ for (ep = 0; ep < 31; ep++) {
+ if (xhci->slots[slot].eps[ep]) {
+ xhci_ep_nuke_xfers(xhci, slot+1, ep+1);
+ }
+ }
xhci->slots[slot].uport = NULL;
}
--
1.7.9.7
- [Qemu-devel] [PULL 0/6] usb patch queue, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 3/6] xhci: nuke transfe5rs on detach,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 1/6] xhci: create xhci_detach_slot helper function, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 5/6] usb-host: Drop superfluous null test from usb_host_auto_scan(), Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 6/6] usb-host: Initialize dev->port the obviously safe way, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 4/6] ehci: Assert state machine is sane w.r.t. EHCIQueue, Gerd Hoffmann, 2013/01/14
- [Qemu-devel] [PATCH 2/6] xhci: call xhci_detach_slot on root port detach too, Gerd Hoffmann, 2013/01/14
- Re: [Qemu-devel] [PULL 0/6] usb patch queue, Anthony Liguori, 2013/01/14