12 files changed, 315 insertions, 63 deletions

diff --git a/include/asm-arm/arch-pxa/pxa27x_keyboard.h b/include/asm-arm/arch-pxa/pxa27x_keyboard.h
deleted file mode 100644
index 3aaff923b2ca..000000000000
--- a/include/asm-arm/arch-pxa/pxa27x_keyboard.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define PXAKBD_MAXROW           8
-#define PXAKBD_MAXCOL           8
-
-struct pxa27x_keyboard_platform_data {
-        int nr_rows, nr_cols;
-        int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL];
-        int gpio_modes[PXAKBD_MAXROW + PXAKBD_MAXCOL];
-
-#ifdef CONFIG_PM
-        u32 reg_kpc;
-        u32 reg_kprec;
-#endif
-};
diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/include/asm-arm/arch-pxa/pxa27x_keypad.h
new file mode 100644
index 000000000000..644f7609b523
--- /dev/null
+++ b/include/asm-arm/arch-pxa/pxa27x_keypad.h
@@ -0,0 +1,56 @@
+#ifndef __ASM_ARCH_PXA27x_KEYPAD_H
+#define __ASM_ARCH_PXA27x_KEYPAD_H
+
+#include <linux/input.h>
+
+#define MAX_MATRIX_KEY_ROWS     (8)
+#define MAX_MATRIX_KEY_COLS     (8)
+
+/* pxa3xx keypad platform specific parameters
+ *
+ * NOTE:
+ * 1. direct_key_num indicates the number of keys in the direct keypad
+ *    _plus_ the number of rotary-encoder sensor inputs,  this can be
+ *    left as 0 if only rotary encoders are enabled,  the driver will
+ *    automatically calculate this
+ *
+ * 2. direct_key_map is the key code map for the direct keys, if rotary
+ *    encoder(s) are enabled, direct key 0/1(2/3) will be ignored
+ *
+ * 3. rotary can be either interpreted as a relative input event (e.g.
+ *    REL_WHEEL/REL_HWHEEL) or specific keys (e.g. UP/DOWN/LEFT/RIGHT)
+ *
+ * 4. matrix key and direct key will use the same debounce_interval by
+ *    default, which should be sufficient in most cases
+ */
+struct pxa27x_keypad_platform_data {
+
+        /* code map for the matrix keys */
+        unsigned int    matrix_key_rows;
+        unsigned int    matrix_key_cols;
+        unsigned int    *matrix_key_map;
+        int             matrix_key_map_size;
+
+        /* direct keys */
+        int             direct_key_num;
+        unsigned int    direct_key_map[8];
+
+        /* rotary encoders 0 */
+        int             enable_rotary0;
+        int             rotary0_rel_code;
+        int             rotary0_up_key;
+        int             rotary0_down_key;
+
+        /* rotary encoders 1 */
+        int             enable_rotary1;
+        int             rotary1_rel_code;
+        int             rotary1_up_key;
+        int             rotary1_down_key;
+
+        /* key debounce interval */
+        unsigned int    debounce_interval;
+};
+
+#define KEY(row, col, val)      (((row) << 28) | ((col) << 24) | (val))
+
+#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */
diff --git a/include/asm-arm/arch-pxa/tosa.h b/include/asm-arm/arch-pxa/tosa.h
index c3364a2c4758..c05e4faf85a6 100644
--- a/include/asm-arm/arch-pxa/tosa.h
+++ b/include/asm-arm/arch-pxa/tosa.h
@@ -163,4 +163,34 @@
 
 extern struct platform_device tosascoop_jc_device;
 extern struct platform_device tosascoop_device;
