Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 532edc93 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-usb: never retry after xacterr 



Never retry after xacterr. The DMA engine cannot handle that properly
and may result in wrong transfer count and hang.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d712648a

drivers/staging/octeon-usb/octeon-hcd.c

+5 −33
Original line number Diff line number Diff line
@@ -2684,41 +2684,13 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
		cvmx_usb_perform_complete(usb, pipe, transaction,

					  CVMX_USB_COMPLETE_STALL);

	} else if (usbc_hcint.s.xacterr) {

		/*

		 * We know at least one packet worked if we get a ACK or NAK.

		 * Reset the retry counter

		 */

		if (usbc_hcint.s.nak || usbc_hcint.s.ack)

			transaction->retries = 0;

		transaction->retries++;

		if (transaction->retries > MAX_RETRIES) {

		/*

		 * XactErr as a response means the device signaled

		 * something wrong with the transfer. For example, PID

			 * toggle errors cause these

		 * toggle errors cause these.

		 */

		cvmx_usb_perform_complete(usb, pipe, transaction,

					  CVMX_USB_COMPLETE_XACTERR);

		} else {

			/*

			 * If this was a split then clear our split in progress

			 * marker

			 */

			if (usb->active_split == transaction)

				usb->active_split = NULL;

			/*

			 * Rewind to the beginning of the transaction by anding

			 * off the split complete bit

			 */

			transaction->stage &= ~1;

			pipe->split_sc_frame = -1;

			pipe->next_tx_frame += pipe->interval;

			if (pipe->next_tx_frame < usb->frame_number)

				pipe->next_tx_frame =

					usb->frame_number + pipe->interval -

					(usb->frame_number -

					 pipe->next_tx_frame) % pipe->interval;

		}

	} else if (usbc_hcint.s.bblerr) {

		/* Babble Error (BblErr) */

		cvmx_usb_perform_complete(usb, pipe, transaction,