From: Aaro Koskinen Date: Sun, 22 Mar 2015 15:38:00 +0000 (+0200) Subject: staging: octeon-usb: fail and warn if DMA counters are wrong X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3b8edc0f366bd7049eafa11d0c0187f039c0528;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git staging: octeon-usb: fail and warn if DMA counters are wrong Fail and WARN if DMA counters are wrong. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c index 84640454ba71..27acab217d21 100644 --- a/drivers/staging/octeon-usb/octeon-hcd.c +++ b/drivers/staging/octeon-usb/octeon-hcd.c @@ -2617,6 +2617,17 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) (pipe->transfer_dir == CVMX_USB_DIRECTION_OUT)) pipe->flags |= CVMX_USB_PIPE_FLAGS_NEED_PING; + if (unlikely(WARN_ON_ONCE(bytes_this_transfer < 0))) { + /* + * In some rare cases the DMA engine seems to get stuck and + * keeps substracting same byte count over and over again. In + * such case we just need to fail every transaction. + */ + cvmx_usb_perform_complete(usb, pipe, transaction, + CVMX_USB_COMPLETE_ERROR); + return 0; + } + if (usbc_hcint.s.stall) { /* * STALL as a response means this transaction cannot be