lkml.org 
[lkml]   [2015]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 70/96] xhci: don't finish a TD if we get a short transfer event mid TD
    Date
    3.13.11-ckt30 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream.

    If the difference is big enough between the bytes asked and received
    in a bulk transfer we can get a short transfer event pointing to a TRB in
    the middle of the TD. We don't want to handle the TD yet as we will anyway
    receive a new event for the last TRB in the TD.

    Hold off from finishing the TD and removing it from the list until we
    receive an event for the last TRB in the TD

    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [ luis: backported to 3.16: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/host/xhci-ring.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
    index 33c0029..71cc699 100644
    --- a/drivers/usb/host/xhci-ring.c
    +++ b/drivers/usb/host/xhci-ring.c
    @@ -2360,6 +2360,10 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
    EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));
    /* Fast path - was this the last TRB in the TD for this URB? */
    if (event_trb == td->last_trb) {
    + if (td->urb_length_set && trb_comp_code == COMP_SHORT_TX)
    + return finish_td(xhci, td, event_trb, event, ep,
    + status, false);
    +
    if (EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) != 0) {
    td->urb->actual_length =
    td->urb->transfer_buffer_length -
    @@ -2411,6 +2415,12 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
    td->urb->actual_length +=
    TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
    EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
    +
    + if (trb_comp_code == COMP_SHORT_TX) {
    + xhci_dbg(xhci, "mid bulk/intr SP, wait for last TRB event\n");
    + td->urb_length_set = true;
    + return 0;
    + }
    }

    return finish_td(xhci, td, event_trb, event, ep, status, false);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-13 23:21    [W:2.215 / U:1.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site