+
+#define TOSA_KEY_SYNC           KEY_102ND /* ??? */
+
+
+#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES
+#define TOSA_KEY_RECORD         KEY_YEN
+#define TOSA_KEY_ADDRESSBOOK    KEY_KATAKANA
+#define TOSA_KEY_CANCEL         KEY_ESC
+#define TOSA_KEY_CENTER         KEY_HIRAGANA
+#define TOSA_KEY_OK             KEY_HENKAN
+#define TOSA_KEY_CALENDAR       KEY_KATAKANAHIRAGANA
+#define TOSA_KEY_HOMEPAGE       KEY_HANGEUL
+#define TOSA_KEY_LIGHT          KEY_MUHENKAN
+#define TOSA_KEY_MENU           KEY_HANJA
+#define TOSA_KEY_FN             KEY_RIGHTALT
+#define TOSA_KEY_MAIL           KEY_ZENKAKUHANKAKU
+#else
+#define TOSA_KEY_RECORD         KEY_RECORD
+#define TOSA_KEY_ADDRESSBOOK    KEY_ADDRESSBOOK
+#define TOSA_KEY_CANCEL         KEY_CANCEL
+#define TOSA_KEY_CENTER         KEY_SELECT /* ??? */
+#define TOSA_KEY_OK             KEY_OK
+#define TOSA_KEY_CALENDAR       KEY_CALENDAR
+#define TOSA_KEY_HOMEPAGE       KEY_HOMEPAGE
+#define TOSA_KEY_LIGHT          KEY_KBDILLUMTOGGLE
+#define TOSA_KEY_MENU           KEY_MENU
+#define TOSA_KEY_FN             KEY_FN
+#define TOSA_KEY_MAIL           KEY_MAIL
+#endif
+
 #endif /* _ASM_ARCH_TOSA_H_ */
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
new file mode 100644
index 000000000000..a5978f18ca40
--- /dev/null
+++ b/include/linux/enclosure.h
@@ -0,0 +1,129 @@
+/*
+ * Enclosure Services
+ *
+ * Copyright (C) 2008 James Bottomley <James.Bottomley@HansenPartnership.com>
+ *
+**-----------------------------------------------------------------------------
+**
+**  This program is free software; you can redistribute it and/or
+**  modify it under the terms of the GNU General Public License
+**  version 2 as published by the Free Software Foundation.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+**
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+**-----------------------------------------------------------------------------
+*/
+#ifndef _LINUX_ENCLOSURE_H_
+#define _LINUX_ENCLOSURE_H_
+
+#include <linux/device.h>
+#include <linux/list.h>
+
+/* A few generic types ... taken from ses-2 */
+enum enclosure_component_type {
+        ENCLOSURE_COMPONENT_DEVICE = 0x01,
+        ENCLOSURE_COMPONENT_ARRAY_DEVICE = 0x17,
+};
+
+/* ses-2 common element status */
+enum enclosure_status {
+        ENCLOSURE_STATUS_UNSUPPORTED = 0,
+        ENCLOSURE_STATUS_OK,
+        ENCLOSURE_STATUS_CRITICAL,
+        ENCLOSURE_STATUS_NON_CRITICAL,
+        ENCLOSURE_STATUS_UNRECOVERABLE,
+        ENCLOSURE_STATUS_NOT_INSTALLED,
+        ENCLOSURE_STATUS_UNKNOWN,
+        ENCLOSURE_STATUS_UNAVAILABLE,
+};
+
+/* SFF-8485 activity light settings */
+enum enclosure_component_setting {
+        ENCLOSURE_SETTING_DISABLED = 0,
+        ENCLOSURE_SETTING_ENABLED = 1,
+        ENCLOSURE_SETTING_BLINK_A_ON_OFF = 2,
+        ENCLOSURE_SETTING_BLINK_A_OFF_ON = 3,
+        ENCLOSURE_SETTING_BLINK_B_ON_OFF = 6,
+        ENCLOSURE_SETTING_BLINK_B_OFF_ON = 7,
+};
+
+struct enclosure_device;
+struct enclosure_component;
+struct enclosure_component_callbacks {
+        void (*get_status)(struct enclosure_device *,
+                             struct enclosure_component *);
+        int (*set_status)(struct enclosure_device *,
+                          struct enclosure_component *,
+                          enum enclosure_status);
+        void (*get_fault)(struct enclosure_device *,
+                          struct enclosure_component *);
+        int (*set_fault)(struct enclosure_device *,
+                         struct enclosure_component *,
+                         enum enclosure_component_setting);
+        void (*get_active)(struct enclosure_device *,
+                           struct enclosure_component *);
+        int (*set_active)(struct enclosure_device *,
+                          struct enclosure_component *,
+                          enum enclosure_component_setting);
+        void (*get_locate)(struct enclosure_device *,
+                           struct enclosure_component *);
+        int (*set_locate)(struct enclosure_device *,
+                          struct enclosure_component *,
+                          enum enclosure_component_setting);
+};
+
+
+struct enclosure_component {
+        void *scratch;
+        struct class_device cdev;
+        enum enclosure_component_type type;
+        int number;
+        int fault;
+        int active;
+        int locate;
+        enum enclosure_status status;
+};
+
+struct enclosure_device {
+        void *scratch;
+        struct list_head node;
+        struct class_device cdev;
+        struct enclosure_component_callbacks *cb;
+        int components;
+        struct enclosure_component component[0];
+};
+
+static inline struct enclosure_device *
+to_enclosure_device(struct class_device *dev)
+{
+        return container_of(dev, struct enclosure_device, cdev);
+}
+
+static inline struct enclosure_component *
+to_enclosure_component(struct class_device *dev)
+{
+        return container_of(dev, struct enclosure_component, cdev);
+}
+
+struct enclosure_device *
+enclosure_register(struct device *, const char *, int,
+                   struct enclosure_component_callbacks *);
+void enclosure_unregister(struct enclosure_device *);
+struct enclosure_component *
+enclosure_component_register(struct enclosure_device *, unsigned int,
+                                 enum enclosure_component_type, const char *);
+int enclosure_add_device(struct enclosure_device *enclosure, int component,
+                         struct device *dev);
+int enclosure_remove_device(struct enclosure_device *enclosure, int component);
+struct enclosure_device *enclosure_find(struct device *dev);
+int enclosure_for_each_device(int (*fn)(struct enclosure_device *, void *),
+                              void *data);
+
+#endif /* _LINUX_ENCLOSURE_H_ */
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 8371b664b41f..203591e23210 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -225,11 +225,14 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
  * idea of the (in)accuracy of timers. Timer values are rounded up to
  * this resolution values.
  */
