[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking |
Date: |
Fri, 2 Mar 2012 21:27:15 +0100 |
cerr should only be decremented on errors which cause XactErr to be set, and
when that happens the failing transaction should be retried until cerr reaches
0 and only then should USBSTS_ERRINT be set (and inactive cleared and
USBSTS_INT set if requested).
Since we don't have any hardware level errors (and in case of redirection
the real hardware has already retried), re-trying makes no sense, so
immediately set cerr to 0 on errors which set XactErr.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb-ehci.c | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index 507e4a8..2685adc 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1291,7 +1291,7 @@ static void ehci_async_complete_packet(USBPort *port,
USBPacket *packet)
static void ehci_execute_complete(EHCIQueue *q)
{
- int c_err, reload;
+ int reload;
assert(q->async != EHCI_ASYNC_INFLIGHT);
q->async = EHCI_ASYNC_NONE;
@@ -1300,15 +1300,10 @@ static void ehci_execute_complete(EHCIQueue *q)
q->qhaddr, q->qh.next, q->qtdaddr, q->usb_status);
if (q->usb_status < 0) {
-err:
- /* TO-DO: put this is in a function that can be invoked below as well
*/
- c_err = get_field(q->qh.token, QTD_TOKEN_CERR);
- c_err--;
- set_field(&q->qh.token, c_err, QTD_TOKEN_CERR);
-
switch(q->usb_status) {
case USB_RET_NODEV:
q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_XACTERR);
+ set_field(&q->qh.token, 0, QTD_TOKEN_CERR);
ehci_record_interrupt(q->ehci, USBSTS_ERRINT);
break;
case USB_RET_STALL:
@@ -1336,15 +1331,13 @@ err:
assert(0);
break;
}
+ } else if ((q->usb_status > q->tbytes) && (q->pid == USB_TOKEN_IN)) {
+ q->usb_status = USB_RET_BABBLE;
+ q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_BABBLE);
+ ehci_record_interrupt(q->ehci, USBSTS_ERRINT);
} else {
- // DPRINTF("Short packet condition\n");
// TODO check 4.12 for splits
- if ((q->usb_status > q->tbytes) && (q->pid == USB_TOKEN_IN)) {
- q->usb_status = USB_RET_BABBLE;
- goto err;
- }
-
if (q->tbytes && q->pid == USB_TOKEN_IN) {
q->tbytes -= q->usb_status;
} else {
--
1.7.7.6
- [Qemu-devel] usb patches [v2], Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 02/13] usb-ehci: Never follow table entries with the T-bit set, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 03/13] usb-ehci: split our qh queue into async and periodic queues, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 06/13] usb-ehci: Rip the queues when the async or period schedule is halted, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 07/13] usb-ehci: Any packet completion except for NAK should set the interrupt, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 08/13] usb-ehci: Fix cerr tracking,
Hans de Goede <=
- [Qemu-devel] [PATCH 10/13] usb-ehci: Fix and simplify nakcnt handling, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 11/13] usb-ehci: Cleanup itd error handling, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 12/13] usb: return BABBLE rather then NAK when we receive too much data, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 13/13] usb: add USB_RET_IOERROR, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 01/13] usb-redir: Set ep type and interface, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 04/13] usb-ehci: always call ehci_queues_rip_unused for period queues, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 05/13] usb-ehci: Drop cached qhs when the doorbell gets rung, Hans de Goede, 2012/03/02
- [Qemu-devel] [PATCH 09/13] usb-ehci: Remove dead nakcnt code, Hans de Goede, 2012/03/02
- Re: [Qemu-devel] usb patches [v2], Gerd Hoffmann, 2012/03/05