vserver 1.9.5.x5
[linux-2.6.git] / drivers / s390 / scsi / zfcp_def.h
index 65c89d3..53fcccb 100644 (file)
@@ -12,6 +12,8 @@
  *            Wolfgang Taphorn
  *            Stefan Bader <stefan.bader@de.ibm.com> 
  *            Heiko Carstens <heiko.carstens@de.ibm.com> 
+ *            Andreas Herrmann <aherrman@de.ibm.com>
+ *            Volker Sameske <sameske@de.ibm.com>
  * 
  * This program is free software; you can redistribute it and/or modify 
  * it under the terms of the GNU General Public License as published by 
@@ -32,8 +34,7 @@
 #ifndef ZFCP_DEF_H
 #define ZFCP_DEF_H
 
-/* this drivers version (do not edit !!! generated and updated by cvs) */
-#define ZFCP_DEF_REVISION "$Revision: 1.73 $"
+#define ZFCP_DEF_REVISION "$Revision: 1.111 $"
 
 /*************************** INCLUDES *****************************************/
 
 #include <linux/miscdevice.h>
 #include <linux/major.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_fc.h>
 #include "../../fc4/fc.h"
 #include "zfcp_fsf.h"
 #include <asm/ccwdev.h>
 #include <asm/qdio.h>
 #include <asm/debug.h>
 #include <asm/ebcdic.h>
-#include <linux/reboot.h>
 #include <linux/mempool.h>
 #include <linux/syscalls.h>
 #include <linux/ioctl.h>
-#ifdef CONFIG_S390_SUPPORT
 #include <linux/ioctl32.h>
-#endif
 
 /************************ DEBUG FLAGS *****************************************/
 
 /********************* GENERAL DEFINES *********************************/
 
 /* zfcp version number, it consists of major, minor, and patch-level number */
-#define ZFCP_VERSION           "4.0.0"
+#define ZFCP_VERSION           "4.2.0"
 
+/**
+ * zfcp_sg_to_address - determine kernel address from struct scatterlist
+ * @list: struct scatterlist
+ * Return: kernel address
+ */
 static inline void *
 zfcp_sg_to_address(struct scatterlist *list)
 {
        return (void *) (page_address(list->page) + list->offset);
 }
 
