Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

author: David S. Miller <davem@davemloft.net> 2009-12-11 04:26:12 -0500
committer: David S. Miller <davem@davemloft.net> 2009-12-11 04:26:12 -0500
commit: e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch)
tree: 8b23624cc792f60d0bf86d787c3514cf0fb04418 /include
parent: adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff)
parent: d71cb81af3817193bc605de061da0499934263a6 (diff)
90 files changed, 1537 insertions, 832 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index e723b0fd8e41..5e1ad3cd1bbd 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20090903
+#define ACPI_CA_VERSION                 0x20091112
 #include "actypes.h"
 #include "actbl.h"
@@ -154,7 +154,8 @@ acpi_status
 acpi_walk_namespace(acpi_object_type type,
                    acpi_handle start_object,
                    u32 max_depth,
-                    acpi_walk_callback user_function,
+                    acpi_walk_callback pre_order_visit,
+                    acpi_walk_callback post_order_visit,
                    void *context, void **return_value);
 acpi_status
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index 4c8d0afae711..fb2d63f13f4c 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -47,7 +47,7 @@
 #elif defined(CONFIG_SPARSEMEM_VMEMMAP)
-/* memmap is virtually contigious.  */
+/* memmap is virtually contiguous.  */
 #define __pfn_to_page(pfn)      (vmemmap + (pfn))
 #define __page_to_pfn(page)     (unsigned long)((page) - vmemmap)
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index d76b66acea95..7c38c147e5e6 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -631,7 +631,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 * these are provided for both review and as a porting
 * help for the C library version.
 *
- * Last chance: are any of these important enought to
+ * Last chance: are any of these important enough to
 * enable by default?
 */
 #ifdef __ARCH_WANT_SYSCALL_NO_AT
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 1ffb53f74d37..fc0d575c71e0 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -106,7 +106,6 @@ struct blkcipher_walk {
 extern const struct crypto_type crypto_ablkcipher_type;
 extern const struct crypto_type crypto_aead_type;
 extern const struct crypto_type crypto_blkcipher_type;
-extern const struct crypto_type crypto_hash_type;
 void crypto_mod_put(struct crypto_alg *alg);
diff --git a/include/crypto/cryptd.h b/include/crypto/cryptd.h
index 2f65a6e8ea4d..1c96b255017c 100644
--- a/include/crypto/cryptd.h
+++ b/include/crypto/cryptd.h
@@ -39,6 +39,7 @@ static inline struct cryptd_ahash *__cryptd_ahash_cast(
 struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,
                                        u32 type, u32 mask);
 struct crypto_shash *cryptd_ahash_child(struct cryptd_ahash *tfm);
+struct shash_desc *cryptd_shash_desc(struct ahash_request *req);
 void cryptd_free_ahash(struct cryptd_ahash *tfm);
 #endif
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index cb57c30081a8..eb130b4d8e72 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -39,7 +39,7 @@ typedef __u32 DriverVer_type;
 #ifndef CCISS_CMD_H
 // This defines are duplicated in cciss_cmd.h in the driver directory 
-//general boundary defintions
+//general boundary definitions
 #define SENSEINFOBYTES          32//note that this value may vary between host implementations
 //Command Status value
diff --git a/include/linux/chio.h b/include/linux/chio.h
index 519248d8b2b6..d9bac7f97282 100644
--- a/include/linux/chio.h
+++ b/include/linux/chio.h
@@ -21,7 +21,7 @@
 *    query vendor-specific element types
 *
 *    accessing elements works by specifing type and unit of the element.
- *    for eample, storage elements are addressed with type = CHET_ST and
+ *    for example, storage elements are addressed with type = CHET_ST and
 *    unit = 0 .. cp_nslots-1
 *
 */
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 3a1dbba4d3ae..0cf725bdd2a1 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -77,10 +77,10 @@ enum clock_event_nofitiers {
 struct clock_event_device {
        const char              *name;
        unsigned int            features;
-        unsigned long           max_delta_ns;
+        u64                     max_delta_ns;
-        unsigned long           min_delta_ns;
+        u64                     min_delta_ns;
-        unsigned long           mult;
+        u32                     mult;
-        int                     shift;
+        u32                     shift;
        int                     rating;
        int                     irq;
        const struct cpumask    *cpumask;
@@ -116,8 +116,8 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,
 }
 /* Clock event layer functions */
-extern unsigned long clockevent_delta2ns(unsigned long latch,
+extern u64 clockevent_delta2ns(unsigned long latch,
-                                         struct clock_event_device *evt);
+                               struct clock_event_device *evt);
 extern void clockevents_register_device(struct clock_event_device *dev);
 extern void clockevents_exchange_device(struct clock_event_device *old,
@@ -130,6 +130,13 @@ extern int clockevents_program_event(struct clock_event_device *dev,
 extern void clockevents_handle_noop(struct clock_event_device *dev);
+static inline void
+clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
+{
+        return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC,
+                                      freq, minsec);
+}
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
 #else
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 83d2fbd81b93..8a4a130cc196 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -151,6 +151,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,
 *                      subtraction of non 64 bit counters
 * @mult:               cycle to nanosecond multiplier
 * @shift:              cycle to nanosecond divisor (power of two)
+ * @max_idle_ns:        max idle time permitted by the clocksource (nsecs)
 * @flags:              flags describing special properties
 * @vread:              vsyscall based read
 * @resume:             resume function for the clocksource, if necessary
@@ -168,6 +169,7 @@ struct clocksource {
        cycle_t mask;
        u32 mult;
        u32 shift;
+        u64 max_idle_ns;
        unsigned long flags;
        cycle_t (*vread)(void);
        void (*resume)(void);
@@ -279,11 +281,23 @@ extern void clocksource_resume(void);
 extern struct clocksource * __init __weak clocksource_default_clock(void);
 extern void clocksource_mark_unstable(struct clocksource *cs);
+extern void
+clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);
+static inline void
+clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec)
+{
+        return clocks_calc_mult_shift(&cs->mult, &cs->shift, freq,
+                                      NSEC_PER_SEC, minsec);
+}
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
-extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
+extern void
+update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult);
 extern void update_vsyscall_tz(void);
 #else
-static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
+static inline void
+update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult)
 {
 }
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index fd929889e8dc..24d2e30f1b46 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -250,29 +250,6 @@ struct cipher_alg {
        void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
 };
