From d46e183f3e7e0b0130becdefa6fd3ef8097df54b Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 8 Apr 2014 13:37:39 -0700 Subject: [PATCH] libpayload: usb: Remove automatic clear_stall() calls from transfers We've recently fixed a problem where an external hard drive would choke due to one too many CLEAR_FEATURE(HALT) commands in the XHCI stack with "libpayload: usb: xhci: Fix STALL endpoint handling". Clearing stall conditions from within the transfer function is wrong in general... this is really something that is host controller agnostic and should be left to the higher-level driver to decide. The mass storage driver (the only one that should really encounter stalls right now) already contains the proper amount of clear_stall() calls... any more than that is redundant and as we found out potentially dangerous. This patch removes automatic clear stalls from UHCI and OHCI drivers as well to make things consistent between host controllers. BUG=chromium:192866 TEST=None. I could borrow the original hard drive from Shawn and compile a Snow to only use the OHCI driver to reproduce/verify this, but alas, I am lazy (and it's really not that important). Change-Id: Ie1e4d4d2d70fa4abf8b4dabd33b10d6d4012048a Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/193732 Reviewed-by: Stefan Reinauer --- payloads/libpayload/drivers/usb/ohci.c | 3 +-- payloads/libpayload/drivers/usb/uhci.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index 848098dcd4..c2ab674789 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -603,8 +603,7 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *src, int finalize) result = dalen - result; if (ep->direction == IN && data != src) memcpy(src, data, result); - } else - clear_stall(ep); + } return result; } diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index 2e3249ee74..cdba3de101 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -452,8 +452,6 @@ uhci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) size -= maxpsize; } if (run_schedule (ep->dev, tds) == 1) { - usb_debug("Stalled. Trying to clean up.\n"); - clear_stall (ep); free (tds); return -1; }