Merge branch 'upstream'

1 files changed, 57 insertions, 14 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 57ef7ae387d9..83467a05dc8e 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -48,7 +48,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ahci"
-#define DRV_VERSION     "1.01"
+#define DRV_VERSION     "1.2"
 
 
 enum {
@@ -134,6 +134,7 @@ enum {
                                   PORT_IRQ_D2H_REG_FIS,
 
         /* PORT_CMD bits */
+        PORT_CMD_ATAPI          = (1 << 24), /* Device is ATAPI */
         PORT_CMD_LIST_ON        = (1 << 15), /* cmd list DMA engine running */
         PORT_CMD_FIS_ON         = (1 << 14), /* FIS DMA engine running */
         PORT_CMD_FIS_RX         = (1 << 4), /* Enable FIS receive DMA engine */
@@ -441,7 +442,7 @@ static void ahci_phy_reset(struct ata_port *ap)
         void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
         struct ata_taskfile tf;
         struct ata_device *dev = &ap->device[0];
-        u32 tmp;
+        u32 new_tmp, tmp;
 
         __sata_phy_reset(ap);
 
@@ -455,8 +456,21 @@ static void ahci_phy_reset(struct ata_port *ap)
         tf.nsect        = (tmp)         & 0xff;
 
         dev->class = ata_dev_classify(&tf);
-        if (!ata_dev_present(dev))
+        if (!ata_dev_present(dev)) {
                 ata_port_disable(ap);
+                return;
+        }
+
+        /* Make sure port's ATAPI bit is set appropriately */
+        new_tmp = tmp = readl(port_mmio + PORT_CMD);
+        if (dev->class == ATA_DEV_ATAPI)
+                new_tmp |= PORT_CMD_ATAPI;
+        else
+                new_tmp &= ~PORT_CMD_ATAPI;
+        if (new_tmp != tmp) {
+                writel(new_tmp, port_mmio + PORT_CMD);
+                readl(port_mmio + PORT_CMD); /* flush */
+        }
 }
 
 static u8 ahci_check_status(struct ata_port *ap)
@@ -474,11 +488,12 @@ static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         ata_tf_from_fis(d2h_fis, tf);
 }
 
-static void ahci_fill_sg(struct ata_queued_cmd *qc)
+static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc)
 {
         struct ahci_port_priv *pp = qc->ap->private_data;
         struct scatterlist *sg;
         struct ahci_sg *ahci_sg;
+        unsigned int n_sg = 0;
 
         VPRINTK("ENTER\n");
 
@@ -493,8 +508,12 @@ static void ahci_fill_sg(struct ata_queued_cmd *qc)
                 ahci_sg->addr = cpu_to_le32(addr & 0xffffffff);
                 ahci_sg->addr_hi = cpu_to_le32((addr >> 16) >> 16);
                 ahci_sg->flags_size = cpu_to_le32(sg_len - 1);
+
                 ahci_sg++;
+                n_sg++;
         }
+
+        return n_sg;
 }
 
 static void ahci_qc_prep(struct ata_queued_cmd *qc)
@@ -503,13 +522,14 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
         struct ahci_port_priv *pp = ap->private_data;
         u32 opts;
         const u32 cmd_fis_len = 5; /* five dwords */
+        unsigned int n_elem;
 
         /*
          * Fill in command slot information (currently only one slot,
          * slot 0, is currently since we don't do queueing)
          */
 
-        opts = (qc->n_elem << 16) | cmd_fis_len;
+        opts = cmd_fis_len;
         if (qc->tf.flags & ATA_TFLAG_WRITE)
                 opts |= AHCI_CMD_WRITE;
         if (is_atapi_taskfile(&qc->tf))
@@ -533,16 +553,31 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
         if (!(qc->flags & ATA_QCFLAG_DMAMAP))
                 return;
 
-        ahci_fill_sg(qc);
+        n_elem = ahci_fill_sg(qc);
+
+        pp->cmd_slot[0].opts |= cpu_to_le32(n_elem << 16);
 }
 
-static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
+static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
 {
         void __iomem *mmio = ap->host_set->mmio_base;
         void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 tmp;
         int work;
 
+        if ((ap->device[0].class != ATA_DEV_ATAPI) ||
+            ((irq_stat & PORT_IRQ_TF_ERR) == 0))
+                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;
@@ -580,8 +615,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\n", ap->id);
 }
 
 static void ahci_eng_timeout(struct ata_port *ap)
@@ -592,17 +625,17 @@ 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);
 
-        ahci_intr_error(ap, readl(port_mmio + PORT_IRQ_STAT));
-
         qc = ata_qc_from_tag(ap, ap->active_tag);
         if (!qc) {
                 printk(KERN_ERR "ata%u: BUG: timeout without command\n",
                        ap->id);
         } else {
+                ahci_restart_port(ap, readl(port_mmio + PORT_IRQ_STAT));
+
                 /* hack alert!  We cannot use the supplied completion
                  * function from inside the ->eh_strategy_handler() thread.
                  * libata is the only user of ->eh_strategy_handler() in
@@ -637,9 +670,19 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
         }
 
         if (status & PORT_IRQ_FATAL) {
-                ahci_intr_error(ap, status);
+                unsigned int err_mask;
+                if (status & PORT_IRQ_TF_ERR)
+                        err_mask = AC_ERR_DEV;
+                else if (status & PORT_IRQ_IF_ERR)
+                        err_mask = AC_ERR_ATA_BUS;
+                else
+                        err_mask = AC_ERR_HOST_BUS;
+
+                /* command processing has stopped due to error; restart */
+                ahci_restart_port(ap, status);
+
                 if (qc)
-                        ata_qc_complete(qc, AC_ERR_OTHER);
+                        ata_qc_complete(qc, err_mask);
         }
 
         return 1;