[POWERPC] FWNMI is only used on pSeries

[linux-2.6-omap-h63xx.git] / include / scsi / iscsi_if.h

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 47524c726ee8c96e6c61fc413038eb5acecaf7f5..50e907f4204849177f8e883ced1ec53b3030504f 100644 (file)
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -43,10 +43,24 @@ enum iscsi_uevent_e {
        ISCSI_UEVENT_GET_STATS          = UEVENT_BASE + 10,
        ISCSI_UEVENT_GET_PARAM          = UEVENT_BASE + 11,
 
+       ISCSI_UEVENT_TRANSPORT_EP_CONNECT       = UEVENT_BASE + 12,
+       ISCSI_UEVENT_TRANSPORT_EP_POLL          = UEVENT_BASE + 13,
+       ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT    = UEVENT_BASE + 14,
+
+       ISCSI_UEVENT_TGT_DSCVR          = UEVENT_BASE + 15,
+       ISCSI_UEVENT_SET_HOST_PARAM     = UEVENT_BASE + 16,
+
        /* up events */
        ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
        ISCSI_KEVENT_CONN_ERROR         = KEVENT_BASE + 2,
        ISCSI_KEVENT_IF_ERROR           = KEVENT_BASE + 3,
+       ISCSI_KEVENT_DESTROY_SESSION    = KEVENT_BASE + 4,
+};
+
+enum iscsi_tgt_dscvr {
+       ISCSI_TGT_DSCVR_SEND_TARGETS    = 1,
+       ISCSI_TGT_DSCVR_ISNS            = 2,
+       ISCSI_TGT_DSCVR_SLP             = 3,
 };
 
 struct iscsi_uevent {
@@ -58,6 +72,8 @@ struct iscsi_uevent {
                /* messages u -> k */
                struct msg_create_session {
                        uint32_t        initial_cmdsn;
+                       uint16_t        cmds_max;
+                       uint16_t        queue_depth;
                } c_session;
                struct msg_destroy_session {
                        uint32_t        sid;
@@ -69,7 +85,7 @@ struct iscsi_uevent {
                struct msg_bind_conn {
                        uint32_t        sid;
                        uint32_t        cid;
-                       uint32_t        transport_fd;
+                       uint64_t        transport_eph;
                        uint32_t        is_leading;
                } b_conn;
                struct msg_destroy_conn {
@@ -102,6 +118,32 @@ struct iscsi_uevent {
                        uint32_t        sid;
                        uint32_t        cid;
                } get_stats;
+               struct msg_transport_connect {
+                       uint32_t        non_blocking;
+               } ep_connect;
+               struct msg_transport_poll {
+                       uint64_t        ep_handle;
+                       uint32_t        timeout_ms;
+               } ep_poll;
+               struct msg_transport_disconnect {
+                       uint64_t        ep_handle;
+               } ep_disconnect;
+               struct msg_tgt_dscvr {
+                       enum iscsi_tgt_dscvr    type;
+                       uint32_t        host_no;
+                       /*
+                        * enable = 1 to establish a new connection
+                        * with the server. enable = 0 to disconnect
+                        * from the server. Used primarily to switch
+                        * from one iSNS server to another.
+                        */
+                       uint32_t        enable;
+               } tgt_dscvr;
+               struct msg_set_host_param {
+                       uint32_t        host_no;
+                       uint32_t        param; /* enum iscsi_host_param */
+                       uint32_t        len;
+               } set_host_param;
        } u;
        union {
                /* messages k -> u */
@@ -124,6 +166,13 @@ struct iscsi_uevent {
                        uint32_t        cid;
                        uint32_t        error; /* enum iscsi_err */
                } connerror;
+               struct msg_session_destroyed {
+                       uint32_t        host_no;
+                       uint32_t        sid;
+               } d_session;
+               struct msg_transport_connect_ret {
+                       uint64_t        handle;
+               } ep_connect_ret;
        } r;
 } __attribute__ ((aligned (sizeof(uint64_t))));
 
@@ -171,6 +220,7 @@ enum iscsi_param {
        ISCSI_PARAM_ERL,
        ISCSI_PARAM_IFMARKER_EN,
        ISCSI_PARAM_OFMARKER_EN,
+       ISCSI_PARAM_EXP_STATSN,
        ISCSI_PARAM_TARGET_NAME,
        ISCSI_PARAM_TPGT,
        ISCSI_PARAM_PERSISTENT_ADDRESS,
@@ -181,6 +231,11 @@ enum iscsi_param {
        ISCSI_PARAM_CONN_PORT,
        ISCSI_PARAM_CONN_ADDRESS,
 
+       ISCSI_PARAM_USERNAME,
+       ISCSI_PARAM_USERNAME_IN,
+       ISCSI_PARAM_PASSWORD,
+       ISCSI_PARAM_PASSWORD_IN,
+
        /* must always be last */
        ISCSI_PARAM_MAX,
 };
@@ -199,6 +254,7 @@ enum iscsi_param {
 #define ISCSI_ERL                      (1 << ISCSI_PARAM_ERL)
 #define ISCSI_IFMARKER_EN              (1 << ISCSI_PARAM_IFMARKER_EN)
 #define ISCSI_OFMARKER_EN              (1 << ISCSI_PARAM_OFMARKER_EN)
+#define ISCSI_EXP_STATSN               (1 << ISCSI_PARAM_EXP_STATSN)
 #define ISCSI_TARGET_NAME              (1 << ISCSI_PARAM_TARGET_NAME)
 #define ISCSI_TPGT                     (1 << ISCSI_PARAM_TPGT)
 #define ISCSI_PERSISTENT_ADDRESS       (1 << ISCSI_PARAM_PERSISTENT_ADDRESS)
@@ -206,6 +262,24 @@ enum iscsi_param {
 #define ISCSI_SESS_RECOVERY_TMO                (1 << ISCSI_PARAM_SESS_RECOVERY_TMO)
 #define ISCSI_CONN_PORT                        (1 << ISCSI_PARAM_CONN_PORT)
 #define ISCSI_CONN_ADDRESS             (1 << ISCSI_PARAM_CONN_ADDRESS)
+#define ISCSI_USERNAME                 (1 << ISCSI_PARAM_USERNAME)
+#define ISCSI_USERNAME_IN              (1 << ISCSI_PARAM_USERNAME_IN)
+#define ISCSI_PASSWORD                 (1 << ISCSI_PARAM_PASSWORD)
+#define ISCSI_PASSWORD_IN              (1 << ISCSI_PARAM_PASSWORD_IN)
+
+/* iSCSI HBA params */
+enum iscsi_host_param {
+       ISCSI_HOST_PARAM_HWADDRESS,
+       ISCSI_HOST_PARAM_INITIATOR_NAME,
+       ISCSI_HOST_PARAM_NETDEV_NAME,
+       ISCSI_HOST_PARAM_IPADDRESS,
+       ISCSI_HOST_PARAM_MAX,
+};
+
+#define ISCSI_HOST_HWADDRESS           (1 << ISCSI_HOST_PARAM_HWADDRESS)
+#define ISCSI_HOST_INITIATOR_NAME      (1 << ISCSI_HOST_PARAM_INITIATOR_NAME)
+#define ISCSI_HOST_NETDEV_NAME         (1 << ISCSI_HOST_PARAM_NETDEV_NAME)
+#define ISCSI_HOST_IPADDRESS           (1 << ISCSI_HOST_PARAM_IPADDRESS)
 
 #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
 #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr)
@@ -229,6 +303,9 @@ enum iscsi_param {
 #define CAP_MULTI_CONN         0x40
 #define CAP_TEXT_NEGO          0x80
 #define CAP_MARKERS            0x100
+#define CAP_FW_DB              0x200
+#define CAP_SENDTARGETS_OFFLOAD        0x400
+#define CAP_DATA_PATH_OFFLOAD  0x800
 
 /*
  * These flags describes reason of stop_conn() call