Commit f217c980 authored Aug 05, 2013 by Sarah Sharp

xhci: Don't enable/disable RWE on bus suspend/resume.



The RWE bit of the USB 2.0 PORTPMSC register is supposed to enable
remote wakeup for devices in the lower power link state L1.  It has
nothing to do with the device suspend remote wakeup from L2.  The RWE
bit is designed to be set once (when USB 2.0 LPM is enabled for the
port) and cleared only when USB 2.0 LPM is disabled for the port.

The xHCI bus suspend method was setting the RWE bit erroneously, and the
bus resume method was clearing it.  The xHCI 1.0 specification with
errata up to Aug 12, 2012 says in section 4.23.5.1.1.1 "Hardware
Controlled LPM":

"While Hardware USB2 LPM is enabled, software shall not modify the
HIRDBESL or RWE fields of the USB2 PORTPMSC register..."

If we have previously enabled USB 2.0 LPM for a device, that means when
the USB 2.0 bus is resumed, we violate the xHCI specification by
clearing RWE.  It also means that after a bus resume, the host would
think remote wakeup is disabled from L1 for ports with USB 2.0 Link PM
enabled, which is not what we want.

This patch should be backported to kernels as old as 3.2, that
contain the commit 65580b43 "xHCI: set
USB2 hardware LPM".  That was the first kernel that supported USB 2.0
Link PM.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org

parent d0e639c9

drivers/usb/host/xhci-hub.c

+0 −26

Original line number	Diff line number	Diff line
		@@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
		t1 = xhci_port_state_to_neutral(t1);
		if (t1 != t2)
		xhci_writel(xhci, t2, port_array[port_index]);

		if (hcd->speed != HCD_USB3) {
		/* enable remote wake up for USB 2.0 */
		__le32 __iomem *addr;
		u32 tmp;

		/* Get the port power control register address. */
		addr = port_array[port_index] + PORTPMSC;
		tmp = xhci_readl(xhci, addr);
		tmp \|= PORT_RWE;
		xhci_writel(xhci, tmp, addr);
		}
		}
		hcd->state = HC_STATE_SUSPENDED;
		bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
		@@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd)
		xhci_ring_device(xhci, slot_id);
		} else
		xhci_writel(xhci, temp, port_array[port_index]);

		if (hcd->speed != HCD_USB3) {
		/* disable remote wake up for USB 2.0 */
		__le32 __iomem *addr;
		u32 tmp;

		/* Add one to the port status register address to get
		* the port power control register address.
		*/
		addr = port_array[port_index] + PORTPMSC;
		tmp = xhci_readl(xhci, addr);
		tmp &= ~PORT_RWE;
		xhci_writel(xhci, tmp, addr);
		}
		}

		(void) xhci_readl(xhci, &xhci->op_regs->command);

Admin message