20 files changed, 453 insertions, 54 deletions

diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 8e9b222251c2..652dec230514 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -46,7 +46,7 @@
  */
 struct fcp_cmnd {
         __u8            fc_lun[8];      /* logical unit number */
-        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_cmdref;      /* command reference number */
         __u8            fc_pri_ta;      /* priority and task attribute */
         __u8            fc_tm_flags;    /* task management flags */
         __u8            fc_flags;       /* additional len & flags */
@@ -58,7 +58,7 @@ struct fcp_cmnd {
 
 struct fcp_cmnd32 {
         __u8            fc_lun[8];      /* logical unit number */
-        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_cmdref;      /* command reference number */
         __u8            fc_pri_ta;      /* priority and task attribute */
         __u8            fc_tm_flags;    /* task management flags */
         __u8            fc_flags;       /* additional len & flags */
@@ -75,7 +75,7 @@ struct fcp_cmnd32 {
 #define FCP_PTA_SIMPLE      0   /* simple task attribute */
 #define FCP_PTA_HEADQ       1   /* head of queue task attribute */
 #define FCP_PTA_ORDERED     2   /* ordered task attribute */
-#define FCP_PTA_ACA         4   /* auto. contigent allegiance */
+#define FCP_PTA_ACA         4   /* auto. contingent allegiance */
 #define FCP_PTA_MASK        7   /* mask for task attribute field */
 #define FCP_PRI_SHIFT       3   /* priority field starts in bit 3 */
 #define FCP_PRI_RESVD_MASK  0x80        /* reserved bits in priority field */
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
index 185015dd1166..f7751d53f1d3 100644
--- a/include/scsi/fc/fc_ns.h
+++ b/include/scsi/fc/fc_ns.h
@@ -41,6 +41,7 @@ enum fc_ns_req {
         FC_NS_GI_A =    0x0101,         /* get identifiers - scope */
         FC_NS_GPN_ID =  0x0112,         /* get port name by ID */
         FC_NS_GNN_ID =  0x0113,         /* get node name by ID */
+        FC_NS_GSPN_ID = 0x0118,         /* get symbolic port name */
         FC_NS_GID_PN =  0x0121,         /* get ID for port name */
         FC_NS_GID_NN =  0x0131,         /* get IDs for node name */
         FC_NS_GID_FT =  0x0171,         /* get IDs by FC4 type */
@@ -144,7 +145,7 @@ struct fc_ns_gid_pn {
 };
 
 /*
- * GID_PN response
+ * GID_PN response or GSPN_ID request
  */
 struct fc_gid_pn_resp {
         __u8      fp_resvd;
@@ -152,6 +153,14 @@ struct fc_gid_pn_resp {
 };
 
 /*
+ * GSPN_ID response
+ */
+struct fc_gspn_resp {
+        __u8    fp_name_len;
+        char    fp_name[];
+};
+
+/*
  * RFT_ID request - register FC-4 types for ID.
  */
 struct fc_ns_rft_id {
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 6d293c846a46..be418d8448a5 100644
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -46,16 +46,11 @@ struct fc_ct_req {
         } payload;
 };
 
-/**
- * fill FC header fields in specified fc_frame
- */
-static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
-                                  u32 did, u32 sid, enum fc_fh_type type,
-                                  u32 f_ctl, u32 parm_offset)
+static inline void __fc_fill_fc_hdr(struct fc_frame_header *fh,
+                                    enum fc_rctl r_ctl,
+                                    u32 did, u32 sid, enum fc_fh_type type,
+                                    u32 f_ctl, u32 parm_offset)
 {
-        struct fc_frame_header *fh;
-
-        fh = fc_frame_header_get(fp);
         WARN_ON(r_ctl == 0);
         fh->fh_r_ctl = r_ctl;
         hton24(fh->fh_d_id, did);
@@ -68,6 +63,19 @@ static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
 }
 
 /**
+ * fill FC header fields in specified fc_frame
+ */
+static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
+                                  u32 did, u32 sid, enum fc_fh_type type,
+                                  u32 f_ctl, u32 parm_offset)
+{
+        struct fc_frame_header *fh;
+
+        fh = fc_frame_header_get(fp);
+        __fc_fill_fc_hdr(fh, r_ctl, did, sid, type, f_ctl, parm_offset);
+}
+
+/**
  * fc_adisc_fill() - Fill in adisc request frame
  * @lport: local port.
  * @fp: fc frame where payload will be placed.
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index a8631acd37c3..ddb04568a509 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -263,6 +263,7 @@ enum iscsi_err {
         ISCSI_ERR_INVALID_HOST          = ISCSI_ERR_BASE + 18,
         ISCSI_ERR_XMIT_FAILED           = ISCSI_ERR_BASE + 19,
         ISCSI_ERR_TCP_CONN_CLOSE        = ISCSI_ERR_BASE + 20,
+        ISCSI_ERR_SCSI_EH_SESSION_RST   = ISCSI_ERR_BASE + 21,
 };
 
 /*
@@ -291,7 +292,7 @@ enum iscsi_param {
         ISCSI_PARAM_PERSISTENT_PORT,
         ISCSI_PARAM_SESS_RECOVERY_TMO,
 
-        /* pased in through bind conn using transport_fd */
+        /* passed in through bind conn using transport_fd */
         ISCSI_PARAM_CONN_PORT,
         ISCSI_PARAM_CONN_ADDRESS,
 
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 14be49b44e84..a3cbda4ddb5c 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -35,6 +35,8 @@
 
 #include <scsi/fc_frame.h>
 
+#define FC_FC4_PROV_SIZE        (FC_TYPE_FCP + 1)       /* size of tables */
+
 /*
  * libfc error codes
  */
@@ -156,6 +158,7 @@ struct fc_rport_libfc_priv {
         #define FC_RP_FLAGS_REC_SUPPORTED       (1 << 0)
         #define FC_RP_FLAGS_RETRY               (1 << 1)
         #define FC_RP_STARTED                   (1 << 2)
+        #define FC_RP_FLAGS_CONF_REQ            (1 << 3)
         unsigned int               e_d_tov;
         unsigned int               r_a_tov;
 };
@@ -179,6 +182,7 @@ struct fc_rport_libfc_priv {
  * @rp_mutex:       The mutex that protects the remote port
  * @retry_work:     Handle for retries
  * @event_callback: Callback when READY, FAILED or LOGO states complete
+ * @prli_count:     Count of open PRLI sessions in providers
  * @rcu:            Structure used for freeing in an RCU-safe manner
  */
 struct fc_rport_priv {
@@ -202,7 +206,13 @@ struct fc_rport_priv {
         struct list_head            peers;
         struct work_struct          event_work;
         u32                         supported_classes;
+        u16                         prli_count;
         struct rcu_head             rcu;
+        u16                         sp_features;
+        u8                          spp_type;
+        void                        (*lld_event_callback)(struct fc_lport *,
+                                                      struct fc_rport_priv *,
+                                                      enum fc_rport_event);
 };
 
 /**
@@ -221,8 +231,8 @@ struct fc_rport_priv {
  * @InputRequests:         Number of input requests
  * @OutputRequests:        Number of output requests
  * @ControlRequests:       Number of control requests
- * @InputMegabytes:        Number of received megabytes
- * @OutputMegabytes:       Number of transmitted megabytes
+ * @InputBytes:            Number of received bytes
+ * @OutputBytes:           Number of transmitted bytes
  * @VLinkFailureCount:     Number of virtual link failures
  * @MissDiscAdvCount:      Number of missing FIP discovery advertisement
  */
@@ -241,8 +251,8 @@ struct fcoe_dev_stats {
         u64             InputRequests;
         u64             OutputRequests;
         u64             ControlRequests;
-        u64             InputMegabytes;
-        u64             OutputMegabytes;
+        u64             InputBytes;
+        u64             OutputBytes;
         u64             VLinkFailureCount;
         u64             MissDiscAdvCount;
 };
@@ -250,7 +260,7 @@ struct fcoe_dev_stats {
 /**
  * struct fc_seq_els_data - ELS data used for passing ELS specific responses
  * @reason: The reason for rejection
- * @explan: The explaination of the rejection
+ * @explan: The explanation of the rejection
  *
  * Mainly used by the exchange manager layer.
  */
@@ -263,7 +273,6 @@ struct fc_seq_els_data {
  * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
  * @lp:              The associated local port
  * @state:           The state of the I/O
- * @tgt_flags:       Target's flags
  * @ref_cnt:         Reference count
  * @scsi_pkt_lock:   Lock to protect the SCSI packet (must be taken before the
  *                   host_lock if both are to be held at the same time)
@@ -298,7 +307,6 @@ struct fc_fcp_pkt {
         /* Housekeeping information */
         struct fc_lport   *lp;
         u16               state;
-        u16               tgt_flags;
         atomic_t          ref_cnt;
         spinlock_t        scsi_pkt_lock;
 
@@ -517,7 +525,7 @@ struct libfc_function_template {
                         struct fc_frame *);
 
         /*
-         * Send an ELS response using infomation from the received frame.
+         * Send an ELS response using information from the received frame.
          *
          * STATUS: OPTIONAL
          */
@@ -553,6 +561,16 @@ struct libfc_function_template {
         struct fc_seq *(*seq_start_next)(struct fc_seq *);
 
         /*
+         * Set a response handler for the exchange of the sequence.
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*seq_set_resp)(struct fc_seq *sp,
+                             void (*resp)(struct fc_seq *, struct fc_frame *,
+                                          void *),
+                             void *arg);
+
+        /*
          * Assign a sequence for an incoming request frame.
          *
          * STATUS: OPTIONAL
@@ -560,6 +578,13 @@ struct libfc_function_template {
         struct fc_seq *(*seq_assign)(struct fc_lport *, struct fc_frame *);
 
         /*
+         * Release the reference on the sequence returned by seq_assign().
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*seq_release)(struct fc_seq *);
+
+        /*
          * Reset an exchange manager, completing all sequences and exchanges.
          * If s_id is non-zero, reset only exchanges originating from that FID.
          * If d_id is non-zero, reset only exchanges sending to that FID.
@@ -638,7 +663,7 @@ struct libfc_function_template {
         int (*rport_logoff)(struct fc_rport_priv *);
 
         /*
-         * Recieve a request from a remote port.
+         * Receive a request from a remote port.
          *
          * STATUS: OPTIONAL
          */
@@ -658,6 +683,15 @@ struct libfc_function_template {
         void (*rport_destroy)(struct kref *);
 
         /*
+         * Callback routine after the remote port is logged in
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*rport_event_callback)(struct fc_lport *,
+                                     struct fc_rport_priv *,
+                                     enum fc_rport_event);
+
+        /*
          * Send a fcp cmd from fsp pkt.
          * Called with the SCSI host lock unlocked and irqs disabled.
          *
@@ -670,7 +704,7 @@ struct libfc_function_template {
                                          void *));
 
         /*
-         * Cleanup the FCP layer, used durring link down and reset
+         * Cleanup the FCP layer, used during link down and reset
          *
          * STATUS: OPTIONAL
          */
@@ -721,7 +755,7 @@ struct libfc_function_template {
  * struct fc_disc - Discovery context
  * @retry_count:   Number of retries
  * @pending:       1 if discovery is pending, 0 if not
- * @requesting:    1 if discovery has been requested, 0 if not
+ * @requested:     1 if discovery has been requested, 0 if not
  * @seq_count:     Number of sequences used for discovery
  * @buf_len:       Length of the discovery buffer
  * @disc_id:       Discovery ID
@@ -751,6 +785,15 @@ struct fc_disc {
                               enum fc_disc_event);
 };
 
+/*
+ * Local port notifier and events.
+ */
+extern struct blocking_notifier_head fc_lport_notifier_head;
+enum fc_lport_event {
+        FC_LPORT_EV_ADD,
+        FC_LPORT_EV_DEL,
+};
+
 /**
  * struct fc_lport - Local port
  * @host:                  The SCSI host associated with a local port
@@ -791,8 +834,10 @@ struct fc_disc {
  * @lso_max:               The maximum large offload send size
  * @fcts:                  FC-4 type mask
  * @lp_mutex:              Mutex to protect the local port
- * @list:                  Handle for list of local ports
+ * @list:                  Linkage on list of vport peers
  * @retry_work:            Handle to local port for delayed retry context
+ * @prov:                  Pointers available for use by passive FC-4 providers
+ * @lport_list:            Linkage on module-wide list of local ports
  */
 struct fc_lport {
         /* Associations */
@@ -848,8 +893,32 @@ struct fc_lport {
         struct mutex                   lp_mutex;
         struct list_head               list;
         struct delayed_work            retry_work;
+        void                           *prov[FC_FC4_PROV_SIZE];
+        struct list_head               lport_list;
 };
 
+/**
+ * struct fc4_prov - FC-4 provider registration
+ * @prli:               Handler for incoming PRLI
+ * @prlo:               Handler for session reset
+ * @recv:               Handler for incoming request
+ * @module:             Pointer to module.  May be NULL.
+ */
+struct fc4_prov {
+        int (*prli)(struct fc_rport_priv *, u32 spp_len,
+                    const struct fc_els_spp *spp_in,
+                    struct fc_els_spp *spp_out);
+        void (*prlo)(struct fc_rport_priv *);
+        void (*recv)(struct fc_lport *, struct fc_frame *);
+        struct module *module;
+};
+
+/*
+ * Register FC-4 provider with libfc.
+ */
+int fc_fc4_register_provider(enum fc_fh_type type, struct fc4_prov *);
+void fc_fc4_deregister_provider(enum fc_fh_type type, struct fc4_prov *);
+
 /*
  * FC_LPORT HELPER FUNCTIONS
  *****************************/
@@ -980,6 +1049,7 @@ struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
 struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
 int fc_lport_bsg_request(struct fc_bsg_job *);
 void fc_lport_set_local_id(struct fc_lport *, u32 port_id);
+void fc_lport_iterate(void (*func)(struct fc_lport *, void *), void *);
 
 /*
  * REMOTE PORT LAYER
@@ -1006,8 +1076,7 @@ void fc_fcp_destroy(struct fc_lport *);
 /*
  * SCSI INTERACTION LAYER
  *****************************/
-int fc_queuecommand(struct scsi_cmnd *,
-                    void (*done)(struct scsi_cmnd *));
+int fc_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
 int fc_eh_abort(struct scsi_cmnd *);
 int fc_eh_device_reset(struct scsi_cmnd *);
 int fc_eh_host_reset(struct scsi_cmnd *);
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 06f1b5a8ed19..8c1638b8c28e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -33,6 +33,12 @@
 #define FCOE_MAX_CMD_LEN        16      /* Supported CDB length */
 
 /*
+ * Max MTU for FCoE: 14 (FCoE header) + 24 (FC header) + 2112 (max FC payload)
+ * + 4 (FC CRC) + 4 (FCoE trailer) =  2158 bytes
+ */
+#define FCOE_MTU        2158
+
+/*
  * FIP tunable parameters.
  */
 #define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
@@ -92,10 +98,12 @@ enum fip_state {
  * @timer_work:    &work_struct for doing keep-alives and resets.
  * @recv_work:     &work_struct for receiving FIP frames.
  * @fip_recv_list: list of received FIP frames.
+ * @flogi_req:     clone of FLOGI request sent
  * @rnd_state:     state for pseudo-random number generator.
  * @port_id:       proposed or selected local-port ID.
  * @user_mfs:      configured maximum FC frame size, including FC header.
  * @flogi_oxid:    exchange ID of most recent fabric login.
+ * @flogi_req_send: send of FLOGI requested
  * @flogi_count:   number of FLOGI attempts in AUTO mode.
  * @map_dest:      use the FC_MAP mode for destination MAC addresses.
  * @spma:          supports SPMA server-provided MACs mode
@@ -106,6 +114,7 @@ enum fip_state {
  * @update_mac:    LLD-supplied function to handle changes to MAC addresses.
  * @get_src_addr:  LLD-supplied function to supply a source MAC address.
  * @ctlr_mutex:    lock protecting this structure.
+ * @ctlr_lock:     spinlock covering flogi_req
  *
  * This structure is used by all FCoE drivers.  It contains information
  * needed by all FCoE low-level drivers (LLDs) as well as internal state
@@ -126,12 +135,14 @@ struct fcoe_ctlr {
         struct work_struct timer_work;
         struct work_struct recv_work;
         struct sk_buff_head fip_recv_list;
+        struct sk_buff *flogi_req;
 
         struct rnd_state rnd_state;
         u32 port_id;
 
         u16 user_mfs;
         u16 flogi_oxid;
+        u8 flogi_req_send;
         u8 flogi_count;
         u8 map_dest;
         u8 spma;
@@ -143,6 +154,7 @@ struct fcoe_ctlr {
         void (*update_mac)(struct fc_lport *, u8 *addr);
         u8 * (*get_src_addr)(struct fc_lport *);
         struct mutex ctlr_mutex;
+        spinlock_t ctlr_lock;
 };
 
 /**
@@ -155,6 +167,7 @@ struct fcoe_ctlr {
  * @fcf_mac:     Ethernet address of the FCF
  * @vfid:        virtual fabric ID
  * @pri:         selection priority, smaller values are better
+ * @flogi_sent:  current FLOGI sent to this FCF
  * @flags:       flags received from advertisement
  * @fka_period:  keep-alive period, in jiffies
  *
@@ -176,6 +189,7 @@ struct fcoe_fcf {
         u8 fcf_mac[ETH_ALEN];
 
         u8 pri;
+        u8 flogi_sent;
         u16 flags;
         u32 fka_period;
         u8 fd_flags:1;
@@ -213,6 +227,8 @@ int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
 u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
 int fcoe_libfc_config(struct fc_lport *, struct fcoe_ctlr *,
                       const struct libfc_function_template *, int init_fcp);
+u32 fcoe_fc_crc(struct fc_frame *fp);
+int fcoe_start_io(struct sk_buff *skb);
 
 /**
  * is_fip_mode() - returns true if FIP mode selected.
@@ -223,5 +239,102 @@ static inline bool is_fip_mode(struct fcoe_ctlr *fip)
         return fip->state == FIP_ST_ENABLED;
 }
 
+/* helper for FCoE SW HBA drivers, can include subven and subdev if needed. The
+ * modpost would use pci_device_id table to auto-generate formatted module alias
+ * into the corresponding .mod.c file, but there may or may not be a pci device
+ * id table for FCoE drivers so we use the following helper for build the fcoe
+ * driver module alias.
+ */
+#define MODULE_ALIAS_FCOE_PCI(ven, dev) \
+        MODULE_ALIAS("fcoe-pci:"        \
+                "v" __stringify(ven)    \
+                "d" __stringify(dev) "sv*sd*bc*sc*i*")
+
+/* the name of the default FCoE transport driver fcoe.ko */
+#define FCOE_TRANSPORT_DEFAULT  "fcoe"
+
+/* struct fcoe_transport - The FCoE transport interface
+ * @name:       a vendor specific name for their FCoE transport driver
+ * @attached:   whether this transport is already attached
+ * @list:       list linkage to all attached transports
+ * @match:      handler to allow the transport driver to match up a given netdev
+ * @create:     handler to sysfs entry of create for FCoE instances
+ * @destroy:    handler to sysfs entry of destroy for FCoE instances
+ * @enable:     handler to sysfs entry of enable for FCoE instances
+ * @disable:    handler to sysfs entry of disable for FCoE instances
+ */
+struct fcoe_transport {
+        char name[IFNAMSIZ];
+        bool attached;
+        struct list_head list;
+        bool (*match) (struct net_device *device);
+        int (*create) (struct net_device *device, enum fip_state fip_mode);
+        int (*destroy) (struct net_device *device);
+        int (*enable) (struct net_device *device);
+        int (*disable) (struct net_device *device);
+};
+
+/**
+ * struct fcoe_percpu_s - The context for FCoE receive thread(s)
+ * @thread:         The thread context
+ * @fcoe_rx_list:   The queue of pending packets to process
+ * @page:           The memory page for calculating frame trailer CRCs
+ * @crc_eof_offset: The offset into the CRC page pointing to available
+ *                  memory for a new trailer
+ */
+struct fcoe_percpu_s {
+        struct task_struct *thread;
+        struct sk_buff_head fcoe_rx_list;
+        struct page *crc_eof_page;
+        int crc_eof_offset;
+};
+
+/**
+ * struct fcoe_port - The FCoE private structure
+ * @priv:                      The associated fcoe interface. The structure is
+ *                             defined by the low level driver
+ * @lport:                     The associated local port
+ * @fcoe_pending_queue:        The pending Rx queue of skbs
+ * @fcoe_pending_queue_active: Indicates if the pending queue is active
+ * @max_queue_depth:           Max queue depth of pending queue
+ * @min_queue_depth:           Min queue depth of pending queue
+ * @timer:                     The queue timer
+ * @destroy_work:              Handle for work context
+ *                             (to prevent RTNL deadlocks)
+ * @data_srt_addr:             Source address for data
+ *
+ * An instance of this structure is to be allocated along with the
+ * Scsi_Host and libfc fc_lport structures.
+ */
+struct fcoe_port {
+        void                  *priv;
+        struct fc_lport       *lport;
+        struct sk_buff_head   fcoe_pending_queue;
+        u8                    fcoe_pending_queue_active;
+        u32                   max_queue_depth;
+        u32                   min_queue_depth;
+        struct timer_list     timer;
+        struct work_struct    destroy_work;
+        u8                    data_src_addr[ETH_ALEN];
+};
+void fcoe_clean_pending_queue(struct fc_lport *);
+void fcoe_check_wait_queue(struct fc_lport *lport, struct sk_buff *skb);
+void fcoe_queue_timer(ulong lport);
+int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen,
+                           struct fcoe_percpu_s *fps);
+
+/**
+ * struct netdev_list
+ * A mapping from netdevice to fcoe_transport
+ */
+struct fcoe_netdev_mapping {
+        struct list_head list;
+        struct net_device *netdev;
+        struct fcoe_transport *ft;
+};
+
+/* fcoe transports registration and deregistration */
+int fcoe_transport_attach(struct fcoe_transport *ft);
+int fcoe_transport_detach(struct fcoe_transport *ft);
 
 #endif /* _LIBFCOE_H */
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index ae5196aae1a5..0f4367751b71 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -89,6 +89,7 @@ enum {
         ISCSI_TASK_RUNNING,
         ISCSI_TASK_ABRT_TMF,            /* aborted due to TMF */
         ISCSI_TASK_ABRT_SESS_RECOV,     /* aborted due to session recovery */
+        ISCSI_TASK_REQUEUE_SCSIQ,       /* qcmd requeueing to scsi-ml */
 };
 
 struct iscsi_r2t_info {
@@ -211,9 +212,6 @@ struct iscsi_conn {
         /* values userspace uses to id a conn */
         int                     persistent_port;
         char                    *persistent_address;
-        /* remote portal currently connected to */
-        int                     portal_port;
-        char                    portal_address[ISCSI_ADDRESS_BUF_LEN];
 
         /* MIB-statistics */
         uint64_t                txdata_octets;
@@ -318,9 +316,6 @@ struct iscsi_host {
         /* hw address or netdev iscsi connection is bound to */
         char                    *hwaddress;
         char                    *netdev;
-        /* local address */
-        int                     local_port;
-        char                    local_address[ISCSI_ADDRESS_BUF_LEN];
 
         wait_queue_head_t       session_removal_wq;
         /* protects sessions and state */
@@ -341,8 +336,7 @@ extern int iscsi_eh_abort(struct scsi_cmnd *sc);
 extern int iscsi_eh_recover_target(struct scsi_cmnd *sc);
 extern int iscsi_eh_session_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
-extern int iscsi_queuecommand(struct scsi_cmnd *sc,
-                              void (*done)(struct scsi_cmnd *));
+extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc);
 
 /*
  * iSCSI host helpers.
@@ -394,6 +388,8 @@ extern void iscsi_session_failure(struct iscsi_session *session,
                                   enum iscsi_err err);
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
                                 enum iscsi_param param, char *buf);
+extern int iscsi_conn_get_addr_param(struct sockaddr_storage *addr,
+                                     enum iscsi_param param, char *buf);
 extern void iscsi_suspend_tx(struct iscsi_conn *conn);
 extern void iscsi_suspend_queue(struct iscsi_conn *conn);
 extern void iscsi_conn_queue_work(struct iscsi_conn *conn);
@@ -420,6 +416,7 @@ extern struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *, itt_t);
 extern struct iscsi_task *iscsi_itt_to_task(struct iscsi_conn *, itt_t);
 extern void iscsi_requeue_task(struct iscsi_task *task);
 extern void iscsi_put_task(struct iscsi_task *task);
+extern void __iscsi_put_task(struct iscsi_task *task);
 extern void __iscsi_get_task(struct iscsi_task *task);
 extern void iscsi_complete_scsi_task(struct iscsi_task *task,
                                      uint32_t exp_cmdsn, uint32_t max_cmdsn);
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h
index 741ae7ed4394..ac0cc1d925ef 100644
--- a/include/scsi/libiscsi_tcp.h
+++ b/include/scsi/libiscsi_tcp.h
@@ -47,11 +47,12 @@ struct iscsi_segment {
         struct scatterlist      *sg;
         void                    *sg_mapped;
         unsigned int            sg_offset;
+        bool                    atomic_mapped;
 
         iscsi_segment_done_fn_t *done;
 };
 
-/* Socket connection recieve helper */
+/* Socket connection receive helper */
 struct iscsi_tcp_recv {
         struct iscsi_hdr        *hdr;
         struct iscsi_segment    segment;
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index d06e13be717b..ee866060f8a4 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -205,6 +205,7 @@ struct domain_device {
         };
 
         void *lldd_dev;
+        int gone;
 };
 
 struct sas_discovery_event {
@@ -360,6 +361,8 @@ struct sas_ha_struct {
         /* The class calls this to send a task for execution. */
         int lldd_max_execute_num;
         int lldd_queue_size;
+        int strict_wide_ports; /* both sas_addr and attached_sas_addr must match
+                                * their siblings when forming wide ports */
 
         /* LLDD calls these to notify the class of an event. */
         void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);
@@ -601,6 +604,7 @@ struct sas_domain_function_template {
         int (*lldd_clear_aca)(struct domain_device *, u8 *lun);
         int (*lldd_clear_task_set)(struct domain_device *, u8 *lun);
         int (*lldd_I_T_nexus_reset)(struct domain_device *);
+        int (*lldd_ata_soft_reset)(struct domain_device *);
         int (*lldd_lu_reset)(struct domain_device *, u8 *lun);
         int (*lldd_query_task)(struct sas_task *);
 
@@ -620,8 +624,7 @@ int sas_set_phy_speed(struct sas_phy *phy,
 int sas_phy_enable(struct sas_phy *phy, int enabled);
 int sas_phy_reset(struct sas_phy *phy, int hard_reset);
 int sas_queue_up(struct sas_task *task);
-extern int sas_queuecommand(struct scsi_cmnd *,
-                     void (*scsi_done)(struct scsi_cmnd *));
+extern int sas_queuecommand(struct Scsi_Host * ,struct scsi_cmnd *);
 extern int sas_target_alloc(struct scsi_target *);
 extern int sas_slave_alloc(struct scsi_device *);
 extern int sas_slave_configure(struct scsi_device *);
diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index a8f370126632..0a5079974fe9 100644
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -137,7 +137,7 @@ struct osd_request {
                 void *buff;
                 unsigned alloc_size; /* 0 here means: don't call kfree */
                 unsigned total_bytes;
-        } set_attr, enc_get_attr, get_attr;
+        } cdb_cont, set_attr, enc_get_attr, get_attr;
 
         struct _osd_io_info {
                 struct bio *bio;
@@ -265,7 +265,7 @@ int osd_execute_request_async(struct osd_request *or,
  * @osi           - Recievs a more detailed error report information (optional).
  * @silent        - Do not print to dmsg (Even if enabled)
  * @bad_obj_list  - Some commands act on multiple objects. Failed objects will
- *                  be recieved here (optional)
+ *                  be received here (optional)
  * @max_obj       - Size of @bad_obj_list.
  * @bad_attr_list - List of failing attributes (optional)
  * @max_attr      - Size of @bad_attr_list.
@@ -448,6 +448,20 @@ void osd_req_read(struct osd_request *or,
 int osd_req_read_kern(struct osd_request *or,
         const struct osd_obj_id *obj, u64 offset, void *buff, u64 len);
 
+/* Scatter/Gather write/read commands */
+int osd_req_write_sg(struct osd_request *or,
+        const struct osd_obj_id *obj, struct bio *bio,
+        const struct osd_sg_entry *sglist, unsigned numentries);
+int osd_req_read_sg(struct osd_request *or,
+        const struct osd_obj_id *obj, struct bio *bio,
+        const struct osd_sg_entry *sglist, unsigned numentries);
+int osd_req_write_sg_kern(struct osd_request *or,
+        const struct osd_obj_id *obj, void **buff,
+        const struct osd_sg_entry *sglist, unsigned numentries);
+int osd_req_read_sg_kern(struct osd_request *or,
+        const struct osd_obj_id *obj, void **buff,
+        const struct osd_sg_entry *sglist, unsigned numentries);
+
 /*
  * Root/Partition/Collection/Object Attributes commands
  */
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
index 685661283540..a6026da25f3e 100644
--- a/include/scsi/osd_protocol.h
+++ b/include/scsi/osd_protocol.h
@@ -631,4 +631,46 @@ static inline void osd_sec_set_caps(struct osd_capability_head *cap,
         put_unaligned_le16(bit_mask, &cap->permissions_bit_mask);
 }
 
+/* osd2r05a sec 5.3: CDB continuation segment formats */
+enum osd_continuation_segment_format {
+        CDB_CONTINUATION_FORMAT_V2 = 0x01,
+};
+
+struct osd_continuation_segment_header {
+        u8      format;
+        u8      reserved1;
+        __be16  service_action;
+        __be32  reserved2;
+        u8      integrity_check[OSDv2_CRYPTO_KEYID_SIZE];
+} __packed;
+
+/* osd2r05a sec 5.4.1: CDB continuation descriptors */
+enum osd_continuation_descriptor_type {
+        NO_MORE_DESCRIPTORS = 0x0000,
+        SCATTER_GATHER_LIST = 0x0001,
+        QUERY_LIST = 0x0002,
+        USER_OBJECT = 0x0003,
+        COPY_USER_OBJECT_SOURCE = 0x0101,
+        EXTENSION_CAPABILITIES = 0xFFEE
+};
+
+struct osd_continuation_descriptor_header {
+        __be16  type;
+        u8      reserved;
+        u8      pad_length;
+        __be32  length;
+} __packed;
+
+
+/* osd2r05a sec 5.4.2: Scatter/gather list */
+struct osd_sg_list_entry {
+        __be64 offset;
+        __be64 len;
+};
+
+struct osd_sg_continuation_descriptor {
+        struct osd_continuation_descriptor_header hdr;
+        struct osd_sg_list_entry entries[];
+};
+
 #endif /* ndef __OSD_PROTOCOL_H__ */
diff --git a/include/scsi/osd_types.h b/include/scsi/osd_types.h
index 3f5e88cc75c0..bd0be7ed4bcf 100644
--- a/include/scsi/osd_types.h
+++ b/include/scsi/osd_types.h
@@ -37,4 +37,9 @@ struct osd_attr {
         void *val_ptr;          /* in network order */
 };
 
+struct osd_sg_entry {
+        u64 offset;
+        u64 len;
+};
+
 #endif /* ndef __OSD_TYPES_H__ */
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index c583193ae929..9c159f74c6d0 100644
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -39,6 +39,11 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,
                                struct scsi_target *starget);
 
 void sas_ata_task_abort(struct sas_task *task);
+void sas_ata_strategy_handler(struct Scsi_Host *shost);
+int sas_ata_timed_out(struct scsi_cmnd *cmd, struct sas_task *task,
+                      enum blk_eh_timer_return *rtn);
+int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
+               struct list_head *done_q);
 
 #else
 
@@ -55,6 +60,23 @@ static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
 static inline void sas_ata_task_abort(struct sas_task *task)
 {
 }
+
+static inline void sas_ata_strategy_handler(struct Scsi_Host *shost)
+{
+}
+
+static inline int sas_ata_timed_out(struct scsi_cmnd *cmd,
+                                    struct sas_task *task,
+                                    enum blk_eh_timer_return *rtn)
+{
+        return 0;
+}
+static inline int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
+                             struct list_head *done_q)
+{
+        return 0;
+}
+
 #endif
 
 #endif /* _SAS_ATA_H_ */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8fcb6e0e9e72..3668903e397b 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -9,6 +9,7 @@
 #define _SCSI_SCSI_H
 
 #include <linux/types.h>
+#include <linux/scatterlist.h>
 
 struct scsi_cmnd;
 
@@ -32,6 +33,12 @@ struct scsi_cmnd;
 #endif
 
 /*
+ * DIX-capable adapters effectively support infinite chaining for the
+ * protection information scatterlist
+ */
+#define SCSI_MAX_PROT_SG_SEGMENTS       0xFFFF
+
+/*
  * Special value for scanning to specify scanning or rescanning of all
  * possible channels, (target) ids, or luns on a given shost.
  */
@@ -67,6 +74,7 @@ struct scsi_cmnd;
 #define SEND_DIAGNOSTIC       0x1d
 #define ALLOW_MEDIUM_REMOVAL  0x1e
 
+#define READ_FORMAT_CAPACITIES 0x23
 #define SET_WINDOW            0x24
 #define READ_CAPACITY         0x25
 #define READ_10               0x28
@@ -96,6 +104,8 @@ struct scsi_cmnd;
 #define WRITE_SAME            0x41
 #define UNMAP                 0x42
 #define READ_TOC              0x43
+#define READ_HEADER           0x44
+#define GET_EVENT_STATUS_NOTIFICATION 0x4a
 #define LOG_SELECT            0x4c
 #define LOG_SENSE             0x4d
 #define XDWRITEREAD_10        0x53
@@ -107,33 +117,61 @@ struct scsi_cmnd;
 #define PERSISTENT_RESERVE_OUT 0x5f
 #define VARIABLE_LENGTH_CMD   0x7f
 #define REPORT_LUNS           0xa0
+#define SECURITY_PROTOCOL_IN  0xa2
 #define MAINTENANCE_IN        0xa3
 #define MAINTENANCE_OUT       0xa4
 #define MOVE_MEDIUM           0xa5
 #define EXCHANGE_MEDIUM       0xa6
 #define READ_12               0xa8
 #define WRITE_12              0xaa
+#define READ_MEDIA_SERIAL_NUMBER 0xab
 #define WRITE_VERIFY_12       0xae
 #define VERIFY_12             0xaf
 #define SEARCH_HIGH_12        0xb0
 #define SEARCH_EQUAL_12       0xb1
 #define SEARCH_LOW_12         0xb2
+#define SECURITY_PROTOCOL_OUT 0xb5
 #define READ_ELEMENT_STATUS   0xb8
 #define SEND_VOLUME_TAG       0xb6
 #define WRITE_LONG_2          0xea
+#define EXTENDED_COPY         0x83
+#define RECEIVE_COPY_RESULTS  0x84
+#define ACCESS_CONTROL_IN     0x86
+#define ACCESS_CONTROL_OUT    0x87
 #define READ_16               0x88
 #define WRITE_16              0x8a
+#define READ_ATTRIBUTE        0x8c
+#define WRITE_ATTRIBUTE       0x8d
 #define VERIFY_16             0x8f
 #define WRITE_SAME_16         0x93
 #define SERVICE_ACTION_IN     0x9e
 /* values for service action in */
 #define SAI_READ_CAPACITY_16  0x10
 #define SAI_GET_LBA_STATUS    0x12
+/* values for VARIABLE_LENGTH_CMD service action codes
+ * see spc4r17 Section D.3.5, table D.7 and D.8 */
+#define VLC_SA_RECEIVE_CREDENTIAL 0x1800
 /* values for maintenance in */
+#define MI_REPORT_IDENTIFYING_INFORMATION 0x05
 #define MI_REPORT_TARGET_PGS  0x0a
+#define MI_REPORT_ALIASES     0x0b
+#define MI_REPORT_SUPPORTED_OPERATION_CODES 0x0c
+#define MI_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS 0x0d
+#define MI_REPORT_PRIORITY   0x0e
+#define MI_REPORT_TIMESTAMP  0x0f
+#define MI_MANAGEMENT_PROTOCOL_IN 0x10
 /* values for maintenance out */
+#define MO_SET_IDENTIFYING_INFORMATION 0x06
 #define MO_SET_TARGET_PGS     0x0a
+#define MO_CHANGE_ALIASES     0x0b
+#define MO_SET_PRIORITY       0x0e
+#define MO_SET_TIMESTAMP      0x0f
+#define MO_MANAGEMENT_PROTOCOL_OUT 0x10
 /* values for variable length command */
+#define XDREAD_32             0x03
+#define XDWRITE_32            0x04
+#define XPWRITE_32            0x06
+#define XDWRITEREAD_32        0x07
 #define READ_32               0x09
 #define VERIFY_32             0x0a
 #define WRITE_32              0x0b
@@ -397,6 +435,10 @@ static inline int scsi_is_wlun(unsigned int lun)
                                       * recover the link. Transport class will
                                       * retry or fail IO */
 #define DID_TRANSPORT_FAILFAST  0x0f /* Transport class fastfailed the io */
+#define DID_TARGET_FAILURE 0x10 /* Permanent target failure, do not retry on
+                                 * other paths */
+#define DID_NEXUS_FAILURE 0x11  /* Permanent nexus failure, retry on other
+                                 * paths might yield different results */
 #define DRIVER_OK       0x00    /* Driver status                           */
 
 /*
@@ -426,6 +468,7 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define TIMEOUT_ERROR   0x2007
 #define SCSI_RETURN_NOT_HANDLED   0x2008
 #define FAST_IO_FAIL    0x2009
+#define TARGET_ERROR    0x200A
 
 /*
  * Midlevel queue return values.
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 50cb34ffef11..dd82e02ddde3 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -148,6 +148,8 @@ struct scsi_device {
         unsigned retry_hwerror:1;       /* Retry HARDWARE_ERROR */
         unsigned last_sector_bug:1;     /* do not use multisector accesses on
                                            SD_LAST_BUGGY_SECTORS */
+        unsigned no_read_disc_info:1;   /* Avoid READ_DISC_INFO cmds */
+        unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */
         unsigned is_visible:1;  /* is the device visible in sysfs */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
@@ -167,6 +169,7 @@ struct scsi_device {
                                 sdev_dev;
 
         struct execute_work     ew; /* used to get process context on put */
+        struct work_struct      requeue_work;
 
         struct scsi_dh_data     *scsi_dh_data;
         enum scsi_device_state sdev_state;
@@ -182,6 +185,7 @@ typedef void (*activate_complete)(void *, int);
 struct scsi_device_handler {
         /* Used by the infrastructure */
         struct list_head list; /* list of scsi_device_handlers */
+        int idx;
 
         /* Filled by the hardware handler */
         struct module *module;
@@ -459,7 +463,7 @@ static inline int scsi_device_qas(struct scsi_device *sdev)
 }
 static inline int scsi_device_enclosure(struct scsi_device *sdev)
 {
-        return sdev->inquiry[6] & (1<<6);
+        return sdev->inquiry ? (sdev->inquiry[6] & (1<<6)) : 1;
 }
 
 static inline int scsi_device_protection(struct scsi_device *sdev)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index b7bdecb7b76e..f1f2644137b8 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -46,7 +46,7 @@ struct blk_queue_tags;
 enum {
         SCSI_QDEPTH_DEFAULT,    /* default requested change, e.g. from sysfs */
         SCSI_QDEPTH_QFULL,      /* scsi-ml requested due to queue full */
-        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshhold event */
+        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshold event */
 };
 
 struct scsi_host_template {
@@ -127,8 +127,7 @@ struct scsi_host_template {
          *
          * STATUS: REQUIRED
          */
-        int (* queuecommand)(struct scsi_cmnd *,
-                             void (*done)(struct scsi_cmnd *));
+        int (* queuecommand)(struct Scsi_Host *, struct scsi_cmnd *);
 
         /*
          * The transfer functions are used to queue a scsi command to
@@ -388,6 +387,7 @@ struct scsi_host_template {
          * of scatter-gather.
          */
         unsigned short sg_tablesize;
+        unsigned short sg_prot_tablesize;
 
         /*
          * Set this if the host adapter has limitations beside segment count.
@@ -504,6 +504,25 @@ struct scsi_host_template {
 };
 
 /*
+ * Temporary #define for host lock push down. Can be removed when all
+ * drivers have been updated to take advantage of unlocked
+ * queuecommand.
+ *
+ */
+#define DEF_SCSI_QCMD(func_name) \
+        int func_name(struct Scsi_Host *shost, struct scsi_cmnd *cmd)   \
+        {                                                               \
+                unsigned long irq_flags;                                \
+                int rc;                                                 \
+                spin_lock_irqsave(shost->host_lock, irq_flags);         \
+                scsi_cmd_get_serial(shost, cmd);                        \
+                rc = func_name##_lck (cmd, cmd->scsi_done);                     \
+                spin_unlock_irqrestore(shost->host_lock, irq_flags);    \
+                return rc;                                              \
+        }
+
+
+/*
  * shost state: If you alter this, you also need to alter scsi_sysfs.c
  * (for the ascii descriptions) and the state model enforcer:
  * scsi_host_set_state()
@@ -599,6 +618,7 @@ struct Scsi_Host {
         int can_queue;
         short cmd_per_lun;
         short unsigned int sg_tablesize;
+        short unsigned int sg_prot_tablesize;
         short unsigned int max_sectors;
         unsigned long dma_boundary;
         /* 
@@ -750,6 +770,7 @@ extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *);
 extern void scsi_host_put(struct Scsi_Host *t);
 extern struct Scsi_Host *scsi_host_lookup(unsigned short);
 extern const char *scsi_host_state_name(enum scsi_host_state);
+extern void scsi_cmd_get_serial(struct Scsi_Host *, struct scsi_cmnd *);
 
 extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
 
@@ -823,6 +844,11 @@ static inline unsigned int scsi_host_get_prot(struct Scsi_Host *shost)
         return shost->prot_capabilities;
 }
 
+static inline int scsi_host_prot_dma(struct Scsi_Host *shost)
+{
+        return shost->prot_capabilities >= SHOST_DIX_TYPE0_PROTECTION;
+}
+
 static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsigned int target_type)
 {
         static unsigned char cap[] = { 0,
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 17231385cb37..81dd12edc38c 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -9,6 +9,7 @@
 #define MSG_SIMPLE_TAG  0x20
 #define MSG_HEAD_TAG    0x21
 #define MSG_ORDERED_TAG 0x22
+#define MSG_ACA_TAG     0x24    /* unsupported */
 
 #define SCSI_NO_TAG     (-1)    /* identify no tag in use */
 
@@ -97,13 +98,9 @@ static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
 static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
 {
         struct request *req = cmd->request;
-        struct scsi_device *sdev = cmd->device;
 
         if (blk_rq_tagged(req)) {
-                if (sdev->ordered_tags && req->cmd_flags & REQ_HARDBARRIER)
-                        *msg++ = MSG_ORDERED_TAG;
-                else
-                        *msg++ = MSG_SIMPLE_TAG;
+                *msg++ = MSG_SIMPLE_TAG;
                 *msg++ = req->tag;
                 return 2;
         }
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 87d81b3ce564..2a65167a8f10 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -192,9 +192,9 @@ struct fc_vport_identifiers {
  *
  * This structure exists for each FC port is a virtual FC port. Virtual
  * ports share the physical link with the Physical port. Each virtual
- * ports has a unique presense on the SAN, and may be instantiated via
+ * ports has a unique presence on the SAN, and may be instantiated via
  * NPIV, Virtual Fabrics, or via additional ALPAs. As the vport is a
- * unique presense, each vport has it's own view of the fabric,
+ * unique presence, each vport has it's own view of the fabric,
  * authentication privilege, and priorities.
  *
  * A virtual port may support 1 or more FC4 roles. Typically it is a
@@ -370,7 +370,7 @@ struct fc_rport {	/* aka fc_starget_attrs */
 /*
  * FC SCSI Target Attributes
  *
- * The SCSI Target is considered an extention of a remote port (as
+ * The SCSI Target is considered an extension of a remote port (as
  * a remote port can be more than a SCSI Target). Within the scsi
  * subsystem, we leave the Target as a separate entity. Doing so
  * provides backward compatibility with prior FC transport api's,
@@ -496,6 +496,7 @@ struct fc_host_attrs {
         u64 fabric_name;
         char symbolic_name[FC_SYMBOLIC_NAME_SIZE];
         char system_hostname[FC_SYMBOLIC_NAME_SIZE];
+        u32 dev_loss_tmo;
 
         /* Private (Transport-managed) Attributes */
         enum fc_tgtid_binding_type  tgtid_bind_type;
@@ -580,6 +581,8 @@ struct fc_host_attrs {
         (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)
 #define fc_host_devloss_work_q(x) \
         (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
+#define fc_host_dev_loss_tmo(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->dev_loss_tmo)
 
 
 struct fc_bsg_buffer {
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 7fff94b3b2a8..bf8f52965675 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -101,6 +101,8 @@ struct iscsi_transport {
         void (*destroy_conn) (struct iscsi_cls_conn *conn);
         int (*set_param) (struct iscsi_cls_conn *conn, enum iscsi_param param,
                           char *buf, int buflen);
+        int (*get_ep_param) (struct iscsi_endpoint *ep, enum iscsi_param param,
+                             char *buf);
         int (*get_conn_param) (struct iscsi_cls_conn *conn,
                                enum iscsi_param param, char *buf);
         int (*get_session_param) (struct iscsi_cls_session *session,
@@ -160,8 +162,9 @@ struct iscsi_cls_conn {
         void *dd_data;                  /* LLD private data */
         struct iscsi_transport *transport;
         uint32_t cid;                   /* connection id */
+        struct mutex ep_mutex;
+        struct iscsi_endpoint *ep;
 
-        int active;                     /* must be accessed with the connlock */
         struct device dev;              /* sysfs transport/container device */
 };
 
@@ -222,6 +225,7 @@ struct iscsi_endpoint {
         void *dd_data;                  /* LLD private data */
         struct device dev;
         uint64_t id;
+        struct iscsi_cls_conn *conn;
 };
 
 /*
diff --git a/include/scsi/srp.h b/include/scsi/srp.h
index ad178fa78f66..1ae84db4c9fb 100644
--- a/include/scsi/srp.h
+++ b/include/scsi/srp.h
@@ -239,4 +239,42 @@ struct srp_rsp {
         u8      data[0];
 } __attribute__((packed));
 
+struct srp_cred_req {
+        u8      opcode;
+        u8      sol_not;
+        u8      reserved[2];
+        __be32  req_lim_delta;
+        u64     tag;
+};
+
+struct srp_cred_rsp {
+        u8      opcode;
+        u8      reserved[7];
+        u64     tag;
+};
+
+/*
+ * The SRP spec defines the fixed portion of the AER_REQ structure to be
+ * 36 bytes, so it needs to be packed to avoid having it padded to 40 bytes
+ * on 64-bit architectures.
+ */
+struct srp_aer_req {
+        u8      opcode;
+        u8      sol_not;
+        u8      reserved[2];
+        __be32  req_lim_delta;
+        u64     tag;
+        u32     reserved2;
+        __be64  lun;
+        __be32  sense_data_len;
+        u32     reserved3;
+        u8      sense_data[0];
+} __attribute__((packed));
+
+struct srp_aer_rsp {
+        u8      opcode;
+        u8      reserved[7];
+        u64     tag;
+};
+
 #endif /* SCSI_SRP_H */