8 files changed, 50 insertions, 9 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 464e67c2e77a..77eeeda2b6e2 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -185,6 +185,7 @@ enum {
         ATA_LFLAG_DISABLED      = (1 << 6), /* link is disabled */
         ATA_LFLAG_SW_ACTIVITY   = (1 << 7), /* keep activity stats */
         ATA_LFLAG_NO_LPM        = (1 << 8), /* disable LPM on this link */
+        ATA_LFLAG_RST_ONCE      = (1 << 9), /* limit recovery to one reset */
 
         /* struct ata_port flags */
         ATA_FLAG_SLAVE_POSS     = (1 << 0), /* host supports slave dev */
@@ -990,8 +991,7 @@ extern int ata_host_activate(struct ata_host *host, int irq,
                              irq_handler_t irq_handler, unsigned long irq_flags,
                              struct scsi_host_template *sht);
 extern void ata_host_detach(struct ata_host *host);
-extern void ata_host_init(struct ata_host *, struct device *,
-                          unsigned long, struct ata_port_operations *);
+extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *);
 extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
@@ -1016,6 +1016,17 @@ extern bool ata_link_offline(struct ata_link *link);
 #ifdef CONFIG_PM
 extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
+extern int ata_sas_port_async_suspend(struct ata_port *ap, int *async);
+extern int ata_sas_port_async_resume(struct ata_port *ap, int *async);
+#else
+static inline int ata_sas_port_async_suspend(struct ata_port *ap, int *async)
+{
+        return 0;
+}
+static inline int ata_sas_port_async_resume(struct ata_port *ap, int *async)
+{
+        return 0;
+}
 #endif
 extern int ata_ratelimit(void);
 extern void ata_msleep(struct ata_port *ap, unsigned int msecs);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 8d3c42719387..33880f6f4e51 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -753,6 +753,7 @@
 #define PCI_DEVICE_ID_HP_CISSD          0x3238
 #define PCI_DEVICE_ID_HP_CISSE          0x323a
 #define PCI_DEVICE_ID_HP_CISSF          0x323b