+/**
+ * zfcp_address_to_sg - set up struct scatterlist from kernel address
+ * @address: kernel address
+ * @list: struct scatterlist
+ */
 static inline void
 zfcp_address_to_sg(void *address, struct scatterlist *list)
 {
@@ -144,6 +156,9 @@ typedef u32 scsi_lun_t;
 #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES      6
 #define ZFCP_EXCHANGE_CONFIG_DATA_SLEEP                50
 
+/* timeout value for "default timer" for fsf requests */
+#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ);
+
 /*************** FIBRE CHANNEL PROTOCOL SPECIFIC DEFINES ********************/
 
 typedef unsigned long long wwn_t;
@@ -156,7 +171,6 @@ typedef unsigned int       fcp_dl_t;
 
 /* timeout for name-server lookup (in seconds) */
 #define ZFCP_NS_GID_PN_TIMEOUT         10
-#define ZFCP_NS_GA_NXT_TIMEOUT         120
 
 /* largest SCSI command we can process */
 /* FCP-2 (FCP_CMND IU) allows up to (255-3+16) */
@@ -172,11 +186,11 @@ typedef unsigned int       fcp_dl_t;
 #define UNTAGGED       5
 
 /* task management flags in FCP-2 FCP_CMND IU */
-#define CLEAR_ACA              0x40
-#define TARGET_RESET           0x20
-#define LOGICAL_UNIT_RESET     0x10
-#define CLEAR_TASK_SET         0x04
-#define ABORT_TASK_SET         0x02
+#define FCP_CLEAR_ACA          0x40
+#define FCP_TARGET_RESET       0x20
+#define FCP_LOGICAL_UNIT_RESET 0x10
+#define FCP_CLEAR_TASK_SET     0x04
+#define FCP_ABORT_TASK_SET     0x02
 
 #define FCP_CDB_LENGTH         16
 
@@ -274,152 +288,41 @@ struct fcp_logo {
 #define R_A_TOV                                10 /* seconds */
 #define ZFCP_ELS_TIMEOUT               (2 * R_A_TOV)
 
-#define ZFCP_LS_RJT                    0x01
-#define ZFCP_LS_ACC                    0x02
-#define ZFCP_LS_RTV                    0x0E
-#define ZFCP_LS_RLS                    0x0F
-#define ZFCP_LS_PDISC                  0x50
+#define ZFCP_LS_RLS                    0x0f
 #define ZFCP_LS_ADISC                  0x52
+#define ZFCP_LS_RPS                    0x56
 #define ZFCP_LS_RSCN                   0x61
 #define ZFCP_LS_RNID                   0x78
-#define ZFCP_LS_RLIR                   0x7A
-#define ZFCP_LS_RTV_E_D_TOV_FLAG       0x04000000
-
-/* LS_ACC Reason Codes */
-#define ZFCP_LS_RJT_INVALID_COMMAND_CODE       0x01
-#define ZFCP_LS_RJT_LOGICAL_ERROR              0x03
-#define ZFCP_LS_RJT_LOGICAL_BUSY               0x05
-#define ZFCP_LS_RJT_PROTOCOL_ERROR             0x07
-#define ZFCP_LS_RJT_UNABLE_TO_PERFORM          0x09
-#define ZFCP_LS_RJT_COMMAND_NOT_SUPPORTED      0x0B
-#define ZFCP_LS_RJT_VENDOR_UNIQUE_ERROR                0xFF
-
-struct zfcp_ls_rjt {
-       u8              code;
-       u8              field[3];
-       u8              reserved;
-       u8      reason_code;
-       u8              reason_expl;
-       u8      vendor_unique;
-} __attribute__ ((packed));
-
-struct zfcp_ls_rtv {
-       u8              code;
-       u8              field[3];
-} __attribute__ ((packed));
-
-struct zfcp_ls_rtv_acc {
-       u8              code;
-       u8              field[3];
-       u32             r_a_tov;
-       u32             e_d_tov;
-       u32             qualifier;
-} __attribute__ ((packed));
-
-struct zfcp_ls_rls {
-       u8              code;
-       u8              field[3];
-       fc_id_t         port_id;
-} __attribute__ ((packed));
 
-struct zfcp_ls_rls_acc {
-       u8              code;
-       u8              field[3];
-       u32             link_failure_count;
-       u32             loss_of_sync_count;
-       u32             loss_of_signal_count;
-       u32             prim_seq_prot_error;
-       u32             invalid_transmition_word;
-       u32             invalid_crc_count;
-} __attribute__ ((packed));
-
-struct zfcp_ls_pdisc {
-       u8              code;
-       u8              field[3];
-       u8              common_svc_parm[16];
-               wwn_t   wwpn;
-       wwn_t           wwnn;
-       struct {
-               u8      class1[16];
-               u8      class2[16];
-               u8      class3[16];
-       } svc_parm;
-       u8              reserved[16];
-       u8              vendor_version[16];
-} __attribute__ ((packed));
-
-struct zfcp_ls_pdisc_acc {
-       u8              code;
-       u8              field[3];
-       u8              common_svc_parm[16];
-       wwn_t           wwpn;
-       wwn_t           wwnn;
-       struct {
-               u8      class1[16];
-               u8      class2[16];
-               u8      class3[16];
-       } svc_parm;
-       u8              reserved[16];
-       u8              vendor_version[16];
+struct zfcp_ls_rjt_par {
+       u8 action;
+       u8 reason_code;
+       u8 reason_expl;
+       u8 vendor_unique;
 } __attribute__ ((packed));
 
 struct zfcp_ls_adisc {
        u8              code;
        u8              field[3];
-       fc_id_t         hard_nport_id;
-       wwn_t           wwpn;
-       wwn_t           wwnn;
-       fc_id_t         nport_id;
+       u32             hard_nport_id;
+       u64             wwpn;
+       u64             wwnn;
+       u32             nport_id;
 } __attribute__ ((packed));
 
 struct zfcp_ls_adisc_acc {
        u8              code;
        u8              field[3];
-       fc_id_t         hard_nport_id;
-       wwn_t           wwpn;
-       wwn_t           wwnn;
-       fc_id_t         nport_id;
+       u32             hard_nport_id;
+       u64             wwpn;
+       u64             wwnn;
+       u32             nport_id;
 } __attribute__ ((packed));
 
-struct zfcp_ls_rnid {
-       u8              code;
-       u8              field[3];
-       u8              node_id_format;
-       u8              reserved[3];
-} __attribute__((packed));
-
-/* common identification data */
-struct zfcp_ls_rnid_common_id {
-       u64             n_port_name;
-       u64             node_name;
-} __attribute__((packed));
-
-/* general topology specific identification data */
-struct zfcp_ls_rnid_general_topology_id {
-       u8              vendor_unique[16];
-       u32             associated_type;
-       u32             physical_port_number;
-       u32             nr_attached_nodes;
-       u8              node_management;
-       u8              ip_version;
-       u16             port_number;
-       u8              ip_address[16];
-       u8              reserved[2];
-       u16             vendor_specific;
-} __attribute__((packed));
-
-struct zfcp_ls_rnid_acc {
-       u8              code;
-       u8              field[3];
-       u8              node_id_format;
-       u8              common_id_length;
-       u8              reserved;
-       u8              specific_id_length;
-       struct zfcp_ls_rnid_common_id
-                       common_id;
-       struct zfcp_ls_rnid_general_topology_id
-                       specific_id;
-} __attribute__((packed));
+struct zfcp_rc_entry {
+       u8 code;
+       const char *description;
+};
 
 /*
  * FC-GS-2 stuff
@@ -429,9 +332,9 @@ struct zfcp_ls_rnid_acc {
 #define ZFCP_CT_NAME_SERVER            0x02
 #define ZFCP_CT_SYNCHRONOUS            0x00
 #define ZFCP_CT_GID_PN                 0x0121
-#define ZFCP_CT_GA_NXT                 0x0100
 #define ZFCP_CT_MAX_SIZE               0x1020
 #define ZFCP_CT_ACCEPT                 0x8002
+#define ZFCP_CT_REJECT                 0x8001
 
 /*
  * FC-GS-4 stuff
@@ -476,6 +379,9 @@ struct zfcp_ls_rnid_acc {
 
 #define ZFCP_NAME               "zfcp"
 
+/* read-only LUN sharing switch initial value */
+#define ZFCP_RO_LUN_SHARING_DEFAULTS 0
+
 /* independent log areas */
 #define ZFCP_LOG_AREA_OTHER    0
 #define ZFCP_LOG_AREA_SCSI     1
@@ -509,14 +415,14 @@ struct zfcp_ls_rnid_acc {
 
 /* all log-level defaults are combined to generate initial log-level */
 #define ZFCP_LOG_LEVEL_DEFAULTS \
-       (ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_OTHER) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_SCSI) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_FSF) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_CONFIG) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_CIO) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_QDIO) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_ERP) | \
-        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_INFO, ZFCP_LOG_AREA_FC))
+       (ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_OTHER) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_SCSI) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_FSF) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_CONFIG) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_CIO) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_QDIO) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_ERP) | \
+        ZFCP_SET_LOG_NIBBLE(ZFCP_LOG_LEVEL_NORMAL, ZFCP_LOG_AREA_FC))
 
 /* check whether we have the right level for logging */
 #define ZFCP_LOG_CHECK(level) \
