From 36b1f983a244521a4dd7293b36b152222aa953ed Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Fri, 11 Jul 2014 14:20:44 +0200

Subject: [PATCH 10/43] xhci: Add xhci_epid_to_usbep helper function

Message-id: <1405088470-24115-12-git-send-email-kraxel@redhat.com>

Patchwork-id: 59837

O-Subject: [RHEL-7.1 qemu-kvm PATCH 11/37] xhci: Add xhci_epid_to_usbep helper function

Bugzilla: 980833

RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

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

And use it instead of prying the USBEndpoint out of the packet struct

in various places.

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

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit 518ad5f2a0754f0a5ce4e478b79f4926ce46111b)

---

 hw/usb/hcd-xhci.c | 32 ++++++++++++++++++++++----------

 1 file changed, 22 insertions(+), 10 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/usb/hcd-xhci.c | 32 ++++++++++++++++++++++----------

 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c

index 2daf334..56145a5 100644

--- a/hw/usb/hcd-xhci.c

+++ b/hw/usb/hcd-xhci.c

@@ -511,6 +511,8 @@ static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid,

                                 unsigned int epid);

 static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v);

 static void xhci_write_event(XHCIState *xhci, XHCIEvent *event, int v);

+static USBEndpoint *xhci_epid_to_usbep(XHCIState *xhci,

+                                       unsigned int slotid, unsigned int epid);

 static const char *TRBType_names[] = {

     [TRB_RESERVED]                     = "TRB_RESERVED",

@@ -1363,13 +1365,12 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid,

     xferi = epctx->next_xfer;

     for (i = 0; i < TD_QUEUE; i++) {

-        if (epctx->transfers[xferi].packet.ep) {

-            ep = epctx->transfers[xferi].packet.ep;

-        }

         killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]);

         epctx->transfers[xferi].packet.ep = NULL;

         xferi = (xferi + 1) % TD_QUEUE;

     }

+

+    ep = xhci_epid_to_usbep(xhci, slotid, epid);

     if (ep) {

         usb_device_ep_stopped(ep->dev, ep);

     }

@@ -1701,7 +1702,6 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer,

 static int xhci_setup_packet(XHCITransfer *xfer)

 {

     XHCIState *xhci = xfer->xhci;

-    USBDevice *dev;

     USBEndpoint *ep;

     int dir;

@@ -1709,15 +1709,13 @@ static int xhci_setup_packet(XHCITransfer *xfer)

     if (xfer->packet.ep) {

         ep = xfer->packet.ep;

-        dev = ep->dev;

     } else {

-        if (!xhci->slots[xfer->slotid-1].uport) {

+        ep = xhci_epid_to_usbep(xhci, xfer->slotid, xfer->epid);

+        if (!ep) {

             fprintf(stderr, "xhci: slot %d has no device\n",

                     xfer->slotid);

             return -1;

         }

-        dev = xhci->slots[xfer->slotid-1].uport->dev;

-        ep = usb_ep_get(dev, dir, xfer->epid >> 1);

     }

     xhci_xfer_create_sgl(xfer, dir == USB_TOKEN_IN); /* Also sets int_req */

@@ -1725,7 +1723,7 @@ static int xhci_setup_packet(XHCITransfer *xfer)

                      xfer->trbs[0].addr, false, xfer->int_req);

     usb_packet_map(&xfer->packet, &xfer->sgl);

     DPRINTF("xhci: setup packet pid 0x%x addr %d ep %d\n",

-            xfer->packet.pid, dev->addr, ep->nr);

+            xfer->packet.pid, ep->dev->addr, ep->nr);

     return 0;

 }

@@ -2077,7 +2075,6 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,

         } else {

             if (xhci_fire_transfer(xhci, xfer, epctx) >= 0) {

                 epctx->next_xfer = (epctx->next_xfer + 1) % TD_QUEUE;

-                ep = xfer->packet.ep;

             } else {

                 if (!xfer->timed_xfer) {

                     fprintf(stderr, "xhci: error firing data transfer\n");

@@ -2094,6 +2091,8 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,

             break;

         }

     }

+

+    ep = xhci_epid_to_usbep(xhci, slotid, epid);

     if (ep) {

         usb_device_flush_ep_queue(ep->dev, ep);

     }

@@ -3331,6 +3330,19 @@ static int xhci_find_epid(USBEndpoint *ep)

     }

 }

+static USBEndpoint *xhci_epid_to_usbep(XHCIState *xhci,

+                                       unsigned int slotid, unsigned int epid)

+{

+    assert(slotid >= 1 && slotid <= xhci->numslots);

+

+    if (!xhci->slots[slotid - 1].uport) {

+        return NULL;

+    }

+

+    return usb_ep_get(xhci->slots[slotid - 1].uport->dev,

+                      (epid & 1) ? USB_TOKEN_IN : USB_TOKEN_OUT, epid >> 1);

+}

+

 static void xhci_wakeup_endpoint(USBBus *bus, USBEndpoint *ep,

                                  unsigned int stream)

 {

-- 

1.8.3.1