Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d90425 authored by Hemant Kumar's avatar Hemant Kumar
Browse files

usb: XHCI: Add support to disable selective suspend 



Out of band remote wakeup cannot be used when selective suspend
is enabled as hub driver can resume/suspend the port. Add
support to disable selective suspend on platforms which
does not support usual in-band remote wakeup.

Change-Id: I1bb699c94aed8f61683cc86ff801b50b69872930
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
parent 7078f1ca

drivers/usb/host/xhci-hub.c

+6 −1
Original line number Diff line number Diff line
@@ -818,7 +818,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
		}

		if ((temp & PORT_PLS_MASK) == XDEV_U0

			&& (temp & PORT_POWER)

			&& (bus_state->suspended_ports & (1 << wIndex))) {

			&& ((bus_state->suspended_ports & (1 << wIndex))

			|| (xhci->quirks & XHCI_NO_SELECTIVE_SUSPEND))) {

			bus_state->suspended_ports &= ~(1 << wIndex);

			if (hcd->speed != HCD_USB3)

				bus_state->port_c_suspend |= 1 << wIndex;
@@ -875,6 +876,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
		/* FIXME: What new port features do we need to support? */

		switch (wValue) {

		case USB_PORT_FEAT_SUSPEND:

			if (xhci->quirks & XHCI_NO_SELECTIVE_SUSPEND)

				break;

			temp = xhci_readl(xhci, port_array[wIndex]);

			if ((temp & PORT_PLS_MASK) != XDEV_U0) {

				/* Resume the port to U0 first */
@@ -1089,6 +1092,8 @@ 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 (xhci->quirks & XHCI_NO_SELECTIVE_SUSPEND)

				break;

			if ((temp & PORT_PLS_MASK) == XDEV_U3) {

				if ((temp & PORT_PE) == 0)

					goto error;

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ struct xhci_hcd { 
 * The workaround is to handle TRB Error and Context State Error in same way

 */

#define XHCI_TR_DEQ_ERR_QUIRK	(1 << 18)

#define XHCI_NO_SELECTIVE_SUSPEND (1 << 19)

	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;

	/* There are two roothubs to keep track of bus suspend info for */