[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/11] usb-redir: allocate buffers before waking up t
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 11/11] usb-redir: allocate buffers before waking up the host adapter |
Date: |
Wed, 12 Oct 2016 14:58:18 +0200 |
From: Hans de Goede <address@hidden>
Needed to make sure usb redirection is prepared to actually handle the
callback from the usb host adapter. Without this interrupt endpoints
don't work on xhci.
Note: On ehci the usb_wakeup() call only schedules a BH for the actual
work, which hides this bug because the allocation happens before ehci
calls back even without this patch.
Signed-off-by: Hans de Goede <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/redirect.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 444672a..d4ca026 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -2036,18 +2036,22 @@ static void usbredir_interrupt_packet(void *priv,
uint64_t id,
}
if (ep & USB_DIR_IN) {
+ bool q_was_empty;
+
if (dev->endpoint[EP2I(ep)].interrupt_started == 0) {
DPRINTF("received int packet while not started ep %02X\n", ep);
free(data);
return;
}
- if (QTAILQ_EMPTY(&dev->endpoint[EP2I(ep)].bufpq)) {
- usb_wakeup(usb_ep_get(&dev->dev, USB_TOKEN_IN, ep & 0x0f), 0);
- }
+ q_was_empty = QTAILQ_EMPTY(&dev->endpoint[EP2I(ep)].bufpq);
/* bufp_alloc also adds the packet to the ep queue */
bufp_alloc(dev, data, data_len, interrupt_packet->status, ep, data);
+
+ if (q_was_empty) {
+ usb_wakeup(usb_ep_get(&dev->dev, USB_TOKEN_IN, ep & 0x0f), 0);
+ }
} else {
/*
* We report output interrupt packets as completed directly upon
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] usb patch queue, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 05/11] xhci: drop XHCITransfer->xhci, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 07/11] xhci: drop XHCITransfer->{slotid,epid}, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 08/11] xhci: make xhci_epid_to_usbep accept XHCIEPContext, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 10/11] usb: Fix incorrect default DMA offset., Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 02/11] xhci: decouple EV_QUEUE from TD_QUEUE, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 04/11] xhci: use linked list for transfers, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 11/11] usb-redir: allocate buffers before waking up the host adapter,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 06/11] xhci: add & use xhci_kick_epctx(), Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 03/11] xhci: drop unused comp_xfer field, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 01/11] xhci: limit the number of link trbs we are willing to process, Gerd Hoffmann, 2016/10/12
- [Qemu-devel] [PULL 09/11] usb: fix serial generator, Gerd Hoffmann, 2016/10/12
- Re: [Qemu-devel] [PULL 00/11] usb patch queue, Peter Maydell, 2016/10/12