+#define PCI_DEVICE_ID_HP_CISSH          0x323c
 #define PCI_DEVICE_ID_HP_ZX2_IOC        0x4031
 
 #define PCI_VENDOR_ID_PCTECH            0x1042
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index ae33706afeb0..ef937b56f9b5 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -79,7 +79,8 @@ enum phy_event {
         PHYE_OOB_DONE         = 1,
         PHYE_OOB_ERROR        = 2,
         PHYE_SPINUP_HOLD      = 3, /* hot plug SATA, no COMWAKE sent */
-        PHY_NUM_EVENTS        = 4,
+        PHYE_RESUME_TIMEOUT   = 4,
+        PHY_NUM_EVENTS        = 5,
 };
 
 enum discover_event {
@@ -87,8 +88,10 @@ enum discover_event {
         DISCE_REVALIDATE_DOMAIN = 1,
         DISCE_PORT_GONE         = 2,
         DISCE_PROBE             = 3,
-        DISCE_DESTRUCT          = 4,
-        DISC_NUM_EVENTS         = 5,
+        DISCE_SUSPEND           = 4,
+        DISCE_RESUME            = 5,
+        DISCE_DESTRUCT          = 6,
+        DISC_NUM_EVENTS         = 7,
 };
 
 /* ---------- Expander Devices ---------- */
@@ -128,7 +131,7 @@ struct ex_phy {
         u8   attached_sas_addr[SAS_ADDR_SIZE];
         u8   attached_phy_id;
 
-        u8   phy_change_count;
+        int phy_change_count;
         enum routing_attribute routing_attr;
         u8   virtual:1;
 
@@ -141,7 +144,7 @@ struct ex_phy {
 struct expander_device {
         struct list_head children;
 
-        u16    ex_change_count;
+        int    ex_change_count;
         u16    max_route_indexes;
         u8     num_phys;
 
@@ -169,6 +172,7 @@ struct sata_device {
         enum   ata_command_set command_set;
         struct smp_resp        rps_resp; /* report_phy_sata_resp */
         u8     port_no;        /* port number, if this is a PM (Port) */
+        int    pm_result;
 
         struct ata_port *ap;
         struct ata_host ata_host;
@@ -182,6 +186,7 @@ struct ssp_device {
 
 enum {
         SAS_DEV_GONE,
+        SAS_DEV_FOUND, /* device notified to lldd */
         SAS_DEV_DESTROY,
         SAS_DEV_EH_PENDING,
         SAS_DEV_LU_RESET,
@@ -273,6 +278,7 @@ struct asd_sas_port {
         enum   sas_linkrate linkrate;
 
         struct sas_work work;
+        int suspended;
 
 /* public: */
         int id;
@@ -321,6 +327,7 @@ struct asd_sas_phy {
         unsigned long phy_events_pending;
 
         int error;
+        int suspended;
 
         struct sas_phy *phy;
 
@@ -687,6 +694,9 @@ struct sas_domain_function_template {
 
 extern int sas_register_ha(struct sas_ha_struct *);
 extern int sas_unregister_ha(struct sas_ha_struct *);
+extern void sas_prep_resume_ha(struct sas_ha_struct *sas_ha);
+extern void sas_resume_ha(struct sas_ha_struct *sas_ha);
+extern void sas_suspend_ha(struct sas_ha_struct *sas_ha);
 
 int sas_set_phy_speed(struct sas_phy *phy,
                       struct sas_phy_linkrates *rates);
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index 2dfbdaa0b34a..ff71a5654684 100644
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -45,6 +45,8 @@ void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
 void sas_ata_schedule_reset(struct domain_device *dev);
 void sas_ata_wait_eh(struct domain_device *dev);
 void sas_probe_sata(struct asd_sas_port *port);
+void sas_suspend_sata(struct asd_sas_port *port);
+void sas_resume_sata(struct asd_sas_port *port);
 void sas_ata_end_eh(struct ata_port *ap);
 #else
 
@@ -82,6 +84,14 @@ static inline void sas_probe_sata(struct asd_sas_port *port)
 {
 }
 
+static inline void sas_suspend_sata(struct asd_sas_port *port)
+{
+}
+
+static inline void sas_resume_sata(struct asd_sas_port *port)
+{
+}
+
 static inline int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy)
 {
         return 0;
diff --git a/include/scsi/scsi_bsg_fc.h b/include/scsi/scsi_bsg_fc.h
index 91a4e4ff9a9b..3031b900b087 100644
--- a/include/scsi/scsi_bsg_fc.h
+++ b/include/scsi/scsi_bsg_fc.h
@@ -26,8 +26,6 @@
  * This file intended to be included by both kernel and user space
  */
 
-#include <scsi/scsi.h>
-
 /*
  * FC Transport SGIO v4 BSG Message Support
  */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 9895f69294fc..88fae8d20154 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -156,6 +156,7 @@ struct scsi_device {
         unsigned is_visible:1;  /* is the device visible in sysfs */
         unsigned can_power_off:1; /* Device supports runtime power off */
         unsigned wce_default_on:1;      /* Cache is ON by default */
+        unsigned no_dif:1;      /* T10 PI (DIF) should be disabled */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
         struct list_head event_list;    /* asserted events */
@@ -476,6 +477,9 @@ static inline int scsi_device_enclosure(struct scsi_device *sdev)
 
 static inline int scsi_device_protection(struct scsi_device *sdev)
 {
+        if (sdev->no_dif)
+                return 0;
+
         return sdev->scsi_level > SCSI_2 && sdev->inquiry[5] & (1<<0);
 }
 
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index b4ddd3b18b4c..cc1f3e786ad7 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -30,4 +30,5 @@
 #define BLIST_RETRY_HWERROR     0x400000 /* retry HARDWARE_ERROR */
 #define BLIST_MAX_512           0x800000 /* maximum 512 sector cdb length */
 #define BLIST_ATTACH_PQ3        0x1000000 /* Scan: Attach to PQ3 devices */
+#define BLIST_NO_DIF            0x2000000 /* Disable T10 PI (DIF) */
 #endif
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 5f7d5b3b1c6e..49084807eb6b 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -873,6 +873,9 @@ static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsign
                                        SHOST_DIF_TYPE2_PROTECTION,
                                        SHOST_DIF_TYPE3_PROTECTION };
 
+        if (target_type > SHOST_DIF_TYPE3_PROTECTION)
+                return 0;
+
         return shost->prot_capabilities & cap[target_type] ? target_type : 0;
 }
 
@@ -884,6 +887,9 @@ static inline unsigned int scsi_host_dix_capable(struct Scsi_Host *shost, unsign
                                        SHOST_DIX_TYPE2_PROTECTION,
                                        SHOST_DIX_TYPE3_PROTECTION };
 
+        if (target_type > SHOST_DIX_TYPE3_PROTECTION)
+                return 0;
+
         return shost->prot_capabilities & cap[target_type];
 #endif
         return 0;