@@ -525,26 +431,32 @@ struct zfcp_ls_rnid_acc {
 /* logging routine for zfcp */
 #define _ZFCP_LOG(fmt, args...) \
        printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __FUNCTION__, \
-              __LINE__ , ##args);
+              __LINE__ , ##args)
 
 #define ZFCP_LOG(level, fmt, args...) \
+do { \
        if (ZFCP_LOG_CHECK(level)) \
-               _ZFCP_LOG(fmt , ##args)
+               _ZFCP_LOG(fmt, ##args); \
+} while (0)
        
 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_NORMAL
 # define ZFCP_LOG_NORMAL(fmt, args...)
 #else
 # define ZFCP_LOG_NORMAL(fmt, args...) \
+do { \
        if (ZFCP_LOG_CHECK(ZFCP_LOG_LEVEL_NORMAL)) \
-               printk(KERN_ERR ZFCP_NAME": " fmt , ##args);
+               printk(KERN_ERR ZFCP_NAME": " fmt, ##args); \
+} while (0)
 #endif
 
 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_INFO
 # define ZFCP_LOG_INFO(fmt, args...)
 #else
 # define ZFCP_LOG_INFO(fmt, args...) \
+do { \
        if (ZFCP_LOG_CHECK(ZFCP_LOG_LEVEL_INFO)) \
-               printk(KERN_ERR ZFCP_NAME": " fmt , ##args);
+               printk(KERN_ERR ZFCP_NAME": " fmt, ##args); \
+} while (0)
 #endif
 
 #if ZFCP_LOG_LEVEL_LIMIT < ZFCP_LOG_LEVEL_DEBUG
@@ -566,8 +478,10 @@ struct zfcp_ls_rnid_acc {
 #else
 extern u32 flags_dump;
 # define ZFCP_LOG_FLAGS(level, fmt, args...) \
+do { \
        if (level <= flags_dump) \
-               _ZFCP_LOG(fmt , ##args)
+               _ZFCP_LOG(fmt, ##args); \
+} while (0)
 #endif
 
 /*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/
@@ -576,8 +490,8 @@ extern u32 flags_dump;
  * Note, the leftmost status byte is common among adapter, port 
  * and unit
  */
-#define ZFCP_COMMON_FLAGS                       0xff000000
-#define ZFCP_SPECIFIC_FLAGS                     0x00ffffff
+#define ZFCP_COMMON_FLAGS                      0xfff00000
+#define ZFCP_SPECIFIC_FLAGS                    0x000fffff
 
 /* common status bits */
 #define ZFCP_STATUS_COMMON_REMOVE              0x80000000
@@ -588,6 +502,7 @@ extern u32 flags_dump;
 #define ZFCP_STATUS_COMMON_OPEN                 0x04000000
 #define ZFCP_STATUS_COMMON_CLOSING              0x02000000
 #define ZFCP_STATUS_COMMON_ERP_INUSE           0x01000000
+#define ZFCP_STATUS_COMMON_ACCESS_DENIED       0x00800000
 
 /* adapter status */
 #define ZFCP_STATUS_ADAPTER_QDIOUP             0x00000002
@@ -604,7 +519,12 @@ extern u32 flags_dump;
                 ZFCP_STATUS_ADAPTER_REGISTERED)
 
 
-#define ZFCP_DID_NAMESERVER                    0xFFFFFC
+/* FC-PH/FC-GS well-known address identifiers for generic services */
+#define ZFCP_DID_MANAGEMENT_SERVICE            0xFFFFFA
+#define ZFCP_DID_TIME_SERVICE                  0xFFFFFB
+#define ZFCP_DID_DIRECTORY_SERVICE             0xFFFFFC
+#define ZFCP_DID_ALIAS_SERVICE                 0xFFFFF8
+#define ZFCP_DID_KEY_DISTRIBUTION_SERVICE      0xFFFFF7
 
 /* remote port status */
 #define ZFCP_STATUS_PORT_PHYS_OPEN             0x00000001
@@ -613,14 +533,18 @@ extern u32 flags_dump;
 #define ZFCP_STATUS_PORT_NO_WWPN               0x00000008
 #define ZFCP_STATUS_PORT_NO_SCSI_ID            0x00000010
 #define ZFCP_STATUS_PORT_INVALID_WWPN          0x00000020
+#define ZFCP_STATUS_PORT_ACCESS_DENIED         0x00000040
 
-#define ZFCP_STATUS_PORT_NAMESERVER \
+/* for ports with well known addresses */
+#define ZFCP_STATUS_PORT_WKA \
                (ZFCP_STATUS_PORT_NO_WWPN | \
                 ZFCP_STATUS_PORT_NO_SCSI_ID)
 
 /* logical unit status */
 #define ZFCP_STATUS_UNIT_NOTSUPPUNITRESET      0x00000001
-
+#define ZFCP_STATUS_UNIT_TEMPORARY             0x00000002
+#define ZFCP_STATUS_UNIT_SHARED                        0x00000004
+#define ZFCP_STATUS_UNIT_READONLY              0x00000008
 
 /* FSF request status (this does not have a common part) */
 #define ZFCP_STATUS_FSFREQ_NOT_INIT            0x00000000
@@ -787,43 +711,29 @@ struct ct_iu_gid_pn_req {
        wwn_t wwpn;
 } __attribute__ ((packed));
 
-/* nameserver request CT_IU -- for requests where
- * a port identifier is required */
-struct ct_iu_ga_nxt_req {
-       struct ct_hdr header;
-       fc_id_t d_id;
-} __attribute__ ((packed));
-
 /* FS_ACC IU and data unit for GID_PN nameserver request */
 struct ct_iu_gid_pn_resp {
        struct ct_hdr header;
        fc_id_t d_id;
 } __attribute__ ((packed));
 
-/* FS_ACC IU and data unit for GA_NXT nameserver request */
-struct ct_iu_ga_nxt_resp {
-       struct ct_hdr header;
-        u8 port_type;
-        u8 port_id[3];
-        u64 port_wwn;
-        u8 port_symbolic_name_length;
-        u8 port_symbolic_name[255];
-        u64 node_wwn;
-        u8 node_symbolic_name_length;
-        u8 node_symbolic_name[255];
-        u64 initial_process_associator;
-        u8 node_ip[16];
-        u32 cos;
-        u8 fc4_types[32];
-        u8 port_ip[16];
-        u64 fabric_wwn;
-        u8 reserved;
-        u8 hard_address[3];
-} __attribute__ ((packed));
-
 typedef void (*zfcp_send_ct_handler_t)(unsigned long);
 
-/* used to pass parameters to zfcp_send_ct() */
+/**
+ * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct
+ * @port: port where the request is sent to
+ * @req: scatter-gather list for request
+ * @resp: scatter-gather list for response
+ * @req_count: number of elements in request scatter-gather list
+ * @resp_count: number of elements in response scatter-gather list
+ * @handler: handler function (called for response to the request)
+ * @handler_data: data passed to handler function
+ * @pool: pointer to memory pool for ct request structure
+ * @timeout: FSF timeout for this request
+ * @timer: timer (e.g. for request initiated by erp)
+ * @completion: completion for synchronization purposes
+ * @status: used to pass error status to calling function
+ */
 struct zfcp_send_ct {
        struct zfcp_port *port;
        struct scatterlist *req;
@@ -832,7 +742,7 @@ struct zfcp_send_ct {
        unsigned int resp_count;
        zfcp_send_ct_handler_t handler;
        unsigned long handler_data;
-       mempool_t *pool;                /* mempool for ct not for fsf_req */
+       mempool_t *pool;
        int timeout;
        struct timer_list *timer;
        struct completion *completion;
@@ -849,18 +759,33 @@ struct zfcp_gid_pn_data {
         struct zfcp_port *port;
 };
 
-typedef int (*zfcp_send_els_handler_t)(unsigned long);
-
-/* used to pass parameters to zfcp_send_els() */
-/* ToDo merge send_ct() and send_els() and corresponding structs */
+typedef void (*zfcp_send_els_handler_t)(unsigned long);
+
+/**
+ * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els
+ * @adapter: adapter where request is sent from
+ * @d_id: destiniation id of port where request is sent to
+ * @req: scatter-gather list for request
+ * @resp: scatter-gather list for response
+ * @req_count: number of elements in request scatter-gather list
+ * @resp_count: number of elements in response scatter-gather list
+ * @handler: handler function (called for response to the request)
+ * @handler_data: data passed to handler function
+ * @timer: timer (e.g. for request initiated by erp)
+ * @completion: completion for synchronization purposes
+ * @ls_code: hex code of ELS command
+ * @status: used to pass error status to calling function
+ */
 struct zfcp_send_els {
-       struct zfcp_port *port;
+       struct zfcp_adapter *adapter;
+       fc_id_t d_id;
        struct scatterlist *req;
        struct scatterlist *resp;
        unsigned int req_count;
        unsigned int resp_count;
        zfcp_send_els_handler_t handler;
        unsigned long handler_data;
+       struct timer_list *timer;
        struct completion *completion;
        int ls_code;
        int status;
@@ -890,6 +815,7 @@ union zfcp_req_data {
        struct zfcp_send_ct *send_ct;
        struct zfcp_send_els *send_els;
        struct zfcp_status_read           status_read;
+       struct fsf_qtcb_bottom_port *port_data;
 };
 
 struct zfcp_qdio_queue {
@@ -974,9 +900,10 @@ struct zfcp_adapter {
        debug_info_t            *abort_dbf;
        debug_info_t            *in_els_dbf;
        debug_info_t            *cmd_dbf;
-       rwlock_t                cmd_dbf_lock;
+       spinlock_t              dbf_lock;
        struct zfcp_adapter_mempool     pool;      /* Adapter memory pools */
        struct qdio_initialize  qdio_init_data;    /* for qdio_establish */
+       struct device           generic_services;  /* directory for WKA ports */
 };
 
 /*
@@ -1023,8 +950,6 @@ struct zfcp_unit {
         struct scsi_device     *device;        /* scsi device struct pointer */
        struct zfcp_erp_action erp_action;     /* pending error recovery */
         atomic_t               erp_counter;
-       atomic_t               scsi_add_work;  /* used to synchronize */
-       wait_queue_head_t      scsi_add_wq;    /* wait for scsi_add_device */
 };
 
 /* FSF request */
@@ -1072,14 +997,18 @@ struct zfcp_data {
                                                       lists */
        struct semaphore        config_sema;        /* serialises configuration
                                                       changes */
-       struct notifier_block   reboot_notifier;     /* used to register cleanup
-                                                       functions */
        atomic_t                loglevel;            /* current loglevel */
        char                    init_busid[BUS_ID_SIZE];
        wwn_t                   init_wwpn;
        fcp_lun_t               init_fcp_lun;
+       char                    *driver_version;
 };
 
+/**
+ * struct zfcp_sg_list - struct describing a scatter-gather list
+ * @sg: pointer to array of (struct scatterlist)
+ * @count: number of elements in scatter-gather list
+ */
 struct zfcp_sg_list {
        struct scatterlist *sg;
        unsigned int count;
@@ -1123,32 +1052,6 @@ extern void _zfcp_hex_dump(char *, int);
                if (ZFCP_LOG_CHECK(level)) { \
                        _zfcp_hex_dump(addr, count); \
                }
-/*
- * Not yet optimal but useful:
- * Waits until the condition is met or the timeout occurs.
- * The condition may be a function call. This allows to
- * execute some additional instructions in addition
- * to a simple condition check.
- * The timeout is modified on exit and holds the remaining time.
- * Thus it is zero if a timeout ocurred, i.e. the condition was 
- * not met in the specified interval.
- */
-#define __ZFCP_WAIT_EVENT_TIMEOUT(timeout, condition) \
-do { \
-       set_current_state(TASK_UNINTERRUPTIBLE); \
-       while (!(condition) && timeout) \
-               timeout = schedule_timeout(timeout); \
-       current->state = TASK_RUNNING; \
-} while (0);
-
-#define ZFCP_WAIT_EVENT_TIMEOUT(waitqueue, timeout, condition) \
-do { \
-       wait_queue_t entry; \
-       init_waitqueue_entry(&entry, current); \
-       add_wait_queue(&waitqueue, &entry); \
-       __ZFCP_WAIT_EVENT_TIMEOUT(timeout, condition) \
-       remove_wait_queue(&waitqueue, &entry); \
-} while (0);
 
 #define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id)
 #define zfcp_get_busid_by_port(port) (zfcp_get_busid_by_adapter(port->adapter))