|
 |
5544c1b |
From 90905dca56de07f7c394ef8cbe480a0d08e0d8cd Mon Sep 17 00:00:00 2001
|
|
 |
c8dfc65 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
c8dfc65 |
Date: Mon, 3 Sep 2012 11:35:58 +0200
|
|
|
5544c1b |
Subject: [PATCH] ehci: Handle USB_RET_PROCERR in ehci_fill_queue
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
USB_RET_PROCERR can be triggered by the guest (by for example requesting more
|
|
|
c8dfc65 |
then BUFFSIZE bytes), so don't assert on it.
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
c8dfc65 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5544c1b |
(cherry picked from commit eff6dce79bd7ad3c16d75c5e55b5a2a137ba6a60)
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
c8dfc65 |
---
|
|
|
c8dfc65 |
hw/usb/hcd-ehci.c | 9 ++++++---
|
|
|
c8dfc65 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
|
|
c8dfc65 |
index d87aca8..2534394 100644
|
|
|
c8dfc65 |
--- a/hw/usb/hcd-ehci.c
|
|
|
c8dfc65 |
+++ b/hw/usb/hcd-ehci.c
|
|
|
c8dfc65 |
@@ -2076,7 +2076,7 @@ static int ehci_state_horizqh(EHCIQueue *q)
|
|
|
c8dfc65 |
return again;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
-static void ehci_fill_queue(EHCIPacket *p)
|
|
|
c8dfc65 |
+static int ehci_fill_queue(EHCIPacket *p)
|
|
|
c8dfc65 |
{
|
|
|
c8dfc65 |
EHCIQueue *q = p->queue;
|
|
|
c8dfc65 |
EHCIqtd qtd = p->qtd;
|
|
|
c8dfc65 |
@@ -2100,9 +2100,13 @@ static void ehci_fill_queue(EHCIPacket *p)
|
|
|
c8dfc65 |
p->qtdaddr = qtdaddr;
|
|
|
c8dfc65 |
p->qtd = qtd;
|
|
|
c8dfc65 |
p->usb_status = ehci_execute(p, "queue");
|
|
|
c8dfc65 |
+ if (p->usb_status == USB_RET_PROCERR) {
|
|
|
c8dfc65 |
+ break;
|
|
|
c8dfc65 |
+ }
|
|
|
c8dfc65 |
assert(p->usb_status == USB_RET_ASYNC);
|
|
|
c8dfc65 |
p->async = EHCI_ASYNC_INFLIGHT;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
+ return p->usb_status;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
static int ehci_state_execute(EHCIQueue *q)
|
|
|
c8dfc65 |
@@ -2144,8 +2148,7 @@ static int ehci_state_execute(EHCIQueue *q)
|
|
|
c8dfc65 |
trace_usb_ehci_packet_action(p->queue, p, "async");
|
|
|
c8dfc65 |
p->async = EHCI_ASYNC_INFLIGHT;
|
|
|
c8dfc65 |
ehci_set_state(q->ehci, q->async, EST_HORIZONTALQH);
|
|
|
c8dfc65 |
- again = 1;
|
|
|
c8dfc65 |
- ehci_fill_queue(p);
|
|
|
c8dfc65 |
+ again = (ehci_fill_queue(p) == USB_RET_PROCERR) ? -1 : 1;
|
|
|
c8dfc65 |
goto out;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
|