5 files changed, 170 insertions, 5 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4c42065dea8..3c606cf8c8c 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -914,7 +914,7 @@ config SCSI_INIA100
 
 config SCSI_PPA
         tristate "IOMEGA parallel port (ppa - older drives)"
-        depends on SCSI && PARPORT
+        depends on SCSI && PARPORT_PC
         ---help---
           This driver supports older versions of IOMEGA's parallel port ZIP
           drive (a 100 MB removable media device).
@@ -941,7 +941,7 @@ config SCSI_PPA
 
 config SCSI_IMM
         tristate "IOMEGA parallel port (imm - newer drives)"
-        depends on SCSI && PARPORT
+        depends on SCSI && PARPORT_PC
         ---help---
           This driver supports newer versions of IOMEGA's parallel port ZIP
           drive (a 100 MB removable media device).
@@ -968,7 +968,7 @@ config SCSI_IMM
 
 config SCSI_IZIP_EPP16
         bool "ppa/imm option - Use slow (but safe) EPP-16"
-        depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+        depends on SCSI_PPA || SCSI_IMM
         ---help---
           EPP (Enhanced Parallel Port) is a standard for parallel ports which
           allows them to act as expansion buses that can handle up to 64
@@ -983,7 +983,7 @@ config SCSI_IZIP_EPP16
 
 config SCSI_IZIP_SLOW_CTR
         bool "ppa/imm option - Assume slow parport control register"
-        depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+        depends on SCSI_PPA || SCSI_IMM
         help
           Some parallel ports are known to have excessive delays between
           changing the parallel port control register and good data being
@@ -1815,7 +1815,7 @@ config SCSI_SUNESP
 
 config ZFCP
         tristate "FCP host bus adapter driver for IBM eServer zSeries"
-        depends on ARCH_S390 && QDIO && SCSI
+        depends on S390 && QDIO && SCSI
         select SCSI_FC_ATTRS
         help
           If you want to access SCSI devices attached to your IBM eServer
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 4b647eefc9a..557788ec4ee 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -166,6 +166,8 @@ static struct pci_driver piix_pci_driver = {
         .id_table               = piix_pci_tbl,
         .probe                  = piix_init_one,
         .remove                 = ata_pci_remove_one,
+        .suspend                = ata_pci_device_suspend,
+        .resume                 = ata_pci_device_resume,
 };
 
 static struct scsi_host_template piix_sht = {
@@ -185,6 +187,8 @@ static struct scsi_host_template piix_sht = {
         .dma_boundary           = ATA_DMA_BOUNDARY,
         .slave_configure        = ata_scsi_slave_config,
         .bios_param             = ata_std_bios_param,
+        .resume                 = ata_scsi_device_resume,
+        .suspend                = ata_scsi_device_suspend,
 };
 
 static const struct ata_port_operations piix_pata_ops = {
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index bdfb0a88cd6..f55b9b3f7b3 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4173,6 +4173,96 @@ err_out:
  *      Inherited from caller.
  */
 
+/*
+ * Execute a 'simple' command, that only consists of the opcode 'cmd' itself,
+ * without filling any other registers
+ */
+static int ata_do_simple_cmd(struct ata_port *ap, struct ata_device *dev,
+                             u8 cmd)
+{
+        struct ata_taskfile tf;
+        int err;
+
+        ata_tf_init(ap, &tf, dev->devno);
+
+        tf.command = cmd;
+        tf.flags |= ATA_TFLAG_DEVICE;
+        tf.protocol = ATA_PROT_NODATA;
+
+        err = ata_exec_internal(ap, dev, &tf, DMA_NONE, NULL, 0);
+        if (err)
+                printk(KERN_ERR "%s: ata command failed: %d\n",
+                                __FUNCTION__, err);
+
+        return err;
+}
+
+static int ata_flush_cache(struct ata_port *ap, struct ata_device *dev)
+{
+        u8 cmd;
+
+        if (!ata_try_flush_cache(dev))
+                return 0;
+
+        if (ata_id_has_flush_ext(dev->id))
+                cmd = ATA_CMD_FLUSH_EXT;
+        else
+                cmd = ATA_CMD_FLUSH;
+
+        return ata_do_simple_cmd(ap, dev, cmd);
+}
+
+static int ata_standby_drive(struct ata_port *ap, struct ata_device *dev)
+{
+        return ata_do_simple_cmd(ap, dev, ATA_CMD_STANDBYNOW1);
+}
+
+static int ata_start_drive(struct ata_port *ap, struct ata_device *dev)
+{
+        return ata_do_simple_cmd(ap, dev, ATA_CMD_IDLEIMMEDIATE);
+}
+
+/**
+ *      ata_device_resume - wakeup a previously suspended devices
+ *
+ *      Kick the drive back into action, by sending it an idle immediate
+ *      command and making sure its transfer mode matches between drive
+ *      and host.
+ *
+ */
+int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
+{
+        if (ap->flags & ATA_FLAG_SUSPENDED) {
+                ap->flags &= ~ATA_FLAG_SUSPENDED;
+                ata_set_mode(ap);
+        }
+        if (!ata_dev_present(dev))
+                return 0;
+        if (dev->class == ATA_DEV_ATA)
+                ata_start_drive(ap, dev);
+
+        return 0;
+}
+
+/**
+ *      ata_device_suspend - prepare a device for suspend
+ *
+ *      Flush the cache on the drive, if appropriate, then issue a
+ *      standbynow command.
+ *
+ */
+int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)
+{
+        if (!ata_dev_present(dev))
+                return 0;
+        if (dev->class == ATA_DEV_ATA)
+                ata_flush_cache(ap, dev);
+
+        ata_standby_drive(ap, dev);
+        ap->flags |= ATA_FLAG_SUSPENDED;
+        return 0;
+}
+
 int ata_port_start (struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
@@ -4921,6 +5011,23 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)
 
         return (tmp == bits->val) ? 1 : 0;
 }
