1 files changed, 27 insertions, 17 deletions

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 96a740543183..3abe70ff1b1e 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -487,8 +487,8 @@ static void xhci_disable_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
         /* Write 1 to disable the port */
         writel(port_status | PORT_PE, addr);
         port_status = readl(addr);
-        xhci_dbg(xhci, "disable port, actual port %d status  = 0x%x\n",
-                        wIndex, port_status);
+        xhci_dbg(xhci, "disable port %d-%d, portsc: 0x%x\n",
+                 hcd->self.busnum, wIndex + 1, port_status);
 }
 
 static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
@@ -537,8 +537,9 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
         /* Change bits are all write 1 to clear */
         writel(port_status | status, addr);
         port_status = readl(addr);
-        xhci_dbg(xhci, "clear port %s change, actual port %d status  = 0x%x\n",
-                        port_change_bit, wIndex, port_status);
+
+        xhci_dbg(xhci, "clear port%d %s change, portsc: 0x%x\n",
+                 wIndex + 1, port_change_bit, port_status);
 }
 
 struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd)
@@ -565,13 +566,16 @@ static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,
         rhub = xhci_get_rhub(hcd);
         port = rhub->ports[index];
         temp = readl(port->addr);
+
+        xhci_dbg(xhci, "set port power %d-%d %s, portsc: 0x%x\n",
+                 hcd->self.busnum, index + 1, on ? "ON" : "OFF", temp);
+
         temp = xhci_port_state_to_neutral(temp);
+
         if (on) {
                 /* Power on */
                 writel(temp | PORT_POWER, port->addr);
-                temp = readl(port->addr);
-                xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n",
-                                                index, temp);
+                readl(port->addr);
         } else {
                 /* Power off */
                 writel(temp & ~PORT_POWER, port->addr);
@@ -666,12 +670,17 @@ void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
                          u32 link_state)
 {
         u32 temp;
+        u32 portsc;
 
-        temp = readl(port->addr);
-        temp = xhci_port_state_to_neutral(temp);
+        portsc = readl(port->addr);
+        temp = xhci_port_state_to_neutral(portsc);
         temp &= ~PORT_PLS_MASK;
         temp |= PORT_LINK_STROBE | link_state;
         writel(temp, port->addr);
+
+        xhci_dbg(xhci, "Set port %d-%d link state, portsc: 0x%x, write 0x%x",
+                 port->rhub->hcd->self.busnum, port->hcd_portnum + 1,
+                 portsc, temp);
 }
 
 static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
@@ -840,7 +849,9 @@ static int xhci_handle_usb2_port_link_resume(struct xhci_port *port,
         } else if (time_after_eq(jiffies, bus_state->resume_done[wIndex])) {
                 int time_left;
 
-                xhci_dbg(xhci, "Resume USB2 port %d\n", wIndex + 1);
+                xhci_dbg(xhci, "resume USB2 port %d-%d\n",
+                         hcd->self.busnum, wIndex + 1);
+
                 bus_state->resume_done[wIndex] = 0;
                 clear_bit(wIndex, &bus_state->resuming_ports);
 
@@ -867,9 +878,8 @@ static int xhci_handle_usb2_port_link_resume(struct xhci_port *port,
                 } else {
                         int port_status = readl(port->addr);
 
-                        xhci_warn(xhci, "Port resume %i msec timed out, portsc = 0x%x\n",
-                                  XHCI_MAX_REXIT_TIMEOUT_MS,
-                                  port_status);
+                        xhci_warn(xhci, "Port resume timed out, port %d-%d: 0x%x\n",
+                                  hcd->self.busnum, wIndex + 1, port_status);
                         *status |= USB_PORT_STAT_SUSPEND;
                         clear_bit(wIndex, &bus_state->rexit_ports);
                 }
@@ -1124,9 +1134,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 if (status == 0xffffffff)
                         goto error;
 
-                xhci_dbg(xhci, "get port status, actual port %d status  = 0x%x\n",
-                                wIndex, temp);
-                xhci_dbg(xhci, "Get port status returned 0x%x\n", status);
+                xhci_dbg(xhci, "Get port status %d-%d read: 0x%x, return 0x%x",
+                         hcd->self.busnum, wIndex + 1, temp, status);
 
                 put_unaligned(cpu_to_le32(status), (__le32 *) buf);
                 /* if USB 3.1 extended port status return additional 4 bytes */
@@ -1182,7 +1191,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         temp = readl(ports[wIndex]->addr);
                         if ((temp & PORT_PE) == 0 || (temp & PORT_RESET)
                                 || (temp & PORT_PLS_MASK) >= XDEV_U3) {
-                                xhci_warn(xhci, "USB core suspending device not in U0/U1/U2.\n");
+                                xhci_warn(xhci, "USB core suspending port %d-%d not in U0/U1/U2\n",
+                                          hcd->self.busnum, wIndex + 1);
                                 goto error;
                         }