Commit 78dec56d authored by Stefan Richter's avatar Stefan Richter

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

Add comments
  - on why bus_reset_tasklet flushes AT queues,
  - that commit 76f73ca1 can possibly be reverted now.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: default avatarJarod Wilson <jarod@redhat.com>
parent 82b662dc
...@@ -1336,6 +1336,8 @@ static int at_context_queue_packet(struct context *ctx, ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment