summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-03-02 21:27:11 +0100
committerGerd Hoffmann <kraxel@redhat.com>2012-03-07 12:28:03 +0100
commit7bce354e148b0ae0ceae7582574810adc6fab4e4 (patch)
tree17fc7830c0007cdc7c453fcd3b60c3e3955bdb70
parentdf5d5c5c9eeaedb7705b4df6f5ee8083f39cf7b5 (diff)
downloadqemu-7bce354e148b0ae0ceae7582574810adc6fab4e4.tar.gz
usb-ehci: always call ehci_queues_rip_unused for period queues
Before this patch USB 2 devices with interrupt endpoints were not working properly. The problem is that to avoid loops we stop processing as soon as we encounter a queue-head (qh) we've already seen since qhs can be linked in a circular fashion, this is tracked by the seen flag in our qh struct. The resetting of the seen flag is done from ehci_queues_rip_unused which before this patch was only called when executing the statemachine for the async schedule. But packets for interrupt endpoints are part of the periodic schedule! So what would happen is that when there were no ctrl or bulk packets for a USB 2 device with an interrupt endpoint, the async schedule would become non active, then ehci_queues_rip_unused would no longer get called and when processing the qhs for the interrupt endpoints from the periodic schedule their seen bit would still be 1 and they would be skipped. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb-ehci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index 840022d2b2..d384fcc9b5 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -2167,6 +2167,7 @@ static void ehci_advance_periodic_state(EHCIState *ehci)
ehci_set_fetch_addr(ehci, async,entry);
ehci_set_state(ehci, async, EST_FETCHENTRY);
ehci_advance_state(ehci, async);
+ ehci_queues_rip_unused(ehci, async);
break;
default: