aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-15 14:03:47 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-15 14:03:47 -0500
commit9f68a24853dd37d18f2cfa979cf4e131f5a10e8f (patch)
tree0e6c81b47ff6f4e2e3a5149873d9d3c176d9e292
parentc6e6e666cbfe40f0d7fb1a293ff6332973acac37 (diff)
[libata ahci] command completion fixes, improved debug msgs
- Fix a regression in command completion, which prevented the restart of the DMA engine after the device throws an error. - Pack more hardware info into the port-reset error message. - Promote "welcome to our timeout" message from debug msg to normal printk.
-rw-r--r--drivers/scsi/ahci.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index c710a7def7a..894e7113e0b 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -565,6 +565,17 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
u32 tmp;
int work;
+ printk(KERN_WARNING "ata%u: port reset, "
+ "p_is %x is %x pis %x cmd %x tf %x ss %x se %x\n",
+ ap->id,
+ irq_stat,
+ readl(mmio + HOST_IRQ_STAT),
+ readl(port_mmio + PORT_IRQ_STAT),
+ readl(port_mmio + PORT_CMD),
+ readl(port_mmio + PORT_TFDATA),
+ readl(port_mmio + PORT_SCR_STAT),
+ readl(port_mmio + PORT_SCR_ERR));
+
/* stop DMA */
tmp = readl(port_mmio + PORT_CMD);
tmp &= ~PORT_CMD_START;
@@ -602,13 +613,6 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
tmp |= PORT_CMD_START;
writel(tmp, port_mmio + PORT_CMD);
readl(port_mmio + PORT_CMD); /* flush */
-
- printk(KERN_WARNING "ata%u: error occurred, port reset (%s%s%s%s)\n",
- ap->id,
- irq_stat & PORT_IRQ_TF_ERR ? "taskf " : "",
- irq_stat & PORT_IRQ_HBUS_ERR ? "hbus " : "",
- irq_stat & PORT_IRQ_HBUS_DATA_ERR ? "hbus_data " : "",
- irq_stat & PORT_IRQ_IF_ERR ? "if " : "");
}
static void ahci_eng_timeout(struct ata_port *ap)
@@ -619,7 +623,7 @@ static void ahci_eng_timeout(struct ata_port *ap)
struct ata_queued_cmd *qc;
unsigned long flags;
- DPRINTK("ENTER\n");
+ printk(KERN_WARNING "ata%u: handling error/timeout\n", ap->id);
spin_lock_irqsave(&host_set->lock, flags);
@@ -672,8 +676,9 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
else
err_mask = AC_ERR_HOST_BUS;
- if (err_mask != AC_ERR_DEV)
- ahci_intr_error(ap, status);
+ /* command processing has stopped due to error; restart */
+ ahci_intr_error(ap, status);
+
if (qc)
ata_qc_complete(qc, err_mask);
}