1 files changed, 30 insertions, 11 deletions

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 0be788cc2fd..ce9f974dac0 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -392,6 +392,20 @@ static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array)
         return max_ports;
 }
 
+/* Test and clear port RWC bit */
+void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
+                                int port_id, u32 port_bit)
+{
+        u32 temp;
+
+        temp = xhci_readl(xhci, port_array[port_id]);
+        if (temp & port_bit) {
+                temp = xhci_port_state_to_neutral(temp);
+                temp |= port_bit;
+                xhci_writel(xhci, temp, port_array[port_id]);
+        }
+}
+
 int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 u16 wIndex, char *buf, u16 wLength)
 {
@@ -463,11 +477,12 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                         && (temp & PORT_POWER))
                                 status |= USB_PORT_STAT_SUSPEND;
                 }
-                if ((temp & PORT_PLS_MASK) == XDEV_RESUME) {
+                if ((temp & PORT_PLS_MASK) == XDEV_RESUME &&
+                                !DEV_SUPERSPEED(temp)) {
                         if ((temp & PORT_RESET) || !(temp & PORT_PE))
                                 goto error;
-                        if (!DEV_SUPERSPEED(temp) && time_after_eq(jiffies,
-                                                bus_state->resume_done[wIndex])) {
+                        if (time_after_eq(jiffies,
+                                        bus_state->resume_done[wIndex])) {
                                 xhci_dbg(xhci, "Resume USB2 port %d\n",
                                         wIndex + 1);
                                 bus_state->resume_done[wIndex] = 0;
@@ -487,6 +502,14 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                 xhci_ring_device(xhci, slot_id);
                                 bus_state->port_c_suspend |= 1 << wIndex;
                                 bus_state->suspended_ports &= ~(1 << wIndex);
+                        } else {
+                                /*
+                                 * The resume has been signaling for less than
+                                 * 20ms. Report the port status as SUSPEND,
+                                 * let the usbcore check port status again
+                                 * and clear resume signaling later.
+                                 */
+                                status |= USB_PORT_STAT_SUSPEND;
                         }
                 }
                 if ((temp & PORT_PLS_MASK) == XDEV_U0
@@ -664,7 +687,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         xhci_dbg(xhci, "PORTSC %04x\n", temp);
                         if (temp & PORT_RESET)
                                 goto error;
-                        if (temp & XDEV_U3) {
+                        if ((temp & PORT_PLS_MASK) == XDEV_U3) {
                                 if ((temp & PORT_PE) == 0)
                                         goto error;
 
@@ -752,7 +775,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
         memset(buf, 0, retval);
         status = 0;
 
-        mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC;
+        mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC | PORT_WRC;
 
         spin_lock_irqsave(&xhci->lock, flags);
         /* For each port, did anything change?  If so, set that bit in buf. */
@@ -929,12 +952,8 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                         spin_lock_irqsave(&xhci->lock, flags);
 
                         /* Clear PLC */
-                        temp = xhci_readl(xhci, port_array[port_index]);
-                        if (temp & PORT_PLC) {
-                                temp = xhci_port_state_to_neutral(temp);
-                                temp |= PORT_PLC;
-                                xhci_writel(xhci, temp, port_array[port_index]);
-                        }
+                        xhci_test_and_clear_bit(xhci, port_array, port_index,
+                                                PORT_PLC);
 
                         slot_id = xhci_find_slot_id_by_port(hcd,
                                         xhci, port_index + 1);