6 files changed, 124 insertions, 8 deletions

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index bed4b7c9be9..e6b61fab66d 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -146,7 +146,7 @@ struct scsi_cmnd {
 #define SCSI_STATE_MLQUEUE         0x100b
 
 
-extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, int);
+extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index da63722c012..7ece05666fe 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -163,6 +163,7 @@ struct scsi_target {
         unsigned int            id; /* target id ... replace
                                      * scsi_device.id eventually */
         unsigned long           create:1; /* signal that it needs to be added */
+        char                    scsi_level;
         void                    *hostdata; /* available to low-level driver */
         unsigned long           starget_data[0]; /* for the transport */
         /* starget_data must be the last element!!!! */
@@ -178,8 +179,8 @@ static inline struct scsi_target *scsi_target(struct scsi_device *sdev)
 
 extern struct scsi_device *__scsi_add_device(struct Scsi_Host *,
                 uint, uint, uint, void *hostdata);
-#define scsi_add_device(host, channel, target, lun) \
-        __scsi_add_device(host, channel, target, lun, NULL)
+extern int scsi_add_device(struct Scsi_Host *host, uint channel,
+                           uint target, uint lun);
 extern void scsi_remove_device(struct scsi_device *);
 extern int scsi_device_cancel(struct scsi_device *, int);
 
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 916144be208..69313ba7505 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -439,6 +439,8 @@ enum scsi_host_state {
         SHOST_CANCEL,
         SHOST_DEL,
         SHOST_RECOVERY,
+        SHOST_CANCEL_RECOVERY,
+        SHOST_DEL_RECOVERY,
 };
 
 struct Scsi_Host {
@@ -465,8 +467,6 @@ struct Scsi_Host {
 
         struct list_head        eh_cmd_q;
         struct task_struct    * ehandler;  /* Error recovery thread. */
-        struct semaphore      * eh_wait;   /* The error recovery thread waits
-                                              on this. */
         struct semaphore      * eh_action; /* Wait for specific actions on the
                                           host. */
         unsigned int            eh_active:1; /* Indicates the eh thread is awake and active if
@@ -621,6 +621,13 @@ static inline struct Scsi_Host *dev_to_shost(struct device *dev)
         return container_of(dev, struct Scsi_Host, shost_gendev);
 }
 
+static inline int scsi_host_in_recovery(struct Scsi_Host *shost)
+{
+        return shost->shost_state == SHOST_RECOVERY ||
+                shost->shost_state == SHOST_CANCEL_RECOVERY ||
+                shost->shost_state == SHOST_DEL_RECOVERY;
+}
+
 extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);
 extern void scsi_flush_work(struct Scsi_Host *);
 
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index 6a140020d7c..2539debb799 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -45,7 +45,7 @@ struct scsi_request {
                                            level driver) of this request */
 };
 
-extern struct scsi_request *scsi_allocate_request(struct scsi_device *, int);
+extern struct scsi_request *scsi_allocate_request(struct scsi_device *, gfp_t);
 extern void scsi_release_request(struct scsi_request *);
 extern void scsi_wait_req(struct scsi_request *, const void *cmnd,
                           void *buffer, unsigned bufflen,
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 70ad16315a1..b0d44543737 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -103,8 +103,8 @@ enum fc_port_state {
                                              incapable of reporting */
 #define FC_PORTSPEED_1GBIT              1
 #define FC_PORTSPEED_2GBIT              2
-#define FC_PORTSPEED_10GBIT             4
-#define FC_PORTSPEED_4GBIT              8
+#define FC_PORTSPEED_4GBIT              4
+#define FC_PORTSPEED_10GBIT             8
 #define FC_PORTSPEED_NOT_NEGOTIATED     (1 << 15) /* Speed not established */
 
 /*
@@ -439,4 +439,12 @@ int fc_remote_port_block(struct fc_rport *rport);
 void fc_remote_port_unblock(struct fc_rport *rport);
 int scsi_is_fc_rport(const struct device *);
 
+static inline u64 wwn_to_u64(u8 *wwn)
+{
+        return (u64)wwn[0] << 56 | (u64)wwn[1] << 48 |
+            (u64)wwn[2] << 40 | (u64)wwn[3] << 32 |
+            (u64)wwn[4] << 24 | (u64)wwn[5] << 16 |
+            (u64)wwn[6] <<  8 | (u64)wwn[7];
+}
+
 #endif /* SCSI_TRANSPORT_FC_H */
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
new file mode 100644
index 00000000000..bc4aeb660dd
--- /dev/null
+++ b/include/scsi/scsi_transport_sas.h
@@ -0,0 +1,100 @@
+#ifndef SCSI_TRANSPORT_SAS_H
+#define SCSI_TRANSPORT_SAS_H
+
+#include <linux/transport_class.h>
+#include <linux/types.h>
+
+struct scsi_transport_template;
+struct sas_rphy;
+
+
+enum sas_device_type {
+        SAS_PHY_UNUSED,
+        SAS_END_DEVICE,
+        SAS_EDGE_EXPANDER_DEVICE,
+        SAS_FANOUT_EXPANDER_DEVICE,
+};
+
+enum sas_protocol {
+        SAS_PROTOCOL_SATA               = 0x01,
+        SAS_PROTOCOL_SMP                = 0x02,
+        SAS_PROTOCOL_STP                = 0x04,
+        SAS_PROTOCOL_SSP                = 0x08,
+};
+
+enum sas_linkrate {
+        SAS_LINK_RATE_UNKNOWN,
+        SAS_PHY_DISABLED,
+        SAS_LINK_RATE_FAILED,
+        SAS_SATA_SPINUP_HOLD,
+        SAS_SATA_PORT_SELECTOR,
+        SAS_LINK_RATE_1_5_GBPS,
+        SAS_LINK_RATE_3_0_GBPS,
+        SAS_LINK_VIRTUAL,
+};
+
+struct sas_identify {
+        enum sas_device_type    device_type;
+        enum sas_protocol       initiator_port_protocols;
+        enum sas_protocol       target_port_protocols;
+        u64                     sas_address;
+        u8                      phy_identifier;
+};
+
+/* The functions by which the transport class and the driver communicate */
+struct sas_function_template {
+};
+
+struct sas_phy {
+        struct device           dev;
+        int                     number;
+        struct sas_identify     identify;
+        enum sas_linkrate       negotiated_linkrate;
+        enum sas_linkrate       minimum_linkrate_hw;
+        enum sas_linkrate       minimum_linkrate;
+        enum sas_linkrate       maximum_linkrate_hw;
+        enum sas_linkrate       maximum_linkrate;
+        u8                      port_identifier;
+        struct sas_rphy         *rphy;
+};
+
+#define dev_to_phy(d) \
+        container_of((d), struct sas_phy, dev)
+#define transport_class_to_phy(cdev) \
+        dev_to_phy((cdev)->dev)
+#define phy_to_shost(phy) \
+        dev_to_shost((phy)->dev.parent)
+
+struct sas_rphy {
+        struct device           dev;
+        struct sas_identify     identify;
+        struct list_head        list;
+        u32                     scsi_target_id;
+};
+
+#define dev_to_rphy(d) \
+        container_of((d), struct sas_rphy, dev)
+#define transport_class_to_rphy(cdev) \
+        dev_to_rphy((cdev)->dev)
+#define rphy_to_shost(rphy) \
+        dev_to_shost((rphy)->dev.parent)
+
+extern void sas_remove_host(struct Scsi_Host *);
+
+extern struct sas_phy *sas_phy_alloc(struct device *, int);
+extern void sas_phy_free(struct sas_phy *);
+extern int sas_phy_add(struct sas_phy *);
+extern void sas_phy_delete(struct sas_phy *);
+extern int scsi_is_sas_phy(const struct device *);
+
+extern struct sas_rphy *sas_rphy_alloc(struct sas_phy *);
+void sas_rphy_free(struct sas_rphy *);
+extern int sas_rphy_add(struct sas_rphy *);
+extern void sas_rphy_delete(struct sas_rphy *);
+extern int scsi_is_sas_rphy(const struct device *);
+
+extern struct scsi_transport_template *
+sas_attach_transport(struct sas_function_template *);
+extern void sas_release_transport(struct scsi_transport_template *);
+
+#endif /* SCSI_TRANSPORT_SAS_H */