1 files changed, 66 insertions, 39 deletions

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 7aabb45c35e5..d0a85073ebf7 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -109,6 +109,7 @@ enum {
 };
 
 static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
+static int sil_pci_device_resume(struct pci_dev *pdev);
 static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
 static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
@@ -160,6 +161,8 @@ static struct pci_driver sil_pci_driver = {
         .id_table               = sil_pci_tbl,
         .probe                  = sil_init_one,
         .remove                 = ata_pci_remove_one,
+        .suspend                = ata_pci_device_suspend,
+        .resume                 = sil_pci_device_resume,
 };
 
 static struct scsi_host_template sil_sht = {
@@ -178,6 +181,8 @@ static struct scsi_host_template sil_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
+        .suspend                = ata_scsi_device_suspend,
+        .resume                 = ata_scsi_device_resume,
 };
 
 static const struct ata_port_operations sil_ops = {
@@ -370,7 +375,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
                  * during hardreset makes controllers with broken SIEN
                  * repeat probing needlessly.
                  */
-                if (!(ap->flags & ATA_FLAG_FROZEN)) {
+                if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
                         ata_ehi_hotplugged(&ap->eh_info);
                         ap->eh_info.serror |= serror;
                 }
@@ -561,6 +566,52 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
         }
 }
 
+static void sil_init_controller(struct pci_dev *pdev,
+                                int n_ports, unsigned long host_flags,
+                                void __iomem *mmio_base)
+{
+        u8 cls;
+        u32 tmp;
+        int i;
+
+        /* Initialize FIFO PCI bus arbitration */
+        cls = sil_get_device_cache_line(pdev);
+        if (cls) {
+                cls >>= 3;
+                cls++;  /* cls = (line_size/8)+1 */
+                for (i = 0; i < n_ports; i++)
+                        writew(cls << 8 | cls,
+                               mmio_base + sil_port[i].fifo_cfg);
+        } else
+                dev_printk(KERN_WARNING, &pdev->dev,
+                           "cache line size not set.  Driver may not function\n");
+
+        /* Apply R_ERR on DMA activate FIS errata workaround */
+        if (host_flags & SIL_FLAG_RERR_ON_DMA_ACT) {
+                int cnt;
+
+                for (i = 0, cnt = 0; i < n_ports; i++) {
+                        tmp = readl(mmio_base + sil_port[i].sfis_cfg);
+                        if ((tmp & 0x3) != 0x01)
+                                continue;
+                        if (!cnt)
+                                dev_printk(KERN_INFO, &pdev->dev,
+                                           "Applying R_ERR on DMA activate "
+                                           "FIS errata fix\n");
+                        writel(tmp & ~0x3, mmio_base + sil_port[i].sfis_cfg);
+                        cnt++;
+                }
+        }
+
+        if (n_ports == 4) {
+                /* flip the magic "make 4 ports work" bit */
+                tmp = readl(mmio_base + sil_port[2].bmdma);
+                if ((tmp & SIL_INTR_STEERING) == 0)
+                        writel(tmp | SIL_INTR_STEERING,
+                               mmio_base + sil_port[2].bmdma);
+        }
+}
+
 static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
@@ -570,8 +621,6 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         int rc;
         unsigned int i;
         int pci_dev_busy = 0;
-        u32 tmp;
-        u8 cls;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
@@ -630,42 +679,8 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 ata_std_ports(&probe_ent->port[i]);
         }
 
-        /* Initialize FIFO PCI bus arbitration */
-        cls = sil_get_device_cache_line(pdev);
-        if (cls) {
-                cls >>= 3;
-                cls++;  /* cls = (line_size/8)+1 */
-                for (i = 0; i < probe_ent->n_ports; i++)
-                        writew(cls << 8 | cls,
-                               mmio_base + sil_port[i].fifo_cfg);
-        } else
-                dev_printk(KERN_WARNING, &pdev->dev,
-                           "cache line size not set.  Driver may not function\n");
-
-        /* Apply R_ERR on DMA activate FIS errata workaround */
-        if (probe_ent->host_flags & SIL_FLAG_RERR_ON_DMA_ACT) {
-                int cnt;
-
-                for (i = 0, cnt = 0; i < probe_ent->n_ports; i++) {
-                        tmp = readl(mmio_base + sil_port[i].sfis_cfg);
-                        if ((tmp & 0x3) != 0x01)
-                                continue;
-                        if (!cnt)
-                                dev_printk(KERN_INFO, &pdev->dev,
-                                           "Applying R_ERR on DMA activate "
-                                           "FIS errata fix\n");
-                        writel(tmp & ~0x3, mmio_base + sil_port[i].sfis_cfg);
-                        cnt++;
-                }
-        }
-
-        if (ent->driver_data == sil_3114) {
-                /* flip the magic "make 4 ports work" bit */
-                tmp = readl(mmio_base + sil_port[2].bmdma);
-                if ((tmp & SIL_INTR_STEERING) == 0)
-                        writel(tmp | SIL_INTR_STEERING,
-                               mmio_base + sil_port[2].bmdma);
-        }
+        sil_init_controller(pdev, probe_ent->n_ports, probe_ent->host_flags,
+                            mmio_base);
 
         pci_set_master(pdev);
 
@@ -685,6 +700,18 @@ err_out:
         return rc;
 }
 
+static int sil_pci_device_resume(struct pci_dev *pdev)
+{
+        struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
+
+        ata_pci_device_do_resume(pdev);
+        sil_init_controller(pdev, host_set->n_ports, host_set->ports[0]->flags,
+                            host_set->mmio_base);
+        ata_host_set_resume(host_set);
+
+        return 0;
+}
+
 static int __init sil_init(void)
 {
         return pci_module_init(&sil_pci_driver);