1 files changed, 36 insertions, 4 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 7fa58c99f126..a9bb796794e3 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -893,7 +893,7 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
         struct xhci_port **ports;
         int port_index;
         unsigned long flags;
-        u32 t1, t2;
+        u32 t1, t2, portsc;
 
         spin_lock_irqsave(&xhci->lock, flags);
 
@@ -902,10 +902,15 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
         ports = xhci->usb3_rhub.ports;
         while (port_index--) {
                 t1 = readl(ports[port_index]->addr);
+                portsc = t1;
                 t1 = xhci_port_state_to_neutral(t1);
                 t2 = t1 & ~PORT_WAKE_BITS;
-                if (t1 != t2)
+                if (t1 != t2) {
                         writel(t2, ports[port_index]->addr);
+                        xhci_dbg(xhci, "disable wake bits port %d-%d, portsc: 0x%x, write: 0x%x\n",
+                                 xhci->usb3_rhub.hcd->self.busnum,
+                                 port_index + 1, portsc, t2);
+                }
         }
 
         /* disable usb2 ports Wake bits */
@@ -913,12 +918,16 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
         ports = xhci->usb2_rhub.ports;
         while (port_index--) {
                 t1 = readl(ports[port_index]->addr);
+                portsc = t1;
                 t1 = xhci_port_state_to_neutral(t1);
                 t2 = t1 & ~PORT_WAKE_BITS;
-                if (t1 != t2)
+                if (t1 != t2) {
                         writel(t2, ports[port_index]->addr);
+                        xhci_dbg(xhci, "disable wake bits port %d-%d, portsc: 0x%x, write: 0x%x\n",
+                                 xhci->usb2_rhub.hcd->self.busnum,
+                                 port_index + 1, portsc, t2);
+                }
         }
-
         spin_unlock_irqrestore(&xhci->lock, flags);
 }
 
@@ -1238,6 +1247,21 @@ EXPORT_SYMBOL_GPL(xhci_resume);
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Bypass the DMA mapping if URB is suitable for Immediate Transfer (IDT),
+ * we'll copy the actual data into the TRB address register. This is limited to
+ * transfers up to 8 bytes on output endpoints of any kind with wMaxPacketSize
+ * >= 8 bytes. If suitable for IDT only one Transfer TRB per TD is allowed.
+ */
+static int xhci_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
+                                gfp_t mem_flags)
+{
+        if (xhci_urb_suitable_for_idt(urb))
+                return 0;
+
+        return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);
+}
+
 /**
  * xhci_get_endpoint_index - Used for passing endpoint bitmasks between the core and
  * HCDs.  Find the index for an endpoint given its descriptor.  Use the return
@@ -1783,6 +1807,7 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
         struct xhci_container_ctx *in_ctx;
         unsigned int ep_index;
         struct xhci_input_control_ctx *ctrl_ctx;
+        struct xhci_ep_ctx *ep_ctx;
         u32 added_ctxs;
         u32 new_add_flags, new_drop_flags;
         struct xhci_virt_device *virt_dev;
@@ -1873,6 +1898,9 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
         /* Store the usb_device pointer for later use */
         ep->hcpriv = udev;
 
+        ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index);
+        trace_xhci_add_endpoint(ep_ctx);
+
         xhci_debugfs_create_endpoint(xhci, virt_dev, ep_index);
 
         xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n",
@@ -2747,6 +2775,8 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
         }
 
         slot_ctx = xhci_get_slot_ctx(xhci, command->in_ctx);
+
+        trace_xhci_configure_endpoint_ctrl_ctx(ctrl_ctx);
         trace_xhci_configure_endpoint(slot_ctx);
 
         if (!ctx_change)
@@ -4012,6 +4042,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
         trace_xhci_address_ctx(xhci, virt_dev->in_ctx,
                                 le32_to_cpu(slot_ctx->dev_info) >> 27);
 
+        trace_xhci_address_ctrl_ctx(ctrl_ctx);
         spin_lock_irqsave(&xhci->lock, flags);
         trace_xhci_setup_device(virt_dev);
         ret = xhci_queue_address_device(xhci, command, virt_dev->in_ctx->dma,
@@ -5154,6 +5185,7 @@ static const struct hc_driver xhci_hc_driver = {
         /*
          * managing i/o requests and associated device resources
          */
+        .map_urb_for_dma =      xhci_map_urb_for_dma,
         .urb_enqueue =          xhci_urb_enqueue,
         .urb_dequeue =          xhci_urb_dequeue,
         .alloc_dev =            xhci_alloc_dev,