|
 |
1b1995 |
From 82e500c24a026323e0b8b869e227cc68b179fb11 Mon Sep 17 00:00:00 2001
|
|
|
1b1995 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
1b1995 |
Date: Mon, 27 Feb 2012 11:44:52 +0100
|
|
|
1b1995 |
Subject: [PATCH 127/140] usb-ehci: Never follow table entries with the T-bit
|
|
|
1b1995 |
set
|
|
|
1b1995 |
|
|
|
1b1995 |
Before this patch the T-bit was not checked in 2 places, while it should be.
|
|
|
1b1995 |
|
|
|
1b1995 |
Once we properly check the T-bit everywhere we no longer need the weird
|
|
|
1b1995 |
entry < 0x1000 and entry > 0x1000 checks, so this patch removes them.
|
|
|
1b1995 |
|
|
|
1b1995 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
1b1995 |
---
|
|
|
1b1995 |
hw/usb-ehci.c | 10 ++++------
|
|
|
1b1995 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
1b1995 |
|
|
|
1b1995 |
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
|
|
|
1b1995 |
index a6b6ae5..37076a9 100644
|
|
|
1b1995 |
--- a/hw/usb-ehci.c
|
|
|
1b1995 |
+++ b/hw/usb-ehci.c
|
|
|
1b1995 |
@@ -1596,8 +1596,7 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async)
|
|
|
1b1995 |
int again = 0;
|
|
|
1b1995 |
uint32_t entry = ehci_get_fetch_addr(ehci, async);
|
|
|
1b1995 |
|
|
|
1b1995 |
- if (entry < 0x1000) {
|
|
|
1b1995 |
- DPRINTF("fetchentry: entry invalid (0x%08x)\n", entry);
|
|
|
1b1995 |
+ if (NLPTR_TBIT(entry)) {
|
|
|
1b1995 |
ehci_set_state(ehci, async, EST_ACTIVE);
|
|
|
1b1995 |
goto out;
|
|
|
1b1995 |
}
|
|
|
1b1995 |
@@ -1705,7 +1704,8 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async)
|
|
|
1b1995 |
if (q->qh.token & QTD_TOKEN_HALT) {
|
|
|
1b1995 |
ehci_set_state(ehci, async, EST_HORIZONTALQH);
|
|
|
1b1995 |
|
|
|
1b1995 |
- } else if ((q->qh.token & QTD_TOKEN_ACTIVE) && (q->qh.current_qtd > 0x1000)) {
|
|
|
1b1995 |
+ } else if ((q->qh.token & QTD_TOKEN_ACTIVE) &&
|
|
|
1b1995 |
+ (NLPTR_TBIT(q->qh.current_qtd) == 0)) {
|
|
|
1b1995 |
q->qtdaddr = q->qh.current_qtd;
|
|
|
1b1995 |
ehci_set_state(ehci, async, EST_FETCHQTD);
|
|
|
1b1995 |
|
|
|
1b1995 |
@@ -1784,7 +1784,6 @@ static int ehci_state_advqueue(EHCIQueue *q, int async)
|
|
|
1b1995 |
* want data and alt-next qTD is valid
|
|
|
1b1995 |
*/
|
|
|
1b1995 |
if (((q->qh.token & QTD_TOKEN_TBYTES_MASK) != 0) &&
|
|
|
1b1995 |
- (q->qh.altnext_qtd > 0x1000) &&
|
|
|
1b1995 |
(NLPTR_TBIT(q->qh.altnext_qtd) == 0)) {
|
|
|
1b1995 |
q->qtdaddr = q->qh.altnext_qtd;
|
|
|
1b1995 |
ehci_set_state(q->ehci, async, EST_FETCHQTD);
|
|
|
1b1995 |
@@ -1792,8 +1791,7 @@ static int ehci_state_advqueue(EHCIQueue *q, int async)
|
|
|
1b1995 |
/*
|
|
|
1b1995 |
* next qTD is valid
|
|
|
1b1995 |
*/
|
|
|
1b1995 |
- } else if ((q->qh.next_qtd > 0x1000) &&
|
|
|
1b1995 |
- (NLPTR_TBIT(q->qh.next_qtd) == 0)) {
|
|
|
1b1995 |
+ } else if (NLPTR_TBIT(q->qh.next_qtd) == 0) {
|
|
|
1b1995 |
q->qtdaddr = q->qh.next_qtd;
|
|
|
1b1995 |
ehci_set_state(q->ehci, async, EST_FETCHQTD);
|
|
|
1b1995 |
|
|
|
1b1995 |
--
|
|
|
1b1995 |
1.7.9.3
|
|
|
1b1995 |
|