david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xhci: nuke transfe5rs on detach

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-01-08 14:06:51 +01:00
parent f3dcf6384c
commit 0cb41e2c5e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1197,6 +1197,7 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid,
ep = epctx->transfers[xferi].packet.ep; ep = epctx->transfers[xferi].packet.ep;
} }
killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]); killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]);
epctx->transfers[xferi].packet.ep = NULL;
xferi = (xferi + 1) % TD_QUEUE; xferi = (xferi + 1) % TD_QUEUE;
} }
if (ep) { 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 */ /* cleanup slot state on usb device detach */
static void xhci_detach_slot(XHCIState *xhci, USBPort *uport) static void xhci_detach_slot(XHCIState *xhci, USBPort *uport)
{ {
int slot; int slot, ep;
for (slot = 0; slot < xhci->numslots; slot++) { for (slot = 0; slot < xhci->numslots; slot++) {
if (xhci->slots[slot].uport == uport) { if (xhci->slots[slot].uport == uport) {
@ -2212,6 +2213,11 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort *uport)
return; 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; xhci->slots[slot].uport = NULL;
} }