Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 52 insertions, 55 deletions

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index cd3ca63d4fb1..5e75bb7f311c 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -24,6 +24,7 @@
 #define LIBISCSI_H
 
 #include <linux/types.h>
+#include <linux/wait.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
@@ -31,6 +32,7 @@
 #include <scsi/iscsi_if.h>
 
 struct scsi_transport_template;
+struct scsi_host_template;
 struct scsi_device;
 struct Scsi_Host;
 struct scsi_cmnd;
@@ -40,6 +42,7 @@ struct iscsi_cls_session;
 struct iscsi_cls_conn;
 struct iscsi_session;
 struct iscsi_nopin;
+struct device;
 
 /* #define DEBUG_SCSI */
 #ifdef DEBUG_SCSI
@@ -49,9 +52,7 @@ struct iscsi_nopin;
 #endif
 
 #define ISCSI_DEF_XMIT_CMDS_MAX 128     /* must be power of 2 */
-#define ISCSI_MGMT_CMDS_MAX     16      /* must be power of 2 */
-
-#define ISCSI_MGMT_ITT_OFFSET   0xa00
+#define ISCSI_MGMT_CMDS_MAX     15
 
 #define ISCSI_DEF_CMD_PER_LUN           32
 #define ISCSI_MAX_CMD_PER_LUN           128
