aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorMark Lord <mlord@pobox.com>2009-02-25 15:15:39 -0500
committerJeff Garzik <jgarzik@redhat.com>2009-03-24 22:02:40 -0400
commit42ed893d8011264f9945c2f54055b47c298ac53e (patch)
tree1923c308e4b103960b9fefb24c51e50a91739a4e /drivers/ata
parentc01e8a23128c746f23088db836bd4c820f3eb0b4 (diff)
downloadkernel_samsung_smdk4412-42ed893d8011264f9945c2f54055b47c298ac53e.tar.gz
kernel_samsung_smdk4412-42ed893d8011264f9945c2f54055b47c298ac53e.tar.bz2
kernel_samsung_smdk4412-42ed893d8011264f9945c2f54055b47c298ac53e.zip
[libata] sata_mv: Tighten up interrupt masking in mv_qc_issue()
so that it doesn't miss any protocols. Handle future cases where a qc is specially marked for polled issue or where a particular chip version prefers interrupts over polling for PIO. This mimics the polling decision logic from ata_sff_qc_issue(). Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_mv.c34
1 files changed, 21 insertions, 13 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 3bfe721ba76..b74af945a2f 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1809,7 +1809,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
void __iomem *port_mmio = mv_ap_base(ap);
struct mv_port_priv *pp = ap->private_data;
u32 in_index;
- unsigned int port_irqs = DONE_IRQ | ERR_IRQ;
+ unsigned int port_irqs;
switch (qc->tf.protocol) {
case ATA_PROT_DMA:
@@ -1842,20 +1842,28 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
"this may fail due to h/w errata\n");
}
/* drop through */
+ case ATA_PROT_NODATA:
case ATAPI_PROT_PIO:
- port_irqs = ERR_IRQ; /* leave DONE_IRQ masked for PIO */
- /* drop through */
- default:
- /*
- * We're about to send a non-EDMA capable command to the
- * port. Turn off EDMA so there won't be problems accessing
- * shadow block, etc registers.
- */
- mv_stop_edma(ap);
- mv_clear_and_enable_port_irqs(ap, mv_ap_base(ap), port_irqs);
- mv_pmp_select(ap, qc->dev->link->pmp);
- return ata_sff_qc_issue(qc);
+ case ATAPI_PROT_NODATA:
+ if (ap->flags & ATA_FLAG_PIO_POLLING)
+ qc->tf.flags |= ATA_TFLAG_POLLING;
+ break;
}
+
+ if (qc->tf.flags & ATA_TFLAG_POLLING)
+ port_irqs = ERR_IRQ; /* mask device interrupt when polling */
+ else
+ port_irqs = ERR_IRQ | DONE_IRQ; /* unmask all interrupts */
+
+ /*
+ * We're about to send a non-EDMA capable command to the
+ * port. Turn off EDMA so there won't be problems accessing
+ * shadow block, etc registers.
+ */
+ mv_stop_edma(ap);
+ mv_clear_and_enable_port_irqs(ap, mv_ap_base(ap), port_irqs);
+ mv_pmp_select(ap, qc->dev->link->pmp);
+ return ata_sff_qc_issue(qc);
}
static struct ata_queued_cmd *mv_get_active_qc(struct ata_port *ap)