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

xhci: flush dequeue pointer to endpoint context

Browse Source 
When done processing a endpoint ring we must update the dequeue pointer
in the endpoint context in guest memory.  This is needed to make sure
the guest has a correct view of things and also to make live migration
work properly, because xhci post_load restores alot of the state from
xhci data structures in guest memory.

Add xhci_set_ep_state() call to do that.

The recursive calls stopped by commit
ddb603ab6c981c1d67cb42266fc700c33e5b2d8f had the (unintentional) side
effect to hiding this bug.  xhci_set_ep_state() was called before
processing, to set the state to running, which updated the dequeue
pointer too.

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 20170331102521.29253-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-03-31 12:25:21 +02:00
parent 95b31d709b
commit 243afe858b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2063,7 +2063,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,
static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid) static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid)
{ {
XHCIState *xhci = epctx->xhci; XHCIState *xhci = epctx->xhci;
XHCIStreamContext *stctx; XHCIStreamContext *stctx = NULL;
XHCITransfer *xfer; XHCITransfer *xfer;
XHCIRing *ring; XHCIRing *ring;
USBEndpoint *ep = NULL; USBEndpoint *ep = NULL;
@ -2186,6 +2186,8 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid)
break; break;
} }
} }
/* update ring dequeue ptr */
xhci_set_ep_state(xhci, epctx, stctx, epctx->state);
epctx->kick_active--; epctx->kick_active--;
ep = xhci_epid_to_usbep(epctx); ep = xhci_epid_to_usbep(epctx);