From patchwork Wed Nov 14 16:21:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 198962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AAC62C00D8 for ; Thu, 15 Nov 2012 03:48:54 +1100 (EST) Received: from localhost ([::1]:47550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfhr-0000mK-9c for incoming@patchwork.ozlabs.org; Wed, 14 Nov 2012 11:20:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfh3-0007NA-2V for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYfgz-0006z1-Us for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:20:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfgz-0006ys-MH for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:19:57 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAEGJv38012315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Nov 2012 11:19:57 -0500 Received: from shalem.localdomain.com (vpn1-4-130.ams2.redhat.com [10.36.4.130]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAEGJkIW016281; Wed, 14 Nov 2012 11:19:56 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Wed, 14 Nov 2012 17:21:42 +0100 Message-Id: <1352910105-10272-8-git-send-email-hdegoede@redhat.com> In-Reply-To: <1352910105-10272-1-git-send-email-hdegoede@redhat.com> References: <1352910105-10272-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/10] ehci: Don't verify the next pointer for periodic qh-s X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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]) {