summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.c
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2012-07-03 22:49:04 -0700
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2012-07-11 07:06:46 -0400
commit6d1d051330ee096f575523647fbd8ffe703600b5 (patch)
tree5a34f8b45e3f12340fc60c62e21c457aa341c5cb /drivers/usb/core/usb.c
parent1a49e2ac9651df7349867a5cf44e2c83de1046af (diff)
downloadblackbird-op-linux-6d1d051330ee096f575523647fbd8ffe703600b5.tar.gz
blackbird-op-linux-6d1d051330ee096f575523647fbd8ffe703600b5.zip
USB: Fix LPM disable/enable during device reset.
The USB 3.0 specification says that sending a Set Feature or Clear Feature for U1/U2 Enable is not a valid request when the device is in the Default or Addressed state. It is only valid when the device is in the Configured state. The original LPM patch attempted to disable LPM after the device had been reset by hub_port_init(), before it had the configuration reinstalled. The TI hub I tested with did not fail the Clear Feature U1/U2 Enable request that khubd sent while it was in the addressed state, which is why I didn't catch it. Move the LPM disable before the device reset, so that we can send the Clear Feature U1/U2 Enable successfully, and balance the LPM disable count. Also delete any calls to usb_enable_lpm() on error paths that lead to re-enumeration. The calls will fail because the device isn't configured, and it's not useful to balance the LPM disable count because the usb_device is about to be destroyed before re-enumeration. Fix the early exit path ("done" label) to call usb_enable_lpm() to balance the LPM disable count. Note that calling usb_reset_and_verify_device() with an unconfigured device may fail on the first call to usb_disable_lpm(). That's because the LPM disable count is initialized to 0 (LPM enabled), and usb_disable_lpm() will attempt to send a Clear Feature U1/U2 request to a device in the Addressed state. The next patch will fix that. This commit should be backported to kernels as old as 3.5, that contain the commit 8306095fd2c1100e8244c09bf560f97aca5a311d "USB: Disable USB 3.0 LPM in critical sections." Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb/core/usb.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud