]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/usb/host/xhci-hub.c
xhci: Fix command ring stop regression in 4.11
[karo-tx-linux.git] / drivers / usb / host / xhci-hub.c
index 3bddeaa1e2d768feebb99c5e091de947562b799c..0dde49c35dd23d858feb2d537840b568fd1c4643 100644 (file)
@@ -392,10 +392,8 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
        trace_xhci_stop_device(virt_dev);
 
        cmd = xhci_alloc_command(xhci, false, true, GFP_NOIO);
-       if (!cmd) {
-               xhci_dbg(xhci, "Couldn't allocate command structure.\n");
+       if (!cmd)
                return -ENOMEM;
-       }
 
        spin_lock_irqsave(&xhci->lock, flags);
        for (i = LAST_EP_INDEX; i > 0; i--) {
@@ -421,7 +419,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
        wait_for_completion(cmd->completion);
 
        if (cmd->status == COMP_COMMAND_ABORTED ||
-                       cmd->status == COMP_STOPPED) {
+           cmd->status == COMP_COMMAND_RING_STOPPED) {
                xhci_warn(xhci, "Timeout while waiting for stop endpoint command\n");
                ret = -ETIME;
        }
@@ -540,6 +538,119 @@ static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array)
        return max_ports;
 }
 
+static __le32 __iomem *xhci_get_port_io_addr(struct usb_hcd *hcd, int index)
+{
+       __le32 __iomem **port_array;
+
+       xhci_get_ports(hcd, &port_array);
+       return port_array[index];
+}
+
+/*
+ * xhci_set_port_power() must be called with xhci->lock held.
+ * It will release and re-aquire the lock while calling ACPI
+ * method.
+ */
+static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,
+                               u16 index, bool on, unsigned long *flags)
+{
+       __le32 __iomem *addr;
+       u32 temp;
+
+       addr = xhci_get_port_io_addr(hcd, index);
+       temp = readl(addr);
+       temp = xhci_port_state_to_neutral(temp);
+       if (on) {
+               /* Power on */
+               writel(temp | PORT_POWER, addr);
+               temp = readl(addr);
+               xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n",
+                                               index, temp);
+       } else {
+               /* Power off */
+               writel(temp & ~PORT_POWER, addr);
+       }
+
+       spin_unlock_irqrestore(&xhci->lock, *flags);
+       temp = usb_acpi_power_manageable(hcd->self.root_hub,
+                                       index);
+       if (temp)
+               usb_acpi_set_power_state(hcd->self.root_hub,
+                       index, on);
+       spin_lock_irqsave(&xhci->lock, *flags);
+}
+
+static void xhci_port_set_test_mode(struct xhci_hcd *xhci,
+       u16 test_mode, u16 wIndex)
+{
+       u32 temp;
+       __le32 __iomem *addr;
+
+       /* xhci only supports test mode for usb2 ports, i.e. xhci->main_hcd */
+       addr = xhci_get_port_io_addr(xhci->main_hcd, wIndex);
+       temp = readl(addr + PORTPMSC);
+       temp |= test_mode << PORT_TEST_MODE_SHIFT;
+       writel(temp, addr + PORTPMSC);
+       xhci->test_mode = test_mode;
+       if (test_mode == TEST_FORCE_EN)
+               xhci_start(xhci);
+}
+
+static int xhci_enter_test_mode(struct xhci_hcd *xhci,
+                               u16 test_mode, u16 wIndex, unsigned long *flags)
+{
+       int i, retval;
+
+       /* Disable all Device Slots */
+       xhci_dbg(xhci, "Disable all slots\n");
+       for (i = 1; i <= HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
+               retval = xhci_disable_slot(xhci, NULL, i);
+               if (retval)
+                       xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",
+                                i, retval);
+       }
+       /* Put all ports to the Disable state by clear PP */
+       xhci_dbg(xhci, "Disable all port (PP = 0)\n");
+       /* Power off USB3 ports*/
+       for (i = 0; i < xhci->num_usb3_ports; i++)
+               xhci_set_port_power(xhci, xhci->shared_hcd, i, false, flags);
+       /* Power off USB2 ports*/
+       for (i = 0; i < xhci->num_usb2_ports; i++)
+               xhci_set_port_power(xhci, xhci->main_hcd, i, false, flags);
+       /* Stop the controller */
+       xhci_dbg(xhci, "Stop controller\n");
+       retval = xhci_halt(xhci);
+       if (retval)
+               return retval;
+       /* Disable runtime PM for test mode */
+       pm_runtime_forbid(xhci_to_hcd(xhci)->self.controller);
+       /* Set PORTPMSC.PTC field to enter selected test mode */
+       /* Port is selected by wIndex. port_id = wIndex + 1 */
+       xhci_dbg(xhci, "Enter Test Mode: %d, Port_id=%d\n",
+                                       test_mode, wIndex + 1);
+       xhci_port_set_test_mode(xhci, test_mode, wIndex);
+       return retval;
+}
+
+static int xhci_exit_test_mode(struct xhci_hcd *xhci)
+{
+       int retval;
+
+       if (!xhci->test_mode) {
+               xhci_err(xhci, "Not in test mode, do nothing.\n");
+               return 0;
+       }
+       if (xhci->test_mode == TEST_FORCE_EN &&
+               !(xhci->xhc_state & XHCI_STATE_HALTED)) {
+               retval = xhci_halt(xhci);
+               if (retval)
+                       return retval;
+       }
+       pm_runtime_allow(xhci_to_hcd(xhci)->self.controller);
+       xhci->test_mode = 0;
+       return xhci_reset(xhci);
+}
+
 void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
                                int port_id, u32 link_state)
 {
@@ -895,6 +1006,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
        u16 link_state = 0;
        u16 wake_mask = 0;
        u16 timeout = 0;
+       u16 test_mode = 0;
 
        max_ports = xhci_get_ports(hcd, &port_array);
        bus_state = &xhci->bus_state[hcd_index(hcd)];
@@ -935,7 +1047,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
                wIndex--;
                temp = readl(port_array[wIndex]);
-               if (temp == 0xffffffff) {
+               if (temp == ~(u32)0) {
+                       xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
@@ -968,6 +1081,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        link_state = (wIndex & 0xff00) >> 3;
                if (wValue == USB_PORT_FEAT_REMOTE_WAKE_MASK)
                        wake_mask = wIndex & 0xff00;
+               if (wValue == USB_PORT_FEAT_TEST)
+                       test_mode = (wIndex & 0xff00) >> 8;
                /* The MSB of wIndex is the U1/U2 timeout */
                timeout = (wIndex & 0xff00) >> 8;
                wIndex &= 0xff;
@@ -975,7 +1090,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
                wIndex--;
                temp = readl(port_array[wIndex]);
-               if (temp == 0xffffffff) {
+               if (temp == ~(u32)0) {
+                       xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
@@ -1092,18 +1208,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         * However, hub_wq will ignore the roothub events until
                         * the roothub is registered.
                         */
-                       writel(temp | PORT_POWER, port_array[wIndex]);
-
-                       temp = readl(port_array[wIndex]);
-                       xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n", wIndex, temp);
-
-                       spin_unlock_irqrestore(&xhci->lock, flags);
-                       temp = usb_acpi_power_manageable(hcd->self.root_hub,
-                                       wIndex);
-                       if (temp)
-                               usb_acpi_set_power_state(hcd->self.root_hub,
-                                               wIndex, true);
-                       spin_lock_irqsave(&xhci->lock, flags);
+                       xhci_set_port_power(xhci, hcd, wIndex, true, &flags);
                        break;
                case USB_PORT_FEAT_RESET:
                        temp = (temp | PORT_RESET);
@@ -1142,6 +1247,15 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        temp |= PORT_U2_TIMEOUT(timeout);
                        writel(temp, port_array[wIndex] + PORTPMSC);
                        break;
+               case USB_PORT_FEAT_TEST:
+                       /* 4.19.6 Port Test Modes (USB2 Test Mode) */
+                       if (hcd->speed != HCD_USB2)
+                               goto error;
+                       if (test_mode > TEST_FORCE_EN || test_mode < TEST_J)
+                               goto error;
+                       retval = xhci_enter_test_mode(xhci, test_mode, wIndex,
+                                                     &flags);
+                       break;
                default:
                        goto error;
                }
@@ -1153,7 +1267,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
                wIndex--;
                temp = readl(port_array[wIndex]);
-               if (temp == 0xffffffff) {
+               if (temp == ~(u32)0) {
+                       xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }
@@ -1207,15 +1322,10 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                        port_array[wIndex], temp);
                        break;
                case USB_PORT_FEAT_POWER:
-                       writel(temp & ~PORT_POWER, port_array[wIndex]);
-
-                       spin_unlock_irqrestore(&xhci->lock, flags);
-                       temp = usb_acpi_power_manageable(hcd->self.root_hub,
-                                       wIndex);
-                       if (temp)
-                               usb_acpi_set_power_state(hcd->self.root_hub,
-                                               wIndex, false);
-                       spin_lock_irqsave(&xhci->lock, flags);
+                       xhci_set_port_power(xhci, hcd, wIndex, false, &flags);
+                       break;
+               case USB_PORT_FEAT_TEST:
+                       retval = xhci_exit_test_mode(xhci);
                        break;
                default:
                        goto error;
@@ -1269,7 +1379,8 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
        /* For each port, did anything change?  If so, set that bit in buf. */
        for (i = 0; i < max_ports; i++) {
                temp = readl(port_array[i]);
-               if (temp == 0xffffffff) {
+               if (temp == ~(u32)0) {
+                       xhci_hc_died(xhci);
                        retval = -ENODEV;
                        break;
                }