[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] ehci: Verify qtd for async completed packets
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 10/10] ehci: Verify qtd for async completed packets |
Date: |
Wed, 14 Nov 2012 17:21:45 +0100 |
Remove the short-circuiting of fetchqtd in fetchqh, so that the
qtd gets properly verified before completing the transaction.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-ehci.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 6d23af1..da413fb 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1570,7 +1570,6 @@ out:
static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
{
uint32_t entry;
- EHCIPacket *p;
EHCIQueue *q;
EHCIqh qh;
@@ -1579,7 +1578,6 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int
async)
if (NULL == q) {
q = ehci_alloc_queue(ehci, entry, async);
}
- p = QTAILQ_FIRST(&q->packets);
q->seen++;
if (q->seen > 1) {
@@ -1601,7 +1599,6 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int
async)
if (ehci_reset_queue(q) > 0) {
ehci_trace_guest_bug(ehci, "guest updated active QH");
}
- p = NULL;
}
q->qh = qh;
@@ -1615,13 +1612,6 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci,
int async)
get_field(q->qh.epchar, QH_EPCHAR_DEVADDR));
}
- if (p && p->async == EHCI_ASYNC_FINISHED) {
- /* I/O finished -- continue processing queue */
- trace_usb_ehci_packet_action(p->queue, p, "complete");
- ehci_set_state(ehci, async, EST_EXECUTING);
- goto out;
- }
-
if (async && (q->qh.epchar & QH_EPCHAR_H)) {
/* EHCI spec version 1.0 Section 4.8.3 & 4.10.1 */
@@ -1792,10 +1782,7 @@ static int ehci_state_fetchqtd(EHCIQueue *q)
ehci_set_state(q->ehci, q->async, EST_HORIZONTALQH);
break;
case EHCI_ASYNC_FINISHED:
- /*
- * We get here when advqueue moves to a packet which is already
- * finished, which can happen with packets queued up by fill_queue
- */
+ /* Complete executing of the packet */
ehci_set_state(q->ehci, q->async, EST_EXECUTING);
break;
}
--
1.7.12.1
- [Qemu-devel] [PATCH 00/10] ehci: various fixes, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 01/10] ehci: Don't access packet after freeing it, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 02/10] ehci: Fixup q->qtdaddr after cancelling an already completed packet, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 03/10] ehci: Better detection for qtd-s linked in circles, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 04/10] ehci: Add a ehci_writeback_async_complete_packet helper function, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 05/10] ehci: Add ehci_verify_qh and ehci_verify_qtd helper functions, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 06/10] ehci: Verify guest does not change the token of inflight qtd-s, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 07/10] ehci: Don't verify the next pointer for periodic qh-s, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 08/10] ehci: Move get / put_dwords upwards, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 09/10] ehci: writeback_async_complete_packet: verify qh and qtd, Hans de Goede, 2012/11/14
- [Qemu-devel] [PATCH 10/10] ehci: Verify qtd for async completed packets,
Hans de Goede <=
- Re: [Qemu-devel] [PATCH 00/10] ehci: various fixes, Gerd Hoffmann, 2012/11/15