Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull first round of SCSI updates from James Bottomley:
 "This is a large set of updates, mostly for drivers (qla2xxx [including
  support for new 83xx based card], qla4xxx, mpt2sas, bfa, zfcp, hpsa,
  be2iscsi, isci, lpfc, ipr, ibmvfc, ibmvscsi, megaraid_sas).

  There's also a rework for tape adding virtually unlimited numbers of
  tape drives plus a set of dif fixes for sd and a fix for a live lock
  on hot remove of SCSI devices.

  This round includes a signed tag pull of isci-for-3.6

  Signed-off-by: James Bottomley <JBottomley@Parallels.com>"

Fix up trivial conflict in drivers/scsi/qla2xxx/qla_nx.c due to new PCI
helper function use in a function that was removed by this pull.

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (198 commits)
  [SCSI] st: remove st_mutex
  [SCSI] sd: Ensure we correctly disable devices with unknown protection type
  [SCSI] hpsa: gen8plus Smart Array IDs
  [SCSI] qla4xxx: Update driver version to 5.03.00-k1
  [SCSI] qla4xxx: Disable generating pause frames for ISP83XX
  [SCSI] qla4xxx: Fix double clearing of risc_intr for ISP83XX
  [SCSI] qla4xxx: IDC implementation for Loopback
  [SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx
  [SCSI] qla4xxx: Fix panic while rmmod
  [SCSI] qla4xxx: Fail probe_adapter if IRQ allocation fails
  [SCSI] qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
  [SCSI] qla4xxx: Update idc reg in case of PCI AER
  [SCSI] qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
  [SCSI] qla4xxx: Clear interrupt while unloading driver for ISP83XX
  [SCSI] qla4xxx: Print correct IDC version
  [SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW
  [SCSI] scsi_dh_alua: Enable STPG for unavailable ports
  [SCSI] scsi_remove_target: fix softlockup regression on hot remove
  [SCSI] ibmvscsi: Fix host config length field overflow
  [SCSI] ibmvscsi: Remove backend abstraction
  ...

1 files changed, 87 insertions, 4 deletions

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index a59fcdc8fd63..bdb81cda8401 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -580,10 +580,7 @@ int sas_ata_init(struct domain_device *found_dev)
         struct ata_port *ap;
         int rc;
 
-        ata_host_init(&found_dev->sata_dev.ata_host,
-                      ha->dev,
-                      sata_port_info.flags,
-                      &sas_sata_ops);
+        ata_host_init(&found_dev->sata_dev.ata_host, ha->dev, &sas_sata_ops);
         ap = ata_sas_port_alloc(&found_dev->sata_dev.ata_host,
                                 &sata_port_info,
                                 shost);
@@ -700,6 +697,92 @@ void sas_probe_sata(struct asd_sas_port *port)
                 if (ata_dev_disabled(sas_to_ata_dev(dev)))
                         sas_fail_probe(dev, __func__, -ENODEV);
         }
+
+}
+
+static bool sas_ata_flush_pm_eh(struct asd_sas_port *port, const char *func)
+{
+        struct domain_device *dev, *n;
+        bool retry = false;
+
+        list_for_each_entry_safe(dev, n, &port->dev_list, dev_list_node) {
+                int rc;
+
+                if (!dev_is_sata(dev))
+                        continue;
+
+                sas_ata_wait_eh(dev);
+                rc = dev->sata_dev.pm_result;
+                if (rc == -EAGAIN)
+                        retry = true;
+                else if (rc) {
+                        /* since we don't have a
+                         * ->port_{suspend|resume} routine in our
+                         *  ata_port ops, and no entanglements with
+                         *  acpi, suspend should just be mechanical trip
+                         *  through eh, catch cases where these
+                         *  assumptions are invalidated
+                         */
+                        WARN_ONCE(1, "failed %s %s error: %d\n", func,
+                                 dev_name(&dev->rphy->dev), rc);
+                }
+
+                /* if libata failed to power manage the device, tear it down */
+                if (ata_dev_disabled(sas_to_ata_dev(dev)))
+                        sas_fail_probe(dev, func, -ENODEV);
+        }
+
+        return retry;
+}
+
+void sas_suspend_sata(struct asd_sas_port *port)
+{
+        struct domain_device *dev;
+
+ retry:
+        mutex_lock(&port->ha->disco_mutex);
+        list_for_each_entry(dev, &port->dev_list, dev_list_node) {
+                struct sata_device *sata;
+
+                if (!dev_is_sata(dev))
+                        continue;
+
+                sata = &dev->sata_dev;
+                if (sata->ap->pm_mesg.event == PM_EVENT_SUSPEND)
+                        continue;
+
+                sata->pm_result = -EIO;
+                ata_sas_port_async_suspend(sata->ap, &sata->pm_result);
+        }
+        mutex_unlock(&port->ha->disco_mutex);
+
+        if (sas_ata_flush_pm_eh(port, __func__))
+                goto retry;
+}
+
+void sas_resume_sata(struct asd_sas_port *port)
+{
+        struct domain_device *dev;
+
+ retry:
+        mutex_lock(&port->ha->disco_mutex);
+        list_for_each_entry(dev, &port->dev_list, dev_list_node) {
+                struct sata_device *sata;
+
+                if (!dev_is_sata(dev))
+                        continue;
+
+                sata = &dev->sata_dev;
+                if (sata->ap->pm_mesg.event == PM_EVENT_ON)
+                        continue;
+
+                sata->pm_result = -EIO;
+                ata_sas_port_async_resume(sata->ap, &sata->pm_result);
+        }
+        mutex_unlock(&port->ha->disco_mutex);
+
+        if (sas_ata_flush_pm_eh(port, __func__))
+                goto retry;
 }
 
 /**