xhci: resume USB 3 roothub first

matnyman · gregkh · commit 671ffdff5b13 · 2016-04-13T11:55:56.000-07:00
Give USB3 devices a better chance to enumerate at USB 3 speeds if
they are connected to a suspended host.
Solves an issue with NEC uPD720200 host hanging when partially
enumerating a USB3 device as USB2 after host controller runtime resume.

Cc: &lt;stable@vger.kernel.org&gt;
Tested-by: Mike Murdoch &lt;main.haarp@gmail.com&gt;
Signed-off-by: Mathias Nyman &lt;mathias.nyman@linux.intel.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
@@ -1108,8 +1108,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 		/* Resume root hubs only when have pending events. */
 		status = readl(&xhci->op_regs->status);
 		if (status & STS_EINT) {
-			usb_hcd_resume_root_hub(hcd);
 			usb_hcd_resume_root_hub(xhci->shared_hcd);
+			usb_hcd_resume_root_hub(hcd);
 		}
 	}
 
@@ -1124,10 +1124,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 
 	/* Re-enable port polling. */
 	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
-	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
-	usb_hcd_poll_rh_status(hcd);
 	set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
 	usb_hcd_poll_rh_status(xhci->shared_hcd);
+	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
+	usb_hcd_poll_rh_status(hcd);
 
 	return retval;
 }

Original file line number	Diff line number	Diff line change
`@@ -1108,8 +1108,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)`
`1108`	`1108`	`/* Resume root hubs only when have pending events. */`
`1109`	`1109`	`status = readl(&xhci->op_regs->status);`
`1110`	`1110`	`if (status & STS_EINT) {`
`1111`		`- usb_hcd_resume_root_hub(hcd);`
`1112`	`1111`	`usb_hcd_resume_root_hub(xhci->shared_hcd);`
	`1112`	`+ usb_hcd_resume_root_hub(hcd);`
`1113`	`1113`	`}`
`1114`	`1114`	`}`
`1115`	`1115`
`@@ -1124,10 +1124,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)`
`1124`	`1124`
`1125`	`1125`	`/* Re-enable port polling. */`
`1126`	`1126`	`xhci_dbg(xhci, "%s: starting port polling.\n", __func__);`
`1127`		`- set_bit(HCD_FLAG_POLL_RH, &hcd->flags);`
`1128`		`- usb_hcd_poll_rh_status(hcd);`
`1129`	`1127`	`set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);`
`1130`	`1128`	`usb_hcd_poll_rh_status(xhci->shared_hcd);`
	`1129`	`+ set_bit(HCD_FLAG_POLL_RH, &hcd->flags);`
	`1130`	`+ usb_hcd_poll_rh_status(hcd);`
`1131`	`1131`
`1132`	`1132`	`return retval;`
`1133`	`1133`	`}`