[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] ehci: Don't verify the next pointer for perio
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 07/10] ehci: Don't verify the next pointer for periodic qh-s |
Date: |
Wed, 14 Nov 2012 17:21:42 +0100 |
Windows-XP likes to play tricks with the next pointer for periodic qh-s, so
far we were not hit by this as we never called fill_queue for periodic qh-s,
but with the move to async packet handling for interrupt endpoints this
becomes an issue.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-ehci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index e565d6a..e83bdde 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -443,8 +443,10 @@ static bool ehci_verify_qh(EHCIQueue *q, EHCIqh *qh)
uint32_t endp = get_field(qh->epchar, QH_EPCHAR_EP);
if ((devaddr != get_field(q->qh.epchar, QH_EPCHAR_DEVADDR)) ||
(endp != get_field(q->qh.epchar, QH_EPCHAR_EP)) ||
- (memcmp(&qh->current_qtd, &q->qh.current_qtd,
- 9 * sizeof(uint32_t)) != 0) ||
+ (qh->current_qtd != q->qh.current_qtd) ||
+ (q->async && qh->next_qtd != q->qh.next_qtd) ||
+ (memcmp(&qh->altnext_qtd, &q->qh.altnext_qtd,
+ 7 * sizeof(uint32_t)) != 0) ||
(q->dev != NULL && q->dev->addr != devaddr)) {
return false;
} else {
@@ -455,7 +457,8 @@ static bool ehci_verify_qh(EHCIQueue *q, EHCIqh *qh)
static bool ehci_verify_qtd(EHCIPacket *p, EHCIqtd *qtd)
{
if (p->qtdaddr != p->queue->qtdaddr ||
- (!NLPTR_TBIT(p->qtd.next) && (p->qtd.next != qtd->next)) ||
+ (p->queue->async && !NLPTR_TBIT(p->qtd.next) &&
+ (p->qtd.next != qtd->next)) ||
(!NLPTR_TBIT(p->qtd.altnext) && (p->qtd.altnext != qtd->altnext)) ||
p->qtd.token != qtd->token ||
p->qtd.bufptr[0] != qtd->bufptr[0]) {
--
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 <=
- [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, 2012/11/14
- Re: [Qemu-devel] [PATCH 00/10] ehci: various fixes, Gerd Hoffmann, 2012/11/15