From 82e500c24a026323e0b8b869e227cc68b179fb11 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Mon, 27 Feb 2012 11:44:52 +0100

Subject: [PATCH 127/140] usb-ehci: Never follow table entries with the T-bit

 set

Before this patch the T-bit was not checked in 2 places, while it should be.

Once we properly check the T-bit everywhere we no longer need the weird

entry < 0x1000 and entry > 0x1000 checks, so this patch removes them.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 hw/usb-ehci.c |   10 ++++------

 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c

index a6b6ae5..37076a9 100644

--- a/hw/usb-ehci.c

+++ b/hw/usb-ehci.c

@@ -1596,8 +1596,7 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async)

     int again = 0;

     uint32_t entry = ehci_get_fetch_addr(ehci, async);

-    if (entry < 0x1000) {

-        DPRINTF("fetchentry: entry invalid (0x%08x)\n", entry);

+    if (NLPTR_TBIT(entry)) {

         ehci_set_state(ehci, async, EST_ACTIVE);

         goto out;

     }

@@ -1705,7 +1704,8 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)

     if (q->qh.token & QTD_TOKEN_HALT) {

         ehci_set_state(ehci, async, EST_HORIZONTALQH);

-    } else if ((q->qh.token & QTD_TOKEN_ACTIVE) && (q->qh.current_qtd > 0x1000)) {

+    } else if ((q->qh.token & QTD_TOKEN_ACTIVE) &&

+               (NLPTR_TBIT(q->qh.current_qtd) == 0)) {

         q->qtdaddr = q->qh.current_qtd;

         ehci_set_state(ehci, async, EST_FETCHQTD);

@@ -1784,7 +1784,6 @@ static int ehci_state_advqueue(EHCIQueue *q, int async)

      * want data and alt-next qTD is valid

      */

     if (((q->qh.token & QTD_TOKEN_TBYTES_MASK) != 0) &&

-        (q->qh.altnext_qtd > 0x1000) &&

         (NLPTR_TBIT(q->qh.altnext_qtd) == 0)) {

         q->qtdaddr = q->qh.altnext_qtd;

         ehci_set_state(q->ehci, async, EST_FETCHQTD);

@@ -1792,8 +1791,7 @@ static int ehci_state_advqueue(EHCIQueue *q, int async)

     /*

      *  next qTD is valid

      */

-    } else if ((q->qh.next_qtd > 0x1000) &&

-               (NLPTR_TBIT(q->qh.next_qtd) == 0)) {

+    } else if (NLPTR_TBIT(q->qh.next_qtd) == 0) {

         q->qtdaddr = q->qh.next_qtd;

         ehci_set_state(q->ehci, async, EST_FETCHQTD);

-- 

1.7.9.3