OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ehci: Better detection for qtd-s linked in circles

Browse Source 
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 <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-11-14 17:21:38 +01:00 committed by Gerd Hoffmann
parent ff80ce599e
commit 601a234731
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/hcd-ehci.c
View File

@ -1790,7 +1790,7 @@ static int ehci_fill_queue(EHCIPacket *p)
USBEndpoint *ep = p->packet.ep; USBEndpoint *ep = p->packet.ep;
EHCIQueue *q = p->queue; EHCIQueue *q = p->queue;
EHCIqtd qtd = p->qtd; EHCIqtd qtd = p->qtd;
uint32_t qtdaddr, start_addr = p->qtdaddr; uint32_t qtdaddr;
for (;;) { for (;;) {
if (NLPTR_TBIT(qtd.next) != 0) { 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 * Detect circular td lists, Windows creates these, counting on the
* active bit going low after execution to make the queue stop. * active bit going low after execution to make the queue stop.
*/ */
if (qtdaddr == start_addr) { QTAILQ_FOREACH(p, &q->packets, next) {
break; if (p->qtdaddr == qtdaddr) {
goto leave;
}
} }
get_dwords(q->ehci, NLPTR_GET(qtdaddr), get_dwords(q->ehci, NLPTR_GET(qtdaddr),
(uint32_t *) &qtd, sizeof(EHCIqtd) >> 2); (uint32_t *) &qtd, sizeof(EHCIqtd) >> 2);
@ -1819,6 +1821,7 @@ static int ehci_fill_queue(EHCIPacket *p)
assert(p->packet.status == USB_RET_ASYNC); assert(p->packet.status == USB_RET_ASYNC);
p->async = EHCI_ASYNC_INFLIGHT; p->async = EHCI_ASYNC_INFLIGHT;
} }
leave:
usb_device_flush_ep_queue(ep->dev, ep); usb_device_flush_ep_queue(ep->dev, ep);
return 1; return 1;
} }