-# define KTIME_HIGH_RES         (ktime_t) { .tv64 = 1 }
+# define HIGH_RES_NSEC          1
+# define KTIME_HIGH_RES         (ktime_t) { .tv64 = HIGH_RES_NSEC }
+# define MONOTONIC_RES_NSEC     HIGH_RES_NSEC
 # define KTIME_MONOTONIC_RES    KTIME_HIGH_RES
 
 #else
 
+# define MONOTONIC_RES_NSEC     LOW_RES_NSEC
 # define KTIME_MONOTONIC_RES    KTIME_LOW_RES
 
 /*
diff --git a/include/linux/input.h b/include/linux/input.h
index 056a17a4f34f..1bdc39a8c76c 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1020,7 +1020,6 @@ struct ff_effect {
  * @going_away: marks devices that are in a middle of unregistering and
  *      causes input_open_device*() fail with -ENODEV.
  * @dev: driver model's view of this device
- * @cdev: union for struct device pointer
  * @h_list: list of input handles associated with the device. When
  *      accessing the list dev->mutex must be held
  * @node: used to place the device onto input_dev_list
@@ -1085,9 +1084,6 @@ struct input_dev {
         int going_away;
 
         struct device dev;
-        union {                 /* temporarily so while we switching to struct device */
-                struct device *dev;
-        } cdev;
 
         struct list_head        h_list;
         struct list_head        node;
@@ -1311,6 +1307,9 @@ static inline void input_set_abs_params(struct input_dev *dev, int axis, int min
         dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);
 }
 
+int input_get_keycode(struct input_dev *dev, int scancode, int *keycode);
+int input_set_keycode(struct input_dev *dev, int scancode, int keycode);
+
 extern struct class input_class;
 
 /**
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index a6ddec141f96..36c542b70c6d 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -316,7 +316,8 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
  * idea of the (in)accuracy of timers. Timer values are rounded up to
  * this resolution values.
  */
-#define KTIME_LOW_RES           (ktime_t){ .tv64 = TICK_NSEC }
+#define LOW_RES_NSEC            TICK_NSEC
+#define KTIME_LOW_RES           (ktime_t){ .tv64 = LOW_RES_NSEC }
 
 /* Get the monotonic time in timespec format: */
 extern void ktime_get_ts(struct timespec *ts);
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index 318a909e7ae1..5ffec8ad6964 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -45,8 +45,8 @@
 /* initiator tags; opaque for target */
 typedef uint32_t __bitwise__ itt_t;
 /* below makes sense only for initiator that created this tag */
