diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-08-27 15:25:24 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-02 11:06:20 +0200 |
| commit | c96c41ed0d38d68a6c8b6f84751afebafeae31be (patch) | |
| tree | 9c8a49f4de234c41a4acbed266aa04a21cf386d5 /hw/usb | |
| parent | 1556a8fc38dbf4e950c50427192a3a37cdea3cba (diff) | |
| download | qemu-c96c41ed0d38d68a6c8b6f84751afebafeae31be.zip qemu-c96c41ed0d38d68a6c8b6f84751afebafeae31be.tar.gz qemu-c96c41ed0d38d68a6c8b6f84751afebafeae31be.tar.bz2 | |
usb: parallelize usb3 streams
usb3 bulk endpoints with streams are implicitly pipelined now,
so the requests will actually be processed in parallel. Also
allow them to complete out-of-order.
Fixes stalls in the uas driver.
Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/usb/core.c b/hw/usb/core.c index 05948ca..31960c2 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -403,7 +403,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) p->ep->halted = false; } - if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) { + if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline || p->stream) { usb_process_one(p); if (p->status == USB_RET_ASYNC) { /* hcd drivers cannot handle async for isoc */ @@ -420,7 +420,8 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) * When pipelining is enabled usb-devices must always return async, * otherwise packets can complete out of order! */ - assert(!p->ep->pipeline || QTAILQ_EMPTY(&p->ep->queue)); + assert(p->stream || !p->ep->pipeline || + QTAILQ_EMPTY(&p->ep->queue)); if (p->status != USB_RET_NAK) { usb_packet_set_state(p, USB_PACKET_COMPLETE); } @@ -434,7 +435,7 @@ void usb_packet_complete_one(USBDevice *dev, USBPacket *p) { USBEndpoint *ep = p->ep; - assert(QTAILQ_FIRST(&ep->queue) == p); + assert(p->stream || QTAILQ_FIRST(&ep->queue) == p); assert(p->status != USB_RET_ASYNC && p->status != USB_RET_NAK); if (p->status != USB_RET_SUCCESS || |