[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/20] usb-ehci: Never follow table entries with the
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/20] usb-ehci: Never follow table entries with the T-bit set |
Date: |
Wed, 7 Mar 2012 14:05:02 +0100 |
From: Hans de Goede <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-ehci.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index afc8ccf..d41b80e 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1568,8 +1568,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;
}
@@ -1677,7 +1676,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);
@@ -1756,7 +1756,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);
@@ -1764,8 +1763,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.1
- [Qemu-devel] [PATCH 05/20] usb-ehci: Drop cached qhs when the doorbell gets rung, (continued)
- [Qemu-devel] [PATCH 05/20] usb-ehci: Drop cached qhs when the doorbell gets rung, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 13/20] usb: add USB_RET_IOERROR, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 04/20] usb-ehci: always call ehci_queues_rip_unused for period queues, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 08/20] usb-ehci: Fix cerr tracking, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 20/20] xhci: fix port status, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 10/20] usb-ehci: Fix and simplify nakcnt handling, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 14/20] uhci_fill_queue: zap debug printf, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 07/20] usb-ehci: Any packet completion except for NAK should set the interrupt, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 09/20] usb-ehci: Remove dead nakcnt code, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 17/20] usb-host: enable pipelineing for bulk endpoints., Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 02/20] usb-ehci: Never follow table entries with the T-bit set,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/20] usb-ehci: Cleanup itd error handling, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 18/20] usb: add shortcut for control transfers, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 16/20] usb: add pipelining option to usb endpoints, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 06/20] usb-ehci: Rip the queues when the async or period schedule is halted, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 19/20] xhci: fix control xfers, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 15/20] usb: queue can have async packets, Gerd Hoffmann, 2012/03/07
- [Qemu-devel] [PATCH 01/20] usb-redir: Set ep type and interface, Gerd Hoffmann, 2012/03/07
- Re: [Qemu-devel] [PULL 00/20] usb patch queue, Anthony Liguori, 2012/03/09