Explorar o código

firewire: ohci: flush AT contexts after bus reset - addendum

Add comments
  - on why bus_reset_tasklet flushes AT queues,
  - that commit 76f73ca1b291 can possibly be reverted now.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Jarod Wilson <jarod@redhat.com>
Stefan Richter %!s(int64=14) %!d(string=hai) anos
pai
achega
78dec56d6a
Modificáronse 1 ficheiros con 7 adicións e 0 borrados
  1. 7 0
      drivers/firewire/ohci.c

+ 7 - 0
drivers/firewire/ohci.c

@@ -1336,6 +1336,8 @@ static int at_context_queue_packet(struct context *ctx,
 	 * some controllers (like a JMicron JMB381 PCI-e) misbehave and wind
 	 * some controllers (like a JMicron JMB381 PCI-e) misbehave and wind
 	 * up stalling out.  So we just bail out in software and try again
 	 * up stalling out.  So we just bail out in software and try again
 	 * later, and everyone is happy.
 	 * later, and everyone is happy.
+	 * FIXME: Test of IntEvent.busReset may no longer be necessary since we
+	 *        flush AT queues in bus_reset_tasklet.
 	 * FIXME: Document how the locking works.
 	 * FIXME: Document how the locking works.
 	 */
 	 */
 	if (ohci->generation != packet->generation ||
 	if (ohci->generation != packet->generation ||
@@ -1750,6 +1752,11 @@ static void bus_reset_tasklet(unsigned long data)
 
 
 	spin_unlock_irqrestore(&ohci->lock, flags);
 	spin_unlock_irqrestore(&ohci->lock, flags);
 
 
+	/*
+	 * Per OHCI 1.2 draft, clause 7.2.3.3, hardware may leave unsent
+	 * packets in the AT queues and software needs to drain them.
+	 * Some OHCI 1.1 controllers (JMicron) apparently require this too.
+	 */
 	at_context_flush(&ohci->at_request_ctx);
 	at_context_flush(&ohci->at_request_ctx);
 	at_context_flush(&ohci->at_response_ctx);
 	at_context_flush(&ohci->at_response_ctx);