This is a note to let you know that I've just added the patch titled

    usb-xhci: Handle COMP_TX_ERR for isoc tds

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-xhci-handle-comp_tx_err-for-isoc-tds.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 9c745995ae5c4ff787f34a359de908facc11ee00 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Mon, 23 Apr 2012 15:06:09 +0200
Subject: usb-xhci: Handle COMP_TX_ERR for isoc tds

From: Hans de Goede <[email protected]>

commit 9c745995ae5c4ff787f34a359de908facc11ee00 upstream.

While testing unplugging an UVC HD webcam with usb-redirection (so through
usbdevfs), my userspace usb-redir code was getting a value of -1 in
iso_frame_desc[n].status, which according to Documentation/usb/error-codes.txt
is not a valid value.

The source of this -1 is the default case in xhci-ring.c:process_isoc_td()
adding a kprintf there showed the value of trb_comp_code to be COMP_TX_ERR
in this case, so this patch adds handling for that completion code to
process_isoc_td().

This was observed and tested with the following xhci controller:
1033:0194 NEC Corporation uPD720200 USB 3.0 Host Controller (rev 04)

Note: I also wonder if setting frame->status to -1 (-EPERM) is the best we can
do, but since I cannot come up with anything better I've left that as is.

This patch should be backported to kernels as old as 2.6.36, which contain the
commit 04e51901dd44f40a5a385ced897f6bca87d5f40a "USB: xHCI: Isochronous
transfer implementation".

Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Sarah Sharp <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/usb/host/xhci-ring.c |    1 +
 1 file changed, 1 insertion(+)

--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1756,6 +1756,7 @@ static int process_isoc_td(struct xhci_h
                break;
        case COMP_DEV_ERR:
        case COMP_STALL:
+       case COMP_TX_ERR:
                frame->status = -EPROTO;
                skip_td = true;
                break;


Patches currently in stable-queue which might be from [email protected] are

queue-3.0/usb-xhci-handle-comp_tx_err-for-isoc-tds.patch
queue-3.0/usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to