1 files changed, 53 insertions, 49 deletions

diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 923130185a9e..9a53a5ed38c5 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -249,9 +249,9 @@ static u8 sil24_check_status(struct ata_port *ap);
 static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);
 static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
 static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
-static void sil24_phy_reset(struct ata_port *ap);
+static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void sil24_qc_prep(struct ata_queued_cmd *qc);
-static int sil24_qc_issue(struct ata_queued_cmd *qc);
+static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc);
 static void sil24_irq_clear(struct ata_port *ap);
 static void sil24_eng_timeout(struct ata_port *ap);
 static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
@@ -262,6 +262,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static const struct pci_device_id sil24_pci_tbl[] = {
         { 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
+        { 0x8086, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
         { 0x1095, 0x3132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3132 },
         { 0x1095, 0x3131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3131 },
         { 0x1095, 0x3531, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3131 },
@@ -280,11 +281,11 @@ static struct scsi_host_template sil24_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
+        .eh_timed_out           = ata_scsi_timed_out,
         .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
         .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -305,7 +306,7 @@ static const struct ata_port_operations sil24_ops = {
 
         .tf_read                = sil24_tf_read,
 
-        .phy_reset              = sil24_phy_reset,
+        .probe_reset            = sil24_probe_reset,
 
         .qc_prep                = sil24_qc_prep,
         .qc_issue               = sil24_qc_issue,
@@ -335,8 +336,8 @@ static struct ata_port_info sil24_port_info[] = {
         {
                 .sht            = &sil24_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
-                                  ATA_FLAG_PIO_DMA | SIL24_NPORTS2FLAG(4),
+                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                  SIL24_NPORTS2FLAG(4),
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -346,8 +347,8 @@ static struct ata_port_info sil24_port_info[] = {
         {
                 .sht            = &sil24_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
-                                  ATA_FLAG_PIO_DMA | SIL24_NPORTS2FLAG(2),
+                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                  SIL24_NPORTS2FLAG(2),
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -357,8 +358,8 @@ static struct ata_port_info sil24_port_info[] = {
         {
                 .sht            = &sil24_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
-                                  ATA_FLAG_PIO_DMA | SIL24_NPORTS2FLAG(1),
+                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                  SIL24_NPORTS2FLAG(1),
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -370,7 +371,7 @@ static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev)
 {
         void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
 
-        if (ap->cdb_len == 16)
+        if (dev->cdb_len == 16)
                 writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
         else
                 writel(PORT_CS_CDB16, port + PORT_CTRL_CLR);
@@ -427,14 +428,23 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         *tf = pp->tf;
 }
 
-static int sil24_issue_SRST(struct ata_port *ap)
+static int sil24_softreset(struct ata_port *ap, int verbose,
+                           unsigned int *class)
 {
         void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
         struct sil24_port_priv *pp = ap->private_data;
         struct sil24_prb *prb = &pp->cmd_block[0].ata.prb;
         dma_addr_t paddr = pp->cmd_block_dma;
+        unsigned long timeout = jiffies + ATA_TMOUT_BOOT * HZ;
         u32 irq_enable, irq_stat;
-        int cnt;
+
+        DPRINTK("ENTER\n");
+
+        if (!sata_dev_present(ap)) {
+                DPRINTK("PHY reports no device\n");
+                *class = ATA_DEV_NONE;
+                goto out;
+        }
 
         /* temporarily turn off IRQs during SRST */
         irq_enable = readl(port + PORT_IRQ_ENABLE_SET);
@@ -451,7 +461,7 @@ static int sil24_issue_SRST(struct ata_port *ap)
 
         writel((u32)paddr, port + PORT_CMD_ACTIVATE);
 
-        for (cnt = 0; cnt < 100; cnt++) {
+        do {
                 irq_stat = readl(port + PORT_IRQ_STAT);
                 writel(irq_stat, port + PORT_IRQ_STAT);         /* clear irq */
 
@@ -459,36 +469,42 @@ static int sil24_issue_SRST(struct ata_port *ap)
                 if (irq_stat & (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR))
                         break;
 
-                msleep(1);
-        }
+                msleep(100);
+        } while (time_before(jiffies, timeout));
 
         /* restore IRQs */
         writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
 
-        if (!(irq_stat & PORT_IRQ_COMPLETE))
-                return -1;
+        if (!(irq_stat & PORT_IRQ_COMPLETE)) {
+                DPRINTK("EXIT, srst failed\n");
+                return -EIO;
+        }
 
-        /* update TF */
         sil24_update_tf(ap);
+        *class = ata_dev_classify(&pp->tf);
+
+        if (*class == ATA_DEV_UNKNOWN)
+                *class = ATA_DEV_NONE;
+
+ out:
+        DPRINTK("EXIT, class=%u\n", *class);
         return 0;
 }
 
-static void sil24_phy_reset(struct ata_port *ap)
+static int sil24_hardreset(struct ata_port *ap, int verbose,
+                           unsigned int *class)
 {
-        struct sil24_port_priv *pp = ap->private_data;
+        unsigned int dummy_class;
 
-        __sata_phy_reset(ap);
-        if (ap->flags & ATA_FLAG_PORT_DISABLED)
-                return;
-
-        if (sil24_issue_SRST(ap) < 0) {
-                printk(KERN_ERR DRV_NAME
-                       " ata%u: SRST failed, disabling port\n", ap->id);
-                ap->ops->port_disable(ap);
-                return;
-        }
+        /* sil24 doesn't report device signature after hard reset */
+        return sata_std_hardreset(ap, verbose, &dummy_class);
+}
 
-        ap->device->class = ata_dev_classify(&pp->tf);
+static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes)
+{
+        return ata_drive_probe_reset(ap, ata_std_probeinit,
+                                     sil24_softreset, sil24_hardreset,
+                                     ata_std_postreset, classes);
 }
 
 static inline void sil24_fill_sg(struct ata_queued_cmd *qc,
@@ -533,7 +549,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
                 prb = &cb->atapi.prb;
                 sge = cb->atapi.sge;
                 memset(cb->atapi.cdb, 0, 32);
-                memcpy(cb->atapi.cdb, qc->cdb, ap->cdb_len);
+                memcpy(cb->atapi.cdb, qc->cdb, qc->dev->cdb_len);
 
                 if (qc->tf.protocol != ATA_PROT_ATAPI_NODATA) {
                         if (qc->tf.flags & ATA_TFLAG_WRITE)
@@ -557,7 +573,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
                 sil24_fill_sg(qc, sge);
 }
 
-static int sil24_qc_issue(struct ata_queued_cmd *qc)
+static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
@@ -638,23 +654,10 @@ static void sil24_eng_timeout(struct ata_port *ap)
         struct ata_queued_cmd *qc;
 
         qc = ata_qc_from_tag(ap, ap->active_tag);
-        if (!qc) {
-                printk(KERN_ERR "ata%u: BUG: timeout without command\n",
-                       ap->id);
-                return;
-        }
 
-        /*
-         * 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
-         * any kernel, so the default scsi_done() assumes it is
-         * not being called from the SCSI EH.
-         */
         printk(KERN_ERR "ata%u: command timeout\n", ap->id);
-        qc->scsidone = scsi_finish_command;
-        qc->err_mask |= AC_ERR_OTHER;
-        ata_qc_complete(qc);
+        qc->err_mask |= AC_ERR_TIMEOUT;
+        ata_eh_qc_complete(qc);
 
         sil24_reset_controller(ap);
 }
@@ -895,6 +898,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->sht          = pinfo->sht;
         probe_ent->host_flags   = pinfo->host_flags;
         probe_ent->pio_mask     = pinfo->pio_mask;
+        probe_ent->mwdma_mask   = pinfo->mwdma_mask;
         probe_ent->udma_mask    = pinfo->udma_mask;
         probe_ent->port_ops     = pinfo->port_ops;
         probe_ent->n_ports      = SIL24_FLAG2NPORTS(pinfo->host_flags);