diff options
| author | Mathias Nyman | 2013-09-05 10:01:20 +0200 |
|---|---|---|
| committer | Sarah Sharp | 2013-09-24 00:43:30 +0200 |
| commit | 284d20552461466b04d6bfeafeb1c47a8891b591 (patch) | |
| tree | 7b929fc25193a67c728614f417bd9cf0f437bb90 | |
| parent | Merge tag 'staging-3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-284d20552461466b04d6bfeafeb1c47a8891b591.tar.gz kernel-qcow2-linux-284d20552461466b04d6bfeafeb1c47a8891b591.tar.xz kernel-qcow2-linux-284d20552461466b04d6bfeafeb1c47a8891b591.zip | |
xhci: Fix oops happening after address device timeout
When a command times out, the command ring is first aborted,
and then stopped. If the command ring is empty when it is stopped
the stop event will point to next command which is not yet set.
xHCI tries to handle this next event often causing an oops.
Don't handle command completion events on stopped cmd ring if ring is
empty.
This patch should be backported to kernels as old as 3.7, that contain
the commit b92cc66c047ff7cf587b318fe377061a353c120f "xHCI: add aborting
command ring function"
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Reported-by: Giovanni <giovanni.nervi@yahoo.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 411da1fc7ae8..aaa2906f7b78 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1414,6 +1414,12 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, inc_deq(xhci, xhci->cmd_ring); return; } + /* There is no command to handle if we get a stop event when the + * command ring is empty, event->cmd_trb points to the next + * unset command + */ + if (xhci->cmd_ring->dequeue == xhci->cmd_ring->enqueue) + return; } switch (le32_to_cpu(xhci->cmd_ring->dequeue->generic.field[3]) |