@@ -69,7 +70,10 @@ enum {
 /* Connection suspend "bit" */
 #define ISCSI_SUSPEND_BIT               1
 
-#define ISCSI_ITT_MASK                  (0xfff)
+#define ISCSI_ITT_MASK                  (0x1fff)
+#define ISCSI_TOTAL_CMDS_MAX            4096
+/* this must be a power of two greater than ISCSI_MGMT_CMDS_MAX */
+#define ISCSI_TOTAL_CMDS_MIN            16
 #define ISCSI_AGE_SHIFT                 28
 #define ISCSI_AGE_MASK                  (0xf << ISCSI_AGE_SHIFT)
 
@@ -82,18 +86,6 @@ enum {
         ISCSI_DIGEST_SIZE = sizeof(__u32),
 };
 
-struct iscsi_mgmt_task {
-        /*
-         * Becuae LLDs allocate their hdr differently, this is a pointer to
-         * that storage. It must be setup at session creation time.
-         */
-        struct iscsi_hdr        *hdr;
-        char                    *data;          /* mgmt payload */
-        unsigned                data_count;     /* counts data to be sent */
-        uint32_t                itt;            /* this ITT */
-        void                    *dd_data;       /* driver/transport data */
-        struct list_head        running;
-};
 
 enum {
         ISCSI_TASK_COMPLETED,
@@ -101,7 +93,7 @@ enum {
         ISCSI_TASK_RUNNING,
 };
 
-struct iscsi_cmd_task {
+struct iscsi_task {
         /*
          * Because LLDs allocate their hdr differently, this is a pointer
          * and length to that storage. It must be setup at session
@@ -118,6 +110,7 @@ struct iscsi_cmd_task {
         /* offset in unsolicited stream (bytes); */
         unsigned                unsol_offset;
         unsigned                data_count;     /* remaining Data-Out */
+        char                    *data;          /* mgmt payload */
         struct scsi_cmnd        *sc;            /* associated SCSI cmd*/
         struct iscsi_conn       *conn;          /* used connection    */
 
@@ -128,9 +121,9 @@ struct iscsi_cmd_task {
         void                    *dd_data;       /* driver/transport data */
 };
 
-static inline void* iscsi_next_hdr(struct iscsi_cmd_task *ctask)
+static inline void* iscsi_next_hdr(struct iscsi_task *task)
 {
-        return (void*)ctask->hdr + ctask->hdr_len;
+        return (void*)task->hdr + task->hdr_len;
 }
 
 /* Connection's states */
@@ -146,11 +139,6 @@ struct iscsi_conn {
         void                    *dd_data;       /* iscsi_transport data */
         struct iscsi_session    *session;       /* parent session */
         /*
-         * LLDs should set this lock. It protects the transport recv
-         * code
-         */
-        rwlock_t                *recv_lock;
-        /*
          * conn_stop() flag: stop to recover, stop to terminate
          */
         int                     stop_stage;
@@ -159,7 +147,7 @@ struct iscsi_conn {
         unsigned long           last_ping;
         int                     ping_timeout;
         int                     recv_timeout;
-        struct iscsi_mgmt_task  *ping_mtask;
+        struct iscsi_task       *ping_task;
 
         /* iSCSI connection-wide sequencing */
         uint32_t                exp_statsn;
@@ -175,9 +163,8 @@ struct iscsi_conn {
          * should always fit in this buffer
          */
         char                    *data;
-        struct iscsi_mgmt_task  *login_mtask;   /* mtask used for login/text */
-        struct iscsi_mgmt_task  *mtask;         /* xmit mtask in progress */
-        struct iscsi_cmd_task   *ctask;         /* xmit ctask in progress */
+        struct iscsi_task       *login_task;    /* mtask used for login/text */
+        struct iscsi_task       *task;          /* xmit task in progress */
 
         /* xmit */
         struct list_head        mgmtqueue;      /* mgmt (control) xmit queue */
@@ -208,9 +195,6 @@ struct iscsi_conn {
         /* remote portal currently connected to */
         int                     portal_port;
         char                    portal_address[ISCSI_ADDRESS_BUF_LEN];
-        /* local address */
-        int                     local_port;
-        char                    local_address[ISCSI_ADDRESS_BUF_LEN];
 
         /* MIB-statistics */
         uint64_t                txdata_octets;
@@ -246,6 +230,7 @@ enum {
 };
 
 struct iscsi_session {
+        struct iscsi_cls_session *cls_session;
         /*
          * Syncs up the scsi eh thread with the iscsi eh thread when sending
          * task management functions. This must be taken before the session
@@ -281,10 +266,8 @@ struct iscsi_session {
         char                    *password;
         char                    *password_in;
         char                    *targetname;
+        char                    *ifacename;
         char                    *initiatorname;
-        /* hw address or netdev iscsi connection is bound to */
-        char                    *hwaddress;
-        char                    *netdev;
         /* control data */
         struct iscsi_transport  *tt;
         struct Scsi_Host        *host;
@@ -298,12 +281,20 @@ struct iscsi_session {
         int                     state;          /* session state           */
         int                     age;            /* counts session re-opens */
 
+        int                     scsi_cmds_max;  /* max scsi commands */
         int                     cmds_max;       /* size of cmds array */
-        struct iscsi_cmd_task   **cmds;         /* Original Cmds arr */
+        struct iscsi_task       **cmds;         /* Original Cmds arr */
         struct iscsi_pool       cmdpool;        /* PDU's pool */
-        int                     mgmtpool_max;   /* size of mgmt array */
-        struct iscsi_mgmt_task  **mgmt_cmds;    /* Original mgmt arr */
-        struct iscsi_pool       mgmtpool;       /* Mgmt PDU's pool */
+};
+
+struct iscsi_host {
+        char                    *initiatorname;
+        /* 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];
 };
 
 /*
@@ -316,42 +307,44 @@ extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
 extern int iscsi_queuecommand(struct scsi_cmnd *sc,
                               void (*done)(struct scsi_cmnd *));
 
-
 /*
  * iSCSI host helpers.
  */
+#define iscsi_host_priv(_shost) \
+        (shost_priv(_shost) + sizeof(struct iscsi_host))
+
 extern int iscsi_host_set_param(struct Scsi_Host *shost,
                                 enum iscsi_host_param param, char *buf,
                                 int buflen);
 extern int iscsi_host_get_param(struct Scsi_Host *shost,
                                 enum iscsi_host_param param, char *buf);
+extern int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev);
+extern struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,
+                                          int dd_data_size, uint16_t qdepth);
+extern void iscsi_host_remove(struct Scsi_Host *shost);
+extern void iscsi_host_free(struct Scsi_Host *shost);
 
 /*
  * session management
  */
 extern struct iscsi_cls_session *
-iscsi_session_setup(struct iscsi_transport *, struct scsi_transport_template *,
-                    uint16_t, uint16_t, int, int, uint32_t, uint32_t *);
+iscsi_session_setup(struct iscsi_transport *, struct Scsi_Host *shost,
+                    uint16_t, int, uint32_t, unsigned int);
 extern void iscsi_session_teardown(struct iscsi_cls_session *);
-extern struct iscsi_session *class_to_transport_session(struct iscsi_cls_session *);
 extern void iscsi_session_recovery_timedout(struct iscsi_cls_session *);
 extern int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
                            enum iscsi_param param, char *buf, int buflen);
 extern int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
                                    enum iscsi_param param, char *buf);
 
-#define session_to_cls(_sess) \
-        hostdata_session(_sess->host->hostdata)
-
 #define iscsi_session_printk(prefix, _sess, fmt, a...)  \
-        iscsi_cls_session_printk(prefix,                \
-                (struct iscsi_cls_session *)session_to_cls(_sess), fmt, ##a)
+        iscsi_cls_session_printk(prefix, _sess->cls_session, fmt, ##a)
 
 /*
  * connection management
  */
 extern struct iscsi_cls_conn *iscsi_conn_setup(struct iscsi_cls_session *,
-                                               uint32_t);
+                                               int, uint32_t);
 extern void iscsi_conn_teardown(struct iscsi_cls_conn *);
 extern int iscsi_conn_start(struct iscsi_cls_conn *);
 extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);
@@ -360,25 +353,29 @@ extern int iscsi_conn_bind(struct iscsi_cls_session *, struct iscsi_cls_conn *,
 extern void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err);
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
                                 enum iscsi_param param, char *buf);
+extern void iscsi_suspend_tx(struct iscsi_conn *conn);
 
 #define iscsi_conn_printk(prefix, _c, fmt, a...) \
-        iscsi_cls_conn_printk(prefix, _c->cls_conn, fmt, ##a)
+        iscsi_cls_conn_printk(prefix, ((struct iscsi_conn *)_c)->cls_conn, \
+                              fmt, ##a)
 
 /*
  * pdu and task processing
  */
 extern void iscsi_update_cmdsn(struct iscsi_session *, struct iscsi_nopin *);
-extern void iscsi_prep_unsolicit_data_pdu(struct iscsi_cmd_task *,
+extern void iscsi_prep_unsolicit_data_pdu(struct iscsi_task *,
                                         struct iscsi_data *hdr);
 extern int iscsi_conn_send_pdu(struct iscsi_cls_conn *, struct iscsi_hdr *,
                                 char *, uint32_t);
 extern int iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *,
                               char *, int);
-extern int iscsi_verify_itt(struct iscsi_conn *, struct iscsi_hdr *,
-                            uint32_t *);
-extern void iscsi_requeue_ctask(struct iscsi_cmd_task *ctask);
-extern void iscsi_free_mgmt_task(struct iscsi_conn *conn,
-                                 struct iscsi_mgmt_task *mtask);
+extern int __iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *,
+                                char *, int);
+extern int iscsi_verify_itt(struct iscsi_conn *, itt_t);
+extern struct iscsi_task *iscsi_itt_to_ctask(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_get_task(struct iscsi_task *task);
 
 /*
  * generic helpers