344 files changed, 12583 insertions, 1401 deletions

diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab
new file mode 100644
index 000000000000..6dcf75e594fb
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-kernel-slab
@@ -0,0 +1,479 @@
+What:           /sys/kernel/slab
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The /sys/kernel/slab directory contains a snapshot of the
+                internal state of the SLUB allocator for each cache.  Certain
+                files may be modified to change the behavior of the cache (and
+                any cache it aliases, if any).
+Users:          kernel memory tuning tools
+
+What:           /sys/kernel/slab/cache/aliases
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The aliases file is read-only and specifies how many caches
+                have merged into this cache.
+
+What:           /sys/kernel/slab/cache/align
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The align file is read-only and specifies the cache's object
+                alignment in bytes.
+
+What:           /sys/kernel/slab/cache/alloc_calls
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_calls file is read-only and lists the kernel code
+                locations from which allocations for this cache were performed.
+                The alloc_calls file only contains information if debugging is
+                enabled for that cache (see Documentation/vm/slub.txt).
+
+What:           /sys/kernel/slab/cache/alloc_fastpath
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_fastpath file is read-only and specifies how many
+                objects have been allocated using the fast path.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/alloc_from_partial
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_from_partial file is read-only and specifies how
+                many times a cpu slab has been full and it has been refilled
+                by using a slab from the list of partially used slabs.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/alloc_refill
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_refill file is read-only and specifies how many
+                times the per-cpu freelist was empty but there were objects
+                available as the result of remote cpu frees.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/alloc_slab
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_slab file is read-only and specifies how many times
+                a new slab had to be allocated from the page allocator.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/alloc_slowpath
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The alloc_slowpath file is read-only and specifies how many
+                objects have been allocated using the slow path because of a
+                refill or allocation from a partial or new slab.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/cache_dma
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The cache_dma file is read-only and specifies whether objects
+                are from ZONE_DMA.
+                Available when CONFIG_ZONE_DMA is enabled.
+
+What:           /sys/kernel/slab/cache/cpu_slabs
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The cpu_slabs file is read-only and displays how many cpu slabs
+                are active and their NUMA locality.
+
+What:           /sys/kernel/slab/cache/cpuslab_flush
+Date:           April 2009
+KernelVersion:  2.6.31
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file cpuslab_flush is read-only and specifies how many
+                times a cache's cpu slabs have been flushed as the result of
+                destroying or shrinking a cache, a cpu going offline, or as
+                the result of forcing an allocation from a certain node.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/ctor
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The ctor file is read-only and specifies the cache's object
+                constructor function, which is invoked for each object when a
+                new slab is allocated.
+
+What:           /sys/kernel/slab/cache/deactivate_empty
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file deactivate_empty is read-only and specifies how many
+                times an empty cpu slab was deactivated.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/deactivate_full
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file deactivate_full is read-only and specifies how many
+                times a full cpu slab was deactivated.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/deactivate_remote_frees
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file deactivate_remote_frees is read-only and specifies how
+                many times a cpu slab has been deactivated and contained free
+                objects that were freed remotely.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/deactivate_to_head
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file deactivate_to_head is read-only and specifies how
+                many times a partial cpu slab was deactivated and added to the
+                head of its node's partial list.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/deactivate_to_tail
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file deactivate_to_tail is read-only and specifies how
+                many times a partial cpu slab was deactivated and added to the
+                tail of its node's partial list.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/destroy_by_rcu
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The destroy_by_rcu file is read-only and specifies whether
+                slabs (not objects) are freed by rcu.
+
+What:           /sys/kernel/slab/cache/free_add_partial
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file free_add_partial is read-only and specifies how many
+                times an object has been freed in a full slab so that it had to
+                added to its node's partial list.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/free_calls
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The free_calls file is read-only and lists the locations of
+                object frees if slab debugging is enabled (see
+                Documentation/vm/slub.txt).
+
+What:           /sys/kernel/slab/cache/free_fastpath
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The free_fastpath file is read-only and specifies how many
+                objects have been freed using the fast path because it was an
+                object from the cpu slab.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/free_frozen
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The free_frozen file is read-only and specifies how many
+                objects have been freed to a frozen slab (i.e. a remote cpu
+                slab).
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/free_remove_partial
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file free_remove_partial is read-only and specifies how
+                many times an object has been freed to a now-empty slab so
+                that it had to be removed from its node's partial list.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/free_slab
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The free_slab file is read-only and specifies how many times an
+                empty slab has been freed back to the page allocator.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/free_slowpath
+Date:           February 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The free_slowpath file is read-only and specifies how many
+                objects have been freed using the slow path (i.e. to a full or
+                partial slab).
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/hwcache_align
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The hwcache_align file is read-only and specifies whether
+                objects are aligned on cachelines.
+
+What:           /sys/kernel/slab/cache/min_partial
+Date:           February 2009
+KernelVersion:  2.6.30
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                David Rientjes <rientjes@google.com>
+Description:
+                The min_partial file specifies how many empty slabs shall
+                remain on a node's partial list to avoid the overhead of
+                allocating new slabs.  Such slabs may be reclaimed by utilizing
+                the shrink file.
+
+What:           /sys/kernel/slab/cache/object_size
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The object_size file is read-only and specifies the cache's
+                object size.
+
+What:           /sys/kernel/slab/cache/objects
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The objects file is read-only and displays how many objects are
+                active and from which nodes they are from.
+
+What:           /sys/kernel/slab/cache/objects_partial
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The objects_partial file is read-only and displays how many
+                objects are on partial slabs and from which nodes they are
+                from.
+
+What:           /sys/kernel/slab/cache/objs_per_slab
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file objs_per_slab is read-only and specifies how many
+                objects may be allocated from a single slab of the order
+                specified in /sys/kernel/slab/cache/order.
+
+What:           /sys/kernel/slab/cache/order
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The order file specifies the page order at which new slabs are
+                allocated.  It is writable and can be changed to increase the
+                number of objects per slab.  If a slab cannot be allocated
+                because of fragmentation, SLUB will retry with the minimum order
+                possible depending on its characteristics.
+
+What:           /sys/kernel/slab/cache/order_fallback
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file order_fallback is read-only and specifies how many
+                times an allocation of a new slab has not been possible at the
+                cache's order and instead fallen back to its minimum possible
+                order.
+                Available when CONFIG_SLUB_STATS is enabled.
+
+What:           /sys/kernel/slab/cache/partial
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The partial file is read-only and displays how long many
+                partial slabs there are and how long each node's list is.
+
+What:           /sys/kernel/slab/cache/poison
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The poison file specifies whether objects should be poisoned
+                when a new slab is allocated.
+
+What:           /sys/kernel/slab/cache/reclaim_account
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The reclaim_account file specifies whether the cache's objects
+                are reclaimable (and grouped by their mobility).
+
+What:           /sys/kernel/slab/cache/red_zone
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The red_zone file specifies whether the cache's objects are red
+                zoned.
+
+What:           /sys/kernel/slab/cache/remote_node_defrag_ratio
+Date:           January 2008
+KernelVersion:  2.6.25
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The file remote_node_defrag_ratio specifies the percentage of
+                times SLUB will attempt to refill the cpu slab with a partial
+                slab from a remote node as opposed to allocating a new slab on
+                the local node.  This reduces the amount of wasted memory over
+                the entire system but can be expensive.
+                Available when CONFIG_NUMA is enabled.
+
+What:           /sys/kernel/slab/cache/sanity_checks
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The sanity_checks file specifies whether expensive checks
+                should be performed on free and, at minimum, enables double free
+                checks.  Caches that enable sanity_checks cannot be merged with
+                caches that do not.
+
+What:           /sys/kernel/slab/cache/shrink
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The shrink file is written when memory should be reclaimed from
+                a cache.  Empty partial slabs are freed and the partial list is
+                sorted so the slabs with the fewest available objects are used
+                first.
+
+What:           /sys/kernel/slab/cache/slab_size
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The slab_size file is read-only and specifies the object size
+                with metadata (debugging information and alignment) in bytes.
+
+What:           /sys/kernel/slab/cache/slabs
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The slabs file is read-only and displays how long many slabs
+                there are (both cpu and partial) and from which nodes they are
+                from.
+
+What:           /sys/kernel/slab/cache/store_user
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The store_user file specifies whether the location of
+                allocation or free should be tracked for a cache.
+
+What:           /sys/kernel/slab/cache/total_objects
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The total_objects file is read-only and displays how many total
+                objects a cache has and from which nodes they are from.
+
+What:           /sys/kernel/slab/cache/trace
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                The trace file specifies whether object allocations and frees
+                should be traced.
+
+What:           /sys/kernel/slab/cache/validate
+Date:           May 2007
+KernelVersion:  2.6.22
+Contact:        Pekka Enberg <penberg@cs.helsinki.fi>,
+                Christoph Lameter <cl@linux-foundation.org>
+Description:
+                Writing to the validate file causes SLUB to traverse all of its
+                cache's objects and check the validity of metadata.
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt
index 222437efd75a..3015da0c6b2a 100644
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
@@ -133,4 +133,4 @@ RAM/SWAP in 10240 inodes and it is only accessible by root.
 Author:
    Christoph Rohland <cr@sap.com>, 1.12.01
 Updated:
-   Hugh Dickins <hugh@veritas.com>, 4 June 2007
+   Hugh Dickins, 4 June 2007
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 2f10ce6a879f..004ee161721e 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -150,6 +150,11 @@ fan[1-*]_min	Fan minimum value
                 Unit: revolution/min (RPM)
                 RW
 
+fan[1-*]_max    Fan maximum value
+                Unit: revolution/min (RPM)
+                Only rarely supported by the hardware.
+                RW
+
 fan[1-*]_input  Fan input value.
                 Unit: revolution/min (RPM)
                 RO
@@ -390,6 +395,7 @@ OR
 in[0-*]_min_alarm
 in[0-*]_max_alarm
 fan[1-*]_min_alarm
+fan[1-*]_max_alarm
 temp[1-*]_min_alarm
 temp[1-*]_max_alarm
 temp[1-*]_crit_alarm
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt
index 9f09557aea39..a12ea3b586e6 100644
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
@@ -18,8 +18,12 @@ Usage
 Anonymous finger details are sent sequentially as separate packets of ABS
 events. Only the ABS_MT events are recognized as part of a finger
 packet. The end of a packet is marked by calling the input_mt_sync()
-function, which generates a SYN_MT_REPORT event. The end of multi-touch
-transfer is marked by calling the usual input_sync() function.
+function, which generates a SYN_MT_REPORT event. This instructs the
+receiver to accept the data for the current finger and prepare to receive
+another. The end of a multi-touch transfer is marked by calling the usual
+input_sync() function. This instructs the receiver to act upon events
+accumulated since last EV_SYN/SYN_REPORT and prepare to receive a new
+set of events/packets.
 
 A set of ABS_MT events with the desired properties is defined. The events
 are divided into categories, to allow for partial implementation.  The
@@ -27,11 +31,26 @@ minimum set consists of ABS_MT_TOUCH_MAJOR, ABS_MT_POSITION_X and
 ABS_MT_POSITION_Y, which allows for multiple fingers to be tracked.  If the
 device supports it, the ABS_MT_WIDTH_MAJOR may be used to provide the size
 of the approaching finger. Anisotropy and direction may be specified with
-ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION. Devices with
-more granular information may specify general shapes as blobs, i.e., as a
-sequence of rectangular shapes grouped together by an
-ABS_MT_BLOB_ID. Finally, the ABS_MT_TOOL_TYPE may be used to specify
-whether the touching tool is a finger or a pen or something else.
+ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION.  The
+ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a
+finger or a pen or something else.  Devices with more granular information
+may specify general shapes as blobs, i.e., as a sequence of rectangular
+shapes grouped together by an ABS_MT_BLOB_ID. Finally, for the few devices
+that currently support it, the ABS_MT_TRACKING_ID event may be used to
+report finger tracking from hardware [5].
+
+Here is what a minimal event sequence for a two-finger touch would look
+like:
+
+   ABS_MT_TOUCH_MAJOR
+   ABS_MT_POSITION_X
+   ABS_MT_POSITION_Y
+   SYN_MT_REPORT
+   ABS_MT_TOUCH_MAJOR
+   ABS_MT_POSITION_X
+   ABS_MT_POSITION_Y
+   SYN_MT_REPORT
+   SYN_REPORT
 
 
 Event Semantics
@@ -44,24 +63,24 @@ ABS_MT_TOUCH_MAJOR
 
 The length of the major axis of the contact. The length should be given in
 surface units. If the surface has an X times Y resolution, the largest
-possible value of ABS_MT_TOUCH_MAJOR is sqrt(X^2 + Y^2), the diagonal.
+possible value of ABS_MT_TOUCH_MAJOR is sqrt(X^2 + Y^2), the diagonal [4].
 
 ABS_MT_TOUCH_MINOR
 
 The length, in surface units, of the minor axis of the contact. If the
-contact is circular, this event can be omitted.
+contact is circular, this event can be omitted [4].
 
 ABS_MT_WIDTH_MAJOR
 
 The length, in surface units, of the major axis of the approaching
 tool. This should be understood as the size of the tool itself. The
 orientation of the contact and the approaching tool are assumed to be the
-same.
+same [4].
 
 ABS_MT_WIDTH_MINOR
 
 The length, in surface units, of the minor axis of the approaching
-tool. Omit if circular.
+tool. Omit if circular [4].
 
 The above four values can be used to derive additional information about
 the contact. The ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR approximates
@@ -70,14 +89,17 @@ different characteristic widths [1].
 
 ABS_MT_ORIENTATION
 
-The orientation of the ellipse. The value should describe half a revolution
-clockwise around the touch center. The scale of the value is arbitrary, but
-zero should be returned for an ellipse aligned along the Y axis of the
-surface. As an example, an index finger placed straight onto the axis could
-return zero orientation, something negative when twisted to the left, and
-something positive when twisted to the right. This value can be omitted if
-the touching object is circular, or if the information is not available in
-the kernel driver.
+The orientation of the ellipse. The value should describe a signed quarter
+of a revolution clockwise around the touch center. The signed value range
+is arbitrary, but zero should be returned for a finger aligned along the Y
+axis of the surface, a negative value when finger is turned to the left, and
+a positive value when finger turned to the right. When completely aligned with
+the X axis, the range max should be returned.  Orientation can be omitted
+if the touching object is circular, or if the information is not available
+in the kernel driver. Partial orientation support is possible if the device
+can distinguish between the two axis, but not (uniquely) any values in
+between. In such cases, the range of ABS_MT_ORIENTATION should be [0, 1]
+[4].
 
 ABS_MT_POSITION_X
 
@@ -98,8 +120,35 @@ ABS_MT_BLOB_ID
 
 The BLOB_ID groups several packets together into one arbitrarily shaped
 contact. This is a low-level anonymous grouping, and should not be confused
-with the high-level contactID, explained below. Most kernel drivers will
-not have this capability, and can safely omit the event.
+with the high-level trackingID [5]. Most kernel drivers will not have blob
+capability, and can safely omit the event.
+
+ABS_MT_TRACKING_ID
+
+The TRACKING_ID identifies an initiated contact throughout its life cycle
+[5]. There are currently only a few devices that support it, so this event
+should normally be omitted.
+
+
+Event Computation
+-----------------
+
+The flora of different hardware unavoidably leads to some devices fitting
+better to the MT protocol than others. To simplify and unify the mapping,
+this section gives recipes for how to compute certain events.
+
+For devices reporting contacts as rectangular shapes, signed orientation
+cannot be obtained. Assuming X and Y are the lengths of the sides of the
+touching rectangle, here is a simple formula that retains the most
+information possible:
+
+   ABS_MT_TOUCH_MAJOR := max(X, Y)
+   ABS_MT_TOUCH_MINOR := min(X, Y)
+   ABS_MT_ORIENTATION := bool(X > Y)
+
+The range of ABS_MT_ORIENTATION should be set to [0, 1], to indicate that
+the device can distinguish between a finger along the Y axis (0) and a
+finger along the X axis (1).
 
 
 Finger Tracking
@@ -109,14 +158,18 @@ The kernel driver should generate an arbitrary enumeration of the set of
 anonymous contacts currently on the surface. The order in which the packets
 appear in the event stream is not important.
 
-The process of finger tracking, i.e., to assign a unique contactID to each
+The process of finger tracking, i.e., to assign a unique trackingID to each
 initiated contact on the surface, is left to user space; preferably the
-multi-touch X driver [3]. In that driver, the contactID stays the same and
+multi-touch X driver [3]. In that driver, the trackingID stays the same and
 unique until the contact vanishes (when the finger leaves the surface). The
 problem of assigning a set of anonymous fingers to a set of identified
 fingers is a euclidian bipartite matching problem at each event update, and
 relies on a sufficiently rapid update rate.
 
+There are a few devices that support trackingID in hardware. User space can
+make use of these native identifiers to reduce bandwidth and cpu usage.
+
+
 Notes
 -----
 
@@ -136,5 +189,7 @@ could be used to derive tilt.
 time of writing (April 2009), the MT protocol is not yet merged, and the
 prototype implements finger matching, basic mouse support and two-finger
 scrolling. The project aims at improving the quality of current multi-touch
-functionality available in the synaptics X driver, and in addition
+functionality available in the Synaptics X driver, and in addition
 implement more advanced gestures.
+[4] See the section on event computation.
+[5] See the section on finger tracking.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e87bdbfbcc75..fd5cac013037 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1535,6 +1535,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         register save and restore. The kernel will only save
                         legacy floating-point registers on task switch.
 
+        noxsave         [BUGS=X86] Disables x86 extended register state save
+                        and restore using xsave. The kernel will fallback to
+                        enabling legacy floating-point and sse state.
+
         nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
                         wfi(ARM) instruction doesn't work correctly and not to
                         use it. This is also useful when using JTAG debugger.
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 8eec05bc079e..322869fc8a9e 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -334,6 +334,7 @@ STAC9227/9228/9229/927x
   ref-no-jd     Reference board without HP/Mic jack detection
   3stack        D965 3stack
   5stack        D965 5stack + SPDIF
+  5stack-no-fp  D965 5stack without front panel
   dell-3stack   Dell Dimension E520
   dell-bios     Fixes with Dell BIOS setup
   auto          BIOS setup (default)
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index bba2dbb79d81..cfac20cf9e33 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -104,6 +104,11 @@ card*/pcm*/xrun_debug
         When this value is greater than 1, the driver will show the
         stack trace additionally.  This may help the debugging.
 
+        Since 2.6.30, this option also enables the hwptr check using
+        jiffies.  This detects spontaneous invalid pointer callback
+        values, but can be lead to too much corrections for a (mostly
+        buggy) hardware that doesn't give smooth pointer updates.
+
 card*/pcm*/sub*/info
         The general information of this PCM sub-stream.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 111fc169437a..cf4abddfc8a4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -434,7 +434,7 @@ F:	arch/alpha/
 
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:      Thomas Dahlmann
-M:      thomas.dahlmann@amd.com
+M:      dahlmann.thomas@arcor.de
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/usb/gadget/amd5536udc.*
@@ -624,6 +624,7 @@ M:	paulius.zaleckas@teltonika.lt
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:      git git://gitorious.org/linux-gemini/mainline.git
 S:      Maintained
+F:      arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
 P:      Russell King
@@ -650,6 +651,7 @@ P:	Paulius Zaleckas
 M:      paulius.zaleckas@teltonika.lt
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
+F:      arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
 P:      Russell King
@@ -1132,17 +1134,17 @@ F:	fs/bfs/
 F:      include/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
-P:      Bryan Wu
-M:      cooloney@kernel.org
+P:      Mike Frysinger
+M:      vapier@gentoo.org
 L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-P:      Bryan Wu
-M:      cooloney@kernel.org
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+P:      Michael Hennerich
+M:      michael.hennerich@analog.com
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/net/bfin_mac.*
@@ -1150,7 +1152,7 @@ F:	drivers/net/bfin_mac.*
 BLACKFIN RTC DRIVER
 P:      Mike Frysinger
 M:      vapier.adi@gmail.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/rtc/rtc-bfin.c
@@ -1158,7 +1160,7 @@ F:	drivers/rtc/rtc-bfin.c
 BLACKFIN SERIAL DRIVER
 P:      Sonic Zhang
 M:      sonic.zhang@analog.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/serial/bfin_5xx.c
@@ -1166,7 +1168,7 @@ F:	drivers/serial/bfin_5xx.c
 BLACKFIN WATCHDOG DRIVER
 P:      Mike Frysinger
 M:      vapier.adi@gmail.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/watchdog/bfin_wdt.c
@@ -1174,7 +1176,7 @@ F:	drivers/watchdog/bfin_wdt.c
 BLACKFIN I2C TWI DRIVER
 P:      Sonic Zhang
 M:      sonic.zhang@analog.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/i2c/busses/i2c-bfin-twi.c
@@ -1431,6 +1433,14 @@ P:	Russell King
 M:      linux@arm.linux.org.uk
 F:      include/linux/clk.h
 
+CISCO FCOE HBA DRIVER
+P:      Abhijeet Joglekar
+M:      abjoglek@cisco.com
+P:      Joe Eykholt
+M:      jeykholt@cisco.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+
 CODA FILE SYSTEM
 P:      Jan Harkes
 M:      jaharkes@cs.cmu.edu
@@ -1970,8 +1980,8 @@ F:	include/linux/edac.h
 
 EDAC-E752X
 P:      Mark Gross
-P:      Doug Thompson
 M:      mark.gross@intel.com
+P:      Doug Thompson
 M:      dougthompson@xmission.com
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
@@ -2248,7 +2258,7 @@ P:	Li Yang
 M:      leoli@freescale.com
 P:      Zhang Wei
 M:      zw@zh-kernel.org
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/dma/fsldma.*
@@ -5586,6 +5596,14 @@ M:	ian@mnementh.co.uk
 S:      Maintained
 F:      drivers/mmc/host/tmio_mmc.*
 
+TMPFS (SHMEM FILESYSTEM)
+P:      Hugh Dickins
+M:      hugh.dickins@tiscali.co.uk
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      include/linux/shmem_fs.h
+F:      mm/shmem.c
+
 TPM DEVICE DRIVER
 P:      Debora Velarde
 M:      debora@linux.vnet.ibm.com
diff --git a/Makefile b/Makefile
index b57e1f539e83..739fd34a72a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 30
-EXTRAVERSION = -rc6
-NAME = Vindictive Armadillo
+EXTRAVERSION = -rc7
+NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e60ec54df334..9d02cdb15b23 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -273,6 +273,7 @@ config ARCH_EP93XX
         select HAVE_CLK
         select COMMON_CLKDEV
         select ARCH_REQUIRE_GPIOLIB
+        select ARCH_HAS_HOLES_MEMORYMODEL
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -976,10 +977,9 @@ config OABI_COMPAT
           UNPREDICTABLE (in fact it can be predicted that it won't work
           at all). If in doubt say Y.
 
-config ARCH_FLATMEM_HAS_HOLES
+config ARCH_HAS_HOLES_MEMORYMODEL
         bool
-        default y
-        depends on FLATMEM
+        default n
 
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index c6884ba1d5ed..3e1714c6523f 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -253,9 +253,9 @@ void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)
 }
 
 #ifdef CONFIG_SMP
-void gic_raise_softirq(cpumask_t cpumask, unsigned int irq)
+void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 {
-        unsigned long map = *cpus_addr(cpumask);
+        unsigned long map = *cpus_addr(*mask);
 
         /* this always happens on GIC0 */
         writel(map << 16 | irq, gic_data[0].dist_base + GIC_DIST_SOFTINT);
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 6116e4893c0a..15f8a092b700 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -114,3 +114,16 @@
         .align  3;                              \
         .long   9999b,9001f;                    \
         .previous
+
+/*
+ * SMP data memory barrier
+ */
+        .macro  smp_dmb
+#ifdef CONFIG_SMP
+#if __LINUX_ARM_ARCH__ >= 7
+        dmb
+#elif __LINUX_ARM_ARCH__ == 6
+        mcr     p15, 0, r0, c7, c10, 5  @ dmb
+#endif
+#endif
+        .endm
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index ee99723b3a6c..16b52f397983 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -44,11 +44,29 @@ static inline void atomic_set(atomic_t *v, int i)
         : "cc");
 }
 
+static inline void atomic_add(int i, atomic_t *v)
+{
+        unsigned long tmp;
+        int result;
+
+        __asm__ __volatile__("@ atomic_add\n"
+"1:     ldrex   %0, [%2]\n"
+"       add     %0, %0, %3\n"
+"       strex   %1, %0, [%2]\n"
+"       teq     %1, #0\n"
+"       bne     1b"
+        : "=&r" (result), "=&r" (tmp)
+        : "r" (&v->counter), "Ir" (i)
+        : "cc");
+}
+
 static inline int atomic_add_return(int i, atomic_t *v)
 {
         unsigned long tmp;
         int result;
 
+        smp_mb();
+
         __asm__ __volatile__("@ atomic_add_return\n"
 "1:     ldrex   %0, [%2]\n"
 "       add     %0, %0, %3\n"
@@ -59,14 +77,34 @@ static inline int atomic_add_return(int i, atomic_t *v)
         : "r" (&v->counter), "Ir" (i)
         : "cc");
 
+        smp_mb();
+
         return result;
 }
 
+static inline void atomic_sub(int i, atomic_t *v)
+{
+        unsigned long tmp;
+        int result;
+
+        __asm__ __volatile__("@ atomic_sub\n"
+"1:     ldrex   %0, [%2]\n"
+"       sub     %0, %0, %3\n"
+"       strex   %1, %0, [%2]\n"
+"       teq     %1, #0\n"
+"       bne     1b"
+        : "=&r" (result), "=&r" (tmp)
+        : "r" (&v->counter), "Ir" (i)
+        : "cc");
+}
+
 static inline int atomic_sub_return(int i, atomic_t *v)
 {
         unsigned long tmp;
         int result;
 
+        smp_mb();
+
         __asm__ __volatile__("@ atomic_sub_return\n"
 "1:     ldrex   %0, [%2]\n"
 "       sub     %0, %0, %3\n"
@@ -77,6 +115,8 @@ static inline int atomic_sub_return(int i, atomic_t *v)
         : "r" (&v->counter), "Ir" (i)
         : "cc");
 
+        smp_mb();
+
         return result;
 }
 
@@ -84,6 +124,8 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 {
         unsigned long oldval, res;
 
+        smp_mb();
+
         do {
                 __asm__ __volatile__("@ atomic_cmpxchg\n"
                 "ldrex  %1, [%2]\n"
@@ -95,6 +137,8 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
                     : "cc");
         } while (res);
 
+        smp_mb();
+
         return oldval;
 }
 
@@ -135,6 +179,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
 
         return val;
 }
+#define atomic_add(i, v)        (void) atomic_add_return(i, v)
 
 static inline int atomic_sub_return(int i, atomic_t *v)
 {
@@ -148,6 +193,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 
         return val;
 }
+#define atomic_sub(i, v)        (void) atomic_sub_return(i, v)
 
 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
 {
@@ -187,10 +233,8 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 }
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 
-#define atomic_add(i, v)        (void) atomic_add_return(i, v)
-#define atomic_inc(v)           (void) atomic_add_return(1, v)
-#define atomic_sub(i, v)        (void) atomic_sub_return(i, v)
-#define atomic_dec(v)           (void) atomic_sub_return(1, v)
+#define atomic_inc(v)           atomic_add(1, v)
+#define atomic_dec(v)           atomic_sub(1, v)
 
 #define atomic_inc_and_test(v)  (atomic_add_return(1, v) == 0)
 #define atomic_dec_and_test(v)  (atomic_sub_return(1, v) == 0)
@@ -200,11 +244,10 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 
 #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0)
 
-/* Atomic operations are already serializing on ARM */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
+#define smp_mb__before_atomic_dec()     smp_mb()
+#define smp_mb__after_atomic_dec()      smp_mb()
+#define smp_mb__before_atomic_inc()     smp_mb()
+#define smp_mb__after_atomic_inc()      smp_mb()
 
 #include <asm-generic/atomic.h>
 #endif
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
index 1d77e51907f6..59426a4595c9 100644
--- a/arch/arm/include/asm/flat.h
+++ b/arch/arm/include/asm/flat.h
@@ -5,9 +5,6 @@
 #ifndef __ARM_FLAT_H__
 #define __ARM_FLAT_H__
 
-/* An odd number of words will be pushed after this alignment, so
-   deliberately misalign the value.  */
-#define flat_stack_align(sp)    sp = (void *)(((unsigned long)(sp) - 4) | 4)
 #define flat_argvp_envp_on_stack()              1
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h
index 4924914af188..7f34333bb545 100644
--- a/arch/arm/include/asm/hardware/gic.h
+++ b/arch/arm/include/asm/hardware/gic.h
@@ -36,7 +36,7 @@
 void gic_dist_init(unsigned int gic_nr, void __iomem *base, unsigned int irq_start);
 void gic_cpu_init(unsigned int gic_nr, void __iomem *base);
 void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
-void gic_raise_softirq(cpumask_t cpumask, unsigned int irq);
+void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);
 #endif
 
 #endif
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index fad70da5911d..5995935338e1 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -53,17 +53,12 @@ extern void smp_store_cpu_info(unsigned int cpuid);
 /*
  * Raise an IPI cross call on CPUs in callmap.
  */
-extern void smp_cross_call(cpumask_t callmap);
-
-/*
- * Broadcast a timer interrupt to the other CPUs.
- */
-extern void smp_send_timer(void);
+extern void smp_cross_call(const struct cpumask *mask);
 
 /*
  * Broadcast a clock event to other CPUs.
  */
-extern void smp_timer_broadcast(cpumask_t mask);
+extern void smp_timer_broadcast(const struct cpumask *mask);
 
 /*
  * Boot a secondary CPU, and assign it the specified idle task.
@@ -102,7 +97,8 @@ extern int platform_cpu_kill(unsigned int cpu);
 extern void platform_cpu_enable(unsigned int cpu);
 
 extern void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi(cpumask_t mask);
+extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
 
 /*
  * Local timer interrupt handling function (can be IPI'ed).
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index bd4dc8ed53d5..d65b2f5bf41f 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -248,6 +248,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
         unsigned int tmp;
 #endif
 
+        smp_mb();
+
         switch (size) {
 #if __LINUX_ARM_ARCH__ >= 6
         case 1:
@@ -307,6 +309,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
                 __bad_xchg(ptr, size), ret = 0;
                 break;
         }
+        smp_mb();
 
         return ret;
 }
@@ -316,6 +319,12 @@ extern void enable_hlt(void);
 
 #include <asm-generic/cmpxchg-local.h>
 
+#if __LINUX_ARM_ARCH__ < 6
+
+#ifdef CONFIG_SMP
+#error "SMP is not supported on this platform"
+#endif
+
 /*
  * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
  * them available.
@@ -329,6 +338,173 @@ extern void enable_hlt(void);
 #include <asm-generic/cmpxchg.h>
 #endif
 
+#else   /* __LINUX_ARM_ARCH__ >= 6 */
+
+extern void __bad_cmpxchg(volatile void *ptr, int size);
+
+/*
+ * cmpxchg only support 32-bits operands on ARMv6.
+ */
+
+static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+                                      unsigned long new, int size)
+{
+        unsigned long oldval, res;
+
+        switch (size) {
+#ifdef CONFIG_CPU_32v6K
+        case 1:
+                do {
+                        asm volatile("@ __cmpxchg1\n"
+                        "       ldrexb  %1, [%2]\n"
+                        "       mov     %0, #0\n"
+                        "       teq     %1, %3\n"
+                        "       strexbeq %0, %4, [%2]\n"
+                                : "=&r" (res), "=&r" (oldval)
+                                : "r" (ptr), "Ir" (old), "r" (new)
+                                : "memory", "cc");
+                } while (res);
+                break;
+        case 2:
+                do {
+                        asm volatile("@ __cmpxchg1\n"
+                        "       ldrexh  %1, [%2]\n"
+                        "       mov     %0, #0\n"
+                        "       teq     %1, %3\n"
+                        "       strexheq %0, %4, [%2]\n"
+                                : "=&r" (res), "=&r" (oldval)
+                                : "r" (ptr), "Ir" (old), "r" (new)
+                                : "memory", "cc");
+                } while (res);
+                break;
+#endif /* CONFIG_CPU_32v6K */
+        case 4:
+                do {
+                        asm volatile("@ __cmpxchg4\n"
+                        "       ldrex   %1, [%2]\n"
+                        "       mov     %0, #0\n"
+                        "       teq     %1, %3\n"
+                        "       strexeq %0, %4, [%2]\n"
+                                : "=&r" (res), "=&r" (oldval)
+                                : "r" (ptr), "Ir" (old), "r" (new)
+                                : "memory", "cc");
+                } while (res);
+                break;
+        default:
+                __bad_cmpxchg(ptr, size);
+                oldval = 0;
+        }
+
+        return oldval;
+}
+
+static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old,
+                                         unsigned long new, int size)
+{
+        unsigned long ret;
+
+        smp_mb();
+        ret = __cmpxchg(ptr, old, new, size);
+        smp_mb();
+
+        return ret;
+}
+
+#define cmpxchg(ptr,o,n)                                                \
+        ((__typeof__(*(ptr)))__cmpxchg_mb((ptr),                        \
+                                          (unsigned long)(o),           \
+                                          (unsigned long)(n),           \
+                                          sizeof(*(ptr))))
+
+static inline unsigned long __cmpxchg_local(volatile void *ptr,
+                                            unsigned long old,
+                                            unsigned long new, int size)
+{
+        unsigned long ret;
+
+        switch (size) {
+#ifndef CONFIG_CPU_32v6K
+        case 1:
+        case 2:
+                ret = __cmpxchg_local_generic(ptr, old, new, size);
+                break;
+#endif  /* !CONFIG_CPU_32v6K */
+        default:
+                ret = __cmpxchg(ptr, old, new, size);
+        }
+
+        return ret;
+}
+
+#define cmpxchg_local(ptr,o,n)                                          \
+        ((__typeof__(*(ptr)))__cmpxchg_local((ptr),                     \
+                                       (unsigned long)(o),              \
+                                       (unsigned long)(n),              \
+                                       sizeof(*(ptr))))
+
+#ifdef CONFIG_CPU_32v6K
+
+/*
+ * Note : ARMv7-M (currently unsupported by Linux) does not support
+ * ldrexd/strexd. If ARMv7-M is ever supported by the Linux kernel, it should
+ * not be allowed to use __cmpxchg64.
+ */
+static inline unsigned long long __cmpxchg64(volatile void *ptr,
+                                             unsigned long long old,
+                                             unsigned long long new)
+{
+        register unsigned long long oldval asm("r0");
+        register unsigned long long __old asm("r2") = old;
+        register unsigned long long __new asm("r4") = new;
+        unsigned long res;
+
+        do {
+                asm volatile(
+                "       @ __cmpxchg8\n"
+                "       ldrexd  %1, %H1, [%2]\n"
+                "       mov     %0, #0\n"
+                "       teq     %1, %3\n"
+                "       teqeq   %H1, %H3\n"
+                "       strexdeq %0, %4, %H4, [%2]\n"
+                        : "=&r" (res), "=&r" (oldval)
+                        : "r" (ptr), "Ir" (__old), "r" (__new)
+                        : "memory", "cc");
+        } while (res);
+
+        return oldval;
+}
+
+static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
+                                                unsigned long long old,
+                                                unsigned long long new)
+{
+        unsigned long long ret;
+
+        smp_mb();
+        ret = __cmpxchg64(ptr, old, new);
+        smp_mb();
+
+        return ret;
+}
+
+#define cmpxchg64(ptr,o,n)                                              \
+        ((__typeof__(*(ptr)))__cmpxchg64_mb((ptr),                      \
+                                            (unsigned long long)(o),    \
+                                            (unsigned long long)(n)))
+
+#define cmpxchg64_local(ptr,o,n)                                        \
+        ((__typeof__(*(ptr)))__cmpxchg64((ptr),                         \
+                                         (unsigned long long)(o),       \
+                                         (unsigned long long)(n)))
+
+#else   /* !CONFIG_CPU_32v6K */
+
+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+
+#endif  /* CONFIG_CPU_32v6K */
+
+#endif  /* __LINUX_ARM_ARCH__ >= 6 */
+
 #endif /* __ASSEMBLY__ */
 
 #define arch_align_stack(x) (x)
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c
index d4a0da1e48f4..950391f194c4 100644
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
@@ -78,6 +78,15 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
                 return 1;
         if (cpu_architecture() < CPU_ARCH_ARMv6)
                 return 1;
+#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
+        /*
+         * If we have support for OABI programs, we can never allow NX
+         * support - our signal syscall restart mechanism relies upon
+         * being able to execute code placed on the user stack.
+         */
+        return 1;
+#else
         return 0;
+#endif
 }
 EXPORT_SYMBOL(arm_elf_read_implies_exec);
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index d662a2f1fd85..83b1da6b7baa 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -815,10 +815,7 @@ __kuser_helper_start:
  */
 
 __kuser_memory_barrier:                         @ 0xffff0fa0
-
-#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_SMP)
-        mcr     p15, 0, r0, c7, c10, 5  @ dmb
-#endif
+        smp_dmb
         usr_ret lr
 
         .align  5
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 7801aac3c043..6014dfd22af4 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -326,14 +326,14 @@ void __init smp_prepare_boot_cpu(void)
         per_cpu(cpu_data, cpu).idle = current;
 }
 
-static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)
+static void send_ipi_message(const struct cpumask *mask, enum ipi_msg_type msg)
 {
         unsigned long flags;
         unsigned int cpu;
 
         local_irq_save(flags);
 
-        for_each_cpu_mask(cpu, callmap) {
+        for_each_cpu(cpu, mask) {
                 struct ipi_data *ipi = &per_cpu(ipi_data, cpu);
 
                 spin_lock(&ipi->lock);
@@ -344,19 +344,19 @@ static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)
         /*
          * Call the platform specific cross-CPU call function.
          */
-        smp_cross_call(callmap);
+        smp_cross_call(mask);
 
         local_irq_restore(flags);
 }
 
-void arch_send_call_function_ipi(cpumask_t mask)
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
         send_ipi_message(mask, IPI_CALL_FUNC);
 }
 
 void arch_send_call_function_single_ipi(int cpu)
 {
-        send_ipi_message(cpumask_of_cpu(cpu), IPI_CALL_FUNC_SINGLE);
+        send_ipi_message(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
 }
 
 void show_ipi_list(struct seq_file *p)
@@ -498,17 +498,10 @@ asmlinkage void __exception do_IPI(struct pt_regs *regs)
 
 void smp_send_reschedule(int cpu)
 {
-        send_ipi_message(cpumask_of_cpu(cpu), IPI_RESCHEDULE);
+        send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE);
 }
 
-void smp_send_timer(void)
-{
-        cpumask_t mask = cpu_online_map;
-        cpu_clear(smp_processor_id(), mask);
-        send_ipi_message(mask, IPI_TIMER);
-}
-
-void smp_timer_broadcast(cpumask_t mask)
+void smp_timer_broadcast(const struct cpumask *mask)
 {
         send_ipi_message(mask, IPI_TIMER);
 }
@@ -517,7 +510,7 @@ void smp_send_stop(void)
 {
         cpumask_t mask = cpu_online_map;
         cpu_clear(smp_processor_id(), mask);
-        send_ipi_message(mask, IPI_CPU_STOP);
+        send_ipi_message(&mask, IPI_CPU_STOP);
 }
 
 /*
@@ -528,20 +521,17 @@ int setup_profiling_timer(unsigned int multiplier)
         return -EINVAL;
 }
 
-static int
-on_each_cpu_mask(void (*func)(void *), void *info, int wait, cpumask_t mask)
+static void
+on_each_cpu_mask(void (*func)(void *), void *info, int wait,
+                const struct cpumask *mask)
 {
-        int ret = 0;
-
         preempt_disable();
 
-        ret = smp_call_function_mask(mask, func, info, wait);
-        if (cpu_isset(smp_processor_id(), mask))
+        smp_call_function_many(mask, func, info, wait);
+        if (cpumask_test_cpu(smp_processor_id(), mask))
                 func(info);
 
         preempt_enable();
-
-        return ret;
 }
 
 /**********************************************************************/
@@ -602,20 +592,17 @@ void flush_tlb_all(void)
 
 void flush_tlb_mm(struct mm_struct *mm)
 {
-        cpumask_t mask = mm->cpu_vm_mask;
-
-        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, &mm->cpu_vm_mask);
 }
 
 void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
 {
-        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
         struct tlb_args ta;
 
         ta.ta_vma = vma;
         ta.ta_start = uaddr;
 
-        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, &vma->vm_mm->cpu_vm_mask);
 }
 
 void flush_tlb_kernel_page(unsigned long kaddr)
@@ -630,14 +617,13 @@ void flush_tlb_kernel_page(unsigned long kaddr)
 void flush_tlb_range(struct vm_area_struct *vma,
                      unsigned long start, unsigned long end)
 {
-        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
         struct tlb_args ta;
 
         ta.ta_vma = vma;
         ta.ta_start = start;
         ta.ta_end = end;
 
-        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, &vma->vm_mm->cpu_vm_mask);
 }
 
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 2e787d40d599..c7f2627385e7 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -18,12 +18,14 @@
         mov     r2, #1
         add     r1, r1, r0, lsr #3      @ Get byte offset
         mov     r3, r2, lsl r3          @ create mask
+        smp_dmb
 1:      ldrexb  r2, [r1]
         ands    r0, r2, r3              @ save old value of bit
         \instr  r2, r2, r3                      @ toggle bit
         strexb  ip, r2, [r1]
         cmp     ip, #0
         bne     1b
+        smp_dmb
         cmp     r0, #0
         movne   r0, #1
 2:      mov     pc, lr
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index e8ebeaea6c48..b2eede5531c8 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -21,15 +21,50 @@
 #include <asm/div64.h>
 #include <mach/hardware.h>
 
+
+/*
+ * The EP93xx has two external crystal oscillators.  To generate the
+ * required high-frequency clocks, the processor uses two phase-locked-
+ * loops (PLLs) to multiply the incoming external clock signal to much
+ * higher frequencies that are then divided down by programmable dividers
+ * to produce the needed clocks.  The PLLs operate independently of one
+ * another.
+ */
+#define EP93XX_EXT_CLK_RATE     14745600
+#define EP93XX_EXT_RTC_RATE     32768
+
+
 struct clk {
         unsigned long   rate;
         int             users;
+        int             sw_locked;
         u32             enable_reg;
         u32             enable_mask;
+
+        unsigned long   (*get_rate)(struct clk *clk);
 };
 
-static struct clk clk_uart = {
-        .rate           = 14745600,
+
+static unsigned long get_uart_rate(struct clk *clk);
+
+
+static struct clk clk_uart1 = {
+        .sw_locked      = 1,
+        .enable_reg     = EP93XX_SYSCON_DEVICE_CONFIG,
+        .enable_mask    = EP93XX_SYSCON_DEVICE_CONFIG_U1EN,
+        .get_rate       = get_uart_rate,
+};
+static struct clk clk_uart2 = {
+        .sw_locked      = 1,
+        .enable_reg     = EP93XX_SYSCON_DEVICE_CONFIG,
+        .enable_mask    = EP93XX_SYSCON_DEVICE_CONFIG_U2EN,
+        .get_rate       = get_uart_rate,
+};
+static struct clk clk_uart3 = {
+        .sw_locked      = 1,
+        .enable_reg     = EP93XX_SYSCON_DEVICE_CONFIG,
+        .enable_mask    = EP93XX_SYSCON_DEVICE_CONFIG_U3EN,
+        .get_rate       = get_uart_rate,
 };
 static struct clk clk_pll1;
 static struct clk clk_f;
@@ -95,9 +130,9 @@ static struct clk clk_m2m1 = {
         { .dev_id = dev, .con_id = con, .clk = ck }
 
 static struct clk_lookup clocks[] = {
-        INIT_CK("apb:uart1", NULL, &clk_uart),
-        INIT_CK("apb:uart2", NULL, &clk_uart),
-        INIT_CK("apb:uart3", NULL, &clk_uart),
+        INIT_CK("apb:uart1", NULL, &clk_uart1),
+        INIT_CK("apb:uart2", NULL, &clk_uart2),
+        INIT_CK("apb:uart3", NULL, &clk_uart3),
         INIT_CK(NULL, "pll1", &clk_pll1),
         INIT_CK(NULL, "fclk", &clk_f),
         INIT_CK(NULL, "hclk", &clk_h),
@@ -125,6 +160,8 @@ int clk_enable(struct clk *clk)
                 u32 value;
 
                 value = __raw_readl(clk->enable_reg);
+                if (clk->sw_locked)
+                        __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
                 __raw_writel(value | clk->enable_mask, clk->enable_reg);
         }
 
@@ -138,13 +175,29 @@ void clk_disable(struct clk *clk)
                 u32 value;
 
                 value = __raw_readl(clk->enable_reg);
+                if (clk->sw_locked)
+                        __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
                 __raw_writel(value & ~clk->enable_mask, clk->enable_reg);
         }
 }
 EXPORT_SYMBOL(clk_disable);
 
+static unsigned long get_uart_rate(struct clk *clk)
+{
+        u32 value;
+
+        value = __raw_readl(EP93XX_SYSCON_CLOCK_CONTROL);
+        if (value & EP93XX_SYSCON_CLOCK_UARTBAUD)
+                return EP93XX_EXT_CLK_RATE;
+        else
+                return EP93XX_EXT_CLK_RATE / 2;
+}
+
 unsigned long clk_get_rate(struct clk *clk)
 {
+        if (clk->get_rate)
+                return clk->get_rate(clk);
+
         return clk->rate;
 }
 EXPORT_SYMBOL(clk_get_rate);
@@ -162,7 +215,7 @@ static unsigned long calc_pll_rate(u32 config_word)
         unsigned long long rate;
         int i;
 
-        rate = 14745600;
+        rate = EP93XX_EXT_CLK_RATE;
         rate *= ((config_word >> 11) & 0x1f) + 1;               /* X1FBD */
         rate *= ((config_word >> 5) & 0x3f) + 1;                /* X2FBD */
         do_div(rate, (config_word & 0x1f) + 1);                 /* X2IPD */
@@ -195,7 +248,7 @@ static int __init ep93xx_clock_init(void)
 
         value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1);
         if (!(value & 0x00800000)) {                    /* PLL1 bypassed?  */
-                clk_pll1.rate = 14745600;
+                clk_pll1.rate = EP93XX_EXT_CLK_RATE;
         } else {
                 clk_pll1.rate = calc_pll_rate(value);
         }
@@ -206,7 +259,7 @@ static int __init ep93xx_clock_init(void)
 
         value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2);
         if (!(value & 0x00080000)) {                    /* PLL2 bypassed?  */
-                clk_pll2.rate = 14745600;
+                clk_pll2.rate = EP93XX_EXT_CLK_RATE;
         } else if (value & 0x00040000) {                /* PLL2 enabled?  */
                 clk_pll2.rate = calc_pll_rate(value);
         } else {
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index f66be12b856e..1732de7629a5 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@ -159,7 +159,10 @@
 #define EP93XX_SYSCON_CLOCK_SET1        EP93XX_SYSCON_REG(0x20)
 #define EP93XX_SYSCON_CLOCK_SET2        EP93XX_SYSCON_REG(0x24)
 #define EP93XX_SYSCON_DEVICE_CONFIG     EP93XX_SYSCON_REG(0x80)
-#define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE       0x00800000
+#define EP93XX_SYSCON_DEVICE_CONFIG_U3EN                (1<<24)
+#define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE       (1<<23)
+#define EP93XX_SYSCON_DEVICE_CONFIG_U2EN                (1<<20)
+#define EP93XX_SYSCON_DEVICE_CONFIG_U1EN                (1<<18)
 #define EP93XX_SYSCON_SWLOCK            EP93XX_SYSCON_REG(0xc0)
 
 #define EP93XX_WATCHDOG_BASE            (EP93XX_APB_VIRT_BASE + 0x00140000)
diff --git a/arch/arm/mach-gemini/include/mach/hardware.h b/arch/arm/mach-gemini/include/mach/hardware.h
index de6752674c05..213a4fcfeb1c 100644
--- a/arch/arm/mach-gemini/include/mach/hardware.h
+++ b/arch/arm/mach-gemini/include/mach/hardware.h
@@ -15,10 +15,9 @@
 /*
  * Memory Map definitions
  */
-/* FIXME: Does it really swap SRAM like this? */
 #ifdef CONFIG_GEMINI_MEM_SWAP
 # define GEMINI_DRAM_BASE       0x00000000
-# define GEMINI_SRAM_BASE       0x20000000
+# define GEMINI_SRAM_BASE       0x70000000
 #else
 # define GEMINI_SRAM_BASE       0x00000000
 # define GEMINI_DRAM_BASE       0x10000000
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 6f8872913073..a0f60e55da6a 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -121,7 +121,7 @@ static struct clk uartclk = {
         .rate   = 14745600,
 };
 
-static struct clk_lookup lookups[] __initdata = {
+static struct clk_lookup lookups[] = {
         {       /* UART0 */
                 .dev_id         = "mb:16",
                 .clk            = &uartclk,
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index eeb00240d784..be1ca28fed3f 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -144,6 +144,9 @@ static struct platform_device kirkwood_ge00 = {
         .id             = 0,
         .num_resources  = 1,
         .resource       = kirkwood_ge00_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
@@ -202,6 +205,9 @@ static struct platform_device kirkwood_ge01 = {
         .id             = 1,
         .num_resources  = 1,
         .resource       = kirkwood_ge01_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
@@ -386,12 +392,10 @@ static struct mv64xxx_i2c_pdata kirkwood_i2c_pdata = {
 
 static struct resource kirkwood_i2c_resources[] = {
         {
-                .name   = "i2c",
                 .start  = I2C_PHYS_BASE,
                 .end    = I2C_PHYS_BASE + 0x1f,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .name   = "i2c",
                 .start  = IRQ_KIRKWOOD_TWSI,
                 .end    = IRQ_KIRKWOOD_TWSI,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
index dda5743cf3e0..01aa213c0a6f 100644
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
@@ -142,6 +142,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
         MPP1_SPI_MOSI,
         MPP2_SPI_SCK,
         MPP3_SPI_MISO,
+        MPP4_SATA1_ACTn,
+        MPP5_SATA0_ACTn,
         MPP8_TW_SDA,
         MPP9_TW_SCK,
         MPP10_UART0_TXD,
@@ -150,10 +152,6 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
         MPP14_UART1_RXD,        /* PIC controller */
         MPP15_GPIO,             /* USB Copy button */
         MPP16_GPIO,             /* Reset button */
-        MPP20_SATA1_ACTn,
-        MPP21_SATA0_ACTn,
-        MPP22_SATA1_PRESENTn,
-        MPP23_SATA0_PRESENTn,
         0
 };
 
diff --git a/arch/arm/mach-l7200/include/mach/sys-clock.h b/arch/arm/mach-l7200/include/mach/sys-clock.h
index 2d7722be60ea..e9729a35751d 100644
--- a/arch/arm/mach-l7200/include/mach/sys-clock.h
+++ b/arch/arm/mach-l7200/include/mach/sys-clock.h
@@ -18,7 +18,7 @@
 
 /* IO_START and IO_BASE are defined in hardware.h */
 
-#define SYS_CLOCK_START (IO_START + SYS_CLCOK_OFF)  /* Physical address */
+#define SYS_CLOCK_START (IO_START + SYS_CLOCK_OFF)  /* Physical address */
 #define SYS_CLOCK_BASE  (IO_BASE  + SYS_CLOCK_OFF)  /* Virtual address  */
 
 /* Define the interface to the SYS_CLOCK */
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c
index c0d2d9d12e74..818f19d7ab1f 100644
--- a/arch/arm/mach-loki/common.c
+++ b/arch/arm/mach-loki/common.c
@@ -82,6 +82,9 @@ static struct platform_device loki_ge0 = {
         .id             = 0,
         .num_resources  = 1,
         .resource       = loki_ge0_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data)
@@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = {
         .id             = 1,
         .num_resources  = 1,
         .resource       = loki_ge1_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data)
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
index d0bdb6e3682b..2e914649b9e4 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
@@ -3,6 +3,11 @@
 
 #include <mach/mfp.h>
 
+#define MFP_DRIVE_VERY_SLOW     (0x0 << 13)
+#define MFP_DRIVE_SLOW          (0x1 << 13)
+#define MFP_DRIVE_MEDIUM        (0x2 << 13)
+#define MFP_DRIVE_FAST          (0x3 << 13)
+
 /* GPIO */
 #define GPIO0_GPIO              MFP_CFG(GPIO0, AF5)
 #define GPIO1_GPIO              MFP_CFG(GPIO1, AF5)
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
index 48a1cbc7c56b..d97de36c50ad 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
@@ -3,6 +3,11 @@
 
 #include <mach/mfp.h>
 
+#define MFP_DRIVE_VERY_SLOW     (0x0 << 13)
+#define MFP_DRIVE_SLOW          (0x2 << 13)
+#define MFP_DRIVE_MEDIUM        (0x4 << 13)
+#define MFP_DRIVE_FAST          (0x8 << 13)
+
 /* UART2 */
 #define GPIO47_UART2_RXD        MFP_CFG(GPIO47, AF6)
 #define GPIO48_UART2_TXD        MFP_CFG(GPIO48, AF6)
diff --git a/arch/arm/mach-mmp/include/mach/mfp.h b/arch/arm/mach-mmp/include/mach/mfp.h
index 277ea4cd0f9f..62e510e80a58 100644
--- a/arch/arm/mach-mmp/include/mach/mfp.h
+++ b/arch/arm/mach-mmp/include/mach/mfp.h
@@ -12,16 +12,13 @@
  * possible, we make the following compromise:
  *
  * 1. SLEEP_OE_N will always be programmed to '1' (by MFP_LPM_FLOAT)
- * 2. DRIVE strength definitions redefined to include the reserved bit10
+ * 2. DRIVE strength definitions redefined to include the reserved bit
+ *    - the reserved bit differs between pxa168 and pxa910, and the
+ *      MFP_DRIVE_* macros are individually defined in mfp-pxa{168,910}.h
  * 3. Override MFP_CFG() and MFP_CFG_DRV()
  * 4. Drop the use of MFP_CFG_LPM() and MFP_CFG_X()
  */
 
-#define MFP_DRIVE_VERY_SLOW     (0x0 << 13)
-#define MFP_DRIVE_SLOW          (0x2 << 13)
-#define MFP_DRIVE_MEDIUM        (0x4 << 13)
-#define MFP_DRIVE_FAST          (0x8 << 13)
-
 #undef MFP_CFG
 #undef MFP_CFG_DRV
 #undef MFP_CFG_LPM
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index b03a6eda7419..a8400bb891e7 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -136,7 +136,7 @@ static struct clock_event_device ckevt = {
         .set_mode       = timer_set_mode,
 };
 
-static cycle_t clksrc_read(void)
+static cycle_t clksrc_read(struct clocksource *cs)
 {
         return timer_read();
 }
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 9ba595083dab..1b22e4af8791 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -321,6 +321,9 @@ static struct platform_device mv78xx0_ge00 = {
         .id             = 0,
         .num_resources  = 1,
         .resource       = mv78xx0_ge00_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
@@ -375,6 +378,9 @@ static struct platform_device mv78xx0_ge01 = {
         .id             = 1,
         .num_resources  = 1,
         .resource       = mv78xx0_ge01_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
@@ -429,6 +435,9 @@ static struct platform_device mv78xx0_ge10 = {
         .id             = 2,
         .num_resources  = 1,
         .resource       = mv78xx0_ge10_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
@@ -496,6 +505,9 @@ static struct platform_device mv78xx0_ge11 = {
         .id             = 3,
         .num_resources  = 1,
         .resource       = mv78xx0_ge11_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
@@ -532,12 +544,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_0_pdata = {
 
 static struct resource mv78xx0_i2c_0_resources[] = {
         {
-                .name   = "i2c 0 base",
                 .start  = I2C_0_PHYS_BASE,
                 .end    = I2C_0_PHYS_BASE + 0x1f,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .name   = "i2c 0 irq",
                 .start  = IRQ_MV78XX0_I2C_0,
                 .end    = IRQ_MV78XX0_I2C_0,
                 .flags  = IORESOURCE_IRQ,
@@ -567,12 +577,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_1_pdata = {
 
 static struct resource mv78xx0_i2c_1_resources[] = {
         {
-                .name   = "i2c 1 base",
                 .start  = I2C_1_PHYS_BASE,
                 .end    = I2C_1_PHYS_BASE + 0x1f,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .name   = "i2c 1 irq",
                 .start  = IRQ_MV78XX0_I2C_1,
                 .end    = IRQ_MV78XX0_I2C_1,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index efc59c49341b..e4cef333e291 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -103,10 +103,10 @@ static struct omap_clk omap24xx_clks[] = {
         CLK(NULL,       "mdm_ick",      &mdm_ick,       CK_243X),
         CLK(NULL,       "mdm_osc_ck",   &mdm_osc_ck,    CK_243X),
         /* DSS domain clocks */
-        CLK(NULL,       "dss_ick",      &dss_ick,       CK_243X | CK_242X),
-        CLK(NULL,       "dss1_fck",     &dss1_fck,      CK_243X | CK_242X),
-        CLK(NULL,       "dss2_fck",     &dss2_fck,      CK_243X | CK_242X),
-        CLK(NULL,       "dss_54m_fck",  &dss_54m_fck,   CK_243X | CK_242X),
+        CLK("omapfb",   "ick",          &dss_ick,       CK_243X | CK_242X),
+        CLK("omapfb",   "dss1_fck",     &dss1_fck,      CK_243X | CK_242X),
+        CLK("omapfb",   "dss2_fck",     &dss2_fck,      CK_243X | CK_242X),
+        CLK("omapfb",   "tv_fck",       &dss_54m_fck,   CK_243X | CK_242X),
         /* L3 domain clocks */
         CLK(NULL,       "core_l3_ck",   &core_l3_ck,    CK_243X | CK_242X),
         CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck, CK_243X | CK_242X),
@@ -206,7 +206,7 @@ static struct omap_clk omap24xx_clks[] = {
         CLK(NULL,       "aes_ick",      &aes_ick,       CK_243X | CK_242X),
         CLK(NULL,       "pka_ick",      &pka_ick,       CK_243X | CK_242X),
         CLK(NULL,       "usb_fck",      &usb_fck,       CK_243X | CK_242X),
-        CLK(NULL,       "usbhs_ick",    &usbhs_ick,     CK_243X),
+        CLK("musb_hdrc",        "ick",  &usbhs_ick,     CK_243X),
         CLK("mmci-omap-hs.0", "ick",    &mmchs1_ick,    CK_243X),
         CLK("mmci-omap-hs.0", "fck",    &mmchs1_fck,    CK_243X),
         CLK("mmci-omap-hs.1", "ick",    &mmchs2_ick,    CK_243X),
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 0a14dca31e30..ba05aa42bd8e 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -157,7 +157,7 @@ static struct omap_clk omap34xx_clks[] = {
         CLK(NULL,       "ssi_ssr_fck",  &ssi_ssr_fck,   CK_343X),
         CLK(NULL,       "ssi_sst_fck",  &ssi_sst_fck,   CK_343X),
         CLK(NULL,       "core_l3_ick",  &core_l3_ick,   CK_343X),
-        CLK(NULL,       "hsotgusb_ick", &hsotgusb_ick,  CK_343X),
+        CLK("musb_hdrc",        "ick",  &hsotgusb_ick,  CK_343X),
         CLK(NULL,       "sdrc_ick",     &sdrc_ick,      CK_343X),
         CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_343X),
         CLK(NULL,       "security_l3_ick", &security_l3_ick, CK_343X),
@@ -197,11 +197,11 @@ static struct omap_clk omap34xx_clks[] = {
         CLK("omap_rng", "ick",          &rng_ick,       CK_343X),
         CLK(NULL,       "sha11_ick",    &sha11_ick,     CK_343X),
         CLK(NULL,       "des1_ick",     &des1_ick,      CK_343X),
-        CLK(NULL,       "dss1_alwon_fck", &dss1_alwon_fck, CK_343X),
-        CLK(NULL,       "dss_tv_fck",   &dss_tv_fck,    CK_343X),
-        CLK(NULL,       "dss_96m_fck",  &dss_96m_fck,   CK_343X),
-        CLK(NULL,       "dss2_alwon_fck", &dss2_alwon_fck, CK_343X),
-        CLK(NULL,       "dss_ick",      &dss_ick,       CK_343X),
+        CLK("omapfb",   "dss1_fck",     &dss1_alwon_fck, CK_343X),
+        CLK("omapfb",   "tv_fck",       &dss_tv_fck,    CK_343X),
+        CLK("omapfb",   "video_fck",    &dss_96m_fck,   CK_343X),
+        CLK("omapfb",   "dss2_fck",     &dss2_alwon_fck, CK_343X),
+        CLK("omapfb",   "ick",          &dss_ick,       CK_343X),
         CLK(NULL,       "cam_mclk",     &cam_mclk,      CK_343X),
         CLK(NULL,       "cam_ick",      &cam_ick,       CK_343X),
         CLK(NULL,       "csi2_96m_fck", &csi2_96m_fck,  CK_343X),
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 6763b8f73028..017a30e9aa1d 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -2182,7 +2182,7 @@ static struct clk wkup_32k_fck = {
 
 static struct clk gpio1_dbck = {
         .name           = "gpio1_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &wkup_32k_fck,
         .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO1_SHIFT,
@@ -2427,7 +2427,7 @@ static struct clk per_32k_alwon_fck = {
 
 static struct clk gpio6_dbck = {
         .name           = "gpio6_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &per_32k_alwon_fck,
         .enable_reg     = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO6_SHIFT,
@@ -2437,7 +2437,7 @@ static struct clk gpio6_dbck = {
 
 static struct clk gpio5_dbck = {
         .name           = "gpio5_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &per_32k_alwon_fck,
         .enable_reg     = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO5_SHIFT,
@@ -2447,7 +2447,7 @@ static struct clk gpio5_dbck = {
 
 static struct clk gpio4_dbck = {
         .name           = "gpio4_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &per_32k_alwon_fck,
         .enable_reg     = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO4_SHIFT,
@@ -2457,7 +2457,7 @@ static struct clk gpio4_dbck = {
 
 static struct clk gpio3_dbck = {
         .name           = "gpio3_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &per_32k_alwon_fck,
         .enable_reg     = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO3_SHIFT,
@@ -2467,7 +2467,7 @@ static struct clk gpio3_dbck = {
 
 static struct clk gpio2_dbck = {
         .name           = "gpio2_dbck",
-        .ops            = &clkops_omap2_dflt_wait,
+        .ops            = &clkops_omap2_dflt,
         .parent         = &per_32k_alwon_fck,
         .enable_reg     = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
         .enable_bit     = OMAP3430_EN_GPIO2_SHIFT,
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 496983ade97e..894cc355818a 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -354,10 +354,12 @@ static void omap_init_mcspi(void)
         platform_device_register(&omap2_mcspi1);
         platform_device_register(&omap2_mcspi2);
 #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
-        platform_device_register(&omap2_mcspi3);
+        if (cpu_is_omap2430() || cpu_is_omap343x())
+                platform_device_register(&omap2_mcspi3);
 #endif
 #ifdef CONFIG_ARCH_OMAP3
-        platform_device_register(&omap2_mcspi4);
+        if (cpu_is_omap343x())
+                platform_device_register(&omap2_mcspi4);
 #endif
 }
 
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index c6a7940f4287..9fd03a2ec95c 100644
--- a/arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
@@ -409,7 +409,7 @@
 /* PM_PREPWSTST_CAM specific bits */
 
 /* PM_PWSTCTRL_USBHOST specific bits */
-#define OMAP3430ES2_SAVEANDRESTORE_SHIFT                (1 << 4)
+#define OMAP3430ES2_SAVEANDRESTORE_SHIFT                4
 
 /* RM_RSTST_PER specific bits */
 
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 8df55f40f4c0..8622c24cd270 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -187,7 +187,7 @@ int tusb6010_platform_retime(unsigned is_refclk)
         unsigned        sysclk_ps;
         int             status;
 
-        if (!refclk_psec || sysclk_ps == 0)
+        if (!refclk_psec || fclk_ps == 0)
                 return -ENODEV;
 
         sysclk_ps = is_refclk ? refclk_psec : TUSB6010_OSCCLK_60;
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 6af99ddabdfb..b1c7778d9f96 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -188,6 +188,9 @@ static struct platform_device orion5x_eth = {
         .id             = 0,
         .num_resources  = 1,
         .resource       = orion5x_eth_resources,
+        .dev            = {
+                .coherent_dma_mask      = 0xffffffff,
+        },
 };
 
 void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
@@ -248,12 +251,10 @@ static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {
 
 static struct resource orion5x_i2c_resources[] = {
         {
-                .name   = "i2c base",
                 .start  = I2C_PHYS_BASE,
                 .end    = I2C_PHYS_BASE + 0x1f,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .name   = "i2c irq",
                 .start  = IRQ_ORION5X_I2C,
                 .end    = IRQ_ORION5X_I2C,
                 .flags  = IORESOURCE_IRQ,
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 92ba16e1b6fc..7db966dc29ce 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -111,9 +111,9 @@ static unsigned long ezx_pin_config[] __initdata = {
         GPIO25_SSP1_TXD,
         GPIO26_SSP1_RXD,
         GPIO24_GPIO,                            /* pcap chip select */
-        GPIO1_GPIO,                             /* pcap interrupt */
-        GPIO4_GPIO,                             /* WDI_AP */
-        GPIO55_GPIO,                            /* SYS_RESTART */
+        GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,       /* pcap interrupt */
+        GPIO4_GPIO | MFP_LPM_DRIVE_HIGH,        /* WDI_AP */
+        GPIO55_GPIO | MFP_LPM_DRIVE_HIGH,       /* SYS_RESTART */
 
         /* MMC */
         GPIO32_MMC_CLK,
@@ -144,20 +144,20 @@ static unsigned long ezx_pin_config[] __initdata = {
 #if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_E680)
 static unsigned long gen1_pin_config[] __initdata = {
         /* flip / lockswitch */
-        GPIO12_GPIO,
+        GPIO12_GPIO | WAKEUP_ON_EDGE_BOTH,
 
         /* bluetooth (bcm2035) */
-        GPIO14_GPIO | WAKEUP_ON_LEVEL_HIGH,     /* HOSTWAKE */
+        GPIO14_GPIO | WAKEUP_ON_EDGE_RISE,      /* HOSTWAKE */
         GPIO48_GPIO,                            /* RESET */
         GPIO28_GPIO,                            /* WAKEUP */
 
         /* Neptune handshake */
-        GPIO0_GPIO | WAKEUP_ON_LEVEL_HIGH,      /* BP_RDY */
-        GPIO57_GPIO,                            /* AP_RDY */
-        GPIO13_GPIO | WAKEUP_ON_LEVEL_HIGH,     /* WDI */
-        GPIO3_GPIO | WAKEUP_ON_LEVEL_HIGH,      /* WDI2 */
-        GPIO82_GPIO,                            /* RESET */
-        GPIO99_GPIO,                            /* TC_MM_EN */
+        GPIO0_GPIO | WAKEUP_ON_EDGE_FALL,       /* BP_RDY */
+        GPIO57_GPIO | MFP_LPM_DRIVE_HIGH,       /* AP_RDY */
+        GPIO13_GPIO | WAKEUP_ON_EDGE_BOTH,      /* WDI */
+        GPIO3_GPIO | WAKEUP_ON_EDGE_BOTH,       /* WDI2 */
+        GPIO82_GPIO | MFP_LPM_DRIVE_HIGH,       /* RESET */
+        GPIO99_GPIO | MFP_LPM_DRIVE_HIGH,       /* TC_MM_EN */
 
         /* sound */
         GPIO52_SSP3_SCLK,
@@ -199,21 +199,21 @@ static unsigned long gen1_pin_config[] __initdata = {
         defined(CONFIG_MACH_EZX_E2) || defined(CONFIG_MACH_EZX_E6)
 static unsigned long gen2_pin_config[] __initdata = {
         /* flip / lockswitch */
-        GPIO15_GPIO,
+        GPIO15_GPIO | WAKEUP_ON_EDGE_BOTH,
 
         /* EOC */
-        GPIO10_GPIO,
+        GPIO10_GPIO | WAKEUP_ON_EDGE_RISE,
 
         /* bluetooth (bcm2045) */
-        GPIO13_GPIO | WAKEUP_ON_LEVEL_HIGH,     /* HOSTWAKE */
+        GPIO13_GPIO | WAKEUP_ON_EDGE_RISE,      /* HOSTWAKE */
         GPIO37_GPIO,                            /* RESET */
         GPIO57_GPIO,                            /* WAKEUP */
 
         /* Neptune handshake */
-        GPIO0_GPIO | WAKEUP_ON_LEVEL_HIGH,      /* BP_RDY */
-        GPIO96_GPIO,                            /* AP_RDY */
-        GPIO3_GPIO | WAKEUP_ON_LEVEL_HIGH,      /* WDI */
-        GPIO116_GPIO,                           /* RESET */
+        GPIO0_GPIO | WAKEUP_ON_EDGE_FALL,       /* BP_RDY */
+        GPIO96_GPIO | MFP_LPM_DRIVE_HIGH,       /* AP_RDY */
+        GPIO3_GPIO | WAKEUP_ON_EDGE_FALL,       /* WDI */
+        GPIO116_GPIO | MFP_LPM_DRIVE_HIGH,      /* RESET */
         GPIO41_GPIO,                            /* BP_FLASH */
 
         /* sound */
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h
index 31e6a7b6ad80..b6c10556fbc7 100644
--- a/arch/arm/mach-pxa/include/mach/reset.h
+++ b/arch/arm/mach-pxa/include/mach/reset.h
@@ -13,8 +13,9 @@ extern void clear_reset_status(unsigned int mask);
 /**
  * init_gpio_reset() - register GPIO as reset generator
  * @gpio: gpio nr
- * @output: set gpio as out/low instead of input during normal work
+ * @output: set gpio as output instead of input during normal work
+ * @level: output level
  */
-extern int init_gpio_reset(int gpio, int output);
+extern int init_gpio_reset(int gpio, int output, int level);
 
 #endif /* __ASM_ARCH_RESET_H */
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index 7ffb91d64c39..cf6b720c055f 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -322,6 +322,7 @@ static inline void pxa27x_mfp_init(void) {}
 #ifdef CONFIG_PM
 static unsigned long saved_gafr[2][4];
 static unsigned long saved_gpdr[4];
+static unsigned long saved_pgsr[4];
 
 static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)
 {
@@ -332,6 +333,7 @@ static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)
                 saved_gafr[0][i] = GAFR_L(i);
                 saved_gafr[1][i] = GAFR_U(i);
                 saved_gpdr[i] = GPDR(i * 32);
+                saved_pgsr[i] = PGSR(i);
 
                 GPDR(i * 32) = gpdr_lpm[i];
         }
@@ -346,6 +348,7 @@ static int pxa2xx_mfp_resume(struct sys_device *d)
                 GAFR_L(i) = saved_gafr[0][i];
                 GAFR_U(i) = saved_gafr[1][i];
                 GPDR(i * 32) = saved_gpdr[i];
+                PGSR(i) = saved_pgsr[i];
         }
         PSSR = PSSR_RDH | PSSR_PH;
         return 0;
@@ -374,6 +377,9 @@ static int __init pxa2xx_mfp_init(void)
         if (cpu_is_pxa27x())
                 pxa27x_mfp_init();
 
+        /* clear RDH bit to enable GPIO receivers after reset/sleep exit */
+        PSSR = PSSR_RDH;
+
         /* initialize gafr_run[], pgsr_lpm[] from existing values */
         for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++)
                 gpdr_lpm[i] = GPDR(i * 32);
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index 1cec1806f002..471a853e548b 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -62,6 +62,8 @@ static unsigned long palmld_pin_config[] __initdata = {
         GPIO29_AC97_SDATA_IN_0,
         GPIO30_AC97_SDATA_OUT,
         GPIO31_AC97_SYNC,
+        GPIO89_AC97_SYSCLK,
+        GPIO95_AC97_nRESET,
 
         /* IrDA */
         GPIO108_GPIO,   /* ir disable */
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 30662363907b..05bf979b78a6 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -64,6 +64,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
         GPIO29_AC97_SDATA_IN_0,
         GPIO30_AC97_SDATA_OUT,
         GPIO31_AC97_SYNC,
+        GPIO89_AC97_SYSCLK,
         GPIO95_AC97_nRESET,
 
         /* IrDA */
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index e2d44b1a8a9b..e99a893c58a7 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -65,6 +65,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
         GPIO29_AC97_SDATA_IN_0,
         GPIO30_AC97_SDATA_OUT,
         GPIO31_AC97_SYNC,
+        GPIO89_AC97_SYSCLK,
         GPIO95_AC97_nRESET,
 
         /* IrDA */
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c
index df29d45fb4e7..01e9d643394a 100644
--- a/arch/arm/mach-pxa/reset.c
+++ b/arch/arm/mach-pxa/reset.c
@@ -20,7 +20,7 @@ static void do_hw_reset(void);
 
 static int reset_gpio = -1;
 
-int init_gpio_reset(int gpio, int output)
+int init_gpio_reset(int gpio, int output, int level)
 {
         int rc;
 
@@ -31,7 +31,7 @@ int init_gpio_reset(int gpio, int output)
         }
 
         if (output)
-                rc = gpio_direction_output(gpio, 0);
+                rc = gpio_direction_output(gpio, level);
         else
                 rc = gpio_direction_input(gpio);
         if (rc) {
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index c18e34acafcb..5a45fe340a10 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -531,9 +531,15 @@ static int spitz_ohci_init(struct device *dev)
         return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1);
 }
 
+static void spitz_ohci_exit(struct device *dev)
+{
+        gpio_free(SPITZ_GPIO_USB_HOST);
+}
+
 static struct pxaohci_platform_data spitz_ohci_platform_data = {
         .port_mode      = PMM_NPS_MODE,
         .init           = spitz_ohci_init,
+        .exit           = spitz_ohci_exit,
         .flags          = ENABLE_PORT_ALL | NO_OC_PROTECTION,
         .power_budget   = 150,
 };
@@ -731,7 +737,7 @@ static void spitz_restart(char mode, const char *cmd)
 
 static void __init common_init(void)
 {
-        init_gpio_reset(SPITZ_GPIO_ON_RESET, 1);
+        init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0);
         pm_power_off = spitz_poweroff;
         arm_pm_restart = spitz_restart;
 
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index afac5b6d3d78..a0bd46ef5d30 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -897,7 +897,7 @@ static void __init tosa_init(void)
         gpio_set_wake(MFP_PIN_GPIO1, 1);
         /* We can't pass to gpio-keys since it will drop the Reset altfunc */
 
-        init_gpio_reset(TOSA_GPIO_ON_RESET, 0);
+        init_gpio_reset(TOSA_GPIO_ON_RESET, 0, 0);
 
         pm_power_off = tosa_poweroff;
         arm_pm_restart = tosa_restart;
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 0e65344e9f53..dd031cc41847 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -46,6 +46,7 @@
 #include <mach/audio.h>
 #include <mach/pxafb.h>
 #include <mach/i2c.h>
+#include <mach/regs-uart.h>
 #include <mach/viper.h>
 
 #include <asm/setup.h>
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 942e1a7eb9b2..076acbc50706 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -750,14 +750,6 @@ void __init realview_timer_init(unsigned int timer_irq)
 {
         u32 val;
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
-        /*
-         * The dummy clock device has to be registered before the main device
-         * so that the latter will broadcast the clock events
-         */
-        local_timer_setup();
-#endif
-
         /* 
          * set clock frequency: 
          *      REALVIEW_REFCLK is 32KHz
diff --git a/arch/arm/mach-realview/include/mach/smp.h b/arch/arm/mach-realview/include/mach/smp.h
index 515819efd046..dd53892d44a7 100644
--- a/arch/arm/mach-realview/include/mach/smp.h
+++ b/arch/arm/mach-realview/include/mach/smp.h
@@ -15,16 +15,9 @@
 /*
  * We use IRQ1 as the IPI
  */
-static inline void smp_cross_call(cpumask_t callmap)
-{
-        gic_raise_softirq(callmap, 1);
-}
-
-/*
- * Do nothing on MPcore.
- */
-static inline void smp_cross_call_done(cpumask_t callmap)
+static inline void smp_cross_call(const struct cpumask *mask)
 {
+        gic_raise_softirq(mask, 1);
 }
 
 #endif
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index d0d39adf6407..1c01d13460f0 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -189,8 +189,10 @@ void __cpuinit local_timer_setup(void)
         struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
 
         clk->name               = "dummy_timer";
-        clk->features           = CLOCK_EVT_FEAT_DUMMY;
-        clk->rating             = 200;
+        clk->features           = CLOCK_EVT_FEAT_ONESHOT |
+                                  CLOCK_EVT_FEAT_PERIODIC |
+                                  CLOCK_EVT_FEAT_DUMMY;
+        clk->rating             = 400;
         clk->mult               = 1;
         clk->set_mode           = dummy_timer_set_mode;
         clk->broadcast          = smp_timer_broadcast;
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index ea3c75595fa9..30a9c68591f6 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -78,13 +78,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
         trace_hardirqs_off();
 
         /*
-         * the primary core may have used a "cross call" soft interrupt
-         * to get this processor out of WFI in the BootMonitor - make
-         * sure that we are no longer being sent this soft interrupt
-         */
-        smp_cross_call_done(cpumask_of_cpu(cpu));
-
-        /*
          * if any interrupts are already enabled for the primary
          * core (e.g. timer irq), then they will not have been enabled
          * for us: do so
@@ -136,7 +129,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          * Use smp_cross_call() for this, since there's little
          * point duplicating the code here
          */
-        smp_cross_call(cpumask_of_cpu(cpu));
+        smp_cross_call(cpumask_of(cpu));
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
@@ -224,11 +217,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         if (max_cpus > ncores)
                 max_cpus = ncores;
 
-#ifdef CONFIG_LOCAL_TIMERS
+#if defined(CONFIG_LOCAL_TIMERS) || defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
         /*
-         * Enable the local timer for primary CPU. If the device is
-         * dummy (!CONFIG_LOCAL_TIMERS), it was already registers in
-         * realview_timer_init
+         * Enable the local timer or broadcast device for the boot CPU.
          */
         local_timer_setup();
 #endif
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 4389c160f7d0..8637dea5e150 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -588,8 +588,6 @@ static void __init bast_map_io(void)
 
         s3c_device_nand.dev.platform_data = &bast_nand_info;
 
-        s3c_i2c0_set_platdata(&bast_i2c_info);
-
         s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
         s3c24xx_init_clocks(0);
         s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));
@@ -602,6 +600,7 @@ static void __init bast_init(void)
         sysdev_class_register(&bast_pm_sysclass);
         sysdev_register(&bast_pm_sysdev);
 
+        s3c_i2c0_set_platdata(&bast_i2c_info);
         s3c24xx_fb_set_platdata(&bast_fb_info);
         platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));
 
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 1f929c391af7..b3bebcc5623b 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -413,7 +413,7 @@ static struct clk ref24_clk = {
         .rate   = 24000000,
 };
 
-static struct clk_lookup lookups[] __initdata = {
+static struct clk_lookup lookups[] = {
         {       /* UART0 */
                 .dev_id         = "dev:f1",
                 .clk            = &ref24_clk,
diff --git a/arch/arm/nwfpe/fpa11.h b/arch/arm/nwfpe/fpa11.h
index 386cbd13eaf4..d3a6f9298e9e 100644
--- a/arch/arm/nwfpe/fpa11.h
+++ b/arch/arm/nwfpe/fpa11.h
@@ -114,4 +114,8 @@ extern unsigned int SingleCPDO(struct roundingData *roundData,
 extern unsigned int DoubleCPDO(struct roundingData *roundData,
                                const unsigned int opcode, FPREG * rFd);
 
+/* extneded_cpdo.c */
+extern unsigned int ExtendedCPDO(struct roundingData *roundData,
+                                 const unsigned int opcode, FPREG * rFd);
+
 #endif
diff --git a/arch/arm/nwfpe/fpa11_cprt.c b/arch/arm/nwfpe/fpa11_cprt.c
index 9843dc533047..31c4eeec18b0 100644
--- a/arch/arm/nwfpe/fpa11_cprt.c
+++ b/arch/arm/nwfpe/fpa11_cprt.c
@@ -27,10 +27,6 @@
 #include "fpmodule.inl"
 #include "softfloat.h"
 
-#ifdef CONFIG_FPE_NWFPE_XP
-extern flag floatx80_is_nan(floatx80);
-#endif
-
 unsigned int PerformFLT(const unsigned int opcode);
 unsigned int PerformFIX(const unsigned int opcode);
 
diff --git a/arch/arm/nwfpe/softfloat.h b/arch/arm/nwfpe/softfloat.h
index 260fe29d73f5..13e479c5da57 100644
--- a/arch/arm/nwfpe/softfloat.h
+++ b/arch/arm/nwfpe/softfloat.h
@@ -226,6 +226,8 @@ char floatx80_le_quiet( floatx80, floatx80 );
 char floatx80_lt_quiet( floatx80, floatx80 );
 char floatx80_is_signaling_nan( floatx80 );
 
+extern flag floatx80_is_nan(floatx80);
+
 #endif
 
 static inline flag extractFloat32Sign(float32 a)
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index ce6b4baeedec..3746222bed10 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -206,9 +206,10 @@ void __init omapfb_reserve_sdram(void)
                         config_invalid = 1;
                         return;
                 }
-                if (rg.paddr)
+                if (rg.paddr) {
                         reserve_bootmem(rg.paddr, rg.size, BOOTMEM_DEFAULT);
-                reserved += rg.size;
+                        reserved += rg.size;
+                }
                 omapfb_config.mem_desc.region[i] = rg;
                 configured_regions++;
         }
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 17d7afe42b83..ee0b21f5b094 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -307,7 +307,7 @@ static inline int gpio_valid(int gpio)
                 return 0;
         if (cpu_is_omap24xx() && gpio < 128)
                 return 0;
-        if (cpu_is_omap34xx() && gpio < 160)
+        if (cpu_is_omap34xx() && gpio < 192)
                 return 0;
         return -1;
 }
diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-s3c/clock.c
index b6be76e2fe51..4d01ef1a25dd 100644
--- a/arch/arm/plat-s3c/clock.c
+++ b/arch/arm/plat-s3c/clock.c
@@ -306,8 +306,6 @@ struct clk s3c24xx_uclk = {
 
 int s3c24xx_register_clock(struct clk *clk)
 {
-        clk->owner = THIS_MODULE;
-
         if (clk->enable == NULL)
                 clk->enable = clk_null_enable;
 
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index aee2aeb46c60..07326f632361 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1235,7 +1235,7 @@ int s3c2410_dma_getposition(unsigned int channel, dma_addr_t *src, dma_addr_t *d
 
 EXPORT_SYMBOL(s3c2410_dma_getposition);
 
-static struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev)
+static inline struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev)
 {
         return container_of(dev, struct s3c2410_dma_chan, dev);
 }
diff --git a/arch/arm/plat-s3c64xx/gpiolib.c b/arch/arm/plat-s3c64xx/gpiolib.c
index ee9188add8fb..78ee52cffc9e 100644
--- a/arch/arm/plat-s3c64xx/gpiolib.c
+++ b/arch/arm/plat-s3c64xx/gpiolib.c
@@ -57,7 +57,7 @@
 #if 1
 #define gpio_dbg(x...) do { } while(0)
 #else
-#define gpio_dbg(x...) printk(KERN_DEBUG ## x)
+#define gpio_dbg(x...) printk(KERN_DEBUG x)
 #endif
 
 /* The s3c64xx_gpiolib_4bit routines are to control the gpio banks where
diff --git a/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
index 81549516572f..2ba1767512d7 100644
--- a/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
+++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
@@ -61,14 +61,14 @@
 #define S3C64XX_GPH7_ADDR_CF1           (0x06 << 28)
 #define S3C64XX_GPH7_EINT_G6_7          (0x07 << 28)
 
-#define S3C64XX_GPH8_MMC1_DATA6         (0x02 << 32)
-#define S3C64XX_GPH8_MMC2_DATA2         (0x03 << 32)
-#define S3C64XX_GPH8_I2S_V40_LRCLK      (0x05 << 32)
-#define S3C64XX_GPH8_ADDR_CF2           (0x06 << 32)
-#define S3C64XX_GPH8_EINT_G6_8          (0x07 << 32)
-
-#define S3C64XX_GPH9_MMC1_DATA7         (0x02 << 36)
-#define S3C64XX_GPH9_MMC2_DATA3         (0x03 << 36)
-#define S3C64XX_GPH9_I2S_V40_DI         (0x05 << 36)
-#define S3C64XX_GPH9_EINT_G6_9          (0x07 << 36)
+#define S3C64XX_GPH8_MMC1_DATA6         (0x02 <<  0)
+#define S3C64XX_GPH8_MMC2_DATA2         (0x03 <<  0)
+#define S3C64XX_GPH8_I2S_V40_LRCLK      (0x05 <<  0)
+#define S3C64XX_GPH8_ADDR_CF2           (0x06 <<  0)
+#define S3C64XX_GPH8_EINT_G6_8          (0x07 <<  0)
 
+#define S3C64XX_GPH9_OUTPUT             (0x01 <<  4)
+#define S3C64XX_GPH9_MMC1_DATA7         (0x02 <<  4)
+#define S3C64XX_GPH9_MMC2_DATA3         (0x03 <<  4)
+#define S3C64XX_GPH9_I2S_V40_DI         (0x05 <<  4)
+#define S3C64XX_GPH9_EINT_G6_9          (0x07 <<  4)
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 945e0d237a1d..fec64678a63a 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# Last update: Mon Mar 23 20:09:01 2009
+# Last update: Fri May 29 10:14:20 2009
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -916,7 +916,7 @@ nxdb500			MACH_NXDB500		NXDB500			905
 apf9328                 MACH_APF9328            APF9328                 906
 omap_wipoq              MACH_OMAP_WIPOQ         OMAP_WIPOQ              907
 omap_twip               MACH_OMAP_TWIP          OMAP_TWIP               908
-palmt650                MACH_PALMT650           PALMT650                909
+treo650                 MACH_TREO650            TREO650                 909
 acumen                  MACH_ACUMEN             ACUMEN                  910
 xp100                   MACH_XP100              XP100                   911
 fs2410                  MACH_FS2410             FS2410                  912
@@ -1232,7 +1232,7 @@ ql202b			MACH_QL202B		QL202B			1226
 vpac270                 MACH_VPAC270            VPAC270                 1227
 rd129                   MACH_RD129              RD129                   1228
 htcwizard               MACH_HTCWIZARD          HTCWIZARD               1229
-xscale_treo680          MACH_XSCALE_TREO680     XSCALE_TREO680          1230
+treo680                 MACH_TREO680            TREO680                 1230
 tecon_tmezon            MACH_TECON_TMEZON       TECON_TMEZON            1231
 zylonite                MACH_ZYLONITE           ZYLONITE                1233
 gene1270                MACH_GENE1270           GENE1270                1234
@@ -1418,10 +1418,10 @@ looxc550		MACH_LOOXC550		LOOXC550		1417
 cnty_titan              MACH_CNTY_TITAN         CNTY_TITAN              1418
 app3xx                  MACH_APP3XX             APP3XX                  1419
 sideoatsgrama           MACH_SIDEOATSGRAMA      SIDEOATSGRAMA           1420
-palmtreo700p            MACH_PALMTREO700P       PALMTREO700P            1421
-palmtreo700w            MACH_PALMTREO700W       PALMTREO700W            1422
-palmtreo750             MACH_PALMTREO750        PALMTREO750             1423
-palmtreo755p            MACH_PALMTREO755P       PALMTREO755P            1424
+treo700p                MACH_TREO700P           TREO700P                1421
+treo700w                MACH_TREO700W           TREO700W                1422
+treo750                 MACH_TREO750            TREO750                 1423
+treo755p                MACH_TREO755P           TREO755P                1424
 ezreganut9200           MACH_EZREGANUT9200      EZREGANUT9200           1425
 sarge                   MACH_SARGE              SARGE                   1426
 a696                    MACH_A696               A696                    1427
@@ -1721,7 +1721,7 @@ sapphire		MACH_SAPPHIRE		SAPPHIRE		1729
 csb637xo                MACH_CSB637XO           CSB637XO                1730
 evisiong                MACH_EVISIONG           EVISIONG                1731
 stmp37xx                MACH_STMP37XX           STMP37XX                1732
-stmp378x                MACH_STMP38XX           STMP38XX                1733
+stmp378x                MACH_STMP378X           STMP378X                1733
 tnt                     MACH_TNT                TNT                     1734
 tbxt                    MACH_TBXT               TBXT                    1735
 playmate                MACH_PLAYMATE           PLAYMATE                1736
@@ -1817,7 +1817,7 @@ smdkc100		MACH_SMDKC100		SMDKC100		1826
 tavorevb                MACH_TAVOREVB           TAVOREVB                1827
 saar                    MACH_SAAR               SAAR                    1828
 deister_eyecam          MACH_DEISTER_EYECAM     DEISTER_EYECAM          1829
-at91sam9m10ek           MACH_AT91SAM9M10EK      AT91SAM9M10EK           1830
+at91sam9m10g45ek        MACH_AT91SAM9M10G45EK   AT91SAM9M10G45EK        1830
 linkstation_produo      MACH_LINKSTATION_PRODUO LINKSTATION_PRODUO      1831
 hit_b0                  MACH_HIT_B0             HIT_B0                  1832
 adx_rmu                 MACH_ADX_RMU            ADX_RMU                 1833
@@ -2132,3 +2132,116 @@ apollo			MACH_APOLLO		APOLLO			2141
 at91cap9stk             MACH_AT91CAP9STK        AT91CAP9STK             2142
 spc300                  MACH_SPC300             SPC300                  2143
 eko                     MACH_EKO                EKO                     2144
+ccw9m2443               MACH_CCW9M2443          CCW9M2443               2145
+ccw9m2443js             MACH_CCW9M2443JS        CCW9M2443JS             2146
+m2m_router_device       MACH_M2M_ROUTER_DEVICE  M2M_ROUTER_DEVICE       2147
+str9104nas              MACH_STAR9104NAS        STAR9104NAS             2148
+pca100                  MACH_PCA100             PCA100                  2149
+z3_dm365_mod_01         MACH_Z3_DM365_MOD_01    Z3_DM365_MOD_01         2150
+hipox                   MACH_HIPOX              HIPOX                   2151
+omap3_piteds            MACH_OMAP3_PITEDS       OMAP3_PITEDS            2152
+bm150r                  MACH_BM150R             BM150R                  2153
+tbone                   MACH_TBONE              TBONE                   2154
+merlin                  MACH_MERLIN             MERLIN                  2155
+falcon                  MACH_FALCON             FALCON                  2156
+davinci_da850_evm       MACH_DAVINCI_DA850_EVM  DAVINCI_DA850_EVM       2157
+s5p6440                 MACH_S5P6440            S5P6440                 2158
+at91sam9g10ek           MACH_AT91SAM9G10EK      AT91SAM9G10EK           2159
+omap_4430sdp            MACH_OMAP_4430SDP       OMAP_4430SDP            2160
+lpc313x                 MACH_LPC313X            LPC313X                 2161
+magx_zn5                MACH_MAGX_ZN5           MAGX_ZN5                2162
+magx_em30               MACH_MAGX_EM30          MAGX_EM30               2163
+magx_ve66               MACH_MAGX_VE66          MAGX_VE66               2164
+meesc                   MACH_MEESC              MEESC                   2165
+otc570                  MACH_OTC570             OTC570                  2166
+bcu2412                 MACH_BCU2412            BCU2412                 2167
+beacon                  MACH_BEACON             BEACON                  2168
+actia_tgw               MACH_ACTIA_TGW          ACTIA_TGW               2169
+e4430                   MACH_E4430              E4430                   2170
+ql300                   MACH_QL300              QL300                   2171
+btmavb101               MACH_BTMAVB101          BTMAVB101               2172
+btmawb101               MACH_BTMAWB101          BTMAWB101               2173
+sq201                   MACH_SQ201              SQ201                   2174
+quatro45xx              MACH_QUATRO45XX         QUATRO45XX              2175
+openpad                 MACH_OPENPAD            OPENPAD                 2176
+tx25                    MACH_TX25               TX25                    2177
+omap3_torpedo           MACH_OMAP3_TORPEDO      OMAP3_TORPEDO           2178
+htcraphael_k            MACH_HTCRAPHAEL_K       HTCRAPHAEL_K            2179
+lal43                   MACH_LAL43              LAL43                   2181
+htcraphael_cdma500      MACH_HTCRAPHAEL_CDMA500 HTCRAPHAEL_CDMA500      2182
+anw6410                 MACH_ANW6410            ANW6410                 2183
+htcprophet              MACH_HTCPROPHET         HTCPROPHET              2185
+cfa_10022               MACH_CFA_10022          CFA_10022               2186
+imx27_visstrim_m10      MACH_IMX27_VISSTRIM_M10 IMX27_VISSTRIM_M10      2187
+px2imx27                MACH_PX2IMX27           PX2IMX27                2188
+stm3210e_eval           MACH_STM3210E_EVAL      STM3210E_EVAL           2189
+dvs10                   MACH_DVS10              DVS10                   2190
+portuxg20               MACH_PORTUXG20          PORTUXG20               2191
+arm_spv                 MACH_ARM_SPV            ARM_SPV                 2192
+smdkc110                MACH_SMDKC110           SMDKC110                2193
+cabespresso             MACH_CABESPRESSO        CABESPRESSO             2194
+hmc800                  MACH_HMC800             HMC800                  2195
+sholes                  MACH_SHOLES             SHOLES                  2196
+btmxc31                 MACH_BTMXC31            BTMXC31                 2197
+dt501                   MACH_DT501              DT501                   2198
+ktx                     MACH_KTX                KTX                     2199
+omap3517evm             MACH_OMAP3517EVM        OMAP3517EVM             2200
+netspace_v2             MACH_NETSPACE_V2        NETSPACE_V2             2201
+netspace_max_v2         MACH_NETSPACE_MAX_V2    NETSPACE_MAX_V2         2202
+d2net_v2                MACH_D2NET_V2           D2NET_V2                2203
+net2big_v2              MACH_NET2BIG_V2         NET2BIG_V2              2204
+net4big_v2              MACH_NET4BIG_V2         NET4BIG_V2              2205
+net5big_v2              MACH_NET5BIG_V2         NET5BIG_V2              2206
+endb2443                MACH_ENDB2443           ENDB2443                2207
+inetspace_v2            MACH_INETSPACE_V2       INETSPACE_V2            2208
+tros                    MACH_TROS               TROS                    2209
+pelco_homer             MACH_PELCO_HOMER        PELCO_HOMER             2210
+ofsp8                   MACH_OFSP8              OFSP8                   2211
+at91sam9g45ekes         MACH_AT91SAM9G45EKES    AT91SAM9G45EKES         2212
+guf_cupid               MACH_GUF_CUPID          GUF_CUPID               2213
+eab1r                   MACH_EAB1R              EAB1R                   2214
+desirec                 MACH_DESIREC            DESIREC                 2215
+cordoba                 MACH_CORDOBA            CORDOBA                 2216
+irvine                  MACH_IRVINE             IRVINE                  2217
+sff772                  MACH_SFF772             SFF772                  2218
+pelco_milano            MACH_PELCO_MILANO       PELCO_MILANO            2219
+pc7302                  MACH_PC7302             PC7302                  2220
+bip6000                 MACH_BIP6000            BIP6000                 2221
+silvermoon              MACH_SILVERMOON         SILVERMOON              2222
+vc0830                  MACH_VC0830             VC0830                  2223
+dt430                   MACH_DT430              DT430                   2224
+ji42pf                  MACH_JI42PF             JI42PF                  2225
+gnet_ksm                MACH_GNET_KSM           GNET_KSM                2226
+gnet_sgm                MACH_GNET_SGM           GNET_SGM                2227
+gnet_sgr                MACH_GNET_SGR           GNET_SGR                2228
+omap3_icetekevm         MACH_OMAP3_ICETEKEVM    OMAP3_ICETEKEVM         2229
+pnp                     MACH_PNP                PNP                     2230
+ctera_2bay_k            MACH_CTERA_2BAY_K       CTERA_2BAY_K            2231
+ctera_2bay_u            MACH_CTERA_2BAY_U       CTERA_2BAY_U            2232
+sas_c                   MACH_SAS_C              SAS_C                   2233
+vma2315                 MACH_VMA2315            VMA2315                 2234
+vcs                     MACH_VCS                VCS                     2235
+spear600                MACH_SPEAR600           SPEAR600                2236
+spear300                MACH_SPEAR300           SPEAR300                2237
+spear1300               MACH_SPEAR1300          SPEAR1300               2238
+lilly1131               MACH_LILLY1131          LILLY1131               2239
+arvoo_ax301             MACH_ARVOO_AX301        ARVOO_AX301             2240
+mapphone                MACH_MAPPHONE           MAPPHONE                2241
+legend                  MACH_LEGEND             LEGEND                  2242
+salsa                   MACH_SALSA              SALSA                   2243
+lounge                  MACH_LOUNGE             LOUNGE                  2244
+vision                  MACH_VISION             VISION                  2245
+vmb20                   MACH_VMB20              VMB20                   2246
+hy2410                  MACH_HY2410             HY2410                  2247
+hy9315                  MACH_HY9315             HY9315                  2248
+bullwinkle              MACH_BULLWINKLE         BULLWINKLE              2249
+arm_ultimator2          MACH_ARM_ULTIMATOR2     ARM_ULTIMATOR2          2250
+vs_v210                 MACH_VS_V210            VS_V210                 2252
+vs_v212                 MACH_VS_V212            VS_V212                 2253
+hmt                     MACH_HMT                HMT                     2254
+suen3                   MACH_SUEN3              SUEN3                   2255
+vesper                  MACH_VESPER             VESPER                  2256
+str9                    MACH_STR9               STR9                    2257
+omap3_wl_ff             MACH_OMAP3_WL_FF        OMAP3_WL_FF             2258
+simcom                  MACH_SIMCOM             SIMCOM                  2259
+mcwebio                 MACH_MCWEBIO            MCWEBIO                 2260
diff --git a/arch/blackfin/include/asm/.gitignore b/arch/blackfin/include/asm/.gitignore
deleted file mode 100644
index 7858564a4466..000000000000
--- a/arch/blackfin/include/asm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-+mach
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h
index e70074e05f4e..733a178d782d 100644
--- a/arch/blackfin/include/asm/flat.h
+++ b/arch/blackfin/include/asm/flat.h
@@ -10,7 +10,6 @@
 
 #include <asm/unaligned.h>
 
-#define flat_stack_align(sp)    /* nothing needed */
 #define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
 
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index 1e57b636e0bc..cf5066d3efd2 100644
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -378,8 +378,10 @@
 #define __NR_dup3               363
 #define __NR_pipe2              364
 #define __NR_inotify_init1      365
+#define __NR_preadv             366
+#define __NR_pwritev            367
 
-#define __NR_syscall            366
+#define __NR_syscall            368
 #define NR_syscalls             __NR_syscall
 
 /* Old optional stuff no one actually uses */
diff --git a/arch/blackfin/kernel/.gitignore b/arch/blackfin/kernel/.gitignore
new file mode 100644
index 000000000000..c5f676c3c224
--- /dev/null
+++ b/arch/blackfin/kernel/.gitignore
@@ -0,0 +1 @@
+vmlinux.lds
diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c
index 2aaae78a68e0..46518b1d2983 100644
--- a/arch/blackfin/lib/strncmp.c
+++ b/arch/blackfin/lib/strncmp.c
@@ -8,9 +8,8 @@
 
 #define strncmp __inline_strncmp
 #include <asm/string.h>
-#undef strncmp
-
 #include <linux/module.h>
+#undef strncmp
 
 int strncmp(const char *cs, const char *ct, size_t count)
 {
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 21e65a339a22..a063a434f7e3 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -1581,6 +1581,8 @@ ENTRY(_sys_call_table)
         .long _sys_dup3
         .long _sys_pipe2
         .long _sys_inotify_init1        /* 365 */
+        .long _sys_preadv
+        .long _sys_pwritev
 
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall
diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
index 2a873508a9a1..bd12b31b90e6 100644
--- a/arch/h8300/include/asm/flat.h
+++ b/arch/h8300/include/asm/flat.h
@@ -5,7 +5,6 @@
 #ifndef __H8300_FLAT_H__
 #define __H8300_FLAT_H__
 
-#define flat_stack_align(sp)                    /* nothing needed */
 #define flat_argvp_envp_on_stack()              1
 #define flat_old_ram_flag(flags)                1
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
diff --git a/arch/m32r/include/asm/flat.h b/arch/m32r/include/asm/flat.h
index d851cf0c4aa5..5d711c4688fb 100644
--- a/arch/m32r/include/asm/flat.h
+++ b/arch/m32r/include/asm/flat.h
@@ -12,7 +12,6 @@
 #ifndef __ASM_M32R_FLAT_H
 #define __ASM_M32R_FLAT_H
 
-#define flat_stack_align(sp)            (*sp += (*sp & 3 ? (4 - (*sp & 3)): 0))
 #define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_set_persistent(relval, p)          0
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index 814b5174a8e0..a0e290793978 100644
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -5,7 +5,6 @@
 #ifndef __M68KNOMMU_FLAT_H__
 #define __M68KNOMMU_FLAT_H__
 
-#define flat_stack_align(sp)                    /* nothing needed */
 #define flat_argvp_envp_on_stack()              1
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig
index beb7ecd72793..4ef6af0a8f31 100644
--- a/arch/microblaze/configs/nommu_defconfig
+++ b/arch/microblaze/configs/nommu_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29
-# Tue Mar 24 10:23:20 2009
+# Linux kernel version: 2.6.30-rc5
+# Mon May 11 09:01:02 2009
 #
 CONFIG_MICROBLAZE=y
 # CONFIG_SWAP is not set
@@ -32,6 +32,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
@@ -63,6 +64,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_HOTPLUG is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -80,6 +82,8 @@ CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -92,7 +96,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -166,6 +169,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
 
 #
 # Exectuable file formats
@@ -180,7 +185,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -232,6 +236,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -244,7 +249,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
 CONFIG_WIRELESS_OLD_REGULATORY=y
@@ -379,6 +383,7 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -388,6 +393,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_ETHOC is not set
 # CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
@@ -405,7 +411,6 @@ CONFIG_NETDEV_10000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -455,6 +460,7 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_R3964 is not set
@@ -525,7 +531,7 @@ CONFIG_USB_SUPPORT=y
 #
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 # CONFIG_USB_GADGET is not set
 
@@ -538,6 +544,7 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_STAGING is not set
 
@@ -563,6 +570,11 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
@@ -601,8 +613,13 @@ CONFIG_CRAMFS=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -614,7 +631,6 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -647,6 +663,9 @@ CONFIG_DEBUG_SHIRQ=y
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
@@ -678,15 +697,8 @@ CONFIG_DEBUG_SG=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
-
-#
-# Tracers
-#
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_HEART_BEAT=y
@@ -777,6 +789,7 @@ CONFIG_CRYPTO=y
 # Compression
 #
 # CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
 
 #
@@ -784,6 +797,7 @@ CONFIG_CRYPTO=y
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -797,8 +811,8 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index a69d3e3c2fd4..b15605299a57 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -137,8 +137,8 @@ void __init init_IRQ(void)
 
         intr_type =
                 *(int *) of_get_property(intc, "xlnx,kind-of-intr", NULL);
-        if (intr_type >= (1 << nr_irq))
-                printk(KERN_INFO " ERROR: Mishmash in king-of-intr param\n");
+        if (intr_type >= (1 << (nr_irq + 1)))
+                printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
 
 #ifdef CONFIG_SELFMOD_INTC
         selfmod_function((int *) arr_func, intc_baseaddr);
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 26947ab85260..c4cae9e6b802 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -473,12 +473,12 @@ endif
 # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
 #
 ifdef CONFIG_SGI_IP28
-  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=1), n)
-      $(error gcc doesn't support needed option -mr10k-cache-barrier=1)
+  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
+      $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
   endif
 endif
 core-$(CONFIG_SGI_IP28)         += arch/mips/sgi-ip22/
-cflags-$(CONFIG_SGI_IP28)       += -mr10k-cache-barrier=1 -I$(srctree)/arch/mips/include/asm/mach-ip28
+cflags-$(CONFIG_SGI_IP28)       += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28
 load-$(CONFIG_SGI_IP28)         += 0xa800000020004000
 
 #
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 8de858f5449f..c2d53c18fd36 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -956,7 +956,7 @@ __clear_user(void __user *addr, __kernel_size_t size)
         void __user * __cl_addr = (addr);                               \
         unsigned long __cl_size = (n);                                  \
         if (__cl_size && access_ok(VERIFY_WRITE,                        \
-                ((unsigned long)(__cl_addr)), __cl_size))               \
+                                        __cl_addr, __cl_size))          \
                 __cl_size = __clear_user(__cl_addr, __cl_size);         \
         __cl_size;                                                      \
 })
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
index f0cf46adb978..1c0048a6f5cf 100644
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@ -82,8 +82,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         int cpu = smp_processor_id();
 
         if (cpu_context(cpu, mm) != 0) {
-                unsigned long flags;
-                int size;
+                unsigned long size, flags;
 
 #ifdef DEBUG_TLB
                 printk("[tlbrange<%lu,0x%08lx,0x%08lx>]",
@@ -121,8 +120,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 
 void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-        unsigned long flags;
-        int size;
+        unsigned long size, flags;
 
 #ifdef DEBUG_TLB
         printk("[tlbrange<%lu,0x%08lx,0x%08lx>]", start, end);
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 9619f66e531e..892be426787c 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -117,8 +117,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         int cpu = smp_processor_id();
 
         if (cpu_context(cpu, mm) != 0) {
-                unsigned long flags;
-                int size;
+                unsigned long size, flags;
 
                 ENTER_CRITICAL(flags);
                 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
@@ -160,8 +159,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 
 void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-        unsigned long flags;
-        int size;
+        unsigned long size, flags;
 
         ENTER_CRITICAL(flags);
         size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
index 4f01a3be215c..4ec95cc2df2f 100644
--- a/arch/mips/mm/tlb-r8k.c
+++ b/arch/mips/mm/tlb-r8k.c
@@ -111,8 +111,7 @@ out_restore:
 /* Usable for KV1 addresses only! */
 void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-        unsigned long flags;
-        int size;
+        unsigned long size, flags;
 
         size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
         size = (size + 1) >> 1;
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 4ad5c3393fd3..45b6694c2079 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -148,7 +148,7 @@ static irqreturn_t panel_int(int irq, void *dev_id)
 
         if (sgint->istat1 & SGINT_ISTAT1_PWR) {
                 /* Wait until interrupt goes away */
-                disable_irq(SGI_PANEL_IRQ);
+                disable_irq_nosync(SGI_PANEL_IRQ);
                 init_timer(&debounce_timer);
                 debounce_timer.function = debounce;
                 debounce_timer.expires = jiffies + 5;
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index b6cab089561e..9b95d80ebc6e 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -53,7 +53,7 @@ static inline void ip32_machine_halt(void)
 
 static void ip32_machine_power_off(void)
 {
-        volatile unsigned char reg_a, xctrl_a, xctrl_b;
+        unsigned char reg_a, xctrl_a, xctrl_b;
 
         disable_irq(MACEISA_RTC_IRQ);
         reg_a = CMOS_READ(RTC_REG_A);
@@ -91,9 +91,10 @@ static void blink_timeout(unsigned long data)
 
 static void debounce(unsigned long data)
 {
-        volatile unsigned char reg_a, reg_c, xctrl_a;
+        unsigned char reg_a, reg_c, xctrl_a;
 
         reg_c = CMOS_READ(RTC_INTR_FLAGS);
+        reg_a = CMOS_READ(RTC_REG_A);
         CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
         wbflush();
         xctrl_a = CMOS_READ(DS_B1_XCTRL4A);
@@ -137,7 +138,7 @@ static inline void ip32_power_button(void)
 
 static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
 {
-        volatile unsigned char reg_c;
+        unsigned char reg_c;
 
         reg_c = CMOS_READ(RTC_INTR_FLAGS);
         if (!(reg_c & RTC_IRQF)) {
@@ -145,7 +146,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
                         "%s: RTC IRQ without RTC_IRQF\n", __func__);
         }
         /* Wait until interrupt goes away */
-        disable_irq(MACEISA_RTC_IRQ);
+        disable_irq_nosync(MACEISA_RTC_IRQ);
         init_timer(&debounce_timer);
         debounce_timer.function = debounce;
         debounce_timer.expires = jiffies + 50;
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a0d1146a0578..cdc9a6ff4be8 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -868,6 +868,18 @@ config TASK_SIZE
         default "0x80000000" if PPC_PREP || PPC_8xx
         default "0xc0000000"
 
+config CONSISTENT_SIZE_BOOL
+        bool "Set custom consistent memory pool size"
+        depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
+        help
+          This option allows you to set the size of the
+          consistent memory pool.  This pool of virtual memory
+          is used to make consistent memory allocations.
+
+config CONSISTENT_SIZE
+        hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
+        default "0x00200000" if NOT_COHERENT_CACHE
+
 config PIN_TLB
         bool "Pinned Kernel TLBs (860 ONLY)"
         depends on ADVANCED_OPTIONS && 8xx
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index ac14f5245d2a..e28e65e7a0e1 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -1,13 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29-rc8
-# Fri Mar 13 09:28:45 2009
+# Linux kernel version: 2.6.30-rc5
+# Fri May 15 10:37:00 2009
 #
 CONFIG_PPC64=y
 
 #
 # Processor support
 #
+CONFIG_PPC_BOOK3S=y
 # CONFIG_POWER4_ONLY is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
@@ -55,9 +56,11 @@ CONFIG_OF=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
+CONFIG_DTC=y
 # CONFIG_DEFAULT_UIMAGE is not set
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -72,6 +75,7 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
@@ -88,8 +92,7 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -99,6 +102,9 @@ CONFIG_NAMESPACES=y
 # CONFIG_NET_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -107,6 +113,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -138,6 +145,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -150,7 +158,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLOCK_COMPAT=y
@@ -172,7 +179,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
-CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_PMAC is not set
@@ -209,6 +215,7 @@ CONFIG_SPU_FS_64K_LS=y
 # CONFIG_SPU_TRACE is not set
 CONFIG_SPU_BASE=y
 # CONFIG_PQ2ADS is not set
+# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 # CONFIG_IPIC is not set
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
@@ -279,11 +286,14 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_PPC_HAS_HASH_64K=y
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
@@ -316,7 +326,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -389,6 +398,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -396,6 +406,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
@@ -419,11 +430,9 @@ CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_NL80211=y
 # CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 # CONFIG_WIRELESS_EXT_SYSFS is not set
@@ -602,6 +611,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
@@ -616,6 +626,7 @@ CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_UEVENT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -625,6 +636,8 @@ CONFIG_NETDEVICES=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -646,12 +659,13 @@ CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y
 CONFIG_WLAN_80211=y
 # CONFIG_LIBERTAS is not set
 # CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_AT76C50X_USB is not set
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_P54_COMMON is not set
-# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_AR9170_USB is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
@@ -673,6 +687,7 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 # CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
@@ -724,28 +739,7 @@ CONFIG_INPUT_EVDEV=m
 #
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
@@ -864,6 +858,7 @@ CONFIG_FB_PS3_DEFAULT_SIZE_M=9
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -934,15 +929,17 @@ CONFIG_USB_HIDDEV=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_COMPAT is not set
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
 # CONFIG_HID_CYPRESS is not set
+# CONFIG_DRAGONRISE_FF is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
 # CONFIG_HID_GYRATION is not set
+# CONFIG_HID_KENSINGTON is not set
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
@@ -950,7 +947,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
+CONFIG_HID_SONY=m
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_GREENASIA_FF is not set
 # CONFIG_HID_TOPSEED is not set
@@ -1012,11 +1009,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_TMC is not set
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 
 #
-# see USB_STORAGE Help for more information
+# also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1058,7 +1055,6 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
@@ -1074,6 +1070,7 @@ CONFIG_USB_STORAGE=m
 #
 # OTG and related infrastructure
 #
+# CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
@@ -1113,8 +1110,10 @@ CONFIG_RTC_INTF_DEV=y
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_PPC=m
+# CONFIG_RTC_DRV_GENERIC is not set
+CONFIG_RTC_DRV_PS3=m
 # CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_STAGING is not set
 
@@ -1125,6 +1124,7 @@ CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
@@ -1161,6 +1161,11 @@ CONFIG_AUTOFS4_FS=m
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 CONFIG_ISO9660_FS=m
@@ -1211,6 +1216,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -1223,7 +1229,6 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1283,6 +1288,7 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 # CONFIG_DLM is not set
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
@@ -1296,15 +1302,16 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
 
 #
 # Kernel hacking
@@ -1322,6 +1329,9 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1357,12 +1367,15 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_RING_BUFFER=y
 CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
 
 #
 # Tracers
@@ -1371,18 +1384,21 @@ CONFIG_TRACING=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 # CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1415,10 +1431,12 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -1487,6 +1505,7 @@ CONFIG_CRYPTO_SALSA20=m
 # Compression
 #
 # CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=m
 
 #
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index c69f2b5f0cc4..cb448d68452c 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -26,7 +26,9 @@
  * allocate the space "normally" and use the cache management functions
  * to ensure it is consistent.
  */
-extern void *__dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp);
+struct device;
+extern void *__dma_alloc_coherent(struct device *dev, size_t size,
+                                  dma_addr_t *handle, gfp_t gfp);
 extern void __dma_free_coherent(size_t size, void *vaddr);
 extern void __dma_sync(void *vaddr, size_t size, int direction);
 extern void __dma_sync_page(struct page *page, unsigned long offset,
@@ -37,7 +39,7 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
  * Cache coherent cores.
  */
 
-#define __dma_alloc_coherent(gfp, size, handle) NULL
+#define __dma_alloc_coherent(dev, gfp, size, handle)    NULL
 #define __dma_free_coherent(size, addr)         ((void)0)
 #define __dma_sync(addr, size, rw)              ((void)0)
 #define __dma_sync_page(pg, off, sz, rw)        ((void)0)
diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h
index d60fd18f428c..f1f4e23a84e9 100644
--- a/arch/powerpc/include/asm/fixmap.h
+++ b/arch/powerpc/include/asm/fixmap.h
@@ -14,8 +14,6 @@
 #ifndef _ASM_FIXMAP_H
 #define _ASM_FIXMAP_H
 
-extern unsigned long FIXADDR_TOP;
-
 #ifndef __ASSEMBLY__
 #include <linux/kernel.h>
 #include <asm/page.h>
@@ -24,6 +22,8 @@ extern unsigned long FIXADDR_TOP;
 #include <asm/kmap_types.h>
 #endif
 
+#define FIXADDR_TOP     ((unsigned long)(-PAGE_SIZE))
+
 /*
  * Here we define all the compile-time 'special' virtual
  * addresses. The point is to have a constant address at
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
index ba45c997830f..c9ff9d75990e 100644
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@ -10,7 +10,7 @@
 
 extern unsigned long va_to_phys(unsigned long address);
 extern pte_t *va_to_pte(unsigned long address);
-extern unsigned long ioremap_bot, ioremap_base;
+extern unsigned long ioremap_bot;
 
 #ifdef CONFIG_44x
 extern int icache_44x_need_flush;
@@ -56,8 +56,30 @@ extern int icache_44x_need_flush;
         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 
 /*
+ * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary
+ * value (for now) on others, from where we can start layout kernel
+ * virtual space that goes below PKMAP and FIXMAP
+ */
+#ifdef CONFIG_HIGHMEM
+#define KVIRT_TOP       PKMAP_BASE
+#else
+#define KVIRT_TOP       (0xfe000000UL)  /* for now, could be FIXMAP_BASE ? */
+#endif
+
+/*
+ * ioremap_bot starts at that address. Early ioremaps move down from there,
+ * until mem_init() at which point this becomes the top of the vmalloc
+ * and ioremap space
+ */
+#ifdef CONFIG_NOT_COHERENT_CACHE
+#define IOREMAP_TOP     ((KVIRT_TOP - CONFIG_CONSISTENT_SIZE) & PAGE_MASK)
+#else
+#define IOREMAP_TOP     KVIRT_TOP
+#endif
+
+/*
  * Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 64MB value just means that there will be a 64MB "hole" after the
+ * current 16MB value just means that there will be a 64MB "hole" after the
  * physical memory until the kernel virtual memory starts.  That means that
  * any out-of-bounds memory accesses will hopefully be caught.
  * The vmalloc() routines leaves a hole of 4kB between each vmalloced
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 53c7788cba78..6b02793dc75b 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -32,7 +32,7 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,
 {
         void *ret;
 #ifdef CONFIG_NOT_COHERENT_CACHE
-        ret = __dma_alloc_coherent(size, dma_handle, flag);
+        ret = __dma_alloc_coherent(dev, size, dma_handle, flag);
         if (ret == NULL)
                 return NULL;
         *dma_handle += get_dma_direct_offset(dev);
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 70e2a736be1f..2d182f119d1d 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -157,7 +157,7 @@ __ftrace_make_nop(struct module *mod,
          * 0xe8, 0x4c, 0x00, 0x28,    ld      r2,40(r12)
          */
 
-        pr_debug("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc);
+        pr_devel("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc);
 
         /* Find where the trampoline jumps to */
         if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
@@ -165,7 +165,7 @@ __ftrace_make_nop(struct module *mod,
                 return -EFAULT;
         }
 
-        pr_debug(" %08x %08x", jmp[0], jmp[1]);
+        pr_devel(" %08x %08x", jmp[0], jmp[1]);
 
         /* verify that this is what we expect it to be */
         if (((jmp[0] & 0xffff0000) != 0x3d820000) ||
@@ -181,18 +181,18 @@ __ftrace_make_nop(struct module *mod,
         offset = ((unsigned)((unsigned short)jmp[0]) << 16) +
                 (int)((short)jmp[1]);
 
-        pr_debug(" %x ", offset);
+        pr_devel(" %x ", offset);
 
         /* get the address this jumps too */
         tramp = mod->arch.toc + offset + 32;
-        pr_debug("toc: %lx", tramp);
+        pr_devel("toc: %lx", tramp);
 
         if (probe_kernel_read(jmp, (void *)tramp, 8)) {
                 printk(KERN_ERR "Failed to read %lx\n", tramp);
                 return -EFAULT;
         }
 
-        pr_debug(" %08x %08x\n", jmp[0], jmp[1]);
+        pr_devel(" %08x %08x\n", jmp[0], jmp[1]);
 
         ptr = ((unsigned long)jmp[0] << 32) + jmp[1];
 
@@ -269,7 +269,7 @@ __ftrace_make_nop(struct module *mod,
          *  0x4e, 0x80, 0x04, 0x20  bctr
          */
 
-        pr_debug("ip:%lx jumps to %lx", ip, tramp);
+        pr_devel("ip:%lx jumps to %lx", ip, tramp);
 
         /* Find where the trampoline jumps to */
         if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
@@ -277,7 +277,7 @@ __ftrace_make_nop(struct module *mod,
                 return -EFAULT;
         }
 
-        pr_debug(" %08x %08x ", jmp[0], jmp[1]);
+        pr_devel(" %08x %08x ", jmp[0], jmp[1]);
 
         /* verify that this is what we expect it to be */
         if (((jmp[0] & 0xffff0000) != 0x3d600000) ||
@@ -293,7 +293,7 @@ __ftrace_make_nop(struct module *mod,
         if (tramp & 0x8000)
                 tramp -= 0x10000;
 
-        pr_debug(" %lx ", tramp);
+        pr_devel(" %lx ", tramp);
 
         if (tramp != addr) {
                 printk(KERN_ERR
@@ -402,7 +402,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
         /* ld r2,40(r1) */
         op[1] = 0xe8410028;
 
-        pr_debug("write to %lx\n", rec->ip);
+        pr_devel("write to %lx\n", rec->ip);
 
         if (probe_kernel_write((void *)ip, op, MCOUNT_INSN_SIZE * 2))
                 return -EPERM;
@@ -442,7 +442,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
                 return -EINVAL;
         }
 
-        pr_debug("write to %lx\n", rec->ip);
+        pr_devel("write to %lx\n", rec->ip);
 
         if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE))
                 return -EPERM;
@@ -594,7 +594,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
                         PPC_LONG "2b,4b\n"
                 ".previous"
 
-                : [old] "=r" (old), [faulted] "=r" (faulted)
+                : [old] "=&r" (old), [faulted] "=r" (faulted)
                 : [parent] "r" (parent), [return_hooker] "r" (return_hooker)
                 : "memory"
         );
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index a047a6cfca4d..8ef8a14abc95 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -264,6 +264,7 @@ SECTIONS
                 *(.data.page_aligned)
         }
 
+        . = ALIGN(L1_CACHE_BYTES);
         .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
                 *(.data.cacheline_aligned)
         }
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 8db35278a4b4..29b742b90f1f 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
                            memcpy_64.o usercopy_64.o mem_64.o string.o
 obj-$(CONFIG_XMON)      += sstep.o
 obj-$(CONFIG_KPROBES)   += sstep.o
-obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-noncoherent.o
 
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c
deleted file mode 100644
index 005a28d380af..000000000000
--- a/arch/powerpc/lib/dma-noncoherent.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  PowerPC version derived from arch/arm/mm/consistent.c
- *    Copyright (C) 2001 Dan Malek (dmalek@jlc.net)
- *
- *  Copyright (C) 2000 Russell King
- *
- * Consistent memory allocators.  Used for DMA devices that want to
- * share uncached memory with the processor core.  The function return
- * is the virtual address and 'dma_handle' is the physical address.
- * Mostly stolen from the ARM port, with some changes for PowerPC.
- *                                              -- Dan
- *
- * Reorganized to get rid of the arch-specific consistent_* functions
- * and provide non-coherent implementations for the DMA API. -Matt
- *
- * Added in_interrupt() safe dma_alloc_coherent()/dma_free_coherent()
- * implementation. This is pulled straight from ARM and barely
- * modified. -Matt
- *
- * 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.
- */
-
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/highmem.h>
-#include <linux/dma-mapping.h>
-#include <linux/vmalloc.h>
-
-#include <asm/tlbflush.h>
-
-/*
- * Allocate DMA-coherent memory space and return both the kernel remapped
- * virtual and bus address for that space.
- */
-void *
-__dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
-{
-        struct page *page;
-        unsigned long order;
-        int i;
-        unsigned int nr_pages = PAGE_ALIGN(size)>>PAGE_SHIFT;
-        unsigned int array_size = nr_pages * sizeof(struct page *);
-        struct page **pages;
-        struct page *end;
-        u64 mask = 0x00ffffff, limit; /* ISA default */
-        struct vm_struct *area;
-
-        BUG_ON(!mem_init_done);
-        size = PAGE_ALIGN(size);
-        limit = (mask + 1) & ~mask;
-        if (limit && size >= limit) {
-                printk(KERN_WARNING "coherent allocation too big (requested "
-                                "%#x mask %#Lx)\n", size, mask);
-                return NULL;
-        }
-
-        order = get_order(size);
-
-        if (mask != 0xffffffff)
-                gfp |= GFP_DMA;
-
-        page = alloc_pages(gfp, order);
-        if (!page)
-                goto no_page;
-
-        end = page + (1 << order);
-
-        /*
-         * Invalidate any data that might be lurking in the
-         * kernel direct-mapped region for device DMA.
-         */
-        {
-                unsigned long kaddr = (unsigned long)page_address(page);
-                memset(page_address(page), 0, size);
-                flush_dcache_range(kaddr, kaddr + size);
-        }
-
-        split_page(page, order);
-
-        /*
-         * Set the "dma handle"
-         */
-        *handle = page_to_phys(page);
-
-        area = get_vm_area_caller(size, VM_IOREMAP,
-                        __builtin_return_address(1));
-        if (!area)
-                goto out_free_pages;
-
-        if (array_size > PAGE_SIZE) {
-                pages = vmalloc(array_size);
-                area->flags |= VM_VPAGES;
-        } else {
-                pages = kmalloc(array_size, GFP_KERNEL);
-        }
-        if (!pages)
-                goto out_free_area;
-
-        area->pages = pages;
-        area->nr_pages = nr_pages;
-
-        for (i = 0; i < nr_pages; i++)
-                pages[i] = page + i;
-
-        if (map_vm_area(area, pgprot_noncached(PAGE_KERNEL), &pages))
-                goto out_unmap;
-
-        /*
-         * Free the otherwise unused pages.
-         */
-        page += nr_pages;
-        while (page < end) {
-                __free_page(page);
-                page++;
-        }
-
-        return area->addr;
-out_unmap:
-        vunmap(area->addr);
-        if (array_size > PAGE_SIZE)
-                vfree(pages);
-        else
-                kfree(pages);
-        goto out_free_pages;
-out_free_area:
-        free_vm_area(area);
-out_free_pages:
-        if (page)
-                __free_pages(page, order);
-no_page:
-        return NULL;
-}
-EXPORT_SYMBOL(__dma_alloc_coherent);
-
-/*
- * free a page as defined by the above mapping.
- */
-void __dma_free_coherent(size_t size, void *vaddr)
-{
-        vfree(vaddr);
-
-}
-EXPORT_SYMBOL(__dma_free_coherent);
-
-/*
- * make an area consistent.
- */
-void __dma_sync(void *vaddr, size_t size, int direction)
-{
-        unsigned long start = (unsigned long)vaddr;
-        unsigned long end   = start + size;
-
-        switch (direction) {
-        case DMA_NONE:
-                BUG();
-        case DMA_FROM_DEVICE:
-                /*
-                 * invalidate only when cache-line aligned otherwise there is
-                 * the potential for discarding uncommitted data from the cache
-                 */
-                if ((start & (L1_CACHE_BYTES - 1)) || (size & (L1_CACHE_BYTES - 1)))
-                        flush_dcache_range(start, end);
-                else
-                        invalidate_dcache_range(start, end);
-                break;
-        case DMA_TO_DEVICE:             /* writeback only */
-                clean_dcache_range(start, end);
-                break;
-        case DMA_BIDIRECTIONAL: /* writeback and invalidate */
-                flush_dcache_range(start, end);
-                break;
-        }
-}
-EXPORT_SYMBOL(__dma_sync);
-
-#ifdef CONFIG_HIGHMEM
-/*
- * __dma_sync_page() implementation for systems using highmem.
- * In this case, each page of a buffer must be kmapped/kunmapped
- * in order to have a virtual address for __dma_sync(). This must
- * not sleep so kmap_atomic()/kunmap_atomic() are used.
- *
- * Note: yes, it is possible and correct to have a buffer extend
- * beyond the first page.
- */
-static inline void __dma_sync_page_highmem(struct page *page,
-                unsigned long offset, size_t size, int direction)
-{
-        size_t seg_size = min((size_t)(PAGE_SIZE - offset), size);
-        size_t cur_size = seg_size;
-        unsigned long flags, start, seg_offset = offset;
-        int nr_segs = 1 + ((size - seg_size) + PAGE_SIZE - 1)/PAGE_SIZE;
-        int seg_nr = 0;
-
-        local_irq_save(flags);
-
-        do {
-                start = (unsigned long)kmap_atomic(page + seg_nr,
-                                KM_PPC_SYNC_PAGE) + seg_offset;
-
-                /* Sync this buffer segment */
-                __dma_sync((void *)start, seg_size, direction);
-                kunmap_atomic((void *)start, KM_PPC_SYNC_PAGE);
-                seg_nr++;
-
-                /* Calculate next buffer segment size */
-                seg_size = min((size_t)PAGE_SIZE, size - cur_size);
-
-                /* Add the segment size to our running total */
-                cur_size += seg_size;
-                seg_offset = 0;
-        } while (seg_nr < nr_segs);
-
-        local_irq_restore(flags);
-}
-#endif /* CONFIG_HIGHMEM */
-
-/*
- * __dma_sync_page makes memory consistent. identical to __dma_sync, but
- * takes a struct page instead of a virtual address
- */
-void __dma_sync_page(struct page *page, unsigned long offset,
-        size_t size, int direction)
-{
-#ifdef CONFIG_HIGHMEM
-        __dma_sync_page_highmem(page, offset, size, direction);
-#else
-        unsigned long start = (unsigned long)page_address(page) + offset;
-        __dma_sync((void *)start, size, direction);
-#endif
-}
-EXPORT_SYMBOL(__dma_sync_page);
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 17290bcedc5e..b746f4ca4209 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -26,3 +26,4 @@ obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o
 obj-$(CONFIG_PPC_MM_SLICES)     += slice.o
 obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
 obj-$(CONFIG_PPC_SUBPAGE_PROT)  += subpage-prot.o
+obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o
diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
new file mode 100644
index 000000000000..36692f5c9a76
--- /dev/null
+++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -0,0 +1,400 @@
+/*
+ *  PowerPC version derived from arch/arm/mm/consistent.c
+ *    Copyright (C) 2001 Dan Malek (dmalek@jlc.net)
+ *
+ *  Copyright (C) 2000 Russell King
+ *
+ * Consistent memory allocators.  Used for DMA devices that want to
+ * share uncached memory with the processor core.  The function return
+ * is the virtual address and 'dma_handle' is the physical address.
+ * Mostly stolen from the ARM port, with some changes for PowerPC.
+ *                                              -- Dan
+ *
+ * Reorganized to get rid of the arch-specific consistent_* functions
+ * and provide non-coherent implementations for the DMA API. -Matt
+ *
+ * Added in_interrupt() safe dma_alloc_coherent()/dma_free_coherent()
+ * implementation. This is pulled straight from ARM and barely
+ * modified. -Matt
+ *
+ * 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.
+ */
+
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/highmem.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/tlbflush.h>
+
+#include "mmu_decl.h"
+
+/*
+ * This address range defaults to a value that is safe for all
+ * platforms which currently set CONFIG_NOT_COHERENT_CACHE. It
+ * can be further configured for specific applications under
+ * the "Advanced Setup" menu. -Matt
+ */
+#define CONSISTENT_BASE         (IOREMAP_TOP)
+#define CONSISTENT_END          (CONSISTENT_BASE + CONFIG_CONSISTENT_SIZE)
+#define CONSISTENT_OFFSET(x)    (((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)
+
+/*
+ * This is the page table (2MB) covering uncached, DMA consistent allocations
+ */
+static DEFINE_SPINLOCK(consistent_lock);
+
+/*
+ * VM region handling support.
+ *
+ * This should become something generic, handling VM region allocations for
+ * vmalloc and similar (ioremap, module space, etc).
+ *
+ * I envisage vmalloc()'s supporting vm_struct becoming:
+ *
+ *  struct vm_struct {
+ *    struct vm_region  region;
+ *    unsigned long     flags;
+ *    struct page       **pages;
+ *    unsigned int      nr_pages;
+ *    unsigned long     phys_addr;
+ *  };
+ *
+ * get_vm_area() would then call vm_region_alloc with an appropriate
+ * struct vm_region head (eg):
+ *
+ *  struct vm_region vmalloc_head = {
+ *      .vm_list        = LIST_HEAD_INIT(vmalloc_head.vm_list),
+ *      .vm_start       = VMALLOC_START,
+ *      .vm_end         = VMALLOC_END,
+ *  };
+ *
+ * However, vmalloc_head.vm_start is variable (typically, it is dependent on
+ * the amount of RAM found at boot time.)  I would imagine that get_vm_area()
+ * would have to initialise this each time prior to calling vm_region_alloc().
+ */
+struct ppc_vm_region {
+        struct list_head        vm_list;
+        unsigned long           vm_start;
+        unsigned long           vm_end;
+};
+
+static struct ppc_vm_region consistent_head = {
+        .vm_list        = LIST_HEAD_INIT(consistent_head.vm_list),
+        .vm_start       = CONSISTENT_BASE,
+        .vm_end         = CONSISTENT_END,
+};
+
+static struct ppc_vm_region *
+ppc_vm_region_alloc(struct ppc_vm_region *head, size_t size, gfp_t gfp)
+{
+        unsigned long addr = head->vm_start, end = head->vm_end - size;
+        unsigned long flags;
+        struct ppc_vm_region *c, *new;
+
+        new = kmalloc(sizeof(struct ppc_vm_region), gfp);
+        if (!new)
+                goto out;
+
+        spin_lock_irqsave(&consistent_lock, flags);
+
+        list_for_each_entry(c, &head->vm_list, vm_list) {
+                if ((addr + size) < addr)
+                        goto nospc;
+                if ((addr + size) <= c->vm_start)
+                        goto found;
+                addr = c->vm_end;
+                if (addr > end)
+                        goto nospc;
+        }
+
+ found:
+        /*
+         * Insert this entry _before_ the one we found.
+         */
+        list_add_tail(&new->vm_list, &c->vm_list);
+        new->vm_start = addr;
+        new->vm_end = addr + size;
+
+        spin_unlock_irqrestore(&consistent_lock, flags);
+        return new;
+
+ nospc:
+        spin_unlock_irqrestore(&consistent_lock, flags);
+        kfree(new);
+ out:
+        return NULL;
+}
+
+static struct ppc_vm_region *ppc_vm_region_find(struct ppc_vm_region *head, unsigned long addr)
+{
+        struct ppc_vm_region *c;
+
+        list_for_each_entry(c, &head->vm_list, vm_list) {
+                if (c->vm_start == addr)
+                        goto out;
+        }
+        c = NULL;
+ out:
+        return c;
+}
+
+/*
+ * Allocate DMA-coherent memory space and return both the kernel remapped
+ * virtual and bus address for that space.
+ */
+void *
+__dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
+{
+        struct page *page;
+        struct ppc_vm_region *c;
+        unsigned long order;
+        u64 mask = ISA_DMA_THRESHOLD, limit;
+
+        if (dev) {
+                mask = dev->coherent_dma_mask;
+
+                /*
+                 * Sanity check the DMA mask - it must be non-zero, and
+                 * must be able to be satisfied by a DMA allocation.
+                 */
+                if (mask == 0) {
+                        dev_warn(dev, "coherent DMA mask is unset\n");
+                        goto no_page;
+                }
+
+                if ((~mask) & ISA_DMA_THRESHOLD) {
+                        dev_warn(dev, "coherent DMA mask %#llx is smaller "
+                                 "than system GFP_DMA mask %#llx\n",
+                                 mask, (unsigned long long)ISA_DMA_THRESHOLD);
+                        goto no_page;
+                }
+        }
+
+
+        size = PAGE_ALIGN(size);
+        limit = (mask + 1) & ~mask;
+        if ((limit && size >= limit) ||
+            size >= (CONSISTENT_END - CONSISTENT_BASE)) {
+                printk(KERN_WARNING "coherent allocation too big (requested %#x mask %#Lx)\n",
+                       size, mask);
+                return NULL;
+        }
+
+        order = get_order(size);
+
+        /* Might be useful if we ever have a real legacy DMA zone... */
+        if (mask != 0xffffffff)
+                gfp |= GFP_DMA;
+
+        page = alloc_pages(gfp, order);
+        if (!page)
+                goto no_page;
+
+        /*
+         * Invalidate any data that might be lurking in the
+         * kernel direct-mapped region for device DMA.
+         */
+        {
+                unsigned long kaddr = (unsigned long)page_address(page);
+                memset(page_address(page), 0, size);
+                flush_dcache_range(kaddr, kaddr + size);
+        }
+
+        /*
+         * Allocate a virtual address in the consistent mapping region.
+         */
+        c = ppc_vm_region_alloc(&consistent_head, size,
+                            gfp & ~(__GFP_DMA | __GFP_HIGHMEM));
+        if (c) {
+                unsigned long vaddr = c->vm_start;
+                struct page *end = page + (1 << order);
+
+                split_page(page, order);
+
+                /*
+                 * Set the "dma handle"
+                 */
+                *handle = page_to_phys(page);
+
+                do {
+                        SetPageReserved(page);
+                        map_page(vaddr, page_to_phys(page),
+                                 pgprot_noncached(PAGE_KERNEL));
+                        page++;
+                        vaddr += PAGE_SIZE;
+                } while (size -= PAGE_SIZE);
+
+                /*
+                 * Free the otherwise unused pages.
+                 */
+                while (page < end) {
+                        __free_page(page);
+                        page++;
+                }
+
+                return (void *)c->vm_start;
+        }
+
+        if (page)
+                __free_pages(page, order);
+ no_page:
+        return NULL;
+}
+EXPORT_SYMBOL(__dma_alloc_coherent);
+
+/*
+ * free a page as defined by the above mapping.
+ */
+void __dma_free_coherent(size_t size, void *vaddr)
+{
+        struct ppc_vm_region *c;
+        unsigned long flags, addr;
+        
+        size = PAGE_ALIGN(size);
+
+        spin_lock_irqsave(&consistent_lock, flags);
+
+        c = ppc_vm_region_find(&consistent_head, (unsigned long)vaddr);
+        if (!c)
+                goto no_area;
+
+        if ((c->vm_end - c->vm_start) != size) {
+                printk(KERN_ERR "%s: freeing wrong coherent size (%ld != %d)\n",
+                       __func__, c->vm_end - c->vm_start, size);
+                dump_stack();
+                size = c->vm_end - c->vm_start;
+        }
+
+        addr = c->vm_start;
+        do {
+                pte_t *ptep;
+                unsigned long pfn;
+
+                ptep = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(addr),
+                                                               addr),
+                                                    addr),
+                                         addr);
+                if (!pte_none(*ptep) && pte_present(*ptep)) {
+                        pfn = pte_pfn(*ptep);
+                        pte_clear(&init_mm, addr, ptep);
+                        if (pfn_valid(pfn)) {
+                                struct page *page = pfn_to_page(pfn);
+
+                                ClearPageReserved(page);
+                                __free_page(page);
+                        }
+                }
+                addr += PAGE_SIZE;
+        } while (size -= PAGE_SIZE);
+
+        flush_tlb_kernel_range(c->vm_start, c->vm_end);
+
+        list_del(&c->vm_list);
+
+        spin_unlock_irqrestore(&consistent_lock, flags);
+
+        kfree(c);
+        return;
+
+ no_area:
+        spin_unlock_irqrestore(&consistent_lock, flags);
+        printk(KERN_ERR "%s: trying to free invalid coherent area: %p\n",
+               __func__, vaddr);
+        dump_stack();
+}
+EXPORT_SYMBOL(__dma_free_coherent);
+
+/*
+ * make an area consistent.
+ */
+void __dma_sync(void *vaddr, size_t size, int direction)
+{
+        unsigned long start = (unsigned long)vaddr;
+        unsigned long end   = start + size;
+
+        switch (direction) {
+        case DMA_NONE:
+                BUG();
+        case DMA_FROM_DEVICE:
+                /*
+                 * invalidate only when cache-line aligned otherwise there is
+                 * the potential for discarding uncommitted data from the cache
+                 */
+                if ((start & (L1_CACHE_BYTES - 1)) || (size & (L1_CACHE_BYTES - 1)))
+                        flush_dcache_range(start, end);
+                else
+                        invalidate_dcache_range(start, end);
+                break;
+        case DMA_TO_DEVICE:             /* writeback only */
+                clean_dcache_range(start, end);
+                break;
+        case DMA_BIDIRECTIONAL: /* writeback and invalidate */
+                flush_dcache_range(start, end);
+                break;
+        }
+}
+EXPORT_SYMBOL(__dma_sync);
+
+#ifdef CONFIG_HIGHMEM
+/*
+ * __dma_sync_page() implementation for systems using highmem.
+ * In this case, each page of a buffer must be kmapped/kunmapped
+ * in order to have a virtual address for __dma_sync(). This must
+ * not sleep so kmap_atomic()/kunmap_atomic() are used.
+ *
+ * Note: yes, it is possible and correct to have a buffer extend
+ * beyond the first page.
+ */
+static inline void __dma_sync_page_highmem(struct page *page,
+                unsigned long offset, size_t size, int direction)
+{
+        size_t seg_size = min((size_t)(PAGE_SIZE - offset), size);
+        size_t cur_size = seg_size;
+        unsigned long flags, start, seg_offset = offset;
+        int nr_segs = 1 + ((size - seg_size) + PAGE_SIZE - 1)/PAGE_SIZE;
+        int seg_nr = 0;
+
+        local_irq_save(flags);
+
+        do {
+                start = (unsigned long)kmap_atomic(page + seg_nr,
+                                KM_PPC_SYNC_PAGE) + seg_offset;
+
+                /* Sync this buffer segment */
+                __dma_sync((void *)start, seg_size, direction);
+                kunmap_atomic((void *)start, KM_PPC_SYNC_PAGE);
+                seg_nr++;
+
+                /* Calculate next buffer segment size */
+                seg_size = min((size_t)PAGE_SIZE, size - cur_size);
+
+                /* Add the segment size to our running total */
+                cur_size += seg_size;
+                seg_offset = 0;
+        } while (seg_nr < nr_segs);
+
+        local_irq_restore(flags);
+}
+#endif /* CONFIG_HIGHMEM */
+
+/*
+ * __dma_sync_page makes memory consistent. identical to __dma_sync, but
+ * takes a struct page instead of a virtual address
+ */
+void __dma_sync_page(struct page *page, unsigned long offset,
+        size_t size, int direction)
+{
+#ifdef CONFIG_HIGHMEM
+        __dma_sync_page_highmem(page, offset, size, direction);
+#else
+        unsigned long start = (unsigned long)page_address(page) + offset;
+        __dma_sync((void *)start, size, direction);
+#endif
+}
+EXPORT_SYMBOL(__dma_sync_page);
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 666a5e8a5be1..3de6a0d93824 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -168,12 +168,8 @@ void __init MMU_init(void)
                 ppc_md.progress("MMU:mapin", 0x301);
         mapin_ram();
 
-#ifdef CONFIG_HIGHMEM
-        ioremap_base = PKMAP_BASE;
-#else
-        ioremap_base = 0xfe000000UL;    /* for now, could be 0xfffff000 */
-#endif /* CONFIG_HIGHMEM */
-        ioremap_bot = ioremap_base;
+        /* Initialize early top-down ioremap allocator */
+        ioremap_bot = IOREMAP_TOP;
 
         /* Map in I/O resources */
         if (ppc_md.progress)
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index d0602a76bf7f..579382c163a9 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -380,6 +380,23 @@ void __init mem_init(void)
                 bsssize >> 10,
                 initsize >> 10);
 
+#ifdef CONFIG_PPC32
+        pr_info("Kernel virtual memory layout:\n");
+        pr_info("  * 0x%08lx..0x%08lx  : fixmap\n", FIXADDR_START, FIXADDR_TOP);
+#ifdef CONFIG_HIGHMEM
+        pr_info("  * 0x%08lx..0x%08lx  : highmem PTEs\n",
+                PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP));
+#endif /* CONFIG_HIGHMEM */
+#ifdef CONFIG_NOT_COHERENT_CACHE
+        pr_info("  * 0x%08lx..0x%08lx  : consistent mem\n",
+                IOREMAP_TOP, IOREMAP_TOP + CONFIG_CONSISTENT_SIZE);
+#endif /* CONFIG_NOT_COHERENT_CACHE */
+        pr_info("  * 0x%08lx..0x%08lx  : early ioremap\n",
+                ioremap_bot, IOREMAP_TOP);
+        pr_info("  * 0x%08lx..0x%08lx  : vmalloc & ioremap\n",
+                VMALLOC_START, VMALLOC_END);
+#endif /* CONFIG_PPC32 */
+
         mem_init_done = 1;
 }
 
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index a70e311bd457..030d0005b4d2 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -127,12 +127,12 @@ static unsigned int steal_context_up(unsigned int id)
 
         pr_debug("[%d] steal context %d from mm @%p\n", cpu, id, mm);
 
-        /* Mark this mm has having no context anymore */
-        mm->context.id = MMU_NO_CONTEXT;
-
         /* Flush the TLB for that context */
         local_flush_tlb_mm(mm);
 
+        /* Mark this mm has having no context anymore */
+        mm->context.id = MMU_NO_CONTEXT;
+
         /* XXX This clear should ultimately be part of local_flush_tlb_mm */
         __clear_bit(id, stale_map[cpu]);
 
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index f5c6fd42265c..ae1d67cc090c 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -219,7 +219,8 @@ int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address,
                 entry = do_dcache_icache_coherency(entry);
         changed = !pte_same(*(ptep), entry);
         if (changed) {
-                assert_pte_locked(vma->vm_mm, address);
+                if (!(vma->vm_flags & VM_HUGETLB))
+                        assert_pte_locked(vma->vm_mm, address);
                 __ptep_set_access_flags(ptep, entry);
                 flush_tlb_page_nohash(vma, address);
         }
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 430d0908fa50..5422169626ba 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -399,8 +399,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
 #endif /* CONFIG_DEBUG_PAGEALLOC */
 
 static int fixmaps;
-unsigned long FIXADDR_TOP = (-PAGE_SIZE);
-EXPORT_SYMBOL(FIXADDR_TOP);
 
 void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
 {
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 301855263b81..04296ffff8bf 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -592,3 +592,17 @@ int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel)
         }
         return irq;
 }
+
+static void __devinit quirk_ipr_msi(struct pci_dev *dev)
+{
+        /* Something prevents MSIs from the IPR from working on Bimini,
+         * and the driver has no smarts to recover. So disable MSI
+         * on it for now. */
+
+        if (machine_is(maple)) {
+                dev->no_msi = 1;
+                dev_info(&dev->dev, "Quirk disabled MSI\n");
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
+                        quirk_ipr_msi);
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 39e46919df14..f2a29641b6a3 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -263,6 +263,9 @@ static int camera_probe(void)
         struct i2c_msg msg;
         int ret;
 
+        if (!a)
+                return -ENODEV;
+
         camera_power(1);
         msg.addr = 0x6e;
         msg.buf = camera_ncm03j_magic;
diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
index d3b2b4f109e3..5d84df5e27f6 100644
--- a/arch/sh/include/asm/flat.h
+++ b/arch/sh/include/asm/flat.h
@@ -12,7 +12,6 @@
 #ifndef __ASM_SH_FLAT_H
 #define __ASM_SH_FLAT_H
 
-#define flat_stack_align(sp)                    /* nothing needed */
 #define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index 425c2f9be6d5..d42e393078c4 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -208,8 +208,9 @@ do {	unsigned long new_flags = current_thread_info()->flags; \
         else                                            \
                 clear_thread_flag(TIF_ABI_PENDING);     \
         /* flush_thread will update pgd cache */        \
-        if (current->personality != PER_LINUX32)        \
-                set_personality(PER_LINUX);             \
+        if (personality(current->personality) != PER_LINUX32)   \
+                set_personality(PER_LINUX |             \
+                        (current->personality & (~PER_MASK)));  \
 } while (0)
 
 #endif /* !(__ASM_SPARC64_ELF_H) */
diff --git a/arch/sparc/lib/csum_copy_from_user.S b/arch/sparc/lib/csum_copy_from_user.S
index a22eddbe5dba..e0304e6a2242 100644
--- a/arch/sparc/lib/csum_copy_from_user.S
+++ b/arch/sparc/lib/csum_copy_from_user.S
@@ -5,7 +5,7 @@
 
 #define EX_LD(x)                \
 98:     x;                      \
-        .section .fixup;        \
+        .section .fixup, "ax";  \
         .align 4;               \
 99:     retl;                   \
          mov    -1, %o0;        \
diff --git a/arch/sparc/lib/csum_copy_to_user.S b/arch/sparc/lib/csum_copy_to_user.S
index d5b12f441f02..afd01acc587c 100644
--- a/arch/sparc/lib/csum_copy_to_user.S
+++ b/arch/sparc/lib/csum_copy_to_user.S
@@ -5,7 +5,7 @@
 
 #define EX_ST(x)                \
 98:     x;                      \
-        .section .fixup;        \
+        .section .fixup,"ax";   \
         .align 4;               \
 99:     retl;                   \
          mov    -1, %o0;        \
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index df9e885eee14..a6efe0a2e9ae 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -498,6 +498,19 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_SPINLOCKS
+        bool "Paravirtualization layer for spinlocks"
+        depends on PARAVIRT && SMP && EXPERIMENTAL
+        ---help---
+          Paravirtualized spinlocks allow a pvops backend to replace the
+          spinlock implementation with something virtualization-friendly
+          (for example, block the virtual CPU rather than spinning).
+
+          Unfortunately the downside is an up to 5% performance hit on
+          native kernels, with various workloads.
+
+          If you are unsure how to answer this question, answer N.
+
 config PARAVIRT_CLOCK
         bool
         default n
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index 857e492c571e..bbeb0c3fbd90 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -504,8 +504,11 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
                         if (sym->st_shndx == SHN_ABS) {
                                 continue;
                         }
-                        if (r_type == R_386_PC32) {
-                                /* PC relative relocations don't need to be adjusted */
+                        if (r_type == R_386_NONE || r_type == R_386_PC32) {
+                                /*
+                                 * NONE can be ignored and and PC relative
+                                 * relocations don't need to be adjusted.
+                                 */
                         }
                         else if (r_type == R_386_32) {
                                 /* Visit relocations that need to be adjusted */
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index 5054c2ddd1a0..74b3d2ba84e9 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -17,11 +17,6 @@
 
 #define SMAP    0x534d4150      /* ASCII "SMAP" */
 
-struct e820_ext_entry {
-        struct e820entry std;
-        u32 ext_flags;
-} __attribute__((packed));
-
 static int detect_memory_e820(void)
 {
         int count = 0;
@@ -29,13 +24,21 @@ static int detect_memory_e820(void)
         u32 size, id, edi;
         u8 err;
         struct e820entry *desc = boot_params.e820_map;
-        static struct e820_ext_entry buf; /* static so it is zeroed */
+        static struct e820entry buf; /* static so it is zeroed */
 
         /*
-         * Set this here so that if the BIOS doesn't change this field
-         * but still doesn't change %ecx, we're still okay...
+         * Note: at least one BIOS is known which assumes that the
+         * buffer pointed to by one e820 call is the same one as
+         * the previous call, and only changes modified fields.  Therefore,
+         * we use a temporary buffer and copy the results entry by entry.
+         *
+         * This routine deliberately does not try to account for
+         * ACPI 3+ extended attributes.  This is because there are
+         * BIOSes in the field which report zero for the valid bit for
+         * all ranges, and we don't currently make any use of the
+         * other attribute bits.  Revisit this if we see the extended
+         * attribute bits deployed in a meaningful way in the future.
          */
-        buf.ext_flags = 1;
 
         do {
                 size = sizeof buf;
@@ -66,13 +69,7 @@ static int detect_memory_e820(void)
                         break;
                 }
 
-                /* ACPI 3.0 added the extended flags support.  If bit 0
-                   in the extended flags is zero, we're supposed to simply
-                   ignore the entry -- a backwards incompatible change! */
-                if (size > 20 && !(buf.ext_flags & 1))
-                        continue;
-
-                *desc++ = buf.std;
+                *desc++ = buf;
                 count++;
         } while (next && count < ARRAY_SIZE(boot_params.e820_map));
 
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 378e3691c08c..a53da004e08e 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -1443,7 +1443,7 @@ u64 _paravirt_ident_64(u64);
 
 #define paravirt_nop    ((void *)_paravirt_nop)
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
 
 static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
 {
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index aee103b26d01..02ecb30982a3 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -82,22 +82,22 @@ do {							\
         case 1:                                         \
                 asm(op "b %1,"__percpu_arg(0)           \
                     : "+m" (var)                        \
-                    : "ri" ((T__)val));                 \
+                    : "qi" ((T__)(val)));               \
                 break;                                  \
         case 2:                                         \
                 asm(op "w %1,"__percpu_arg(0)           \
                     : "+m" (var)                        \
-                    : "ri" ((T__)val));                 \
+                    : "ri" ((T__)(val)));               \
                 break;                                  \
         case 4:                                         \
                 asm(op "l %1,"__percpu_arg(0)           \
                     : "+m" (var)                        \
-                    : "ri" ((T__)val));                 \
+                    : "ri" ((T__)(val)));               \
                 break;                                  \
         case 8:                                         \
                 asm(op "q %1,"__percpu_arg(0)           \
                     : "+m" (var)                        \
-                    : "re" ((T__)val));                 \
+                    : "re" ((T__)(val)));               \
                 break;                                  \
         default: __bad_percpu_size();                   \
         }                                               \
@@ -109,7 +109,7 @@ do {							\
         switch (sizeof(var)) {                          \
         case 1:                                         \
                 asm(op "b "__percpu_arg(1)",%0"         \
-                    : "=r" (ret__)                      \
+                    : "=q" (ret__)                      \
                     : "m" (var));                       \
                 break;                                  \
         case 2:                                         \
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index e304b66abeea..624f133943ed 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -187,14 +187,15 @@ static inline int v8086_mode(struct pt_regs *regs)
 
 /*
  * X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
- * when it traps.  So regs will be the current sp.
+ * when it traps.  The previous stack will be directly underneath the saved
+ * registers, and 'sp/ss' won't even have been saved. Thus the '&regs->sp'.
  *
  * This is valid only for kernel mode traps.
  */
-static inline unsigned long kernel_trap_sp(struct pt_regs *regs)
+static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-        return (unsigned long)regs;
+        return (unsigned long)(&regs->sp);
 #else
         return regs->sp;
 #endif
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index e5e6caffec87..b7e5db876399 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -172,7 +172,7 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
         return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;
 }
 
-#ifndef CONFIG_PARAVIRT
+#ifndef CONFIG_PARAVIRT_SPINLOCKS
 
 static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
 {
@@ -206,7 +206,7 @@ static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock,
         __raw_spin_lock(lock);
 }
 
-#endif
+#endif  /* CONFIG_PARAVIRT_SPINLOCKS */
 
 static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
 {
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 145cce75cda7..88d1bfc847d3 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -89,7 +89,8 @@ obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o
 obj-$(CONFIG_VMI)               += vmi_32.o vmiclock_32.o
 obj-$(CONFIG_KVM_GUEST)         += kvm.o
 obj-$(CONFIG_KVM_CLOCK)         += kvmclock.o
-obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirt_patch_$(BITS).o paravirt-spinlocks.o
+obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirt_patch_$(BITS).o
+obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o
 obj-$(CONFIG_PARAVIRT_CLOCK)    += pvclock.o
 
 obj-$(CONFIG_PCSPKR_PLATFORM)   += pcspeaker.o
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 1c11b819f245..302947775575 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -254,7 +254,7 @@ static int parse_unisys_oem(char *oemptr)
 }
 
 #ifdef CONFIG_ACPI
-static int find_unisys_acpi_oem_table(unsigned long *oem_addr)
+static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)
 {
         struct acpi_table_header *header = NULL;
         struct es7000_oem_table *table;
@@ -285,7 +285,7 @@ static int find_unisys_acpi_oem_table(unsigned long *oem_addr)
         return 0;
 }
 
-static void unmap_unisys_acpi_oem_table(unsigned long oem_addr)
+static void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr)
 {
         if (!oem_addr)
                 return;
@@ -306,7 +306,7 @@ static int es7000_check_dsdt(void)
 static int es7000_acpi_ret;
 
 /* Hook from generic ACPI tables.c */
-static int es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
         unsigned long oem_addr = 0;
         int check_dsdt;
@@ -717,7 +717,7 @@ struct apic apic_es7000_cluster = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 };
 
-struct apic apic_es7000 = {
+struct apic __refdata apic_es7000 = {
 
         .name                           = "es7000",
         .probe                          = probe_es7000,
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c1caefc82e62..77848d9fca68 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -114,6 +114,13 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
 } };
 EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
 
+static int __init x86_xsave_setup(char *s)
+{
+        setup_clear_cpu_cap(X86_FEATURE_XSAVE);
+        return 1;
+}
+__setup("noxsave", x86_xsave_setup);
+
 #ifdef CONFIG_X86_32
 static int cachesize_override __cpuinitdata = -1;
 static int disable_x86_serial_nr __cpuinitdata = 1;
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 208ecf6643df..54b6de2cd947 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -693,8 +693,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
         if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
             policy->cpuinfo.transition_latency > 20 * 1000) {
                 policy->cpuinfo.transition_latency = 20 * 1000;
-                        printk_once(KERN_INFO "Capping off P-state tranision"
-                                    " latency at 20 uS\n");
+                printk_once(KERN_INFO
+                            "P-state transition latency capped at 20 uS\n");
         }
 
         /* table init */
diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 6ac55bd341ae..869615193720 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -168,6 +168,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
                 case 0x0E: /* Core */
                 case 0x0F: /* Core Duo */
                 case 0x16: /* Celeron Core */
+                case 0x1C: /* Atom */
                         p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
                         return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
                 case 0x0D: /* Pentium M (Dothan) */
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
index 3c28ccd49742..a8363e5be4ef 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
@@ -168,10 +168,12 @@ static int check_powernow(void)
         return 1;
 }
 
+#ifdef CONFIG_X86_POWERNOW_K7_ACPI
 static void invalidate_entry(unsigned int entry)
 {
         powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
 }
+#endif
 
 static int get_ranges(unsigned char *pst)
 {
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 4709ead2db52..f6b32d112357 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -649,6 +649,20 @@ static void print_basics(struct powernow_k8_data *data)
                                 data->batps);
 }
 
+static u32 freq_from_fid_did(u32 fid, u32 did)
+{
+        u32 mhz = 0;
+
+        if (boot_cpu_data.x86 == 0x10)
+                mhz = (100 * (fid + 0x10)) >> did;
+        else if (boot_cpu_data.x86 == 0x11)
+                mhz = (100 * (fid + 8)) >> did;
+        else
+                BUG();
+
+        return mhz * 1000;
+}
+
 static int fill_powernow_table(struct powernow_k8_data *data,
                 struct pst_s *pst, u8 maxvid)
 {
@@ -923,8 +937,13 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data,
 
                 powernow_table[i].index = index;
 
-                powernow_table[i].frequency =
-                        data->acpi_data.states[i].core_frequency * 1000;
+                /* Frequency may be rounded for these */
+                if (boot_cpu_data.x86 == 0x10 || boot_cpu_data.x86 == 0x11) {
+                        powernow_table[i].frequency =
+                                freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7);
+                } else
+                        powernow_table[i].frequency =
+                                data->acpi_data.states[i].core_frequency * 1000;
         }
         return 0;
 }
@@ -1215,13 +1234,16 @@ static int powernowk8_verify(struct cpufreq_policy *pol)
         return cpufreq_frequency_table_verify(pol, data->powernow_table);
 }
 
+static const char ACPI_PSS_BIOS_BUG_MSG[] =
+        KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
+        KERN_ERR FW_BUG PFX "Try again with latest BIOS.\n";
+
 /* per CPU init entry point to the driver */
 static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data;
         cpumask_t oldmask;
         int rc;
-        static int print_once;
 
         if (!cpu_online(pol->cpu))
                 return -ENODEV;
@@ -1244,19 +1266,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
                  * an UP version, and is deprecated by AMD.
                  */
                 if (num_online_cpus() != 1) {
-                        /*
-                         * Replace this one with print_once as soon as such a
-                         * thing gets introduced
-                         */
-                        if (!print_once) {
-                                WARN_ONCE(1, KERN_ERR FW_BUG PFX "Your BIOS "
-                                        "does not provide ACPI _PSS objects "
-                                        "in a way that Linux understands. "
-                                        "Please report this to the Linux ACPI"
-                                        " maintainers and complain to your "
-                                        "BIOS vendor.\n");
-                                print_once++;
-                        }
+                        printk_once(ACPI_PSS_BIOS_BUG_MSG);
                         goto err_out;
                 }
                 if (pol->cpu != 0) {
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 0b776c09aff3..d21d4fb161f7 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -275,7 +275,11 @@ static void __init print_mtrr_state(void)
         }
         printk(KERN_DEBUG "MTRR variable ranges %sabled:\n",
                mtrr_state.enabled & 2 ? "en" : "dis");
-        high_width = ((size_or_mask ? ffs(size_or_mask) - 1 : 32) - (32 - PAGE_SHIFT) + 3) / 4;
+        if (size_or_mask & 0xffffffffUL)
+                high_width = ffs(size_or_mask & 0xffffffffUL) - 1;
+        else
+                high_width = ffs(size_or_mask>>32) + 32 - 1;
+        high_width = (high_width - (32 - PAGE_SHIFT) + 3) / 4;
         for (i = 0; i < num_var_ranges; ++i) {
                 if (mtrr_state.var_ranges[i].mask_lo & (1 << 11))
                         printk(KERN_DEBUG "  %u base %0*X%05X000 mask %0*X%05X000 %s\n",
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 18dfa30795c9..b79c5533c421 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -442,7 +442,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
                 _ASM_EXTABLE(1b, 4b)
                 _ASM_EXTABLE(2b, 4b)
 
-                : [old] "=r" (old), [faulted] "=r" (faulted)
+                : [old] "=&r" (old), [faulted] "=r" (faulted)
                 : [parent] "r" (parent), [return_hooker] "r" (return_hooker)
                 : "memory"
         );
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 8e45f4464880..9faf43bea336 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -134,7 +134,9 @@ static void *get_call_destination(u8 type)
                 .pv_irq_ops = pv_irq_ops,
                 .pv_apic_ops = pv_apic_ops,
                 .pv_mmu_ops = pv_mmu_ops,
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
                 .pv_lock_ops = pv_lock_ops,
+#endif
         };
         return *((void **)&tmpl + type);
 }
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 1340dad417f4..667188e0b5a0 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -232,6 +232,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Dell DXP061"),
                 },
         },
+        {       /* Handle problems with rebooting on Sony VGN-Z540N */
+                .callback = set_bios_reboot,
+                .ident = "Sony VGN-Z540N",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"),
+                },
+        },
         { }
 };
 
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 3a97a4cf1872..8f0e13be36b3 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -160,8 +160,10 @@ static ssize_t __init setup_pcpu_remap(size_t static_size)
         /*
          * If large page isn't supported, there's no benefit in doing
          * this.  Also, on non-NUMA, embedding is better.
+         *
+         * NOTE: disabled for now.
          */
-        if (!cpu_has_pse || !pcpu_need_numa())
+        if (true || !cpu_has_pse || !pcpu_need_numa())
                 return -EINVAL;
 
         /*
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index b6caf1329b1b..32cf11e5728a 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2897,8 +2897,7 @@ static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu,
 
 static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu)
 {
-        kvm_x86_ops->tlb_flush(vcpu);
-        set_bit(KVM_REQ_MMU_SYNC, &vcpu->requests);
+        kvm_set_cr3(vcpu, vcpu->arch.cr3);
         return 1;
 }
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 49079a46687b..3944e917e794 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -338,6 +338,9 @@ EXPORT_SYMBOL_GPL(kvm_lmsw);
 
 void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
 {
+        unsigned long old_cr4 = vcpu->arch.cr4;
+        unsigned long pdptr_bits = X86_CR4_PGE | X86_CR4_PSE | X86_CR4_PAE;
+
         if (cr4 & CR4_RESERVED_BITS) {
                 printk(KERN_DEBUG "set_cr4: #GP, reserved bits\n");
                 kvm_inject_gp(vcpu, 0);
@@ -351,7 +354,8 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
                         kvm_inject_gp(vcpu, 0);
                         return;
                 }
-        } else if (is_paging(vcpu) && !is_pae(vcpu) && (cr4 & X86_CR4_PAE)
+        } else if (is_paging(vcpu) && (cr4 & X86_CR4_PAE)
+                   && ((cr4 ^ old_cr4) & pdptr_bits)
                    && !load_pdptrs(vcpu, vcpu->arch.cr3)) {
                 printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
                 kvm_inject_gp(vcpu, 0);
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 8f307d914c2e..f46c340727b8 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -26,12 +26,16 @@ static unsigned long page_table_shareable(struct vm_area_struct *svma,
         unsigned long sbase = saddr & PUD_MASK;
         unsigned long s_end = sbase + PUD_SIZE;
 
+        /* Allow segments to share if only one is marked locked */
+        unsigned long vm_flags = vma->vm_flags & ~VM_LOCKED;
+        unsigned long svm_flags = svma->vm_flags & ~VM_LOCKED;
+
         /*
          * match the virtual addresses, permission and the alignment of the
          * page table page.
          */
         if (pmd_index(addr) != pmd_index(saddr) ||
-            vma->vm_flags != svma->vm_flags ||
+            vm_flags != svm_flags ||
             sbase < svma->vm_start || svma->vm_end < s_end)
                 return 0;
 
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 797f9f107cb6..e17efed088c5 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -153,7 +153,7 @@ static void __cpa_flush_all(void *arg)
          */
         __flush_tlb_all();
 
-        if (cache && boot_cpu_data.x86_model >= 4)
+        if (cache && boot_cpu_data.x86 >= 4)
                 wbinvd();
 }
 
@@ -208,20 +208,15 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
                             int in_flags, struct page **pages)
 {
         unsigned int i, level;
+        unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */
 
         BUG_ON(irqs_disabled());
 
-        on_each_cpu(__cpa_flush_range, NULL, 1);
+        on_each_cpu(__cpa_flush_all, (void *) do_wbinvd, 1);
 
-        if (!cache)
+        if (!cache || do_wbinvd)
                 return;
 
-        /* 4M threshold */
-        if (numpages >= 1024) {
-                if (boot_cpu_data.x86_model >= 4)
-                        wbinvd();
-                return;
-        }
         /*
          * We only need to flush on one CPU,
          * clflush is a MESI-coherent instruction that
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 04df67f8a7ba..044897be021f 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -76,9 +76,9 @@ void
 x86_backtrace(struct pt_regs * const regs, unsigned int depth)
 {
         struct frame_head *head = (struct frame_head *)frame_pointer(regs);
-        unsigned long stack = kernel_trap_sp(regs);
 
         if (!user_mode_vm(regs)) {
+                unsigned long stack = kernel_stack_pointer(regs);
                 if (depth)
                         dump_trace(NULL, regs, (unsigned long *)stack, 0,
                                    &backtrace_ops, &depth);
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 3b767d03fd6a..172438f86a02 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -9,5 +9,6 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
                         time.o xen-asm.o xen-asm_$(BITS).o \
                         grant-table.o suspend.o
 
-obj-$(CONFIG_SMP)               += smp.o spinlock.o
-obj-$(CONFIG_XEN_DEBUG_FS)      += debugfs.o
\ No newline at end of file
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
+obj-$(CONFIG_XEN_DEBUG_FS)      += debugfs.o
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index e25a78e1113a..fba55b1a4021 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -42,6 +42,7 @@
 #include <linux/highmem.h>
 #include <linux/debugfs.h>
 #include <linux/bug.h>
+#include <linux/module.h>
 
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 20139464943c..ca6596b05d53 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -62,15 +62,26 @@ void xen_setup_vcpu_info_placement(void);
 #ifdef CONFIG_SMP
 void xen_smp_init(void);
 
-void __init xen_init_spinlocks(void);
-__cpuinit void xen_init_lock_cpu(int cpu);
-void xen_uninit_lock_cpu(int cpu);
-
 extern cpumask_var_t xen_cpu_initialized_map;
 #else
 static inline void xen_smp_init(void) {}
 #endif
 
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
+void __init xen_init_spinlocks(void);
+__cpuinit void xen_init_lock_cpu(int cpu);
+void xen_uninit_lock_cpu(int cpu);
+#else
+static inline void xen_init_spinlocks(void)
+{
+}
+static inline void xen_init_lock_cpu(int cpu)
+{
+}
+static inline void xen_uninit_lock_cpu(int cpu)
+{
+}
+#endif
 
 /* Declare an asm function, along with symbols needed to make it
    inlineable */
diff --git a/crypto/ahash.c b/crypto/ahash.c
index b2d1ee32cfe8..f3476374f764 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -82,10 +82,11 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
         if (err)
                 return err;
 
-        walk->offset = 0;
-
-        if (nbytes)
+        if (nbytes) {
+                walk->offset = 0;
+                walk->pg++;
                 return hash_walk_next(walk);
+        }
 
         if (!walk->total)
                 return 0;
diff --git a/crypto/api.c b/crypto/api.c
index 314dab96840e..fd2545decb28 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -221,7 +221,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
 
                 request_module(name);
 
-                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
+                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
+                      CRYPTO_ALG_NEED_FALLBACK) &&
                     snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
                         request_module(tmp);
 
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c
index 2a342c8e52b3..3ca3b669d5d5 100644
--- a/crypto/eseqiv.c
+++ b/crypto/eseqiv.c
@@ -153,7 +153,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req)
         if (err)
                 goto out;
 
-        eseqiv_complete2(req);
+        if (giv != req->giv)
+                eseqiv_complete2(req);
 
 out:
         return err;
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 95650f83ce2e..bc46de3d967f 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -116,9 +116,6 @@ int acpi_pci_bind(struct acpi_device *device)
         struct acpi_pci_data *pdata;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         acpi_handle handle;
-        struct pci_dev *dev;
-        struct pci_bus *bus;
-
 
         if (!device || !device->parent)
                 return -EINVAL;
@@ -176,20 +173,9 @@ int acpi_pci_bind(struct acpi_device *device)
          * Locate matching device in PCI namespace.  If it doesn't exist
          * this typically means that the device isn't currently inserted
          * (e.g. docking station, port replicator, etc.).
-         * We cannot simply search the global pci device list, since
-         * PCI devices are added to the global pci list when the root
-         * bridge start ops are run, which may not have happened yet.
          */
-        bus = pci_find_bus(data->id.segment, data->id.bus);
-        if (bus) {
-                list_for_each_entry(dev, &bus->devices, bus_list) {
-                        if (dev->devfn == PCI_DEVFN(data->id.device,
-                                                    data->id.function)) {
-                                data->dev = dev;
-                                break;
-                        }
-                }
-        }
+        data->dev = pci_get_slot(pdata->bus,
+                                PCI_DEVFN(data->id.device, data->id.function));
         if (!data->dev) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Device %04x:%02x:%02x.%d not present in PCI namespace\n",
@@ -259,9 +245,10 @@ int acpi_pci_bind(struct acpi_device *device)
 
       end:
         kfree(buffer.pointer);
-        if (result)
+        if (result) {
+                pci_dev_put(data->dev);
                 kfree(data);
-
+        }
         return result;
 }
 
@@ -303,6 +290,7 @@ static int acpi_pci_unbind(struct acpi_device *device)
         if (data->dev->subordinate) {
                 acpi_pci_irq_del_prt(data->id.segment, data->bus->number);
         }
+        pci_dev_put(data->dev);
         kfree(data);
 
       end:
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 72069ba5f1ed..10a2d913635a 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -148,6 +148,9 @@ static void acpi_timer_check_state(int state, struct acpi_processor *pr,
         if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT))
                 return;
 
+        if (boot_cpu_has(X86_FEATURE_AMDC1E))
+                type = ACPI_STATE_C1;
+
         /*
          * Check, if one of the previous states already marked the lapic
          * unstable
@@ -611,6 +614,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                 switch (cx->type) {
                 case ACPI_STATE_C1:
                         cx->valid = 1;
+                        acpi_timer_check_state(i, pr, cx);
                         break;
 
                 case ACPI_STATE_C2:
@@ -830,11 +834,12 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 
         /* Do not access any ACPI IO ports in suspend path */
         if (acpi_idle_suspend) {
-                acpi_safe_halt();
                 local_irq_enable();
+                cpu_relax();
                 return 0;
         }
 
+        acpi_state_timer_broadcast(pr, cx, 1);
         kt1 = ktime_get_real();
         acpi_idle_do_entry(cx);
         kt2 = ktime_get_real();
@@ -842,6 +847,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 
         local_irq_enable();
         cx->usage++;
+        acpi_state_timer_broadcast(pr, cx, 0);
 
         return idle_time;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index cafb41000f6b..60e543d3234e 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -309,9 +309,15 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                                   (u32) px->bus_master_latency,
                                   (u32) px->control, (u32) px->status));
 
-                if (!px->core_frequency) {
-                        printk(KERN_ERR PREFIX
-                                    "Invalid _PSS data: freq is zero\n");
+                /*
+                 * Check that ACPI's u64 MHz will be valid as u32 KHz in cpufreq
+                 */
+                if (!px->core_frequency ||
+                    ((u32)(px->core_frequency * 1000) !=
+                     (px->core_frequency * 1000))) {
+                        printk(KERN_ERR FW_BUG PREFIX
+                               "Invalid BIOS _PSS frequency: 0x%llx MHz\n",
+                               px->core_frequency);
                         result = -EFAULT;
                         kfree(pr->performance->states);
                         goto end;
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 7f16f5f8e7d3..227543789ba9 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -840,7 +840,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
                 state = acpi_get_throttling_state(pr, value);
                 if (state == -1) {
                         ACPI_WARNING((AE_INFO,
-                                "Invalid throttling state, reset\n"));
+                                "Invalid throttling state, reset"));
                         state = 0;
                         ret = acpi_processor_set_throttling(pr, state);
                         if (ret)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 810cca90ca7f..1bdfb37377e3 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -570,6 +570,22 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710Z"),
                 },
         },
+        {
+         .callback = video_set_bqc_offset,
+         .ident = "eMachines E510",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "EMACHINES"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "eMachines E510"),
+                },
+        },
+        {
+         .callback = video_set_bqc_offset,
+         .ident = "Acer Aspire 5315",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
+                },
+        },
         {}
 };
 
@@ -2334,7 +2350,7 @@ static int __init acpi_video_init(void)
         return acpi_video_register();
 }
 
-void __exit acpi_video_exit(void)
+void acpi_video_exit(void)
 {
 
         acpi_bus_unregister_driver(&acpi_video_bus);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index dc030f1f00f1..c6599618523e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -700,8 +700,10 @@ int bus_add_driver(struct device_driver *drv)
         }
 
         kobject_uevent(&priv->kobj, KOBJ_ADD);
-        return error;
+        return 0;
 out_unregister:
+        kfree(drv->p);
+        drv->p = NULL;
         kobject_put(&priv->kobj);
 out_put_bus:
         bus_put(bus);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4aa527b8a913..1977d4beb89e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -879,7 +879,7 @@ int device_add(struct device *dev)
         }
 
         if (!dev_name(dev))
-                goto done;
+                goto name_error;
 
         pr_debug("device: '%s': %s\n", dev_name(dev), __func__);
 
@@ -978,6 +978,9 @@ done:
         cleanup_device_parent(dev);
         if (parent)
                 put_device(parent);
+name_error:
+        kfree(dev->p);
+        dev->p = NULL;
         goto done;
 }
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index c51f11bb29ae..8ae0f63602e0 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -257,6 +257,10 @@ EXPORT_SYMBOL_GPL(driver_register);
  */
 void driver_unregister(struct device_driver *drv)
 {
+        if (!drv || !drv->p) {
+                WARN(1, "Unexpected driver unregister!\n");
+                return;
+        }
         driver_remove_groups(drv, drv->groups);
         bus_remove_driver(drv);
 }
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 69b4ddb7de3b..3e4bc699bc0f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -357,6 +357,7 @@ static void dpm_power_up(pm_message_t state)
 {
         struct device *dev;
 
+        mutex_lock(&dpm_list_mtx);
         list_for_each_entry(dev, &dpm_list, power.entry)
                 if (dev->power.status > DPM_OFF) {
                         int error;
@@ -366,6 +367,7 @@ static void dpm_power_up(pm_message_t state)
                         if (error)
                                 pm_dev_err(dev, state, " early", error);
                 }
+        mutex_unlock(&dpm_list_mtx);
 }
 
 /**
@@ -614,6 +616,7 @@ int device_power_down(pm_message_t state)
         int error = 0;
 
         suspend_device_irqs();
+        mutex_lock(&dpm_list_mtx);
         list_for_each_entry_reverse(dev, &dpm_list, power.entry) {
                 error = suspend_device_noirq(dev, state);
                 if (error) {
@@ -622,6 +625,7 @@ int device_power_down(pm_message_t state)
                 }
                 dev->power.status = DPM_OFF_IRQ;
         }
+        mutex_unlock(&dpm_list_mtx);
         if (error)
                 device_power_up(resume_event(state));
         return error;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 8f905089b72b..a6cbf7b808e6 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -934,8 +934,6 @@ static void blkfront_closing(struct xenbus_device *dev)
 
         spin_lock_irqsave(&blkif_io_lock, flags);
 
-        del_gendisk(info->gd);
-
         /* No more blkif_request(). */
         blk_stop_queue(info->rq);
 
@@ -949,6 +947,8 @@ static void blkfront_closing(struct xenbus_device *dev)
         blk_cleanup_queue(info->rq);
         info->rq = NULL;
 
+        del_gendisk(info->gd);
+
  out:
         xenbus_frontend_closed(dev);
 }
@@ -977,8 +977,10 @@ static void backend_changed(struct xenbus_device *dev,
                 break;
 
         case XenbusStateClosing:
-                if (info->gd == NULL)
-                        xenbus_dev_fatal(dev, -ENODEV, "gd is NULL");
+                if (info->gd == NULL) {
+                        xenbus_frontend_closed(dev);
+                        break;
+                }
                 bd = bdget_disk(info->gd, 0);
                 if (bd == NULL)
                         xenbus_dev_fatal(dev, -ENODEV, "bdget failed");
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 13929356135c..9b1624e0ddeb 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -587,7 +587,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         struct device_node *node = vdev->dev.archdata.of_node;
 
         deviceno = vdev->unit_address;
-        if (deviceno > VIOCD_MAX_CD)
+        if (deviceno >= VIOCD_MAX_CD)
                 return -ENODEV;
         if (!node)
                 return -ENODEV;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index aa83a0865ec1..09050797c76a 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2856,6 +2856,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                 /* Assume a single IPMB channel at zero. */
                 intf->channels[0].medium = IPMI_CHANNEL_MEDIUM_IPMB;
                 intf->channels[0].protocol = IPMI_CHANNEL_PROTOCOL_IPMB;
+                intf->curr_channel = IPMI_MAX_CHANNELS;
         }
 
         if (rv == 0)
@@ -3648,13 +3649,13 @@ static int handle_new_recv_msg(ipmi_smi_t          intf,
                 }
 
                 /*
-                ** We need to make sure the channels have been initialized.
-                ** The channel_handler routine will set the "curr_channel"
-                ** equal to or greater than IPMI_MAX_CHANNELS when all the
-                ** channels for this interface have been initialized.
-                */
+                 * We need to make sure the channels have been initialized.
+                 * The channel_handler routine will set the "curr_channel"
+                 * equal to or greater than IPMI_MAX_CHANNELS when all the
+                 * channels for this interface have been initialized.
+                 */
                 if (intf->curr_channel < IPMI_MAX_CHANNELS) {
-                        requeue = 1;     /* Just put the message back for now */
+                        requeue = 0; /* Throw the message away */
                         goto out;
                 }
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index b2ced39d76b2..8c7444857a4b 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1673,7 +1673,7 @@ unsigned int get_random_int(void)
         int ret;
 
         keyptr = get_keyptr();
-        hash[0] += current->pid + jiffies + get_cycles() + (int)(long)&ret;
+        hash[0] += current->pid + jiffies + get_cycles();
 
         ret = half_md4_transform(hash, keyptr->secret);
         put_cpu_var(get_random_int_hash);
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index ed306eb1057f..0c2f55a38b95 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -212,7 +212,8 @@ static int get_event_name(char *dest, struct tcpa_event *event,
                         unsigned char * event_entry)
 {
         const char *name = "";
-        char data[40] = "";
+        /* 41 so there is room for 40 data and 1 nul */
+        char data[41] = "";
         int i, n_len = 0, d_len = 0;
         struct tcpa_pc_event *pc_event;
 
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d270e8eb3e67..47d2ad0ae079 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1070,11 +1070,11 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
         spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
 #endif
 
+        unlock_policy_rwsem_write(cpu);
+
         if (cpufreq_driver->target)
                 __cpufreq_governor(data, CPUFREQ_GOV_STOP);
 
-        unlock_policy_rwsem_write(cpu);
-
         kobject_put(&data->kobj);
 
         /* we need to make sure that the underlying kobj is actually
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 2ecd95e4ab1a..7a74d175287b 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -91,6 +91,9 @@ static unsigned int dbs_enable;	/* number of CPUs using this policy */
  * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then
  * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock
  * is recursive for the same process. -Venki
+ * DEADLOCK ALERT! (2) : do_dbs_timer() must not take the dbs_mutex, because it
+ * would deadlock with cancel_delayed_work_sync(), which is needed for proper
+ * raceless workqueue teardown.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
@@ -542,7 +545,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
 {
         dbs_info->enable = 0;
-        cancel_delayed_work(&dbs_info->work);
+        cancel_delayed_work_sync(&dbs_info->work);
 }
 
 static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 338f428a15b7..e741c339df76 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -98,6 +98,9 @@ static unsigned int dbs_enable;	/* number of CPUs using this policy */
  * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then
  * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock
  * is recursive for the same process. -Venki
+ * DEADLOCK ALERT! (2) : do_dbs_timer() must not take the dbs_mutex, because it
+ * would deadlock with cancel_delayed_work_sync(), which is needed for proper
+ * raceless workqueue teardown.
  */
 static DEFINE_MUTEX(dbs_mutex);
 
@@ -562,7 +565,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
 {
         dbs_info->enable = 0;
-        cancel_delayed_work(&dbs_info->work);
+        cancel_delayed_work_sync(&dbs_info->work);
 }
 
 static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index f9f05d7a707d..6c6656d3b1e2 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -415,6 +415,7 @@ static void crypto_done_action(unsigned long arg)
 static int init_ixp_crypto(void)
 {
         int ret = -ENODEV;
+        u32 msg[2] = { 0, 0 };
 
         if (! ( ~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH |
                                 IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) {
@@ -426,9 +427,35 @@ static int init_ixp_crypto(void)
                 return ret;
 
         if (!npe_running(npe_c)) {
-                npe_load_firmware(npe_c, npe_name(npe_c), dev);
+                ret = npe_load_firmware(npe_c, npe_name(npe_c), dev);
+                if (ret) {
+                        return ret;
+                }
+                if (npe_recv_message(npe_c, msg, "STATUS_MSG"))
+                        goto npe_error;
+        } else {
+                if (npe_send_message(npe_c, msg, "STATUS_MSG"))
+                        goto npe_error;
+
+                if (npe_recv_message(npe_c, msg, "STATUS_MSG"))
+                        goto npe_error;
         }
 
+        switch ((msg[1]>>16) & 0xff) {
+        case 3:
+                printk(KERN_WARNING "Firmware of %s lacks AES support\n",
+                                npe_name(npe_c));
+                support_aes = 0;
+                break;
+        case 4:
+        case 5:
+                support_aes = 1;
+                break;
+        default:
+                printk(KERN_ERR "Firmware of %s lacks crypto support\n",
+                        npe_name(npe_c));
+                return -ENODEV;
+        }
         /* buffer_pool will also be used to sometimes store the hmac,
          * so assure it is large enough
          */
@@ -459,6 +486,10 @@ static int init_ixp_crypto(void)
 
         qmgr_enable_irq(RECV_QID);
         return 0;
+
+npe_error:
+        printk(KERN_ERR "%s not responding\n", npe_name(npe_c));
+        ret = -EIO;
 err:
         if (ctx_pool)
                 dma_pool_destroy(ctx_pool);
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 3f0fdd18255d..856b3cc25583 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -489,4 +489,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michal Ludvig");
 
-MODULE_ALIAS("aes-all");
+MODULE_ALIAS("aes");
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index da8a8ed9e411..f18d1bde0439 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -179,9 +179,14 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
 static void set_ld_eol(struct fsl_dma_chan *fsl_chan,
                         struct fsl_desc_sw *desc)
 {
+        u64 snoop_bits;
+
+        snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
+                ? FSL_DMA_SNEN : 0;
+
         desc->hw.next_ln_addr = CPU_TO_DMA(fsl_chan,
-                DMA_TO_CPU(fsl_chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL,
-                64);
+                DMA_TO_CPU(fsl_chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
+                        | snoop_bits, 64);
 }
 
 static void append_ld_queue(struct fsl_dma_chan *fsl_chan,
@@ -313,8 +318,8 @@ static void fsl_chan_toggle_ext_start(struct fsl_dma_chan *fsl_chan, int enable)
 
 static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
 {
-        struct fsl_desc_sw *desc = tx_to_fsl_desc(tx);
         struct fsl_dma_chan *fsl_chan = to_fsl_chan(tx->chan);
+        struct fsl_desc_sw *desc;
         unsigned long flags;
         dma_cookie_t cookie;
 
@@ -322,14 +327,17 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
         spin_lock_irqsave(&fsl_chan->desc_lock, flags);
 
         cookie = fsl_chan->common.cookie;
-        cookie++;
-        if (cookie < 0)
-                cookie = 1;
-        desc->async_tx.cookie = cookie;
-        fsl_chan->common.cookie = desc->async_tx.cookie;
+        list_for_each_entry(desc, &tx->tx_list, node) {
+                cookie++;
+                if (cookie < 0)
+                        cookie = 1;
 
-        append_ld_queue(fsl_chan, desc);
-        list_splice_init(&desc->async_tx.tx_list, fsl_chan->ld_queue.prev);
+                desc->async_tx.cookie = cookie;
+        }
+
+        fsl_chan->common.cookie = cookie;
+        append_ld_queue(fsl_chan, tx_to_fsl_desc(tx));
+        list_splice_init(&tx->tx_list, fsl_chan->ld_queue.prev);
 
         spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
 
@@ -454,8 +462,8 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
 {
         struct fsl_dma_chan *fsl_chan;
         struct fsl_desc_sw *first = NULL, *prev = NULL, *new;
+        struct list_head *list;
         size_t copy;
-        LIST_HEAD(link_chain);
 
         if (!chan)
                 return NULL;
@@ -472,7 +480,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
                 if (!new) {
                         dev_err(fsl_chan->dev,
                                         "No free memory for link descriptor\n");
-                        return NULL;
+                        goto fail;
                 }
 #ifdef FSL_DMA_LD_DEBUG
                 dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
@@ -507,7 +515,19 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
         /* Set End-of-link to the last link descriptor of new list*/
         set_ld_eol(fsl_chan, new);
 
-        return first ? &first->async_tx : NULL;
+        return &first->async_tx;
+
+fail:
+        if (!first)
+                return NULL;
+
+        list = &first->async_tx.tx_list;
+        list_for_each_entry_safe_reverse(new, prev, list, node) {
+                list_del(&new->node);
+                dma_pool_free(fsl_chan->desc_pool, new, new->async_tx.phys);
+        }
+
+        return NULL;
 }
 
 /**
@@ -598,15 +618,16 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
         dma_addr_t next_dest_addr;
         unsigned long flags;
 
+        spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+
         if (!dma_is_idle(fsl_chan))
-                return;
+                goto out_unlock;
 
         dma_halt(fsl_chan);
 
         /* If there are some link descriptors
          * not transfered in queue. We need to start it.
          */
-        spin_lock_irqsave(&fsl_chan->desc_lock, flags);
 
         /* Find the first un-transfer desciptor */
         for (ld_node = fsl_chan->ld_queue.next;
@@ -617,19 +638,20 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
                                 fsl_chan->common.cookie) == DMA_SUCCESS);
                 ld_node = ld_node->next);
 
-        spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
-
         if (ld_node != &fsl_chan->ld_queue) {
                 /* Get the ld start address from ld_queue */
                 next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
-                dev_dbg(fsl_chan->dev, "xfer LDs staring from %p\n",
-                                (void *)next_dest_addr);
+                dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",
+                                (unsigned long long)next_dest_addr);
                 set_cdar(fsl_chan, next_dest_addr);
                 dma_start(fsl_chan);
         } else {
                 set_cdar(fsl_chan, 0);
                 set_ndar(fsl_chan, 0);
         }
+
+out_unlock:
+        spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
 }
 
 /**
@@ -734,8 +756,9 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
          */
         if (stat & FSL_DMA_SR_EOSI) {
                 dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n");
-                dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n",
-                        (void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan));
+                dev_dbg(fsl_chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",
+                        (unsigned long long)get_cdar(fsl_chan),
+                        (unsigned long long)get_ndar(fsl_chan));
                 stat &= ~FSL_DMA_SR_EOSI;
                 update_cookie = 1;
         }
@@ -830,7 +853,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
                         new_fsl_chan->reg.end - new_fsl_chan->reg.start + 1);
 
         new_fsl_chan->id = ((new_fsl_chan->reg.start - 0x100) & 0xfff) >> 7;
-        if (new_fsl_chan->id > FSL_DMA_MAX_CHANS_PER_DEVICE) {
+        if (new_fsl_chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
                 dev_err(fdev->dev, "There is no %d channel!\n",
                                 new_fsl_chan->id);
                 err = -EINVAL;
@@ -925,8 +948,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
         }
 
         dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "
-                        "controller at %p...\n",
-                        match->compatible, (void *)fdev->reg.start);
+                        "controller at 0x%llx...\n",
+                        match->compatible, (unsigned long long)fdev->reg.start);
         fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end
                                                 - fdev->reg.start + 1);
 
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 1955ee8d6d20..a600fc0f7962 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -173,7 +173,7 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device)
         xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));
 
 #ifdef  CONFIG_I7300_IDLE_IOAT_CHANNEL
-        if (i7300_idle_platform_probe(NULL, NULL) == 0) {
+        if (i7300_idle_platform_probe(NULL, NULL, 1) == 0) {
                 device->common.chancnt--;
         }
 #endif
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index e5f5c5a8ba6c..956982f8739b 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -192,16 +192,20 @@ config EDAC_PPC4XX
 
 config EDAC_AMD8131
         tristate "AMD8131 HyperTransport PCI-X Tunnel"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && PPC_MAPLE
         help
           Support for error detection and correction on the
           AMD8131 HyperTransport PCI-X Tunnel chip.
+          Note, add more Kconfig dependency if it's adopted
+          on some machine other than Maple.
 
 config EDAC_AMD8111
         tristate "AMD8111 HyperTransport I/O Hub"
-        depends on EDAC_MM_EDAC && PCI
+        depends on EDAC_MM_EDAC && PCI && PPC_MAPLE
         help
           Support for error detection and correction on the
           AMD8111 HyperTransport I/O Hub chip.
+          Note, add more Kconfig dependency if it's adopted
+          on some machine other than Maple.
 
 endif # EDAC
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index a5fdcf02f591..59076819135d 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -35,3 +35,5 @@ obj-$(CONFIG_EDAC_MPC85XX)		+= mpc85xx_edac.o
 obj-$(CONFIG_EDAC_MV64X60)              += mv64x60_edac.o
 obj-$(CONFIG_EDAC_CELL)                 += cell_edac.o
 obj-$(CONFIG_EDAC_PPC4XX)               += ppc4xx_edac.o
+obj-$(CONFIG_EDAC_AMD8111)              += amd8111_edac.o
+obj-$(CONFIG_EDAC_AMD8131)              += amd8131_edac.o
diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 614692181120..2cb58ef743e0 100644
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -389,7 +389,7 @@ static int amd8111_dev_probe(struct pci_dev *dev,
         dev_info->edac_dev->dev = &dev_info->dev->dev;
         dev_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
         dev_info->edac_dev->ctl_name = dev_info->ctl_name;
-        dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+        dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
 
         if (edac_op_state == EDAC_OPSTATE_POLL)
                 dev_info->edac_dev->edac_check = dev_info->check;
@@ -473,7 +473,7 @@ static int amd8111_pci_probe(struct pci_dev *dev,
         pci_info->edac_dev->dev = &pci_info->dev->dev;
         pci_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
         pci_info->edac_dev->ctl_name = pci_info->ctl_name;
-        pci_info->edac_dev->dev_name = pci_info->dev->dev.bus_id;
+        pci_info->edac_dev->dev_name = dev_name(&pci_info->dev->dev);
 
         if (edac_op_state == EDAC_OPSTATE_POLL)
                 pci_info->edac_dev->edac_check = pci_info->check;
diff --git a/drivers/edac/amd8131_edac.c b/drivers/edac/amd8131_edac.c
index c083b31cac5a..b432d60c622a 100644
--- a/drivers/edac/amd8131_edac.c
+++ b/drivers/edac/amd8131_edac.c
@@ -287,7 +287,7 @@ static int amd8131_probe(struct pci_dev *dev, const struct pci_device_id *id)
         dev_info->edac_dev->dev = &dev_info->dev->dev;
         dev_info->edac_dev->mod_name = AMD8131_EDAC_MOD_STR;
         dev_info->edac_dev->ctl_name = dev_info->ctl_name;
-        dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+        dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
 
         if (edac_op_state == EDAC_OPSTATE_POLL)
                 dev_info->edac_dev->edac_check = amd8131_chipset.check;
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 4cd35d8fd799..f5d46e7199d4 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -67,12 +67,18 @@ config DRM_I830
           will load the correct one.
 
 config DRM_I915
+        tristate "i915 driver"
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select FB
         select FRAMEBUFFER_CONSOLE if !EMBEDDED
-        tristate "i915 driver"
+        # i915 depends on ACPI_VIDEO when ACPI is enabled
+        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
+        select VIDEO_OUTPUT_CONTROL if ACPI
+        select BACKLIGHT_CLASS_DEVICE if ACPI
+        select INPUT if ACPI
+        select ACPI_VIDEO if ACPI
         help
           Choose this option if you have a system that has Intel 830M, 845G,
           852GM, 855GM 865G or 915G integrated graphics.  If M is selected, the
@@ -84,12 +90,6 @@ config DRM_I915
 config DRM_I915_KMS
         bool "Enable modesetting on intel by default"
         depends on DRM_I915
-        # i915 KMS depends on ACPI_VIDEO when ACPI is enabled
-        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
-        select VIDEO_OUTPUT_CONTROL if ACPI
-        select BACKLIGHT_CLASS_DEVICE if ACPI
-        select INPUT if ACPI
-        select ACPI_VIDEO if ACPI
         help
           Choose this option if you want kernel modesetting enabled by default,
           and you have a new enough userspace to support this. Running old
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6d80d17f1e96..0411d912d82a 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -170,6 +170,14 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
         }
         DRM_DEBUG("offset = 0x%08llx, size = 0x%08lx, type = %d\n",
                   (unsigned long long)map->offset, map->size, map->type);
+
+        /* page-align _DRM_SHM maps. They are allocated here so there is no security
+         * hole created by that and it works around various broken drivers that use
+         * a non-aligned quantity to map the SAREA. --BenH
+         */
+        if (map->type == _DRM_SHM)
+                map->size = PAGE_ALIGN(map->size);
+
         if ((map->offset & (~(resource_size_t)PAGE_MASK)) || (map->size & (~PAGE_MASK))) {
                 drm_free(map, sizeof(*map), DRM_MEM_MAPS);
                 return -EINVAL;
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index f01def16a669..019b7c578236 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -481,7 +481,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
                 }
                 retcode = func(dev, kdata, file_priv);
 
-                if ((retcode == 0) && (cmd & IOC_OUT)) {
+                if (cmd & IOC_OUT) {
                         if (copy_to_user((void __user *)arg, kdata,
                                          _IOC_SIZE(cmd)) != 0)
                                 retcode = -EFAULT;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9b149fe824c3..c431fa54bbb5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -180,7 +180,8 @@ typedef struct drm_i915_private {
         int backlight_duty_cycle;  /* restore backlight to this value */
         bool panel_wants_dither;
         struct drm_display_mode *panel_fixed_mode;
-        struct drm_display_mode *vbt_mode; /* if any */
+        struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
+        struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */
 
         /* Feature bits from the VBIOS */
         unsigned int int_tv_support:1;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b189b49c7602..670d12881468 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -349,7 +349,7 @@ i915_gem_shmem_pread_slow(struct drm_device *dev, struct drm_gem_object *obj,
         last_data_page = (data_ptr + args->size - 1) / PAGE_SIZE;
         num_pages = last_data_page - first_data_page + 1;
 
-        user_pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
+        user_pages = drm_calloc_large(num_pages, sizeof(struct page *));
         if (user_pages == NULL)
                 return -ENOMEM;
 
@@ -429,7 +429,7 @@ fail_put_user_pages:
                 SetPageDirty(user_pages[i]);
                 page_cache_release(user_pages[i]);
         }
-        kfree(user_pages);
+        drm_free_large(user_pages);
 
         return ret;
 }
@@ -649,7 +649,7 @@ i915_gem_gtt_pwrite_slow(struct drm_device *dev, struct drm_gem_object *obj,
         last_data_page = (data_ptr + args->size - 1) / PAGE_SIZE;
         num_pages = last_data_page - first_data_page + 1;
 
-        user_pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
+        user_pages = drm_calloc_large(num_pages, sizeof(struct page *));
         if (user_pages == NULL)
                 return -ENOMEM;
 
@@ -719,7 +719,7 @@ out_unlock:
 out_unpin_pages:
         for (i = 0; i < pinned_pages; i++)
                 page_cache_release(user_pages[i]);
-        kfree(user_pages);
+        drm_free_large(user_pages);
 
         return ret;
 }
@@ -824,7 +824,7 @@ i915_gem_shmem_pwrite_slow(struct drm_device *dev, struct drm_gem_object *obj,
         last_data_page = (data_ptr + args->size - 1) / PAGE_SIZE;
         num_pages = last_data_page - first_data_page + 1;
 
-        user_pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
+        user_pages = drm_calloc_large(num_pages, sizeof(struct page *));
         if (user_pages == NULL)
                 return -ENOMEM;
 
@@ -902,7 +902,7 @@ fail_unlock:
 fail_put_user_pages:
         for (i = 0; i < pinned_pages; i++)
                 page_cache_release(user_pages[i]);
-        kfree(user_pages);
+        drm_free_large(user_pages);
 
         return ret;
 }
@@ -1145,7 +1145,14 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                         mutex_unlock(&dev->struct_mutex);
                         return VM_FAULT_SIGBUS;
                 }
-                list_add(&obj_priv->list, &dev_priv->mm.inactive_list);
+
+                ret = i915_gem_object_set_to_gtt_domain(obj, write);
+                if (ret) {
+                        mutex_unlock(&dev->struct_mutex);
+                        return VM_FAULT_SIGBUS;
+                }
+
+                list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list);
         }
 
         /* Need a new fence register? */
@@ -1375,7 +1382,7 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
                         mutex_unlock(&dev->struct_mutex);
                         return ret;
                 }
-                list_add(&obj_priv->list, &dev_priv->mm.inactive_list);
+                list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list);
         }
 
         drm_gem_object_unreference(obj);
@@ -1408,9 +1415,7 @@ i915_gem_object_put_pages(struct drm_gem_object *obj)
                 }
         obj_priv->dirty = 0;
 
-        drm_free(obj_priv->pages,
-                 page_count * sizeof(struct page *),
-                 DRM_MEM_DRIVER);
+        drm_free_large(obj_priv->pages);
         obj_priv->pages = NULL;
 }
 
@@ -2024,8 +2029,7 @@ i915_gem_object_get_pages(struct drm_gem_object *obj)
          */
         page_count = obj->size / PAGE_SIZE;
         BUG_ON(obj_priv->pages != NULL);
-        obj_priv->pages = drm_calloc(page_count, sizeof(struct page *),
-                                     DRM_MEM_DRIVER);
+        obj_priv->pages = drm_calloc_large(page_count, sizeof(struct page *));
         if (obj_priv->pages == NULL) {
                 DRM_ERROR("Faled to allocate page list\n");
                 obj_priv->pages_refcount--;
@@ -2131,8 +2135,10 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg)
                 return;
         }
 
-        pitch_val = (obj_priv->stride / 128) - 1;
-        WARN_ON(pitch_val & ~0x0000000f);
+        pitch_val = obj_priv->stride / 128;
+        pitch_val = ffs(pitch_val) - 1;
+        WARN_ON(pitch_val > I830_FENCE_MAX_PITCH_VAL);
+
         val = obj_priv->gtt_offset;
         if (obj_priv->tiling_mode == I915_TILING_Y)
                 val |= 1 << I830_FENCE_TILING_Y_SHIFT;
@@ -2424,6 +2430,16 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
         if (obj_priv->pages == NULL)
                 return;
 
+        /* XXX: The 865 in particular appears to be weird in how it handles
+         * cache flushing.  We haven't figured it out, but the
+         * clflush+agp_chipset_flush doesn't appear to successfully get the
+         * data visible to the PGU, while wbinvd + agp_chipset_flush does.
+         */
+        if (IS_I865G(obj->dev)) {
+                wbinvd();
+                return;
+        }
+
         drm_clflush_pages(obj_priv->pages, obj->size / PAGE_SIZE);
 }
 
@@ -3111,7 +3127,7 @@ i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object *exec_list,
                 reloc_count += exec_list[i].relocation_count;
         }
 
-        *relocs = drm_calloc(reloc_count, sizeof(**relocs), DRM_MEM_DRIVER);
+        *relocs = drm_calloc_large(reloc_count, sizeof(**relocs));
         if (*relocs == NULL)
                 return -ENOMEM;
 
@@ -3125,8 +3141,7 @@ i915_gem_get_relocs_from_user(struct drm_i915_gem_exec_object *exec_list,
                                      exec_list[i].relocation_count *
                                      sizeof(**relocs));
                 if (ret != 0) {
-                        drm_free(*relocs, reloc_count * sizeof(**relocs),
-                                 DRM_MEM_DRIVER);
+                        drm_free_large(*relocs);
                         *relocs = NULL;
                         return -EFAULT;
                 }
@@ -3165,7 +3180,7 @@ i915_gem_put_relocs_to_user(struct drm_i915_gem_exec_object *exec_list,
         }
 
 err:
-        drm_free(relocs, reloc_count * sizeof(*relocs), DRM_MEM_DRIVER);
+        drm_free_large(relocs);
 
         return ret;
 }
@@ -3198,10 +3213,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
         /* Copy in the exec list from userland */
-        exec_list = drm_calloc(sizeof(*exec_list), args->buffer_count,
-                               DRM_MEM_DRIVER);
-        object_list = drm_calloc(sizeof(*object_list), args->buffer_count,
-                                 DRM_MEM_DRIVER);
+        exec_list = drm_calloc_large(sizeof(*exec_list), args->buffer_count);
+        object_list = drm_calloc_large(sizeof(*object_list), args->buffer_count);
         if (exec_list == NULL || object_list == NULL) {
                 DRM_ERROR("Failed to allocate exec or object list "
                           "for %d buffers\n",
@@ -3462,10 +3475,8 @@ err:
         }
 
 pre_mutex_err:
-        drm_free(object_list, sizeof(*object_list) * args->buffer_count,
-                 DRM_MEM_DRIVER);
-        drm_free(exec_list, sizeof(*exec_list) * args->buffer_count,
-                 DRM_MEM_DRIVER);
+        drm_free_large(object_list);
+        drm_free_large(exec_list);
         drm_free(cliprects, sizeof(*cliprects) * args->num_cliprects,
                  DRM_MEM_DRIVER);
 
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 52a059354e83..540dd336e6ec 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -213,7 +213,8 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
         if (tiling_mode == I915_TILING_NONE)
                 return true;
 
-        if (tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev))
+        if (!IS_I9XX(dev) ||
+            (tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev)))
                 tile_width = 128;
         else
                 tile_width = 512;
@@ -225,11 +226,18 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
                 if (stride / 128 > I965_FENCE_MAX_PITCH_VAL)
                         return false;
         } else if (IS_I9XX(dev)) {
-                if (stride / tile_width > I830_FENCE_MAX_PITCH_VAL ||
+                uint32_t pitch_val = ffs(stride / tile_width) - 1;
+
+                /* XXX: For Y tiling, FENCE_MAX_PITCH_VAL is actually 6 (8KB)
+                 * instead of 4 (2KB) on 945s.
+                 */
+                if (pitch_val > I915_FENCE_MAX_PITCH_VAL ||
                     size > (I830_FENCE_MAX_SIZE_VAL << 20))
                         return false;
         } else {
-                if (stride / 128 > I830_FENCE_MAX_PITCH_VAL ||
+                uint32_t pitch_val = ffs(stride / tile_width) - 1;
+
+                if (pitch_val > I830_FENCE_MAX_PITCH_VAL ||
                     size > (I830_FENCE_MAX_SIZE_VAL << 19))
                         return false;
         }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 15da44cf21b1..375569d01d01 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -190,7 +190,8 @@
 #define   I830_FENCE_SIZE_BITS(size)    ((ffs((size) >> 19) - 1) << 8)
 #define   I830_FENCE_PITCH_SHIFT        4
 #define   I830_FENCE_REG_VALID          (1<<0)
-#define   I830_FENCE_MAX_PITCH_VAL      0x10
+#define   I915_FENCE_MAX_PITCH_VAL      0x10
+#define   I830_FENCE_MAX_PITCH_VAL      6
 #define   I830_FENCE_MAX_SIZE_VAL       (1<<8)
 
 #define   I915_FENCE_START_MASK         0x0ff00000
@@ -1410,9 +1411,25 @@
 
 /* Cursor A & B regs */
 #define CURACNTR                0x70080
+/* Old style CUR*CNTR flags (desktop 8xx) */
+#define   CURSOR_ENABLE         0x80000000
+#define   CURSOR_GAMMA_ENABLE   0x40000000
+#define   CURSOR_STRIDE_MASK    0x30000000
+#define   CURSOR_FORMAT_SHIFT   24
+#define   CURSOR_FORMAT_MASK    (0x07 << CURSOR_FORMAT_SHIFT)
+#define   CURSOR_FORMAT_2C      (0x00 << CURSOR_FORMAT_SHIFT)
+#define   CURSOR_FORMAT_3C      (0x01 << CURSOR_FORMAT_SHIFT)
+#define   CURSOR_FORMAT_4C      (0x02 << CURSOR_FORMAT_SHIFT)
+#define   CURSOR_FORMAT_ARGB    (0x04 << CURSOR_FORMAT_SHIFT)
+#define   CURSOR_FORMAT_XRGB    (0x05 << CURSOR_FORMAT_SHIFT)
+/* New style CUR*CNTR flags */
+#define   CURSOR_MODE           0x27
 #define   CURSOR_MODE_DISABLE   0x00
 #define   CURSOR_MODE_64_32B_AX 0x07
 #define   CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX)
+#define   MCURSOR_PIPE_SELECT   (1 << 28)
+#define   MCURSOR_PIPE_A        0x00
+#define   MCURSOR_PIPE_B        (1 << 28)
 #define   MCURSOR_GAMMA_ENABLE  (1 << 26)
 #define CURABASE                0x70084
 #define CURAPOS                 0x70088
@@ -1420,6 +1437,7 @@
 #define   CURSOR_POS_SIGN       0x8000
 #define   CURSOR_X_SHIFT        0
 #define   CURSOR_Y_SHIFT        16
+#define CURSIZE                 0x700a0
 #define CURBCNTR                0x700c0
 #define CURBBASE                0x700c4
 #define CURBPOS                 0x700c8
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index fc28e2bbd542..9d78cff33b24 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -57,9 +57,43 @@ find_section(struct bdb_header *bdb, int section_id)
         return NULL;
 }
 
-/* Try to find panel data */
 static void
-parse_panel_data(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
+fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode,
+                        struct lvds_dvo_timing *dvo_timing)
+{
+        panel_fixed_mode->hdisplay = (dvo_timing->hactive_hi << 8) |
+                dvo_timing->hactive_lo;
+        panel_fixed_mode->hsync_start = panel_fixed_mode->hdisplay +
+                ((dvo_timing->hsync_off_hi << 8) | dvo_timing->hsync_off_lo);
+        panel_fixed_mode->hsync_end = panel_fixed_mode->hsync_start +
+                dvo_timing->hsync_pulse_width;
+        panel_fixed_mode->htotal = panel_fixed_mode->hdisplay +
+                ((dvo_timing->hblank_hi << 8) | dvo_timing->hblank_lo);
+
+        panel_fixed_mode->vdisplay = (dvo_timing->vactive_hi << 8) |
+                dvo_timing->vactive_lo;
+        panel_fixed_mode->vsync_start = panel_fixed_mode->vdisplay +
+                dvo_timing->vsync_off;
+        panel_fixed_mode->vsync_end = panel_fixed_mode->vsync_start +
+                dvo_timing->vsync_pulse_width;
+        panel_fixed_mode->vtotal = panel_fixed_mode->vdisplay +
+                ((dvo_timing->vblank_hi << 8) | dvo_timing->vblank_lo);
+        panel_fixed_mode->clock = dvo_timing->clock * 10;
+        panel_fixed_mode->type = DRM_MODE_TYPE_PREFERRED;
+
+        /* Some VBTs have bogus h/vtotal values */
+        if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal)
+                panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1;
+        if (panel_fixed_mode->vsync_end > panel_fixed_mode->vtotal)
+                panel_fixed_mode->vtotal = panel_fixed_mode->vsync_end + 1;
+
+        drm_mode_set_name(panel_fixed_mode);
+}
+
+/* Try to find integrated panel data */
+static void
+parse_lfp_panel_data(struct drm_i915_private *dev_priv,
+                            struct bdb_header *bdb)
 {
         struct bdb_lvds_options *lvds_options;
         struct bdb_lvds_lfp_data *lvds_lfp_data;
@@ -91,38 +125,45 @@ parse_panel_data(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
         panel_fixed_mode = drm_calloc(1, sizeof(*panel_fixed_mode),
                                       DRM_MEM_DRIVER);
 
-        panel_fixed_mode->hdisplay = (dvo_timing->hactive_hi << 8) |
-                dvo_timing->hactive_lo;
-        panel_fixed_mode->hsync_start = panel_fixed_mode->hdisplay +
-                ((dvo_timing->hsync_off_hi << 8) | dvo_timing->hsync_off_lo);
-        panel_fixed_mode->hsync_end = panel_fixed_mode->hsync_start +
-                dvo_timing->hsync_pulse_width;
-        panel_fixed_mode->htotal = panel_fixed_mode->hdisplay +
-                ((dvo_timing->hblank_hi << 8) | dvo_timing->hblank_lo);
+        fill_detail_timing_data(panel_fixed_mode, dvo_timing);
 
-        panel_fixed_mode->vdisplay = (dvo_timing->vactive_hi << 8) |
-                dvo_timing->vactive_lo;
-        panel_fixed_mode->vsync_start = panel_fixed_mode->vdisplay +
-                dvo_timing->vsync_off;
-        panel_fixed_mode->vsync_end = panel_fixed_mode->vsync_start +
-                dvo_timing->vsync_pulse_width;
-        panel_fixed_mode->vtotal = panel_fixed_mode->vdisplay +
-                ((dvo_timing->vblank_hi << 8) | dvo_timing->vblank_lo);
-        panel_fixed_mode->clock = dvo_timing->clock * 10;
-        panel_fixed_mode->type = DRM_MODE_TYPE_PREFERRED;
+        dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode;
 
-        /* Some VBTs have bogus h/vtotal values */
-        if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal)
-                panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1;
-        if (panel_fixed_mode->vsync_end > panel_fixed_mode->vtotal)
-                panel_fixed_mode->vtotal = panel_fixed_mode->vsync_end + 1;
+        DRM_DEBUG("Found panel mode in BIOS VBT tables:\n");
+        drm_mode_debug_printmodeline(panel_fixed_mode);
 
-        drm_mode_set_name(panel_fixed_mode);
+        return;
+}
+
+/* Try to find sdvo panel data */
+static void
+parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
+                      struct bdb_header *bdb)
+{
+        struct bdb_sdvo_lvds_options *sdvo_lvds_options;
+        struct lvds_dvo_timing *dvo_timing;
+        struct drm_display_mode *panel_fixed_mode;
 
-        dev_priv->vbt_mode = panel_fixed_mode;
+        dev_priv->sdvo_lvds_vbt_mode = NULL;
 
-        DRM_DEBUG("Found panel mode in BIOS VBT tables:\n");
-        drm_mode_debug_printmodeline(panel_fixed_mode);
+        sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
+        if (!sdvo_lvds_options)
+                return;
+
+        dvo_timing = find_section(bdb, BDB_SDVO_PANEL_DTDS);
+        if (!dvo_timing)
+                return;
+
+        panel_fixed_mode = drm_calloc(1, sizeof(*panel_fixed_mode),
+                                      DRM_MEM_DRIVER);
+
+        if (!panel_fixed_mode)
+                return;
+
+        fill_detail_timing_data(panel_fixed_mode,
+                        dvo_timing + sdvo_lvds_options->panel_type);
+
+        dev_priv->sdvo_lvds_vbt_mode = panel_fixed_mode;
 
         return;
 }
@@ -199,7 +240,8 @@ intel_init_bios(struct drm_device *dev)
 
         /* Grab useful general definitions */
         parse_general_features(dev_priv, bdb);
-        parse_panel_data(dev_priv, bdb);
+        parse_lfp_panel_data(dev_priv, bdb);
+        parse_sdvo_panel_data(dev_priv, bdb);
 
         pci_unmap_rom(pdev, bios);
 
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index de621aad85b5..8ca2cde15804 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -279,6 +279,23 @@ struct vch_bdb_22 {
         struct vch_panel_data panels[16];
 } __attribute__((packed));
 
+struct bdb_sdvo_lvds_options {
+        u8 panel_backlight;
+        u8 h40_set_panel_type;
+        u8 panel_type;
+        u8 ssc_clk_freq;
+        u16 als_low_trip;
+        u16 als_high_trip;
+        u8 sclalarcoeff_tab_row_num;
+        u8 sclalarcoeff_tab_row_size;
+        u8 coefficient[8];
+        u8 panel_misc_bits_1;
+        u8 panel_misc_bits_2;
+        u8 panel_misc_bits_3;
+        u8 panel_misc_bits_4;
+} __attribute__((packed));
+
+
 bool intel_init_bios(struct drm_device *dev);
 
 /*
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 19148c3df637..640f5158effc 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -198,9 +198,142 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
         return intel_ddc_probe(intel_output);
 }
 
+static enum drm_connector_status
+intel_crt_load_detect(struct drm_crtc *crtc, struct intel_output *intel_output)
+{
+        struct drm_encoder *encoder = &intel_output->enc;
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        uint32_t pipe = intel_crtc->pipe;
+        uint32_t save_bclrpat;
+        uint32_t save_vtotal;
+        uint32_t vtotal, vactive;
+        uint32_t vsample;
+        uint32_t vblank, vblank_start, vblank_end;
+        uint32_t dsl;
+        uint32_t bclrpat_reg;
+        uint32_t vtotal_reg;
+        uint32_t vblank_reg;
+        uint32_t vsync_reg;
+        uint32_t pipeconf_reg;
+        uint32_t pipe_dsl_reg;
+        uint8_t st00;
+        enum drm_connector_status status;
+
+        if (pipe == 0) {
+                bclrpat_reg = BCLRPAT_A;
+                vtotal_reg = VTOTAL_A;
+                vblank_reg = VBLANK_A;
+                vsync_reg = VSYNC_A;
+                pipeconf_reg = PIPEACONF;
+                pipe_dsl_reg = PIPEADSL;
+        } else {
+                bclrpat_reg = BCLRPAT_B;
+                vtotal_reg = VTOTAL_B;
+                vblank_reg = VBLANK_B;
+                vsync_reg = VSYNC_B;
+                pipeconf_reg = PIPEBCONF;
+                pipe_dsl_reg = PIPEBDSL;
+        }
+
+        save_bclrpat = I915_READ(bclrpat_reg);
+        save_vtotal = I915_READ(vtotal_reg);
+        vblank = I915_READ(vblank_reg);
+
+        vtotal = ((save_vtotal >> 16) & 0xfff) + 1;
+        vactive = (save_vtotal & 0x7ff) + 1;
+
+        vblank_start = (vblank & 0xfff) + 1;
+        vblank_end = ((vblank >> 16) & 0xfff) + 1;
+
+        /* Set the border color to purple. */
+        I915_WRITE(bclrpat_reg, 0x500050);
+
+        if (IS_I9XX(dev)) {
+                uint32_t pipeconf = I915_READ(pipeconf_reg);
+                I915_WRITE(pipeconf_reg, pipeconf | PIPECONF_FORCE_BORDER);
+                /* Wait for next Vblank to substitue
+                 * border color for Color info */
+                intel_wait_for_vblank(dev);
+                st00 = I915_READ8(VGA_MSR_WRITE);
+                status = ((st00 & (1 << 4)) != 0) ?
+                        connector_status_connected :
+                        connector_status_disconnected;
+
+                I915_WRITE(pipeconf_reg, pipeconf);
+        } else {
+                bool restore_vblank = false;
+                int count, detect;
+
+                /*
+                * If there isn't any border, add some.
+                * Yes, this will flicker
+                */
+                if (vblank_start <= vactive && vblank_end >= vtotal) {
+                        uint32_t vsync = I915_READ(vsync_reg);
+                        uint32_t vsync_start = (vsync & 0xffff) + 1;
+
+                        vblank_start = vsync_start;
+                        I915_WRITE(vblank_reg,
+                                   (vblank_start - 1) |
+                                   ((vblank_end - 1) << 16));
+                        restore_vblank = true;
+                }
+                /* sample in the vertical border, selecting the larger one */
+                if (vblank_start - vactive >= vtotal - vblank_end)
+                        vsample = (vblank_start + vactive) >> 1;
+                else
+                        vsample = (vtotal + vblank_end) >> 1;
+
+                /*
+                 * Wait for the border to be displayed
+                 */
+                while (I915_READ(pipe_dsl_reg) >= vactive)
+                        ;
+                while ((dsl = I915_READ(pipe_dsl_reg)) <= vsample)
+                        ;
+                /*
+                 * Watch ST00 for an entire scanline
+                 */
+                detect = 0;
+                count = 0;
+                do {
+                        count++;
+                        /* Read the ST00 VGA status register */
+                        st00 = I915_READ8(VGA_MSR_WRITE);
+                        if (st00 & (1 << 4))
+                                detect++;
+                } while ((I915_READ(pipe_dsl_reg) == dsl));
+
+                /* restore vblank if necessary */
+                if (restore_vblank)
+                        I915_WRITE(vblank_reg, vblank);
+                /*
+                 * If more than 3/4 of the scanline detected a monitor,
+                 * then it is assumed to be present. This works even on i830,
+                 * where there isn't any way to force the border color across
+                 * the screen
+                 */
+                status = detect * 4 > count * 3 ?
+                         connector_status_connected :
+                         connector_status_disconnected;
+        }
+
+        /* Restore previous settings */
+        I915_WRITE(bclrpat_reg, save_bclrpat);
+
+        return status;
+}
+
 static enum drm_connector_status intel_crt_detect(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
+        struct intel_output *intel_output = to_intel_output(connector);
+        struct drm_encoder *encoder = &intel_output->enc;
+        struct drm_crtc *crtc;
+        int dpms_mode;
+        enum drm_connector_status status;
 
         if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
                 if (intel_crt_detect_hotplug(connector))
@@ -212,8 +345,20 @@ static enum drm_connector_status intel_crt_detect(struct drm_connector *connecto
         if (intel_crt_detect_ddc(connector))
                 return connector_status_connected;
 
-        /* TODO use load detect */
-        return connector_status_unknown;
+        /* for pre-945g platforms use load detect */
+        if (encoder->crtc && encoder->crtc->enabled) {
+                status = intel_crt_load_detect(encoder->crtc, intel_output);
+        } else {
+                crtc = intel_get_load_detect_pipe(intel_output,
+                                                  NULL, &dpms_mode);
+                if (crtc) {
+                        status = intel_crt_load_detect(crtc, intel_output);
+                        intel_release_load_detect_pipe(intel_output, dpms_mode);
+                } else
+                        status = connector_status_unknown;
+        }
+
+        return status;
 }
 
 static void intel_crt_destroy(struct drm_connector *connector)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3387cf32f385..c9d6f10ba92e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1357,7 +1357,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
         int pipe = intel_crtc->pipe;
         uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
         uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp;
+        uint32_t temp = I915_READ(control);
         size_t addr;
         int ret;
 
@@ -1366,7 +1366,12 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
         /* if we want to turn off the cursor ignore width and height */
         if (!handle) {
                 DRM_DEBUG("cursor off\n");
-                temp = CURSOR_MODE_DISABLE;
+                if (IS_MOBILE(dev) || IS_I9XX(dev)) {
+                        temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
+                        temp |= CURSOR_MODE_DISABLE;
+                } else {
+                        temp &= ~(CURSOR_ENABLE | CURSOR_GAMMA_ENABLE);
+                }
                 addr = 0;
                 bo = NULL;
                 mutex_lock(&dev->struct_mutex);
@@ -1409,10 +1414,19 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
                 addr = obj_priv->phys_obj->handle->busaddr;
         }
 
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
+        if (!IS_I9XX(dev))
+                I915_WRITE(CURSIZE, (height << 12) | width);
+
+        /* Hooray for CUR*CNTR differences */
+        if (IS_MOBILE(dev) || IS_I9XX(dev)) {
+                temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
+                temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
+                temp |= (pipe << 28); /* Connect to correct pipe */
+        } else {
+                temp &= ~(CURSOR_FORMAT_MASK);
+                temp |= CURSOR_ENABLE;
+                temp |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE;
+        }
 
  finish:
         I915_WRITE(control, temp);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 439a86514993..53731f0ffcb5 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -511,10 +511,10 @@ void intel_lvds_init(struct drm_device *dev)
         }
 
         /* Failed to get EDID, what about VBT? */
-        if (dev_priv->vbt_mode) {
+        if (dev_priv->lfp_lvds_vbt_mode) {
                 mutex_lock(&dev->mode_config.mutex);
                 dev_priv->panel_fixed_mode =
-                        drm_mode_duplicate(dev, dev_priv->vbt_mode);
+                        drm_mode_duplicate(dev, dev_priv->lfp_lvds_vbt_mode);
                 mutex_unlock(&dev->mode_config.mutex);
                 if (dev_priv->panel_fixed_mode) {
                         dev_priv->panel_fixed_mode->type |=
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 9913651c1e17..f3ef6bfd8ffc 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -69,6 +69,10 @@ struct intel_sdvo_priv {
          * This is set if we treat the device as HDMI, instead of DVI.
          */
         bool is_hdmi;
+        /**
+         * This is set if we detect output of sdvo device as LVDS.
+         */
+        bool is_lvds;
 
         /**
          * Returned SDTV resolutions allowed for the current format, if the
@@ -1398,10 +1402,8 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
 static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 {
         struct intel_output *intel_output = to_intel_output(connector);
-        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
 
         /* set the bus switch and get the modes */
-        intel_sdvo_set_control_bus_switch(intel_output, sdvo_priv->ddc_bus);
         intel_ddc_get_modes(intel_output);
 
 #if 0
@@ -1543,6 +1545,37 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
                 }
 }
 
+static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
+{
+        struct intel_output *intel_output = to_intel_output(connector);
+        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+        struct drm_i915_private *dev_priv = connector->dev->dev_private;
+
+        /*
+         * Attempt to get the mode list from DDC.
+         * Assume that the preferred modes are
+         * arranged in priority order.
+         */
+        /* set the bus switch and get the modes */
+        intel_sdvo_set_control_bus_switch(intel_output, sdvo_priv->ddc_bus);
+        intel_ddc_get_modes(intel_output);
+        if (list_empty(&connector->probed_modes) == false)
+                return;
+
+        /* Fetch modes from VBT */
+        if (dev_priv->sdvo_lvds_vbt_mode != NULL) {
+                struct drm_display_mode *newmode;
+                newmode = drm_mode_duplicate(connector->dev,
+                                             dev_priv->sdvo_lvds_vbt_mode);
+                if (newmode != NULL) {
+                        /* Guarantee the mode is preferred */
+                        newmode->type = (DRM_MODE_TYPE_PREFERRED |
+                                         DRM_MODE_TYPE_DRIVER);
+                        drm_mode_probed_add(connector, newmode);
+                }
+        }
+}
+
 static int intel_sdvo_get_modes(struct drm_connector *connector)
 {
         struct intel_output *output = to_intel_output(connector);
@@ -1550,6 +1583,8 @@ static int intel_sdvo_get_modes(struct drm_connector *connector)
 
         if (sdvo_priv->is_tv)
                 intel_sdvo_get_tv_modes(connector);
+        else if (sdvo_priv->is_lvds == true)
+                intel_sdvo_get_lvds_modes(connector);
         else
                 intel_sdvo_get_ddc_modes(connector);
 
@@ -1564,6 +1599,9 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
 
         if (intel_output->i2c_bus)
                 intel_i2c_destroy(intel_output->i2c_bus);
+        if (intel_output->ddc_bus)
+                intel_i2c_destroy(intel_output->ddc_bus);
+
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
         kfree(intel_output);
@@ -1660,12 +1698,56 @@ intel_sdvo_get_digital_encoding_mode(struct intel_output *output)
         return true;
 }
 
+static struct intel_output *
+intel_sdvo_chan_to_intel_output(struct intel_i2c_chan *chan)
+{
+        struct drm_device *dev = chan->drm_dev;
+        struct drm_connector *connector;
+        struct intel_output *intel_output = NULL;
+
+        list_for_each_entry(connector,
+                        &dev->mode_config.connector_list, head) {
+                if (to_intel_output(connector)->ddc_bus == chan) {
+                        intel_output = to_intel_output(connector);
+                        break;
+                }
+        }
+        return intel_output;
+}
+
+static int intel_sdvo_master_xfer(struct i2c_adapter *i2c_adap,
+                                  struct i2c_msg msgs[], int num)
+{
+        struct intel_output *intel_output;
+        struct intel_sdvo_priv *sdvo_priv;
+        struct i2c_algo_bit_data *algo_data;
+        struct i2c_algorithm *algo;
+
+        algo_data = (struct i2c_algo_bit_data *)i2c_adap->algo_data;
+        intel_output =
+                intel_sdvo_chan_to_intel_output(
+                                (struct intel_i2c_chan *)(algo_data->data));
+        if (intel_output == NULL)
+                return -EINVAL;
+
+        sdvo_priv = intel_output->dev_priv;
+        algo = (struct i2c_algorithm *)intel_output->i2c_bus->adapter.algo;
+
+        intel_sdvo_set_control_bus_switch(intel_output, sdvo_priv->ddc_bus);
+        return algo->master_xfer(i2c_adap, msgs, num);
+}
+
+static struct i2c_algorithm intel_sdvo_i2c_bit_algo = {
+        .master_xfer    = intel_sdvo_master_xfer,
+};
+
 bool intel_sdvo_init(struct drm_device *dev, int output_device)
 {
         struct drm_connector *connector;
         struct intel_output *intel_output;
         struct intel_sdvo_priv *sdvo_priv;
         struct intel_i2c_chan *i2cbus = NULL;
+        struct intel_i2c_chan *ddcbus = NULL;
         int connector_type;
         u8 ch[0x40];
         int i;
@@ -1676,17 +1758,9 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 return false;
         }
 
-        connector = &intel_output->base;
-
-        drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
-                           DRM_MODE_CONNECTOR_Unknown);
-        drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
         sdvo_priv = (struct intel_sdvo_priv *)(intel_output + 1);
         intel_output->type = INTEL_OUTPUT_SDVO;
 
-        connector->interlace_allowed = 0;
-        connector->doublescan_allowed = 0;
-
         /* setup the DDC bus. */
         if (output_device == SDVOB)
                 i2cbus = intel_i2c_create(dev, GPIOE, "SDVOCTRL_E for SDVOB");
@@ -1694,7 +1768,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 i2cbus = intel_i2c_create(dev, GPIOE, "SDVOCTRL_E for SDVOC");
 
         if (!i2cbus)
-                goto err_connector;
+                goto err_inteloutput;
 
         sdvo_priv->i2c_bus = i2cbus;
 
@@ -1710,7 +1784,6 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
         intel_output->i2c_bus = i2cbus;
         intel_output->dev_priv = sdvo_priv;
 
-
         /* Read the regs to test if we can talk to the device */
         for (i = 0; i < 0x40; i++) {
                 if (!intel_sdvo_read_byte(intel_output, i, &ch[i])) {
@@ -1720,6 +1793,22 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 }
         }
 
+        /* setup the DDC bus. */
+        if (output_device == SDVOB)
+                ddcbus = intel_i2c_create(dev, GPIOE, "SDVOB DDC BUS");
+        else
+                ddcbus = intel_i2c_create(dev, GPIOE, "SDVOC DDC BUS");
+
+        if (ddcbus == NULL)
+                goto err_i2c;
+
+        intel_sdvo_i2c_bit_algo.functionality =
+                intel_output->i2c_bus->adapter.algo->functionality;
+        ddcbus->adapter.algo = &intel_sdvo_i2c_bit_algo;
+        intel_output->ddc_bus = ddcbus;
+
+        /* In defaut case sdvo lvds is false */
+        sdvo_priv->is_lvds = false;
         intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
 
         if (sdvo_priv->caps.output_flags &
@@ -1729,7 +1818,6 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 else
                         sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
 
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_TMDS;
                 connector_type = DRM_MODE_CONNECTOR_DVID;
 
@@ -1747,7 +1835,6 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
         {
                 sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_TVDAC;
                 connector_type = DRM_MODE_CONNECTOR_SVIDEO;
                 sdvo_priv->is_tv = true;
@@ -1756,30 +1843,28 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
         {
                 sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_DAC;
                 connector_type = DRM_MODE_CONNECTOR_VGA;
         }
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
         {
                 sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_DAC;
                 connector_type = DRM_MODE_CONNECTOR_VGA;
         }
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
         {
                 sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_LVDS;
                 connector_type = DRM_MODE_CONNECTOR_LVDS;
+                sdvo_priv->is_lvds = true;
         }
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
         {
                 sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
-                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_LVDS;
                 connector_type = DRM_MODE_CONNECTOR_LVDS;
+                sdvo_priv->is_lvds = true;
         }
         else
         {
@@ -1795,9 +1880,16 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                 goto err_i2c;
         }
 
+        connector = &intel_output->base;
+        drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
+                           connector_type);
+        drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
+        connector->interlace_allowed = 0;
+        connector->doublescan_allowed = 0;
+        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
+
         drm_encoder_init(dev, &intel_output->enc, &intel_sdvo_enc_funcs, encoder_type);
         drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
-        connector->connector_type = connector_type;
 
         drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
         drm_sysfs_connector_add(connector);
@@ -1829,14 +1921,13 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
                   sdvo_priv->caps.output_flags &
                         (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');
 
-        intel_output->ddc_bus = i2cbus;
-
         return true;
 
 err_i2c:
+        if (ddcbus != NULL)
+                intel_i2c_destroy(intel_output->ddc_bus);
         intel_i2c_destroy(intel_output->i2c_bus);
-err_connector:
-        drm_connector_cleanup(connector);
+err_inteloutput:
         kfree(intel_output);
 
         return false;
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index b5e3b2851698..a1787fdf5b9f 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -182,7 +182,7 @@ static struct platform_driver lm78_isa_driver = {
                 .name   = "lm78",
         },
         .probe          = lm78_isa_probe,
-        .remove         = lm78_isa_remove,
+        .remove         = __devexit_p(lm78_isa_remove),
 };
 
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 35dc38d3b2c5..6415a2e2ba87 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -696,7 +696,7 @@ void ide_timer_expiry (unsigned long data)
                 }
                 spin_lock_irq(&hwif->lock);
                 enable_irq(hwif->irq);
-                if (startstop == ide_stopped) {
+                if (startstop == ide_stopped && hwif->polling == 0) {
                         ide_unlock_port(hwif);
                         plug_device = 1;
                 }
@@ -868,7 +868,7 @@ irqreturn_t ide_intr (int irq, void *dev_id)
          * same irq as is currently being serviced here, and Linux
          * won't allow another of the same (on any CPU) until we return.
          */
-        if (startstop == ide_stopped) {
+        if (startstop == ide_stopped && hwif->polling == 0) {
                 BUG_ON(hwif->handler);
                 ide_unlock_port(hwif);
                 plug_device = 1;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index c19a221b1e18..06fe002116ec 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -206,8 +206,6 @@ EXPORT_SYMBOL_GPL(ide_in_drive_list);
 
 /*
  * Early UDMA66 devices don't set bit14 to 1, only bit13 is valid.
- * We list them here and depend on the device side cable detection for them.
- *
  * Some optical devices with the buggy firmwares have the same problem.
  */
 static const struct drive_list_entry ivb_list[] = {
@@ -251,10 +249,25 @@ u8 eighty_ninty_three(ide_drive_t *drive)
          * - force bit13 (80c cable present) check also for !ivb devices
          *   (unless the slave device is pre-ATA3)
          */
-        if ((id[ATA_ID_HW_CONFIG] & 0x4000) ||
-            (ivb && (id[ATA_ID_HW_CONFIG] & 0x2000)))
+        if (id[ATA_ID_HW_CONFIG] & 0x4000)
                 return 1;
 
+        if (ivb) {
+                const char *model = (char *)&id[ATA_ID_PROD];
+
+                if (strstr(model, "TSSTcorp CDDVDW SH-S202")) {
+                        /*
+                         * These ATAPI devices always report 80c cable
+                         * so we have to depend on the host in this case.
+                         */
+                        if (hwif->cbl == ATA_CBL_PATA80)
+                                return 1;
+                } else {
+                        /* Depend on the device side cable detection. */
+                        if (id[ATA_ID_HW_CONFIG] & 0x2000)
+                                return 1;
+                }
+        }
 no_80w:
         if (drive->dev_flags & IDE_DFLAG_UDMA33_WARNED)
                 return 0;
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 56ff8c46c7d1..2148df836ce7 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -31,24 +31,6 @@ void ide_toggle_bounce(ide_drive_t *drive, int on)
                 blk_queue_bounce_limit(drive->queue, addr);
 }
 
-static void ide_dump_opcode(ide_drive_t *drive)
-{
-        struct request *rq = drive->hwif->rq;
-        struct ide_cmd *cmd = NULL;
-
-        if (!rq)
-                return;
-
-        if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
-                cmd = rq->special;
-
-        printk(KERN_ERR "ide: failed opcode was: ");
-        if (cmd == NULL)
-                printk(KERN_CONT "unknown\n");
-        else
-                printk(KERN_CONT "0x%02x\n", cmd->tf.command);
-}
-
 u64 ide_get_lba_addr(struct ide_cmd *cmd, int lba48)
 {
         struct ide_taskfile *tf = &cmd->tf;
@@ -91,7 +73,7 @@ static void ide_dump_sector(ide_drive_t *drive)
 
 static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
 {
-        printk(KERN_ERR "{ ");
+        printk(KERN_CONT "{ ");
         if (err & ATA_ABORTED)
                 printk(KERN_CONT "DriveStatusError ");
         if (err & ATA_ICRC)
@@ -121,7 +103,7 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
 
 static void ide_dump_atapi_error(ide_drive_t *drive, u8 err)
 {
-        printk(KERN_ERR "{ ");
+        printk(KERN_CONT "{ ");
         if (err & ATAPI_ILI)
                 printk(KERN_CONT "IllegalLengthIndication ");
         if (err & ATAPI_EOM)
@@ -179,7 +161,10 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
                 else
                         ide_dump_atapi_error(drive, err);
         }
-        ide_dump_opcode(drive);
+
+        printk(KERN_ERR "%s: possibly failed opcode: 0x%02x\n",
+                drive->name, drive->hwif->cmd.tf.command);
+
         return err;
 }
 EXPORT_SYMBOL(ide_dump_status);
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index 61111fd27130..39d4e01f5c9c 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -33,6 +33,16 @@ static int ide_generic_all;		/* Set to claim all devices */
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
 
+static void netcell_quirkproc(ide_drive_t *drive)
+{
+        /* mark words 85-87 as valid */
+        drive->id[ATA_ID_CSF_DEFAULT] |= 0x4000;
+}
+
+static const struct ide_port_ops netcell_port_ops = {
+        .quirkproc              = netcell_quirkproc,
+};
+
 #define DECLARE_GENERIC_PCI_DEV(extra_flags) \
         { \
                 .name           = DRV_NAME, \
@@ -74,6 +84,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
 
         {       /* 6: Revolution */
                 .name           = DRV_NAME,
+                .port_ops       = &netcell_port_ops,
                 .host_flags     = IDE_HFLAG_CLEAR_SIMPLEX |
                                   IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_OFF_BOARD,
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 7f264ed1141b..c895ed52b2e8 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -295,7 +295,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
 
         timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;
 
-        if (ide_busy_sleep(hwif, timeout, use_altstatus))
+        if (ide_busy_sleep(drive, timeout, use_altstatus))
                 return 1;
 
         /* wait for IRQ and ATA_DRQ */
@@ -316,8 +316,9 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
         return rc;
 }
 
-int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
+int ide_busy_sleep(ide_drive_t *drive, unsigned long timeout, int altstatus)
 {
+        ide_hwif_t *hwif = drive->hwif;
         u8 stat;
 
         timeout += jiffies;
@@ -330,6 +331,8 @@ int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
                         return 0;
         } while (time_before(jiffies, timeout));
 
+        printk(KERN_ERR "%s: timeout in %s\n", drive->name, __func__);
+
         return 1;       /* drive timed-out */
 }
 
@@ -420,7 +423,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                         tp_ops->dev_select(drive);
                         msleep(50);
                         tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
-                        (void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
+                        (void)ide_busy_sleep(drive, WAIT_WORSTCASE, 0);
                         rc = ide_dev_read_id(drive, cmd, id);
                 }
 
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index 3ff7231e4858..028de26a25fe 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -67,6 +67,7 @@ static struct via_isa_bridge {
         u8 udma_mask;
         u8 flags;
 } via_isa_bridges[] = {
+        { "vx855",      PCI_DEVICE_ID_VIA_VX855,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
@@ -474,6 +475,7 @@ static const struct pci_device_id via_pci_tbl[] = {
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1),  0 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1),  0 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_CX700_IDE), 0 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_VX855_IDE), 0 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410),      1 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), 1 },
         { 0, },
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index bf740394d704..949c97ff57e3 100644
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -41,6 +41,10 @@ static int debug;
 module_param_named(debug, debug, uint, 0644);
 MODULE_PARM_DESC(debug, "Enable debug printks in this driver");
 
+static int forceload;
+module_param_named(forceload, forceload, uint, 0644);
+MODULE_PARM_DESC(debug, "Enable driver testing on unvalidated i5000");
+
 #define dprintk(fmt, arg...) \
         do { if (debug) printk(KERN_INFO I7300_PRINT fmt, ##arg); } while (0)
 
@@ -552,7 +556,7 @@ static int __init i7300_idle_init(void)
         cpus_clear(idle_cpumask);
         total_us = 0;
 
-        if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev))
+        if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev, forceload))
                 return -ENODEV;
 
         if (i7300_idle_thrt_save())
diff --git a/drivers/input/input.c b/drivers/input/input.c
index e54e002665b0..5d445f48789b 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -42,6 +42,7 @@ static unsigned int input_abs_bypass_init_data[] __initdata = {
         ABS_MT_POSITION_Y,
         ABS_MT_TOOL_TYPE,
         ABS_MT_BLOB_ID,
+        ABS_MT_TRACKING_ID,
         0
 };
 static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)];
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index e29cdc13a199..a28c06d686e1 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -107,7 +107,7 @@ static void amba_kmi_close(struct serio *io)
         clk_disable(kmi->clk);
 }
 
-static int amba_kmi_probe(struct amba_device *dev, void *id)
+static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct amba_kmi_port *kmi;
         struct serio *io;
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index 67248c31e19a..be5bbbb8ae4e 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -210,7 +210,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
         timeout = wait_event_timeout(ps2dev->wait,
                                      !(ps2dev->flags & PS2_FLAG_CMD1), timeout);
 
-        if (ps2dev->cmdcnt && timeout > 0) {
+        if (ps2dev->cmdcnt && !(ps2dev->flags & PS2_FLAG_CMD1)) {
 
                 timeout = ps2_adjust_timeout(ps2dev, command, timeout);
                 wait_event_timeout(ps2dev->wait,
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index f100c7f4c1db..6954f5500108 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -419,7 +419,7 @@ static int ucb1400_ts_remove(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int ucb1400_ts_resume(struct platform_device *dev)
 {
-        struct ucb1400_ts *ucb = platform_get_drvdata(dev);
+        struct ucb1400_ts *ucb = dev->dev.platform_data;
 
         if (ucb->ts_task) {
                 /*
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 1a83910f674f..eaf722fe309a 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -358,6 +358,16 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                         if (emulate_insn(cpu))
                                 return;
                 }
+                /* If KVM is active, the vmcall instruction triggers a
+                 * General Protection Fault.  Normally it triggers an
+                 * invalid opcode fault (6): */
+        case 6:
+                /* We need to check if ring == GUEST_PL and
+                 * faulting instruction == vmcall. */
+                if (is_hypercall(cpu)) {
+                        rewrite_hypercall(cpu);
+                        return;
+                }
                 break;
         case 14: /* We've intercepted a Page Fault. */
                 /* The Guest accessed a virtual address that wasn't mapped.
@@ -403,15 +413,6 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                  * up the pointer now to indicate a hypercall is pending. */
                 cpu->hcall = (struct hcall_args *)cpu->regs;
                 return;
-        case 6:
-                /* kvm hypercalls trigger an invalid opcode fault (6).
-                 * We need to check if ring == GUEST_PL and
-                 * faulting instruction == vmcall. */
-                if (is_hypercall(cpu)) {
-                        rewrite_hypercall(cpu);
-                        return;
-                }
-                break;
         }
 
         /* We didn't handle the trap, so it needs to go to the Guest. */
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 47c68bc75a17..56df1cee8fb3 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1097,14 +1097,12 @@ void bitmap_daemon_work(struct bitmap *bitmap)
         }
         bitmap->allclean = 1;
 
+        spin_lock_irqsave(&bitmap->lock, flags);
         for (j = 0; j < bitmap->chunks; j++) {
                 bitmap_counter_t *bmc;
-                spin_lock_irqsave(&bitmap->lock, flags);
-                if (!bitmap->filemap) {
+                if (!bitmap->filemap)
                         /* error or shutdown */
-                        spin_unlock_irqrestore(&bitmap->lock, flags);
                         break;
-                }
 
                 page = filemap_get_page(bitmap, j);
 
@@ -1121,6 +1119,8 @@ void bitmap_daemon_work(struct bitmap *bitmap)
                                         write_page(bitmap, page, 0);
                                         bitmap->allclean = 0;
                                 }
+                                spin_lock_irqsave(&bitmap->lock, flags);
+                                j |= (PAGE_BITS - 1);
                                 continue;
                         }
 
@@ -1181,9 +1181,10 @@ void bitmap_daemon_work(struct bitmap *bitmap)
                                         ext2_clear_bit(file_page_offset(j), paddr);
                                 kunmap_atomic(paddr, KM_USER0);
                         }
-                }
-                spin_unlock_irqrestore(&bitmap->lock, flags);
+                } else
+                        j |= PAGE_COUNTER_MASK;
         }
+        spin_unlock_irqrestore(&bitmap->lock, flags);
 
         /* now sync the final page */
         if (lastpage != NULL) {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index fccc8343a250..641b211fe3fe 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1375,6 +1375,9 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
 
         sb->raid_disks = cpu_to_le32(mddev->raid_disks);
         sb->size = cpu_to_le64(mddev->dev_sectors);
+        sb->chunksize = cpu_to_le32(mddev->chunk_size >> 9);
+        sb->level = cpu_to_le32(mddev->level);
+        sb->layout = cpu_to_le32(mddev->layout);
 
         if (mddev->bitmap && mddev->bitmap_file == NULL) {
                 sb->bitmap_offset = cpu_to_le32((__u32)mddev->bitmap_offset);
@@ -3303,7 +3306,9 @@ static ssize_t
 action_show(mddev_t *mddev, char *page)
 {
         char *type = "idle";
-        if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
+        if (test_bit(MD_RECOVERY_FROZEN, &mddev->recovery))
+                type = "frozen";
+        else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
             (!mddev->ro && test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))) {
                 if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))
                         type = "reshape";
@@ -3326,7 +3331,12 @@ action_store(mddev_t *mddev, const char *page, size_t len)
         if (!mddev->pers || !mddev->pers->sync_request)
                 return -EINVAL;
 
-        if (cmd_match(page, "idle")) {
+        if (cmd_match(page, "frozen"))
+                set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+        else
+                clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+
+        if (cmd_match(page, "idle") || cmd_match(page, "frozen")) {
                 if (mddev->sync_thread) {
                         set_bit(MD_RECOVERY_INTR, &mddev->recovery);
                         md_unregister_thread(mddev->sync_thread);
@@ -3680,7 +3690,7 @@ array_size_store(mddev_t *mddev, const char *buf, size_t len)
                 if (strict_blocks_to_sectors(buf, &sectors) < 0)
                         return -EINVAL;
                 if (mddev->pers && mddev->pers->size(mddev, 0, 0) < sectors)
-                        return -EINVAL;
+                        return -E2BIG;
 
                 mddev->external_size = 1;
         }
@@ -5557,7 +5567,7 @@ static struct block_device_operations md_fops =
         .owner          = THIS_MODULE,
         .open           = md_open,
         .release        = md_release,
-        .locked_ioctl   = md_ioctl,
+        .ioctl          = md_ioctl,
         .getgeo         = md_getgeo,
         .media_changed  = md_media_changed,
         .revalidate_disk= md_revalidate,
@@ -6352,12 +6362,13 @@ void md_do_sync(mddev_t *mddev)
 
                 skipped = 0;
 
-                if ((mddev->curr_resync > mddev->curr_resync_completed &&
-                     (mddev->curr_resync - mddev->curr_resync_completed)
-                    > (max_sectors >> 4)) ||
-                    (j - mddev->curr_resync_completed)*2
-                    >= mddev->resync_max - mddev->curr_resync_completed
-                        ) {
+                if (!test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) &&
+                    ((mddev->curr_resync > mddev->curr_resync_completed &&
+                      (mddev->curr_resync - mddev->curr_resync_completed)
+                      > (max_sectors >> 4)) ||
+                     (j - mddev->curr_resync_completed)*2
+                     >= mddev->resync_max - mddev->curr_resync_completed
+                            )) {
                         /* time to update curr_resync_completed */
                         blk_unplug(mddev->queue);
                         wait_event(mddev->recovery_wait,
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 4616bc3a6e71..5d400aef8d9b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3811,13 +3811,13 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
         safepos = conf->reshape_safe;
         sector_div(safepos, data_disks);
         if (mddev->delta_disks < 0) {
-                writepos -= reshape_sectors;
+                writepos -= min_t(sector_t, reshape_sectors, writepos);
                 readpos += reshape_sectors;
                 safepos += reshape_sectors;
         } else {
                 writepos += reshape_sectors;
-                readpos -= reshape_sectors;
-                safepos -= reshape_sectors;
+                readpos -= min_t(sector_t, reshape_sectors, readpos);
+                safepos -= min_t(sector_t, reshape_sectors, safepos);
         }
 
         /* 'writepos' is the most advanced device address we might write.
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 7793932a513b..11a6248cc1c1 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -443,7 +443,7 @@ static irqreturn_t pcf50633_irq(int irq, void *data)
         dev_dbg(pcf->dev, "pcf50633_irq\n");
 
         get_device(pcf->dev);
-        disable_irq(pcf->irq);
+        disable_irq_nosync(pcf->irq);
         schedule_work(&pcf->irq_work);
 
         return IRQ_HANDLED;
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index c2be3088e2e1..fe24079387c5 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -79,10 +79,6 @@ static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
                 /* Cache is CPU endian */
                 dest[i - reg] = be16_to_cpu(dest[i - reg]);
 
-                /* Satisfy non-volatile bits from cache */
-                dest[i - reg] &= wm8350_reg_io_map[i].vol;
-                dest[i - reg] |= wm8350->reg_cache[i];
-
                 /* Mask out non-readable bits */
                 dest[i - reg] &= wm8350_reg_io_map[i].readable;
         }
@@ -182,9 +178,6 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
                         (wm8350->reg_cache[i] & ~wm8350_reg_io_map[i].writable)
                         | src[i - reg];
 
-                /* Don't store volatile bits */
-                wm8350->reg_cache[i] &= ~wm8350_reg_io_map[i].vol;
-
                 src[i - reg] = cpu_to_be16(src[i - reg]);
         }
 
@@ -1261,7 +1254,6 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
                     (i < WM8350_CLOCK_CONTROL_1 || i > WM8350_AIF_TEST)) {
                         value = be16_to_cpu(wm8350->reg_cache[i]);
                         value &= wm8350_reg_io_map[i].readable;
-                        value &= ~wm8350_reg_io_map[i].vol;
                         wm8350->reg_cache[i] = value;
                 } else
                         wm8350->reg_cache[i] = reg_map[i];
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 3cf61ece71d7..348443bdb23b 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -119,7 +119,7 @@ enclosure_register(struct device *dev, const char *name, int components,
         edev->edev.class = &enclosure_class;
         edev->edev.parent = get_device(dev);
         edev->cb = cb;
-        dev_set_name(&edev->edev, name);
+        dev_set_name(&edev->edev, "%s", name);
         err = device_register(&edev->edev);
         if (err)
                 goto err;
@@ -255,8 +255,8 @@ enclosure_component_register(struct enclosure_device *edev,
         ecomp->number = number;
         cdev = &ecomp->cdev;
         cdev->parent = get_device(&edev->edev);
-        if (name)
-                dev_set_name(cdev, name);
+        if (name && name[0])
+                dev_set_name(cdev, "%s", name);
         else
                 dev_set_name(cdev, "%u", number);
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 36875dcfa492..7d4febdab286 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data)
         mod_timer(&host->timer, jiffies + HZ);
 }
 
-static int __devinit mmci_probe(struct amba_device *dev, void *id)
+static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct mmc_platform_data *plat = dev->dev.platform_data;
         struct mmci_host *host;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 62dee54af0a5..43976aa4dbb1 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
                 /* Calculate flash page address; use block erase (for speed) if
                  * we're at a block boundary and need to erase the whole block.
                  */
-                pageaddr = div_u64(instr->len, priv->page_size);
+                pageaddr = div_u64(instr->addr, priv->page_size);
                 do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize;
                 pageaddr = pageaddr << priv->page_offset;
 
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index f3548d048014..40c26080ecda 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -831,6 +831,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                 break;
 
         case NAND_CMD_READID:
+                host->col_addr = 0;
                 send_read_id(host);
                 break;
 
@@ -867,6 +868,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         mtd->priv = this;
         mtd->owner = THIS_MODULE;
         mtd->dev.parent = &pdev->dev;
+        mtd->name = "mxc_nand";
 
         /* 50 us command delay time */
         this->chip_delay = 5;
@@ -882,8 +884,10 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         this->verify_buf = mxc_nand_verify_buf;
 
         host->clk = clk_get(&pdev->dev, "nfc");
-        if (IS_ERR(host->clk))
+        if (IS_ERR(host->clk)) {
+                err = PTR_ERR(host->clk);
                 goto eclk;
+        }
 
         clk_enable(host->clk);
         host->clk_act = 1;
@@ -896,7 +900,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
 
         host->regs = ioremap(res->start, res->end - res->start + 1);
         if (!host->regs) {
-                err = -EIO;
+                err = -ENOMEM;
                 goto eres;
         }
 
@@ -1011,30 +1015,35 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct mtd_info *info = platform_get_drvdata(pdev);
+        struct mtd_info *mtd = platform_get_drvdata(pdev);
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
         int ret = 0;
 
         DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
-        if (info)
-                ret = info->suspend(info);
-
-        /* Disable the NFC clock */
-        clk_disable(nfc_clk);   /* FIXME */
+        if (mtd) {
+                ret = mtd->suspend(mtd);
+                /* Disable the NFC clock */
+                clk_disable(host->clk);
+        }
 
         return ret;
 }
 
 static int mxcnd_resume(struct platform_device *pdev)
 {
-        struct mtd_info *info = platform_get_drvdata(pdev);
+        struct mtd_info *mtd = platform_get_drvdata(pdev);
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
         int ret = 0;
 
         DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
-        /* Enable the NFC clock */
-        clk_enable(nfc_clk);    /* FIXME */
 
-        if (info)
-                info->resume(info);
+        if (mtd) {
+                /* Enable the NFC clock */
+                clk_enable(host->clk);
+                mtd->resume(mtd);
+        }
 
         return ret;
 }
@@ -1055,13 +1064,7 @@ static struct platform_driver mxcnd_driver = {
 
 static int __init mxc_nd_init(void)
 {
-        /* Register the device driver structure. */
-        pr_info("MXC MTD nand Driver\n");
-        if (platform_driver_probe(&mxcnd_driver, mxcnd_probe) != 0) {
-                printk(KERN_ERR "Driver register failed for mxcnd_driver\n");
-                return -ENODEV;
-        }
-        return 0;
+        return platform_driver_probe(&mxcnd_driver, mxcnd_probe);
 }
 
 static void __exit mxc_nd_cleanup(void)
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index f0e99d4c066b..242257b19441 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -78,16 +78,20 @@ void free_cpu_buffers(void)
         op_ring_buffer_write = NULL;
 }
 
+#define RB_EVENT_HDR_SIZE 4
+
 int alloc_cpu_buffers(void)
 {
         int i;
 
         unsigned long buffer_size = oprofile_cpu_buffer_size;
+        unsigned long byte_size = buffer_size * (sizeof(struct op_sample) +
+                                                 RB_EVENT_HDR_SIZE);
 
-        op_ring_buffer_read = ring_buffer_alloc(buffer_size, OP_BUFFER_FLAGS);
+        op_ring_buffer_read = ring_buffer_alloc(byte_size, OP_BUFFER_FLAGS);
         if (!op_ring_buffer_read)
                 goto fail;
-        op_ring_buffer_write = ring_buffer_alloc(buffer_size, OP_BUFFER_FLAGS);
+        op_ring_buffer_write = ring_buffer_alloc(byte_size, OP_BUFFER_FLAGS);
         if (!op_ring_buffer_write)
                 goto fail;
 
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index e6a7e847ee80..ea31a452b153 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -352,8 +352,8 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
         unsigned long port;
 
         if (!dev->irq) {
-                printk(KERN_WARNING "IRQ not found for parallel device at 0x%lx\n",
-                        dev->hpa.start);
+                printk(KERN_WARNING "IRQ not found for parallel device at 0x%llx\n",
+                        (unsigned long long)dev->hpa.start);
                 return -ENODEV;
         }
 
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index 4fc168b70095..e68d5f20ffb3 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -129,7 +129,6 @@ struct acpiphp_func {
         struct acpiphp_bridge *bridge;  /* Ejectable PCI-to-PCI bridge */
 
         struct list_head sibling;
-        struct pci_dev *pci_dev;
         struct notifier_block nb;
         acpi_handle     handle;
 
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index a33794d9e0dc..3a6064bce561 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -32,9 +32,6 @@
 
 /*
  * Lifetime rules for pci_dev:
- *  - The one in acpiphp_func has its refcount elevated by pci_get_slot()
- *    when the driver is loaded or when an insertion event occurs.  It loses
- *    a refcount when its ejected or the driver unloads.
  *  - The one in acpiphp_bridge has its refcount elevated by pci_get_slot()
  *    when the bridge is scanned and it loses a refcount when the bridge
  *    is removed.
@@ -130,6 +127,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         unsigned long long adr, sun;
         int device, function, retval;
         struct pci_bus *pbus = bridge->pci_bus;
+        struct pci_dev *pdev;
 
         if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
                 return AE_OK;
@@ -213,10 +211,10 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         newfunc->slot = slot;
         list_add_tail(&newfunc->sibling, &slot->funcs);
 
-        /* associate corresponding pci_dev */
-        newfunc->pci_dev = pci_get_slot(pbus, PCI_DEVFN(device, function));
-        if (newfunc->pci_dev) {
+        pdev = pci_get_slot(pbus, PCI_DEVFN(device, function));
+        if (pdev) {
                 slot->flags |= (SLOT_ENABLED | SLOT_POWEREDON);
+                pci_dev_put(pdev);
         }
 
         if (is_dock_device(handle)) {
@@ -617,7 +615,6 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
                                 if (ACPI_FAILURE(status))
                                         err("failed to remove notify handler\n");
                         }
-                        pci_dev_put(func->pci_dev);
                         list_del(list);
                         kfree(func);
                 }
@@ -1101,22 +1098,24 @@ static int __ref enable_device(struct acpiphp_slot *slot)
         pci_enable_bridges(bus);
         pci_bus_add_devices(bus);
 
-        /* associate pci_dev to our representation */
         list_for_each (l, &slot->funcs) {
                 func = list_entry(l, struct acpiphp_func, sibling);
-                func->pci_dev = pci_get_slot(bus, PCI_DEVFN(slot->device,
-                                                        func->function));
-                if (!func->pci_dev)
+                dev = pci_get_slot(bus, PCI_DEVFN(slot->device,
+                                                  func->function));
+                if (!dev)
                         continue;
 
-                if (func->pci_dev->hdr_type != PCI_HEADER_TYPE_BRIDGE &&
-                    func->pci_dev->hdr_type != PCI_HEADER_TYPE_CARDBUS)
+                if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE &&
+                    dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) {
+                        pci_dev_put(dev);
                         continue;
+                }
 
                 status = find_p2p_bridge(func->handle, (u32)1, bus, NULL);
                 if (ACPI_FAILURE(status))
                         warn("find_p2p_bridge failed (error code = 0x%x)\n",
                                 status);
+                pci_dev_put(dev);
         }
 
         slot->flags |= SLOT_ENABLED;
@@ -1142,17 +1141,14 @@ static void disable_bridges(struct pci_bus *bus)
  */
 static int disable_device(struct acpiphp_slot *slot)
 {
-        int retval = 0;
         struct acpiphp_func *func;
-        struct list_head *l;
+        struct pci_dev *pdev;
 
         /* is this slot already disabled? */
         if (!(slot->flags & SLOT_ENABLED))
                 goto err_exit;
 
-        list_for_each (l, &slot->funcs) {
-                func = list_entry(l, struct acpiphp_func, sibling);
-
+        list_for_each_entry(func, &slot->funcs, sibling) {
                 if (func->bridge) {
                         /* cleanup p2p bridges under this P2P bridge */
                         cleanup_p2p_bridge(func->bridge->handle,
@@ -1160,35 +1156,28 @@ static int disable_device(struct acpiphp_slot *slot)
                         func->bridge = NULL;
                 }
 
-                if (func->pci_dev) {
-                        pci_stop_bus_device(func->pci_dev);
-                        if (func->pci_dev->subordinate) {
-                                disable_bridges(func->pci_dev->subordinate);
-                                pci_disable_device(func->pci_dev);
+                pdev = pci_get_slot(slot->bridge->pci_bus,
+                                    PCI_DEVFN(slot->device, func->function));
+                if (pdev) {
+                        pci_stop_bus_device(pdev);
+                        if (pdev->subordinate) {
+                                disable_bridges(pdev->subordinate);
+                                pci_disable_device(pdev);
                         }
+                        pci_remove_bus_device(pdev);
+                        pci_dev_put(pdev);
                 }
         }
 
-        list_for_each (l, &slot->funcs) {
-                func = list_entry(l, struct acpiphp_func, sibling);
-
+        list_for_each_entry(func, &slot->funcs, sibling) {
                 acpiphp_unconfigure_ioapics(func->handle);
                 acpiphp_bus_trim(func->handle);
-                /* try to remove anyway.
-                 * acpiphp_bus_add might have been failed */
-
-                if (!func->pci_dev)
-                        continue;
-
-                pci_remove_bus_device(func->pci_dev);
-                pci_dev_put(func->pci_dev);
-                func->pci_dev = NULL;
         }
 
         slot->flags &= (~SLOT_ENABLED);
 
- err_exit:
-        return retval;
+err_exit:
+        return 0;
 }
 
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 34bf0fdf5047..1a91bf9687af 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -557,7 +557,8 @@ static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
         } else {
                 error = -ENODEV;
                 /* Fall back to PCI_D0 if native PM is not supported */
-                pci_update_current_state(dev, PCI_D0);
+                if (!dev->pm_cap)
+                        dev->current_state = PCI_D0;
         }
 
         return error;
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 72b15495183c..c6628f5a0af7 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -497,7 +497,7 @@ static struct platform_driver da903x_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = da903x_regulator_probe,
-        .remove         = da903x_regulator_remove,
+        .remove         = __devexit_p(da903x_regulator_remove),
 };
 
 static int __init da903x_regulator_init(void)
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 826153552157..aaf1f75fa293 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -102,7 +102,7 @@ static const struct rtc_class_ops pl030_ops = {
         .set_alarm      = pl030_set_alarm,
 };
 
-static int pl030_probe(struct amba_device *dev, void *id)
+static int pl030_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct pl030_rtc *rtc;
         int ret;
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 333eec689d2f..451fc13784d1 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -127,7 +127,7 @@ static int pl031_remove(struct amba_device *adev)
         return 0;
 }
 
-static int pl031_probe(struct amba_device *adev, void *id)
+static int pl031_probe(struct amba_device *adev, struct amba_id *id)
 {
         int ret;
         struct pl031_local *ldata;
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 8b7983aba8f7..36c21b19e5d7 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1978,7 +1978,8 @@ static void twa_unmap_scsi_data(TW_Device_Extension *tw_dev, int request_id)
 {
         struct scsi_cmnd *cmd = tw_dev->srb[request_id];
 
-        scsi_dma_unmap(cmd);
+        if (cmd->SCp.phase == TW_PHASE_SGLIST)
+                scsi_dma_unmap(cmd);
 } /* End twa_unmap_scsi_data() */
 
 /* scsi_host_template initializer */
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index c03f1d2c9e2e..faa0fcfed71e 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -6,7 +6,7 @@
                      Arnaldo Carvalho de Melo <acme@conectiva.com.br>
                      Brad Strand <linux@3ware.com>
 
-   Copyright (C) 1999-2007 3ware Inc.
+   Copyright (C) 1999-2009 3ware Inc.
 
    Kernel compatiblity By:      Andre Hedrick <andre@suse.com>
    Non-Copyright (C) 2000       Andre Hedrick <andre@suse.com>
@@ -1294,7 +1294,8 @@ static void tw_unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)
 {
         dprintk(KERN_WARNING "3w-xxxx: tw_unmap_scsi_data()\n");
 
-        scsi_dma_unmap(cmd);
+        if (cmd->SCp.phase == TW_PHASE_SGLIST)
+                scsi_dma_unmap(cmd);
 } /* End tw_unmap_scsi_data() */
 
 /* This function will reset a device extension */
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 8e71e5e122b3..a5a2ba2561d9 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -6,7 +6,7 @@
                      Arnaldo Carvalho de Melo <acme@conectiva.com.br>
                      Brad Strand <linux@3ware.com>
 
-   Copyright (C) 1999-2007 3ware Inc.
+   Copyright (C) 1999-2009 3ware Inc.
 
    Kernel compatiblity By:      Andre Hedrick <andre@suse.com>
    Non-Copyright (C) 2000       Andre Hedrick <andre@suse.com>
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 8ed2990c826e..fb2740789b68 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -628,6 +628,17 @@ config FCOE
         ---help---
           Fibre Channel over Ethernet module
 
+config FCOE_FNIC
+        tristate "Cisco FNIC Driver"
+        depends on PCI && X86
+        select LIBFC
+        help
+          This is support for the Cisco PCI-Express FCoE HBA.
+
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/scsi/scsi.txt>.
+          The module will be called fnic.
+
 config SCSI_DMX3191D
         tristate "DMX3191D SCSI support"
         depends on PCI && SCSI
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index e7c861ac417d..a5049cfb40ed 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_SCSI_DH)		+= device_handler/
 obj-$(CONFIG_LIBFC)             += libfc/
 obj-$(CONFIG_LIBFCOE)           += fcoe/
 obj-$(CONFIG_FCOE)              += fcoe/
+obj-$(CONFIG_FCOE_FNIC)         += fnic/
 obj-$(CONFIG_ISCSI_TCP)         += libiscsi.o   libiscsi_tcp.o iscsi_tcp.o
 obj-$(CONFIG_INFINIBAND_ISER)   += libiscsi.o
 obj-$(CONFIG_SCSI_A4000T)       += 53c700.o     a4000t.o
diff --git a/drivers/scsi/fnic/Makefile b/drivers/scsi/fnic/Makefile
new file mode 100644
index 000000000000..37c3440bc17c
--- /dev/null
+++ b/drivers/scsi/fnic/Makefile
@@ -0,0 +1,15 @@
+obj-$(CONFIG_FCOE_FNIC) += fnic.o
+
+fnic-y  := \
+        fnic_attrs.o \
+        fnic_isr.o \
+        fnic_main.o \
+        fnic_res.o \
+        fnic_fcs.o \
+        fnic_scsi.o \
+        vnic_cq.o \
+        vnic_dev.o \
+        vnic_intr.o \
+        vnic_rq.o \
+        vnic_wq_copy.o \
+        vnic_wq.o
diff --git a/drivers/scsi/fnic/cq_desc.h b/drivers/scsi/fnic/cq_desc.h
new file mode 100644
index 000000000000..d1225cf6320e
--- /dev/null
+++ b/drivers/scsi/fnic/cq_desc.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _CQ_DESC_H_
+#define _CQ_DESC_H_
+
+/*
+ * Completion queue descriptor types
+ */
+enum cq_desc_types {
+        CQ_DESC_TYPE_WQ_ENET = 0,
+        CQ_DESC_TYPE_DESC_COPY = 1,
+        CQ_DESC_TYPE_WQ_EXCH = 2,
+        CQ_DESC_TYPE_RQ_ENET = 3,
+        CQ_DESC_TYPE_RQ_FCP = 4,
+};
+
+/* Completion queue descriptor: 16B
+ *
+ * All completion queues have this basic layout.  The
+ * type_specfic area is unique for each completion
+ * queue type.
+ */
+struct cq_desc {
+        __le16 completed_index;
+        __le16 q_number;
+        u8 type_specfic[11];
+        u8 type_color;
+};
+
+#define CQ_DESC_TYPE_BITS        4
+#define CQ_DESC_TYPE_MASK        ((1 << CQ_DESC_TYPE_BITS) - 1)
+#define CQ_DESC_COLOR_MASK       1
+#define CQ_DESC_COLOR_SHIFT      7
+#define CQ_DESC_Q_NUM_BITS       10
+#define CQ_DESC_Q_NUM_MASK       ((1 << CQ_DESC_Q_NUM_BITS) - 1)
+#define CQ_DESC_COMP_NDX_BITS    12
+#define CQ_DESC_COMP_NDX_MASK    ((1 << CQ_DESC_COMP_NDX_BITS) - 1)
+
+static inline void cq_desc_dec(const struct cq_desc *desc_arg,
+        u8 *type, u8 *color, u16 *q_number, u16 *completed_index)
+{
+        const struct cq_desc *desc = desc_arg;
+        const u8 type_color = desc->type_color;
+
+        *color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK;
+
+        /*
+         * Make sure color bit is read from desc *before* other fields
+         * are read from desc.  Hardware guarantees color bit is last
+         * bit (byte) written.  Adding the rmb() prevents the compiler
+         * and/or CPU from reordering the reads which would potentially
+         * result in reading stale values.
+         */
+
+        rmb();
+
+        *type = type_color & CQ_DESC_TYPE_MASK;
+        *q_number = le16_to_cpu(desc->q_number) & CQ_DESC_Q_NUM_MASK;
+        *completed_index = le16_to_cpu(desc->completed_index) &
+                CQ_DESC_COMP_NDX_MASK;
+}
+
+#endif /* _CQ_DESC_H_ */
diff --git a/drivers/scsi/fnic/cq_enet_desc.h b/drivers/scsi/fnic/cq_enet_desc.h
new file mode 100644
index 000000000000..a9fa26f82ddd
--- /dev/null
+++ b/drivers/scsi/fnic/cq_enet_desc.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _CQ_ENET_DESC_H_
+#define _CQ_ENET_DESC_H_
+
+#include "cq_desc.h"
+
+/* Ethernet completion queue descriptor: 16B */
+struct cq_enet_wq_desc {
+        __le16 completed_index;
+        __le16 q_number;
+        u8 reserved[11];
+        u8 type_color;
+};
+
+static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc,
+        u8 *type, u8 *color, u16 *q_number, u16 *completed_index)
+{
+        cq_desc_dec((struct cq_desc *)desc, type,
+                color, q_number, completed_index);
+}
+
+/* Completion queue descriptor: Ethernet receive queue, 16B */
+struct cq_enet_rq_desc {
+        __le16 completed_index_flags;
+        __le16 q_number_rss_type_flags;
+        __le32 rss_hash;
+        __le16 bytes_written_flags;
+        __le16 vlan;
+        __le16 checksum_fcoe;
+        u8 flags;
+        u8 type_color;
+};
+
+#define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT          (0x1 << 12)
+#define CQ_ENET_RQ_DESC_FLAGS_FCOE                  (0x1 << 13)
+#define CQ_ENET_RQ_DESC_FLAGS_EOP                   (0x1 << 14)
+#define CQ_ENET_RQ_DESC_FLAGS_SOP                   (0x1 << 15)
+
+#define CQ_ENET_RQ_DESC_RSS_TYPE_BITS               4
+#define CQ_ENET_RQ_DESC_RSS_TYPE_MASK \
+        ((1 << CQ_ENET_RQ_DESC_RSS_TYPE_BITS) - 1)
+#define CQ_ENET_RQ_DESC_RSS_TYPE_NONE               0
+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv4               1
+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv4           2
+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6               3
+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6           4
+#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6_EX            5
+#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6_EX        6
+
+#define CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC         (0x1 << 14)
+
+#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS          14
+#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK \
+        ((1 << CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS) - 1)
+#define CQ_ENET_RQ_DESC_FLAGS_TRUNCATED             (0x1 << 14)
+#define CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED         (0x1 << 15)
+
+#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               4
+#define CQ_ENET_RQ_DESC_FCOE_SOF_MASK \
+        ((1 << CQ_ENET_RQ_DESC_FCOE_SOF_BITS) - 1)
+#define CQ_ENET_RQ_DESC_FCOE_EOF_BITS               8
+#define CQ_ENET_RQ_DESC_FCOE_EOF_MASK \
+        ((1 << CQ_ENET_RQ_DESC_FCOE_EOF_BITS) - 1)
+#define CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT              8
+
+#define CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK       (0x1 << 0)
+#define CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK              (0x1 << 0)
+#define CQ_ENET_RQ_DESC_FLAGS_UDP                   (0x1 << 1)
+#define CQ_ENET_RQ_DESC_FCOE_ENC_ERROR              (0x1 << 1)
+#define CQ_ENET_RQ_DESC_FLAGS_TCP                   (0x1 << 2)
+#define CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK          (0x1 << 3)
+#define CQ_ENET_RQ_DESC_FLAGS_IPV6                  (0x1 << 4)
+#define CQ_ENET_RQ_DESC_FLAGS_IPV4                  (0x1 << 5)
+#define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT         (0x1 << 6)
+#define CQ_ENET_RQ_DESC_FLAGS_FCS_OK                (0x1 << 7)
+
+static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
+        u8 *type, u8 *color, u16 *q_number, u16 *completed_index,
+        u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,
+        u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,
+        u8 *vlan_stripped, u16 *vlan, u16 *checksum, u8 *fcoe_sof,
+        u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,
+        u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,
+        u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)
+{
+        u16 completed_index_flags = le16_to_cpu(desc->completed_index_flags);
+        u16 q_number_rss_type_flags =
+                le16_to_cpu(desc->q_number_rss_type_flags);
+        u16 bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);
+
+        cq_desc_dec((struct cq_desc *)desc, type,
+                color, q_number, completed_index);
+
+        *ingress_port = (completed_index_flags &
+                CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;
+        *fcoe = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_FCOE) ?
+                1 : 0;
+        *eop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_EOP) ?
+                1 : 0;
+        *sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ?
+                1 : 0;
+
+        *rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) &
+                CQ_ENET_RQ_DESC_RSS_TYPE_MASK);
+        *csum_not_calc = (q_number_rss_type_flags &
+                CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;
+
+        *rss_hash = le32_to_cpu(desc->rss_hash);
+
+        *bytes_written = bytes_written_flags &
+                CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
+        *packet_error = (bytes_written_flags &
+                CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;
+        *vlan_stripped = (bytes_written_flags &
+                CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;
+
+        *vlan = le16_to_cpu(desc->vlan);
+
+        if (*fcoe) {
+                *fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &
+                        CQ_ENET_RQ_DESC_FCOE_SOF_MASK);
+                *fcoe_fc_crc_ok = (desc->flags &
+                        CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;
+                *fcoe_enc_error = (desc->flags &
+                        CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;
+                *fcoe_eof = (u8)((desc->checksum_fcoe >>
+                        CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &
+                        CQ_ENET_RQ_DESC_FCOE_EOF_MASK);
+                *checksum = 0;
+        } else {
+                *fcoe_sof = 0;
+                *fcoe_fc_crc_ok = 0;
+                *fcoe_enc_error = 0;
+                *fcoe_eof = 0;
+                *checksum = le16_to_cpu(desc->checksum_fcoe);
+        }
+
+        *tcp_udp_csum_ok =
+                (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;
+        *udp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;
+        *tcp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;
+        *ipv4_csum_ok =
+                (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;
+        *ipv6 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;
+        *ipv4 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;
+        *ipv4_fragment =
+                (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;
+        *fcs_ok = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;
+}
+
+#endif /* _CQ_ENET_DESC_H_ */
diff --git a/drivers/scsi/fnic/cq_exch_desc.h b/drivers/scsi/fnic/cq_exch_desc.h
new file mode 100644
index 000000000000..501660cfe228
--- /dev/null
+++ b/drivers/scsi/fnic/cq_exch_desc.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _CQ_EXCH_DESC_H_
+#define _CQ_EXCH_DESC_H_
+
+#include "cq_desc.h"
+
+/* Exchange completion queue descriptor: 16B */
+struct cq_exch_wq_desc {
+        u16 completed_index;
+        u16 q_number;
+        u16 exchange_id;
+        u8  tmpl;
+        u8  reserved0;
+        u32 reserved1;
+        u8  exch_status;
+        u8  reserved2[2];
+        u8  type_color;
+};
+
+#define CQ_EXCH_WQ_STATUS_BITS      2
+#define CQ_EXCH_WQ_STATUS_MASK      ((1 << CQ_EXCH_WQ_STATUS_BITS) - 1)
+
+enum cq_exch_status_types {
+        CQ_EXCH_WQ_STATUS_TYPE_COMPLETE = 0,
+        CQ_EXCH_WQ_STATUS_TYPE_ABORT = 1,
+        CQ_EXCH_WQ_STATUS_TYPE_SGL_EOF = 2,
+        CQ_EXCH_WQ_STATUS_TYPE_TMPL_ERR = 3,
+};
+
+static inline void cq_exch_wq_desc_dec(struct cq_exch_wq_desc *desc_ptr,
+                                       u8  *type,
+                                       u8  *color,
+                                       u16 *q_number,
+                                       u16 *completed_index,
+                                       u8  *exch_status)
+{
+        cq_desc_dec((struct cq_desc *)desc_ptr, type,
+                    color, q_number, completed_index);
+        *exch_status = desc_ptr->exch_status & CQ_EXCH_WQ_STATUS_MASK;
+}
+
+struct cq_fcp_rq_desc {
+        u16 completed_index_eop_sop_prt;
+        u16 q_number;
+        u16 exchange_id;
+        u16 tmpl;
+        u16 bytes_written;
+        u16 vlan;
+        u8  sof;
+        u8  eof;
+        u8  fcs_fer_fck;
+        u8  type_color;
+};
+
+#define CQ_FCP_RQ_DESC_FLAGS_SOP                (1 << 15)
+#define CQ_FCP_RQ_DESC_FLAGS_EOP                (1 << 14)
+#define CQ_FCP_RQ_DESC_FLAGS_PRT                (1 << 12)
+#define CQ_FCP_RQ_DESC_TMPL_MASK                0x1f
+#define CQ_FCP_RQ_DESC_BYTES_WRITTEN_MASK       0x3fff
+#define CQ_FCP_RQ_DESC_PACKET_ERR_SHIFT         14
+#define CQ_FCP_RQ_DESC_PACKET_ERR_MASK (1 << CQ_FCP_RQ_DESC_PACKET_ERR_SHIFT)
+#define CQ_FCP_RQ_DESC_VS_STRIPPED_SHIFT        15
+#define CQ_FCP_RQ_DESC_VS_STRIPPED_MASK (1 << CQ_FCP_RQ_DESC_VS_STRIPPED_SHIFT)
+#define CQ_FCP_RQ_DESC_FC_CRC_OK_MASK           0x1
+#define CQ_FCP_RQ_DESC_FCOE_ERR_SHIFT           1
+#define CQ_FCP_RQ_DESC_FCOE_ERR_MASK (1 << CQ_FCP_RQ_DESC_FCOE_ERR_SHIFT)
+#define CQ_FCP_RQ_DESC_FCS_OK_SHIFT             7
+#define CQ_FCP_RQ_DESC_FCS_OK_MASK (1 << CQ_FCP_RQ_DESC_FCS_OK_SHIFT)
+
+static inline void cq_fcp_rq_desc_dec(struct cq_fcp_rq_desc *desc_ptr,
+                                      u8  *type,
+                                      u8  *color,
+                                      u16 *q_number,
+                                      u16 *completed_index,
+                                      u8  *eop,
+                                      u8  *sop,
+                                      u8  *fck,
+                                      u16 *exchange_id,
+                                      u16 *tmpl,
+                                      u32 *bytes_written,
+                                      u8  *sof,
+                                      u8  *eof,
+                                      u8  *ingress_port,
+                                      u8  *packet_err,
+                                      u8  *fcoe_err,
+                                      u8  *fcs_ok,
+                                      u8  *vlan_stripped,
+                                      u16 *vlan)
+{
+        cq_desc_dec((struct cq_desc *)desc_ptr, type,
+                    color, q_number, completed_index);
+        *eop = (desc_ptr->completed_index_eop_sop_prt &
+                CQ_FCP_RQ_DESC_FLAGS_EOP) ? 1 : 0;
+        *sop = (desc_ptr->completed_index_eop_sop_prt &
+                CQ_FCP_RQ_DESC_FLAGS_SOP) ? 1 : 0;
+        *ingress_port =
+                (desc_ptr->completed_index_eop_sop_prt &
+                 CQ_FCP_RQ_DESC_FLAGS_PRT) ? 1 : 0;
+        *exchange_id = desc_ptr->exchange_id;
+        *tmpl = desc_ptr->tmpl & CQ_FCP_RQ_DESC_TMPL_MASK;
+        *bytes_written =
+                desc_ptr->bytes_written & CQ_FCP_RQ_DESC_BYTES_WRITTEN_MASK;
+        *packet_err =
+                (desc_ptr->bytes_written & CQ_FCP_RQ_DESC_PACKET_ERR_MASK) >>
+                CQ_FCP_RQ_DESC_PACKET_ERR_SHIFT;
+        *vlan_stripped =
+                (desc_ptr->bytes_written & CQ_FCP_RQ_DESC_VS_STRIPPED_MASK) >>
+                CQ_FCP_RQ_DESC_VS_STRIPPED_SHIFT;
+        *vlan = desc_ptr->vlan;
+        *sof = desc_ptr->sof;
+        *fck = desc_ptr->fcs_fer_fck & CQ_FCP_RQ_DESC_FC_CRC_OK_MASK;
+        *fcoe_err = (desc_ptr->fcs_fer_fck & CQ_FCP_RQ_DESC_FCOE_ERR_MASK) >>
+                CQ_FCP_RQ_DESC_FCOE_ERR_SHIFT;
+        *eof = desc_ptr->eof;
+        *fcs_ok =
+                (desc_ptr->fcs_fer_fck & CQ_FCP_RQ_DESC_FCS_OK_MASK) >>
+                CQ_FCP_RQ_DESC_FCS_OK_SHIFT;
+}
+
+struct cq_sgl_desc {
+        u16 exchange_id;
+        u16 q_number;
+        u32 active_burst_offset;
+        u32 tot_data_bytes;
+        u16 tmpl;
+        u8  sgl_err;
+        u8  type_color;
+};
+
+enum cq_sgl_err_types {
+        CQ_SGL_ERR_NO_ERROR = 0,
+        CQ_SGL_ERR_OVERFLOW,         /* data ran beyond end of SGL */
+        CQ_SGL_ERR_SGL_LCL_ADDR_ERR, /* sgl access to local vnic addr illegal*/
+        CQ_SGL_ERR_ADDR_RSP_ERR,     /* sgl address error */
+        CQ_SGL_ERR_DATA_RSP_ERR,     /* sgl data rsp error */
+        CQ_SGL_ERR_CNT_ZERO_ERR,     /* SGL count is 0 */
+        CQ_SGL_ERR_CNT_MAX_ERR,      /* SGL count is larger than supported */
+        CQ_SGL_ERR_ORDER_ERR,        /* frames recv on both ports, order err */
+        CQ_SGL_ERR_DATA_LCL_ADDR_ERR,/* sgl data buf to local vnic addr ill */
+        CQ_SGL_ERR_HOST_CQ_ERR,      /* host cq entry to local vnic addr ill */
+};
+
+#define CQ_SGL_SGL_ERR_MASK             0x1f
+#define CQ_SGL_TMPL_MASK                0x1f
+
+static inline void cq_sgl_desc_dec(struct cq_sgl_desc *desc_ptr,
+                                   u8  *type,
+                                   u8  *color,
+                                   u16 *q_number,
+                                   u16 *exchange_id,
+                                   u32 *active_burst_offset,
+                                   u32 *tot_data_bytes,
+                                   u16 *tmpl,
+                                   u8  *sgl_err)
+{
+        /* Cheat a little by assuming exchange_id is the same as completed
+           index */
+        cq_desc_dec((struct cq_desc *)desc_ptr, type, color, q_number,
+                    exchange_id);
+        *active_burst_offset = desc_ptr->active_burst_offset;
+        *tot_data_bytes = desc_ptr->tot_data_bytes;
+        *tmpl = desc_ptr->tmpl & CQ_SGL_TMPL_MASK;
+        *sgl_err = desc_ptr->sgl_err & CQ_SGL_SGL_ERR_MASK;
+}
+
+#endif /* _CQ_EXCH_DESC_H_ */
diff --git a/drivers/scsi/fnic/fcpio.h b/drivers/scsi/fnic/fcpio.h
new file mode 100644
index 000000000000..12d770d885c5
--- /dev/null
+++ b/drivers/scsi/fnic/fcpio.h
@@ -0,0 +1,780 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FCPIO_H_
+#define _FCPIO_H_
+
+#include <linux/if_ether.h>
+
+/*
+ * This header file includes all of the data structures used for
+ * communication by the host driver to the fcp firmware.
+ */
+
+/*
+ * Exchange and sequence id space allocated to the host driver
+ */
+#define FCPIO_HOST_EXCH_RANGE_START         0x1000
+#define FCPIO_HOST_EXCH_RANGE_END           0x1fff
+#define FCPIO_HOST_SEQ_ID_RANGE_START       0x80
+#define FCPIO_HOST_SEQ_ID_RANGE_END         0xff
+
+/*
+ * Command entry type
+ */
+enum fcpio_type {
+        /*
+         * Initiator request types
+         */
+        FCPIO_ICMND_16 = 0x1,
+        FCPIO_ICMND_32,
+        FCPIO_ICMND_CMPL,
+        FCPIO_ITMF,
+        FCPIO_ITMF_CMPL,
+
+        /*
+         * Target request types
+         */
+        FCPIO_TCMND_16 = 0x11,
+        FCPIO_TCMND_32,
+        FCPIO_TDATA,
+        FCPIO_TXRDY,
+        FCPIO_TRSP,
+        FCPIO_TDRSP_CMPL,
+        FCPIO_TTMF,
+        FCPIO_TTMF_ACK,
+        FCPIO_TABORT,
+        FCPIO_TABORT_CMPL,
+
+        /*
+         * Misc request types
+         */
+        FCPIO_ACK = 0x20,
+        FCPIO_RESET,
+        FCPIO_RESET_CMPL,
+        FCPIO_FLOGI_REG,
+        FCPIO_FLOGI_REG_CMPL,
+        FCPIO_ECHO,
+        FCPIO_ECHO_CMPL,
+        FCPIO_LUNMAP_CHNG,
+        FCPIO_LUNMAP_REQ,
+        FCPIO_LUNMAP_REQ_CMPL,
+        FCPIO_FLOGI_FIP_REG,
+        FCPIO_FLOGI_FIP_REG_CMPL,
+};
+
+/*
+ * Header status codes from the firmware
+ */
+enum fcpio_status {
+        FCPIO_SUCCESS = 0,              /* request was successful */
+
+        /*
+         * If a request to the firmware is rejected, the original request
+         * header will be returned with the status set to one of the following:
+         */
+        FCPIO_INVALID_HEADER,    /* header contains invalid data */
+        FCPIO_OUT_OF_RESOURCE,   /* out of resources to complete request */
+        FCPIO_INVALID_PARAM,     /* some parameter in request is invalid */
+        FCPIO_REQ_NOT_SUPPORTED, /* request type is not supported */
+        FCPIO_IO_NOT_FOUND,      /* requested I/O was not found */
+
+        /*
+         * Once a request is processed, the firmware will usually return
+         * a cmpl message type.  In cases where errors occurred,
+         * the header status field would be filled in with one of the following:
+         */
+        FCPIO_ABORTED = 0x41,     /* request was aborted */
+        FCPIO_TIMEOUT,            /* request was timed out */
+        FCPIO_SGL_INVALID,        /* request was aborted due to sgl error */
+        FCPIO_MSS_INVALID,        /* request was aborted due to mss error */
+        FCPIO_DATA_CNT_MISMATCH,  /* recv/sent more/less data than exp. */
+        FCPIO_FW_ERR,             /* request was terminated due to fw error */
+        FCPIO_ITMF_REJECTED,      /* itmf req was rejected by remote node */
+        FCPIO_ITMF_FAILED,        /* itmf req was failed by remote node */
+        FCPIO_ITMF_INCORRECT_LUN, /* itmf req targeted incorrect LUN */
+        FCPIO_CMND_REJECTED,      /* request was invalid and rejected */
+        FCPIO_NO_PATH_AVAIL,      /* no paths to the lun was available */
+        FCPIO_PATH_FAILED,        /* i/o sent to current path failed */
+        FCPIO_LUNMAP_CHNG_PEND,   /* i/o rejected due to lunmap change */
+};
+
+/*
+ * The header command tag.  All host requests will use the "tag" field
+ * to mark commands with a unique tag.  When the firmware responds to
+ * a host request, it will copy the tag field into the response.
+ *
+ * The only firmware requests that will use the rx_id/ox_id fields instead
+ * of the tag field will be the target command and target task management
+ * requests.  These two requests do not have corresponding host requests
+ * since they come directly from the FC initiator on the network.
+ */
+struct fcpio_tag {
+        union {
+                u32 req_id;
+                struct {
+                        u16 rx_id;
+                        u16 ox_id;
+                } ex_id;
+        } u;
+};
+
+static inline void
+fcpio_tag_id_enc(struct fcpio_tag *tag, u32 id)
+{
+        tag->u.req_id = id;
+}
+
+static inline void
+fcpio_tag_id_dec(struct fcpio_tag *tag, u32 *id)
+{
+        *id = tag->u.req_id;
+}
+
+static inline void
+fcpio_tag_exid_enc(struct fcpio_tag *tag, u16 ox_id, u16 rx_id)
+{
+        tag->u.ex_id.rx_id = rx_id;
+        tag->u.ex_id.ox_id = ox_id;
+}
+
+static inline void
+fcpio_tag_exid_dec(struct fcpio_tag *tag, u16 *ox_id, u16 *rx_id)
+{
+        *rx_id = tag->u.ex_id.rx_id;
+        *ox_id = tag->u.ex_id.ox_id;
+}
+
+/*
+ * The header for an fcpio request, whether from the firmware or from the
+ * host driver
+ */
+struct fcpio_header {
+        u8            type;           /* enum fcpio_type */
+        u8            status;         /* header status entry */
+        u16           _resvd;         /* reserved */
+        struct fcpio_tag    tag;      /* header tag */
+};
+
+static inline void
+fcpio_header_enc(struct fcpio_header *hdr,
+                 u8 type, u8 status,
+                 struct fcpio_tag tag)
+{
+        hdr->type = type;
+        hdr->status = status;
+        hdr->_resvd = 0;
+        hdr->tag = tag;
+}
+
+static inline void
+fcpio_header_dec(struct fcpio_header *hdr,
+                 u8 *type, u8 *status,
+                 struct fcpio_tag *tag)
+{
+        *type = hdr->type;
+        *status = hdr->status;
+        *tag = hdr->tag;
+}
+
+#define CDB_16      16
+#define CDB_32      32
+#define LUN_ADDRESS 8
+
+/*
+ * fcpio_icmnd_16: host -> firmware request
+ *
+ * used for sending out an initiator SCSI 16-byte command
+ */
+struct fcpio_icmnd_16 {
+        u32       lunmap_id;            /* index into lunmap table */
+        u8        special_req_flags;    /* special exchange request flags */
+        u8        _resvd0[3];           /* reserved */
+        u32       sgl_cnt;              /* scatter-gather list count */
+        u32       sense_len;            /* sense buffer length */
+        u64       sgl_addr;             /* scatter-gather list addr */
+        u64       sense_addr;           /* sense buffer address */
+        u8        crn;                  /* SCSI Command Reference No. */
+        u8        pri_ta;               /* SCSI Priority and Task attribute */
+        u8        _resvd1;              /* reserved: should be 0 */
+        u8        flags;                /* command flags */
+        u8        scsi_cdb[CDB_16];     /* SCSI Cmnd Descriptor Block */
+        u32       data_len;             /* length of data expected */
+        u8        lun[LUN_ADDRESS];     /* FC vNIC only: LUN address */
+        u8        _resvd2;              /* reserved */
+        u8        d_id[3];              /* FC vNIC only: Target D_ID */
+        u16       mss;                  /* FC vNIC only: max burst */
+        u16       _resvd3;              /* reserved */
+        u32       r_a_tov;              /* FC vNIC only: Res. Alloc Timeout */
+        u32       e_d_tov;              /* FC vNIC only: Err Detect Timeout */
+};
+
+/*
+ * Special request flags
+ */
+#define FCPIO_ICMND_SRFLAG_RETRY 0x01   /* Enable Retry handling on exchange */
+
+/*
+ * Priority/Task Attribute settings
+ */
+#define FCPIO_ICMND_PTA_SIMPLE      0   /* simple task attribute */
+#define FCPIO_ICMND_PTA_HEADQ       1   /* head of queue task attribute */
+#define FCPIO_ICMND_PTA_ORDERED     2   /* ordered task attribute */
+#define FCPIO_ICMND_PTA_ACA         4   /* auto contingent allegiance */
+#define FCPIO_ICMND_PRI_SHIFT       3   /* priority field starts in bit 3 */
+
+/*
+ * Command flags
+ */
+#define FCPIO_ICMND_RDDATA      0x02    /* read data */
+#define FCPIO_ICMND_WRDATA      0x01    /* write data */
+
+/*
+ * fcpio_icmnd_32: host -> firmware request
+ *
+ * used for sending out an initiator SCSI 32-byte command
+ */
+struct fcpio_icmnd_32 {
+        u32   lunmap_id;              /* index into lunmap table */
+        u8    special_req_flags;      /* special exchange request flags */
+        u8    _resvd0[3];             /* reserved */
+        u32   sgl_cnt;                /* scatter-gather list count */
+        u32   sense_len;              /* sense buffer length */
+        u64   sgl_addr;               /* scatter-gather list addr */
+        u64   sense_addr;             /* sense buffer address */
+        u8    crn;                    /* SCSI Command Reference No. */
+        u8    pri_ta;                 /* SCSI Priority and Task attribute */
+        u8    _resvd1;                /* reserved: should be 0 */
+        u8    flags;                  /* command flags */
+        u8    scsi_cdb[CDB_32];       /* SCSI Cmnd Descriptor Block */
+        u32   data_len;               /* length of data expected */
+        u8    lun[LUN_ADDRESS];       /* FC vNIC only: LUN address */
+        u8    _resvd2;                /* reserved */
+        u8    d_id[3];                /* FC vNIC only: Target D_ID */
+        u16   mss;                    /* FC vNIC only: max burst */
+        u16   _resvd3;                /* reserved */
+        u32   r_a_tov;                /* FC vNIC only: Res. Alloc Timeout */
+        u32   e_d_tov;                /* FC vNIC only: Error Detect Timeout */
+};
+
+/*
+ * fcpio_itmf: host -> firmware request
+ *
+ * used for requesting the firmware to abort a request and/or send out
+ * a task management function
+ *
+ * The t_tag field is only needed when the request type is ABT_TASK.
+ */
+struct fcpio_itmf {
+        u32   lunmap_id;              /* index into lunmap table */
+        u32   tm_req;                 /* SCSI Task Management request */
+        u32   t_tag;                  /* header tag of fcpio to be aborted */
+        u32   _resvd;                 /* _reserved */
+        u8    lun[LUN_ADDRESS];       /* FC vNIC only: LUN address */
+        u8    _resvd1;                /* reserved */
+        u8    d_id[3];                /* FC vNIC only: Target D_ID */
+        u32   r_a_tov;                /* FC vNIC only: R_A_TOV in msec */
+        u32   e_d_tov;                /* FC vNIC only: E_D_TOV in msec */
+};
+
+/*
+ * Task Management request
+ */
+enum fcpio_itmf_tm_req_type {
+        FCPIO_ITMF_ABT_TASK_TERM = 0x01,    /* abort task and terminate */
+        FCPIO_ITMF_ABT_TASK,                /* abort task and issue abts */
+        FCPIO_ITMF_ABT_TASK_SET,            /* abort task set */
+        FCPIO_ITMF_CLR_TASK_SET,            /* clear task set */
+        FCPIO_ITMF_LUN_RESET,               /* logical unit reset task mgmt */
+        FCPIO_ITMF_CLR_ACA,                 /* Clear ACA condition */
+};
+
+/*
+ * fcpio_tdata: host -> firmware request
+ *
+ * used for requesting the firmware to send out a read data transfer for a
+ * target command
+ */
+struct fcpio_tdata {
+        u16   rx_id;                  /* FC rx_id of target command */
+        u16   flags;                  /* command flags */
+        u32   rel_offset;             /* data sequence relative offset */
+        u32   sgl_cnt;                /* scatter-gather list count */
+        u32   data_len;               /* length of data expected to send */
+        u64   sgl_addr;               /* scatter-gather list address */
+};
+
+/*
+ * Command flags
+ */
+#define FCPIO_TDATA_SCSI_RSP    0x01    /* send a scsi resp. after last frame */
+
+/*
+ * fcpio_txrdy: host -> firmware request
+ *
+ * used for requesting the firmware to send out a write data transfer for a
+ * target command
+ */
+struct fcpio_txrdy {
+        u16   rx_id;                  /* FC rx_id of target command */
+        u16   _resvd0;                /* reserved */
+        u32   rel_offset;             /* data sequence relative offset */
+        u32   sgl_cnt;                /* scatter-gather list count */
+        u32   data_len;               /* length of data expected to send */
+        u64   sgl_addr;               /* scatter-gather list address */
+};
+
+/*
+ * fcpio_trsp: host -> firmware request
+ *
+ * used for requesting the firmware to send out a response for a target
+ * command
+ */
+struct fcpio_trsp {
+        u16   rx_id;                  /* FC rx_id of target command */
+        u16   _resvd0;                /* reserved */
+        u32   sense_len;              /* sense data buffer length */
+        u64   sense_addr;             /* sense data buffer address */
+        u16   _resvd1;                /* reserved */
+        u8    flags;                  /* response request flags */
+        u8    scsi_status;            /* SCSI status */
+        u32   residual;               /* SCSI data residual value of I/O */
+};
+
+/*
+ * resposnse request flags
+ */
+#define FCPIO_TRSP_RESID_UNDER  0x08   /* residual is valid and is underflow */
+#define FCPIO_TRSP_RESID_OVER   0x04   /* residual is valid and is overflow */
+
+/*
+ * fcpio_ttmf_ack: host -> firmware response
+ *
+ * used by the host to indicate to the firmware it has received and processed
+ * the target tmf request
+ */
+struct fcpio_ttmf_ack {
+        u16   rx_id;                  /* FC rx_id of target command */
+        u16   _resvd0;                /* reserved */
+        u32   tmf_status;             /* SCSI task management status */
+};
+
+/*
+ * fcpio_tabort: host -> firmware request
+ *
+ * used by the host to request the firmware to abort a target request that was
+ * received by the firmware
+ */
+struct fcpio_tabort {
+        u16   rx_id;                  /* rx_id of the target request */
+};
+
+/*
+ * fcpio_reset: host -> firmware request
+ *
+ * used by the host to signal a reset of the driver to the firmware
+ * and to request firmware to clean up all outstanding I/O
+ */
+struct fcpio_reset {
+        u32   _resvd;
+};
+
+enum fcpio_flogi_reg_format_type {
+        FCPIO_FLOGI_REG_DEF_DEST = 0,    /* Use the oui | s_id mac format */
+        FCPIO_FLOGI_REG_GW_DEST,         /* Use the fixed gateway mac */
+};
+
+/*
+ * fcpio_flogi_reg: host -> firmware request
+ *
+ * fc vnic only
+ * used by the host to notify the firmware of the lif's s_id
+ * and destination mac address format
+ */
+struct fcpio_flogi_reg {
+        u8 format;
+        u8 s_id[3];                     /* FC vNIC only: Source S_ID */
+        u8 gateway_mac[ETH_ALEN];       /* Destination gateway mac */
+        u16 _resvd;
+        u32 r_a_tov;                    /* R_A_TOV in msec */
+        u32 e_d_tov;                    /* E_D_TOV in msec */
+};
+
+/*
+ * fcpio_echo: host -> firmware request
+ *
+ * sends a heartbeat echo request to the firmware
+ */
+struct fcpio_echo {
+        u32 _resvd;
+};
+
+/*
+ * fcpio_lunmap_req: host -> firmware request
+ *
+ * scsi vnic only
+ * sends a request to retrieve the lunmap table for scsi vnics
+ */
+struct fcpio_lunmap_req {
+        u64 addr;                     /* address of the buffer */
+        u32 len;                      /* len of the buffer */
+};
+
+/*
+ * fcpio_flogi_fip_reg: host -> firmware request
+ *
+ * fc vnic only
+ * used by the host to notify the firmware of the lif's s_id
+ * and destination mac address format
+ */
+struct fcpio_flogi_fip_reg {
+        u8    _resvd0;
+        u8     s_id[3];               /* FC vNIC only: Source S_ID */
+        u8     fcf_mac[ETH_ALEN];     /* FCF Target destination mac */
+        u16   _resvd1;
+        u32   r_a_tov;                /* R_A_TOV in msec */
+        u32   e_d_tov;                /* E_D_TOV in msec */
+        u8    ha_mac[ETH_ALEN];       /* Host adapter source mac */
+        u16   _resvd2;
+};
+
+/*
+ * Basic structure for all fcpio structures that are sent from the host to the
+ * firmware.  They are 128 bytes per structure.
+ */
+#define FCPIO_HOST_REQ_LEN      128     /* expected length of host requests */
+
+struct fcpio_host_req {
+        struct fcpio_header hdr;
+
+        union {
+                /*
+                 * Defines space needed for request
+                 */
+                u8 buf[FCPIO_HOST_REQ_LEN - sizeof(struct fcpio_header)];
+
+                /*
+                 * Initiator host requests
+                 */
+                struct fcpio_icmnd_16               icmnd_16;
+                struct fcpio_icmnd_32               icmnd_32;
+                struct fcpio_itmf                   itmf;
+
+                /*
+                 * Target host requests
+                 */
+                struct fcpio_tdata                  tdata;
+                struct fcpio_txrdy                  txrdy;
+                struct fcpio_trsp                   trsp;
+                struct fcpio_ttmf_ack               ttmf_ack;
+                struct fcpio_tabort                 tabort;
+
+                /*
+                 * Misc requests
+                 */
+                struct fcpio_reset                  reset;
+                struct fcpio_flogi_reg              flogi_reg;
+                struct fcpio_echo                   echo;
+                struct fcpio_lunmap_req             lunmap_req;
+                struct fcpio_flogi_fip_reg          flogi_fip_reg;
+        } u;
+};
+
+/*
+ * fcpio_icmnd_cmpl: firmware -> host response
+ *
+ * used for sending the host a response to an initiator command
+ */
+struct fcpio_icmnd_cmpl {
+        u8    _resvd0[6];             /* reserved */
+        u8    flags;                  /* response flags */
+        u8    scsi_status;            /* SCSI status */
+        u32   residual;               /* SCSI data residual length */
+        u32   sense_len;              /* SCSI sense length */
+};
+
+/*
+ * response flags
+ */
+#define FCPIO_ICMND_CMPL_RESID_UNDER    0x08    /* resid under and valid */
+#define FCPIO_ICMND_CMPL_RESID_OVER     0x04    /* resid over and valid */
+
+/*
+ * fcpio_itmf_cmpl: firmware -> host response
+ *
+ * used for sending the host a response for a itmf request
+ */
+struct fcpio_itmf_cmpl {
+        u32    _resvd;                /* reserved */
+};
+
+/*
+ * fcpio_tcmnd_16: firmware -> host request
+ *
+ * used by the firmware to notify the host of an incoming target SCSI 16-Byte
+ * request
+ */
+struct fcpio_tcmnd_16 {
+        u8    lun[LUN_ADDRESS];       /* FC vNIC only: LUN address */
+        u8    crn;                    /* SCSI Command Reference No. */
+        u8    pri_ta;                 /* SCSI Priority and Task attribute */
+        u8    _resvd2;                /* reserved: should be 0 */
+        u8    flags;                  /* command flags */
+        u8    scsi_cdb[CDB_16];       /* SCSI Cmnd Descriptor Block */
+        u32   data_len;               /* length of data expected */
+        u8    _resvd1;                /* reserved */
+        u8    s_id[3];                /* FC vNIC only: Source S_ID */
+};
+
+/*
+ * Priority/Task Attribute settings
+ */
+#define FCPIO_TCMND_PTA_SIMPLE      0   /* simple task attribute */
+#define FCPIO_TCMND_PTA_HEADQ       1   /* head of queue task attribute */
+#define FCPIO_TCMND_PTA_ORDERED     2   /* ordered task attribute */
+#define FCPIO_TCMND_PTA_ACA         4   /* auto contingent allegiance */
+#define FCPIO_TCMND_PRI_SHIFT       3   /* priority field starts in bit 3 */
+
+/*
+ * Command flags
+ */
+#define FCPIO_TCMND_RDDATA      0x02    /* read data */
+#define FCPIO_TCMND_WRDATA      0x01    /* write data */
+
+/*
+ * fcpio_tcmnd_32: firmware -> host request
+ *
+ * used by the firmware to notify the host of an incoming target SCSI 32-Byte
+ * request
+ */
+struct fcpio_tcmnd_32 {
+        u8    lun[LUN_ADDRESS];       /* FC vNIC only: LUN address */
+        u8    crn;                    /* SCSI Command Reference No. */
+        u8    pri_ta;                 /* SCSI Priority and Task attribute */
+        u8    _resvd2;                /* reserved: should be 0 */
+        u8    flags;                  /* command flags */
+        u8    scsi_cdb[CDB_32];       /* SCSI Cmnd Descriptor Block */
+        u32   data_len;               /* length of data expected */
+        u8    _resvd0;                /* reserved */
+        u8    s_id[3];                /* FC vNIC only: Source S_ID */
+};
+
+/*
+ * fcpio_tdrsp_cmpl: firmware -> host response
+ *
+ * used by the firmware to notify the host of a response to a host target
+ * command
+ */
+struct fcpio_tdrsp_cmpl {
+        u16   rx_id;                  /* rx_id of the target request */
+        u16   _resvd0;                /* reserved */
+};
+
+/*
+ * fcpio_ttmf: firmware -> host request
+ *
+ * used by the firmware to notify the host of an incoming task management
+ * function request
+ */
+struct fcpio_ttmf {
+        u8    _resvd0;                /* reserved */
+        u8    s_id[3];                /* FC vNIC only: Source S_ID */
+        u8    lun[LUN_ADDRESS];       /* FC vNIC only: LUN address */
+        u8    crn;                    /* SCSI Command Reference No. */
+        u8    _resvd2[3];             /* reserved */
+        u32   tmf_type;               /* task management request type */
+};
+
+/*
+ * Task Management request
+ */
+#define FCPIO_TTMF_CLR_ACA      0x40    /* Clear ACA condition */
+#define FCPIO_TTMF_LUN_RESET    0x10    /* logical unit reset task mgmt */
+#define FCPIO_TTMF_CLR_TASK_SET 0x04    /* clear task set */
+#define FCPIO_TTMF_ABT_TASK_SET 0x02    /* abort task set */
+#define FCPIO_TTMF_ABT_TASK     0x01    /* abort task */
+
+/*
+ * fcpio_tabort_cmpl: firmware -> host response
+ *
+ * used by the firmware to respond to a host's tabort request
+ */
+struct fcpio_tabort_cmpl {
+        u16   rx_id;                  /* rx_id of the target request */
+        u16   _resvd0;                /* reserved */
+};
+
+/*
+ * fcpio_ack: firmware -> host response
+ *
+ * used by firmware to notify the host of the last work request received
+ */
+struct fcpio_ack {
+        u16  request_out;             /* last host entry received */
+        u16  _resvd;
+};
+
+/*
+ * fcpio_reset_cmpl: firmware -> host response
+ *
+ * use by firmware to respond to the host's reset request
+ */
+struct fcpio_reset_cmpl {
+        u16   vnic_id;
+};
+
+/*
+ * fcpio_flogi_reg_cmpl: firmware -> host response
+ *
+ * fc vnic only
+ * response to the fcpio_flogi_reg request
+ */
+struct fcpio_flogi_reg_cmpl {
+        u32 _resvd;
+};
+
+/*
+ * fcpio_echo_cmpl: firmware -> host response
+ *
+ * response to the fcpio_echo request
+ */
+struct fcpio_echo_cmpl {
+        u32 _resvd;
+};
+
+/*
+ * fcpio_lunmap_chng: firmware -> host notification
+ *
+ * scsi vnic only
+ * notifies the host that the lunmap tables have changed
+ */
+struct fcpio_lunmap_chng {
+        u32 _resvd;
+};
+
+/*
+ * fcpio_lunmap_req_cmpl: firmware -> host response
+ *
+ * scsi vnic only
+ * response for lunmap table request from the host
+ */
+struct fcpio_lunmap_req_cmpl {
+        u32 _resvd;
+};
+
+/*
+ * Basic structure for all fcpio structures that are sent from the firmware to
+ * the host.  They are 64 bytes per structure.
+ */
+#define FCPIO_FW_REQ_LEN        64      /* expected length of fw requests */
+struct fcpio_fw_req {
+        struct fcpio_header hdr;
+
+        union {
+                /*
+                 * Defines space needed for request
+                 */
+                u8 buf[FCPIO_FW_REQ_LEN - sizeof(struct fcpio_header)];
+
+                /*
+                 * Initiator firmware responses
+                 */
+                struct fcpio_icmnd_cmpl         icmnd_cmpl;
+                struct fcpio_itmf_cmpl          itmf_cmpl;
+
+                /*
+                 * Target firmware new requests
+                 */
+                struct fcpio_tcmnd_16           tcmnd_16;
+                struct fcpio_tcmnd_32           tcmnd_32;
+
+                /*
+                 * Target firmware responses
+                 */
+                struct fcpio_tdrsp_cmpl         tdrsp_cmpl;
+                struct fcpio_ttmf               ttmf;
+                struct fcpio_tabort_cmpl        tabort_cmpl;
+
+                /*
+                 * Firmware response to work received
+                 */
+                struct fcpio_ack                ack;
+
+                /*
+                 * Misc requests
+                 */
+                struct fcpio_reset_cmpl         reset_cmpl;
+                struct fcpio_flogi_reg_cmpl     flogi_reg_cmpl;
+                struct fcpio_echo_cmpl          echo_cmpl;
+                struct fcpio_lunmap_chng        lunmap_chng;
+                struct fcpio_lunmap_req_cmpl    lunmap_req_cmpl;
+        } u;
+};
+
+/*
+ * Access routines to encode and decode the color bit, which is the most
+ * significant bit of the MSB of the structure
+ */
+static inline void fcpio_color_enc(struct fcpio_fw_req *fw_req, u8 color)
+{
+        u8 *c = ((u8 *) fw_req) + sizeof(struct fcpio_fw_req) - 1;
+
+        if (color)
+                *c |= 0x80;
+        else
+                *c &= ~0x80;
+}
+
+static inline void fcpio_color_dec(struct fcpio_fw_req *fw_req, u8 *color)
+{
+        u8 *c = ((u8 *) fw_req) + sizeof(struct fcpio_fw_req) - 1;
+
+        *color = *c >> 7;
+
+        /*
+         * Make sure color bit is read from desc *before* other fields
+         * are read from desc.  Hardware guarantees color bit is last
+         * bit (byte) written.  Adding the rmb() prevents the compiler
+         * and/or CPU from reordering the reads which would potentially
+         * result in reading stale values.
+         */
+
+        rmb();
+
+}
+
+/*
+ * Lunmap table entry for scsi vnics
+ */
+#define FCPIO_LUNMAP_TABLE_SIZE     256
+#define FCPIO_FLAGS_LUNMAP_VALID    0x80
+#define FCPIO_FLAGS_BOOT            0x01
+struct fcpio_lunmap_entry {
+        u8    bus;
+        u8    target;
+        u8    lun;
+        u8    path_cnt;
+        u16   flags;
+        u16   update_cnt;
+};
+
+struct fcpio_lunmap_tbl {
+        u32                   update_cnt;
+        struct fcpio_lunmap_entry   lunmaps[FCPIO_LUNMAP_TABLE_SIZE];
+};
+
+#endif /* _FCPIO_H_ */
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
new file mode 100644
index 000000000000..e4c0a3d7d87b
--- /dev/null
+++ b/drivers/scsi/fnic/fnic.h
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FNIC_H_
+#define _FNIC_H_
+
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/workqueue.h>
+#include <scsi/libfc.h>
+#include "fnic_io.h"
+#include "fnic_res.h"
+#include "vnic_dev.h"
+#include "vnic_wq.h"
+#include "vnic_rq.h"
+#include "vnic_cq.h"
+#include "vnic_wq_copy.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "vnic_scsi.h"
+
+#define DRV_NAME                "fnic"
+#define DRV_DESCRIPTION         "Cisco FCoE HBA Driver"
+#define DRV_VERSION             "1.0.0.1121"
+#define PFX                     DRV_NAME ": "
+#define DFX                     DRV_NAME "%d: "
+
+#define DESC_CLEAN_LOW_WATERMARK 8
+#define FNIC_MAX_IO_REQ         2048 /* scsi_cmnd tag map entries */
+#define FNIC_IO_LOCKS           64 /* IO locks: power of 2 */
+#define FNIC_DFLT_QUEUE_DEPTH   32
+#define FNIC_STATS_RATE_LIMIT   4 /* limit rate at which stats are pulled up */
+
+/*
+ * Tag bits used for special requests.
+ */
+#define BIT(nr)                 (1UL << (nr))
+#define FNIC_TAG_ABORT          BIT(30)         /* tag bit indicating abort */
+#define FNIC_TAG_DEV_RST        BIT(29)         /* indicates device reset */
+#define FNIC_TAG_MASK           (BIT(24) - 1)   /* mask for lookup */
+#define FNIC_NO_TAG             -1
+
+/*
+ * Usage of the scsi_cmnd scratchpad.
+ * These fields are locked by the hashed io_req_lock.
+ */
+#define CMD_SP(Cmnd)            ((Cmnd)->SCp.ptr)
+#define CMD_STATE(Cmnd)         ((Cmnd)->SCp.phase)
+#define CMD_ABTS_STATUS(Cmnd)   ((Cmnd)->SCp.Message)
+#define CMD_LR_STATUS(Cmnd)     ((Cmnd)->SCp.have_data_in)
+#define CMD_TAG(Cmnd)           ((Cmnd)->SCp.sent_command)
+
+#define FCPIO_INVALID_CODE 0x100 /* hdr_status value unused by firmware */
+
+#define FNIC_LUN_RESET_TIMEOUT       10000      /* mSec */
+#define FNIC_HOST_RESET_TIMEOUT      10000      /* mSec */
+#define FNIC_RMDEVICE_TIMEOUT        1000       /* mSec */
+#define FNIC_HOST_RESET_SETTLE_TIME  30         /* Sec */
+
+#define FNIC_MAX_FCP_TARGET     256
+
+extern unsigned int fnic_log_level;
+
+#define FNIC_MAIN_LOGGING 0x01
+#define FNIC_FCS_LOGGING 0x02
+#define FNIC_SCSI_LOGGING 0x04
+#define FNIC_ISR_LOGGING 0x08
+
+#define FNIC_CHECK_LOGGING(LEVEL, CMD)                          \
+do {                                                            \
+        if (unlikely(fnic_log_level & LEVEL))                   \
+                do {                                            \
+                        CMD;                                    \
+                } while (0);                                    \
+} while (0)
+
+#define FNIC_MAIN_DBG(kern_level, host, fmt, args...)           \
+        FNIC_CHECK_LOGGING(FNIC_MAIN_LOGGING,                   \
+                         shost_printk(kern_level, host, fmt, ##args);)
+
+#define FNIC_FCS_DBG(kern_level, host, fmt, args...)            \
+        FNIC_CHECK_LOGGING(FNIC_FCS_LOGGING,                    \
+                         shost_printk(kern_level, host, fmt, ##args);)
+
+#define FNIC_SCSI_DBG(kern_level, host, fmt, args...)           \
+        FNIC_CHECK_LOGGING(FNIC_SCSI_LOGGING,                   \
+                         shost_printk(kern_level, host, fmt, ##args);)
+
+#define FNIC_ISR_DBG(kern_level, host, fmt, args...)            \
+        FNIC_CHECK_LOGGING(FNIC_ISR_LOGGING,                    \
+                         shost_printk(kern_level, host, fmt, ##args);)
+
+extern const char *fnic_state_str[];
+
+enum fnic_intx_intr_index {
+        FNIC_INTX_WQ_RQ_COPYWQ,
+        FNIC_INTX_ERR,
+        FNIC_INTX_NOTIFY,
+        FNIC_INTX_INTR_MAX,
+};
+
+enum fnic_msix_intr_index {
+        FNIC_MSIX_RQ,
+        FNIC_MSIX_WQ,
+        FNIC_MSIX_WQ_COPY,
+        FNIC_MSIX_ERR_NOTIFY,
+        FNIC_MSIX_INTR_MAX,
+};
+
+struct fnic_msix_entry {
+        int requested;
+        char devname[IFNAMSIZ];
+        irqreturn_t (*isr)(int, void *);
+        void *devid;
+};
+
+enum fnic_state {
+        FNIC_IN_FC_MODE = 0,
+        FNIC_IN_FC_TRANS_ETH_MODE,
+        FNIC_IN_ETH_MODE,
+        FNIC_IN_ETH_TRANS_FC_MODE,
+};
+
+#define FNIC_WQ_COPY_MAX 1
+#define FNIC_WQ_MAX 1
+#define FNIC_RQ_MAX 1
+#define FNIC_CQ_MAX (FNIC_WQ_COPY_MAX + FNIC_WQ_MAX + FNIC_RQ_MAX)
+
+struct mempool;
+
+/* Per-instance private data structure */
+struct fnic {
+        struct fc_lport *lport;
+        struct vnic_dev_bar bar0;
+
+        struct msix_entry msix_entry[FNIC_MSIX_INTR_MAX];
+        struct fnic_msix_entry msix[FNIC_MSIX_INTR_MAX];
+
+        struct vnic_stats *stats;
+        unsigned long stats_time;       /* time of stats update */
+        struct vnic_nic_cfg *nic_cfg;
+        char name[IFNAMSIZ];
+        struct timer_list notify_timer; /* used for MSI interrupts */
+
+        unsigned int err_intr_offset;
+        unsigned int link_intr_offset;
+
+        unsigned int wq_count;
+        unsigned int cq_count;
+
+        u32 fcoui_mode:1;               /* use fcoui address*/
+        u32 vlan_hw_insert:1;           /* let hw insert the tag */
+        u32 in_remove:1;                /* fnic device in removal */
+        u32 stop_rx_link_events:1;      /* stop proc. rx frames, link events */
+
+        struct completion *remove_wait; /* device remove thread blocks */
+
+        struct fc_frame *flogi;
+        struct fc_frame *flogi_resp;
+        u16 flogi_oxid;
+        unsigned long s_id;
+        enum fnic_state state;
+        spinlock_t fnic_lock;
+
+        u16 vlan_id;                    /* VLAN tag including priority */
+        u8 mac_addr[ETH_ALEN];
+        u8 dest_addr[ETH_ALEN];
+        u8 data_src_addr[ETH_ALEN];
+        u64 fcp_input_bytes;            /* internal statistic */
+        u64 fcp_output_bytes;           /* internal statistic */
+        u32 link_down_cnt;
+        int link_status;
+
+        struct list_head list;
+        struct pci_dev *pdev;
+        struct vnic_fc_config config;
+        struct vnic_dev *vdev;
+        unsigned int raw_wq_count;
+        unsigned int wq_copy_count;
+        unsigned int rq_count;
+        int fw_ack_index[FNIC_WQ_COPY_MAX];
+        unsigned short fw_ack_recd[FNIC_WQ_COPY_MAX];
+        unsigned short wq_copy_desc_low[FNIC_WQ_COPY_MAX];
+        unsigned int intr_count;
+        u32 __iomem *legacy_pba;
+        struct fnic_host_tag *tags;
+        mempool_t *io_req_pool;
+        mempool_t *io_sgl_pool[FNIC_SGL_NUM_CACHES];
+        spinlock_t io_req_lock[FNIC_IO_LOCKS];  /* locks for scsi cmnds */
+
+        struct work_struct link_work;
+        struct work_struct frame_work;
+        struct sk_buff_head frame_queue;
+
+        /* copy work queue cache line section */
+        ____cacheline_aligned struct vnic_wq_copy wq_copy[FNIC_WQ_COPY_MAX];
+        /* completion queue cache line section */
+        ____cacheline_aligned struct vnic_cq cq[FNIC_CQ_MAX];
+
+        spinlock_t wq_copy_lock[FNIC_WQ_COPY_MAX];
+
+        /* work queue cache line section */
+        ____cacheline_aligned struct vnic_wq wq[FNIC_WQ_MAX];
+        spinlock_t wq_lock[FNIC_WQ_MAX];
+
+        /* receive queue cache line section */
+        ____cacheline_aligned struct vnic_rq rq[FNIC_RQ_MAX];
+
+        /* interrupt resource cache line section */
+        ____cacheline_aligned struct vnic_intr intr[FNIC_MSIX_INTR_MAX];
+};
+
+extern struct workqueue_struct *fnic_event_queue;
+extern struct device_attribute *fnic_attrs[];
+
+void fnic_clear_intr_mode(struct fnic *fnic);
+int fnic_set_intr_mode(struct fnic *fnic);
+void fnic_free_intr(struct fnic *fnic);
+int fnic_request_intr(struct fnic *fnic);
+
+int fnic_send(struct fc_lport *, struct fc_frame *);
+void fnic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf);
+void fnic_handle_frame(struct work_struct *work);
+void fnic_handle_link(struct work_struct *work);
+int fnic_rq_cmpl_handler(struct fnic *fnic, int);
+int fnic_alloc_rq_frame(struct vnic_rq *rq);
+void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf);
+int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp);
+
+int fnic_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *));
+int fnic_abort_cmd(struct scsi_cmnd *);
+int fnic_device_reset(struct scsi_cmnd *);
+int fnic_host_reset(struct scsi_cmnd *);
+int fnic_reset(struct Scsi_Host *);
+void fnic_scsi_cleanup(struct fc_lport *);
+void fnic_scsi_abort_io(struct fc_lport *);
+void fnic_empty_scsi_cleanup(struct fc_lport *);
+void fnic_exch_mgr_reset(struct fc_lport *, u32, u32);
+int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int);
+int fnic_wq_cmpl_handler(struct fnic *fnic, int);
+int fnic_flogi_reg_handler(struct fnic *fnic);
+void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
+                                  struct fcpio_host_req *desc);
+int fnic_fw_reset_handler(struct fnic *fnic);
+void fnic_terminate_rport_io(struct fc_rport *);
+const char *fnic_state_to_str(unsigned int state);
+
+void fnic_log_q_error(struct fnic *fnic);
+void fnic_handle_link_event(struct fnic *fnic);
+
+#endif /* _FNIC_H_ */
diff --git a/drivers/scsi/fnic/fnic_attrs.c b/drivers/scsi/fnic/fnic_attrs.c
new file mode 100644
index 000000000000..aea0c3becfd4
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_attrs.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/string.h>
+#include <linux/device.h>
+#include <scsi/scsi_host.h>
+#include "fnic.h"
+
+static ssize_t fnic_show_state(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        struct fc_lport *lp = shost_priv(class_to_shost(dev));
+        struct fnic *fnic = lport_priv(lp);
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", fnic_state_str[fnic->state]);
+}
+
+static ssize_t fnic_show_drv_version(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", DRV_VERSION);
+}
+
+static ssize_t fnic_show_link_state(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct fc_lport *lp = shost_priv(class_to_shost(dev));
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", (lp->link_up)
+                        ? "Link Up" : "Link Down");
+}
+
+static DEVICE_ATTR(fnic_state, S_IRUGO, fnic_show_state, NULL);
+static DEVICE_ATTR(drv_version, S_IRUGO, fnic_show_drv_version, NULL);
+static DEVICE_ATTR(link_state, S_IRUGO, fnic_show_link_state, NULL);
+
+struct device_attribute *fnic_attrs[] = {
+        &dev_attr_fnic_state,
+        &dev_attr_drv_version,
+        &dev_attr_link_state,
+        NULL,
+};
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
new file mode 100644
index 000000000000..07e6eedb83ce
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -0,0 +1,742 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/skbuff.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/workqueue.h>
+#include <scsi/fc/fc_els.h>
+#include <scsi/fc/fc_fcoe.h>
+#include <scsi/fc_frame.h>
+#include <scsi/libfc.h>
+#include "fnic_io.h"
+#include "fnic.h"
+#include "cq_enet_desc.h"
+#include "cq_exch_desc.h"
+
+struct workqueue_struct *fnic_event_queue;
+
+void fnic_handle_link(struct work_struct *work)
+{
+        struct fnic *fnic = container_of(work, struct fnic, link_work);
+        unsigned long flags;
+        int old_link_status;
+        u32 old_link_down_cnt;
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+
+        if (fnic->stop_rx_link_events) {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                return;
+        }
+
+        old_link_down_cnt = fnic->link_down_cnt;
+        old_link_status = fnic->link_status;
+        fnic->link_status = vnic_dev_link_status(fnic->vdev);
+        fnic->link_down_cnt = vnic_dev_link_down_cnt(fnic->vdev);
+
+        if (old_link_status == fnic->link_status) {
+                if (!fnic->link_status)
+                        /* DOWN -> DOWN */
+                        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                else {
+                        if (old_link_down_cnt != fnic->link_down_cnt) {
+                                /* UP -> DOWN -> UP */
+                                fnic->lport->host_stats.link_failure_count++;
+                                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                                             "link down\n");
+                                fc_linkdown(fnic->lport);
+                                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                                             "link up\n");
+                                fc_linkup(fnic->lport);
+                        } else
+                                /* UP -> UP */
+                                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                }
+        } else if (fnic->link_status) {
+                /* DOWN -> UP */
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n");
+                fc_linkup(fnic->lport);
+        } else {
+                /* UP -> DOWN */
+                fnic->lport->host_stats.link_failure_count++;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link down\n");
+                fc_linkdown(fnic->lport);
+        }
+
+}
+
+/*
+ * This function passes incoming fabric frames to libFC
+ */
+void fnic_handle_frame(struct work_struct *work)
+{
+        struct fnic *fnic = container_of(work, struct fnic, frame_work);
+        struct fc_lport *lp = fnic->lport;
+        unsigned long flags;
+        struct sk_buff *skb;
+        struct fc_frame *fp;
+
+        while ((skb = skb_dequeue(&fnic->frame_queue))) {
+
+                spin_lock_irqsave(&fnic->fnic_lock, flags);
+                if (fnic->stop_rx_link_events) {
+                        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                        dev_kfree_skb(skb);
+                        return;
+                }
+                fp = (struct fc_frame *)skb;
+                /* if Flogi resp frame, register the address */
+                if (fr_flags(fp)) {
+                        vnic_dev_add_addr(fnic->vdev,
+                                          fnic->data_src_addr);
+                        fr_flags(fp) = 0;
+                }
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+                fc_exch_recv(lp, lp->emp, fp);
+        }
+
+}
+
+static inline void fnic_import_rq_fc_frame(struct sk_buff *skb,
+                                           u32 len, u8 sof, u8 eof)
+{
+        struct fc_frame *fp = (struct fc_frame *)skb;
+
+        skb_trim(skb, len);
+        fr_eof(fp) = eof;
+        fr_sof(fp) = sof;
+}
+
+
+static inline int fnic_import_rq_eth_pkt(struct sk_buff *skb, u32 len)
+{
+        struct fc_frame *fp;
+        struct ethhdr *eh;
+        struct vlan_ethhdr *vh;
+        struct fcoe_hdr *fcoe_hdr;
+        struct fcoe_crc_eof *ft;
+        u32    transport_len = 0;
+
+        eh = (struct ethhdr *)skb->data;
+        vh = (struct vlan_ethhdr *)skb->data;
+        if (vh->h_vlan_proto == htons(ETH_P_8021Q) &&
+            vh->h_vlan_encapsulated_proto == htons(ETH_P_FCOE)) {
+                skb_pull(skb, sizeof(struct vlan_ethhdr));
+                transport_len += sizeof(struct vlan_ethhdr);
+        } else if (eh->h_proto == htons(ETH_P_FCOE)) {
+                transport_len += sizeof(struct ethhdr);
+                skb_pull(skb, sizeof(struct ethhdr));
+        } else
+                return -1;
+
+        fcoe_hdr = (struct fcoe_hdr *)skb->data;
+        if (FC_FCOE_DECAPS_VER(fcoe_hdr) != FC_FCOE_VER)
+                return -1;
+
+        fp = (struct fc_frame *)skb;
+        fc_frame_init(fp);
+        fr_sof(fp) = fcoe_hdr->fcoe_sof;
+        skb_pull(skb, sizeof(struct fcoe_hdr));
+        transport_len += sizeof(struct fcoe_hdr);
+
+        ft = (struct fcoe_crc_eof *)(skb->data + len -
+                                     transport_len - sizeof(*ft));
+        fr_eof(fp) = ft->fcoe_eof;
+        skb_trim(skb, len - transport_len - sizeof(*ft));
+        return 0;
+}
+
+static inline int fnic_handle_flogi_resp(struct fnic *fnic,
+                                         struct fc_frame *fp)
+{
+        u8 mac[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
+        struct ethhdr *eth_hdr;
+        struct fc_frame_header *fh;
+        int ret = 0;
+        unsigned long flags;
+        struct fc_frame *old_flogi_resp = NULL;
+
+        fh = (struct fc_frame_header *)fr_hdr(fp);
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+
+        if (fnic->state == FNIC_IN_ETH_MODE) {
+
+                /*
+                 * Check if oxid matches on taking the lock. A new Flogi
+                 * issued by libFC might have changed the fnic cached oxid
+                 */
+                if (fnic->flogi_oxid != ntohs(fh->fh_ox_id)) {
+                        FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                                     "Flogi response oxid not"
+                                     " matching cached oxid, dropping frame"
+                                     "\n");
+                        ret = -1;
+                        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                        dev_kfree_skb_irq(fp_skb(fp));
+                        goto handle_flogi_resp_end;
+                }
+
+                /* Drop older cached flogi response frame, cache this frame */
+                old_flogi_resp = fnic->flogi_resp;
+                fnic->flogi_resp = fp;
+                fnic->flogi_oxid = FC_XID_UNKNOWN;
+
+                /*
+                 * this frame is part of flogi get the src mac addr from this
+                 * frame if the src mac is fcoui based then we mark the
+                 * address mode flag to use fcoui base for dst mac addr
+                 * otherwise we have to store the fcoe gateway addr
+                 */
+                eth_hdr = (struct ethhdr *)skb_mac_header(fp_skb(fp));
+                memcpy(mac, eth_hdr->h_source, ETH_ALEN);
+
+                if (ntoh24(mac) == FC_FCOE_OUI)
+                        fnic->fcoui_mode = 1;
+                else {
+                        fnic->fcoui_mode = 0;
+                        memcpy(fnic->dest_addr, mac, ETH_ALEN);
+                }
+
+                /*
+                 * Except for Flogi frame, all outbound frames from us have the
+                 * Eth Src address as FC_FCOE_OUI"our_sid". Flogi frame uses
+                 * the vnic MAC address as the Eth Src address
+                 */
+                fc_fcoe_set_mac(fnic->data_src_addr, fh->fh_d_id);
+
+                /* We get our s_id from the d_id of the flogi resp frame */
+                fnic->s_id = ntoh24(fh->fh_d_id);
+
+                /* Change state to reflect transition from Eth to FC mode */
+                fnic->state = FNIC_IN_ETH_TRANS_FC_MODE;
+
+        } else {
+                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                             "Unexpected fnic state %s while"
+                             " processing flogi resp\n",
+                             fnic_state_to_str(fnic->state));
+                ret = -1;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                dev_kfree_skb_irq(fp_skb(fp));
+                goto handle_flogi_resp_end;
+        }
+
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        /* Drop older cached frame */
+        if (old_flogi_resp)
+                dev_kfree_skb_irq(fp_skb(old_flogi_resp));
+
+        /*
+         * send flogi reg request to firmware, this will put the fnic in
+         * in FC mode
+         */
+        ret = fnic_flogi_reg_handler(fnic);
+
+        if (ret < 0) {
+                int free_fp = 1;
+                spin_lock_irqsave(&fnic->fnic_lock, flags);
+                /*
+                 * free the frame is some other thread is not
+                 * pointing to it
+                 */
+                if (fnic->flogi_resp != fp)
+                        free_fp = 0;
+                else
+                        fnic->flogi_resp = NULL;
+
+                if (fnic->state == FNIC_IN_ETH_TRANS_FC_MODE)
+                        fnic->state = FNIC_IN_ETH_MODE;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                if (free_fp)
+                        dev_kfree_skb_irq(fp_skb(fp));
+        }
+
+ handle_flogi_resp_end:
+        return ret;
+}
+
+/* Returns 1 for a response that matches cached flogi oxid */
+static inline int is_matching_flogi_resp_frame(struct fnic *fnic,
+                                               struct fc_frame *fp)
+{
+        struct fc_frame_header *fh;
+        int ret = 0;
+        u32 f_ctl;
+
+        fh = fc_frame_header_get(fp);
+        f_ctl = ntoh24(fh->fh_f_ctl);
+
+        if (fnic->flogi_oxid == ntohs(fh->fh_ox_id) &&
+            fh->fh_r_ctl == FC_RCTL_ELS_REP &&
+            (f_ctl & (FC_FC_EX_CTX | FC_FC_SEQ_CTX)) == FC_FC_EX_CTX &&
+            fh->fh_type == FC_TYPE_ELS)
+                ret = 1;
+
+        return ret;
+}
+
+static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
+                                    *cq_desc, struct vnic_rq_buf *buf,
+                                    int skipped __attribute__((unused)),
+                                    void *opaque)
+{
+        struct fnic *fnic = vnic_dev_priv(rq->vdev);
+        struct sk_buff *skb;
+        struct fc_frame *fp;
+        unsigned int eth_hdrs_stripped;
+        u8 type, color, eop, sop, ingress_port, vlan_stripped;
+        u8 fcoe = 0, fcoe_sof, fcoe_eof;
+        u8 fcoe_fc_crc_ok = 1, fcoe_enc_error = 0;
+        u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;
+        u8 ipv6, ipv4, ipv4_fragment, rss_type, csum_not_calc;
+        u8 fcs_ok = 1, packet_error = 0;
+        u16 q_number, completed_index, bytes_written = 0, vlan, checksum;
+        u32 rss_hash;
+        u16 exchange_id, tmpl;
+        u8 sof = 0;
+        u8 eof = 0;
+        u32 fcp_bytes_written = 0;
+        unsigned long flags;
+
+        pci_unmap_single(fnic->pdev, buf->dma_addr, buf->len,
+                         PCI_DMA_FROMDEVICE);
+        skb = buf->os_buf;
+        buf->os_buf = NULL;
+
+        cq_desc_dec(cq_desc, &type, &color, &q_number, &completed_index);
+        if (type == CQ_DESC_TYPE_RQ_FCP) {
+                cq_fcp_rq_desc_dec((struct cq_fcp_rq_desc *)cq_desc,
+                                   &type, &color, &q_number, &completed_index,
+                                   &eop, &sop, &fcoe_fc_crc_ok, &exchange_id,
+                                   &tmpl, &fcp_bytes_written, &sof, &eof,
+                                   &ingress_port, &packet_error,
+                                   &fcoe_enc_error, &fcs_ok, &vlan_stripped,
+                                   &vlan);
+                eth_hdrs_stripped = 1;
+
+        } else if (type == CQ_DESC_TYPE_RQ_ENET) {
+                cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc,
+                                    &type, &color, &q_number, &completed_index,
+                                    &ingress_port, &fcoe, &eop, &sop,
+                                    &rss_type, &csum_not_calc, &rss_hash,
+                                    &bytes_written, &packet_error,
+                                    &vlan_stripped, &vlan, &checksum,
+                                    &fcoe_sof, &fcoe_fc_crc_ok,
+                                    &fcoe_enc_error, &fcoe_eof,
+                                    &tcp_udp_csum_ok, &udp, &tcp,
+                                    &ipv4_csum_ok, &ipv6, &ipv4,
+                                    &ipv4_fragment, &fcs_ok);
+                eth_hdrs_stripped = 0;
+
+        } else {
+                /* wrong CQ type*/
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "fnic rq_cmpl wrong cq type x%x\n", type);
+                goto drop;
+        }
+
+        if (!fcs_ok || packet_error || !fcoe_fc_crc_ok || fcoe_enc_error) {
+                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                             "fnic rq_cmpl fcoe x%x fcsok x%x"
+                             " pkterr x%x fcoe_fc_crc_ok x%x, fcoe_enc_err"
+                             " x%x\n",
+                             fcoe, fcs_ok, packet_error,
+                             fcoe_fc_crc_ok, fcoe_enc_error);
+                goto drop;
+        }
+
+        if (eth_hdrs_stripped)
+                fnic_import_rq_fc_frame(skb, fcp_bytes_written, sof, eof);
+        else if (fnic_import_rq_eth_pkt(skb, bytes_written))
+                goto drop;
+
+        fp = (struct fc_frame *)skb;
+
+        /*
+         * If frame is an ELS response that matches the cached FLOGI OX_ID,
+         * and is accept, issue flogi_reg_request copy wq request to firmware
+         * to register the S_ID and determine whether FC_OUI mode or GW mode.
+         */
+        if (is_matching_flogi_resp_frame(fnic, fp)) {
+                if (!eth_hdrs_stripped) {
+                        if (fc_frame_payload_op(fp) == ELS_LS_ACC) {
+                                fnic_handle_flogi_resp(fnic, fp);
+                                return;
+                        }
+                        /*
+                         * Recd. Flogi reject. No point registering
+                         * with fw, but forward to libFC
+                         */
+                        goto forward;
+                }
+                goto drop;
+        }
+        if (!eth_hdrs_stripped)
+                goto drop;
+
+forward:
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        if (fnic->stop_rx_link_events) {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                goto drop;
+        }
+        /* Use fr_flags to indicate whether succ. flogi resp or not */
+        fr_flags(fp) = 0;
+        fr_dev(fp) = fnic->lport;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        skb_queue_tail(&fnic->frame_queue, skb);
+        queue_work(fnic_event_queue, &fnic->frame_work);
+
+        return;
+drop:
+        dev_kfree_skb_irq(skb);
+}
+
+static int fnic_rq_cmpl_handler_cont(struct vnic_dev *vdev,
+                                     struct cq_desc *cq_desc, u8 type,
+                                     u16 q_number, u16 completed_index,
+                                     void *opaque)
+{
+        struct fnic *fnic = vnic_dev_priv(vdev);
+
+        vnic_rq_service(&fnic->rq[q_number], cq_desc, completed_index,
+                        VNIC_RQ_RETURN_DESC, fnic_rq_cmpl_frame_recv,
+                        NULL);
+        return 0;
+}
+
+int fnic_rq_cmpl_handler(struct fnic *fnic, int rq_work_to_do)
+{
+        unsigned int tot_rq_work_done = 0, cur_work_done;
+        unsigned int i;
+        int err;
+
+        for (i = 0; i < fnic->rq_count; i++) {
+                cur_work_done = vnic_cq_service(&fnic->cq[i], rq_work_to_do,
+                                                fnic_rq_cmpl_handler_cont,
+                                                NULL);
+                if (cur_work_done) {
+                        err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
+                        if (err)
+                                shost_printk(KERN_ERR, fnic->lport->host,
+                                             "fnic_alloc_rq_frame cant alloc"
+                                             " frame\n");
+                }
+                tot_rq_work_done += cur_work_done;
+        }
+
+        return tot_rq_work_done;
+}
+
+/*
+ * This function is called once at init time to allocate and fill RQ
+ * buffers. Subsequently, it is called in the interrupt context after RQ
+ * buffer processing to replenish the buffers in the RQ
+ */
+int fnic_alloc_rq_frame(struct vnic_rq *rq)
+{
+        struct fnic *fnic = vnic_dev_priv(rq->vdev);
+        struct sk_buff *skb;
+        u16 len;
+        dma_addr_t pa;
+
+        len = FC_FRAME_HEADROOM + FC_MAX_FRAME + FC_FRAME_TAILROOM;
+        skb = dev_alloc_skb(len);
+        if (!skb) {
+                FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
+                             "Unable to allocate RQ sk_buff\n");
+                return -ENOMEM;
+        }
+        skb_reset_mac_header(skb);
+        skb_reset_transport_header(skb);
+        skb_reset_network_header(skb);
+        skb_put(skb, len);
+        pa = pci_map_single(fnic->pdev, skb->data, len, PCI_DMA_FROMDEVICE);
+        fnic_queue_rq_desc(rq, skb, pa, len);
+        return 0;
+}
+
+void fnic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
+{
+        struct fc_frame *fp = buf->os_buf;
+        struct fnic *fnic = vnic_dev_priv(rq->vdev);
+
+        pci_unmap_single(fnic->pdev, buf->dma_addr, buf->len,
+                         PCI_DMA_FROMDEVICE);
+
+        dev_kfree_skb(fp_skb(fp));
+        buf->os_buf = NULL;
+}
+
+static inline int is_flogi_frame(struct fc_frame_header *fh)
+{
+        return fh->fh_r_ctl == FC_RCTL_ELS_REQ && *(u8 *)(fh + 1) == ELS_FLOGI;
+}
+
+int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
+{
+        struct vnic_wq *wq = &fnic->wq[0];
+        struct sk_buff *skb;
+        dma_addr_t pa;
+        struct ethhdr *eth_hdr;
+        struct vlan_ethhdr *vlan_hdr;
+        struct fcoe_hdr *fcoe_hdr;
+        struct fc_frame_header *fh;
+        u32 tot_len, eth_hdr_len;
+        int ret = 0;
+        unsigned long flags;
+
+        fh = fc_frame_header_get(fp);
+        skb = fp_skb(fp);
+
+        if (!fnic->vlan_hw_insert) {
+                eth_hdr_len = sizeof(*vlan_hdr) + sizeof(*fcoe_hdr);
+                vlan_hdr = (struct vlan_ethhdr *)skb_push(skb, eth_hdr_len);
+                eth_hdr = (struct ethhdr *)vlan_hdr;
+                vlan_hdr->h_vlan_proto = htons(ETH_P_8021Q);
+                vlan_hdr->h_vlan_encapsulated_proto = htons(ETH_P_FCOE);
+                vlan_hdr->h_vlan_TCI = htons(fnic->vlan_id);
+                fcoe_hdr = (struct fcoe_hdr *)(vlan_hdr + 1);
+        } else {
+                eth_hdr_len = sizeof(*eth_hdr) + sizeof(*fcoe_hdr);
+                eth_hdr = (struct ethhdr *)skb_push(skb, eth_hdr_len);
+                eth_hdr->h_proto = htons(ETH_P_FCOE);
+                fcoe_hdr = (struct fcoe_hdr *)(eth_hdr + 1);
+        }
+
+        if (is_flogi_frame(fh)) {
+                fc_fcoe_set_mac(eth_hdr->h_dest, fh->fh_d_id);
+                memcpy(eth_hdr->h_source, fnic->mac_addr, ETH_ALEN);
+        } else {
+                if (fnic->fcoui_mode)
+                        fc_fcoe_set_mac(eth_hdr->h_dest, fh->fh_d_id);
+                else
+                        memcpy(eth_hdr->h_dest, fnic->dest_addr, ETH_ALEN);
+                memcpy(eth_hdr->h_source, fnic->data_src_addr, ETH_ALEN);
+        }
+
+        tot_len = skb->len;
+        BUG_ON(tot_len % 4);
+
+        memset(fcoe_hdr, 0, sizeof(*fcoe_hdr));
+        fcoe_hdr->fcoe_sof = fr_sof(fp);
+        if (FC_FCOE_VER)
+                FC_FCOE_ENCAPS_VER(fcoe_hdr, FC_FCOE_VER);
+
+        pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);
+
+        spin_lock_irqsave(&fnic->wq_lock[0], flags);
+
+        if (!vnic_wq_desc_avail(wq)) {
+                pci_unmap_single(fnic->pdev, pa,
+                                 tot_len, PCI_DMA_TODEVICE);
+                ret = -1;
+                goto fnic_send_frame_end;
+        }
+
+        fnic_queue_wq_desc(wq, skb, pa, tot_len, fr_eof(fp),
+                           fnic->vlan_hw_insert, fnic->vlan_id, 1, 1, 1);
+fnic_send_frame_end:
+        spin_unlock_irqrestore(&fnic->wq_lock[0], flags);
+
+        if (ret)
+                dev_kfree_skb_any(fp_skb(fp));
+
+        return ret;
+}
+
+/*
+ * fnic_send
+ * Routine to send a raw frame
+ */
+int fnic_send(struct fc_lport *lp, struct fc_frame *fp)
+{
+        struct fnic *fnic = lport_priv(lp);
+        struct fc_frame_header *fh;
+        int ret = 0;
+        enum fnic_state old_state;
+        unsigned long flags;
+        struct fc_frame *old_flogi = NULL;
+        struct fc_frame *old_flogi_resp = NULL;
+
+        if (fnic->in_remove) {
+                dev_kfree_skb(fp_skb(fp));
+                ret = -1;
+                goto fnic_send_end;
+        }
+
+        fh = fc_frame_header_get(fp);
+        /* if not an Flogi frame, send it out, this is the common case */
+        if (!is_flogi_frame(fh))
+                return fnic_send_frame(fnic, fp);
+
+        /* Flogi frame, now enter the state machine */
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+again:
+        /* Get any old cached frames, free them after dropping lock */
+        old_flogi = fnic->flogi;
+        fnic->flogi = NULL;
+        old_flogi_resp = fnic->flogi_resp;
+        fnic->flogi_resp = NULL;
+
+        fnic->flogi_oxid = FC_XID_UNKNOWN;
+
+        old_state = fnic->state;
+        switch (old_state) {
+        case FNIC_IN_FC_MODE:
+        case FNIC_IN_ETH_TRANS_FC_MODE:
+        default:
+                fnic->state = FNIC_IN_FC_TRANS_ETH_MODE;
+                vnic_dev_del_addr(fnic->vdev, fnic->data_src_addr);
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+                if (old_flogi) {
+                        dev_kfree_skb(fp_skb(old_flogi));
+                        old_flogi = NULL;
+                }
+                if (old_flogi_resp) {
+                        dev_kfree_skb(fp_skb(old_flogi_resp));
+                        old_flogi_resp = NULL;
+                }
+
+                ret = fnic_fw_reset_handler(fnic);
+
+                spin_lock_irqsave(&fnic->fnic_lock, flags);
+                if (fnic->state != FNIC_IN_FC_TRANS_ETH_MODE)
+                        goto again;
+                if (ret) {
+                        fnic->state = old_state;
+                        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                        dev_kfree_skb(fp_skb(fp));
+                        goto fnic_send_end;
+                }
+                old_flogi = fnic->flogi;
+                fnic->flogi = fp;
+                fnic->flogi_oxid = ntohs(fh->fh_ox_id);
+                old_flogi_resp = fnic->flogi_resp;
+                fnic->flogi_resp = NULL;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                break;
+
+        case FNIC_IN_FC_TRANS_ETH_MODE:
+                /*
+                 * A reset is pending with the firmware. Store the flogi
+                 * and its oxid. The transition out of this state happens
+                 * only when Firmware completes the reset, either with
+                 * success or failed. If success, transition to
+                 * FNIC_IN_ETH_MODE, if fail, then transition to
+                 * FNIC_IN_FC_MODE
+                 */
+                fnic->flogi = fp;
+                fnic->flogi_oxid = ntohs(fh->fh_ox_id);
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                break;
+
+        case FNIC_IN_ETH_MODE:
+                /*
+                 * The fw/hw is already in eth mode. Store the oxid,
+                 * and send the flogi frame out. The transition out of this
+                 * state happens only we receive flogi response from the
+                 * network, and the oxid matches the cached oxid when the
+                 * flogi frame was sent out. If they match, then we issue
+                 * a flogi_reg request and transition to state
+                 * FNIC_IN_ETH_TRANS_FC_MODE
+                 */
+                fnic->flogi_oxid = ntohs(fh->fh_ox_id);
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                ret = fnic_send_frame(fnic, fp);
+                break;
+        }
+
+fnic_send_end:
+        if (old_flogi)
+                dev_kfree_skb(fp_skb(old_flogi));
+        if (old_flogi_resp)
+                dev_kfree_skb(fp_skb(old_flogi_resp));
+        return ret;
+}
+
+static void fnic_wq_complete_frame_send(struct vnic_wq *wq,
+                                        struct cq_desc *cq_desc,
+                                        struct vnic_wq_buf *buf, void *opaque)
+{
+        struct sk_buff *skb = buf->os_buf;
+        struct fc_frame *fp = (struct fc_frame *)skb;
+        struct fnic *fnic = vnic_dev_priv(wq->vdev);
+
+        pci_unmap_single(fnic->pdev, buf->dma_addr,
+                         buf->len, PCI_DMA_TODEVICE);
+        dev_kfree_skb_irq(fp_skb(fp));
+        buf->os_buf = NULL;
+}
+
+static int fnic_wq_cmpl_handler_cont(struct vnic_dev *vdev,
+                                     struct cq_desc *cq_desc, u8 type,
+                                     u16 q_number, u16 completed_index,
+                                     void *opaque)
+{
+        struct fnic *fnic = vnic_dev_priv(vdev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->wq_lock[q_number], flags);
+        vnic_wq_service(&fnic->wq[q_number], cq_desc, completed_index,
+                        fnic_wq_complete_frame_send, NULL);
+        spin_unlock_irqrestore(&fnic->wq_lock[q_number], flags);
+
+        return 0;
+}
+
+int fnic_wq_cmpl_handler(struct fnic *fnic, int work_to_do)
+{
+        unsigned int wq_work_done = 0;
+        unsigned int i;
+
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                wq_work_done  += vnic_cq_service(&fnic->cq[fnic->rq_count+i],
+                                                 work_to_do,
+                                                 fnic_wq_cmpl_handler_cont,
+                                                 NULL);
+        }
+
+        return wq_work_done;
+}
+
+
+void fnic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)
+{
+        struct fc_frame *fp = buf->os_buf;
+        struct fnic *fnic = vnic_dev_priv(wq->vdev);
+
+        pci_unmap_single(fnic->pdev, buf->dma_addr,
+                         buf->len, PCI_DMA_TODEVICE);
+
+        dev_kfree_skb(fp_skb(fp));
+        buf->os_buf = NULL;
+}
diff --git a/drivers/scsi/fnic/fnic_io.h b/drivers/scsi/fnic/fnic_io.h
new file mode 100644
index 000000000000..f0b896988cd5
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_io.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FNIC_IO_H_
+#define _FNIC_IO_H_
+
+#include <scsi/fc/fc_fcp.h>
+
+#define FNIC_DFLT_SG_DESC_CNT  32
+#define FNIC_MAX_SG_DESC_CNT        1024    /* Maximum descriptors per sgl */
+#define FNIC_SG_DESC_ALIGN          16      /* Descriptor address alignment */
+
+struct host_sg_desc {
+        __le64 addr;
+        __le32 len;
+        u32 _resvd;
+};
+
+struct fnic_dflt_sgl_list {
+        struct host_sg_desc sg_desc[FNIC_DFLT_SG_DESC_CNT];
+};
+
+struct fnic_sgl_list {
+        struct host_sg_desc sg_desc[FNIC_MAX_SG_DESC_CNT];
+};
+
+enum fnic_sgl_list_type {
+        FNIC_SGL_CACHE_DFLT = 0,  /* cache with default size sgl */
+        FNIC_SGL_CACHE_MAX,       /* cache with max size sgl */
+        FNIC_SGL_NUM_CACHES       /* number of sgl caches */
+};
+
+enum fnic_ioreq_state {
+        FNIC_IOREQ_CMD_PENDING = 0,
+        FNIC_IOREQ_ABTS_PENDING,
+        FNIC_IOREQ_ABTS_COMPLETE,
+        FNIC_IOREQ_CMD_COMPLETE,
+};
+
+struct fnic_io_req {
+        struct host_sg_desc *sgl_list; /* sgl list */
+        void *sgl_list_alloc; /* sgl list address used for free */
+        dma_addr_t sense_buf_pa; /* dma address for sense buffer*/
+        dma_addr_t sgl_list_pa; /* dma address for sgl list */
+        u16 sgl_cnt;
+        u8 sgl_type; /* device DMA descriptor list type */
+        u8 io_completed:1; /* set to 1 when fw completes IO */
+        u32 port_id; /* remote port DID */
+        struct completion *abts_done; /* completion for abts */
+        struct completion *dr_done; /* completion for device reset */
+};
+
+#endif /* _FNIC_IO_H_ */
diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c
new file mode 100644
index 000000000000..2b3064828aea
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_isr.c
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <scsi/libfc.h>
+#include <scsi/fc_frame.h>
+#include "vnic_dev.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "fnic_io.h"
+#include "fnic.h"
+
+static irqreturn_t fnic_isr_legacy(int irq, void *data)
+{
+        struct fnic *fnic = data;
+        u32 pba;
+        unsigned long work_done = 0;
+
+        pba = vnic_intr_legacy_pba(fnic->legacy_pba);
+        if (!pba)
+                return IRQ_NONE;
+
+        if (pba & (1 << FNIC_INTX_NOTIFY)) {
+                vnic_intr_return_all_credits(&fnic->intr[FNIC_INTX_NOTIFY]);
+                fnic_handle_link_event(fnic);
+        }
+
+        if (pba & (1 << FNIC_INTX_ERR)) {
+                vnic_intr_return_all_credits(&fnic->intr[FNIC_INTX_ERR]);
+                fnic_log_q_error(fnic);
+        }
+
+        if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) {
+                work_done += fnic_wq_copy_cmpl_handler(fnic, 8);
+                work_done += fnic_wq_cmpl_handler(fnic, 4);
+                work_done += fnic_rq_cmpl_handler(fnic, 4);
+
+                vnic_intr_return_credits(&fnic->intr[FNIC_INTX_WQ_RQ_COPYWQ],
+                                         work_done,
+                                         1 /* unmask intr */,
+                                         1 /* reset intr timer */);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fnic_isr_msi(int irq, void *data)
+{
+        struct fnic *fnic = data;
+        unsigned long work_done = 0;
+
+        work_done += fnic_wq_copy_cmpl_handler(fnic, 8);
+        work_done += fnic_wq_cmpl_handler(fnic, 4);
+        work_done += fnic_rq_cmpl_handler(fnic, 4);
+
+        vnic_intr_return_credits(&fnic->intr[0],
+                                 work_done,
+                                 1 /* unmask intr */,
+                                 1 /* reset intr timer */);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fnic_isr_msix_rq(int irq, void *data)
+{
+        struct fnic *fnic = data;
+        unsigned long rq_work_done = 0;
+
+        rq_work_done = fnic_rq_cmpl_handler(fnic, 4);
+        vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_RQ],
+                                 rq_work_done,
+                                 1 /* unmask intr */,
+                                 1 /* reset intr timer */);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fnic_isr_msix_wq(int irq, void *data)
+{
+        struct fnic *fnic = data;
+        unsigned long wq_work_done = 0;
+
+        wq_work_done = fnic_wq_cmpl_handler(fnic, 4);
+        vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ],
+                                 wq_work_done,
+                                 1 /* unmask intr */,
+                                 1 /* reset intr timer */);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data)
+{
+        struct fnic *fnic = data;
+        unsigned long wq_copy_work_done = 0;
+
+        wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, 8);
+        vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY],
+                                 wq_copy_work_done,
+                                 1 /* unmask intr */,
+                                 1 /* reset intr timer */);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fnic_isr_msix_err_notify(int irq, void *data)
+{
+        struct fnic *fnic = data;
+
+        vnic_intr_return_all_credits(&fnic->intr[FNIC_MSIX_ERR_NOTIFY]);
+        fnic_log_q_error(fnic);
+        fnic_handle_link_event(fnic);
+
+        return IRQ_HANDLED;
+}
+
+void fnic_free_intr(struct fnic *fnic)
+{
+        int i;
+
+        switch (vnic_dev_get_intr_mode(fnic->vdev)) {
+        case VNIC_DEV_INTR_MODE_INTX:
+        case VNIC_DEV_INTR_MODE_MSI:
+                free_irq(fnic->pdev->irq, fnic);
+                break;
+
+        case VNIC_DEV_INTR_MODE_MSIX:
+                for (i = 0; i < ARRAY_SIZE(fnic->msix); i++)
+                        if (fnic->msix[i].requested)
+                                free_irq(fnic->msix_entry[i].vector,
+                                         fnic->msix[i].devid);
+                break;
+
+        default:
+                break;
+        }
+}
+
+int fnic_request_intr(struct fnic *fnic)
+{
+        int err = 0;
+        int i;
+
+        switch (vnic_dev_get_intr_mode(fnic->vdev)) {
+
+        case VNIC_DEV_INTR_MODE_INTX:
+                err = request_irq(fnic->pdev->irq, &fnic_isr_legacy,
+                                  IRQF_SHARED, DRV_NAME, fnic);
+                break;
+
+        case VNIC_DEV_INTR_MODE_MSI:
+                err = request_irq(fnic->pdev->irq, &fnic_isr_msi,
+                                  0, fnic->name, fnic);
+                break;
+
+        case VNIC_DEV_INTR_MODE_MSIX:
+
+                sprintf(fnic->msix[FNIC_MSIX_RQ].devname,
+                        "%.11s-fcs-rq", fnic->name);
+                fnic->msix[FNIC_MSIX_RQ].isr = fnic_isr_msix_rq;
+                fnic->msix[FNIC_MSIX_RQ].devid = fnic;
+
+                sprintf(fnic->msix[FNIC_MSIX_WQ].devname,
+                        "%.11s-fcs-wq", fnic->name);
+                fnic->msix[FNIC_MSIX_WQ].isr = fnic_isr_msix_wq;
+                fnic->msix[FNIC_MSIX_WQ].devid = fnic;
+
+                sprintf(fnic->msix[FNIC_MSIX_WQ_COPY].devname,
+                        "%.11s-scsi-wq", fnic->name);
+                fnic->msix[FNIC_MSIX_WQ_COPY].isr = fnic_isr_msix_wq_copy;
+                fnic->msix[FNIC_MSIX_WQ_COPY].devid = fnic;
+
+                sprintf(fnic->msix[FNIC_MSIX_ERR_NOTIFY].devname,
+                        "%.11s-err-notify", fnic->name);
+                fnic->msix[FNIC_MSIX_ERR_NOTIFY].isr =
+                        fnic_isr_msix_err_notify;
+                fnic->msix[FNIC_MSIX_ERR_NOTIFY].devid = fnic;
+
+                for (i = 0; i < ARRAY_SIZE(fnic->msix); i++) {
+                        err = request_irq(fnic->msix_entry[i].vector,
+                                          fnic->msix[i].isr, 0,
+                                          fnic->msix[i].devname,
+                                          fnic->msix[i].devid);
+                        if (err) {
+                                shost_printk(KERN_ERR, fnic->lport->host,
+                                             "MSIX: request_irq"
+                                             " failed %d\n", err);
+                                fnic_free_intr(fnic);
+                                break;
+                        }
+                        fnic->msix[i].requested = 1;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        return err;
+}
+
+int fnic_set_intr_mode(struct fnic *fnic)
+{
+        unsigned int n = ARRAY_SIZE(fnic->rq);
+        unsigned int m = ARRAY_SIZE(fnic->wq);
+        unsigned int o = ARRAY_SIZE(fnic->wq_copy);
+        unsigned int i;
+
+        /*
+         * Set interrupt mode (INTx, MSI, MSI-X) depending
+         * system capabilities.
+         *
+         * Try MSI-X first
+         *
+         * We need n RQs, m WQs, o Copy WQs, n+m+o CQs, and n+m+o+1 INTRs
+         * (last INTR is used for WQ/RQ errors and notification area)
+         */
+
+        BUG_ON(ARRAY_SIZE(fnic->msix_entry) < n + m + o + 1);
+        for (i = 0; i < n + m + o + 1; i++)
+                fnic->msix_entry[i].entry = i;
+
+        if (fnic->rq_count >= n &&
+            fnic->raw_wq_count >= m &&
+            fnic->wq_copy_count >= o &&
+            fnic->cq_count >= n + m + o) {
+                if (!pci_enable_msix(fnic->pdev, fnic->msix_entry,
+                                    n + m + o + 1)) {
+                        fnic->rq_count = n;
+                        fnic->raw_wq_count = m;
+                        fnic->wq_copy_count = o;
+                        fnic->wq_count = m + o;
+                        fnic->cq_count = n + m + o;
+                        fnic->intr_count = n + m + o + 1;
+                        fnic->err_intr_offset = FNIC_MSIX_ERR_NOTIFY;
+
+                        FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host,
+                                     "Using MSI-X Interrupts\n");
+                        vnic_dev_set_intr_mode(fnic->vdev,
+                                               VNIC_DEV_INTR_MODE_MSIX);
+                        return 0;
+                }
+        }
+
+        /*
+         * Next try MSI
+         * We need 1 RQ, 1 WQ, 1 WQ_COPY, 3 CQs, and 1 INTR
+         */
+        if (fnic->rq_count >= 1 &&
+            fnic->raw_wq_count >= 1 &&
+            fnic->wq_copy_count >= 1 &&
+            fnic->cq_count >= 3 &&
+            fnic->intr_count >= 1 &&
+            !pci_enable_msi(fnic->pdev)) {
+
+                fnic->rq_count = 1;
+                fnic->raw_wq_count = 1;
+                fnic->wq_copy_count = 1;
+                fnic->wq_count = 2;
+                fnic->cq_count = 3;
+                fnic->intr_count = 1;
+                fnic->err_intr_offset = 0;
+
+                FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host,
+                             "Using MSI Interrupts\n");
+                vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_MSI);
+
+                return 0;
+        }
+
+        /*
+         * Next try INTx
+         * We need 1 RQ, 1 WQ, 1 WQ_COPY, 3 CQs, and 3 INTRs
+         * 1 INTR is used for all 3 queues, 1 INTR for queue errors
+         * 1 INTR for notification area
+         */
+
+        if (fnic->rq_count >= 1 &&
+            fnic->raw_wq_count >= 1 &&
+            fnic->wq_copy_count >= 1 &&
+            fnic->cq_count >= 3 &&
+            fnic->intr_count >= 3) {
+
+                fnic->rq_count = 1;
+                fnic->raw_wq_count = 1;
+                fnic->wq_copy_count = 1;
+                fnic->cq_count = 3;
+                fnic->intr_count = 3;
+
+                FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host,
+                             "Using Legacy Interrupts\n");
+                vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_INTX);
+
+                return 0;
+        }
+
+        vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_UNKNOWN);
+
+        return -EINVAL;
+}
+
+void fnic_clear_intr_mode(struct fnic *fnic)
+{
+        switch (vnic_dev_get_intr_mode(fnic->vdev)) {
+        case VNIC_DEV_INTR_MODE_MSIX:
+                pci_disable_msix(fnic->pdev);
+                break;
+        case VNIC_DEV_INTR_MODE_MSI:
+                pci_disable_msi(fnic->pdev);
+                break;
+        default:
+                break;
+        }
+
+        vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_INTX);
+}
+
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
new file mode 100644
index 000000000000..32ef6b87d895
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -0,0 +1,942 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/module.h>
+#include <linux/mempool.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/skbuff.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_fc.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/libfc.h>
+#include <scsi/fc_frame.h>
+
+#include "vnic_dev.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "fnic_io.h"
+#include "fnic.h"
+
+#define PCI_DEVICE_ID_CISCO_FNIC        0x0045
+
+/* Timer to poll notification area for events. Used for MSI interrupts */
+#define FNIC_NOTIFY_TIMER_PERIOD        (2 * HZ)
+
+static struct kmem_cache *fnic_sgl_cache[FNIC_SGL_NUM_CACHES];
+static struct kmem_cache *fnic_io_req_cache;
+LIST_HEAD(fnic_list);
+DEFINE_SPINLOCK(fnic_list_lock);
+
+/* Supported devices by fnic module */
+static struct pci_device_id fnic_id_table[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_FNIC) },
+        { 0, }
+};
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR("Abhijeet Joglekar <abjoglek@cisco.com>, "
+              "Joseph R. Eykholt <jeykholt@cisco.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DEVICE_TABLE(pci, fnic_id_table);
+
+unsigned int fnic_log_level;
+module_param(fnic_log_level, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(fnic_log_level, "bit mask of fnic logging levels");
+
+
+static struct libfc_function_template fnic_transport_template = {
+        .frame_send = fnic_send,
+        .fcp_abort_io = fnic_empty_scsi_cleanup,
+        .fcp_cleanup = fnic_empty_scsi_cleanup,
+        .exch_mgr_reset = fnic_exch_mgr_reset
+};
+
+static int fnic_slave_alloc(struct scsi_device *sdev)
+{
+        struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
+        struct fc_lport *lp = shost_priv(sdev->host);
+        struct fnic *fnic = lport_priv(lp);
+
+        sdev->tagged_supported = 1;
+
+        if (!rport || fc_remote_port_chkready(rport))
+                return -ENXIO;
+
+        scsi_activate_tcq(sdev, FNIC_DFLT_QUEUE_DEPTH);
+        rport->dev_loss_tmo = fnic->config.port_down_timeout / 1000;
+
+        return 0;
+}
+
+static struct scsi_host_template fnic_host_template = {
+        .module = THIS_MODULE,
+        .name = DRV_NAME,
+        .queuecommand = fnic_queuecommand,
+        .eh_abort_handler = fnic_abort_cmd,
+        .eh_device_reset_handler = fnic_device_reset,
+        .eh_host_reset_handler = fnic_host_reset,
+        .slave_alloc = fnic_slave_alloc,
+        .change_queue_depth = fc_change_queue_depth,
+        .change_queue_type = fc_change_queue_type,
+        .this_id = -1,
+        .cmd_per_lun = 3,
+        .can_queue = FNIC_MAX_IO_REQ,
+        .use_clustering = ENABLE_CLUSTERING,
+        .sg_tablesize = FNIC_MAX_SG_DESC_CNT,
+        .max_sectors = 0xffff,
+        .shost_attrs = fnic_attrs,
+};
+
+static void fnic_get_host_speed(struct Scsi_Host *shost);
+static struct scsi_transport_template *fnic_fc_transport;
+static struct fc_host_statistics *fnic_get_stats(struct Scsi_Host *);
+
+static struct fc_function_template fnic_fc_functions = {
+
+        .show_host_node_name = 1,
+        .show_host_port_name = 1,
+        .show_host_supported_classes = 1,
+        .show_host_supported_fc4s = 1,
+        .show_host_active_fc4s = 1,
+        .show_host_maxframe_size = 1,
+        .show_host_port_id = 1,
+        .show_host_supported_speeds = 1,
+        .get_host_speed = fnic_get_host_speed,
+        .show_host_speed = 1,
+        .show_host_port_type = 1,
+        .get_host_port_state = fc_get_host_port_state,
+        .show_host_port_state = 1,
+        .show_host_symbolic_name = 1,
+        .show_rport_maxframe_size = 1,
+        .show_rport_supported_classes = 1,
+        .show_host_fabric_name = 1,
+        .show_starget_node_name = 1,
+        .show_starget_port_name = 1,
+        .show_starget_port_id = 1,
+        .show_rport_dev_loss_tmo = 1,
+        .issue_fc_host_lip = fnic_reset,
+        .get_fc_host_stats = fnic_get_stats,
+        .dd_fcrport_size = sizeof(struct fc_rport_libfc_priv),
+        .terminate_rport_io = fnic_terminate_rport_io,
+};
+
+static void fnic_get_host_speed(struct Scsi_Host *shost)
+{
+        struct fc_lport *lp = shost_priv(shost);
+        struct fnic *fnic = lport_priv(lp);
+        u32 port_speed = vnic_dev_port_speed(fnic->vdev);
+
+        /* Add in other values as they get defined in fw */
+        switch (port_speed) {
+        case 10000:
+                fc_host_speed(shost) = FC_PORTSPEED_10GBIT;
+                break;
+        default:
+                fc_host_speed(shost) = FC_PORTSPEED_10GBIT;
+                break;
+        }
+}
+
+static struct fc_host_statistics *fnic_get_stats(struct Scsi_Host *host)
+{
+        int ret;
+        struct fc_lport *lp = shost_priv(host);
+        struct fnic *fnic = lport_priv(lp);
+        struct fc_host_statistics *stats = &lp->host_stats;
+        struct vnic_stats *vs;
+        unsigned long flags;
+
+        if (time_before(jiffies, fnic->stats_time + HZ / FNIC_STATS_RATE_LIMIT))
+                return stats;
+        fnic->stats_time = jiffies;
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        ret = vnic_dev_stats_dump(fnic->vdev, &fnic->stats);
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        if (ret) {
+                FNIC_MAIN_DBG(KERN_DEBUG, fnic->lport->host,
+                              "fnic: Get vnic stats failed"
+                              " 0x%x", ret);
+                return stats;
+        }
+        vs = fnic->stats;
+        stats->tx_frames = vs->tx.tx_unicast_frames_ok;
+        stats->tx_words  = vs->tx.tx_unicast_bytes_ok / 4;
+        stats->rx_frames = vs->rx.rx_unicast_frames_ok;
+        stats->rx_words  = vs->rx.rx_unicast_bytes_ok / 4;
+        stats->error_frames = vs->tx.tx_errors + vs->rx.rx_errors;
+        stats->dumped_frames = vs->tx.tx_drops + vs->rx.rx_drop;
+        stats->invalid_crc_count = vs->rx.rx_crc_errors;
+        stats->seconds_since_last_reset = (jiffies - lp->boot_time) / HZ;
+        stats->fcp_input_megabytes = div_u64(fnic->fcp_input_bytes, 1000000);
+        stats->fcp_output_megabytes = div_u64(fnic->fcp_output_bytes, 1000000);
+
+        return stats;
+}
+
+void fnic_log_q_error(struct fnic *fnic)
+{
+        unsigned int i;
+        u32 error_status;
+
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                error_status = ioread32(&fnic->wq[i].ctrl->error_status);
+                if (error_status)
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "WQ[%d] error_status"
+                                     " %d\n", i, error_status);
+        }
+
+        for (i = 0; i < fnic->rq_count; i++) {
+                error_status = ioread32(&fnic->rq[i].ctrl->error_status);
+                if (error_status)
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "RQ[%d] error_status"
+                                     " %d\n", i, error_status);
+        }
+
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                error_status = ioread32(&fnic->wq_copy[i].ctrl->error_status);
+                if (error_status)
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "CWQ[%d] error_status"
+                                     " %d\n", i, error_status);
+        }
+}
+
+void fnic_handle_link_event(struct fnic *fnic)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        if (fnic->stop_rx_link_events) {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                return;
+        }
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        queue_work(fnic_event_queue, &fnic->link_work);
+
+}
+
+static int fnic_notify_set(struct fnic *fnic)
+{
+        int err;
+
+        switch (vnic_dev_get_intr_mode(fnic->vdev)) {
+        case VNIC_DEV_INTR_MODE_INTX:
+                err = vnic_dev_notify_set(fnic->vdev, FNIC_INTX_NOTIFY);
+                break;
+        case VNIC_DEV_INTR_MODE_MSI:
+                err = vnic_dev_notify_set(fnic->vdev, -1);
+                break;
+        case VNIC_DEV_INTR_MODE_MSIX:
+                err = vnic_dev_notify_set(fnic->vdev, FNIC_MSIX_ERR_NOTIFY);
+                break;
+        default:
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Interrupt mode should be set up"
+                             " before devcmd notify set %d\n",
+                             vnic_dev_get_intr_mode(fnic->vdev));
+                err = -1;
+                break;
+        }
+
+        return err;
+}
+
+static void fnic_notify_timer(unsigned long data)
+{
+        struct fnic *fnic = (struct fnic *)data;
+
+        fnic_handle_link_event(fnic);
+        mod_timer(&fnic->notify_timer,
+                  round_jiffies(jiffies + FNIC_NOTIFY_TIMER_PERIOD));
+}
+
+static void fnic_notify_timer_start(struct fnic *fnic)
+{
+        switch (vnic_dev_get_intr_mode(fnic->vdev)) {
+        case VNIC_DEV_INTR_MODE_MSI:
+                /*
+                 * Schedule first timeout immediately. The driver is
+                 * initiatialized and ready to look for link up notification
+                 */
+                mod_timer(&fnic->notify_timer, jiffies);
+                break;
+        default:
+                /* Using intr for notification for INTx/MSI-X */
+                break;
+        };
+}
+
+static int fnic_dev_wait(struct vnic_dev *vdev,
+                         int (*start)(struct vnic_dev *, int),
+                         int (*finished)(struct vnic_dev *, int *),
+                         int arg)
+{
+        unsigned long time;
+        int done;
+        int err;
+
+        err = start(vdev, arg);
+        if (err)
+                return err;
+
+        /* Wait for func to complete...2 seconds max */
+        time = jiffies + (HZ * 2);
+        do {
+                err = finished(vdev, &done);
+                if (err)
+                        return err;
+                if (done)
+                        return 0;
+                schedule_timeout_uninterruptible(HZ / 10);
+        } while (time_after(time, jiffies));
+
+        return -ETIMEDOUT;
+}
+
+static int fnic_cleanup(struct fnic *fnic)
+{
+        unsigned int i;
+        int err;
+        unsigned long flags;
+        struct fc_frame *flogi = NULL;
+        struct fc_frame *flogi_resp = NULL;
+
+        vnic_dev_disable(fnic->vdev);
+        for (i = 0; i < fnic->intr_count; i++)
+                vnic_intr_mask(&fnic->intr[i]);
+
+        for (i = 0; i < fnic->rq_count; i++) {
+                err = vnic_rq_disable(&fnic->rq[i]);
+                if (err)
+                        return err;
+        }
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                err = vnic_wq_disable(&fnic->wq[i]);
+                if (err)
+                        return err;
+        }
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                err = vnic_wq_copy_disable(&fnic->wq_copy[i]);
+                if (err)
+                        return err;
+        }
+
+        /* Clean up completed IOs and FCS frames */
+        fnic_wq_copy_cmpl_handler(fnic, -1);
+        fnic_wq_cmpl_handler(fnic, -1);
+        fnic_rq_cmpl_handler(fnic, -1);
+
+        /* Clean up the IOs and FCS frames that have not completed */
+        for (i = 0; i < fnic->raw_wq_count; i++)
+                vnic_wq_clean(&fnic->wq[i], fnic_free_wq_buf);
+        for (i = 0; i < fnic->rq_count; i++)
+                vnic_rq_clean(&fnic->rq[i], fnic_free_rq_buf);
+        for (i = 0; i < fnic->wq_copy_count; i++)
+                vnic_wq_copy_clean(&fnic->wq_copy[i],
+                                   fnic_wq_copy_cleanup_handler);
+
+        for (i = 0; i < fnic->cq_count; i++)
+                vnic_cq_clean(&fnic->cq[i]);
+        for (i = 0; i < fnic->intr_count; i++)
+                vnic_intr_clean(&fnic->intr[i]);
+
+        /*
+         * Remove cached flogi and flogi resp frames if any
+         * These frames are not in any queue, and therefore queue
+         * cleanup does not clean them. So clean them explicitly
+         */
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        flogi = fnic->flogi;
+        fnic->flogi = NULL;
+        flogi_resp = fnic->flogi_resp;
+        fnic->flogi_resp = NULL;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        if (flogi)
+                dev_kfree_skb(fp_skb(flogi));
+
+        if (flogi_resp)
+                dev_kfree_skb(fp_skb(flogi_resp));
+
+        mempool_destroy(fnic->io_req_pool);
+        for (i = 0; i < FNIC_SGL_NUM_CACHES; i++)
+                mempool_destroy(fnic->io_sgl_pool[i]);
+
+        return 0;
+}
+
+static void fnic_iounmap(struct fnic *fnic)
+{
+        if (fnic->bar0.vaddr)
+                iounmap(fnic->bar0.vaddr);
+}
+
+/*
+ * Allocate element for mempools requiring GFP_DMA flag.
+ * Otherwise, checks in kmem_flagcheck() hit BUG_ON().
+ */
+static void *fnic_alloc_slab_dma(gfp_t gfp_mask, void *pool_data)
+{
+        struct kmem_cache *mem = pool_data;
+
+        return kmem_cache_alloc(mem, gfp_mask | GFP_ATOMIC | GFP_DMA);
+}
+
+static int __devinit fnic_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        struct Scsi_Host *host;
+        struct fc_lport *lp;
+        struct fnic *fnic;
+        mempool_t *pool;
+        int err;
+        int i;
+        unsigned long flags;
+
+        /*
+         * Allocate SCSI Host and set up association between host,
+         * local port, and fnic
+         */
+        host = scsi_host_alloc(&fnic_host_template,
+                               sizeof(struct fc_lport) + sizeof(struct fnic));
+        if (!host) {
+                printk(KERN_ERR PFX "Unable to alloc SCSI host\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+        lp = shost_priv(host);
+        lp->host = host;
+        fnic = lport_priv(lp);
+        fnic->lport = lp;
+
+        snprintf(fnic->name, sizeof(fnic->name) - 1, "%s%d", DRV_NAME,
+                 host->host_no);
+
+        host->transportt = fnic_fc_transport;
+
+        err = scsi_init_shared_tag_map(host, FNIC_MAX_IO_REQ);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Unable to alloc shared tag map\n");
+                goto err_out_free_hba;
+        }
+
+        /* Setup PCI resources */
+        pci_set_drvdata(pdev, fnic);
+
+        fnic->pdev = pdev;
+
+        err = pci_enable_device(pdev);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Cannot enable PCI device, aborting.\n");
+                goto err_out_free_hba;
+        }
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Cannot enable PCI resources, aborting\n");
+                goto err_out_disable_device;
+        }
+
+        pci_set_master(pdev);
+
+        /* Query PCI controller on system for DMA addressing
+         * limitation for the device.  Try 40-bit first, and
+         * fail to 32-bit.
+         */
+        err = pci_set_dma_mask(pdev, DMA_40BIT_MASK);
+        if (err) {
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (err) {
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "No usable DMA configuration "
+                                     "aborting\n");
+                        goto err_out_release_regions;
+                }
+                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                if (err) {
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "Unable to obtain 32-bit DMA "
+                                     "for consistent allocations, aborting.\n");
+                        goto err_out_release_regions;
+                }
+        } else {
+                err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);
+                if (err) {
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "Unable to obtain 40-bit DMA "
+                                     "for consistent allocations, aborting.\n");
+                        goto err_out_release_regions;
+                }
+        }
+
+        /* Map vNIC resources from BAR0 */
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "BAR0 not memory-map'able, aborting.\n");
+                err = -ENODEV;
+                goto err_out_release_regions;
+        }
+
+        fnic->bar0.vaddr = pci_iomap(pdev, 0, 0);
+        fnic->bar0.bus_addr = pci_resource_start(pdev, 0);
+        fnic->bar0.len = pci_resource_len(pdev, 0);
+
+        if (!fnic->bar0.vaddr) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Cannot memory-map BAR0 res hdr, "
+                             "aborting.\n");
+                err = -ENODEV;
+                goto err_out_release_regions;
+        }
+
+        fnic->vdev = vnic_dev_register(NULL, fnic, pdev, &fnic->bar0);
+        if (!fnic->vdev) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "vNIC registration failed, "
+                             "aborting.\n");
+                err = -ENODEV;
+                goto err_out_iounmap;
+        }
+
+        err = fnic_dev_wait(fnic->vdev, vnic_dev_open,
+                            vnic_dev_open_done, 0);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "vNIC dev open failed, aborting.\n");
+                goto err_out_vnic_unregister;
+        }
+
+        err = vnic_dev_init(fnic->vdev, 0);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "vNIC dev init failed, aborting.\n");
+                goto err_out_dev_close;
+        }
+
+        err = vnic_dev_mac_addr(fnic->vdev, fnic->mac_addr);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "vNIC get MAC addr failed \n");
+                goto err_out_dev_close;
+        }
+
+        /* Get vNIC configuration */
+        err = fnic_get_vnic_config(fnic);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Get vNIC configuration failed, "
+                             "aborting.\n");
+                goto err_out_dev_close;
+        }
+        host->max_lun = fnic->config.luns_per_tgt;
+        host->max_id = FNIC_MAX_FCP_TARGET;
+
+        fnic_get_res_counts(fnic);
+
+        err = fnic_set_intr_mode(fnic);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Failed to set intr mode, "
+                             "aborting.\n");
+                goto err_out_dev_close;
+        }
+
+        err = fnic_request_intr(fnic);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Unable to request irq.\n");
+                goto err_out_clear_intr;
+        }
+
+        err = fnic_alloc_vnic_resources(fnic);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Failed to alloc vNIC resources, "
+                             "aborting.\n");
+                goto err_out_free_intr;
+        }
+
+
+        /* initialize all fnic locks */
+        spin_lock_init(&fnic->fnic_lock);
+
+        for (i = 0; i < FNIC_WQ_MAX; i++)
+                spin_lock_init(&fnic->wq_lock[i]);
+
+        for (i = 0; i < FNIC_WQ_COPY_MAX; i++) {
+                spin_lock_init(&fnic->wq_copy_lock[i]);
+                fnic->wq_copy_desc_low[i] = DESC_CLEAN_LOW_WATERMARK;
+                fnic->fw_ack_recd[i] = 0;
+                fnic->fw_ack_index[i] = -1;
+        }
+
+        for (i = 0; i < FNIC_IO_LOCKS; i++)
+                spin_lock_init(&fnic->io_req_lock[i]);
+
+        fnic->io_req_pool = mempool_create_slab_pool(2, fnic_io_req_cache);
+        if (!fnic->io_req_pool)
+                goto err_out_free_resources;
+
+        pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,
+                              fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
+        if (!pool)
+                goto err_out_free_ioreq_pool;
+        fnic->io_sgl_pool[FNIC_SGL_CACHE_DFLT] = pool;
+
+        pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,
+                              fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);
+        if (!pool)
+                goto err_out_free_dflt_pool;
+        fnic->io_sgl_pool[FNIC_SGL_CACHE_MAX] = pool;
+
+        /* setup vlan config, hw inserts vlan header */
+        fnic->vlan_hw_insert = 1;
+        fnic->vlan_id = 0;
+
+        fnic->flogi_oxid = FC_XID_UNKNOWN;
+        fnic->flogi = NULL;
+        fnic->flogi_resp = NULL;
+        fnic->state = FNIC_IN_FC_MODE;
+
+        /* Enable hardware stripping of vlan header on ingress */
+        fnic_set_nic_config(fnic, 0, 0, 0, 0, 0, 0, 1);
+
+        /* Setup notification buffer area */
+        err = fnic_notify_set(fnic);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Failed to alloc notify buffer, aborting.\n");
+                goto err_out_free_max_pool;
+        }
+
+        /* Setup notify timer when using MSI interrupts */
+        if (vnic_dev_get_intr_mode(fnic->vdev) == VNIC_DEV_INTR_MODE_MSI)
+                setup_timer(&fnic->notify_timer,
+                            fnic_notify_timer, (unsigned long)fnic);
+
+        /* allocate RQ buffers and post them to RQ*/
+        for (i = 0; i < fnic->rq_count; i++) {
+                err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
+                if (err) {
+                        shost_printk(KERN_ERR, fnic->lport->host,
+                                     "fnic_alloc_rq_frame can't alloc "
+                                     "frame\n");
+                        goto err_out_free_rq_buf;
+                }
+        }
+
+        /*
+         * Initialization done with PCI system, hardware, firmware.
+         * Add host to SCSI
+         */
+        err = scsi_add_host(lp->host, &pdev->dev);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "fnic: scsi_add_host failed...exiting\n");
+                goto err_out_free_rq_buf;
+        }
+
+        /* Start local port initiatialization */
+
+        lp->link_up = 0;
+        lp->tt = fnic_transport_template;
+
+        lp->emp = fc_exch_mgr_alloc(lp, FC_CLASS_3,
+                                    FCPIO_HOST_EXCH_RANGE_START,
+                                    FCPIO_HOST_EXCH_RANGE_END);
+        if (!lp->emp) {
+                err = -ENOMEM;
+                goto err_out_remove_scsi_host;
+        }
+
+        lp->max_retry_count = fnic->config.flogi_retries;
+        lp->service_params = (FCP_SPPF_INIT_FCN | FCP_SPPF_RD_XRDY_DIS |
+                              FCP_SPPF_CONF_COMPL);
+        if (fnic->config.flags & VFCF_FCP_SEQ_LVL_ERR)
+                lp->service_params |= FCP_SPPF_RETRY;
+
+        lp->boot_time = jiffies;
+        lp->e_d_tov = fnic->config.ed_tov;
+        lp->r_a_tov = fnic->config.ra_tov;
+        lp->link_supported_speeds = FC_PORTSPEED_10GBIT;
+        fc_set_wwnn(lp, fnic->config.node_wwn);
+        fc_set_wwpn(lp, fnic->config.port_wwn);
+
+        fc_exch_init(lp);
+        fc_lport_init(lp);
+        fc_elsct_init(lp);
+        fc_rport_init(lp);
+        fc_disc_init(lp);
+
+        fc_lport_config(lp);
+
+        if (fc_set_mfs(lp, fnic->config.maxdatafieldsize +
+                       sizeof(struct fc_frame_header))) {
+                err = -EINVAL;
+                goto err_out_free_exch_mgr;
+        }
+        fc_host_maxframe_size(lp->host) = lp->mfs;
+
+        sprintf(fc_host_symbolic_name(lp->host),
+                DRV_NAME " v" DRV_VERSION " over %s", fnic->name);
+
+        spin_lock_irqsave(&fnic_list_lock, flags);
+        list_add_tail(&fnic->list, &fnic_list);
+        spin_unlock_irqrestore(&fnic_list_lock, flags);
+
+        INIT_WORK(&fnic->link_work, fnic_handle_link);
+        INIT_WORK(&fnic->frame_work, fnic_handle_frame);
+        skb_queue_head_init(&fnic->frame_queue);
+
+        /* Enable all queues */
+        for (i = 0; i < fnic->raw_wq_count; i++)
+                vnic_wq_enable(&fnic->wq[i]);
+        for (i = 0; i < fnic->rq_count; i++)
+                vnic_rq_enable(&fnic->rq[i]);
+        for (i = 0; i < fnic->wq_copy_count; i++)
+                vnic_wq_copy_enable(&fnic->wq_copy[i]);
+
+        fc_fabric_login(lp);
+
+        vnic_dev_enable(fnic->vdev);
+        for (i = 0; i < fnic->intr_count; i++)
+                vnic_intr_unmask(&fnic->intr[i]);
+
+        fnic_notify_timer_start(fnic);
+
+        return 0;
+
+err_out_free_exch_mgr:
+        fc_exch_mgr_free(lp->emp);
+err_out_remove_scsi_host:
+        fc_remove_host(fnic->lport->host);
+        scsi_remove_host(fnic->lport->host);
+err_out_free_rq_buf:
+        for (i = 0; i < fnic->rq_count; i++)
+                vnic_rq_clean(&fnic->rq[i], fnic_free_rq_buf);
+        vnic_dev_notify_unset(fnic->vdev);
+err_out_free_max_pool:
+        mempool_destroy(fnic->io_sgl_pool[FNIC_SGL_CACHE_MAX]);
+err_out_free_dflt_pool:
+        mempool_destroy(fnic->io_sgl_pool[FNIC_SGL_CACHE_DFLT]);
+err_out_free_ioreq_pool:
+        mempool_destroy(fnic->io_req_pool);
+err_out_free_resources:
+        fnic_free_vnic_resources(fnic);
+err_out_free_intr:
+        fnic_free_intr(fnic);
+err_out_clear_intr:
+        fnic_clear_intr_mode(fnic);
+err_out_dev_close:
+        vnic_dev_close(fnic->vdev);
+err_out_vnic_unregister:
+        vnic_dev_unregister(fnic->vdev);
+err_out_iounmap:
+        fnic_iounmap(fnic);
+err_out_release_regions:
+        pci_release_regions(pdev);
+err_out_disable_device:
+        pci_disable_device(pdev);
+err_out_free_hba:
+        scsi_host_put(lp->host);
+err_out:
+        return err;
+}
+
+static void __devexit fnic_remove(struct pci_dev *pdev)
+{
+        struct fnic *fnic = pci_get_drvdata(pdev);
+        unsigned long flags;
+
+        /*
+         * Mark state so that the workqueue thread stops forwarding
+         * received frames and link events to the local port. ISR and
+         * other threads that can queue work items will also stop
+         * creating work items on the fnic workqueue
+         */
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->stop_rx_link_events = 1;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        if (vnic_dev_get_intr_mode(fnic->vdev) == VNIC_DEV_INTR_MODE_MSI)
+                del_timer_sync(&fnic->notify_timer);
+
+        /*
+         * Flush the fnic event queue. After this call, there should
+         * be no event queued for this fnic device in the workqueue
+         */
+        flush_workqueue(fnic_event_queue);
+        skb_queue_purge(&fnic->frame_queue);
+
+        /*
+         * Log off the fabric. This stops all remote ports, dns port,
+         * logs off the fabric. This flushes all rport, disc, lport work
+         * before returning
+         */
+        fc_fabric_logoff(fnic->lport);
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->in_remove = 1;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        fc_lport_destroy(fnic->lport);
+
+        /*
+         * This stops the fnic device, masks all interrupts. Completed
+         * CQ entries are drained. Posted WQ/RQ/Copy-WQ entries are
+         * cleaned up
+         */
+        fnic_cleanup(fnic);
+
+        BUG_ON(!skb_queue_empty(&fnic->frame_queue));
+
+        spin_lock_irqsave(&fnic_list_lock, flags);
+        list_del(&fnic->list);
+        spin_unlock_irqrestore(&fnic_list_lock, flags);
+
+        fc_remove_host(fnic->lport->host);
+        scsi_remove_host(fnic->lport->host);
+        fc_exch_mgr_free(fnic->lport->emp);
+        vnic_dev_notify_unset(fnic->vdev);
+        fnic_free_vnic_resources(fnic);
+        fnic_free_intr(fnic);
+        fnic_clear_intr_mode(fnic);
+        vnic_dev_close(fnic->vdev);
+        vnic_dev_unregister(fnic->vdev);
+        fnic_iounmap(fnic);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        scsi_host_put(fnic->lport->host);
+}
+
+static struct pci_driver fnic_driver = {
+        .name = DRV_NAME,
+        .id_table = fnic_id_table,
+        .probe = fnic_probe,
+        .remove = __devexit_p(fnic_remove),
+};
+
+static int __init fnic_init_module(void)
+{
+        size_t len;
+        int err = 0;
+
+        printk(KERN_INFO PFX "%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);
+
+        /* Create a cache for allocation of default size sgls */
+        len = sizeof(struct fnic_dflt_sgl_list);
+        fnic_sgl_cache[FNIC_SGL_CACHE_DFLT] = kmem_cache_create
+                ("fnic_sgl_dflt", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,
+                 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,
+                 NULL);
+        if (!fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]) {
+                printk(KERN_ERR PFX "failed to create fnic dflt sgl slab\n");
+                err = -ENOMEM;
+                goto err_create_fnic_sgl_slab_dflt;
+        }
+
+        /* Create a cache for allocation of max size sgls*/
+        len = sizeof(struct fnic_sgl_list);
+        fnic_sgl_cache[FNIC_SGL_CACHE_MAX] = kmem_cache_create
+                ("fnic_sgl_max", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,
+                 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,
+                 NULL);
+        if (!fnic_sgl_cache[FNIC_SGL_CACHE_MAX]) {
+                printk(KERN_ERR PFX "failed to create fnic max sgl slab\n");
+                err = -ENOMEM;
+                goto err_create_fnic_sgl_slab_max;
+        }
+
+        /* Create a cache of io_req structs for use via mempool */
+        fnic_io_req_cache = kmem_cache_create("fnic_io_req",
+                                              sizeof(struct fnic_io_req),
+                                              0, SLAB_HWCACHE_ALIGN, NULL);
+        if (!fnic_io_req_cache) {
+                printk(KERN_ERR PFX "failed to create fnic io_req slab\n");
+                err = -ENOMEM;
+                goto err_create_fnic_ioreq_slab;
+        }
+
+        fnic_event_queue = create_singlethread_workqueue("fnic_event_wq");
+        if (!fnic_event_queue) {
+                printk(KERN_ERR PFX "fnic work queue create failed\n");
+                err = -ENOMEM;
+                goto err_create_fnic_workq;
+        }
+
+        spin_lock_init(&fnic_list_lock);
+        INIT_LIST_HEAD(&fnic_list);
+
+        fnic_fc_transport = fc_attach_transport(&fnic_fc_functions);
+        if (!fnic_fc_transport) {
+                printk(KERN_ERR PFX "fc_attach_transport error\n");
+                err = -ENOMEM;
+                goto err_fc_transport;
+        }
+
+        /* register the driver with PCI system */
+        err = pci_register_driver(&fnic_driver);
+        if (err < 0) {
+                printk(KERN_ERR PFX "pci register error\n");
+                goto err_pci_register;
+        }
+        return err;
+
+err_pci_register:
+        fc_release_transport(fnic_fc_transport);
+err_fc_transport:
+        destroy_workqueue(fnic_event_queue);
+err_create_fnic_workq:
+        kmem_cache_destroy(fnic_io_req_cache);
+err_create_fnic_ioreq_slab:
+        kmem_cache_destroy(fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);
+err_create_fnic_sgl_slab_max:
+        kmem_cache_destroy(fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
+err_create_fnic_sgl_slab_dflt:
+        return err;
+}
+
+static void __exit fnic_cleanup_module(void)
+{
+        pci_unregister_driver(&fnic_driver);
+        destroy_workqueue(fnic_event_queue);
+        kmem_cache_destroy(fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);
+        kmem_cache_destroy(fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
+        kmem_cache_destroy(fnic_io_req_cache);
+        fc_release_transport(fnic_fc_transport);
+}
+
+module_init(fnic_init_module);
+module_exit(fnic_cleanup_module);
+
diff --git a/drivers/scsi/fnic/fnic_res.c b/drivers/scsi/fnic/fnic_res.c
new file mode 100644
index 000000000000..7ba61ec715d2
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_res.c
@@ -0,0 +1,444 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include "wq_enet_desc.h"
+#include "rq_enet_desc.h"
+#include "cq_enet_desc.h"
+#include "vnic_resource.h"
+#include "vnic_dev.h"
+#include "vnic_wq.h"
+#include "vnic_rq.h"
+#include "vnic_cq.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "vnic_nic.h"
+#include "fnic.h"
+
+int fnic_get_vnic_config(struct fnic *fnic)
+{
+        struct vnic_fc_config *c = &fnic->config;
+        int err;
+
+#define GET_CONFIG(m) \
+        do { \
+                err = vnic_dev_spec(fnic->vdev, \
+                                    offsetof(struct vnic_fc_config, m), \
+                                    sizeof(c->m), &c->m); \
+                if (err) { \
+                        shost_printk(KERN_ERR, fnic->lport->host, \
+                                     "Error getting %s, %d\n", #m, \
+                                     err); \
+                        return err; \
+                } \
+        } while (0);
+
+        GET_CONFIG(node_wwn);
+        GET_CONFIG(port_wwn);
+        GET_CONFIG(wq_enet_desc_count);
+        GET_CONFIG(wq_copy_desc_count);
+        GET_CONFIG(rq_desc_count);
+        GET_CONFIG(maxdatafieldsize);
+        GET_CONFIG(ed_tov);
+        GET_CONFIG(ra_tov);
+        GET_CONFIG(intr_timer);
+        GET_CONFIG(intr_timer_type);
+        GET_CONFIG(flags);
+        GET_CONFIG(flogi_retries);
+        GET_CONFIG(flogi_timeout);
+        GET_CONFIG(plogi_retries);
+        GET_CONFIG(plogi_timeout);
+        GET_CONFIG(io_throttle_count);
+        GET_CONFIG(link_down_timeout);
+        GET_CONFIG(port_down_timeout);
+        GET_CONFIG(port_down_io_retries);
+        GET_CONFIG(luns_per_tgt);
+
+        c->wq_enet_desc_count =
+                min_t(u32, VNIC_FNIC_WQ_DESCS_MAX,
+                      max_t(u32, VNIC_FNIC_WQ_DESCS_MIN,
+                            c->wq_enet_desc_count));
+        c->wq_enet_desc_count = ALIGN(c->wq_enet_desc_count, 16);
+
+        c->wq_copy_desc_count =
+                min_t(u32, VNIC_FNIC_WQ_COPY_DESCS_MAX,
+                      max_t(u32, VNIC_FNIC_WQ_COPY_DESCS_MIN,
+                            c->wq_copy_desc_count));
+        c->wq_copy_desc_count = ALIGN(c->wq_copy_desc_count, 16);
+
+        c->rq_desc_count =
+                min_t(u32, VNIC_FNIC_RQ_DESCS_MAX,
+                      max_t(u32, VNIC_FNIC_RQ_DESCS_MIN,
+                            c->rq_desc_count));
+        c->rq_desc_count = ALIGN(c->rq_desc_count, 16);
+
+        c->maxdatafieldsize =
+                min_t(u16, VNIC_FNIC_MAXDATAFIELDSIZE_MAX,
+                      max_t(u16, VNIC_FNIC_MAXDATAFIELDSIZE_MIN,
+                            c->maxdatafieldsize));
+        c->ed_tov =
+                min_t(u32, VNIC_FNIC_EDTOV_MAX,
+                      max_t(u32, VNIC_FNIC_EDTOV_MIN,
+                            c->ed_tov));
+
+        c->ra_tov =
+                min_t(u32, VNIC_FNIC_RATOV_MAX,
+                      max_t(u32, VNIC_FNIC_RATOV_MIN,
+                            c->ra_tov));
+
+        c->flogi_retries =
+                min_t(u32, VNIC_FNIC_FLOGI_RETRIES_MAX, c->flogi_retries);
+
+        c->flogi_timeout =
+                min_t(u32, VNIC_FNIC_FLOGI_TIMEOUT_MAX,
+                      max_t(u32, VNIC_FNIC_FLOGI_TIMEOUT_MIN,
+                            c->flogi_timeout));
+
+        c->plogi_retries =
+                min_t(u32, VNIC_FNIC_PLOGI_RETRIES_MAX, c->plogi_retries);
+
+        c->plogi_timeout =
+                min_t(u32, VNIC_FNIC_PLOGI_TIMEOUT_MAX,
+                      max_t(u32, VNIC_FNIC_PLOGI_TIMEOUT_MIN,
+                            c->plogi_timeout));
+
+        c->io_throttle_count =
+                min_t(u32, VNIC_FNIC_IO_THROTTLE_COUNT_MAX,
+                      max_t(u32, VNIC_FNIC_IO_THROTTLE_COUNT_MIN,
+                            c->io_throttle_count));
+
+        c->link_down_timeout =
+                min_t(u32, VNIC_FNIC_LINK_DOWN_TIMEOUT_MAX,
+                      c->link_down_timeout);
+
+        c->port_down_timeout =
+                min_t(u32, VNIC_FNIC_PORT_DOWN_TIMEOUT_MAX,
+                      c->port_down_timeout);
+
+        c->port_down_io_retries =
+                min_t(u32, VNIC_FNIC_PORT_DOWN_IO_RETRIES_MAX,
+                      c->port_down_io_retries);
+
+        c->luns_per_tgt =
+                min_t(u32, VNIC_FNIC_LUNS_PER_TARGET_MAX,
+                      max_t(u32, VNIC_FNIC_LUNS_PER_TARGET_MIN,
+                            c->luns_per_tgt));
+
+        c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
+        c->intr_timer_type = c->intr_timer_type;
+
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
+                     "wq/wq_copy/rq %d/%d/%d\n",
+                     fnic->mac_addr[0], fnic->mac_addr[1], fnic->mac_addr[2],
+                     fnic->mac_addr[3], fnic->mac_addr[4], fnic->mac_addr[5],
+                     c->wq_enet_desc_count, c->wq_copy_desc_count,
+                     c->rq_desc_count);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC node wwn %llx port wwn %llx\n",
+                     c->node_wwn, c->port_wwn);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC ed_tov %d ra_tov %d\n",
+                     c->ed_tov, c->ra_tov);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC mtu %d intr timer %d\n",
+                     c->maxdatafieldsize, c->intr_timer);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC flags 0x%x luns per tgt %d\n",
+                     c->flags, c->luns_per_tgt);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC flogi_retries %d flogi timeout %d\n",
+                     c->flogi_retries, c->flogi_timeout);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC plogi retries %d plogi timeout %d\n",
+                     c->plogi_retries, c->plogi_timeout);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC io throttle count %d link dn timeout %d\n",
+                     c->io_throttle_count, c->link_down_timeout);
+        shost_printk(KERN_INFO, fnic->lport->host,
+                     "vNIC port dn io retries %d port dn timeout %d\n",
+                     c->port_down_io_retries, c->port_down_timeout);
+
+        return 0;
+}
+
+int fnic_set_nic_config(struct fnic *fnic, u8 rss_default_cpu,
+                        u8 rss_hash_type,
+                        u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable,
+                        u8 tso_ipid_split_en, u8 ig_vlan_strip_en)
+{
+        u64 a0, a1;
+        u32 nic_cfg;
+        int wait = 1000;
+
+        vnic_set_nic_cfg(&nic_cfg, rss_default_cpu,
+                rss_hash_type, rss_hash_bits, rss_base_cpu,
+                rss_enable, tso_ipid_split_en, ig_vlan_strip_en);
+
+        a0 = nic_cfg;
+        a1 = 0;
+
+        return vnic_dev_cmd(fnic->vdev, CMD_NIC_CFG, &a0, &a1, wait);
+}
+
+void fnic_get_res_counts(struct fnic *fnic)
+{
+        fnic->wq_count = vnic_dev_get_res_count(fnic->vdev, RES_TYPE_WQ);
+        fnic->raw_wq_count = fnic->wq_count - 1;
+        fnic->wq_copy_count = fnic->wq_count - fnic->raw_wq_count;
+        fnic->rq_count = vnic_dev_get_res_count(fnic->vdev, RES_TYPE_RQ);
+        fnic->cq_count = vnic_dev_get_res_count(fnic->vdev, RES_TYPE_CQ);
+        fnic->intr_count = vnic_dev_get_res_count(fnic->vdev,
+                RES_TYPE_INTR_CTRL);
+}
+
+void fnic_free_vnic_resources(struct fnic *fnic)
+{
+        unsigned int i;
+
+        for (i = 0; i < fnic->raw_wq_count; i++)
+                vnic_wq_free(&fnic->wq[i]);
+
+        for (i = 0; i < fnic->wq_copy_count; i++)
+                vnic_wq_copy_free(&fnic->wq_copy[i]);
+
+        for (i = 0; i < fnic->rq_count; i++)
+                vnic_rq_free(&fnic->rq[i]);
+
+        for (i = 0; i < fnic->cq_count; i++)
+                vnic_cq_free(&fnic->cq[i]);
+
+        for (i = 0; i < fnic->intr_count; i++)
+                vnic_intr_free(&fnic->intr[i]);
+}
+
+int fnic_alloc_vnic_resources(struct fnic *fnic)
+{
+        enum vnic_dev_intr_mode intr_mode;
+        unsigned int mask_on_assertion;
+        unsigned int interrupt_offset;
+        unsigned int error_interrupt_enable;
+        unsigned int error_interrupt_offset;
+        unsigned int i, cq_index;
+        unsigned int wq_copy_cq_desc_count;
+        int err;
+
+        intr_mode = vnic_dev_get_intr_mode(fnic->vdev);
+
+        shost_printk(KERN_INFO, fnic->lport->host, "vNIC interrupt mode: %s\n",
+                     intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :
+                     intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :
+                     intr_mode == VNIC_DEV_INTR_MODE_MSIX ?
+                     "MSI-X" : "unknown");
+
+        shost_printk(KERN_INFO, fnic->lport->host, "vNIC resources avail: "
+                     "wq %d cp_wq %d raw_wq %d rq %d cq %d intr %d\n",
+                     fnic->wq_count, fnic->wq_copy_count, fnic->raw_wq_count,
+                     fnic->rq_count, fnic->cq_count, fnic->intr_count);
+
+        /* Allocate Raw WQ used for FCS frames */
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                err = vnic_wq_alloc(fnic->vdev, &fnic->wq[i], i,
+                        fnic->config.wq_enet_desc_count,
+                        sizeof(struct wq_enet_desc));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        /* Allocate Copy WQs used for SCSI IOs */
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                err = vnic_wq_copy_alloc(fnic->vdev, &fnic->wq_copy[i],
+                        (fnic->raw_wq_count + i),
+                        fnic->config.wq_copy_desc_count,
+                        sizeof(struct fcpio_host_req));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        /* RQ for receiving FCS frames */
+        for (i = 0; i < fnic->rq_count; i++) {
+                err = vnic_rq_alloc(fnic->vdev, &fnic->rq[i], i,
+                        fnic->config.rq_desc_count,
+                        sizeof(struct rq_enet_desc));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        /* CQ for each RQ */
+        for (i = 0; i < fnic->rq_count; i++) {
+                cq_index = i;
+                err = vnic_cq_alloc(fnic->vdev,
+                        &fnic->cq[cq_index], cq_index,
+                        fnic->config.rq_desc_count,
+                        sizeof(struct cq_enet_rq_desc));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        /* CQ for each WQ */
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                cq_index = fnic->rq_count + i;
+                err = vnic_cq_alloc(fnic->vdev, &fnic->cq[cq_index], cq_index,
+                        fnic->config.wq_enet_desc_count,
+                        sizeof(struct cq_enet_wq_desc));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        /* CQ for each COPY WQ */
+        wq_copy_cq_desc_count = (fnic->config.wq_copy_desc_count * 3);
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                cq_index = fnic->raw_wq_count + fnic->rq_count + i;
+                err = vnic_cq_alloc(fnic->vdev, &fnic->cq[cq_index],
+                        cq_index,
+                        wq_copy_cq_desc_count,
+                        sizeof(struct fcpio_fw_req));
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        for (i = 0; i < fnic->intr_count; i++) {
+                err = vnic_intr_alloc(fnic->vdev, &fnic->intr[i], i);
+                if (err)
+                        goto err_out_cleanup;
+        }
+
+        fnic->legacy_pba = vnic_dev_get_res(fnic->vdev,
+                                RES_TYPE_INTR_PBA_LEGACY, 0);
+
+        if (!fnic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Failed to hook legacy pba resource\n");
+                err = -ENODEV;
+                goto err_out_cleanup;
+        }
+
+        /*
+         * Init RQ/WQ resources.
+         *
+         * RQ[0 to n-1] point to CQ[0 to n-1]
+         * WQ[0 to m-1] point to CQ[n to n+m-1]
+         * WQ_COPY[0 to k-1] points to CQ[n+m to n+m+k-1]
+         *
+         * Note for copy wq we always initialize with cq_index = 0
+         *
+         * Error interrupt is not enabled for MSI.
+         */
+
+        switch (intr_mode) {
+        case VNIC_DEV_INTR_MODE_INTX:
+        case VNIC_DEV_INTR_MODE_MSIX:
+                error_interrupt_enable = 1;
+                error_interrupt_offset = fnic->err_intr_offset;
+                break;
+        default:
+                error_interrupt_enable = 0;
+                error_interrupt_offset = 0;
+                break;
+        }
+
+        for (i = 0; i < fnic->rq_count; i++) {
+                cq_index = i;
+                vnic_rq_init(&fnic->rq[i],
+                             cq_index,
+                             error_interrupt_enable,
+                             error_interrupt_offset);
+        }
+
+        for (i = 0; i < fnic->raw_wq_count; i++) {
+                cq_index = i + fnic->rq_count;
+                vnic_wq_init(&fnic->wq[i],
+                             cq_index,
+                             error_interrupt_enable,
+                             error_interrupt_offset);
+        }
+
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                vnic_wq_copy_init(&fnic->wq_copy[i],
+                                  0 /* cq_index 0 - always */,
+                                  error_interrupt_enable,
+                                  error_interrupt_offset);
+        }
+
+        for (i = 0; i < fnic->cq_count; i++) {
+
+                switch (intr_mode) {
+                case VNIC_DEV_INTR_MODE_MSIX:
+                        interrupt_offset = i;
+                        break;
+                default:
+                        interrupt_offset = 0;
+                        break;
+                }
+
+                vnic_cq_init(&fnic->cq[i],
+                        0 /* flow_control_enable */,
+                        1 /* color_enable */,
+                        0 /* cq_head */,
+                        0 /* cq_tail */,
+                        1 /* cq_tail_color */,
+                        1 /* interrupt_enable */,
+                        1 /* cq_entry_enable */,
+                        0 /* cq_message_enable */,
+                        interrupt_offset,
+                        0 /* cq_message_addr */);
+        }
+
+        /*
+         * Init INTR resources
+         *
+         * mask_on_assertion is not used for INTx due to the level-
+         * triggered nature of INTx
+         */
+
+        switch (intr_mode) {
+        case VNIC_DEV_INTR_MODE_MSI:
+        case VNIC_DEV_INTR_MODE_MSIX:
+                mask_on_assertion = 1;
+                break;
+        default:
+                mask_on_assertion = 0;
+                break;
+        }
+
+        for (i = 0; i < fnic->intr_count; i++) {
+                vnic_intr_init(&fnic->intr[i],
+                        fnic->config.intr_timer,
+                        fnic->config.intr_timer_type,
+                        mask_on_assertion);
+        }
+
+        /* init the stats memory by making the first call here */
+        err = vnic_dev_stats_dump(fnic->vdev, &fnic->stats);
+        if (err) {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "vnic_dev_stats_dump failed - x%x\n", err);
+                goto err_out_cleanup;
+        }
+
+        /* Clear LIF stats */
+        vnic_dev_stats_clear(fnic->vdev);
+
+        return 0;
+
+err_out_cleanup:
+        fnic_free_vnic_resources(fnic);
+
+        return err;
+}
diff --git a/drivers/scsi/fnic/fnic_res.h b/drivers/scsi/fnic/fnic_res.h
new file mode 100644
index 000000000000..b6f310262534
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_res.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FNIC_RES_H_
+#define _FNIC_RES_H_
+
+#include "wq_enet_desc.h"
+#include "rq_enet_desc.h"
+#include "vnic_wq.h"
+#include "vnic_rq.h"
+#include "fnic_io.h"
+#include "fcpio.h"
+#include "vnic_wq_copy.h"
+#include "vnic_cq_copy.h"
+
+static inline void fnic_queue_wq_desc(struct vnic_wq *wq,
+                                      void *os_buf, dma_addr_t dma_addr,
+                                      unsigned int len, unsigned int fc_eof,
+                                      int vlan_tag_insert,
+                                      unsigned int vlan_tag,
+                                      int cq_entry, int sop, int eop)
+{
+        struct wq_enet_desc *desc = vnic_wq_next_desc(wq);
+
+        wq_enet_desc_enc(desc,
+                         (u64)dma_addr | VNIC_PADDR_TARGET,
+                         (u16)len,
+                         0, /* mss_or_csum_offset */
+                         (u16)fc_eof,
+                         0, /* offload_mode */
+                         (u8)eop, (u8)cq_entry,
+                         1, /* fcoe_encap */
+                         (u8)vlan_tag_insert,
+                         (u16)vlan_tag,
+                         0 /* loopback */);
+
+        vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop);
+}
+
+static inline void fnic_queue_wq_copy_desc_icmnd_16(struct vnic_wq_copy *wq,
+                                                    u32 req_id,
+                                                    u32 lunmap_id, u8 spl_flags,
+                                                    u32 sgl_cnt, u32 sense_len,
+                                                    u64 sgl_addr, u64 sns_addr,
+                                                    u8 crn, u8 pri_ta,
+                                                    u8 flags, u8 *scsi_cdb,
+                                                    u32 data_len, u8 *lun,
+                                                    u32 d_id, u16 mss,
+                                                    u32 ratov, u32 edtov)
+{
+        struct fcpio_host_req *desc = vnic_wq_copy_next_desc(wq);
+
+        desc->hdr.type = FCPIO_ICMND_16; /* enum fcpio_type */
+        desc->hdr.status = 0;            /* header status entry */
+        desc->hdr._resvd = 0;            /* reserved */
+        desc->hdr.tag.u.req_id = req_id; /* id for this request */
+
+        desc->u.icmnd_16.lunmap_id = lunmap_id; /* index into lunmap table */
+        desc->u.icmnd_16.special_req_flags = spl_flags; /* exch req flags */
+        desc->u.icmnd_16._resvd0[0] = 0;        /* reserved */
+        desc->u.icmnd_16._resvd0[1] = 0;        /* reserved */
+        desc->u.icmnd_16._resvd0[2] = 0;        /* reserved */
+        desc->u.icmnd_16.sgl_cnt = sgl_cnt;     /* scatter-gather list count */
+        desc->u.icmnd_16.sense_len = sense_len; /* sense buffer length */
+        desc->u.icmnd_16.sgl_addr = sgl_addr;   /* scatter-gather list addr */
+        desc->u.icmnd_16.sense_addr = sns_addr; /* sense buffer address */
+        desc->u.icmnd_16.crn = crn;             /* SCSI Command Reference No.*/
+        desc->u.icmnd_16.pri_ta = pri_ta;       /* SCSI Pri & Task attribute */
+        desc->u.icmnd_16._resvd1 = 0;           /* reserved: should be 0 */
+        desc->u.icmnd_16.flags = flags;         /* command flags */
+        memcpy(desc->u.icmnd_16.scsi_cdb, scsi_cdb, CDB_16);    /* SCSI CDB */
+        desc->u.icmnd_16.data_len = data_len;   /* length of data expected */
+        memcpy(desc->u.icmnd_16.lun, lun, LUN_ADDRESS);  /* LUN address */
+        desc->u.icmnd_16._resvd2 = 0;           /* reserved */
+        hton24(desc->u.icmnd_16.d_id, d_id);    /* FC vNIC only: Target D_ID */
+        desc->u.icmnd_16.mss = mss;             /* FC vNIC only: max burst */
+        desc->u.icmnd_16.r_a_tov = ratov; /*FC vNIC only: Res. Alloc Timeout */
+        desc->u.icmnd_16.e_d_tov = edtov; /*FC vNIC only: Err Detect Timeout */
+
+        vnic_wq_copy_post(wq);
+}
+
+static inline void fnic_queue_wq_copy_desc_itmf(struct vnic_wq_copy *wq,
+                                                u32 req_id, u32 lunmap_id,
+                                                u32 tm_req, u32 tm_id, u8 *lun,
+                                                u32 d_id, u32 r_a_tov,
+                                                u32 e_d_tov)
+{
+        struct fcpio_host_req *desc = vnic_wq_copy_next_desc(wq);
+
+        desc->hdr.type = FCPIO_ITMF;     /* enum fcpio_type */
+        desc->hdr.status = 0;            /* header status entry */
+        desc->hdr._resvd = 0;            /* reserved */
+        desc->hdr.tag.u.req_id = req_id; /* id for this request */
+
+        desc->u.itmf.lunmap_id = lunmap_id; /* index into lunmap table */
+        desc->u.itmf.tm_req = tm_req;       /* SCSI Task Management request */
+        desc->u.itmf.t_tag = tm_id;         /* tag of fcpio to be aborted */
+        desc->u.itmf._resvd = 0;
+        memcpy(desc->u.itmf.lun, lun, LUN_ADDRESS);  /* LUN address */
+        desc->u.itmf._resvd1 = 0;
+        hton24(desc->u.itmf.d_id, d_id);    /* FC vNIC only: Target D_ID */
+        desc->u.itmf.r_a_tov = r_a_tov;     /* FC vNIC only: R_A_TOV in msec */
+        desc->u.itmf.e_d_tov = e_d_tov;     /* FC vNIC only: E_D_TOV in msec */
+
+        vnic_wq_copy_post(wq);
+}
+
+static inline void fnic_queue_wq_copy_desc_flogi_reg(struct vnic_wq_copy *wq,
+                                                     u32 req_id, u8 format,
+                                                     u32 s_id, u8 *gw_mac)
+{
+        struct fcpio_host_req *desc = vnic_wq_copy_next_desc(wq);
+
+        desc->hdr.type = FCPIO_FLOGI_REG;     /* enum fcpio_type */
+        desc->hdr.status = 0;                 /* header status entry */
+        desc->hdr._resvd = 0;                 /* reserved */
+        desc->hdr.tag.u.req_id = req_id;      /* id for this request */
+
+        desc->u.flogi_reg.format = format;
+        hton24(desc->u.flogi_reg.s_id, s_id);
+        memcpy(desc->u.flogi_reg.gateway_mac, gw_mac, ETH_ALEN);
+
+        vnic_wq_copy_post(wq);
+}
+
+static inline void fnic_queue_wq_copy_desc_fw_reset(struct vnic_wq_copy *wq,
+                                                    u32 req_id)
+{
+        struct fcpio_host_req *desc = vnic_wq_copy_next_desc(wq);
+
+        desc->hdr.type = FCPIO_RESET;     /* enum fcpio_type */
+        desc->hdr.status = 0;             /* header status entry */
+        desc->hdr._resvd = 0;             /* reserved */
+        desc->hdr.tag.u.req_id = req_id;  /* id for this request */
+
+        vnic_wq_copy_post(wq);
+}
+
+static inline void fnic_queue_wq_copy_desc_lunmap(struct vnic_wq_copy *wq,
+                                                  u32 req_id, u64 lunmap_addr,
+                                                  u32 lunmap_len)
+{
+        struct fcpio_host_req *desc = vnic_wq_copy_next_desc(wq);
+
+        desc->hdr.type = FCPIO_LUNMAP_REQ;      /* enum fcpio_type */
+        desc->hdr.status = 0;                   /* header status entry */
+        desc->hdr._resvd = 0;                   /* reserved */
+        desc->hdr.tag.u.req_id = req_id;        /* id for this request */
+
+        desc->u.lunmap_req.addr = lunmap_addr;  /* address of the buffer */
+        desc->u.lunmap_req.len = lunmap_len;    /* len of the buffer */
+
+        vnic_wq_copy_post(wq);
+}
+
+static inline void fnic_queue_rq_desc(struct vnic_rq *rq,
+                                      void *os_buf, dma_addr_t dma_addr,
+                                      u16 len)
+{
+        struct rq_enet_desc *desc = vnic_rq_next_desc(rq);
+
+        rq_enet_desc_enc(desc,
+                (u64)dma_addr | VNIC_PADDR_TARGET,
+                RQ_ENET_TYPE_ONLY_SOP,
+                (u16)len);
+
+        vnic_rq_post(rq, os_buf, 0, dma_addr, len);
+}
+
+
+struct fnic;
+
+int fnic_get_vnic_config(struct fnic *);
+int fnic_alloc_vnic_resources(struct fnic *);
+void fnic_free_vnic_resources(struct fnic *);
+void fnic_get_res_counts(struct fnic *);
+int fnic_set_nic_config(struct fnic *fnic, u8 rss_default_cpu,
+                        u8 rss_hash_type, u8 rss_hash_bits, u8 rss_base_cpu,
+                        u8 rss_enable, u8 tso_ipid_split_en,
+                        u8 ig_vlan_strip_en);
+
+#endif /* _FNIC_RES_H_ */
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
new file mode 100644
index 000000000000..eabf36502856
--- /dev/null
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -0,0 +1,1850 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/mempool.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/workqueue.h>
+#include <linux/pci.h>
+#include <linux/scatterlist.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/delay.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/fc/fc_els.h>
+#include <scsi/fc/fc_fcoe.h>
+#include <scsi/libfc.h>
+#include <scsi/fc_frame.h>
+#include "fnic_io.h"
+#include "fnic.h"
+
+const char *fnic_state_str[] = {
+        [FNIC_IN_FC_MODE] =           "FNIC_IN_FC_MODE",
+        [FNIC_IN_FC_TRANS_ETH_MODE] = "FNIC_IN_FC_TRANS_ETH_MODE",
+        [FNIC_IN_ETH_MODE] =          "FNIC_IN_ETH_MODE",
+        [FNIC_IN_ETH_TRANS_FC_MODE] = "FNIC_IN_ETH_TRANS_FC_MODE",
+};
+
+static const char *fnic_ioreq_state_str[] = {
+        [FNIC_IOREQ_CMD_PENDING] = "FNIC_IOREQ_CMD_PENDING",
+        [FNIC_IOREQ_ABTS_PENDING] = "FNIC_IOREQ_ABTS_PENDING",
+        [FNIC_IOREQ_ABTS_COMPLETE] = "FNIC_IOREQ_ABTS_COMPLETE",
+        [FNIC_IOREQ_CMD_COMPLETE] = "FNIC_IOREQ_CMD_COMPLETE",
+};
+
+static const char *fcpio_status_str[] =  {
+        [FCPIO_SUCCESS] = "FCPIO_SUCCESS", /*0x0*/
+        [FCPIO_INVALID_HEADER] = "FCPIO_INVALID_HEADER",
+        [FCPIO_OUT_OF_RESOURCE] = "FCPIO_OUT_OF_RESOURCE",
+        [FCPIO_INVALID_PARAM] = "FCPIO_INVALID_PARAM]",
+        [FCPIO_REQ_NOT_SUPPORTED] = "FCPIO_REQ_NOT_SUPPORTED",
+        [FCPIO_IO_NOT_FOUND] = "FCPIO_IO_NOT_FOUND",
+        [FCPIO_ABORTED] = "FCPIO_ABORTED", /*0x41*/
+        [FCPIO_TIMEOUT] = "FCPIO_TIMEOUT",
+        [FCPIO_SGL_INVALID] = "FCPIO_SGL_INVALID",
+        [FCPIO_MSS_INVALID] = "FCPIO_MSS_INVALID",
+        [FCPIO_DATA_CNT_MISMATCH] = "FCPIO_DATA_CNT_MISMATCH",
+        [FCPIO_FW_ERR] = "FCPIO_FW_ERR",
+        [FCPIO_ITMF_REJECTED] = "FCPIO_ITMF_REJECTED",
+        [FCPIO_ITMF_FAILED] = "FCPIO_ITMF_FAILED",
+        [FCPIO_ITMF_INCORRECT_LUN] = "FCPIO_ITMF_INCORRECT_LUN",
+        [FCPIO_CMND_REJECTED] = "FCPIO_CMND_REJECTED",
+        [FCPIO_NO_PATH_AVAIL] = "FCPIO_NO_PATH_AVAIL",
+        [FCPIO_PATH_FAILED] = "FCPIO_PATH_FAILED",
+        [FCPIO_LUNMAP_CHNG_PEND] = "FCPIO_LUNHMAP_CHNG_PEND",
+};
+
+const char *fnic_state_to_str(unsigned int state)
+{
+        if (state >= ARRAY_SIZE(fnic_state_str) || !fnic_state_str[state])
+                return "unknown";
+
+        return fnic_state_str[state];
+}
+
+static const char *fnic_ioreq_state_to_str(unsigned int state)
+{
+        if (state >= ARRAY_SIZE(fnic_ioreq_state_str) ||
+            !fnic_ioreq_state_str[state])
+                return "unknown";
+
+        return fnic_ioreq_state_str[state];
+}
+
+static const char *fnic_fcpio_status_to_str(unsigned int status)
+{
+        if (status >= ARRAY_SIZE(fcpio_status_str) || !fcpio_status_str[status])
+                return "unknown";
+
+        return fcpio_status_str[status];
+}
+
+static void fnic_cleanup_io(struct fnic *fnic, int exclude_id);
+
+static inline spinlock_t *fnic_io_lock_hash(struct fnic *fnic,
+                                            struct scsi_cmnd *sc)
+{
+        u32 hash = sc->request->tag & (FNIC_IO_LOCKS - 1);
+
+        return &fnic->io_req_lock[hash];
+}
+
+/*
+ * Unmap the data buffer and sense buffer for an io_req,
+ * also unmap and free the device-private scatter/gather list.
+ */
+static void fnic_release_ioreq_buf(struct fnic *fnic,
+                                   struct fnic_io_req *io_req,
+                                   struct scsi_cmnd *sc)
+{
+        if (io_req->sgl_list_pa)
+                pci_unmap_single(fnic->pdev, io_req->sgl_list_pa,
+                                 sizeof(io_req->sgl_list[0]) * io_req->sgl_cnt,
+                                 PCI_DMA_TODEVICE);
+        scsi_dma_unmap(sc);
+
+        if (io_req->sgl_cnt)
+                mempool_free(io_req->sgl_list_alloc,
+                             fnic->io_sgl_pool[io_req->sgl_type]);
+        if (io_req->sense_buf_pa)
+                pci_unmap_single(fnic->pdev, io_req->sense_buf_pa,
+                                 SCSI_SENSE_BUFFERSIZE, PCI_DMA_FROMDEVICE);
+}
+
+/* Free up Copy Wq descriptors. Called with copy_wq lock held */
+static int free_wq_copy_descs(struct fnic *fnic, struct vnic_wq_copy *wq)
+{
+        /* if no Ack received from firmware, then nothing to clean */
+        if (!fnic->fw_ack_recd[0])
+                return 1;
+
+        /*
+         * Update desc_available count based on number of freed descriptors
+         * Account for wraparound
+         */
+        if (wq->to_clean_index <= fnic->fw_ack_index[0])
+                wq->ring.desc_avail += (fnic->fw_ack_index[0]
+                                        - wq->to_clean_index + 1);
+        else
+                wq->ring.desc_avail += (wq->ring.desc_count
+                                        - wq->to_clean_index
+                                        + fnic->fw_ack_index[0] + 1);
+
+        /*
+         * just bump clean index to ack_index+1 accounting for wraparound
+         * this will essentially free up all descriptors between
+         * to_clean_index and fw_ack_index, both inclusive
+         */
+        wq->to_clean_index =
+                (fnic->fw_ack_index[0] + 1) % wq->ring.desc_count;
+
+        /* we have processed the acks received so far */
+        fnic->fw_ack_recd[0] = 0;
+        return 0;
+}
+
+
+/*
+ * fnic_fw_reset_handler
+ * Routine to send reset msg to fw
+ */
+int fnic_fw_reset_handler(struct fnic *fnic)
+{
+        struct vnic_wq_copy *wq = &fnic->wq_copy[0];
+        int ret = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], flags);
+
+        if (vnic_wq_copy_desc_avail(wq) <= fnic->wq_copy_desc_low[0])
+                free_wq_copy_descs(fnic, wq);
+
+        if (!vnic_wq_copy_desc_avail(wq))
+                ret = -EAGAIN;
+        else
+                fnic_queue_wq_copy_desc_fw_reset(wq, SCSI_NO_TAG);
+
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
+
+        if (!ret)
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Issued fw reset\n");
+        else
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Failed to issue fw reset\n");
+        return ret;
+}
+
+
+/*
+ * fnic_flogi_reg_handler
+ * Routine to send flogi register msg to fw
+ */
+int fnic_flogi_reg_handler(struct fnic *fnic)
+{
+        struct vnic_wq_copy *wq = &fnic->wq_copy[0];
+        u8 gw_mac[ETH_ALEN];
+        int ret = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], flags);
+
+        if (vnic_wq_copy_desc_avail(wq) <= fnic->wq_copy_desc_low[0])
+                free_wq_copy_descs(fnic, wq);
+
+        if (!vnic_wq_copy_desc_avail(wq)) {
+                ret = -EAGAIN;
+                goto flogi_reg_ioreq_end;
+        }
+
+        if (fnic->fcoui_mode)
+                memset(gw_mac, 0xff, ETH_ALEN);
+        else
+                memcpy(gw_mac, fnic->dest_addr, ETH_ALEN);
+
+        fnic_queue_wq_copy_desc_flogi_reg(wq, SCSI_NO_TAG,
+                                          FCPIO_FLOGI_REG_GW_DEST,
+                                          fnic->s_id,
+                                          gw_mac);
+
+flogi_reg_ioreq_end:
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
+
+        if (!ret)
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "flog reg issued\n");
+
+        return ret;
+}
+
+/*
+ * fnic_queue_wq_copy_desc
+ * Routine to enqueue a wq copy desc
+ */
+static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
+                                          struct vnic_wq_copy *wq,
+                                          struct fnic_io_req *io_req,
+                                          struct scsi_cmnd *sc,
+                                          u32 sg_count)
+{
+        struct scatterlist *sg;
+        struct fc_rport *rport = starget_to_rport(scsi_target(sc->device));
+        struct fc_rport_libfc_priv *rp = rport->dd_data;
+        struct host_sg_desc *desc;
+        u8 pri_tag = 0;
+        unsigned int i;
+        unsigned long intr_flags;
+        int flags;
+        u8 exch_flags;
+        struct scsi_lun fc_lun;
+        char msg[2];
+
+        if (sg_count) {
+                BUG_ON(sg_count < 0);
+                BUG_ON(sg_count > FNIC_MAX_SG_DESC_CNT);
+
+                /* For each SGE, create a device desc entry */
+                desc = io_req->sgl_list;
+                for_each_sg(scsi_sglist(sc), sg, sg_count, i) {
+                        desc->addr = cpu_to_le64(sg_dma_address(sg));
+                        desc->len = cpu_to_le32(sg_dma_len(sg));
+                        desc->_resvd = 0;
+                        desc++;
+                }
+
+                io_req->sgl_list_pa = pci_map_single
+                        (fnic->pdev,
+                         io_req->sgl_list,
+                         sizeof(io_req->sgl_list[0]) * sg_count,
+                         PCI_DMA_TODEVICE);
+        }
+
+        io_req->sense_buf_pa = pci_map_single(fnic->pdev,
+                                              sc->sense_buffer,
+                                              SCSI_SENSE_BUFFERSIZE,
+                                              PCI_DMA_FROMDEVICE);
+
+        int_to_scsilun(sc->device->lun, &fc_lun);
+
+        pri_tag = FCPIO_ICMND_PTA_SIMPLE;
+        msg[0] = MSG_SIMPLE_TAG;
+        scsi_populate_tag_msg(sc, msg);
+        if (msg[0] == MSG_ORDERED_TAG)
+                pri_tag = FCPIO_ICMND_PTA_ORDERED;
+
+        /* Enqueue the descriptor in the Copy WQ */
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], intr_flags);
+
+        if (vnic_wq_copy_desc_avail(wq) <= fnic->wq_copy_desc_low[0])
+                free_wq_copy_descs(fnic, wq);
+
+        if (unlikely(!vnic_wq_copy_desc_avail(wq))) {
+                spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags);
+                return SCSI_MLQUEUE_HOST_BUSY;
+        }
+
+        flags = 0;
+        if (sc->sc_data_direction == DMA_FROM_DEVICE)
+                flags = FCPIO_ICMND_RDDATA;
+        else if (sc->sc_data_direction == DMA_TO_DEVICE)
+                flags = FCPIO_ICMND_WRDATA;
+
+        exch_flags = 0;
+        if ((fnic->config.flags & VFCF_FCP_SEQ_LVL_ERR) &&
+            (rp->flags & FC_RP_FLAGS_RETRY))
+                exch_flags |= FCPIO_ICMND_SRFLAG_RETRY;
+
+        fnic_queue_wq_copy_desc_icmnd_16(wq, sc->request->tag,
+                                         0, exch_flags, io_req->sgl_cnt,
+                                         SCSI_SENSE_BUFFERSIZE,
+                                         io_req->sgl_list_pa,
+                                         io_req->sense_buf_pa,
+                                         0, /* scsi cmd ref, always 0 */
+                                         pri_tag, /* scsi pri and tag */
+                                         flags, /* command flags */
+                                         sc->cmnd, scsi_bufflen(sc),
+                                         fc_lun.scsi_lun, io_req->port_id,
+                                         rport->maxframe_size, rp->r_a_tov,
+                                         rp->e_d_tov);
+
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags);
+        return 0;
+}
+
+/*
+ * fnic_queuecommand
+ * Routine to send a scsi cdb
+ * Called with host_lock held and interrupts disabled.
+ */
+int fnic_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
+{
+        struct fc_lport *lp;
+        struct fc_rport *rport;
+        struct fnic_io_req *io_req;
+        struct fnic *fnic;
+        struct vnic_wq_copy *wq;
+        int ret;
+        u32 sg_count;
+        unsigned long flags;
+        unsigned long ptr;
+
+        rport = starget_to_rport(scsi_target(sc->device));
+        ret = fc_remote_port_chkready(rport);
+        if (ret) {
+                sc->result = ret;
+                done(sc);
+                return 0;
+        }
+
+        lp = shost_priv(sc->device->host);
+        if (lp->state != LPORT_ST_READY || !(lp->link_up))
+                return SCSI_MLQUEUE_HOST_BUSY;
+
+        /*
+         * Release host lock, use driver resource specific locks from here.
+         * Don't re-enable interrupts in case they were disabled prior to the
+         * caller disabling them.
+         */
+        spin_unlock(lp->host->host_lock);
+
+        /* Get a new io_req for this SCSI IO */
+        fnic = lport_priv(lp);
+
+        io_req = mempool_alloc(fnic->io_req_pool, GFP_ATOMIC);
+        if (!io_req) {
+                ret = SCSI_MLQUEUE_HOST_BUSY;
+                goto out;
+        }
+        memset(io_req, 0, sizeof(*io_req));
+
+        /* Map the data buffer */
+        sg_count = scsi_dma_map(sc);
+        if (sg_count < 0) {
+                mempool_free(io_req, fnic->io_req_pool);
+                goto out;
+        }
+
+        /* Determine the type of scatter/gather list we need */
+        io_req->sgl_cnt = sg_count;
+        io_req->sgl_type = FNIC_SGL_CACHE_DFLT;
+        if (sg_count > FNIC_DFLT_SG_DESC_CNT)
+                io_req->sgl_type = FNIC_SGL_CACHE_MAX;
+
+        if (sg_count) {
+                io_req->sgl_list =
+                        mempool_alloc(fnic->io_sgl_pool[io_req->sgl_type],
+                                      GFP_ATOMIC | GFP_DMA);
+                if (!io_req->sgl_list) {
+                        ret = SCSI_MLQUEUE_HOST_BUSY;
+                        scsi_dma_unmap(sc);
+                        mempool_free(io_req, fnic->io_req_pool);
+                        goto out;
+                }
+
+                /* Cache sgl list allocated address before alignment */
+                io_req->sgl_list_alloc = io_req->sgl_list;
+                ptr = (unsigned long) io_req->sgl_list;
+                if (ptr % FNIC_SG_DESC_ALIGN) {
+                        io_req->sgl_list = (struct host_sg_desc *)
+                                (((unsigned long) ptr
+                                  + FNIC_SG_DESC_ALIGN - 1)
+                                 & ~(FNIC_SG_DESC_ALIGN - 1));
+                }
+        }
+
+        /* initialize rest of io_req */
+        io_req->port_id = rport->port_id;
+        CMD_STATE(sc) = FNIC_IOREQ_CMD_PENDING;
+        CMD_SP(sc) = (char *)io_req;
+        sc->scsi_done = done;
+
+        /* create copy wq desc and enqueue it */
+        wq = &fnic->wq_copy[0];
+        ret = fnic_queue_wq_copy_desc(fnic, wq, io_req, sc, sg_count);
+        if (ret) {
+                /*
+                 * In case another thread cancelled the request,
+                 * refetch the pointer under the lock.
+                 */
+                spinlock_t *io_lock = fnic_io_lock_hash(fnic, sc);
+
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                CMD_SP(sc) = NULL;
+                CMD_STATE(sc) = FNIC_IOREQ_CMD_COMPLETE;
+                spin_unlock_irqrestore(io_lock, flags);
+                if (io_req) {
+                        fnic_release_ioreq_buf(fnic, io_req, sc);
+                        mempool_free(io_req, fnic->io_req_pool);
+                }
+        }
+out:
+        /* acquire host lock before returning to SCSI */
+        spin_lock(lp->host->host_lock);
+        return ret;
+}
+
+/*
+ * fnic_fcpio_fw_reset_cmpl_handler
+ * Routine to handle fw reset completion
+ */
+static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic,
+                                            struct fcpio_fw_req *desc)
+{
+        u8 type;
+        u8 hdr_status;
+        struct fcpio_tag tag;
+        int ret = 0;
+        struct fc_frame *flogi;
+        unsigned long flags;
+
+        fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
+
+        /* Clean up all outstanding io requests */
+        fnic_cleanup_io(fnic, SCSI_NO_TAG);
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+
+        flogi = fnic->flogi;
+        fnic->flogi = NULL;
+
+        /* fnic should be in FC_TRANS_ETH_MODE */
+        if (fnic->state == FNIC_IN_FC_TRANS_ETH_MODE) {
+                /* Check status of reset completion */
+                if (!hdr_status) {
+                        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                                      "reset cmpl success\n");
+                        /* Ready to send flogi out */
+                        fnic->state = FNIC_IN_ETH_MODE;
+                } else {
+                        FNIC_SCSI_DBG(KERN_DEBUG,
+                                      fnic->lport->host,
+                                      "fnic fw_reset : failed %s\n",
+                                      fnic_fcpio_status_to_str(hdr_status));
+
+                        /*
+                         * Unable to change to eth mode, cannot send out flogi
+                         * Change state to fc mode, so that subsequent Flogi
+                         * requests from libFC will cause more attempts to
+                         * reset the firmware. Free the cached flogi
+                         */
+                        fnic->state = FNIC_IN_FC_MODE;
+                        ret = -1;
+                }
+        } else {
+                FNIC_SCSI_DBG(KERN_DEBUG,
+                              fnic->lport->host,
+                              "Unexpected state %s while processing"
+                              " reset cmpl\n", fnic_state_to_str(fnic->state));
+                ret = -1;
+        }
+
+        /* Thread removing device blocks till firmware reset is complete */
+        if (fnic->remove_wait)
+                complete(fnic->remove_wait);
+
+        /*
+         * If fnic is being removed, or fw reset failed
+         * free the flogi frame. Else, send it out
+         */
+        if (fnic->remove_wait || ret) {
+                fnic->flogi_oxid = FC_XID_UNKNOWN;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                if (flogi)
+                        dev_kfree_skb_irq(fp_skb(flogi));
+                goto reset_cmpl_handler_end;
+        }
+
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        if (flogi)
+                ret = fnic_send_frame(fnic, flogi);
+
+ reset_cmpl_handler_end:
+        return ret;
+}
+
+/*
+ * fnic_fcpio_flogi_reg_cmpl_handler
+ * Routine to handle flogi register completion
+ */
+static int fnic_fcpio_flogi_reg_cmpl_handler(struct fnic *fnic,
+                                             struct fcpio_fw_req *desc)
+{
+        u8 type;
+        u8 hdr_status;
+        struct fcpio_tag tag;
+        int ret = 0;
+        struct fc_frame *flogi_resp = NULL;
+        unsigned long flags;
+        struct sk_buff *skb;
+
+        fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
+
+        /* Update fnic state based on status of flogi reg completion */
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+
+        flogi_resp = fnic->flogi_resp;
+        fnic->flogi_resp = NULL;
+
+        if (fnic->state == FNIC_IN_ETH_TRANS_FC_MODE) {
+
+                /* Check flogi registration completion status */
+                if (!hdr_status) {
+                        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                                      "flog reg succeeded\n");
+                        fnic->state = FNIC_IN_FC_MODE;
+                } else {
+                        FNIC_SCSI_DBG(KERN_DEBUG,
+                                      fnic->lport->host,
+                                      "fnic flogi reg :failed %s\n",
+                                      fnic_fcpio_status_to_str(hdr_status));
+                        fnic->state = FNIC_IN_ETH_MODE;
+                        ret = -1;
+                }
+        } else {
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Unexpected fnic state %s while"
+                              " processing flogi reg completion\n",
+                              fnic_state_to_str(fnic->state));
+                ret = -1;
+        }
+
+        /* Successful flogi reg cmpl, pass frame to LibFC */
+        if (!ret && flogi_resp) {
+                if (fnic->stop_rx_link_events) {
+                        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                        goto reg_cmpl_handler_end;
+                }
+                skb = (struct sk_buff *)flogi_resp;
+                /* Use fr_flags to indicate whether flogi resp or not */
+                fr_flags(flogi_resp) = 1;
+                fr_dev(flogi_resp) = fnic->lport;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+                skb_queue_tail(&fnic->frame_queue, skb);
+                queue_work(fnic_event_queue, &fnic->frame_work);
+
+        } else {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                if (flogi_resp)
+                        dev_kfree_skb_irq(fp_skb(flogi_resp));
+        }
+
+reg_cmpl_handler_end:
+        return ret;
+}
+
+static inline int is_ack_index_in_range(struct vnic_wq_copy *wq,
+                                        u16 request_out)
+{
+        if (wq->to_clean_index <= wq->to_use_index) {
+                /* out of range, stale request_out index */
+                if (request_out < wq->to_clean_index ||
+                    request_out >= wq->to_use_index)
+                        return 0;
+        } else {
+                /* out of range, stale request_out index */
+                if (request_out < wq->to_clean_index &&
+                    request_out >= wq->to_use_index)
+                        return 0;
+        }
+        /* request_out index is in range */
+        return 1;
+}
+
+
+/*
+ * Mark that ack received and store the Ack index. If there are multiple
+ * acks received before Tx thread cleans it up, the latest value will be
+ * used which is correct behavior. This state should be in the copy Wq
+ * instead of in the fnic
+ */
+static inline void fnic_fcpio_ack_handler(struct fnic *fnic,
+                                          unsigned int cq_index,
+                                          struct fcpio_fw_req *desc)
+{
+        struct vnic_wq_copy *wq;
+        u16 request_out = desc->u.ack.request_out;
+        unsigned long flags;
+
+        /* mark the ack state */
+        wq = &fnic->wq_copy[cq_index - fnic->raw_wq_count - fnic->rq_count];
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], flags);
+
+        if (is_ack_index_in_range(wq, request_out)) {
+                fnic->fw_ack_index[0] = request_out;
+                fnic->fw_ack_recd[0] = 1;
+        }
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
+}
+
+/*
+ * fnic_fcpio_icmnd_cmpl_handler
+ * Routine to handle icmnd completions
+ */
+static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
+                                         struct fcpio_fw_req *desc)
+{
+        u8 type;
+        u8 hdr_status;
+        struct fcpio_tag tag;
+        u32 id;
+        u64 xfer_len = 0;
+        struct fcpio_icmnd_cmpl *icmnd_cmpl;
+        struct fnic_io_req *io_req;
+        struct scsi_cmnd *sc;
+        unsigned long flags;
+        spinlock_t *io_lock;
+
+        /* Decode the cmpl description to get the io_req id */
+        fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
+        fcpio_tag_id_dec(&tag, &id);
+
+        if (id >= FNIC_MAX_IO_REQ)
+                return;
+
+        sc = scsi_host_find_tag(fnic->lport->host, id);
+        WARN_ON_ONCE(!sc);
+        if (!sc)
+                return;
+
+        io_lock = fnic_io_lock_hash(fnic, sc);
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        WARN_ON_ONCE(!io_req);
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                return;
+        }
+
+        /* firmware completed the io */
+        io_req->io_completed = 1;
+
+        /*
+         *  if SCSI-ML has already issued abort on this command,
+         * ignore completion of the IO. The abts path will clean it up
+         */
+        if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                spin_unlock_irqrestore(io_lock, flags);
+                return;
+        }
+
+        /* Mark the IO as complete */
+        CMD_STATE(sc) = FNIC_IOREQ_CMD_COMPLETE;
+
+        icmnd_cmpl = &desc->u.icmnd_cmpl;
+
+        switch (hdr_status) {
+        case FCPIO_SUCCESS:
+                sc->result = (DID_OK << 16) | icmnd_cmpl->scsi_status;
+                xfer_len = scsi_bufflen(sc);
+                scsi_set_resid(sc, icmnd_cmpl->residual);
+
+                if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER)
+                        xfer_len -= icmnd_cmpl->residual;
+
+                /*
+                 * If queue_full, then try to reduce queue depth for all
+                 * LUNS on the target. Todo: this should be accompanied
+                 * by a periodic queue_depth rampup based on successful
+                 * IO completion.
+                 */
+                if (icmnd_cmpl->scsi_status == QUEUE_FULL) {
+                        struct scsi_device *t_sdev;
+                        int qd = 0;
+
+                        shost_for_each_device(t_sdev, sc->device->host) {
+                                if (t_sdev->id != sc->device->id)
+                                        continue;
+
+                                if (t_sdev->queue_depth > 1) {
+                                        qd = scsi_track_queue_full
+                                                (t_sdev,
+                                                 t_sdev->queue_depth - 1);
+                                        if (qd == -1)
+                                                qd = t_sdev->host->cmd_per_lun;
+                                        shost_printk(KERN_INFO,
+                                                     fnic->lport->host,
+                                                     "scsi[%d:%d:%d:%d"
+                                                     "] queue full detected,"
+                                                     "new depth = %d\n",
+                                                     t_sdev->host->host_no,
+                                                     t_sdev->channel,
+                                                     t_sdev->id, t_sdev->lun,
+                                                     t_sdev->queue_depth);
+                                }
+                        }
+                }
+                break;
+
+        case FCPIO_TIMEOUT:          /* request was timed out */
+                sc->result = (DID_TIME_OUT << 16) | icmnd_cmpl->scsi_status;
+                break;
+
+        case FCPIO_ABORTED:          /* request was aborted */
+                sc->result = (DID_ERROR << 16) | icmnd_cmpl->scsi_status;
+                break;
+
+        case FCPIO_DATA_CNT_MISMATCH: /* recv/sent more/less data than exp. */
+                scsi_set_resid(sc, icmnd_cmpl->residual);
+                sc->result = (DID_ERROR << 16) | icmnd_cmpl->scsi_status;
+                break;
+
+        case FCPIO_OUT_OF_RESOURCE:  /* out of resources to complete request */
+                sc->result = (DID_REQUEUE << 16) | icmnd_cmpl->scsi_status;
+                break;
+        case FCPIO_INVALID_HEADER:   /* header contains invalid data */
+        case FCPIO_INVALID_PARAM:    /* some parameter in request invalid */
+        case FCPIO_REQ_NOT_SUPPORTED:/* request type is not supported */
+        case FCPIO_IO_NOT_FOUND:     /* requested I/O was not found */
+        case FCPIO_SGL_INVALID:      /* request was aborted due to sgl error */
+        case FCPIO_MSS_INVALID:      /* request was aborted due to mss error */
+        case FCPIO_FW_ERR:           /* request was terminated due fw error */
+        default:
+                shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",
+                             fnic_fcpio_status_to_str(hdr_status));
+                sc->result = (DID_ERROR << 16) | icmnd_cmpl->scsi_status;
+                break;
+        }
+
+        /* Break link with the SCSI command */
+        CMD_SP(sc) = NULL;
+
+        spin_unlock_irqrestore(io_lock, flags);
+
+        fnic_release_ioreq_buf(fnic, io_req, sc);
+
+        mempool_free(io_req, fnic->io_req_pool);
+
+        if (sc->sc_data_direction == DMA_FROM_DEVICE) {
+                fnic->lport->host_stats.fcp_input_requests++;
+                fnic->fcp_input_bytes += xfer_len;
+        } else if (sc->sc_data_direction == DMA_TO_DEVICE) {
+                fnic->lport->host_stats.fcp_output_requests++;
+                fnic->fcp_output_bytes += xfer_len;
+        } else
+                fnic->lport->host_stats.fcp_control_requests++;
+
+        /* Call SCSI completion function to complete the IO */
+        if (sc->scsi_done)
+                sc->scsi_done(sc);
+
+}
+
+/* fnic_fcpio_itmf_cmpl_handler
+ * Routine to handle itmf completions
+ */
+static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic,
+                                        struct fcpio_fw_req *desc)
+{
+        u8 type;
+        u8 hdr_status;
+        struct fcpio_tag tag;
+        u32 id;
+        struct scsi_cmnd *sc;
+        struct fnic_io_req *io_req;
+        unsigned long flags;
+        spinlock_t *io_lock;
+
+        fcpio_header_dec(&desc->hdr, &type, &hdr_status, &tag);
+        fcpio_tag_id_dec(&tag, &id);
+
+        if ((id & FNIC_TAG_MASK) >= FNIC_MAX_IO_REQ)
+                return;
+
+        sc = scsi_host_find_tag(fnic->lport->host, id & FNIC_TAG_MASK);
+        WARN_ON_ONCE(!sc);
+        if (!sc)
+                return;
+
+        io_lock = fnic_io_lock_hash(fnic, sc);
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        WARN_ON_ONCE(!io_req);
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                return;
+        }
+
+        if (id & FNIC_TAG_ABORT) {
+                /* Completion of abort cmd */
+                if (CMD_STATE(sc) != FNIC_IOREQ_ABTS_PENDING) {
+                        /* This is a late completion. Ignore it */
+                        spin_unlock_irqrestore(io_lock, flags);
+                        return;
+                }
+                CMD_STATE(sc) = FNIC_IOREQ_ABTS_COMPLETE;
+                CMD_ABTS_STATUS(sc) = hdr_status;
+
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "abts cmpl recd. id %d status %s\n",
+                              (int)(id & FNIC_TAG_MASK),
+                              fnic_fcpio_status_to_str(hdr_status));
+
+                /*
+                 * If scsi_eh thread is blocked waiting for abts to complete,
+                 * signal completion to it. IO will be cleaned in the thread
+                 * else clean it in this context
+                 */
+                if (io_req->abts_done) {
+                        complete(io_req->abts_done);
+                        spin_unlock_irqrestore(io_lock, flags);
+                } else {
+                        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                                      "abts cmpl, completing IO\n");
+                        CMD_SP(sc) = NULL;
+                        sc->result = (DID_ERROR << 16);
+
+                        spin_unlock_irqrestore(io_lock, flags);
+
+                        fnic_release_ioreq_buf(fnic, io_req, sc);
+                        mempool_free(io_req, fnic->io_req_pool);
+                        if (sc->scsi_done)
+                                sc->scsi_done(sc);
+                }
+
+        } else if (id & FNIC_TAG_DEV_RST) {
+                /* Completion of device reset */
+                CMD_LR_STATUS(sc) = hdr_status;
+                CMD_STATE(sc) = FNIC_IOREQ_CMD_COMPLETE;
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "dev reset cmpl recd. id %d status %s\n",
+                              (int)(id & FNIC_TAG_MASK),
+                              fnic_fcpio_status_to_str(hdr_status));
+                if (io_req->dr_done)
+                        complete(io_req->dr_done);
+                spin_unlock_irqrestore(io_lock, flags);
+
+        } else {
+                shost_printk(KERN_ERR, fnic->lport->host,
+                             "Unexpected itmf io state %s tag %x\n",
+                             fnic_ioreq_state_to_str(CMD_STATE(sc)), id);
+                spin_unlock_irqrestore(io_lock, flags);
+        }
+
+}
+
+/*
+ * fnic_fcpio_cmpl_handler
+ * Routine to service the cq for wq_copy
+ */
+static int fnic_fcpio_cmpl_handler(struct vnic_dev *vdev,
+                                   unsigned int cq_index,
+                                   struct fcpio_fw_req *desc)
+{
+        struct fnic *fnic = vnic_dev_priv(vdev);
+        int ret = 0;
+
+        switch (desc->hdr.type) {
+        case FCPIO_ACK: /* fw copied copy wq desc to its queue */
+                fnic_fcpio_ack_handler(fnic, cq_index, desc);
+                break;
+
+        case FCPIO_ICMND_CMPL: /* fw completed a command */
+                fnic_fcpio_icmnd_cmpl_handler(fnic, desc);
+                break;
+
+        case FCPIO_ITMF_CMPL: /* fw completed itmf (abort cmd, lun reset)*/
+                fnic_fcpio_itmf_cmpl_handler(fnic, desc);
+                break;
+
+        case FCPIO_FLOGI_REG_CMPL: /* fw completed flogi_reg */
+                ret = fnic_fcpio_flogi_reg_cmpl_handler(fnic, desc);
+                break;
+
+        case FCPIO_RESET_CMPL: /* fw completed reset */
+                ret = fnic_fcpio_fw_reset_cmpl_handler(fnic, desc);
+                break;
+
+        default:
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "firmware completion type %d\n",
+                              desc->hdr.type);
+                break;
+        }
+
+        return ret;
+}
+
+/*
+ * fnic_wq_copy_cmpl_handler
+ * Routine to process wq copy
+ */
+int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do)
+{
+        unsigned int wq_work_done = 0;
+        unsigned int i, cq_index;
+        unsigned int cur_work_done;
+
+        for (i = 0; i < fnic->wq_copy_count; i++) {
+                cq_index = i + fnic->raw_wq_count + fnic->rq_count;
+                cur_work_done = vnic_cq_copy_service(&fnic->cq[cq_index],
+                                                     fnic_fcpio_cmpl_handler,
+                                                     copy_work_to_do);
+                wq_work_done += cur_work_done;
+        }
+        return wq_work_done;
+}
+
+static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)
+{
+        unsigned int i;
+        struct fnic_io_req *io_req;
+        unsigned long flags = 0;
+        struct scsi_cmnd *sc;
+        spinlock_t *io_lock;
+
+        for (i = 0; i < FNIC_MAX_IO_REQ; i++) {
+                if (i == exclude_id)
+                        continue;
+
+                sc = scsi_host_find_tag(fnic->lport->host, i);
+                if (!sc)
+                        continue;
+
+                io_lock = fnic_io_lock_hash(fnic, sc);
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                if (!io_req) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        goto cleanup_scsi_cmd;
+                }
+
+                CMD_SP(sc) = NULL;
+
+                spin_unlock_irqrestore(io_lock, flags);
+
+                /*
+                 * If there is a scsi_cmnd associated with this io_req, then
+                 * free the corresponding state
+                 */
+                fnic_release_ioreq_buf(fnic, io_req, sc);
+                mempool_free(io_req, fnic->io_req_pool);
+
+cleanup_scsi_cmd:
+                sc->result = DID_TRANSPORT_DISRUPTED << 16;
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "fnic_cleanup_io:"
+                              " DID_TRANSPORT_DISRUPTED\n");
+
+                /* Complete the command to SCSI */
+                if (sc->scsi_done)
+                        sc->scsi_done(sc);
+        }
+}
+
+void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
+                                  struct fcpio_host_req *desc)
+{
+        u32 id;
+        struct fnic *fnic = vnic_dev_priv(wq->vdev);
+        struct fnic_io_req *io_req;
+        struct scsi_cmnd *sc;
+        unsigned long flags;
+        spinlock_t *io_lock;
+
+        /* get the tag reference */
+        fcpio_tag_id_dec(&desc->hdr.tag, &id);
+        id &= FNIC_TAG_MASK;
+
+        if (id >= FNIC_MAX_IO_REQ)
+                return;
+
+        sc = scsi_host_find_tag(fnic->lport->host, id);
+        if (!sc)
+                return;
+
+        io_lock = fnic_io_lock_hash(fnic, sc);
+        spin_lock_irqsave(io_lock, flags);
+
+        /* Get the IO context which this desc refers to */
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+
+        /* fnic interrupts are turned off by now */
+
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                goto wq_copy_cleanup_scsi_cmd;
+        }
+
+        CMD_SP(sc) = NULL;
+
+        spin_unlock_irqrestore(io_lock, flags);
+
+        fnic_release_ioreq_buf(fnic, io_req, sc);
+        mempool_free(io_req, fnic->io_req_pool);
+
+wq_copy_cleanup_scsi_cmd:
+        sc->result = DID_NO_CONNECT << 16;
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "wq_copy_cleanup_handler:"
+                      " DID_NO_CONNECT\n");
+
+        if (sc->scsi_done)
+                sc->scsi_done(sc);
+}
+
+static inline int fnic_queue_abort_io_req(struct fnic *fnic, int tag,
+                                          u32 task_req, u8 *fc_lun,
+                                          struct fnic_io_req *io_req)
+{
+        struct vnic_wq_copy *wq = &fnic->wq_copy[0];
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], flags);
+
+        if (vnic_wq_copy_desc_avail(wq) <= fnic->wq_copy_desc_low[0])
+                free_wq_copy_descs(fnic, wq);
+
+        if (!vnic_wq_copy_desc_avail(wq)) {
+                spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
+                return 1;
+        }
+        fnic_queue_wq_copy_desc_itmf(wq, tag | FNIC_TAG_ABORT,
+                                     0, task_req, tag, fc_lun, io_req->port_id,
+                                     fnic->config.ra_tov, fnic->config.ed_tov);
+
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags);
+        return 0;
+}
+
+void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
+{
+        int tag;
+        struct fnic_io_req *io_req;
+        spinlock_t *io_lock;
+        unsigned long flags;
+        struct scsi_cmnd *sc;
+        struct scsi_lun fc_lun;
+        enum fnic_ioreq_state old_ioreq_state;
+
+        FNIC_SCSI_DBG(KERN_DEBUG,
+                      fnic->lport->host,
+                      "fnic_rport_reset_exch called portid 0x%06x\n",
+                      port_id);
+
+        if (fnic->in_remove)
+                return;
+
+        for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
+                sc = scsi_host_find_tag(fnic->lport->host, tag);
+                if (!sc)
+                        continue;
+
+                io_lock = fnic_io_lock_hash(fnic, sc);
+                spin_lock_irqsave(io_lock, flags);
+
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+
+                if (!io_req || io_req->port_id != port_id) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        continue;
+                }
+
+                /*
+                 * Found IO that is still pending with firmware and
+                 * belongs to rport that went away
+                 */
+                if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        continue;
+                }
+                old_ioreq_state = CMD_STATE(sc);
+                CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING;
+                CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
+
+                BUG_ON(io_req->abts_done);
+
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "fnic_rport_reset_exch: Issuing abts\n");
+
+                spin_unlock_irqrestore(io_lock, flags);
+
+                /* Now queue the abort command to firmware */
+                int_to_scsilun(sc->device->lun, &fc_lun);
+
+                if (fnic_queue_abort_io_req(fnic, tag,
+                                            FCPIO_ITMF_ABT_TASK_TERM,
+                                            fc_lun.scsi_lun, io_req)) {
+                        /*
+                         * Revert the cmd state back to old state, if
+                         * it hasnt changed in between. This cmd will get
+                         * aborted later by scsi_eh, or cleaned up during
+                         * lun reset
+                         */
+                        io_lock = fnic_io_lock_hash(fnic, sc);
+
+                        spin_lock_irqsave(io_lock, flags);
+                        if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING)
+                                CMD_STATE(sc) = old_ioreq_state;
+                        spin_unlock_irqrestore(io_lock, flags);
+                }
+        }
+
+}
+
+void fnic_terminate_rport_io(struct fc_rport *rport)
+{
+        int tag;
+        struct fnic_io_req *io_req;
+        spinlock_t *io_lock;
+        unsigned long flags;
+        struct scsi_cmnd *sc;
+        struct scsi_lun fc_lun;
+        struct fc_rport_libfc_priv *rdata = rport->dd_data;
+        struct fc_lport *lport = rdata->local_port;
+        struct fnic *fnic = lport_priv(lport);
+        struct fc_rport *cmd_rport;
+        enum fnic_ioreq_state old_ioreq_state;
+
+        FNIC_SCSI_DBG(KERN_DEBUG,
+                      fnic->lport->host, "fnic_terminate_rport_io called"
+                      " wwpn 0x%llx, wwnn0x%llx, portid 0x%06x\n",
+                      rport->port_name, rport->node_name,
+                      rport->port_id);
+
+        if (fnic->in_remove)
+                return;
+
+        for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
+                sc = scsi_host_find_tag(fnic->lport->host, tag);
+                if (!sc)
+                        continue;
+
+                cmd_rport = starget_to_rport(scsi_target(sc->device));
+                if (rport != cmd_rport)
+                        continue;
+
+                io_lock = fnic_io_lock_hash(fnic, sc);
+                spin_lock_irqsave(io_lock, flags);
+
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+
+                if (!io_req || rport != cmd_rport) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        continue;
+                }
+
+                /*
+                 * Found IO that is still pending with firmware and
+                 * belongs to rport that went away
+                 */
+                if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        continue;
+                }
+                old_ioreq_state = CMD_STATE(sc);
+                CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING;
+                CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
+
+                BUG_ON(io_req->abts_done);
+
+                FNIC_SCSI_DBG(KERN_DEBUG,
+                              fnic->lport->host,
+                              "fnic_terminate_rport_io: Issuing abts\n");
+
+                spin_unlock_irqrestore(io_lock, flags);
+
+                /* Now queue the abort command to firmware */
+                int_to_scsilun(sc->device->lun, &fc_lun);
+
+                if (fnic_queue_abort_io_req(fnic, tag,
+                                            FCPIO_ITMF_ABT_TASK_TERM,
+                                            fc_lun.scsi_lun, io_req)) {
+                        /*
+                         * Revert the cmd state back to old state, if
+                         * it hasnt changed in between. This cmd will get
+                         * aborted later by scsi_eh, or cleaned up during
+                         * lun reset
+                         */
+                        io_lock = fnic_io_lock_hash(fnic, sc);
+
+                        spin_lock_irqsave(io_lock, flags);
+                        if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING)
+                                CMD_STATE(sc) = old_ioreq_state;
+                        spin_unlock_irqrestore(io_lock, flags);
+                }
+        }
+
+}
+
+static void fnic_block_error_handler(struct scsi_cmnd *sc)
+{
+        struct Scsi_Host *shost = sc->device->host;
+        struct fc_rport *rport = starget_to_rport(scsi_target(sc->device));
+        unsigned long flags;
+
+        spin_lock_irqsave(shost->host_lock, flags);
+        while (rport->port_state == FC_PORTSTATE_BLOCKED) {
+                spin_unlock_irqrestore(shost->host_lock, flags);
+                msleep(1000);
+                spin_lock_irqsave(shost->host_lock, flags);
+        }
+        spin_unlock_irqrestore(shost->host_lock, flags);
+
+}
+
+/*
+ * This function is exported to SCSI for sending abort cmnds.
+ * A SCSI IO is represented by a io_req in the driver.
+ * The ioreq is linked to the SCSI Cmd, thus a link with the ULP's IO.
+ */
+int fnic_abort_cmd(struct scsi_cmnd *sc)
+{
+        struct fc_lport *lp;
+        struct fnic *fnic;
+        struct fnic_io_req *io_req;
+        struct fc_rport *rport;
+        spinlock_t *io_lock;
+        unsigned long flags;
+        int ret = SUCCESS;
+        u32 task_req;
+        struct scsi_lun fc_lun;
+        DECLARE_COMPLETION_ONSTACK(tm_done);
+
+        /* Wait for rport to unblock */
+        fnic_block_error_handler(sc);
+
+        /* Get local-port, check ready and link up */
+        lp = shost_priv(sc->device->host);
+
+        fnic = lport_priv(lp);
+        FNIC_SCSI_DBG(KERN_DEBUG,
+                      fnic->lport->host,
+                      "Abort Cmd called FCID 0x%x, LUN 0x%x TAG %d\n",
+                      (starget_to_rport(scsi_target(sc->device)))->port_id,
+                      sc->device->lun, sc->request->tag);
+
+        if (lp->state != LPORT_ST_READY || !(lp->link_up)) {
+                ret = FAILED;
+                goto fnic_abort_cmd_end;
+        }
+
+        /*
+         * Avoid a race between SCSI issuing the abort and the device
+         * completing the command.
+         *
+         * If the command is already completed by the fw cmpl code,
+         * we just return SUCCESS from here. This means that the abort
+         * succeeded. In the SCSI ML, since the timeout for command has
+         * happened, the completion wont actually complete the command
+         * and it will be considered as an aborted command
+         *
+         * The CMD_SP will not be cleared except while holding io_req_lock.
+         */
+        io_lock = fnic_io_lock_hash(fnic, sc);
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                goto fnic_abort_cmd_end;
+        }
+
+        io_req->abts_done = &tm_done;
+
+        if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                spin_unlock_irqrestore(io_lock, flags);
+                goto wait_pending;
+        }
+        /*
+         * Command is still pending, need to abort it
+         * If the firmware completes the command after this point,
+         * the completion wont be done till mid-layer, since abort
+         * has already started.
+         */
+        CMD_STATE(sc) = FNIC_IOREQ_ABTS_PENDING;
+        CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
+
+        spin_unlock_irqrestore(io_lock, flags);
+
+        /*
+         * Check readiness of the remote port. If the path to remote
+         * port is up, then send abts to the remote port to terminate
+         * the IO. Else, just locally terminate the IO in the firmware
+         */
+        rport = starget_to_rport(scsi_target(sc->device));
+        if (fc_remote_port_chkready(rport) == 0)
+                task_req = FCPIO_ITMF_ABT_TASK;
+        else
+                task_req = FCPIO_ITMF_ABT_TASK_TERM;
+
+        /* Now queue the abort command to firmware */
+        int_to_scsilun(sc->device->lun, &fc_lun);
+
+        if (fnic_queue_abort_io_req(fnic, sc->request->tag, task_req,
+                                    fc_lun.scsi_lun, io_req)) {
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                if (io_req)
+                        io_req->abts_done = NULL;
+                spin_unlock_irqrestore(io_lock, flags);
+                ret = FAILED;
+                goto fnic_abort_cmd_end;
+        }
+
+        /*
+         * We queued an abort IO, wait for its completion.
+         * Once the firmware completes the abort command, it will
+         * wake up this thread.
+         */
+ wait_pending:
+        wait_for_completion_timeout(&tm_done,
+                                    msecs_to_jiffies
+                                    (2 * fnic->config.ra_tov +
+                                     fnic->config.ed_tov));
+
+        /* Check the abort status */
+        spin_lock_irqsave(io_lock, flags);
+
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                ret = FAILED;
+                goto fnic_abort_cmd_end;
+        }
+        io_req->abts_done = NULL;
+
+        /* fw did not complete abort, timed out */
+        if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                spin_unlock_irqrestore(io_lock, flags);
+                ret = FAILED;
+                goto fnic_abort_cmd_end;
+        }
+
+        /*
+         * firmware completed the abort, check the status,
+         * free the io_req irrespective of failure or success
+         */
+        if (CMD_ABTS_STATUS(sc) != FCPIO_SUCCESS)
+                ret = FAILED;
+
+        CMD_SP(sc) = NULL;
+
+        spin_unlock_irqrestore(io_lock, flags);
+
+        fnic_release_ioreq_buf(fnic, io_req, sc);
+        mempool_free(io_req, fnic->io_req_pool);
+
+fnic_abort_cmd_end:
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                      "Returning from abort cmd %s\n",
+                      (ret == SUCCESS) ?
+                      "SUCCESS" : "FAILED");
+        return ret;
+}
+
+static inline int fnic_queue_dr_io_req(struct fnic *fnic,
+                                       struct scsi_cmnd *sc,
+                                       struct fnic_io_req *io_req)
+{
+        struct vnic_wq_copy *wq = &fnic->wq_copy[0];
+        struct scsi_lun fc_lun;
+        int ret = 0;
+        unsigned long intr_flags;
+
+        spin_lock_irqsave(&fnic->wq_copy_lock[0], intr_flags);
+
+        if (vnic_wq_copy_desc_avail(wq) <= fnic->wq_copy_desc_low[0])
+                free_wq_copy_descs(fnic, wq);
+
+        if (!vnic_wq_copy_desc_avail(wq)) {
+                ret = -EAGAIN;
+                goto lr_io_req_end;
+        }
+
+        /* fill in the lun info */
+        int_to_scsilun(sc->device->lun, &fc_lun);
+
+        fnic_queue_wq_copy_desc_itmf(wq, sc->request->tag | FNIC_TAG_DEV_RST,
+                                     0, FCPIO_ITMF_LUN_RESET, SCSI_NO_TAG,
+                                     fc_lun.scsi_lun, io_req->port_id,
+                                     fnic->config.ra_tov, fnic->config.ed_tov);
+
+lr_io_req_end:
+        spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags);
+
+        return ret;
+}
+
+/*
+ * Clean up any pending aborts on the lun
+ * For each outstanding IO on this lun, whose abort is not completed by fw,
+ * issue a local abort. Wait for abort to complete. Return 0 if all commands
+ * successfully aborted, 1 otherwise
+ */
+static int fnic_clean_pending_aborts(struct fnic *fnic,
+                                     struct scsi_cmnd *lr_sc)
+{
+        int tag;
+        struct fnic_io_req *io_req;
+        spinlock_t *io_lock;
+        unsigned long flags;
+        int ret = 0;
+        struct scsi_cmnd *sc;
+        struct fc_rport *rport;
+        struct scsi_lun fc_lun;
+        struct scsi_device *lun_dev = lr_sc->device;
+        DECLARE_COMPLETION_ONSTACK(tm_done);
+
+        for (tag = 0; tag < FNIC_MAX_IO_REQ; tag++) {
+                sc = scsi_host_find_tag(fnic->lport->host, tag);
+                /*
+                 * ignore this lun reset cmd or cmds that do not belong to
+                 * this lun
+                 */
+                if (!sc || sc == lr_sc || sc->device != lun_dev)
+                        continue;
+
+                io_lock = fnic_io_lock_hash(fnic, sc);
+                spin_lock_irqsave(io_lock, flags);
+
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+
+                if (!io_req || sc->device != lun_dev) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        continue;
+                }
+
+                /*
+                 * Found IO that is still pending with firmware and
+                 * belongs to the LUN that we are resetting
+                 */
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Found IO in %s on lun\n",
+                              fnic_ioreq_state_to_str(CMD_STATE(sc)));
+
+                BUG_ON(CMD_STATE(sc) != FNIC_IOREQ_ABTS_PENDING);
+
+                CMD_ABTS_STATUS(sc) = FCPIO_INVALID_CODE;
+                io_req->abts_done = &tm_done;
+                spin_unlock_irqrestore(io_lock, flags);
+
+                /* Now queue the abort command to firmware */
+                int_to_scsilun(sc->device->lun, &fc_lun);
+                rport = starget_to_rport(scsi_target(sc->device));
+
+                if (fnic_queue_abort_io_req(fnic, tag,
+                                            FCPIO_ITMF_ABT_TASK_TERM,
+                                            fc_lun.scsi_lun, io_req)) {
+                        spin_lock_irqsave(io_lock, flags);
+                        io_req = (struct fnic_io_req *)CMD_SP(sc);
+                        if (io_req)
+                                io_req->abts_done = NULL;
+                        spin_unlock_irqrestore(io_lock, flags);
+                        ret = 1;
+                        goto clean_pending_aborts_end;
+                }
+
+                wait_for_completion_timeout(&tm_done,
+                                            msecs_to_jiffies
+                                            (fnic->config.ed_tov));
+
+                /* Recheck cmd state to check if it is now aborted */
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                if (!io_req) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        ret = 1;
+                        goto clean_pending_aborts_end;
+                }
+
+                io_req->abts_done = NULL;
+
+                /* if abort is still pending with fw, fail */
+                if (CMD_STATE(sc) == FNIC_IOREQ_ABTS_PENDING) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        ret = 1;
+                        goto clean_pending_aborts_end;
+                }
+                CMD_SP(sc) = NULL;
+                spin_unlock_irqrestore(io_lock, flags);
+
+                fnic_release_ioreq_buf(fnic, io_req, sc);
+                mempool_free(io_req, fnic->io_req_pool);
+        }
+
+clean_pending_aborts_end:
+        return ret;
+}
+
+/*
+ * SCSI Eh thread issues a Lun Reset when one or more commands on a LUN
+ * fail to get aborted. It calls driver's eh_device_reset with a SCSI command
+ * on the LUN.
+ */
+int fnic_device_reset(struct scsi_cmnd *sc)
+{
+        struct fc_lport *lp;
+        struct fnic *fnic;
+        struct fnic_io_req *io_req;
+        struct fc_rport *rport;
+        int status;
+        int ret = FAILED;
+        spinlock_t *io_lock;
+        unsigned long flags;
+        DECLARE_COMPLETION_ONSTACK(tm_done);
+
+        /* Wait for rport to unblock */
+        fnic_block_error_handler(sc);
+
+        /* Get local-port, check ready and link up */
+        lp = shost_priv(sc->device->host);
+
+        fnic = lport_priv(lp);
+        FNIC_SCSI_DBG(KERN_DEBUG,
+                      fnic->lport->host,
+                      "Device reset called FCID 0x%x, LUN 0x%x\n",
+                      (starget_to_rport(scsi_target(sc->device)))->port_id,
+                      sc->device->lun);
+
+
+        if (lp->state != LPORT_ST_READY || !(lp->link_up))
+                goto fnic_device_reset_end;
+
+        /* Check if remote port up */
+        rport = starget_to_rport(scsi_target(sc->device));
+        if (fc_remote_port_chkready(rport))
+                goto fnic_device_reset_end;
+
+        io_lock = fnic_io_lock_hash(fnic, sc);
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+
+        /*
+         * If there is a io_req attached to this command, then use it,
+         * else allocate a new one.
+         */
+        if (!io_req) {
+                io_req = mempool_alloc(fnic->io_req_pool, GFP_ATOMIC);
+                if (!io_req) {
+                        spin_unlock_irqrestore(io_lock, flags);
+                        goto fnic_device_reset_end;
+                }
+                memset(io_req, 0, sizeof(*io_req));
+                io_req->port_id = rport->port_id;
+                CMD_SP(sc) = (char *)io_req;
+        }
+        io_req->dr_done = &tm_done;
+        CMD_STATE(sc) = FNIC_IOREQ_CMD_PENDING;
+        CMD_LR_STATUS(sc) = FCPIO_INVALID_CODE;
+        spin_unlock_irqrestore(io_lock, flags);
+
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "TAG %d\n",
+                      sc->request->tag);
+
+        /*
+         * issue the device reset, if enqueue failed, clean up the ioreq
+         * and break assoc with scsi cmd
+         */
+        if (fnic_queue_dr_io_req(fnic, sc, io_req)) {
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                if (io_req)
+                        io_req->dr_done = NULL;
+                goto fnic_device_reset_clean;
+        }
+
+        /*
+         * Wait on the local completion for LUN reset.  The io_req may be
+         * freed while we wait since we hold no lock.
+         */
+        wait_for_completion_timeout(&tm_done,
+                                    msecs_to_jiffies(FNIC_LUN_RESET_TIMEOUT));
+
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        if (!io_req) {
+                spin_unlock_irqrestore(io_lock, flags);
+                goto fnic_device_reset_end;
+        }
+        io_req->dr_done = NULL;
+
+        status = CMD_LR_STATUS(sc);
+        spin_unlock_irqrestore(io_lock, flags);
+
+        /*
+         * If lun reset not completed, bail out with failed. io_req
+         * gets cleaned up during higher levels of EH
+         */
+        if (status == FCPIO_INVALID_CODE) {
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Device reset timed out\n");
+                goto fnic_device_reset_end;
+        }
+
+        /* Completed, but not successful, clean up the io_req, return fail */
+        if (status != FCPIO_SUCCESS) {
+                spin_lock_irqsave(io_lock, flags);
+                FNIC_SCSI_DBG(KERN_DEBUG,
+                              fnic->lport->host,
+                              "Device reset completed - failed\n");
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                goto fnic_device_reset_clean;
+        }
+
+        /*
+         * Clean up any aborts on this lun that have still not
+         * completed. If any of these fail, then LUN reset fails.
+         * clean_pending_aborts cleans all cmds on this lun except
+         * the lun reset cmd. If all cmds get cleaned, the lun reset
+         * succeeds
+         */
+        if (fnic_clean_pending_aborts(fnic, sc)) {
+                spin_lock_irqsave(io_lock, flags);
+                io_req = (struct fnic_io_req *)CMD_SP(sc);
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                              "Device reset failed"
+                              " since could not abort all IOs\n");
+                goto fnic_device_reset_clean;
+        }
+
+        /* Clean lun reset command */
+        spin_lock_irqsave(io_lock, flags);
+        io_req = (struct fnic_io_req *)CMD_SP(sc);
+        if (io_req)
+                /* Completed, and successful */
+                ret = SUCCESS;
+
+fnic_device_reset_clean:
+        if (io_req)
+                CMD_SP(sc) = NULL;
+
+        spin_unlock_irqrestore(io_lock, flags);
+
+        if (io_req) {
+                fnic_release_ioreq_buf(fnic, io_req, sc);
+                mempool_free(io_req, fnic->io_req_pool);
+        }
+
+fnic_device_reset_end:
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                      "Returning from device reset %s\n",
+                      (ret == SUCCESS) ?
+                      "SUCCESS" : "FAILED");
+        return ret;
+}
+
+/* Clean up all IOs, clean up libFC local port */
+int fnic_reset(struct Scsi_Host *shost)
+{
+        struct fc_lport *lp;
+        struct fnic *fnic;
+        int ret = SUCCESS;
+
+        lp = shost_priv(shost);
+        fnic = lport_priv(lp);
+
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                      "fnic_reset called\n");
+
+        /*
+         * Reset local port, this will clean up libFC exchanges,
+         * reset remote port sessions, and if link is up, begin flogi
+         */
+        if (lp->tt.lport_reset(lp))
+                ret = FAILED;
+
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                      "Returning from fnic reset %s\n",
+                      (ret == SUCCESS) ?
+                      "SUCCESS" : "FAILED");
+
+        return ret;
+}
+
+/*
+ * SCSI Error handling calls driver's eh_host_reset if all prior
+ * error handling levels return FAILED. If host reset completes
+ * successfully, and if link is up, then Fabric login begins.
+ *
+ * Host Reset is the highest level of error recovery. If this fails, then
+ * host is offlined by SCSI.
+ *
+ */
+int fnic_host_reset(struct scsi_cmnd *sc)
+{
+        int ret;
+        unsigned long wait_host_tmo;
+        struct Scsi_Host *shost = sc->device->host;
+        struct fc_lport *lp = shost_priv(shost);
+
+        /*
+         * If fnic_reset is successful, wait for fabric login to complete
+         * scsi-ml tries to send a TUR to every device if host reset is
+         * successful, so before returning to scsi, fabric should be up
+         */
+        ret = fnic_reset(shost);
+        if (ret == SUCCESS) {
+                wait_host_tmo = jiffies + FNIC_HOST_RESET_SETTLE_TIME * HZ;
+                ret = FAILED;
+                while (time_before(jiffies, wait_host_tmo)) {
+                        if ((lp->state == LPORT_ST_READY) &&
+                            (lp->link_up)) {
+                                ret = SUCCESS;
+                                break;
+                        }
+                        ssleep(1);
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This fxn is called from libFC when host is removed
+ */
+void fnic_scsi_abort_io(struct fc_lport *lp)
+{
+        int err = 0;
+        unsigned long flags;
+        enum fnic_state old_state;
+        struct fnic *fnic = lport_priv(lp);
+        DECLARE_COMPLETION_ONSTACK(remove_wait);
+
+        /* Issue firmware reset for fnic, wait for reset to complete */
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->remove_wait = &remove_wait;
+        old_state = fnic->state;
+        fnic->state = FNIC_IN_FC_TRANS_ETH_MODE;
+        vnic_dev_del_addr(fnic->vdev, fnic->data_src_addr);
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        err = fnic_fw_reset_handler(fnic);
+        if (err) {
+                spin_lock_irqsave(&fnic->fnic_lock, flags);
+                if (fnic->state == FNIC_IN_FC_TRANS_ETH_MODE)
+                        fnic->state = old_state;
+                fnic->remove_wait = NULL;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                return;
+        }
+
+        /* Wait for firmware reset to complete */
+        wait_for_completion_timeout(&remove_wait,
+                                    msecs_to_jiffies(FNIC_RMDEVICE_TIMEOUT));
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->remove_wait = NULL;
+        FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                      "fnic_scsi_abort_io %s\n",
+                      (fnic->state == FNIC_IN_ETH_MODE) ?
+                      "SUCCESS" : "FAILED");
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+}
+
+/*
+ * This fxn called from libFC to clean up driver IO state on link down
+ */
+void fnic_scsi_cleanup(struct fc_lport *lp)
+{
+        unsigned long flags;
+        enum fnic_state old_state;
+        struct fnic *fnic = lport_priv(lp);
+
+        /* issue fw reset */
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        old_state = fnic->state;
+        fnic->state = FNIC_IN_FC_TRANS_ETH_MODE;
+        vnic_dev_del_addr(fnic->vdev, fnic->data_src_addr);
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+        if (fnic_fw_reset_handler(fnic)) {
+                spin_lock_irqsave(&fnic->fnic_lock, flags);
+                if (fnic->state == FNIC_IN_FC_TRANS_ETH_MODE)
+                        fnic->state = old_state;
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+        }
+
+}
+
+void fnic_empty_scsi_cleanup(struct fc_lport *lp)
+{
+}
+
+void fnic_exch_mgr_reset(struct fc_lport *lp, u32 sid, u32 did)
+{
+        struct fnic *fnic = lport_priv(lp);
+
+        /* Non-zero sid, nothing to do */
+        if (sid)
+                goto call_fc_exch_mgr_reset;
+
+        if (did) {
+                fnic_rport_exch_reset(fnic, did);
+                goto call_fc_exch_mgr_reset;
+        }
+
+        /*
+         * sid = 0, did = 0
+         * link down or device being removed
+         */
+        if (!fnic->in_remove)
+                fnic_scsi_cleanup(lp);
+        else
+                fnic_scsi_abort_io(lp);
+
+        /* call libFC exch mgr reset to reset its exchanges */
+call_fc_exch_mgr_reset:
+        fc_exch_mgr_reset(lp, sid, did);
+
+}
diff --git a/drivers/scsi/fnic/rq_enet_desc.h b/drivers/scsi/fnic/rq_enet_desc.h
new file mode 100644
index 000000000000..92e80ae6b725
--- /dev/null
+++ b/drivers/scsi/fnic/rq_enet_desc.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _RQ_ENET_DESC_H_
+#define _RQ_ENET_DESC_H_
+
+/* Ethernet receive queue descriptor: 16B */
+struct rq_enet_desc {
+        __le64 address;
+        __le16 length_type;
+        u8 reserved[6];
+};
+
+enum rq_enet_type_types {
+        RQ_ENET_TYPE_ONLY_SOP = 0,
+        RQ_ENET_TYPE_NOT_SOP = 1,
+        RQ_ENET_TYPE_RESV2 = 2,
+        RQ_ENET_TYPE_RESV3 = 3,
+};
+
+#define RQ_ENET_ADDR_BITS               64
+#define RQ_ENET_LEN_BITS                14
+#define RQ_ENET_LEN_MASK                ((1 << RQ_ENET_LEN_BITS) - 1)
+#define RQ_ENET_TYPE_BITS               2
+#define RQ_ENET_TYPE_MASK               ((1 << RQ_ENET_TYPE_BITS) - 1)
+
+static inline void rq_enet_desc_enc(struct rq_enet_desc *desc,
+        u64 address, u8 type, u16 length)
+{
+        desc->address = cpu_to_le64(address);
+        desc->length_type = cpu_to_le16((length & RQ_ENET_LEN_MASK) |
+                ((type & RQ_ENET_TYPE_MASK) << RQ_ENET_LEN_BITS));
+}
+
+static inline void rq_enet_desc_dec(struct rq_enet_desc *desc,
+        u64 *address, u8 *type, u16 *length)
+{
+        *address = le64_to_cpu(desc->address);
+        *length = le16_to_cpu(desc->length_type) & RQ_ENET_LEN_MASK;
+        *type = (u8)((le16_to_cpu(desc->length_type) >> RQ_ENET_LEN_BITS) &
+                RQ_ENET_TYPE_MASK);
+}
+
+#endif /* _RQ_ENET_DESC_H_ */
diff --git a/drivers/scsi/fnic/vnic_cq.c b/drivers/scsi/fnic/vnic_cq.c
new file mode 100644
index 000000000000..c5db32eda5ef
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_cq.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include "vnic_dev.h"
+#include "vnic_cq.h"
+
+void vnic_cq_free(struct vnic_cq *cq)
+{
+        vnic_dev_free_desc_ring(cq->vdev, &cq->ring);
+
+        cq->ctrl = NULL;
+}
+
+int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size)
+{
+        int err;
+
+        cq->index = index;
+        cq->vdev = vdev;
+
+        cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);
+        if (!cq->ctrl) {
+                printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index);
+                return -EINVAL;
+        }
+
+        err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
+        unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
+        unsigned int cq_tail_color, unsigned int interrupt_enable,
+        unsigned int cq_entry_enable, unsigned int cq_message_enable,
+        unsigned int interrupt_offset, u64 cq_message_addr)
+{
+        u64 paddr;
+
+        paddr = (u64)cq->ring.base_addr | VNIC_PADDR_TARGET;
+        writeq(paddr, &cq->ctrl->ring_base);
+        iowrite32(cq->ring.desc_count, &cq->ctrl->ring_size);
+        iowrite32(flow_control_enable, &cq->ctrl->flow_control_enable);
+        iowrite32(color_enable, &cq->ctrl->color_enable);
+        iowrite32(cq_head, &cq->ctrl->cq_head);
+        iowrite32(cq_tail, &cq->ctrl->cq_tail);
+        iowrite32(cq_tail_color, &cq->ctrl->cq_tail_color);
+        iowrite32(interrupt_enable, &cq->ctrl->interrupt_enable);
+        iowrite32(cq_entry_enable, &cq->ctrl->cq_entry_enable);
+        iowrite32(cq_message_enable, &cq->ctrl->cq_message_enable);
+        iowrite32(interrupt_offset, &cq->ctrl->interrupt_offset);
+        writeq(cq_message_addr, &cq->ctrl->cq_message_addr);
+}
+
+void vnic_cq_clean(struct vnic_cq *cq)
+{
+        cq->to_clean = 0;
+        cq->last_color = 0;
+
+        iowrite32(0, &cq->ctrl->cq_head);
+        iowrite32(0, &cq->ctrl->cq_tail);
+        iowrite32(1, &cq->ctrl->cq_tail_color);
+
+        vnic_dev_clear_desc_ring(&cq->ring);
+}
diff --git a/drivers/scsi/fnic/vnic_cq.h b/drivers/scsi/fnic/vnic_cq.h
new file mode 100644
index 000000000000..4ede6809fb1e
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_cq.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_CQ_H_
+#define _VNIC_CQ_H_
+
+#include "cq_desc.h"
+#include "vnic_dev.h"
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_cq_service fnic_cq_service
+#define vnic_cq_free fnic_cq_free
+#define vnic_cq_alloc fnic_cq_alloc
+#define vnic_cq_init fnic_cq_init
+#define vnic_cq_clean fnic_cq_clean
+
+/* Completion queue control */
+struct vnic_cq_ctrl {
+        u64 ring_base;                  /* 0x00 */
+        u32 ring_size;                  /* 0x08 */
+        u32 pad0;
+        u32 flow_control_enable;        /* 0x10 */
+        u32 pad1;
+        u32 color_enable;               /* 0x18 */
+        u32 pad2;
+        u32 cq_head;                    /* 0x20 */
+        u32 pad3;
+        u32 cq_tail;                    /* 0x28 */
+        u32 pad4;
+        u32 cq_tail_color;              /* 0x30 */
+        u32 pad5;
+        u32 interrupt_enable;           /* 0x38 */
+        u32 pad6;
+        u32 cq_entry_enable;            /* 0x40 */
+        u32 pad7;
+        u32 cq_message_enable;          /* 0x48 */
+        u32 pad8;
+        u32 interrupt_offset;           /* 0x50 */
+        u32 pad9;
+        u64 cq_message_addr;            /* 0x58 */
+        u32 pad10;
+};
+
+struct vnic_cq {
+        unsigned int index;
+        struct vnic_dev *vdev;
+        struct vnic_cq_ctrl __iomem *ctrl;      /* memory-mapped */
+        struct vnic_dev_ring ring;
+        unsigned int to_clean;
+        unsigned int last_color;
+};
+
+static inline unsigned int vnic_cq_service(struct vnic_cq *cq,
+        unsigned int work_to_do,
+        int (*q_service)(struct vnic_dev *vdev, struct cq_desc *cq_desc,
+        u8 type, u16 q_number, u16 completed_index, void *opaque),
+        void *opaque)
+{
+        struct cq_desc *cq_desc;
+        unsigned int work_done = 0;
+        u16 q_number, completed_index;
+        u8 type, color;
+
+        cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
+                cq->ring.desc_size * cq->to_clean);
+        cq_desc_dec(cq_desc, &type, &color,
+                &q_number, &completed_index);
+
+        while (color != cq->last_color) {
+
+                if ((*q_service)(cq->vdev, cq_desc, type,
+                        q_number, completed_index, opaque))
+                        break;
+
+                cq->to_clean++;
+                if (cq->to_clean == cq->ring.desc_count) {
+                        cq->to_clean = 0;
+                        cq->last_color = cq->last_color ? 0 : 1;
+                }
+
+                cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
+                        cq->ring.desc_size * cq->to_clean);
+                cq_desc_dec(cq_desc, &type, &color,
+                        &q_number, &completed_index);
+
+                work_done++;
+                if (work_done >= work_to_do)
+                        break;
+        }
+
+        return work_done;
+}
+
+void vnic_cq_free(struct vnic_cq *cq);
+int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size);
+void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
+        unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
+        unsigned int cq_tail_color, unsigned int interrupt_enable,
+        unsigned int cq_entry_enable, unsigned int message_enable,
+        unsigned int interrupt_offset, u64 message_addr);
+void vnic_cq_clean(struct vnic_cq *cq);
+
+#endif /* _VNIC_CQ_H_ */
diff --git a/drivers/scsi/fnic/vnic_cq_copy.h b/drivers/scsi/fnic/vnic_cq_copy.h
new file mode 100644
index 000000000000..7901ce255a81
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_cq_copy.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_CQ_COPY_H_
+#define _VNIC_CQ_COPY_H_
+
+#include "fcpio.h"
+
+static inline unsigned int vnic_cq_copy_service(
+        struct vnic_cq *cq,
+        int (*q_service)(struct vnic_dev *vdev,
+                         unsigned int index,
+                         struct fcpio_fw_req *desc),
+        unsigned int work_to_do)
+
+{
+        struct fcpio_fw_req *desc;
+        unsigned int work_done = 0;
+        u8 color;
+
+        desc = (struct fcpio_fw_req *)((u8 *)cq->ring.descs +
+                cq->ring.desc_size * cq->to_clean);
+        fcpio_color_dec(desc, &color);
+
+        while (color != cq->last_color) {
+
+                if ((*q_service)(cq->vdev, cq->index, desc))
+                        break;
+
+                cq->to_clean++;
+                if (cq->to_clean == cq->ring.desc_count) {
+                        cq->to_clean = 0;
+                        cq->last_color = cq->last_color ? 0 : 1;
+                }
+
+                desc = (struct fcpio_fw_req *)((u8 *)cq->ring.descs +
+                        cq->ring.desc_size * cq->to_clean);
+                fcpio_color_dec(desc, &color);
+
+                work_done++;
+                if (work_done >= work_to_do)
+                        break;
+        }
+
+        return work_done;
+}
+
+#endif /* _VNIC_CQ_COPY_H_ */
diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c
new file mode 100644
index 000000000000..566770645086
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_dev.c
@@ -0,0 +1,690 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/if_ether.h>
+#include "vnic_resource.h"
+#include "vnic_devcmd.h"
+#include "vnic_dev.h"
+#include "vnic_stats.h"
+
+struct vnic_res {
+        void __iomem *vaddr;
+        unsigned int count;
+};
+
+struct vnic_dev {
+        void *priv;
+        struct pci_dev *pdev;
+        struct vnic_res res[RES_TYPE_MAX];
+        enum vnic_dev_intr_mode intr_mode;
+        struct vnic_devcmd __iomem *devcmd;
+        struct vnic_devcmd_notify *notify;
+        struct vnic_devcmd_notify notify_copy;
+        dma_addr_t notify_pa;
+        u32 *linkstatus;
+        dma_addr_t linkstatus_pa;
+        struct vnic_stats *stats;
+        dma_addr_t stats_pa;
+        struct vnic_devcmd_fw_info *fw_info;
+        dma_addr_t fw_info_pa;
+};
+
+#define VNIC_MAX_RES_HDR_SIZE \
+        (sizeof(struct vnic_resource_header) + \
+        sizeof(struct vnic_resource) * RES_TYPE_MAX)
+#define VNIC_RES_STRIDE 128
+
+void *vnic_dev_priv(struct vnic_dev *vdev)
+{
+        return vdev->priv;
+}
+
+static int vnic_dev_discover_res(struct vnic_dev *vdev,
+        struct vnic_dev_bar *bar)
+{
+        struct vnic_resource_header __iomem *rh;
+        struct vnic_resource __iomem *r;
+        u8 type;
+
+        if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
+                printk(KERN_ERR "vNIC BAR0 res hdr length error\n");
+                return -EINVAL;
+        }
+
+        rh = bar->vaddr;
+        if (!rh) {
+                printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n");
+                return -EINVAL;
+        }
+
+        if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||
+            ioread32(&rh->version) != VNIC_RES_VERSION) {
+                printk(KERN_ERR "vNIC BAR0 res magic/version error "
+                        "exp (%lx/%lx) curr (%x/%x)\n",
+                        VNIC_RES_MAGIC, VNIC_RES_VERSION,
+                        ioread32(&rh->magic), ioread32(&rh->version));
+                return -EINVAL;
+        }
+
+        r = (struct vnic_resource __iomem *)(rh + 1);
+
+        while ((type = ioread8(&r->type)) != RES_TYPE_EOL) {
+
+                u8 bar_num = ioread8(&r->bar);
+                u32 bar_offset = ioread32(&r->bar_offset);
+                u32 count = ioread32(&r->count);
+                u32 len;
+
+                r++;
+
+                if (bar_num != 0)  /* only mapping in BAR0 resources */
+                        continue;
+
+                switch (type) {
+                case RES_TYPE_WQ:
+                case RES_TYPE_RQ:
+                case RES_TYPE_CQ:
+                case RES_TYPE_INTR_CTRL:
+                        /* each count is stride bytes long */
+                        len = count * VNIC_RES_STRIDE;
+                        if (len + bar_offset > bar->len) {
+                                printk(KERN_ERR "vNIC BAR0 resource %d "
+                                        "out-of-bounds, offset 0x%x + "
+                                        "size 0x%x > bar len 0x%lx\n",
+                                        type, bar_offset,
+                                        len,
+                                        bar->len);
+                                return -EINVAL;
+                        }
+                        break;
+                case RES_TYPE_INTR_PBA_LEGACY:
+                case RES_TYPE_DEVCMD:
+                        len = count;
+                        break;
+                default:
+                        continue;
+                }
+
+                vdev->res[type].count = count;
+                vdev->res[type].vaddr = (char __iomem *)bar->vaddr + bar_offset;
+        }
+
+        return 0;
+}
+
+unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,
+        enum vnic_res_type type)
+{
+        return vdev->res[type].count;
+}
+
+void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,
+        unsigned int index)
+{
+        if (!vdev->res[type].vaddr)
+                return NULL;
+
+        switch (type) {
+        case RES_TYPE_WQ:
+        case RES_TYPE_RQ:
+        case RES_TYPE_CQ:
+        case RES_TYPE_INTR_CTRL:
+                return (char __iomem *)vdev->res[type].vaddr +
+                                        index * VNIC_RES_STRIDE;
+        default:
+                return (char __iomem *)vdev->res[type].vaddr;
+        }
+}
+
+unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
+                                     unsigned int desc_count,
+                                     unsigned int desc_size)
+{
+        /* The base address of the desc rings must be 512 byte aligned.
+         * Descriptor count is aligned to groups of 32 descriptors.  A
+         * count of 0 means the maximum 4096 descriptors.  Descriptor
+         * size is aligned to 16 bytes.
+         */
+
+        unsigned int count_align = 32;
+        unsigned int desc_align = 16;
+
+        ring->base_align = 512;
+
+        if (desc_count == 0)
+                desc_count = 4096;
+
+        ring->desc_count = ALIGN(desc_count, count_align);
+
+        ring->desc_size = ALIGN(desc_size, desc_align);
+
+        ring->size = ring->desc_count * ring->desc_size;
+        ring->size_unaligned = ring->size + ring->base_align;
+
+        return ring->size_unaligned;
+}
+
+void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring)
+{
+        memset(ring->descs, 0, ring->size);
+}
+
+int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
+        unsigned int desc_count, unsigned int desc_size)
+{
+        vnic_dev_desc_ring_size(ring, desc_count, desc_size);
+
+        ring->descs_unaligned = pci_alloc_consistent(vdev->pdev,
+                ring->size_unaligned,
+                &ring->base_addr_unaligned);
+
+        if (!ring->descs_unaligned) {
+                printk(KERN_ERR
+                  "Failed to allocate ring (size=%d), aborting\n",
+                        (int)ring->size);
+                return -ENOMEM;
+        }
+
+        ring->base_addr = ALIGN(ring->base_addr_unaligned,
+                ring->base_align);
+        ring->descs = (u8 *)ring->descs_unaligned +
+                (ring->base_addr - ring->base_addr_unaligned);
+
+        vnic_dev_clear_desc_ring(ring);
+
+        ring->desc_avail = ring->desc_count - 1;
+
+        return 0;
+}
+
+void vnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)
+{
+        if (ring->descs) {
+                pci_free_consistent(vdev->pdev,
+                        ring->size_unaligned,
+                        ring->descs_unaligned,
+                        ring->base_addr_unaligned);
+                ring->descs = NULL;
+        }
+}
+
+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+        u64 *a0, u64 *a1, int wait)
+{
+        struct vnic_devcmd __iomem *devcmd = vdev->devcmd;
+        int delay;
+        u32 status;
+        int dev_cmd_err[] = {
+                /* convert from fw's version of error.h to host's version */
+                0,      /* ERR_SUCCESS */
+                EINVAL, /* ERR_EINVAL */
+                EFAULT, /* ERR_EFAULT */
+                EPERM,  /* ERR_EPERM */
+                EBUSY,  /* ERR_EBUSY */
+        };
+        int err;
+
+        status = ioread32(&devcmd->status);
+        if (status & STAT_BUSY) {
+                printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd));
+                return -EBUSY;
+        }
+
+        if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
+                writeq(*a0, &devcmd->args[0]);
+                writeq(*a1, &devcmd->args[1]);
+                wmb();
+        }
+
+        iowrite32(cmd, &devcmd->cmd);
+
+        if ((_CMD_FLAGS(cmd) & _CMD_FLAGS_NOWAIT))
+                        return 0;
+
+        for (delay = 0; delay < wait; delay++) {
+
+                udelay(100);
+
+                status = ioread32(&devcmd->status);
+                if (!(status & STAT_BUSY)) {
+
+                        if (status & STAT_ERROR) {
+                                err = dev_cmd_err[(int)readq(&devcmd->args[0])];
+                                printk(KERN_ERR "Error %d devcmd %d\n",
+                                        err, _CMD_N(cmd));
+                                return -err;
+                        }
+
+                        if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
+                                rmb();
+                                *a0 = readq(&devcmd->args[0]);
+                                *a1 = readq(&devcmd->args[1]);
+                        }
+
+                        return 0;
+                }
+        }
+
+        printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd));
+        return -ETIMEDOUT;
+}
+
+int vnic_dev_fw_info(struct vnic_dev *vdev,
+        struct vnic_devcmd_fw_info **fw_info)
+{
+        u64 a0, a1 = 0;
+        int wait = 1000;
+        int err = 0;
+
+        if (!vdev->fw_info) {
+                vdev->fw_info = pci_alloc_consistent(vdev->pdev,
+                        sizeof(struct vnic_devcmd_fw_info),
+                        &vdev->fw_info_pa);
+                if (!vdev->fw_info)
+                        return -ENOMEM;
+
+                a0 = vdev->fw_info_pa;
+
+                /* only get fw_info once and cache it */
+                err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
+        }
+
+        *fw_info = vdev->fw_info;
+
+        return err;
+}
+
+int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
+        void *value)
+{
+        u64 a0, a1;
+        int wait = 1000;
+        int err;
+
+        a0 = offset;
+        a1 = size;
+
+        err = vnic_dev_cmd(vdev, CMD_DEV_SPEC, &a0, &a1, wait);
+
+        switch (size) {
+        case 1:
+                *(u8 *)value = (u8)a0;
+                break;
+        case 2:
+                *(u16 *)value = (u16)a0;
+                break;
+        case 4:
+                *(u32 *)value = (u32)a0;
+                break;
+        case 8:
+                *(u64 *)value = a0;
+                break;
+        default:
+                BUG();
+                break;
+        }
+
+        return err;
+}
+
+int vnic_dev_stats_clear(struct vnic_dev *vdev)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_STATS_CLEAR, &a0, &a1, wait);
+}
+
+int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)
+{
+        u64 a0, a1;
+        int wait = 1000;
+
+        if (!vdev->stats) {
+                vdev->stats = pci_alloc_consistent(vdev->pdev,
+                        sizeof(struct vnic_stats), &vdev->stats_pa);
+                if (!vdev->stats)
+                        return -ENOMEM;
+        }
+
+        *stats = vdev->stats;
+        a0 = vdev->stats_pa;
+        a1 = sizeof(struct vnic_stats);
+
+        return vnic_dev_cmd(vdev, CMD_STATS_DUMP, &a0, &a1, wait);
+}
+
+int vnic_dev_close(struct vnic_dev *vdev)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait);
+}
+
+int vnic_dev_enable(struct vnic_dev *vdev)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
+}
+
+int vnic_dev_disable(struct vnic_dev *vdev)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_DISABLE, &a0, &a1, wait);
+}
+
+int vnic_dev_open(struct vnic_dev *vdev, int arg)
+{
+        u64 a0 = (u32)arg, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_OPEN, &a0, &a1, wait);
+}
+
+int vnic_dev_open_done(struct vnic_dev *vdev, int *done)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        *done = 0;
+
+        err = vnic_dev_cmd(vdev, CMD_OPEN_STATUS, &a0, &a1, wait);
+        if (err)
+                return err;
+
+        *done = (a0 == 0);
+
+        return 0;
+}
+
+int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg)
+{
+        u64 a0 = (u32)arg, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait);
+}
+
+int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        *done = 0;
+
+        err = vnic_dev_cmd(vdev, CMD_SOFT_RESET_STATUS, &a0, &a1, wait);
+        if (err)
+                return err;
+
+        *done = (a0 == 0);
+
+        return 0;
+}
+
+int vnic_dev_hang_notify(struct vnic_dev *vdev)
+{
+        u64 a0, a1;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_HANG_NOTIFY, &a0, &a1, wait);
+}
+
+int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
+{
+        u64 a0, a1;
+        int wait = 1000;
+        int err, i;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                mac_addr[i] = 0;
+
+        err = vnic_dev_cmd(vdev, CMD_MAC_ADDR, &a0, &a1, wait);
+        if (err)
+                return err;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                mac_addr[i] = ((u8 *)&a0)[i];
+
+        return 0;
+}
+
+void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
+        int broadcast, int promisc, int allmulti)
+{
+        u64 a0, a1 = 0;
+        int wait = 1000;
+        int err;
+
+        a0 = (directed ? CMD_PFILTER_DIRECTED : 0) |
+             (multicast ? CMD_PFILTER_MULTICAST : 0) |
+             (broadcast ? CMD_PFILTER_BROADCAST : 0) |
+             (promisc ? CMD_PFILTER_PROMISCUOUS : 0) |
+             (allmulti ? CMD_PFILTER_ALL_MULTICAST : 0);
+
+        err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);
+        if (err)
+                printk(KERN_ERR "Can't set packet filter\n");
+}
+
+void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                ((u8 *)&a0)[i] = addr[i];
+
+        err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
+        if (err)
+                printk(KERN_ERR
+                        "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
+                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
+                        err);
+}
+
+void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
+{
+        u64 a0 = 0, a1 = 0;
+        int wait = 1000;
+        int err;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++)
+                ((u8 *)&a0)[i] = addr[i];
+
+        err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
+        if (err)
+                printk(KERN_ERR
+                        "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
+                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
+                        err);
+}
+
+int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
+{
+        u64 a0, a1;
+        int wait = 1000;
+
+        if (!vdev->notify) {
+                vdev->notify = pci_alloc_consistent(vdev->pdev,
+                        sizeof(struct vnic_devcmd_notify),
+                        &vdev->notify_pa);
+                if (!vdev->notify)
+                        return -ENOMEM;
+        }
+
+        a0 = vdev->notify_pa;
+        a1 = ((u64)intr << 32) & 0x0000ffff00000000ULL;
+        a1 += sizeof(struct vnic_devcmd_notify);
+
+        return vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
+}
+
+void vnic_dev_notify_unset(struct vnic_dev *vdev)
+{
+        u64 a0, a1;
+        int wait = 1000;
+
+        a0 = 0;  /* paddr = 0 to unset notify buffer */
+        a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */
+        a1 += sizeof(struct vnic_devcmd_notify);
+
+        vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
+}
+
+static int vnic_dev_notify_ready(struct vnic_dev *vdev)
+{
+        u32 *words;
+        unsigned int nwords = sizeof(struct vnic_devcmd_notify) / 4;
+        unsigned int i;
+        u32 csum;
+
+        if (!vdev->notify)
+                return 0;
+
+        do {
+                csum = 0;
+                memcpy(&vdev->notify_copy, vdev->notify,
+                        sizeof(struct vnic_devcmd_notify));
+                words = (u32 *)&vdev->notify_copy;
+                for (i = 1; i < nwords; i++)
+                        csum += words[i];
+        } while (csum != words[0]);
+
+        return 1;
+}
+
+int vnic_dev_init(struct vnic_dev *vdev, int arg)
+{
+        u64 a0 = (u32)arg, a1 = 0;
+        int wait = 1000;
+        return vnic_dev_cmd(vdev, CMD_INIT, &a0, &a1, wait);
+}
+
+int vnic_dev_link_status(struct vnic_dev *vdev)
+{
+        if (vdev->linkstatus)
+                return *vdev->linkstatus;
+
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.link_state;
+}
+
+u32 vnic_dev_port_speed(struct vnic_dev *vdev)
+{
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.port_speed;
+}
+
+u32 vnic_dev_msg_lvl(struct vnic_dev *vdev)
+{
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.msglvl;
+}
+
+u32 vnic_dev_mtu(struct vnic_dev *vdev)
+{
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.mtu;
+}
+
+u32 vnic_dev_link_down_cnt(struct vnic_dev *vdev)
+{
+        if (!vnic_dev_notify_ready(vdev))
+                return 0;
+
+        return vdev->notify_copy.link_down_cnt;
+}
+
+void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
+        enum vnic_dev_intr_mode intr_mode)
+{
+        vdev->intr_mode = intr_mode;
+}
+
+enum vnic_dev_intr_mode vnic_dev_get_intr_mode(
+        struct vnic_dev *vdev)
+{
+        return vdev->intr_mode;
+}
+
+void vnic_dev_unregister(struct vnic_dev *vdev)
+{
+        if (vdev) {
+                if (vdev->notify)
+                        pci_free_consistent(vdev->pdev,
+                                sizeof(struct vnic_devcmd_notify),
+                                vdev->notify,
+                                vdev->notify_pa);
+                if (vdev->linkstatus)
+                        pci_free_consistent(vdev->pdev,
+                                sizeof(u32),
+                                vdev->linkstatus,
+                                vdev->linkstatus_pa);
+                if (vdev->stats)
+                        pci_free_consistent(vdev->pdev,
+                                sizeof(struct vnic_dev),
+                                vdev->stats, vdev->stats_pa);
+                if (vdev->fw_info)
+                        pci_free_consistent(vdev->pdev,
+                                sizeof(struct vnic_devcmd_fw_info),
+                                vdev->fw_info, vdev->fw_info_pa);
+                kfree(vdev);
+        }
+}
+
+struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
+        void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar)
+{
+        if (!vdev) {
+                vdev = kzalloc(sizeof(struct vnic_dev), GFP_KERNEL);
+                if (!vdev)
+                        return NULL;
+        }
+
+        vdev->priv = priv;
+        vdev->pdev = pdev;
+
+        if (vnic_dev_discover_res(vdev, bar))
+                goto err_out;
+
+        vdev->devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0);
+        if (!vdev->devcmd)
+                goto err_out;
+
+        return vdev;
+
+err_out:
+        vnic_dev_unregister(vdev);
+        return NULL;
+}
diff --git a/drivers/scsi/fnic/vnic_dev.h b/drivers/scsi/fnic/vnic_dev.h
new file mode 100644
index 000000000000..f9935a8a5a09
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_dev.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_DEV_H_
+#define _VNIC_DEV_H_
+
+#include "vnic_resource.h"
+#include "vnic_devcmd.h"
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_dev_priv fnic_dev_priv
+#define vnic_dev_get_res_count fnic_dev_get_res_count
+#define vnic_dev_get_res fnic_dev_get_res
+#define vnic_dev_desc_ring_size fnic_dev_desc_ring_siz
+#define vnic_dev_clear_desc_ring fnic_dev_clear_desc_ring
+#define vnic_dev_alloc_desc_ring fnic_dev_alloc_desc_ring
+#define vnic_dev_free_desc_ring fnic_dev_free_desc_ring
+#define vnic_dev_cmd fnic_dev_cmd
+#define vnic_dev_fw_info fnic_dev_fw_info
+#define vnic_dev_spec fnic_dev_spec
+#define vnic_dev_stats_clear fnic_dev_stats_clear
+#define vnic_dev_stats_dump fnic_dev_stats_dump
+#define vnic_dev_hang_notify fnic_dev_hang_notify
+#define vnic_dev_packet_filter fnic_dev_packet_filter
+#define vnic_dev_add_addr fnic_dev_add_addr
+#define vnic_dev_del_addr fnic_dev_del_addr
+#define vnic_dev_mac_addr fnic_dev_mac_addr
+#define vnic_dev_notify_set fnic_dev_notify_set
+#define vnic_dev_notify_unset fnic_dev_notify_unset
+#define vnic_dev_link_status fnic_dev_link_status
+#define vnic_dev_port_speed fnic_dev_port_speed
+#define vnic_dev_msg_lvl fnic_dev_msg_lvl
+#define vnic_dev_mtu fnic_dev_mtu
+#define vnic_dev_link_down_cnt fnic_dev_link_down_cnt
+#define vnic_dev_close fnic_dev_close
+#define vnic_dev_enable fnic_dev_enable
+#define vnic_dev_disable fnic_dev_disable
+#define vnic_dev_open fnic_dev_open
+#define vnic_dev_open_done fnic_dev_open_done
+#define vnic_dev_init fnic_dev_init
+#define vnic_dev_soft_reset fnic_dev_soft_reset
+#define vnic_dev_soft_reset_done fnic_dev_soft_reset_done
+#define vnic_dev_set_intr_mode fnic_dev_set_intr_mode
+#define vnic_dev_get_intr_mode fnic_dev_get_intr_mode
+#define vnic_dev_unregister fnic_dev_unregister
+#define vnic_dev_register fnic_dev_register
+
+#ifndef VNIC_PADDR_TARGET
+#define VNIC_PADDR_TARGET       0x0000000000000000ULL
+#endif
+
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+        return ((u64)readl(reg + 0x4UL) << 32) | (u64)readl(reg);
+}
+
+static inline void writeq(u64 val, void __iomem *reg)
+{
+        writel(val & 0xffffffff, reg);
+        writel(val >> 32, reg + 0x4UL);
+}
+#endif
+
+enum vnic_dev_intr_mode {
+        VNIC_DEV_INTR_MODE_UNKNOWN,
+        VNIC_DEV_INTR_MODE_INTX,
+        VNIC_DEV_INTR_MODE_MSI,
+        VNIC_DEV_INTR_MODE_MSIX,
+};
+
+struct vnic_dev_bar {
+        void __iomem *vaddr;
+        dma_addr_t bus_addr;
+        unsigned long len;
+};
+
+struct vnic_dev_ring {
+        void *descs;
+        size_t size;
+        dma_addr_t base_addr;
+        size_t base_align;
+        void *descs_unaligned;
+        size_t size_unaligned;
+        dma_addr_t base_addr_unaligned;
+        unsigned int desc_size;
+        unsigned int desc_count;
+        unsigned int desc_avail;
+};
+
+struct vnic_dev;
+struct vnic_stats;
+
+void *vnic_dev_priv(struct vnic_dev *vdev);
+unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,
+                                    enum vnic_res_type type);
+void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,
+                               unsigned int index);
+unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
+                                     unsigned int desc_count,
+                                     unsigned int desc_size);
+void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring);
+int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
+                             unsigned int desc_count, unsigned int desc_size);
+void vnic_dev_free_desc_ring(struct vnic_dev *vdev,
+                             struct vnic_dev_ring *ring);
+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+                 u64 *a0, u64 *a1, int wait);
+int vnic_dev_fw_info(struct vnic_dev *vdev,
+                     struct vnic_devcmd_fw_info **fw_info);
+int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset,
+                  unsigned int size, void *value);
+int vnic_dev_stats_clear(struct vnic_dev *vdev);
+int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
+int vnic_dev_hang_notify(struct vnic_dev *vdev);
+void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
+                            int broadcast, int promisc, int allmulti);
+void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
+void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);
+int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr);
+int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr);
+void vnic_dev_notify_unset(struct vnic_dev *vdev);
+int vnic_dev_link_status(struct vnic_dev *vdev);
+u32 vnic_dev_port_speed(struct vnic_dev *vdev);
+u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);
+u32 vnic_dev_mtu(struct vnic_dev *vdev);
+u32 vnic_dev_link_down_cnt(struct vnic_dev *vdev);
+int vnic_dev_close(struct vnic_dev *vdev);
+int vnic_dev_enable(struct vnic_dev *vdev);
+int vnic_dev_disable(struct vnic_dev *vdev);
+int vnic_dev_open(struct vnic_dev *vdev, int arg);
+int vnic_dev_open_done(struct vnic_dev *vdev, int *done);
+int vnic_dev_init(struct vnic_dev *vdev, int arg);
+int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);
+int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);
+void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
+                            enum vnic_dev_intr_mode intr_mode);
+enum vnic_dev_intr_mode vnic_dev_get_intr_mode(struct vnic_dev *vdev);
+void vnic_dev_unregister(struct vnic_dev *vdev);
+struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
+                                   void *priv, struct pci_dev *pdev,
+                                   struct vnic_dev_bar *bar);
+
+#endif /* _VNIC_DEV_H_ */
diff --git a/drivers/scsi/fnic/vnic_devcmd.h b/drivers/scsi/fnic/vnic_devcmd.h
new file mode 100644
index 000000000000..d62b9061bf12
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_devcmd.h
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_DEVCMD_H_
+#define _VNIC_DEVCMD_H_
+
+#define _CMD_NBITS      14
+#define _CMD_VTYPEBITS  10
+#define _CMD_FLAGSBITS  6
+#define _CMD_DIRBITS    2
+
+#define _CMD_NMASK      ((1 << _CMD_NBITS)-1)
+#define _CMD_VTYPEMASK  ((1 << _CMD_VTYPEBITS)-1)
+#define _CMD_FLAGSMASK  ((1 << _CMD_FLAGSBITS)-1)
+#define _CMD_DIRMASK    ((1 << _CMD_DIRBITS)-1)
+
+#define _CMD_NSHIFT     0
+#define _CMD_VTYPESHIFT (_CMD_NSHIFT+_CMD_NBITS)
+#define _CMD_FLAGSSHIFT (_CMD_VTYPESHIFT+_CMD_VTYPEBITS)
+#define _CMD_DIRSHIFT   (_CMD_FLAGSSHIFT+_CMD_FLAGSBITS)
+
+/*
+ * Direction bits (from host perspective).
+ */
+#define _CMD_DIR_NONE   0U
+#define _CMD_DIR_WRITE  1U
+#define _CMD_DIR_READ   2U
+#define _CMD_DIR_RW     (_CMD_DIR_WRITE | _CMD_DIR_READ)
+
+/*
+ * Flag bits.
+ */
+#define _CMD_FLAGS_NONE 0U
+#define _CMD_FLAGS_NOWAIT 1U
+
+/*
+ * vNIC type bits.
+ */
+#define _CMD_VTYPE_NONE  0U
+#define _CMD_VTYPE_ENET  1U
+#define _CMD_VTYPE_FC    2U
+#define _CMD_VTYPE_SCSI  4U
+#define _CMD_VTYPE_ALL   (_CMD_VTYPE_ENET | _CMD_VTYPE_FC | _CMD_VTYPE_SCSI)
+
+/*
+ * Used to create cmds..
+*/
+#define _CMDCF(dir, flags, vtype, nr)  \
+        (((dir)   << _CMD_DIRSHIFT) | \
+        ((flags) << _CMD_FLAGSSHIFT) | \
+        ((vtype) << _CMD_VTYPESHIFT) | \
+        ((nr)    << _CMD_NSHIFT))
+#define _CMDC(dir, vtype, nr)    _CMDCF(dir, 0, vtype, nr)
+#define _CMDCNW(dir, vtype, nr)  _CMDCF(dir, _CMD_FLAGS_NOWAIT, vtype, nr)
+
+/*
+ * Used to decode cmds..
+*/
+#define _CMD_DIR(cmd)            (((cmd) >> _CMD_DIRSHIFT) & _CMD_DIRMASK)
+#define _CMD_FLAGS(cmd)          (((cmd) >> _CMD_FLAGSSHIFT) & _CMD_FLAGSMASK)
+#define _CMD_VTYPE(cmd)          (((cmd) >> _CMD_VTYPESHIFT) & _CMD_VTYPEMASK)
+#define _CMD_N(cmd)              (((cmd) >> _CMD_NSHIFT) & _CMD_NMASK)
+
+enum vnic_devcmd_cmd {
+        CMD_NONE                = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0),
+
+        /* mcpu fw info in mem: (u64)a0=paddr to struct vnic_devcmd_fw_info */
+        CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
+
+        /* dev-specific block member:
+         *    in: (u16)a0=offset,(u8)a1=size
+         *    out: a0=value */
+        CMD_DEV_SPEC            = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 2),
+
+        /* stats clear */
+        CMD_STATS_CLEAR         = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 3),
+
+        /* stats dump in mem: (u64)a0=paddr to stats area,
+         *                    (u16)a1=sizeof stats area */
+        CMD_STATS_DUMP          = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 4),
+
+        /* set Rx packet filter: (u32)a0=filters (see CMD_PFILTER_*) */
+        CMD_PACKET_FILTER       = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 7),
+
+        /* hang detection notification */
+        CMD_HANG_NOTIFY         = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 8),
+
+        /* MAC address in (u48)a0 */
+        CMD_MAC_ADDR            = _CMDC(_CMD_DIR_READ,
+                                        _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 9),
+
+        /* disable/enable promisc mode: (u8)a0=0/1 */
+/***** XXX DEPRECATED *****/
+        CMD_PROMISC_MODE        = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 10),
+
+        /* disable/enable all-multi mode: (u8)a0=0/1 */
+/***** XXX DEPRECATED *****/
+        CMD_ALLMULTI_MODE       = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 11),
+
+        /* add addr from (u48)a0 */
+        CMD_ADDR_ADD            = _CMDCNW(_CMD_DIR_WRITE,
+                                        _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 12),
+
+        /* del addr from (u48)a0 */
+        CMD_ADDR_DEL            = _CMDCNW(_CMD_DIR_WRITE,
+                                        _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 13),
+
+        /* add VLAN id in (u16)a0 */
+        CMD_VLAN_ADD            = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 14),
+
+        /* del VLAN id in (u16)a0 */
+        CMD_VLAN_DEL            = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 15),
+
+        /* nic_cfg in (u32)a0 */
+        CMD_NIC_CFG             = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 16),
+
+        /* union vnic_rss_key in mem: (u64)a0=paddr, (u16)a1=len */
+        CMD_RSS_KEY             = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 17),
+
+        /* union vnic_rss_cpu in mem: (u64)a0=paddr, (u16)a1=len */
+        CMD_RSS_CPU             = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 18),
+
+        /* initiate softreset */
+        CMD_SOFT_RESET          = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 19),
+
+        /* softreset status:
+         *    out: a0=0 reset complete, a0=1 reset in progress */
+        CMD_SOFT_RESET_STATUS   = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 20),
+
+        /* set struct vnic_devcmd_notify buffer in mem:
+         * in:
+         *   (u64)a0=paddr to notify (set paddr=0 to unset)
+         *   (u32)a1 & 0x00000000ffffffff=sizeof(struct vnic_devcmd_notify)
+         *   (u16)a1 & 0x0000ffff00000000=intr num (-1 for no intr)
+         * out:
+         *   (u32)a1 = effective size
+         */
+        CMD_NOTIFY              = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 21),
+
+        /* UNDI API: (u64)a0=paddr to s_PXENV_UNDI_ struct,
+         *           (u8)a1=PXENV_UNDI_xxx */
+        CMD_UNDI                = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 22),
+
+        /* initiate open sequence (u32)a0=flags (see CMD_OPENF_*) */
+        CMD_OPEN                = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 23),
+
+        /* open status:
+         *    out: a0=0 open complete, a0=1 open in progress */
+        CMD_OPEN_STATUS         = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 24),
+
+        /* close vnic */
+        CMD_CLOSE               = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 25),
+
+        /* initialize virtual link: (u32)a0=flags (see CMD_INITF_*) */
+        CMD_INIT                = _CMDCNW(_CMD_DIR_READ, _CMD_VTYPE_ALL, 26),
+
+        /* variant of CMD_INIT, with provisioning info
+         *     (u64)a0=paddr of vnic_devcmd_provinfo
+         *     (u32)a1=sizeof provision info */
+        CMD_INIT_PROV_INFO      = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 27),
+
+        /* enable virtual link */
+        CMD_ENABLE              = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
+
+        /* disable virtual link */
+        CMD_DISABLE             = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 29),
+
+        /* stats dump all vnics on uplink in mem: (u64)a0=paddr (u32)a1=uif */
+        CMD_STATS_DUMP_ALL      = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),
+
+        /* init status:
+         *    out: a0=0 init complete, a0=1 init in progress
+         *         if a0=0, a1=errno */
+        CMD_INIT_STATUS         = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 31),
+
+        /* INT13 API: (u64)a0=paddr to vnic_int13_params struct
+         *            (u8)a1=INT13_CMD_xxx */
+        CMD_INT13               = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_FC, 32),
+
+        /* logical uplink enable/disable: (u64)a0: 0/1=disable/enable */
+        CMD_LOGICAL_UPLINK      = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 33),
+
+        /* undo initialize of virtual link */
+        CMD_DEINIT              = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 34),
+};
+
+/* flags for CMD_OPEN */
+#define CMD_OPENF_OPROM         0x1     /* open coming from option rom */
+
+/* flags for CMD_INIT */
+#define CMD_INITF_DEFAULT_MAC   0x1     /* init with default mac addr */
+
+/* flags for CMD_PACKET_FILTER */
+#define CMD_PFILTER_DIRECTED            0x01
+#define CMD_PFILTER_MULTICAST           0x02
+#define CMD_PFILTER_BROADCAST           0x04
+#define CMD_PFILTER_PROMISCUOUS         0x08
+#define CMD_PFILTER_ALL_MULTICAST       0x10
+
+enum vnic_devcmd_status {
+        STAT_NONE = 0,
+        STAT_BUSY = 1 << 0,     /* cmd in progress */
+        STAT_ERROR = 1 << 1,    /* last cmd caused error (code in a0) */
+};
+
+enum vnic_devcmd_error {
+        ERR_SUCCESS = 0,
+        ERR_EINVAL = 1,
+        ERR_EFAULT = 2,
+        ERR_EPERM = 3,
+        ERR_EBUSY = 4,
+        ERR_ECMDUNKNOWN = 5,
+        ERR_EBADSTATE = 6,
+        ERR_ENOMEM = 7,
+        ERR_ETIMEDOUT = 8,
+        ERR_ELINKDOWN = 9,
+};
+
+struct vnic_devcmd_fw_info {
+        char fw_version[32];
+        char fw_build[32];
+        char hw_version[32];
+        char hw_serial_number[32];
+};
+
+struct vnic_devcmd_notify {
+        u32 csum;               /* checksum over following words */
+
+        u32 link_state;         /* link up == 1 */
+        u32 port_speed;         /* effective port speed (rate limit) */
+        u32 mtu;                /* MTU */
+        u32 msglvl;             /* requested driver msg lvl */
+        u32 uif;                /* uplink interface */
+        u32 status;             /* status bits (see VNIC_STF_*) */
+        u32 error;              /* error code (see ERR_*) for first ERR */
+        u32 link_down_cnt;      /* running count of link down transitions */
+};
+#define VNIC_STF_FATAL_ERR      0x0001  /* fatal fw error */
+
+struct vnic_devcmd_provinfo {
+        u8 oui[3];
+        u8 type;
+        u8 data[0];
+};
+
+/*
+ * Writing cmd register causes STAT_BUSY to get set in status register.
+ * When cmd completes, STAT_BUSY will be cleared.
+ *
+ * If cmd completed successfully STAT_ERROR will be clear
+ * and args registers contain cmd-specific results.
+ *
+ * If cmd error, STAT_ERROR will be set and args[0] contains error code.
+ *
+ * status register is read-only.  While STAT_BUSY is set,
+ * all other register contents are read-only.
+ */
+
+/* Make sizeof(vnic_devcmd) a power-of-2 for I/O BAR. */
+#define VNIC_DEVCMD_NARGS 15
+struct vnic_devcmd {
+        u32 status;                     /* RO */
+        u32 cmd;                        /* RW */
+        u64 args[VNIC_DEVCMD_NARGS];    /* RW cmd args (little-endian) */
+};
+
+#endif /* _VNIC_DEVCMD_H_ */
diff --git a/drivers/scsi/fnic/vnic_intr.c b/drivers/scsi/fnic/vnic_intr.c
new file mode 100644
index 000000000000..4f4dc8793d23
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_intr.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include "vnic_dev.h"
+#include "vnic_intr.h"
+
+void vnic_intr_free(struct vnic_intr *intr)
+{
+        intr->ctrl = NULL;
+}
+
+int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
+        unsigned int index)
+{
+        intr->index = index;
+        intr->vdev = vdev;
+
+        intr->ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index);
+        if (!intr->ctrl) {
+                printk(KERN_ERR "Failed to hook INTR[%d].ctrl resource\n",
+                        index);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,
+        unsigned int coalescing_type, unsigned int mask_on_assertion)
+{
+        iowrite32(coalescing_timer, &intr->ctrl->coalescing_timer);
+        iowrite32(coalescing_type, &intr->ctrl->coalescing_type);
+        iowrite32(mask_on_assertion, &intr->ctrl->mask_on_assertion);
+        iowrite32(0, &intr->ctrl->int_credits);
+}
+
+void vnic_intr_clean(struct vnic_intr *intr)
+{
+        iowrite32(0, &intr->ctrl->int_credits);
+}
diff --git a/drivers/scsi/fnic/vnic_intr.h b/drivers/scsi/fnic/vnic_intr.h
new file mode 100644
index 000000000000..d5fb40e7c98e
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_intr.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_INTR_H_
+#define _VNIC_INTR_H_
+
+#include <linux/pci.h>
+#include "vnic_dev.h"
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_intr_unmask fnic_intr_unmask
+#define vnic_intr_mask fnic_intr_mask
+#define vnic_intr_return_credits fnic_intr_return_credits
+#define vnic_intr_credits fnic_intr_credits
+#define vnic_intr_return_all_credits fnic_intr_return_all_credits
+#define vnic_intr_legacy_pba fnic_intr_legacy_pba
+#define vnic_intr_free fnic_intr_free
+#define vnic_intr_alloc fnic_intr_alloc
+#define vnic_intr_init fnic_intr_init
+#define vnic_intr_clean fnic_intr_clean
+
+#define VNIC_INTR_TIMER_MAX             0xffff
+
+#define VNIC_INTR_TIMER_TYPE_ABS        0
+#define VNIC_INTR_TIMER_TYPE_QUIET      1
+
+/* Interrupt control */
+struct vnic_intr_ctrl {
+        u32 coalescing_timer;           /* 0x00 */
+        u32 pad0;
+        u32 coalescing_value;           /* 0x08 */
+        u32 pad1;
+        u32 coalescing_type;            /* 0x10 */
+        u32 pad2;
+        u32 mask_on_assertion;          /* 0x18 */
+        u32 pad3;
+        u32 mask;                       /* 0x20 */
+        u32 pad4;
+        u32 int_credits;                /* 0x28 */
+        u32 pad5;
+        u32 int_credit_return;          /* 0x30 */
+        u32 pad6;
+};
+
+struct vnic_intr {
+        unsigned int index;
+        struct vnic_dev *vdev;
+        struct vnic_intr_ctrl __iomem *ctrl;    /* memory-mapped */
+};
+
+static inline void vnic_intr_unmask(struct vnic_intr *intr)
+{
+        iowrite32(0, &intr->ctrl->mask);
+}
+
+static inline void vnic_intr_mask(struct vnic_intr *intr)
+{
+        iowrite32(1, &intr->ctrl->mask);
+}
+
+static inline void vnic_intr_return_credits(struct vnic_intr *intr,
+        unsigned int credits, int unmask, int reset_timer)
+{
+#define VNIC_INTR_UNMASK_SHIFT          16
+#define VNIC_INTR_RESET_TIMER_SHIFT     17
+
+        u32 int_credit_return = (credits & 0xffff) |
+                (unmask ? (1 << VNIC_INTR_UNMASK_SHIFT) : 0) |
+                (reset_timer ? (1 << VNIC_INTR_RESET_TIMER_SHIFT) : 0);
+
+        iowrite32(int_credit_return, &intr->ctrl->int_credit_return);
+}
+
+static inline unsigned int vnic_intr_credits(struct vnic_intr *intr)
+{
+        return ioread32(&intr->ctrl->int_credits);
+}
+
+static inline void vnic_intr_return_all_credits(struct vnic_intr *intr)
+{
+        unsigned int credits = vnic_intr_credits(intr);
+        int unmask = 1;
+        int reset_timer = 1;
+
+        vnic_intr_return_credits(intr, credits, unmask, reset_timer);
+}
+
+static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba)
+{
+        /* read PBA without clearing */
+        return ioread32(legacy_pba);
+}
+
+void vnic_intr_free(struct vnic_intr *intr);
+int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
+        unsigned int index);
+void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,
+        unsigned int coalescing_type, unsigned int mask_on_assertion);
+void vnic_intr_clean(struct vnic_intr *intr);
+
+#endif /* _VNIC_INTR_H_ */
diff --git a/drivers/scsi/fnic/vnic_nic.h b/drivers/scsi/fnic/vnic_nic.h
new file mode 100644
index 000000000000..f15b83eeaced
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_nic.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_NIC_H_
+#define _VNIC_NIC_H_
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_set_nic_cfg fnic_set_nic_cfg
+
+#define NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD      0xffUL
+#define NIC_CFG_RSS_DEFAULT_CPU_SHIFT           0
+#define NIC_CFG_RSS_HASH_TYPE                   (0xffUL << 8)
+#define NIC_CFG_RSS_HASH_TYPE_MASK_FIELD        0xffUL
+#define NIC_CFG_RSS_HASH_TYPE_SHIFT             8
+#define NIC_CFG_RSS_HASH_BITS                   (7UL << 16)
+#define NIC_CFG_RSS_HASH_BITS_MASK_FIELD        7UL
+#define NIC_CFG_RSS_HASH_BITS_SHIFT             16
+#define NIC_CFG_RSS_BASE_CPU                    (7UL << 19)
+#define NIC_CFG_RSS_BASE_CPU_MASK_FIELD         7UL
+#define NIC_CFG_RSS_BASE_CPU_SHIFT              19
+#define NIC_CFG_RSS_ENABLE                      (1UL << 22)
+#define NIC_CFG_RSS_ENABLE_MASK_FIELD           1UL
+#define NIC_CFG_RSS_ENABLE_SHIFT                22
+#define NIC_CFG_TSO_IPID_SPLIT_EN               (1UL << 23)
+#define NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD    1UL
+#define NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT         23
+#define NIC_CFG_IG_VLAN_STRIP_EN                (1UL << 24)
+#define NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD     1UL
+#define NIC_CFG_IG_VLAN_STRIP_EN_SHIFT          24
+
+static inline void vnic_set_nic_cfg(u32 *nic_cfg,
+        u8 rss_default_cpu, u8 rss_hash_type,
+        u8 rss_hash_bits, u8 rss_base_cpu,
+        u8 rss_enable, u8 tso_ipid_split_en,
+        u8 ig_vlan_strip_en)
+{
+        *nic_cfg = (rss_default_cpu & NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD) |
+                ((rss_hash_type & NIC_CFG_RSS_HASH_TYPE_MASK_FIELD)
+                        << NIC_CFG_RSS_HASH_TYPE_SHIFT) |
+                ((rss_hash_bits & NIC_CFG_RSS_HASH_BITS_MASK_FIELD)
+                        << NIC_CFG_RSS_HASH_BITS_SHIFT) |
+                ((rss_base_cpu & NIC_CFG_RSS_BASE_CPU_MASK_FIELD)
+                        << NIC_CFG_RSS_BASE_CPU_SHIFT) |
+                ((rss_enable & NIC_CFG_RSS_ENABLE_MASK_FIELD)
+                        << NIC_CFG_RSS_ENABLE_SHIFT) |
+                ((tso_ipid_split_en & NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD)
+                        << NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT) |
+                ((ig_vlan_strip_en & NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD)
+                        << NIC_CFG_IG_VLAN_STRIP_EN_SHIFT);
+}
+
+#endif /* _VNIC_NIC_H_ */
diff --git a/drivers/scsi/fnic/vnic_resource.h b/drivers/scsi/fnic/vnic_resource.h
new file mode 100644
index 000000000000..2d842f79d41a
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_resource.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_RESOURCE_H_
+#define _VNIC_RESOURCE_H_
+
+#define VNIC_RES_MAGIC          0x766E6963L     /* 'vnic' */
+#define VNIC_RES_VERSION        0x00000000L
+
+/* vNIC resource types */
+enum vnic_res_type {
+        RES_TYPE_EOL,                   /* End-of-list */
+        RES_TYPE_WQ,                    /* Work queues */
+        RES_TYPE_RQ,                    /* Receive queues */
+        RES_TYPE_CQ,                    /* Completion queues */
+        RES_TYPE_RSVD1,
+        RES_TYPE_NIC_CFG,               /* Enet NIC config registers */
+        RES_TYPE_RSVD2,
+        RES_TYPE_RSVD3,
+        RES_TYPE_RSVD4,
+        RES_TYPE_RSVD5,
+        RES_TYPE_INTR_CTRL,             /* Interrupt ctrl table */
+        RES_TYPE_INTR_TABLE,            /* MSI/MSI-X Interrupt table */
+        RES_TYPE_INTR_PBA,              /* MSI/MSI-X PBA table */
+        RES_TYPE_INTR_PBA_LEGACY,       /* Legacy intr status */
+        RES_TYPE_RSVD6,
+        RES_TYPE_RSVD7,
+        RES_TYPE_DEVCMD,                /* Device command region */
+        RES_TYPE_PASS_THRU_PAGE,        /* Pass-thru page */
+
+        RES_TYPE_MAX,                   /* Count of resource types */
+};
+
+struct vnic_resource_header {
+        u32 magic;
+        u32 version;
+};
+
+struct vnic_resource {
+        u8 type;
+        u8 bar;
+        u8 pad[2];
+        u32 bar_offset;
+        u32 count;
+};
+
+#endif /* _VNIC_RESOURCE_H_ */
diff --git a/drivers/scsi/fnic/vnic_rq.c b/drivers/scsi/fnic/vnic_rq.c
new file mode 100644
index 000000000000..bedd0d285630
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_rq.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include "vnic_dev.h"
+#include "vnic_rq.h"
+
+static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
+{
+        struct vnic_rq_buf *buf;
+        struct vnic_dev *vdev;
+        unsigned int i, j, count = rq->ring.desc_count;
+        unsigned int blks = VNIC_RQ_BUF_BLKS_NEEDED(count);
+
+        vdev = rq->vdev;
+
+        for (i = 0; i < blks; i++) {
+                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
+                if (!rq->bufs[i]) {
+                        printk(KERN_ERR "Failed to alloc rq_bufs\n");
+                        return -ENOMEM;
+                }
+        }
+
+        for (i = 0; i < blks; i++) {
+                buf = rq->bufs[i];
+                for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES; j++) {
+                        buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES + j;
+                        buf->desc = (u8 *)rq->ring.descs +
+                                rq->ring.desc_size * buf->index;
+                        if (buf->index + 1 == count) {
+                                buf->next = rq->bufs[0];
+                                break;
+                        } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES) {
+                                buf->next = rq->bufs[i + 1];
+                        } else {
+                                buf->next = buf + 1;
+                                buf++;
+                        }
+                }
+        }
+
+        rq->to_use = rq->to_clean = rq->bufs[0];
+        rq->buf_index = 0;
+
+        return 0;
+}
+
+void vnic_rq_free(struct vnic_rq *rq)
+{
+        struct vnic_dev *vdev;
+        unsigned int i;
+
+        vdev = rq->vdev;
+
+        vnic_dev_free_desc_ring(vdev, &rq->ring);
+
+        for (i = 0; i < VNIC_RQ_BUF_BLKS_MAX; i++) {
+                kfree(rq->bufs[i]);
+                rq->bufs[i] = NULL;
+        }
+
+        rq->ctrl = NULL;
+}
+
+int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size)
+{
+        int err;
+
+        rq->index = index;
+        rq->vdev = vdev;
+
+        rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);
+        if (!rq->ctrl) {
+                printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index);
+                return -EINVAL;
+        }
+
+        vnic_rq_disable(rq);
+
+        err = vnic_dev_alloc_desc_ring(vdev, &rq->ring, desc_count, desc_size);
+        if (err)
+                return err;
+
+        err = vnic_rq_alloc_bufs(rq);
+        if (err) {
+                vnic_rq_free(rq);
+                return err;
+        }
+
+        return 0;
+}
+
+void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset)
+{
+        u64 paddr;
+        u32 fetch_index;
+
+        paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
+        writeq(paddr, &rq->ctrl->ring_base);
+        iowrite32(rq->ring.desc_count, &rq->ctrl->ring_size);
+        iowrite32(cq_index, &rq->ctrl->cq_index);
+        iowrite32(error_interrupt_enable, &rq->ctrl->error_interrupt_enable);
+        iowrite32(error_interrupt_offset, &rq->ctrl->error_interrupt_offset);
+        iowrite32(0, &rq->ctrl->dropped_packet_count);
+        iowrite32(0, &rq->ctrl->error_status);
+
+        /* Use current fetch_index as the ring starting point */
+        fetch_index = ioread32(&rq->ctrl->fetch_index);
+        rq->to_use = rq->to_clean =
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+        iowrite32(fetch_index, &rq->ctrl->posted_index);
+
+        rq->buf_index = 0;
+}
+
+unsigned int vnic_rq_error_status(struct vnic_rq *rq)
+{
+        return ioread32(&rq->ctrl->error_status);
+}
+
+void vnic_rq_enable(struct vnic_rq *rq)
+{
+        iowrite32(1, &rq->ctrl->enable);
+}
+
+int vnic_rq_disable(struct vnic_rq *rq)
+{
+        unsigned int wait;
+
+        iowrite32(0, &rq->ctrl->enable);
+
+        /* Wait for HW to ACK disable request */
+        for (wait = 0; wait < 100; wait++) {
+                if (!(ioread32(&rq->ctrl->running)))
+                        return 0;
+                udelay(1);
+        }
+
+        printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);
+
+        return -ETIMEDOUT;
+}
+
+void vnic_rq_clean(struct vnic_rq *rq,
+        void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf))
+{
+        struct vnic_rq_buf *buf;
+        u32 fetch_index;
+
+        BUG_ON(ioread32(&rq->ctrl->enable));
+
+        buf = rq->to_clean;
+
+        while (vnic_rq_desc_used(rq) > 0) {
+
+                (*buf_clean)(rq, buf);
+
+                buf = rq->to_clean = buf->next;
+                rq->ring.desc_avail++;
+        }
+
+        /* Use current fetch_index as the ring starting point */
+        fetch_index = ioread32(&rq->ctrl->fetch_index);
+        rq->to_use = rq->to_clean =
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+        iowrite32(fetch_index, &rq->ctrl->posted_index);
+
+        rq->buf_index = 0;
+
+        vnic_dev_clear_desc_ring(&rq->ring);
+}
+
diff --git a/drivers/scsi/fnic/vnic_rq.h b/drivers/scsi/fnic/vnic_rq.h
new file mode 100644
index 000000000000..aebdfbd6ad3c
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_rq.h
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_RQ_H_
+#define _VNIC_RQ_H_
+
+#include <linux/pci.h>
+#include "vnic_dev.h"
+#include "vnic_cq.h"
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_rq_desc_avail fnic_rq_desc_avail
+#define vnic_rq_desc_used fnic_rq_desc_used
+#define vnic_rq_next_desc fnic_rq_next_desc
+#define vnic_rq_next_index fnic_rq_next_index
+#define vnic_rq_next_buf_index fnic_rq_next_buf_index
+#define vnic_rq_post fnic_rq_post
+#define vnic_rq_posting_soon fnic_rq_posting_soon
+#define vnic_rq_return_descs fnic_rq_return_descs
+#define vnic_rq_service fnic_rq_service
+#define vnic_rq_fill fnic_rq_fill
+#define vnic_rq_free fnic_rq_free
+#define vnic_rq_alloc fnic_rq_alloc
+#define vnic_rq_init fnic_rq_init
+#define vnic_rq_error_status fnic_rq_error_status
+#define vnic_rq_enable fnic_rq_enable
+#define vnic_rq_disable fnic_rq_disable
+#define vnic_rq_clean fnic_rq_clean
+
+/* Receive queue control */
+struct vnic_rq_ctrl {
+        u64 ring_base;                  /* 0x00 */
+        u32 ring_size;                  /* 0x08 */
+        u32 pad0;
+        u32 posted_index;               /* 0x10 */
+        u32 pad1;
+        u32 cq_index;                   /* 0x18 */
+        u32 pad2;
+        u32 enable;                     /* 0x20 */
+        u32 pad3;
+        u32 running;                    /* 0x28 */
+        u32 pad4;
+        u32 fetch_index;                /* 0x30 */
+        u32 pad5;
+        u32 error_interrupt_enable;     /* 0x38 */
+        u32 pad6;
+        u32 error_interrupt_offset;     /* 0x40 */
+        u32 pad7;
+        u32 error_status;               /* 0x48 */
+        u32 pad8;
+        u32 dropped_packet_count;       /* 0x50 */
+        u32 pad9;
+        u32 dropped_packet_count_rc;    /* 0x58 */
+        u32 pad10;
+};
+
+/* Break the vnic_rq_buf allocations into blocks of 64 entries */
+#define VNIC_RQ_BUF_BLK_ENTRIES 64
+#define VNIC_RQ_BUF_BLK_SZ \
+        (VNIC_RQ_BUF_BLK_ENTRIES * sizeof(struct vnic_rq_buf))
+#define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
+        DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES)
+#define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)
+
+struct vnic_rq_buf {
+        struct vnic_rq_buf *next;
+        dma_addr_t dma_addr;
+        void *os_buf;
+        unsigned int os_buf_index;
+        unsigned int len;
+        unsigned int index;
+        void *desc;
+};
+
+struct vnic_rq {
+        unsigned int index;
+        struct vnic_dev *vdev;
+        struct vnic_rq_ctrl __iomem *ctrl;      /* memory-mapped */
+        struct vnic_dev_ring ring;
+        struct vnic_rq_buf *bufs[VNIC_RQ_BUF_BLKS_MAX];
+        struct vnic_rq_buf *to_use;
+        struct vnic_rq_buf *to_clean;
+        void *os_buf_head;
+        unsigned int buf_index;
+        unsigned int pkts_outstanding;
+};
+
+static inline unsigned int vnic_rq_desc_avail(struct vnic_rq *rq)
+{
+        /* how many does SW own? */
+        return rq->ring.desc_avail;
+}
+
+static inline unsigned int vnic_rq_desc_used(struct vnic_rq *rq)
+{
+        /* how many does HW own? */
+        return rq->ring.desc_count - rq->ring.desc_avail - 1;
+}
+
+static inline void *vnic_rq_next_desc(struct vnic_rq *rq)
+{
+        return rq->to_use->desc;
+}
+
+static inline unsigned int vnic_rq_next_index(struct vnic_rq *rq)
+{
+        return rq->to_use->index;
+}
+
+static inline unsigned int vnic_rq_next_buf_index(struct vnic_rq *rq)
+{
+        return rq->buf_index++;
+}
+
+static inline void vnic_rq_post(struct vnic_rq *rq,
+        void *os_buf, unsigned int os_buf_index,
+        dma_addr_t dma_addr, unsigned int len)
+{
+        struct vnic_rq_buf *buf = rq->to_use;
+
+        buf->os_buf = os_buf;
+        buf->os_buf_index = os_buf_index;
+        buf->dma_addr = dma_addr;
+        buf->len = len;
+
+        buf = buf->next;
+        rq->to_use = buf;
+        rq->ring.desc_avail--;
+
+        /* Move the posted_index every nth descriptor
+         */
+
+#ifndef VNIC_RQ_RETURN_RATE
+#define VNIC_RQ_RETURN_RATE             0xf     /* keep 2^n - 1 */
+#endif
+
+        if ((buf->index & VNIC_RQ_RETURN_RATE) == 0) {
+                /* Adding write memory barrier prevents compiler and/or CPU
+                 * reordering, thus avoiding descriptor posting before
+                 * descriptor is initialized. Otherwise, hardware can read
+                 * stale descriptor fields.
+                 */
+                wmb();
+                iowrite32(buf->index, &rq->ctrl->posted_index);
+        }
+}
+
+static inline int vnic_rq_posting_soon(struct vnic_rq *rq)
+{
+        return (rq->to_use->index & VNIC_RQ_RETURN_RATE) == 0;
+}
+
+static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)
+{
+        rq->ring.desc_avail += count;
+}
+
+enum desc_return_options {
+        VNIC_RQ_RETURN_DESC,
+        VNIC_RQ_DEFER_RETURN_DESC,
+};
+
+static inline void vnic_rq_service(struct vnic_rq *rq,
+        struct cq_desc *cq_desc, u16 completed_index,
+        int desc_return, void (*buf_service)(struct vnic_rq *rq,
+        struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
+        int skipped, void *opaque), void *opaque)
+{
+        struct vnic_rq_buf *buf;
+        int skipped;
+
+        buf = rq->to_clean;
+        while (1) {
+
+                skipped = (buf->index != completed_index);
+
+                (*buf_service)(rq, cq_desc, buf, skipped, opaque);
+
+                if (desc_return == VNIC_RQ_RETURN_DESC)
+                        rq->ring.desc_avail++;
+
+                rq->to_clean = buf->next;
+
+                if (!skipped)
+                        break;
+
+                buf = rq->to_clean;
+        }
+}
+
+static inline int vnic_rq_fill(struct vnic_rq *rq,
+        int (*buf_fill)(struct vnic_rq *rq))
+{
+        int err;
+
+        while (vnic_rq_desc_avail(rq) > 1) {
+
+                err = (*buf_fill)(rq);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+void vnic_rq_free(struct vnic_rq *rq);
+int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size);
+void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset);
+unsigned int vnic_rq_error_status(struct vnic_rq *rq);
+void vnic_rq_enable(struct vnic_rq *rq);
+int vnic_rq_disable(struct vnic_rq *rq);
+void vnic_rq_clean(struct vnic_rq *rq,
+        void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf));
+
+#endif /* _VNIC_RQ_H_ */
diff --git a/drivers/scsi/fnic/vnic_scsi.h b/drivers/scsi/fnic/vnic_scsi.h
new file mode 100644
index 000000000000..46baa5254001
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_scsi.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_SCSI_H_
+#define _VNIC_SCSI_H_
+
+#define VNIC_FNIC_WQ_COPY_COUNT_MIN         1
+#define VNIC_FNIC_WQ_COPY_COUNT_MAX         1
+
+#define VNIC_FNIC_WQ_DESCS_MIN              64
+#define VNIC_FNIC_WQ_DESCS_MAX              128
+
+#define VNIC_FNIC_WQ_COPY_DESCS_MIN         64
+#define VNIC_FNIC_WQ_COPY_DESCS_MAX         512
+
+#define VNIC_FNIC_RQ_DESCS_MIN              64
+#define VNIC_FNIC_RQ_DESCS_MAX              128
+
+#define VNIC_FNIC_EDTOV_MIN                 1000
+#define VNIC_FNIC_EDTOV_MAX                 255000
+#define VNIC_FNIC_EDTOV_DEF                 2000
+
+#define VNIC_FNIC_RATOV_MIN                 1000
+#define VNIC_FNIC_RATOV_MAX                 255000
+
+#define VNIC_FNIC_MAXDATAFIELDSIZE_MIN      256
+#define VNIC_FNIC_MAXDATAFIELDSIZE_MAX      2112
+
+#define VNIC_FNIC_FLOGI_RETRIES_MIN         0
+#define VNIC_FNIC_FLOGI_RETRIES_MAX         0xffffffff
+#define VNIC_FNIC_FLOGI_RETRIES_DEF         0xffffffff
+
+#define VNIC_FNIC_FLOGI_TIMEOUT_MIN         1000
+#define VNIC_FNIC_FLOGI_TIMEOUT_MAX         255000
+
+#define VNIC_FNIC_PLOGI_RETRIES_MIN         0
+#define VNIC_FNIC_PLOGI_RETRIES_MAX         255
+#define VNIC_FNIC_PLOGI_RETRIES_DEF         8
+
+#define VNIC_FNIC_PLOGI_TIMEOUT_MIN         1000
+#define VNIC_FNIC_PLOGI_TIMEOUT_MAX         255000
+
+#define VNIC_FNIC_IO_THROTTLE_COUNT_MIN     256
+#define VNIC_FNIC_IO_THROTTLE_COUNT_MAX     4096
+
+#define VNIC_FNIC_LINK_DOWN_TIMEOUT_MIN     0
+#define VNIC_FNIC_LINK_DOWN_TIMEOUT_MAX     240000
+
+#define VNIC_FNIC_PORT_DOWN_TIMEOUT_MIN     0
+#define VNIC_FNIC_PORT_DOWN_TIMEOUT_MAX     240000
+
+#define VNIC_FNIC_PORT_DOWN_IO_RETRIES_MIN  0
+#define VNIC_FNIC_PORT_DOWN_IO_RETRIES_MAX  255
+
+#define VNIC_FNIC_LUNS_PER_TARGET_MIN       1
+#define VNIC_FNIC_LUNS_PER_TARGET_MAX       1024
+
+/* Device-specific region: scsi configuration */
+struct vnic_fc_config {
+        u64 node_wwn;
+        u64 port_wwn;
+        u32 flags;
+        u32 wq_enet_desc_count;
+        u32 wq_copy_desc_count;
+        u32 rq_desc_count;
+        u32 flogi_retries;
+        u32 flogi_timeout;
+        u32 plogi_retries;
+        u32 plogi_timeout;
+        u32 io_throttle_count;
+        u32 link_down_timeout;
+        u32 port_down_timeout;
+        u32 port_down_io_retries;
+        u32 luns_per_tgt;
+        u16 maxdatafieldsize;
+        u16 ed_tov;
+        u16 ra_tov;
+        u16 intr_timer;
+        u8 intr_timer_type;
+};
+
+#define VFCF_FCP_SEQ_LVL_ERR    0x1     /* Enable FCP-2 Error Recovery */
+#define VFCF_PERBI              0x2     /* persistent binding info available */
+
+#endif /* _VNIC_SCSI_H_ */
diff --git a/drivers/scsi/fnic/vnic_stats.h b/drivers/scsi/fnic/vnic_stats.h
new file mode 100644
index 000000000000..5372e23c1cb3
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_stats.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_STATS_H_
+#define _VNIC_STATS_H_
+
+/* Tx statistics */
+struct vnic_tx_stats {
+        u64 tx_frames_ok;
+        u64 tx_unicast_frames_ok;
+        u64 tx_multicast_frames_ok;
+        u64 tx_broadcast_frames_ok;
+        u64 tx_bytes_ok;
+        u64 tx_unicast_bytes_ok;
+        u64 tx_multicast_bytes_ok;
+        u64 tx_broadcast_bytes_ok;
+        u64 tx_drops;
+        u64 tx_errors;
+        u64 tx_tso;
+        u64 rsvd[16];
+};
+
+/* Rx statistics */
+struct vnic_rx_stats {
+        u64 rx_frames_ok;
+        u64 rx_frames_total;
+        u64 rx_unicast_frames_ok;
+        u64 rx_multicast_frames_ok;
+        u64 rx_broadcast_frames_ok;
+        u64 rx_bytes_ok;
+        u64 rx_unicast_bytes_ok;
+        u64 rx_multicast_bytes_ok;
+        u64 rx_broadcast_bytes_ok;
+        u64 rx_drop;
+        u64 rx_no_bufs;
+        u64 rx_errors;
+        u64 rx_rss;
+        u64 rx_crc_errors;
+        u64 rx_frames_64;
+        u64 rx_frames_127;
+        u64 rx_frames_255;
+        u64 rx_frames_511;
+        u64 rx_frames_1023;
+        u64 rx_frames_1518;
+        u64 rx_frames_to_max;
+        u64 rsvd[16];
+};
+
+struct vnic_stats {
+        struct vnic_tx_stats tx;
+        struct vnic_rx_stats rx;
+};
+
+#endif /* _VNIC_STATS_H_ */
diff --git a/drivers/scsi/fnic/vnic_wq.c b/drivers/scsi/fnic/vnic_wq.c
new file mode 100644
index 000000000000..1f9ea790d130
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_wq.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include "vnic_dev.h"
+#include "vnic_wq.h"
+
+static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
+{
+        struct vnic_wq_buf *buf;
+        struct vnic_dev *vdev;
+        unsigned int i, j, count = wq->ring.desc_count;
+        unsigned int blks = VNIC_WQ_BUF_BLKS_NEEDED(count);
+
+        vdev = wq->vdev;
+
+        for (i = 0; i < blks; i++) {
+                wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);
+                if (!wq->bufs[i]) {
+                        printk(KERN_ERR "Failed to alloc wq_bufs\n");
+                        return -ENOMEM;
+                }
+        }
+
+        for (i = 0; i < blks; i++) {
+                buf = wq->bufs[i];
+                for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES; j++) {
+                        buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES + j;
+                        buf->desc = (u8 *)wq->ring.descs +
+                                wq->ring.desc_size * buf->index;
+                        if (buf->index + 1 == count) {
+                                buf->next = wq->bufs[0];
+                                break;
+                        } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES) {
+                                buf->next = wq->bufs[i + 1];
+                        } else {
+                                buf->next = buf + 1;
+                                buf++;
+                        }
+                }
+        }
+
+        wq->to_use = wq->to_clean = wq->bufs[0];
+
+        return 0;
+}
+
+void vnic_wq_free(struct vnic_wq *wq)
+{
+        struct vnic_dev *vdev;
+        unsigned int i;
+
+        vdev = wq->vdev;
+
+        vnic_dev_free_desc_ring(vdev, &wq->ring);
+
+        for (i = 0; i < VNIC_WQ_BUF_BLKS_MAX; i++) {
+                kfree(wq->bufs[i]);
+                wq->bufs[i] = NULL;
+        }
+
+        wq->ctrl = NULL;
+
+}
+
+int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size)
+{
+        int err;
+
+        wq->index = index;
+        wq->vdev = vdev;
+
+        wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
+        if (!wq->ctrl) {
+                printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index);
+                return -EINVAL;
+        }
+
+        vnic_wq_disable(wq);
+
+        err = vnic_dev_alloc_desc_ring(vdev, &wq->ring, desc_count, desc_size);
+        if (err)
+                return err;
+
+        err = vnic_wq_alloc_bufs(wq);
+        if (err) {
+                vnic_wq_free(wq);
+                return err;
+        }
+
+        return 0;
+}
+
+void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset)
+{
+        u64 paddr;
+
+        paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
+        writeq(paddr, &wq->ctrl->ring_base);
+        iowrite32(wq->ring.desc_count, &wq->ctrl->ring_size);
+        iowrite32(0, &wq->ctrl->fetch_index);
+        iowrite32(0, &wq->ctrl->posted_index);
+        iowrite32(cq_index, &wq->ctrl->cq_index);
+        iowrite32(error_interrupt_enable, &wq->ctrl->error_interrupt_enable);
+        iowrite32(error_interrupt_offset, &wq->ctrl->error_interrupt_offset);
+        iowrite32(0, &wq->ctrl->error_status);
+}
+
+unsigned int vnic_wq_error_status(struct vnic_wq *wq)
+{
+        return ioread32(&wq->ctrl->error_status);
+}
+
+void vnic_wq_enable(struct vnic_wq *wq)
+{
+        iowrite32(1, &wq->ctrl->enable);
+}
+
+int vnic_wq_disable(struct vnic_wq *wq)
+{
+        unsigned int wait;
+
+        iowrite32(0, &wq->ctrl->enable);
+
+        /* Wait for HW to ACK disable request */
+        for (wait = 0; wait < 100; wait++) {
+                if (!(ioread32(&wq->ctrl->running)))
+                        return 0;
+                udelay(1);
+        }
+
+        printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index);
+
+        return -ETIMEDOUT;
+}
+
+void vnic_wq_clean(struct vnic_wq *wq,
+        void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf))
+{
+        struct vnic_wq_buf *buf;
+
+        BUG_ON(ioread32(&wq->ctrl->enable));
+
+        buf = wq->to_clean;
+
+        while (vnic_wq_desc_used(wq) > 0) {
+
+                (*buf_clean)(wq, buf);
+
+                buf = wq->to_clean = buf->next;
+                wq->ring.desc_avail++;
+        }
+
+        wq->to_use = wq->to_clean = wq->bufs[0];
+
+        iowrite32(0, &wq->ctrl->fetch_index);
+        iowrite32(0, &wq->ctrl->posted_index);
+        iowrite32(0, &wq->ctrl->error_status);
+
+        vnic_dev_clear_desc_ring(&wq->ring);
+}
diff --git a/drivers/scsi/fnic/vnic_wq.h b/drivers/scsi/fnic/vnic_wq.h
new file mode 100644
index 000000000000..5cd094f79281
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_wq.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_WQ_H_
+#define _VNIC_WQ_H_
+
+#include <linux/pci.h>
+#include "vnic_dev.h"
+#include "vnic_cq.h"
+
+/*
+ * These defines avoid symbol clash between fnic and enic (Cisco 10G Eth
+ * Driver) when both are built with CONFIG options =y
+ */
+#define vnic_wq_desc_avail fnic_wq_desc_avail
+#define vnic_wq_desc_used fnic_wq_desc_used
+#define vnic_wq_next_desc fni_cwq_next_desc
+#define vnic_wq_post fnic_wq_post
+#define vnic_wq_service fnic_wq_service
+#define vnic_wq_free fnic_wq_free
+#define vnic_wq_alloc fnic_wq_alloc
+#define vnic_wq_init fnic_wq_init
+#define vnic_wq_error_status fnic_wq_error_status
+#define vnic_wq_enable fnic_wq_enable
+#define vnic_wq_disable fnic_wq_disable
+#define vnic_wq_clean fnic_wq_clean
+
+/* Work queue control */
+struct vnic_wq_ctrl {
+        u64 ring_base;                  /* 0x00 */
+        u32 ring_size;                  /* 0x08 */
+        u32 pad0;
+        u32 posted_index;               /* 0x10 */
+        u32 pad1;
+        u32 cq_index;                   /* 0x18 */
+        u32 pad2;
+        u32 enable;                     /* 0x20 */
+        u32 pad3;
+        u32 running;                    /* 0x28 */
+        u32 pad4;
+        u32 fetch_index;                /* 0x30 */
+        u32 pad5;
+        u32 dca_value;                  /* 0x38 */
+        u32 pad6;
+        u32 error_interrupt_enable;     /* 0x40 */
+        u32 pad7;
+        u32 error_interrupt_offset;     /* 0x48 */
+        u32 pad8;
+        u32 error_status;               /* 0x50 */
+        u32 pad9;
+};
+
+struct vnic_wq_buf {
+        struct vnic_wq_buf *next;
+        dma_addr_t dma_addr;
+        void *os_buf;
+        unsigned int len;
+        unsigned int index;
+        int sop;
+        void *desc;
+};
+
+/* Break the vnic_wq_buf allocations into blocks of 64 entries */
+#define VNIC_WQ_BUF_BLK_ENTRIES 64
+#define VNIC_WQ_BUF_BLK_SZ \
+        (VNIC_WQ_BUF_BLK_ENTRIES * sizeof(struct vnic_wq_buf))
+#define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
+        DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES)
+#define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)
+
+struct vnic_wq {
+        unsigned int index;
+        struct vnic_dev *vdev;
+        struct vnic_wq_ctrl __iomem *ctrl;      /* memory-mapped */
+        struct vnic_dev_ring ring;
+        struct vnic_wq_buf *bufs[VNIC_WQ_BUF_BLKS_MAX];
+        struct vnic_wq_buf *to_use;
+        struct vnic_wq_buf *to_clean;
+        unsigned int pkts_outstanding;
+};
+
+static inline unsigned int vnic_wq_desc_avail(struct vnic_wq *wq)
+{
+        /* how many does SW own? */
+        return wq->ring.desc_avail;
+}
+
+static inline unsigned int vnic_wq_desc_used(struct vnic_wq *wq)
+{
+        /* how many does HW own? */
+        return wq->ring.desc_count - wq->ring.desc_avail - 1;
+}
+
+static inline void *vnic_wq_next_desc(struct vnic_wq *wq)
+{
+        return wq->to_use->desc;
+}
+
+static inline void vnic_wq_post(struct vnic_wq *wq,
+        void *os_buf, dma_addr_t dma_addr,
+        unsigned int len, int sop, int eop)
+{
+        struct vnic_wq_buf *buf = wq->to_use;
+
+        buf->sop = sop;
+        buf->os_buf = eop ? os_buf : NULL;
+        buf->dma_addr = dma_addr;
+        buf->len = len;
+
+        buf = buf->next;
+        if (eop) {
+                /* Adding write memory barrier prevents compiler and/or CPU
+                 * reordering, thus avoiding descriptor posting before
+                 * descriptor is initialized. Otherwise, hardware can read
+                 * stale descriptor fields.
+                 */
+                wmb();
+                iowrite32(buf->index, &wq->ctrl->posted_index);
+        }
+        wq->to_use = buf;
+
+        wq->ring.desc_avail--;
+}
+
+static inline void vnic_wq_service(struct vnic_wq *wq,
+        struct cq_desc *cq_desc, u16 completed_index,
+        void (*buf_service)(struct vnic_wq *wq,
+        struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque),
+        void *opaque)
+{
+        struct vnic_wq_buf *buf;
+
+        buf = wq->to_clean;
+        while (1) {
+
+                (*buf_service)(wq, cq_desc, buf, opaque);
+
+                wq->ring.desc_avail++;
+
+                wq->to_clean = buf->next;
+
+                if (buf->index == completed_index)
+                        break;
+
+                buf = wq->to_clean;
+        }
+}
+
+void vnic_wq_free(struct vnic_wq *wq);
+int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
+        unsigned int desc_count, unsigned int desc_size);
+void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset);
+unsigned int vnic_wq_error_status(struct vnic_wq *wq);
+void vnic_wq_enable(struct vnic_wq *wq);
+int vnic_wq_disable(struct vnic_wq *wq);
+void vnic_wq_clean(struct vnic_wq *wq,
+        void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));
+
+#endif /* _VNIC_WQ_H_ */
diff --git a/drivers/scsi/fnic/vnic_wq_copy.c b/drivers/scsi/fnic/vnic_wq_copy.c
new file mode 100644
index 000000000000..9eab7e7caf38
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_wq_copy.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include "vnic_wq_copy.h"
+
+void vnic_wq_copy_enable(struct vnic_wq_copy *wq)
+{
+        iowrite32(1, &wq->ctrl->enable);
+}
+
+int vnic_wq_copy_disable(struct vnic_wq_copy *wq)
+{
+        unsigned int wait;
+
+        iowrite32(0, &wq->ctrl->enable);
+
+        /* Wait for HW to ACK disable request */
+        for (wait = 0; wait < 100; wait++) {
+                if (!(ioread32(&wq->ctrl->running)))
+                        return 0;
+                udelay(1);
+        }
+
+        printk(KERN_ERR "Failed to disable Copy WQ[%d],"
+               " fetch index=%d, posted_index=%d\n",
+               wq->index, ioread32(&wq->ctrl->fetch_index),
+               ioread32(&wq->ctrl->posted_index));
+
+        return -ENODEV;
+}
+
+void vnic_wq_copy_clean(struct vnic_wq_copy *wq,
+        void (*q_clean)(struct vnic_wq_copy *wq,
+        struct fcpio_host_req *wq_desc))
+{
+        BUG_ON(ioread32(&wq->ctrl->enable));
+
+        if (vnic_wq_copy_desc_in_use(wq))
+                vnic_wq_copy_service(wq, -1, q_clean);
+
+        wq->to_use_index = wq->to_clean_index = 0;
+
+        iowrite32(0, &wq->ctrl->fetch_index);
+        iowrite32(0, &wq->ctrl->posted_index);
+        iowrite32(0, &wq->ctrl->error_status);
+
+        vnic_dev_clear_desc_ring(&wq->ring);
+}
+
+void vnic_wq_copy_free(struct vnic_wq_copy *wq)
+{
+        struct vnic_dev *vdev;
+
+        vdev = wq->vdev;
+        vnic_dev_free_desc_ring(vdev, &wq->ring);
+        wq->ctrl = NULL;
+}
+
+int vnic_wq_copy_alloc(struct vnic_dev *vdev, struct vnic_wq_copy *wq,
+                       unsigned int index, unsigned int desc_count,
+                       unsigned int desc_size)
+{
+        int err;
+
+        wq->index = index;
+        wq->vdev = vdev;
+        wq->to_use_index = wq->to_clean_index = 0;
+        wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
+        if (!wq->ctrl) {
+                printk(KERN_ERR "Failed to hook COPY WQ[%d] resource\n", index);
+                return -EINVAL;
+        }
+
+        vnic_wq_copy_disable(wq);
+
+        err = vnic_dev_alloc_desc_ring(vdev, &wq->ring, desc_count, desc_size);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+void vnic_wq_copy_init(struct vnic_wq_copy *wq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset)
+{
+        u64 paddr;
+
+        paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
+        writeq(paddr, &wq->ctrl->ring_base);
+        iowrite32(wq->ring.desc_count, &wq->ctrl->ring_size);
+        iowrite32(0, &wq->ctrl->fetch_index);
+        iowrite32(0, &wq->ctrl->posted_index);
+        iowrite32(cq_index, &wq->ctrl->cq_index);
+        iowrite32(error_interrupt_enable, &wq->ctrl->error_interrupt_enable);
+        iowrite32(error_interrupt_offset, &wq->ctrl->error_interrupt_offset);
+}
+
diff --git a/drivers/scsi/fnic/vnic_wq_copy.h b/drivers/scsi/fnic/vnic_wq_copy.h
new file mode 100644
index 000000000000..6aff9740c3df
--- /dev/null
+++ b/drivers/scsi/fnic/vnic_wq_copy.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _VNIC_WQ_COPY_H_
+#define _VNIC_WQ_COPY_H_
+
+#include <linux/pci.h>
+#include "vnic_wq.h"
+#include "fcpio.h"
+
+#define VNIC_WQ_COPY_MAX 1
+
+struct vnic_wq_copy {
+        unsigned int index;
+        struct vnic_dev *vdev;
+        struct vnic_wq_ctrl __iomem *ctrl;      /* memory-mapped */
+        struct vnic_dev_ring ring;
+        unsigned to_use_index;
+        unsigned to_clean_index;
+};
+
+static inline unsigned int vnic_wq_copy_desc_avail(struct vnic_wq_copy *wq)
+{
+        return wq->ring.desc_avail;
+}
+
+static inline unsigned int vnic_wq_copy_desc_in_use(struct vnic_wq_copy *wq)
+{
+        return wq->ring.desc_count - 1 - wq->ring.desc_avail;
+}
+
+static inline void *vnic_wq_copy_next_desc(struct vnic_wq_copy *wq)
+{
+        struct fcpio_host_req *desc = wq->ring.descs;
+        return &desc[wq->to_use_index];
+}
+
+static inline void vnic_wq_copy_post(struct vnic_wq_copy *wq)
+{
+
+        ((wq->to_use_index + 1) == wq->ring.desc_count) ?
+                (wq->to_use_index = 0) : (wq->to_use_index++);
+        wq->ring.desc_avail--;
+
+        /* Adding write memory barrier prevents compiler and/or CPU
+         * reordering, thus avoiding descriptor posting before
+         * descriptor is initialized. Otherwise, hardware can read
+         * stale descriptor fields.
+         */
+        wmb();
+
+        iowrite32(wq->to_use_index, &wq->ctrl->posted_index);
+}
+
+static inline void vnic_wq_copy_desc_process(struct vnic_wq_copy *wq, u16 index)
+{
+        unsigned int cnt;
+
+        if (wq->to_clean_index <= index)
+                cnt = (index - wq->to_clean_index) + 1;
+        else
+                cnt = wq->ring.desc_count - wq->to_clean_index + index + 1;
+
+        wq->to_clean_index = ((index + 1) % wq->ring.desc_count);
+        wq->ring.desc_avail += cnt;
+
+}
+
+static inline void vnic_wq_copy_service(struct vnic_wq_copy *wq,
+        u16 completed_index,
+        void (*q_service)(struct vnic_wq_copy *wq,
+        struct fcpio_host_req *wq_desc))
+{
+        struct fcpio_host_req *wq_desc = wq->ring.descs;
+        unsigned int curr_index;
+
+        while (1) {
+
+                if (q_service)
+                        (*q_service)(wq, &wq_desc[wq->to_clean_index]);
+
+                wq->ring.desc_avail++;
+
+                curr_index = wq->to_clean_index;
+
+                /* increment the to-clean index so that we start
+                 * with an unprocessed index next time we enter the loop
+                 */
+                ((wq->to_clean_index + 1) == wq->ring.desc_count) ?
+                        (wq->to_clean_index = 0) : (wq->to_clean_index++);
+
+                if (curr_index == completed_index)
+                        break;
+
+                /* we have cleaned all the entries */
+                if ((completed_index == (u16)-1) &&
+                    (wq->to_clean_index == wq->to_use_index))
+                        break;
+        }
+}
+
+void vnic_wq_copy_enable(struct vnic_wq_copy *wq);
+int vnic_wq_copy_disable(struct vnic_wq_copy *wq);
+void vnic_wq_copy_free(struct vnic_wq_copy *wq);
+int vnic_wq_copy_alloc(struct vnic_dev *vdev, struct vnic_wq_copy *wq,
+        unsigned int index, unsigned int desc_count, unsigned int desc_size);
+void vnic_wq_copy_init(struct vnic_wq_copy *wq, unsigned int cq_index,
+        unsigned int error_interrupt_enable,
+        unsigned int error_interrupt_offset);
+void vnic_wq_copy_clean(struct vnic_wq_copy *wq,
+        void (*q_clean)(struct vnic_wq_copy *wq,
+        struct fcpio_host_req *wq_desc));
+
+#endif /* _VNIC_WQ_COPY_H_ */
diff --git a/drivers/scsi/fnic/wq_enet_desc.h b/drivers/scsi/fnic/wq_enet_desc.h
new file mode 100644
index 000000000000..b121cbad18b8
--- /dev/null
+++ b/drivers/scsi/fnic/wq_enet_desc.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _WQ_ENET_DESC_H_
+#define _WQ_ENET_DESC_H_
+
+/* Ethernet work queue descriptor: 16B */
+struct wq_enet_desc {
+        __le64 address;
+        __le16 length;
+        __le16 mss_loopback;
+        __le16 header_length_flags;
+        __le16 vlan_tag;
+};
+
+#define WQ_ENET_ADDR_BITS               64
+#define WQ_ENET_LEN_BITS                14
+#define WQ_ENET_LEN_MASK                ((1 << WQ_ENET_LEN_BITS) - 1)
+#define WQ_ENET_MSS_BITS                14
+#define WQ_ENET_MSS_MASK                ((1 << WQ_ENET_MSS_BITS) - 1)
+#define WQ_ENET_MSS_SHIFT               2
+#define WQ_ENET_LOOPBACK_SHIFT          1
+#define WQ_ENET_HDRLEN_BITS             10
+#define WQ_ENET_HDRLEN_MASK             ((1 << WQ_ENET_HDRLEN_BITS) - 1)
+#define WQ_ENET_FLAGS_OM_BITS           2
+#define WQ_ENET_FLAGS_OM_MASK           ((1 << WQ_ENET_FLAGS_OM_BITS) - 1)
+#define WQ_ENET_FLAGS_EOP_SHIFT         12
+#define WQ_ENET_FLAGS_CQ_ENTRY_SHIFT    13
+#define WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT  14
+#define WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT     15
+
+#define WQ_ENET_OFFLOAD_MODE_CSUM       0
+#define WQ_ENET_OFFLOAD_MODE_RESERVED   1
+#define WQ_ENET_OFFLOAD_MODE_CSUM_L4    2
+#define WQ_ENET_OFFLOAD_MODE_TSO        3
+
+static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,
+        u64 address, u16 length, u16 mss, u16 header_length,
+        u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap,
+        u8 vlan_tag_insert, u16 vlan_tag, u8 loopback)
+{
+        desc->address = cpu_to_le64(address);
+        desc->length = cpu_to_le16(length & WQ_ENET_LEN_MASK);
+        desc->mss_loopback = cpu_to_le16((mss & WQ_ENET_MSS_MASK) <<
+                WQ_ENET_MSS_SHIFT | (loopback & 1) << WQ_ENET_LOOPBACK_SHIFT);
+        desc->header_length_flags = cpu_to_le16(
+                (header_length & WQ_ENET_HDRLEN_MASK) |
+                (offload_mode & WQ_ENET_FLAGS_OM_MASK) << WQ_ENET_HDRLEN_BITS |
+                (eop & 1) << WQ_ENET_FLAGS_EOP_SHIFT |
+                (cq_entry & 1) << WQ_ENET_FLAGS_CQ_ENTRY_SHIFT |
+                (fcoe_encap & 1) << WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT |
+                (vlan_tag_insert & 1) << WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT);
+        desc->vlan_tag = cpu_to_le16(vlan_tag);
+}
+
+static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,
+        u64 *address, u16 *length, u16 *mss, u16 *header_length,
+        u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap,
+        u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback)
+{
+        *address = le64_to_cpu(desc->address);
+        *length = le16_to_cpu(desc->length) & WQ_ENET_LEN_MASK;
+        *mss = (le16_to_cpu(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) &
+                WQ_ENET_MSS_MASK;
+        *loopback = (u8)((le16_to_cpu(desc->mss_loopback) >>
+                WQ_ENET_LOOPBACK_SHIFT) & 1);
+        *header_length = le16_to_cpu(desc->header_length_flags) &
+                WQ_ENET_HDRLEN_MASK;
+        *offload_mode = (u8)((le16_to_cpu(desc->header_length_flags) >>
+                WQ_ENET_HDRLEN_BITS) & WQ_ENET_FLAGS_OM_MASK);
+        *eop = (u8)((le16_to_cpu(desc->header_length_flags) >>
+                WQ_ENET_FLAGS_EOP_SHIFT) & 1);
+        *cq_entry = (u8)((le16_to_cpu(desc->header_length_flags) >>
+                WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) & 1);
+        *fcoe_encap = (u8)((le16_to_cpu(desc->header_length_flags) >>
+                WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) & 1);
+        *vlan_tag_insert = (u8)((le16_to_cpu(desc->header_length_flags) >>
+                WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) & 1);
+        *vlan_tag = le16_to_cpu(desc->vlan_tag);
+}
+
+#endif /* _WQ_ENET_DESC_H_ */
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index babd4cc0cb25..36b1d1052ba1 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -69,7 +69,7 @@
 #define MPT2SAS_AUTHOR  "LSI Corporation <DL-MPTFusionLinux@lsi.com>"
 #define MPT2SAS_DESCRIPTION     "LSI MPT Fusion SAS 2.0 Device Driver"
 #define MPT2SAS_DRIVER_VERSION          "01.100.02.00"
-#define MPT2SAS_MAJOR_VERSION           00
+#define MPT2SAS_MAJOR_VERSION           01
 #define MPT2SAS_MINOR_VERSION           100
 #define MPT2SAS_BUILD_VERSION           02
 #define MPT2SAS_RELEASE_VERSION         00
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6f51ca485f35..e2b50d8f57a8 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -425,6 +425,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         INIT_LIST_HEAD(&starget->devices);
         starget->state = STARGET_CREATED;
         starget->scsi_level = SCSI_2;
+        starget->max_target_blocked = SCSI_DEFAULT_TARGET_BLOCKED;
  retry:
         spin_lock_irqsave(shost->host_lock, flags);
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 094795455293..0a2ce7b6325c 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -357,7 +357,7 @@ int iscsi_session_chkready(struct iscsi_cls_session *session)
                 err = 0;
                 break;
         case ISCSI_SESSION_FAILED:
-                err = DID_TRANSPORT_DISRUPTED << 16;
+                err = DID_IMM_RETRY << 16;
                 break;
         case ISCSI_SESSION_FREE:
                 err = DID_TRANSPORT_FAILFAST << 16;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index b4b39811b445..a0127e93ade0 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -137,6 +137,7 @@ struct uart_8250_port {
         unsigned char           mcr;
         unsigned char           mcr_mask;       /* mask of user bits */
         unsigned char           mcr_force;      /* mask of forced bits */
+        unsigned char           cur_iotype;     /* Running I/O type */
 
         /*
          * Some bits in registers are cleared on a read, so they must
@@ -471,6 +472,7 @@ static void io_serial_out(struct uart_port *p, int offset, int value)
 
 static void set_io_from_upio(struct uart_port *p)
 {
+        struct uart_8250_port *up = (struct uart_8250_port *)p;
         switch (p->iotype) {
         case UPIO_HUB6:
                 p->serial_in = hub6_serial_in;
@@ -509,6 +511,8 @@ static void set_io_from_upio(struct uart_port *p)
                 p->serial_out = io_serial_out;
                 break;
         }
+        /* Remember loaded iotype */
+        up->cur_iotype = p->iotype;
 }
 
 static void
@@ -1937,6 +1941,9 @@ static int serial8250_startup(struct uart_port *port)
         up->capabilities = uart_config[up->port.type].flags;
         up->mcr = 0;
 
+        if (up->port.iotype != up->cur_iotype)
+                set_io_from_upio(port);
+
         if (up->port.type == PORT_16C950) {
                 /* Wake up and initialize UART */
                 up->acr = 0;
@@ -2563,6 +2570,9 @@ static void serial8250_config_port(struct uart_port *port, int flags)
         if (ret < 0)
                 probeflags &= ~PROBE_RSA;
 
+        if (up->port.iotype != up->cur_iotype)
+                set_io_from_upio(port);
+
         if (flags & UART_CONFIG_TYPE)
                 autoconfig(up, probeflags);
         if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
@@ -2671,6 +2681,11 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev)
 {
         int i;
 
+        for (i = 0; i < nr_uarts; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+                up->cur_iotype = 0xFF;
+        }
+
         serial8250_isa_init_ports();
 
         for (i = 0; i < nr_uarts; i++) {
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c
index 418b4fe9a0a1..33149d982e82 100644
--- a/drivers/serial/8250_gsc.c
+++ b/drivers/serial/8250_gsc.c
@@ -39,9 +39,9 @@ static int __init serial_init_chip(struct parisc_device *dev)
                  */
                 if (parisc_parent(dev)->id.hw_type != HPHW_IOA)
                         printk(KERN_INFO
-                                "Serial: device 0x%lx not configured.\n"
+                                "Serial: device 0x%llx not configured.\n"
                                 "Enable support for Wax, Lasi, Asp or Dino.\n",
-                                dev->hpa.start);
+                                (unsigned long long)dev->hpa.start);
                 return -ENODEV;
         }
 
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index e3a5ad5ef1d6..cdc049d4350f 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -665,7 +665,7 @@ static struct uart_driver amba_reg = {
         .cons                   = AMBA_CONSOLE,
 };
 
-static int pl010_probe(struct amba_device *dev, void *id)
+static int pl010_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct uart_amba_port *uap;
         void __iomem *base;
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 8b2b9700f3e4..88fdac51b6c5 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -729,7 +729,7 @@ static struct uart_driver amba_reg = {
         .cons                   = AMBA_CONSOLE,
 };
 
-static int pl011_probe(struct amba_device *dev, void *id)
+static int pl011_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct uart_amba_port *uap;
         void __iomem *base;
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 6579e2be1dd1..a461b3b2c72d 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -1472,8 +1472,8 @@ static void icom_remove_adapter(struct icom_adapter *icom_adapter)
 
         free_irq(icom_adapter->pci_dev->irq, (void *) icom_adapter);
         iounmap(icom_adapter->base_addr);
-        icom_free_adapter(icom_adapter);
         pci_release_regions(icom_adapter->pci_dev);
+        icom_free_adapter(icom_adapter);
 }
 
 static void icom_kref_release(struct kref *kref)
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 7f72f8ceaa6f..b3feb6198d57 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -988,7 +988,7 @@ mpc52xx_console_setup(struct console *co, char *options)
         pr_debug("mpc52xx_console_setup co=%p, co->index=%i, options=%s\n",
                  co, co->index, options);
 
-        if ((co->index < 0) || (co->index > MPC52xx_PSC_MAXNUM)) {
+        if ((co->index < 0) || (co->index >= MPC52xx_PSC_MAXNUM)) {
                 pr_debug("PSC%x out of range\n", co->index);
                 return -EINVAL;
         }
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 0716cdb44cd8..0a3dc5ece634 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_USB_MON)		+= mon/
 obj-$(CONFIG_PCI)               += host/
 obj-$(CONFIG_USB_EHCI_HCD)      += host/
 obj-$(CONFIG_USB_ISP116X_HCD)   += host/
-obj-$(CONFIG_USB_ISP1760_HCD)   += host/
 obj-$(CONFIG_USB_OHCI_HCD)      += host/
 obj-$(CONFIG_USB_UHCI_HCD)      += host/
 obj-$(CONFIG_USB_FHCI_HCD)      += host/
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 0a69c0977e3f..7a1164dd1d37 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1375,6 +1375,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
         { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */
         },
         { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 563d57275448..05c913cc3658 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -794,7 +794,8 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         if (ep->desc) {
                 list_add_tail(&req->queue, &ep->queue);
 
-                if (ep->is_in || (ep_is_control(ep)
+                if ((!ep_is_control(ep) && ep->is_in) ||
+                        (ep_is_control(ep)
                                 && (ep->state == DATA_STAGE_IN
                                         || ep->state == STATUS_STAGE_IN)))
                         usba_ep_writel(ep, CTL_ENB, USBA_TX_PK_RDY);
@@ -1940,7 +1941,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
         usba_writel(udc, CTRL, USBA_DISABLE_MASK);
         clk_disable(pclk);
 
-        usba_ep = kmalloc(sizeof(struct usba_ep) * pdata->num_ep,
+        usba_ep = kzalloc(sizeof(struct usba_ep) * pdata->num_ep,
                           GFP_KERNEL);
         if (!usba_ep)
                 goto err_alloc_ep;
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index cd07ea3f0c63..15438469f21a 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1658,6 +1658,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
         u32 reg_base, or_reg, skip_reg;
         unsigned long flags;
         struct ptd ptd;
+        packet_enqueue *pe;
 
         switch (usb_pipetype(urb->pipe)) {
         case PIPE_ISOCHRONOUS:
@@ -1669,6 +1670,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
                 reg_base = INT_REGS_OFFSET;
                 or_reg = HC_INT_IRQ_MASK_OR_REG;
                 skip_reg = HC_INT_PTD_SKIPMAP_REG;
+                pe = enqueue_an_INT_packet;
                 break;
 
         default:
@@ -1676,6 +1678,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
                 reg_base = ATL_REGS_OFFSET;
                 or_reg = HC_ATL_IRQ_MASK_OR_REG;
                 skip_reg = HC_ATL_PTD_SKIPMAP_REG;
+                pe =  enqueue_an_ATL_packet;
                 break;
         }
 
@@ -1687,6 +1690,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
                         u32 skip_map;
                         u32 or_map;
                         struct isp1760_qtd *qtd;
+                        struct isp1760_qh *qh = ints->qh;
 
                         skip_map = isp1760_readl(hcd->regs + skip_reg);
                         skip_map |= 1 << i;
@@ -1699,8 +1703,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
                         priv_write_copy(priv, (u32 *)&ptd, hcd->regs + reg_base
                                         + i * sizeof(ptd), sizeof(ptd));
                         qtd = ints->qtd;
-
-                        clean_up_qtdlist(qtd);
+                        qtd = clean_up_qtdlist(qtd);
 
                         free_mem(priv, ints->payload);
 
@@ -1711,7 +1714,24 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
                         ints->payload = 0;
 
                         isp1760_urb_done(priv, urb, status);
+                        if (qtd)
+                                pe(hcd, qh, qtd);
                         break;
+
+                } else if (ints->qtd) {
+                        struct isp1760_qtd *qtd, *prev_qtd = ints->qtd;
+
+                        for (qtd = ints->qtd->hw_next; qtd; qtd = qtd->hw_next) {
+                                if (qtd->urb == urb) {
+                                        prev_qtd->hw_next = clean_up_qtdlist(qtd);
+                                        isp1760_urb_done(priv, urb, status);
+                                        break;
+                                }
+                                prev_qtd = qtd;
+                        }
+                        /* we found the urb before the end of the list */
+                        if (qtd)
+                                break;
                 }
                 ints++;
         }
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 0ab8474b00cb..d9fcdaedf389 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1487,14 +1487,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
 
         remove_sysfs_attrs(port);
 
-        /* all open ports are closed at this point
-         *    (by usbserial.c:__serial_close, which calls ftdi_close)
-         */
-
-        if (priv) {
-                usb_set_serial_port_data(port, NULL);
-                kref_put(&priv->kref, ftdi_sio_priv_release);
-        }
+        kref_put(&priv->kref, ftdi_sio_priv_release);
 
         return 0;
 }
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 0a566eea49c0..f331e2bde88a 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -974,6 +974,7 @@ int usb_serial_probe(struct usb_interface *interface,
                 if (retval > 0) {
                         /* quietly accept this device, but don't bind to a
                            serial port as it's about to disappear */
+                        serial->num_ports = 0;
                         goto exit;
                 }
         }
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 61050ab14128..d1f80bac54f0 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -437,7 +437,7 @@ static int clcdfb_register(struct clcd_fb *fb)
         return ret;
 }
 
-static int clcdfb_probe(struct amba_device *dev, void *id)
+static int clcdfb_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct clcd_board *board = dev->dev.platform_data;
         struct clcd_fb *fb;
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 9a577a800db5..2fb63f6ea2f1 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -29,14 +29,8 @@
 
 /* configurable parameters */
 #define ATMEL_LCDC_CVAL_DEFAULT         0xc8
-#define ATMEL_LCDC_DMA_BURST_LEN        8
-
-#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9) || \
-        defined(CONFIG_ARCH_AT91SAM9RL)
-#define ATMEL_LCDC_FIFO_SIZE            2048
-#else
-#define ATMEL_LCDC_FIFO_SIZE            512
-#endif
+#define ATMEL_LCDC_DMA_BURST_LEN        8       /* words */
+#define ATMEL_LCDC_FIFO_SIZE            512     /* words */
 
 #if defined(CONFIG_ARCH_AT91)
 #define ATMEL_LCDFB_FBINFO_DEFAULT      (FBINFO_DEFAULT \
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index dfb72f5e4c96..148cbcc39602 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -880,20 +880,22 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
 
 static int get_dss_clocks(void)
 {
-        if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) {
-                dev_err(dispc.fbdev->dev, "can't get dss_ick\n");
+        dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick");
+        if (IS_ERR(dispc.dss_ick)) {
+                dev_err(dispc.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(dispc.dss_ick);
         }
 
-        if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) {
+        dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck");
+        if (IS_ERR(dispc.dss1_fck)) {
                 dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(dispc.dss_ick);
                 return PTR_ERR(dispc.dss1_fck);
         }
 
-        if (IS_ERR((dispc.dss_54m_fck =
-                                clk_get(dispc.fbdev->dev, "dss_54m_fck")))) {
-                dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n");
+        dispc.dss_54m_fck = clk_get(dispc.fbdev->dev, "tv_fck");
+        if (IS_ERR(dispc.dss_54m_fck)) {
+                dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
                 clk_put(dispc.dss_ick);
                 clk_put(dispc.dss1_fck);
                 return PTR_ERR(dispc.dss_54m_fck);
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index a13c8dcad2a8..9332d6ca6456 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx)
 
 static int rfbi_get_clocks(void)
 {
-        if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) {
-                dev_err(rfbi.fbdev->dev, "can't get dss_ick\n");
+        rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick");
+        if (IS_ERR(rfbi.dss_ick)) {
+                dev_err(rfbi.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(rfbi.dss_ick);
         }
 
-        if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) {
+        rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck");
+        if (IS_ERR(rfbi.dss1_fck)) {
                 dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(rfbi.dss_ick);
                 return PTR_ERR(rfbi.dss1_fck);
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 5e9c6302433b..d3a568e6b169 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -947,7 +947,8 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
         int win;
 
         for (win = 0; win <= S3C_FB_MAX_WIN; win++)
-                s3c_fb_release_win(sfb, sfb->windows[win]);
+                if (sfb->windows[win])
+                        s3c_fb_release_win(sfb, sfb->windows[win]);
 
         iounmap(sfb->regs);
 
@@ -985,11 +986,20 @@ static int s3c_fb_suspend(struct platform_device *pdev, pm_message_t state)
 static int s3c_fb_resume(struct platform_device *pdev)
 {
         struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb_platdata *pd = sfb->pdata;
         struct s3c_fb_win *win;
         int win_no;
 
         clk_enable(sfb->bus_clk);
 
+        /* setup registers */
+        writel(pd->vidcon1, sfb->regs + VIDCON1);
+
+        /* zero all windows before we do anything */
+        for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++)
+                s3c_fb_clear_win(sfb, win_no);
+
+        /* restore framebuffers */
         for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {
                 win = sfb->windows[win_no];
                 if (!win)
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 92ea0ab44ce2..f10d2fbeda06 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -47,6 +47,7 @@ struct sh_mobile_lcdc_priv {
 #endif
         unsigned long lddckr;
         struct sh_mobile_lcdc_chan ch[2];
+        int started;
 };
 
 /* shared registers */
@@ -451,6 +452,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 
         /* start the lcdc */
         sh_mobile_lcdc_start_stop(priv, 1);
+        priv->started = 1;
 
         /* tell the board code to enable the panel */
         for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
@@ -493,7 +495,10 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
         }
 
         /* stop the lcdc */
-        sh_mobile_lcdc_start_stop(priv, 0);
+        if (priv->started) {
+                sh_mobile_lcdc_start_stop(priv, 0);
+                priv->started = 0;
+        }
 
         /* stop clocks */
         for (k = 0; k < ARRAY_SIZE(priv->ch); k++)
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 5cebf0b37798..697f6b5f1313 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -41,6 +41,7 @@
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 #include <asm/cacheflush.h>
+#include <asm/page.h>
 
 /****************************************************************************/
 
@@ -54,6 +55,18 @@
 #define DBG_FLT(a...)
 #endif
 
+/*
+ * User data (stack, data section and bss) needs to be aligned
+ * for the same reasons as SLAB memory is, and to the same amount.
+ * Avoid duplicating architecture specific code by using the same
+ * macro as with SLAB allocation:
+ */
+#ifdef ARCH_SLAB_MINALIGN
+#define FLAT_DATA_ALIGN (ARCH_SLAB_MINALIGN)
+#else
+#define FLAT_DATA_ALIGN (sizeof(void *))
+#endif
+
 #define RELOC_FAILED 0xff00ff01         /* Relocation incorrect somewhere */
 #define UNLOADED_LIB 0x7ff000ff         /* Placeholder for unused library */
 
@@ -114,20 +127,18 @@ static unsigned long create_flat_tables(
         int envc = bprm->envc;
         char uninitialized_var(dummy);
 
-        sp = (unsigned long *) ((-(unsigned long)sizeof(char *))&(unsigned long) p);
+        sp = (unsigned long *)p;
+        sp -= (envc + argc + 2) + 1 + (flat_argvp_envp_on_stack() ? 2 : 0);
+        sp = (unsigned long *) ((unsigned long)sp & -FLAT_DATA_ALIGN);
+        argv = sp + 1 + (flat_argvp_envp_on_stack() ? 2 : 0);
+        envp = argv + (argc + 1);
 
-        sp -= envc+1;
-        envp = sp;
-        sp -= argc+1;
-        argv = sp;
-
-        flat_stack_align(sp);
         if (flat_argvp_envp_on_stack()) {
-                --sp; put_user((unsigned long) envp, sp);
-                --sp; put_user((unsigned long) argv, sp);
+                put_user((unsigned long) envp, sp + 2);
+                put_user((unsigned long) argv, sp + 1);
         }
 
-        put_user(argc,--sp);
+        put_user(argc, sp);
         current->mm->arg_start = (unsigned long) p;
         while (argc-->0) {
                 put_user((unsigned long) p, argv++);
@@ -558,7 +569,9 @@ static int load_flat_file(struct linux_binprm * bprm,
                         ret = realdatastart;
                         goto err;
                 }
-                datapos = realdatastart + MAX_SHARED_LIBS * sizeof(unsigned long);
+                datapos = ALIGN(realdatastart +
+                                MAX_SHARED_LIBS * sizeof(unsigned long),
+                                FLAT_DATA_ALIGN);
 
                 DBG_FLT("BINFMT_FLAT: Allocated data+bss+stack (%d bytes): %x\n",
                                 (int)(data_len + bss_len + stack_len), (int)datapos);
@@ -604,9 +617,12 @@ static int load_flat_file(struct linux_binprm * bprm,
                 }
 
                 realdatastart = textpos + ntohl(hdr->data_start);
-                datapos = realdatastart + MAX_SHARED_LIBS * sizeof(unsigned long);
-                reloc = (unsigned long *) (textpos + ntohl(hdr->reloc_start) +
-                                MAX_SHARED_LIBS * sizeof(unsigned long));
+                datapos = ALIGN(realdatastart +
+                                MAX_SHARED_LIBS * sizeof(unsigned long),
+                                FLAT_DATA_ALIGN);
+
+                reloc = (unsigned long *)
+                        (datapos + (ntohl(hdr->reloc_start) - text_len));
                 memp = textpos;
                 memp_size = len;
 #ifdef CONFIG_BINFMT_ZFLAT
@@ -854,7 +870,7 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         stack_len = TOP_OF_ARGS - bprm->p;             /* the strings */
         stack_len += (bprm->argc + 1) * sizeof(char *); /* the argv array */
         stack_len += (bprm->envc + 1) * sizeof(char *); /* the envp array */
-
+        stack_len += FLAT_DATA_ALIGN - 1;  /* reserve for upcoming alignment */
         
         res = load_flat_file(bprm, &libinfo, 0, &stack_len);
         if (res > (unsigned long)-4096)
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 19218e1463d6..f7c255f9c624 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -122,13 +122,13 @@ static inline void cachefiles_state_changed(struct cachefiles_cache *cache)
 }
 
 /*
- * cf-bind.c
+ * bind.c
  */
 extern int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args);
 extern void cachefiles_daemon_unbind(struct cachefiles_cache *cache);
 
 /*
- * cf-daemon.c
+ * daemon.c
  */
 extern const struct file_operations cachefiles_daemon_fops;
 
@@ -136,17 +136,17 @@ extern int cachefiles_has_space(struct cachefiles_cache *cache,
                                 unsigned fnr, unsigned bnr);
 
 /*
- * cf-interface.c
+ * interface.c
  */
 extern const struct fscache_cache_ops cachefiles_cache_ops;
 
 /*
- * cf-key.c
+ * key.c
  */
 extern char *cachefiles_cook_key(const u8 *raw, int keylen, uint8_t type);
 
 /*
- * cf-namei.c
+ * namei.c
  */
 extern int cachefiles_delete_object(struct cachefiles_cache *cache,
                                     struct cachefiles_object *object);
@@ -165,7 +165,7 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
                                    struct dentry *dir, char *filename);
 
 /*
- * cf-proc.c
+ * proc.c
  */
 #ifdef CONFIG_CACHEFILES_HISTOGRAM
 extern atomic_t cachefiles_lookup_histogram[HZ];
@@ -190,7 +190,7 @@ void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
 #endif
 
 /*
- * cf-rdwr.c
+ * rdwr.c
  */
 extern int cachefiles_read_or_alloc_page(struct fscache_retrieval *,
                                          struct page *, gfp_t);
@@ -205,7 +205,7 @@ extern int cachefiles_write_page(struct fscache_storage *, struct page *);
 extern void cachefiles_uncache_page(struct fscache_object *, struct page *);
 
 /*
- * cf-security.c
+ * security.c
  */
 extern int cachefiles_get_security_ID(struct cachefiles_cache *cache);
 extern int cachefiles_determine_cache_security(struct cachefiles_cache *cache,
@@ -225,7 +225,7 @@ static inline void cachefiles_end_secure(struct cachefiles_cache *cache,
 }
 
 /*
- * cf-xattr.c
+ * xattr.c
  */
 extern int cachefiles_check_object_type(struct cachefiles_object *object);
 extern int cachefiles_set_object_xattr(struct cachefiles_object *object,
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5759ba53dc96..d06260251c30 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2475,7 +2475,7 @@ querySymLinkRetry:
                         /* BB FIXME investigate remapping reserved chars here */
                         *symlinkinfo = cifs_strndup_from_ucs(data_start, count,
                                                     is_unicode, nls_codepage);
-                        if (!symlinkinfo)
+                        if (!*symlinkinfo)
                                 rc = -ENOMEM;
                 }
         }
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 11431ed72a7f..3758965d73d5 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -225,6 +225,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
         if (!(oflags & FMODE_READ))
                 write_only = true;
 
+        mode &= ~current_umask();
         rc = CIFSPOSIXCreate(xid, cifs_sb->tcon, posix_flags, mode,
                         pnetfid, presp_data, &oplock, full_path,
                         cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
@@ -310,7 +311,6 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                 return -ENOMEM;
         }
 
-        mode &= ~current_umask();
         if (oplockEnabled)
                 oplock = REQ_OPLOCK;
 
@@ -336,7 +336,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                         else /* success, no need to query */
                                 goto cifs_create_set_dentry;
                 } else if ((rc != -EIO) && (rc != -EREMOTE) &&
-                         (rc != -EOPNOTSUPP)) /* path not found or net err */
+                         (rc != -EOPNOTSUPP) && (rc != -EINVAL))
                         goto cifs_create_out;
                 /* else fallthrough to retry, using older open call, this is
                    case where server does not support this SMB level, and
@@ -609,7 +609,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
         int xid;
         int rc = 0; /* to get around spurious gcc warning, set to zero here */
         int oplock = 0;
-        int mode;
         __u16 fileHandle = 0;
         bool posix_open = false;
         struct cifs_sb_info *cifs_sb;
@@ -658,30 +657,36 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
         }
         cFYI(1, ("Full path: %s inode = 0x%p", full_path, direntry->d_inode));
 
+        /* Posix open is only called (at lookup time) for file create now.
+         * For opens (rather than creates), because we do not know if it
+         * is a file or directory yet, and current Samba no longer allows
+         * us to do posix open on dirs, we could end up wasting an open call
+         * on what turns out to be a dir. For file opens, we wait to call posix
+         * open till cifs_open.  It could be added here (lookup) in the future
+         * but the performance tradeoff of the extra network request when EISDIR
+         * or EACCES is returned would have to be weighed against the 50%
+         * reduction in network traffic in the other paths.
+         */
         if (pTcon->unix_ext) {
                 if (!(nd->flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY)) &&
-                                (nd->flags & LOOKUP_OPEN)) {
-                        if (!((nd->intent.open.flags & O_CREAT) &&
-                                        (nd->intent.open.flags & O_EXCL))) {
-                                mode = nd->intent.open.create_mode &
-                                                ~current_umask();
-                                rc = cifs_posix_open(full_path, &newInode,
-                                        parent_dir_inode->i_sb, mode,
+                     (nd->flags & LOOKUP_OPEN) && !pTcon->broken_posix_open &&
+                     (nd->intent.open.flags & O_CREAT)) {
+                        rc = cifs_posix_open(full_path, &newInode,
+                                        parent_dir_inode->i_sb,
+                                        nd->intent.open.create_mode,
                                         nd->intent.open.flags, &oplock,
                                         &fileHandle, xid);
-                                /*
-                                 * This code works around a bug in
-                                 * samba posix open in samba versions 3.3.1
-                                 * and earlier where create works
-                                 * but open fails with invalid parameter.
-                                 * If either of these error codes are
-                                 * returned, follow the normal lookup.
-                                 * Otherwise, the error during posix open
-                                 * is handled.
-                                 */
-                                if ((rc != -EINVAL) && (rc != -EOPNOTSUPP))
-                                        posix_open = true;
-                        }
+                        /*
+                         * The check below works around a bug in POSIX
+                         * open in samba versions 3.3.1 and earlier where
+                         * open could incorrectly fail with invalid parameter.
+                         * If either that or op not supported returned, follow
+                         * the normal lookup.
+                         */
+                        if ((rc == 0) || (rc == -ENOENT))
+                                posix_open = true;
+                        else if ((rc == -EINVAL) || (rc != -EOPNOTSUPP))
+                                pTcon->broken_posix_open = true;
                 }
                 if (!posix_open)
                         rc = cifs_get_inode_info_unix(&newInode, full_path,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 38c06f826575..302ea15f02e6 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -130,10 +130,6 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode,
                         struct cifsFileInfo *pCifsFile, int oplock, u16 netfid)
 {
 
-        file->private_data = kmalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
-        if (file->private_data == NULL)
-                return -ENOMEM;
-        pCifsFile = cifs_init_private(file->private_data, inode, file, netfid);
         write_lock(&GlobalSMBSeslock);
 
         pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
@@ -184,6 +180,38 @@ psx_client_can_cache:
         return 0;
 }
 
+static struct cifsFileInfo *
+cifs_fill_filedata(struct file *file)
+{
+        struct list_head *tmp;
+        struct cifsFileInfo *pCifsFile = NULL;
+        struct cifsInodeInfo *pCifsInode = NULL;
+
+        /* search inode for this file and fill in file->private_data */
+        pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
+        read_lock(&GlobalSMBSeslock);
+        list_for_each(tmp, &pCifsInode->openFileList) {
+                pCifsFile = list_entry(tmp, struct cifsFileInfo, flist);
+                if ((pCifsFile->pfile == NULL) &&
+                    (pCifsFile->pid == current->tgid)) {
+                        /* mode set in cifs_create */
+
+                        /* needed for writepage */
+                        pCifsFile->pfile = file;
+                        file->private_data = pCifsFile;
+                        break;
+                }
+        }
+        read_unlock(&GlobalSMBSeslock);
+
+        if (file->private_data != NULL) {
+                return pCifsFile;
+        } else if ((file->f_flags & O_CREAT) && (file->f_flags & O_EXCL))
+                        cERROR(1, ("could not find file instance for "
+                                   "new file %p", file));
+        return NULL;
+}
+
 /* all arguments to this function must be checked for validity in caller */
 static inline int cifs_open_inode_helper(struct inode *inode, struct file *file,
         struct cifsInodeInfo *pCifsInode, struct cifsFileInfo *pCifsFile,
@@ -258,7 +286,6 @@ int cifs_open(struct inode *inode, struct file *file)
         struct cifsTconInfo *tcon;
         struct cifsFileInfo *pCifsFile;
         struct cifsInodeInfo *pCifsInode;
-        struct list_head *tmp;
         char *full_path = NULL;
         int desiredAccess;
         int disposition;
@@ -270,32 +297,12 @@ int cifs_open(struct inode *inode, struct file *file)
         cifs_sb = CIFS_SB(inode->i_sb);
         tcon = cifs_sb->tcon;
 
-        /* search inode for this file and fill in file->private_data */
         pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
-        read_lock(&GlobalSMBSeslock);
-        list_for_each(tmp, &pCifsInode->openFileList) {
-                pCifsFile = list_entry(tmp, struct cifsFileInfo,
-                                       flist);
-                if ((pCifsFile->pfile == NULL) &&
-                    (pCifsFile->pid == current->tgid)) {
-                        /* mode set in cifs_create */
-
-                        /* needed for writepage */
-                        pCifsFile->pfile = file;
-
-                        file->private_data = pCifsFile;
-                        break;
-                }
-        }
-        read_unlock(&GlobalSMBSeslock);
-
-        if (file->private_data != NULL) {
-                rc = 0;
+        pCifsFile = cifs_fill_filedata(file);
+        if (pCifsFile) {
                 FreeXid(xid);
-                return rc;
-        } else if ((file->f_flags & O_CREAT) && (file->f_flags & O_EXCL))
-                        cERROR(1, ("could not find file instance for "
-                                   "new file %p", file));
+                return 0;
+        }
 
         full_path = build_path_from_dentry(file->f_path.dentry);
         if (full_path == NULL) {
@@ -325,6 +332,7 @@ int cifs_open(struct inode *inode, struct file *file)
                         /* no need for special case handling of setting mode
                            on read only files needed here */
 
+                        pCifsFile = cifs_fill_filedata(file);
                         cifs_posix_open_inode_helper(inode, file, pCifsInode,
                                                      pCifsFile, oplock, netfid);
                         goto out;
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index ea9d11e3dcbb..cd83c53fcbb5 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -107,48 +107,48 @@ void *
 cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
 {
         struct inode *inode = direntry->d_inode;
-        int rc = -EACCES;
+        int rc = -ENOMEM;
         int xid;
         char *full_path = NULL;
-        char *target_path = ERR_PTR(-ENOMEM);
-        struct cifs_sb_info *cifs_sb;
-        struct cifsTconInfo *pTcon;
+        char *target_path = NULL;
+        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+        struct cifsTconInfo *tcon = cifs_sb->tcon;
 
         xid = GetXid();
 
-        full_path = build_path_from_dentry(direntry);
+        /*
+         * For now, we just handle symlinks with unix extensions enabled.
+         * Eventually we should handle NTFS reparse points, and MacOS
+         * symlink support. For instance...
+         *
+         * rc = CIFSSMBQueryReparseLinkInfo(...)
+         *
+         * For now, just return -EACCES when the server doesn't support posix
+         * extensions. Note that we still allow querying symlinks when posix
+         * extensions are manually disabled. We could disable these as well
+         * but there doesn't seem to be any harm in allowing the client to
+         * read them.
+         */
+        if (!(tcon->ses->capabilities & CAP_UNIX)) {
+                rc = -EACCES;
+                goto out;
+        }
 
+        full_path = build_path_from_dentry(direntry);
         if (!full_path)
                 goto out;
 
         cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
-        cifs_sb = CIFS_SB(inode->i_sb);
-        pTcon = cifs_sb->tcon;
-
-        /* We could change this to:
-                if (pTcon->unix_ext)
-           but there does not seem any point in refusing to
-           get symlink info if we can, even if unix extensions
-           turned off for this mount */
-
-        if (pTcon->ses->capabilities & CAP_UNIX)
-                rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path,
-                                             &target_path,
-                                             cifs_sb->local_nls);
-        else {
-                /* BB add read reparse point symlink code here */
-                /* rc = CIFSSMBQueryReparseLinkInfo */
-                /* BB Add code to Query ReparsePoint info */
-                /* BB Add MAC style xsymlink check here if enabled */
-        }
 
+        rc = CIFSSMBUnixQuerySymLink(xid, tcon, full_path, &target_path,
+                                     cifs_sb->local_nls);
+        kfree(full_path);
+out:
         if (rc != 0) {
                 kfree(target_path);
                 target_path = ERR_PTR(rc);
         }
 
-        kfree(full_path);
-out:
         FreeXid(xid);
         nd_set_link(nd, target_path);
         return NULL;
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
index e0cbd16f6dc9..1c341304621f 100644
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
@@ -28,7 +28,7 @@
 #define FSCACHE_MAX_THREADS     32
 
 /*
- * fsc-cache.c
+ * cache.c
  */
 extern struct list_head fscache_cache_list;
 extern struct rw_semaphore fscache_addremove_sem;
@@ -37,7 +37,7 @@ extern struct fscache_cache *fscache_select_cache_for_object(
         struct fscache_cookie *);
 
 /*
- * fsc-cookie.c
+ * cookie.c
  */
 extern struct kmem_cache *fscache_cookie_jar;
 
@@ -45,13 +45,13 @@ extern void fscache_cookie_init_once(void *);
 extern void __fscache_cookie_put(struct fscache_cookie *);
 
 /*
- * fsc-fsdef.c
+ * fsdef.c
  */
 extern struct fscache_cookie fscache_fsdef_index;
 extern struct fscache_cookie_def fscache_fsdef_netfs_def;
 
 /*
- * fsc-histogram.c
+ * histogram.c
  */
 #ifdef CONFIG_FSCACHE_HISTOGRAM
 extern atomic_t fscache_obj_instantiate_histogram[HZ];
@@ -75,7 +75,7 @@ extern const struct file_operations fscache_histogram_fops;
 #endif
 
 /*
- * fsc-main.c
+ * main.c
  */
 extern unsigned fscache_defer_lookup;
 extern unsigned fscache_defer_create;
@@ -86,14 +86,14 @@ extern int fscache_wait_bit(void *);
 extern int fscache_wait_bit_interruptible(void *);
 
 /*
- * fsc-object.c
+ * object.c
  */
 extern void fscache_withdrawing_object(struct fscache_cache *,
                                        struct fscache_object *);
 extern void fscache_enqueue_object(struct fscache_object *);
 
 /*
- * fsc-operation.c
+ * operation.c
  */
 extern int fscache_submit_exclusive_op(struct fscache_object *,
                                        struct fscache_operation *);
@@ -104,7 +104,7 @@ extern void fscache_start_operations(struct fscache_object *);
 extern void fscache_operation_gc(struct work_struct *);
 
 /*
- * fsc-proc.c
+ * proc.c
  */
 #ifdef CONFIG_PROC_FS
 extern int __init fscache_proc_init(void);
@@ -115,7 +115,7 @@ extern void fscache_proc_cleanup(void);
 #endif
 
 /*
- * fsc-stats.c
+ * stats.c
  */
 #ifdef CONFIG_FSCACHE_STATS
 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index c32b4a1ad6cf..a0244740b75a 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -480,13 +480,6 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
         return;
 
 filebad:
-        mutex_lock(&c->erase_free_sem);
-        spin_lock(&c->erase_completion_lock);
-        /* Stick it on a list (any list) so erase_failed can take it
-           right off again.  Silly, but shouldn't happen often. */
-        list_move(&jeb->list, &c->erasing_list);
-        spin_unlock(&c->erase_completion_lock);
-        mutex_unlock(&c->erase_free_sem);
         jffs2_erase_failed(c, jeb, bad_offset);
         return;
 
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 370b190a09d1..89f98e9a024b 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1943,7 +1943,8 @@ int nfs_permission(struct inode *inode, int mask)
                 case S_IFREG:
                         /* NFSv4 has atomic_open... */
                         if (nfs_server_capable(inode, NFS_CAP_ATOMIC_OPEN)
-                                        && (mask & MAY_OPEN))
+                                        && (mask & MAY_OPEN)
+                                        && !(mask & MAY_EXEC))
                                 goto out;
                         break;
                 case S_IFDIR:
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a4d242680299..4674f8092da8 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2594,12 +2594,9 @@ static void nfs4_renew_done(struct rpc_task *task, void *data)
         unsigned long timestamp = (unsigned long)data;
 
         if (task->tk_status < 0) {
-                switch (task->tk_status) {
-                        case -NFS4ERR_STALE_CLIENTID:
-                        case -NFS4ERR_EXPIRED:
-                        case -NFS4ERR_CB_PATH_DOWN:
-                                nfs4_schedule_state_recovery(clp);
-                }
+                /* Unless we're shutting down, schedule state recovery! */
+                if (test_bit(NFS_CS_RENEWD, &clp->cl_res_state) != 0)
+                        nfs4_schedule_state_recovery(clp);
                 return;
         }
         spin_lock(&clp->cl_lock);
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index d9ef602fbc5a..e3ed5908820b 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -129,7 +129,7 @@ enum {
         Opt_err
 };
 
-static match_table_t __initconst tokens = {
+static const match_table_t tokens __initconst = {
         {Opt_port, "port=%u"},
         {Opt_rsize, "rsize=%u"},
         {Opt_wsize, "wsize=%u"},
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 6c68ffd6b4bb..b660435978d2 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1015,6 +1015,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
         host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
         set_fs(oldfs);
         if (host_err >= 0) {
+                *cnt = host_err;
                 nfsdstats.io_write += host_err;
                 fsnotify_modify(file->f_path.dentry);
         }
@@ -1060,10 +1061,9 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
         }
 
         dprintk("nfsd: write complete host_err=%d\n", host_err);
-        if (host_err >= 0) {
+        if (host_err >= 0)
                 err = 0;
-                *cnt = host_err;
-        } else
+        else
                 err = nfserrno(host_err);
 out:
         return err;
diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index e90b60dfced9..300f1cdfa862 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -311,7 +311,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
                 ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &cp_bh);
                 if (ret < 0) {
                         if (ret != -ENOENT)
-                                goto out_sem;
+                                goto out_header;
                         /* skip hole */
                         ret = 0;
                         continue;
@@ -344,7 +344,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
                                         continue;
                                 printk(KERN_ERR "%s: cannot delete block\n",
                                        __func__);
-                                goto out_sem;
+                                goto out_header;
                         }
                 }
 
@@ -361,6 +361,8 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
                 nilfs_mdt_mark_dirty(cpfile);
                 kunmap_atomic(kaddr, KM_USER0);
         }
+
+ out_header:
         brelse(header_bh);
 
  out_sem:
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 50ff3f2cdf24..d6759b92006f 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -576,7 +576,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
         ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);
 
  out_free:
-        while (--n > 0)
+        while (--n >= 0)
                 vfree(kbufs[n]);
         kfree(kbufs[4]);
         return ret;
diff --git a/fs/proc/base.c b/fs/proc/base.c
index fb45615943c2..3326bbf9ab95 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1956,7 +1956,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir,
         const struct pid_entry *p = ptr;
         struct inode *inode;
         struct proc_inode *ei;
-        struct dentry *error = ERR_PTR(-EINVAL);
+        struct dentry *error = ERR_PTR(-ENOENT);
 
         inode = proc_pid_make_inode(dir->i_sb, task);
         if (!inode)
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 1215a4f50cd2..3567fb9e3fb1 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -448,13 +448,11 @@ int remove_save_link(struct inode *inode, int truncate)
 static void reiserfs_kill_sb(struct super_block *s)
 {
         if (REISERFS_SB(s)) {
-#ifdef CONFIG_REISERFS_FS_XATTR
                 if (REISERFS_SB(s)->xattr_root) {
                         d_invalidate(REISERFS_SB(s)->xattr_root);
                         dput(REISERFS_SB(s)->xattr_root);
                         REISERFS_SB(s)->xattr_root = NULL;
                 }
-#endif
                 if (REISERFS_SB(s)->priv_root) {
                         d_invalidate(REISERFS_SB(s)->priv_root);
                         dput(REISERFS_SB(s)->priv_root);
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 2237e10c7c7c..8e7deb0e6964 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -123,7 +123,9 @@ static struct dentry *open_xa_root(struct super_block *sb, int flags)
         mutex_lock_nested(&privroot->d_inode->i_mutex, I_MUTEX_XATTR);
 
         xaroot = dget(REISERFS_SB(sb)->xattr_root);
-        if (!xaroot->d_inode) {
+        if (!xaroot)
+                xaroot = ERR_PTR(-ENODATA);
+        else if (!xaroot->d_inode) {
                 int err = -ENODATA;
                 if (xattr_may_create(flags))
                         err = xattr_mkdir(privroot->d_inode, xaroot, 0700);
@@ -685,20 +687,6 @@ out:
         return err;
 }
 
-/* Actual operations that are exported to VFS-land */
-struct xattr_handler *reiserfs_xattr_handlers[] = {
-        &reiserfs_xattr_user_handler,
-        &reiserfs_xattr_trusted_handler,
-#ifdef CONFIG_REISERFS_FS_SECURITY
-        &reiserfs_xattr_security_handler,
-#endif
-#ifdef CONFIG_REISERFS_FS_POSIX_ACL
-        &reiserfs_posix_acl_access_handler,
-        &reiserfs_posix_acl_default_handler,
-#endif
-        NULL
-};
-
 /*
  * In order to implement different sets of xattr operations for each xattr
  * prefix with the generic xattr API, a filesystem should create a
@@ -883,23 +871,6 @@ static int reiserfs_check_acl(struct inode *inode, int mask)
         return error;
 }
 
-int reiserfs_permission(struct inode *inode, int mask)
-{
-        /*
-         * We don't do permission checks on the internal objects.
-         * Permissions are determined by the "owning" object.
-         */
-        if (IS_PRIVATE(inode))
-                return 0;
-        /*
-         * Stat data v1 doesn't support ACLs.
-         */
-        if (get_inode_sd_version(inode) == STAT_DATA_V1)
-                return generic_permission(inode, mask, NULL);
-        else
-                return generic_permission(inode, mask, reiserfs_check_acl);
-}
-
 static int create_privroot(struct dentry *dentry)
 {
         int err;
@@ -922,6 +893,28 @@ static int create_privroot(struct dentry *dentry)
         return 0;
 }
 
+#else
+int __init reiserfs_xattr_register_handlers(void) { return 0; }
+void reiserfs_xattr_unregister_handlers(void) {}
+static int create_privroot(struct dentry *dentry) { return 0; }
+#endif
+
+/* Actual operations that are exported to VFS-land */
+struct xattr_handler *reiserfs_xattr_handlers[] = {
+#ifdef CONFIG_REISERFS_FS_XATTR
+        &reiserfs_xattr_user_handler,
+        &reiserfs_xattr_trusted_handler,
+#endif
+#ifdef CONFIG_REISERFS_FS_SECURITY
+        &reiserfs_xattr_security_handler,
+#endif
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
+        &reiserfs_posix_acl_access_handler,
+        &reiserfs_posix_acl_default_handler,
+#endif
+        NULL
+};
+
 static int xattr_mount_check(struct super_block *s)
 {
         /* We need generation numbers to ensure that the oid mapping is correct
@@ -941,10 +934,24 @@ static int xattr_mount_check(struct super_block *s)
         return 0;
 }
 
-#else
-int __init reiserfs_xattr_register_handlers(void) { return 0; }
-void reiserfs_xattr_unregister_handlers(void) {}
+int reiserfs_permission(struct inode *inode, int mask)
+{
+        /*
+         * We don't do permission checks on the internal objects.
+         * Permissions are determined by the "owning" object.
+         */
+        if (IS_PRIVATE(inode))
+                return 0;
+
+#ifdef CONFIG_REISERFS_FS_XATTR
+        /*
+         * Stat data v1 doesn't support ACLs.
+         */
+        if (get_inode_sd_version(inode) != STAT_DATA_V1)
+                return generic_permission(inode, mask, reiserfs_check_acl);
 #endif
+        return generic_permission(inode, mask, NULL);
+}
 
 /* This will catch lookups from the fs root to .reiserfs_priv */
 static int
@@ -992,7 +999,6 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags)
         int err = 0;
         struct dentry *privroot = REISERFS_SB(s)->priv_root;
 
-#ifdef CONFIG_REISERFS_FS_XATTR
         err = xattr_mount_check(s);
         if (err)
                 goto error;
@@ -1023,14 +1029,11 @@ error:
                 clear_bit(REISERFS_XATTRS_USER, &(REISERFS_SB(s)->s_mount_opt));
                 clear_bit(REISERFS_POSIXACL, &(REISERFS_SB(s)->s_mount_opt));
         }
-#endif
 
         /* The super_block MS_POSIXACL must mirror the (no)acl mount option. */
-#ifdef CONFIG_REISERFS_FS_POSIX_ACL
         if (reiserfs_posixacl(s))
                 s->s_flags |= MS_POSIXACL;
         else
-#endif
                 s->s_flags &= ~MS_POSIXACL;
 
         return err;
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index b1606e07b7a3..561a9c050cef 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -723,7 +723,7 @@ int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
         mutex_unlock(&sysfs_workq_mutex);
 
         if (sysfs_workqueue == NULL) {
-                sysfs_workqueue = create_workqueue("sysfsd");
+                sysfs_workqueue = create_singlethread_workqueue("sysfsd");
                 if (sysfs_workqueue == NULL) {
                         module_put(owner);
                         return -ENOMEM;
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index af6843c7ee4b..179cbd630f69 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);
 static inline int
 kmem_shake_allow(gfp_t gfp_mask)
 {
-        return (gfp_mask & __GFP_WAIT) != 0;
+        return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS));
 }
 
 #endif /* __XFS_SUPPORT_KMEM_H__ */
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index e6d839bddbf0..7465f9ee125f 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -347,13 +347,15 @@ xfs_swap_extents(
 
         error = xfs_trans_commit(tp, XFS_TRANS_SWAPEXT);
 
-out_unlock:
-        xfs_iunlock(ip,  XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
-        xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
 out:
         kmem_free(tempifp);
         return error;
 
+out_unlock:
+        xfs_iunlock(ip,  XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
+        xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
+        goto out;
+
 out_trans_cancel:
         xfs_trans_cancel(tp, 0);
         goto out_unlock;
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 8379e3bca26c..cbd451bb4848 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -160,7 +160,7 @@ xfs_growfs_data_private(
         nagcount = new + (nb_mod != 0);
         if (nb_mod && nb_mod < XFS_MIN_AG_BLOCKS) {
                 nagcount--;
-                nb = nagcount * mp->m_sb.sb_agblocks;
+                nb = (xfs_rfsblock_t)nagcount * mp->m_sb.sb_agblocks;
                 if (nb < mp->m_sb.sb_dblocks)
                         return XFS_ERROR(EINVAL);
         }
diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
index dbd6150763e9..fc218444e315 100644
--- a/include/asm-generic/local.h
+++ b/include/asm-generic/local.h
@@ -42,7 +42,7 @@ typedef struct
 
 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
-#define local_add_unless(l, a, u) atomic_long_add_unless((&(l)->a), (a), (u))
+#define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
 
 /* Non-atomic variants, ie. preemption disabled and won't be touched
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index c8c422151431..b84d8ae35e6f 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1519,6 +1519,30 @@ static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area)
 {
         return kcalloc(nmemb, size, GFP_KERNEL);
 }
+
+static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
+{
+        u8 *addr;
+
+        if (size <= PAGE_SIZE)
+            return kcalloc(nmemb, size, GFP_KERNEL);
+
+        addr = vmalloc(nmemb * size);
+        if (!addr)
+                return NULL;
+
+        memset(addr, 0, nmemb * size);
+
+        return addr;
+}
+
+static __inline void drm_free_large(void *ptr)
+{
+        if (!is_vmalloc_addr(ptr))
+                return kfree(ptr);
+
+        vfree(ptr);
+}
 #else
 extern void *drm_alloc(size_t size, int area);
 extern void drm_free(void *pt, size_t size, int area);
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 51e6e54b2aa1..9b93cafa82a0 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -28,7 +28,7 @@ struct amba_id {
 
 struct amba_driver {
         struct device_driver    drv;
-        int                     (*probe)(struct amba_device *, void *);
+        int                     (*probe)(struct amba_device *, struct amba_id *);
         int                     (*remove)(struct amba_device *);
         void                    (*shutdown)(struct amba_device *);
         int                     (*suspend)(struct amba_device *, pm_message_t);
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
index 63265852b7d1..7b09c8348fd3 100644
--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -14,13 +14,12 @@
 #ifndef _LINUX_AUTO_FS_H
 #define _LINUX_AUTO_FS_H
 
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/limits.h>
-#include <linux/types.h>
 #include <linux/ioctl.h>
 #else
-#include <asm/types.h>
 #include <sys/ioctl.h>
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 3282ee4318e7..4fa999696310 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -13,6 +13,7 @@
 #define _LINUX_CRED_H
 
 #include <linux/capability.h>
+#include <linux/init.h>
 #include <linux/key.h>
 #include <asm/atomic.h>
 
diff --git a/include/linux/i7300_idle.h b/include/linux/i7300_idle.h
index 05a80c44513c..1587b7dec505 100644
--- a/include/linux/i7300_idle.h
+++ b/include/linux/i7300_idle.h
@@ -16,35 +16,33 @@
 struct fbd_ioat {
         unsigned int vendor;
         unsigned int ioat_dev;
+        unsigned int enabled;
 };
 
 /*
  * The i5000 chip-set has the same hooks as the i7300
- * but support is disabled by default because this driver
- * has not been validated on that platform.
+ * but it is not enabled by default and must be manually
+ * manually enabled with "forceload=1" because it is
+ * only lightly validated.
  */
-#define SUPPORT_I5000 0
 
 static const struct fbd_ioat fbd_ioat_list[] = {
-        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT_CNB},
-#if SUPPORT_I5000
-        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT},
-#endif
+        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT_CNB, 1},
+        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT, 0},
         {0, 0}
 };
 
 /* table of devices that work with this driver */
 static const struct pci_device_id pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_FBD_CNB) },
-#if SUPPORT_I5000
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
-#endif
         { } /* Terminating entry */
 };
 
 /* Check for known platforms with I/O-AT */
 static inline int i7300_idle_platform_probe(struct pci_dev **fbd_dev,
-                                                struct pci_dev **ioat_dev)
+                                                struct pci_dev **ioat_dev,
+                                                int enable_all)
 {
         int i;
         struct pci_dev *memdev, *dmadev;
@@ -69,6 +67,8 @@ static inline int i7300_idle_platform_probe(struct pci_dev **fbd_dev,
         for (i = 0; fbd_ioat_list[i].vendor != 0; i++) {
                 if (dmadev->vendor == fbd_ioat_list[i].vendor &&
                     dmadev->device == fbd_ioat_list[i].ioat_dev) {
+                        if (!(fbd_ioat_list[i].enabled || enable_all))
+                                continue;
                         if (fbd_dev)
                                 *fbd_dev = memdev;
                         if (ioat_dev)
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ff65fffb078f..9fed365a598b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1109,7 +1109,7 @@ void ide_fix_driveid(u16 *);
 
 extern void ide_fixstring(u8 *, const int, const int);
 
-int ide_busy_sleep(ide_hwif_t *, unsigned long, int);
+int ide_busy_sleep(ide_drive_t *, unsigned long, int);
 
 int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
 
diff --git a/include/linux/input.h b/include/linux/input.h
index 0e6ff5de3588..6fed4f6a9c9e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -656,6 +656,7 @@ struct input_absinfo {
 #define ABS_MT_POSITION_Y       0x36    /* Center Y ellipse position */
 #define ABS_MT_TOOL_TYPE        0x37    /* Type of touching device */
 #define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
+#define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
 
 #define ABS_MAX                 0x3f
 #define ABS_CNT                 (ABS_MAX+1)
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 186ec6ab334d..a47c879e1304 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1097,6 +1097,32 @@ unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long);
 #define pfn_valid_within(pfn) (1)
 #endif
 
+#ifdef CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
+/*
+ * pfn_valid() is meant to be able to tell if a given PFN has valid memmap
+ * associated with it or not. In FLATMEM, it is expected that holes always
+ * have valid memmap as long as there is valid PFNs either side of the hole.
+ * In SPARSEMEM, it is assumed that a valid section has a memmap for the
+ * entire section.
+ *
+ * However, an ARM, and maybe other embedded architectures in the future
+ * free memmap backing holes to save memory on the assumption the memmap is
+ * never used. The page_zone linkages are then broken even though pfn_valid()
+ * returns true. A walker of the full memmap must then do this additional
+ * check to ensure the memmap they are looking at is sane by making sure
+ * the zone and PFN linkages are still valid. This is expensive, but walkers
+ * of the full memmap are extremely rare.
+ */
+int memmap_valid_within(unsigned long pfn,
+                                        struct page *page, struct zone *zone);
+#else
+static inline int memmap_valid_within(unsigned long pfn,
+                                        struct page *page, struct zone *zone)
+{
+        return 1;
+}
+#endif /* CONFIG_ARCH_HAS_HOLES_MEMORYMODEL */
+
 #endif /* !__GENERATING_BOUNDS.H */
 #endif /* !__ASSEMBLY__ */
 #endif /* _LINUX_MMZONE_H */
diff --git a/include/linux/net_dropmon.h b/include/linux/net_dropmon.h
index 0217fb81a630..0e2e100c44a2 100644
--- a/include/linux/net_dropmon.h
+++ b/include/linux/net_dropmon.h
@@ -1,6 +1,7 @@
 #ifndef __NET_DROPMON_H
 #define __NET_DROPMON_H
 
+#include <linux/types.h>
 #include <linux/netlink.h>
 
 struct net_dm_drop_point {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 06ba90c211a5..0f71812d67d3 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1406,7 +1406,7 @@
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
 #define PCI_DEVICE_ID_VIA_838X_1        0xB188
 #define PCI_DEVICE_ID_VIA_83_87XX_1     0xB198
-#define PCI_DEVICE_ID_VIA_C409_IDE      0XC409
+#define PCI_DEVICE_ID_VIA_VX855_IDE     0xC409
 #define PCI_DEVICE_ID_VIA_ANON          0xFFFF
 
 #define PCI_VENDOR_ID_SIEMENS           0x110A
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index cdedc01036e4..99928dce37ea 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -41,6 +41,7 @@ int reiserfs_xattr_init(struct super_block *sb, int mount_flags);
 int reiserfs_lookup_privroot(struct super_block *sb);
 int reiserfs_delete_xattrs(struct inode *inode);
 int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);
+int reiserfs_permission(struct inode *inode, int mask);
 
 #ifdef CONFIG_REISERFS_FS_XATTR
 #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
@@ -50,7 +51,6 @@ int reiserfs_setxattr(struct dentry *dentry, const char *name,
                       const void *value, size_t size, int flags);
 ssize_t reiserfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 int reiserfs_removexattr(struct dentry *dentry, const char *name);
-int reiserfs_permission(struct inode *inode, int mask);
 
 int reiserfs_xattr_get(struct inode *, const char *, void *, size_t);
 int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);
@@ -117,8 +117,6 @@ static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
 #define reiserfs_listxattr NULL
 #define reiserfs_removexattr NULL
 
-#define reiserfs_permission NULL
-
 static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
 {
 }
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 62d81435347a..d476aad3ff57 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -437,6 +437,11 @@ static inline int mem_cgroup_cache_charge_swapin(struct page *page,
         return 0;
 }
 
+static inline void
+mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
+{
+}
+
 #endif /* CONFIG_SWAP */
 #endif /* __KERNEL__*/
 #endif /* _LINUX_SWAP_H */
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index c9184f756cad..68a8d873bbd9 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -680,7 +680,7 @@ fc_remote_port_chkready(struct fc_rport *rport)
                 if (rport->roles & FC_PORT_ROLE_FCP_TARGET)
                         result = 0;
                 else if (rport->flags & FC_RPORT_DEVLOSS_PENDING)
-                        result = DID_TRANSPORT_DISRUPTED << 16;
+                        result = DID_IMM_RETRY << 16;
                 else
                         result = DID_NO_CONNECT << 16;
                 break;
@@ -688,7 +688,7 @@ fc_remote_port_chkready(struct fc_rport *rport)
                 if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT)
                         result = DID_TRANSPORT_FAILFAST << 16;
                 else
-                        result = DID_TRANSPORT_DISRUPTED << 16;
+                        result = DID_IMM_RETRY << 16;
                 break;
         default:
                 result = DID_NO_CONNECT << 16;
diff --git a/init/main.c b/init/main.c
index 3bbf93be744c..d721dad05dd7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -566,8 +566,7 @@ asmlinkage void __init start_kernel(void)
         tick_init();
         boot_cpu_init();
         page_address_init();
-        printk(KERN_NOTICE);
-        printk(linux_banner);
+        printk(KERN_NOTICE "%s", linux_banner);
         setup_arch(&command_line);
         mm_init_owner(&init_mm, &init_task);
         setup_command_line(command_line);
diff --git a/kernel/async.c b/kernel/async.c
index 968ef9457d4e..50540301ed0f 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -92,19 +92,23 @@ extern int initcall_debug;
 static async_cookie_t  __lowest_in_progress(struct list_head *running)
 {
         struct async_entry *entry;
+        async_cookie_t ret = next_cookie; /* begin with "infinity" value */
+
         if (!list_empty(running)) {
                 entry = list_first_entry(running,
                         struct async_entry, list);
-                return entry->cookie;
-        } else if (!list_empty(&async_pending)) {
-                entry = list_first_entry(&async_pending,
-                        struct async_entry, list);
-                return entry->cookie;
-        } else {
-                /* nothing in progress... next_cookie is "infinity" */
-                return next_cookie;
+                ret = entry->cookie;
         }
 
+        if (!list_empty(&async_pending)) {
+                list_for_each_entry(entry, &async_pending, list)
+                        if (entry->running == running) {
+                                ret = entry->cookie;
+                                break;
+                        }
+        }
+
+        return ret;
 }
 
 static async_cookie_t  lowest_in_progress(struct list_head *running)
diff --git a/kernel/futex.c b/kernel/futex.c
index eef8cd26b5e5..d546b2d53a62 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -193,6 +193,7 @@ static void drop_futex_key_refs(union futex_key *key)
  * @uaddr: virtual address of the futex
  * @fshared: 0 for a PROCESS_PRIVATE futex, 1 for PROCESS_SHARED
  * @key: address where result is stored.
+ * @rw: mapping needs to be read/write (values: VERIFY_READ, VERIFY_WRITE)
  *
  * Returns a negative error code or 0
  * The key words are stored in *key on success.
@@ -203,7 +204,8 @@ static void drop_futex_key_refs(union futex_key *key)
  *
  * lock_page() might sleep, the caller should not hold a spinlock.
  */
-static int get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
+static int
+get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
 {
         unsigned long address = (unsigned long)uaddr;
         struct mm_struct *mm = current->mm;
@@ -226,7 +228,7 @@ static int get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
          *        but access_ok() should be faster than find_vma()
          */
         if (!fshared) {
-                if (unlikely(!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))))
+                if (unlikely(!access_ok(rw, uaddr, sizeof(u32))))
                         return -EFAULT;
                 key->private.mm = mm;
                 key->private.address = address;
@@ -235,7 +237,7 @@ static int get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
         }
 
 again:
-        err = get_user_pages_fast(address, 1, 0, &page);
+        err = get_user_pages_fast(address, 1, rw == VERIFY_WRITE, &page);
         if (err < 0)
                 return err;
 
@@ -677,7 +679,7 @@ static int futex_wake(u32 __user *uaddr, int fshared, int nr_wake, u32 bitset)
         if (!bitset)
                 return -EINVAL;
 
-        ret = get_futex_key(uaddr, fshared, &key);
+        ret = get_futex_key(uaddr, fshared, &key, VERIFY_READ);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -723,10 +725,10 @@ futex_wake_op(u32 __user *uaddr1, int fshared, u32 __user *uaddr2,
         int ret, op_ret;
 
 retry:
-        ret = get_futex_key(uaddr1, fshared, &key1);
+        ret = get_futex_key(uaddr1, fshared, &key1, VERIFY_READ);
         if (unlikely(ret != 0))
                 goto out;
-        ret = get_futex_key(uaddr2, fshared, &key2);
+        ret = get_futex_key(uaddr2, fshared, &key2, VERIFY_WRITE);
         if (unlikely(ret != 0))
                 goto out_put_key1;
 
@@ -814,10 +816,10 @@ static int futex_requeue(u32 __user *uaddr1, int fshared, u32 __user *uaddr2,
         int ret, drop_count = 0;
 
 retry:
-        ret = get_futex_key(uaddr1, fshared, &key1);
+        ret = get_futex_key(uaddr1, fshared, &key1, VERIFY_READ);
         if (unlikely(ret != 0))
                 goto out;
-        ret = get_futex_key(uaddr2, fshared, &key2);
+        ret = get_futex_key(uaddr2, fshared, &key2, VERIFY_READ);
         if (unlikely(ret != 0))
                 goto out_put_key1;
 
@@ -1140,7 +1142,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
         q.bitset = bitset;
 retry:
         q.key = FUTEX_KEY_INIT;
-        ret = get_futex_key(uaddr, fshared, &q.key);
+        ret = get_futex_key(uaddr, fshared, &q.key, VERIFY_READ);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -1330,7 +1332,7 @@ static int futex_lock_pi(u32 __user *uaddr, int fshared,
         q.pi_state = NULL;
 retry:
         q.key = FUTEX_KEY_INIT;
-        ret = get_futex_key(uaddr, fshared, &q.key);
+        ret = get_futex_key(uaddr, fshared, &q.key, VERIFY_WRITE);
         if (unlikely(ret != 0))
                 goto out;
 
@@ -1594,7 +1596,7 @@ retry:
         if ((uval & FUTEX_TID_MASK) != task_pid_vnr(current))
                 return -EPERM;
 
-        ret = get_futex_key(uaddr, fshared, &key);
+        ret = get_futex_key(uaddr, fshared, &key, VERIFY_WRITE);
         if (unlikely(ret != 0))
                 goto out;
 
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 5a758c6e4950..e4983770913b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1451,7 +1451,6 @@ int kernel_kexec(void)
                 error = device_suspend(PMSG_FREEZE);
                 if (error)
                         goto Resume_console;
-                device_pm_lock();
                 /* At this point, device_suspend() has been called,
                  * but *not* device_power_down(). We *must*
                  * device_power_down() now.  Otherwise, drivers for
@@ -1489,7 +1488,6 @@ int kernel_kexec(void)
                 enable_nonboot_cpus();
                 device_power_up(PMSG_RESTORE);
  Resume_devices:
-                device_pm_unlock();
                 device_resume(PMSG_RESTORE);
  Resume_console:
                 resume_console();
diff --git a/kernel/kmod.c b/kernel/kmod.c
index b750675251e5..7e95bedb2bfc 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -370,8 +370,10 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
         sub_info->argv = argv;
         sub_info->envp = envp;
         sub_info->cred = prepare_usermodehelper_creds();
-        if (!sub_info->cred)
+        if (!sub_info->cred) {
+                kfree(sub_info);
                 return NULL;
+        }
 
   out:
         return sub_info;
diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
index a2cc7e9a6e84..699a2ac3a0d7 100644
--- a/kernel/lockdep_internals.h
+++ b/kernel/lockdep_internals.h
@@ -54,9 +54,9 @@ enum {
  * table (if it's not there yet), and we check it for lock order
  * conflicts and deadlocks.
  */
-#define MAX_LOCKDEP_ENTRIES     8192UL
+#define MAX_LOCKDEP_ENTRIES     16384UL
 
-#define MAX_LOCKDEP_CHAINS_BITS 14
+#define MAX_LOCKDEP_CHAINS_BITS 15
 #define MAX_LOCKDEP_CHAINS      (1UL << MAX_LOCKDEP_CHAINS_BITS)
 
 #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e71ca9cd81b2..5cb080e7eebd 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -215,8 +215,6 @@ static int create_image(int platform_mode)
         if (error)
                 return error;
 
-        device_pm_lock();
-
         /* At this point, device_suspend() has been called, but *not*
          * device_power_down(). We *must* call device_power_down() now.
          * Otherwise, drivers for some devices (e.g. interrupt controllers)
@@ -227,7 +225,7 @@ static int create_image(int platform_mode)
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down, "
                         "aborting hibernation\n");
-                goto Unlock;
+                return error;
         }
 
         error = platform_pre_snapshot(platform_mode);
@@ -241,9 +239,9 @@ static int create_image(int platform_mode)
 
         local_irq_disable();
 
-        sysdev_suspend(PMSG_FREEZE);
+        error = sysdev_suspend(PMSG_FREEZE);
         if (error) {
-                printk(KERN_ERR "PM: Some devices failed to power down, "
+                printk(KERN_ERR "PM: Some system devices failed to power down, "
                         "aborting hibernation\n");
                 goto Enable_irqs;
         }
@@ -280,9 +278,6 @@ static int create_image(int platform_mode)
         device_power_up(in_suspend ?
                 (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
 
- Unlock:
-        device_pm_unlock();
-
         return error;
 }
 
@@ -344,13 +339,11 @@ static int resume_target_kernel(bool platform_mode)
 {
         int error;
 
-        device_pm_lock();
-
         error = device_power_down(PMSG_QUIESCE);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down, "
                         "aborting resume\n");
-                goto Unlock;
+                return error;
         }
 
         error = platform_pre_restore(platform_mode);
@@ -403,9 +396,6 @@ static int resume_target_kernel(bool platform_mode)
 
         device_power_up(PMSG_RECOVER);
 
- Unlock:
-        device_pm_unlock();
-
         return error;
 }
 
@@ -464,11 +454,9 @@ int hibernation_platform_enter(void)
                 goto Resume_devices;
         }
 
-        device_pm_lock();
-
         error = device_power_down(PMSG_HIBERNATE);
         if (error)
-                goto Unlock;
+                goto Resume_devices;
 
         error = hibernation_ops->prepare();
         if (error)
@@ -493,9 +481,6 @@ int hibernation_platform_enter(void)
 
         device_power_up(PMSG_RESTORE);
 
- Unlock:
-        device_pm_unlock();
-
  Resume_devices:
         entering_platform_hibernation = false;
         device_resume(PMSG_RESTORE);
diff --git a/kernel/power/main.c b/kernel/power/main.c
index f99ed6a75eac..868028280d13 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -289,12 +289,10 @@ static int suspend_enter(suspend_state_t state)
 {
         int error;
 
-        device_pm_lock();
-
         if (suspend_ops->prepare) {
                 error = suspend_ops->prepare();
                 if (error)
-                        goto Done;
+                        return error;
         }
 
         error = device_power_down(PMSG_SUSPEND);
@@ -343,9 +341,6 @@ static int suspend_enter(suspend_state_t state)
         if (suspend_ops->finish)
                 suspend_ops->finish();
 
- Done:
-        device_pm_unlock();
-
         return error;
 }
 
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 819f17ac796e..e1d16c9a7680 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -38,7 +38,8 @@
  */
 unsigned long long __attribute__((weak)) sched_clock(void)
 {
-        return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
+        return (unsigned long long)(jiffies - INITIAL_JIFFIES)
+                                        * (NSEC_PER_SEC / HZ);
 }
 
 static __read_mostly int sched_clock_running;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a884c09006c4..cda81ec58d9f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2380,7 +2380,7 @@ static const char readme_msg[] =
         "# echo print-parent > /debug/tracing/trace_options\n"
         "# echo 1 > /debug/tracing/tracing_enabled\n"
         "# cat /debug/tracing/trace > /tmp/trace.txt\n"
-        "echo 0 > /debug/tracing/tracing_enabled\n"
+        "# echo 0 > /debug/tracing/tracing_enabled\n"
 ;
 
 static ssize_t
diff --git a/mm/filemap.c b/mm/filemap.c
index 379ff0bcbf6e..1b60f30cebfa 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -121,7 +121,6 @@ void __remove_from_page_cache(struct page *page)
         mapping->nrpages--;
         __dec_zone_page_state(page, NR_FILE_PAGES);
         BUG_ON(page_mapped(page));
-        mem_cgroup_uncharge_cache_page(page);
 
         /*
          * Some filesystems seem to re-dirty the page even after
@@ -145,6 +144,7 @@ void remove_from_page_cache(struct page *page)
         spin_lock_irq(&mapping->tree_lock);
         __remove_from_page_cache(page);
         spin_unlock_irq(&mapping->tree_lock);
+        mem_cgroup_uncharge_cache_page(page);
 }
 
 static int sync_page(void *word)
@@ -476,13 +476,13 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping,
                 if (likely(!error)) {
                         mapping->nrpages++;
                         __inc_zone_page_state(page, NR_FILE_PAGES);
+                        spin_unlock_irq(&mapping->tree_lock);
                 } else {
                         page->mapping = NULL;
+                        spin_unlock_irq(&mapping->tree_lock);
                         mem_cgroup_uncharge_cache_page(page);
                         page_cache_release(page);
                 }
-
-                spin_unlock_irq(&mapping->tree_lock);
                 radix_tree_preload_end();
         } else
                 mem_cgroup_uncharge_cache_page(page);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 28c655ba9353..e83ad2c9228c 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -316,7 +316,7 @@ static void resv_map_release(struct kref *ref)
 static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
 {
         VM_BUG_ON(!is_vm_hugetlb_page(vma));
-        if (!(vma->vm_flags & VM_SHARED))
+        if (!(vma->vm_flags & VM_MAYSHARE))
                 return (struct resv_map *)(get_vma_private_data(vma) &
                                                         ~HPAGE_RESV_MASK);
         return NULL;
@@ -325,7 +325,7 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
 static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
 {
         VM_BUG_ON(!is_vm_hugetlb_page(vma));
-        VM_BUG_ON(vma->vm_flags & VM_SHARED);
+        VM_BUG_ON(vma->vm_flags & VM_MAYSHARE);
 
         set_vma_private_data(vma, (get_vma_private_data(vma) &
                                 HPAGE_RESV_MASK) | (unsigned long)map);
@@ -334,7 +334,7 @@ static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
 static void set_vma_resv_flags(struct vm_area_struct *vma, unsigned long flags)
 {
         VM_BUG_ON(!is_vm_hugetlb_page(vma));
-        VM_BUG_ON(vma->vm_flags & VM_SHARED);
+        VM_BUG_ON(vma->vm_flags & VM_MAYSHARE);
 
         set_vma_private_data(vma, get_vma_private_data(vma) | flags);
 }
@@ -353,7 +353,7 @@ static void decrement_hugepage_resv_vma(struct hstate *h,
         if (vma->vm_flags & VM_NORESERVE)
                 return;
 
-        if (vma->vm_flags & VM_SHARED) {
+        if (vma->vm_flags & VM_MAYSHARE) {
                 /* Shared mappings always use reserves */
                 h->resv_huge_pages--;
         } else if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
@@ -369,14 +369,14 @@ static void decrement_hugepage_resv_vma(struct hstate *h,
 void reset_vma_resv_huge_pages(struct vm_area_struct *vma)
 {
         VM_BUG_ON(!is_vm_hugetlb_page(vma));
-        if (!(vma->vm_flags & VM_SHARED))
+        if (!(vma->vm_flags & VM_MAYSHARE))
                 vma->vm_private_data = (void *)0;
 }
 
 /* Returns true if the VMA has associated reserve pages */
 static int vma_has_reserves(struct vm_area_struct *vma)
 {
-        if (vma->vm_flags & VM_SHARED)
+        if (vma->vm_flags & VM_MAYSHARE)
                 return 1;
         if (is_vma_resv_set(vma, HPAGE_RESV_OWNER))
                 return 1;
@@ -924,7 +924,7 @@ static long vma_needs_reservation(struct hstate *h,
         struct address_space *mapping = vma->vm_file->f_mapping;
         struct inode *inode = mapping->host;
 
-        if (vma->vm_flags & VM_SHARED) {
+        if (vma->vm_flags & VM_MAYSHARE) {
                 pgoff_t idx = vma_hugecache_offset(h, vma, addr);
                 return region_chg(&inode->i_mapping->private_list,
                                                         idx, idx + 1);
@@ -949,7 +949,7 @@ static void vma_commit_reservation(struct hstate *h,
         struct address_space *mapping = vma->vm_file->f_mapping;
         struct inode *inode = mapping->host;
 
-        if (vma->vm_flags & VM_SHARED) {
+        if (vma->vm_flags & VM_MAYSHARE) {
                 pgoff_t idx = vma_hugecache_offset(h, vma, addr);
                 region_add(&inode->i_mapping->private_list, idx, idx + 1);
 
@@ -1893,7 +1893,7 @@ retry_avoidcopy:
          * at the time of fork() could consume its reserves on COW instead
          * of the full address range.
          */
-        if (!(vma->vm_flags & VM_SHARED) &&
+        if (!(vma->vm_flags & VM_MAYSHARE) &&
                         is_vma_resv_set(vma, HPAGE_RESV_OWNER) &&
                         old_page != pagecache_page)
                 outside_reserve = 1;
@@ -2000,7 +2000,7 @@ retry:
                 clear_huge_page(page, address, huge_page_size(h));
                 __SetPageUptodate(page);
 
-                if (vma->vm_flags & VM_SHARED) {
+                if (vma->vm_flags & VM_MAYSHARE) {
                         int err;
                         struct inode *inode = mapping->host;
 
@@ -2104,7 +2104,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                         goto out_mutex;
                 }
 
-                if (!(vma->vm_flags & VM_SHARED))
+                if (!(vma->vm_flags & VM_MAYSHARE))
                         pagecache_page = hugetlbfs_pagecache_page(h,
                                                                 vma, address);
         }
@@ -2289,7 +2289,7 @@ int hugetlb_reserve_pages(struct inode *inode,
          * to reserve the full area even if read-only as mprotect() may be
          * called to make the mapping read-write. Assume !vma is a shm mapping
          */
-        if (!vma || vma->vm_flags & VM_SHARED)
+        if (!vma || vma->vm_flags & VM_MAYSHARE)
                 chg = region_chg(&inode->i_mapping->private_list, from, to);
         else {
                 struct resv_map *resv_map = resv_map_alloc();
@@ -2330,7 +2330,7 @@ int hugetlb_reserve_pages(struct inode *inode,
          * consumed reservations are stored in the map. Hence, nothing
          * else has to be done for private mappings here
          */
-        if (!vma || vma->vm_flags & VM_SHARED)
+        if (!vma || vma->vm_flags & VM_MAYSHARE)
                 region_add(&inode->i_mapping->private_list, from, to);
         return 0;
 }
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 01c2d8f14685..78eb8552818b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -314,14 +314,6 @@ static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
         return mem;
 }
 
-static bool mem_cgroup_is_obsolete(struct mem_cgroup *mem)
-{
-        if (!mem)
-                return true;
-        return css_is_removed(&mem->css);
-}
-
-
 /*
  * Call callback function against all cgroup under hierarchy tree.
  */
@@ -932,7 +924,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
         if (unlikely(!mem))
                 return 0;
 
-        VM_BUG_ON(!mem || mem_cgroup_is_obsolete(mem));
+        VM_BUG_ON(css_is_removed(&mem->css));
 
         while (1) {
                 int ret;
@@ -1488,8 +1480,9 @@ void mem_cgroup_uncharge_cache_page(struct page *page)
         __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE);
 }
 
+#ifdef CONFIG_SWAP
 /*
- * called from __delete_from_swap_cache() and drop "page" account.
+ * called after __delete_from_swap_cache() and drop "page" account.
  * memcg information is recorded to swap_cgroup of "ent"
  */
 void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
@@ -1506,6 +1499,7 @@ void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
         if (memcg)
                 css_put(&memcg->css);
 }
+#endif
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 /*
diff --git a/mm/mmzone.c b/mm/mmzone.c
index 16ce8b955dcf..f5b7d1760213 100644
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -6,6 +6,7 @@
 
 
 #include <linux/stddef.h>
+#include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
 
@@ -72,3 +73,17 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
         *zone = zonelist_zone(z);
         return z;
 }
+
+#ifdef CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
+int memmap_valid_within(unsigned long pfn,
+                                        struct page *page, struct zone *zone)
+{
+        if (page_to_pfn(page) != pfn)
+                return 0;
+
+        if (page_zone(page) != zone)
+                return 0;
+
+        return 1;
+}
+#endif /* CONFIG_ARCH_HAS_HOLES_MEMORYMODEL */
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 92bcf1db16b2..a7b2460e922b 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -284,22 +284,28 @@ static void dump_tasks(const struct mem_cgroup *mem)
         printk(KERN_INFO "[ pid ]   uid  tgid total_vm      rss cpu oom_adj "
                "name\n");
         do_each_thread(g, p) {
-                /*
-                 * total_vm and rss sizes do not exist for tasks with a
-                 * detached mm so there's no need to report them.
-                 */
-                if (!p->mm)
-                        continue;
+                struct mm_struct *mm;
+
                 if (mem && !task_in_mem_cgroup(p, mem))
                         continue;
                 if (!thread_group_leader(p))
                         continue;
 
                 task_lock(p);
+                mm = p->mm;
+                if (!mm) {
+                        /*
+                         * total_vm and rss sizes do not exist for tasks with no
+                         * mm so there's no need to report them; they can't be
+                         * oom killed anyway.
+                         */
+                        task_unlock(p);
+                        continue;
+                }
                 printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d     %3d %s\n",
-                       p->pid, __task_cred(p)->uid, p->tgid,
-                       p->mm->total_vm, get_mm_rss(p->mm), (int)task_cpu(p),
-                       p->oomkilladj, p->comm);
+                       p->pid, __task_cred(p)->uid, p->tgid, mm->total_vm,
+                       get_mm_rss(mm), (int)task_cpu(p), p->oomkilladj,
+                       p->comm);
                 task_unlock(p);
         } while_each_thread(g, p);
 }
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 30351f0063ac..bb553c3e955d 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -94,12 +94,12 @@ unsigned long vm_dirty_bytes;
 /*
  * The interval between `kupdate'-style writebacks
  */
-unsigned int dirty_writeback_interval = 5 * 100; /* sentiseconds */
+unsigned int dirty_writeback_interval = 5 * 100; /* centiseconds */
 
 /*
  * The longest time for which data is allowed to remain dirty
  */
-unsigned int dirty_expire_interval = 30 * 100; /* sentiseconds */
+unsigned int dirty_expire_interval = 30 * 100; /* centiseconds */
 
 /*
  * Flag that makes the machine dump writes/reads and block dirtyings.
@@ -770,7 +770,7 @@ static void wb_kupdate(unsigned long arg)
 
         sync_supers();
 
-        oldest_jif = jiffies - msecs_to_jiffies(dirty_expire_interval);
+        oldest_jif = jiffies - msecs_to_jiffies(dirty_expire_interval * 10);
         start_jif = jiffies;
         next_jif = start_jif + msecs_to_jiffies(dirty_writeback_interval * 10);
         nr_to_write = global_page_state(NR_FILE_DIRTY) +
diff --git a/mm/rmap.c b/mm/rmap.c
index 16521664010d..23122af32611 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -14,7 +14,7 @@
  * Original design by Rik van Riel <riel@conectiva.com.br> 2001
  * File methods by Dave McCracken <dmccr@us.ibm.com> 2003, 2004
  * Anonymous methods by Andrea Arcangeli <andrea@suse.de> 2004
- * Contributions by Hugh Dickins <hugh@veritas.com> 2003, 2004
+ * Contributions by Hugh Dickins 2003, 2004
  */
 
 /*
diff --git a/mm/slob.c b/mm/slob.c
index a2d4ab32198d..f92e66d558bd 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -60,6 +60,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/swap.h> /* struct reclaim_state */
 #include <linux/cache.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -255,6 +256,8 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
 
 static void slob_free_pages(void *b, int order)
 {
+        if (current->reclaim_state)
+                current->reclaim_state->reclaimed_slab += 1 << order;
         free_pages((unsigned long)b, order);
 }
 
@@ -407,7 +410,7 @@ static void slob_free(void *block, int size)
                 spin_unlock_irqrestore(&slob_lock, flags);
                 clear_slob_page(sp);
                 free_slob_page(sp);
-                free_page((unsigned long)b);
+                slob_free_pages(b, 0);
                 return;
         }
 
diff --git a/mm/slub.c b/mm/slub.c
index 7ab54ecbd3f3..65ffda5934b0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/swap.h> /* struct reclaim_state */
 #include <linux/module.h>
 #include <linux/bit_spinlock.h>
 #include <linux/interrupt.h>
@@ -1170,6 +1171,8 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
 
         __ClearPageSlab(page);
         reset_page_mapcount(page);
+        if (current->reclaim_state)
+                current->reclaim_state->reclaimed_slab += pages;
         __free_pages(page, order);
 }
 
@@ -1909,7 +1912,7 @@ static inline int calculate_order(int size)
          * Doh this slab cannot be placed using slub_max_order.
          */
         order = slab_order(size, 1, MAX_ORDER, 1);
-        if (order <= MAX_ORDER)
+        if (order < MAX_ORDER)
                 return order;
         return -ENOSYS;
 }
@@ -2522,6 +2525,7 @@ __setup("slub_min_order=", setup_slub_min_order);
 static int __init setup_slub_max_order(char *str)
 {
         get_option(&str, &slub_max_order);
+        slub_max_order = min(slub_max_order, MAX_ORDER - 1);
 
         return 1;
 }
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 3ecea98ecb45..1416e7e9e02d 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -109,8 +109,6 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
  */
 void __delete_from_swap_cache(struct page *page)
 {
-        swp_entry_t ent = {.val = page_private(page)};
-
         VM_BUG_ON(!PageLocked(page));
         VM_BUG_ON(!PageSwapCache(page));
         VM_BUG_ON(PageWriteback(page));
@@ -121,7 +119,6 @@ void __delete_from_swap_cache(struct page *page)
         total_swapcache_pages--;
         __dec_zone_page_state(page, NR_FILE_PAGES);
         INC_CACHE_INFO(del_total);
-        mem_cgroup_uncharge_swapcache(page, ent);
 }
 
 /**
@@ -191,6 +188,7 @@ void delete_from_swap_cache(struct page *page)
         __delete_from_swap_cache(page);
         spin_unlock_irq(&swapper_space.tree_lock);
 
+        mem_cgroup_uncharge_swapcache(page, entry);
         swap_free(entry);
         page_cache_release(page);
 }
diff --git a/mm/truncate.c b/mm/truncate.c
index 55206fab7b99..12e1579f9165 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -359,6 +359,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page)
         BUG_ON(page_has_private(page));
         __remove_from_page_cache(page);
         spin_unlock_irq(&mapping->tree_lock);
+        mem_cgroup_uncharge_cache_page(page);
         page_cache_release(page);       /* pagecache ref */
         return 1;
 failed:
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 5fa3eda1f03f..d254306562cd 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -470,10 +470,12 @@ static int __remove_mapping(struct address_space *mapping, struct page *page)
                 swp_entry_t swap = { .val = page_private(page) };
                 __delete_from_swap_cache(page);
                 spin_unlock_irq(&mapping->tree_lock);
+                mem_cgroup_uncharge_swapcache(page, swap);
                 swap_free(swap);
         } else {
                 __remove_from_page_cache(page);
                 spin_unlock_irq(&mapping->tree_lock);
+                mem_cgroup_uncharge_cache_page(page);
         }
 
         return 1;
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 66f6130976cb..74d66dba0cbe 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -509,22 +509,11 @@ static void pagetypeinfo_showblockcount_print(struct seq_file *m,
                         continue;
 
                 page = pfn_to_page(pfn);
-#ifdef CONFIG_ARCH_FLATMEM_HAS_HOLES
-                /*
-                 * Ordinarily, memory holes in flatmem still have a valid
-                 * memmap for the PFN range. However, an architecture for
-                 * embedded systems (e.g. ARM) can free up the memmap backing
-                 * holes to save memory on the assumption the memmap is
-                 * never used. The page_zone linkages are then broken even
-                 * though pfn_valid() returns true. Skip the page if the
-                 * linkages are broken. Even if this test passed, the impact
-                 * is that the counters for the movable type are off but
-                 * fragmentation monitoring is likely meaningless on small
-                 * systems.
-                 */
-                if (page_zone(page) != zone)
+
+                /* Watch for unexpected holes punched in the memmap */
+                if (!memmap_valid_within(pfn, page, zone))
                         continue;
-#endif
+
                 mtype = get_pageblock_migratetype(page);
 
                 if (mtype < MIGRATE_TYPES)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index af3198814c15..9d504234af4a 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -345,6 +345,7 @@ static void svc_sock_setbufsize(struct socket *sock, unsigned int snd,
         lock_sock(sock->sk);
         sock->sk->sk_sndbuf = snd * 2;
         sock->sk->sk_rcvbuf = rcv * 2;
+        sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK|SOCK_RCVBUF_LOCK;
         release_sock(sock->sk);
 #endif
 }
@@ -796,6 +797,23 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
                 test_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags),
                 test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));
 
+        if (test_and_clear_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags))
+                /* sndbuf needs to have room for one request
+                 * per thread, otherwise we can stall even when the
+                 * network isn't a bottleneck.
+                 *
+                 * We count all threads rather than threads in a
+                 * particular pool, which provides an upper bound
+                 * on the number of threads which will access the socket.
+                 *
+                 * rcvbuf just needs to be able to hold a few requests.
+                 * Normally they will be removed from the queue
+                 * as soon a a complete request arrives.
+                 */
+                svc_sock_setbufsize(svsk->sk_sock,
+                                    (serv->sv_nrthreads+3) * serv->sv_max_mesg,
+                                    3 * serv->sv_max_mesg);
+
         clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 
         /* Receive data. If we haven't got the record length yet, get
@@ -1043,6 +1061,15 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
 
                 tcp_sk(sk)->nonagle |= TCP_NAGLE_OFF;
 
+                /* initialise setting must have enough space to
+                 * receive and respond to one request.
+                 * svc_tcp_recvfrom will re-adjust if necessary
+                 */
+                svc_sock_setbufsize(svsk->sk_sock,
+                                    3 * svsk->sk_xprt.xpt_server->sv_max_mesg,
+                                    3 * svsk->sk_xprt.xpt_server->sv_max_mesg);
+
+                set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags);
                 set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
                 if (sk->sk_state != TCP_ESTABLISHED)
                         set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
@@ -1112,14 +1139,8 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
         /* Initialize the socket */
         if (sock->type == SOCK_DGRAM)
                 svc_udp_init(svsk, serv);
-        else {
-                /* initialise setting must have enough space to
-                 * receive and respond to one request.
-                 */
-                svc_sock_setbufsize(svsk->sk_sock, 4 * serv->sv_max_mesg,
-                                        4 * serv->sv_max_mesg);
+        else
                 svc_tcp_init(svsk, serv);
-        }
 
         dprintk("svc: svc_setup_socket created %p (inet %p)\n",
                                 svsk, svsk->sk_sk);
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 8b510c5e8777..f11be72a1a80 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -128,7 +128,8 @@ static int fast_reg_xdr(struct svcxprt_rdma *xprt,
                 page_bytes -= sge_bytes;
 
                 frmr->page_list->page_list[page_no] =
-                        ib_dma_map_page(xprt->sc_cm_id->device, page, 0,
+                        ib_dma_map_single(xprt->sc_cm_id->device,
+                                          page_address(page),
                                           PAGE_SIZE, DMA_TO_DEVICE);
                 if (ib_dma_mapping_error(xprt->sc_cm_id->device,
                                          frmr->page_list->page_list[page_no]))
@@ -532,18 +533,17 @@ static int send_reply(struct svcxprt_rdma *rdma,
                 clear_bit(RDMACTXT_F_FAST_UNREG, &ctxt->flags);
 
         /* Prepare the SGE for the RPCRDMA Header */
+        ctxt->sge[0].lkey = rdma->sc_dma_lkey;
+        ctxt->sge[0].length = svc_rdma_xdr_get_reply_hdr_len(rdma_resp);
         ctxt->sge[0].addr =
-                ib_dma_map_page(rdma->sc_cm_id->device,
-                                page, 0, PAGE_SIZE, DMA_TO_DEVICE);
+                ib_dma_map_single(rdma->sc_cm_id->device, page_address(page),
+                                  ctxt->sge[0].length, DMA_TO_DEVICE);
         if (ib_dma_mapping_error(rdma->sc_cm_id->device, ctxt->sge[0].addr))
                 goto err;
         atomic_inc(&rdma->sc_dma_used);
 
         ctxt->direction = DMA_TO_DEVICE;
 
-        ctxt->sge[0].length = svc_rdma_xdr_get_reply_hdr_len(rdma_resp);
-        ctxt->sge[0].lkey = rdma->sc_dma_lkey;
-
         /* Determine how many of our SGE are to be transmitted */
         for (sge_no = 1; byte_count && sge_no < vec->count; sge_no++) {
                 sge_bytes = min_t(size_t, vec->sge[sge_no].iov_len, byte_count);
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 4b0c2fa15e0b..5151f9f6c573 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -500,8 +500,8 @@ int svc_rdma_post_recv(struct svcxprt_rdma *xprt)
                 BUG_ON(sge_no >= xprt->sc_max_sge);
                 page = svc_rdma_get_page();
                 ctxt->pages[sge_no] = page;
-                pa = ib_dma_map_page(xprt->sc_cm_id->device,
-                                     page, 0, PAGE_SIZE,
+                pa = ib_dma_map_single(xprt->sc_cm_id->device,
+                                     page_address(page), PAGE_SIZE,
                                      DMA_FROM_DEVICE);
                 if (ib_dma_mapping_error(xprt->sc_cm_id->device, pa))
                         goto err_put_ctxt;
@@ -1315,8 +1315,8 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
         length = svc_rdma_xdr_encode_error(xprt, rmsgp, err, va);
 
         /* Prepare SGE for local address */
-        sge.addr = ib_dma_map_page(xprt->sc_cm_id->device,
-                                   p, 0, PAGE_SIZE, DMA_FROM_DEVICE);
+        sge.addr = ib_dma_map_single(xprt->sc_cm_id->device,
+                                   page_address(p), PAGE_SIZE, DMA_FROM_DEVICE);
         if (ib_dma_mapping_error(xprt->sc_cm_id->device, sge.addr)) {
                 put_page(p);
                 return;
@@ -1343,7 +1343,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
         if (ret) {
                 dprintk("svcrdma: Error %d posting send for protocol error\n",
                         ret);
-                ib_dma_unmap_page(xprt->sc_cm_id->device,
+                ib_dma_unmap_single(xprt->sc_cm_id->device,
                                   sge.addr, PAGE_SIZE,
                                   DMA_FROM_DEVICE);
                 svc_rdma_put_context(ctxt, 1);
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 3b21e0cc5e69..465aafc2007f 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1495,7 +1495,8 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
         frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
         frmr_wr.wr.fast_reg.length = i << PAGE_SHIFT;
         frmr_wr.wr.fast_reg.access_flags = (writing ?
-                                IB_ACCESS_REMOTE_WRITE : IB_ACCESS_REMOTE_READ);
+                                IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE :
+                                IB_ACCESS_REMOTE_READ);
         frmr_wr.wr.fast_reg.rkey = seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey;
         DECR_CQCOUNT(&r_xprt->rx_ep);
 
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 32c8554f3946..00790472f641 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -1,5 +1,13 @@
 #!/bin/sh
-# Print additional version information for non-release trees.
+#
+# This scripts adds local version information from the version
+# control systems git, mercurial (hg) and subversion (svn).
+#
+# If something goes wrong, send a mail the kernel build mailinglist
+# (see MAINTAINERS) and CC Nico Schottelius
+# <nico-linuxsetlocalversion -at- schottelius.org>.
+#
+#
 
 usage() {
         echo "Usage: $0 [srctree]" >&2
@@ -10,12 +18,20 @@ cd "${1:-.}" || usage
 
 # Check for git and a git repo.
 if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-        # Do we have an untagged tag?
-        if atag=`git describe 2>/dev/null`; then
-                echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
-        # add -g${head}, if there is no usable tag
-        else
-                printf '%s%s' -g $head
+
+        # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,
+        # because this version is defined in the top level Makefile.
+        if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+
+                # If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
+                # we pretty print it.
+                if atag="`git describe 2>/dev/null`"; then
+                        echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+                # If we don't have a tag at all we print -g{commitish}.
+                else
+                        printf '%s%s' -g $head
+                fi
         fi
 
         # Is this git on svn?
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 5b481912752a..e42be5c4f055 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -27,6 +27,12 @@ static int tomoyo_cred_prepare(struct cred *new, const struct cred *old,
 
 static int tomoyo_bprm_set_creds(struct linux_binprm *bprm)
 {
+        int rc;
+
+        rc = cap_bprm_set_creds(bprm);
+        if (rc)
+                return rc;
+
         /*
          * Do only if this function is called for the first time of an execve
          * operation.
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 7fbd68fab944..5c48e36038f2 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -1074,7 +1074,7 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
         return i;
 }
 
-static int __devinit aaci_probe(struct amba_device *dev, void *id)
+static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct aaci *aaci;
         int ret, i;
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index a2a792c18c40..d659995ac3ac 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -249,6 +249,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
                         new_hw_ptr = hw_base + pos;
                 }
         }
+
+        /* Do jiffies check only in xrun_debug mode */
+        if (!xrun_debug(substream))
+                goto no_jiffies_check;
+
         /* Skip the jiffies check for hardwares with BATCH flag.
          * Such hardware usually just increases the position at each IRQ,
          * thus it can't give any strange position.
@@ -336,7 +341,9 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
                         hw_base = 0;
                 new_hw_ptr = hw_base + pos;
         }
-        if (((delta * HZ) / runtime->rate) > jdelta + HZ/100) {
+        /* Do jiffies check only in xrun_debug mode */
+        if (xrun_debug(substream) &&
+            ((delta * HZ) / runtime->rate) > jdelta + HZ/100) {
                 hw_ptr_error(substream,
                              "hw_ptr skipping! "
                              "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu)\n",
@@ -1478,7 +1485,6 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
                 runtime->status->hw_ptr %= runtime->buffer_size;
         else
                 runtime->status->hw_ptr = 0;
-        runtime->hw_ptr_jiffies = jiffies;
         snd_pcm_stream_unlock_irqrestore(substream, flags);
         return 0;
 }
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index fc6f98e257df..b5da656d1ece 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -848,6 +848,7 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         snd_pcm_trigger_tstamp(substream);
+        runtime->hw_ptr_jiffies = jiffies;
         runtime->status->state = state;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
             runtime->silence_size > 0)
@@ -961,6 +962,11 @@ static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push)
 {
         if (substream->runtime->trigger_master != substream)
                 return 0;
+        /* The jiffies check in snd_pcm_update_hw_ptr*() is done by
+         * a delta betwen the current jiffies, this gives a large enough
+         * delta, effectively to skip the check once.
+         */
+        substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000;
         return substream->ops->trigger(substream,
                                        push ? SNDRV_PCM_TRIGGER_PAUSE_PUSH :
                                               SNDRV_PCM_TRIGGER_PAUSE_RELEASE);
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c
index 771955a9be71..199b03377142 100644
--- a/sound/drivers/pcsp/pcsp_mixer.c
+++ b/sound/drivers/pcsp/pcsp_mixer.c
@@ -51,7 +51,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol,
         if (uinfo->value.enumerated.item > chip->max_treble)
                 uinfo->value.enumerated.item = chip->max_treble;
         sprintf(uinfo->value.enumerated.name, "%lu",
-                        PCSP_CALC_RATE(uinfo->value.enumerated.item));
+                (unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item));
         return 0;
 }
 
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 81bc93e5f1e3..7337abdbe4e3 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97)
 }
 
 static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =
-AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
+AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch",
+                AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
 
+/* "Sigmatel " removed due to excessive name length: */
 static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =
-AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
+AC97_SINGLE("Surround Phase Inversion Playback Switch",
+                AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
 
 static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {
 AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index ad2888705d2a..c111efe61c3c 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                 "Capture Volume",
                 "External Amplifier",
                 "Sigmatel 4-Speaker Stereo Playback Switch",
-                "Sigmatel Surround Phase Inversion Playback ",
+                "Surround Phase Inversion Playback Switch",
                 NULL
         };
         static char *ca0106_rename_ctls[] = {
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 21e99cfa8c49..3128e1a6bc65 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2141,6 +2141,7 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
         /* including bogus ALC268 in slot#2 that conflicts with ALC888 */
         SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),
         /* forced codec slots */
+        SND_PCI_QUIRK(0x1043, 0x1262, "ASUS W5Fm", 0x103),
         SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),
         {}
 };
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 56ce19e68cb5..4fcbe21829ab 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1848,6 +1848,7 @@ static const char *cxt5051_models[CXT5051_MODELS] = {
 
 static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),
+        SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),
         SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
                       CXT5051_LAPTOP),
         SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b8a0d3e79272..0fd258eba3a5 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -776,6 +776,12 @@ static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
                 pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
                 if (pincap & AC_PINCAP_VREF_80)
                         val = PIN_VREF80;
+                else if (pincap & AC_PINCAP_VREF_50)
+                        val = PIN_VREF50;
+                else if (pincap & AC_PINCAP_VREF_100)
+                        val = PIN_VREF100;
+                else if (pincap & AC_PINCAP_VREF_GRD)
+                        val = PIN_VREFGRD;
         }
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, val);
 }
@@ -12058,6 +12064,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
         SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
         SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
+        SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA),
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
         SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
         SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 03b3646018a1..d2fd8ef6aef8 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -150,6 +150,7 @@ enum {
         STAC_D965_REF,
         STAC_D965_3ST,
         STAC_D965_5ST,
+        STAC_D965_5ST_NO_FP,
         STAC_DELL_3ST,
         STAC_DELL_BIOS,
         STAC_927X_MODELS
@@ -2154,6 +2155,13 @@ static unsigned int d965_5st_pin_configs[14] = {
         0x40000100, 0x40000100
 };
 
+static unsigned int d965_5st_no_fp_pin_configs[14] = {
+        0x40000100, 0x40000100, 0x0181304e, 0x01014010,
+        0x01a19040, 0x01011012, 0x01016011, 0x40000100,
+        0x40000100, 0x40000100, 0x40000100, 0x01442070,
+        0x40000100, 0x40000100
+};
+
 static unsigned int dell_3st_pin_configs[14] = {
         0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
         0x01111212, 0x01116211, 0x01813050, 0x01112214,
@@ -2166,6 +2174,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
         [STAC_D965_REF]  = ref927x_pin_configs,
         [STAC_D965_3ST]  = d965_3st_pin_configs,
         [STAC_D965_5ST]  = d965_5st_pin_configs,
+        [STAC_D965_5ST_NO_FP]  = d965_5st_no_fp_pin_configs,
         [STAC_DELL_3ST]  = dell_3st_pin_configs,
         [STAC_DELL_BIOS] = NULL,
 };
@@ -2176,6 +2185,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = {
         [STAC_D965_REF]         = "ref",
         [STAC_D965_3ST]         = "3stack",
         [STAC_D965_5ST]         = "5stack",
+        [STAC_D965_5ST_NO_FP]   = "5stack-no-fp",
         [STAC_DELL_3ST]         = "dell-3stack",
         [STAC_DELL_BIOS]        = "dell-bios",
 };
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 823296d7d578..a6b88482637b 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3347,7 +3347,7 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip,
                 [QUIRK_MIDI_YAMAHA] = snd_usb_create_midi_interface,
                 [QUIRK_MIDI_MIDIMAN] = snd_usb_create_midi_interface,
                 [QUIRK_MIDI_NOVATION] = snd_usb_create_midi_interface,
-                [QUIRK_MIDI_RAW] = snd_usb_create_midi_interface,
+                [QUIRK_MIDI_FASTLANE] = snd_usb_create_midi_interface,
                 [QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface,
                 [QUIRK_MIDI_CME] = snd_usb_create_midi_interface,
                 [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 36e4f7a29adc..8e7f78941ba6 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -153,7 +153,7 @@ enum quirk_type {
         QUIRK_MIDI_YAMAHA,
         QUIRK_MIDI_MIDIMAN,
         QUIRK_MIDI_NOVATION,
-        QUIRK_MIDI_RAW,
+        QUIRK_MIDI_FASTLANE,
         QUIRK_MIDI_EMAGIC,
         QUIRK_MIDI_CME,
         QUIRK_MIDI_US122L,
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 26bad373fe65..2fb35cc22a30 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1778,8 +1778,18 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
                 umidi->usb_protocol_ops = &snd_usbmidi_novation_ops;
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
-        case QUIRK_MIDI_RAW:
+        case QUIRK_MIDI_FASTLANE:
                 umidi->usb_protocol_ops = &snd_usbmidi_raw_ops;
+                /*
+                 * Interface 1 contains isochronous endpoints, but with the same
+                 * numbers as in interface 0.  Since it is interface 1 that the
+                 * USB core has most recently seen, these descriptors are now
+                 * associated with the endpoint numbers.  This will foul up our
+                 * attempts to submit bulk/interrupt URBs to the endpoints in
+                 * interface 0, so we have to make sure that the USB core looks
+                 * again at interface 0 by calling usb_set_interface() on it.
+                 */
+                usb_set_interface(umidi->chip->dev, 0, 0);
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
         case QUIRK_MIDI_EMAGIC:
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 647ef5029651..5d955aaad85f 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1868,7 +1868,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .data = & (const struct snd_usb_audio_quirk[]) {
                         {
                                 .ifnum = 0,
-                                .type = QUIRK_MIDI_RAW
+                                .type = QUIRK_MIDI_FASTLANE
                         },
                         {
                                 .ifnum = 1,