Clearing IRQ from ata_sff_error_handler() is necessary only when the
port is gonna be thawed before performing EH actions and some
controllers don't like being accessed after certain fail modes until
they're reset. Clear IRQ iff the port is being thawed. Also, remove
unnecessary ata_sff_sync() while at it.
Note that the original reason why IRQ was cleared unconditonally was
to help screaming IRQ cases; however, it didn't make any difference as
to screaming IRQs because...
1. If the port is already frozen && IRQ is screaming && EH is not
gonna thaw until reset is complete, it doesn't matter.
2. If IRQ is screaming && the port is not frozen or freezing doesn't
work, the IRQ will get killed way before it reaches EH.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
drivers/ata/libata-sff.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 4b47394..b9fb068 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2119,11 +2119,13 @@ void ata_sff_error_handler(struct ata_port *ap)
}
ap->ops->bmdma_stop(qc);
- }
- ata_sff_sync(ap); /* FIXME: We don't need this */
- ap->ops->sff_check_status(ap);
- ap->ops->sff_irq_clear(ap);
+ /* if we're gonna thaw, make sure IRQ is clear */
+ if (thaw) {
+ ap->ops->sff_check_status(ap);
+ ap->ops->sff_irq_clear(ap);
+ }
+ }
spin_unlock_irqrestore(ap->lock, flags);
--
1.5.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
