diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2009-12-09 18:59:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:53:12 -0500 |
commit | 2a8f82c4ceaffcfd64531dbdee1d1bc227387882 (patch) | |
tree | b70b68e35d8a9e7264263848ce48a9863b387c55 /drivers/usb/host/xhci-dbg.c | |
parent | 6219c047d3fe18dee4916d6898fc94f5a7ffd156 (diff) |
USB: xhci: Notify the xHC when a device is reset.
When a USB device is reset, the xHCI hardware must know, in order to match
the device state and disable all endpoints except control endpoint 0.
Issue a Reset Device command after a USB device is successfully reset.
Wait on the command to finish, and then cache or free the disabled
endpoint rings.
There are four different USB device states that the xHCI hardware tracks:
- disabled/enabled - device connection has just been detected,
- default - the device has been reset and has an address of 0,
- addressed - the device has a non-zero address but no configuration has
been set,
- configured - a set configuration succeeded.
The USB core may issue a port reset when a device is in any state, but the
Reset Device command will fail for a 0.96 xHC if the device is not in the
addressed or configured state. Don't consider this failure as an error,
but don't free any endpoint rings if this command fails.
A storage driver may request that the USB device be reset during error
handling, so use GPF_NOIO instead of GPF_KERNEL while allocating memory
for the Reset Device command.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/xhci-dbg.c')
-rw-r--r-- | drivers/usb/host/xhci-dbg.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c index 33128d52f212..b2915aea47ee 100644 --- a/drivers/usb/host/xhci-dbg.c +++ b/drivers/usb/host/xhci-dbg.c | |||
@@ -406,6 +406,25 @@ static void dbg_rsvd64(struct xhci_hcd *xhci, u64 *ctx, dma_addr_t dma) | |||
406 | } | 406 | } |
407 | } | 407 | } |
408 | 408 | ||
409 | inline char *xhci_get_slot_state(struct xhci_hcd *xhci, | ||
410 | struct xhci_container_ctx *ctx) | ||
411 | { | ||
412 | struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx); | ||
413 | |||
414 | switch (GET_SLOT_STATE(slot_ctx->dev_state)) { | ||
415 | case 0: | ||
416 | return "enabled/disabled"; | ||
417 | case 1: | ||
418 | return "default"; | ||
419 | case 2: | ||
420 | return "addressed"; | ||
421 | case 3: | ||
422 | return "configured"; | ||
423 | default: | ||
424 | return "reserved"; | ||
425 | } | ||
426 | } | ||
427 | |||
409 | void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) | 428 | void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) |
410 | { | 429 | { |
411 | /* Fields are 32 bits wide, DMA addresses are in bytes */ | 430 | /* Fields are 32 bits wide, DMA addresses are in bytes */ |