From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTZ6D-0008CV-7x for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTZ6A-0005Po-5U for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTZ69-0005Ow-2C for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:01 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p56Ce04K031947 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 6 Jun 2011 08:40:00 -0400 From: Gerd Hoffmann Date: Mon, 6 Jun 2011 14:39:01 +0200 Message-Id: <1307363962-27223-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1307363962-27223-1-git-send-email-kraxel@redhat.com> References: <1307363962-27223-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/31] usb-ehci: fix error handling. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- 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 cf10dfc..2bbb5e4 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.1