7 files changed, 51 insertions, 26 deletions

diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index 02f6e4b9e693..4a44278ed768 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -40,6 +40,14 @@
 }
 #define zero_data(p) {p[0]=0;p[1]=0;p[2]=0;}
 
+/* initiator tags; opaque for target */
+typedef uint32_t __bitwise__ itt_t;
+/* below makes sense only for initiator that created this tag */
+#define build_itt(itt, id, age) ((__force itt_t)\
+        ((itt) | ((id) << ISCSI_CID_SHIFT) | ((age) << ISCSI_AGE_SHIFT)))
+#define get_itt(itt) ((__force uint32_t)(itt_t)(itt) & ISCSI_ITT_MASK)
+#define RESERVED_ITT ((__force itt_t)0xffffffff)
+
 /*
  * iSCSI Template Message Header
  */
@@ -50,7 +58,7 @@ struct iscsi_hdr {
         uint8_t         hlength;        /* AHSs total length */
         uint8_t         dlength[3];     /* Data length */
         uint8_t         lun[8];
-        __be32          itt;            /* Initiator Task Tag */
+        itt_t           itt;            /* Initiator Task Tag, opaque for target */
         __be32          ttt;            /* Target Task Tag */
         __be32          statsn;
         __be32          exp_statsn;
@@ -111,7 +119,7 @@ struct iscsi_cmd {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32 itt;     /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32 data_length;
         __be32 cmdsn;
         __be32 exp_statsn;
@@ -148,7 +156,7 @@ struct iscsi_cmd_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  rsvd1;
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -206,7 +214,7 @@ struct iscsi_nopout {
         uint8_t rsvd3;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  ttt;    /* Target Transfer Tag */
         __be32  cmdsn;
         __be32  exp_statsn;
@@ -221,7 +229,7 @@ struct iscsi_nopin {
         uint8_t rsvd3;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  ttt;    /* Target Transfer Tag */
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -237,8 +245,8 @@ struct iscsi_tm {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;    /* Initiator Task Tag */
-        __be32  rtt;    /* Reference Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
+        itt_t    rtt;   /* Reference Task Tag */
         __be32  cmdsn;
         __be32  exp_statsn;
         __be32  refcmdsn;
@@ -267,8 +275,8 @@ struct iscsi_tm_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd2[8];
-        __be32  itt;    /* Initiator Task Tag */
-        __be32  rtt;    /* Reference Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
+        itt_t    rtt;   /* Reference Task Tag */
         __be32  statsn;
         __be32  exp_cmdsn;
         __be32  max_cmdsn;
@@ -293,7 +301,7 @@ struct iscsi_r2t_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  ttt;    /* Target Transfer Tag */
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -311,7 +319,7 @@ struct iscsi_data {
         uint8_t rsvd3;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;
+        itt_t    itt;
         __be32  ttt;
         __be32  rsvd4;
         __be32  exp_statsn;
@@ -331,7 +339,7 @@ struct iscsi_data_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t lun[8];
-        __be32  itt;
+        itt_t    itt;
         __be32  ttt;
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -355,7 +363,7 @@ struct iscsi_text {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd4[8];
-        __be32  itt;
+        itt_t    itt;
         __be32  ttt;
         __be32  cmdsn;
         __be32  exp_statsn;
@@ -373,7 +381,7 @@ struct iscsi_text_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd4[8];
-        __be32  itt;
+        itt_t    itt;
         __be32  ttt;
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -392,7 +400,7 @@ struct iscsi_login {
         uint8_t dlength[3];
         uint8_t isid[6];        /* Initiator Session ID */
         __be16  tsih;   /* Target Session Handle */
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be16  cid;
         __be16  rsvd3;
         __be32  cmdsn;
@@ -421,7 +429,7 @@ struct iscsi_login_rsp {
         uint8_t dlength[3];
         uint8_t isid[6];        /* Initiator Session ID */
         __be16  tsih;   /* Target Session Handle */
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  rsvd3;
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -478,7 +486,7 @@ struct iscsi_logout {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd2[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be16  cid;
         uint8_t rsvd3[2];
         __be32  cmdsn;
@@ -505,7 +513,7 @@ struct iscsi_logout_rsp {
         uint8_t hlength;
         uint8_t dlength[3];
         uint8_t rsvd3[8];
-        __be32  itt;    /* Initiator Task Tag */
+        itt_t    itt;   /* Initiator Task Tag */
         __be32  rsvd4;
         __be32  statsn;
         __be32  exp_cmdsn;
@@ -528,7 +536,7 @@ struct iscsi_snack {
         uint8_t opcode;
         uint8_t flags;
         uint8_t rsvd2[14];
-        __be32  itt;
+        itt_t    itt;
         __be32  begrun;
         __be32  runlength;
         __be32  exp_statsn;
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 0c775fceb675..ad0182ef7809 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -323,12 +323,20 @@ struct sas_ha_event {
         struct sas_ha_struct *ha;
 };
 
+enum sas_ha_state {
+        SAS_HA_REGISTERED,
+        SAS_HA_UNREGISTERED
+};
+
 struct sas_ha_struct {
 /* private: */
         spinlock_t       event_lock;
         struct sas_ha_event ha_events[HA_NUM_EVENTS];
         unsigned long    pending;
 
+        enum sas_ha_state state;
+        spinlock_t        state_lock;
+
         struct scsi_core core;
 
 /* public: */
@@ -553,15 +561,15 @@ struct sas_task {
 #define SAS_TASK_STATE_PENDING      1
 #define SAS_TASK_STATE_DONE         2
 #define SAS_TASK_STATE_ABORTED      4
-#define SAS_TASK_INITIATOR_ABORTED  8
+#define SAS_TASK_NEED_DEV_RESET     8
+#define SAS_TASK_AT_INITIATOR       16
 
 static inline struct sas_task *sas_alloc_task(gfp_t flags)
 {
         extern struct kmem_cache *sas_task_cache;
-        struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags);
+        struct sas_task *task = kmem_cache_zalloc(sas_task_cache, flags);
 
         if (task) {
-                memset(task, 0, sizeof(*task));
                 INIT_LIST_HEAD(&task->list);
                 spin_lock_init(&task->task_state_lock);
                 task->task_state_flags = SAS_TASK_STATE_PENDING;
@@ -613,6 +621,9 @@ struct sas_domain_function_template {
 extern int sas_register_ha(struct sas_ha_struct *);
 extern int sas_unregister_ha(struct sas_ha_struct *);
 
+int sas_set_phy_speed(struct sas_phy *phy,
+                      struct sas_phy_linkrates *rates);
+int sas_phy_enable(struct sas_phy *phy, int enabled);
 int sas_phy_reset(struct sas_phy *phy, int hard_reset);
 extern int sas_queuecommand(struct scsi_cmnd *,
                      void (*scsi_done)(struct scsi_cmnd *));
@@ -646,6 +657,9 @@ void sas_unregister_dev(struct domain_device *);
 
 void sas_init_dev(struct domain_device *);
 
-void sas_task_abort(struct work_struct *);
+void sas_task_abort(struct sas_task *);
+int __sas_task_abort(struct sas_task *);
+int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);
+int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd);
 
 #endif /* _SASLIB_H_ */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index ebf31b16dc49..9dd37e2f5a84 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -122,6 +122,7 @@ struct scsi_device {
         unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
         unsigned select_no_atn:1;
         unsigned fix_capacity:1;        /* READ_CAPACITY is too high by 1 */
+        unsigned guess_capacity:1;      /* READ_CAPACITY might be too high by 1 */
         unsigned retry_hwerror:1;       /* Retry HARDWARE_ERROR */
 
         unsigned int device_blocked;    /* Device returned QUEUE_FULL. */
diff --git a/include/scsi/scsi_tgt_if.h b/include/scsi/scsi_tgt_if.h
index 46d5e70d7215..07d6e77ae895 100644
--- a/include/scsi/scsi_tgt_if.h
+++ b/include/scsi/scsi_tgt_if.h
@@ -83,8 +83,5 @@ struct tgt_event {
 } __attribute__ ((aligned (sizeof(uint64_t))));
 
 #define TGT_RING_SIZE (1UL << 16)
-#define TGT_RING_PAGES (TGT_RING_SIZE >> PAGE_SHIFT)
-#define TGT_EVENT_PER_PAGE (PAGE_SIZE / sizeof(struct tgt_event))
-#define TGT_MAX_EVENTS (TGT_EVENT_PER_PAGE * TGT_RING_PAGES)
 
 #endif
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index cca1d4926d2a..3c18baa65a72 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -22,6 +22,7 @@
 
 #include <linux/transport_class.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
 
 struct scsi_transport_template {
         /* the attribute containers */
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 59633a82de47..9aedc19820b0 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -54,6 +54,7 @@ struct sas_identify {
 struct sas_phy {
         struct device           dev;
         int                     number;
+        int                     enabled;
 
         /* phy identification */
         struct sas_identify     identify;
@@ -163,6 +164,7 @@ struct sas_function_template {
         int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
         int (*get_bay_identifier)(struct sas_rphy *);
         int (*phy_reset)(struct sas_phy *, int);
+        int (*phy_enable)(struct sas_phy *, int);
         int (*set_phy_speed)(struct sas_phy *, struct sas_phy_linkrates *);
 };
 
@@ -180,6 +182,7 @@ extern struct sas_rphy *sas_end_device_alloc(struct sas_port *);
 extern struct sas_rphy *sas_expander_alloc(struct sas_port *, enum sas_device_type);
 void sas_rphy_free(struct sas_rphy *);
 extern int sas_rphy_add(struct sas_rphy *);
+extern void sas_rphy_remove(struct sas_rphy *);
 extern void sas_rphy_delete(struct sas_rphy *);
 extern int scsi_is_sas_rphy(const struct device *);
 
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index da180f738477..286e9628ed8b 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -85,6 +85,7 @@ struct spi_host_attrs {
 #define spi_pcomp_en(x) (((struct spi_transport_attrs *)&(x)->starget_data)->pcomp_en)
 #define spi_hold_mcs(x) (((struct spi_transport_attrs *)&(x)->starget_data)->hold_mcs)
 #define spi_initial_dv(x)       (((struct spi_transport_attrs *)&(x)->starget_data)->initial_dv)
+#define spi_dv_pending(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_pending)
 
 #define spi_support_sync(x)     (((struct spi_transport_attrs *)&(x)->starget_data)->support_sync)
 #define spi_support_wide(x)     (((struct spi_transport_attrs *)&(x)->starget_data)->support_wide)