|
 |
9ae3a8 |
From 6b9188baee63673ee4816b7bb994a7be3e164fce Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 7 Aug 2013 09:22:47 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 16/28] xhci: add xhci_init_epctx
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1375867368-18979-5-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53037
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 4/5] xhci: add xhci_init_epctx
|
|
|
9ae3a8 |
Bugzilla: 838170
|
|
|
9ae3a8 |
RH-Acked-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Factor out endpoint context initialization to a separate function.
|
|
|
9ae3a8 |
xhci live migration will need that too, in post_load.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 003e15a180373048f0c1f4df0bfe303746eb2676)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 43 +++++++++++++++++++++++++------------------
|
|
|
9ae3a8 |
1 file changed, 25 insertions(+), 18 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 43 +++++++++++++++++++++++++------------------
|
|
|
9ae3a8 |
1 files changed, 25 insertions(+), 18 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
index 7f46ccc..8224465 100644
|
|
|
9ae3a8 |
--- a/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
+++ b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
@@ -1218,26 +1218,11 @@ static XHCIEPContext *xhci_alloc_epctx(XHCIState *xhci,
|
|
|
9ae3a8 |
return epctx;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
|
|
|
9ae3a8 |
- unsigned int epid, dma_addr_t pctx,
|
|
|
9ae3a8 |
- uint32_t *ctx)
|
|
|
9ae3a8 |
+static void xhci_init_epctx(XHCIEPContext *epctx,
|
|
|
9ae3a8 |
+ dma_addr_t pctx, uint32_t *ctx)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- XHCISlot *slot;
|
|
|
9ae3a8 |
- XHCIEPContext *epctx;
|
|
|
9ae3a8 |
dma_addr_t dequeue;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- trace_usb_xhci_ep_enable(slotid, epid);
|
|
|
9ae3a8 |
- assert(slotid >= 1 && slotid <= xhci->numslots);
|
|
|
9ae3a8 |
- assert(epid >= 1 && epid <= 31);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- slot = &xhci->slots[slotid-1];
|
|
|
9ae3a8 |
- if (slot->eps[epid-1]) {
|
|
|
9ae3a8 |
- xhci_disable_ep(xhci, slotid, epid);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- epctx = xhci_alloc_epctx(xhci, slotid, epid);
|
|
|
9ae3a8 |
- slot->eps[epid-1] = epctx;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
dequeue = xhci_addr64(ctx[2] & ~0xf, ctx[3]);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
epctx->type = (ctx[1] >> EP_TYPE_SHIFT) & EP_TYPE_MASK;
|
|
|
9ae3a8 |
@@ -1252,11 +1237,33 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
|
|
|
9ae3a8 |
if (epctx->max_pstreams) {
|
|
|
9ae3a8 |
xhci_alloc_streams(epctx, dequeue);
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
- xhci_ring_init(xhci, &epctx->ring, dequeue);
|
|
|
9ae3a8 |
+ xhci_ring_init(epctx->xhci, &epctx->ring, dequeue);
|
|
|
9ae3a8 |
epctx->ring.ccs = ctx[2] & 1;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
epctx->interval = 1 << (ctx[0] >> 16) & 0xff;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
|
|
|
9ae3a8 |
+ unsigned int epid, dma_addr_t pctx,
|
|
|
9ae3a8 |
+ uint32_t *ctx)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ XHCISlot *slot;
|
|
|
9ae3a8 |
+ XHCIEPContext *epctx;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ trace_usb_xhci_ep_enable(slotid, epid);
|
|
|
9ae3a8 |
+ assert(slotid >= 1 && slotid <= xhci->numslots);
|
|
|
9ae3a8 |
+ assert(epid >= 1 && epid <= 31);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ slot = &xhci->slots[slotid-1];
|
|
|
9ae3a8 |
+ if (slot->eps[epid-1]) {
|
|
|
9ae3a8 |
+ xhci_disable_ep(xhci, slotid, epid);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ epctx = xhci_alloc_epctx(xhci, slotid, epid);
|
|
|
9ae3a8 |
+ slot->eps[epid-1] = epctx;
|
|
|
9ae3a8 |
+ xhci_init_epctx(epctx, pctx, ctx);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
epctx->mfindex_last = 0;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
epctx->state = EP_RUNNING;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|