From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIsCb-0000ak-4n for qemu-devel@nongnu.org; Thu, 08 Jun 2017 03:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIsCX-0006tJ-9Q for qemu-devel@nongnu.org; Thu, 08 Jun 2017 03:49:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37790) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIsCX-0006sz-3e for qemu-devel@nongnu.org; Thu, 08 Jun 2017 03:49:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 434794E4EE for ; Thu, 8 Jun 2017 07:49:51 +0000 (UTC) References: <20170608074122.32099-1-kraxel@redhat.com> From: Laurent Vivier Message-ID: <76d56c88-d08d-62a4-ad74-889b6d1bb469@redhat.com> Date: Thu, 8 Jun 2017 09:49:47 +0200 MIME-Version: 1.0 In-Reply-To: <20170608074122.32099-1-kraxel@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] xhci: only update dequeue ptr on completed transfers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org On 08/06/2017 09:41, Gerd Hoffmann wrote: > The dequeue pointer should only be updated in case the transfer > is actually completed. If we update it for inflight transfers > we will not pick them up again after migration, which easily > triggers with HID devices as they typically have a pending > transfer, waiting for user input to happen. > > Fixes: 243afe858b95765b98d16a1f0dd50dca262858ad > Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1451631 > Signed-off-by: Gerd Hoffmann Tested-by: Laurent Vivier > --- > hw/usb/hcd-xhci.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c > index a0c7960a7b..760135c0d2 100644 > --- a/hw/usb/hcd-xhci.c > +++ b/hw/usb/hcd-xhci.c > @@ -1912,6 +1912,8 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid) > } > assert(!xfer->running_retry); > if (xfer->complete) { > + /* update ring dequeue ptr */ > + xhci_set_ep_state(xhci, epctx, stctx, epctx->state); > xhci_ep_free_xfer(epctx->retry); > } > epctx->retry = NULL; > @@ -1962,6 +1964,8 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid) > xhci_fire_transfer(xhci, xfer, epctx); > } > if (xfer->complete) { > + /* update ring dequeue ptr */ > + xhci_set_ep_state(xhci, epctx, stctx, epctx->state); > xhci_ep_free_xfer(xfer); > xfer = NULL; > } > @@ -1979,8 +1983,6 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid) > break; > } > } > - /* update ring dequeue ptr */ > - xhci_set_ep_state(xhci, epctx, stctx, epctx->state); > epctx->kick_active--; > > ep = xhci_epid_to_usbep(epctx); >