[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/21] usb-uhci: stop queue filling when we find a i
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/21] usb-uhci: stop queue filling when we find a in-flight td |
Date: |
Tue, 17 Apr 2012 10:45:07 +0200 |
Not only QHs can form rings, but TDs too. With the new
queuing/pipelining support we are following TD chains and
can actually walk in circles. An assert() prevents us from
entering an endless loop then.
Fix is easy: Just stop queuing when we figure the TD we are
about to queue up is in flight already.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-uhci.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index e55dad9..2be564b 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -965,6 +965,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
}
trace_usb_uhci_td_queue(plink & ~0xf, ptd.ctrl, ptd.token);
ret = uhci_handle_td(s, plink, &ptd, &int_mask);
+ if (ret == TD_RESULT_ASYNC_CONT) {
+ break;
+ }
assert(ret == TD_RESULT_ASYNC_START);
assert(int_mask == 0);
plink = ptd.link;
--
1.7.1
- [Qemu-devel] [PATCH 18/21] usb-host: rewrite usb_linux_update_endp_table, (continued)
- [Qemu-devel] [PATCH 18/21] usb-host: rewrite usb_linux_update_endp_table, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 21/21] usb-ehci: drop assert(), Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 08/21] usb-host: add property to turn off pipelining, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 19/21] usb-ehci: Drop unused sofv value, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 16/21] usb: use USBDescriptor for interface descriptors., Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 09/21] usb_packet_set_state: handle p->ep == NULL, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 06/21] usb-host: trace canceled requests, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 20/21] usb-redir: Notify our peer when we reject a device due to a speed mismatch, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 13/21] usb: add USBDescriptor, use for device descriptors., Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 12/21] usb-ehci: frindex always is a 14 bits counter, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 02/21] usb-uhci: stop queue filling when we find a in-flight td,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 15/21] usb: use USBDescriptor for config descriptors., Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 04/21] Add bootindex support to usb-host and usb-redir, Gerd Hoffmann, 2012/04/17
- [Qemu-devel] [PATCH 07/21] usb-host: add usb packet to request tracepoints, Gerd Hoffmann, 2012/04/17
- Re: [Qemu-devel] [PULL 00/21] usb patch queue, Hans de Goede, 2012/04/17