-struct digest_alg {
-        unsigned int dia_digestsize;
-        void (*dia_init)(struct crypto_tfm *tfm);
-        void (*dia_update)(struct crypto_tfm *tfm, const u8 *data,
-                           unsigned int len);
-        void (*dia_final)(struct crypto_tfm *tfm, u8 *out);
-        int (*dia_setkey)(struct crypto_tfm *tfm, const u8 *key,
-                          unsigned int keylen);
-};
-struct hash_alg {
-        int (*init)(struct hash_desc *desc);
-        int (*update)(struct hash_desc *desc, struct scatterlist *sg,
-                      unsigned int nbytes);
-        int (*final)(struct hash_desc *desc, u8 *out);
-        int (*digest)(struct hash_desc *desc, struct scatterlist *sg,
-                      unsigned int nbytes, u8 *out);
-        int (*setkey)(struct crypto_hash *tfm, const u8 *key,
-                      unsigned int keylen);
-        unsigned int digestsize;
-};
 struct compress_alg {
        int (*coa_compress)(struct crypto_tfm *tfm, const u8 *src,
                            unsigned int slen, u8 *dst, unsigned int *dlen);
@@ -293,8 +270,6 @@ struct rng_alg {
 #define cra_aead        cra_u.aead
 #define cra_blkcipher   cra_u.blkcipher
 #define cra_cipher      cra_u.cipher
-#define cra_digest      cra_u.digest
-#define cra_hash        cra_u.hash
 #define cra_compress    cra_u.compress
 #define cra_rng         cra_u.rng
@@ -320,8 +295,6 @@ struct crypto_alg {
                struct aead_alg aead;
                struct blkcipher_alg blkcipher;
                struct cipher_alg cipher;
-                struct digest_alg digest;
-                struct hash_alg hash;
                struct compress_alg compress;
                struct rng_alg rng;
        } cra_u;
diff --git a/include/linux/dm-log-userspace.h b/include/linux/dm-log-userspace.h
index 8a1f972c0fe9..0c3c3a2110c4 100644
--- a/include/linux/dm-log-userspace.h
+++ b/include/linux/dm-log-userspace.h
@@ -363,7 +363,7 @@
 * various request types above.  The remaining 24-bits are currently
 * set to zero and are reserved for future use and compatibility concerns.
 *
- * User-space should always use DM_ULOG_REQUEST_TYPE to aquire the
+ * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the
 * request type from the 'request_type' field to maintain forward compatibility.
 */
 #define DM_ULOG_REQUEST_MASK 0xFF
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 5de4c9e5856d..d7cecc90ed34 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -126,7 +126,9 @@ extern int free_irte(int irq);
 extern int irq_remapped(int irq);
 extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev);
 extern struct intel_iommu *map_ioapic_to_ir(int apic);
+extern struct intel_iommu *map_hpet_to_ir(u8 id);
 extern int set_ioapic_sid(struct irte *irte, int apic);
+extern int set_hpet_sid(struct irte *irte, u8 id);
 extern int set_msi_sid(struct irte *irte, struct pci_dev *dev);
 #else
 static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
@@ -158,10 +160,18 @@ static inline struct intel_iommu *map_ioapic_to_ir(int apic)
 {
        return NULL;
 }
+static inline struct intel_iommu *map_hpet_to_ir(unsigned int hpet_id)
+{
+        return NULL;
+}
 static inline int set_ioapic_sid(struct irte *irte, int apic)
 {
        return 0;
 }
+static inline int set_hpet_sid(struct irte *irte, u8 id)
+{
+        return -1;
+}
 static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev)
 {
        return 0;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index de9c722e7b90..369767bd873e 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -763,6 +763,7 @@ struct fb_tile_ops {
         *  takes over; acceleration engine should be in a quiescent state */
 /* hints */
+#define FBINFO_VIRTFB           0x0004 /* FB is System RAM, not device. */
 #define FBINFO_PARTIAL_PAN_OK   0x0040 /* otw use pan only for double-buffering */
 #define FBINFO_READS_FAST       0x0080 /* soft-copy faster than rendering */
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 10f628416740..87093652dda8 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -312,6 +312,7 @@ struct hid_item {
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
+#define HID_QUIRK_NO_INIT_REPORTS               0x20000000
 /*
 * This is the global environment of the parser. This information is
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 79f63a27bcef..219ca4f6bea6 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -126,4 +126,6 @@ struct hpet_info {
 #define HPET_DPI        _IO('h', 0x05)  /* disable periodic */
 #define HPET_IRQFREQ    _IOW('h', 0x6, unsigned long)   /* IRQFREQ usec */
+#define MAX_HPET_TBS    8               /* maximum hpet timer blocks */
 #endif                          /* !__HPET__ */
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index ff037f0b1b4e..9bace4b9f4fe 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -446,7 +446,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
 static inline void timer_stats_account_hrtimer(struct hrtimer *timer)
 {
-        if (likely(!timer->start_site))
+        if (likely(!timer_stats_active))
                return;
        timer_stats_update_stats(timer, timer->start_pid, timer->start_site,
                                 timer->function, timer->start_comm, 0);
@@ -457,8 +457,6 @@ extern void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer,
 static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer)
 {
-        if (likely(!timer_stats_active))
-                return;
        __timer_stats_hrtimer_set_start_info(timer, __builtin_return_address(0));
 }
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index 7244456e7e65..9bede7633f74 100644
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -22,10 +22,12 @@
 * @cleanup:            Cleanup callback (can be NULL).
 * @data_present:       Callback to determine if data is available
 *                      on the RNG. If NULL, it is assumed that
- *                      there is always data available.
+ *                      there is always data available.  *OBSOLETE*
 * @data_read:          Read data from the RNG device.
 *                      Returns the number of lower random bytes in "data".
- *                      Must not be NULL.
+ *                      Must not be NULL.    *OSOLETE*
+ * @read:               New API. drivers can fill up to max bytes of data
+ *                      into the buffer. The buffer is aligned for any type.
 * @priv:               Private data, for use by the RNG driver.
 */
 struct hwrng {
@@ -34,6 +36,7 @@ struct hwrng {
        void (*cleanup)(struct hwrng *rng);
        int (*data_present)(struct hwrng *rng, int wait);
        int (*data_read)(struct hwrng *rng, u32 *data);
+        int (*read)(struct hwrng *rng, void *data, size_t max, bool wait);
        unsigned long priv;
        /* internal. */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e4135d6e0556..0ec612959042 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -125,8 +125,8 @@ struct ide_io_ports {
 * Timeouts for various operations:
 */
 enum {
-        /* spec allows up to 20ms */
+        /* spec allows up to 20ms, but CF cards and SSD drives need more */
-        WAIT_DRQ        = HZ / 10,      /* 100ms */
+        WAIT_DRQ        = 1 * HZ,       /* 1s */
        /* some laptops are very slow */
        WAIT_READY      = 5 * HZ,       /* 5s */
        /* should be less than 3ms (?), if all ATAPI CD is closed at boot */
diff --git a/include/linux/in6.h b/include/linux/in6.h
index dfa29168e6ab..bd55c6e46b2e 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -110,7 +110,7 @@ struct in6_flowlabel_req {
 #define IPV6_FLOWINFO_FLOWLABEL         0x000fffff
 #define IPV6_FLOWINFO_PRIORITY          0x0ff00000
-/* These defintions are obsolete */
+/* These definitions are obsolete */
 #define IPV6_PRIORITY_UNCHARACTERIZED   0x0000
 #define IPV6_PRIORITY_FILLER            0x0100
 #define IPV6_PRIORITY_UNATTENDED        0x0200
diff --git a/include/linux/input-polldev.h b/include/linux/input-polldev.h
index 597a0077b3c5..5e3dddf8f562 100644
--- a/include/linux/input-polldev.h
+++ b/include/linux/input-polldev.h
@@ -14,12 +14,19 @@
 /**
 * struct input_polled_dev - simple polled input device
- * @private: private driver data
+ * @private: private driver data.
- * @flush: driver-supplied method that flushes device's state upon
+ * @open: driver-supplied method that prepares device for polling
- *      opening (optional)
+ *      (enabled the device and maybe flushes device state).
+ * @close: driver-supplied method that is called when device is no
+ *      longer being polled. Used to put device into low power mode.
 * @poll: driver-supplied method that polls the device and posts
 *      input events (mandatory).
- * @poll_interval: specifies how often the poll() method shoudl be called.
+ * @poll_interval: specifies how often the poll() method should be called.
+ *      Defaults to 500 msec unless overriden when registering the device.
+ * @poll_interval_max: specifies upper bound for the poll interval.
+ *      Defaults to the initial value of @poll_interval.
+ * @poll_interval_min: specifies lower bound for the poll interval.
+ *      Defaults to 0.
 * @input: input device structire associated with the polled device.
 *      Must be properly initialized by the driver (id, name, phys, bits).
 *
@@ -30,11 +37,16 @@
 struct input_polled_dev {
        void *private;
-        void (*flush)(struct input_polled_dev *dev);
+        void (*open)(struct input_polled_dev *dev);
+        void (*close)(struct input_polled_dev *dev);
        void (*poll)(struct input_polled_dev *dev);
        unsigned int poll_interval; /* msec */
+        unsigned int poll_interval_max; /* msec */
+        unsigned int poll_interval_min; /* msec */
        struct input_dev *input;
+/* private: */
        struct delayed_work work;
 };
diff --git a/include/linux/input.h b/include/linux/input.h
index 84b501ab0d8f..7be8a6537b57 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -895,7 +895,7 @@ struct ff_periodic_effect {
        struct ff_envelope envelope;
        __u32 custom_len;
-        __s16 *custom_data;
+        __s16 __user *custom_data;
 };
 /**
@@ -1021,9 +1021,12 @@ struct ff_effect {
 * @keycodesize: size of elements in keycode table
 * @keycode: map of scancodes to keycodes for this device
 * @setkeycode: optional method to alter current keymap, used to implement
- *      sparse keymaps. If not supplied default mechanism will be used
+ *      sparse keymaps. If not supplied default mechanism will be used.
+ *      The method is being called while holding event_lock and thus must
+ *      not sleep
 * @getkeycode: optional method to retrieve current keymap. If not supplied
- *      default mechanism will be used
+ *      default mechanism will be used. The method is being called while
+ *      holding event_lock and thus must not sleep
 * @ff: force feedback structure associated with the device if device
 *      supports force feedback effects
 * @repeat_key: stores key code of the last key pressed; used to implement
@@ -1040,6 +1043,7 @@ struct ff_effect {
 * @absmin: minimum values for events coming from absolute axes
 * @absfuzz: describes noisiness for axes
 * @absflat: size of the center flat position (used by joydev)
+ * @absres: resolution used for events coming form absolute axes
 * @open: this method is called when the very first user calls
 *      input_open_device(). The driver must prepare the device
 *      to start generating events (start polling thread,
@@ -1294,6 +1298,9 @@ void input_unregister_device(struct input_dev *);
 int __must_check input_register_handler(struct input_handler *);
 void input_unregister_handler(struct input_handler *);
+int input_handler_for_each_handle(struct input_handler *, void *data,
+                                  int (*fn)(struct input_handle *, void *));
 int input_register_handle(struct input_handle *);
 void input_unregister_handle(struct input_handle *);
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index b3cd42d50e16..3bd018baae20 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -41,6 +41,9 @@ struct matrix_keymap_data {
 * @col_scan_delay_us: delay, measured in microseconds, that is
 *      needed before we can keypad after activating column gpio
 * @debounce_ms: debounce interval in milliseconds
+ * @active_low: gpio polarity
+ * @wakeup: controls whether the device should be set up as wakeup
+ *      source
 *
 * This structure represents platform-specific data that use used by
 * matrix_keypad driver to perform proper initialization.
diff --git a/include/linux/input/sh_keysc.h b/include/linux/input/sh_keysc.h
new file mode 100644
index 000000000000..c211b5cf08e6
--- /dev/null
+++ b/include/linux/input/sh_keysc.h
@@ -0,0 +1,14 @@
+#ifndef __SH_KEYSC_H__
+#define __SH_KEYSC_H__
+#define SH_KEYSC_MAXKEYS 30
+struct sh_keysc_info {
+        enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode;
+        int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
+        int delay;
+        int kycr2_delay;
+        int keycodes[SH_KEYSC_MAXKEYS];
+};
+#endif /* __SH_KEYSC_H__ */
diff --git a/include/linux/input/sparse-keymap.h b/include/linux/input/sparse-keymap.h
new file mode 100644
index 000000000000..52db62064c6e
--- /dev/null
+++ b/include/linux/input/sparse-keymap.h
@@ -0,0 +1,62 @@
+#ifndef _SPARSE_KEYMAP_H
+#define _SPARSE_KEYMAP_H
+/*
+ * Copyright (c) 2009 Dmitry Torokhov
+ *
+ * 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.
+ */
+#define KE_END          0       /* Indicates end of keymap */
+#define KE_KEY          1       /* Ordinary key/button */
+#define KE_SW           2       /* Switch (predetermined value) */
+#define KE_VSW          3       /* Switch (value supplied at runtime) */
+#define KE_IGNORE       4       /* Known entry that should be ignored */
+#define KE_LAST         KE_IGNORE
+/**
+ * struct key_entry - keymap entry for use in sparse keymap
+ * @type: Type of the key entry (KE_KEY, KE_SW, KE_VSW, KE_END);
+ *      drivers are allowed to extend the list with their own
+ *      private definitions.
+ * @code: Device-specific data identifying the button/switch
+ * @keycode: KEY_* code assigned to a key/button
+ * @sw.code: SW_* code assigned to a switch
+ * @sw.value: Value that should be sent in an input even when KE_SW
+ *      switch is toggled. KE_VSW switches ignore this field and
+ *      expect driver to supply value for the event.
+ *
+ * This structure defines an entry in a sparse keymap used by some
+ * input devices for which traditional table-based approach is not
+ * suitable.
+ */
+struct key_entry {
+        int type;               /* See KE_* above */
+        u32 code;
+        union {
+                u16 keycode;            /* For KE_KEY */
+                struct {                /* For KE_SW, KE_VSW */
+                        u8 code;
+                        u8 value;       /* For KE_SW, ignored by KE_VSW */
+                } sw;
+        };
+};
+struct key_entry *sparse_keymap_entry_from_scancode(struct input_dev *dev,
+                                                    unsigned int code);
+struct key_entry *sparse_keymap_entry_from_keycode(struct input_dev *dev,
+                                                   unsigned int code);
+int sparse_keymap_setup(struct input_dev *dev,
+                        const struct key_entry *keymap,
+                        int (*setup)(struct input_dev *, struct key_entry *));
+void sparse_keymap_free(struct input_dev *dev);
+void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *ke,
+                                unsigned int value, bool autorelease);
+bool sparse_keymap_report_event(struct input_dev *dev, unsigned int code,
+                                unsigned int value, bool autorelease);
+#endif /* _SPARSE_KEYMAP_H */
diff --git a/include/linux/irq.h b/include/linux/irq.h
index ae9653dbcd78..a287cfc0b1a6 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -282,7 +282,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
 /*
 * Built-in IRQ handlers for various IRQ types,
- * callable via desc->chip->handle_irq()
+ * callable via desc->handle_irq()
 */
 extern void handle_level_irq(unsigned int irq, struct irq_desc *desc);
 extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index a5b3dc71e819..6a9c4ddd3d95 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1024,7 +1024,7 @@ extern int ata_std_bios_param(struct scsi_device *sdev,
 extern int ata_scsi_slave_config(struct scsi_device *sdev);
 extern void ata_scsi_slave_destroy(struct scsi_device *sdev);
 extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
-                                       int queue_depth);
+                                       int queue_depth, int reason);
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
 extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
index e5124ceea769..3402042ddc31 100644
--- a/include/linux/mfd/ezx-pcap.h
+++ b/include/linux/mfd/ezx-pcap.h
@@ -45,7 +45,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32);
 #define PCAP_CLEAR_INTERRUPT_REGISTER   0x01ffffff
 #define PCAP_MASK_ALL_INTERRUPT         0x01ffffff
-/* registers acessible by both pcap ports */
+/* registers accessible by both pcap ports */
 #define PCAP_REG_ISR            0x0     /* Interrupt Status */
 #define PCAP_REG_MSR            0x1     /* Interrupt Mask */
 #define PCAP_REG_PSTAT          0x2     /* Processor Status */
@@ -67,7 +67,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32);
 #define PCAP_REG_VENDOR_TEST1   0x1e
 #define PCAP_REG_VENDOR_TEST2   0x1f
-/* registers acessible by pcap port 1 only (a1200, e2 & e6) */
+/* registers accessible by pcap port 1 only (a1200, e2 & e6) */
 #define PCAP_REG_INT_SEL        0x3     /* Interrupt Select */
 #define PCAP_REG_SWCTRL         0x4     /* Switching Regulator Control */
 #define PCAP_REG_VREG1          0x5     /* Regulator Bank 1 Control */
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
new file mode 100644
index 000000000000..3bcd7163485c
--- /dev/null
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -0,0 +1,8 @@
+#ifndef __SH_MOBILE_SDHI_H__
+#define __SH_MOBILE_SDHI_H__
+struct sh_mobile_sdhi_info {
+        void (*set_pwr)(struct platform_device *pdev, int state);
+};
+#endif /* __SH_MOBILE_SDHI_H__ */
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index 6913b71d9ab2..b31bd9e9bca3 100644
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -174,6 +174,8 @@ void ubi_get_volume_info(struct ubi_volume_desc *desc,
 struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode);
 struct ubi_volume_desc *ubi_open_volume_nm(int ubi_num, const char *name,
                                           int mode);
+struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode);
 int ubi_register_volume_notifier(struct notifier_block *nb,
                                 int ignore_existing);
 int ubi_unregister_volume_notifier(struct notifier_block *nb);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cabf074b4324..eae1f864c934 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1587,6 +1587,8 @@
 #define PCI_VENDOR_ID_COMPEX            0x11f6
 #define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112
+#define PCI_VENDOR_ID_PMC_Sierra        0x11f8
 #define PCI_VENDOR_ID_RP                0x11fe
 #define PCI_DEVICE_ID_RP32INTF          0x0001
 #define PCI_DEVICE_ID_RP8INTF           0x0002
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index d745f5b6c7b0..76e5053e1fac 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -30,7 +30,7 @@
 /*
 * use drive write caching -- we need deferred error handling to be
- * able to sucessfully recover with this option (drive will return good
+ * able to successfully recover with this option (drive will return good
 * status as soon as the cdb is validated).
 */
 #if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index dd31e7bae35c..a05b4a20768d 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -52,11 +52,63 @@
 #define REISERFS_IOC32_GETVERSION       FS_IOC32_GETVERSION
 #define REISERFS_IOC32_SETVERSION       FS_IOC32_SETVERSION
-/* Locking primitives */
+/*
-/* Right now we are still falling back to (un)lock_kernel, but eventually that
+ * Locking primitives. The write lock is a per superblock
-   would evolve into real per-fs locks */
+ * special mutex that has properties close to the Big Kernel Lock
-#define reiserfs_write_lock( sb ) lock_kernel()
+ * which was used in the previous locking scheme.
-#define reiserfs_write_unlock( sb ) unlock_kernel()
+ */
+void reiserfs_write_lock(struct super_block *s);
+void reiserfs_write_unlock(struct super_block *s);
+int reiserfs_write_lock_once(struct super_block *s);
+void reiserfs_write_unlock_once(struct super_block *s, int lock_depth);
+/*
+ * Several mutexes depend on the write lock.
+ * However sometimes we want to relax the write lock while we hold
+ * these mutexes, according to the release/reacquire on schedule()
+ * properties of the Bkl that were used.
+ * Reiserfs performances and locking were based on this scheme.
+ * Now that the write lock is a mutex and not the bkl anymore, doing so
+ * may result in a deadlock:
+ *
+ * A acquire write_lock
+ * A acquire j_commit_mutex
+ * A release write_lock and wait for something
+ * B acquire write_lock
+ * B can't acquire j_commit_mutex and sleep
+ * A can't acquire write lock anymore
+ * deadlock
+ *
+ * What we do here is avoiding such deadlock by playing the same game
+ * than the Bkl: if we can't acquire a mutex that depends on the write lock,
+ * we release the write lock, wait a bit and then retry.
+ *
+ * The mutexes concerned by this hack are:
+ * - The commit mutex of a journal list
+ * - The flush mutex
+ * - The journal lock
+ * - The inode mutex
+ */
+static inline void reiserfs_mutex_lock_safe(struct mutex *m,
+                               struct super_block *s)
+{
+        reiserfs_write_unlock(s);
+        mutex_lock(m);
+        reiserfs_write_lock(s);
+}
+/*
+ * When we schedule, we usually want to also release the write lock,
+ * according to the previous bkl based locking scheme of reiserfs.
+ */
+static inline void reiserfs_cond_resched(struct super_block *s)
+{
+        if (need_resched()) {
+                reiserfs_write_unlock(s);
+                schedule();
+                reiserfs_write_lock(s);
+        }
+}
 struct fid;
@@ -1329,7 +1381,11 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
 #define get_generation(s) atomic_read (&fs_generation(s))
 #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
 #define __fs_changed(gen,s) (gen != get_generation (s))
-#define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
+#define fs_changed(gen,s)               \
+({                                      \
+        reiserfs_cond_resched(s);       \
+        __fs_changed(gen, s);           \
+})
 /***************************************************************************/
 /*                  FIXATE NODES                                           */
@@ -2258,8 +2314,7 @@ __u32 r5_hash(const signed char *msg, int len);
 #define SPARE_SPACE 500
 /* prototypes from ioctl.c */
-int reiserfs_ioctl(struct inode *inode, struct file *filp,
+long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
-                   unsigned int cmd, unsigned long arg);
 long reiserfs_compat_ioctl(struct file *filp,
                   unsigned int cmd, unsigned long arg);
 int reiserfs_unpack(struct inode *inode, struct file *filp);
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index dab68bbed675..52c83b6a758a 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -7,6 +7,8 @@
 #ifdef __KERNEL__
 #include <linux/workqueue.h>
 #include <linux/rwsem.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
 #endif
 typedef enum {
@@ -355,6 +357,13 @@ struct reiserfs_sb_info {
        struct reiserfs_journal *s_journal;     /* pointer to journal information */
        unsigned short s_mount_state;   /* reiserfs state (valid, invalid) */
+        /* Serialize writers access, replace the old bkl */
+        struct mutex lock;
+        /* Owner of the lock (can be recursive) */
+        struct task_struct *lock_owner;
+        /* Depth of the lock, start from -1 like the bkl */
+        int lock_depth;
        /* Comment? -Hans */
        void (*end_io_handler) (struct buffer_head *, int);
        hashf_t s_hash_function;        /* pointer to function which is used
@@ -408,6 +417,17 @@ struct reiserfs_sb_info {
        char *s_qf_names[MAXQUOTAS];
        int s_jquota_fmt;
 #endif
+#ifdef CONFIG_REISERFS_CHECK
+        struct tree_balance *cur_tb;    /*
+                                         * Detects whether more than one
+                                         * copy of tb exists per superblock
+                                         * as a means of checking whether
+                                         * do_balance is executing concurrently
+                                         * against another tree reader/writer
+                                         * on a same mount point.
+                                         */
+#endif
 };
 /* Definitions of reiserfs on-disk properties: */
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 1ee2c05142f6..899fbb487c94 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -14,7 +14,8 @@ struct screen_info {
        __u16 orig_video_page;  /* 0x04 */
        __u8  orig_video_mode;  /* 0x06 */
        __u8  orig_video_cols;  /* 0x07 */
-        __u16 unused2;          /* 0x08 */
+        __u8  flags;            /* 0x08 */
+        __u8  unused2;          /* 0x09 */
        __u16 orig_video_ega_bx;/* 0x0a */
        __u16 unused3;          /* 0x0c */
        __u8  orig_video_lines; /* 0x0e */
@@ -65,6 +66,8 @@ struct screen_info {
 #define VIDEO_TYPE_EFI          0x70    /* EFI graphic mode             */
+#define VIDEO_FLAGS_NOCURSOR    (1 << 0) /* The video mode has no cursor set */
 #ifdef __KERNEL__
 extern struct screen_info screen_info;
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 850db2e80510..cf9327c051ad 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -216,10 +216,10 @@
 #define UART_IIR_TOD    0x08    /* Character Timeout Indication Detected */
-#define UART_FCR_PXAR1  0x00    /* receive FIFO treshold = 1 */
+#define UART_FCR_PXAR1  0x00    /* receive FIFO threshold = 1 */
-#define UART_FCR_PXAR8  0x40    /* receive FIFO treshold = 8 */
+#define UART_FCR_PXAR8  0x40    /* receive FIFO threshold = 8 */
-#define UART_FCR_PXAR16 0x80    /* receive FIFO treshold = 16 */
+#define UART_FCR_PXAR16 0x80    /* receive FIFO threshold = 16 */
-#define UART_FCR_PXAR32 0xc0    /* receive FIFO treshold = 32 */
+#define UART_FCR_PXAR32 0xc0    /* receive FIFO threshold = 32 */
diff --git a/include/linux/serio.h b/include/linux/serio.h
index a640bc2afe76..e2f3044d4a4a 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -215,5 +215,6 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_INEXIO    0x37
 #define SERIO_TOUCHIT213        0x38
 #define SERIO_W8001     0x39
+#define SERIO_DYNAPRO   0x3a
 #endif
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 68e212ff9dde..4ef246f14654 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -57,10 +57,8 @@ struct intc_desc {
        struct intc_sense_reg *sense_regs;
        unsigned int nr_sense_regs;
        char *name;
-#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
        struct intc_mask_reg *ack_regs;
        unsigned int nr_ack_regs;
-#endif
 };
 #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
@@ -73,7 +71,6 @@ struct intc_desc symbol __initdata = {					\
        chipname,                                                       \
 }
-#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups,        \
        mask_regs, prio_regs, sense_regs, ack_regs)                     \
 struct intc_desc symbol __initdata = {                                  \
@@ -83,9 +80,11 @@ struct intc_desc symbol __initdata = {					\
        chipname,                                                       \
        _INTC_ARRAY(ack_regs),                                          \
 }
-#endif
 void __init register_intc_controller(struct intc_desc *desc);
 int intc_set_priority(unsigned int irq, unsigned int prio);
+int reserve_irq_vector(unsigned int irq);
+void reserve_irq_legacy(void);
 #endif /* __SH_INTC_H */
diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
new file mode 100644
index 000000000000..07c08af9f8f6
--- /dev/null
+++ b/include/linux/sh_pfc.h
@@ -0,0 +1,96 @@
+/*
+ * SuperH Pin Function Controller Support
+ *
+ * Copyright (c) 2008 Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __SH_PFC_H
+#define __SH_PFC_H
+#include <asm-generic/gpio.h>
+typedef unsigned short pinmux_enum_t;
+typedef unsigned short pinmux_flag_t;
+#define PINMUX_TYPE_NONE            0
+#define PINMUX_TYPE_FUNCTION        1
+#define PINMUX_TYPE_GPIO            2
+#define PINMUX_TYPE_OUTPUT          3
+#define PINMUX_TYPE_INPUT           4
+#define PINMUX_TYPE_INPUT_PULLUP    5
+#define PINMUX_TYPE_INPUT_PULLDOWN  6
+#define PINMUX_FLAG_TYPE            (0x7)
+#define PINMUX_FLAG_WANT_PULLUP     (1 << 3)
+#define PINMUX_FLAG_WANT_PULLDOWN   (1 << 4)
+#define PINMUX_FLAG_DBIT_SHIFT      5
+#define PINMUX_FLAG_DBIT            (0x1f << PINMUX_FLAG_DBIT_SHIFT)
+#define PINMUX_FLAG_DREG_SHIFT      10
+#define PINMUX_FLAG_DREG            (0x3f << PINMUX_FLAG_DREG_SHIFT)
+struct pinmux_gpio {
+        pinmux_enum_t enum_id;
+        pinmux_flag_t flags;
+};
+#define PINMUX_GPIO(gpio, data_or_mark) [gpio] = { data_or_mark }
+#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0
+struct pinmux_cfg_reg {
+        unsigned long reg, reg_width, field_width;
+        unsigned long *cnt;
+        pinmux_enum_t *enum_ids;
+};
+#define PINMUX_CFG_REG(name, r, r_width, f_width) \
+        .reg = r, .reg_width = r_width, .field_width = f_width,         \
+        .cnt = (unsigned long [r_width / f_width]) {}, \
+        .enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)]) \
+struct pinmux_data_reg {
+        unsigned long reg, reg_width, reg_shadow;
+        pinmux_enum_t *enum_ids;
+};
+#define PINMUX_DATA_REG(name, r, r_width) \
+        .reg = r, .reg_width = r_width, \
+        .enum_ids = (pinmux_enum_t [r_width]) \
+struct pinmux_range {
+        pinmux_enum_t begin;
+        pinmux_enum_t end;
+        pinmux_enum_t force;
+};
+struct pinmux_info {
+        char *name;
+        pinmux_enum_t reserved_id;
+        struct pinmux_range data;
+        struct pinmux_range input;
+        struct pinmux_range input_pd;
+        struct pinmux_range input_pu;
+        struct pinmux_range output;
+        struct pinmux_range mark;
+        struct pinmux_range function;
+        unsigned first_gpio, last_gpio;
+        struct pinmux_gpio *gpios;
+        struct pinmux_cfg_reg *cfg_regs;
+        struct pinmux_data_reg *data_regs;
+        pinmux_enum_t *gpio_data;
+        unsigned int gpio_data_size;
+        unsigned long *gpio_in_use;
+        struct gpio_chip chip;
+};
+int register_pinmux(struct pinmux_info *pip);
+#endif /* __SH_PFC_H */
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index eed4254bd503..3274c507b8a9 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -15,7 +15,7 @@
 * Some hardware works well with requests at spi_transfer scope:
 *
 *   -  Drivers leveraging smarter hardware, with fifos or DMA; or for half
- *      duplex (MicroWire) controllers.  Provide chipslect() and txrx_bufs(),
+ *      duplex (MicroWire) controllers.  Provide chipselect() and txrx_bufs(),
 *      and custom setup()/cleanup() methods.
 */
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 56af3ca75e24..877ba039e6a4 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -89,8 +89,8 @@ enum
        KERN_VERSION=4,         /* string: compile time info */
        KERN_SECUREMASK=5,      /* struct: maximum rights mask */
        KERN_PROF=6,            /* table: profiling information */
-        KERN_NODENAME=7,
+        KERN_NODENAME=7,        /* string: hostname */
-        KERN_DOMAINNAME=8,
+        KERN_DOMAINNAME=8,      /* string: domainname */
        KERN_PANIC=15,          /* int: panic timeout */
        KERN_REALROOTDEV=16,    /* real root device to mount after initrd */
@@ -102,8 +102,8 @@ enum
        KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */
        KERN_PPC_ZEROPAGED=26,  /* turn idle page zeroing on/off on PPC */
        KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */
-        KERN_MODPROBE=28,
+        KERN_MODPROBE=28,       /* string: modprobe path */
-        KERN_SG_BIG_BUFF=29,
+        KERN_SG_BIG_BUFF=29,    /* int: sg driver reserved buffer size */
        KERN_ACCT=30,           /* BSD process accounting parameters */
        KERN_PPC_L2CR=31,       /* l2cr register on PPC */
@@ -150,7 +150,7 @@ enum
        KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
        KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
        KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
-        KERN_MAX_LOCK_DEPTH=74,
+        KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */
        KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
 };
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 0482229c07db..d2ae79e21be3 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -43,6 +43,7 @@ enum tick_nohz_mode {
 * @idle_exittime:      Time when the idle state was left
 * @idle_sleeptime:     Sum of the time slept in idle with sched tick stopped
 * @sleep_length:       Duration of the current idle sleep
+ * @do_timer_lst:       CPU was the last one doing do_timer before going idle
 */
 struct tick_sched {
        struct hrtimer                  sched_timer;
@@ -64,6 +65,7 @@ struct tick_sched {
        unsigned long                   last_jiffies;
        unsigned long                   next_jiffies;
        ktime_t                         idle_expires;
+        int                             do_timer_last;
 };
 extern void __init tick_init(void);
@@ -98,6 +100,9 @@ extern int tick_check_oneshot_change(int allow_nohz);
 extern struct tick_sched *tick_get_tick_sched(int cpu);
 extern void tick_check_idle(int cpu);
 extern int tick_oneshot_mode_active(void);
+#  ifndef arch_needs_cpu
+#   define arch_needs_cpu(cpu) (0)
+#  endif
 # else
 static inline void tick_clock_notify(void) { }
 static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
diff --git a/include/linux/time.h b/include/linux/time.h
index fe04e5ef6a59..6e026e45a179 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -148,6 +148,7 @@ extern void monotonic_to_bootbased(struct timespec *ts);
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 extern int timekeeping_valid_for_hres(void);
+extern u64 timekeeping_max_deferment(void);
 extern void update_wall_time(void);
 extern void update_xtime_cache(u64 nsec);
 extern void timekeeping_leap_insert(int leapsecond);
diff --git a/include/linux/timex.h b/include/linux/timex.h
index e6967d10d9e5..94f8faecdcbc 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -115,13 +115,16 @@ struct timex {
 #define ADJ_OFFSET_SS_READ      0xa001  /* read-only adjtime */
 #endif
-/* xntp 3.4 compatibility names */
+/* NTP userland likes the MOD_ prefix better */
 #define MOD_OFFSET      ADJ_OFFSET
 #define MOD_FREQUENCY   ADJ_FREQUENCY
 #define MOD_MAXERROR    ADJ_MAXERROR
 #define MOD_ESTERROR    ADJ_ESTERROR
 #define MOD_STATUS      ADJ_STATUS
 #define MOD_TIMECONST   ADJ_TIMECONST
+#define MOD_TAI ADJ_TAI
+#define MOD_MICRO       ADJ_MICRO
+#define MOD_NANO        ADJ_NANO
 /*
@@ -261,11 +264,7 @@ static inline int ntp_synced(void)
 #define NTP_SCALE_SHIFT         32
-#ifdef CONFIG_NO_HZ
-#define NTP_INTERVAL_FREQ  (2)
-#else
 #define NTP_INTERVAL_FREQ  (HZ)
-#endif
 #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
 /* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index adb44066680c..1b4790911052 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -110,6 +110,10 @@ struct ucb1400 {
        struct platform_device  *ucb1400_gpio;
 };
+struct ucb1400_pdata {
+        int     irq;
+};
 static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
 {
        return ac97->bus->ops->read(ac97, reg);
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 429c631d2aad..63ebdcc5dda6 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -74,7 +74,7 @@ enum {
 * WUSB defines that CHIDs, CDIDs and CKs are a 16 byte string of
 * data. In order to avoid confusion and enforce types, we wrap it.
 *
- * Make it packed, as we use it in some hw defintions.
+ * Make it packed, as we use it in some hw definitions.
 */
 struct wusb_ckhdid {
        u8 data[16];
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index b59e78c57161..32b92298fd79 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -361,6 +361,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
 #define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
 #define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
 /*
 *      F O R M A T   E N U M E R A T I O N
@@ -490,7 +491,7 @@ struct v4l2_jpegcompression {
                                 * you do, leave them untouched.
                                 * Inluding less markers will make the
                                 * resulting code smaller, but there will
-                                 * be fewer aplications which can read it.
+                                 * be fewer applications which can read it.
                                 * The presence of the APP and COM marker
                                 * is influenced by APP_len and COM_len
                                 * ONLY, not by this property! */
@@ -563,6 +564,7 @@ struct v4l2_framebuffer {
 #define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
 #define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
 #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
+#define V4L2_FBUF_CAP_SRC_CHROMAKEY     0x0080
 /*  Flags for the 'flags' field. */
 #define V4L2_FBUF_FLAG_PRIMARY          0x0001
 #define V4L2_FBUF_FLAG_OVERLAY          0x0002
@@ -570,6 +572,7 @@ struct v4l2_framebuffer {
 #define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY    0x0040
 struct v4l2_clip {
        struct v4l2_rect        c;
@@ -912,8 +915,10 @@ enum v4l2_colorfx {
 #define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
 #define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
+#define V4L2_CID_ROTATE                         (V4L2_CID_BASE+34)
+#define V4L2_CID_BG_COLOR                       (V4L2_CID_BASE+35)
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+36)
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index c0c4e1103a73..7f56db4a79f0 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -110,6 +110,7 @@ extern char con_buf[CON_BUF_SIZE];
 extern struct mutex con_buf_mtx;
 extern char vt_dont_switch;
 extern int default_utf8;
+extern int global_cursor_default;
 struct vt_spawn_console {
        spinlock_t lock;
@@ -130,4 +131,6 @@ struct vt_notifier_param {
 extern int register_vt_notifier(struct notifier_block *nb);
 extern int unregister_vt_notifier(struct notifier_block *nb);
+extern void hide_boot_cursor(bool hide);
 #endif /* _VT_KERN_H */
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index cf24c20de9e4..9466e860d8c2 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -25,6 +25,7 @@ typedef void (*work_func_t)(struct work_struct *work);
 struct work_struct {
        atomic_long_t data;
 #define WORK_STRUCT_PENDING 0           /* T if work item pending execution */
+#define WORK_STRUCT_STATIC  1           /* static initializer (debugobjects) */
 #define WORK_STRUCT_FLAG_MASK (3UL)
 #define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK)
        struct list_head entry;
@@ -35,6 +36,7 @@ struct work_struct {
 };
 #define WORK_DATA_INIT()        ATOMIC_LONG_INIT(0)
+#define WORK_DATA_STATIC_INIT() ATOMIC_LONG_INIT(2)
 struct delayed_work {
        struct work_struct work;
@@ -63,7 +65,7 @@ struct execute_work {
 #endif
 #define __WORK_INITIALIZER(n, f) {                              \
-        .data = WORK_DATA_INIT(),                               \
+        .data = WORK_DATA_STATIC_INIT(),                        \
        .entry  = { &(n).entry, &(n).entry },                   \
        .func = (f),                                            \
        __WORK_INIT_LOCKDEP_MAP(#n, &(n))                       \
@@ -91,6 +93,14 @@ struct execute_work {
 #define PREPARE_DELAYED_WORK(_work, _func)                      \
        PREPARE_WORK(&(_work)->work, (_func))
+#ifdef CONFIG_DEBUG_OBJECTS_WORK
+extern void __init_work(struct work_struct *work, int onstack);
+extern void destroy_work_on_stack(struct work_struct *work);
+#else
+static inline void __init_work(struct work_struct *work, int onstack) { }
+static inline void destroy_work_on_stack(struct work_struct *work) { }
+#endif
 /*
 * initialize all of a work item in one go
 *
@@ -99,24 +109,36 @@ struct execute_work {
 * to generate better code.
 */
 #ifdef CONFIG_LOCKDEP
-#define INIT_WORK(_work, _func)                                         \
+#define __INIT_WORK(_work, _func, _onstack)                             \
        do {                                                            \
                static struct lock_class_key __key;                     \
                                                                        \
+                __init_work((_work), _onstack);                         \
                (_work)->data = (atomic_long_t) WORK_DATA_INIT();       \
                lockdep_init_map(&(_work)->lockdep_map, #_work, &__key, 0);\
                INIT_LIST_HEAD(&(_work)->entry);                        \
                PREPARE_WORK((_work), (_func));                         \
        } while (0)
 #else
-#define INIT_WORK(_work, _func)                                         \
+#define __INIT_WORK(_work, _func, _onstack)                             \
        do {                                                            \
+                __init_work((_work), _onstack);                         \
                (_work)->data = (atomic_long_t) WORK_DATA_INIT();       \
                INIT_LIST_HEAD(&(_work)->entry);                        \
                PREPARE_WORK((_work), (_func));                         \
        } while (0)
 #endif
+#define INIT_WORK(_work, _func)                                 \
+        do {                                                    \
+                __INIT_WORK((_work), (_func), 0);               \
+        } while (0)
+#define INIT_WORK_ON_STACK(_work, _func)                        \
+        do {                                                    \
+                __INIT_WORK((_work), (_func), 1);               \
+        } while (0)
 #define INIT_DELAYED_WORK(_work, _func)                         \
        do {                                                    \
                INIT_WORK(&(_work)->work, (_func));             \
@@ -125,22 +147,16 @@ struct execute_work {
 #define INIT_DELAYED_WORK_ON_STACK(_work, _func)                \
        do {                                                    \
-                INIT_WORK(&(_work)->work, (_func));             \
+                INIT_WORK_ON_STACK(&(_work)->work, (_func));    \
                init_timer_on_stack(&(_work)->timer);           \
        } while (0)
-#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func)                      \
+#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func)              \
        do {                                                    \
                INIT_WORK(&(_work)->work, (_func));             \
                init_timer_deferrable(&(_work)->timer);         \
        } while (0)
-#define INIT_DELAYED_WORK_ON_STACK(_work, _func)                \
-        do {                                                    \
-                INIT_WORK(&(_work)->work, (_func));             \
-                init_timer_on_stack(&(_work)->timer);           \
-        } while (0)
 /**
 * work_pending - Find out whether a work item is currently pending
 * @work: The work item in question
diff --git a/include/media/cx25840.h b/include/media/cx25840.h
index 2c3fbaa33f74..0b0cb1776796 100644
--- a/include/media/cx25840.h
+++ b/include/media/cx25840.h
@@ -84,6 +84,7 @@ enum cx25840_video_input {
        CX25840_NONE0_CH3 = 0x80000080,
        CX25840_NONE1_CH3 = 0x800000c0,
        CX25840_SVIDEO_ON = 0x80000100,
+        CX25840_COMPONENT_ON = 0x80000200,
 };
 enum cx25840_audio_input {
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h
index 71d8982e13ff..d863e5e8426d 100644
--- a/include/media/davinci/vpfe_capture.h
+++ b/include/media/davinci/vpfe_capture.h
@@ -83,6 +83,8 @@ struct vpfe_subdev_info {
 struct vpfe_config {
        /* Number of sub devices connected to vpfe */
        int num_subdevs;
+        /* i2c bus adapter no */
+        int i2c_adapter_id;
        /* information about each subdev */
        struct vpfe_subdev_info *sub_devs;
        /* evm card info */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 29f0e53cff94..e41a99ee353e 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -26,14 +26,16 @@
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/spinlock.h>
+extern int media_ir_debug;    /* media_ir_debug level (0,1,2) */
+#define IR_dprintk(level, fmt, arg...)  if (media_ir_debug >= level) \
+        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
 #define IR_TYPE_RC5     1
 #define IR_TYPE_PD      2 /* Pulse distance encoded IR */
 #define IR_TYPE_OTHER  99
-#define IR_KEYTAB_TYPE u32
-#define IR_KEYTAB_SIZE  128  /* enougth for rc5, probably need more some day */
 struct ir_scancode {
        u16     scancode;
        u32     keycode;
@@ -42,11 +44,9 @@ struct ir_scancode {
 struct ir_scancode_table {
        struct ir_scancode *scan;
        int size;
+        spinlock_t lock;
 };
-#define IR_KEYCODE(tab,code)    (((unsigned)code < IR_KEYTAB_SIZE) \
-                                 ? tab[code] : KEY_RESERVED)
 #define RC5_START(x)    (((x)>>12)&3)
 #define RC5_TOGGLE(x)   (((x)>>11)&1)
 #define RC5_ADDR(x)     (((x)>>6)&31)
@@ -55,11 +55,11 @@ struct ir_scancode_table {
 struct ir_input_state {
        /* configuration */
        int                ir_type;
-        IR_KEYTAB_TYPE     ir_codes[IR_KEYTAB_SIZE];
+        struct ir_scancode_table keytable;
        /* key info */
-        u32                ir_raw;      /* raw data */
+        u32                ir_key;      /* ir scancode */
-        u32                ir_key;      /* ir key code */
        u32                keycode;     /* linux key code */
        int                keypressed;  /* current state */
 };
@@ -102,20 +102,36 @@ struct card_ir {
        struct tasklet_struct   tlet;
 };
-void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
+/* Routines from ir-functions.c */
+int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
                   int ir_type, struct ir_scancode_table *ir_codes);
 void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir);
 void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
-                      u32 ir_key, u32 ir_raw);
+                      u32 ir_key);
 u32  ir_extract_bits(u32 data, u32 mask);
 int  ir_dump_samples(u32 *samples, int count);
 int  ir_decode_biphase(u32 *samples, int count, int low, int high);
 int  ir_decode_pulsedistance(u32 *samples, int count, int low, int high);
+u32  ir_rc5_decode(unsigned int code);
 void ir_rc5_timer_end(unsigned long data);
 void ir_rc5_timer_keyup(unsigned long data);
-/* Keymaps to be used by other modules */
+/* Routines from ir-keytable.c */
+u32 ir_g_keycode_from_table(struct input_dev *input_dev,
+                            u32 scancode);
+int ir_set_keycode_table(struct input_dev *input_dev,
+                         struct ir_scancode_table *rc_tab);
+int ir_roundup_tablesize(int n_elems);
+int ir_copy_table(struct ir_scancode_table *destin,
+                 const struct ir_scancode_table *origin);
+void ir_input_free(struct input_dev *input_dev);
+/* scancode->keycode map tables from ir-keymaps.c */
 extern struct ir_scancode_table ir_codes_empty_table;
 extern struct ir_scancode_table ir_codes_avermedia_table;
@@ -150,6 +166,7 @@ extern struct ir_scancode_table ir_codes_rc5_tv_table;
 extern struct ir_scancode_table ir_codes_winfast_table;
 extern struct ir_scancode_table ir_codes_pinnacle_color_table;
 extern struct ir_scancode_table ir_codes_hauppauge_new_table;
+extern struct ir_scancode_table ir_codes_rc5_hauppauge_new_table;
 extern struct ir_scancode_table ir_codes_npgtech_table;
 extern struct ir_scancode_table ir_codes_norwood_table;
 extern struct ir_scancode_table ir_codes_proteus_2309_table;
@@ -172,6 +189,8 @@ extern struct ir_scancode_table ir_codes_ati_tv_wonder_hd_600_table;
 extern struct ir_scancode_table ir_codes_kworld_plus_tv_analog_table;
 extern struct ir_scancode_table ir_codes_kaiomy_table;
 extern struct ir_scancode_table ir_codes_dm1105_nec_table;
+extern struct ir_scancode_table ir_codes_tevii_nec_table;
+extern struct ir_scancode_table ir_codes_tbs_nec_table;
 extern struct ir_scancode_table ir_codes_evga_indtube_table;
 extern struct ir_scancode_table ir_codes_terratec_cinergy_xs_table;
 extern struct ir_scancode_table ir_codes_videomate_s350_table;
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index cf16689adba7..91942dbe64e3 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -64,6 +64,7 @@ enum {
        V4L2_IDENT_OV9650 = 254,
        V4L2_IDENT_OV9655 = 255,
        V4L2_IDENT_SOI968 = 256,
+        V4L2_IDENT_OV9640 = 257,
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,
@@ -72,6 +73,7 @@ enum {
        V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
        V4L2_IDENT_CX23415 = 415,
        V4L2_IDENT_CX23416 = 416,
+        V4L2_IDENT_CX23417 = 417,
        V4L2_IDENT_CX23418 = 418,
        /* module au0828 */
@@ -129,6 +131,9 @@ enum {
        V4L2_IDENT_SAA6752HS = 6752,
        V4L2_IDENT_SAA6752HS_AC3 = 6753,
+        /* modules tef6862: just ident 6862 */
+        V4L2_IDENT_TEF6862 = 6862,
        /* module adv7170: just ident 7170 */
        V4L2_IDENT_ADV7170 = 7170,
@@ -165,12 +170,27 @@ enum {
        /* module mt9v011, just ident 8243 */
        V4L2_IDENT_MT9V011 = 8243,
+        /* module cx23885 and cx25840 */
+        V4L2_IDENT_CX23885    = 8850,
+        V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23887    = 8870,
+        V4L2_IDENT_CX23887_AV = 8871, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23888    = 8880,
+        V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
        /* module tw9910: just ident 9910 */
        V4L2_IDENT_TW9910 = 9910,
        /* module sn9c20x: just ident 10000 */
        V4L2_IDENT_SN9C20X = 10000,
+        /* module cx231xx and cx25840 */
+        V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
+        V4L2_IDENT_CX23100    = 23100,
+        V4L2_IDENT_CX23101    = 23101,
+        V4L2_IDENT_CX23102    = 23102,
        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
                                        use internally (tveeprom.c). */
@@ -264,6 +284,9 @@ enum {
        /* module m52790: just ident 52790 */
        V4L2_IDENT_M52790 = 52790,
+        /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
+        V4L2_IDENT_RJ54N1CB0C = 51980,
 };
 #endif
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index d411345f244b..00bf17608453 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -23,6 +23,16 @@
 #include <media/v4l2-common.h>
+/* generic v4l2_device notify callback notification values */
+#define V4L2_SUBDEV_IR_RX_NOTIFY                _IOW('v', 0, u32)
+#define V4L2_SUBDEV_IR_RX_FIFO_SERVICE_REQ      0x00000001
+#define V4L2_SUBDEV_IR_RX_END_OF_RX_DETECTED    0x00000002
+#define V4L2_SUBDEV_IR_RX_HW_FIFO_OVERRUN       0x00000004
+#define V4L2_SUBDEV_IR_RX_SW_FIFO_OVERRUN       0x00000008
+#define V4L2_SUBDEV_IR_TX_NOTIFY                _IOW('v', 1, u32)
+#define V4L2_SUBDEV_IR_TX_FIFO_SERVICE_REQ      0x00000001
 struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
@@ -96,6 +106,9 @@ struct v4l2_decode_vbi_line {
   s_gpio: set GPIO pins. Very simple right now, might need to be extended with
        a direction argument if needed.
+   s_power: puts subdevice in power saving mode (on == 0) or normal operation
+        mode (on == 1).
 */
 struct v4l2_subdev_core_ops {
        int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
@@ -118,6 +131,7 @@ struct v4l2_subdev_core_ops {
        int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
        int (*s_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
 #endif
+        int (*s_power)(struct v4l2_subdev *sd, int on);
 };
 /* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
@@ -127,8 +141,6 @@ struct v4l2_subdev_core_ops {
   s_type_addr: sets tuner type and its I2C addr.
   s_config: sets tda9887 specific stuff, like port1, port2 and qss
-   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
 */
 struct v4l2_subdev_tuner_ops {
        int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
@@ -141,7 +153,6 @@ struct v4l2_subdev_tuner_ops {
        int (*s_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm);
        int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
        int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
-        int (*s_standby)(struct v4l2_subdev *sd);
 };
 /* s_clock_freq: set the frequency (in Hz) of the audio clock output.
@@ -231,11 +242,95 @@ struct v4l2_subdev_video_ops {
        int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
 };
+/*
+   interrupt_service_routine: Called by the bridge chip's interrupt service
+        handler, when an IR interrupt status has be raised due to this subdev,
+        so that this subdev can handle the details.  It may schedule work to be
+        performed later.  It must not sleep.  *Called from an IRQ context*.
+   [rt]x_g_parameters: Get the current operating parameters and state of the
+        the IR receiver or transmitter.
+   [rt]x_s_parameters: Set the current operating parameters and state of the
+        the IR receiver or transmitter.  It is recommended to call
+        [rt]x_g_parameters first to fill out the current state, and only change
+        the fields that need to be changed.  Upon return, the actual device
+        operating parameters and state will be returned.  Note that hardware
+        limitations may prevent the actual settings from matching the requested
+        settings - e.g. an actual carrier setting of 35,904 Hz when 36,000 Hz
+        was requested.  An exception is when the shutdown parameter is true.
+        The last used operational parameters will be returned, but the actual
+        state of the hardware be different to minimize power consumption and
+        processing when shutdown is true.
+   rx_read: Reads received codes or pulse width data.
+        The semantics are similar to a non-blocking read() call.
+   tx_write: Writes codes or pulse width data for transmission.
+        The semantics are similar to a non-blocking write() call.
+ */
+enum v4l2_subdev_ir_mode {
+        V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* space & mark widths in nanosecs */
+};
+/* Data format of data read or written for V4L2_SUBDEV_IR_MODE_PULSE_WIDTH */
+#define V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS       0x7fffffff
+#define V4L2_SUBDEV_IR_PULSE_LEVEL_MASK         0x80000000
+#define V4L2_SUBDEV_IR_PULSE_RX_SEQ_END         0xffffffff
+struct v4l2_subdev_ir_parameters {
+        /* Either Rx or Tx */
+        unsigned int bytes_per_data_element; /* of data in read or write call */
+        enum v4l2_subdev_ir_mode mode;
+        bool enable;
+        bool interrupt_enable;
+        bool shutdown; /* true: set hardware to low/no power, false: normal */
+        bool modulation;           /* true: uses carrier, false: baseband */
+        u32 max_pulse_width;       /* ns,      valid only for baseband signal */
+        unsigned int carrier_freq; /* Hz,      valid only for modulated signal*/
+        unsigned int duty_cycle;   /* percent, valid only for modulated signal*/
+        bool invert;               /* logically invert sense of mark/space */
+        /* Rx only */
+        u32 noise_filter_min_width;       /* ns, min time of a valid pulse */
+        unsigned int carrier_range_lower; /* Hz, valid only for modulated sig */
+        unsigned int carrier_range_upper; /* Hz, valid only for modulated sig */
+        u32 resolution;                   /* ns */
+};
+struct v4l2_subdev_ir_ops {
+        /* Common to receiver and transmitter */
+        int (*interrupt_service_routine)(struct v4l2_subdev *sd,
+                                                u32 status, bool *handled);
+        /* Receiver */
+        int (*rx_read)(struct v4l2_subdev *sd, u8 *buf, size_t count,
+                                ssize_t *num);
+        int (*rx_g_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+        int (*rx_s_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+        /* Transmitter */
+        int (*tx_write)(struct v4l2_subdev *sd, u8 *buf, size_t count,
+                                ssize_t *num);
+        int (*tx_g_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+        int (*tx_s_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+};
 struct v4l2_subdev_ops {
        const struct v4l2_subdev_core_ops  *core;
        const struct v4l2_subdev_tuner_ops *tuner;
        const struct v4l2_subdev_audio_ops *audio;
        const struct v4l2_subdev_video_ops *video;
+        const struct v4l2_subdev_ir_ops    *ir;
 };
 #define V4L2_SUBDEV_NAME_SIZE 32
@@ -290,7 +385,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
   Example: err = v4l2_subdev_call(sd, core, g_chip_ident, &chip);
 */
 #define v4l2_subdev_call(sd, o, f, args...)                             \
-        (!(sd) ? -ENODEV : (((sd) && (sd)->ops->o && (sd)->ops->o->f) ? \
+        (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \
                (sd)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))
 /* Send a notification to v4l2_device. */
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 1c5946c44758..316fdccdcaa0 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -166,7 +166,7 @@ struct videobuf_queue {
        enum v4l2_field            field;
        enum v4l2_field            last;   /* for field=V4L2_FIELD_ALTERNATE */
        struct videobuf_buffer     *bufs[VIDEO_MAX_FRAME];
-        struct videobuf_queue_ops  *ops;
+        const struct videobuf_queue_ops  *ops;
        struct videobuf_qtype_ops  *int_ops;
        unsigned int               streaming:1;
@@ -195,7 +195,7 @@ void *videobuf_queue_to_vmalloc (struct videobuf_queue* q,
                                 struct videobuf_buffer *buf);
 void videobuf_queue_core_init(struct videobuf_queue *q,
-                         struct videobuf_queue_ops *ops,
+                         const struct videobuf_queue_ops *ops,
                         struct device *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index 549386681aab..ebaa9bc1ee8d 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -17,7 +17,7 @@
 #include <media/videobuf-core.h>
 void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
-                                    struct videobuf_queue_ops *ops,
+                                    const struct videobuf_queue_ops *ops,
                                    struct device *dev,
                                    spinlock_t *irqlock,
                                    enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index dda47f0082e9..53e72f787175 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -103,7 +103,7 @@ struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf);
 void *videobuf_sg_alloc(size_t size);
 void videobuf_queue_sg_init(struct videobuf_queue* q,
-                         struct videobuf_queue_ops *ops,
+                         const struct videobuf_queue_ops *ops,
                         struct device *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index 6ba4f1271d23..07cf4b9d0a65 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -42,7 +42,9 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
                          void *adapter_priv,
                          struct device *device,
                          short *adapter_nr,
-                          int mfe_shared);
+                          int mfe_shared,
+                          int (*fe_ioctl_override)(struct dvb_frontend *,
+                                        unsigned int, void *, unsigned int));
 void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index e87222c6a125..4b419a257a7d 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -30,8 +30,8 @@ struct videobuf_vmalloc_memory
 };
 void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
-                         struct videobuf_queue_ops *ops,
+                         const struct videobuf_queue_ops *ops,
-                         void *dev,
+                         struct device *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,
                         enum v4l2_field field,
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 7571e32723bf..ff3017744711 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -989,7 +989,7 @@ struct sctp_transport {
        int init_sent_count;
        /* state       : The current state of this destination,
-         *             : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN.
+         *             : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN.
         */
        int state;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index e2d2ca2509be..5740b85bc5a0 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1262,7 +1262,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu
        skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
 /* This function calculates a "timeout" which is equivalent to the timeout of a
- * TCP connection after "boundary" unsucessful, exponentially backed-off
+ * TCP connection after "boundary" unsuccessful, exponentially backed-off
 * retransmissions with an initial RTO of TCP_RTO_MIN.
 */
 static inline bool retransmits_timed_out(const struct sock *sk,
diff --git a/include/net/wimax.h b/include/net/wimax.h
index d69c4a7a1267..3461aa1df1e0 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -79,7 +79,7 @@
 * drivers have to only report state changes due to external
 * conditions.
 *
- * All API operations are 'atomic', serialized thorough a mutex in the
+ * All API operations are 'atomic', serialized through a mutex in the
 * `struct wimax_dev`.
 *
 * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
index 33b2750e9283..b3a0ee6b2f1c 100644
--- a/include/scsi/Kbuild
+++ b/include/scsi/Kbuild
@@ -2,3 +2,4 @@ header-y += scsi.h
 header-y += scsi_netlink.h
 header-y += scsi_netlink_fc.h
 header-y += scsi_bsg_fc.h
+header-y += fc/
diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild
new file mode 100644
index 000000000000..56603813c6cd
--- /dev/null
+++ b/include/scsi/fc/Kbuild
@@ -0,0 +1,4 @@
+header-y += fc_els.h
+header-y += fc_fs.h
+header-y += fc_gs.h
+header-y += fc_ns.h
diff --git a/include/scsi/fc/fc_els.h b/include/scsi/fc/fc_els.h
index 195ca014d3ce..f94328132a26 100644
--- a/include/scsi/fc/fc_els.h
+++ b/include/scsi/fc/fc_els.h
@@ -20,6 +20,8 @@
 #ifndef _FC_ELS_H_
 #define _FC_ELS_H_
+#include <linux/types.h>
 /*
 * Fibre Channel Switch - Enhanced Link Services definitions.
 * From T11 FC-LS Rev 1.2 June 7, 2005.
@@ -248,10 +250,12 @@ struct fc_els_csp {
 /*
 * sp_features
 */
-#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel. off. */
+#define FC_SP_FT_NPIV   0x8000  /* multiple N_Port_ID support (FLOGI) */
+#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel off (PLOGI) */
 #define FC_SP_FT_CLAD   0x8000  /* clean address (in FLOGI LS_ACC) */
 #define FC_SP_FT_RAND   0x4000  /* random relative offset */
 #define FC_SP_FT_VAL    0x2000  /* valid vendor version level */
+#define FC_SP_FT_NPIV_ACC       0x2000  /* NPIV assignment (FLOGI LS_ACC) */
 #define FC_SP_FT_FPORT  0x1000  /* F port (1) vs. N port (0) */
 #define FC_SP_FT_ABB    0x0800  /* alternate BB_credit management */
 #define FC_SP_FT_EDTR   0x0400  /* E_D_TOV Resolution is nanoseconds */
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index ccb3dbe90463..e6ad3d2ae475 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -86,6 +86,18 @@ struct fcoe_crc_eof {
 #define FCOE_MIN_FRAME 46
 /*
+ * FCoE Link Error Status Block: T11 FC-BB-5 Rev2.0, Clause 7.10.
+ */
+struct fcoe_fc_els_lesb {
+        __be32          lesb_link_fail; /* link failure count */
+        __be32          lesb_vlink_fail; /* virtual link failure count */
+        __be32          lesb_miss_fka;  /* missing FIP keep-alive count */
+        __be32          lesb_symb_err;  /* symbol error during carrier count */
+        __be32          lesb_err_block; /* errored block count */
+        __be32          lesb_fcs_error; /* frame check sequence error count */
+};
+/*
 * fc_fcoe_set_mac - Store OUI + DID into MAC address field.
 * @mac: mac address to be set
 * @did: fc dest id to use
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 5d38f1989f37..747e2c7d88d6 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -83,6 +83,8 @@ struct fcp_cmnd32 {
 * fc_tm_flags - task management flags field.
 */
 #define FCP_TMF_CLR_ACA         0x40    /* clear ACA condition */
+#define FCP_TMF_TGT_RESET       0x20    /* target reset task management,
+                                           deprecated as of FCP-3 */
 #define FCP_TMF_LUN_RESET       0x10    /* logical unit reset task management */
 #define FCP_TMF_CLR_TASK_SET    0x04    /* clear task set */
 #define FCP_TMF_ABT_TASK_SET    0x02    /* abort task set */
@@ -196,4 +198,10 @@ struct fcp_srr {
        __u8            srr_resvd2[3];  /* reserved */
 };
+/*
+ * Feature bits in name server FC-4 Features object.
+ */
+#define FCP_FEAT_TARG   (1 << 0)        /* target function supported */
+#define FCP_FEAT_INIT   (1 << 1)        /* initiator function supported */
 #endif /* _FC_FCP_H_ */
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
index 3d138c1fcf8a..17baa19380f0 100644
--- a/include/scsi/fc/fc_fip.h
+++ b/include/scsi/fc/fc_fip.h
@@ -214,11 +214,21 @@ struct fip_vn_desc {
 */
 struct fip_fka_desc {
        struct fip_desc fd_desc;
-        __u8            fd_resvd[2];
+        __u8            fd_resvd;
+        __u8            fd_flags;       /* bit0 is fka disable flag */
        __be32          fd_fka_period;  /* adv./keep-alive period in mS */
 } __attribute__((packed));
 /*
+ * flags for fip_fka_desc.fd_flags
+ */
+enum fip_fka_flags {
+        FIP_FKA_ADV_D = 0x01,           /* no need for FKA from ENode */
+};
+/* FIP_DT_FKA flags */
+/*
 * FIP_DT_VENDOR descriptor.
 */
 struct fip_vendor_desc {
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
index ac4cd38c860e..50f28b143451 100644
--- a/include/scsi/fc/fc_fs.h
+++ b/include/scsi/fc/fc_fs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_FS_H_
 #define _FC_FS_H_
+#include <linux/types.h>
 /*
 * Fibre Channel Framing and Signalling definitions.
 * From T11 FC-FS-2 Rev 0.90 - 9 August 2005.
diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h
index 324dd0e3c622..a37346d47eb1 100644
--- a/include/scsi/fc/fc_gs.h
+++ b/include/scsi/fc/fc_gs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_GS_H_
 #define _FC_GS_H_
+#include <linux/types.h>
 /*
 * Fibre Channel Services - Common Transport.
 * From T11.org FC-GS-2 Rev 5.3 November 1998.
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
index 790d7b97d4bc..e7d3ac497d7d 100644
--- a/include/scsi/fc/fc_ns.h
+++ b/include/scsi/fc/fc_ns.h
@@ -20,6 +20,8 @@
 #ifndef _FC_NS_H_
 #define _FC_NS_H_
+#include <linux/types.h>
 /*
 * Fibre Channel Services - Name Service (dNS)
 * From T11.org FC-GS-2 Rev 5.3 November 1998.
@@ -44,9 +46,12 @@ enum fc_ns_req {
        FC_NS_GID_FT =  0x0171,         /* get IDs by FC4 type */
        FC_NS_GPN_FT =  0x0172,         /* get port names by FC4 type */
        FC_NS_GID_PT =  0x01a1,         /* get IDs by port type */
-        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
        FC_NS_RPN_ID =  0x0212,         /* reg port name for ID */
        FC_NS_RNN_ID =  0x0213,         /* reg node name for ID */
+        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
+        FC_NS_RSPN_ID = 0x0218,         /* reg symbolic port name */
+        FC_NS_RFF_ID =  0x021f,         /* reg FC4 Features for ID */
+        FC_NS_RSNN_NN = 0x0239,         /* reg symbolic node name */
 };
 /*
@@ -156,4 +161,32 @@ struct fc_ns_rn_id {
        __be64          fr_wwn;         /* node name or port name */
 } __attribute__((__packed__));
+/*
+ * RSNN_NN request - register symbolic node name
+ */
+struct fc_ns_rsnn {
+        __be64          fr_wwn;         /* node name */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+/*
+ * RSPN_ID request - register symbolic port name
+ */
+struct fc_ns_rspn {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+/*
+ * RFF_ID request - register FC-4 Features for ID.
+ */
+struct fc_ns_rff_id {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_resvd[2];
+        __u8            fr_feat;        /* FC-4 Feature bits */
+        __u8            fr_type;        /* FC-4 type */
+} __attribute__((__packed__));
 #endif /* _FC_NS_H_ */
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 27dad703824f..8eb0a0fc0a71 100644
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -32,7 +32,10 @@ struct fc_ct_req {
                struct fc_ns_gid_ft gid;
                struct fc_ns_rn_id  rn;
                struct fc_ns_rft rft;
+                struct fc_ns_rff_id rff;
                struct fc_ns_fid fid;
+                struct fc_ns_rsnn snn;
+                struct fc_ns_rspn spn;
        } payload;
 };
@@ -109,6 +112,7 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                      enum fc_fh_type *fh_type)
 {
        struct fc_ct_req *ct;
+        size_t len;
        switch (op) {
        case FC_NS_GPN_FT:
@@ -128,12 +132,41 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                ct->payload.rft.fts = lport->fcts;
                break;
-        case FC_NS_RPN_ID:
+        case FC_NS_RFF_ID:
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id));
+                hton24(ct->payload.rff.fr_fid.fp_fid,
+                       fc_host_port_id(lport->host));
+                ct->payload.rff.fr_type = FC_TYPE_FCP;
+                if (lport->service_params & FCP_SPPF_INIT_FCN)
+                        ct->payload.rff.fr_feat = FCP_FEAT_INIT;
+                if (lport->service_params & FCP_SPPF_TARG_FCN)
+                        ct->payload.rff.fr_feat |= FCP_FEAT_TARG;
+                break;
+        case FC_NS_RNN_ID:
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id));
                hton24(ct->payload.rn.fr_fid.fp_fid,
                       fc_host_port_id(lport->host));
-                ct->payload.rft.fts = lport->fcts;
+                put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn);
-                put_unaligned_be64(lport->wwpn, &ct->payload.rn.fr_wwn);
+                break;
+        case FC_NS_RSPN_ID:
+                len = strnlen(fc_host_symbolic_name(lport->host), 255);
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len);
+                hton24(ct->payload.spn.fr_fid.fp_fid,
+                       fc_host_port_id(lport->host));
+                strncpy(ct->payload.spn.fr_name,
+                        fc_host_symbolic_name(lport->host), len);
+                ct->payload.spn.fr_name_len = len;
+                break;
+        case FC_NS_RSNN_NN:
+                len = strnlen(fc_host_symbolic_name(lport->host), 255);
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn) + len);
+                put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn);
+                strncpy(ct->payload.snn.fr_name,
+                        fc_host_symbolic_name(lport->host), len);
+                ct->payload.snn.fr_name_len = len;
                break;
        default:
@@ -198,6 +231,31 @@ static inline void fc_flogi_fill(struct fc_lport *lport, struct fc_frame *fp)
        sp->sp_bb_data = htons((u16) lport->mfs);
        cp = &flogi->fl_cssp[3 - 1];    /* class 3 parameters */
        cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+        if (lport->does_npiv)
+                sp->sp_features = htons(FC_SP_FT_NPIV);
+}
+/**
+ * fc_fdisc_fill - Fill in a fdisc request frame.
+ */
+static inline void fc_fdisc_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_csp *sp;
+        struct fc_els_cssp *cp;
+        struct fc_els_flogi *fdisc;
+        fdisc = fc_frame_payload_get(fp, sizeof(*fdisc));
+        memset(fdisc, 0, sizeof(*fdisc));
+        fdisc->fl_cmd = (u8) ELS_FDISC;
+        put_unaligned_be64(lport->wwpn, &fdisc->fl_wwpn);
+        put_unaligned_be64(lport->wwnn, &fdisc->fl_wwnn);
+        sp = &fdisc->fl_csp;
+        sp->sp_hi_ver = 0x20;
+        sp->sp_lo_ver = 0x20;
+        sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
+        sp->sp_bb_data = htons((u16) lport->mfs);
+        cp = &fdisc->fl_cssp[3 - 1];    /* class 3 parameters */
+        cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
 }
 /**
@@ -296,6 +354,10 @@ static inline int fc_els_fill(struct fc_lport *lport,
                fc_flogi_fill(lport, fp);
                break;
+        case ELS_FDISC:
+                fc_fdisc_fill(lport, fp);
+                break;
        case ELS_LOGO:
                fc_logo_fill(lport, fp);
                break;
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h
index c35d2383cc26..4d3e9c7b7c57 100644
--- a/include/scsi/fc_frame.h
+++ b/include/scsi/fc_frame.h
@@ -28,6 +28,8 @@
 #include <scsi/fc/fc_fcp.h>
 #include <scsi/fc/fc_encaps.h>
+#include <linux/if_ether.h>
 /*
 * The fc_frame interface is used to pass frame data between functions.
 * The frame includes the data buffer, length, and SOF / EOF delimiter types.
@@ -37,6 +39,9 @@
 #define FC_FRAME_HEADROOM       32      /* headroom for VLAN + FCoE headers */
 #define FC_FRAME_TAILROOM       8       /* trailer space for FCoE */
+/* Max number of skb frags allowed, reserving one for fcoe_crc_eof page */
+#define FC_FRAME_SG_LEN         (MAX_SKB_FRAGS - 1)
 #define fp_skb(fp)      (&((fp)->skb))
 #define fr_hdr(fp)      ((fp)->skb.data)
 #define fr_len(fp)      ((fp)->skb.len)
@@ -64,6 +69,7 @@ struct fcoe_rcv_info {
        enum fc_sof     fr_sof;         /* start of frame delimiter */
        enum fc_eof     fr_eof;         /* end of frame delimiter */
        u8              fr_flags;       /* flags - see below */
+        u8              granted_mac[ETH_ALEN]; /* FCoE MAC address */
 };
@@ -94,17 +100,7 @@ static inline void fc_frame_init(struct fc_frame *fp)
 }
 struct fc_frame *fc_frame_alloc_fill(struct fc_lport *, size_t payload_len);
+struct fc_frame *_fc_frame_alloc(size_t payload_len);
-struct fc_frame *__fc_frame_alloc(size_t payload_len);
-/*
- * Get frame for sending via port.
- */
-static inline struct fc_frame *_fc_frame_alloc(struct fc_lport *dev,
-                                               size_t payload_len)
-{
-        return __fc_frame_alloc(payload_len);
-}
 /*
 * Allocate fc_frame structure and buffer.  Set the initial length to
@@ -118,10 +114,10 @@ static inline struct fc_frame *fc_frame_alloc(struct fc_lport *dev, size_t len)
         * Note: Since len will often be a constant multiple of 4,
         * this check will usually be evaluated and eliminated at compile time.
         */
-        if ((len % 4) != 0)
+        if (len && len % 4)
                fp = fc_frame_alloc_fill(dev, len);
        else
-                fp = _fc_frame_alloc(dev, len);
+                fp = _fc_frame_alloc(len);
        return fp;
 }
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index d67dda2b6aa0..66d377b9c72b 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -311,6 +311,8 @@ enum iscsi_param {
        ISCSI_PARAM_IFACE_NAME,
        ISCSI_PARAM_ISID,
        ISCSI_PARAM_INITIATOR_NAME,
+        ISCSI_PARAM_TGT_RESET_TMO,
        /* must always be last */
        ISCSI_PARAM_MAX,
 };
@@ -350,6 +352,7 @@ enum iscsi_param {
 #define ISCSI_IFACE_NAME                (1ULL << ISCSI_PARAM_IFACE_NAME)
 #define ISCSI_ISID                      (1ULL << ISCSI_PARAM_ISID)
 #define ISCSI_INITIATOR_NAME            (1ULL << ISCSI_PARAM_INITIATOR_NAME)
+#define ISCSI_TGT_RESET_TMO             (1ULL << ISCSI_PARAM_TGT_RESET_TMO)
 /* iSCSI HBA params */
 enum iscsi_host_param {
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index f2a2c1169486..dd0a52cea95a 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -279,6 +279,8 @@ struct iscsi_tm {
 #define ISCSI_TM_FUNC_TARGET_COLD_RESET         7
 #define ISCSI_TM_FUNC_TASK_REASSIGN             8
+#define ISCSI_TM_FUNC_VALUE(hdr) ((hdr)->flags & ISCSI_FLAG_TM_FUNC_MASK)
 /* SCSI Task Management Response Header */
 struct iscsi_tm_rsp {
        uint8_t opcode;
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 65dc9aacbf70..4b912eee33e5 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -26,6 +26,7 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
+#include <scsi/scsi_bsg_fc.h>
 #include <scsi/fc/fc_fcp.h>
 #include <scsi/fc/fc_ns.h>
@@ -34,67 +35,6 @@
 #include <scsi/fc_frame.h>
-#define FC_LIBFC_LOGGING 0x01 /* General logging, not categorized */
-#define FC_LPORT_LOGGING 0x02 /* lport layer logging */
-#define FC_DISC_LOGGING  0x04 /* discovery layer logging */
-#define FC_RPORT_LOGGING 0x08 /* rport layer logging */
-#define FC_FCP_LOGGING   0x10 /* I/O path logging */
-#define FC_EM_LOGGING    0x20 /* Exchange Manager logging */
-#define FC_EXCH_LOGGING  0x40 /* Exchange/Sequence logging */
-#define FC_SCSI_LOGGING  0x80 /* SCSI logging (mostly error handling) */
-extern unsigned int fc_debug_logging;
-#define FC_CHECK_LOGGING(LEVEL, CMD)                            \
-do {                                                            \
-        if (unlikely(fc_debug_logging & LEVEL))                 \
-                do {                                            \
-                        CMD;                                    \
-                } while (0);                                    \
-} while (0)
-#define FC_LIBFC_DBG(fmt, args...)                                      \
-        FC_CHECK_LOGGING(FC_LIBFC_LOGGING,                              \
-                         printk(KERN_INFO "libfc: " fmt, ##args))
-#define FC_LPORT_DBG(lport, fmt, args...)                               \
-        FC_CHECK_LOGGING(FC_LPORT_LOGGING,                              \
-                         printk(KERN_INFO "host%u: lport %6x: " fmt,    \
-                                (lport)->host->host_no,                 \
-                                fc_host_port_id((lport)->host), ##args))
-#define FC_DISC_DBG(disc, fmt, args...)                                 \
-        FC_CHECK_LOGGING(FC_DISC_LOGGING,                               \
-                         printk(KERN_INFO "host%u: disc: " fmt,         \
-                                (disc)->lport->host->host_no,           \
-                                ##args))
-#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...)                   \
-        FC_CHECK_LOGGING(FC_RPORT_LOGGING,                              \
-                         printk(KERN_INFO "host%u: rport %6x: " fmt,    \
-                                (lport)->host->host_no,                 \
-                                (port_id), ##args))
-#define FC_RPORT_DBG(rdata, fmt, args...)                               \
-        FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args)
-#define FC_FCP_DBG(pkt, fmt, args...)                                   \
-        FC_CHECK_LOGGING(FC_FCP_LOGGING,                                \
-                         printk(KERN_INFO "host%u: fcp: %6x: " fmt,     \
-                                (pkt)->lp->host->host_no,               \
-                                pkt->rport->port_id, ##args))
-#define FC_EXCH_DBG(exch, fmt, args...)                                 \
-        FC_CHECK_LOGGING(FC_EXCH_LOGGING,                               \
-                         printk(KERN_INFO "host%u: xid %4x: " fmt,      \
-                                (exch)->lp->host->host_no,              \
-                                exch->xid, ##args))
-#define FC_SCSI_DBG(lport, fmt, args...)                                \
-        FC_CHECK_LOGGING(FC_SCSI_LOGGING,                               \
-                         printk(KERN_INFO "host%u: scsi: " fmt,         \
-                                (lport)->host->host_no, ##args))
 /*
 * libfc error codes
 */
@@ -115,15 +55,28 @@ do {								\
                p[2] = ((v) & 0xFF);            \
        } while (0)
-/*
+/**
- * FC HBA status
+ * enum fc_lport_state - Local port states
+ * @LPORT_ST_DISABLED: Disabled
+ * @LPORT_ST_FLOGI:    Fabric login (FLOGI) sent
+ * @LPORT_ST_DNS:      Waiting for name server remote port to become ready
+ * @LPORT_ST_RPN_ID:   Register port name by ID (RPN_ID) sent
+ * @LPORT_ST_RFT_ID:   Register Fibre Channel types by ID (RFT_ID) sent
+ * @LPORT_ST_RFF_ID:   Register FC-4 Features by ID (RFF_ID) sent
+ * @LPORT_ST_SCR:      State Change Register (SCR) sent
+ * @LPORT_ST_READY:    Ready for use
+ * @LPORT_ST_LOGO:     Local port logout (LOGO) sent
+ * @LPORT_ST_RESET:    Local port reset
 */
 enum fc_lport_state {
        LPORT_ST_DISABLED = 0,
        LPORT_ST_FLOGI,
        LPORT_ST_DNS,
-        LPORT_ST_RPN_ID,
+        LPORT_ST_RNN_ID,
+        LPORT_ST_RSNN_NN,
+        LPORT_ST_RSPN_ID,
        LPORT_ST_RFT_ID,
+        LPORT_ST_RFF_ID,
        LPORT_ST_SCR,
        LPORT_ST_READY,
        LPORT_ST_LOGO,
@@ -136,15 +89,28 @@ enum fc_disc_event {
        DISC_EV_FAILED
 };
+/**
+ * enum fc_rport_state - Remote port states
+ * @RPORT_ST_INIT:    Initialized
+ * @RPORT_ST_PLOGI:   Waiting for PLOGI completion
+ * @RPORT_ST_PRLI:    Waiting for PRLI completion
+ * @RPORT_ST_RTV:     Waiting for RTV completion
+ * @RPORT_ST_READY:   Ready for use
+ * @RPORT_ST_LOGO:    Remote port logout (LOGO) sent
+ * @RPORT_ST_ADISC:   Discover Address sent
+ * @RPORT_ST_DELETE:  Remote port being deleted
+ * @RPORT_ST_RESTART: Remote port being deleted and will restart
+*/
 enum fc_rport_state {
-        RPORT_ST_INIT,          /* initialized */
+        RPORT_ST_INIT,
-        RPORT_ST_PLOGI,         /* waiting for PLOGI completion */
+        RPORT_ST_PLOGI,
-        RPORT_ST_PRLI,          /* waiting for PRLI completion */
+        RPORT_ST_PRLI,
-        RPORT_ST_RTV,           /* waiting for RTV completion */
+        RPORT_ST_RTV,
-        RPORT_ST_READY,         /* ready for use */
+        RPORT_ST_READY,
-        RPORT_ST_LOGO,          /* port logout sent */
+        RPORT_ST_LOGO,
-        RPORT_ST_ADISC,         /* Discover Address sent */
+        RPORT_ST_ADISC,
-        RPORT_ST_DELETE,        /* port being deleted */
+        RPORT_ST_DELETE,
+        RPORT_ST_RESTART,
 };
 /**
@@ -155,12 +121,20 @@ enum fc_rport_state {
 * @port_id:    Port ID of the discovered port
 */
 struct fc_disc_port {
-        struct fc_lport             *lp;
+        struct fc_lport    *lp;
-        struct list_head            peers;
+        struct list_head   peers;
-        struct work_struct          rport_work;
+        struct work_struct rport_work;
-        u32                         port_id;
+        u32                port_id;
 };
+/**
+ * enum fc_rport_event - Remote port events
+ * @RPORT_EV_NONE:   No event
+ * @RPORT_EV_READY:  Remote port is ready for use
+ * @RPORT_EV_FAILED: State machine failed, remote port is not ready
+ * @RPORT_EV_STOP:   Remote port has been stopped
+ * @RPORT_EV_LOGO:   Remote port logout (LOGO) sent
+ */
 enum fc_rport_event {
        RPORT_EV_NONE = 0,
        RPORT_EV_READY,
@@ -171,6 +145,10 @@ enum fc_rport_event {
 struct fc_rport_priv;
+/**
+ * struct fc_rport_operations - Operations for a remote port
+ * @event_callback: Function to be called for remote port events
+ */
 struct fc_rport_operations {
        void (*event_callback)(struct fc_lport *, struct fc_rport_priv *,
                               enum fc_rport_event);
@@ -178,11 +156,11 @@ struct fc_rport_operations {
 /**
 * struct fc_rport_libfc_priv - libfc internal information about a remote port
- * @local_port: Fibre Channel host port instance
+ * @local_port: The associated local port
- * @rp_state: indicates READY for I/O or DELETE when blocked.
+ * @rp_state:   Indicates READY for I/O or DELETE when blocked
- * @flags: REC and RETRY supported flags
+ * @flags:      REC and RETRY supported flags
- * @e_d_tov: error detect timeout value (in msec)
+ * @e_d_tov:    Error detect timeout value (in msec)
- * @r_a_tov: resource allocation timeout value (in msec)
+ * @r_a_tov:    Resource allocation timeout value (in msec)
 */
 struct fc_rport_libfc_priv {
        struct fc_lport            *local_port;
@@ -195,47 +173,66 @@ struct fc_rport_libfc_priv {
 };
 /**
- * struct fc_rport_priv - libfc rport and discovery info about a remote port
+ * struct fc_rport_priv - libfc remote port and discovery info
- * @local_port: Fibre Channel host port instance
+ * @local_port:     The associated local port
- * @rport: transport remote port
+ * @rport:          The FC transport remote port
- * @kref: reference counter
+ * @kref:           Reference counter
- * @rp_state: state tracks progress of PLOGI, PRLI, and RTV exchanges
+ * @rp_state:       Enumeration that tracks progress of PLOGI, PRLI,
- * @ids: remote port identifiers and roles
+ *                  and RTV exchanges
- * @flags: REC and RETRY supported flags
+ * @ids:            The remote port identifiers and roles
- * @max_seq: maximum number of concurrent sequences
+ * @flags:          REC and RETRY supported flags
- * @disc_id: discovery identifier
+ * @max_seq:        Maximum number of concurrent sequences
- * @maxframe_size: maximum frame size
+ * @disc_id:        The discovery identifier
- * @retries: retry count in current state
+ * @maxframe_size:  The maximum frame size
- * @e_d_tov: error detect timeout value (in msec)
+ * @retries:        The retry count for the current state
- * @r_a_tov: resource allocation timeout value (in msec)
+ * @e_d_tov:        Error detect timeout value (in msec)
- * @rp_mutex: mutex protects rport
+ * @r_a_tov:        Resource allocation timeout value (in msec)
- * @retry_work:
+ * @rp_mutex:       The mutex that protects the remote port
- * @event_callback: Callback for rport READY, FAILED or LOGO
+ * @retry_work:     Handle for retries
+ * @event_callback: Callback when READY, FAILED or LOGO states complete
 */
 struct fc_rport_priv {
-        struct fc_lport            *local_port;
+        struct fc_lport             *local_port;
-        struct fc_rport            *rport;
+        struct fc_rport             *rport;
-        struct kref                kref;
+        struct kref                 kref;
-        enum fc_rport_state        rp_state;
+        enum fc_rport_state         rp_state;
        struct fc_rport_identifiers ids;
-        u16                        flags;
+        u16                         flags;
-        u16                        max_seq;
+        u16                         max_seq;
-        u16                        disc_id;
+        u16                         disc_id;
-        u16                        maxframe_size;
+        u16                         maxframe_size;
-        unsigned int               retries;
+        unsigned int                retries;
-        unsigned int               e_d_tov;
+        unsigned int                e_d_tov;
-        unsigned int               r_a_tov;
+        unsigned int                r_a_tov;
-        struct mutex               rp_mutex;
+        struct mutex                rp_mutex;
-        struct delayed_work        retry_work;
+        struct delayed_work         retry_work;
-        enum fc_rport_event        event;
+        enum fc_rport_event         event;
-        struct fc_rport_operations *ops;
+        struct fc_rport_operations  *ops;
-        struct list_head           peers;
+        struct list_head            peers;
-        struct work_struct         event_work;
+        struct work_struct          event_work;
-        u32                        supported_classes;
+        u32                         supported_classes;
 };
-/*
+/**
- * fcoe stats structure
+ * struct fcoe_dev_stats - fcoe stats structure
+ * @SecondsSinceLastReset: Seconds since the last reset
+ * @TxFrames:              Number of transmitted frames
+ * @TxWords:               Number of transmitted words
+ * @RxFrames:              Number of received frames
+ * @RxWords:               Number of received words
+ * @ErrorFrames:           Number of received error frames
+ * @DumpedFrames:          Number of dumped frames
+ * @LinkFailureCount:      Number of link failures
+ * @LossOfSignalCount:     Number for signal losses
+ * @InvalidTxWordCount:    Number of invalid transmitted words
+ * @InvalidCRCCount:       Number of invalid CRCs
+ * @InputRequests:         Number of input requests
+ * @OutputRequests:        Number of output requests
+ * @ControlRequests:       Number of control requests
+ * @InputMegabytes:        Number of received megabytes
+ * @OutputMegabytes:       Number of transmitted megabytes
+ * @VLinkFailureCount:     Number of virtual link failures
+ * @MissDiscAdvCount:      Number of missing FIP discovery advertisement
 */
 struct fcoe_dev_stats {
        u64             SecondsSinceLastReset;
@@ -254,12 +251,17 @@ struct fcoe_dev_stats {
        u64             ControlRequests;
        u64             InputMegabytes;
        u64             OutputMegabytes;
+        u64             VLinkFailureCount;
+        u64             MissDiscAdvCount;
 };
-/*
+/**
- * els data is used for passing ELS respone specific
+ * struct fc_seq_els_data - ELS data used for passing ELS specific responses
- * data to send ELS response mainly using infomation
+ * @fp:     The ELS frame
- * in exchange and sequence in EM layer.
+ * @reason: The reason for rejection
+ * @explan: The explaination of the rejection
+ *
+ * Mainly used by the exchange manager layer.
 */
 struct fc_seq_els_data {
        struct fc_frame *fp;
@@ -267,77 +269,87 @@ struct fc_seq_els_data {
        enum fc_els_rjt_explan explan;
 };
-/*
+/**
- * FCP request structure, one for each scsi cmd request
+ * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
+ * @lp:              The associated local port
+ * @state:           The state of the I/O
+ * @tgt_flags:       Target's flags
+ * @ref_cnt:         Reference count
+ * @scsi_pkt_lock:   Lock to protect the SCSI packet (must be taken before the
+ *                   host_lock if both are to be held at the same time)
+ * @cmd:             The SCSI command (set and clear with the host_lock held)
+ * @list:            Tracks queued commands (accessed with the host_lock held)
+ * @timer:           The command timer
+ * @tm_done:         Completion indicator
+ * @wait_for_comp:   Indicator to wait for completion of the I/O (in jiffies)
+ * @start_time:      Timestamp indicating the start of the I/O (in jiffies)
+ * @end_time:        Timestamp indicating the end of the I/O (in jiffies)
+ * @last_pkt_time:   Timestamp of the last frame received (in jiffies)
+ * @data_len:        The length of the data
+ * @cdb_cmd:         The CDB command
+ * @xfer_len:        The transfer length
+ * @xfer_ddp:        Indicates if this transfer used DDP (XID of the exchange
+ *                   will be set here if DDP was setup)
+ * @xfer_contig_end: The offset into the buffer if the buffer is contiguous
+ *                   (Tx and Rx)
+ * @max_payload:     The maximum payload size (in bytes)
+ * @io_status:       SCSI result (upper 24 bits)
+ * @cdb_status:      CDB status
+ * @status_code:     FCP I/O status
+ * @scsi_comp_flags: Completion flags (bit 3 Underrun bit 2: overrun)
+ * @req_flags:       Request flags (bit 0: read bit:1 write)
+ * @scsi_resid:      SCSI residule length
+ * @rport:           The remote port that the SCSI command is targeted at
+ * @seq_ptr:         The sequence that will carry the SCSI command
+ * @recov_retry:     Number of recovery retries
+ * @recov_seq:       The sequence for REC or SRR
 */
 struct fc_fcp_pkt {
-        /*
+        /* Housekeeping information */
-         * housekeeping stuff
+        struct fc_lport   *lp;
-         */
+        u16               state;
-        struct fc_lport *lp;    /* handle to hba struct */
+        u16               tgt_flags;
-        u16             state;          /* scsi_pkt state state */
+        atomic_t          ref_cnt;
-        u16             tgt_flags;      /* target flags  */
+        spinlock_t        scsi_pkt_lock;
-        atomic_t        ref_cnt;        /* fcp pkt ref count */
-        spinlock_t      scsi_pkt_lock;  /* Must be taken before the host lock
+        /* SCSI I/O related information */
-                                         * if both are held at the same time */
+        struct scsi_cmnd  *cmd;
-        /*
+        struct list_head  list;
-         * SCSI I/O related stuff
-         */
+        /* Timeout related information */
-        struct scsi_cmnd *cmd;          /* scsi command pointer. set/clear
+        struct timer_list timer;
-                                         * under host lock */
-        struct list_head list;          /* tracks queued commands. access under
-                                         * host lock */
-        /*
-         * timeout related stuff
-         */
-        struct timer_list timer;        /* command timer */
        struct completion tm_done;
-        int     wait_for_comp;
+        int               wait_for_comp;
-        unsigned long   start_time;     /* start jiffie */
+        unsigned long     start_time;
-        unsigned long   end_time;       /* end jiffie */
+        unsigned long     end_time;
-        unsigned long   last_pkt_time;   /* jiffies of last frame received */
+        unsigned long     last_pkt_time;
-        /*
+        /* SCSI command and data transfer information */
-         * scsi cmd and data transfer information
+        u32               data_len;
-         */
-        u32             data_len;
+        /* Transport related veriables */
-        /*
+        struct fcp_cmnd   cdb_cmd;
-         * transport related veriables
+        size_t            xfer_len;
-         */
+        u16               xfer_ddp;
-        struct fcp_cmnd cdb_cmd;
+        u32               xfer_contig_end;
-        size_t          xfer_len;
+        u16               max_payload;
-        u16             xfer_ddp;       /* this xfer is ddped */
-        u32             xfer_contig_end; /* offset of end of contiguous xfer */
+        /* SCSI/FCP return status */
-        u16             max_payload;    /* max payload size in bytes */
+        u32               io_status;
+        u8                cdb_status;
-        /*
+        u8                status_code;
-         * scsi/fcp return status
+        u8                scsi_comp_flags;
-         */
+        u32               req_flags;
-        u32             io_status;      /* SCSI result upper 24 bits */
+        u32               scsi_resid;
-        u8              cdb_status;
-        u8              status_code;    /* FCP I/O status */
+        /* Associated structures */
-        /* bit 3 Underrun bit 2: overrun */
+        struct fc_rport   *rport;
-        u8              scsi_comp_flags;
+        struct fc_seq     *seq_ptr;
-        u32             req_flags;      /* bit 0: read bit:1 write */
-        u32             scsi_resid;     /* residule length */
+        /* Error Processing information */
+        u8                recov_retry;
-        struct fc_rport *rport;         /* remote port pointer */
+        struct fc_seq     *recov_seq;
-        struct fc_seq   *seq_ptr;       /* current sequence pointer */
-        /*
-         * Error Processing
-         */
-        u8              recov_retry;    /* count of recovery retries */
-        struct fc_seq   *recov_seq;     /* sequence for REC or SRR */
 };
-/*
- * FC_FCP HELPER FUNCTIONS
- *****************************/
-static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
-{
-        if (fsp && fsp->cmd)
-                return fsp->cmd->sc_data_direction == DMA_FROM_DEVICE;
-        return false;
-}
 /*
 * Structure and function definitions for managing Fibre Channel Exchanges
@@ -350,23 +362,51 @@ static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
 struct fc_exch_mgr;
 struct fc_exch_mgr_anchor;
-extern u16      fc_cpu_mask;    /* cpu mask for possible cpus */
+extern u16 fc_cpu_mask; /* cpu mask for possible cpus */
-/*
+/**
- * Sequence.
+ * struct fc_seq - FC sequence
+ * @id:       The sequence ID
+ * @ssb_stat: Status flags for the sequence status block (SSB)
+ * @cnt:      Number of frames sent so far
+ * @rec_data: FC-4 value for REC
 */
 struct fc_seq {
-        u8      id;             /* seq ID */
+        u8  id;
-        u16     ssb_stat;       /* status flags for sequence status block */
+        u16 ssb_stat;
-        u16     cnt;            /* frames sent so far on sequence */
+        u16 cnt;
-        u32     rec_data;       /* FC-4 value for REC */
+        u32 rec_data;
 };
 #define FC_EX_DONE              (1 << 0) /* ep is completed */
 #define FC_EX_RST_CLEANUP       (1 << 1) /* reset is forcing completion */
-/*
+/**
- * Exchange.
+ * struct fc_exch - Fibre Channel Exchange
+ * @em:           Exchange manager
+ * @pool:         Exchange pool
+ * @state:        The exchange's state
+ * @xid:          The exchange ID
+ * @ex_list:      Handle used by the EM to track free exchanges
+ * @ex_lock:      Lock that protects the exchange
+ * @ex_refcnt:    Reference count
+ * @timeout_work: Handle for timeout handler
+ * @lp:           The local port that this exchange is on
+ * @oxid:         Originator's exchange ID
+ * @rxid:         Responder's exchange ID
+ * @oid:          Originator's FCID
+ * @sid:          Source FCID
+ * @did:          Destination FCID
+ * @esb_stat:     ESB exchange status
+ * @r_a_tov:      Resouce allocation time out value (in msecs)
+ * @seq_id:       The next sequence ID to use
+ * @f_ctl:        F_CTL flags for the sequence
+ * @fh_type:      The frame type
+ * @class:        The class of service
+ * @seq:          The sequence in use on this exchange
+ * @resp:         Callback for responses on this exchange
+ * @destructor:   Called when destroying the exchange
+ * @arg:          Passed as a void pointer to the resp() callback
 *
 * Locking notes: The ex_lock protects following items:
 *      state, esb_stat, f_ctl, seq.ssb_stat
@@ -374,76 +414,59 @@ struct fc_seq {
 *      sequence allocation
 */
 struct fc_exch {
-        struct fc_exch_mgr *em;         /* exchange manager */
+        struct fc_exch_mgr  *em;
-        struct fc_exch_pool *pool;      /* per cpu exches pool */
+        struct fc_exch_pool *pool;
-        u32             state;          /* internal driver state */
+        u32                 state;
-        u16             xid;            /* our exchange ID */
+        u16                 xid;
-        struct list_head        ex_list;        /* free or busy list linkage */
+        struct list_head    ex_list;
-        spinlock_t      ex_lock;        /* lock covering exchange state */
+        spinlock_t          ex_lock;
-        atomic_t        ex_refcnt;      /* reference counter */
+        atomic_t            ex_refcnt;
-        struct delayed_work timeout_work; /* timer for upper level protocols */
+        struct delayed_work timeout_work;
-        struct fc_lport *lp;            /* fc device instance */
+        struct fc_lport     *lp;
-        u16             oxid;           /* originator's exchange ID */
+        u16                 oxid;
-        u16             rxid;           /* responder's exchange ID */
+        u16                 rxid;
-        u32             oid;            /* originator's FCID */
+        u32                 oid;
-        u32             sid;            /* source FCID */
+        u32                 sid;
-        u32             did;            /* destination FCID */
+        u32                 did;
-        u32             esb_stat;       /* exchange status for ESB */
+        u32                 esb_stat;
-        u32             r_a_tov;        /* r_a_tov from rport (msec) */
+        u32                 r_a_tov;
-        u8              seq_id;         /* next sequence ID to use */
+        u8                  seq_id;
-        u32             f_ctl;          /* F_CTL flags for sequences */
+        u32                 f_ctl;
-        u8              fh_type;        /* frame type */
+        u8                  fh_type;
-        enum fc_class   class;          /* class of service */
+        enum fc_class       class;
-        struct fc_seq   seq;            /* single sequence */
+        struct fc_seq       seq;
-        /*
-         * Handler for responses to this current exchange.
+        void                (*resp)(struct fc_seq *, struct fc_frame *, void *);
-         */
+        void                *arg;
-        void            (*resp)(struct fc_seq *, struct fc_frame *, void *);
-        void            (*destructor)(struct fc_seq *, void *);
+        void                (*destructor)(struct fc_seq *, void *);
-        /*
-         * arg is passed as void pointer to exchange
-         * resp and destructor handlers
-         */
-        void            *arg;
 };
 #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
-struct libfc_function_template {
+struct libfc_function_template {
        /*
         * Interface to send a FC frame
         *
         * STATUS: REQUIRED
         */
-        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
+        int (*frame_send)(struct fc_lport *, struct fc_frame *);
        /*
         * Interface to send ELS/CT frames
         *
         * STATUS: OPTIONAL
         */
-        struct fc_seq *(*elsct_send)(struct fc_lport *lport,
+        struct fc_seq *(*elsct_send)(struct fc_lport *, u32 did,
-                                     u32 did,
+                                     struct fc_frame *, unsigned int op,
-                                     struct fc_frame *fp,
-                                     unsigned int op,
                                     void (*resp)(struct fc_seq *,
-                                             struct fc_frame *fp,
+                                             struct fc_frame *, void *arg),
-                                             void *arg),
                                     void *arg, u32 timer_msec);
        /*
         * Send the FC frame payload using a new exchange and sequence.
         *
-         * The frame pointer with some of the header's fields must be
-         * filled before calling exch_seq_send(), those fields are,
-         *
-         * - routing control
-         * - FC port did
-         * - FC port sid
-         * - FC header type
-         * - frame control
-         * - parameter or relative offset
-         *
         * The exchange response handler is set in this routine to resp()
         * function pointer. It can be called in two scenarios: if a timeout
         * occurs or if a response frame is received for the exchange. The
@@ -464,14 +487,13 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        struct fc_seq *(*exch_seq_send)(struct fc_lport *lp,
+        struct fc_seq *(*exch_seq_send)(struct fc_lport *, struct fc_frame *,
-                                        struct fc_frame *fp,
+                                        void (*resp)(struct fc_seq *,
-                                        void (*resp)(struct fc_seq *sp,
+                                                     struct fc_frame *,
-                                                     struct fc_frame *fp,
+                                                     void *),
-                                                     void *arg),
+                                        void (*destructor)(struct fc_seq *,
-                                        void (*destructor)(struct fc_seq *sp,
+                                                           void *),
-                                                           void *arg),
+                                        void *, unsigned int timer_msec);
-                                        void *arg, unsigned int timer_msec);
        /*
         * Sets up the DDP context for a given exchange id on the given
@@ -479,22 +501,28 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        int (*ddp_setup)(struct fc_lport *lp, u16 xid,
+        int (*ddp_setup)(struct fc_lport *, u16, struct scatterlist *,
-                         struct scatterlist *sgl, unsigned int sgc);
+                         unsigned int);
        /*
         * Completes the DDP transfer and returns the length of data DDPed
         * for the given exchange id.
         *
         * STATUS: OPTIONAL
         */
-        int (*ddp_done)(struct fc_lport *lp, u16 xid);
+        int (*ddp_done)(struct fc_lport *, u16);
+        /*
+         * Allow LLD to fill its own Link Error Status Block
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);
        /*
         * Send a frame using an existing sequence and exchange.
         *
         * STATUS: OPTIONAL
         */
-        int (*seq_send)(struct fc_lport *lp, struct fc_seq *sp,
+        int (*seq_send)(struct fc_lport *, struct fc_seq *,
-                        struct fc_frame *fp);
+                        struct fc_frame *);
        /*
         * Send an ELS response using infomation from a previous
@@ -502,8 +530,8 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
+        void (*seq_els_rsp_send)(struct fc_seq *, enum fc_els_cmd,
-                                 struct fc_seq_els_data *els_data);
+                                 struct fc_seq_els_data *);
        /*
         * Abort an exchange and sequence. Generally called because of a
@@ -515,7 +543,7 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        int (*seq_exch_abort)(const struct fc_seq *req_sp,
+        int (*seq_exch_abort)(const struct fc_seq *,
                              unsigned int timer_msec);
        /*
@@ -524,14 +552,14 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*exch_done)(struct fc_seq *sp);
+        void (*exch_done)(struct fc_seq *);
        /*
         * Start a new sequence on the same exchange/sequence tuple.
         *
         * STATUS: OPTIONAL
         */
-        struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
+        struct fc_seq *(*seq_start_next)(struct fc_seq *);
        /*
         * Reset an exchange manager, completing all sequences and exchanges.
@@ -540,8 +568,7 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*exch_mgr_reset)(struct fc_lport *,
+        void (*exch_mgr_reset)(struct fc_lport *, u32 s_id, u32 d_id);
-                               u32 s_id, u32 d_id);
        /*
         * Flush the rport work queue. Generally used before shutdown.
@@ -555,8 +582,8 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
+        void (*lport_recv)(struct fc_lport *, struct fc_seq *,
-                           struct fc_frame *fp);
+                           struct fc_frame *);
        /*
         * Reset the local port.
@@ -566,6 +593,26 @@ struct libfc_function_template {
        int (*lport_reset)(struct fc_lport *);
        /*
+         * Set the local port FC_ID.
+         *
+         * This may be provided by the LLD to allow it to be
+         * notified when the local port is assigned a FC-ID.
+         *
+         * The frame, if non-NULL, is the incoming frame with the
+         * FLOGI LS_ACC or FLOGI, and may contain the granted MAC
+         * address for the LLD.  The frame pointer may be NULL if
+         * no MAC is associated with this assignment (LOGO or PLOGI).
+         *
+         * If FC_ID is non-zero, r_a_tov and e_d_tov must be valid.
+         *
+         * Note: this is called with the local port mutex held.
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*lport_set_port_id)(struct fc_lport *, u32 port_id,
+                                  struct fc_frame *);
+        /*
         * Create a remote port with a given port ID
         *
         * STATUS: OPTIONAL
@@ -622,31 +669,31 @@ struct libfc_function_template {
         *
         * STATUS: OPTIONAL
         */
-        int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
+        int (*fcp_cmd_send)(struct fc_lport *, struct fc_fcp_pkt *,
-                            void (*resp)(struct fc_seq *, struct fc_frame *fp,
+                            void (*resp)(struct fc_seq *, struct fc_frame *,
-                                         void *arg));
+                                         void *));
        /*
         * Cleanup the FCP layer, used durring link down and reset
         *
         * STATUS: OPTIONAL
         */
-        void (*fcp_cleanup)(struct fc_lport *lp);
+        void (*fcp_cleanup)(struct fc_lport *);
        /*
         * Abort all I/O on a local port
         *
         * STATUS: OPTIONAL
         */
-        void (*fcp_abort_io)(struct fc_lport *lp);
+        void (*fcp_abort_io)(struct fc_lport *);
        /*
         * Receive a request for the discovery layer.
         *
         * STATUS: OPTIONAL
         */
-        void (*disc_recv_req)(struct fc_seq *,
+        void (*disc_recv_req)(struct fc_seq *, struct fc_frame *,
-                              struct fc_frame *, struct fc_lport *);
+                              struct fc_lport *);
        /*
         * Start discovery for a local port.
@@ -675,419 +722,340 @@ struct libfc_function_template {
        void (*disc_stop_final) (struct fc_lport *);
 };
-/* information used by the discovery layer */
+/**
+ * struct fc_disc - Discovery context
+ * @retry_count:   Number of retries
+ * @pending:       1 if discovery is pending, 0 if not
+ * @requesting:    1 if discovery has been requested, 0 if not
+ * @seq_count:     Number of sequences used for discovery
+ * @buf_len:       Length of the discovery buffer
+ * @disc_id:       Discovery ID
+ * @rports:        List of discovered remote ports
+ * @lport:         The local port that discovery is for
+ * @disc_mutex:    Mutex that protects the discovery context
+ * @partial_buf:   Partial name buffer (if names are returned
+ *                 in multiple frames)
+ * @disc_work:     handle for delayed work context
+ * @disc_callback: Callback routine called when discovery completes
+ */
 struct fc_disc {
-        unsigned char           retry_count;
+        unsigned char         retry_count;
-        unsigned char           pending;
+        unsigned char         pending;
-        unsigned char           requested;
+        unsigned char         requested;
-        unsigned short          seq_count;
+        unsigned short        seq_count;
-        unsigned char           buf_len;
+        unsigned char         buf_len;
-        u16                     disc_id;
+        u16                   disc_id;
+        struct list_head      rports;
+        struct fc_lport       *lport;
+        struct mutex          disc_mutex;
+        struct fc_gpn_ft_resp partial_buf;
+        struct delayed_work   disc_work;
        void (*disc_callback)(struct fc_lport *,
                              enum fc_disc_event);
-        struct list_head         rports;
-        struct fc_lport         *lport;
-        struct mutex            disc_mutex;
-        struct fc_gpn_ft_resp   partial_buf;    /* partial name buffer */
-        struct delayed_work     disc_work;
 };
+/**
+ * struct fc_lport - Local port
+ * @host:                  The SCSI host associated with a local port
+ * @ema_list:              Exchange manager anchor list
+ * @dns_rdata:             The directory server remote port
+ * @ptp_rdata:             Point to point remote port
+ * @scsi_priv:             FCP layer internal data
+ * @disc:                  Discovery context
+ * @vports:                Child vports if N_Port
+ * @vport:                 Parent vport if VN_Port
+ * @tt:                    Libfc function template
+ * @link_up:               Link state (1 = link up, 0 = link down)
+ * @qfull:                 Queue state (1 queue is full, 0 queue is not full)
+ * @state:                 Identifies the state
+ * @boot_time:             Timestamp indicating when the local port came online
+ * @host_stats:            SCSI host statistics
+ * @dev_stats:             FCoE device stats (TODO: libfc should not be
+ *                         FCoE aware)
+ * @retry_count:           Number of retries in the current state
+ * @wwpn:                  World Wide Port Name
+ * @wwnn:                  World Wide Node Name
+ * @service_params:        Common service parameters
+ * @e_d_tov:               Error detection timeout value
+ * @r_a_tov:               Resouce allocation timeout value
+ * @rnid_gen:              RNID information
+ * @sg_supp:               Indicates if scatter gather is supported
+ * @seq_offload:           Indicates if sequence offload is supported
+ * @crc_offload:           Indicates if CRC offload is supported
+ * @lro_enabled:           Indicates if large receive offload is supported
+ * @does_npiv:             Supports multiple vports
+ * @npiv_enabled:          Switch/fabric allows NPIV
+ * @mfs:                   The maximum Fibre Channel payload size
+ * @max_retry_count:       The maximum retry attempts
+ * @max_rport_retry_count: The maximum remote port retry attempts
+ * @lro_xid:               The maximum XID for LRO
+ * @lso_max:               The maximum large offload send size
+ * @fcts:                  FC-4 type mask
+ * @lp_mutex:              Mutex to protect the local port
+ * @list:                  Handle for list of local ports
+ * @retry_work:            Handle to local port for delayed retry context
+ */
 struct fc_lport {
-        struct list_head list;
        /* Associations */
-        struct Scsi_Host        *host;
+        struct Scsi_Host               *host;
-        struct list_head        ema_list;
+        struct list_head               ema_list;
-        struct fc_rport_priv    *dns_rp;
+        struct fc_rport_priv           *dns_rdata;
-        struct fc_rport_priv    *ptp_rp;
+        struct fc_rport_priv           *ptp_rdata;
-        void                    *scsi_priv;
+        void                           *scsi_priv;
-        struct fc_disc          disc;
+        struct fc_disc                 disc;
+        /* Virtual port information */
+        struct list_head               vports;
+        struct fc_vport                *vport;
        /* Operational Information */
        struct libfc_function_template tt;
-        u8                      link_up;
+        u8                             link_up;
-        u8                      qfull;
+        u8                             qfull;
-        enum fc_lport_state     state;
+        enum fc_lport_state            state;
-        unsigned long           boot_time;
+        unsigned long                  boot_time;
+        struct fc_host_statistics      host_stats;
-        struct fc_host_statistics host_stats;
+        struct fcoe_dev_stats          *dev_stats;
-        struct fcoe_dev_stats   *dev_stats;
+        u8                             retry_count;
-        u64                     wwpn;
+        /* Fabric information */
-        u64                     wwnn;
+        u64                            wwpn;
-        u8                      retry_count;
+        u64                            wwnn;
+        unsigned int                   service_params;
+        unsigned int                   e_d_tov;
+        unsigned int                   r_a_tov;
+        struct fc_els_rnid_gen         rnid_gen;
        /* Capabilities */
-        u32                     sg_supp:1;      /* scatter gather supported */
+        u32                            sg_supp:1;
-        u32                     seq_offload:1;  /* seq offload supported */
+        u32                            seq_offload:1;
-        u32                     crc_offload:1;  /* crc offload supported */
+        u32                            crc_offload:1;
-        u32                     lro_enabled:1;  /* large receive offload */
+        u32                            lro_enabled:1;
-        u32                     mfs;            /* max FC payload size */
+        u32                            does_npiv:1;
-        unsigned int            service_params;
+        u32                            npiv_enabled:1;
-        unsigned int            e_d_tov;
+        u32                            mfs;
-        unsigned int            r_a_tov;
+        u8                             max_retry_count;
-        u8                      max_retry_count;
+        u8                             max_rport_retry_count;
-        u8                      max_rport_retry_count;
+        u16                            link_speed;
-        u16                     link_speed;
+        u16                            link_supported_speeds;
-        u16                     link_supported_speeds;
+        u16                            lro_xid;
-        u16                     lro_xid;        /* max xid for fcoe lro */
+        unsigned int                   lso_max;
-        unsigned int            lso_max;        /* max large send size */
+        struct fc_ns_fts               fcts;
-        struct fc_ns_fts        fcts;           /* FC-4 type masks */
-        struct fc_els_rnid_gen  rnid_gen;       /* RNID information */
-        /* Semaphores */
-        struct mutex lp_mutex;
        /* Miscellaneous */
-        struct delayed_work     retry_work;
+        struct mutex                   lp_mutex;
-        struct delayed_work     disc_work;
+        struct list_head               list;
+        struct delayed_work            retry_work;
 };
 /*
 * FC_LPORT HELPER FUNCTIONS
 *****************************/
-static inline int fc_lport_test_ready(struct fc_lport *lp)
+/**
+ * fc_lport_test_ready() - Determine if a local port is in the READY state
+ * @lport: The local port to test
+ */
+static inline int fc_lport_test_ready(struct fc_lport *lport)
 {
-        return lp->state == LPORT_ST_READY;
+        return lport->state == LPORT_ST_READY;
 }
-static inline void fc_set_wwnn(struct fc_lport *lp, u64 wwnn)
+/**
+ * fc_set_wwnn() - Set the World Wide Node Name of a local port
+ * @lport: The local port whose WWNN is to be set
+ * @wwnn:  The new WWNN
+ */
+static inline void fc_set_wwnn(struct fc_lport *lport, u64 wwnn)
 {
-        lp->wwnn = wwnn;
+        lport->wwnn = wwnn;
 }
-static inline void fc_set_wwpn(struct fc_lport *lp, u64 wwnn)
+/**
+ * fc_set_wwpn() - Set the World Wide Port Name of a local port
+ * @lport: The local port whose WWPN is to be set
+ * @wwnn:  The new WWPN
+ */
+static inline void fc_set_wwpn(struct fc_lport *lport, u64 wwnn)
 {
-        lp->wwpn = wwnn;
+        lport->wwpn = wwnn;
 }
-static inline void fc_lport_state_enter(struct fc_lport *lp,
+/**
+ * fc_lport_state_enter() - Change a local port's state
+ * @lport: The local port whose state is to change
+ * @state: The new state
+ */
+static inline void fc_lport_state_enter(struct fc_lport *lport,
                                        enum fc_lport_state state)
 {
-        if (state != lp->state)
+        if (state != lport->state)
-                lp->retry_count = 0;
+                lport->retry_count = 0;
-        lp->state = state;
+        lport->state = state;
 }
-static inline int fc_lport_init_stats(struct fc_lport *lp)
+/**
+ * fc_lport_init_stats() - Allocate per-CPU statistics for a local port
+ * @lport: The local port whose statistics are to be initialized
+ */
+static inline int fc_lport_init_stats(struct fc_lport *lport)
 {
-        /* allocate per cpu stats block */
+        lport->dev_stats = alloc_percpu(struct fcoe_dev_stats);
-        lp->dev_stats = alloc_percpu(struct fcoe_dev_stats);
+        if (!lport->dev_stats)
-        if (!lp->dev_stats)
                return -ENOMEM;
        return 0;
 }
-static inline void fc_lport_free_stats(struct fc_lport *lp)
+/**
+ * fc_lport_free_stats() - Free memory for a local port's statistics
+ * @lport: The local port whose statistics are to be freed
+ */
+static inline void fc_lport_free_stats(struct fc_lport *lport)
 {
-        free_percpu(lp->dev_stats);
+        free_percpu(lport->dev_stats);
 }
-static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lp)
+/**
+ * fc_lport_get_stats() - Get a local port's statistics
+ * @lport: The local port whose statistics are to be retreived
+ */
+static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lport)
 {
-        return per_cpu_ptr(lp->dev_stats, smp_processor_id());
+        return per_cpu_ptr(lport->dev_stats, smp_processor_id());
 }
-static inline void *lport_priv(const struct fc_lport *lp)
+/**
+ * lport_priv() - Return the private data from a local port
+ * @lport: The local port whose private data is to be retreived
+ */
+static inline void *lport_priv(const struct fc_lport *lport)
 {
-        return (void *)(lp + 1);
+        return (void *)(lport + 1);
 }
 /**
- * libfc_host_alloc() - Allocate a Scsi_Host with room for the fc_lport
+ * libfc_host_alloc() - Allocate a Scsi_Host with room for a local port and
- * @sht: ptr to the scsi host templ
+ *                      LLD private data
- * @priv_size: size of private data after fc_lport
+ * @sht:       The SCSI host template
+ * @priv_size: Size of private data
 *
- * Returns: ptr to Scsi_Host
+ * Returns: libfc lport
 */
-static inline struct Scsi_Host *
+static inline struct fc_lport *
 libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
 {
-        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+        struct fc_lport *lport;
+        struct Scsi_Host *shost;
+        shost = scsi_host_alloc(sht, sizeof(*lport) + priv_size);
+        if (!shost)
+                return NULL;
+        lport = shost_priv(shost);
+        lport->host = shost;
+        INIT_LIST_HEAD(&lport->ema_list);
+        INIT_LIST_HEAD(&lport->vports);
+        return lport;
 }
 /*
- * LOCAL PORT LAYER
+ * FC_FCP HELPER FUNCTIONS
 *****************************/
-int fc_lport_init(struct fc_lport *lp);
+static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
+{
-/*
+        if (fsp && fsp->cmd)
- * Destroy the specified local port by finding and freeing all
+                return fsp->cmd->sc_data_direction == DMA_FROM_DEVICE;
- * fc_rports associated with it and then by freeing the fc_lport
+        return false;
- * itself.
+}
- */
-int fc_lport_destroy(struct fc_lport *lp);
-/*
- * Logout the specified local port from the fabric
- */
-int fc_fabric_logoff(struct fc_lport *lp);
-/*
- * Initiate the LP state machine. This handler will use fc_host_attr
- * to store the FLOGI service parameters, so fc_host_attr must be
- * initialized before calling this handler.
- */
-int fc_fabric_login(struct fc_lport *lp);
 /*
- * The link is up for the given local port.
+ * LOCAL PORT LAYER
- */
+ *****************************/
+int fc_lport_init(struct fc_lport *);
+int fc_lport_destroy(struct fc_lport *);
+int fc_fabric_logoff(struct fc_lport *);
+int fc_fabric_login(struct fc_lport *);
+void __fc_linkup(struct fc_lport *);
 void fc_linkup(struct fc_lport *);
+void __fc_linkdown(struct fc_lport *);
-/*
- * Link is down for the given local port.
- */
 void fc_linkdown(struct fc_lport *);
+void fc_vport_setlink(struct fc_lport *);
-/*
+void fc_vports_linkchange(struct fc_lport *);
- * Configure the local port.
- */
 int fc_lport_config(struct fc_lport *);
-/*
- * Reset the local port.
- */
 int fc_lport_reset(struct fc_lport *);
+int fc_set_mfs(struct fc_lport *, u32 mfs);
-/*
+struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
- * Set the mfs or reset
+struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
- */
+int fc_lport_bsg_request(struct fc_bsg_job *);
-int fc_set_mfs(struct fc_lport *lp, u32 mfs);
 /*
 * REMOTE PORT LAYER
 *****************************/
-int fc_rport_init(struct fc_lport *lp);
+int fc_rport_init(struct fc_lport *);
-void fc_rport_terminate_io(struct fc_rport *rp);
+void fc_rport_terminate_io(struct fc_rport *);
 /*
 * DISCOVERY LAYER
 *****************************/
-int fc_disc_init(struct fc_lport *lp);
+int fc_disc_init(struct fc_lport *);
 /*
- * SCSI LAYER
+ * FCP LAYER
 *****************************/
-/*
- * Initialize the SCSI block of libfc
- */
 int fc_fcp_init(struct fc_lport *);
-/*
- * This section provides an API which allows direct interaction
- * with the SCSI-ml. Each of these functions satisfies a function
- * pointer defined in Scsi_Host and therefore is always called
- * directly from the SCSI-ml.
- */
-int fc_queuecommand(struct scsi_cmnd *sc_cmd,
-                    void (*done)(struct scsi_cmnd *));
-/*
- * complete processing of a fcp packet
- *
- * This function may sleep if a fsp timer is pending.
- * The host lock must not be held by caller.
- */
-void fc_fcp_complete(struct fc_fcp_pkt *fsp);
-/*
- * Send an ABTS frame to the target device. The sc_cmd argument
- * is a pointer to the SCSI command to be aborted.
- */
-int fc_eh_abort(struct scsi_cmnd *sc_cmd);
-/*
- * Reset a LUN by sending send the tm cmd to the target.
- */
-int fc_eh_device_reset(struct scsi_cmnd *sc_cmd);
-/*
- * Reset the host adapter.
- */
-int fc_eh_host_reset(struct scsi_cmnd *sc_cmd);
-/*
- * Check rport status.
- */
-int fc_slave_alloc(struct scsi_device *sdev);
-/*
- * Adjust the queue depth.
- */
-int fc_change_queue_depth(struct scsi_device *sdev, int qdepth);
-/*
- * Change the tag type.
- */
-int fc_change_queue_type(struct scsi_device *sdev, int tag_type);
-/*
- * Free memory pools used by the FCP layer.
- */
 void fc_fcp_destroy(struct fc_lport *);
 /*
- * Set up direct-data placement for this I/O request
+ * SCSI INTERACTION LAYER
- */
+ *****************************/
-void fc_fcp_ddp_setup(struct fc_fcp_pkt *fsp, u16 xid);
+int fc_queuecommand(struct scsi_cmnd *,
+                    void (*done)(struct scsi_cmnd *));
+int fc_eh_abort(struct scsi_cmnd *);
+int fc_eh_device_reset(struct scsi_cmnd *);
+int fc_eh_host_reset(struct scsi_cmnd *);
+int fc_slave_alloc(struct scsi_device *);
+int fc_change_queue_depth(struct scsi_device *, int qdepth, int reason);
+int fc_change_queue_type(struct scsi_device *, int tag_type);
 /*
 * ELS/CT interface
 *****************************/
-/*
+int fc_elsct_init(struct fc_lport *);
- * Initializes ELS/CT interface
+struct fc_seq *fc_elsct_send(struct fc_lport *, u32 did,
- */
+                                    struct fc_frame *,
-int fc_elsct_init(struct fc_lport *lp);
+                                    unsigned int op,
+                                    void (*resp)(struct fc_seq *,
+                                                 struct fc_frame *,
+                                                 void *arg),
+                                    void *arg, u32 timer_msec);
+void fc_lport_flogi_resp(struct fc_seq *, struct fc_frame *, void *);
+void fc_lport_logo_resp(struct fc_seq *, struct fc_frame *, void *);
 /*
 * EXCHANGE MANAGER LAYER
 *****************************/
-/*
+int fc_exch_init(struct fc_lport *);
- * Initializes Exchange Manager related
+struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *,
- * function pointers in struct libfc_function_template.
+                                           struct fc_exch_mgr *,
- */
-int fc_exch_init(struct fc_lport *lp);
-/*
- * Adds Exchange Manager (EM) mp to lport.
- *
- * Adds specified mp to lport using struct fc_exch_mgr_anchor,
- * the struct fc_exch_mgr_anchor allows same EM sharing by
- * more than one lport with their specified match function,
- * the match function is used in allocating exchange from
- * added mp.
- */
-struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *lport,
-                                           struct fc_exch_mgr *mp,
                                           bool (*match)(struct fc_frame *));
+void fc_exch_mgr_del(struct fc_exch_mgr_anchor *);
-/*
+int fc_exch_mgr_list_clone(struct fc_lport *src, struct fc_lport *dst);
- * Deletes Exchange Manager (EM) from lport by removing
+struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *, enum fc_class class,
- * its anchor ema from lport.
+                                      u16 min_xid, u16 max_xid,
- *
- * If removed anchor ema was the last user of its associated EM
- * then also destroys associated EM.
- */
-void fc_exch_mgr_del(struct fc_exch_mgr_anchor *ema);
-/*
- * Allocates an Exchange Manager (EM).
- *
- * The EM manages exchanges for their allocation and
- * free, also allows exchange lookup for received
- * frame.
- *
- * The class is used for initializing FC class of
- * allocated exchange from EM.
- *
- * The min_xid and max_xid will limit new
- * exchange ID (XID) within this range for
- * a new exchange.
- * The LLD may choose to have multiple EMs,
- * e.g. one EM instance per CPU receive thread in LLD.
- *
- * Specified match function is used in allocating exchanges
- * from newly allocated EM.
- */
-struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lp,
-                                      enum fc_class class,
-                                      u16 min_xid,
-                                      u16 max_xid,
                                      bool (*match)(struct fc_frame *));
+void fc_exch_mgr_free(struct fc_lport *);
-/*
+void fc_exch_recv(struct fc_lport *, struct fc_frame *);
- * Free all exchange managers of a lport.
- */
-void fc_exch_mgr_free(struct fc_lport *lport);
-/*
- * Receive a frame on specified local port and exchange manager.
- */
-void fc_exch_recv(struct fc_lport *lp, struct fc_frame *fp);
-/*
- * This function is for exch_seq_send function pointer in
- * struct libfc_function_template, see comment block on
- * exch_seq_send for description of this function.
- */
-struct fc_seq *fc_exch_seq_send(struct fc_lport *lp,
-                                struct fc_frame *fp,
-                                void (*resp)(struct fc_seq *sp,
-                                             struct fc_frame *fp,
-                                             void *arg),
-                                void (*destructor)(struct fc_seq *sp,
-                                                   void *arg),
-                                void *arg, u32 timer_msec);
-/*
- * send a frame using existing sequence and exchange.
- */
-int fc_seq_send(struct fc_lport *lp, struct fc_seq *sp, struct fc_frame *fp);
-/*
- * Send ELS response using mainly infomation
- * in exchange and sequence in EM layer.
- */
-void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
-                         struct fc_seq_els_data *els_data);
-/*
- * This function is for seq_exch_abort function pointer in
- * struct libfc_function_template, see comment block on
- * seq_exch_abort for description of this function.
- */
-int fc_seq_exch_abort(const struct fc_seq *req_sp, unsigned int timer_msec);
-/*
- * Indicate that an exchange/sequence tuple is complete and the memory
- * allocated for the related objects may be freed.
- */
-void fc_exch_done(struct fc_seq *sp);
-/*
- * Allocate a new exchange and sequence pair.
- */
-struct fc_exch *fc_exch_alloc(struct fc_lport *lport, struct fc_frame *fp);
-/*
- * Start a new sequence on the same exchange as the supplied sequence.
- */
-struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
-/*
- * Reset all EMs of a lport, releasing its all sequences and
- * exchanges. If sid is non-zero, then reset only exchanges
- * we sourced from that FID. If did is non-zero, reset only
- * exchanges destined to that FID.
- */
 void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);
 /*
 * Functions for fc_functions_template
 */
-void fc_get_host_speed(struct Scsi_Host *shost);
+void fc_get_host_speed(struct Scsi_Host *);
-void fc_get_host_port_type(struct Scsi_Host *shost);
+void fc_get_host_port_type(struct Scsi_Host *);
-void fc_get_host_port_state(struct Scsi_Host *shost);
+void fc_get_host_port_state(struct Scsi_Host *);
-void fc_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout);
+void fc_set_rport_loss_tmo(struct fc_rport *, u32 timeout);
 struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *);
-/*
- * module setup functions.
- */
-int fc_setup_exch_mgr(void);
-void fc_destroy_exch_mgr(void);
-int fc_setup_rport(void);
-void fc_destroy_rport(void);
-/*
- * Internal libfc functions.
- */
-const char *fc_els_resp_type(struct fc_frame *);
 #endif /* _LIBFC_H_ */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index b2410605b740..c603f4a7e7fc 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -53,33 +53,36 @@ enum fip_state {
 };
 /**
- * struct fcoe_ctlr - FCoE Controller and FIP state.
+ * struct fcoe_ctlr - FCoE Controller and FIP state
- * @state:      internal FIP state for network link and FIP or non-FIP mode.
+ * @state:         internal FIP state for network link and FIP or non-FIP mode.
- * @lp:         &fc_lport: libfc local port.
+ * @mode:          LLD-selected mode.
- * @sel_fcf:    currently selected FCF, or NULL.
+ * @lp:            &fc_lport: libfc local port.
- * @fcfs:       list of discovered FCFs.
+ * @sel_fcf:       currently selected FCF, or NULL.
- * @fcf_count:  number of discovered FCF entries.
+ * @fcfs:          list of discovered FCFs.
- * @sol_time:   time when a multicast solicitation was last sent.
+ * @fcf_count:     number of discovered FCF entries.
- * @sel_time:   time after which to select an FCF.
+ * @sol_time:      time when a multicast solicitation was last sent.
- * @port_ka_time: time of next port keep-alive.
+ * @sel_time:      time after which to select an FCF.
- * @ctlr_ka_time: time of next controller keep-alive.
+ * @port_ka_time:  time of next port keep-alive.
- * @timer:      timer struct used for all delayed events.
+ * @ctlr_ka_time:  time of next controller keep-alive.
- * @link_work:  &work_struct for doing FCF selection.
+ * @timer:         timer struct used for all delayed events.
- * @recv_work:  &work_struct for receiving FIP frames.
+ * @link_work:     &work_struct for doing FCF selection.
+ * @recv_work:     &work_struct for receiving FIP frames.
 * @fip_recv_list: list of received FIP frames.
- * @user_mfs:   configured maximum FC frame size, including FC header.
+ * @user_mfs:      configured maximum FC frame size, including FC header.
- * @flogi_oxid: exchange ID of most recent fabric login.
+ * @flogi_oxid:    exchange ID of most recent fabric login.
- * @flogi_count: number of FLOGI attempts in AUTO mode.
+ * @flogi_count:   number of FLOGI attempts in AUTO mode.
- * @link:       current link status for libfc.
+ * @link:          current link status for libfc.
- * @last_link:  last link state reported to libfc.
+ * @last_link:     last link state reported to libfc.
- * @map_dest:   use the FC_MAP mode for destination MAC addresses.
+ * @map_dest:      use the FC_MAP mode for destination MAC addresses.
- * @spma:       supports SPMA server-provided MACs mode
+ * @spma:          supports SPMA server-provided MACs mode
- * @dest_addr:  MAC address of the selected FC forwarder.
+ * @send_ctlr_ka:  need to send controller keep alive
- * @ctl_src_addr: the native MAC address of our local port.
+ * @send_port_ka:  need to send port keep alives
- * @data_src_addr: the assigned MAC address for the local port after FLOGI.
+ * @dest_addr:     MAC address of the selected FC forwarder.
- * @send:       LLD-supplied function to handle sending of FIP Ethernet frames.
+ * @ctl_src_addr:  the native MAC address of our local port.
- * @update_mac: LLD-supplied function to handle changes to MAC addresses.
+ * @send:          LLD-supplied function to handle sending FIP Ethernet frames
- * @lock:       lock protecting this structure.
+ * @update_mac:    LLD-supplied function to handle changes to MAC addresses.
+ * @get_src_addr:  LLD-supplied function to supply a source MAC address.
+ * @lock:          lock protecting this structure.
 *
 * This structure is used by all FCoE drivers.  It contains information
 * needed by all FCoE low-level drivers (LLDs) as well as internal state
@@ -87,6 +90,7 @@ enum fip_state {
 */
 struct fcoe_ctlr {
        enum fip_state state;
+        enum fip_state mode;
        struct fc_lport *lp;
        struct fcoe_fcf *sel_fcf;
        struct list_head fcfs;
@@ -104,29 +108,32 @@ struct fcoe_ctlr {
        u8 flogi_count;
        u8 link;
        u8 last_link;
+        u8 reset_req;
        u8 map_dest;
        u8 spma;
+        u8 send_ctlr_ka;
+        u8 send_port_ka;
        u8 dest_addr[ETH_ALEN];
        u8 ctl_src_addr[ETH_ALEN];
-        u8 data_src_addr[ETH_ALEN];
        void (*send)(struct fcoe_ctlr *, struct sk_buff *);
-        void (*update_mac)(struct fcoe_ctlr *, u8 *old, u8 *new);
+        void (*update_mac)(struct fc_lport *, u8 *addr);
+        u8 * (*get_src_addr)(struct fc_lport *);
        spinlock_t lock;
 };
-/*
+/**
- * struct fcoe_fcf - Fibre-Channel Forwarder.
+ * struct fcoe_fcf - Fibre-Channel Forwarder
- * @list:       list linkage.
+ * @list:        list linkage
- * @time:       system time (jiffies) when an advertisement was last received.
+ * @time:        system time (jiffies) when an advertisement was last received
- * @switch_name: WWN of switch from advertisement.
+ * @switch_name: WWN of switch from advertisement
- * @fabric_name: WWN of fabric from advertisement.
+ * @fabric_name: WWN of fabric from advertisement
- * @fc_map:     FC_MAP value from advertisement.
+ * @fc_map:      FC_MAP value from advertisement
- * @fcf_mac:    Ethernet address of the FCF.
+ * @fcf_mac:     Ethernet address of the FCF
- * @vfid:       virtual fabric ID.
+ * @vfid:        virtual fabric ID
- * @pri:        seletion priority, smaller values are better.
+ * @pri:         selection priority, smaller values are better
- * @flags:      flags received from advertisement.
+ * @flags:       flags received from advertisement
- * @fka_period: keep-alive period, in jiffies.
+ * @fka_period:  keep-alive period, in jiffies
 *
 * A Fibre-Channel Forwarder (FCF) is the entity on the Ethernet that
 * passes FCoE frames on to an FC fabric.  This structure represents
@@ -148,6 +155,7 @@ struct fcoe_fcf {
        u8 pri;
        u16 flags;
        u32 fka_period;
+        u8 fd_flags:1;
 };
 /* FIP API functions */
@@ -155,9 +163,10 @@ void fcoe_ctlr_init(struct fcoe_ctlr *);
 void fcoe_ctlr_destroy(struct fcoe_ctlr *);
 void fcoe_ctlr_link_up(struct fcoe_ctlr *);
 int fcoe_ctlr_link_down(struct fcoe_ctlr *);
-int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct sk_buff *);
+int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct fc_lport *, struct sk_buff *);
 void fcoe_ctlr_recv(struct fcoe_ctlr *, struct sk_buff *);
-int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_frame *fp, u8 *sa);
+int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
+                         struct fc_frame *);
 /* libfcoe funcs */
 u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index a72edd4eceec..7394e3bc8f4b 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -267,6 +267,7 @@ struct iscsi_session {
        /* configuration */
        int                     abort_timeout;
        int                     lu_reset_timeout;
+        int                     tgt_reset_timeout;
        int                     initial_r2t_en;
        unsigned                max_r2t;
        int                     imm_data_en;
@@ -333,7 +334,8 @@ struct iscsi_host {
 /*
 * scsi host template
 */
-extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth);
+extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth,
+                                    int reason);
 extern int iscsi_eh_abort(struct scsi_cmnd *sc);
 extern int iscsi_eh_target_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index e78d3b62d8ec..9eaa3f05f954 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -634,7 +634,8 @@ extern int sas_target_alloc(struct scsi_target *);
 extern int sas_slave_alloc(struct scsi_device *);
 extern int sas_slave_configure(struct scsi_device *);
 extern void sas_slave_destroy(struct scsi_device *);
-extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
+extern int sas_change_queue_depth(struct scsi_device *, int new_depth,
+                                  int reason);
 extern int sas_change_queue_type(struct scsi_device *, int qt);
 extern int sas_bios_param(struct scsi_device *,
                          struct block_device *,
diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index 02bd9f716357..39d6d1097153 100644
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -48,7 +48,6 @@ enum osd_std_version {
 */
 struct osd_dev {
        struct scsi_device *scsi_device;
-        struct file *file;
        unsigned def_timeout;
 #ifdef OSD_VER1_SUPPORT
@@ -56,10 +55,24 @@ struct osd_dev {
 #endif
 };
-/* Retrieve/return osd_dev(s) for use by Kernel clients */
+/* Unique Identification of an OSD device */
-struct osd_dev *osduld_path_lookup(const char *dev_name); /*Use IS_ERR/ERR_PTR*/
+struct osd_dev_info {
+        unsigned systemid_len;
+        u8 systemid[OSD_SYSTEMID_LEN];
+        unsigned osdname_len;
+        u8 *osdname;
+};
+/* Retrieve/return osd_dev(s) for use by Kernel clients
+ * Use IS_ERR/ERR_PTR on returned "osd_dev *".
+ */
+struct osd_dev *osduld_path_lookup(const char *dev_name);
+struct osd_dev *osduld_info_lookup(const struct osd_dev_info *odi);
 void osduld_put_device(struct osd_dev *od);
+const struct osd_dev_info *osduld_device_info(struct osd_dev *od);
+bool osduld_device_same(struct osd_dev *od, const struct osd_dev_info *odi);
 /* Add/remove test ioctls from external modules */
 typedef int (do_test_fn)(struct osd_dev *od, unsigned cmd, unsigned long arg);
 int osduld_register_test(unsigned ioctl, do_test_fn *do_test);
@@ -69,8 +82,24 @@ void osduld_unregister_test(unsigned ioctl);
 void osd_dev_init(struct osd_dev *od, struct scsi_device *scsi_device);
 void osd_dev_fini(struct osd_dev *od);
-/* some hi level device operations */
+/**
-int osd_auto_detect_ver(struct osd_dev *od, void *caps);    /* GFP_KERNEL */
+ * osd_auto_detect_ver - Detect the OSD version, return Unique Identification
+ *
+ * @od:     OSD target lun handle
+ * @caps:   Capabilities authorizing OSD root read attributes access
+ * @odi:    Retrieved information uniquely identifying the osd target lun
+ *          Note: odi->osdname must be kfreed by caller.
+ *
+ * Auto detects the OSD version of the OSD target and sets the @od
+ * accordingly. Meanwhile also returns the "system id" and "osd name" root
+ * attributes which uniquely identify the OSD target. This member is usually
+ * called by the ULD. ULD users should call osduld_device_info().
+ * This rutine allocates osd requests and memory at GFP_KERNEL level and might
+ * sleep.
+ */
+int osd_auto_detect_ver(struct osd_dev *od,
+        void *caps, struct osd_dev_info *odi);
 static inline struct request_queue *osd_request_queue(struct osd_dev *od)
 {
        return od->scsi_device->request_queue;
@@ -84,6 +113,15 @@ static inline void osd_dev_set_ver(struct osd_dev *od, enum osd_std_version v)
 #endif
 }
+static inline bool osd_dev_is_ver1(struct osd_dev *od)
+{
+#ifdef OSD_VER1_SUPPORT
+        return od->version == OSD_VER1;
+#else
+        return false;
+#endif
+}
 struct osd_request;
 typedef void (osd_req_done_fn)(struct osd_request *or, void *private);
@@ -120,14 +158,9 @@ struct osd_request {
        int async_error;
 };
-/* OSD Version control */
 static inline bool osd_req_is_ver1(struct osd_request *or)
 {
-#ifdef OSD_VER1_SUPPORT
+        return osd_dev_is_ver1(or->osd_dev);
-        return or->osd_dev->version == OSD_VER1;
-#else
-        return false;
-#endif
 }
 /*
@@ -234,7 +267,7 @@ int osd_execute_request_async(struct osd_request *or,
 * @bad_attr_list - List of failing attributes (optional)
 * @max_attr      - Size of @bad_attr_list.
 *
- * After execution, sense + return code can be analyzed using this function. The
+ * After execution, osd_request results are analyzed using this function. The
 * return code is the final disposition on the error. So it is possible that a
 * CHECK_CONDITION was returned from target but this will return NO_ERROR, for
 * example on recovered errors. All parameters are optional if caller does
@@ -243,7 +276,31 @@ int osd_execute_request_async(struct osd_request *or,
 * of the SCSI_OSD_DPRINT_SENSE Kconfig value. Set @silent if you know the
 * command would routinely fail, to not spam the dmsg file.
 */
+/**
+ * osd_err_priority - osd categorized return codes in ascending severity.
+ *
+ * The categories are borrowed from the pnfs_osd_errno enum.
+ * See comments for translated Linux codes returned by osd_req_decode_sense.
+ */
+enum osd_err_priority {
+        OSD_ERR_PRI_NO_ERROR    = 0,
+        /* Recoverable, caller should clear_highpage() all pages */
+        OSD_ERR_PRI_CLEAR_PAGES = 1, /* -EFAULT */
+        OSD_ERR_PRI_RESOURCE    = 2, /* -ENOMEM */
+        OSD_ERR_PRI_BAD_CRED    = 3, /* -EINVAL */
+        OSD_ERR_PRI_NO_ACCESS   = 4, /* -EACCES */
+        OSD_ERR_PRI_UNREACHABLE = 5, /* any other */
+        OSD_ERR_PRI_NOT_FOUND   = 6, /* -ENOENT */
+        OSD_ERR_PRI_NO_SPACE    = 7, /* -ENOSPC */
+        OSD_ERR_PRI_EIO         = 8, /* -EIO    */
+};
 struct osd_sense_info {
+        u64 out_resid;          /* Zero on success otherwise out residual */
+        u64 in_resid;           /* Zero on success otherwise in residual */
+        enum osd_err_priority osd_err_pri;
        int key;                /* one of enum scsi_sense_keys */
        int additional_code ;   /* enum osd_additional_sense_codes */
        union { /* Sense specific information */
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
index 2cc8e8b1cc19..685661283540 100644
--- a/include/scsi/osd_protocol.h
+++ b/include/scsi/osd_protocol.h
@@ -17,6 +17,7 @@
 #define __OSD_PROTOCOL_H__
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi.h>
diff --git a/include/scsi/osd_sense.h b/include/scsi/osd_sense.h
index ff9b33c773c7..91db543a5502 100644
--- a/include/scsi/osd_sense.h
+++ b/include/scsi/osd_sense.h
@@ -255,6 +255,9 @@ enum osdv2_cdb_field_offset {
        OSD_CFO_STARTING_BYTE   = OSD_CDB_OFFSET(v2.start_address),
        OSD_CFO_PARTITION_ID    = OSD_CDB_OFFSET(partition),
        OSD_CFO_OBJECT_ID       = OSD_CDB_OFFSET(object),
+        OSD_CFO_PERMISSIONS     = sizeof(struct osd_cdb_head) +
+                                        offsetof(struct osd_capability_head,
+                                                 permissions_bit_mask),
 };
 #endif /* ndef __OSD_SENSE_H__ */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 34c46ab5c31b..8b4deca996ad 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -94,6 +94,7 @@ struct scsi_cmnd;
 #define WRITE_LONG            0x3f
 #define CHANGE_DEFINITION     0x40
 #define WRITE_SAME            0x41
+#define UNMAP                 0x42
 #define READ_TOC              0x43
 #define LOG_SELECT            0x4c
 #define LOG_SENSE             0x4d
@@ -122,9 +123,11 @@ struct scsi_cmnd;
 #define READ_16               0x88
 #define WRITE_16              0x8a
 #define VERIFY_16             0x8f
+#define WRITE_SAME_16         0x93
 #define SERVICE_ACTION_IN     0x9e
 /* values for service action in */
 #define SAI_READ_CAPACITY_16  0x10
+#define SAI_GET_LBA_STATUS    0x12
 /* values for maintenance in */
 #define MI_REPORT_TARGET_PGS  0x0a
 /* values for maintenance out */
@@ -132,6 +135,7 @@ struct scsi_cmnd;
 /* values for variable length command */
 #define READ_32               0x09
 #define WRITE_32              0x0b
+#define WRITE_SAME_32         0x0d
 /* Values for T10/04-262r7 */
 #define ATA_16                0x85      /* 16-byte pass-thru */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index f097ae340bc1..7c4449900c24 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -81,11 +81,14 @@ struct scsi_device {
        struct list_head starved_entry;
        struct scsi_cmnd *current_cmnd; /* currently active command */
        unsigned short queue_depth;     /* How deep of a queue we want */
+        unsigned short max_queue_depth; /* max queue depth */
        unsigned short last_queue_full_depth; /* These two are used by */
        unsigned short last_queue_full_count; /* scsi_track_queue_full() */
-        unsigned long last_queue_full_time;/* don't let QUEUE_FULLs on the same
+        unsigned long last_queue_full_time;     /* last queue full time */
-                                           jiffie count on our counter, they
+        unsigned long queue_ramp_up_period;     /* ramp up period in jiffies */
-                                           could all be from the same event. */
+#define SCSI_DEFAULT_RAMP_UP_PERIOD     (120 * HZ)
+        unsigned long last_queue_ramp_up;       /* last queue ramp up time */
        unsigned int id, lun, channel;
@@ -175,6 +178,7 @@ struct scsi_dh_devlist {
        char *model;
 };
+typedef void (*activate_complete)(void *, int);
 struct scsi_device_handler {
        /* Used by the infrastructure */
        struct list_head list; /* list of scsi_device_handlers */
@@ -186,7 +190,7 @@ struct scsi_device_handler {
        int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
        int (*attach)(struct scsi_device *);
        void (*detach)(struct scsi_device *);
-        int (*activate)(struct scsi_device *);
+        int (*activate)(struct scsi_device *, activate_complete, void *);
        int (*prep_fn)(struct scsi_device *, struct request *);
        int (*set_params)(struct scsi_device *, const char *);
 };
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index ff2407405b42..e3f2db212ddc 100644
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -56,14 +56,16 @@ enum {
        SCSI_DH_DRIVER_MAX,
 };
 #if defined(CONFIG_SCSI_DH) || defined(CONFIG_SCSI_DH_MODULE)
-extern int scsi_dh_activate(struct request_queue *);
+extern int scsi_dh_activate(struct request_queue *, activate_complete, void *);
 extern int scsi_dh_handler_exist(const char *);
 extern int scsi_dh_attach(struct request_queue *, const char *);
 extern void scsi_dh_detach(struct request_queue *);
 extern int scsi_dh_set_params(struct request_queue *, const char *);
 #else
-static inline int scsi_dh_activate(struct request_queue *req)
+static inline int scsi_dh_activate(struct request_queue *req,
+                                        activate_complete fn, void *data)
 {
+        fn(data, 0);
        return 0;
 }
 static inline int scsi_dh_handler_exist(const char *name)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 47941fc5aba7..c50a97fc76f9 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -43,6 +43,12 @@ struct blk_queue_tags;
 #define DISABLE_CLUSTERING 0
 #define ENABLE_CLUSTERING 1
+enum {
+        SCSI_QDEPTH_DEFAULT,    /* default requested change, e.g. from sysfs */
+        SCSI_QDEPTH_QFULL,      /* scsi-ml requested due to queue full */
+        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshhold event */
+};
 struct scsi_host_template {
        struct module *module;
        const char *name;
@@ -294,7 +300,7 @@ struct scsi_host_template {
         *
         * Status: OPTIONAL
         */
-        int (* change_queue_depth)(struct scsi_device *, int);
+        int (* change_queue_depth)(struct scsi_device *, int, int);
        /*
         * Fill in this function to allow the changing of tag types
@@ -677,6 +683,12 @@ struct Scsi_Host {
        void *shost_data;
        /*
+         * Points to the physical bus device we'd use to do DMA
+         * Needed just in case we have virtual hosts.
+         */
+        struct device *dma_dev;
+        /*
         * We should ensure that this is aligned, both for better performance
         * and also because some compilers (m68k) don't automatically force
         * alignment to a long boundary.
@@ -720,7 +732,9 @@ extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);
 extern void scsi_flush_work(struct Scsi_Host *);
 extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int);
-extern int __must_check scsi_add_host(struct Scsi_Host *, struct device *);
+extern int __must_check scsi_add_host_with_dma(struct Scsi_Host *,
+                                               struct device *,
+                                               struct device *);
 extern void scsi_scan_host(struct Scsi_Host *);
 extern void scsi_rescan_device(struct device *);
 extern void scsi_remove_host(struct Scsi_Host *);
@@ -731,6 +745,12 @@ extern const char *scsi_host_state_name(enum scsi_host_state);
 extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
+static inline int __must_check scsi_add_host(struct Scsi_Host *host,
+                                             struct device *dev)
+{
+        return scsi_add_host_with_dma(host, dev, dev);
+}
 static inline struct device *scsi_get_device(struct Scsi_Host *shost)
 {
        return shost->shost_gendev.parent;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index fc50bd64aa4e..8e86a94faf06 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -807,5 +807,6 @@ void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
 struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel,
                struct fc_vport_identifiers *);
 int fc_vport_terminate(struct fc_vport *vport);
+void fc_block_scsi_eh(struct scsi_cmnd *cmnd);
 #endif /* SCSI_TRANSPORT_FC_H */
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 3dae3f799b9b..49400459b477 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -593,7 +593,7 @@ enum {
 struct ac97_quirk {
        unsigned short subvendor; /* PCI subsystem vendor id */
-        unsigned short subdevice; /* PCI sybsystem device id */
+        unsigned short subdevice; /* PCI subsystem device id */
        unsigned short mask;    /* device id bit mask, 0 = accept all */
        unsigned int codec_id;  /* codec id (if any), 0 = accept all */
        const char *name;       /* name shown as info */
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h
index 9c661f2f8cda..eee19f63c0d8 100644
--- a/include/sound/wm8993.h
+++ b/include/sound/wm8993.h
@@ -36,7 +36,7 @@ struct wm8993_platform_data {
        unsigned int micbias1_lvl:1;
        unsigned int micbias2_lvl:1;
-        /* Jack detect threashold levels, see datasheet for values */
+        /* Jack detect threshold levels, see datasheet for values */
        unsigned int jd_scthr:2;
        unsigned int jd_thr:2;
 };
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 318f76535bd4..d0b6cd3afb2f 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -38,7 +38,7 @@ TRACE_EVENT(ext4_free_inode,
                __entry->blocks = inode->i_blocks;
        ),
-        TP_printk("dev %s ino %lu mode %d uid %u gid %u blocks %llu",
+        TP_printk("dev %s ino %lu mode 0%o uid %u gid %u blocks %llu",
                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
                  __entry->mode, __entry->uid, __entry->gid,
                  (unsigned long long) __entry->blocks)
@@ -61,7 +61,7 @@ TRACE_EVENT(ext4_request_inode,
                __entry->mode   = mode;
        ),
-        TP_printk("dev %s dir %lu mode %d",
+        TP_printk("dev %s dir %lu mode 0%o",
                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->dir,
                  __entry->mode)
 );
@@ -85,7 +85,7 @@ TRACE_EVENT(ext4_allocate_inode,
                __entry->mode   = mode;
        ),
-        TP_printk("dev %s ino %lu dir %lu mode %d",
+        TP_printk("dev %s ino %lu dir %lu mode 0%o",
                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
                  (unsigned long) __entry->dir, __entry->mode)
 );
@@ -305,7 +305,6 @@ TRACE_EVENT(ext4_da_writepages_result,
                __field(        int,    ret                     )
                __field(        int,    pages_written           )
                __field(        long,   pages_skipped           )
-                __field(        char,   encountered_congestion  )
                __field(        char,   more_io                 )       
                __field(        char,   no_nrwrite_index_update )
                __field(       pgoff_t, writeback_index         )
@@ -317,17 +316,16 @@ TRACE_EVENT(ext4_da_writepages_result,
                __entry->ret            = ret;
                __entry->pages_written  = pages_written;
                __entry->pages_skipped  = wbc->pages_skipped;
-                __entry->encountered_congestion = wbc->encountered_congestion;
                __entry->more_io        = wbc->more_io;
                __entry->no_nrwrite_index_update = wbc->no_nrwrite_index_update;
                __entry->writeback_index = inode->i_mapping->writeback_index;
        ),
-        TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld congestion %d more_io %d no_nrwrite_index_update %d writeback_index %lu",
+        TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld more_io %d no_nrwrite_index_update %d writeback_index %lu",
                  jbd2_dev_to_name(__entry->dev),
                  (unsigned long) __entry->ino, __entry->ret,
                  __entry->pages_written, __entry->pages_skipped,
-                  __entry->encountered_congestion, __entry->more_io,
+                  __entry->more_io,
                  __entry->no_nrwrite_index_update,
                  (unsigned long) __entry->writeback_index)
 );
@@ -591,30 +589,32 @@ TRACE_EVENT(ext4_allocate_blocks,
 TRACE_EVENT(ext4_free_blocks,
        TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
-                        int metadata),
+                 int flags),
-        TP_ARGS(inode, block, count, metadata),
+        TP_ARGS(inode, block, count, flags),
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
+                __field(      umode_t, mode                     )
                __field(        __u64,  block                   )
                __field(        unsigned long,  count           )
-                __field(        int,    metadata                )
+                __field(         int,   flags                   )
        ),
        TP_fast_assign(
                __entry->dev            = inode->i_sb->s_dev;
                __entry->ino            = inode->i_ino;
+                __entry->mode           = inode->i_mode;
                __entry->block          = block;
                __entry->count          = count;
-                __entry->metadata       = metadata;
+                __entry->flags          = flags;
        ),
-        TP_printk("dev %s ino %lu block %llu count %lu metadata %d",
+        TP_printk("dev %s ino %lu mode 0%o block %llu count %lu flags %d",
                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->block, __entry->count, __entry->metadata)
+                  __entry->mode, __entry->block, __entry->count,
+                  __entry->flags)
 );
 TRACE_EVENT(ext4_sync_file,
@@ -848,6 +848,32 @@ TRACE_EVENT(ext4_mballoc_free,
                  __entry->result_len, __entry->result_logical)
 );
+TRACE_EVENT(ext4_forget,
+        TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
+        TP_ARGS(inode, is_metadata, block),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        umode_t, mode                   )
+                __field(        int,    is_metadata             )
+                __field(        __u64,  block                   )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->mode   = inode->i_mode;
+                __entry->is_metadata = is_metadata;
+                __entry->block  = block;
+        ),
+        TP_printk("dev %s ino %lu mode 0%o is_metadata %d block %llu",
+                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->mode, __entry->is_metadata, __entry->block)
+);
 #endif /* _TRACE_EXT4_H */
 /* This part must be outside protection */
diff --git a/include/video/sgivw.h b/include/video/sgivw.h
index 55f2a7c024af..f6aa5692e74b 100644
--- a/include/video/sgivw.h
+++ b/include/video/sgivw.h
@@ -351,7 +351,7 @@ typedef enum {
 struct dbe_timing_info
 {
  dbe_timing_t type;
-  int flags;                            
+  int flags;
  short width;              /* Monitor resolution               */
  short height;
  int fields_sec;           /* fields/sec  (Hz -3 dec. places */
@@ -389,11 +389,11 @@ struct dbe_timing_info dbeVTimings[] = {
  {
    DBE_VT_640_480_60,
    /*  flags,  width,                  height,         fields_sec,             cfreq */
-    0,          640,                    480,            59940,                  25175,
+    0,          640,                    480,            59940,                  25175,
    /*  htotal, hblank_start,   hblank_end,     hsync_start,    hsync_end */
-    800,        640,                800,                656,            752,
+    800,        640,                    800,            656,            752,
    /*  vtotal, vblank_start,   vblank_end,     vsync_start,    vsync_end */
-    525,        480,                525,                490,                492,
+    525,        480,                    525,            490,                492,
    /*  pll_m,  pll_n,                  pll_p */
    15,     2,                          3
  },
@@ -650,7 +650,7 @@ struct dbe_timing_info dbeVTimings[] = {
    /* pll_m,  pll_n,          pll_p */
    6,      1,              0
  },
-        
  {
    DBE_VT_1920_1200_60,
    /* flags,  width,          height,         fields_sec,     cfreq */
@@ -676,7 +676,6 @@ struct dbe_timing_info dbeVTimings[] = {
  }
 };
-#define DBE_VT_SIZE  (sizeof(dbeVTimings)/sizeof(dbeVTimings[0]))
 #endif // INCLUDE_TIMING_TABLE_DATA
 #endif // ! __SGIVWFB_H__
author	David S. Miller <davem@davemloft.net>	2009-12-11 04:26:12 -0500
committer	David S. Miller <davem@davemloft.net>	2009-12-11 04:26:12 -0500
commit	e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch)
tree	8b23624cc792f60d0bf86d787c3514cf0fb04418 /include
parent	adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff)
parent	d71cb81af3817193bc605de061da0499934263a6 (diff)