[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] ehci: Better detection for qtd-s linked in ci
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 03/10] ehci: Better detection for qtd-s linked in circles |
Date: |
Wed, 14 Nov 2012 17:21:38 +0100 |
Windows links interrupt qtd-s in circles, which means that when interrupt
endpoints return USB_RET_ASYNC, combined with the recent
"ehci: Retry to fill the queue while waiting for td completion" patch,
we keep adding the tds to the queue over and over again, as we detect the
circle from fill_queue, but we call it over and over again ...
This patch fixes this by changing the circle detection to also detect
circling into tds already queued up previously.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-ehci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 5e3b4a8..89b7520 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1790,7 +1790,7 @@ static int ehci_fill_queue(EHCIPacket *p)
USBEndpoint *ep = p->packet.ep;
EHCIQueue *q = p->queue;
EHCIqtd qtd = p->qtd;
- uint32_t qtdaddr, start_addr = p->qtdaddr;
+ uint32_t qtdaddr;
for (;;) {
if (NLPTR_TBIT(qtd.next) != 0) {
@@ -1801,8 +1801,10 @@ static int ehci_fill_queue(EHCIPacket *p)
* Detect circular td lists, Windows creates these, counting on the
* active bit going low after execution to make the queue stop.
*/
- if (qtdaddr == start_addr) {
- break;
+ QTAILQ_FOREACH(p, &q->packets, next) {
+ if (p->qtdaddr == qtdaddr) {
+ goto leave;
+ }
}
get_dwords(q->ehci, NLPTR_GET(qtdaddr),
(uint32_t *) &qtd, sizeof(EHCIqtd) >> 2);
@@ -1819,6 +1821,7 @@ static int ehci_fill_queue(EHCIPacket *p)
assert(p->packet.status == USB_RET_ASYNC);
p->async = EHCI_ASYNC_INFLIGHT;
}
+leave:
usb_device_flush_ep_queue(ep->dev, ep);
return 1;
}
--
1.7.12.1
- [Qemu-devel] [PATCH 00/10] ehci: various fixes, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 01/10] ehci: Don't access packet after freeing it, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 02/10] ehci: Fixup q->qtdaddr after cancelling an already completed packet, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 03/10] ehci: Better detection for qtd-s linked in circles,
Hans de Goede <=
- [Qemu-devel] [PATCH 04/10] ehci: Add a ehci_writeback_async_complete_packet helper function, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 05/10] ehci: Add ehci_verify_qh and ehci_verify_qtd helper functions, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 06/10] ehci: Verify guest does not change the token of inflight qtd-s, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 07/10] ehci: Don't verify the next pointer for periodic qh-s, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 08/10] ehci: Move get / put_dwords upwards, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 09/10] ehci: writeback_async_complete_packet: verify qh and qtd, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 10/10] ehci: Verify qtd for async completed packets, Hans de Goede, 2012/11/14
- Re: [Qemu-devel] [PATCH 00/10] ehci: various fixes, Gerd Hoffmann, 2012/11/15