-#define build_itt(itt, id, age) ((__force itt_t)\
-        ((itt) | ((id) << ISCSI_CID_SHIFT) | ((age) << ISCSI_AGE_SHIFT)))
+#define build_itt(itt, age) ((__force itt_t)\
+        ((itt) | ((age) << ISCSI_AGE_SHIFT)))
 #define get_itt(itt) ((__force uint32_t)(itt_t)(itt) & ISCSI_ITT_MASK)
 #define RESERVED_ITT ((__force itt_t)0xffffffff)
 
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 889f51fabab9..7b90b63fb5c7 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -70,8 +70,6 @@ enum {
 #define ISCSI_SUSPEND_BIT               1
 
 #define ISCSI_ITT_MASK                  (0xfff)
-#define ISCSI_CID_SHIFT                 12
-#define ISCSI_CID_MASK                  (0xffff << ISCSI_CID_SHIFT)
 #define ISCSI_AGE_SHIFT                 28
 #define ISCSI_AGE_MASK                  (0xf << ISCSI_AGE_SHIFT)
 
@@ -135,6 +133,14 @@ static inline void* iscsi_next_hdr(struct iscsi_cmd_task *ctask)
         return (void*)ctask->hdr + ctask->hdr_len;
 }
 
+/* Connection's states */
+enum {
+        ISCSI_CONN_INITIAL_STAGE,
+        ISCSI_CONN_STARTED,
+        ISCSI_CONN_STOPPED,
+        ISCSI_CONN_CLEANUP_WAIT,
+};
+
 struct iscsi_conn {
         struct iscsi_cls_conn   *cls_conn;      /* ptr to class connection */
         void                    *dd_data;       /* iscsi_transport data */
@@ -227,6 +233,17 @@ struct iscsi_pool {
         int                     max;            /* Max number of elements */
 };
 
+/* Session's states */
+enum {
+        ISCSI_STATE_FREE = 1,
+        ISCSI_STATE_LOGGED_IN,
+        ISCSI_STATE_FAILED,
+        ISCSI_STATE_TERMINATE,
+        ISCSI_STATE_IN_RECOVERY,
+        ISCSI_STATE_RECOVERY_FAILED,
+        ISCSI_STATE_LOGGING_OUT,
+};
+
 struct iscsi_session {
         /*
          * Syncs up the scsi eh thread with the iscsi eh thread when sending
@@ -325,6 +342,10 @@ extern int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
 #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)
+
 /*
  * connection management
  */
@@ -339,6 +360,9 @@ 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);
 
+#define iscsi_conn_printk(prefix, _c, fmt, a...) \
+        iscsi_cls_conn_printk(prefix, _c->cls_conn, fmt, ##a)
+
 /*
  * pdu and task processing
  */
@@ -349,8 +373,6 @@ 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_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);
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 82251575a9b4..1f74bcd603fe 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -235,6 +235,20 @@ static inline int scsi_status_is_good(int status)
 #define TYPE_RBC            0x0e
 #define TYPE_NO_LUN         0x7f
 
+/* SCSI protocols; these are taken from SPC-3 section 7.5 */
+enum scsi_protocol {
+        SCSI_PROTOCOL_FCP = 0,  /* Fibre Channel */
+        SCSI_PROTOCOL_SPI = 1,  /* parallel SCSI */
+        SCSI_PROTOCOL_SSA = 2,  /* Serial Storage Architecture - Obsolete */
+        SCSI_PROTOCOL_SBP = 3,  /* firewire */
+        SCSI_PROTOCOL_SRP = 4,  /* Infiniband RDMA */
+        SCSI_PROTOCOL_ISCSI = 5,
+        SCSI_PROTOCOL_SAS = 6,
+        SCSI_PROTOCOL_ADT = 7,  /* Media Changers */
+        SCSI_PROTOCOL_ATA = 8,
+        SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
+};
+
 /* Returns a human-readable name for the device */
 extern const char * scsi_device_type(unsigned type);
 
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 5c58d594126a..d1299e999723 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -280,39 +280,45 @@ struct scsi_host_template {
          * If the host wants to be called before the scan starts, but
          * after the midlayer has set up ready for the scan, it can fill
          * in this function.
+         *
+         * Status: OPTIONAL
          */
         void (* scan_start)(struct Scsi_Host *);
 
         /*
-         * fill in this function to allow the queue depth of this host
-         * to be changeable (on a per device basis).  returns either
+         * Fill in this function to allow the queue depth of this host
+         * to be changeable (on a per device basis).  Returns either
          * the current queue depth setting (may be different from what
          * was passed in) or an error.  An error should only be
          * returned if the requested depth is legal but the driver was
          * unable to set it.  If the requested depth is illegal, the
          * driver should set and return the closest legal queue depth.
          *
+         * Status: OPTIONAL
          */
         int (* change_queue_depth)(struct scsi_device *, int);
 
         /*
-         * fill in this function to allow the changing of tag types
+         * Fill in this function to allow the changing of tag types
          * (this also allows the enabling/disabling of tag command
          * queueing).  An error should only be returned if something
          * went wrong in the driver while trying to set the tag type.
          * If the driver doesn't support the requested tag type, then
          * it should set the closest type it does support without
          * returning an error.  Returns the actual tag type set.
+         *
+         * Status: OPTIONAL
          */
         int (* change_queue_type)(struct scsi_device *, int);
 
         /*
-         * This function determines the bios parameters for a given
+         * This function determines the BIOS parameters for a given
          * harddisk.  These tend to be numbers that are made up by
          * the host adapter.  Parameters:
          * size, device, list (heads, sectors, cylinders)
          *
-         * Status: OPTIONAL */
+         * Status: OPTIONAL
+         */
         int (* bios_param)(struct scsi_device *, struct block_device *,
                         sector_t, int []);
 
@@ -351,7 +357,7 @@ struct scsi_host_template {
 
         /*
          * This determines if we will use a non-interrupt driven
-         * or an interrupt driven scheme,  It is set to the maximum number
+         * or an interrupt driven scheme.  It is set to the maximum number
          * of simultaneous commands a given host adapter will accept.
          */
         int can_queue;
@@ -372,12 +378,12 @@ struct scsi_host_template {
         unsigned short sg_tablesize;
 
         /*
-         * If the host adapter has limitations beside segment count
+         * Set this if the host adapter has limitations beside segment count.
          */
         unsigned short max_sectors;
 
         /*
-         * dma scatter gather segment boundary limit. a segment crossing this
+         * DMA scatter gather segment boundary limit. A segment crossing this
          * boundary will be split in two.
          */
         unsigned long dma_boundary;
@@ -386,7 +392,7 @@ struct scsi_host_template {
          * This specifies "machine infinity" for host templates which don't
          * limit the transfer size.  Note this limit represents an absolute
          * maximum, and may be over the transfer limits allowed for
-         * individual devices (e.g. 256 for SCSI-1)
+         * individual devices (e.g. 256 for SCSI-1).
          */
 #define SCSI_DEFAULT_MAX_SECTORS        1024
 
@@ -413,12 +419,12 @@ struct scsi_host_template {
         unsigned supported_mode:2;
 
         /*
-         * true if this host adapter uses unchecked DMA onto an ISA bus.
+         * True if this host adapter uses unchecked DMA onto an ISA bus.
          */
         unsigned unchecked_isa_dma:1;
 
         /*
-         * true if this host adapter can make good use of clustering.
+         * True if this host adapter can make good use of clustering.
          * I originally thought that if the tablesize was large that it
          * was a waste of CPU cycles to prepare a cluster list, but
          * it works out that the Buslogic is faster if you use a smaller
@@ -428,7 +434,7 @@ struct scsi_host_template {
         unsigned use_clustering:1;
 
         /*
-         * True for emulated SCSI host adapters (e.g. ATAPI)
+         * True for emulated SCSI host adapters (e.g. ATAPI).
          */
         unsigned emulated:1;
 
@@ -438,12 +444,12 @@ struct scsi_host_template {
         unsigned skip_settle_delay:1;
 
         /*
-         * ordered write support
+         * True if we are using ordered write support.
          */
         unsigned ordered_tag:1;
 
         /*
-         * Countdown for host blocking with no commands outstanding
+         * Countdown for host blocking with no commands outstanding.
          */
         unsigned int max_host_blocked;
 
@@ -522,8 +528,8 @@ struct Scsi_Host {
         struct scsi_transport_template *transportt;
 
         /*
-         * area to keep a shared tag map (if needed, will be
-         * NULL if not)
+         * Area to keep a shared tag map (if needed, will be
+         * NULL if not).
          */
         struct blk_queue_tag    *bqt;
 
@@ -596,16 +602,16 @@ struct Scsi_Host {
         /*
          * Host uses correct SCSI ordering not PC ordering. The bit is
          * set for the minority of drivers whose authors actually read
-         * the spec ;)
+         * the spec ;).
          */
         unsigned reverse_ordering:1;
 
         /*
-         * ordered write support
+         * Ordered write support
          */
         unsigned ordered_tag:1;
 
-        /* task mgmt function in progress */
+        /* Task mgmt function in progress */
         unsigned tmf_in_progress:1;
 
         /* Asynchronous scan in progress */
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 404f11d331d6..dbc96ef4cc72 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -149,13 +149,6 @@ extern void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error);
 extern int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
                           char *data, uint32_t data_size);
 
-
-/* Connection's states */
-#define ISCSI_CONN_INITIAL_STAGE        0
-#define ISCSI_CONN_STARTED              1
-#define ISCSI_CONN_STOPPED              2
-#define ISCSI_CONN_CLEANUP_WAIT         3
-
 struct iscsi_cls_conn {
         struct list_head conn_list;     /* item in connlist */
         void *dd_data;                  /* LLD private data */
@@ -169,27 +162,31 @@ struct iscsi_cls_conn {
 #define iscsi_dev_to_conn(_dev) \
         container_of(_dev, struct iscsi_cls_conn, dev)
 
-/* Session's states */
-#define ISCSI_STATE_FREE                1
-#define ISCSI_STATE_LOGGED_IN           2
-#define ISCSI_STATE_FAILED              3
-#define ISCSI_STATE_TERMINATE           4
-#define ISCSI_STATE_IN_RECOVERY         5
-#define ISCSI_STATE_RECOVERY_FAILED     6
-#define ISCSI_STATE_LOGGING_OUT         7
+#define iscsi_conn_to_session(_conn) \
+        iscsi_dev_to_session(_conn->dev.parent)
+
+/* iscsi class session state */
+enum {
+        ISCSI_SESSION_LOGGED_IN,
+        ISCSI_SESSION_FAILED,
+        ISCSI_SESSION_FREE,
+};
 
 struct iscsi_cls_session {
         struct list_head sess_list;             /* item in session_list */
         struct list_head host_list;
         struct iscsi_transport *transport;
+        spinlock_t lock;
+        struct work_struct scan_work;
+        struct work_struct unbind_work;
 
         /* recovery fields */
         int recovery_tmo;
         struct delayed_work recovery_work;
-        struct work_struct unbind_work;
 
         int target_id;
 
+        int state;
         int sid;                                /* session id */
         void *dd_data;                          /* LLD private data */
         struct device dev;      /* sysfs transport/container device */
@@ -206,14 +203,22 @@ struct iscsi_cls_session {
 
 struct iscsi_host {
         struct list_head sessions;
+        atomic_t nr_scans;
         struct mutex mutex;
-        struct workqueue_struct *unbind_workq;
-        char unbind_workq_name[KOBJ_NAME_LEN];
+        struct workqueue_struct *scan_workq;
+        char scan_workq_name[KOBJ_NAME_LEN];
 };
 
 /*
  * session and connection functions that can be used by HW iSCSI LLDs
  */
+#define iscsi_cls_session_printk(prefix, _cls_session, fmt, a...) \
+        dev_printk(prefix, &(_cls_session)->dev, fmt, ##a)
+
+#define iscsi_cls_conn_printk(prefix, _cls_conn, fmt, a...) \
+        dev_printk(prefix, &(_cls_conn)->dev, fmt, ##a)
+
+extern int iscsi_session_chkready(struct iscsi_cls_session *session);
 extern struct iscsi_cls_session *iscsi_alloc_session(struct Scsi_Host *shost,
                                         struct iscsi_transport *transport);
 extern int iscsi_add_session(struct iscsi_cls_session *session,
@@ -231,6 +236,6 @@ extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
 extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
 extern void iscsi_unblock_session(struct iscsi_cls_session *session);
 extern void iscsi_block_session(struct iscsi_cls_session *session);
-
+extern int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time);
 
 #endif