Increase XHCI suspend timeout to 16ms
authorMichael Spang <spang@chromium.org>
Fri, 14 Sep 2012 17:05:49 +0000 (13:05 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Oct 2012 15:39:33 +0000 (08:39 -0700)
commitee537508bdc0c00b96ac497f3d82a68f820e6182
treebd39b545fce60e7d8b806e3ea0b1943267a20fb5
parent2b66cca8004827d84023e5c9d69b74e1e5c03734
Increase XHCI suspend timeout to 16ms

commit a6e097dfdfd189b6929af6efa1d289af61858386 upstream.

The Intel XHCI specification says that after clearing the run/stop bit
the controller may take up to 16ms to halt. We've seen a device take
14ms, which with the current timeout of 10ms causes the kernel to
abort the suspend. Increasing the timeout to the recommended value
fixes the problem.

This patch should be backported to kernels as old as 2.6.37, that
contain the commit 5535b1d5f8885695c6ded783c692e3c0d0eda8ca "USB: xHCI:
PCI power management implementation".

Signed-off-by: Michael Spang <spang@chromium.org>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci.c