lkml.org 
[lkml]   [2013]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 063/104] xhci: Fix oops happening after address device timeout
    Date
    3.8.13.11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mathias Nyman <mathias.nyman@linux.intel.com>

    commit 284d20552461466b04d6bfeafeb1c47a8891b591 upstream.

    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>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/host/xhci-ring.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
    index 3020c71..04b212d 100644
    --- a/drivers/usb/host/xhci-ring.c
    +++ b/drivers/usb/host/xhci-ring.c
    @@ -1390,6 +1390,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])
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-10-10 19:01    [W:4.060 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site