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 patch set is driver updates for qla4xxx, scsi_debug, pm80xx,
  fcoe/libfc, eas2r, lpfc, be2iscsi and megaraid_sas plus some assorted
  bug fixes and cleanups"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
  [SCSI] scsi_error: Escalate to LUN reset if abort fails
  [SCSI] Add 'eh_deadline' to limit SCSI EH runtime
  [SCSI] remove check for 'resetting'
  [SCSI] dc395: Move 'last_reset' into internal host structure
  [SCSI] tmscsim: Move 'last_reset' into host structure
  [SCSI] advansys: Remove 'last_reset' references
  [SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset
  [SCSI] dpt_i2o: Remove DPTI_STATE_IOCTL
  [SCSI] megaraid_sas: Fix synchronization problem between sysPD IO path and AEN path
  [SCSI] lpfc: Fix typo on NULL assignment
  [SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning
  [SCSI] scsi_dh_alua: ALUA check sense should retry device internal reset unit attention
  [SCSI] esas2r: Cleanup snprinf formatting of firmware version
  [SCSI] esas2r: Remove superfluous mask of pcie_cap_reg
  [SCSI] esas2r: Fixes for big-endian platforms
  [SCSI] esas2r: Directly call kernel functions for atomic bit operations
  [SCSI] lpfc 8.3.43: Update lpfc version to driver version 8.3.43
  [SCSI] lpfc 8.3.43: Fixed not processing task management IOCB response status
  [SCSI] lpfc 8.3.43: Fixed spinlock hang.
  [SCSI] lpfc 8.3.43: Fixed invalid Total_Data_Placed value received for els and ct command responses
  ...

6 files changed, 38 insertions, 3 deletions

diff --git a/include/scsi/fc/fc_fc2.h b/include/scsi/fc/fc_fc2.h
index f87777d0d5bd..0b2671431305 100644
--- a/include/scsi/fc/fc_fc2.h
+++ b/include/scsi/fc/fc_fc2.h
@@ -104,7 +104,7 @@ struct fc_esb {
  * esb_e_stat - flags from FC-FS-2 T11/1619-D Rev 0.90.
  */
 #define ESB_ST_RESP         (1 << 31)   /* responder to exchange */
-#define ESB_ST_SEQ_INIT     (1 << 30)   /* port holds sequence initiaive */
+#define ESB_ST_SEQ_INIT     (1 << 30)   /* port holds sequence initiative */
 #define ESB_ST_COMPLETE     (1 << 29)   /* exchange is complete */
 #define ESB_ST_ABNORMAL     (1 << 28)   /* abnormal ending condition */
 #define ESB_ST_REC_QUAL     (1 << 26)   /* recovery qualifier active */
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 13d81c5c4ebf..5d6ed6cf12cc 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -69,6 +69,7 @@ enum iscsi_uevent_e {
         ISCSI_UEVENT_LOGIN_FLASHNODE    = UEVENT_BASE + 28,
         ISCSI_UEVENT_LOGOUT_FLASHNODE   = UEVENT_BASE + 29,
         ISCSI_UEVENT_LOGOUT_FLASHNODE_SID       = UEVENT_BASE + 30,
+        ISCSI_UEVENT_SET_CHAP           = UEVENT_BASE + 31,
 
         /* up events */
         ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
@@ -309,8 +310,16 @@ enum iscsi_param_type {
         ISCSI_HOST_PARAM,       /* iscsi_host_param */
         ISCSI_NET_PARAM,        /* iscsi_net_param */
         ISCSI_FLASHNODE_PARAM,  /* iscsi_flashnode_param */
+        ISCSI_CHAP_PARAM,       /* iscsi_chap_param */
 };
 
+/* structure for minimalist usecase */
+struct iscsi_param_info {
+        uint32_t len;           /* Actual length of the param value */
+        uint16_t param;         /* iscsi param */
+        uint8_t value[0];       /* length sized value follows */
+} __packed;
+
 struct iscsi_iface_param_info {
         uint32_t iface_num;     /* iface number, 0 - n */
         uint32_t len;           /* Actual length of the param */
@@ -739,6 +748,14 @@ enum chap_type_e {
         CHAP_TYPE_IN,
 };
 
+enum iscsi_chap_param {
+        ISCSI_CHAP_PARAM_INDEX,
+        ISCSI_CHAP_PARAM_CHAP_TYPE,
+        ISCSI_CHAP_PARAM_USERNAME,
+        ISCSI_CHAP_PARAM_PASSWORD,
+        ISCSI_CHAP_PARAM_PASSWORD_LEN
+};
+
 #define ISCSI_CHAP_AUTH_NAME_MAX_LEN    256
 #define ISCSI_CHAP_AUTH_SECRET_MAX_LEN  256
 struct iscsi_chap_rec {
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index e1379b4e8faf..52beadf9a29b 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -410,6 +410,12 @@ struct fc_seq {
  * @fh_type:      The frame type
  * @class:        The class of service
  * @seq:          The sequence in use on this exchange
+ * @resp_active:  Number of tasks that are concurrently executing @resp().
+ * @resp_task:    If @resp_active > 0, either the task executing @resp(), the
+ *                task that has been interrupted to execute the soft-IRQ
+ *                executing @resp() or NULL if more than one task is executing
+ *                @resp concurrently.
+ * @resp_wq:      Waitqueue for the tasks waiting on @resp_active.
  * @resp:         Callback for responses on this exchange
  * @destructor:   Called when destroying the exchange
  * @arg:          Passed as a void pointer to the resp() callback
@@ -441,6 +447,9 @@ struct fc_exch {
         u32                 r_a_tov;
         u32                 f_ctl;
         struct fc_seq       seq;
+        int                 resp_active;
+        struct task_struct  *resp_task;
+        wait_queue_head_t   resp_wq;
         void                (*resp)(struct fc_seq *, struct fc_frame *, void *);
         void                *arg;
         void                (*destructor)(struct fc_seq *, void *);
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 4427393115ea..de7e3ee60f0c 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -90,6 +90,7 @@ enum fip_state {
  * @lp:            &fc_lport: libfc local port.
  * @sel_fcf:       currently selected FCF, or NULL.
  * @fcfs:          list of discovered FCFs.
+ * @cdev:          (Optional) pointer to sysfs fcoe_ctlr_device.
  * @fcf_count:     number of discovered FCF entries.
  * @sol_time:      time when a multicast solicitation was last sent.
  * @sel_time:      time after which to select an FCF.
@@ -127,6 +128,7 @@ struct fcoe_ctlr {
         struct fc_lport *lp;
         struct fcoe_fcf *sel_fcf;
         struct list_head fcfs;
+        struct fcoe_ctlr_device *cdev;
         u16 fcf_count;
         unsigned long sol_time;
         unsigned long sel_time;
@@ -168,8 +170,11 @@ static inline void *fcoe_ctlr_priv(const struct fcoe_ctlr *ctlr)
         return (void *)(ctlr + 1);
 }
 
+/*
+ * This assumes that the fcoe_ctlr (x) is allocated with the fcoe_ctlr_device.
+ */
 #define fcoe_ctlr_to_ctlr_dev(x)                                        \
-        (struct fcoe_ctlr_device *)(((struct fcoe_ctlr_device *)(x)) - 1)
+        (x)->cdev
 
 /**
  * struct fcoe_fcf - Fibre-Channel Forwarder
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 755243572219..546084964d55 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -598,9 +598,12 @@ struct Scsi_Host {
         unsigned int host_eh_scheduled;    /* EH scheduled without command */
     
         unsigned int host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */
-        int resetting; /* if set, it means that last_reset is a valid value */
+
+        /* next two fields are used to bound the time spent in error handling */
+        int eh_deadline;
         unsigned long last_reset;
 
+
         /*
          * These three parameters can be used to allow for wide scsi,
          * and for host adapters that support multiple busses
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index d0f1602985e7..fe7c8f3e93f8 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -152,6 +152,7 @@ struct iscsi_transport {
         int (*get_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx,
                          uint32_t *num_entries, char *buf);
         int (*delete_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx);
+        int (*set_chap) (struct Scsi_Host *shost, void *data, int len);
         int (*get_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,
                                     int param, char *buf);
         int (*set_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,