|
 |
5544c1b |
From d6968ced27f697b26d7a1d5b44f15eeb300a9fd6 Mon Sep 17 00:00:00 2001
|
|
 |
c8dfc65 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
c8dfc65 |
Date: Fri, 31 Aug 2012 15:30:51 +0200
|
|
|
5544c1b |
Subject: [PATCH] xhci: pick target interrupter
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Pick the correct interrupter when queuing an event.
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
c8dfc65 |
---
|
|
|
c8dfc65 |
hw/usb/hcd-xhci.c | 22 ++++++++++++++++------
|
|
|
c8dfc65 |
1 file changed, 16 insertions(+), 6 deletions(-)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
5544c1b |
index 6b3ff16..3b03c6c 100644
|
|
|
c8dfc65 |
--- a/hw/usb/hcd-xhci.c
|
|
|
c8dfc65 |
+++ b/hw/usb/hcd-xhci.c
|
|
|
c8dfc65 |
@@ -264,6 +264,10 @@ typedef enum TRBCCode {
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
#define TRB_LK_TC (1<<1)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
+#define TRB_INTR_SHIFT 22
|
|
|
c8dfc65 |
+#define TRB_INTR_MASK 0x3ff
|
|
|
c8dfc65 |
+#define TRB_INTR(t) (((t).status >> TRB_INTR_SHIFT) & TRB_INTR_MASK)
|
|
|
c8dfc65 |
+
|
|
|
c8dfc65 |
#define EP_TYPE_MASK 0x7
|
|
|
c8dfc65 |
#define EP_TYPE_SHIFT 3
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
@@ -806,10 +810,16 @@ static void xhci_events_update(XHCIState *xhci, int v)
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v)
|
|
|
c8dfc65 |
{
|
|
|
c8dfc65 |
- XHCIInterrupter *intr = &xhci->intr[v];
|
|
|
c8dfc65 |
+ XHCIInterrupter *intr;
|
|
|
c8dfc65 |
dma_addr_t erdp;
|
|
|
c8dfc65 |
unsigned int dp_idx;
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
+ if (v >= MAXINTRS) {
|
|
|
c8dfc65 |
+ DPRINTF("intr nr out of range (%d >= %d)\n", v, MAXINTRS);
|
|
|
c8dfc65 |
+ return;
|
|
|
c8dfc65 |
+ }
|
|
|
c8dfc65 |
+ intr = &xhci->intr[v];
|
|
|
c8dfc65 |
+
|
|
|
c8dfc65 |
if (intr->er_full) {
|
|
|
c8dfc65 |
DPRINTF("xhci_event(): ER full, queueing\n");
|
|
|
c8dfc65 |
if (((intr->ev_buffer_put+1) % EV_QUEUE) == intr->ev_buffer_get) {
|
|
|
c8dfc65 |
@@ -1377,7 +1387,7 @@ static void xhci_xfer_report(XHCITransfer *xfer)
|
|
|
c8dfc65 |
DPRINTF("xhci_xfer_data: EDTLA=%d\n", event.length);
|
|
|
c8dfc65 |
edtla = 0;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
- xhci_event(xhci, &event, 0 /* FIXME */);
|
|
|
c8dfc65 |
+ xhci_event(xhci, &event, TRB_INTR(*trb));
|
|
|
c8dfc65 |
reported = 1;
|
|
|
c8dfc65 |
if (xfer->status != CC_SUCCESS) {
|
|
|
c8dfc65 |
return;
|
|
|
5544c1b |
@@ -2253,7 +2263,7 @@ static void xhci_process_commands(XHCIState *xhci)
|
|
|
c8dfc65 |
break;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
event.slotid = slotid;
|
|
|
c8dfc65 |
- xhci_event(xhci, &event, 0 /* FIXME */);
|
|
|
c8dfc65 |
+ xhci_event(xhci, &event, 0);
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
|
|
|
5544c1b |
@@ -2283,7 +2293,7 @@ static void xhci_update_port(XHCIState *xhci, XHCIPort *port, int is_detach)
|
|
|
c8dfc65 |
port->portsc |= PORTSC_CSC;
|
|
|
c8dfc65 |
XHCIEvent ev = { ER_PORT_STATUS_CHANGE, CC_SUCCESS,
|
|
|
c8dfc65 |
port->portnr << 24};
|
|
|
c8dfc65 |
- xhci_event(xhci, &ev, 0 /* FIXME */);
|
|
|
c8dfc65 |
+ xhci_event(xhci, &ev, 0);
|
|
|
c8dfc65 |
DPRINTF("xhci: port change event for port %d\n", port->portnr);
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
}
|
|
|
5544c1b |
@@ -2562,7 +2572,7 @@ static void xhci_oper_write(XHCIState *xhci, uint32_t reg, uint32_t val)
|
|
|
c8dfc65 |
if (xhci->crcr_low & (CRCR_CA|CRCR_CS) && (xhci->crcr_low & CRCR_CRR)) {
|
|
|
c8dfc65 |
XHCIEvent event = {ER_COMMAND_COMPLETE, CC_COMMAND_RING_STOPPED};
|
|
|
c8dfc65 |
xhci->crcr_low &= ~CRCR_CRR;
|
|
|
c8dfc65 |
- xhci_event(xhci, &event, 0 /* FIXME */);
|
|
|
c8dfc65 |
+ xhci_event(xhci, &event, 0);
|
|
|
c8dfc65 |
DPRINTF("xhci: command ring stopped (CRCR=%08x)\n", xhci->crcr_low);
|
|
|
c8dfc65 |
} else {
|
|
|
c8dfc65 |
dma_addr_t base = xhci_addr64(xhci->crcr_low & ~0x3f, val);
|
|
|
c8dfc65 |
@@ -2807,7 +2817,7 @@ static void xhci_wakeup(USBPort *usbport)
|
|
|
c8dfc65 |
return;
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
port->portsc |= PORTSC_PLC;
|
|
|
c8dfc65 |
- xhci_event(xhci, &ev, 0 /* FIXME */);
|
|
|
c8dfc65 |
+ xhci_event(xhci, &ev, 0);
|
|
|
c8dfc65 |
}
|
|
|
c8dfc65 |
|
|
|
c8dfc65 |
static void xhci_complete(USBPort *port, USBPacket *packet)
|
|
|
c8dfc65 |
--
|
|
|
5544c1b |
1.7.12.1
|
|
|
c8dfc65 |
|