fiq_fsm: clear hcintmsk for aborted transactions

Prevents the FIQ from erroneously handling interrupts on a timed out channel.
raspberrypi · Apr 24, 2014 · 526dd19 · 526dd19
1 parent e570fc8
commit 526dd19
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
@@ -580,8 +580,10 @@ static int notrace noinline fiq_fsm_do_sof(struct fiq_state *state, int num_chan
 					fiq_fsm_restart_channel(state, n, 0);
 					state->channel[n].fsm = FIQ_PER_SSPLIT_STARTED;
 				} else {
+					/* Transaction cannot be started without risking a device babble error */
 					state->channel[n].fsm = FIQ_PER_SPLIT_TIMEOUT;
 					state->haintmsk_saved.b2.chint &= ~(1 << n);
+					FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK, 0);
 					kick_irq |= 1;
 				}
 			}
@@ -629,6 +631,7 @@ static int notrace noinline fiq_fsm_do_sof(struct fiq_state *state, int num_chan
 			 * that's OK.
 			 */
 			state->haintmsk_saved.b2.chint &= ~(1 << n);
+			FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK, 0);
 			kick_irq |= 1;
 			break;