From 46691523c6452a9b18902c45e355fac90250e61c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 23 Jun 2011 12:42:15 -0300 Subject: [RHEL6 qemu-kvm PATCH 099/115] usb-ehci: fix error handling. RH-Author: Gerd Hoffmann Message-id: <1308832951-8995-100-git-send-email-kraxel@redhat.com> Patchwork-id: 28418 O-Subject: [RHEL-6.2 kvm PATCH 099/115] usb-ehci: fix error handling. Bugzilla: 561414 632299 645351 711354 RH-Acked-by: Hans de Goede RH-Acked-by: Jes Sorensen Set the correct bits for nodev, stall and babble errors. Raise errint irq. Fix state transition from WRITEBACK to the next state. Signed-off-by: Gerd Hoffmann (cherry picked from commit d2bd525fbbebcb108a62963140dad076b476aa5f) --- hw/usb-ehci.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) Signed-off-by: Eduardo Habkost --- hw/usb-ehci.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index 38e4992..6c3b93f 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -1114,10 +1114,10 @@ err: switch(q->usb_status) { case USB_RET_NODEV: - fprintf(stderr, "USB no device\n"); + q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_XACTERR); + ehci_record_interrupt(q->ehci, USBSTS_ERRINT); break; case USB_RET_STALL: - fprintf(stderr, "USB stall\n"); q->qh.token |= QTD_TOKEN_HALT; ehci_record_interrupt(q->ehci, USBSTS_ERRINT); break; @@ -1133,8 +1133,7 @@ err: } break; case USB_RET_BABBLE: - fprintf(stderr, "USB babble TODO\n"); - q->qh.token |= QTD_TOKEN_BABBLE; + q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_BABBLE); ehci_record_interrupt(q->ehci, USBSTS_ERRINT); break; default: @@ -1792,15 +1791,21 @@ static int ehci_state_writeback(EHCIQueue *q, int async) put_dwords(NLPTR_GET(q->qtdaddr),(uint32_t *) &q->qh.next_qtd, sizeof(EHCIqtd) >> 2); - /* TODO confirm next state. For now, keep going if async - * but stop after one qtd if periodic + /* + * EHCI specs say go horizontal here. + * + * We can also advance the queue here for performance reasons. We + * need to take care to only take that shortcut in case we've + * processed the qtd just written back without errors, i.e. halt + * bit is clear. */ - //if (async) { + if (q->qh.token & QTD_TOKEN_HALT) { + ehci_set_state(q->ehci, async, EST_HORIZONTALQH); + again = 1; + } else { ehci_set_state(q->ehci, async, EST_ADVANCEQUEUE); again = 1; - //} else { - // ehci_set_state(ehci, async, EST_ACTIVE); - //} + } return again; } -- 1.7.3.2