+
+int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
+        return 0;
+}
+
+int ata_pci_device_resume(struct pci_dev *pdev)
+{
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_device(pdev);
+        pci_set_master(pdev);
+        return 0;
+}
 #endif /* CONFIG_PCI */
 
 
@@ -5024,4 +5131,11 @@ EXPORT_SYMBOL_GPL(ata_pci_host_stop);
 EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);
 EXPORT_SYMBOL_GPL(ata_pci_init_one);
 EXPORT_SYMBOL_GPL(ata_pci_remove_one);
+EXPORT_SYMBOL_GPL(ata_pci_device_suspend);
+EXPORT_SYMBOL_GPL(ata_pci_device_resume);
 #endif /* CONFIG_PCI */
+
+EXPORT_SYMBOL_GPL(ata_device_suspend);
+EXPORT_SYMBOL_GPL(ata_device_resume);
+EXPORT_SYMBOL_GPL(ata_scsi_device_suspend);
+EXPORT_SYMBOL_GPL(ata_scsi_device_resume);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 2c644cbb6e9..cfbceb50471 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -396,6 +396,22 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)
         }
 }
 
+int ata_scsi_device_resume(struct scsi_device *sdev)
+{
+        struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+        struct ata_device *dev = &ap->device[sdev->id];
+
+        return ata_device_resume(ap, dev);
+}
+
+int ata_scsi_device_suspend(struct scsi_device *sdev)
+{
+        struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+        struct ata_device *dev = &ap->device[sdev->id];
+
+        return ata_device_suspend(ap, dev);
+}
+
 /**
  *      ata_to_sense_error - convert ATA error to SCSI error
  *      @id: ATA device number
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 15842b1f0f4..ea7f3a43357 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -263,9 +263,40 @@ static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
         return (sdp->inq_periph_qual == SCSI_INQ_PQ_CON)? 1: 0;
 }
 
+static int scsi_bus_suspend(struct device * dev, pm_message_t state)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct scsi_host_template *sht = sdev->host->hostt;
+        int err;
+
+        err = scsi_device_quiesce(sdev);
+        if (err)
+                return err;
+
+        if (sht->suspend)
+                err = sht->suspend(sdev);
+
+        return err;
+}
+
+static int scsi_bus_resume(struct device * dev)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct scsi_host_template *sht = sdev->host->hostt;
+        int err = 0;
+
+        if (sht->resume)
+                err = sht->resume(sdev);
+
+        scsi_device_resume(sdev);
+        return err;
+}
+
 struct bus_type scsi_bus_type = {
         .name           = "scsi",
         .match          = scsi_bus_match,
+        .suspend        = scsi_bus_suspend,
+        .resume         = scsi_bus_resume,
 };
 
 int scsi_sysfs_register(void)