[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/12] usb-ehci: fix error handling.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/12] usb-ehci: fix error handling. |
Date: |
Thu, 26 May 2011 12:44:12 +0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/12] ehci: tracing, multiqueue, bugfixes., Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 04/12] usb-ehci: trace port state, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 01/12] usb-linux: catch NODEV in more places., Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 02/12] usb-ehci: trace mmio and usbsts, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 03/12] usb-ehci: trace state machine changes, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 06/12] usb-ehci: trace buffer copy, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 09/12] usb-ehci: fix offset writeback in ehci_buffer_rw, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 05/12] usb-ehci: improve mmio tracing, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 10/12] usb-ehci: fix error handling.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/12] ehci: fix a number of unused-but-set-variable warnings (new with gcc-4.6), Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 08/12] usb-ehci: multiqueue support, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 12/12] usb: cancel async packets on unplug, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 07/12] usb-ehci: add queue data struct, Gerd Hoffmann, 2011/05/26