aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci.c
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2012-05-07 18:34:26 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2012-05-18 18:42:00 -0400
commit4b2665418c81c87e7a46df690a443b3d5ac5b088 (patch)
treeaf4cb2f6e83ca3f7db6c7258832867247d0d0d13 /drivers/usb/host/xhci.c
parent8306095fd2c1100e8244c09bf560f97aca5a311d (diff)
xhci: Some Evaluate Context commands must succeed.
The upcoming USB 3.0 Link PM patches will introduce new API to enable and disable low-power link states. We must be able to disable LPM in order to reset a device, or place the device into U3 (device suspend). Therefore, we need to make sure the Evaluate Context command to disable the LPM timeouts can't fail due to there being no room on the command ring. Introduce a new flag to the function that queues the Evaluate Context command, command_must_succeed. This tells the ring handler that a TRB has already been reserved for the command (by incrementing xhci->cmd_ring_reserved_trbs), and basically ensures that prepare_ring() won't fail. A similar flag was already implemented for the Configure Endpoint command queuing function. All functions that currently call xhci_configure_endpoint() to issue an Evaluate Context command pass "false" for the "must_succeed" parameter, so this patch should have no effect on current xHCI driver behavior. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci.c')
-rw-r--r--drivers/usb/host/xhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 16c05c6b5afa..05034f346fad 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -2446,7 +2446,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
2446 udev->slot_id, must_succeed); 2446 udev->slot_id, must_succeed);
2447 else 2447 else
2448 ret = xhci_queue_evaluate_context(xhci, in_ctx->dma, 2448 ret = xhci_queue_evaluate_context(xhci, in_ctx->dma,
2449 udev->slot_id); 2449 udev->slot_id, must_succeed);
2450 if (ret < 0) { 2450 if (ret < 0) {
2451 if (command) 2451 if (command)
2452 list_del(&command->cmd_list); 2452 list_del(&command->cmd_list);