760 files changed, 21032 insertions, 9822 deletions

diff --git a/.gitignore b/.gitignore
index acb6afe6b7a3..4ad4a98b884b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 *.order
 *.elf
 *.bin
+*.tar
 *.gz
 *.bz2
 *.lzma
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index 449a8a19fc21..4d4f06d47e06 100644
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -659,6 +659,19 @@ macros using parameters.
 #define CONSTANT 0x4000
 #define CONSTEXP (CONSTANT | 3)
 
+5) namespace collisions when defining local variables in macros resembling
+functions:
+
+#define FOO(x)                          \
+({                                      \
+        typeof(x) ret;                  \
+        ret = calc_ret(x);              \
+        (ret);                          \
+)}
+
+ret is a common name for a local variable - __foo_ret is less likely
+to collide with an existing variable.
+
 The cpp manual deals with macros exhaustively. The gcc internals manual also
 covers RTL which is used frequently with assembly language in the kernel.
 
diff --git a/Documentation/IRQ-domain.txt b/Documentation/IRQ-domain.txt
index 39cfa72732ff..3a8e15cba816 100644
--- a/Documentation/IRQ-domain.txt
+++ b/Documentation/IRQ-domain.txt
@@ -95,8 +95,7 @@ since it doesn't need to allocate a table as large as the largest
 hwirq number.  The disadvantage is that hwirq to IRQ number lookup is
 dependent on how many entries are in the table.
 
-Very few drivers should need this mapping.  At the moment, powerpc
-iseries is the only user.
+Very few drivers should need this mapping.
 
 ==== No Map ===-
 irq_domain_add_nomap()
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 447671bd2927..b03a832a08e2 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -614,8 +614,8 @@ The canonical patch message body contains the following:
 
   - An empty line.
 
-  - The body of the explanation, which will be copied to the
-    permanent changelog to describe this patch.
+  - The body of the explanation, line wrapped at 75 columns, which will
+    be copied to the permanent changelog to describe this patch.
 
   - The "Signed-off-by:" lines, described above, which will
     also go in the changelog.
diff --git a/Documentation/blockdev/nbd.txt b/Documentation/blockdev/nbd.txt
index 271e607304da..db242ea2bce8 100644
--- a/Documentation/blockdev/nbd.txt
+++ b/Documentation/blockdev/nbd.txt
@@ -1,17 +1,31 @@
-                      Network Block Device (TCP version)
-                                       
-   What is it: With this compiled in the kernel (or as a module), Linux
-   can use a remote server as one of its block devices. So every time
-   the client computer wants to read, e.g., /dev/nb0, it sends a
-   request over TCP to the server, which will reply with the data read.
-   This can be used for stations with low disk space (or even diskless)
-   to borrow disk space from another computer.
-   Unlike NFS, it is possible to put any filesystem on it, etc.
-
-   For more information, or to download the nbd-client and nbd-server
-   tools, go to http://nbd.sf.net/.
-
-   The nbd kernel module need only be installed on the client
-   system, as the nbd-server is completely in userspace. In fact,
-   the nbd-server has been successfully ported to other operating
-   systems, including Windows.
+Network Block Device (TCP version)
+==================================
+
+1) Overview
+-----------
+
+What is it: With this compiled in the kernel (or as a module), Linux
+can use a remote server as one of its block devices. So every time
+the client computer wants to read, e.g., /dev/nb0, it sends a
+request over TCP to the server, which will reply with the data read.
+This can be used for stations with low disk space (or even diskless)
+to borrow disk space from another computer.
+Unlike NFS, it is possible to put any filesystem on it, etc.
+
+For more information, or to download the nbd-client and nbd-server
+tools, go to http://nbd.sf.net/.
+
+The nbd kernel module need only be installed on the client
+system, as the nbd-server is completely in userspace. In fact,
+the nbd-server has been successfully ported to other operating
+systems, including Windows.
+
+A) NBD parameters
+-----------------
+
+max_part
+        Number of partitions per device (default: 0).
+
+nbds_max
+        Number of block devices that should be initialized (default: 16).
+
diff --git a/Documentation/devicetree/bindings/clock/pistachio-clock.txt b/Documentation/devicetree/bindings/clock/pistachio-clock.txt
new file mode 100644
index 000000000000..868db499eed2
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/pistachio-clock.txt
@@ -0,0 +1,123 @@
+Imagination Technologies Pistachio SoC clock controllers
+========================================================
+
+Pistachio has four clock controllers (core clock, peripheral clock, peripheral
+general control, and top general control) which are instantiated individually
+from the device-tree.
+
+External clocks:
+----------------
+
+There are three external inputs to the clock controllers which should be
+defined with the following clock-output-names:
+- "xtal": External 52Mhz oscillator (required)
+- "audio_clk_in": Alternate audio reference clock (optional)
+- "enet_clk_in": Alternate ethernet PHY clock (optional)
+
+Core clock controller:
+----------------------
+
+The core clock controller generates clocks for the CPU, RPU (WiFi + BT
+co-processor), audio, and several peripherals.
+
+Required properties:
+- compatible: Must be "img,pistachio-clk".
+- reg: Must contain the base address and length of the core clock controller.
+- #clock-cells: Must be 1.  The single cell is the clock identifier.
+  See dt-bindings/clock/pistachio-clk.h for the list of valid identifiers.
+- clocks: Must contain an entry for each clock in clock-names.
+- clock-names: Must include "xtal" (see "External clocks") and
+  "audio_clk_in_gate", "enet_clk_in_gate" which are generated by the
+  top-level general control.
+
+Example:
+        clk_core: clock-controller@18144000 {
+                compatible = "img,pistachio-clk";
+                reg = <0x18144000 0x800>;
+                clocks = <&xtal>, <&cr_top EXT_CLK_AUDIO_IN>,
+                         <&cr_top EXT_CLK_ENET_IN>;
+                clock-names = "xtal", "audio_clk_in_gate", "enet_clk_in_gate";
+
+                #clock-cells = <1>;
+        };
+
+Peripheral clock controller:
+----------------------------
+
+The peripheral clock controller generates clocks for the DDR, ROM, and other
+peripherals.  The peripheral system clock ("periph_sys") generated by the core
+clock controller is the input clock to the peripheral clock controller.
+
+Required properties:
+- compatible: Must be "img,pistachio-periph-clk".
+- reg: Must contain the base address and length of the peripheral clock
+  controller.
+- #clock-cells: Must be 1.  The single cell is the clock identifier.
+  See dt-bindings/clock/pistachio-clk.h for the list of valid identifiers.
+- clocks: Must contain an entry for each clock in clock-names.
+- clock-names: Must include "periph_sys", the peripheral system clock generated
+  by the core clock controller.
+
+Example:
+        clk_periph: clock-controller@18144800 {
+                compatible = "img,pistachio-clk-periph";
+                reg = <0x18144800 0x800>;
+                clocks = <&clk_core CLK_PERIPH_SYS>;
+                clock-names = "periph_sys";
+
+                #clock-cells = <1>;
+        };
+
+Peripheral general control:
+---------------------------
+
+The peripheral general control block generates system interface clocks and
+resets for various peripherals.  It also contains miscellaneous peripheral
+control registers.  The system clock ("sys") generated by the peripheral clock
+controller is the input clock to the system clock controller.
+
+Required properties:
+- compatible: Must include "img,pistachio-periph-cr" and "syscon".
+- reg: Must contain the base address and length of the peripheral general
+  control registers.
+- #clock-cells: Must be 1.  The single cell is the clock identifier.
+  See dt-bindings/clock/pistachio-clk.h for the list of valid identifiers.
+- clocks: Must contain an entry for each clock in clock-names.
+- clock-names: Must include "sys", the system clock generated by the peripheral
+  clock controller.
+
+Example:
+        cr_periph: syscon@18144800 {
+                compatible = "img,pistachio-cr-periph", "syscon";
+                reg = <0x18148000 0x1000>;
+                clocks = <&clock_periph PERIPH_CLK_PERIPH_SYS>;
+                clock-names = "sys";
+
+                #clock-cells = <1>;
+        };
+
+Top-level general control:
+--------------------------
+
+The top-level general control block contains miscellaneous control registers and
+gates for the external clocks "audio_clk_in" and "enet_clk_in".
+
+Required properties:
+- compatible: Must include "img,pistachio-cr-top" and "syscon".
+- reg: Must contain the base address and length of the top-level
+  control registers.
+- clocks: Must contain an entry for each clock in clock-names.
+- clock-names: Two optional clocks, "audio_clk_in" and "enet_clk_in" (see
+  "External clocks").
+- #clock-cells: Must be 1.  The single cell is the clock identifier.
+  See dt-bindings/clock/pistachio-clk.h for the list of valid identifiers.
+
+Example:
+        cr_top: syscon@18144800 {
+                compatible = "img,pistachio-cr-top", "syscon";
+                reg = <0x18149000 0x200>;
+                clocks = <&audio_refclk>, <&ext_enet_in>;
+                clock-names = "audio_clk_in", "enet_clk_in";
+
+                #clock-cells = <1>;
+        };
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt
new file mode 100644
index 000000000000..8f48aad50868
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt
@@ -0,0 +1,41 @@
+Broadcom BCM3380-style Level 1 / Level 2 interrupt controller
+
+This interrupt controller shows up in various forms on many BCM338x/BCM63xx
+chipsets.  It has the following properties:
+
+- outputs a single interrupt signal to its interrupt controller parent
+
+- contains one or more enable/status word pairs, which often appear at
+  different offsets in different blocks
+
+- no atomic set/clear operations
+
+Required properties:
+
+- compatible: should be "brcm,bcm3380-l2-intc"
+- reg: specifies one or more enable/status pairs, in the following format:
+  <enable_reg 0x4 status_reg 0x4>...
+- interrupt-controller: identifies the node as an interrupt controller
+- #interrupt-cells: specifies the number of cells needed to encode an interrupt
+  source, should be 1.
+- interrupt-parent: specifies the phandle to the parent interrupt controller
+  this one is cascaded from
+- interrupts: specifies the interrupt line in the interrupt-parent controller
+  node, valid values depend on the type of parent interrupt controller
+
+Optional properties:
+
+- brcm,irq-can-wake: if present, this means the L2 controller can be used as a
+  wakeup source for system suspend/resume.
+
+Example:
+
+irq0_intc: interrupt-controller@10000020 {
+        compatible = "brcm,bcm3380-l2-intc";
+        reg = <0x10000024 0x4 0x1000002c 0x4>,
+              <0x10000020 0x4 0x10000028 0x4>;
+        interrupt-controller;
+        #interrupt-cells = <1>;
+        interrupt-parent = <&cpu_intc>;
+        interrupts = <2>;
+};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt
new file mode 100644
index 000000000000..cc217b22dccd
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt
@@ -0,0 +1,52 @@
+Broadcom BCM7038-style Level 1 interrupt controller
+
+This block is a first level interrupt controller that is typically connected
+directly to one of the HW INT lines on each CPU.  Every BCM7xxx set-top chip
+since BCM7038 has contained this hardware.
+
+Key elements of the hardware design include:
+
+- 64, 96, 128, or 160 incoming level IRQ lines
+
+- Most onchip peripherals are wired directly to an L1 input
+
+- A separate instance of the register set for each CPU, allowing individual
+  peripheral IRQs to be routed to any CPU
+
+- Atomic mask/unmask operations
+
+- No polarity/level/edge settings
+
+- No FIFO or priority encoder logic; software is expected to read all
+  2-5 status words to determine which IRQs are pending
+
+Required properties:
+
+- compatible: should be "brcm,bcm7038-l1-intc"
+- reg: specifies the base physical address and size of the registers;
+  the number of supported IRQs is inferred from the size argument
+- interrupt-controller: identifies the node as an interrupt controller
+- #interrupt-cells: specifies the number of cells needed to encode an interrupt
+  source, should be 1.
+- interrupt-parent: specifies the phandle to the parent interrupt controller(s)
+  this one is cascaded from
+- interrupts: specifies the interrupt line(s) in the interrupt-parent controller
+  node; valid values depend on the type of parent interrupt controller
+
+If multiple reg ranges and interrupt-parent entries are present on an SMP
+system, the driver will allow IRQ SMP affinity to be set up through the
+/proc/irq/ interface.  In the simplest possible configuration, only one
+reg range and one interrupt-parent is needed.
+
+Example:
+
+periph_intc: periph_intc@1041a400 {
+        compatible = "brcm,bcm7038-l1-intc";
+        reg = <0x1041a400 0x30 0x1041a600 0x30>;
+
+        interrupt-controller;
+        #interrupt-cells = <1>;
+
+        interrupt-parent = <&cpu_intc>;
+        interrupts = <2>, <3>;
+};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
index bae1f2187226..44a9bb15dd56 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
@@ -13,8 +13,7 @@ Such an interrupt controller has the following hardware design:
   or if they will output an interrupt signal at this 2nd level interrupt
   controller, in particular for UARTs
 
-- typically has one 32-bit enable word and one 32-bit status word, but on
-  some hardware may have more than one enable/status pair
+- has one 32-bit enable word and one 32-bit status word
 
 - no atomic set/clear operations
 
@@ -53,9 +52,7 @@ The typical hardware layout for this controller is represented below:
 Required properties:
 
 - compatible: should be "brcm,bcm7120-l2-intc"
-- reg: specifies the base physical address and size of the registers;
-  multiple pairs may be specified, with the first pair handling IRQ offsets
-  0..31 and the second pair handling 32..63
+- reg: specifies the base physical address and size of the registers
 - interrupt-controller: identifies the node as an interrupt controller
 - #interrupt-cells: specifies the number of cells needed to encode an interrupt
   source, should be 1.
@@ -66,10 +63,7 @@ Required properties:
 - brcm,int-map-mask: 32-bits bit mask describing how many and which interrupts
   are wired to this 2nd level interrupt controller, and how they match their
   respective interrupt parents. Should match exactly the number of interrupts
-  specified in the 'interrupts' property, multiplied by the number of
-  enable/status register pairs implemented by this controller.  For
-  multiple parent IRQs with multiple enable/status words, this looks like:
-  <irq0_w0 irq0_w1 irq1_w0 irq1_w1 ...>
+  specified in the 'interrupts' property.
 
 Optional properties:
 
diff --git a/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-mx.txt b/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-mx.txt
new file mode 100644
index 000000000000..d4de980e55fa
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-mx.txt
@@ -0,0 +1,18 @@
+* Xtensa Interrupt Distributor and Programmable Interrupt Controller (MX)
+
+Required properties:
+- compatible: Should be "cdns,xtensa-mx".
+
+Remaining properties have exact same meaning as in Xtensa PIC
+(see cdns,xtensa-pic.txt).
+
+Examples:
+        pic: pic {
+                compatible = "cdns,xtensa-mx";
+                /* one cell: internal irq number,
+                 * two cells: second cell == 0: internal irq number
+                 *            second cell == 1: external irq number
+                 */
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
diff --git a/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.txt b/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.txt
new file mode 100644
index 000000000000..026ef4cfc1d5
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.txt
@@ -0,0 +1,25 @@
+* Xtensa built-in Programmable Interrupt Controller (PIC)
+
+Required properties:
+- compatible: Should be "cdns,xtensa-pic".
+- interrupt-controller: Identifies the node as an interrupt controller.
+- #interrupt-cells: The number of cells to define the interrupts.
+  It may be either 1 or 2.
+  When it's 1, the first cell is the internal IRQ number.
+  When it's 2, the first cell is the IRQ number, and the second cell
+  specifies whether it's internal (0) or external (1).
+  Periferals are usually connected to a fixed external IRQ, but for different
+  core variants it may be mapped to different internal IRQ.
+  IRQ sensitivity and priority are fixed for each core variant and may not be
+  changed at runtime.
+
+Examples:
+        pic: pic {
+                compatible = "cdns,xtensa-pic";
+                /* one cell: internal irq number,
+                 * two cells: second cell == 0: internal irq number
+                 *            second cell == 1: external irq number
+                 */
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
diff --git a/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt b/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
index 5a65478e5d40..aae4c384ee1f 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
@@ -27,8 +27,13 @@ Optional properties:
 Required properties for timer sub-node:
 - compatible : Should be "mti,gic-timer".
 - interrupts : Interrupt for the GIC local timer.
+
+Optional properties for timer sub-node:
+- clocks : GIC timer operating clock.
 - clock-frequency : Clock frequency at which the GIC timers operate.
 
+Note that one of clocks or clock-frequency must be specified.
+
 Example:
 
         gic: interrupt-controller@1bdc0000 {
diff --git a/Documentation/devicetree/bindings/mailbox/arm-mhu.txt b/Documentation/devicetree/bindings/mailbox/arm-mhu.txt
new file mode 100644
index 000000000000..4971f03f0b33
--- /dev/null
+++ b/Documentation/devicetree/bindings/mailbox/arm-mhu.txt
@@ -0,0 +1,43 @@
+ARM MHU Mailbox Driver
+======================
+
+The ARM's Message-Handling-Unit (MHU) is a mailbox controller that has
+3 independent channels/links to communicate with remote processor(s).
+ MHU links are hardwired on a platform. A link raises interrupt for any
+received data. However, there is no specified way of knowing if the sent
+data has been read by the remote. This driver assumes the sender polls
+STAT register and the remote clears it after having read the data.
+The last channel is specified to be a 'Secure' resource, hence can't be
+used by Linux running NS.
+
+Mailbox Device Node:
+====================
+
+Required properties:
+--------------------
+- compatible:           Shall be "arm,mhu" & "arm,primecell"
+- reg:                  Contains the mailbox register address range (base
+                        address and length)
+- #mbox-cells           Shall be 1 - the index of the channel needed.
+- interrupts:           Contains the interrupt information corresponding to
+                        each of the 3 links of MHU.
+
+Example:
+--------
+
+        mhu: mailbox@2b1f0000 {
+                #mbox-cells = <1>;
+                compatible = "arm,mhu", "arm,primecell";
+                reg = <0 0x2b1f0000 0x1000>;
+                interrupts = <0 36 4>, /* LP-NonSecure */
+                             <0 35 4>, /* HP-NonSecure */
+                             <0 37 4>; /* Secure */
+                clocks = <&clock 0 2 1>;
+                clock-names = "apb_pclk";
+        };
+
+        mhu_client: scb@2e000000 {
+                compatible = "fujitsu,mb86s70-scb-1.0";
+                reg = <0 0x2e000000 0x4000>;
+                mboxes = <&mhu 1>; /* HP-NonSecure */
+        };
diff --git a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt b/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
deleted file mode 100644
index d4e0141d3620..000000000000
--- a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-* Interrupt Controller
-
-Properties:
-- compatible: "brcm,bcm3384-intc"
-
-  Compatibility with BCM3384 and possibly other BCM33xx/BCM63xx SoCs.
-
-- reg: Address/length pairs for each mask/status register set.  Length must
-  be 8.  If multiple register sets are specified, the first set will
-  handle IRQ offsets 0..31, the second set 32..63, and so on.
-
-- interrupt-controller: This is an interrupt controller.
-
-- #interrupt-cells: Must be <1>.  Just a simple IRQ offset; no level/edge
-  or polarity configuration is possible with this controller.
-
-- interrupt-parent: This controller is cascaded from a MIPS CPU HW IRQ, or
-  from another INTC.
-
-- interrupts: The IRQ on the parent controller.
-
-Example:
-        periph_intc: periph_intc@14e00038 {
-                compatible = "brcm,bcm3384-intc";
-
-                /*
-                 * IRQs 0..31:  mask reg 0x14e00038, status reg 0x14e0003c
-                 * IRQs 32..63: mask reg 0x14e00340, status reg 0x14e00344
-                 */
-                reg = <0x14e00038 0x8 0x14e00340 0x8>;
-
-                interrupt-controller;
-                #interrupt-cells = <1>;
-
-                interrupt-parent = <&cpu_intc>;
-                interrupts = <4>;
-        };
diff --git a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt b/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
deleted file mode 100644
index 8a139cb3c0b5..000000000000
--- a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-* Broadcom cable/DSL platforms
-
-SoCs:
-
-Required properties:
-- compatible: "brcm,bcm3384", "brcm,bcm33843"
-
-Boards:
-
-Required properties:
-- compatible: "brcm,bcm93384wvg"
diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
new file mode 100644
index 000000000000..7bab90cc4a7b
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -0,0 +1,12 @@
+* Broadcom cable/DSL/settop platforms
+
+Required properties:
+
+- compatible: "brcm,bcm3384", "brcm,bcm33843"
+              "brcm,bcm3384-viper", "brcm,bcm33843-viper"
+              "brcm,bcm6328", "brcm,bcm6368",
+              "brcm,bcm7125", "brcm,bcm7346", "brcm,bcm7358", "brcm,bcm7360",
+              "brcm,bcm7362", "brcm,bcm7420", "brcm,bcm7425"
+
+The experimental -viper variants are for running Linux on the 3384's
+BMIPS4355 cable modem CPU instead of the BMIPS5000 application processor.
diff --git a/Documentation/devicetree/bindings/mips/img/pistachio.txt b/Documentation/devicetree/bindings/mips/img/pistachio.txt
new file mode 100644
index 000000000000..a736d889c2b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/img/pistachio.txt
@@ -0,0 +1,42 @@
+Imagination Pistachio SoC
+=========================
+
+Required properties:
+--------------------
+ - compatible: Must include "img,pistachio".
+
+CPU nodes:
+----------
+A "cpus" node is required.  Required properties:
+ - #address-cells: Must be 1.
+ - #size-cells: Must be 0.
+A CPU sub-node is also required for at least CPU 0.  Since the topology may
+be probed via CPS, it is not necessary to specify secondary CPUs.  Required
+propertis:
+ - device_type: Must be "cpu".
+ - compatible: Must be "mti,interaptiv".
+ - reg: CPU number.
+ - clocks: Must include the CPU clock.  See ../../clock/clock-bindings.txt for
+   details on clock bindings.
+Example:
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "mti,interaptiv";
+                        reg = <0>;
+                        clocks = <&clk_core CLK_MIPS>;
+                };
+        };
+
+
+Boot protocol:
+--------------
+In accordance with the MIPS UHI specification[1], the bootloader must pass the
+following arguments to the kernel:
+ - $a0: -2.
+ - $a1: KSEG0 address of the flattened device-tree blob.
+
+[1] http://prplfoundation.org/wiki/MIPS_documentation
diff --git a/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt b/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt
new file mode 100644
index 000000000000..d464986012cd
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt
@@ -0,0 +1,17 @@
+Conexant Digicolor Real Time Clock controller
+
+This binding currently supports the CX92755 SoC.
+
+Required properties:
+- compatible: should be "cnxt,cx92755-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: rtc alarm interrupt
+
+Example:
+
+        rtc@f0000c30 {
+                compatible = "cnxt,cx92755-rtc";
+                reg = <0xf0000c30 0x18>;
+                interrupts = <25>;
+        };
diff --git a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
index b800070fe6e9..fa6a94226669 100644
--- a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
@@ -7,6 +7,11 @@ Required properties:
   region.
 - interrupts: rtc alarm interrupt
 
+Optional properties:
+- stmp,crystal-freq: override crystal frequency as determined from fuse bits.
+  Only <32000> and <32768> are possible for the hardware.  Use <0> for
+  "no crystal".
+
 Example:
 
 rtc@80056000 {
diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt
index 77685185cf3b..e49e423268c0 100644
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
@@ -15,6 +15,7 @@ Table of Contents
     1) Entry point for arch/arm
     2) Entry point for arch/powerpc
     3) Entry point for arch/x86
+    4) Entry point for arch/mips/bmips
 
   II - The DT block format
     1) Header
@@ -288,6 +289,33 @@ it with special cases.
   or initrd address. It simply holds information which can not be retrieved
   otherwise like interrupt routing or a list of devices behind an I2C bus.
 
+4) Entry point for arch/mips/bmips
+----------------------------------
+
+  Some bootloaders only support a single entry point, at the start of the
+  kernel image.  Other bootloaders will jump to the ELF start address.
+  Both schemes are supported; CONFIG_BOOT_RAW=y and CONFIG_NO_EXCEPT_FILL=y,
+  so the first instruction immediately jumps to kernel_entry().
+
+  Similar to the arch/arm case (b), a DT-aware bootloader is expected to
+  set up the following registers:
+
+         a0 : 0
+
+         a1 : 0xffffffff
+
+         a2 : Physical pointer to the device tree block (defined in chapter
+         II) in RAM.  The device tree can be located anywhere in the first
+         512MB of the physical address space (0x00000000 - 0x1fffffff),
+         aligned on a 64 bit boundary.
+
+  Legacy bootloaders do not use this convention, and they do not pass in a
+  DT block.  In this case, Linux will look for a builtin DTB, selected via
+  CONFIG_DT_*.
+
+  This convention is defined for 32-bit systems only, as there are not
+  currently any 64-bit BMIPS implementations.
+
 II - The DT block format
 ========================
 
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 7c3f187d48bf..0a926e2ba3ab 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -196,7 +196,7 @@ prototypes:
         void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, int);
         void (*freepage)(struct page *);
-        int (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);
+        int (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);
         int (*migratepage)(struct address_space *, struct page *, struct page *);
         int (*launder_page)(struct page *);
         int (*is_partially_uptodate)(struct page *, unsigned long, unsigned long);
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index a07ba61662ed..8e36c7e3c345 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -200,12 +200,12 @@ contains details information about the process itself.  Its fields are
 explained in Table 1-4.
 
 (for SMP CONFIG users)
-For making accounting scalable, RSS related information are handled in
-asynchronous manner and the vaule may not be very precise. To see a precise
+For making accounting scalable, RSS related information are handled in an
+asynchronous manner and the value may not be very precise. To see a precise
 snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
 It's slow but very precise.
 
-Table 1-2: Contents of the status files (as of 2.6.30-rc7)
+Table 1-2: Contents of the status files (as of 3.20.0)
 ..............................................................................
  Field                       Content
  Name                        filename of the executable
@@ -213,6 +213,7 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
                              in an uninterruptible wait, Z is zombie,
                              T is traced or stopped)
  Tgid                        thread group ID
+ Ngid                        NUMA group ID (0 if none)
  Pid                         process id
  PPid                        process id of the parent process
  TracerPid                   PID of process tracing this process (0 if not)
@@ -220,6 +221,10 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
  Gid                         Real, effective, saved set, and  file system GIDs
  FDSize                      number of file descriptor slots currently allocated
  Groups                      supplementary group list
+ NStgid                      descendant namespace thread group ID hierarchy
+ NSpid                       descendant namespace process ID hierarchy
+ NSpgid                      descendant namespace process group ID hierarchy
+ NSsid                       descendant namespace session ID hierarchy
  VmPeak                      peak virtual memory size
  VmSize                      total program size
  VmLck                       locked memory size
@@ -1704,6 +1709,10 @@ A typical output is
         flags:  0100002
         mnt_id: 19
 
+All locks associated with a file descriptor are shown in its fdinfo too.
+
+lock:       1: FLOCK  ADVISORY  WRITE 359 00:13:11691 0 EOF
+
 The files such as eventfd, fsnotify, signalfd, epoll among the regular pos/flags
 pair provide additional information particular to the objects they represent.
 
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 207cdca68bed..5d833b32bbcd 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -590,7 +590,7 @@ struct address_space_operations {
         void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, int);
         void (*freepage)(struct page *);
-        ssize_t (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);
+        ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);
         /* migrate the contents of a page to the specified target */
         int (*migratepage) (struct page *, struct page *);
         int (*launder_page) (struct page *);
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 491bbd104b06..11a76df2e1f1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2317,7 +2317,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         noexec32=off: disable non-executable mappings
                                 read implies executable mappings
 
-        nofpu           [SH] Disable hardware FPU at boot time.
+        nofpu           [MIPS,SH] Disable hardware FPU at boot time.
 
         nofxsr          [BUGS=X86-32] Disables x86 floating point extended
                         register save and restore. The kernel will only save
diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c
index 94f574b0fdb2..135b3f592b83 100644
--- a/Documentation/spi/spidev_test.c
+++ b/Documentation/spi/spidev_test.c
@@ -80,7 +80,7 @@ static void hex_dump(const void *src, size_t length, size_t line_size, char *pre
  *  Unescape - process hexadecimal escape character
  *      converts shell input "\x23" -> 0x23
  */
-int unespcape(char *_dst, char *_src, size_t len)
+static int unescape(char *_dst, char *_src, size_t len)
 {
         int ret = 0;
         char *src = _src;
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
                 size = strlen(input_tx+1);
                 tx = malloc(size);
                 rx = malloc(size);
-                size = unespcape((char *)tx, input_tx, size);
+                size = unescape((char *)tx, input_tx, size);
                 transfer(fd, tx, rx, size);
                 free(rx);
                 free(tx);
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 99d7eb3a1416..c831001c45f1 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -872,6 +872,27 @@ can be ORed together:
 
 ==============================================================
 
+threads-max
+
+This value controls the maximum number of threads that can be created
+using fork().
+
+During initialization the kernel sets this value such that even if the
+maximum number of threads is created, the thread structures occupy only
+a part (1/8th) of the available RAM pages.
+
+The minimum value that can be written to threads-max is 20.
+The maximum value that can be written to threads-max is given by the
+constant FUTEX_TID_MASK (0x3fffffff).
+If a value outside of this range is written to threads-max an error
+EINVAL occurs.
+
+The value written is checked against the available RAM pages. If the
+thread structures would occupy too much (more than 1/8th) of the
+available RAM pages threads-max is reduced accordingly.
+
+==============================================================
+
 unknown_nmi_panic:
 
 The value in this file affects behavior of handling NMI. When the
diff --git a/MAINTAINERS b/MAINTAINERS
index 56a432d51119..f7bbaece5649 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1215,6 +1215,7 @@ F:	arch/arm/mach-orion5x/ts78xx-*
 ARM/Mediatek SoC support
 M:      Matthias Brugger <matthias.bgg@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/boot/dts/mt6*
 F:      arch/arm/boot/dts/mt8*
@@ -8107,7 +8108,7 @@ S:	Maintained
 F:      drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
-M:      Nick Piggin <npiggin@kernel.dk>
+M:      Jens Axboe <axboe@kernel.dk>
 S:      Maintained
 F:      Documentation/blockdev/ramdisk.txt
 F:      drivers/block/brd.c
@@ -8183,6 +8184,7 @@ X:	kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:      Alessandro Zummo <a.zummo@towertech.it>
+M:      Alexandre Belloni <alexandre.belloni@free-electrons.com>
 L:      rtc-linux@googlegroups.com
 Q:      http://patchwork.ozlabs.org/project/rtc-linux/list/
 S:      Maintained
@@ -8653,11 +8655,9 @@ F:	drivers/scsi/sg.c
 F:      include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:      "James E.J. Bottomley" <JBottomley@parallels.com>
+M:      "James E.J. Bottomley" <JBottomley@odin.com>
 L:      linux-scsi@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 S:      Maintained
 F:      drivers/scsi/
 F:      include/scsi/
diff --git a/arch/alpha/include/asm/processor.h b/arch/alpha/include/asm/processor.h
index b4cf03690394..43a7559c448b 100644
--- a/arch/alpha/include/asm/processor.h
+++ b/arch/alpha/include/asm/processor.h
@@ -44,6 +44,7 @@ struct task_struct;
 extern unsigned long thread_saved_pc(struct task_struct *);
 
 /* Do necessary setup to start up a newly executed thread.  */
+struct pt_regs;
 extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
 
 /* Free all resources held by a thread. */
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 1badf9b84b51..e00a01879025 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -52,7 +52,7 @@ static void show_callee_regs(struct callee_regs *cregs)
         print_reg_file(&(cregs->r13), 13);
 }
 
-void print_task_path_n_nm(struct task_struct *tsk, char *buf)
+static void print_task_path_n_nm(struct task_struct *tsk, char *buf)
 {
         struct path path;
         char *path_nm = NULL;
@@ -77,7 +77,6 @@ void print_task_path_n_nm(struct task_struct *tsk, char *buf)
 done:
         pr_info("Path: %s\n", path_nm);
 }
-EXPORT_SYMBOL(print_task_path_n_nm);
 
 static void show_faulting_vma(unsigned long address, char *buf)
 {
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index eb0f43f3e3f1..3c4596d0ce6c 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -21,6 +21,7 @@ generic-y += preempt.h
 generic-y += resource.h
 generic-y += rwsem.h
 generic-y += scatterlist.h
+generic-y += seccomp.h
 generic-y += sections.h
 generic-y += segment.h
 generic-y += sembuf.h
diff --git a/arch/arm/include/asm/seccomp.h b/arch/arm/include/asm/seccomp.h
deleted file mode 100644
index 52b156b341f5..000000000000
--- a/arch/arm/include/asm/seccomp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_ARM_SECCOMP_H
-#define _ASM_ARM_SECCOMP_H
-
-#include <linux/unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#endif /* _ASM_ARM_SECCOMP_H */
diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile
index e72eb3417239..6b0be670ddfa 100644
--- a/arch/c6x/Makefile
+++ b/arch/c6x/Makefile
@@ -8,7 +8,7 @@
 
 KBUILD_DEFCONFIG := dsk6455_defconfig
 
-cflags-y += -mno-dsbt -msdata=none
+cflags-y += -mno-dsbt -msdata=none -D__linux__
 
 cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls
 
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 2de73391b81e..ae0a51f5376c 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -41,6 +41,7 @@ generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += segment.h
 generic-y += sembuf.h
+generic-y += serial.h
 generic-y += shmbuf.h
 generic-y += shmparam.h
 generic-y += siginfo.h
diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h
index 88bd0d899bdb..bbd7774e4d4e 100644
--- a/arch/c6x/include/asm/dma-mapping.h
+++ b/arch/c6x/include/asm/dma-mapping.h
@@ -17,6 +17,14 @@
 
 #define dma_supported(d, m)     1
 
+static inline void dma_sync_single_range_for_device(struct device *dev,
+                                                    dma_addr_t addr,
+                                                    unsigned long offset,
+                                                    size_t size,
+                                                    enum dma_data_direction dir)
+{
+}
+
 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
 {
         if (!dev->dma_mask || !dma_supported(dev, dma_mask))
diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
new file mode 100644
index 000000000000..a1858bd5f6c8
--- /dev/null
+++ b/arch/c6x/include/asm/flat.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_C6X_FLAT_H
+#define __ASM_C6X_FLAT_H
+
+#define flat_argvp_envp_on_stack()                      0
+#define flat_old_ram_flag(flags)                        (flags)
+#define flat_reloc_valid(reloc, size)                   ((reloc) <= (size))
+#define flat_get_addr_from_rp(rp, relval, flags, p)     get_unaligned(rp)
+#define flat_put_addr_at_rp(rp, val, relval)            put_unaligned(val, rp)
+#define flat_get_relocate_addr(rel)                     (rel)
+#define flat_set_persistent(relval, p)                  0
+
+#endif /* __ASM_C6X_FLAT_H */
diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h
index 696804475f55..852afb209afb 100644
--- a/arch/c6x/include/asm/setup.h
+++ b/arch/c6x/include/asm/setup.h
@@ -12,6 +12,7 @@
 #define _ASM_C6X_SETUP_H
 
 #include <uapi/asm/setup.h>
+#include <linux/types.h>
 
 #ifndef __ASSEMBLY__
 extern int c6x_add_memory(phys_addr_t start, unsigned long size);
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 757128868d43..72e17f7ebd6f 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -26,7 +26,8 @@
 #include <linux/cpu.h>
 #include <linux/fs.h>
 #include <linux/of.h>
-
+#include <linux/console.h>
+#include <linux/screen_info.h>
 
 #include <asm/sections.h>
 #include <asm/div64.h>
@@ -38,6 +39,8 @@
 
 static const char *c6x_soc_name;
 
+struct screen_info screen_info;
+
 int c6x_num_cores;
 EXPORT_SYMBOL_GPL(c6x_num_cores);
 
@@ -60,6 +63,7 @@ unsigned char c6x_fuse_mac[6];
 
 unsigned long memory_start;
 unsigned long memory_end;
+EXPORT_SYMBOL(memory_end);
 
 unsigned long ram_start;
 unsigned long ram_end;
@@ -265,8 +269,8 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
  */
 notrace void __init machine_init(unsigned long dt_ptr)
 {
-        const void *dtb = __va(dt_ptr);
-        const void *fdt = _fdt_start;
+        void *dtb = __va(dt_ptr);
+        void *fdt = _fdt_start;
 
         /* interrupts must be masked */
         set_creg(IER, 2);
diff --git a/arch/c6x/kernel/time.c b/arch/c6x/kernel/time.c
index 356ee84cad95..04845aaf5985 100644
--- a/arch/c6x/kernel/time.c
+++ b/arch/c6x/kernel/time.c
@@ -49,7 +49,7 @@ u64 sched_clock(void)
         return (tsc * sched_clock_multiplier) >> SCHED_CLOCK_SHIFT;
 }
 
-void time_init(void)
+void __init time_init(void)
 {
         u64 tmp = (u64)NSEC_PER_SEC << SCHED_CLOCK_SHIFT;
 
diff --git a/arch/c6x/platforms/cache.c b/arch/c6x/platforms/cache.c
index 86318a16a252..46fd2d530271 100644
--- a/arch/c6x/platforms/cache.c
+++ b/arch/c6x/platforms/cache.c
@@ -350,6 +350,7 @@ void L1P_cache_block_invalidate(unsigned int start, unsigned int end)
                               (unsigned int *) end,
                               IMCR_L1PIBAR, IMCR_L1PIWC);
 }
+EXPORT_SYMBOL(L1P_cache_block_invalidate);
 
 void L1D_cache_block_invalidate(unsigned int start, unsigned int end)
 {
@@ -371,6 +372,7 @@ void L1D_cache_block_writeback(unsigned int start, unsigned int end)
                               (unsigned int *) end,
                               IMCR_L1DWBAR, IMCR_L1DWWC);
 }
+EXPORT_SYMBOL(L1D_cache_block_writeback);
 
 /*
  *  L2 block operations
diff --git a/arch/microblaze/include/asm/seccomp.h b/arch/microblaze/include/asm/seccomp.h
index 0d912758a0d7..204618a2ce84 100644
--- a/arch/microblaze/include/asm/seccomp.h
+++ b/arch/microblaze/include/asm/seccomp.h
@@ -3,14 +3,8 @@
 
 #include <linux/unistd.h>
 
-#define __NR_seccomp_read               __NR_read
-#define __NR_seccomp_write              __NR_write
-#define __NR_seccomp_exit               __NR_exit
 #define __NR_seccomp_sigreturn          __NR_sigreturn
 
-#define __NR_seccomp_read_32            __NR_read
-#define __NR_seccomp_write_32           __NR_write
-#define __NR_seccomp_exit_32            __NR_exit
-#define __NR_seccomp_sigreturn_32       __NR_sigreturn
+#include <asm-generic/seccomp.h>
 
 #endif  /* _ASM_MICROBLAZE_SECCOMP_H */
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index e5fc463b36d0..39cf40da5f14 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -4,9 +4,9 @@ platforms += alchemy
 platforms += ar7
 platforms += ath25
 platforms += ath79
-platforms += bcm3384
 platforms += bcm47xx
 platforms += bcm63xx
+platforms += bmips
 platforms += cavium-octeon
 platforms += cobalt
 platforms += dec
@@ -21,6 +21,7 @@ platforms += mti-malta
 platforms += mti-sead3
 platforms += netlogic
 platforms += paravirt
+platforms += pistachio
 platforms += pmcs-msp71xx
 platforms += pnx833x
 platforms += ralink
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a326c4cb8cf0..2198837c256f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -43,6 +43,7 @@ config MIPS
         select GENERIC_SMP_IDLE_THREAD
         select BUILDTIME_EXTABLE_SORT
         select GENERIC_CLOCKEVENTS
+        select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
         select GENERIC_CMOS_UPDATE
         select HAVE_MOD_ARCH_SPECIFIC
         select VIRT_TO_BUS
@@ -55,6 +56,8 @@ config MIPS
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_BINFMT_ELF_STATE
         select SYSCTL_EXCEPTION_TRACE
+        select HAVE_VIRT_CPU_ACCOUNTING_GEN
+        select HAVE_IRQ_TIME_ACCOUNTING
 
 menu "Machine selection"
 
@@ -131,8 +134,8 @@ config ATH79
         help
           Support for the Atheros AR71XX/AR724X/AR913X SoCs.
 
-config BCM3384
-        bool "Broadcom BCM3384 based boards"
+config BMIPS_GENERIC
+        bool "Broadcom Generic BMIPS kernel"
         select BOOT_RAW
         select NO_EXCEPT_FILL
         select USE_OF
@@ -140,22 +143,30 @@ config BCM3384
         select CSRC_R4K
         select SYNC_R4K
         select COMMON_CLK
-        select DMA_NONCOHERENT
+        select BCM7038_L1_IRQ
+        select BCM7120_L2_IRQ
+        select BRCMSTB_L2_IRQ
         select IRQ_CPU
+        select RAW_IRQ_ACCESSORS
+        select DMA_NONCOHERENT
         select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_HIGHMEM
+        select SYS_HAS_CPU_BMIPS32_3300
+        select SYS_HAS_CPU_BMIPS4350
+        select SYS_HAS_CPU_BMIPS4380
         select SYS_HAS_CPU_BMIPS5000
         select SWAP_IO_SPACE
-        select USB_EHCI_BIG_ENDIAN_DESC
-        select USB_EHCI_BIG_ENDIAN_MMIO
-        select USB_OHCI_BIG_ENDIAN_DESC
-        select USB_OHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+        select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+        select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+        select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
         help
-          Support for BCM3384 based boards.  BCM3384/BCM33843 is a cable modem
-          chipset with a Linux application processor that is often used to
-          provide Samba services, a CUPS print server, and/or advanced routing
-          features.
+          Build a generic DT-based kernel image that boots on select
+          BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
+          box chips.  Note that CONFIG_CPU_BIG_ENDIAN/CONFIG_CPU_LITTLE_ENDIAN
+          must be set appropriately for your board.
 
 config BCM47XX
         bool "Broadcom BCM47XX based boards"
@@ -352,6 +363,33 @@ config MACH_LOONGSON1
           the ICT (Institute of Computing Technology) and the Chinese Academy
           of Sciences.
 
+config MACH_PISTACHIO
+        bool "IMG Pistachio SoC based boards"
+        select ARCH_REQUIRE_GPIOLIB
+        select BOOT_ELF32
+        select BOOT_RAW
+        select CEVT_R4K
+        select CLKSRC_MIPS_GIC
+        select COMMON_CLK
+        select CSRC_R4K
+        select DMA_MAYBE_COHERENT
+        select IRQ_CPU
+        select LIBFDT
+        select MFD_SYSCON
+        select MIPS_CPU_SCACHE
+        select MIPS_GIC
+        select PINCTRL
+        select REGULATOR
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_MIPS_CPS
+        select SYS_SUPPORTS_MULTITHREADING
+        select SYS_SUPPORTS_ZBOOT
+        select USE_OF
+        help
+          This enables support for the IMG Pistachio SoC platform.
+
 config MIPS_MALTA
         bool "MIPS Malta board"
         select ARCH_MAY_HAVE_PC_FDC
@@ -377,6 +415,7 @@ config MIPS_MALTA
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_MIPS32_R2
         select SYS_HAS_CPU_MIPS32_R3_5
+        select SYS_HAS_CPU_MIPS32_R5
         select SYS_HAS_CPU_MIPS32_R6
         select SYS_HAS_CPU_MIPS64_R1
         select SYS_HAS_CPU_MIPS64_R2
@@ -386,6 +425,7 @@ config MIPS_MALTA
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_MICROMIPS
         select SYS_SUPPORTS_MIPS_CMP
@@ -779,7 +819,8 @@ config CAVIUM_OCTEON_SOC
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select EDAC_SUPPORT
-        select SYS_SUPPORTS_HOTPLUG_CPU
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_HOTPLUG_CPU if CPU_BIG_ENDIAN
         select SYS_HAS_EARLY_PRINTK
         select SYS_HAS_CPU_CAVIUM_OCTEON
         select SWAP_IO_SPACE
@@ -793,6 +834,7 @@ config CAVIUM_OCTEON_SOC
         select SYS_SUPPORTS_SMP
         select NR_CPUS_DEFAULT_16
         select BUILTIN_DTB
+        select MTD_COMPLEX_MAPPINGS
         help
           This option supports all of the Octeon reference boards from Cavium
           Networks. It builds a kernel that dynamically determines the Octeon
@@ -887,6 +929,7 @@ source "arch/mips/ath25/Kconfig"
 source "arch/mips/ath79/Kconfig"
 source "arch/mips/bcm47xx/Kconfig"
 source "arch/mips/bcm63xx/Kconfig"
+source "arch/mips/bmips/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/jz4740/Kconfig"
 source "arch/mips/lantiq/Kconfig"
@@ -1202,10 +1245,10 @@ config MIPS_L1_CACHE_SHIFT_7
 
 config MIPS_L1_CACHE_SHIFT
         int
-        default "4" if MIPS_L1_CACHE_SHIFT_4
-        default "5" if MIPS_L1_CACHE_SHIFT_5
-        default "6" if MIPS_L1_CACHE_SHIFT_6
         default "7" if MIPS_L1_CACHE_SHIFT_7
+        default "6" if MIPS_L1_CACHE_SHIFT_6
+        default "5" if MIPS_L1_CACHE_SHIFT_5
+        default "4" if MIPS_L1_CACHE_SHIFT_4
         default "5"
 
 config HAVE_STD_PC_SERIAL_PORT
@@ -1572,6 +1615,7 @@ config CPU_XLP
         select WEAK_REORDERING_BEYOND_LLSC
         select CPU_HAS_PREFETCH
         select CPU_MIPSR2
+        select CPU_SUPPORTS_HUGEPAGES
         help
           Netlogic Microsystems XLP processors.
 endchoice
@@ -1596,6 +1640,33 @@ config CPU_MIPS32_3_5_EVA
           One of its primary benefits is an increase in the maximum size
           of lowmem (up to 3GB). If unsure, say 'N' here.
 
+config CPU_MIPS32_R5_FEATURES
+        bool "MIPS32 Release 5 Features"
+        depends on SYS_HAS_CPU_MIPS32_R5
+        depends on CPU_MIPS32_R2
+        help
+          Choose this option to build a kernel for release 2 or later of the
+          MIPS32 architecture including features from release 5 such as
+          support for Extended Physical Addressing (XPA).
+
+config CPU_MIPS32_R5_XPA
+        bool "Extended Physical Addressing (XPA)"
+        depends on CPU_MIPS32_R5_FEATURES
+        depends on !EVA
+        depends on !PAGE_SIZE_4KB
+        depends on SYS_SUPPORTS_HIGHMEM
+        select XPA
+        select HIGHMEM
+        select ARCH_PHYS_ADDR_T_64BIT
+        default n
+        help
+          Choose this option if you want to enable the Extended Physical
+          Addressing (XPA) on your MIPS32 core (such as P5600 series). The
+          benefit is to increase physical addressing equal to or greater
+          than 40 bits. Note that this has the side effect of turning on
+          64-bit addressing which in turn makes the PTEs 64-bit in size.
+          If unsure, say 'N' here.
+
 if CPU_LOONGSON2F
 config CPU_NOP_WORKAROUNDS
         bool
@@ -1699,6 +1770,9 @@ config SYS_HAS_CPU_MIPS32_R2
 config SYS_HAS_CPU_MIPS32_R3_5
         bool
 
+config SYS_HAS_CPU_MIPS32_R5
+        bool
+
 config SYS_HAS_CPU_MIPS32_R6
         bool
 
@@ -1836,6 +1910,9 @@ config CPU_MIPSR6
 config EVA
         bool
 
+config XPA
+        bool
+
 config SYS_SUPPORTS_32BIT_KERNEL
         bool
 config SYS_SUPPORTS_64BIT_KERNEL
@@ -2072,7 +2149,7 @@ config MIPSR2_TO_R6_EMULATOR
         help
           Choose this option if you want to run non-R6 MIPS userland code.
           Even if you say 'Y' here, the emulator will still be disabled by
-          default. You can enable it using the 'mipsr2emul' kernel option.
+          default. You can enable it using the 'mipsr2emu' kernel option.
           The only reason this is a build-time option is to save ~14K from the
           final kernel image.
 comment "MIPS R2-to-R6 emulator is only available for UP kernels"
@@ -2142,7 +2219,7 @@ config MIPS_CMP
 
 config MIPS_CPS
         bool "MIPS Coherent Processing System support"
-        depends on SYS_SUPPORTS_MIPS_CPS
+        depends on SYS_SUPPORTS_MIPS_CPS && !64BIT
         select MIPS_CM
         select MIPS_CPC
         select MIPS_CPS_PM if HOTPLUG_CPU
@@ -2348,7 +2425,7 @@ config NODES_SHIFT
 
 config HW_PERF_EVENTS
         bool "Enable hardware performance counter support for perf events"
-        depends on PERF_EVENTS && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP)
+        depends on PERF_EVENTS && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP || CPU_LOONGSON3)
         default y
         help
           Enable hardware performance counter support for perf events. If
@@ -2500,6 +2577,9 @@ config HZ
         default 1000 if HZ_1000
         default 1024 if HZ_1024
 
+config SCHED_HRTICK
+        def_bool HIGH_RES_TIMERS
+
 source "kernel/Kconfig.preempt"
 
 config KEXEC
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d152dfbc360d..5200f649dd4e 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -197,11 +197,17 @@ endif
 # Warning: the 64-bit MIPS architecture does not support the `smartmips' extension
 # Pass -Wa,--no-warn to disable all assembler warnings until the kernel code has
 # been fixed properly.
-mips-cflags                             := "$(cflags-y)"
-cflags-$(CONFIG_CPU_HAS_SMARTMIPS)      += $(call cc-option,$(mips-cflags),-msmartmips) -Wa,--no-warn
-cflags-$(CONFIG_CPU_MICROMIPS)          += $(call cc-option,$(mips-cflags),-mmicromips)
+mips-cflags                             := $(cflags-y)
+ifeq ($(CONFIG_CPU_HAS_SMARTMIPS),y)
+smartmips-ase                           := $(call cc-option-yn,$(mips-cflags) -msmartmips)
+cflags-$(smartmips-ase)                 += -msmartmips -Wa,--no-warn
+endif
+ifeq ($(CONFIG_CPU_MICROMIPS),y)
+micromips-ase                           := $(call cc-option-yn,$(mips-cflags) -mmicromips)
+cflags-$(micromips-ase)                 += -mmicromips
+endif
 ifeq ($(CONFIG_CPU_HAS_MSA),y)
-toolchain-msa                           := $(call cc-option-yn,-$(mips-cflags),mhard-float -mfp64 -Wa$(comma)-mmsa)
+toolchain-msa                           := $(call cc-option-yn,$(mips-cflags) -mhard-float -mfp64 -Wa$(comma)-mmsa)
 cflags-$(toolchain-msa)                 += -DTOOLCHAIN_SUPPORTS_MSA
 endif
 
@@ -365,7 +371,11 @@ core-$(CONFIG_BUILTIN_DTB) += arch/mips/boot/dts/
 
 PHONY += dtbs
 dtbs: scripts
-        $(Q)$(MAKE) $(build)=arch/mips/boot/dts dtbs
+        $(Q)$(MAKE) $(build)=arch/mips/boot/dts
+
+PHONY += dtbs_install
+dtbs_install:
+        $(Q)$(MAKE) $(dtbinst)=arch/mips/boot/dts
 
 archprepare:
 ifdef CONFIG_MIPS32_N32
@@ -407,6 +417,7 @@ define archhelp
         echo '  uImage.lzma          - U-Boot image (lzma)'
         echo '  uImage.lzo           - U-Boot image (lzo)'
         echo '  dtbs                 - Device-tree blobs for enabled boards'
+        echo '  dtbs_install         - Install dtbs to $(INSTALL_DTBS_PATH)'
         echo
         echo '  These will be default as appropriate for a configured platform.'
 endef
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index af2441dbfc12..be9ff1673ded 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -307,10 +307,7 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
         }
 
         if (mac) {
-                if (sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-                                        &dev_addr[0], &dev_addr[1],
-                                        &dev_addr[2], &dev_addr[3],
-                                        &dev_addr[4], &dev_addr[5]) != 6) {
+                if (!mac_pton(mac, dev_addr)) {
                         pr_warn("cannot parse mac address, using random address\n");
                         eth_random_addr(dev_addr);
                 }
diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
index a3120714f0b7..c39de61f9b36 100644
--- a/arch/mips/ath79/common.h
+++ b/arch/mips/ath79/common.h
@@ -17,7 +17,7 @@
 #include <linux/types.h>
 
 #define ATH79_MEM_SIZE_MIN      (2 * 1024 * 1024)
-#define ATH79_MEM_SIZE_MAX      (128 * 1024 * 1024)
+#define ATH79_MEM_SIZE_MAX      (256 * 1024 * 1024)
 
 void ath79_clocks_init(void);
 unsigned long ath79_get_sys_clk_rate(const char *id);
diff --git a/arch/mips/bcm3384/Platform b/arch/mips/bcm3384/Platform
deleted file mode 100644
index 8e1ca0819e1b..000000000000
--- a/arch/mips/bcm3384/Platform
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Broadcom BCM3384 boards
-#
-platform-$(CONFIG_BCM3384)      += bcm3384/
-cflags-$(CONFIG_BCM3384)        +=                                      \
-                -I$(srctree)/arch/mips/include/asm/mach-bcm3384/
-load-$(CONFIG_BCM3384)          := 0xffffffff80010000
diff --git a/arch/mips/bcm3384/dma.c b/arch/mips/bcm3384/dma.c
deleted file mode 100644
index ea42012fd4f5..000000000000
--- a/arch/mips/bcm3384/dma.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2014 Kevin Cernekee <cernekee@gmail.com>
- */
-
-#include <linux/device.h>
-#include <linux/dma-direction.h>
-#include <linux/dma-mapping.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/of.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-#include <dma-coherence.h>
-
-/*
- * BCM3384 has configurable address translation windows which allow the
- * peripherals' DMA addresses to be different from the Zephyr-visible
- * physical addresses.  e.g. usb_dma_addr = zephyr_pa ^ 0x08000000
- *
- * If our DT "memory" node has a "dma-xor-mask" property we will enable this
- * translation using the provided offset.
- */
-static u32 bcm3384_dma_xor_mask;
-static u32 bcm3384_dma_xor_limit = 0xffffffff;
-
-/*
- * PCI collapses the memory hole at 0x10000000 - 0x1fffffff.
- * On systems with a dma-xor-mask, this range is guaranteed to live above
- * the dma-xor-limit.
- */
-#define BCM3384_MEM_HOLE_PA     0x10000000
-#define BCM3384_MEM_HOLE_SIZE   0x10000000
-
-static dma_addr_t bcm3384_phys_to_dma(struct device *dev, phys_addr_t pa)
-{
-        if (dev && dev_is_pci(dev) &&
-            pa >= (BCM3384_MEM_HOLE_PA + BCM3384_MEM_HOLE_SIZE))
-                return pa - BCM3384_MEM_HOLE_SIZE;
-        if (pa <= bcm3384_dma_xor_limit)
-                return pa ^ bcm3384_dma_xor_mask;
-        return pa;
-}
-
-dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)
-{
-        return bcm3384_phys_to_dma(dev, virt_to_phys(addr));
-}
-
-dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
-{
-        return bcm3384_phys_to_dma(dev, page_to_phys(page));
-}
-
-unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr)
-{
-        if (dev && dev_is_pci(dev) &&
-            dma_addr >= BCM3384_MEM_HOLE_PA)
-                return dma_addr + BCM3384_MEM_HOLE_SIZE;
-        if ((dma_addr ^ bcm3384_dma_xor_mask) <= bcm3384_dma_xor_limit)
-                return dma_addr ^ bcm3384_dma_xor_mask;
-        return dma_addr;
-}
-
-static int __init bcm3384_init_dma_xor(void)
-{
-        struct device_node *np = of_find_node_by_type(NULL, "memory");
-
-        if (!np)
-                return 0;
-
-        of_property_read_u32(np, "dma-xor-mask", &bcm3384_dma_xor_mask);
-        of_property_read_u32(np, "dma-xor-limit", &bcm3384_dma_xor_limit);
-
-        of_node_put(np);
-        return 0;
-}
-arch_initcall(bcm3384_init_dma_xor);
diff --git a/arch/mips/bcm3384/irq.c b/arch/mips/bcm3384/irq.c
deleted file mode 100644
index fd94fe849af6..000000000000
--- a/arch/mips/bcm3384/irq.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.
- *
- * Partially based on arch/mips/ralink/irq.c
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- * Copyright (C) 2014 Kevin Cernekee <cernekee@gmail.com>
- */
-
-#include <linux/io.h>
-#include <linux/bitops.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/irqdomain.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-
-#include <asm/bmips.h>
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-
-/* INTC register offsets */
-#define INTC_REG_ENABLE         0x00
-#define INTC_REG_STATUS         0x04
-
-#define MAX_WORDS               2
-#define IRQS_PER_WORD           32
-
-struct bcm3384_intc {
-        int                     n_words;
-        void __iomem            *reg[MAX_WORDS];
-        u32                     enable[MAX_WORDS];
-        spinlock_t              lock;
-};
-
-static void bcm3384_intc_irq_unmask(struct irq_data *d)
-{
-        struct bcm3384_intc *priv = d->domain->host_data;
-        unsigned long flags;
-        int idx = d->hwirq / IRQS_PER_WORD;
-        int bit = d->hwirq % IRQS_PER_WORD;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        priv->enable[idx] |= BIT(bit);
-        __raw_writel(priv->enable[idx], priv->reg[idx] + INTC_REG_ENABLE);
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-static void bcm3384_intc_irq_mask(struct irq_data *d)
-{
-        struct bcm3384_intc *priv = d->domain->host_data;
-        unsigned long flags;
-        int idx = d->hwirq / IRQS_PER_WORD;
-        int bit = d->hwirq % IRQS_PER_WORD;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        priv->enable[idx] &= ~BIT(bit);
-        __raw_writel(priv->enable[idx], priv->reg[idx] + INTC_REG_ENABLE);
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-static struct irq_chip bcm3384_intc_irq_chip = {
-        .name           = "INTC",
-        .irq_unmask     = bcm3384_intc_irq_unmask,
-        .irq_mask       = bcm3384_intc_irq_mask,
-        .irq_mask_ack   = bcm3384_intc_irq_mask,
-};
-
-unsigned int get_c0_compare_int(void)
-{
-        return CP0_LEGACY_COMPARE_IRQ;
-}
-
-static void bcm3384_intc_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        struct irq_domain *domain = irq_get_handler_data(irq);
-        struct bcm3384_intc *priv = domain->host_data;
-        unsigned long flags;
-        unsigned int idx;
-
-        for (idx = 0; idx < priv->n_words; idx++) {
-                unsigned long pending;
-                int hwirq;
-
-                spin_lock_irqsave(&priv->lock, flags);
-                pending = __raw_readl(priv->reg[idx] + INTC_REG_STATUS) &
-                          priv->enable[idx];
-                spin_unlock_irqrestore(&priv->lock, flags);
-
-                for_each_set_bit(hwirq, &pending, IRQS_PER_WORD) {
-                        generic_handle_irq(irq_find_mapping(domain,
-                                           hwirq + idx * IRQS_PER_WORD));
-                }
-        }
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned long pending =
-                (read_c0_status() & read_c0_cause() & ST0_IM) >> STATUSB_IP0;
-        int bit;
-
-        for_each_set_bit(bit, &pending, 8)
-                do_IRQ(MIPS_CPU_IRQ_BASE + bit);
-}
-
-static int intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
-{
-        irq_set_chip_and_handler(irq, &bcm3384_intc_irq_chip, handle_level_irq);
-        return 0;
-}
-
-static const struct irq_domain_ops irq_domain_ops = {
-        .xlate = irq_domain_xlate_onecell,
-        .map = intc_map,
-};
-
-static int __init ioremap_one_pair(struct bcm3384_intc *priv,
-                                   struct device_node *node,
-                                   int idx)
-{
-        struct resource res;
-
-        if (of_address_to_resource(node, idx, &res))
-                return 0;
-
-        if (request_mem_region(res.start, resource_size(&res),
-                               res.name) < 0)
-                pr_err("Failed to request INTC register region\n");
-
-        priv->reg[idx] = ioremap_nocache(res.start, resource_size(&res));
-        if (!priv->reg[idx])
-                panic("Failed to ioremap INTC register range");
-
-        /* start up with everything masked before we hook the parent IRQ */
-        __raw_writel(0, priv->reg[idx] + INTC_REG_ENABLE);
-        priv->enable[idx] = 0;
-
-        return IRQS_PER_WORD;
-}
-
-static int __init intc_of_init(struct device_node *node,
-                               struct device_node *parent)
-{
-        struct irq_domain *domain;
-        unsigned int parent_irq, n_irqs = 0;
-        struct bcm3384_intc *priv;
-
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
-                panic("Failed to allocate bcm3384_intc struct");
-
-        spin_lock_init(&priv->lock);
-
-        parent_irq = irq_of_parse_and_map(node, 0);
-        if (!parent_irq)
-                panic("Failed to get INTC IRQ");
-
-        n_irqs += ioremap_one_pair(priv, node, 0);
-        n_irqs += ioremap_one_pair(priv, node, 1);
-
-        if (!n_irqs)
-                panic("Failed to map INTC registers");
-
-        priv->n_words = n_irqs / IRQS_PER_WORD;
-        domain = irq_domain_add_linear(node, n_irqs, &irq_domain_ops, priv);
-        if (!domain)
-                panic("Failed to add irqdomain");
-
-        irq_set_chained_handler(parent_irq, bcm3384_intc_irq_handler);
-        irq_set_handler_data(parent_irq, domain);
-
-        return 0;
-}
-
-static struct of_device_id of_irq_ids[] __initdata = {
-        { .compatible = "mti,cpu-interrupt-controller",
-          .data = mips_cpu_irq_of_init },
-        { .compatible = "brcm,bcm3384-intc",
-          .data = intc_of_init },
-        {},
-};
-
-void __init arch_init_irq(void)
-{
-        bmips_tp1_irqs = 0;
-        of_irq_init(of_irq_ids);
-}
diff --git a/arch/mips/bcm3384/setup.c b/arch/mips/bcm3384/setup.c
deleted file mode 100644
index d84b8400b874..000000000000
--- a/arch/mips/bcm3384/setup.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
- * Copyright (C) 2014 Kevin Cernekee <cernekee@gmail.com>
- */
-
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/clk-provider.h>
-#include <linux/ioport.h>
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/of_platform.h>
-#include <linux/smp.h>
-#include <asm/addrspace.h>
-#include <asm/bmips.h>
-#include <asm/bootinfo.h>
-#include <asm/prom.h>
-#include <asm/smp-ops.h>
-#include <asm/time.h>
-
-void __init prom_init(void)
-{
-        register_bmips_smp_ops();
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-const char *get_system_type(void)
-{
-        return "BCM3384";
-}
-
-void __init plat_time_init(void)
-{
-        struct device_node *np;
-        u32 freq;
-
-        np = of_find_node_by_name(NULL, "cpus");
-        if (!np)
-                panic("missing 'cpus' DT node");
-        if (of_property_read_u32(np, "mips-hpt-frequency", &freq) < 0)
-                panic("missing 'mips-hpt-frequency' property");
-        of_node_put(np);
-
-        mips_hpt_frequency = freq;
-}
-
-void __init plat_mem_setup(void)
-{
-        void *dtb = __dtb_start;
-
-        set_io_port_base(0);
-        ioport_resource.start = 0;
-        ioport_resource.end = ~0;
-
-        /* intended to somewhat resemble ARM; see Documentation/arm/Booting */
-        if (fw_arg0 == 0 && fw_arg1 == 0xffffffff)
-                dtb = phys_to_virt(fw_arg2);
-
-        __dt_setup_arch(dtb);
-
-        strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-}
-
-void __init device_tree_init(void)
-{
-        struct device_node *np;
-
-        unflatten_and_copy_device_tree();
-
-        /* Disable SMP boot unless both CPUs are listed in DT and !disabled */
-        np = of_find_node_by_name(NULL, "cpus");
-        if (np && of_get_available_child_count(np) <= 1)
-                bmips_smp_enabled = 0;
-        of_node_put(np);
-}
-
-int __init plat_of_setup(void)
-{
-        return __dt_register_buses("brcm,bcm3384", "simple-bus");
-}
-
-arch_initcall(plat_of_setup);
-
-static int __init plat_dev_init(void)
-{
-        of_clk_init(NULL);
-        return 0;
-}
-
-device_initcall(plat_dev_init);
diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
index ea909a56a3ee..41796befa9df 100644
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -1,6 +1,10 @@
 #ifndef LINUX_BCM47XX_PRIVATE_H_
 #define LINUX_BCM47XX_PRIVATE_H_
 
+#ifndef pr_fmt
+#define pr_fmt(fmt)             "bcm47xx: " fmt
+#endif
+
 #include <linux/kernel.h>
 
 /* prom.c */
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index b3ae068ca4fa..bd56415f2f3b 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -1,8 +1,8 @@
 #include <linux/errno.h>
 #include <linux/export.h>
 #include <linux/string.h>
+#include <bcm47xx.h>
 #include <bcm47xx_board.h>
-#include <bcm47xx_nvram.h>
 
 struct bcm47xx_board_type {
         const enum bcm47xx_board board;
@@ -40,20 +40,6 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_model_name[] __initconst = {
         { {0}, NULL},
 };
 
-/* model_no */
-static const
-struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] __initconst = {
-        {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
-        { {0}, NULL},
-};
-
-/* machine_name */
-static const
-struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst = {
-        {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
-        { {0}, NULL},
-};
-
 /* hardware_version */
 static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
@@ -165,9 +151,11 @@ static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
         {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
+        {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
+        {{BCM47XX_BOARD_NETGEAR_WNDR3400_V3, "Netgear WNDR3400 V3"}, "U12H208T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR"},
         {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
@@ -202,6 +190,20 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_board_type_rev[] __initconst
         { {0}, NULL},
 };
 
+/*
+ * Some devices don't use any common NVRAM entry for identification and they
+ * have only one model specific variable.
+ * They don't deserve own arrays, let's group them there using key-value array.
+ */
+static const
+struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
+        {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
+        {{BCM47XX_BOARD_LINKSYS_WRT300N_V1, "Linksys WRT300N V1"}, "router_name", "WRT300N"},
+        {{BCM47XX_BOARD_LINKSYS_WRT600N_V11, "Linksys WRT600N V1.1"}, "Model_Name", "WRT600N"},
+        {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
+        { {0}, NULL},
+};
+
 static const
 struct bcm47xx_board_type bcm47xx_board_unknown[] __initconst = {
         {BCM47XX_BOARD_UNKNOWN, "Unknown Board"},
@@ -225,20 +227,6 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
                 }
         }
 
-        if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) {
-                for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) {
-                        if (strstarts(buf1, e1->value1))
-                                return &e1->board;
-                }
-        }
-
-        if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) {
-                for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) {
-                        if (strstarts(buf1, e1->value1))
-                                return &e1->board;
-                }
-        }
-
         if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
                 for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
                         if (strstarts(buf1, e1->value1))
@@ -247,8 +235,8 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
         }
 
         if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 &&
-            bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) {
-                for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
+            bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) {
+                for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) {
                         if (!strstarts(buf1, e2->value1) &&
                             !strcmp(buf2, e2->value2))
                                 return &e2->board;
@@ -314,6 +302,14 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
                                 return &e2->board;
                 }
         }
+
+        for (e2 = bcm47xx_board_list_key_value; e2->value1; e2++) {
+                if (bcm47xx_nvram_getenv(e2->value1, buf1, sizeof(buf1)) >= 0) {
+                        if (!strcmp(buf1, e2->value2))
+                                return &e2->board;
+                }
+        }
+
         return bcm47xx_board_unknown;
 }
 
@@ -330,9 +326,8 @@ void __init bcm47xx_board_detect(void)
         err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));
 
         /* init of nvram failed, probably too early now */
-        if (err == -ENXIO) {
+        if (err == -ENXIO)
                 return;
-        }
 
         board_detected = bcm47xx_board_get_nvram();
         bcm47xx_board.board = board_detected->board;
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 913182bcafb8..276276a8c6d7 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -252,6 +252,12 @@ bcm47xx_buttons_linksys_wrt160nv3[] __initconst = {
 };
 
 static const struct gpio_keys_button
+bcm47xx_buttons_linksys_wrt300n_v1[] __initconst = {
+        BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
+        BCM47XX_GPIO_KEY(6, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
 bcm47xx_buttons_linksys_wrt300nv11[] __initconst = {
         BCM47XX_GPIO_KEY(4, KEY_UNKNOWN),
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
@@ -327,6 +333,12 @@ bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
 };
 
 static const struct gpio_keys_button
+bcm47xx_buttons_netgear_wndr3400_v3[] __initconst = {
+        BCM47XX_GPIO_KEY(12, KEY_RESTART),
+        BCM47XX_GPIO_KEY(23, KEY_WPS_BUTTON),
+};
+
+static const struct gpio_keys_button
 bcm47xx_buttons_netgear_wndr3700v3[] __initconst = {
         BCM47XX_GPIO_KEY(2, KEY_RFKILL),
         BCM47XX_GPIO_KEY(3, KEY_RESTART),
@@ -516,6 +528,9 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT160NV3:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt160nv3);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300n_v1);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT300NV11:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300nv11);
                 break;
@@ -557,6 +572,9 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
                 break;
+        case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400_v3);
+                break;
         case BCM47XX_BOARD_NETGEAR_WNDR3700V3:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3700v3);
                 break;
diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
index 903a656d4119..0e4ade342333 100644
--- a/arch/mips/bcm47xx/leds.c
+++ b/arch/mips/bcm47xx/leds.c
@@ -292,6 +292,13 @@ bcm47xx_leds_linksys_wrt160nv3[] __initconst = {
 };
 
 static const struct gpio_led
+bcm47xx_leds_linksys_wrt300n_v1[] __initconst = {
+        BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(3, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(5, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+};
+
+static const struct gpio_led
 bcm47xx_leds_linksys_wrt300nv11[] __initconst = {
         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(3, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
@@ -585,6 +592,9 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT160NV3:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt160nv3);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
+                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300n_v1);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT300NV11:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300nv11);
                 break;
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index c5c381c43f17..ba632ff08a13 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -11,15 +11,18 @@
  * option) any later version.
  */
 
+#include <linux/io.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mtd/mtd.h>
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 
-#define NVRAM_MAGIC             0x48534C46      /* 'FLSH' */
-#define NVRAM_SPACE             0x8000
+#define NVRAM_MAGIC                     0x48534C46      /* 'FLSH' */
+#define NVRAM_SPACE                     0x10000
+#define NVRAM_MAX_GPIO_ENTRIES          32
+#define NVRAM_MAX_GPIO_VALUE_LEN        30
 
 #define FLASH_MIN               0x00020000      /* Minimum flash size */
 
@@ -91,20 +94,18 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
         return -ENXIO;
 
 found:
-
         if (header->len > size)
                 pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
         if (header->len > NVRAM_SPACE)
                 pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
                        header->len, NVRAM_SPACE);
 
-        src = (u32 *) header;
-        dst = (u32 *) nvram_buf;
+        src = (u32 *)header;
+        dst = (u32 *)nvram_buf;
         for (i = 0; i < sizeof(struct nvram_header); i += 4)
-                *dst++ = *src++;
+                *dst++ = __raw_readl(src++);
         for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
-                *dst++ = le32_to_cpu(*src++);
-        memset(dst, 0x0, NVRAM_SPACE - i);
+                *dst++ = readl(src++);
 
         return 0;
 }
@@ -138,37 +139,28 @@ static int nvram_init(void)
         struct mtd_info *mtd;
         struct nvram_header header;
         size_t bytes_read;
-        int err, i;
+        int err;
 
         mtd = get_mtd_device_nm("nvram");
         if (IS_ERR(mtd))
                 return -ENODEV;
 
-        for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
-                loff_t from = mtd->size - nvram_sizes[i];
+        err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
+        if (!err && header.magic == NVRAM_MAGIC) {
+                u8 *dst = (uint8_t *)nvram_buf;
+                size_t len = header.len;
 
-                if (from < 0)
-                        continue;
-
-                err = mtd_read(mtd, from, sizeof(header), &bytes_read,
-                               (uint8_t *)&header);
-                if (!err && header.magic == NVRAM_MAGIC) {
-                        u8 *dst = (uint8_t *)nvram_buf;
-                        size_t len = header.len;
-
-                        if (header.len > NVRAM_SPACE) {
-                                pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                                       header.len, NVRAM_SPACE);
-                                len = NVRAM_SPACE;
-                        }
+                if (header.len > NVRAM_SPACE) {
+                        pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+                                header.len, NVRAM_SPACE);
+                        len = NVRAM_SPACE;
+                }
 
-                        err = mtd_read(mtd, from, len, &bytes_read, dst);
-                        if (err)
-                                return err;
-                        memset(dst + bytes_read, 0x0, NVRAM_SPACE - bytes_read);
+                err = mtd_read(mtd, 0, len, &bytes_read, dst);
+                if (err)
+                        return err;
 
-                        return 0;
-                }
+                return 0;
         }
 #endif
 
@@ -178,7 +170,7 @@ static int nvram_init(void)
 int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
 {
         char *var, *value, *end, *eq;
-        int err;
+        int data_left, err;
 
         if (!name)
                 return -EINVAL;
@@ -192,16 +184,18 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
         /* Look for name=value and return value */
         var = &nvram_buf[sizeof(struct nvram_header)];
         end = nvram_buf + sizeof(nvram_buf) - 2;
-        end[0] = end[1] = '\0';
+        end[0] = '\0';
+        end[1] = '\0';
         for (; *var; var = value + strlen(value) + 1) {
-                eq = strchr(var, '=');
+                data_left = end - var;
+
+                eq = strnchr(var, data_left, '=');
                 if (!eq)
                         break;
                 value = eq + 1;
-                if ((eq - var) == strlen(name) &&
-                        strncmp(var, name, (eq - var)) == 0) {
+                if (eq - var == strlen(name) &&
+                    strncmp(var, name, eq - var) == 0)
                         return snprintf(val, val_len, "%s", value);
-                }
         }
         return -ENOENT;
 }
@@ -210,10 +204,11 @@ EXPORT_SYMBOL(bcm47xx_nvram_getenv);
 int bcm47xx_nvram_gpio_pin(const char *name)
 {
         int i, err;
-        char nvram_var[10];
-        char buf[30];
+        char nvram_var[] = "gpioXX";
+        char buf[NVRAM_MAX_GPIO_VALUE_LEN];
 
-        for (i = 0; i < 32; i++) {
+        /* TODO: Optimize it to don't call getenv so many times */
+        for (i = 0; i < NVRAM_MAX_GPIO_ENTRIES; i++) {
                 err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);
                 if (err <= 0)
                         continue;
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 1b170bf5f7f0..ab698bad6d62 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -35,7 +35,6 @@
 #include <bcm47xx.h>
 #include <bcm47xx_board.h>
 
-
 static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
 
 const char *get_system_type(void)
@@ -83,7 +82,7 @@ static __init void prom_init_mem(void)
                 /* Loop condition may be not enough, off may be over 1 MiB */
                 if (off + mem >= max) {
                         mem = max;
-                        printk(KERN_DEBUG "assume 128MB RAM\n");
+                        pr_debug("Assume 128MB RAM\n");
                         break;
                 }
                 if (!memcmp(prom_init, prom_init + mem, 32))
diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
index 2f5bbd68e9a0..df761d38f7fc 100644
--- a/arch/mips/bcm47xx/serial.c
+++ b/arch/mips/bcm47xx/serial.c
@@ -36,8 +36,8 @@ static int __init uart8250_init_ssb(void)
                 struct plat_serial8250_port *p = &(uart8250_data[i]);
                 struct ssb_serial_port *ssb_port = &(mcore->serial_ports[i]);
 
-                p->mapbase = (unsigned int) ssb_port->regs;
-                p->membase = (void *) ssb_port->regs;
+                p->mapbase = (unsigned int)ssb_port->regs;
+                p->membase = (void *)ssb_port->regs;
                 p->irq = ssb_port->irq + 2;
                 p->uartclk = ssb_port->baud_base;
                 p->regshift = ssb_port->reg_shift;
@@ -62,8 +62,8 @@ static int __init uart8250_init_bcma(void)
                 struct bcma_serial_port *bcma_port;
                 bcma_port = &(cc->serial_ports[i]);
 
-                p->mapbase = (unsigned int) bcma_port->regs;
-                p->membase = (void *) bcma_port->regs;
+                p->mapbase = (unsigned int)bcma_port->regs;
+                p->membase = (void *)bcma_port->regs;
                 p->irq = bcma_port->irq;
                 p->uartclk = bcma_port->baud_base;
                 p->regshift = bcma_port->reg_shift;
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index e43b5046cb30..82ff9fd2ab6e 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -42,7 +42,6 @@
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <bcm47xx.h>
-#include <bcm47xx_nvram.h>
 #include <bcm47xx_board.h>
 
 union bcm47xx_bus bcm47xx_bus;
@@ -53,7 +52,7 @@ EXPORT_SYMBOL(bcm47xx_bus_type);
 
 static void bcm47xx_machine_restart(char *command)
 {
-        printk(KERN_ALERT "Please stand by while rebooting the system...\n");
+        pr_alert("Please stand by while rebooting the system...\n");
         local_irq_disable();
         /* Set the watchdog timer to reset immediately */
         switch (bcm47xx_bus_type) {
@@ -108,7 +107,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
         char buf[20];
 
         /* Fill boardinfo structure */
-        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
+        memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));
 
         bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
 
@@ -127,7 +126,7 @@ static void __init bcm47xx_register_ssb(void)
         char buf[100];
         struct ssb_mipscore *mcore;
 
-        err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE,
+        err = ssb_bus_ssbbus_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE,
                                       bcm47xx_get_invariants);
         if (err)
                 panic("Failed to initialize SSB bus (err %d)", err);
@@ -137,7 +136,7 @@ static void __init bcm47xx_register_ssb(void)
                 if (strstr(buf, "console=ttyS1")) {
                         struct ssb_serial_port port;
 
-                        printk(KERN_DEBUG "Swapping serial ports!\n");
+                        pr_debug("Swapping serial ports!\n");
                         /* swap serial ports */
                         memcpy(&port, &mcore->serial_ports[0], sizeof(port));
                         memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
@@ -169,7 +168,7 @@ void __init plat_mem_setup(void)
         struct cpuinfo_mips *c = &current_cpu_data;
 
         if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K)) {
-                printk(KERN_INFO "bcm47xx: using bcma bus\n");
+                pr_info("Using bcma bus\n");
 #ifdef CONFIG_BCM47XX_BCMA
                 bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
                 bcm47xx_sprom_register_fallbacks();
@@ -180,7 +179,7 @@ void __init plat_mem_setup(void)
 #endif
 #endif
         } else {
-                printk(KERN_INFO "bcm47xx: using ssb bus\n");
+                pr_info("Using ssb bus\n");
 #ifdef CONFIG_BCM47XX_SSB
                 bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
                 bcm47xx_sprom_register_fallbacks();
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 2eff7fe99c6b..68ebf2322f8b 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -27,7 +27,6 @@
  */
 
 #include <bcm47xx.h>
-#include <bcm47xx_nvram.h>
 #include <linux/if_ether.h>
 #include <linux/etherdevice.h>
 
@@ -181,94 +180,245 @@ static void nvram_read_alpha2(const char *prefix, const char *name,
         memcpy(val, buf, 2);
 }
 
+/* This is one-function-only macro, it uses local "sprom" variable! */
+#define ENTRY(_revmask, _type, _prefix, _name, _val, _allset, _fallback) \
+        if (_revmask & BIT(sprom->revision)) \
+                nvram_read_ ## _type(_prefix, NULL, _name, &sprom->_val, \
+                                     _allset, _fallback)
+/*
+ * Special version of filling function that can be safely called for any SPROM
+ * revision. For every NVRAM to SPROM mapping it contains bitmask of revisions
+ * for which the mapping is valid.
+ * It obviously requires some hexadecimal/bitmasks knowledge, but allows
+ * writing cleaner code (easy revisions handling).
+ * Note that while SPROM revision 0 was never used, we still keep BIT(0)
+ * reserved for it, just to keep numbering sane.
+ */
+static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
+                                    const char *prefix, bool fallback)
+{
+        const char *pre = prefix;
+        bool fb = fallback;
+
+        ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
+        ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb);
+        ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true);
+        ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
+        ENTRY(0x00000002, u8, pre, "cc", country_code, 0, fb);
+        ENTRY(0xfffffff8, u8, pre, "regrev", regrev, 0, fb);
+
+        ENTRY(0xfffffffe, u8, pre, "ledbh0", gpio0, 0xff, fb);
+        ENTRY(0xfffffffe, u8, pre, "ledbh1", gpio1, 0xff, fb);
+        ENTRY(0xfffffffe, u8, pre, "ledbh2", gpio2, 0xff, fb);
+        ENTRY(0xfffffffe, u8, pre, "ledbh3", gpio3, 0xff, fb);
+
+        ENTRY(0x0000070e, u16, pre, "pa0b0", pa0b0, 0, fb);
+        ENTRY(0x0000070e, u16, pre, "pa0b1", pa0b1, 0, fb);
+        ENTRY(0x0000070e, u16, pre, "pa0b2", pa0b2, 0, fb);
+        ENTRY(0x0000070e, u8, pre, "pa0itssit", itssi_bg, 0, fb);
+        ENTRY(0x0000070e, u8, pre, "pa0maxpwr", maxpwr_bg, 0, fb);
+
+        ENTRY(0x0000070c, u8, pre, "opo", opo, 0, fb);
+        ENTRY(0xfffffffe, u8, pre, "aa2g", ant_available_bg, 0, fb);
+        ENTRY(0xfffffffe, u8, pre, "aa5g", ant_available_a, 0, fb);
+        ENTRY(0x000007fe, s8, pre, "ag0", antenna_gain.a0, 0, fb);
+        ENTRY(0x000007fe, s8, pre, "ag1", antenna_gain.a1, 0, fb);
+        ENTRY(0x000007f0, s8, pre, "ag2", antenna_gain.a2, 0, fb);
+        ENTRY(0x000007f0, s8, pre, "ag3", antenna_gain.a3, 0, fb);
+
+        ENTRY(0x0000070e, u16, pre, "pa1b0", pa1b0, 0, fb);
+        ENTRY(0x0000070e, u16, pre, "pa1b1", pa1b1, 0, fb);
+        ENTRY(0x0000070e, u16, pre, "pa1b2", pa1b2, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1lob0", pa1lob0, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1lob1", pa1lob1, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1lob2", pa1lob2, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1hib0", pa1hib0, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1hib1", pa1hib1, 0, fb);
+        ENTRY(0x0000070c, u16, pre, "pa1hib2", pa1hib2, 0, fb);
+        ENTRY(0x0000070e, u8, pre, "pa1itssit", itssi_a, 0, fb);
+        ENTRY(0x0000070e, u8, pre, "pa1maxpwr", maxpwr_a, 0, fb);
+        ENTRY(0x0000070c, u8, pre, "pa1lomaxpwr", maxpwr_al, 0, fb);
+        ENTRY(0x0000070c, u8, pre, "pa1himaxpwr", maxpwr_ah, 0, fb);
+
+        ENTRY(0x00000708, u8, pre, "bxa2g", bxa2g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssisav2g", rssisav2g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssismc2g", rssismc2g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssismf2g", rssismf2g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "bxa5g", bxa5g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssisav5g", rssisav5g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssismc5g", rssismc5g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "rssismf5g", rssismf5g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "tri2g", tri2g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "tri5g", tri5g, 0, fb);
+        ENTRY(0x00000708, u8, pre, "tri5gl", tri5gl, 0, fb);
+        ENTRY(0x00000708, u8, pre, "tri5gh", tri5gh, 0, fb);
+        ENTRY(0x00000708, s8, pre, "rxpo2g", rxpo2g, 0, fb);
+        ENTRY(0x00000708, s8, pre, "rxpo5g", rxpo5g, 0, fb);
+        ENTRY(0xfffffff0, u8, pre, "txchain", txchain, 0xf, fb);
+        ENTRY(0xfffffff0, u8, pre, "rxchain", rxchain, 0xf, fb);
+        ENTRY(0xfffffff0, u8, pre, "antswitch", antswitch, 0xff, fb);
+        ENTRY(0x00000700, u8, pre, "tssipos2g", fem.ghz2.tssipos, 0, fb);
+        ENTRY(0x00000700, u8, pre, "extpagain2g", fem.ghz2.extpa_gain, 0, fb);
+        ENTRY(0x00000700, u8, pre, "pdetrange2g", fem.ghz2.pdet_range, 0, fb);
+        ENTRY(0x00000700, u8, pre, "triso2g", fem.ghz2.tr_iso, 0, fb);
+        ENTRY(0x00000700, u8, pre, "antswctl2g", fem.ghz2.antswlut, 0, fb);
+        ENTRY(0x00000700, u8, pre, "tssipos5g", fem.ghz5.tssipos, 0, fb);
+        ENTRY(0x00000700, u8, pre, "extpagain5g", fem.ghz5.extpa_gain, 0, fb);
+        ENTRY(0x00000700, u8, pre, "pdetrange5g", fem.ghz5.pdet_range, 0, fb);
+        ENTRY(0x00000700, u8, pre, "triso5g", fem.ghz5.tr_iso, 0, fb);
+        ENTRY(0x00000700, u8, pre, "antswctl5g", fem.ghz5.antswlut, 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid2ga0", txpid2g[0], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid2ga1", txpid2g[1], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid2ga2", txpid2g[2], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid2ga3", txpid2g[3], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5ga0", txpid5g[0], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5ga1", txpid5g[1], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5ga2", txpid5g[2], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5ga3", txpid5g[3], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gla0", txpid5gl[0], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gla1", txpid5gl[1], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gla2", txpid5gl[2], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gla3", txpid5gl[3], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gha0", txpid5gh[0], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gha1", txpid5gh[1], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gha2", txpid5gh[2], 0, fb);
+        ENTRY(0x000000f0, u8, pre, "txpid5gha3", txpid5gh[3], 0, fb);
+
+        ENTRY(0xffffff00, u8, pre, "tempthresh", tempthresh, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "tempoffset", tempoffset, 0, fb);
+        ENTRY(0xffffff00, u16, pre, "rawtempsense", rawtempsense, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "measpower", measpower, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "tempsense_slope", tempsense_slope, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "tempcorrx", tempcorrx, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "tempsense_option", tempsense_option, 0, fb);
+        ENTRY(0x00000700, u8, pre, "freqoffset_corr", freqoffset_corr, 0, fb);
+        ENTRY(0x00000700, u8, pre, "iqcal_swp_dis", iqcal_swp_dis, 0, fb);
+        ENTRY(0x00000700, u8, pre, "hw_iqcal_en", hw_iqcal_en, 0, fb);
+        ENTRY(0x00000700, u8, pre, "elna2g", elna2g, 0, fb);
+        ENTRY(0x00000700, u8, pre, "elna5g", elna5g, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "phycal_tempdelta", phycal_tempdelta, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "temps_period", temps_period, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "temps_hysteresis", temps_hysteresis, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "measpower1", measpower1, 0, fb);
+        ENTRY(0xffffff00, u8, pre, "measpower2", measpower2, 0, fb);
+
+        ENTRY(0x000001f0, u16, pre, "cck2gpo", cck2gpo, 0, fb);
+        ENTRY(0x000001f0, u32, pre, "ofdm2gpo", ofdm2gpo, 0, fb);
+        ENTRY(0x000001f0, u32, pre, "ofdm5gpo", ofdm5gpo, 0, fb);
+        ENTRY(0x000001f0, u32, pre, "ofdm5glpo", ofdm5glpo, 0, fb);
+        ENTRY(0x000001f0, u32, pre, "ofdm5ghpo", ofdm5ghpo, 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo0", mcs2gpo[0], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo1", mcs2gpo[1], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo2", mcs2gpo[2], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo3", mcs2gpo[3], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo4", mcs2gpo[4], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo5", mcs2gpo[5], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo6", mcs2gpo[6], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs2gpo7", mcs2gpo[7], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo0", mcs5gpo[0], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo1", mcs5gpo[1], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo2", mcs5gpo[2], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo3", mcs5gpo[3], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo4", mcs5gpo[4], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo5", mcs5gpo[5], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo6", mcs5gpo[6], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5gpo7", mcs5gpo[7], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo0", mcs5glpo[0], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo1", mcs5glpo[1], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo2", mcs5glpo[2], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo3", mcs5glpo[3], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo4", mcs5glpo[4], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo5", mcs5glpo[5], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo6", mcs5glpo[6], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5glpo7", mcs5glpo[7], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo0", mcs5ghpo[0], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo1", mcs5ghpo[1], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo2", mcs5ghpo[2], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo3", mcs5ghpo[3], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo4", mcs5ghpo[4], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo5", mcs5ghpo[5], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo6", mcs5ghpo[6], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "mcs5ghpo7", mcs5ghpo[7], 0, fb);
+        ENTRY(0x000001f0, u16, pre, "cddpo", cddpo, 0, fb);
+        ENTRY(0x000001f0, u16, pre, "stbcpo", stbcpo, 0, fb);
+        ENTRY(0x000001f0, u16, pre, "bw40po", bw40po, 0, fb);
+        ENTRY(0x000001f0, u16, pre, "bwduppo", bwduppo, 0, fb);
+
+        ENTRY(0xfffffe00, u16, pre, "cckbw202gpo", cckbw202gpo, 0, fb);
+        ENTRY(0xfffffe00, u16, pre, "cckbw20ul2gpo", cckbw20ul2gpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw202gpo", legofdmbw202gpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw20ul2gpo", legofdmbw20ul2gpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw205glpo", legofdmbw205glpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw20ul5glpo", legofdmbw20ul5glpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw205gmpo", legofdmbw205gmpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw20ul5gmpo", legofdmbw20ul5gmpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw205ghpo", legofdmbw205ghpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "legofdmbw20ul5ghpo", legofdmbw20ul5ghpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw202gpo", mcsbw202gpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "mcsbw20ul2gpo", mcsbw20ul2gpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw402gpo", mcsbw402gpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw205glpo", mcsbw205glpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "mcsbw20ul5glpo", mcsbw20ul5glpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw405glpo", mcsbw405glpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw205gmpo", mcsbw205gmpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "mcsbw20ul5gmpo", mcsbw20ul5gmpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw405gmpo", mcsbw405gmpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw205ghpo", mcsbw205ghpo, 0, fb);
+        ENTRY(0x00000600, u32, pre, "mcsbw20ul5ghpo", mcsbw20ul5ghpo, 0, fb);
+        ENTRY(0xfffffe00, u32, pre, "mcsbw405ghpo", mcsbw405ghpo, 0, fb);
+        ENTRY(0x00000600, u16, pre, "mcs32po", mcs32po, 0, fb);
+        ENTRY(0x00000600, u16, pre, "legofdm40duppo", legofdm40duppo, 0, fb);
+        ENTRY(0x00000700, u8, pre, "pcieingress_war", pcieingress_war, 0, fb);
+
+        /* TODO: rev 11 support */
+        ENTRY(0x00000700, u8, pre, "rxgainerr2ga0", rxgainerr2ga[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr2ga1", rxgainerr2ga[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr2ga2", rxgainerr2ga[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gla0", rxgainerr5gla[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gla1", rxgainerr5gla[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gla2", rxgainerr5gla[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gma0", rxgainerr5gma[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gma1", rxgainerr5gma[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gma2", rxgainerr5gma[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gha0", rxgainerr5gha[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gha1", rxgainerr5gha[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gha2", rxgainerr5gha[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gua0", rxgainerr5gua[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gua1", rxgainerr5gua[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "rxgainerr5gua2", rxgainerr5gua[2], 0, fb);
+
+        ENTRY(0xfffffe00, u8, pre, "sar2g", sar2g, 0, fb);
+        ENTRY(0xfffffe00, u8, pre, "sar5g", sar5g, 0, fb);
+
+        /* TODO: rev 11 support */
+        ENTRY(0x00000700, u8, pre, "noiselvl2ga0", noiselvl2ga[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl2ga1", noiselvl2ga[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl2ga2", noiselvl2ga[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gla0", noiselvl5gla[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gla1", noiselvl5gla[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gla2", noiselvl5gla[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gma0", noiselvl5gma[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gma1", noiselvl5gma[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gma2", noiselvl5gma[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gha0", noiselvl5gha[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gha1", noiselvl5gha[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gha2", noiselvl5gha[2], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gua0", noiselvl5gua[0], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gua1", noiselvl5gua[1], 0, fb);
+        ENTRY(0x00000700, u8, pre, "noiselvl5gua2", noiselvl5gua[2], 0, fb);
+}
+#undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
+
 static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
                                         const char *prefix, bool fallback)
 {
         nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
-        nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
-        nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
-        nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
-        nvram_read_u8(prefix, NULL, "ledbh3", &sprom->gpio3, 0xff, fallback);
-        nvram_read_u8(prefix, NULL, "aa2g", &sprom->ant_available_bg, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "aa5g", &sprom->ant_available_a, 0,
-                      fallback);
-        nvram_read_s8(prefix, NULL, "ag0", &sprom->antenna_gain.a0, 0,
-                      fallback);
-        nvram_read_s8(prefix, NULL, "ag1", &sprom->antenna_gain.a1, 0,
-                      fallback);
         nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
 }
 
-static void bcm47xx_fill_sprom_r12389(struct ssb_sprom *sprom,
-                                      const char *prefix, bool fallback)
-{
-        nvram_read_u16(prefix, NULL, "pa0b0", &sprom->pa0b0, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa0b1", &sprom->pa0b1, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa0b2", &sprom->pa0b2, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pa0itssit", &sprom->itssi_bg, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pa0maxpwr", &sprom->maxpwr_bg, 0,
-                      fallback);
-        nvram_read_u16(prefix, NULL, "pa1b0", &sprom->pa1b0, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1b1", &sprom->pa1b1, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1b2", &sprom->pa1b2, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pa1itssit", &sprom->itssi_a, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pa1maxpwr", &sprom->maxpwr_a, 0, fallback);
-}
-
-static void bcm47xx_fill_sprom_r1(struct ssb_sprom *sprom, const char *prefix,
-                                  bool fallback)
-{
-        nvram_read_u16(prefix, NULL, "boardflags", &sprom->boardflags_lo, 0,
-                       fallback);
-        nvram_read_u8(prefix, NULL, "cc", &sprom->country_code, 0, fallback);
-}
-
-static void bcm47xx_fill_sprom_r2389(struct ssb_sprom *sprom,
-                                     const char *prefix, bool fallback)
-{
-        nvram_read_u8(prefix, NULL, "opo", &sprom->opo, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1lob0", &sprom->pa1lob0, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1lob1", &sprom->pa1lob1, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1lob2", &sprom->pa1lob2, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1hib0", &sprom->pa1hib0, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1hib1", &sprom->pa1hib1, 0, fallback);
-        nvram_read_u16(prefix, NULL, "pa1hib2", &sprom->pa1hib2, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pa1lomaxpwr", &sprom->maxpwr_al, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "pa1himaxpwr", &sprom->maxpwr_ah, 0,
-                      fallback);
-}
-
-static void bcm47xx_fill_sprom_r389(struct ssb_sprom *sprom, const char *prefix,
-                                    bool fallback)
-{
-        nvram_read_u8(prefix, NULL, "bxa2g", &sprom->bxa2g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "rssisav2g", &sprom->rssisav2g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "rssismc2g", &sprom->rssismc2g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "rssismf2g", &sprom->rssismf2g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "bxa5g", &sprom->bxa5g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "rssisav5g", &sprom->rssisav5g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "rssismc5g", &sprom->rssismc5g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "rssismf5g", &sprom->rssismf5g, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "tri2g", &sprom->tri2g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "tri5g", &sprom->tri5g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "tri5gl", &sprom->tri5gl, 0, fallback);
-        nvram_read_u8(prefix, NULL, "tri5gh", &sprom->tri5gh, 0, fallback);
-        nvram_read_s8(prefix, NULL, "rxpo2g", &sprom->rxpo2g, 0, fallback);
-        nvram_read_s8(prefix, NULL, "rxpo5g", &sprom->rxpo5g, 0, fallback);
-}
-
 static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
                                   bool fallback)
 {
-        nvram_read_u8(prefix, NULL, "regrev", &sprom->regrev, 0, fallback);
         nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
                          &sprom->leddc_off_time, fallback);
 }
@@ -276,309 +426,10 @@ static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
 static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
                                      const char *prefix, bool fallback)
 {
-        nvram_read_u8(prefix, NULL, "regrev", &sprom->regrev, 0, fallback);
-        nvram_read_s8(prefix, NULL, "ag2", &sprom->antenna_gain.a2, 0,
-                      fallback);
-        nvram_read_s8(prefix, NULL, "ag3", &sprom->antenna_gain.a3, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txchain", &sprom->txchain, 0xf, fallback);
-        nvram_read_u8(prefix, NULL, "rxchain", &sprom->rxchain, 0xf, fallback);
-        nvram_read_u8(prefix, NULL, "antswitch", &sprom->antswitch, 0xff,
-                      fallback);
         nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
                          &sprom->leddc_off_time, fallback);
 }
 
-static void bcm47xx_fill_sprom_r458(struct ssb_sprom *sprom, const char *prefix,
-                                    bool fallback)
-{
-        nvram_read_u16(prefix, NULL, "cck2gpo", &sprom->cck2gpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "ofdm2gpo", &sprom->ofdm2gpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "ofdm5gpo", &sprom->ofdm5gpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "ofdm5glpo", &sprom->ofdm5glpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "ofdm5ghpo", &sprom->ofdm5ghpo, 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "cddpo", &sprom->cddpo, 0, fallback);
-        nvram_read_u16(prefix, NULL, "stbcpo", &sprom->stbcpo, 0, fallback);
-        nvram_read_u16(prefix, NULL, "bw40po", &sprom->bw40po, 0, fallback);
-        nvram_read_u16(prefix, NULL, "bwduppo", &sprom->bwduppo, 0, fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo0", &sprom->mcs2gpo[0], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo1", &sprom->mcs2gpo[1], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo2", &sprom->mcs2gpo[2], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo3", &sprom->mcs2gpo[3], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo4", &sprom->mcs2gpo[4], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo5", &sprom->mcs2gpo[5], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo6", &sprom->mcs2gpo[6], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs2gpo7", &sprom->mcs2gpo[7], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo0", &sprom->mcs5gpo[0], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo1", &sprom->mcs5gpo[1], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo2", &sprom->mcs5gpo[2], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo3", &sprom->mcs5gpo[3], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo4", &sprom->mcs5gpo[4], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo5", &sprom->mcs5gpo[5], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo6", &sprom->mcs5gpo[6], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5gpo7", &sprom->mcs5gpo[7], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo0", &sprom->mcs5glpo[0], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo1", &sprom->mcs5glpo[1], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo2", &sprom->mcs5glpo[2], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo3", &sprom->mcs5glpo[3], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo4", &sprom->mcs5glpo[4], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo5", &sprom->mcs5glpo[5], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo6", &sprom->mcs5glpo[6], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5glpo7", &sprom->mcs5glpo[7], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo0", &sprom->mcs5ghpo[0], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo1", &sprom->mcs5ghpo[1], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo2", &sprom->mcs5ghpo[2], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo3", &sprom->mcs5ghpo[3], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo4", &sprom->mcs5ghpo[4], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo5", &sprom->mcs5ghpo[5], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo6", &sprom->mcs5ghpo[6], 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs5ghpo7", &sprom->mcs5ghpo[7], 0,
-                       fallback);
-}
-
-static void bcm47xx_fill_sprom_r45(struct ssb_sprom *sprom, const char *prefix,
-                                   bool fallback)
-{
-        nvram_read_u8(prefix, NULL, "txpid2ga0", &sprom->txpid2g[0], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid2ga1", &sprom->txpid2g[1], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid2ga2", &sprom->txpid2g[2], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid2ga3", &sprom->txpid2g[3], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5ga0", &sprom->txpid5g[0], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5ga1", &sprom->txpid5g[1], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5ga2", &sprom->txpid5g[2], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5ga3", &sprom->txpid5g[3], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gla0", &sprom->txpid5gl[0], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gla1", &sprom->txpid5gl[1], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gla2", &sprom->txpid5gl[2], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gla3", &sprom->txpid5gl[3], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gha0", &sprom->txpid5gh[0], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gha1", &sprom->txpid5gh[1], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gha2", &sprom->txpid5gh[2], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "txpid5gha3", &sprom->txpid5gh[3], 0,
-                      fallback);
-}
-
-static void bcm47xx_fill_sprom_r89(struct ssb_sprom *sprom, const char *prefix,
-                                   bool fallback)
-{
-        nvram_read_u8(prefix, NULL, "tssipos2g", &sprom->fem.ghz2.tssipos, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "extpagain2g",
-                      &sprom->fem.ghz2.extpa_gain, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pdetrange2g",
-                      &sprom->fem.ghz2.pdet_range, 0, fallback);
-        nvram_read_u8(prefix, NULL, "triso2g", &sprom->fem.ghz2.tr_iso, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "antswctl2g", &sprom->fem.ghz2.antswlut, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "tssipos5g", &sprom->fem.ghz5.tssipos, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "extpagain5g",
-                      &sprom->fem.ghz5.extpa_gain, 0, fallback);
-        nvram_read_u8(prefix, NULL, "pdetrange5g",
-                      &sprom->fem.ghz5.pdet_range, 0, fallback);
-        nvram_read_u8(prefix, NULL, "triso5g", &sprom->fem.ghz5.tr_iso, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "antswctl5g", &sprom->fem.ghz5.antswlut, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "tempthresh", &sprom->tempthresh, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "tempoffset", &sprom->tempoffset, 0,
-                      fallback);
-        nvram_read_u16(prefix, NULL, "rawtempsense", &sprom->rawtempsense, 0,
-                       fallback);
-        nvram_read_u8(prefix, NULL, "measpower", &sprom->measpower, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "tempsense_slope",
-                      &sprom->tempsense_slope, 0, fallback);
-        nvram_read_u8(prefix, NULL, "tempcorrx", &sprom->tempcorrx, 0,
-                       fallback);
-        nvram_read_u8(prefix, NULL, "tempsense_option",
-                      &sprom->tempsense_option, 0, fallback);
-        nvram_read_u8(prefix, NULL, "freqoffset_corr",
-                      &sprom->freqoffset_corr, 0, fallback);
-        nvram_read_u8(prefix, NULL, "iqcal_swp_dis", &sprom->iqcal_swp_dis, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "hw_iqcal_en", &sprom->hw_iqcal_en, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "elna2g", &sprom->elna2g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "elna5g", &sprom->elna5g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "phycal_tempdelta",
-                      &sprom->phycal_tempdelta, 0, fallback);
-        nvram_read_u8(prefix, NULL, "temps_period", &sprom->temps_period, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "temps_hysteresis",
-                      &sprom->temps_hysteresis, 0, fallback);
-        nvram_read_u8(prefix, NULL, "measpower1", &sprom->measpower1, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "measpower2", &sprom->measpower2, 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr2ga0",
-                      &sprom->rxgainerr2ga[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr2ga1",
-                      &sprom->rxgainerr2ga[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr2ga2",
-                      &sprom->rxgainerr2ga[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gla0",
-                      &sprom->rxgainerr5gla[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gla1",
-                      &sprom->rxgainerr5gla[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gla2",
-                      &sprom->rxgainerr5gla[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gma0",
-                      &sprom->rxgainerr5gma[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gma1",
-                      &sprom->rxgainerr5gma[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gma2",
-                      &sprom->rxgainerr5gma[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gha0",
-                      &sprom->rxgainerr5gha[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gha1",
-                      &sprom->rxgainerr5gha[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gha2",
-                      &sprom->rxgainerr5gha[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gua0",
-                      &sprom->rxgainerr5gua[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gua1",
-                      &sprom->rxgainerr5gua[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "rxgainerr5gua2",
-                      &sprom->rxgainerr5gua[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl2ga0", &sprom->noiselvl2ga[0], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl2ga1", &sprom->noiselvl2ga[1], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl2ga2", &sprom->noiselvl2ga[2], 0,
-                      fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gla0",
-                      &sprom->noiselvl5gla[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gla1",
-                      &sprom->noiselvl5gla[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gla2",
-                      &sprom->noiselvl5gla[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gma0",
-                      &sprom->noiselvl5gma[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gma1",
-                      &sprom->noiselvl5gma[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gma2",
-                      &sprom->noiselvl5gma[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gha0",
-                      &sprom->noiselvl5gha[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gha1",
-                      &sprom->noiselvl5gha[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gha2",
-                      &sprom->noiselvl5gha[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gua0",
-                      &sprom->noiselvl5gua[0], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gua1",
-                      &sprom->noiselvl5gua[1], 0, fallback);
-        nvram_read_u8(prefix, NULL, "noiselvl5gua2",
-                      &sprom->noiselvl5gua[2], 0, fallback);
-        nvram_read_u8(prefix, NULL, "pcieingress_war",
-                      &sprom->pcieingress_war, 0, fallback);
-}
-
-static void bcm47xx_fill_sprom_r9(struct ssb_sprom *sprom, const char *prefix,
-                                  bool fallback)
-{
-        nvram_read_u16(prefix, NULL, "cckbw202gpo", &sprom->cckbw202gpo, 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "cckbw20ul2gpo", &sprom->cckbw20ul2gpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw202gpo",
-                       &sprom->legofdmbw202gpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw20ul2gpo",
-                       &sprom->legofdmbw20ul2gpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw205glpo",
-                       &sprom->legofdmbw205glpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw20ul5glpo",
-                       &sprom->legofdmbw20ul5glpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw205gmpo",
-                       &sprom->legofdmbw205gmpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw20ul5gmpo",
-                       &sprom->legofdmbw20ul5gmpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw205ghpo",
-                       &sprom->legofdmbw205ghpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "legofdmbw20ul5ghpo",
-                       &sprom->legofdmbw20ul5ghpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw202gpo", &sprom->mcsbw202gpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw20ul2gpo", &sprom->mcsbw20ul2gpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw402gpo", &sprom->mcsbw402gpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw205glpo", &sprom->mcsbw205glpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw20ul5glpo",
-                       &sprom->mcsbw20ul5glpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw405glpo", &sprom->mcsbw405glpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw205gmpo", &sprom->mcsbw205gmpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw20ul5gmpo",
-                       &sprom->mcsbw20ul5gmpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw405gmpo", &sprom->mcsbw405gmpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw205ghpo", &sprom->mcsbw205ghpo, 0,
-                       fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw20ul5ghpo",
-                       &sprom->mcsbw20ul5ghpo, 0, fallback);
-        nvram_read_u32(prefix, NULL, "mcsbw405ghpo", &sprom->mcsbw405ghpo, 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "mcs32po", &sprom->mcs32po, 0, fallback);
-        nvram_read_u16(prefix, NULL, "legofdm40duppo",
-                       &sprom->legofdm40duppo, 0, fallback);
-        nvram_read_u8(prefix, NULL, "sar2g", &sprom->sar2g, 0, fallback);
-        nvram_read_u8(prefix, NULL, "sar5g", &sprom->sar5g, 0, fallback);
-}
-
 static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
                                           const char *prefix, bool fallback)
 {
@@ -715,10 +566,6 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
 static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
                                     bool fallback)
 {
-        nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0, true);
-        nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0,
-                       fallback);
-        nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
         nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
                          &sprom->boardflags_hi, fallback);
         nvram_read_u32_2(prefix, "boardflags2", &sprom->boardflags2_lo,
@@ -736,58 +583,39 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
         switch (sprom->revision) {
         case 1:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
                 break;
         case 2:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
                 break;
         case 3:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_r3(sprom, prefix, fallback);
                 break;
         case 4:
         case 5:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r458(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r45(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback);
                 break;
         case 8:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r458(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r89(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
                 break;
         case 9:
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r89(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r9(sprom, prefix, fallback);
                 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
                 break;
         default:
-                pr_warn("Unsupported SPROM revision %d detected. Will extract"
-                        " v1\n", sprom->revision);
+                pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
+                        sprom->revision);
                 sprom->revision = 1;
                 bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-                bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
         }
+
+        bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
 }
 
 #ifdef CONFIG_BCM47XX_SSB
@@ -829,13 +657,45 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
                 bcm47xx_fill_sprom(out, prefix, false);
                 return 0;
         } else {
-                pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
+                pr_warn("Unable to fill SPROM for given bustype.\n");
                 return -EINVAL;
         }
 }
 #endif
 
 #if defined(CONFIG_BCM47XX_BCMA)
+/*
+ * Having many NVRAM entries for PCI devices led to repeating prefixes like
+ * pci/1/1/ all the time and wasting flash space. So at some point Broadcom
+ * decided to introduce prefixes like 0: 1: 2: etc.
+ * If we find e.g. devpath0=pci/2/1 or devpath0=pci/2/1/ we should use 0:
+ * instead of pci/2/1/.
+ */
+static void bcm47xx_sprom_apply_prefix_alias(char *prefix, size_t prefix_size)
+{
+        size_t prefix_len = strlen(prefix);
+        size_t short_len = prefix_len - 1;
+        char nvram_var[10];
+        char buf[20];
+        int i;
+
+        /* Passed prefix has to end with a slash */
+        if (prefix_len <= 0 || prefix[prefix_len - 1] != '/')
+                return;
+
+        for (i = 0; i < 3; i++) {
+                if (snprintf(nvram_var, sizeof(nvram_var), "devpath%d", i) <= 0)
+                        continue;
+                if (bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf)) < 0)
+                        continue;
+                if (!strcmp(buf, prefix) ||
+                    (short_len && strlen(buf) == short_len && !strncmp(buf, prefix, short_len))) {
+                        snprintf(prefix, prefix_size, "%d:", i);
+                        return;
+                }
+        }
+}
+
 static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
 {
         char prefix[10];
@@ -847,6 +707,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
                 snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                          bus->host_pci->bus->number + 1,
                          PCI_SLOT(bus->host_pci->devfn));
+                bcm47xx_sprom_apply_prefix_alias(prefix, sizeof(prefix));
                 bcm47xx_fill_sprom(out, prefix, false);
                 return 0;
         case BCMA_HOSTTYPE_SOC:
@@ -861,7 +722,7 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
                 }
                 return 0;
         default:
-                pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
+                pr_warn("Unable to fill SPROM for given bustype.\n");
                 return -EINVAL;
         }
 }
diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c
index 2c85d9254b5e..74224cf2e84d 100644
--- a/arch/mips/bcm47xx/time.c
+++ b/arch/mips/bcm47xx/time.c
@@ -22,12 +22,10 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include <linux/init.h>
 #include <linux/ssb/ssb.h>
 #include <asm/time.h>
 #include <bcm47xx.h>
-#include <bcm47xx_nvram.h>
 #include <bcm47xx_board.h>
 
 void __init plat_time_init(void)
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index e1f27d653f60..7019e2967009 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -17,7 +17,6 @@
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
-#include <bcm63xx_gpio.h>
 
 void __init prom_init(void)
 {
@@ -53,9 +52,6 @@ void __init prom_init(void)
         reg &= ~mask;
         bcm_perf_writel(reg, PERF_CKCTL_REG);
 
-        /* register gpiochip */
-        bcm63xx_gpio_init();
-
         /* do low level board init */
         board_prom_init();
 
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index 6660c7ddf87b..240fb4ffa55c 100644
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -20,6 +20,7 @@
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_regs.h>
 #include <bcm63xx_io.h>
+#include <bcm63xx_gpio.h>
 
 void bcm63xx_machine_halt(void)
 {
@@ -160,6 +161,9 @@ void __init plat_mem_setup(void)
 
 int __init bcm63xx_register_devices(void)
 {
+        /* register gpiochip */
+        bcm63xx_gpio_init();
+
         return board_register_devices();
 }
 
diff --git a/arch/mips/bmips/Kconfig b/arch/mips/bmips/Kconfig
new file mode 100644
index 000000000000..f35c84c019df
--- /dev/null
+++ b/arch/mips/bmips/Kconfig
@@ -0,0 +1,62 @@
+if BMIPS_GENERIC
+
+choice
+        prompt "Built-in device tree"
+        help
+          Legacy bootloaders do not pass a DTB pointer to the kernel, so
+          if a "wrapper" is not being used, the kernel will need to include
+          a device tree that matches the target board.
+
+          The builtin DTB will only be used if the firmware does not supply
+          a valid DTB.
+
+config DT_NONE
+        bool "None"
+
+config DT_BCM93384WVG
+        bool "BCM93384WVG Zephyr CPU"
+        select BUILTIN_DTB
+
+config DT_BCM93384WVG_VIPER
+        bool "BCM93384WVG Viper CPU (EXPERIMENTAL)"
+        select BUILTIN_DTB
+
+config DT_BCM96368MVWG
+        bool "BCM96368MVWG"
+        select BUILTIN_DTB
+
+config DT_BCM9EJTAGPRB
+        bool "BCM9EJTAGPRB"
+        select BUILTIN_DTB
+
+config DT_BCM97125CBMB
+        bool "BCM97125CBMB"
+        select BUILTIN_DTB
+
+config DT_BCM97346DBSMB
+        bool "BCM97346DBSMB"
+        select BUILTIN_DTB
+
+config DT_BCM97358SVMB
+        bool "BCM97358SVMB"
+        select BUILTIN_DTB
+
+config DT_BCM97360SVMB
+        bool "BCM97360SVMB"
+        select BUILTIN_DTB
+
+config DT_BCM97362SVMB
+        bool "BCM97362SVMB"
+        select BUILTIN_DTB
+
+config DT_BCM97420C
+        bool "BCM97420C"
+        select BUILTIN_DTB
+
+config DT_BCM97425SVMB
+        bool "BCM97425SVMB"
+        select BUILTIN_DTB
+
+endchoice
+
+endif
diff --git a/arch/mips/bcm3384/Makefile b/arch/mips/bmips/Makefile
index a393955cba08..a393955cba08 100644
--- a/arch/mips/bcm3384/Makefile
+++ b/arch/mips/bmips/Makefile
diff --git a/arch/mips/bmips/Platform b/arch/mips/bmips/Platform
new file mode 100644
index 000000000000..5f127fd7f4b5
--- /dev/null
+++ b/arch/mips/bmips/Platform
@@ -0,0 +1,7 @@
+#
+# Broadcom Generic BMIPS kernel
+#
+platform-$(CONFIG_BMIPS_GENERIC)        += bmips/
+cflags-$(CONFIG_BMIPS_GENERIC)          +=                              \
+                -I$(srctree)/arch/mips/include/asm/mach-bmips/
+load-$(CONFIG_BMIPS_GENERIC)            := 0xffffffff80010000
diff --git a/arch/mips/bmips/dma.c b/arch/mips/bmips/dma.c
new file mode 100644
index 000000000000..04790f4e1805
--- /dev/null
+++ b/arch/mips/bmips/dma.c
@@ -0,0 +1,117 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2014 Kevin Cernekee <cernekee@gmail.com>
+ */
+
+#define pr_fmt(fmt)             "bmips-dma: " fmt
+
+#include <linux/device.h>
+#include <linux/dma-direction.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/printk.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <dma-coherence.h>
+
+/*
+ * BCM338x has configurable address translation windows which allow the
+ * peripherals' DMA addresses to be different from the Zephyr-visible
+ * physical addresses.  e.g. usb_dma_addr = zephyr_pa ^ 0x08000000
+ *
+ * If the "brcm,ubus" node has a "dma-ranges" property we will enable this
+ * translation globally using the provided information.  This implements a
+ * very limited subset of "dma-ranges" support and it will probably be
+ * replaced by a more generic version later.
+ */
+
+struct bmips_dma_range {
+        u32                     child_addr;
+        u32                     parent_addr;
+        u32                     size;
+};
+
+static struct bmips_dma_range *bmips_dma_ranges;
+
+#define FLUSH_RAC               0x100
+
+static dma_addr_t bmips_phys_to_dma(struct device *dev, phys_addr_t pa)
+{
+        struct bmips_dma_range *r;
+
+        for (r = bmips_dma_ranges; r && r->size; r++) {
+                if (pa >= r->child_addr &&
+                    pa < (r->child_addr + r->size))
+                        return pa - r->child_addr + r->parent_addr;
+        }
+        return pa;
+}
+
+dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)
+{
+        return bmips_phys_to_dma(dev, virt_to_phys(addr));
+}
+
+dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
+{
+        return bmips_phys_to_dma(dev, page_to_phys(page));
+}
+
+unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr)
+{
+        struct bmips_dma_range *r;
+
+        for (r = bmips_dma_ranges; r && r->size; r++) {
+                if (dma_addr >= r->parent_addr &&
+                    dma_addr < (r->parent_addr + r->size))
+                        return dma_addr - r->parent_addr + r->child_addr;
+        }
+        return dma_addr;
+}
+
+static int __init bmips_init_dma_ranges(void)
+{
+        struct device_node *np =
+                of_find_compatible_node(NULL, NULL, "brcm,ubus");
+        const __be32 *data;
+        struct bmips_dma_range *r;
+        int len;
+
+        if (!np)
+                return 0;
+
+        data = of_get_property(np, "dma-ranges", &len);
+        if (!data)
+                goto out_good;
+
+        len /= sizeof(*data) * 3;
+        if (!len)
+                goto out_bad;
+
+        /* add a dummy (zero) entry at the end as a sentinel */
+        bmips_dma_ranges = kzalloc(sizeof(struct bmips_dma_range) * (len + 1),
+                                   GFP_KERNEL);
+        if (!bmips_dma_ranges)
+                goto out_bad;
+
+        for (r = bmips_dma_ranges; len; len--, r++) {
+                r->child_addr = be32_to_cpup(data++);
+                r->parent_addr = be32_to_cpup(data++);
+                r->size = be32_to_cpup(data++);
+        }
+
+out_good:
+        of_node_put(np);
+        return 0;
+
+out_bad:
+        pr_err("error parsing dma-ranges property\n");
+        of_node_put(np);
+        return -EINVAL;
+}
+arch_initcall(bmips_init_dma_ranges);
diff --git a/arch/mips/bmips/irq.c b/arch/mips/bmips/irq.c
new file mode 100644
index 000000000000..14552e58ff7e
--- /dev/null
+++ b/arch/mips/bmips/irq.c
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ * Copyright (C) 2014 Broadcom Corporation
+ * Author: Kevin Cernekee <cernekee@gmail.com>
+ */
+
+#include <linux/of.h>
+#include <linux/irqchip.h>
+
+#include <asm/bmips.h>
+#include <asm/irq.h>
+#include <asm/irq_cpu.h>
+#include <asm/time.h>
+
+unsigned int get_c0_compare_int(void)
+{
+        return CP0_LEGACY_COMPARE_IRQ;
+}
+
+void __init arch_init_irq(void)
+{
+        struct device_node *dn;
+
+        /* Only the STB (bcm7038) controller supports SMP IRQ affinity */
+        dn = of_find_compatible_node(NULL, NULL, "brcm,bcm7038-l1-intc");
+        if (dn)
+                of_node_put(dn);
+        else
+                bmips_tp1_irqs = 0;
+
+        irqchip_init();
+}
+
+OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller",
+             mips_cpu_irq_of_init);
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
new file mode 100644
index 000000000000..fae800e8b1e1
--- /dev/null
+++ b/arch/mips/bmips/setup.c
@@ -0,0 +1,194 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
+ * Copyright (C) 2014 Kevin Cernekee <cernekee@gmail.com>
+ */
+
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/bootmem.h>
+#include <linux/clk-provider.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
+#include <linux/smp.h>
+#include <asm/addrspace.h>
+#include <asm/bmips.h>
+#include <asm/bootinfo.h>
+#include <asm/cpu-type.h>
+#include <asm/mipsregs.h>
+#include <asm/prom.h>
+#include <asm/smp-ops.h>
+#include <asm/time.h>
+#include <asm/traps.h>
+
+#define RELO_NORMAL_VEC         BIT(18)
+
+#define REG_BCM6328_OTP         ((void __iomem *)CKSEG1ADDR(0x1000062c))
+#define BCM6328_TP1_DISABLED    BIT(9)
+
+static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
+
+struct bmips_quirk {
+        const char              *compatible;
+        void                    (*quirk_fn)(void);
+};
+
+static void kbase_setup(void)
+{
+        __raw_writel(kbase | RELO_NORMAL_VEC,
+                     BMIPS_GET_CBR() + BMIPS_RELO_VECTOR_CONTROL_1);
+        ebase = kbase;
+}
+
+static void bcm3384_viper_quirks(void)
+{
+        /*
+         * Some experimental CM boxes are set up to let CM own the Viper TP0
+         * and let Linux own TP1.  This requires moving the kernel
+         * load address to a non-conflicting region (e.g. via
+         * CONFIG_PHYSICAL_START) and supplying an alternate DTB.
+         * If we detect this condition, we need to move the MIPS exception
+         * vectors up to an area that we own.
+         *
+         * This is distinct from the OTHER special case mentioned in
+         * smp-bmips.c (boot on TP1, but enable SMP, then TP0 becomes our
+         * logical CPU#1).  For the Viper TP1 case, SMP is off limits.
+         *
+         * Also note that many BMIPS435x CPUs do not have a
+         * BMIPS_RELO_VECTOR_CONTROL_1 register, so it isn't safe to just
+         * write VMLINUX_LOAD_ADDRESS into that register on every SoC.
+         */
+        board_ebase_setup = &kbase_setup;
+        bmips_smp_enabled = 0;
+}
+
+static void bcm63xx_fixup_cpu1(void)
+{
+        /*
+         * The bootloader has set up the CPU1 reset vector at
+         * 0xa000_0200.
+         * This conflicts with the special interrupt vector (IV).
+         * The bootloader has also set up CPU1 to respond to the wrong
+         * IPI interrupt.
+         * Here we will start up CPU1 in the background and ask it to
+         * reconfigure itself then go back to sleep.
+         */
+        memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);
+        __sync();
+        set_c0_cause(C_SW0);
+        cpumask_set_cpu(1, &bmips_booted_mask);
+}
+
+static void bcm6328_quirks(void)
+{
+        /* Check CPU1 status in OTP (it is usually disabled) */
+        if (__raw_readl(REG_BCM6328_OTP) & BCM6328_TP1_DISABLED)
+                bmips_smp_enabled = 0;
+        else
+                bcm63xx_fixup_cpu1();
+}
+
+static void bcm6368_quirks(void)
+{
+        bcm63xx_fixup_cpu1();
+}
+
+static const struct bmips_quirk bmips_quirk_list[] = {
+        { "brcm,bcm3384-viper",         &bcm3384_viper_quirks           },
+        { "brcm,bcm33843-viper",        &bcm3384_viper_quirks           },
+        { "brcm,bcm6328",               &bcm6328_quirks                 },
+        { "brcm,bcm6368",               &bcm6368_quirks                 },
+        { },
+};
+
+void __init prom_init(void)
+{
+        register_bmips_smp_ops();
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+const char *get_system_type(void)
+{
+        return "Generic BMIPS kernel";
+}
+
+void __init plat_time_init(void)
+{
+        struct device_node *np;
+        u32 freq;
+
+        np = of_find_node_by_name(NULL, "cpus");
+        if (!np)
+                panic("missing 'cpus' DT node");
+        if (of_property_read_u32(np, "mips-hpt-frequency", &freq) < 0)
+                panic("missing 'mips-hpt-frequency' property");
+        of_node_put(np);
+
+        mips_hpt_frequency = freq;
+}
+
+void __init plat_mem_setup(void)
+{
+        void *dtb;
+        const struct bmips_quirk *q;
+
+        set_io_port_base(0);
+        ioport_resource.start = 0;
+        ioport_resource.end = ~0;
+
+        /* intended to somewhat resemble ARM; see Documentation/arm/Booting */
+        if (fw_arg0 == 0 && fw_arg1 == 0xffffffff)
+                dtb = phys_to_virt(fw_arg2);
+        else if (__dtb_start != __dtb_end)
+                dtb = (void *)__dtb_start;
+        else
+                panic("no dtb found");
+
+        __dt_setup_arch(dtb);
+        strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+
+        for (q = bmips_quirk_list; q->quirk_fn; q++) {
+                if (of_flat_dt_is_compatible(of_get_flat_dt_root(),
+                                             q->compatible)) {
+                        q->quirk_fn();
+                }
+        }
+}
+
+void __init device_tree_init(void)
+{
+        struct device_node *np;
+
+        unflatten_and_copy_device_tree();
+
+        /* Disable SMP boot unless both CPUs are listed in DT and !disabled */
+        np = of_find_node_by_name(NULL, "cpus");
+        if (np && of_get_available_child_count(np) <= 1)
+                bmips_smp_enabled = 0;
+        of_node_put(np);
+}
+
+int __init plat_of_setup(void)
+{
+        return __dt_register_buses("simple-bus", NULL);
+}
+
+arch_initcall(plat_of_setup);
+
+static int __init plat_dev_init(void)
+{
+        of_clk_init(NULL);
+        return 0;
+}
+
+device_initcall(plat_dev_init);
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 61af6b6ab13d..dc91bde10d62 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -12,6 +12,8 @@
 # Author: Wu Zhangjin <wuzhangjin@gmail.com>
 #
 
+include $(srctree)/arch/mips/Kbuild.platforms
+
 # set the default size of the mallocing area for decompressing
 BOOT_HEAP_SIZE := 0x400000
 
@@ -30,9 +32,10 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
 targets := head.o decompress.o string.o dbg.o uart-16550.o uart-alchemy.o
 
 # decompressor objects (linked with vmlinuz)
-vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/dbg.o
+vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
 
 ifdef CONFIG_DEBUG_ZBOOT
+vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT)                  += $(obj)/dbg.o
 vmlinuzobjs-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
 vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY)                 += $(obj)/uart-alchemy.o
 endif
@@ -66,8 +69,8 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE
 # Calculate the load address of the compressed kernel image
 hostprogs-y := calc_vmlinuz_load_addr
 
-ifeq ($(CONFIG_MACH_JZ4740),y)
-VMLINUZ_LOAD_ADDRESS := 0x80600000
+ifneq ($(zload-y),)
+VMLINUZ_LOAD_ADDRESS := $(zload-y)
 else
 VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
                 $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index 31903cf9709d..54831069a206 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -28,8 +28,13 @@ unsigned long free_mem_end_ptr;
 extern unsigned char __image_begin, __image_end;
 
 /* debug interfaces  */
+#ifdef CONFIG_DEBUG_ZBOOT
 extern void puts(const char *s);
 extern void puthex(unsigned long long val);
+#else
+#define puts(s) do {} while (0)
+#define puthex(val) do {} while (0)
+#endif
 
 void error(char *x)
 {
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 4f49fa477f14..5d95e4bd709a 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,21 +1,12 @@
-dtb-$(CONFIG_BCM3384)                   += bcm93384wvg.dtb
-dtb-$(CONFIG_CAVIUM_OCTEON_SOC)         += octeon_3xxx.dtb octeon_68xx.dtb
-dtb-$(CONFIG_DT_EASY50712)              += easy50712.dtb
-dtb-$(CONFIG_DT_XLP_EVP)                += xlp_evp.dtb
-dtb-$(CONFIG_DT_XLP_SVP)                += xlp_svp.dtb
-dtb-$(CONFIG_DT_XLP_FVP)                += xlp_fvp.dtb
-dtb-$(CONFIG_DT_XLP_GVP)                += xlp_gvp.dtb
-dtb-$(CONFIG_DTB_RT2880_EVAL)           += rt2880_eval.dtb
-dtb-$(CONFIG_DTB_RT305X_EVAL)           += rt3052_eval.dtb
-dtb-$(CONFIG_DTB_RT3883_EVAL)           += rt3883_eval.dtb
-dtb-$(CONFIG_DTB_MT7620A_EVAL)          += mt7620a_eval.dtb
-dtb-$(CONFIG_MIPS_SEAD3)                += sead3.dtb
-
-obj-y           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
-
-targets         += dtbs
-targets         += $(dtb-y)
-
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-
-clean-files     += *.dtb *.dtb.S
+dts-dirs        += brcm
+dts-dirs        += cavium-octeon
+dts-dirs        += lantiq
+dts-dirs        += mti
+dts-dirs        += netlogic
+dts-dirs        += ralink
+
+obj-y           := $(addsuffix /, $(dts-dirs))
+
+always          := $(dtb-y)
+subdir-y        := $(dts-dirs)
+clean-files     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/bcm3384.dtsi b/arch/mips/boot/dts/bcm3384.dtsi
deleted file mode 100644
index 21b074a99c94..000000000000
--- a/arch/mips/boot/dts/bcm3384.dtsi
+++ /dev/null
@@ -1,109 +0,0 @@
-/ {
-        #address-cells = <1>;
-        #size-cells = <1>;
-        compatible = "brcm,bcm3384", "brcm,bcm33843";
-
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                /* On BMIPS5000 this is 1/8th of the CPU core clock */
-                mips-hpt-frequency = <100000000>;
-
-                cpu@0 {
-                        compatible = "brcm,bmips5000";
-                        device_type = "cpu";
-                        reg = <0>;
-                };
-
-                cpu@1 {
-                        compatible = "brcm,bmips5000";
-                        device_type = "cpu";
-                        reg = <1>;
-                };
-        };
-
-        clocks {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                periph_clk: periph_clk@0 {
-                        compatible = "fixed-clock";
-                        #clock-cells = <0>;
-                        clock-frequency = <54000000>;
-                };
-        };
-
-        aliases {
-                uart0 = &uart0;
-        };
-
-        cpu_intc: cpu_intc@0 {
-                #address-cells = <0>;
-                compatible = "mti,cpu-interrupt-controller";
-
-                interrupt-controller;
-                #interrupt-cells = <1>;
-        };
-
-        periph_intc: periph_intc@14e00038 {
-                compatible = "brcm,bcm3384-intc";
-                reg = <0x14e00038 0x8 0x14e00340 0x8>;
-
-                interrupt-controller;
-                #interrupt-cells = <1>;
-
-                interrupt-parent = <&cpu_intc>;
-                interrupts = <4>;
-        };
-
-        zmips_intc: zmips_intc@104b0060 {
-                compatible = "brcm,bcm3384-intc";
-                reg = <0x104b0060 0x8>;
-
-                interrupt-controller;
-                #interrupt-cells = <1>;
-
-                interrupt-parent = <&periph_intc>;
-                interrupts = <29>;
-        };
-
-        iop_intc: iop_intc@14e00058 {
-                compatible = "brcm,bcm3384-intc";
-                reg = <0x14e00058 0x8>;
-
-                interrupt-controller;
-                #interrupt-cells = <1>;
-
-                interrupt-parent = <&cpu_intc>;
-                interrupts = <6>;
-        };
-
-        uart0: serial@14e00520 {
-                compatible = "brcm,bcm6345-uart";
-                reg = <0x14e00520 0x18>;
-                interrupt-parent = <&periph_intc>;
-                interrupts = <2>;
-                clocks = <&periph_clk>;
-                status = "disabled";
-        };
-
-        ehci0: usb@15400300 {
-                compatible = "brcm,bcm3384-ehci", "generic-ehci";
-                reg = <0x15400300 0x100>;
-                big-endian;
-                interrupt-parent = <&periph_intc>;
-                interrupts = <41>;
-                status = "disabled";
-        };
-
-        ohci0: usb@15400400 {
-                compatible = "brcm,bcm3384-ohci", "generic-ohci";
-                reg = <0x15400400 0x100>;
-                big-endian;
-                no-big-frame-no;
-                interrupt-parent = <&periph_intc>;
-                interrupts = <40>;
-                status = "disabled";
-        };
-};
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
new file mode 100644
index 000000000000..1c8353bfe003
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -0,0 +1,19 @@
+dtb-$(CONFIG_DT_BCM93384WVG)            += bcm93384wvg.dtb
+dtb-$(CONFIG_DT_BCM93384WVG_VIPER)      += bcm93384wvg_viper.dtb
+dtb-$(CONFIG_DT_BCM96368MVWG)           += bcm96368mvwg.dtb
+dtb-$(CONFIG_DT_BCM9EJTAGPRB)           += bcm9ejtagprb.dtb
+dtb-$(CONFIG_DT_BCM97125CBMB)           += bcm97125cbmb.dtb
+dtb-$(CONFIG_DT_BCM97346DBSMB)          += bcm97346dbsmb.dtb
+dtb-$(CONFIG_DT_BCM97358SVMB)           += bcm97358svmb.dtb
+dtb-$(CONFIG_DT_BCM97360SVMB)           += bcm97360svmb.dtb
+dtb-$(CONFIG_DT_BCM97362SVMB)           += bcm97362svmb.dtb
+dtb-$(CONFIG_DT_BCM97420C)              += bcm97420c.dtb
+dtb-$(CONFIG_DT_BCM97425SVMB)           += bcm97425svmb.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi b/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
new file mode 100644
index 000000000000..aa406b43c65f
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
@@ -0,0 +1,108 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm3384-viper", "brcm,bcm33843-viper";
+
+        memory@0 {
+                device_type = "memory";
+
+                /* Typical ranges.  The bootloader should fill these in. */
+                reg = <0x06000000 0x02000000>,
+                      <0x0e000000 0x02000000>;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /* 1/2 of the CPU core clock (standard MIPS behavior) */
+                mips-hpt-frequency = <300000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips4350";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                periph_clk: periph_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <54000000>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        ubus {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "brcm,ubus", "simple-bus";
+                ranges;
+                /* No dma-ranges on Viper. */
+
+                periph_intc: periph_intc@14e00048 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x14e00048 0x4 0x14e0004c 0x4>,
+                              <0x14e00350 0x4 0x14e00354 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <4>;
+                };
+
+                cmips_intc: cmips_intc@151f8048 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x151f8048 0x4 0x151f804c 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <30>;
+                        brcm,int-map-mask = <0xffffffff>;
+                };
+
+                uart0: serial@14e00520 {
+                        compatible = "brcm,bcm6345-uart";
+                        reg = <0x14e00520 0x18>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <2>;
+                        clocks = <&periph_clk>;
+                        status = "disabled";
+                };
+
+                ehci0: usb@15400300 {
+                        compatible = "brcm,bcm3384-ehci", "generic-ehci";
+                        reg = <0x15400300 0x100>;
+                        big-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <41>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@15400400 {
+                        compatible = "brcm,bcm3384-ohci", "generic-ohci";
+                        reg = <0x15400400 0x100>;
+                        big-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <40>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi b/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
new file mode 100644
index 000000000000..a7bd8564e9f6
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
@@ -0,0 +1,126 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm3384", "brcm,bcm33843";
+
+        memory@0 {
+                device_type = "memory";
+
+                /* Typical range.  The bootloader should fill this in. */
+                reg = <0x0 0x08000000>;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /* On BMIPS5000 this is 1/8th of the CPU core clock */
+                mips-hpt-frequency = <100000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                periph_clk: periph_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <54000000>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        ubus {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "brcm,ubus", "simple-bus";
+                ranges;
+                dma-ranges = <0x00000000 0x08000000 0x08000000>,
+                             <0x08000000 0x00000000 0x08000000>;
+
+                periph_intc: periph_intc@14e00038 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x14e00038 0x4 0x14e0003c 0x4>,
+                              <0x14e00340 0x4 0x14e00344 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <4>;
+                };
+
+                zmips_intc: zmips_intc@104b0060 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x104b0060 0x4 0x104b0064 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <29>;
+                        brcm,int-map-mask = <0xffffffff>;
+                };
+
+                iop_intc: iop_intc@14e00058 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x14e00058 0x4 0x14e0005c 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <6>;
+                        brcm,int-map-mask = <0xffffffff>;
+                };
+
+                uart0: serial@14e00520 {
+                        compatible = "brcm,bcm6345-uart";
+                        reg = <0x14e00520 0x18>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <2>;
+                        clocks = <&periph_clk>;
+                        status = "disabled";
+                };
+
+                ehci0: usb@15400300 {
+                        compatible = "brcm,bcm3384-ehci", "generic-ehci";
+                        reg = <0x15400300 0x100>;
+                        big-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <41>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@15400400 {
+                        compatible = "brcm,bcm3384-ohci", "generic-ohci";
+                        reg = <0x15400400 0x100>;
+                        big-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <40>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm6328.dtsi b/arch/mips/boot/dts/brcm/bcm6328.dtsi
new file mode 100644
index 000000000000..41891c1e58bd
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@ -0,0 +1,86 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm6328";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <160000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips4350";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips4350";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        clocks {
+                periph_clk: periph_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <50000000>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        ubus {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges;
+
+                periph_intc: periph_intc@10000020 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x10000024 0x4 0x1000002c 0x4>,
+                              <0x10000020 0x4 0x10000028 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>;
+                };
+
+                uart0: serial@10000100 {
+                        compatible = "brcm,bcm6345-uart";
+                        reg = <0x10000100 0x18>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <28>;
+                        clocks = <&periph_clk>;
+                        status = "disabled";
+                };
+
+                timer: timer@10000040 {
+                        compatible = "syscon";
+                        reg = <0x10000040 0x2c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "syscon-reboot";
+                        regmap = <&timer>;
+                        offset = <0x28>;
+                        mask = <0x1>;
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm6368.dtsi b/arch/mips/boot/dts/brcm/bcm6368.dtsi
new file mode 100644
index 000000000000..45152bc22117
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm6368.dtsi
@@ -0,0 +1,93 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm6368";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <200000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips4350";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips4350";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+
+        };
+
+        clocks {
+                periph_clk: periph_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <50000000>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        ubus {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges;
+
+                periph_intc: periph_intc@10000020 {
+                        compatible = "brcm,bcm3380-l2-intc";
+                        reg = <0x10000024 0x4 0x1000002c 0x4>,
+                              <0x10000020 0x4 0x10000028 0x4>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>;
+                };
+
+                uart0: serial@10000100 {
+                        compatible = "brcm,bcm6345-uart";
+                        reg = <0x10000100 0x18>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <2>;
+                        clocks = <&periph_clk>;
+                        status = "disabled";
+                };
+
+                ehci0: usb@10001500 {
+                        compatible = "brcm,bcm6368-ehci", "generic-ehci";
+                        reg = <0x10001500 0x100>;
+                        big-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <7>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@10001600 {
+                        compatible = "brcm,bcm6368-ohci", "generic-ohci";
+                        reg = <0x10001600 0x100>;
+                        big-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <5>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi
new file mode 100644
index 000000000000..1a7efa883c5e
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi
@@ -0,0 +1,139 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7125";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <202500000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips4380";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips4380";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@441400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x441400 0x30>, <0x441600 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>, <3>;
+                };
+
+                sun_l2_intc: sun_l2_intc@401800 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x401800 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <23>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x2f7>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "pci_0",
+                                                     "bsp_0", "rdc_0", "rptd_0",
+                                                     "avd_0", "jtag_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406780 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406780 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <18>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7125-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x60c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,bcm7038-reboot";
+                        syscon = <&sun_top_ctrl 0x8 0x14>;
+                };
+
+                uart0: serial@406b00 {
+                        compatible = "ns16550a";
+                        reg = <0x406b00 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <21>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                ehci0: usb@488300 {
+                        compatible = "brcm,bcm7125-ehci", "generic-ehci";
+                        reg = <0x488300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <60>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@488400 {
+                        compatible = "brcm,bcm7125-ohci", "generic-ohci";
+                        reg = <0x488400 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi
new file mode 100644
index 000000000000..1f30728a3177
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -0,0 +1,224 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7346";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <163125000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@411400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x411400 0x30>, <0x411600 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>, <3>;
+                };
+
+                sun_l2_intc: sun_l2_intc@403000 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x403000 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <51>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x673>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "bsp_0",
+                                                     "rdc_0", "raaga_0",
+                                                     "jtag_0", "svd_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406780 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406780 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <59>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7346-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x51c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,brcmstb-reboot";
+                        syscon = <&sun_top_ctrl 0x304 0x308>;
+                };
+
+                uart0: serial@406900 {
+                        compatible = "ns16550a";
+                        reg = <0x406900 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <64>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@430000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v2";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0x430000 0x4c8c>;
+                        interrupts = <24>, <25>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v2";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,40nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@480300 {
+                        compatible = "brcm,bcm7346-ehci", "generic-ehci";
+                        reg = <0x480300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <68>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@480400 {
+                        compatible = "brcm,bcm7346-ohci", "generic-ohci";
+                        reg = <0x480400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <70>;
+                        status = "disabled";
+                };
+
+                ehci1: usb@480500 {
+                        compatible = "brcm,bcm7346-ehci", "generic-ehci";
+                        reg = <0x480500 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <69>;
+                        status = "disabled";
+                };
+
+                ohci1: usb@480600 {
+                        compatible = "brcm,bcm7346-ohci", "generic-ohci";
+                        reg = <0x480600 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <71>;
+                        status = "disabled";
+                };
+
+                ehci2: usb@490300 {
+                        compatible = "brcm,bcm7346-ehci", "generic-ehci";
+                        reg = <0x490300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <73>;
+                        status = "disabled";
+                };
+
+                ohci2: usb@490400 {
+                        compatible = "brcm,bcm7346-ohci", "generic-ohci";
+                        reg = <0x490400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <75>;
+                        status = "disabled";
+                };
+
+                ehci3: usb@490500 {
+                        compatible = "brcm,bcm7346-ehci", "generic-ehci";
+                        reg = <0x490500 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <74>;
+                        status = "disabled";
+                };
+
+                ohci3: usb@490600 {
+                        compatible = "brcm,bcm7346-ohci", "generic-ohci";
+                        reg = <0x490600 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <76>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi
new file mode 100644
index 000000000000..2c2aa9368f76
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi
@@ -0,0 +1,161 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7358";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <375000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips3300";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@411400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x411400 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>;
+                };
+
+                sun_l2_intc: sun_l2_intc@403000 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x403000 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <48>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x2f3>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "bsp_0",
+                                                     "rdc_0", "raaga_0",
+                                                     "avd_0", "jtag_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406600 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406600 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <56>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7358-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x51c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,brcmstb-reboot";
+                        syscon = <&sun_top_ctrl 0x304 0x308>;
+                };
+
+                uart0: serial@406800 {
+                        compatible = "ns16550a";
+                        reg = <0x406800 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@430000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v2";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0x430000 0x4c8c>;
+                        interrupts = <24>, <25>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v2";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,40nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@480300 {
+                        compatible = "brcm,bcm7358-ehci", "generic-ehci";
+                        reg = <0x480300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <65>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@480400 {
+                        compatible = "brcm,bcm7358-ohci", "generic-ohci";
+                        reg = <0x480400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <66>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi
new file mode 100644
index 000000000000..f23b0aed276f
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi
@@ -0,0 +1,161 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7360";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <375000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips3300";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@411400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x411400 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>;
+                };
+
+                sun_l2_intc: sun_l2_intc@403000 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x403000 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <48>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x2f3>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "bsp_0",
+                                                     "rdc_0", "raaga_0",
+                                                     "avd_0", "jtag_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406600 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406600 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <56>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7360-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x51c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,brcmstb-reboot";
+                        syscon = <&sun_top_ctrl 0x304 0x308>;
+                };
+
+                uart0: serial@406800 {
+                        compatible = "ns16550a";
+                        reg = <0x406800 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@430000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v2";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0x430000 0x4c8c>;
+                        interrupts = <24>, <25>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v2";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,40nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@480300 {
+                        compatible = "brcm,bcm7360-ehci", "generic-ehci";
+                        reg = <0x480300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <65>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@480400 {
+                        compatible = "brcm,bcm7360-ohci", "generic-ohci";
+                        reg = <0x480400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <66>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi
new file mode 100644
index 000000000000..da99db665bbc
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -0,0 +1,167 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7362";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <375000000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips4380";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips4380";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@411400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x411400 0x30>, <0x411600 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>, <3>;
+                };
+
+                sun_l2_intc: sun_l2_intc@403000 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x403000 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <48>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x2f3>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "bsp_0",
+                                                     "rdc_0", "raaga_0",
+                                                     "avd_0", "jtag_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406600 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406600 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <56>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7362-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x51c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,brcmstb-reboot";
+                        syscon = <&sun_top_ctrl 0x304 0x308>;
+                };
+
+                uart0: serial@406800 {
+                        compatible = "ns16550a";
+                        reg = <0x406800 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@430000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v2";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0x430000 0x4c8c>;
+                        interrupts = <24>, <25>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v2";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,40nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@480300 {
+                        compatible = "brcm,bcm7362-ehci", "generic-ehci";
+                        reg = <0x480300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <65>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@480400 {
+                        compatible = "brcm,bcm7362-ohci", "generic-ohci";
+                        reg = <0x480400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <66>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi
new file mode 100644
index 000000000000..5f55d0a50a28
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi
@@ -0,0 +1,184 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7420";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <93750000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@441400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x441400 0x30>, <0x441600 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>, <3>;
+                };
+
+                sun_l2_intc: sun_l2_intc@401800 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x401800 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <23>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x3ff>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "pci_0",
+                                                     "pcie_0", "bsp_0", "rdc_0",
+                                                     "rptd_0", "avd_0", "avd_1",
+                                                     "jtag_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406780 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406780 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <18>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7420-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x60c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,bcm7038-reboot";
+                        syscon = <&sun_top_ctrl 0x8 0x14>;
+                };
+
+                uart0: serial@406b00 {
+                        compatible = "ns16550a";
+                        reg = <0x406b00 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <21>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@468000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v1";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0x468000 0x3c8c>;
+                        interrupts = <69>, <79>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v1";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,65nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@488300 {
+                        compatible = "brcm,bcm7420-ehci", "generic-ehci";
+                        reg = <0x488300 0x100>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <60>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@488400 {
+                        compatible = "brcm,bcm7420-ohci", "generic-ohci";
+                        reg = <0x488400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        status = "disabled";
+                };
+
+                ehci1: usb@488500 {
+                        compatible = "brcm,bcm7420-ehci", "generic-ehci";
+                        reg = <0x488500 0x100>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <55>;
+                        status = "disabled";
+                };
+
+                ohci1: usb@488600 {
+                        compatible = "brcm,bcm7420-ohci", "generic-ohci";
+                        reg = <0x488600 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <62>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi
new file mode 100644
index 000000000000..5b660b617ead
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -0,0 +1,225 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "brcm,bcm7425";
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                mips-hpt-frequency = <163125000>;
+
+                cpu@0 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,bmips5000";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        aliases {
+                uart0 = &uart0;
+        };
+
+        cpu_intc: cpu_intc {
+                #address-cells = <0>;
+                compatible = "mti,cpu-interrupt-controller";
+
+                interrupt-controller;
+                #interrupt-cells = <1>;
+        };
+
+        clocks {
+                uart_clk: uart_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <81000000>;
+                };
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                compatible = "simple-bus";
+                ranges = <0 0x10000000 0x01000000>;
+
+                periph_intc: periph_intc@41a400 {
+                        compatible = "brcm,bcm7038-l1-intc";
+                        reg = <0x41a400 0x30>, <0x41a600 0x30>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpu_intc>;
+                        interrupts = <2>, <3>;
+                };
+
+                sun_l2_intc: sun_l2_intc@403000 {
+                        compatible = "brcm,l2-intc";
+                        reg = <0x403000 0x30>;
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <47>;
+                };
+
+                gisb-arb@400000 {
+                        compatible = "brcm,bcm7400-gisb-arb";
+                        reg = <0x400000 0xdc>;
+                        native-endian;
+                        interrupt-parent = <&sun_l2_intc>;
+                        interrupts = <0>, <2>;
+                        brcm,gisb-arb-master-mask = <0x177b>;
+                        brcm,gisb-arb-master-names = "ssp_0", "cpu_0", "pcie_0",
+                                                     "bsp_0", "rdc_0",
+                                                     "raaga_0", "avd_1",
+                                                     "jtag_0", "svd_0",
+                                                     "vice_0";
+                };
+
+                upg_irq0_intc: upg_irq0_intc@406780 {
+                        compatible = "brcm,bcm7120-l2-intc";
+                        reg = <0x406780 0x8>;
+
+                        brcm,int-map-mask = <0x44>;
+                        brcm,int-fwd-mask = <0x70000>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <55>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7425-sun-top-ctrl", "syscon";
+                        reg = <0x404000 0x51c>;
+                        little-endian;
+                };
+
+                reboot {
+                        compatible = "brcm,brcmstb-reboot";
+                        syscon = <&sun_top_ctrl 0x304 0x308>;
+                };
+
+                uart0: serial@406b00 {
+                        compatible = "ns16550a";
+                        reg = <0x406b00 0x20>;
+                        reg-io-width = <0x4>;
+                        reg-shift = <0x2>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <61>;
+                        clocks = <&uart_clk>;
+                        status = "disabled";
+                };
+
+                enet0: ethernet@b80000 {
+                        phy-mode = "internal";
+                        phy-handle = <&phy1>;
+                        mac-address = [ 00 10 18 36 23 1a ];
+                        compatible = "brcm,genet-v3";
+                        #address-cells = <0x1>;
+                        #size-cells = <0x1>;
+                        reg = <0xb80000 0x11c88>;
+                        interrupts = <17>, <18>;
+                        interrupt-parent = <&periph_intc>;
+                        status = "disabled";
+
+                        mdio@e14 {
+                                compatible = "brcm,genet-mdio-v3";
+                                #address-cells = <0x1>;
+                                #size-cells = <0x0>;
+                                reg = <0xe14 0x8>;
+
+                                phy1: ethernet-phy@1 {
+                                        max-speed = <100>;
+                                        reg = <0x1>;
+                                        compatible = "brcm,40nm-ephy",
+                                                "ethernet-phy-ieee802.3-c22";
+                                };
+                        };
+                };
+
+                ehci0: usb@480300 {
+                        compatible = "brcm,bcm7425-ehci", "generic-ehci";
+                        reg = <0x480300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <65>;
+                        status = "disabled";
+                };
+
+                ohci0: usb@480400 {
+                        compatible = "brcm,bcm7425-ohci", "generic-ohci";
+                        reg = <0x480400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <67>;
+                        status = "disabled";
+                };
+
+                ehci1: usb@480500 {
+                        compatible = "brcm,bcm7425-ehci", "generic-ehci";
+                        reg = <0x480500 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <66>;
+                        status = "disabled";
+                };
+
+                ohci1: usb@480600 {
+                        compatible = "brcm,bcm7425-ohci", "generic-ohci";
+                        reg = <0x480600 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <68>;
+                        status = "disabled";
+                };
+
+                ehci2: usb@490300 {
+                        compatible = "brcm,bcm7425-ehci", "generic-ehci";
+                        reg = <0x490300 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <70>;
+                        status = "disabled";
+                };
+
+                ohci2: usb@490400 {
+                        compatible = "brcm,bcm7425-ohci", "generic-ohci";
+                        reg = <0x490400 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <72>;
+                        status = "disabled";
+                };
+
+                ehci3: usb@490500 {
+                        compatible = "brcm,bcm7425-ehci", "generic-ehci";
+                        reg = <0x490500 0x100>;
+                        native-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <71>;
+                        status = "disabled";
+                };
+
+                ohci3: usb@490600 {
+                        compatible = "brcm,bcm7425-ohci", "generic-ohci";
+                        reg = <0x490600 0x100>;
+                        native-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <73>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/mips/boot/dts/bcm93384wvg.dts b/arch/mips/boot/dts/brcm/bcm93384wvg.dts
index 831741179212..d1e44a17d41a 100644
--- a/arch/mips/boot/dts/bcm93384wvg.dts
+++ b/arch/mips/boot/dts/brcm/bcm93384wvg.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "bcm3384.dtsi"
+/include/ "bcm3384_zephyr.dtsi"
 
 / {
         compatible = "brcm,bcm93384wvg", "brcm,bcm3384";
@@ -10,13 +10,6 @@
                 bootargs = "console=ttyS0,115200";
                 stdout-path = &uart0;
         };
-
-        memory@0 {
-                device_type = "memory";
-                reg = <0x0 0x04000000>;
-                dma-xor-mask = <0x08000000>;
-                dma-xor-limit = <0x0fffffff>;
-        };
 };
 
 &uart0 {
diff --git a/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts b/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
new file mode 100644
index 000000000000..1ecb2696aca8
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
@@ -0,0 +1,25 @@
+/dts-v1/;
+
+/include/ "bcm3384_viper.dtsi"
+
+/ {
+        compatible = "brcm,bcm93384wvg-viper", "brcm,bcm3384-viper";
+        model = "Broadcom BCM93384WVG-viper";
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm96368mvwg.dts b/arch/mips/boot/dts/brcm/bcm96368mvwg.dts
new file mode 100644
index 000000000000..0e890c28fe5c
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm96368mvwg.dts
@@ -0,0 +1,31 @@
+/dts-v1/;
+
+/include/ "bcm6368.dtsi"
+
+/ {
+        compatible = "brcm,bcm96368mvwg", "brcm,bcm6368";
+        model = "Broadcom BCM96368MVWG";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x04000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+/* FIXME: need to set up USB_CTRL registers first */
+&ehci0 {
+        status = "disabled";
+};
+
+&ohci0 {
+        status = "disabled";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97125cbmb.dts b/arch/mips/boot/dts/brcm/bcm97125cbmb.dts
new file mode 100644
index 000000000000..e046b1109eab
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97125cbmb.dts
@@ -0,0 +1,31 @@
+/dts-v1/;
+
+/include/ "bcm7125.dtsi"
+
+/ {
+        compatible = "brcm,bcm97125cbmb", "brcm,bcm7125";
+        model = "Broadcom BCM97125CBMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+/* FIXME: USB is wonky; disable it for now */
+&ehci0 {
+        status = "disabled";
+};
+
+&ohci0 {
+        status = "disabled";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts b/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
new file mode 100644
index 000000000000..70f196d89d26
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
@@ -0,0 +1,58 @@
+/dts-v1/;
+
+/include/ "bcm7346.dtsi"
+
+/ {
+        compatible = "brcm,bcm97346dbsmb", "brcm,bcm7346";
+        model = "Broadcom BCM97346DBSMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>, <0x20000000 0x30000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&enet0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
+
+&ehci2 {
+        status = "okay";
+};
+
+&ohci2 {
+        status = "okay";
+};
+
+&ehci3 {
+        status = "okay";
+};
+
+&ohci3 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97358svmb.dts b/arch/mips/boot/dts/brcm/bcm97358svmb.dts
new file mode 100644
index 000000000000..d18e6d947739
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97358svmb.dts
@@ -0,0 +1,34 @@
+/dts-v1/;
+
+/include/ "bcm7358.dtsi"
+
+/ {
+        compatible = "brcm,bcm97358svmb", "brcm,bcm7358";
+        model = "Broadcom BCM97358SVMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&enet0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97360svmb.dts b/arch/mips/boot/dts/brcm/bcm97360svmb.dts
new file mode 100644
index 000000000000..4fe515500102
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97360svmb.dts
@@ -0,0 +1,34 @@
+/dts-v1/;
+
+/include/ "bcm7360.dtsi"
+
+/ {
+        compatible = "brcm,bcm97360svmb", "brcm,bcm7360";
+        model = "Broadcom BCM97360SVMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&enet0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97362svmb.dts b/arch/mips/boot/dts/brcm/bcm97362svmb.dts
new file mode 100644
index 000000000000..b7b88e5dc9e7
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97362svmb.dts
@@ -0,0 +1,34 @@
+/dts-v1/;
+
+/include/ "bcm7362.dtsi"
+
+/ {
+        compatible = "brcm,bcm97362svmb", "brcm,bcm7362";
+        model = "Broadcom BCM97362SVMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>, <0x20000000 0x30000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&enet0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97420c.dts b/arch/mips/boot/dts/brcm/bcm97420c.dts
new file mode 100644
index 000000000000..67fe1f3a3891
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97420c.dts
@@ -0,0 +1,45 @@
+/dts-v1/;
+
+/include/ "bcm7420.dtsi"
+
+/ {
+        compatible = "brcm,bcm97420c", "brcm,bcm7420";
+        model = "Broadcom BCM97420C";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>,
+                      <0x20000000 0x30000000>,
+                      <0x60000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+/* FIXME: MAC driver comes up but cannot attach to PHY */
+&enet0 {
+        status = "disabled";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm97425svmb.dts b/arch/mips/boot/dts/brcm/bcm97425svmb.dts
new file mode 100644
index 000000000000..689c68a4f9c8
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm97425svmb.dts
@@ -0,0 +1,60 @@
+/dts-v1/;
+
+/include/ "bcm7425.dtsi"
+
+/ {
+        compatible = "brcm,bcm97425svmb", "brcm,bcm7425";
+        model = "Broadcom BCM97425SVMB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>,
+                      <0x20000000 0x30000000>,
+                      <0x90000000 0x40000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&enet0 {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
+
+&ehci2 {
+        status = "okay";
+};
+
+&ohci2 {
+        status = "okay";
+};
+
+&ehci3 {
+        status = "okay";
+};
+
+&ohci3 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts b/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
new file mode 100644
index 000000000000..1da4608680aa
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
@@ -0,0 +1,22 @@
+/dts-v1/;
+
+/include/ "bcm6328.dtsi"
+
+/ {
+        compatible = "brcm,bcm9ejtagprb", "brcm,bcm6328";
+        model = "Broadcom BCM9EJTAGPRB";
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x00000000 0x08000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+                stdout-path = &uart0;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/mips/boot/dts/cavium-octeon/Makefile b/arch/mips/boot/dts/cavium-octeon/Makefile
new file mode 100644
index 000000000000..5b99c40a058f
--- /dev/null
+++ b/arch/mips/boot/dts/cavium-octeon/Makefile
@@ -0,0 +1,9 @@
+dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/octeon_3xxx.dts b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
index fa33115bde33..9c48e0586ba7 100644
--- a/arch/mips/boot/dts/octeon_3xxx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
@@ -587,4 +587,16 @@
                 usbn = &usbn;
                 led0 = &led0;
         };
+
+        dsr1000n-leds {
+                compatible = "gpio-leds";
+                usb1 {
+                        label = "usb1";
+                        gpios = <&gpio 9 1>; /* Active low */
+                };
+                usb2 {
+                        label = "usb2";
+                        gpios = <&gpio 10 1>; /* Active low */
+                };
+        };
  };
diff --git a/arch/mips/boot/dts/octeon_68xx.dts b/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
index 79b46fcb0a11..79b46fcb0a11 100644
--- a/arch/mips/boot/dts/octeon_68xx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
diff --git a/arch/mips/boot/dts/lantiq/Makefile b/arch/mips/boot/dts/lantiq/Makefile
new file mode 100644
index 000000000000..0906c62141b9
--- /dev/null
+++ b/arch/mips/boot/dts/lantiq/Makefile
@@ -0,0 +1,9 @@
+dtb-$(CONFIG_DT_EASY50712)      += easy50712.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/danube.dtsi b/arch/mips/boot/dts/lantiq/danube.dtsi
index d4c59e003708..d4c59e003708 100644
--- a/arch/mips/boot/dts/danube.dtsi
+++ b/arch/mips/boot/dts/lantiq/danube.dtsi
diff --git a/arch/mips/boot/dts/easy50712.dts b/arch/mips/boot/dts/lantiq/easy50712.dts
index 143b8a37b5e4..143b8a37b5e4 100644
--- a/arch/mips/boot/dts/easy50712.dts
+++ b/arch/mips/boot/dts/lantiq/easy50712.dts
diff --git a/arch/mips/boot/dts/mti/Makefile b/arch/mips/boot/dts/mti/Makefile
new file mode 100644
index 000000000000..ef1f3dbed033
--- /dev/null
+++ b/arch/mips/boot/dts/mti/Makefile
@@ -0,0 +1,9 @@
+dtb-$(CONFIG_MIPS_SEAD3)        += sead3.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/sead3.dts b/arch/mips/boot/dts/mti/sead3.dts
index e4b317d414f1..e4b317d414f1 100644
--- a/arch/mips/boot/dts/sead3.dts
+++ b/arch/mips/boot/dts/mti/sead3.dts
diff --git a/arch/mips/boot/dts/netlogic/Makefile b/arch/mips/boot/dts/netlogic/Makefile
new file mode 100644
index 000000000000..9868057140b5
--- /dev/null
+++ b/arch/mips/boot/dts/netlogic/Makefile
@@ -0,0 +1,13 @@
+dtb-$(CONFIG_DT_XLP_EVP)        += xlp_evp.dtb
+dtb-$(CONFIG_DT_XLP_SVP)        += xlp_svp.dtb
+dtb-$(CONFIG_DT_XLP_FVP)        += xlp_fvp.dtb
+dtb-$(CONFIG_DT_XLP_GVP)        += xlp_gvp.dtb
+dtb-$(CONFIG_DT_XLP_RVP)        += xlp_rvp.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/xlp_evp.dts b/arch/mips/boot/dts/netlogic/xlp_evp.dts
index 89ad04808c02..89ad04808c02 100644
--- a/arch/mips/boot/dts/xlp_evp.dts
+++ b/arch/mips/boot/dts/netlogic/xlp_evp.dts
diff --git a/arch/mips/boot/dts/xlp_fvp.dts b/arch/mips/boot/dts/netlogic/xlp_fvp.dts
index 63e62b7bd758..63e62b7bd758 100644
--- a/arch/mips/boot/dts/xlp_fvp.dts
+++ b/arch/mips/boot/dts/netlogic/xlp_fvp.dts
diff --git a/arch/mips/boot/dts/xlp_gvp.dts b/arch/mips/boot/dts/netlogic/xlp_gvp.dts
index bb4ecd1d47fc..bb4ecd1d47fc 100644
--- a/arch/mips/boot/dts/xlp_gvp.dts
+++ b/arch/mips/boot/dts/netlogic/xlp_gvp.dts
diff --git a/arch/mips/boot/dts/netlogic/xlp_rvp.dts b/arch/mips/boot/dts/netlogic/xlp_rvp.dts
new file mode 100644
index 000000000000..7188aed2ea2e
--- /dev/null
+++ b/arch/mips/boot/dts/netlogic/xlp_rvp.dts
@@ -0,0 +1,77 @@
+/*
+ * XLP5XX Device Tree Source for RVP boards
+ */
+
+/dts-v1/;
+/ {
+        model = "netlogic,XLP-RVP";
+        compatible = "netlogic,xlp";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        soc {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                          1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+                serial0: serial@30000 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0 0x112100 0xa00>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clock-frequency = <125000000>;
+                        interrupt-parent = <&pic>;
+                        interrupts = <17>;
+                };
+                pic: pic@110000 {
+                        compatible = "netlogic,xlp-pic";
+                        #address-cells = <0>;
+                        #interrupt-cells = <1>;
+                        reg = <0 0x110000 0x200>;
+                        interrupt-controller;
+                };
+
+                nor_flash@1,0 {
+                        compatible = "cfi-flash";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        bank-width = <2>;
+                        reg = <1 0 0x1000000>;
+
+                        partition@0 {
+                                label = "x-loader";
+                                reg = <0x0 0x100000>; /* 1M */
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "u-boot";
+                                reg = <0x100000 0x100000>; /* 1M */
+                        };
+
+                        partition@200000 {
+                                label = "kernel";
+                                reg = <0x200000 0x500000>; /* 5M */
+                        };
+
+                        partition@700000 {
+                                label = "rootfs";
+                                reg = <0x700000 0x800000>; /* 8M */
+                        };
+
+                        partition@f00000 {
+                                label = "env";
+                                reg = <0xf00000 0x100000>; /* 1M */
+                                read-only;
+                        };
+                };
+
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+        };
+};
diff --git a/arch/mips/boot/dts/xlp_svp.dts b/arch/mips/boot/dts/netlogic/xlp_svp.dts
index 1ebd00edaacc..1ebd00edaacc 100644
--- a/arch/mips/boot/dts/xlp_svp.dts
+++ b/arch/mips/boot/dts/netlogic/xlp_svp.dts
diff --git a/arch/mips/boot/dts/ralink/Makefile b/arch/mips/boot/dts/ralink/Makefile
new file mode 100644
index 000000000000..2a7225954bf6
--- /dev/null
+++ b/arch/mips/boot/dts/ralink/Makefile
@@ -0,0 +1,12 @@
+dtb-$(CONFIG_DTB_RT2880_EVAL)   += rt2880_eval.dtb
+dtb-$(CONFIG_DTB_RT305X_EVAL)   += rt3052_eval.dtb
+dtb-$(CONFIG_DTB_RT3883_EVAL)   += rt3883_eval.dtb
+dtb-$(CONFIG_DTB_MT7620A_EVAL)  += mt7620a_eval.dtb
+
+obj-y                           += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+
+# Force kbuild to make empty built-in.o if necessary
+obj-                            += dummy.o
+
+always                          := $(dtb-y)
+clean-files                     := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/mt7620a.dtsi b/arch/mips/boot/dts/ralink/mt7620a.dtsi
index 08bf24fefe9f..08bf24fefe9f 100644
--- a/arch/mips/boot/dts/mt7620a.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7620a.dtsi
diff --git a/arch/mips/boot/dts/mt7620a_eval.dts b/arch/mips/boot/dts/ralink/mt7620a_eval.dts
index 709f58132f5c..709f58132f5c 100644
--- a/arch/mips/boot/dts/mt7620a_eval.dts
+++ b/arch/mips/boot/dts/ralink/mt7620a_eval.dts
diff --git a/arch/mips/boot/dts/rt2880.dtsi b/arch/mips/boot/dts/ralink/rt2880.dtsi
index 182afde2f2e1..182afde2f2e1 100644
--- a/arch/mips/boot/dts/rt2880.dtsi
+++ b/arch/mips/boot/dts/ralink/rt2880.dtsi
diff --git a/arch/mips/boot/dts/rt2880_eval.dts b/arch/mips/boot/dts/ralink/rt2880_eval.dts
index 0a685db093d4..0a685db093d4 100644
--- a/arch/mips/boot/dts/rt2880_eval.dts
+++ b/arch/mips/boot/dts/ralink/rt2880_eval.dts
diff --git a/arch/mips/boot/dts/rt3050.dtsi b/arch/mips/boot/dts/ralink/rt3050.dtsi
index e3203d414fee..e3203d414fee 100644
--- a/arch/mips/boot/dts/rt3050.dtsi
+++ b/arch/mips/boot/dts/ralink/rt3050.dtsi
diff --git a/arch/mips/boot/dts/rt3052_eval.dts b/arch/mips/boot/dts/ralink/rt3052_eval.dts
index ec9e9a035541..ec9e9a035541 100644
--- a/arch/mips/boot/dts/rt3052_eval.dts
+++ b/arch/mips/boot/dts/ralink/rt3052_eval.dts
diff --git a/arch/mips/boot/dts/rt3883.dtsi b/arch/mips/boot/dts/ralink/rt3883.dtsi
index 3b131dd0d5ac..3b131dd0d5ac 100644
--- a/arch/mips/boot/dts/rt3883.dtsi
+++ b/arch/mips/boot/dts/ralink/rt3883.dtsi
diff --git a/arch/mips/boot/dts/rt3883_eval.dts b/arch/mips/boot/dts/ralink/rt3883_eval.dts
index e8df21a5d10d..e8df21a5d10d 100644
--- a/arch/mips/boot/dts/rt3883_eval.dts
+++ b/arch/mips/boot/dts/ralink/rt3883_eval.dts
diff --git a/arch/mips/cavium-octeon/crypto/octeon-crypto.h b/arch/mips/cavium-octeon/crypto/octeon-crypto.h
index 355072535110..7315cc307397 100644
--- a/arch/mips/cavium-octeon/crypto/octeon-crypto.h
+++ b/arch/mips/cavium-octeon/crypto/octeon-crypto.h
@@ -33,7 +33,7 @@ do {							\
         __asm__ __volatile__ (                          \
         "dmtc2 %[rt],0x0048+" STR(index)                \
         :                                               \
-        : [rt] "d" (value));                            \
+        : [rt] "d" (cpu_to_be64(value)));               \
 } while (0)
 
 /*
@@ -48,7 +48,7 @@ do {							\
         : [rt] "=d" (__value)                           \
         : );                                            \
                                                         \
-        __value;                                        \
+        be64_to_cpu(__value);                           \
 })
 
 /*
@@ -59,7 +59,7 @@ do {							\
         __asm__ __volatile__ (                          \
         "dmtc2 %[rt],0x0040+" STR(index)                \
         :                                               \
-        : [rt] "d" (value));                            \
+        : [rt] "d" (cpu_to_be64(value)));               \
 } while (0)
 
 /*
@@ -70,6 +70,80 @@ do {							\
         __asm__ __volatile__ (                          \
         "dmtc2 %[rt],0x4047"                            \
         :                                               \
+        : [rt] "d" (cpu_to_be64(value)));               \
+} while (0)
+
+/*
+ * The value is the final block dword (64-bit).
+ */
+#define octeon_sha1_start(value)                        \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+        "dmtc2 %[rt],0x4057"                            \
+        :                                               \
+        : [rt] "d" (value));                            \
+} while (0)
+
+/*
+ * The value is the final block dword (64-bit).
+ */
+#define octeon_sha256_start(value)                      \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+        "dmtc2 %[rt],0x404f"                            \
+        :                                               \
+        : [rt] "d" (value));                            \
+} while (0)
+
+/*
+ * Macros needed to implement SHA512:
+ */
+
+/*
+ * The index can be 0-7.
+ */
+#define write_octeon_64bit_hash_sha512(value, index)    \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+        "dmtc2 %[rt],0x0250+" STR(index)                \
+        :                                               \
+        : [rt] "d" (value));                            \
+} while (0)
+
+/*
+ * The index can be 0-7.
+ */
+#define read_octeon_64bit_hash_sha512(index)            \
+({                                                      \
+        u64 __value;                                    \
+                                                        \
+        __asm__ __volatile__ (                          \
+        "dmfc2 %[rt],0x0250+" STR(index)                \
+        : [rt] "=d" (__value)                           \
+        : );                                            \
+                                                        \
+        __value;                                        \
+})
+
+/*
+ * The index can be 0-14.
+ */
+#define write_octeon_64bit_block_sha512(value, index)   \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+        "dmtc2 %[rt],0x0240+" STR(index)                \
+        :                                               \
+        : [rt] "d" (value));                            \
+} while (0)
+
+/*
+ * The value is the final block word (64-bit).
+ */
+#define octeon_sha512_start(value)                      \
+do {                                                    \
+        __asm__ __volatile__ (                          \
+        "dmtc2 %[rt],0x424f"                            \
+        :                                               \
         : [rt] "d" (value));                            \
 } while (0)
 
diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index 7d8987818ccf..d8960d46417b 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -306,7 +306,7 @@ void __init plat_swiotlb_setup(void)
                 swiotlbsize = 64 * (1<<20);
         }
 #endif
-#ifdef CONFIG_USB_OCTEON_OHCI
+#ifdef CONFIG_USB_OHCI_HCD_PLATFORM
         /* OCTEON II ohci is only 32-bit. */
         if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul)
                 swiotlbsize = 64 * (1<<20);
diff --git a/arch/mips/cavium-octeon/executive/cvmx-l2c.c b/arch/mips/cavium-octeon/executive/cvmx-l2c.c
index 42e38c30b540..89b5273299ab 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-l2c.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-l2c.c
@@ -519,44 +519,89 @@ int cvmx_l2c_unlock_mem_region(uint64_t start, uint64_t len)
 union __cvmx_l2c_tag {
         uint64_t u64;
         struct cvmx_l2c_tag_cn50xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:40;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:20;       /* Phys mem addr (33..14) */
+#else
+                uint64_t addr:20;       /* Phys mem addr (33..14) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:40;
+#endif
         } cn50xx;
         struct cvmx_l2c_tag_cn30xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:41;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:19;       /* Phys mem addr (33..15) */
+#else
+                uint64_t addr:19;       /* Phys mem addr (33..15) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:41;
+#endif
         } cn30xx;
         struct cvmx_l2c_tag_cn31xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:42;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:18;       /* Phys mem addr (33..16) */
+#else
+                uint64_t addr:18;       /* Phys mem addr (33..16) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:42;
+#endif
         } cn31xx;
         struct cvmx_l2c_tag_cn38xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:43;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:17;       /* Phys mem addr (33..17) */
+#else
+                uint64_t addr:17;       /* Phys mem addr (33..17) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:43;
+#endif
         } cn38xx;
         struct cvmx_l2c_tag_cn58xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:44;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:16;       /* Phys mem addr (33..18) */
+#else
+                uint64_t addr:16;       /* Phys mem addr (33..18) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:44;
+#endif
         } cn58xx;
         struct cvmx_l2c_tag_cn58xx cn56xx;      /* 2048 sets */
         struct cvmx_l2c_tag_cn31xx cn52xx;      /* 512 sets */
diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
index 237e5b1a72d8..a5e8f4a784af 100644
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -8,9 +8,11 @@
  * Copyright (C) 2007, 2008 Cavium Networks
  */
 #include <linux/kernel.h>
-#include <linux/export.h>
+#include <linux/module.h>
+#include <linux/semaphore.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
+#include <linux/of_platform.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/octeon/octeon.h>
@@ -25,19 +27,62 @@ static const char *part_probe_types[] = {
         NULL
 };
 
+static map_word octeon_flash_map_read(struct map_info *map, unsigned long ofs)
+{
+        map_word r;
+
+        down(&octeon_bootbus_sem);
+        r = inline_map_read(map, ofs);
+        up(&octeon_bootbus_sem);
+
+        return r;
+}
+
+static void octeon_flash_map_write(struct map_info *map, const map_word datum,
+                                   unsigned long ofs)
+{
+        down(&octeon_bootbus_sem);
+        inline_map_write(map, datum, ofs);
+        up(&octeon_bootbus_sem);
+}
+
+static void octeon_flash_map_copy_from(struct map_info *map, void *to,
+                                       unsigned long from, ssize_t len)
+{
+        down(&octeon_bootbus_sem);
+        inline_map_copy_from(map, to, from, len);
+        up(&octeon_bootbus_sem);
+}
+
+static void octeon_flash_map_copy_to(struct map_info *map, unsigned long to,
+                                     const void *from, ssize_t len)
+{
+        down(&octeon_bootbus_sem);
+        inline_map_copy_to(map, to, from, len);
+        up(&octeon_bootbus_sem);
+}
+
 /**
  * Module/ driver initialization.
  *
  * Returns Zero on success
  */
-static int __init flash_init(void)
+static int octeon_flash_probe(struct platform_device *pdev)
 {
+        union cvmx_mio_boot_reg_cfgx region_cfg;
+        u32 cs;
+        int r;
+        struct device_node *np = pdev->dev.of_node;
+
+        r = of_property_read_u32(np, "reg", &cs);
+        if (r)
+                return r;
+
         /*
          * Read the bootbus region 0 setup to determine the base
          * address of the flash.
          */
-        union cvmx_mio_boot_reg_cfgx region_cfg;
-        region_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(0));
+        region_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(cs));
         if (region_cfg.s.en) {
                 /*
                  * The bootloader always takes the flash and sets its
@@ -56,7 +101,11 @@ static int __init flash_init(void)
                 flash_map.virt = ioremap(flash_map.phys, flash_map.size);
                 pr_notice("Bootbus flash: Setting flash for %luMB flash at "
                           "0x%08llx\n", flash_map.size >> 20, flash_map.phys);
-                simple_map_init(&flash_map);
+                WARN_ON(!map_bankwidth_supported(flash_map.bankwidth));
+                flash_map.read = octeon_flash_map_read;
+                flash_map.write = octeon_flash_map_write;
+                flash_map.copy_from = octeon_flash_map_copy_from;
+                flash_map.copy_to = octeon_flash_map_copy_to;
                 mymtd = do_map_probe("cfi_probe", &flash_map);
                 if (mymtd) {
                         mymtd->owner = THIS_MODULE;
@@ -69,4 +118,26 @@ static int __init flash_init(void)
         return 0;
 }
 
-late_initcall(flash_init);
+static const struct of_device_id of_flash_match[] = {
+        {
+                .compatible     = "cfi-flash",
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, of_flash_match);
+
+static struct platform_driver of_flash_driver = {
+        .driver = {
+                .name = "octeon-of-flash",
+                .of_match_table = of_flash_match,
+        },
+        .probe          = octeon_flash_probe,
+};
+
+static int octeon_flash_init(void)
+{
+        return platform_driver_register(&of_flash_driver);
+}
+late_initcall(octeon_flash_init);
+
+MODULE_LICENSE("GPL");
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index 12410a2788d8..d113c8ded6e2 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -325,8 +325,14 @@ static void __init octeon_ehci_hw_start(struct device *dev)
         /* Use 64-bit addressing. */
         ehci_ctl.s.ehci_64b_addr_en = 1;
         ehci_ctl.s.l2c_addr_msb = 0;
+#ifdef __BIG_ENDIAN
         ehci_ctl.s.l2c_buff_emod = 1; /* Byte swapped. */
         ehci_ctl.s.l2c_desc_emod = 1; /* Byte swapped. */
+#else
+        ehci_ctl.s.l2c_buff_emod = 0; /* not swapped. */
+        ehci_ctl.s.l2c_desc_emod = 0; /* not swapped. */
+        ehci_ctl.s.inv_reg_a2 = 1;
+#endif
         cvmx_write_csr(CVMX_UCTLX_EHCI_CTL(0), ehci_ctl.u64);
 
         octeon2_usb_clocks_stop();
@@ -381,8 +387,14 @@ static void __init octeon_ohci_hw_start(struct device *dev)
 
         ohci_ctl.u64 = cvmx_read_csr(CVMX_UCTLX_OHCI_CTL(0));
         ohci_ctl.s.l2c_addr_msb = 0;
+#ifdef __BIG_ENDIAN
         ohci_ctl.s.l2c_buff_emod = 1; /* Byte swapped. */
         ohci_ctl.s.l2c_desc_emod = 1; /* Byte swapped. */
+#else
+        ohci_ctl.s.l2c_buff_emod = 0; /* not swapped. */
+        ohci_ctl.s.l2c_desc_emod = 0; /* not swapped. */
+        ohci_ctl.s.inv_reg_a2 = 1;
+#endif
         cvmx_write_csr(CVMX_UCTLX_OHCI_CTL(0), ohci_ctl.u64);
 
         octeon2_usb_clocks_stop();
@@ -958,6 +970,13 @@ end_led:
                 }
         }
 
+        if (octeon_bootinfo->board_type != CVMX_BOARD_TYPE_CUST_DSR1000N) {
+                int dsr1000n_leds = fdt_path_offset(initial_boot_params,
+                                                    "/dsr1000n-leds");
+                if (dsr1000n_leds >= 0)
+                        fdt_nop_node(initial_boot_params, dsr1000n_leds);
+        }
+
         return 0;
 }
 
diff --git a/arch/mips/cavium-octeon/octeon_boot.h b/arch/mips/cavium-octeon/octeon_boot.h
index 7b066bbca86d..a6ce7c43e0ae 100644
--- a/arch/mips/cavium-octeon/octeon_boot.h
+++ b/arch/mips/cavium-octeon/octeon_boot.h
@@ -37,11 +37,13 @@ struct boot_init_vector {
 
 /* similar to bootloader's linux_app_boot_info but without global data */
 struct linux_app_boot_info {
+#ifdef __BIG_ENDIAN_BITFIELD
         uint32_t labi_signature;
         uint32_t start_core0_addr;
         uint32_t avail_coremask;
         uint32_t pci_console_active;
         uint32_t icache_prefetch_disable;
+        uint32_t padding;
         uint64_t InitTLBStart_addr;
         uint32_t start_app_addr;
         uint32_t cur_exception_base;
@@ -49,6 +51,27 @@ struct linux_app_boot_info {
         uint32_t compact_flash_common_base_addr;
         uint32_t compact_flash_attribute_base_addr;
         uint32_t led_display_base_addr;
+#else
+        uint32_t start_core0_addr;
+        uint32_t labi_signature;
+
+        uint32_t pci_console_active;
+        uint32_t avail_coremask;
+
+        uint32_t padding;
+        uint32_t icache_prefetch_disable;
+
+        uint64_t InitTLBStart_addr;
+
+        uint32_t cur_exception_base;
+        uint32_t start_app_addr;
+
+        uint32_t compact_flash_common_base_addr;
+        uint32_t no_mark_private_data;
+
+        uint32_t led_display_base_addr;
+        uint32_t compact_flash_attribute_base_addr;
+#endif
 };
 
 /* If not to copy a lot of bootloader's structures
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index a42110e7edbc..89a628455bc2 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -51,6 +51,9 @@ extern void pci_console_init(const char *arg);
 
 static unsigned long long MAX_MEMORY = 512ull << 20;
 
+DEFINE_SEMAPHORE(octeon_bootbus_sem);
+EXPORT_SYMBOL(octeon_bootbus_sem);
+
 struct octeon_boot_descriptor *octeon_boot_desc_ptr;
 
 struct cvmx_bootinfo *octeon_bootinfo;
@@ -413,7 +416,10 @@ static void octeon_restart(char *command)
 
         mb();
         while (1)
-                cvmx_write_csr(CVMX_CIU_SOFT_RST, 1);
+                if (OCTEON_IS_OCTEON3())
+                        cvmx_write_csr(CVMX_RST_SOFT_RST, 1);
+                else
+                        cvmx_write_csr(CVMX_CIU_SOFT_RST, 1);
 }
 
 
@@ -1043,7 +1049,7 @@ int prom_putchar(char c)
 }
 EXPORT_SYMBOL(prom_putchar);
 
-void prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
         if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR) {
                 /* Check for presence of Core-14449 fix.  */
diff --git a/arch/mips/configs/bcm3384_defconfig b/arch/mips/configs/bmips_be_defconfig
index 88711c28ff32..f5585c8f35ad 100644
--- a/arch/mips/configs/bcm3384_defconfig
+++ b/arch/mips/configs/bmips_be_defconfig
@@ -1,4 +1,4 @@
-CONFIG_BCM3384=y
+CONFIG_BMIPS_GENERIC=y
 CONFIG_HIGHMEM=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
@@ -33,6 +33,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_MTD=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_INTELEXT=y
@@ -43,15 +44,19 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
+CONFIG_BCMGENET=y
 CONFIG_USB_USBNET=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
 # CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_EARLYCON_FORCE=y
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_BRCMSTB=y
+CONFIG_POWER_RESET_SYSCON=y
 # CONFIG_HWMON is not set
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
@@ -75,4 +80,6 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="earlycon"
 # CONFIG_CRYPTO_HW is not set
diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig
new file mode 100644
index 000000000000..400a47ec1ef1
--- /dev/null
+++ b/arch/mips/configs/bmips_stb_defconfig
@@ -0,0 +1,88 @@
+CONFIG_BMIPS_GENERIC=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_HIGHMEM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+# CONFIG_SECCOMP is not set
+CONFIG_MIPS_O32_FP64_SUPPORT=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_NO_HZ=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_GZIP is not set
+CONFIG_EXPERT=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
+CONFIG_MAC80211=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_BRCMSTB_GISB_ARB=y
+CONFIG_MTD=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_BLK_DEV is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_NETDEVICES=y
+CONFIG_BCMGENET=y
+CONFIG_USB_USBNET=y
+# CONFIG_INPUT is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_BRCMSTB=y
+CONFIG_POWER_RESET_SYSCON=y
+# CONFIG_HWMON is not set
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FUSE_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=y
+CONFIG_CIFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="earlycon"
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 70ffe9b55829..fe48220157a9 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -105,7 +105,8 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 # CONFIG_RTC_INTF_SYSFS is not set
 # CONFIG_RTC_INTF_PROC is not set
-CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1685_FAMILY=y
+CONFIG_RTC_DRV_DS1685=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig
new file mode 100644
index 000000000000..c388bff09148
--- /dev/null
+++ b/arch/mips/configs/maltaup_xpa_defconfig
@@ -0,0 +1,439 @@
+CONFIG_MIPS_MALTA=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPS32_R5_FEATURES=y
+CONFIG_CPU_MIPS32_R5_XPA=y
+CONFIG_PAGE_SIZE_16KB=y
+CONFIG_HZ_100=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_NAMESPACES=y
+CONFIG_RELAY=y
+CONFIG_EXPERT=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_PCI=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=m
+CONFIG_NET_KEY=y
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_NET_IPIP=m
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_SCTP=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_PHONET=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_CLS_IND=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_MAC80211_MESH=y
+CONFIG_RFKILL=m
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_CONNECTOR=m
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_ATA_OVER_ETH=m
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_BLK_DEV_IT8213=m
+CONFIG_BLK_DEV_TC86C001=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_MACVLAN=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_PCNET32=y
+CONFIG_CHELSIO_T3=m
+CONFIG_AX88796=m
+CONFIG_NETXEN_NIC=m
+CONFIG_TC35815=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PRISM54=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_LIBERTAS=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HWMON is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_HID=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_QUOTA=y
+CONFIG_QFMT_V2=y
+CONFIG_FUSE_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_CRAMFS=m
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRC16=m
diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig
new file mode 100644
index 000000000000..f22e92ee7709
--- /dev/null
+++ b/arch/mips/configs/pistachio_defconfig
@@ -0,0 +1,336 @@
+CONFIG_MACH_PISTACHIO=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_MIPS_CPS=y
+# CONFIG_COMPACTION is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_ZSMALLOC=y
+CONFIG_NR_CPUS=4
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="localhost"
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_PROFILING=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+CONFIG_CPU_IDLE=y
+# CONFIG_MIPS_CPS_CPUIDLE is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_DIAG is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_IPV6_SIT=m
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_DSCP=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_DSCP=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_MARK=y
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_DEBUG_MENU=y
+CONFIG_MAC80211_VERBOSE_DEBUG=y
+CONFIG_RFKILL=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_ZRAM=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=m
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=y
+CONFIG_DM_VERITY=y
+CONFIG_NETDEVICES=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+CONFIG_STMMAC_ETH=y
+# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_PPP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_MCS7830=m
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_RT2X00=m
+CONFIG_RT2800USB=m
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_HW_RANDOM=y
+CONFIG_TCG_TPM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_IMG=y
+CONFIG_I2C_STUB=m
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_IMG_SPFI=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_IMGPDC_WDT=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_RC_DECODERS is not set
+CONFIG_RC_DEVICES=y
+CONFIG_IR_IMG=y
+CONFIG_IR_IMG_NEC=y
+CONFIG_IR_IMG_JVC=y
+CONFIG_IR_IMG_SONY=y
+CONFIG_IR_IMG_SHARP=y
+CONFIG_IR_IMG_SANYO=y
+CONFIG_IR_IMG_RC5=y
+CONFIG_IR_IMG_RC6=y
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SPI is not set
+CONFIG_SND_USB_AUDIO=m
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_DEFAULT_PERSIST is not set
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_TEST=m
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_IDMAC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_RTC_CLASS=y
+CONFIG_DMADEVICES=y
+CONFIG_IMG_MDC_DMA=y
+CONFIG_STAGING=y
+CONFIG_ASHMEM=y
+# CONFIG_ANDROID_TIMED_OUTPUT is not set
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_MEMORY=y
+CONFIG_IIO=y
+CONFIG_CC10001_ADC=y
+CONFIG_PWM=y
+CONFIG_PWM_IMG=y
+CONFIG_ANDROID=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FUSE_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_ECRYPT_FS=y
+CONFIG_HFSPLUS_FS=m
+CONFIG_UBIFS_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_RAM=y
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_CREDENTIALS=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_LKDTM=y
+CONFIG_TEST_UDELAY=m
+CONFIG_KEYS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+# CONFIG_XZ_DEC_X86 is not set
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 41a2fa1fa12e..8c6f508e59de 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -267,8 +267,13 @@ handle_it:
 
 #ifdef CONFIG_32BIT
 fpu:
+                lw      t0,fpu_kstat_irq
+                nop
+                lw      t1,(t0)
+                nop
+                addu    t1,1
                 j       handle_fpe_int
-                 nop
+                 sw     t1,(t0)
 #endif
 
 spurious:
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 41bbffd9cc0e..a0b8943c8f11 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -12,13 +12,15 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
+#include <linux/irq.h>
+#include <linux/irqnr.h>
 #include <linux/module.h>
 #include <linux/param.h>
+#include <linux/percpu-defs.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/pm.h>
-#include <linux/irq.h>
 
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
@@ -98,6 +100,7 @@ int_ptr asic_mask_nr_tbl[DEC_MAX_ASIC_INTS][2] = {
         { { .i = ~0 }, { .p = asic_intr_unimplemented } },
 };
 int cpu_fpu_mask = DEC_CPU_IRQ_MASK(DEC_CPU_INR_FPU);
+int *fpu_kstat_irq;
 
 static struct irqaction ioirq = {
         .handler = no_action,
@@ -755,8 +758,15 @@ void __init arch_init_irq(void)
                 dec_interrupt[DEC_IRQ_HALT] = -1;
 
         /* Register board interrupts: FPU and cascade. */
-        if (dec_interrupt[DEC_IRQ_FPU] >= 0)
-                setup_irq(dec_interrupt[DEC_IRQ_FPU], &fpuirq);
+        if (dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {
+                struct irq_desc *desc_fpu;
+                int irq_fpu;
+
+                irq_fpu = dec_interrupt[DEC_IRQ_FPU];
+                setup_irq(irq_fpu, &fpuirq);
+                desc_fpu = irq_to_desc(irq_fpu);
+                fpu_kstat_irq = this_cpu_ptr(desc_fpu->kstat_irqs);
+        }
         if (dec_interrupt[DEC_IRQ_CASCADE] >= 0)
                 setup_irq(dec_interrupt[DEC_IRQ_CASCADE], &ioirq);
 
diff --git a/arch/mips/include/asm/asm-eva.h b/arch/mips/include/asm/asm-eva.h
index e41c56e375b1..1e38f0e1ea3e 100644
--- a/arch/mips/include/asm/asm-eva.h
+++ b/arch/mips/include/asm/asm-eva.h
@@ -11,6 +11,36 @@
 #define __ASM_ASM_EVA_H
 
 #ifndef __ASSEMBLY__
+
+/* Kernel variants */
+
+#define kernel_cache(op, base)          "cache " op ", " base "\n"
+#define kernel_ll(reg, addr)            "ll " reg ", " addr "\n"
+#define kernel_sc(reg, addr)            "sc " reg ", " addr "\n"
+#define kernel_lw(reg, addr)            "lw " reg ", " addr "\n"
+#define kernel_lwl(reg, addr)           "lwl " reg ", " addr "\n"
+#define kernel_lwr(reg, addr)           "lwr " reg ", " addr "\n"
+#define kernel_lh(reg, addr)            "lh " reg ", " addr "\n"
+#define kernel_lb(reg, addr)            "lb " reg ", " addr "\n"
+#define kernel_lbu(reg, addr)           "lbu " reg ", " addr "\n"
+#define kernel_sw(reg, addr)            "sw " reg ", " addr "\n"
+#define kernel_swl(reg, addr)           "swl " reg ", " addr "\n"
+#define kernel_swr(reg, addr)           "swr " reg ", " addr "\n"
+#define kernel_sh(reg, addr)            "sh " reg ", " addr "\n"
+#define kernel_sb(reg, addr)            "sb " reg ", " addr "\n"
+
+#ifdef CONFIG_32BIT
+/*
+ * No 'sd' or 'ld' instructions in 32-bit but the code will
+ * do the correct thing
+ */
+#define kernel_sd(reg, addr)            user_sw(reg, addr)
+#define kernel_ld(reg, addr)            user_lw(reg, addr)
+#else
+#define kernel_sd(reg, addr)            "sd " reg", " addr "\n"
+#define kernel_ld(reg, addr)            "ld " reg", " addr "\n"
+#endif /* CONFIG_32BIT */
+
 #ifdef CONFIG_EVA
 
 #define __BUILD_EVA_INSN(insn, reg, addr)                               \
@@ -41,37 +71,60 @@
 
 #else
 
-#define user_cache(op, base)            "cache " op ", " base "\n"
-#define user_ll(reg, addr)              "ll " reg ", " addr "\n"
-#define user_sc(reg, addr)              "sc " reg ", " addr "\n"
-#define user_lw(reg, addr)              "lw " reg ", " addr "\n"
-#define user_lwl(reg, addr)             "lwl " reg ", " addr "\n"
-#define user_lwr(reg, addr)             "lwr " reg ", " addr "\n"
-#define user_lh(reg, addr)              "lh " reg ", " addr "\n"
-#define user_lb(reg, addr)              "lb " reg ", " addr "\n"
-#define user_lbu(reg, addr)             "lbu " reg ", " addr "\n"
-#define user_sw(reg, addr)              "sw " reg ", " addr "\n"
-#define user_swl(reg, addr)             "swl " reg ", " addr "\n"
-#define user_swr(reg, addr)             "swr " reg ", " addr "\n"
-#define user_sh(reg, addr)              "sh " reg ", " addr "\n"
-#define user_sb(reg, addr)              "sb " reg ", " addr "\n"
+#define user_cache(op, base)            kernel_cache(op, base)
+#define user_ll(reg, addr)              kernel_ll(reg, addr)
+#define user_sc(reg, addr)              kernel_sc(reg, addr)
+#define user_lw(reg, addr)              kernel_lw(reg, addr)
+#define user_lwl(reg, addr)             kernel_lwl(reg, addr)
+#define user_lwr(reg, addr)             kernel_lwr(reg, addr)
+#define user_lh(reg, addr)              kernel_lh(reg, addr)
+#define user_lb(reg, addr)              kernel_lb(reg, addr)
+#define user_lbu(reg, addr)             kernel_lbu(reg, addr)
+#define user_sw(reg, addr)              kernel_sw(reg, addr)
+#define user_swl(reg, addr)             kernel_swl(reg, addr)
+#define user_swr(reg, addr)             kernel_swr(reg, addr)
+#define user_sh(reg, addr)              kernel_sh(reg, addr)
+#define user_sb(reg, addr)              kernel_sb(reg, addr)
 
 #ifdef CONFIG_32BIT
-/*
- * No 'sd' or 'ld' instructions in 32-bit but the code will
- * do the correct thing
- */
-#define user_sd(reg, addr)              user_sw(reg, addr)
-#define user_ld(reg, addr)              user_lw(reg, addr)
+#define user_sd(reg, addr)              kernel_sw(reg, addr)
+#define user_ld(reg, addr)              kernel_lw(reg, addr)
 #else
-#define user_sd(reg, addr)              "sd " reg", " addr "\n"
-#define user_ld(reg, addr)              "ld " reg", " addr "\n"
+#define user_sd(reg, addr)              kernel_sd(reg, addr)
+#define user_ld(reg, addr)              kernel_ld(reg, addr)
 #endif /* CONFIG_32BIT */
 
 #endif /* CONFIG_EVA */
 
 #else /* __ASSEMBLY__ */
 
+#define kernel_cache(op, base)          cache op, base
+#define kernel_ll(reg, addr)            ll reg, addr
+#define kernel_sc(reg, addr)            sc reg, addr
+#define kernel_lw(reg, addr)            lw reg, addr
+#define kernel_lwl(reg, addr)           lwl reg, addr
+#define kernel_lwr(reg, addr)           lwr reg, addr
+#define kernel_lh(reg, addr)            lh reg, addr
+#define kernel_lb(reg, addr)            lb reg, addr
+#define kernel_lbu(reg, addr)           lbu reg, addr
+#define kernel_sw(reg, addr)            sw reg, addr
+#define kernel_swl(reg, addr)           swl reg, addr
+#define kernel_swr(reg, addr)           swr reg, addr
+#define kernel_sh(reg, addr)            sh reg, addr
+#define kernel_sb(reg, addr)            sb reg, addr
+
+#ifdef CONFIG_32BIT
+/*
+ * No 'sd' or 'ld' instructions in 32-bit but the code will
+ * do the correct thing
+ */
+#define kernel_sd(reg, addr)            user_sw(reg, addr)
+#define kernel_ld(reg, addr)            user_lw(reg, addr)
+#else
+#define kernel_sd(reg, addr)            sd reg, addr
+#define kernel_ld(reg, addr)            ld reg, addr
+#endif /* CONFIG_32BIT */
+
 #ifdef CONFIG_EVA
 
 #define __BUILD_EVA_INSN(insn, reg, addr)                       \
@@ -101,31 +154,27 @@
 #define user_sd(reg, addr)              user_sw(reg, addr)
 #else
 
-#define user_cache(op, base)            cache op, base
-#define user_ll(reg, addr)              ll reg, addr
-#define user_sc(reg, addr)              sc reg, addr
-#define user_lw(reg, addr)              lw reg, addr
-#define user_lwl(reg, addr)             lwl reg, addr
-#define user_lwr(reg, addr)             lwr reg, addr
-#define user_lh(reg, addr)              lh reg, addr
-#define user_lb(reg, addr)              lb reg, addr
-#define user_lbu(reg, addr)             lbu reg, addr
-#define user_sw(reg, addr)              sw reg, addr
-#define user_swl(reg, addr)             swl reg, addr
-#define user_swr(reg, addr)             swr reg, addr
-#define user_sh(reg, addr)              sh reg, addr
-#define user_sb(reg, addr)              sb reg, addr
+#define user_cache(op, base)            kernel_cache(op, base)
+#define user_ll(reg, addr)              kernel_ll(reg, addr)
+#define user_sc(reg, addr)              kernel_sc(reg, addr)
+#define user_lw(reg, addr)              kernel_lw(reg, addr)
+#define user_lwl(reg, addr)             kernel_lwl(reg, addr)
+#define user_lwr(reg, addr)             kernel_lwr(reg, addr)
+#define user_lh(reg, addr)              kernel_lh(reg, addr)
+#define user_lb(reg, addr)              kernel_lb(reg, addr)
+#define user_lbu(reg, addr)             kernel_lbu(reg, addr)
+#define user_sw(reg, addr)              kernel_sw(reg, addr)
+#define user_swl(reg, addr)             kernel_swl(reg, addr)
+#define user_swr(reg, addr)             kernel_swr(reg, addr)
+#define user_sh(reg, addr)              kernel_sh(reg, addr)
+#define user_sb(reg, addr)              kernel_sb(reg, addr)
 
 #ifdef CONFIG_32BIT
-/*
- * No 'sd' or 'ld' instructions in 32-bit but the code will
- * do the correct thing
- */
-#define user_sd(reg, addr)              user_sw(reg, addr)
-#define user_ld(reg, addr)              user_lw(reg, addr)
+#define user_sd(reg, addr)              kernel_sw(reg, addr)
+#define user_ld(reg, addr)              kernel_lw(reg, addr)
 #else
-#define user_sd(reg, addr)              sd reg, addr
-#define user_ld(reg, addr)              ld reg, addr
+#define user_sd(reg, addr)              kernel_sd(reg, addr)
+#define user_ld(reg, addr)              kernel_sd(reg, addr)
 #endif /* CONFIG_32BIT */
 
 #endif /* CONFIG_EVA */
diff --git a/arch/mips/include/asm/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h
index 80386470d3a4..0ef39ad0f2d4 100644
--- a/arch/mips/include/asm/asmmacro-32.h
+++ b/arch/mips/include/asm/asmmacro-32.h
@@ -16,38 +16,22 @@
         .set push
         SET_HARDFLOAT
         cfc1    \tmp,  fcr31
-        swc1    $f0,  THREAD_FPR0(\thread)
-        swc1    $f1,  THREAD_FPR1(\thread)
-        swc1    $f2,  THREAD_FPR2(\thread)
-        swc1    $f3,  THREAD_FPR3(\thread)
-        swc1    $f4,  THREAD_FPR4(\thread)
-        swc1    $f5,  THREAD_FPR5(\thread)
-        swc1    $f6,  THREAD_FPR6(\thread)
-        swc1    $f7,  THREAD_FPR7(\thread)
-        swc1    $f8,  THREAD_FPR8(\thread)
-        swc1    $f9,  THREAD_FPR9(\thread)
-        swc1    $f10, THREAD_FPR10(\thread)
-        swc1    $f11, THREAD_FPR11(\thread)
-        swc1    $f12, THREAD_FPR12(\thread)
-        swc1    $f13, THREAD_FPR13(\thread)
-        swc1    $f14, THREAD_FPR14(\thread)
-        swc1    $f15, THREAD_FPR15(\thread)
-        swc1    $f16, THREAD_FPR16(\thread)
-        swc1    $f17, THREAD_FPR17(\thread)
-        swc1    $f18, THREAD_FPR18(\thread)
-        swc1    $f19, THREAD_FPR19(\thread)
-        swc1    $f20, THREAD_FPR20(\thread)
-        swc1    $f21, THREAD_FPR21(\thread)
-        swc1    $f22, THREAD_FPR22(\thread)
-        swc1    $f23, THREAD_FPR23(\thread)
-        swc1    $f24, THREAD_FPR24(\thread)
-        swc1    $f25, THREAD_FPR25(\thread)
-        swc1    $f26, THREAD_FPR26(\thread)
-        swc1    $f27, THREAD_FPR27(\thread)
-        swc1    $f28, THREAD_FPR28(\thread)
-        swc1    $f29, THREAD_FPR29(\thread)
-        swc1    $f30, THREAD_FPR30(\thread)
-        swc1    $f31, THREAD_FPR31(\thread)
+        s.d     $f0,  THREAD_FPR0(\thread)
+        s.d     $f2,  THREAD_FPR2(\thread)
+        s.d     $f4,  THREAD_FPR4(\thread)
+        s.d     $f6,  THREAD_FPR6(\thread)
+        s.d     $f8,  THREAD_FPR8(\thread)
+        s.d     $f10, THREAD_FPR10(\thread)
+        s.d     $f12, THREAD_FPR12(\thread)
+        s.d     $f14, THREAD_FPR14(\thread)
+        s.d     $f16, THREAD_FPR16(\thread)
+        s.d     $f18, THREAD_FPR18(\thread)
+        s.d     $f20, THREAD_FPR20(\thread)
+        s.d     $f22, THREAD_FPR22(\thread)
+        s.d     $f24, THREAD_FPR24(\thread)
+        s.d     $f26, THREAD_FPR26(\thread)
+        s.d     $f28, THREAD_FPR28(\thread)
+        s.d     $f30, THREAD_FPR30(\thread)
         sw      \tmp, THREAD_FCR31(\thread)
         .set pop
         .endm
@@ -56,38 +40,22 @@
         .set push
         SET_HARDFLOAT
         lw      \tmp, THREAD_FCR31(\thread)
-        lwc1    $f0,  THREAD_FPR0(\thread)
-        lwc1    $f1,  THREAD_FPR1(\thread)
-        lwc1    $f2,  THREAD_FPR2(\thread)
-        lwc1    $f3,  THREAD_FPR3(\thread)
-        lwc1    $f4,  THREAD_FPR4(\thread)
-        lwc1    $f5,  THREAD_FPR5(\thread)
-        lwc1    $f6,  THREAD_FPR6(\thread)
-        lwc1    $f7,  THREAD_FPR7(\thread)
-        lwc1    $f8,  THREAD_FPR8(\thread)
-        lwc1    $f9,  THREAD_FPR9(\thread)
-        lwc1    $f10, THREAD_FPR10(\thread)
-        lwc1    $f11, THREAD_FPR11(\thread)
-        lwc1    $f12, THREAD_FPR12(\thread)
-        lwc1    $f13, THREAD_FPR13(\thread)
-        lwc1    $f14, THREAD_FPR14(\thread)
-        lwc1    $f15, THREAD_FPR15(\thread)
-        lwc1    $f16, THREAD_FPR16(\thread)
-        lwc1    $f17, THREAD_FPR17(\thread)
-        lwc1    $f18, THREAD_FPR18(\thread)
-        lwc1    $f19, THREAD_FPR19(\thread)
-        lwc1    $f20, THREAD_FPR20(\thread)
-        lwc1    $f21, THREAD_FPR21(\thread)
-        lwc1    $f22, THREAD_FPR22(\thread)
-        lwc1    $f23, THREAD_FPR23(\thread)
-        lwc1    $f24, THREAD_FPR24(\thread)
-        lwc1    $f25, THREAD_FPR25(\thread)
-        lwc1    $f26, THREAD_FPR26(\thread)
-        lwc1    $f27, THREAD_FPR27(\thread)
-        lwc1    $f28, THREAD_FPR28(\thread)
-        lwc1    $f29, THREAD_FPR29(\thread)
-        lwc1    $f30, THREAD_FPR30(\thread)
-        lwc1    $f31, THREAD_FPR31(\thread)
+        l.d     $f0,  THREAD_FPR0(\thread)
+        l.d     $f2,  THREAD_FPR2(\thread)
+        l.d     $f4,  THREAD_FPR4(\thread)
+        l.d     $f6,  THREAD_FPR6(\thread)
+        l.d     $f8,  THREAD_FPR8(\thread)
+        l.d     $f10, THREAD_FPR10(\thread)
+        l.d     $f12, THREAD_FPR12(\thread)
+        l.d     $f14, THREAD_FPR14(\thread)
+        l.d     $f16, THREAD_FPR16(\thread)
+        l.d     $f18, THREAD_FPR18(\thread)
+        l.d     $f20, THREAD_FPR20(\thread)
+        l.d     $f22, THREAD_FPR22(\thread)
+        l.d     $f24, THREAD_FPR24(\thread)
+        l.d     $f26, THREAD_FPR26(\thread)
+        l.d     $f28, THREAD_FPR28(\thread)
+        l.d     $f30, THREAD_FPR30(\thread)
         ctc1    \tmp, fcr31
         .set pop
         .endm
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
index 9f935f6aa996..0cf29bd5dc5c 100644
--- a/arch/mips/include/asm/bitops.h
+++ b/arch/mips/include/asm/bitops.h
@@ -481,7 +481,7 @@ static inline unsigned long __fls(unsigned long word)
 {
         int num;
 
-        if (BITS_PER_LONG == 32 &&
+        if (BITS_PER_LONG == 32 && !__builtin_constant_p(word) &&
             __builtin_constant_p(cpu_has_clo_clz) && cpu_has_clo_clz) {
                 __asm__(
                 "       .set    push                                    \n"
@@ -494,7 +494,7 @@ static inline unsigned long __fls(unsigned long word)
                 return 31 - num;
         }
 
-        if (BITS_PER_LONG == 64 &&
+        if (BITS_PER_LONG == 64 && !__builtin_constant_p(word) &&
             __builtin_constant_p(cpu_has_mips64) && cpu_has_mips64) {
                 __asm__(
                 "       .set    push                                    \n"
@@ -559,7 +559,8 @@ static inline int fls(int x)
 {
         int r;
 
-        if (__builtin_constant_p(cpu_has_clo_clz) && cpu_has_clo_clz) {
+        if (!__builtin_constant_p(x) &&
+            __builtin_constant_p(cpu_has_clo_clz) && cpu_has_clo_clz) {
                 __asm__(
                 "       .set    push                                    \n"
                 "       .set    "MIPS_ISA_LEVEL"                        \n"
diff --git a/arch/mips/include/asm/bmips.h b/arch/mips/include/asm/bmips.h
index 30939b02e3ff..6d25ad33ec78 100644
--- a/arch/mips/include/asm/bmips.h
+++ b/arch/mips/include/asm/bmips.h
@@ -122,6 +122,22 @@ static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
         barrier();
 }
 
+static inline void bmips_post_dma_flush(struct device *dev)
+{
+        void __iomem *cbr = BMIPS_GET_CBR();
+        u32 cfg;
+
+        if (boot_cpu_type() != CPU_BMIPS3300 &&
+            boot_cpu_type() != CPU_BMIPS4350 &&
+            boot_cpu_type() != CPU_BMIPS4380)
+                return;
+
+        /* Flush stale data out of the readahead cache */
+        cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
+        __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);
+        __raw_readl(cbr + BMIPS_RAC_CONFIG);
+}
+
 #endif /* !defined(__ASSEMBLY__) */
 
 #endif /* _ASM_BMIPS_H */
diff --git a/arch/mips/include/asm/cacheflush.h b/arch/mips/include/asm/cacheflush.h
index e08381a37f8b..723229f4cf27 100644
--- a/arch/mips/include/asm/cacheflush.h
+++ b/arch/mips/include/asm/cacheflush.h
@@ -29,6 +29,20 @@
  *  - flush_icache_all() flush the entire instruction cache
  *  - flush_data_cache_page() flushes a page from the data cache
  */
+
+ /*
+ * This flag is used to indicate that the page pointed to by a pte
+ * is dirty and requires cleaning before returning it to the user.
+ */
+#define PG_dcache_dirty                 PG_arch_1
+
+#define Page_dcache_dirty(page)         \
+        test_bit(PG_dcache_dirty, &(page)->flags)
+#define SetPageDcacheDirty(page)        \
+        set_bit(PG_dcache_dirty, &(page)->flags)
+#define ClearPageDcacheDirty(page)      \
+        clear_bit(PG_dcache_dirty, &(page)->flags)
+
 extern void (*flush_cache_all)(void);
 extern void (*__flush_cache_all)(void);
 extern void (*flush_cache_mm)(struct mm_struct *mm);
@@ -37,13 +51,15 @@ extern void (*flush_cache_range)(struct vm_area_struct *vma,
         unsigned long start, unsigned long end);
 extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
 extern void __flush_dcache_page(struct page *page);
+extern void __flush_icache_page(struct vm_area_struct *vma, struct page *page);
 
 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
 static inline void flush_dcache_page(struct page *page)
 {
-        if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc)
+        if (cpu_has_dc_aliases)
                 __flush_dcache_page(page);
-
+        else if (!cpu_has_ic_fills_f_dc)
+                SetPageDcacheDirty(page);
 }
 
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
@@ -61,6 +77,11 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
 static inline void flush_icache_page(struct vm_area_struct *vma,
         struct page *page)
 {
+        if (!cpu_has_ic_fills_f_dc && (vma->vm_flags & VM_EXEC) &&
+            Page_dcache_dirty(page)) {
+                __flush_icache_page(vma, page);
+                ClearPageDcacheDirty(page);
+        }
 }
 
 extern void (*flush_icache_range)(unsigned long start, unsigned long end);
@@ -95,19 +116,6 @@ extern void (*flush_icache_all)(void);
 extern void (*local_flush_data_cache_page)(void * addr);
 extern void (*flush_data_cache_page)(unsigned long addr);
 
-/*
- * This flag is used to indicate that the page pointed to by a pte
- * is dirty and requires cleaning before returning it to the user.
- */
-#define PG_dcache_dirty                 PG_arch_1
-
-#define Page_dcache_dirty(page)         \
-        test_bit(PG_dcache_dirty, &(page)->flags)
-#define SetPageDcacheDirty(page)        \
-        set_bit(PG_dcache_dirty, &(page)->flags)
-#define ClearPageDcacheDirty(page)      \
-        clear_bit(PG_dcache_dirty, &(page)->flags)
-
 /* Run kernel code uncached, useful for cache probing functions. */
 unsigned long run_uncached(void *func);
 
diff --git a/arch/mips/include/asm/cdmm.h b/arch/mips/include/asm/cdmm.h
new file mode 100644
index 000000000000..16e22ce9719f
--- /dev/null
+++ b/arch/mips/include/asm/cdmm.h
@@ -0,0 +1,98 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2014 Imagination Technologies Ltd.
+ */
+#ifndef __ASM_CDMM_H
+#define __ASM_CDMM_H
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+
+/**
+ * struct mips_cdmm_device - Represents a single device on a CDMM bus.
+ * @dev:        Driver model device object.
+ * @cpu:        CPU which can access this device.
+ * @res:        MMIO resource.
+ * @type:       Device type identifier.
+ * @rev:        Device revision number.
+ */
+struct mips_cdmm_device {
+        struct device           dev;
+        unsigned int            cpu;
+        struct resource         res;
+        unsigned int            type;
+        unsigned int            rev;
+};
+
+/**
+ * struct mips_cdmm_driver - Represents a driver for a CDMM device.
+ * @drv:        Driver model driver object.
+ * @probe       Callback for probing newly discovered devices.
+ * @remove:     Callback to remove the device.
+ * @shutdown:   Callback on system shutdown.
+ * @cpu_down:   Callback when the parent CPU is going down.
+ *              Any CPU pinned threads/timers should be disabled.
+ * @cpu_up:     Callback when the parent CPU is coming back up again.
+ *              CPU pinned threads/timers can be restarted.
+ * @id_table:   Table for CDMM IDs to match against.
+ */
+struct mips_cdmm_driver {
+        struct device_driver    drv;
+        int                     (*probe)(struct mips_cdmm_device *);
+        int                     (*remove)(struct mips_cdmm_device *);
+        void                    (*shutdown)(struct mips_cdmm_device *);
+        int                     (*cpu_down)(struct mips_cdmm_device *);
+        int                     (*cpu_up)(struct mips_cdmm_device *);
+        const struct mips_cdmm_device_id *id_table;
+};
+
+/**
+ * mips_cdmm_phys_base() - Choose a physical base address for CDMM region.
+ *
+ * Picking a suitable physical address at which to map the CDMM region is
+ * platform specific, so this weak function can be defined by platform code to
+ * pick a suitable value if none is configured by the bootloader.
+ *
+ * This address must be 32kB aligned, and the region occupies a maximum of 32kB
+ * of physical address space which must not be used for anything else.
+ *
+ * Returns:     Physical base address for CDMM region, or 0 on failure.
+ */
+phys_addr_t __weak mips_cdmm_phys_base(void);
+
+extern struct bus_type mips_cdmm_bustype;
+void __iomem *mips_cdmm_early_probe(unsigned int dev_type);
+
+#define to_mips_cdmm_device(d)  container_of(d, struct mips_cdmm_device, dev)
+
+#define mips_cdmm_get_drvdata(d)        dev_get_drvdata(&d->dev)
+#define mips_cdmm_set_drvdata(d, p)     dev_set_drvdata(&d->dev, p)
+
+int mips_cdmm_driver_register(struct mips_cdmm_driver *);
+void mips_cdmm_driver_unregister(struct mips_cdmm_driver *);
+
+/*
+ * module_mips_cdmm_driver() - Helper macro for drivers that don't do
+ * anything special in module init/exit.  This eliminates a lot of
+ * boilerplate.  Each module may only use this macro once, and
+ * calling it replaces module_init() and module_exit()
+ */
+#define module_mips_cdmm_driver(__mips_cdmm_driver) \
+        module_driver(__mips_cdmm_driver, mips_cdmm_driver_register, \
+                        mips_cdmm_driver_unregister)
+
+/* drivers/tty/mips_ejtag_fdc.c */
+
+#ifdef CONFIG_MIPS_EJTAG_FDC_EARLYCON
+int setup_early_fdc_console(void);
+#else
+static inline int setup_early_fdc_console(void)
+{
+        return -ENODEV;
+}
+#endif
+
+#endif /* __ASM_CDMM_H */
diff --git a/arch/mips/include/asm/cevt-r4k.h b/arch/mips/include/asm/cevt-r4k.h
index 65f9bdd02f1f..f0edf6fcd002 100644
--- a/arch/mips/include/asm/cevt-r4k.h
+++ b/arch/mips/include/asm/cevt-r4k.h
@@ -27,23 +27,4 @@ irqreturn_t c0_compare_interrupt(int, void *);
 extern struct irqaction c0_compare_irqaction;
 extern int cp0_timer_irq_installed;
 
-/*
- * Possibly handle a performance counter interrupt.
- * Return true if the timer interrupt should not be checked
- */
-
-static inline int handle_perf_irq(int r2)
-{
-        /*
-         * The performance counter overflow interrupt may be shared with the
-         * timer interrupt (cp0_perfcount_irq < 0). If it is and a
-         * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
-         * and we can't reliably determine if a counter interrupt has also
-         * happened (!r2) then don't check for a timer interrupt.
-         */
-        return (cp0_perfcount_irq < 0) &&
-                perf_irq() == IRQ_HANDLED &&
-                !r2;
-}
-
 #endif /* __ASM_CEVT_R4K_H */
diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index 5c585c5c1c3e..3ceacde5eb6e 100644
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -218,6 +218,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                                           __u32 len, unsigned short proto,
                                           __wsum sum)
 {
+        __wsum tmp;
+
         __asm__(
         "       .set    push            # csum_ipv6_magic\n"
         "       .set    noreorder       \n"
@@ -270,9 +272,9 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
 
         "       addu    %0, $1          # Add final carry\n"
         "       .set    pop"
-        : "=r" (sum), "=r" (proto)
+        : "=&r" (sum), "=&r" (tmp)
         : "r" (saddr), "r" (daddr),
-          "0" (htonl(len)), "1" (htonl(proto)), "r" (sum));
+          "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
 
         return csum_fold(sum);
 }
diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h
index d0a2a68ca600..412f945f1f5e 100644
--- a/arch/mips/include/asm/cmpxchg.h
+++ b/arch/mips/include/asm/cmpxchg.h
@@ -229,21 +229,22 @@ extern void __cmpxchg_called_with_bad_pointer(void);
 #define cmpxchg(ptr, old, new)          __cmpxchg(ptr, old, new, smp_mb__before_llsc(), smp_llsc_mb())
 #define cmpxchg_local(ptr, old, new)    __cmpxchg(ptr, old, new, , )
 
-#define cmpxchg64(ptr, o, n)                                            \
+#ifdef CONFIG_64BIT
+#define cmpxchg64_local(ptr, o, n)                                      \
   ({                                                                    \
         BUILD_BUG_ON(sizeof(*(ptr)) != 8);                              \
-        cmpxchg((ptr), (o), (n));                                       \
+        cmpxchg_local((ptr), (o), (n));                                 \
   })
 
-#ifdef CONFIG_64BIT
-#define cmpxchg64_local(ptr, o, n)                                      \
+#define cmpxchg64(ptr, o, n)                                            \
   ({                                                                    \
         BUILD_BUG_ON(sizeof(*(ptr)) != 8);                              \
-        cmpxchg_local((ptr), (o), (n));                                 \
+        cmpxchg((ptr), (o), (n));                                       \
   })
 #else
 #include <asm-generic/cmpxchg-local.h>
 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n))
 #endif
 
 #endif /* __ASM_CMPXCHG_H */
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 0d8208de9a3f..5aeaf19c26b0 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -68,6 +68,7 @@
 #ifndef cpu_has_octeon_cache
 #define cpu_has_octeon_cache    0
 #endif
+/* Don't override `cpu_has_fpu' to 1 or the "nofpu" option won't work.  */
 #ifndef cpu_has_fpu
 #define cpu_has_fpu             (current_cpu_data.options & MIPS_CPU_FPU)
 #define raw_cpu_has_fpu         (raw_current_cpu_data.options & MIPS_CPU_FPU)
@@ -139,6 +140,9 @@
 # endif
 #endif
 
+#ifndef cpu_has_xpa
+#define cpu_has_xpa             (cpu_data[0].options & MIPS_CPU_XPA)
+#endif
 #ifndef cpu_has_vtag_icache
 #define cpu_has_vtag_icache     (cpu_data[0].icache.flags & MIPS_CACHE_VTAG)
 #endif
@@ -220,8 +224,11 @@
 #define cpu_has_mips_4_5_r      (cpu_has_mips_4 | cpu_has_mips_5_r)
 #define cpu_has_mips_5_r        (cpu_has_mips_5 | cpu_has_mips_r)
 
-#define cpu_has_mips_4_5_r2_r6  (cpu_has_mips_4_5 | cpu_has_mips_r2 | \
-                                 cpu_has_mips_r6)
+#define cpu_has_mips_3_4_5_64_r2_r6                                     \
+                                (cpu_has_mips_3 | cpu_has_mips_4_5_64_r2_r6)
+#define cpu_has_mips_4_5_64_r2_r6                                       \
+                                (cpu_has_mips_4_5 | cpu_has_mips64r1 |  \
+                                 cpu_has_mips_r2 | cpu_has_mips_r6)
 
 #define cpu_has_mips32  (cpu_has_mips32r1 | cpu_has_mips32r2 | cpu_has_mips32r6)
 #define cpu_has_mips64  (cpu_has_mips64r1 | cpu_has_mips64r2 | cpu_has_mips64r6)
@@ -235,8 +242,39 @@
 /* MIPSR2 and MIPSR6 have a lot of similarities */
 #define cpu_has_mips_r2_r6      (cpu_has_mips_r2 | cpu_has_mips_r6)
 
+/*
+ * cpu_has_mips_r2_exec_hazard - return if IHB is required on current processor
+ *
+ * Returns non-zero value if the current processor implementation requires
+ * an IHB instruction to deal with an instruction hazard as per MIPS R2
+ * architecture specification, zero otherwise.
+ */
 #ifndef cpu_has_mips_r2_exec_hazard
-#define cpu_has_mips_r2_exec_hazard (cpu_has_mips_r2 | cpu_has_mips_r6)
+#define cpu_has_mips_r2_exec_hazard                                     \
+({                                                                      \
+        int __res;                                                      \
+                                                                        \
+        switch (current_cpu_type()) {                                   \
+        case CPU_M14KC:                                                 \
+        case CPU_74K:                                                   \
+        case CPU_1074K:                                                 \
+        case CPU_PROAPTIV:                                              \
+        case CPU_P5600:                                                 \
+        case CPU_M5150:                                                 \
+        case CPU_QEMU_GENERIC:                                          \
+        case CPU_CAVIUM_OCTEON:                                         \
+        case CPU_CAVIUM_OCTEON_PLUS:                                    \
+        case CPU_CAVIUM_OCTEON2:                                        \
+        case CPU_CAVIUM_OCTEON3:                                        \
+                __res = 0;                                              \
+                break;                                                  \
+                                                                        \
+        default:                                                        \
+                __res = 1;                                              \
+        }                                                               \
+                                                                        \
+        __res;                                                          \
+})
 #endif
 
 /*
@@ -366,4 +404,8 @@
 # define cpu_has_fre            (cpu_data[0].options & MIPS_CPU_FRE)
 #endif
 
+#ifndef cpu_has_cdmm
+# define cpu_has_cdmm           (cpu_data[0].options & MIPS_CPU_CDMM)
+#endif
+
 #endif /* __ASM_CPU_FEATURES_H */
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index c3f4f2d2e108..e7dc785a91ca 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -49,6 +49,8 @@ struct cpuinfo_mips {
         unsigned int            udelay_val;
         unsigned int            processor_id;
         unsigned int            fpu_id;
+        unsigned int            fpu_csr31;
+        unsigned int            fpu_msk31;
         unsigned int            msa_id;
         unsigned int            cputype;
         int                     isa_level;
diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index 8245875f8b33..33f3cab9e689 100644
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -157,6 +157,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
 #endif
 #ifdef CONFIG_SYS_HAS_CPU_RM7000
         case CPU_RM7000:
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 15687234d70a..e3adca1d0b99 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -67,7 +67,7 @@
 #define PRID_IMP_R4300          0x0b00
 #define PRID_IMP_VR41XX         0x0c00
 #define PRID_IMP_R12000         0x0e00
-#define PRID_IMP_R14000         0x0f00
+#define PRID_IMP_R14000         0x0f00          /* R14K && R16K */
 #define PRID_IMP_R8000          0x1000
 #define PRID_IMP_PR4450         0x1200
 #define PRID_IMP_R4600          0x2000
@@ -284,8 +284,8 @@ enum cpu_type_enum {
         CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,
         CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,
         CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000,
-        CPU_R12000, CPU_R14000, CPU_VR41XX, CPU_VR4111, CPU_VR4121, CPU_VR4122,
-        CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,
+        CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,
+        CPU_VR4122, CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,
         CPU_SR71000, CPU_TX49XX,
 
         /*
@@ -377,6 +377,8 @@ enum cpu_type_enum {
 #define MIPS_CPU_MAAR           0x400000000ull /* MAAR(I) registers are present */
 #define MIPS_CPU_FRE            0x800000000ull /* FRE & UFE bits implemented */
 #define MIPS_CPU_RW_LLB         0x1000000000ull /* LLADDR/LLB writes are allowed */
+#define MIPS_CPU_XPA            0x2000000000ull /* CPU supports Extended Physical Addressing */
+#define MIPS_CPU_CDMM           0x4000000000ull /* CPU has Common Device Memory Map */
 
 /*
  * CPU ASE encodings
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 06412aa9e3fb..fd1b4a150759 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -23,7 +23,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 {
         if (!dev->dma_mask)
-                return 0;
+                return false;
 
         return addr + size <= *dev->dma_mask;
 }
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index 31d747d46a23..a594d8ed9698 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -11,6 +11,9 @@
 #include <linux/fs.h>
 #include <uapi/linux/elf.h>
 
+#include <asm/cpu-info.h>
+#include <asm/current.h>
+
 /* ELF header e_flags defines. */
 /* MIPS architecture level. */
 #define EF_MIPS_ARCH_1          0x00000000      /* -mips1 code.  */
@@ -294,9 +297,14 @@ do {									\
         if (personality(current->personality) != PER_LINUX)             \
                 set_personality(PER_LINUX);                             \
                                                                         \
+        clear_thread_flag(TIF_HYBRID_FPREGS);                           \
+        set_thread_flag(TIF_32BIT_FPREGS);                              \
+                                                                        \
         mips_set_personality_fp(state);                                 \
                                                                         \
         current->thread.abi = &mips_abi;                                \
+                                                                        \
+        current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31;         \
 } while (0)
 
 #endif /* CONFIG_32BIT */
@@ -319,6 +327,8 @@ do {									\
         do {                                                            \
                 set_thread_flag(TIF_32BIT_REGS);                        \
                 set_thread_flag(TIF_32BIT_ADDR);                        \
+                clear_thread_flag(TIF_HYBRID_FPREGS);                   \
+                set_thread_flag(TIF_32BIT_FPREGS);                      \
                                                                         \
                 mips_set_personality_fp(state);                         \
                                                                         \
@@ -356,6 +366,8 @@ do {									\
         else                                                            \
                 current->thread.abi = &mips_abi;                        \
                                                                         \
+        current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31;         \
+                                                                        \
         p = personality(current->personality);                          \
         if (p != PER_LINUX32 && p != PER_LINUX)                         \
                 set_personality(PER_LINUX);                             \
diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
index b104ad9d655f..084780b355aa 100644
--- a/arch/mips/include/asm/fpu.h
+++ b/arch/mips/include/asm/fpu.h
@@ -30,7 +30,7 @@
 struct sigcontext;
 struct sigcontext32;
 
-extern void _init_fpu(void);
+extern void _init_fpu(unsigned int);
 extern void _save_fp(struct task_struct *);
 extern void _restore_fp(struct task_struct *);
 
@@ -188,6 +188,7 @@ static inline void lose_fpu(int save)
 
 static inline int init_fpu(void)
 {
+        unsigned int fcr31 = current->thread.fpu.fcr31;
         int ret = 0;
 
         if (cpu_has_fpu) {
@@ -198,7 +199,7 @@ static inline int init_fpu(void)
                         return ret;
 
                 if (!cpu_has_fre) {
-                        _init_fpu();
+                        _init_fpu(fcr31);
 
                         return 0;
                 }
@@ -212,7 +213,7 @@ static inline int init_fpu(void)
                 config5 = clear_c0_config5(MIPS_CONF5_FRE);
                 enable_fpu_hazard();
 
-                _init_fpu();
+                _init_fpu(fcr31);
 
                 /* Restore FRE */
                 write_c0_config5(config5);
diff --git a/arch/mips/include/asm/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h
index 3ee347713307..2f021cdfba4f 100644
--- a/arch/mips/include/asm/fpu_emulator.h
+++ b/arch/mips/include/asm/fpu_emulator.h
@@ -44,6 +44,7 @@ struct mips_fpu_emulator_stats {
         unsigned long ieee754_overflow;
         unsigned long ieee754_zerodiv;
         unsigned long ieee754_invalidop;
+        unsigned long ds_emul;
 };
 
 DECLARE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
@@ -65,7 +66,8 @@ extern int do_dsemulret(struct pt_regs *xcp);
 extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
                                     struct mips_fpu_struct *ctx, int has_fpu,
                                     void *__user *fault_addr);
-int process_fpemu_return(int sig, void __user *fault_addr);
+int process_fpemu_return(int sig, void __user *fault_addr,
+                         unsigned long fcr31);
 int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                      unsigned long *contpc);
 
@@ -86,8 +88,6 @@ static inline void fpu_emulator_init_fpu(void)
         struct task_struct *t = current;
         int i;
 
-        t->thread.fpu.fcr31 = 0;
-
         for (i = 0; i < 32; i++)
                 set_fpr64(&t->thread.fpu.fpr[i], 0, SIGNALLING_NAN);
 }
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 5a4e1bb8fb1b..f0db99f8defe 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -47,6 +47,9 @@ extern void free_irqno(unsigned int irq);
 extern int cp0_compare_irq;
 extern int cp0_compare_irq_shift;
 extern int cp0_perfcount_irq;
+extern int cp0_fdc_irq;
+
+extern int __weak get_c0_fdc_int(void);
 
 void arch_trigger_all_cpu_backtrace(bool);
 #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
diff --git a/arch/mips/include/asm/mach-ar7/war.h b/arch/mips/include/asm/mach-ar7/war.h
deleted file mode 100644
index 99071e50faab..000000000000
--- a/arch/mips/include/asm/mach-ar7/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_AR7_WAR_H
-#define __ASM_MIPS_MACH_AR7_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_AR7_WAR_H */
diff --git a/arch/mips/include/asm/mach-ath25/dma-coherence.h b/arch/mips/include/asm/mach-ath25/dma-coherence.h
index d8009c93a465..d5defdde32db 100644
--- a/arch/mips/include/asm/mach-ath25/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ath25/dma-coherence.h
@@ -59,16 +59,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
         return 1;
 }
 
-static inline void plat_extra_sync_for_device(struct device *dev)
-{
-}
-
-static inline int plat_dma_mapping_error(struct device *dev,
-                                         dma_addr_t dma_addr)
-{
-        return 0;
-}
-
 static inline int plat_device_is_coherent(struct device *dev)
 {
 #ifdef CONFIG_DMA_COHERENT
@@ -79,4 +69,8 @@ static inline int plat_device_is_coherent(struct device *dev)
 #endif
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 #endif /* __ASM_MACH_ATH25_DMA_COHERENCE_H */
diff --git a/arch/mips/include/asm/mach-ath25/war.h b/arch/mips/include/asm/mach-ath25/war.h
deleted file mode 100644
index e3a5250ebd67..000000000000
--- a/arch/mips/include/asm/mach-ath25/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- */
-#ifndef __ASM_MACH_ATH25_WAR_H
-#define __ASM_MACH_ATH25_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define RM9000_CDEX_SMP_WAR             0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MACH_ATH25_WAR_H */
diff --git a/arch/mips/include/asm/mach-ath79/war.h b/arch/mips/include/asm/mach-ath79/war.h
deleted file mode 100644
index 0bb30905fd5b..000000000000
--- a/arch/mips/include/asm/mach-ath79/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_ATH79_WAR_H
-#define __ASM_MACH_ATH79_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MACH_ATH79_WAR_H */
diff --git a/arch/mips/include/asm/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h
deleted file mode 100644
index 72e260d24e59..000000000000
--- a/arch/mips/include/asm/mach-au1x00/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_AU1X00_WAR_H
-#define __ASM_MIPS_MACH_AU1X00_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_AU1X00_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm3384/war.h b/arch/mips/include/asm/mach-bcm3384/war.h
deleted file mode 100644
index 59d7599059b0..000000000000
--- a/arch/mips/include/asm/mach-bcm3384/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM3384_WAR_H
-#define __ASM_MIPS_MACH_BCM3384_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_BCM3384_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
index 7527c1d33d02..8ed77f618940 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
@@ -22,6 +22,7 @@
 #include <linux/ssb/ssb.h>
 #include <linux/bcma/bcma.h>
 #include <linux/bcma/bcma_soc.h>
+#include <linux/bcm47xx_nvram.h>
 
 enum bcm47xx_bus_type {
 #ifdef CONFIG_BCM47XX_SSB
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
index 1f5643b89a91..c41d1dce1062 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
@@ -67,6 +67,7 @@ enum bcm47xx_board {
         BCM47XX_BOARD_LINKSYS_WRT150NV11,
         BCM47XX_BOARD_LINKSYS_WRT160NV1,
         BCM47XX_BOARD_LINKSYS_WRT160NV3,
+        BCM47XX_BOARD_LINKSYS_WRT300N_V1,
         BCM47XX_BOARD_LINKSYS_WRT300NV11,
         BCM47XX_BOARD_LINKSYS_WRT310NV1,
         BCM47XX_BOARD_LINKSYS_WRT310NV2,
@@ -74,6 +75,7 @@ enum bcm47xx_board {
         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
+        BCM47XX_BOARD_LINKSYS_WRT600N_V11,
         BCM47XX_BOARD_LINKSYS_WRT610NV1,
         BCM47XX_BOARD_LINKSYS_WRT610NV2,
         BCM47XX_BOARD_LINKSYS_WRTSL54GS,
@@ -86,9 +88,11 @@ enum bcm47xx_board {
 
         BCM47XX_BOARD_NETGEAR_WGR614V8,
         BCM47XX_BOARD_NETGEAR_WGR614V9,
+        BCM47XX_BOARD_NETGEAR_WGR614_V10,
         BCM47XX_BOARD_NETGEAR_WNDR3300,
         BCM47XX_BOARD_NETGEAR_WNDR3400V1,
         BCM47XX_BOARD_NETGEAR_WNDR3400V2,
+        BCM47XX_BOARD_NETGEAR_WNDR3400_V3,
         BCM47XX_BOARD_NETGEAR_WNDR3400VCNA,
         BCM47XX_BOARD_NETGEAR_WNDR3700V3,
         BCM47XX_BOARD_NETGEAR_WNDR4000,
diff --git a/arch/mips/include/asm/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h
deleted file mode 100644
index a3d2f448b10e..000000000000
--- a/arch/mips/include/asm/mach-bcm47xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H
-#define __ASM_MIPS_MACH_BCM47XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm63xx/dma-coherence.h b/arch/mips/include/asm/mach-bcm63xx/dma-coherence.h
new file mode 100644
index 000000000000..11d3b572b1b3
--- /dev/null
+++ b/arch/mips/include/asm/mach-bcm63xx/dma-coherence.h
@@ -0,0 +1,10 @@
+#ifndef __ASM_MACH_BCM63XX_DMA_COHERENCE_H
+#define __ASM_MACH_BCM63XX_DMA_COHERENCE_H
+
+#include <asm/bmips.h>
+
+#define plat_post_dma_flush     bmips_post_dma_flush
+
+#include <asm/mach-generic/dma-coherence.h>
+
+#endif /* __ASM_MACH_BCM63XX_DMA_COHERENCE_H */
diff --git a/arch/mips/include/asm/mach-bcm63xx/war.h b/arch/mips/include/asm/mach-bcm63xx/war.h
deleted file mode 100644
index 05ee8671bef1..000000000000
--- a/arch/mips/include/asm/mach-bcm63xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_BCM63XX_WAR_H
-#define __ASM_MIPS_MACH_BCM63XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_BCM63XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-bcm3384/dma-coherence.h b/arch/mips/include/asm/mach-bmips/dma-coherence.h
index a3be8e50e1f0..d29781f02285 100644
--- a/arch/mips/include/asm/mach-bcm3384/dma-coherence.h
+++ b/arch/mips/include/asm/mach-bmips/dma-coherence.h
@@ -12,8 +12,12 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __ASM_MACH_BCM3384_DMA_COHERENCE_H
-#define __ASM_MACH_BCM3384_DMA_COHERENCE_H
+#ifndef __ASM_MACH_BMIPS_DMA_COHERENCE_H
+#define __ASM_MACH_BMIPS_DMA_COHERENCE_H
+
+#include <asm/bmips.h>
+#include <asm/cpu-type.h>
+#include <asm/cpu.h>
 
 struct device;
 
@@ -45,4 +49,6 @@ static inline int plat_device_is_coherent(struct device *dev)
         return 0;
 }
 
-#endif /* __ASM_MACH_BCM3384_DMA_COHERENCE_H */
+#define plat_post_dma_flush     bmips_post_dma_flush
+
+#endif /* __ASM_MACH_BMIPS_DMA_COHERENCE_H */
diff --git a/arch/mips/include/asm/mach-bmips/spaces.h b/arch/mips/include/asm/mach-bmips/spaces.h
new file mode 100644
index 000000000000..1b05bddc8ec5
--- /dev/null
+++ b/arch/mips/include/asm/mach-bmips/spaces.h
@@ -0,0 +1,18 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle
+ * Copyright (C) 2000, 2002  Maciej W. Rozycki
+ * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc.
+ */
+#ifndef _ASM_BMIPS_SPACES_H
+#define _ASM_BMIPS_SPACES_H
+
+/* Avoid collisions with system base register (SBR) region on BMIPS3300 */
+#define FIXADDR_TOP             ((unsigned long)(long)(int)0xff000000)
+
+#include <asm/mach-generic/spaces.h>
+
+#endif /* __ASM_BMIPS_SPACES_H */
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index fa1f3cfbae8d..d68e685cde60 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -50,7 +50,6 @@
 #define cpu_has_mips32r2        0
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        1
-#define cpu_has_mips_r2_exec_hazard 0
 #define cpu_has_dsp             0
 #define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
index f9f448650505..460042ee5d6f 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
@@ -57,6 +57,10 @@ static inline int plat_device_is_coherent(struct device *dev)
         return 1;
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
 phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
 
diff --git a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
new file mode 100644
index 000000000000..374eefafb320
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
@@ -0,0 +1,74 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003, 2004 Ralf Baechle
+ */
+#ifndef __ASM_MACH_GENERIC_MANGLE_PORT_H
+#define __ASM_MACH_GENERIC_MANGLE_PORT_H
+
+#include <asm/byteorder.h>
+
+#ifdef __BIG_ENDIAN
+
+# define __swizzle_addr_b(port) (port)
+# define __swizzle_addr_w(port) (port)
+# define __swizzle_addr_l(port) (port)
+# define __swizzle_addr_q(port) (port)
+
+#else /* __LITTLE_ENDIAN */
+
+static inline bool __should_swizzle_addr(unsigned long p)
+{
+        /* boot bus? */
+        return ((p >> 40) & 0xff) == 0;
+}
+
+# define __swizzle_addr_b(port) \
+        (__should_swizzle_addr(port) ? (port) ^ 7 : (port))
+# define __swizzle_addr_w(port) \
+        (__should_swizzle_addr(port) ? (port) ^ 6 : (port))
+# define __swizzle_addr_l(port) \
+        (__should_swizzle_addr(port) ? (port) ^ 4 : (port))
+# define __swizzle_addr_q(port) (port)
+
+#endif /* __BIG_ENDIAN */
+
+/*
+ * Sane hardware offers swapping of PCI/ISA I/O space accesses in hardware;
+ * less sane hardware forces software to fiddle with this...
+ *
+ * Regardless, if the host bus endianness mismatches that of PCI/ISA, then
+ * you can't have the numerical value of data and byte addresses within
+ * multibyte quantities both preserved at the same time.  Hence two
+ * variations of functions: non-prefixed ones that preserve the value
+ * and prefixed ones that preserve byte addresses.  The latters are
+ * typically used for moving raw data between a peripheral and memory (cf.
+ * string I/O functions), hence the "__mem_" prefix.
+ */
+#if defined(CONFIG_SWAP_IO_SPACE)
+
+# define ioswabb(a, x)          (x)
+# define __mem_ioswabb(a, x)    (x)
+# define ioswabw(a, x)          le16_to_cpu(x)
+# define __mem_ioswabw(a, x)    (x)
+# define ioswabl(a, x)          le32_to_cpu(x)
+# define __mem_ioswabl(a, x)    (x)
+# define ioswabq(a, x)          le64_to_cpu(x)
+# define __mem_ioswabq(a, x)    (x)
+
+#else
+
+# define ioswabb(a, x)          (x)
+# define __mem_ioswabb(a, x)    (x)
+# define ioswabw(a, x)          (x)
+# define __mem_ioswabw(a, x)    cpu_to_le16(x)
+# define ioswabl(a, x)          (x)
+# define __mem_ioswabl(a, x)    cpu_to_le32(x)
+# define ioswabq(a, x)          (x)
+# define __mem_ioswabq(a, x)    cpu_to_le32(x)
+
+#endif
+
+#endif /* __ASM_MACH_GENERIC_MANGLE_PORT_H */
diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
index 71d4bface1dc..30c5cd9fd973 100644
--- a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
@@ -14,7 +14,6 @@
 #define cpu_has_3k_cache        0
 #define cpu_has_4k_cache        1
 #define cpu_has_tx39_cache      0
-#define cpu_has_fpu             1
 #define cpu_has_32fpr           1
 #define cpu_has_counter         1
 #define cpu_has_watch           0
diff --git a/arch/mips/include/asm/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h
deleted file mode 100644
index 34ae4046541e..000000000000
--- a/arch/mips/include/asm/mach-cobalt/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_COBALT_WAR_H
-#define __ASM_MIPS_MACH_COBALT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_COBALT_WAR_H */
diff --git a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
index acce27fd2bb8..bdf045fb00c8 100644
--- a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
@@ -15,7 +15,6 @@
 /* Generic ones first.  */
 #define cpu_has_tlb                     1
 #define cpu_has_tx39_cache              0
-#define cpu_has_fpu                     1
 #define cpu_has_divec                   0
 #define cpu_has_prefetch                0
 #define cpu_has_mcheck                  0
diff --git a/arch/mips/include/asm/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h
deleted file mode 100644
index d29996feb3e7..000000000000
--- a/arch/mips/include/asm/mach-dec/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_DEC_WAR_H
-#define __ASM_MIPS_MACH_DEC_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_DEC_WAR_H */
diff --git a/arch/mips/include/asm/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h
deleted file mode 100644
index 79ae82da3ec7..000000000000
--- a/arch/mips/include/asm/mach-emma2rh/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_EMMA2RH_WAR_H
-#define __ASM_MIPS_MACH_EMMA2RH_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_EMMA2RH_WAR_H */
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h
index 7629c35986f7..0f8a354fd468 100644
--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
+++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
@@ -52,6 +52,12 @@ static inline int plat_device_is_coherent(struct device *dev)
         return coherentio;
 }
 
+#ifndef plat_post_dma_flush
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+#endif
+
 #ifdef CONFIG_SWIOTLB
 static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
diff --git a/arch/mips/include/asm/mach-ralink/war.h b/arch/mips/include/asm/mach-generic/war.h
index c074b5dc1f82..a1bc2e71f983 100644
--- a/arch/mips/include/asm/mach-ralink/war.h
+++ b/arch/mips/include/asm/mach-generic/war.h
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
  */
-#ifndef __ASM_MACH_RALINK_WAR_H
-#define __ASM_MACH_RALINK_WAR_H
+#ifndef __ASM_MACH_GENERIC_WAR_H
+#define __ASM_MACH_GENERIC_WAR_H
 
 #define R4600_V1_INDEX_ICACHEOP_WAR     0
 #define R4600_V1_HIT_CACHEOP_WAR        0
@@ -21,4 +21,4 @@
 #define R10000_LLSC_WAR                 0
 #define MIPS34K_MISSED_ITLB_WAR         0
 
-#endif /* __ASM_MACH_RALINK_WAR_H */
+#endif /* __ASM_MACH_GENERIC_WAR_H */
diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
index 1dfe47453ea4..9b19b72dba56 100644
--- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
@@ -16,7 +16,6 @@
 #define cpu_has_tlb             1
 #define cpu_has_4kex            1
 #define cpu_has_4k_cache        1
-#define cpu_has_fpu             1
 #define cpu_has_32fpr           1
 #define cpu_has_counter         1
 #define cpu_has_mips16          0
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h
index 4ffddfdb5062..1daa64412569 100644
--- a/arch/mips/include/asm/mach-ip27/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h
@@ -58,6 +58,10 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
         return 1;
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 1;               /* IP27 non-cohernet mode is unsupported */
diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
index 2e1ec6cfedd5..241409b78ff1 100644
--- a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
@@ -26,7 +26,6 @@
 /* Settings which are common for all ip32 CPUs */
 #define cpu_has_tlb             1
 #define cpu_has_4kex            1
-#define cpu_has_fpu             1
 #define cpu_has_32fpr           1
 #define cpu_has_counter         1
 #define cpu_has_mips16          0
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h
index 104cfbc3ed63..0a0b0e2ced60 100644
--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
@@ -80,6 +80,10 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
         return 1;
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 0;               /* IP32 is non-cohernet */
diff --git a/arch/mips/include/asm/mach-ip32/mc146818rtc.h b/arch/mips/include/asm/mach-ip32/mc146818rtc.h
deleted file mode 100644
index 6b6bab43d5c1..000000000000
--- a/arch/mips/include/asm/mach-ip32/mc146818rtc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1998, 2001, 03 by Ralf Baechle
- * Copyright (C) 2000 Harald Koerfgen
- *
- * RTC routines for IP32 style attached Dallas chip.
- */
-#ifndef __ASM_MACH_IP32_MC146818RTC_H
-#define __ASM_MACH_IP32_MC146818RTC_H
-
-#include <asm/ip32/mace.h>
-
-#define RTC_PORT(x)     (0x70 + (x))
-
-static unsigned char CMOS_READ(unsigned long addr)
-{
-        return mace->isa.rtc[addr << 8];
-}
-
-static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
-{
-        mace->isa.rtc[addr << 8] = data;
-}
-
-/*
- * FIXME: Do it right. For now just assume that no one lives in 20th century
- * and no O2 user in 22th century ;-)
- */
-#define mc146818_decode_year(year) ((year) + 2000)
-
-#define RTC_ALWAYS_BCD  0
-
-#endif /* __ASM_MACH_IP32_MC146818RTC_H */
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h
index 949003ef97b3..dc347c25c343 100644
--- a/arch/mips/include/asm/mach-jazz/dma-coherence.h
+++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h
@@ -48,6 +48,10 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
         return 1;
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 0;
diff --git a/arch/mips/include/asm/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h
deleted file mode 100644
index 5b18b9a3d0ec..000000000000
--- a/arch/mips/include/asm/mach-jazz/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_JAZZ_WAR_H
-#define __ASM_MIPS_MACH_JAZZ_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_JAZZ_WAR_H */
diff --git a/arch/mips/include/asm/mach-jz4740/war.h b/arch/mips/include/asm/mach-jz4740/war.h
deleted file mode 100644
index 9b511d323838..000000000000
--- a/arch/mips/include/asm/mach-jz4740/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_JZ4740_WAR_H
-#define __ASM_MIPS_MACH_JZ4740_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_JZ4740_WAR_H */
diff --git a/arch/mips/include/asm/mach-lantiq/war.h b/arch/mips/include/asm/mach-lantiq/war.h
deleted file mode 100644
index 358ca979c1bd..000000000000
--- a/arch/mips/include/asm/mach-lantiq/war.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- */
-#ifndef __ASM_MIPS_MACH_LANTIQ_WAR_H
-#define __ASM_MIPS_MACH_LANTIQ_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif
diff --git a/arch/mips/include/asm/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h
deleted file mode 100644
index 741ae724adc6..000000000000
--- a/arch/mips/include/asm/mach-lasat/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_LASAT_WAR_H
-#define __ASM_MIPS_MACH_LASAT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_LASAT_WAR_H */
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
index 6d69332f21ec..acc376897e46 100644
--- a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
@@ -34,7 +34,6 @@
 #define cpu_has_dsp             0
 #define cpu_has_dsp2            0
 #define cpu_has_ejtag           0
-#define cpu_has_fpu             1
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_inclusive_pcaches       1
 #define cpu_has_llsc            1
diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h
index a90534161bd2..4bf4e19f72e8 100644
--- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
+++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
@@ -78,4 +78,8 @@ static inline int plat_device_is_coherent(struct device *dev)
 #endif /* CONFIG_DMA_NONCOHERENT */
 }
 
+static inline void plat_post_dma_flush(struct device *dev)
+{
+}
+
 #endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index 5459ac09679f..9783103fd6f6 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -255,6 +255,10 @@ static inline void do_perfcnt_IRQ(void)
 extern u64 loongson_chipcfg[MAX_PACKAGES];
 #define LOONGSON_CHIPCFG(id) (*(volatile u32 *)(loongson_chipcfg[id]))
 
+/* Chip Temperature registor of each physical cpu package, PRid >= Loongson-3A */
+extern u64 loongson_chiptemp[MAX_PACKAGES];
+#define LOONGSON_CHIPTEMP(id) (*(volatile u32 *)(loongson_chiptemp[id]))
+
 /* Freq Control register of each physical cpu package, PRid >= Loongson-3B */
 extern u64 loongson_freqctrl[MAX_PACKAGES];
 #define LOONGSON_FREQCTRL(id) (*(volatile u32 *)(loongson_freqctrl[id]))
diff --git a/arch/mips/include/asm/mach-loongson/war.h b/arch/mips/include/asm/mach-loongson/war.h
deleted file mode 100644
index f2570df66bb5..000000000000
--- a/arch/mips/include/asm/mach-loongson/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_LOONGSON_WAR_H
-#define __ASM_MACH_LOONGSON_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MACH_LEMOTE_WAR_H */
diff --git a/arch/mips/include/asm/mach-loongson1/war.h b/arch/mips/include/asm/mach-loongson1/war.h
deleted file mode 100644
index 8fb50d008131..000000000000
--- a/arch/mips/include/asm/mach-loongson1/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MACH_LOONGSON1_WAR_H
-#define __ASM_MACH_LOONGSON1_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MACH_LOONGSON1_WAR_H */
diff --git a/arch/mips/include/asm/mach-netlogic/multi-node.h b/arch/mips/include/asm/mach-netlogic/multi-node.h
index 9ed8dacdc37c..8bdf47e29145 100644
--- a/arch/mips/include/asm/mach-netlogic/multi-node.h
+++ b/arch/mips/include/asm/mach-netlogic/multi-node.h
@@ -48,15 +48,6 @@
 #endif
 
 #define NLM_THREADS_PER_CORE    4
-#ifdef CONFIG_CPU_XLR
-#define nlm_cores_per_node()    8
-#else
-extern unsigned int xlp_cores_per_node;
-#define nlm_cores_per_node()    xlp_cores_per_node
-#endif
-
-#define nlm_threads_per_node()  (nlm_cores_per_node() * NLM_THREADS_PER_CORE)
-#define nlm_cpuid_to_node(c)    ((c) / nlm_threads_per_node())
 
 struct nlm_soc_info {
         unsigned long   coremask;       /* cores enabled on the soc */
diff --git a/arch/mips/include/asm/mach-netlogic/topology.h b/arch/mips/include/asm/mach-netlogic/topology.h
deleted file mode 100644
index 0eb43c832b25..000000000000
--- a/arch/mips/include/asm/mach-netlogic/topology.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2013 Broadcom Corporation
- */
-#ifndef _ASM_MACH_NETLOGIC_TOPOLOGY_H
-#define _ASM_MACH_NETLOGIC_TOPOLOGY_H
-
-#include <asm/mach-netlogic/multi-node.h>
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_MACH_NETLOGIC_TOPOLOGY_H */
diff --git a/arch/mips/include/asm/mach-netlogic/war.h b/arch/mips/include/asm/mach-netlogic/war.h
deleted file mode 100644
index 2c7216840e18..000000000000
--- a/arch/mips/include/asm/mach-netlogic/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2011 Netlogic Microsystems.
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_NLM_WAR_H
-#define __ASM_MIPS_MACH_NLM_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_NLM_WAR_H */
diff --git a/arch/mips/include/asm/mach-paravirt/war.h b/arch/mips/include/asm/mach-paravirt/war.h
deleted file mode 100644
index 36d3afb98451..000000000000
--- a/arch/mips/include/asm/mach-paravirt/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- * Copyright (C) 2013 Cavium Networks <support@caviumnetworks.com>
- */
-#ifndef __ASM_MIPS_MACH_PARAVIRT_WAR_H
-#define __ASM_MIPS_MACH_PARAVIRT_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_PARAVIRT_WAR_H */
diff --git a/arch/mips/include/asm/mach-pistachio/gpio.h b/arch/mips/include/asm/mach-pistachio/gpio.h
new file mode 100644
index 000000000000..6c1649c27b8d
--- /dev/null
+++ b/arch/mips/include/asm/mach-pistachio/gpio.h
@@ -0,0 +1,21 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_PISTACHIO_GPIO_H
+#define __ASM_MACH_PISTACHIO_GPIO_H
+
+#include <asm-generic/gpio.h>
+
+#define gpio_get_value  __gpio_get_value
+#define gpio_set_value  __gpio_set_value
+#define gpio_cansleep   __gpio_cansleep
+#define gpio_to_irq     __gpio_to_irq
+
+#endif /* __ASM_MACH_PISTACHIO_GPIO_H */
diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/include/asm/mach-pistachio/irq.h
new file mode 100644
index 000000000000..b94a09a54221
--- /dev/null
+++ b/arch/mips/include/asm/mach-pistachio/irq.h
@@ -0,0 +1,18 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_PISTACHIO_IRQ_H
+#define __ASM_MACH_PISTACHIO_IRQ_H
+
+#define NR_IRQS 256
+
+#include_next <irq.h>
+
+#endif /* __ASM_MACH_PISTACHIO_IRQ_H */
diff --git a/arch/mips/include/asm/mach-pnx833x/war.h b/arch/mips/include/asm/mach-pnx833x/war.h
deleted file mode 100644
index e410df4e1b3a..000000000000
--- a/arch/mips/include/asm/mach-pnx833x/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_PNX833X_WAR_H
-#define __ASM_MIPS_MACH_PNX833X_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_PNX833X_WAR_H */
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
index f095c529c48c..98cf40417c5d 100644
--- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
@@ -15,7 +15,6 @@
 #define cpu_has_tlb             1
 #define cpu_has_4kex            1
 #define cpu_has_4k_cache        1
-#define cpu_has_fpu             1
 #define cpu_has_32fpr           1
 #define cpu_has_counter         1
 #define cpu_has_watch           0
diff --git a/arch/mips/include/asm/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h
deleted file mode 100644
index 6a52e6534776..000000000000
--- a/arch/mips/include/asm/mach-tx39xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_TX39XX_WAR_H
-#define __ASM_MIPS_MACH_TX39XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */
diff --git a/arch/mips/include/asm/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h
deleted file mode 100644
index ffe31e736009..000000000000
--- a/arch/mips/include/asm/mach-vr41xx/war.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_VR41XX_WAR_H
-#define __ASM_MIPS_MACH_VR41XX_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR     0
-#define R4600_V1_HIT_CACHEOP_WAR        0
-#define R4600_V2_HIT_CACHEOP_WAR        0
-#define R5432_CP0_INTERRUPT_WAR         0
-#define BCM1250_M3_WAR                  0
-#define SIBYTE_1956_WAR                 0
-#define MIPS4K_ICACHE_REFILL_WAR        0
-#define MIPS_CACHE_SYNC_WAR             0
-#define TX49XX_ICACHE_INDEX_INV_WAR     0
-#define ICACHE_REFILLS_WORKAROUND_WAR   0
-#define R10000_LLSC_WAR                 0
-#define MIPS34K_MISSED_ITLB_WAR         0
-
-#endif /* __ASM_MIPS_MACH_VR41XX_WAR_H */
diff --git a/arch/mips/include/asm/mips-boards/sead3-addr.h b/arch/mips/include/asm/mips-boards/sead3-addr.h
new file mode 100644
index 000000000000..c0db57802f7c
--- /dev/null
+++ b/arch/mips/include/asm/mips-boards/sead3-addr.h
@@ -0,0 +1,83 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2015 Imagination Technologies, Inc.
+ *   written by Ralf Baechle <ralf@linux-mips.org>
+ */
+#ifndef __ASM_MIPS_BOARDS_SEAD3_ADDR_H
+#define __ASM_MIPS_BOARDS_SEAD3_ADDR_H
+
+/*
+ * Target #0 Register Decode
+ */
+#define SEAD3_SD_SPDCNF                         0xbb000040
+#define SEAD3_SD_SPADDR                         0xbb000048
+#define SEAD3_SD_DATA                           0xbb000050
+
+/*
+ * Target #1 Register Decode
+ */
+#define SEAD3_CFG                               0xbb100110
+#define SEAD3_GIC_BASE_ADDRESS                  0xbb1c0000
+#define SEAD3_SHARED_SECTION                    0xbb1c0000
+#define SEAD3_VPE_LOCAL_SECTION                 0xbb1c8000
+#define SEAD3_VPE_OTHER_SECTION                 0xbb1cc000
+#define SEAD3_USER_MODE_VISIBLE_SECTION         0xbb1d0000
+
+/*
+ * Target #3 Register Decode
+ */
+#define SEAD3_USB_HS_BASE                       0xbb200000
+#define SEAD3_USB_HS_IDENTIFICATION_REGS        0xbb200000
+#define SEAD3_USB_HS_CAPABILITY_REGS            0xbb200100
+#define SEAD3_USB_HS_OPERATIONAL_REGS           0xbb200140
+#define SEAD3_RESERVED                          0xbe800000
+
+/*
+ * Target #3 Register Decode
+ */
+#define SEAD3_SRAM                              0xbe000000
+#define SEAD3_OPTIONAL_SRAM                     0xbe400000
+#define SEAD3_FPGA                              0xbf000000
+
+#define SEAD3_PI_PIC32_USB_STATUS               0xbf000060
+#define   SEAD3_PI_PIC32_USB_STATUS_IO_RDY      (1 << 0)
+#define   SEAD3_PI_PIC32_USB_STATUS_SPL_INT     (1 << 1)
+#define   SEAD3_PI_PIC32_USB_STATUS_GPIOA_INT   (1 << 2)
+#define   SEAD3_PI_PIC32_USB_STATUS_GPIOB_INT   (1 << 3)
+
+#define SEAD3_PI_SOFT_ENDIAN                    0xbf000070
+
+#define SEAD3_CPLD_P_SWITCH                     0xbf000200
+#define SEAD3_CPLD_F_SWITCH                     0xbf000208
+#define SEAD3_CPLD_P_LED                        0xbf000210
+#define SEAD3_CPLD_F_LED                        0xbf000218
+#define SEAD3_NEWSC_LIVE                        0xbf000220
+#define SEAD3_NEWSC_REG                         0xbf000228
+#define SEAD3_NEWSC_CTRL                        0xbf000230
+
+#define SEAD3_LCD_CONTROL                       0xbf000400
+#define SEAD3_LCD_DATA                          0xbf000408
+#define SEAD3_CPLD_LCD_STATUS                   0xbf000410
+#define SEAD3_CPLD_LCD_DATA                     0xbf000418
+
+#define SEAD3_CPLD_PI_DEVRST                    0xbf000480
+#define SEAD3_CPLD_PI_DEVRST_IC32_RST           (1 << 0)
+#define SEAD3_RESERVED_0                        0xbf000500
+
+#define SEAD3_PIC32_REGISTERS                   0xbf000600
+#define SEAD3_RESERVED_1                        0xbf000700
+#define SEAD3_UART_CH_0                         0xbf000800
+#define SEAD3_UART_CH_1                         0xbf000900
+#define SEAD3_RESERVED_2                        0xbf000a00
+#define SEAD3_ETHERNET                          0xbf010000
+#define SEAD3_RESERVED_3                        0xbf020000
+#define SEAD3_USER_EXPANSION                    0xbf400000
+#define SEAD3_RESERVED_4                        0xbf800000
+#define SEAD3_BOOT_FLASH_EXTENSION              0xbfa00000
+#define SEAD3_BOOT_FLASH                        0xbfc00000
+#define SEAD3_REVISION_REGISTER                 0xbfc00010
+
+#endif /* __ASM_MIPS_BOARDS_SEAD3_ADDR_H  */
diff --git a/arch/mips/include/asm/mips-r2-to-r6-emul.h b/arch/mips/include/asm/mips-r2-to-r6-emul.h
index 60570f2c3ba2..4b89f28047f7 100644
--- a/arch/mips/include/asm/mips-r2-to-r6-emul.h
+++ b/arch/mips/include/asm/mips-r2-to-r6-emul.h
@@ -84,11 +84,16 @@ extern void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
 
 #ifndef CONFIG_MIPSR2_TO_R6_EMULATOR
 static int mipsr2_emulation;
-static __maybe_unused int mipsr2_decoder(struct pt_regs *regs, u32 inst) { return 0; };
+static inline int mipsr2_decoder(struct pt_regs *regs, u32 inst,
+                                 unsigned long *fcr31)
+{
+        return 0;
+};
 #else
 /* MIPS R2 Emulator ON/OFF */
 extern int mipsr2_emulation;
-extern int mipsr2_decoder(struct pt_regs *regs, u32 inst);
+extern int mipsr2_decoder(struct pt_regs *regs, u32 inst,
+                          unsigned long *fcr31);
 #endif /* CONFIG_MIPSR2_TO_R6_EMULATOR */
 
 #define NO_R6EMU        (cpu_has_mips_r6 && !mipsr2_emulation)
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index fef004434096..764e2756b54d 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -111,70 +111,6 @@
  */
 #define CP0_TX39_CACHE  $7
 
-/*
- * Coprocessor 1 (FPU) register names
- */
-#define CP1_REVISION   $0
-#define CP1_STATUS     $31
-
-/*
- * FPU Status Register Values
- */
-/*
- * Status Register Values
- */
-
-#define FPU_CSR_FLUSH   0x01000000      /* flush denormalised results to 0 */
-#define FPU_CSR_COND    0x00800000      /* $fcc0 */
-#define FPU_CSR_COND0   0x00800000      /* $fcc0 */
-#define FPU_CSR_COND1   0x02000000      /* $fcc1 */
-#define FPU_CSR_COND2   0x04000000      /* $fcc2 */
-#define FPU_CSR_COND3   0x08000000      /* $fcc3 */
-#define FPU_CSR_COND4   0x10000000      /* $fcc4 */
-#define FPU_CSR_COND5   0x20000000      /* $fcc5 */
-#define FPU_CSR_COND6   0x40000000      /* $fcc6 */
-#define FPU_CSR_COND7   0x80000000      /* $fcc7 */
-
-/*
- * Bits 18 - 20 of the FPU Status Register will be read as 0,
- * and should be written as zero.
- */
-#define FPU_CSR_RSVD    0x001c0000
-
-/*
- * X the exception cause indicator
- * E the exception enable
- * S the sticky/flag bit
-*/
-#define FPU_CSR_ALL_X   0x0003f000
-#define FPU_CSR_UNI_X   0x00020000
-#define FPU_CSR_INV_X   0x00010000
-#define FPU_CSR_DIV_X   0x00008000
-#define FPU_CSR_OVF_X   0x00004000
-#define FPU_CSR_UDF_X   0x00002000
-#define FPU_CSR_INE_X   0x00001000
-
-#define FPU_CSR_ALL_E   0x00000f80
-#define FPU_CSR_INV_E   0x00000800
-#define FPU_CSR_DIV_E   0x00000400
-#define FPU_CSR_OVF_E   0x00000200
-#define FPU_CSR_UDF_E   0x00000100
-#define FPU_CSR_INE_E   0x00000080
-
-#define FPU_CSR_ALL_S   0x0000007c
-#define FPU_CSR_INV_S   0x00000040
-#define FPU_CSR_DIV_S   0x00000020
-#define FPU_CSR_OVF_S   0x00000010
-#define FPU_CSR_UDF_S   0x00000008
-#define FPU_CSR_INE_S   0x00000004
-
-/* Bits 0 and 1 of FPU Status Register specify the rounding mode */
-#define FPU_CSR_RM      0x00000003
-#define FPU_CSR_RN      0x0     /* nearest */
-#define FPU_CSR_RZ      0x1     /* towards zero */
-#define FPU_CSR_RU      0x2     /* towards +Infinity */
-#define FPU_CSR_RD      0x3     /* towards -Infinity */
-
 
 /*
  * Values for PageMask register
@@ -341,39 +277,6 @@
 #define ST0_MX                  0x01000000
 
 /*
- * Bitfields in the TX39 family CP0 Configuration Register 3
- */
-#define TX39_CONF_ICS_SHIFT     19
-#define TX39_CONF_ICS_MASK      0x00380000
-#define TX39_CONF_ICS_1KB       0x00000000
-#define TX39_CONF_ICS_2KB       0x00080000
-#define TX39_CONF_ICS_4KB       0x00100000
-#define TX39_CONF_ICS_8KB       0x00180000
-#define TX39_CONF_ICS_16KB      0x00200000
-
-#define TX39_CONF_DCS_SHIFT     16
-#define TX39_CONF_DCS_MASK      0x00070000
-#define TX39_CONF_DCS_1KB       0x00000000
-#define TX39_CONF_DCS_2KB       0x00010000
-#define TX39_CONF_DCS_4KB       0x00020000
-#define TX39_CONF_DCS_8KB       0x00030000
-#define TX39_CONF_DCS_16KB      0x00040000
-
-#define TX39_CONF_CWFON         0x00004000
-#define TX39_CONF_WBON          0x00002000
-#define TX39_CONF_RF_SHIFT      10
-#define TX39_CONF_RF_MASK       0x00000c00
-#define TX39_CONF_DOZE          0x00000200
-#define TX39_CONF_HALT          0x00000100
-#define TX39_CONF_LOCK          0x00000080
-#define TX39_CONF_ICE           0x00000020
-#define TX39_CONF_DCE           0x00000010
-#define TX39_CONF_IRSIZE_SHIFT  2
-#define TX39_CONF_IRSIZE_MASK   0x0000000c
-#define TX39_CONF_DRSIZE_SHIFT  0
-#define TX39_CONF_DRSIZE_MASK   0x00000003
-
-/*
  * Status register bits available in all MIPS CPUs.
  */
 #define ST0_IM                  0x0000ff00
@@ -425,9 +328,9 @@
 
 /*
  * Bitfields and bit numbers in the coprocessor 0 IntCtl register. (MIPSR2)
- *
- * Refer to your MIPS R4xx0 manual, chapter 5 for explanation.
  */
+#define INTCTLB_IPFDC           23
+#define INTCTLF_IPFDC           (_ULCAST_(7) << INTCTLB_IPFDC)
 #define INTCTLB_IPPCI           26
 #define INTCTLF_IPPCI           (_ULCAST_(7) << INTCTLB_IPPCI)
 #define INTCTLB_IPTI            29
@@ -438,10 +341,10 @@
  *
  * Refer to your MIPS R4xx0 manual, chapter 5 for explanation.
  */
-#define  CAUSEB_EXCCODE         2
-#define  CAUSEF_EXCCODE         (_ULCAST_(31)  <<  2)
-#define  CAUSEB_IP              8
-#define  CAUSEF_IP              (_ULCAST_(255) <<  8)
+#define CAUSEB_EXCCODE          2
+#define CAUSEF_EXCCODE          (_ULCAST_(31)  <<  2)
+#define CAUSEB_IP               8
+#define CAUSEF_IP               (_ULCAST_(255) <<  8)
 #define  CAUSEB_IP0             8
 #define  CAUSEF_IP0             (_ULCAST_(1)   <<  8)
 #define  CAUSEB_IP1             9
@@ -458,16 +361,18 @@
 #define  CAUSEF_IP6             (_ULCAST_(1)   << 14)
 #define  CAUSEB_IP7             15
 #define  CAUSEF_IP7             (_ULCAST_(1)   << 15)
-#define  CAUSEB_IV              23
-#define  CAUSEF_IV              (_ULCAST_(1)   << 23)
-#define  CAUSEB_PCI             26
-#define  CAUSEF_PCI             (_ULCAST_(1)   << 26)
-#define  CAUSEB_CE              28
-#define  CAUSEF_CE              (_ULCAST_(3)   << 28)
-#define  CAUSEB_TI              30
-#define  CAUSEF_TI              (_ULCAST_(1)   << 30)
-#define  CAUSEB_BD              31
-#define  CAUSEF_BD              (_ULCAST_(1)   << 31)
+#define CAUSEB_FDCI             21
+#define CAUSEF_FDCI             (_ULCAST_(1)   << 21)
+#define CAUSEB_IV               23
+#define CAUSEF_IV               (_ULCAST_(1)   << 23)
+#define CAUSEB_PCI              26
+#define CAUSEF_PCI              (_ULCAST_(1)   << 26)
+#define CAUSEB_CE               28
+#define CAUSEF_CE               (_ULCAST_(3)   << 28)
+#define CAUSEB_TI               30
+#define CAUSEF_TI               (_ULCAST_(1)   << 30)
+#define CAUSEB_BD               31
+#define CAUSEF_BD               (_ULCAST_(1)   << 31)
 
 /*
  * Bits in the coprocessor 0 config register.
@@ -689,18 +594,6 @@
 #define MIPS_CMGCRF_BASE        (~_ULCAST_((1 << MIPS_CMGCRB_BASE) - 1))
 
 /*
- * Bits in the MIPS32/64 coprocessor 1 (FPU) revision register.
- */
-#define MIPS_FPIR_S             (_ULCAST_(1) << 16)
-#define MIPS_FPIR_D             (_ULCAST_(1) << 17)
-#define MIPS_FPIR_PS            (_ULCAST_(1) << 18)
-#define MIPS_FPIR_3D            (_ULCAST_(1) << 19)
-#define MIPS_FPIR_W             (_ULCAST_(1) << 20)
-#define MIPS_FPIR_L             (_ULCAST_(1) << 21)
-#define MIPS_FPIR_F64           (_ULCAST_(1) << 22)
-#define MIPS_FPIR_FREP          (_ULCAST_(1) << 29)
-
-/*
  * Bits in the MIPS32 Memory Segmentation registers.
  */
 #define MIPS_SEGCFG_PA_SHIFT    9
@@ -751,6 +644,172 @@
 #define MIPS_PWCTL_PSN_SHIFT    0
 #define MIPS_PWCTL_PSN_MASK     0x0000003f
 
+/* CDMMBase register bit definitions */
+#define MIPS_CDMMBASE_SIZE_SHIFT 0
+#define MIPS_CDMMBASE_SIZE      (_ULCAST_(511) << MIPS_CDMMBASE_SIZE_SHIFT)
+#define MIPS_CDMMBASE_CI        (_ULCAST_(1) << 9)
+#define MIPS_CDMMBASE_EN        (_ULCAST_(1) << 10)
+#define MIPS_CDMMBASE_ADDR_SHIFT 11
+#define MIPS_CDMMBASE_ADDR_START 15
+
+/*
+ * Bitfields in the TX39 family CP0 Configuration Register 3
+ */
+#define TX39_CONF_ICS_SHIFT     19
+#define TX39_CONF_ICS_MASK      0x00380000
+#define TX39_CONF_ICS_1KB       0x00000000
+#define TX39_CONF_ICS_2KB       0x00080000
+#define TX39_CONF_ICS_4KB       0x00100000
+#define TX39_CONF_ICS_8KB       0x00180000
+#define TX39_CONF_ICS_16KB      0x00200000
+
+#define TX39_CONF_DCS_SHIFT     16
+#define TX39_CONF_DCS_MASK      0x00070000
+#define TX39_CONF_DCS_1KB       0x00000000
+#define TX39_CONF_DCS_2KB       0x00010000
+#define TX39_CONF_DCS_4KB       0x00020000
+#define TX39_CONF_DCS_8KB       0x00030000
+#define TX39_CONF_DCS_16KB      0x00040000
+
+#define TX39_CONF_CWFON         0x00004000
+#define TX39_CONF_WBON          0x00002000
+#define TX39_CONF_RF_SHIFT      10
+#define TX39_CONF_RF_MASK       0x00000c00
+#define TX39_CONF_DOZE          0x00000200
+#define TX39_CONF_HALT          0x00000100
+#define TX39_CONF_LOCK          0x00000080
+#define TX39_CONF_ICE           0x00000020
+#define TX39_CONF_DCE           0x00000010
+#define TX39_CONF_IRSIZE_SHIFT  2
+#define TX39_CONF_IRSIZE_MASK   0x0000000c
+#define TX39_CONF_DRSIZE_SHIFT  0
+#define TX39_CONF_DRSIZE_MASK   0x00000003
+
+
+/*
+ * Coprocessor 1 (FPU) register names
+ */
+#define CP1_REVISION    $0
+#define CP1_UFR         $1
+#define CP1_UNFR        $4
+#define CP1_FCCR        $25
+#define CP1_FEXR        $26
+#define CP1_FENR        $28
+#define CP1_STATUS      $31
+
+
+/*
+ * Bits in the MIPS32/64 coprocessor 1 (FPU) revision register.
+ */
+#define MIPS_FPIR_S             (_ULCAST_(1) << 16)
+#define MIPS_FPIR_D             (_ULCAST_(1) << 17)
+#define MIPS_FPIR_PS            (_ULCAST_(1) << 18)
+#define MIPS_FPIR_3D            (_ULCAST_(1) << 19)
+#define MIPS_FPIR_W             (_ULCAST_(1) << 20)
+#define MIPS_FPIR_L             (_ULCAST_(1) << 21)
+#define MIPS_FPIR_F64           (_ULCAST_(1) << 22)
+#define MIPS_FPIR_HAS2008       (_ULCAST_(1) << 23)
+#define MIPS_FPIR_UFRP          (_ULCAST_(1) << 28)
+#define MIPS_FPIR_FREP          (_ULCAST_(1) << 29)
+
+/*
+ * Bits in the MIPS32/64 coprocessor 1 (FPU) condition codes register.
+ */
+#define MIPS_FCCR_CONDX_S       0
+#define MIPS_FCCR_CONDX         (_ULCAST_(255) << MIPS_FCCR_CONDX_S)
+#define MIPS_FCCR_COND0_S       0
+#define MIPS_FCCR_COND0         (_ULCAST_(1) << MIPS_FCCR_COND0_S)
+#define MIPS_FCCR_COND1_S       1
+#define MIPS_FCCR_COND1         (_ULCAST_(1) << MIPS_FCCR_COND1_S)
+#define MIPS_FCCR_COND2_S       2
+#define MIPS_FCCR_COND2         (_ULCAST_(1) << MIPS_FCCR_COND2_S)
+#define MIPS_FCCR_COND3_S       3
+#define MIPS_FCCR_COND3         (_ULCAST_(1) << MIPS_FCCR_COND3_S)
+#define MIPS_FCCR_COND4_S       4
+#define MIPS_FCCR_COND4         (_ULCAST_(1) << MIPS_FCCR_COND4_S)
+#define MIPS_FCCR_COND5_S       5
+#define MIPS_FCCR_COND5         (_ULCAST_(1) << MIPS_FCCR_COND5_S)
+#define MIPS_FCCR_COND6_S       6
+#define MIPS_FCCR_COND6         (_ULCAST_(1) << MIPS_FCCR_COND6_S)
+#define MIPS_FCCR_COND7_S       7
+#define MIPS_FCCR_COND7         (_ULCAST_(1) << MIPS_FCCR_COND7_S)
+
+/*
+ * Bits in the MIPS32/64 coprocessor 1 (FPU) enables register.
+ */
+#define MIPS_FENR_FS_S          2
+#define MIPS_FENR_FS            (_ULCAST_(1) << MIPS_FENR_FS_S)
+
+/*
+ * FPU Status Register Values
+ */
+#define FPU_CSR_COND_S  23                                      /* $fcc0 */
+#define FPU_CSR_COND    (_ULCAST_(1) << FPU_CSR_COND_S)
+
+#define FPU_CSR_FS_S    24              /* flush denormalised results to 0 */
+#define FPU_CSR_FS      (_ULCAST_(1) << FPU_CSR_FS_S)
+
+#define FPU_CSR_CONDX_S 25                                      /* $fcc[7:1] */
+#define FPU_CSR_CONDX   (_ULCAST_(127) << FPU_CSR_CONDX_S)
+#define FPU_CSR_COND1_S 25                                      /* $fcc1 */
+#define FPU_CSR_COND1   (_ULCAST_(1) << FPU_CSR_COND1_S)
+#define FPU_CSR_COND2_S 26                                      /* $fcc2 */
+#define FPU_CSR_COND2   (_ULCAST_(1) << FPU_CSR_COND2_S)
+#define FPU_CSR_COND3_S 27                                      /* $fcc3 */
+#define FPU_CSR_COND3   (_ULCAST_(1) << FPU_CSR_COND3_S)
+#define FPU_CSR_COND4_S 28                                      /* $fcc4 */
+#define FPU_CSR_COND4   (_ULCAST_(1) << FPU_CSR_COND4_S)
+#define FPU_CSR_COND5_S 29                                      /* $fcc5 */
+#define FPU_CSR_COND5   (_ULCAST_(1) << FPU_CSR_COND5_S)
+#define FPU_CSR_COND6_S 30                                      /* $fcc6 */
+#define FPU_CSR_COND6   (_ULCAST_(1) << FPU_CSR_COND6_S)
+#define FPU_CSR_COND7_S 31                                      /* $fcc7 */
+#define FPU_CSR_COND7   (_ULCAST_(1) << FPU_CSR_COND7_S)
+
+/*
+ * Bits 22:20 of the FPU Status Register will be read as 0,
+ * and should be written as zero.
+ */
+#define FPU_CSR_RSVD    (_ULCAST_(7) << 20)
+
+#define FPU_CSR_ABS2008 (_ULCAST_(1) << 19)
+#define FPU_CSR_NAN2008 (_ULCAST_(1) << 18)
+
+/*
+ * X the exception cause indicator
+ * E the exception enable
+ * S the sticky/flag bit
+*/
+#define FPU_CSR_ALL_X   0x0003f000
+#define FPU_CSR_UNI_X   0x00020000
+#define FPU_CSR_INV_X   0x00010000
+#define FPU_CSR_DIV_X   0x00008000
+#define FPU_CSR_OVF_X   0x00004000
+#define FPU_CSR_UDF_X   0x00002000
+#define FPU_CSR_INE_X   0x00001000
+
+#define FPU_CSR_ALL_E   0x00000f80
+#define FPU_CSR_INV_E   0x00000800
+#define FPU_CSR_DIV_E   0x00000400
+#define FPU_CSR_OVF_E   0x00000200
+#define FPU_CSR_UDF_E   0x00000100
+#define FPU_CSR_INE_E   0x00000080
+
+#define FPU_CSR_ALL_S   0x0000007c
+#define FPU_CSR_INV_S   0x00000040
+#define FPU_CSR_DIV_S   0x00000020
+#define FPU_CSR_OVF_S   0x00000010
+#define FPU_CSR_UDF_S   0x00000008
+#define FPU_CSR_INE_S   0x00000004
+
+/* Bits 0 and 1 of FPU Status Register specify the rounding mode */
+#define FPU_CSR_RM      0x00000003
+#define FPU_CSR_RN      0x0     /* nearest */
+#define FPU_CSR_RZ      0x1     /* towards zero */
+#define FPU_CSR_RU      0x2     /* towards +Infinity */
+#define FPU_CSR_RD      0x3     /* towards -Infinity */
+
+
 #ifndef __ASSEMBLY__
 
 /*
@@ -1282,6 +1341,9 @@ do {									\
 #define read_c0_ebase()         __read_32bit_c0_register($15, 1)
 #define write_c0_ebase(val)     __write_32bit_c0_register($15, 1, val)
 
+#define read_c0_cdmmbase()      __read_ulong_c0_register($15, 2)
+#define write_c0_cdmmbase(val)  __write_ulong_c0_register($15, 2, val)
+
 /* MIPSR3 */
 #define read_c0_segctl0()       __read_32bit_c0_register($5, 2)
 #define write_c0_segctl0(val)   __write_32bit_c0_register($5, 2, val)
diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h
index c281f03eb312..2a4c128277e4 100644
--- a/arch/mips/include/asm/netlogic/common.h
+++ b/arch/mips/include/asm/netlogic/common.h
@@ -111,6 +111,25 @@ static inline int nlm_irq_to_xirq(int node, int irq)
         return node * NR_IRQS / NLM_NR_NODES + irq;
 }
 
-extern int nlm_cpu_ready[];
+#ifdef CONFIG_CPU_XLR
+#define nlm_cores_per_node()    8
+#else
+static inline int nlm_cores_per_node(void)
+{
+        return ((read_c0_prid() & PRID_IMP_MASK)
+                                == PRID_IMP_NETLOGIC_XLP9XX) ? 32 : 8;
+}
 #endif
+static inline int nlm_threads_per_node(void)
+{
+        return nlm_cores_per_node() * NLM_THREADS_PER_CORE;
+}
+
+static inline int nlm_hwtid_to_node(int hwtid)
+{
+        return hwtid / nlm_threads_per_node();
+}
+
+extern int nlm_cpu_ready[];
+#endif /* __ASSEMBLY__ */
 #endif /* _NETLOGIC_COMMON_H_ */
diff --git a/arch/mips/include/asm/netlogic/mips-extns.h b/arch/mips/include/asm/netlogic/mips-extns.h
index 06f1f75bfa9b..788baf399e69 100644
--- a/arch/mips/include/asm/netlogic/mips-extns.h
+++ b/arch/mips/include/asm/netlogic/mips-extns.h
@@ -157,7 +157,13 @@ static inline int nlm_nodeid(void)
 
 static inline unsigned int nlm_core_id(void)
 {
-        return (read_c0_ebase() & 0x1c) >> 2;
+        uint32_t prid = read_c0_prid() & PRID_IMP_MASK;
+
+        if ((prid == PRID_IMP_NETLOGIC_XLP9XX) ||
+                        (prid == PRID_IMP_NETLOGIC_XLP5XX))
+                return (read_c0_ebase() & 0x7c) >> 2;
+        else
+                return (read_c0_ebase() & 0x1c) >> 2;
 }
 
 static inline unsigned int nlm_thread_id(void)
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h b/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
index 6d2e58a9a542..a06b59292153 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
@@ -46,6 +46,8 @@
 #define CPU_BLOCKID_FPU         9
 #define CPU_BLOCKID_MAP         10
 
+#define IFU_BRUB_RESERVE        0x007
+
 #define ICU_DEFEATURE           0x100
 
 #define LSU_DEFEATURE           0x304
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/sys.h b/arch/mips/include/asm/netlogic/xlp-hal/sys.h
index bc7bddf25be9..6bcf3952e556 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/sys.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/sys.h
@@ -177,6 +177,9 @@
 #define SYS_9XX_CLK_DEV_DIV                     0x18d
 #define SYS_9XX_CLK_DEV_CHG                     0x18f
 
+#define SYS_9XX_CLK_DEV_SEL_REG                 0x1a4
+#define SYS_9XX_CLK_DEV_DIV_REG                 0x1a6
+
 /* Registers changed on 9XX */
 #define SYS_9XX_POWER_ON_RESET_CFG              0x00
 #define SYS_9XX_CHIP_RESET                      0x01
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index a862b93223cc..feb6ed807ec6 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -52,6 +52,7 @@
 #define PIC_2XX_XHCI_2_IRQ              25
 #define PIC_9XX_XHCI_0_IRQ              23
 #define PIC_9XX_XHCI_1_IRQ              24
+#define PIC_9XX_XHCI_2_IRQ              25
 
 #define PIC_MMC_IRQ                     29
 #define PIC_I2C_0_IRQ                   30
@@ -89,7 +90,7 @@ void xlp_wakeup_secondary_cpus(void);
 
 void xlp_mmu_init(void);
 void nlm_hal_init(void);
-int xlp_get_dram_map(int n, uint64_t *dram_map);
+int nlm_get_dram_map(int node, uint64_t *dram_map, int nentries);
 
 struct pci_dev;
 int xlp_socdev_to_node(const struct pci_dev *dev);
diff --git a/arch/mips/include/asm/octeon/cvmx-address.h b/arch/mips/include/asm/octeon/cvmx-address.h
index e2d874e681f6..e4444f8c4a61 100644
--- a/arch/mips/include/asm/octeon/cvmx-address.h
+++ b/arch/mips/include/asm/octeon/cvmx-address.h
@@ -104,6 +104,7 @@ typedef enum {
 typedef union {
 
         uint64_t u64;
+#ifdef __BIG_ENDIAN_BITFIELD
         /* mapped or unmapped virtual address */
         struct {
                 uint64_t R:2;
@@ -202,6 +203,72 @@ typedef union {
                 uint64_t didspace:24;
                 uint64_t unused:40;
         } sfilldidspace;
+#else
+        struct {
+                uint64_t offset:62;
+                uint64_t R:2;
+        } sva;
+
+        struct {
+                uint64_t offset:31;
+                uint64_t zeroes:33;
+        } suseg;
+
+        struct {
+                uint64_t offset:29;
+                uint64_t sp:2;
+                uint64_t ones:33;
+        } sxkseg;
+
+        struct {
+                uint64_t pa:49;
+                uint64_t mbz:10;
+                uint64_t cca:3;
+                uint64_t R:2;
+        } sxkphys;
+
+        struct {
+                uint64_t offset:36;
+                uint64_t unaddr:4;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t mbz:15;
+        } sphys;
+
+        struct {
+                uint64_t offset:36;
+                uint64_t unaddr:4;
+                uint64_t zeroes:24;
+        } smem;
+
+        struct {
+                uint64_t offset:36;
+                uint64_t unaddr:4;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t mbz:13;
+                uint64_t mem_region:2;
+        } sio;
+
+        struct {
+                uint64_t addr:13;
+                cvmx_add_win_dec_t csrdec:2;
+                uint64_t ones:49;
+        } sscr;
+
+        struct {
+                uint64_t addr:7;
+                uint64_t type:3;
+                uint64_t unused2:3;
+                uint64_t csrdec:2;
+                uint64_t ones:49;
+        } sdma;
+
+        struct {
+                uint64_t unused:40;
+                uint64_t didspace:24;
+        } sfilldidspace;
+#endif
 
 } cvmx_addr_t;
 
diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 2298199a287e..c373d95b5e2c 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -53,6 +53,7 @@
  * to 0.
  */
 struct cvmx_bootinfo {
+#ifdef __BIG_ENDIAN_BITFIELD
         uint32_t major_version;
         uint32_t minor_version;
 
@@ -123,6 +124,60 @@ struct cvmx_bootinfo {
          */
         uint64_t fdt_addr;
 #endif
+#else                           /* __BIG_ENDIAN */
+        /*
+         * Little-Endian: When the CPU mode is switched to
+         * little-endian, the view of the structure has some of the
+         * fields swapped.
+         */
+        uint32_t minor_version;
+        uint32_t major_version;
+
+        uint64_t stack_top;
+        uint64_t heap_base;
+        uint64_t heap_end;
+        uint64_t desc_vaddr;
+
+        uint32_t stack_size;
+        uint32_t exception_base_addr;
+
+        uint32_t core_mask;
+        uint32_t flags;
+
+        uint32_t phy_mem_desc_addr;
+        uint32_t dram_size;
+
+        uint32_t eclock_hz;
+        uint32_t debugger_flags_base_addr;
+
+        uint32_t reserved0;
+        uint32_t dclock_hz;
+
+        uint8_t reserved3;
+        uint8_t reserved2;
+        uint16_t reserved1;
+        uint8_t board_rev_minor;
+        uint8_t board_rev_major;
+        uint16_t board_type;
+
+        char board_serial_number[CVMX_BOOTINFO_OCTEON_SERIAL_LEN];
+        uint8_t mac_addr_base[6];
+        uint8_t mac_addr_count;
+        uint8_t pad[5];
+
+#if (CVMX_BOOTINFO_MIN_VER >= 1)
+        uint64_t compact_flash_common_base_addr;
+        uint64_t compact_flash_attribute_base_addr;
+        uint64_t led_display_base_addr;
+#endif
+#if (CVMX_BOOTINFO_MIN_VER >= 2)
+        uint32_t config_flags;
+        uint32_t dfa_ref_clock_hz;
+#endif
+#if (CVMX_BOOTINFO_MIN_VER >= 3)
+        uint64_t fdt_addr;
+#endif
+#endif
 };
 
 #define CVMX_BOOTINFO_CFG_FLAG_PCI_HOST                 (1ull << 0)
diff --git a/arch/mips/include/asm/octeon/cvmx-bootmem.h b/arch/mips/include/asm/octeon/cvmx-bootmem.h
index 352f1dc2508b..374562507d0b 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootmem.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootmem.h
@@ -95,6 +95,7 @@ struct cvmx_bootmem_named_block_desc {
  * positions for backwards compatibility.
  */
 struct cvmx_bootmem_desc {
+#if defined(__BIG_ENDIAN_BITFIELD) || defined(CVMX_BUILD_FOR_LINUX_HOST)
         /* spinlock to control access to list */
         uint32_t lock;
         /* flags for indicating various conditions */
@@ -120,7 +121,20 @@ struct cvmx_bootmem_desc {
         uint32_t named_block_name_len;
         /* address of named memory block descriptors */
         uint64_t named_block_array_addr;
+#else                           /* __LITTLE_ENDIAN */
+        uint32_t flags;
+        uint32_t lock;
+        uint64_t head_addr;
 
+        uint32_t minor_version;
+        uint32_t major_version;
+        uint64_t app_data_addr;
+        uint64_t app_data_size;
+
+        uint32_t named_block_name_len;
+        uint32_t named_block_num_blocks;
+        uint64_t named_block_array_addr;
+#endif
 };
 
 /**
diff --git a/arch/mips/include/asm/octeon/cvmx-fau.h b/arch/mips/include/asm/octeon/cvmx-fau.h
index ef98f7fc102f..dafeae300c97 100644
--- a/arch/mips/include/asm/octeon/cvmx-fau.h
+++ b/arch/mips/include/asm/octeon/cvmx-fau.h
@@ -105,6 +105,16 @@ typedef union {
         } s;
 } cvmx_fau_async_tagwait_result_t;
 
+#ifdef __BIG_ENDIAN_BITFIELD
+#define SWIZZLE_8  0
+#define SWIZZLE_16 0
+#define SWIZZLE_32 0
+#else
+#define SWIZZLE_8  0x7
+#define SWIZZLE_16 0x6
+#define SWIZZLE_32 0x4
+#endif
+
 /**
  * Builds a store I/O address for writing to the FAU
  *
@@ -175,6 +185,7 @@ static inline int64_t cvmx_fau_fetch_and_add64(cvmx_fau_reg_64_t reg,
 static inline int32_t cvmx_fau_fetch_and_add32(cvmx_fau_reg_32_t reg,
                                                int32_t value)
 {
+        reg ^= SWIZZLE_32;
         return cvmx_read64_int32(__cvmx_fau_atomic_address(0, reg, value));
 }
 
@@ -189,6 +200,7 @@ static inline int32_t cvmx_fau_fetch_and_add32(cvmx_fau_reg_32_t reg,
 static inline int16_t cvmx_fau_fetch_and_add16(cvmx_fau_reg_16_t reg,
                                                int16_t value)
 {
+        reg ^= SWIZZLE_16;
         return cvmx_read64_int16(__cvmx_fau_atomic_address(0, reg, value));
 }
 
@@ -201,6 +213,7 @@ static inline int16_t cvmx_fau_fetch_and_add16(cvmx_fau_reg_16_t reg,
  */
 static inline int8_t cvmx_fau_fetch_and_add8(cvmx_fau_reg_8_t reg, int8_t value)
 {
+        reg ^= SWIZZLE_8;
         return cvmx_read64_int8(__cvmx_fau_atomic_address(0, reg, value));
 }
 
@@ -247,6 +260,7 @@ cvmx_fau_tagwait_fetch_and_add32(cvmx_fau_reg_32_t reg, int32_t value)
                 uint64_t i32;
                 cvmx_fau_tagwait32_t t;
         } result;
+        reg ^= SWIZZLE_32;
         result.i32 =
             cvmx_read64_int32(__cvmx_fau_atomic_address(1, reg, value));
         return result.t;
@@ -270,6 +284,7 @@ cvmx_fau_tagwait_fetch_and_add16(cvmx_fau_reg_16_t reg, int16_t value)
                 uint64_t i16;
                 cvmx_fau_tagwait16_t t;
         } result;
+        reg ^= SWIZZLE_16;
         result.i16 =
             cvmx_read64_int16(__cvmx_fau_atomic_address(1, reg, value));
         return result.t;
@@ -292,6 +307,7 @@ cvmx_fau_tagwait_fetch_and_add8(cvmx_fau_reg_8_t reg, int8_t value)
                 uint64_t i8;
                 cvmx_fau_tagwait8_t t;
         } result;
+        reg ^= SWIZZLE_8;
         result.i8 = cvmx_read64_int8(__cvmx_fau_atomic_address(1, reg, value));
         return result.t;
 }
@@ -521,6 +537,7 @@ static inline void cvmx_fau_atomic_add64(cvmx_fau_reg_64_t reg, int64_t value)
  */
 static inline void cvmx_fau_atomic_add32(cvmx_fau_reg_32_t reg, int32_t value)
 {
+        reg ^= SWIZZLE_32;
         cvmx_write64_int32(__cvmx_fau_store_address(0, reg), value);
 }
 
@@ -533,6 +550,7 @@ static inline void cvmx_fau_atomic_add32(cvmx_fau_reg_32_t reg, int32_t value)
  */
 static inline void cvmx_fau_atomic_add16(cvmx_fau_reg_16_t reg, int16_t value)
 {
+        reg ^= SWIZZLE_16;
         cvmx_write64_int16(__cvmx_fau_store_address(0, reg), value);
 }
 
@@ -544,6 +562,7 @@ static inline void cvmx_fau_atomic_add16(cvmx_fau_reg_16_t reg, int16_t value)
  */
 static inline void cvmx_fau_atomic_add8(cvmx_fau_reg_8_t reg, int8_t value)
 {
+        reg ^= SWIZZLE_8;
         cvmx_write64_int8(__cvmx_fau_store_address(0, reg), value);
 }
 
@@ -568,6 +587,7 @@ static inline void cvmx_fau_atomic_write64(cvmx_fau_reg_64_t reg, int64_t value)
  */
 static inline void cvmx_fau_atomic_write32(cvmx_fau_reg_32_t reg, int32_t value)
 {
+        reg ^= SWIZZLE_32;
         cvmx_write64_int32(__cvmx_fau_store_address(1, reg), value);
 }
 
@@ -580,6 +600,7 @@ static inline void cvmx_fau_atomic_write32(cvmx_fau_reg_32_t reg, int32_t value)
  */
 static inline void cvmx_fau_atomic_write16(cvmx_fau_reg_16_t reg, int16_t value)
 {
+        reg ^= SWIZZLE_16;
         cvmx_write64_int16(__cvmx_fau_store_address(1, reg), value);
 }
 
@@ -591,6 +612,7 @@ static inline void cvmx_fau_atomic_write16(cvmx_fau_reg_16_t reg, int16_t value)
  */
 static inline void cvmx_fau_atomic_write8(cvmx_fau_reg_8_t reg, int8_t value)
 {
+        reg ^= SWIZZLE_8;
         cvmx_write64_int8(__cvmx_fau_store_address(1, reg), value);
 }
 
diff --git a/arch/mips/include/asm/octeon/cvmx-fpa.h b/arch/mips/include/asm/octeon/cvmx-fpa.h
index aa26a2ce5a0e..c00501d0f7ae 100644
--- a/arch/mips/include/asm/octeon/cvmx-fpa.h
+++ b/arch/mips/include/asm/octeon/cvmx-fpa.h
@@ -49,6 +49,7 @@
 typedef union {
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * the (64-bit word) location in scratchpad to write
                  * to (if len != 0)
@@ -63,6 +64,12 @@ typedef union {
                  * the NCB bus.
                  */
                 uint64_t addr:40;
+#else
+                uint64_t addr:40;
+                uint64_t did:8;
+                uint64_t len:8;
+                uint64_t scraddr:8;
+#endif
         } s;
 } cvmx_fpa_iobdma_data_t;
 
diff --git a/arch/mips/include/asm/octeon/cvmx-l2c.h b/arch/mips/include/asm/octeon/cvmx-l2c.h
index 11c0a8fa8eb5..ddb429210a0e 100644
--- a/arch/mips/include/asm/octeon/cvmx-l2c.h
+++ b/arch/mips/include/asm/octeon/cvmx-l2c.h
@@ -53,12 +53,21 @@
 union cvmx_l2c_tag {
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved:28;
                 uint64_t V:1;           /* Line valid */
                 uint64_t D:1;           /* Line dirty */
                 uint64_t L:1;           /* Line locked */
                 uint64_t U:1;           /* Use, LRU eviction */
                 uint64_t addr:32;       /* Phys mem (not all bits valid) */
+#else
+                uint64_t addr:32;       /* Phys mem (not all bits valid) */
+                uint64_t U:1;           /* Use, LRU eviction */
+                uint64_t L:1;           /* Line locked */
+                uint64_t D:1;           /* Line dirty */
+                uint64_t V:1;           /* Line valid */
+                uint64_t reserved:28;
+#endif
         } s;
 };
 
diff --git a/arch/mips/include/asm/octeon/cvmx-packet.h b/arch/mips/include/asm/octeon/cvmx-packet.h
index 38aefa1bab9d..895e93d682c2 100644
--- a/arch/mips/include/asm/octeon/cvmx-packet.h
+++ b/arch/mips/include/asm/octeon/cvmx-packet.h
@@ -39,6 +39,7 @@ union cvmx_buf_ptr {
         void *ptr;
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* if set, invert the "free" pick of the overall
                  * packet. HW always sets this bit to 0 on inbound
                  * packet */
@@ -55,6 +56,13 @@ union cvmx_buf_ptr {
                 uint64_t size:16;
                 /* Pointer to the first byte of the data, NOT buffer */
                 uint64_t addr:40;
+#else
+                uint64_t addr:40;
+                uint64_t size:16;
+                uint64_t pool:3;
+                uint64_t back:4;
+                uint64_t i:1;
+#endif
         } s;
 };
 
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index f7d2a6718849..3da59bb8ce24 100644
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -127,6 +127,7 @@ typedef struct {
 typedef union {
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Must CVMX_IO_SEG */
                 uint64_t mem_space:2;
                 /* Must be zero */
@@ -151,6 +152,17 @@ typedef union {
                 uint64_t queue:9;
                 /* Must be zero */
                 uint64_t reserved4:3;
+#else
+                uint64_t reserved4:3;
+                uint64_t queue:9;
+                uint64_t port:9;
+                uint64_t reserved3:15;
+                uint64_t reserved2:4;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved:13;
+                uint64_t mem_space:2;
+#endif
         } s;
 } cvmx_pko_doorbell_address_t;
 
@@ -160,6 +172,7 @@ typedef union {
 typedef union {
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * The size of the reg1 operation - could be 8, 16,
                  * 32, or 64 bits.
@@ -229,6 +242,24 @@ typedef union {
                 uint64_t segs:6;
                 /* Including L2, but no trailing CRC */
                 uint64_t total_bytes:16;
+#else
+                uint64_t total_bytes:16;
+                uint64_t segs:6;
+                uint64_t dontfree:1;
+                uint64_t ignore_i:1;
+                uint64_t ipoffp1:7;
+                uint64_t gather:1;
+                uint64_t rsp:1;
+                uint64_t wqp:1;
+                uint64_t n2:1;
+                uint64_t le:1;
+                uint64_t reg0:11;
+                uint64_t subone0:1;
+                uint64_t reg1:11;
+                uint64_t subone1:1;
+                uint64_t size0:2;
+                uint64_t size1:2;
+#endif
         } s;
 } cvmx_pko_command_word0_t;
 
diff --git a/arch/mips/include/asm/octeon/cvmx-pow.h b/arch/mips/include/asm/octeon/cvmx-pow.h
index 2188e65afb86..d5565d758ddd 100644
--- a/arch/mips/include/asm/octeon/cvmx-pow.h
+++ b/arch/mips/include/asm/octeon/cvmx-pow.h
@@ -178,6 +178,7 @@ typedef enum {
 typedef union {
         uint64_t u64;
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * Don't reschedule this entry. no_sched is used for
                  * CVMX_POW_TAG_OP_SWTAG_DESCH and
@@ -217,6 +218,17 @@ typedef union {
                  * CVMX_POW_TAG_OP_*_NSCHED
                  */
                 uint64_t tag:32;
+#else
+                uint64_t tag:32;
+                uint64_t type:3;
+                uint64_t grp:4;
+                uint64_t qos:3;
+                uint64_t unused2:2;
+                cvmx_pow_tag_op_t op:4;
+                uint64_t index:13;
+                uint64_t unused:2;
+                uint64_t no_sched:1;
+#endif
         } s;
 } cvmx_pow_tag_req_t;
 
@@ -230,6 +242,7 @@ typedef union {
      * Address for new work request loads (did<2:0> == 0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Mips64 address region. Should be CVMX_IO_SEG */
                 uint64_t mem_region:2;
                 /* Must be zero */
@@ -247,12 +260,22 @@ typedef union {
                 uint64_t wait:1;
                 /* Must be zero */
                 uint64_t reserved_0_2:3;
+#else
+                uint64_t reserved_0_2:3;
+                uint64_t wait:1;
+                uint64_t reserved_4_39:36;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_region:2;
+#endif
         } swork;
 
     /**
      * Address for loads to get POW internal status
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Mips64 address region. Should be CVMX_IO_SEG */
                 uint64_t mem_region:2;
                 /* Must be zero */
@@ -282,12 +305,25 @@ typedef union {
                 uint64_t get_wqp:1;
                 /* Must be zero */
                 uint64_t reserved_0_2:3;
+#else
+                uint64_t reserved_0_2:3;
+                uint64_t get_wqp:1;
+                uint64_t get_cur:1;
+                uint64_t get_rev:1;
+                uint64_t coreid:4;
+                uint64_t reserved_10_39:30;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_region:2;
+#endif
         } sstatus;
 
     /**
      * Address for memory loads to get POW internal state
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Mips64 address region. Should be CVMX_IO_SEG */
                 uint64_t mem_region:2;
                 /* Must be zero */
@@ -314,12 +350,24 @@ typedef union {
                 uint64_t get_wqp:1;
                 /* Must be zero */
                 uint64_t reserved_0_2:3;
+#else
+                uint64_t reserved_0_2:3;
+                uint64_t get_wqp:1;
+                uint64_t get_des:1;
+                uint64_t index:11;
+                uint64_t reserved_16_39:24;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_region:2;
+#endif
         } smemload;
 
     /**
      * Address for index/pointer loads
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Mips64 address region. Should be CVMX_IO_SEG */
                 uint64_t mem_region:2;
                 /* Must be zero */
@@ -366,6 +414,17 @@ typedef union {
                 uint64_t get_rmt:1;
                 /* Must be zero */
                 uint64_t reserved_0_2:3;
+#else
+                uint64_t reserved_0_2:3;
+                uint64_t get_rmt:1;
+                uint64_t get_des_get_tail:1;
+                uint64_t qosgrp:4;
+                uint64_t reserved_9_39:31;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_region:2;
+#endif
         } sindexload;
 
     /**
@@ -377,6 +436,7 @@ typedef union {
      * available.)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Mips64 address region. Should be CVMX_IO_SEG */
                 uint64_t mem_region:2;
                 /* Must be zero */
@@ -387,6 +447,13 @@ typedef union {
                 uint64_t did:8;
                 /* Must be zero */
                 uint64_t reserved_0_39:40;
+#else
+                uint64_t reserved_0_39:40;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_region:2;
+#endif
         } snull_rd;
 } cvmx_pow_load_addr_t;
 
@@ -401,6 +468,7 @@ typedef union {
      * Response to new work request loads
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * Set when no new work queue entry was returned.  *
                  * If there was de-scheduled work, the HW will
@@ -419,12 +487,18 @@ typedef union {
                 uint64_t reserved_40_62:23;
                 /* 36 in O1 -- the work queue pointer */
                 uint64_t addr:40;
+#else
+                uint64_t addr:40;
+                uint64_t reserved_40_62:23;
+                uint64_t no_work:1;
+#endif
         } s_work;
 
     /**
      * Result for a POW Status Load (when get_cur==0 and get_wqp==0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /* Set when there is a pending non-NULL SWTAG or
                  * SWTAG_FULL, and the POW entry has not left the list
@@ -476,12 +550,32 @@ typedef union {
                  *    AND pend_desched_switch) are set.
                  */
                 uint64_t pend_tag:32;
+#else
+                uint64_t pend_tag:32;
+                uint64_t pend_type:2;
+                uint64_t reserved_34_35:2;
+                uint64_t pend_grp:4;
+                uint64_t pend_index:11;
+                uint64_t reserved_51:1;
+                uint64_t pend_nosched_clr:1;
+                uint64_t pend_null_rd:1;
+                uint64_t pend_new_work_wait:1;
+                uint64_t pend_new_work:1;
+                uint64_t pend_nosched:1;
+                uint64_t pend_desched_switch:1;
+                uint64_t pend_desched:1;
+                uint64_t pend_switch_null:1;
+                uint64_t pend_switch_full:1;
+                uint64_t pend_switch:1;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus0;
 
     /**
      * Result for a POW Status Load (when get_cur==0 and get_wqp==1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /*
                  * Set when there is a pending non-NULL SWTAG or
@@ -529,6 +623,23 @@ typedef union {
                 uint64_t pend_grp:4;
                 /* This is the wqp when pend_nosched_clr is set. */
                 uint64_t pend_wqp:36;
+#else
+                uint64_t pend_wqp:36;
+                uint64_t pend_grp:4;
+                uint64_t pend_index:11;
+                uint64_t reserved_51:1;
+                uint64_t pend_nosched_clr:1;
+                uint64_t pend_null_rd:1;
+                uint64_t pend_new_work_wait:1;
+                uint64_t pend_new_work:1;
+                uint64_t pend_nosched:1;
+                uint64_t pend_desched_switch:1;
+                uint64_t pend_desched:1;
+                uint64_t pend_switch_null:1;
+                uint64_t pend_switch_full:1;
+                uint64_t pend_switch:1;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus1;
 
     /**
@@ -536,6 +647,7 @@ typedef union {
      * get_rev==0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /*
                  * Points to the next POW entry in the tag list when
@@ -573,12 +685,23 @@ typedef union {
                  * SWTAG_DESCHED).
                  */
                 uint64_t tag:32;
+#else
+                uint64_t tag:32;
+                uint64_t tag_type:2;
+                uint64_t tail:1;
+                uint64_t head:1;
+                uint64_t grp:4;
+                uint64_t index:11;
+                uint64_t link_index:11;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus2;
 
     /**
      * Result for a POW Status Load (when get_cur==1, get_wqp==0, and get_rev==1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /*
                  * Points to the prior POW entry in the tag list when
@@ -617,6 +740,16 @@ typedef union {
                  * SWTAG_DESCHED).
                  */
                 uint64_t tag:32;
+#else
+                uint64_t tag:32;
+                uint64_t tag_type:2;
+                uint64_t tail:1;
+                uint64_t head:1;
+                uint64_t grp:4;
+                uint64_t index:11;
+                uint64_t revlink_index:11;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus3;
 
     /**
@@ -624,6 +757,7 @@ typedef union {
      * get_rev==0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /*
                  * Points to the next POW entry in the tag list when
@@ -642,6 +776,13 @@ typedef union {
                  * list entered on SWTAG_FULL).
                  */
                 uint64_t wqp:36;
+#else
+                uint64_t wqp:36;
+                uint64_t grp:4;
+                uint64_t index:11;
+                uint64_t link_index:11;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus4;
 
     /**
@@ -649,6 +790,7 @@ typedef union {
      * get_rev==1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_62_63:2;
                 /*
                  * Points to the prior POW entry in the tag list when
@@ -669,12 +811,20 @@ typedef union {
                  * list entered on SWTAG_FULL).
                  */
                 uint64_t wqp:36;
+#else
+                uint64_t wqp:36;
+                uint64_t grp:4;
+                uint64_t index:11;
+                uint64_t revlink_index:11;
+                uint64_t reserved_62_63:2;
+#endif
         } s_sstatus5;
 
     /**
      * Result For POW Memory Load (get_des == 0 and get_wqp == 0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_51_63:13;
                 /*
                  * The next entry in the input, free, descheduled_head
@@ -695,12 +845,22 @@ typedef union {
                 uint64_t tag_type:2;
                 /* The tag of the POW entry. */
                 uint64_t tag:32;
+#else
+                uint64_t tag:32;
+                uint64_t tag_type:2;
+                uint64_t tail:1;
+                uint64_t reserved_35:1;
+                uint64_t grp:4;
+                uint64_t next_index:11;
+                uint64_t reserved_51_63:13;
+#endif
         } s_smemload0;
 
     /**
      * Result For POW Memory Load (get_des == 0 and get_wqp == 1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_51_63:13;
                 /*
                  * The next entry in the input, free, descheduled_head
@@ -712,12 +872,19 @@ typedef union {
                 uint64_t grp:4;
                 /* The WQP held in the POW entry. */
                 uint64_t wqp:36;
+#else
+                uint64_t wqp:36;
+                uint64_t grp:4;
+                uint64_t next_index:11;
+                uint64_t reserved_51_63:13;
+#endif
         } s_smemload1;
 
     /**
      * Result For POW Memory Load (get_des == 1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_51_63:13;
                 /*
                  * The next entry in the tag list connected to the
@@ -740,12 +907,22 @@ typedef union {
                  * is set.
                  */
                 uint64_t pend_tag:32;
+#else
+                uint64_t pend_tag:32;
+                uint64_t pend_type:2;
+                uint64_t pend_switch:1;
+                uint64_t nosched:1;
+                uint64_t grp:4;
+                uint64_t fwd_index:11;
+                uint64_t reserved_51_63:13;
+#endif
         } s_smemload2;
 
     /**
      * Result For POW Index/Pointer Load (get_rmt == 0/get_des_get_tail == 0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_52_63:12;
                 /*
                  * set when there is one or more POW entries on the
@@ -791,12 +968,28 @@ typedef union {
                  * the input Q list selected by qosgrp.
                  */
                 uint64_t loc_tail:11;
+#else
+                uint64_t loc_tail:11;
+                uint64_t reserved_11:1;
+                uint64_t loc_head:11;
+                uint64_t reserved_23:1;
+                uint64_t loc_one:1;
+                uint64_t loc_val:1;
+                uint64_t free_tail:11;
+                uint64_t reserved_37:1;
+                uint64_t free_head:11;
+                uint64_t reserved_49:1;
+                uint64_t free_one:1;
+                uint64_t free_val:1;
+                uint64_t reserved_52_63:12;
+#endif
         } sindexload0;
 
     /**
      * Result For POW Index/Pointer Load (get_rmt == 0/get_des_get_tail == 1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_52_63:12;
                 /*
                  * set when there is one or more POW entries on the
@@ -843,12 +1036,28 @@ typedef union {
                  * head on the descheduled list selected by qosgrp.
                  */
                 uint64_t des_tail:11;
+#else
+                uint64_t des_tail:11;
+                uint64_t reserved_11:1;
+                uint64_t des_head:11;
+                uint64_t reserved_23:1;
+                uint64_t des_one:1;
+                uint64_t des_val:1;
+                uint64_t nosched_tail:11;
+                uint64_t reserved_37:1;
+                uint64_t nosched_head:11;
+                uint64_t reserved_49:1;
+                uint64_t nosched_one:1;
+                uint64_t nosched_val:1;
+                uint64_t reserved_52_63:12;
+#endif
         } sindexload1;
 
     /**
      * Result For POW Index/Pointer Load (get_rmt == 1/get_des_get_tail == 0)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_39_63:25;
                 /*
                  * Set when this DRAM list is the current head
@@ -877,6 +1086,13 @@ typedef union {
                  * qosgrp.
                  */
                 uint64_t rmt_head:36;
+#else
+                uint64_t rmt_head:36;
+                uint64_t rmt_one:1;
+                uint64_t rmt_val:1;
+                uint64_t rmt_is_head:1;
+                uint64_t reserved_39_63:25;
+#endif
         } sindexload2;
 
     /**
@@ -884,6 +1100,7 @@ typedef union {
      * 1/get_des_get_tail == 1)
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_39_63:25;
                 /*
                  * set when this DRAM list is the current head
@@ -912,12 +1129,20 @@ typedef union {
                  * qosgrp.
                  */
                 uint64_t rmt_tail:36;
+#else
+                uint64_t rmt_tail:36;
+                uint64_t rmt_one:1;
+                uint64_t rmt_val:1;
+                uint64_t rmt_is_head:1;
+                uint64_t reserved_39_63:25;
+#endif
         } sindexload3;
 
     /**
      * Response to NULL_RD request loads
      */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t unused:62;
                 /* of type cvmx_pow_tag_type_t. state is one of the
                  * following:
@@ -928,6 +1153,10 @@ typedef union {
                  * - CVMX_POW_TAG_TYPE_NULL_NULL
                  */
                 uint64_t state:2;
+#else
+                uint64_t state:2;
+                uint64_t unused:62;
+#endif
         } s_null_rd;
 
 } cvmx_pow_tag_load_resp_t;
@@ -962,6 +1191,7 @@ typedef union {
         uint64_t u64;
 
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* Memory region.  Should be CVMX_IO_SEG in most cases */
                 uint64_t mem_reg:2;
                 uint64_t reserved_49_61:13;     /* Must be zero */
@@ -971,6 +1201,14 @@ typedef union {
                 uint64_t reserved_36_39:4;      /* Must be zero */
                 /* Address field. addr<2:0> must be zero */
                 uint64_t addr:36;
+#else
+                uint64_t addr:36;
+                uint64_t reserved_36_39:4;
+                uint64_t did:8;
+                uint64_t is_io:1;
+                uint64_t reserved_49_61:13;
+                uint64_t mem_reg:2;
+#endif
         } stag;
 } cvmx_pow_tag_store_addr_t;
 
@@ -981,6 +1219,7 @@ typedef union {
         uint64_t u64;
 
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * the (64-bit word) location in scratchpad to write
                  * to (if len != 0)
@@ -994,6 +1233,14 @@ typedef union {
                 /* if set, don't return load response until work is available */
                 uint64_t wait:1;
                 uint64_t unused2:3;
+#else
+                uint64_t unused2:3;
+                uint64_t wait:1;
+                uint64_t unused:36;
+                uint64_t did:8;
+                uint64_t len:8;
+                uint64_t scraddr:8;
+#endif
         } s;
 
 } cvmx_pow_iobdma_store_t;
diff --git a/arch/mips/include/asm/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h
index aa0d3d0de75c..2d6d0c7127a7 100644
--- a/arch/mips/include/asm/octeon/cvmx-wqe.h
+++ b/arch/mips/include/asm/octeon/cvmx-wqe.h
@@ -57,6 +57,7 @@ typedef union {
 
         /* Use this struct if the hardware determines that the packet is IP */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* HW sets this to the number of buffers used by this packet */
                 uint64_t bufs:8;
                 /* HW sets to the number of L2 bytes prior to the IP */
@@ -166,13 +167,45 @@ typedef union {
                  * the slow path */
                 /* type is cvmx_pip_err_t */
                 uint64_t err_code:8;
+#else
+                uint64_t err_code:8;
+                uint64_t rcv_error:1;
+                uint64_t not_IP:1;
+                uint64_t is_mcast:1;
+                uint64_t is_bcast:1;
+                uint64_t IP_exc:1;
+                uint64_t is_frag:1;
+                uint64_t L4_error:1;
+                uint64_t software:1;
+                uint64_t is_v6:1;
+                uint64_t dec_ipsec:1;
+                uint64_t tcp_or_udp:1;
+                uint64_t dec_ipcomp:1;
+                uint64_t unassigned2:4;
+                uint64_t unassigned2a:4;
+                uint64_t pr:4;
+                uint64_t vlan_id:12;
+                uint64_t vlan_cfi:1;
+                uint64_t unassigned:1;
+                uint64_t vlan_stacked:1;
+                uint64_t vlan_valid:1;
+                uint64_t ip_offset:8;
+                uint64_t bufs:8;
+#endif
         } s;
 
         /* use this to get at the 16 vlan bits */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t unused1:16;
                 uint64_t vlan:16;
                 uint64_t unused2:32;
+#else
+                uint64_t unused2:32;
+                uint64_t vlan:16;
+                uint64_t unused1:16;
+
+#endif
         } svlan;
 
         /*
@@ -180,6 +213,7 @@ typedef union {
          * the packet is ip.
          */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * HW sets this to the number of buffers used by this
                  * packet.
@@ -296,6 +330,27 @@ typedef union {
                  */
                 /* type is cvmx_pip_err_t (union, so can't use directly */
                 uint64_t err_code:8;
+#else
+                uint64_t err_code:8;
+                uint64_t rcv_error:1;
+                uint64_t not_IP:1;
+                uint64_t is_mcast:1;
+                uint64_t is_bcast:1;
+                uint64_t is_arp:1;
+                uint64_t is_rarp:1;
+                uint64_t unassigned3:1;
+                uint64_t software:1;
+                uint64_t unassigned2:4;
+                uint64_t unassigned2a:8;
+                uint64_t pr:4;
+                uint64_t vlan_id:12;
+                uint64_t vlan_cfi:1;
+                uint64_t unassigned:1;
+                uint64_t vlan_stacked:1;
+                uint64_t vlan_valid:1;
+                uint64_t unused:8;
+                uint64_t bufs:8;
+#endif
         } snoip;
 
 } cvmx_pip_wqe_word2;
@@ -312,6 +367,7 @@ typedef struct {
      *  HW WRITE: the following 64 bits are filled by HW when a packet arrives
      */
 
+#ifdef __BIG_ENDIAN_BITFIELD
     /**
      * raw chksum result generated by the HW
      */
@@ -327,12 +383,18 @@ typedef struct {
      * (Only 36 bits used in Octeon 1)
      */
         uint64_t next_ptr:40;
+#else
+        uint64_t next_ptr:40;
+        uint8_t unused;
+        uint16_t hw_chksum;
+#endif
 
     /*****************************************************************
      * WORD 1
      *  HW WRITE: the following 64 bits are filled by HW when a packet arrives
      */
 
+#ifdef __BIG_ENDIAN_BITFIELD
     /**
      * HW sets to the total number of bytes in the packet
      */
@@ -359,6 +421,15 @@ typedef struct {
      * the synchronization/ordering tag
      */
         uint64_t tag:32;
+#else
+        uint64_t tag:32;
+        uint64_t tag_type:2;
+        uint64_t zero_2:1;
+        uint64_t grp:4;
+        uint64_t qos:3;
+        uint64_t ipprt:6;
+        uint64_t len:16;
+#endif
 
     /**
      * WORD 2 HW WRITE: the following 64-bits are filled in by
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index 33db1c806b01..774bb45834cb 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -436,14 +436,6 @@ static inline uint64_t cvmx_get_cycle_global(void)
 
 /***************************************************************************/
 
-static inline void cvmx_reset_octeon(void)
-{
-        union cvmx_ciu_soft_rst ciu_soft_rst;
-        ciu_soft_rst.u64 = 0;
-        ciu_soft_rst.s.soft_rst = 1;
-        cvmx_write_csr(CVMX_CIU_SOFT_RST, ciu_soft_rst.u64);
-}
-
 /* Return the number of cores available in the chip */
 static inline uint32_t cvmx_octeon_num_cores(void)
 {
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index 041596570856..de9f74ee5dd0 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -335,4 +335,6 @@ void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t);
 
 extern void octeon_fixup_irqs(void);
 
+extern struct semaphore octeon_bootbus_sem;
+
 #endif /* __ASM_OCTEON_OCTEON_H */
diff --git a/arch/mips/include/asm/octeon/pci-octeon.h b/arch/mips/include/asm/octeon/pci-octeon.h
index 64ba56a02843..1884609741a8 100644
--- a/arch/mips/include/asm/octeon/pci-octeon.h
+++ b/arch/mips/include/asm/octeon/pci-octeon.h
@@ -11,9 +11,6 @@
 
 #include <linux/pci.h>
 
-/* Some PCI cards require delays when accessing config space. */
-#define PCI_CONFIG_SPACE_DELAY 10000
-
 /*
  * The physical memory base mapped by BAR1.  256MB at the end of the
  * first 4GB.
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
index 154b70a10483..89dd7fed1a57 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -105,8 +105,6 @@ static inline void clear_user_page(void *addr, unsigned long vaddr,
                 flush_data_cache_page((unsigned long)addr);
 }
 
-extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
-        struct page *to);
 struct vm_area_struct;
 extern void copy_user_highpage(struct page *to, struct page *from,
         unsigned long vaddr, struct vm_area_struct *vma);
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index 193b4c6b7541..d9692993fc83 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -35,6 +35,8 @@ struct pci_controller {
         struct resource *io_resource;
         unsigned long io_offset;
         unsigned long io_map_base;
+        struct resource *busn_resource;
+        unsigned long busn_offset;
 
         unsigned int index;
         /* For compatibility with current (as of July 2003) pciutils
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index af2c8a351ca7..8d7a63b52ac7 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -835,6 +835,7 @@ struct bridge_controller {
         struct pci_controller   pc;
         struct resource         mem;
         struct resource         io;
+        struct resource         busn;
         bridge_t                *base;
         nasid_t                 nasid;
         unsigned int            widget_id;
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index a6be006b6f75..7d56686c0e62 100644
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -105,13 +105,16 @@ static inline void pmd_clear(pmd_t *pmdp)
 
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
 #define pte_page(x)             pfn_to_page(pte_pfn(x))
-#define pte_pfn(x)              ((unsigned long)((x).pte_high >> 6))
+#define pte_pfn(x)              (((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT))
 static inline pte_t
 pfn_pte(unsigned long pfn, pgprot_t prot)
 {
         pte_t pte;
-        pte.pte_high = (pfn << 6) | (pgprot_val(prot) & 0x3f);
-        pte.pte_low = pgprot_val(prot);
+
+        pte.pte_low = (pfn >> _PAGE_PRESENT_SHIFT) |
+                                (pgprot_val(prot) & ~_PFNX_MASK);
+        pte.pte_high = (pfn << _PFN_SHIFT) |
+                                (pgprot_val(prot) & ~_PFN_MASK);
         return pte;
 }
 
@@ -166,9 +169,9 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
 
 /* Swap entries must have VALID and GLOBAL bits cleared. */
-#define __swp_type(x)                   (((x).val >> 2) & 0x1f)
-#define __swp_offset(x)                  ((x).val >> 7)
-#define __swp_entry(type,offset)        ((swp_entry_t)  { ((type) << 2) | ((offset) << 7) })
+#define __swp_type(x)                   (((x).val >> 4) & 0x1f)
+#define __swp_offset(x)                  ((x).val >> 9)
+#define __swp_entry(type,offset)        ((swp_entry_t)  { ((type) << 4) | ((offset) << 9) })
 #define __pte_to_swp_entry(pte)         ((swp_entry_t) { (pte).pte_high })
 #define __swp_entry_to_pte(x)           ((pte_t) { 0, (x).val })
 
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index 1659bb91ae21..cf661a2fb141 100644
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -279,14 +279,14 @@ extern void pgd_init(unsigned long page);
 extern void pmd_init(unsigned long page, unsigned long pagetable);
 
 /*
- * Non-present pages:  high 24 bits are offset, next 8 bits type,
- * low 32 bits zero.
+ * Non-present pages:  high 40 bits are offset, next 8 bits type,
+ * low 16 bits zero.
  */
 static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
-{ pte_t pte; pte_val(pte) = (type << 32) | (offset << 40); return pte; }
+{ pte_t pte; pte_val(pte) = (type << 16) | (offset << 24); return pte; }
 
-#define __swp_type(x)           (((x).val >> 32) & 0xff)
-#define __swp_offset(x)         ((x).val >> 40)
+#define __swp_type(x)           (((x).val >> 16) & 0xff)
+#define __swp_offset(x)         ((x).val >> 24)
 #define __swp_entry(type, offset) ((swp_entry_t) { pte_val(mk_swap_pte((type), (offset))) })
 #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
 #define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index 91747c282bb3..18ae5ddef118 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -37,7 +37,11 @@
 /*
  * The following bits are implemented by the TLB hardware
  */
-#define _PAGE_GLOBAL_SHIFT      0
+#define _PAGE_NO_EXEC_SHIFT     0
+#define _PAGE_NO_EXEC           (1 << _PAGE_NO_EXEC_SHIFT)
+#define _PAGE_NO_READ_SHIFT     (_PAGE_NO_EXEC_SHIFT + 1)
+#define _PAGE_NO_READ           (1 << _PAGE_NO_READ_SHIFT)
+#define _PAGE_GLOBAL_SHIFT      (_PAGE_NO_READ_SHIFT + 1)
 #define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
 #define _PAGE_VALID_SHIFT       (_PAGE_GLOBAL_SHIFT + 1)
 #define _PAGE_VALID             (1 << _PAGE_VALID_SHIFT)
@@ -49,7 +53,7 @@
 /*
  * The following bits are implemented in software
  */
-#define _PAGE_PRESENT_SHIFT     (_CACHE_SHIFT + 3)
+#define _PAGE_PRESENT_SHIFT     (24)
 #define _PAGE_PRESENT           (1 << _PAGE_PRESENT_SHIFT)
 #define _PAGE_READ_SHIFT        (_PAGE_PRESENT_SHIFT + 1)
 #define _PAGE_READ              (1 << _PAGE_READ_SHIFT)
@@ -62,6 +66,11 @@
 
 #define _PFN_SHIFT              (PAGE_SHIFT - 12 + _CACHE_SHIFT + 3)
 
+/*
+ * Bits for extended EntryLo0/EntryLo1 registers
+ */
+#define _PFNX_MASK              0xffffff
+
 #elif defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
 
 /*
@@ -95,11 +104,7 @@
 
 #else
 /*
- * When using the RI/XI bit support, we have 13 bits of flags below
- * the physical address. The RI/XI bits are placed such that a SRL 5
- * can strip off the software bits, then a ROTR 2 can move the RI/XI
- * into bits [63:62]. This also limits physical address to 56 bits,
- * which is more than we need right now.
+ * Below are the "Normal" R4K cases
  */
 
 /*
@@ -107,38 +112,59 @@
  */
 #define _PAGE_PRESENT_SHIFT     0
 #define _PAGE_PRESENT           (1 << _PAGE_PRESENT_SHIFT)
-#define _PAGE_READ_SHIFT        (cpu_has_rixi ? _PAGE_PRESENT_SHIFT : _PAGE_PRESENT_SHIFT + 1)
-#define _PAGE_READ ({BUG_ON(cpu_has_rixi); 1 << _PAGE_READ_SHIFT; })
+/* R2 or later cores check for RI/XI support to determine _PAGE_READ */
+#ifdef CONFIG_CPU_MIPSR2
+#define _PAGE_WRITE_SHIFT       (_PAGE_PRESENT_SHIFT + 1)
+#define _PAGE_WRITE             (1 << _PAGE_WRITE_SHIFT)
+#else
+#define _PAGE_READ_SHIFT        (_PAGE_PRESENT_SHIFT + 1)
+#define _PAGE_READ              (1 << _PAGE_READ_SHIFT)
 #define _PAGE_WRITE_SHIFT       (_PAGE_READ_SHIFT + 1)
 #define _PAGE_WRITE             (1 << _PAGE_WRITE_SHIFT)
+#endif
 #define _PAGE_ACCESSED_SHIFT    (_PAGE_WRITE_SHIFT + 1)
 #define _PAGE_ACCESSED          (1 << _PAGE_ACCESSED_SHIFT)
 #define _PAGE_MODIFIED_SHIFT    (_PAGE_ACCESSED_SHIFT + 1)
 #define _PAGE_MODIFIED          (1 << _PAGE_MODIFIED_SHIFT)
 
-#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
-/* huge tlb page */
+#if defined(CONFIG_64BIT) && defined(CONFIG_MIPS_HUGE_TLB_SUPPORT)
+/* Huge TLB page */
 #define _PAGE_HUGE_SHIFT        (_PAGE_MODIFIED_SHIFT + 1)
 #define _PAGE_HUGE              (1 << _PAGE_HUGE_SHIFT)
 #define _PAGE_SPLITTING_SHIFT   (_PAGE_HUGE_SHIFT + 1)
 #define _PAGE_SPLITTING         (1 << _PAGE_SPLITTING_SHIFT)
+
+/* Only R2 or newer cores have the XI bit */
+#ifdef CONFIG_CPU_MIPSR2
+#define _PAGE_NO_EXEC_SHIFT     (_PAGE_SPLITTING_SHIFT + 1)
 #else
-#define _PAGE_HUGE_SHIFT        (_PAGE_MODIFIED_SHIFT)
-#define _PAGE_HUGE              ({BUG(); 1; })  /* Dummy value */
-#define _PAGE_SPLITTING_SHIFT   (_PAGE_HUGE_SHIFT)
-#define _PAGE_SPLITTING         ({BUG(); 1; })  /* Dummy value */
-#endif
+#define _PAGE_GLOBAL_SHIFT      (_PAGE_SPLITTING_SHIFT + 1)
+#define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
+#endif  /* CONFIG_CPU_MIPSR2 */
 
-/* Page cannot be executed */
-#define _PAGE_NO_EXEC_SHIFT     (cpu_has_rixi ? _PAGE_SPLITTING_SHIFT + 1 : _PAGE_SPLITTING_SHIFT)
-#define _PAGE_NO_EXEC           ({BUG_ON(!cpu_has_rixi); 1 << _PAGE_NO_EXEC_SHIFT; })
+#endif  /* CONFIG_64BIT && CONFIG_MIPS_HUGE_TLB_SUPPORT */
 
-/* Page cannot be read */
-#define _PAGE_NO_READ_SHIFT     (cpu_has_rixi ? _PAGE_NO_EXEC_SHIFT + 1 : _PAGE_NO_EXEC_SHIFT)
-#define _PAGE_NO_READ           ({BUG_ON(!cpu_has_rixi); 1 << _PAGE_NO_READ_SHIFT; })
+#ifdef CONFIG_CPU_MIPSR2
+/* XI - page cannot be executed */
+#ifndef _PAGE_NO_EXEC_SHIFT
+#define _PAGE_NO_EXEC_SHIFT     (_PAGE_MODIFIED_SHIFT + 1)
+#endif
+#define _PAGE_NO_EXEC           (cpu_has_rixi ? (1 << _PAGE_NO_EXEC_SHIFT) : 0)
+
+/* RI - page cannot be read */
+#define _PAGE_READ_SHIFT        (_PAGE_NO_EXEC_SHIFT + 1)
+#define _PAGE_READ              (cpu_has_rixi ? 0 : (1 << _PAGE_READ_SHIFT))
+#define _PAGE_NO_READ_SHIFT     _PAGE_READ_SHIFT
+#define _PAGE_NO_READ           (cpu_has_rixi ? (1 << _PAGE_READ_SHIFT) : 0)
 
 #define _PAGE_GLOBAL_SHIFT      (_PAGE_NO_READ_SHIFT + 1)
 #define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
+
+#else   /* !CONFIG_CPU_MIPSR2 */
+#define _PAGE_GLOBAL_SHIFT      (_PAGE_MODIFIED_SHIFT + 1)
+#define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
+#endif  /* CONFIG_CPU_MIPSR2 */
+
 #define _PAGE_VALID_SHIFT       (_PAGE_GLOBAL_SHIFT + 1)
 #define _PAGE_VALID             (1 << _PAGE_VALID_SHIFT)
 #define _PAGE_DIRTY_SHIFT       (_PAGE_VALID_SHIFT + 1)
@@ -150,18 +176,26 @@
 
 #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT && defined(CONFIG_CPU_MIPS32) */
 
+#ifndef _PAGE_NO_EXEC
+#define _PAGE_NO_EXEC           0
+#endif
+#ifndef _PAGE_NO_READ
+#define _PAGE_NO_READ           0
+#endif
+
 #define _PAGE_SILENT_READ       _PAGE_VALID
 #define _PAGE_SILENT_WRITE      _PAGE_DIRTY
 
 #define _PFN_MASK               (~((1 << (_PFN_SHIFT)) - 1))
 
-#ifndef _PAGE_NO_READ
-#define _PAGE_NO_READ ({BUG(); 0; })
-#define _PAGE_NO_READ_SHIFT ({BUG(); 0; })
-#endif
-#ifndef _PAGE_NO_EXEC
-#define _PAGE_NO_EXEC ({BUG(); 0; })
-#endif
+/*
+ * The final layouts of the PTE bits are:
+ *
+ *   64-bit, R1 or earlier:     CCC D V G [S H] M A W R P
+ *   32-bit, R1 or earler:      CCC D V G M A W R P
+ *   64-bit, R2 or later:       CCC D V G RI/R XI [S H] M A W P
+ *   32-bit, R2 or later:       CCC D V G RI/R XI M A W P
+ */
 
 
 #ifndef __ASSEMBLY__
@@ -171,6 +205,7 @@
  */
 static inline uint64_t pte_to_entrylo(unsigned long pte_val)
 {
+#ifdef CONFIG_CPU_MIPSR2
         if (cpu_has_rixi) {
                 int sa;
 #ifdef CONFIG_32BIT
@@ -186,6 +221,7 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val)
                 return (pte_val >> _PAGE_GLOBAL_SHIFT) |
                         ((pte_val & (_PAGE_NO_EXEC | _PAGE_NO_READ)) << sa);
         }
+#endif
 
         return pte_val >> _PAGE_GLOBAL_SHIFT;
 }
@@ -245,7 +281,7 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val)
 #define _CACHE_UNCACHED_ACCELERATED     (7<<_CACHE_SHIFT)
 #endif
 
-#define __READABLE      (_PAGE_SILENT_READ | _PAGE_ACCESSED | (cpu_has_rixi ? 0 : _PAGE_READ))
+#define __READABLE      (_PAGE_SILENT_READ | _PAGE_READ | _PAGE_ACCESSED)
 #define __WRITEABLE     (_PAGE_SILENT_WRITE | _PAGE_WRITE | _PAGE_MODIFIED)
 
 #define _PAGE_CHG_MASK  (_PAGE_ACCESSED | _PAGE_MODIFIED |      \
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index bef782c4a44b..819af9d057a8 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -24,17 +24,17 @@ struct mm_struct;
 struct vm_area_struct;
 
 #define PAGE_NONE       __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT)
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_WRITE | (cpu_has_rixi ? 0 : _PAGE_READ) | \
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_WRITE | _PAGE_READ | \
                                  _page_cachable_default)
-#define PAGE_COPY       __pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | \
-                                 (cpu_has_rixi ?  _PAGE_NO_EXEC : 0) | _page_cachable_default)
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | \
+#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_NO_EXEC | \
+                                 _page_cachable_default)
+#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_READ | \
                                  _page_cachable_default)
 #define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \
                                  _PAGE_GLOBAL | _page_cachable_default)
 #define PAGE_KERNEL_NC  __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \
                                  _PAGE_GLOBAL | _CACHE_CACHABLE_NONCOHERENT)
-#define PAGE_USERIO     __pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | _PAGE_WRITE | \
+#define PAGE_USERIO     __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
                                  _page_cachable_default)
 #define PAGE_KERNEL_UNCACHED __pgprot(_PAGE_PRESENT | __READABLE | \
                         __WRITEABLE | _PAGE_GLOBAL | _CACHE_UNCACHED)
@@ -127,13 +127,9 @@ do {									\
         }                                                               \
 } while(0)
 
-
-extern void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
-        pte_t pteval);
-
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
 
-#define pte_none(pte)           (!(((pte).pte_low | (pte).pte_high) & ~_PAGE_GLOBAL))
+#define pte_none(pte)           (!(((pte).pte_high) & ~_PAGE_GLOBAL))
 #define pte_present(pte)        ((pte).pte_low & _PAGE_PRESENT)
 
 static inline void set_pte(pte_t *ptep, pte_t pte)
@@ -142,18 +138,17 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
         smp_wmb();
         ptep->pte_low = pte.pte_low;
 
-        if (pte.pte_low & _PAGE_GLOBAL) {
+        if (pte.pte_high & _PAGE_GLOBAL) {
                 pte_t *buddy = ptep_buddy(ptep);
                 /*
                  * Make sure the buddy is global too (if it's !none,
                  * it better already be global)
                  */
-                if (pte_none(*buddy)) {
-                        buddy->pte_low  |= _PAGE_GLOBAL;
+                if (pte_none(*buddy))
                         buddy->pte_high |= _PAGE_GLOBAL;
-                }
         }
 }
+#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
 
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
@@ -161,8 +156,8 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
 
         htw_stop();
         /* Preserve global status for the pair */
-        if (ptep_buddy(ptep)->pte_low & _PAGE_GLOBAL)
-                null.pte_low = null.pte_high = _PAGE_GLOBAL;
+        if (ptep_buddy(ptep)->pte_high & _PAGE_GLOBAL)
+                null.pte_high = _PAGE_GLOBAL;
 
         set_pte_at(mm, addr, ptep, null);
         htw_start();
@@ -192,6 +187,7 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
         }
 #endif
 }
+#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
 
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
@@ -242,21 +238,21 @@ static inline int pte_young(pte_t pte)	{ return pte.pte_low & _PAGE_ACCESSED; }
 
 static inline pte_t pte_wrprotect(pte_t pte)
 {
-        pte.pte_low  &= ~(_PAGE_WRITE | _PAGE_SILENT_WRITE);
+        pte.pte_low  &= ~_PAGE_WRITE;
         pte.pte_high &= ~_PAGE_SILENT_WRITE;
         return pte;
 }
 
 static inline pte_t pte_mkclean(pte_t pte)
 {
-        pte.pte_low  &= ~(_PAGE_MODIFIED | _PAGE_SILENT_WRITE);
+        pte.pte_low  &= ~_PAGE_MODIFIED;
         pte.pte_high &= ~_PAGE_SILENT_WRITE;
         return pte;
 }
 
 static inline pte_t pte_mkold(pte_t pte)
 {
-        pte.pte_low  &= ~(_PAGE_ACCESSED | _PAGE_SILENT_READ);
+        pte.pte_low  &= ~_PAGE_ACCESSED;
         pte.pte_high &= ~_PAGE_SILENT_READ;
         return pte;
 }
@@ -264,30 +260,24 @@ static inline pte_t pte_mkold(pte_t pte)
 static inline pte_t pte_mkwrite(pte_t pte)
 {
         pte.pte_low |= _PAGE_WRITE;
-        if (pte.pte_low & _PAGE_MODIFIED) {
-                pte.pte_low  |= _PAGE_SILENT_WRITE;
+        if (pte.pte_low & _PAGE_MODIFIED)
                 pte.pte_high |= _PAGE_SILENT_WRITE;
-        }
         return pte;
 }
 
 static inline pte_t pte_mkdirty(pte_t pte)
 {
         pte.pte_low |= _PAGE_MODIFIED;
-        if (pte.pte_low & _PAGE_WRITE) {
-                pte.pte_low  |= _PAGE_SILENT_WRITE;
+        if (pte.pte_low & _PAGE_WRITE)
                 pte.pte_high |= _PAGE_SILENT_WRITE;
-        }
         return pte;
 }
 
 static inline pte_t pte_mkyoung(pte_t pte)
 {
         pte.pte_low |= _PAGE_ACCESSED;
-        if (pte.pte_low & _PAGE_READ) {
-                pte.pte_low  |= _PAGE_SILENT_READ;
+        if (pte.pte_low & _PAGE_READ)
                 pte.pte_high |= _PAGE_SILENT_READ;
-        }
         return pte;
 }
 #else
@@ -332,13 +322,13 @@ static inline pte_t pte_mkdirty(pte_t pte)
 static inline pte_t pte_mkyoung(pte_t pte)
 {
         pte_val(pte) |= _PAGE_ACCESSED;
-        if (cpu_has_rixi) {
-                if (!(pte_val(pte) & _PAGE_NO_READ))
-                        pte_val(pte) |= _PAGE_SILENT_READ;
-        } else {
-                if (pte_val(pte) & _PAGE_READ)
-                        pte_val(pte) |= _PAGE_SILENT_READ;
-        }
+#ifdef CONFIG_CPU_MIPSR2
+        if (!(pte_val(pte) & _PAGE_NO_READ))
+                pte_val(pte) |= _PAGE_SILENT_READ;
+        else
+#endif
+        if (pte_val(pte) & _PAGE_READ)
+                pte_val(pte) |= _PAGE_SILENT_READ;
         return pte;
 }
 
@@ -391,10 +381,10 @@ static inline pgprot_t pgprot_writecombine(pgprot_t _prot)
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
-        pte.pte_low  &= _PAGE_CHG_MASK;
+        pte.pte_low  &= (_PAGE_MODIFIED | _PAGE_ACCESSED | _PFNX_MASK);
         pte.pte_high &= (_PFN_MASK | _CACHE_MASK);
-        pte.pte_low  |= pgprot_val(newprot);
-        pte.pte_high |= pgprot_val(newprot) & ~(_PFN_MASK | _CACHE_MASK);
+        pte.pte_low  |= pgprot_val(newprot) & ~_PFNX_MASK;
+        pte.pte_high |= pgprot_val(newprot) & ~_PFN_MASK;
         return pte;
 }
 #else
@@ -407,12 +397,15 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 extern void __update_tlb(struct vm_area_struct *vma, unsigned long address,
         pte_t pte);
+extern void __update_cache(struct vm_area_struct *vma, unsigned long address,
+        pte_t pte);
 
 static inline void update_mmu_cache(struct vm_area_struct *vma,
         unsigned long address, pte_t *ptep)
 {
         pte_t pte = *ptep;
         __update_tlb(vma, address, pte);
+        __update_cache(vma, address, pte);
 }
 
 static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
@@ -534,13 +527,13 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd)
 {
         pmd_val(pmd) |= _PAGE_ACCESSED;
 
-        if (cpu_has_rixi) {
-                if (!(pmd_val(pmd) & _PAGE_NO_READ))
-                        pmd_val(pmd) |= _PAGE_SILENT_READ;
-        } else {
-                if (pmd_val(pmd) & _PAGE_READ)
-                        pmd_val(pmd) |= _PAGE_SILENT_READ;
-        }
+#ifdef CONFIG_CPU_MIPSR2
+        if (!(pmd_val(pmd) & _PAGE_NO_READ))
+                pmd_val(pmd) |= _PAGE_SILENT_READ;
+        else
+#endif
+        if (pmd_val(pmd) & _PAGE_READ)
+                pmd_val(pmd) |= _PAGE_SILENT_READ;
 
         return pmd;
 }
diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h
index 1b22d2da88a1..38902bf97adc 100644
--- a/arch/mips/include/asm/r4kcache.h
+++ b/arch/mips/include/asm/r4kcache.h
@@ -12,6 +12,8 @@
 #ifndef _ASM_R4KCACHE_H
 #define _ASM_R4KCACHE_H
 
+#include <linux/stringify.h>
+
 #include <asm/asm.h>
 #include <asm/cacheops.h>
 #include <asm/compiler.h>
@@ -344,7 +346,7 @@ static inline void invalidate_tcache_page(unsigned long addr)
         "       cache %1, 0x0a0(%0); cache %1, 0x0b0(%0)\n"     \
         "       cache %1, 0x0c0(%0); cache %1, 0x0d0(%0)\n"     \
         "       cache %1, 0x0e0(%0); cache %1, 0x0f0(%0)\n"     \
-        "       addiu $1, $0, 0x100                     \n"     \
+        "       "__stringify(LONG_ADDIU)" $1, %0, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x010($1)\n"     \
         "       cache %1, 0x020($1); cache %1, 0x030($1)\n"     \
         "       cache %1, 0x040($1); cache %1, 0x050($1)\n"     \
@@ -368,17 +370,17 @@ static inline void invalidate_tcache_page(unsigned long addr)
         "       cache %1, 0x040(%0); cache %1, 0x060(%0)\n"     \
         "       cache %1, 0x080(%0); cache %1, 0x0a0(%0)\n"     \
         "       cache %1, 0x0c0(%0); cache %1, 0x0e0(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, %0, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x020($1)\n"     \
         "       cache %1, 0x040($1); cache %1, 0x060($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0a0($1)\n"     \
         "       cache %1, 0x0c0($1); cache %1, 0x0e0($1)\n"     \
-        "       addiu $1, $1, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x020($1)\n"     \
         "       cache %1, 0x040($1); cache %1, 0x060($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0a0($1)\n"     \
         "       cache %1, 0x0c0($1); cache %1, 0x0e0($1)\n"     \
-        "       addiu $1, $1, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100\n"      \
         "       cache %1, 0x000($1); cache %1, 0x020($1)\n"     \
         "       cache %1, 0x040($1); cache %1, 0x060($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0a0($1)\n"     \
@@ -396,25 +398,25 @@ static inline void invalidate_tcache_page(unsigned long addr)
         "       .set noat\n"                                    \
         "       cache %1, 0x000(%0); cache %1, 0x040(%0)\n"     \
         "       cache %1, 0x080(%0); cache %1, 0x0c0(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, %0, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
         "       cache %1, 0x000($1); cache %1, 0x040($1)\n"     \
         "       cache %1, 0x080($1); cache %1, 0x0c0($1)\n"     \
         "       .set pop\n"                                     \
@@ -429,39 +431,38 @@ static inline void invalidate_tcache_page(unsigned long addr)
         "       .set mips64r6\n"                                \
         "       .set noat\n"                                    \
         "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
-        "       cache %1, 0x000(%0); cache %1, 0x080(%0)\n"     \
-        "       addiu $1, %0, 0x100\n"                          \
+        "       "__stringify(LONG_ADDIU)" $1, %0, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
+        "       "__stringify(LONG_ADDIU)" $1, $1, 0x100 \n"     \
+        "       cache %1, 0x000($1); cache %1, 0x080($1)\n"     \
         "       .set pop\n"                                     \
                 :                                               \
                 : "r" (base),                                   \
diff --git a/arch/mips/include/asm/seccomp.h b/arch/mips/include/asm/seccomp.h
index f29c75cf83c6..1d8a2e2c75c1 100644
--- a/arch/mips/include/asm/seccomp.h
+++ b/arch/mips/include/asm/seccomp.h
@@ -2,11 +2,6 @@
 
 #include <linux/unistd.h>
 
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
 /*
  * Kludge alert:
  *
@@ -29,4 +24,6 @@
 
 #endif /* CONFIG_MIPS32_O32 */
 
+#include <asm-generic/seccomp.h>
+
 #endif /* __ASM_SECCOMP_H */
diff --git a/arch/mips/include/asm/sgi/sgi.h b/arch/mips/include/asm/sgi/sgi.h
index 645cea7c0f8e..b61557151e3f 100644
--- a/arch/mips/include/asm/sgi/sgi.h
+++ b/arch/mips/include/asm/sgi/sgi.h
@@ -22,14 +22,15 @@ enum sgi_mach {
         ip17,   /* R4K UP */
         ip19,   /* R4K MP */
         ip20,   /* R4K UP, Indigo */
-        ip21,   /* TFP MP */
-        ip22,   /* R4x00 UP, Indigo2 */
+        ip21,   /* R8k/TFP MP */
+        ip22,   /* R4x00 UP, Indy, Indigo2 */
         ip25,   /* R10k MP */
-        ip26,   /* TFP UP, Indigo2 */
-        ip27,   /* R10k MP, R12k MP, Origin */
-        ip28,   /* R10k UP, Indigo2 */
-        ip30,   /* Octane */
-        ip32,   /* O2 */
+        ip26,   /* R8k/TFP UP, Indigo2 */
+        ip27,   /* R10k MP, R12k MP, R14k MP, Origin 200/2k, Onyx2 */
+        ip28,   /* R10k UP, Indigo2 Impact R10k */
+        ip30,   /* R10k MP, R12k MP, R14k MP, Octane */
+        ip32,   /* R5k UP, RM5200 UP, RM7k UP, R10k UP, R12k UP, O2 */
+        ip35,   /* R14k MP, R16k MP, Origin 300/3k, Onyx3, Fuel, Tezro */
 };
 
 extern enum sgi_mach sgimach;
diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
index b4548690ade9..1fca2e0793dc 100644
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
@@ -263,7 +263,7 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
                 "1:     ll      %1, %2          # arch_read_unlock      \n"
-                "       addiu   %1, 1                                   \n"
+                "       addiu   %1, -1                                  \n"
                 "       sc      %1, %0                                  \n"
                 "       beqzl   %1, 1b                                  \n"
                 : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp)
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index 8408a30c47f3..9c0014e87c17 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -53,10 +53,10 @@ struct thread_info {
 #define init_stack              (init_thread_union.stack)
 
 /* How to get the thread information struct from C.  */
+register struct thread_info *__current_thread_info __asm__("$28");
+
 static inline struct thread_info *current_thread_info(void)
 {
-        register struct thread_info *__current_thread_info __asm__("$28");
-
         return __current_thread_info;
 }
 
diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform
index ba91be9c21ef..c41d30080098 100644
--- a/arch/mips/jz4740/Platform
+++ b/arch/mips/jz4740/Platform
@@ -1,3 +1,4 @@
 platform-$(CONFIG_MACH_JZ4740)  += jz4740/
 cflags-$(CONFIG_MACH_JZ4740)    += -I$(srctree)/arch/mips/include/asm/mach-jz4740
 load-$(CONFIG_MACH_JZ4740)      += 0xffffffff80010000
+zload-$(CONFIG_MACH_JZ4740)     += 0xffffffff80600000
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index 5e430ce9ac7e..72b0cecbc17c 100644
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -18,6 +18,7 @@
 #include <linux/time.h>
 
 #include <linux/clockchips.h>
+#include <linux/sched_clock.h>
 
 #include <asm/mach-jz4740/irq.h>
 #include <asm/mach-jz4740/timer.h>
@@ -43,6 +44,11 @@ static struct clocksource jz4740_clocksource = {
         .flags = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace jz4740_read_sched_clock(void)
+{
+        return jz4740_timer_get_count(TIMER_CLOCKSOURCE);
+}
+
 static irqreturn_t jz4740_clockevent_irq(int irq, void *devid)
 {
         struct clock_event_device *cd = devid;
@@ -126,6 +132,8 @@ void __init plat_time_init(void)
         if (ret)
                 printk(KERN_ERR "Failed to register clocksource: %d\n", ret);
 
+        sched_clock_register(jz4740_read_sched_clock, 16, clk_rate);
+
         setup_irq(JZ4740_IRQ_TCU0, &timer_irqaction);
 
         ctrl = JZ_TIMER_CTRL_PRESCALE_16 | JZ_TIMER_CTRL_SRC_EXT;
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index c2e0f45ddf6c..c0c5e5972256 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -36,8 +36,10 @@ int __isa_exception_epc(struct pt_regs *regs)
                 return epc;
         }
         if (cpu_has_mips16) {
-                if (((union mips16e_instruction)inst).ri.opcode
-                                == MIPS16e_jal_op)
+                union mips16e_instruction inst_mips16e;
+
+                inst_mips16e.full = inst;
+                if (inst_mips16e.ri.opcode == MIPS16e_jal_op)
                         epc += 4;
                 else
                         epc += 2;
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 82bd2b278a24..d70c4d893219 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -37,6 +37,24 @@ void mips_set_clock_mode(enum clock_event_mode mode,
 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
 int cp0_timer_irq_installed;
 
+/*
+ * Possibly handle a performance counter interrupt.
+ * Return true if the timer interrupt should not be checked
+ */
+static inline int handle_perf_irq(int r2)
+{
+        /*
+         * The performance counter overflow interrupt may be shared with the
+         * timer interrupt (cp0_perfcount_irq < 0). If it is and a
+         * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
+         * and we can't reliably determine if a counter interrupt has also
+         * happened (!r2) then don't check for a timer interrupt.
+         */
+        return (cp0_perfcount_irq < 0) &&
+                perf_irq() == IRQ_HANDLED &&
+                !r2;
+}
+
 irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
 {
         const int r2 = cpu_has_mips_r2_r6;
@@ -50,27 +68,32 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
          * the performance counter interrupt handler anyway.
          */
         if (handle_perf_irq(r2))
-                goto out;
+                return IRQ_HANDLED;
 
         /*
          * The same applies to performance counter interrupts.  But with the
          * above we now know that the reason we got here must be a timer
          * interrupt.  Being the paranoiacs we are we check anyway.
          */
-        if (!r2 || (read_c0_cause() & (1 << 30))) {
+        if (!r2 || (read_c0_cause() & CAUSEF_TI)) {
                 /* Clear Count/Compare Interrupt */
                 write_c0_compare(read_c0_compare());
                 cd = &per_cpu(mips_clockevent_device, cpu);
                 cd->event_handler(cd);
+
+                return IRQ_HANDLED;
         }
 
-out:
-        return IRQ_HANDLED;
+        return IRQ_NONE;
 }
 
 struct irqaction c0_compare_irqaction = {
         .handler = c0_compare_interrupt,
-        .flags = IRQF_PERCPU | IRQF_TIMER,
+        /*
+         * IRQF_SHARED: The timer interrupt may be shared with other interrupts
+         * such as perf counter and FDC interrupts.
+         */
+        .flags = IRQF_PERCPU | IRQF_TIMER | IRQF_SHARED,
         .name = "timer",
 };
 
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 2ae08462e46e..723932441ecc 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/sched_clock.h>
 #include <asm/time.h>
 #include <asm/txx9tmr.h>
 
@@ -46,6 +47,11 @@ static struct txx9_clocksource txx9_clocksource = {
         },
 };
 
+static u64 notrace txx9_read_sched_clock(void)
+{
+        return __raw_readl(&txx9_clocksource.tmrptr->trr);
+}
+
 void __init txx9_clocksource_init(unsigned long baseaddr,
                                   unsigned int imbusclk)
 {
@@ -61,6 +67,9 @@ void __init txx9_clocksource_init(unsigned long baseaddr,
         __raw_writel(1 << TXX9_CLOCKSOURCE_BITS, &tmrptr->cpra);
         __raw_writel(TCR_BASE | TXx9_TMTCR_TCE, &tmrptr->tcr);
         txx9_clocksource.tmrptr = tmrptr;
+
+        sched_clock_register(txx9_read_sched_clock, TXX9_CLOCKSOURCE_BITS,
+                             TIMER_CLK(imbusclk));
 }
 
 struct txx9_clock_event_device {
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 48dfb9de853d..e36515dcd3b2 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -20,6 +20,7 @@
 
 #include <asm/bugs.h>
 #include <asm/cpu.h>
+#include <asm/cpu-features.h>
 #include <asm/cpu-type.h>
 #include <asm/fpu.h>
 #include <asm/mipsregs.h>
@@ -31,11 +32,127 @@
 #include <asm/spram.h>
 #include <asm/uaccess.h>
 
+/*
+ * Get the FPU Implementation/Revision.
+ */
+static inline unsigned long cpu_get_fpu_id(void)
+{
+        unsigned long tmp, fpu_id;
+
+        tmp = read_c0_status();
+        __enable_fpu(FPU_AS_IS);
+        fpu_id = read_32bit_cp1_register(CP1_REVISION);
+        write_c0_status(tmp);
+        return fpu_id;
+}
+
+/*
+ * Check if the CPU has an external FPU.
+ */
+static inline int __cpu_has_fpu(void)
+{
+        return (cpu_get_fpu_id() & FPIR_IMP_MASK) != FPIR_IMP_NONE;
+}
+
+static inline unsigned long cpu_get_msa_id(void)
+{
+        unsigned long status, msa_id;
+
+        status = read_c0_status();
+        __enable_fpu(FPU_64BIT);
+        enable_msa();
+        msa_id = read_msa_ir();
+        disable_msa();
+        write_c0_status(status);
+        return msa_id;
+}
+
+/*
+ * Determine the FCSR mask for FPU hardware.
+ */
+static inline void cpu_set_fpu_fcsr_mask(struct cpuinfo_mips *c)
+{
+        unsigned long sr, mask, fcsr, fcsr0, fcsr1;
+
+        mask = FPU_CSR_ALL_X | FPU_CSR_ALL_E | FPU_CSR_ALL_S | FPU_CSR_RM;
+
+        sr = read_c0_status();
+        __enable_fpu(FPU_AS_IS);
+
+        fcsr = read_32bit_cp1_register(CP1_STATUS);
+
+        fcsr0 = fcsr & mask;
+        write_32bit_cp1_register(CP1_STATUS, fcsr0);
+        fcsr0 = read_32bit_cp1_register(CP1_STATUS);
+
+        fcsr1 = fcsr | ~mask;
+        write_32bit_cp1_register(CP1_STATUS, fcsr1);
+        fcsr1 = read_32bit_cp1_register(CP1_STATUS);
+
+        write_32bit_cp1_register(CP1_STATUS, fcsr);
+
+        write_c0_status(sr);
+
+        c->fpu_msk31 = ~(fcsr0 ^ fcsr1) & ~mask;
+}
+
+/*
+ * Set the FIR feature flags for the FPU emulator.
+ */
+static void cpu_set_nofpu_id(struct cpuinfo_mips *c)
+{
+        u32 value;
+
+        value = 0;
+        if (c->isa_level & (MIPS_CPU_ISA_M32R1 | MIPS_CPU_ISA_M64R1 |
+                            MIPS_CPU_ISA_M32R2 | MIPS_CPU_ISA_M64R2 |
+                            MIPS_CPU_ISA_M32R6 | MIPS_CPU_ISA_M64R6))
+                value |= MIPS_FPIR_D | MIPS_FPIR_S;
+        if (c->isa_level & (MIPS_CPU_ISA_M32R2 | MIPS_CPU_ISA_M64R2 |
+                            MIPS_CPU_ISA_M32R6 | MIPS_CPU_ISA_M64R6))
+                value |= MIPS_FPIR_F64 | MIPS_FPIR_L | MIPS_FPIR_W;
+        c->fpu_id = value;
+}
+
+/* Determined FPU emulator mask to use for the boot CPU with "nofpu".  */
+static unsigned int mips_nofpu_msk31;
+
+/*
+ * Set options for FPU hardware.
+ */
+static void cpu_set_fpu_opts(struct cpuinfo_mips *c)
+{
+        c->fpu_id = cpu_get_fpu_id();
+        mips_nofpu_msk31 = c->fpu_msk31;
+
+        if (c->isa_level & (MIPS_CPU_ISA_M32R1 | MIPS_CPU_ISA_M64R1 |
+                            MIPS_CPU_ISA_M32R2 | MIPS_CPU_ISA_M64R2 |
+                            MIPS_CPU_ISA_M32R6 | MIPS_CPU_ISA_M64R6)) {
+                if (c->fpu_id & MIPS_FPIR_3D)
+                        c->ases |= MIPS_ASE_MIPS3D;
+                if (c->fpu_id & MIPS_FPIR_FREP)
+                        c->options |= MIPS_CPU_FRE;
+        }
+
+        cpu_set_fpu_fcsr_mask(c);
+}
+
+/*
+ * Set options for the FPU emulator.
+ */
+static void cpu_set_nofpu_opts(struct cpuinfo_mips *c)
+{
+        c->options &= ~MIPS_CPU_FPU;
+        c->fpu_msk31 = mips_nofpu_msk31;
+
+        cpu_set_nofpu_id(c);
+}
+
 static int mips_fpu_disabled;
 
 static int __init fpu_disable(char *s)
 {
-        cpu_data[0].options &= ~MIPS_CPU_FPU;
+        cpu_set_nofpu_opts(&boot_cpu_data);
         mips_fpu_disabled = 1;
 
         return 1;
@@ -178,41 +295,6 @@ static inline void set_elf_platform(int cpu, const char *plat)
                 __elf_platform = plat;
 }
 
-/*
- * Get the FPU Implementation/Revision.
- */
-static inline unsigned long cpu_get_fpu_id(void)
-{
-        unsigned long tmp, fpu_id;
-
-        tmp = read_c0_status();
-        __enable_fpu(FPU_AS_IS);
-        fpu_id = read_32bit_cp1_register(CP1_REVISION);
-        write_c0_status(tmp);
-        return fpu_id;
-}
-
-/*
- * Check the CPU has an FPU the official way.
- */
-static inline int __cpu_has_fpu(void)
-{
-        return (cpu_get_fpu_id() & FPIR_IMP_MASK) != FPIR_IMP_NONE;
-}
-
-static inline unsigned long cpu_get_msa_id(void)
-{
-        unsigned long status, msa_id;
-
-        status = read_c0_status();
-        __enable_fpu(FPU_64BIT);
-        enable_msa();
-        msa_id = read_msa_ir();
-        disable_msa();
-        write_c0_status(status);
-        return msa_id;
-}
-
 static inline void cpu_probe_vmbits(struct cpuinfo_mips *c)
 {
 #ifdef __NEED_VMBITS_PROBE
@@ -441,6 +523,8 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
                 c->htw_seq = 0;
                 c->options |= MIPS_CPU_HTW;
         }
+        if (config3 & MIPS_CONF3_CDMM)
+                c->options |= MIPS_CPU_CDMM;
 
         return config3 & MIPS_CONF_M;
 }
@@ -516,6 +600,10 @@ static inline unsigned int decode_config5(struct cpuinfo_mips *c)
                 c->options |= MIPS_CPU_MAAR;
         if (config5 & MIPS_CONF5_LLB)
                 c->options |= MIPS_CPU_RW_LLB;
+#ifdef CONFIG_XPA
+        if (config5 & MIPS_CONF5_MVH)
+                c->options |= MIPS_CPU_XPA;
+#endif
 
         return config5 & MIPS_CONF_M;
 }
@@ -575,6 +663,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
         case PRID_IMP_R2000:
                 c->cputype = CPU_R2000;
                 __cpu_name[cpu] = "R2000";
+                c->fpu_msk31 |= FPU_CSR_CONDX | FPU_CSR_FS;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE |
                              MIPS_CPU_NOFPUEX;
                 if (__cpu_has_fpu())
@@ -594,6 +683,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                         c->cputype = CPU_R3000;
                         __cpu_name[cpu] = "R3000";
                 }
+                c->fpu_msk31 |= FPU_CSR_CONDX | FPU_CSR_FS;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE |
                              MIPS_CPU_NOFPUEX;
                 if (__cpu_has_fpu())
@@ -642,6 +732,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 }
 
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_WATCH | MIPS_CPU_VCE |
                              MIPS_CPU_LLSC;
@@ -649,6 +740,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 break;
         case PRID_IMP_VR41XX:
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS;
                 c->tlbsize = 32;
                 switch (c->processor_id & 0xf0) {
@@ -690,6 +782,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R4300;
                 __cpu_name[cpu] = "R4300";
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
                 c->tlbsize = 32;
@@ -698,6 +791,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R4600;
                 __cpu_name[cpu] = "R4600";
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
                 c->tlbsize = 48;
@@ -713,11 +807,13 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R4650;
                 __cpu_name[cpu] = "R4650";
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC;
                 c->tlbsize = 48;
                 break;
         #endif
         case PRID_IMP_TX39:
+                c->fpu_msk31 |= FPU_CSR_CONDX | FPU_CSR_FS;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_TX39_CACHE;
 
                 if ((c->processor_id & 0xf0) == (PRID_REV_TX3927 & 0xf0)) {
@@ -743,6 +839,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R4700;
                 __cpu_name[cpu] = "R4700";
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
                 c->tlbsize = 48;
@@ -751,6 +848,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_TX49XX;
                 __cpu_name[cpu] = "R49XX";
                 set_isa(c, MIPS_CPU_ISA_III);
+                c->fpu_msk31 |= FPU_CSR_CONDX;
                 c->options = R4K_OPTS | MIPS_CPU_LLSC;
                 if (!(c->processor_id & 0x08))
                         c->options |= MIPS_CPU_FPU | MIPS_CPU_32FPR;
@@ -792,6 +890,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R6000;
                 __cpu_name[cpu] = "R6000";
                 set_isa(c, MIPS_CPU_ISA_II);
+                c->fpu_msk31 |= FPU_CSR_CONDX | FPU_CSR_FS;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_FPU |
                              MIPS_CPU_LLSC;
                 c->tlbsize = 32;
@@ -800,6 +899,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_R6000A;
                 __cpu_name[cpu] = "R6000A";
                 set_isa(c, MIPS_CPU_ISA_II);
+                c->fpu_msk31 |= FPU_CSR_CONDX | FPU_CSR_FS;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_FPU |
                              MIPS_CPU_LLSC;
                 c->tlbsize = 32;
@@ -850,8 +950,13 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->tlbsize = 64;
                 break;
         case PRID_IMP_R14000:
-                c->cputype = CPU_R14000;
-                __cpu_name[cpu] = "R14000";
+                if (((c->processor_id >> 4) & 0x0f) > 2) {
+                        c->cputype = CPU_R16000;
+                        __cpu_name[cpu] = "R16000";
+                } else {
+                        c->cputype = CPU_R14000;
+                        __cpu_name[cpu] = "R14000";
+                }
                 set_isa(c, MIPS_CPU_ISA_IV);
                 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                              MIPS_CPU_FPU | MIPS_CPU_32FPR |
@@ -866,12 +971,14 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                         __cpu_name[cpu] = "ICT Loongson-2";
                         set_elf_platform(cpu, "loongson2e");
                         set_isa(c, MIPS_CPU_ISA_III);
+                        c->fpu_msk31 |= FPU_CSR_CONDX;
                         break;
                 case PRID_REV_LOONGSON2F:
                         c->cputype = CPU_LOONGSON2;
                         __cpu_name[cpu] = "ICT Loongson-2";
                         set_elf_platform(cpu, "loongson2f");
                         set_isa(c, MIPS_CPU_ISA_III);
+                        c->fpu_msk31 |= FPU_CSR_CONDX;
                         break;
                 case PRID_REV_LOONGSON3A:
                         c->cputype = CPU_LOONGSON3;
@@ -1308,6 +1415,9 @@ void cpu_probe(void)
         c->cputype      = CPU_UNKNOWN;
         c->writecombine = _CACHE_UNCACHED;
 
+        c->fpu_csr31    = FPU_CSR_RN;
+        c->fpu_msk31    = FPU_CSR_RSVD | FPU_CSR_ABS2008 | FPU_CSR_NAN2008;
+
         c->processor_id = read_c0_prid();
         switch (c->processor_id & PRID_COMP_MASK) {
         case PRID_COMP_LEGACY:
@@ -1364,16 +1474,10 @@ void cpu_probe(void)
                                ~(1 << MIPS_PWCTL_PWEN_SHIFT));
         }
 
-        if (c->options & MIPS_CPU_FPU) {
-                c->fpu_id = cpu_get_fpu_id();
-
-                if (c->isa_level & cpu_has_mips_r) {
-                        if (c->fpu_id & MIPS_FPIR_3D)
-                                c->ases |= MIPS_ASE_MIPS3D;
-                        if (c->fpu_id & MIPS_FPIR_FREP)
-                                c->options |= MIPS_CPU_FRE;
-                }
-        }
+        if (c->options & MIPS_CPU_FPU)
+                cpu_set_fpu_opts(c);
+        else
+                cpu_set_nofpu_opts(c);
 
         if (cpu_has_mips_r2_r6) {
                 c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
diff --git a/arch/mips/kernel/csrc-bcm1480.c b/arch/mips/kernel/csrc-bcm1480.c
index 468f3eba4132..7f65b53d1b24 100644
--- a/arch/mips/kernel/csrc-bcm1480.c
+++ b/arch/mips/kernel/csrc-bcm1480.c
@@ -10,12 +10,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/clocksource.h>
+#include <linux/sched_clock.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
@@ -41,6 +38,11 @@ struct clocksource bcm1480_clocksource = {
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace sb1480_read_sched_clock(void)
+{
+        return __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
+}
+
 void __init sb1480_clocksource_init(void)
 {
         struct clocksource *cs = &bcm1480_clocksource;
@@ -50,4 +52,6 @@ void __init sb1480_clocksource_init(void)
         plldiv = G_BCM1480_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG)));
         zbbus = ((plldiv >> 1) * 50000000) + ((plldiv & 1) * 25000000);
         clocksource_register_hz(cs, zbbus);
+
+        sched_clock_register(sb1480_read_sched_clock, 64, zbbus);
 }
diff --git a/arch/mips/kernel/csrc-ioasic.c b/arch/mips/kernel/csrc-ioasic.c
index 6cbbf6e106b9..722f5589cd1d 100644
--- a/arch/mips/kernel/csrc-ioasic.c
+++ b/arch/mips/kernel/csrc-ioasic.c
@@ -12,12 +12,9 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <linux/clocksource.h>
+#include <linux/sched_clock.h>
 #include <linux/init.h>
 
 #include <asm/ds1287.h>
@@ -37,6 +34,11 @@ static struct clocksource clocksource_dec = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace dec_ioasic_read_sched_clock(void)
+{
+        return ioasic_read(IO_REG_FCTR);
+}
+
 int __init dec_ioasic_clocksource_init(void)
 {
         unsigned int freq;
@@ -65,5 +67,8 @@ int __init dec_ioasic_clocksource_init(void)
 
         clocksource_dec.rating = 200 + freq / 10000000;
         clocksource_register_hz(&clocksource_dec, freq);
+
+        sched_clock_register(dec_ioasic_read_sched_clock, 32, freq);
+
         return 0;
 }
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index decd1fa38d55..e5ed7ada1433 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -7,6 +7,7 @@
  */
 #include <linux/clocksource.h>
 #include <linux/init.h>
+#include <linux/sched_clock.h>
 
 #include <asm/time.h>
 
@@ -22,6 +23,11 @@ static struct clocksource clocksource_mips = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace r4k_read_sched_clock(void)
+{
+        return read_c0_count();
+}
+
 int __init init_r4k_clocksource(void)
 {
         if (!cpu_has_counter || !mips_hpt_frequency)
@@ -32,5 +38,7 @@ int __init init_r4k_clocksource(void)
 
         clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
 
+        sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency);
+
         return 0;
 }
diff --git a/arch/mips/kernel/csrc-sb1250.c b/arch/mips/kernel/csrc-sb1250.c
index 6ecb77d82063..d915652b4d56 100644
--- a/arch/mips/kernel/csrc-sb1250.c
+++ b/arch/mips/kernel/csrc-sb1250.c
@@ -10,12 +10,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/clocksource.h>
+#include <linux/sched_clock.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
@@ -33,15 +30,22 @@
  * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
  * again.
  */
-static cycle_t sb1250_hpt_read(struct clocksource *cs)
+static inline cycle_t sb1250_hpt_get_cycles(void)
 {
         unsigned int count;
+        void __iomem *addr;
 
-        count = G_SCD_TIMER_CNT(__raw_readq(IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CNT))));
+        addr = IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CNT));
+        count = G_SCD_TIMER_CNT(__raw_readq(addr));
 
         return SB1250_HPT_VALUE - count;
 }
 
+static cycle_t sb1250_hpt_read(struct clocksource *cs)
+{
+        return sb1250_hpt_get_cycles();
+}
+
 struct clocksource bcm1250_clocksource = {
         .name   = "bcm1250-counter-3",
         .rating = 200,
@@ -50,6 +54,11 @@ struct clocksource bcm1250_clocksource = {
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace sb1250_read_sched_clock(void)
+{
+        return sb1250_hpt_get_cycles();
+}
+
 void __init sb1250_clocksource_init(void)
 {
         struct clocksource *cs = &bcm1250_clocksource;
@@ -66,4 +75,6 @@ void __init sb1250_clocksource_init(void)
                                                  R_SCD_TIMER_CFG)));
 
         clocksource_register_hz(cs, V_SCD_TIMER_FREQ);
+
+        sched_clock_register(sb1250_read_sched_clock, 23, V_SCD_TIMER_FREQ);
 }
diff --git a/arch/mips/kernel/elf.c b/arch/mips/kernel/elf.c
index d2c09f6475c5..be4899f3c393 100644
--- a/arch/mips/kernel/elf.c
+++ b/arch/mips/kernel/elf.c
@@ -131,16 +131,6 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf,
         return 0;
 }
 
-static inline unsigned get_fp_abi(int in_abi)
-{
-        /* If the ABI requirement is provided, simply return that */
-        if (in_abi != MIPS_ABI_FP_UNKNOWN)
-                return in_abi;
-
-        /* Unknown ABI */
-        return MIPS_ABI_FP_UNKNOWN;
-}
-
 int arch_check_elf(void *_ehdr, bool has_interpreter,
                    struct arch_elf_state *state)
 {
@@ -151,10 +141,10 @@ int arch_check_elf(void *_ehdr, bool has_interpreter,
         if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT))
                 return 0;
 
-        fp_abi = get_fp_abi(state->fp_abi);
+        fp_abi = state->fp_abi;
 
         if (has_interpreter) {
-                interp_fp_abi = get_fp_abi(state->interp_fp_abi);
+                interp_fp_abi = state->interp_fp_abi;
 
                 abi0 = min(fp_abi, interp_fp_abi);
                 abi1 = max(fp_abi, interp_fp_abi);
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index af41ba6db960..7791840cf22c 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -10,6 +10,7 @@
 
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
+#include <asm/compiler.h>
 #include <asm/regdef.h>
 #include <asm/mipsregs.h>
 #include <asm/stackframe.h>
@@ -185,7 +186,7 @@ syscall_exit_work:
  * For C code use the inline version named instruction_hazard().
  */
 LEAF(mips_ihb)
-        .set    mips32r2
+        .set    MIPS_ISA_LEVEL_RAW
         jr.hb   ra
         nop
         END(mips_ihb)
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index 368c88b7eb6c..e4f62b7875d2 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -176,6 +176,17 @@ void __init check_wait(void)
                 cpu_wait = rm7k_wait_irqoff;
                 break;
 
+        case CPU_PROAPTIV:
+        case CPU_P5600:
+                /*
+                 * Incoming Fast Debug Channel (FDC) data during a wait
+                 * instruction causes the wait never to resume, even if an
+                 * interrupt is received. Avoid using wait at all if FDC data is
+                 * likely to be received.
+                 */
+                if (IS_ENABLED(CONFIG_MIPS_EJTAG_FDC_TTY))
+                        break;
+                /* fall through */
         case CPU_M14KC:
         case CPU_M14KEC:
         case CPU_24K:
@@ -183,8 +194,6 @@ void __init check_wait(void)
         case CPU_1004K:
         case CPU_1074K:
         case CPU_INTERAPTIV:
-        case CPU_PROAPTIV:
-        case CPU_P5600:
         case CPU_M5150:
         case CPU_QEMU_GENERIC:
                 cpu_wait = r4k_wait;
diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c
index 64d17e41093b..f2977f00911b 100644
--- a/arch/mips/kernel/mips-r2-to-r6-emul.c
+++ b/arch/mips/kernel/mips-r2-to-r6-emul.c
@@ -187,7 +187,7 @@ static inline int mipsr6_emul(struct pt_regs *regs, u32 ir)
 }
 
 /**
- * movt_func - Emulate a MOVT instruction
+ * movf_func - Emulate a MOVF instruction
  * @regs: Process register set
  * @ir: Instruction
  *
@@ -200,9 +200,12 @@ static int movf_func(struct pt_regs *regs, u32 ir)
 
         csr = current->thread.fpu.fcr31;
         cond = fpucondbit[MIPSInst_RT(ir) >> 2];
+
         if (((csr & cond) == 0) && MIPSInst_RD(ir))
                 regs->regs[MIPSInst_RD(ir)] = regs->regs[MIPSInst_RS(ir)];
+
         MIPS_R2_STATS(movs);
+
         return 0;
 }
 
@@ -895,8 +898,9 @@ static inline int mipsr2_find_op_func(struct pt_regs *regs, u32 inst,
  * mipsr2_decoder: Decode and emulate a MIPS R2 instruction
  * @regs: Process register set
  * @inst: Instruction to decode and emulate
+ * @fcr31: Floating Point Control and Status Register returned
  */
-int mipsr2_decoder(struct pt_regs *regs, u32 inst)
+int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31)
 {
         int err = 0;
         unsigned long vaddr;
@@ -1165,6 +1169,13 @@ fpu_emul:
 
                 err = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 0,
                                                &fault_addr);
+                *fcr31 = current->thread.fpu.fcr31;
+
+                /*
+                 * We can't allow the emulated instruction to leave any of
+                 * the cause bits set in $fcr31.
+                 */
+                current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
 
                 /*
                  * this is a tricky issue - lose_fpu() uses LL/SC atomics
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 9466184d0039..cc1b6fadf089 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -558,8 +558,10 @@ static int mipspmu_get_irq(void)
         if (mipspmu.irq >= 0) {
                 /* Request my own irq handler. */
                 err = request_irq(mipspmu.irq, mipsxx_pmu_handle_irq,
-                        IRQF_PERCPU | IRQF_NOBALANCING | IRQF_NO_THREAD,
-                        "mips_perf_pmu", NULL);
+                                  IRQF_PERCPU | IRQF_NOBALANCING |
+                                  IRQF_NO_THREAD | IRQF_NO_SUSPEND |
+                                  IRQF_SHARED,
+                                  "mips_perf_pmu", &mipspmu);
                 if (err) {
                         pr_warn("Unable to request IRQ%d for MIPS performance counters!\n",
                                 mipspmu.irq);
@@ -582,7 +584,7 @@ static int mipspmu_get_irq(void)
 static void mipspmu_free_irq(void)
 {
         if (mipspmu.irq >= 0)
-                free_irq(mipspmu.irq, NULL);
+                free_irq(mipspmu.irq, &mipspmu);
         else if (cp0_perfcount_irq < 0)
                 perf_irq = save_perf_irq;
 }
@@ -775,6 +777,7 @@ static int n_counters(void)
 
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 counters = 4;
                 break;
 
@@ -822,6 +825,13 @@ static const struct mips_perf_event mipsxxcore_event_map2
         [PERF_COUNT_HW_BRANCH_MISSES] = { 0x27, CNTR_ODD, T },
 };
 
+static const struct mips_perf_event loongson3_event_map[PERF_COUNT_HW_MAX] = {
+        [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN },
+        [PERF_COUNT_HW_INSTRUCTIONS] = { 0x00, CNTR_ODD },
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x01, CNTR_EVEN },
+        [PERF_COUNT_HW_BRANCH_MISSES] = { 0x01, CNTR_ODD },
+};
+
 static const struct mips_perf_event octeon_event_map[PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_CPU_CYCLES] = { 0x01, CNTR_ALL },
         [PERF_COUNT_HW_INSTRUCTIONS] = { 0x03, CNTR_ALL },
@@ -1005,6 +1015,61 @@ static const struct mips_perf_event mipsxxcore_cache_map2
 },
 };
 
+static const struct mips_perf_event loongson3_cache_map
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
+[C(L1D)] = {
+        /*
+         * Like some other architectures (e.g. ARM), the performance
+         * counters don't differentiate between read and write
+         * accesses/misses, so this isn't strictly correct, but it's the
+         * best we can do. Writes and reads get combined.
+         */
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x04, CNTR_ODD },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x04, CNTR_ODD },
+        },
+},
+[C(L1I)] = {
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x04, CNTR_EVEN },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x04, CNTR_EVEN },
+        },
+},
+[C(DTLB)] = {
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x09, CNTR_ODD },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x09, CNTR_ODD },
+        },
+},
+[C(ITLB)] = {
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x0c, CNTR_ODD },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x0c, CNTR_ODD },
+        },
+},
+[C(BPU)] = {
+        /* Using the same code for *HW_BRANCH* */
+        [C(OP_READ)] = {
+                [C(RESULT_ACCESS)]      = { 0x02, CNTR_EVEN },
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_ACCESS)]      = { 0x02, CNTR_EVEN },
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD },
+        },
+},
+};
+
 /* BMIPS5000 */
 static const struct mips_perf_event bmips5000_cache_map
                                 [PERF_COUNT_HW_CACHE_MAX]
@@ -1539,6 +1604,10 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
                 else
                         raw_event.cntr_mask =
                                 raw_id > 127 ? CNTR_ODD : CNTR_EVEN;
+                break;
+        case CPU_LOONGSON3:
+                raw_event.cntr_mask = raw_id > 127 ? CNTR_ODD : CNTR_EVEN;
+        break;
         }
 
         raw_event.event_id = base_id;
@@ -1615,8 +1684,7 @@ init_hw_perf_events(void)
 
         if (get_c0_perfcount_int)
                 irq = get_c0_perfcount_int();
-        else if ((cp0_perfcount_irq >= 0) &&
-                 (cp0_compare_irq != cp0_perfcount_irq))
+        else if (cp0_perfcount_irq >= 0)
                 irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
         else
                 irq = -1;
@@ -1669,6 +1737,11 @@ init_hw_perf_events(void)
                 mipspmu.general_event_map = &mipsxxcore_event_map;
                 mipspmu.cache_event_map = &mipsxxcore_cache_map;
                 break;
+        case CPU_LOONGSON3:
+                mipspmu.name = "mips/loongson3";
+                mipspmu.general_event_map = &loongson3_event_map;
+                mipspmu.cache_event_map = &loongson3_cache_map;
+                break;
         case CPU_CAVIUM_OCTEON:
         case CPU_CAVIUM_OCTEON_PLUS:
         case CPU_CAVIUM_OCTEON2:
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 130af7d26a9c..298b2b773d12 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -120,6 +120,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         if (cpu_has_msa)        seq_printf(m, "%s", " msa");
         if (cpu_has_eva)        seq_printf(m, "%s", " eva");
         if (cpu_has_htw)        seq_printf(m, "%s", " htw");
+        if (cpu_has_xpa)        seq_printf(m, "%s", " xpa");
         seq_printf(m, "\n");
 
         if (cpu_has_mmips) {
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index bf85cc180d91..d295bd1e4996 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -107,8 +107,11 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
         return 0;
 }
 
+/*
+ * Copy architecture-specific thread state
+ */
 int copy_thread(unsigned long clone_flags, unsigned long usp,
-        unsigned long arg, struct task_struct *p)
+        unsigned long kthread_arg, struct task_struct *p)
 {
         struct thread_info *ti = task_thread_info(p);
         struct pt_regs *childregs, *regs = current_pt_regs();
@@ -123,11 +126,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         childksp = (unsigned long) childregs;
         p->thread.cp0_status = read_c0_status() & ~(ST0_CU2|ST0_CU1);
         if (unlikely(p->flags & PF_KTHREAD)) {
+                /* kernel thread */
                 unsigned long status = p->thread.cp0_status;
                 memset(childregs, 0, sizeof(struct pt_regs));
                 ti->addr_limit = KERNEL_DS;
                 p->thread.reg16 = usp; /* fn */
-                p->thread.reg17 = arg;
+                p->thread.reg17 = kthread_arg;
                 p->thread.reg29 = childksp;
                 p->thread.reg31 = (unsigned long) ret_from_kernel_thread;
 #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
@@ -139,6 +143,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                 childregs->cp0_status = status;
                 return 0;
         }
+
+        /* user thread */
         *childregs = *regs;
         childregs->regs[7] = 0; /* Clear error flag */
         childregs->regs[2] = 0; /* Child gets zero as return value */
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 452d4350ce42..e303cb1ef2f4 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -64,7 +64,10 @@ int __init __dt_register_buses(const char *bus0, const char *bus1)
                 panic("device tree not present");
 
         strlcpy(of_ids[0].compatible, bus0, sizeof(of_ids[0].compatible));
-        strlcpy(of_ids[1].compatible, bus1, sizeof(of_ids[1].compatible));
+        if (bus1) {
+                strlcpy(of_ids[1].compatible, bus1,
+                        sizeof(of_ids[1].compatible));
+        }
 
         if (of_platform_populate(NULL, of_ids, NULL, NULL))
                 panic("failed to populate DT");
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 7da6e324dd35..d544e774eea6 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -32,6 +32,7 @@
 
 #include <asm/byteorder.h>
 #include <asm/cpu.h>
+#include <asm/cpu-info.h>
 #include <asm/dsp.h>
 #include <asm/fpu.h>
 #include <asm/mipsregs.h>
@@ -157,6 +158,9 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)
 {
         union fpureg *fregs;
         u64 fpr_val;
+        u32 fcr31;
+        u32 value;
+        u32 mask;
         int i;
 
         if (!access_ok(VERIFY_READ, data, 33 * 8))
@@ -170,8 +174,10 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)
                 set_fpr64(&fregs[i], 0, fpr_val);
         }
 
-        __get_user(child->thread.fpu.fcr31, data + 64);
-        child->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
+        __get_user(value, data + 64);
+        fcr31 = child->thread.fpu.fcr31;
+        mask = current_cpu_data.fpu_msk31;
+        child->thread.fpu.fcr31 = (value & ~mask) | (fcr31 & mask);
 
         /* FIR may not be written.  */
 
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index 435ea652f5fa..5087a4b72e6b 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -115,11 +115,9 @@ LEAF(_restore_fp)
  * the property that no matter whether considered as single or as double
  * precision represents signaling NANS.
  *
- * We initialize fcr31 to rounding to nearest, no exceptions.
+ * The value to initialize fcr31 to comes in $a0.
  */
 
-#define FPU_DEFAULT  0x00000000
-
         .set push
         SET_HARDFLOAT
 
@@ -129,8 +127,7 @@ LEAF(_init_fpu)
         or      t0, t1
         mtc0    t0, CP0_STATUS
 
-        li      t1, FPU_DEFAULT
-        ctc1    t1, fcr31
+        ctc1    a0, fcr31
 
         li      t0, -1
 
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index 3b1a36f13a7d..04cbbde3521b 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -165,11 +165,9 @@ LEAF(_init_msa_upper)
  * the property that no matter whether considered as single or as double
  * precision represents signaling NANS.
  *
- * We initialize fcr31 to rounding to nearest, no exceptions.
+ * The value to initialize fcr31 to comes in $a0.
  */
 
-#define FPU_DEFAULT  0x00000000
-
         .set push
         SET_HARDFLOAT
 
@@ -180,8 +178,7 @@ LEAF(_init_fpu)
         mtc0    t0, CP0_STATUS
         enable_fpu_hazard
 
-        li      t1, FPU_DEFAULT
-        ctc1    t1, fcr31
+        ctc1    a0, fcr31
 
         li      t1, -1                          # SNaN
 
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
index 07fc5244aed4..7c746d3458e7 100644
--- a/arch/mips/kernel/reset.c
+++ b/arch/mips/kernel/reset.c
@@ -11,6 +11,7 @@
 #include <linux/pm.h>
 #include <linux/types.h>
 #include <linux/reboot.h>
+#include <linux/delay.h>
 
 #include <asm/reboot.h>
 
@@ -29,16 +30,40 @@ void machine_restart(char *command)
 {
         if (_machine_restart)
                 _machine_restart(command);
+
+#ifdef CONFIG_SMP
+        preempt_disable();
+        smp_send_stop();
+#endif
+        do_kernel_restart(command);
+        mdelay(1000);
+        pr_emerg("Reboot failed -- System halted\n");
+        local_irq_disable();
+        while (1);
 }
 
 void machine_halt(void)
 {
         if (_machine_halt)
                 _machine_halt();
+
+#ifdef CONFIG_SMP
+        preempt_disable();
+        smp_send_stop();
+#endif
+        local_irq_disable();
+        while (1);
 }
 
 void machine_power_off(void)
 {
         if (pm_power_off)
                 pm_power_off();
+
+#ifdef CONFIG_SMP
+        preempt_disable();
+        smp_send_stop();
+#endif
+        local_irq_disable();
+        while (1);
 }
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 058929041368..be73c491182b 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -31,6 +31,7 @@
 #include <asm/bootinfo.h>
 #include <asm/bugs.h>
 #include <asm/cache.h>
+#include <asm/cdmm.h>
 #include <asm/cpu.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
@@ -763,6 +764,7 @@ void __init setup_arch(char **cmdline_p)
         cpu_probe();
         prom_init();
 
+        setup_early_fdc_console();
 #ifdef CONFIG_EARLY_PRINTK
         setup_early_printk();
 #endif
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index bed7590e475f..d5589bedd0a4 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -88,6 +88,12 @@ static void __init cps_smp_setup(void)
 
         /* Make core 0 coherent with everything */
         write_gcr_cl_coherence(0xff);
+
+#ifdef CONFIG_MIPS_MT_FPAFF
+        /* If we have an FPU, enroll ourselves in the FPU-full mask */
+        if (cpu_has_fpu)
+                cpu_set(0, mt_fpu_cpumask);
+#endif /* CONFIG_MIPS_MT_FPAFF */
 }
 
 static void __init cps_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 1c0d8c50b7e1..5b020bda3e05 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -176,10 +176,8 @@ static void stop_this_cpu(void *dummy)
          * Remove this CPU:
          */
         set_cpu_online(smp_processor_id(), false);
-        for (;;) {
-                if (cpu_wait)
-                        (*cpu_wait)();          /* Wait if available. */
-        }
+        local_irq_disable();
+        while (1);
 }
 
 void smp_send_stop(void)
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 5b4d711f878d..e334c641a81b 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -12,6 +12,7 @@
  * Copyright (C) 2000, 2001, 2012 MIPS Technologies, Inc.  All rights reserved.
  * Copyright (C) 2014, Imagination Technologies Ltd.
  */
+#include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
 #include <linux/context_tracking.h>
@@ -699,36 +700,60 @@ asmlinkage void do_ov(struct pt_regs *regs)
         exception_exit(prev_state);
 }
 
-int process_fpemu_return(int sig, void __user *fault_addr)
+int process_fpemu_return(int sig, void __user *fault_addr, unsigned long fcr31)
 {
-        /*
-         * We can't allow the emulated instruction to leave any of the cause
-         * bits set in FCSR. If they were then the kernel would take an FP
-         * exception when restoring FP context.
-         */
-        current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
+        struct siginfo si = { 0 };
+
+        switch (sig) {
+        case 0:
+                return 0;
 
-        if (sig == SIGSEGV || sig == SIGBUS) {
-                struct siginfo si = {0};
+        case SIGFPE:
                 si.si_addr = fault_addr;
                 si.si_signo = sig;
-                if (sig == SIGSEGV) {
-                        down_read(&current->mm->mmap_sem);
-                        if (find_vma(current->mm, (unsigned long)fault_addr))
-                                si.si_code = SEGV_ACCERR;
-                        else
-                                si.si_code = SEGV_MAPERR;
-                        up_read(&current->mm->mmap_sem);
-                } else {
-                        si.si_code = BUS_ADRERR;
-                }
+                /*
+                 * Inexact can happen together with Overflow or Underflow.
+                 * Respect the mask to deliver the correct exception.
+                 */
+                fcr31 &= (fcr31 & FPU_CSR_ALL_E) <<
+                         (ffs(FPU_CSR_ALL_X) - ffs(FPU_CSR_ALL_E));
+                if (fcr31 & FPU_CSR_INV_X)
+                        si.si_code = FPE_FLTINV;
+                else if (fcr31 & FPU_CSR_DIV_X)
+                        si.si_code = FPE_FLTDIV;
+                else if (fcr31 & FPU_CSR_OVF_X)
+                        si.si_code = FPE_FLTOVF;
+                else if (fcr31 & FPU_CSR_UDF_X)
+                        si.si_code = FPE_FLTUND;
+                else if (fcr31 & FPU_CSR_INE_X)
+                        si.si_code = FPE_FLTRES;
+                else
+                        si.si_code = __SI_FAULT;
+                force_sig_info(sig, &si, current);
+                return 1;
+
+        case SIGBUS:
+                si.si_addr = fault_addr;
+                si.si_signo = sig;
+                si.si_code = BUS_ADRERR;
+                force_sig_info(sig, &si, current);
+                return 1;
+
+        case SIGSEGV:
+                si.si_addr = fault_addr;
+                si.si_signo = sig;
+                down_read(&current->mm->mmap_sem);
+                if (find_vma(current->mm, (unsigned long)fault_addr))
+                        si.si_code = SEGV_ACCERR;
+                else
+                        si.si_code = SEGV_MAPERR;
+                up_read(&current->mm->mmap_sem);
                 force_sig_info(sig, &si, current);
                 return 1;
-        } else if (sig) {
+
+        default:
                 force_sig(sig, current);
                 return 1;
-        } else {
-                return 0;
         }
 }
 
@@ -736,7 +761,8 @@ static int simulate_fp(struct pt_regs *regs, unsigned int opcode,
                        unsigned long old_epc, unsigned long old_ra)
 {
         union mips_instruction inst = { .word = opcode };
-        void __user *fault_addr = NULL;
+        void __user *fault_addr;
+        unsigned long fcr31;
         int sig;
 
         /* If it's obviously not an FP instruction, skip it */
@@ -766,13 +792,20 @@ static int simulate_fp(struct pt_regs *regs, unsigned int opcode,
         /* Run the emulator */
         sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1,
                                        &fault_addr);
+        fcr31 = current->thread.fpu.fcr31;
 
-        /* If something went wrong, signal */
-        process_fpemu_return(sig, fault_addr);
+        /*
+         * We can't allow the emulated instruction to leave any of
+         * the cause bits set in $fcr31.
+         */
+        current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
 
         /* Restore the hardware register state */
         own_fpu(1);
 
+        /* Send a signal if required.  */
+        process_fpemu_return(sig, fault_addr, fcr31);
+
         return 0;
 }
 
@@ -782,7 +815,8 @@ static int simulate_fp(struct pt_regs *regs, unsigned int opcode,
 asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
 {
         enum ctx_state prev_state;
-        siginfo_t info = {0};
+        void __user *fault_addr;
+        int sig;
 
         prev_state = exception_enter();
         if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs),
@@ -796,9 +830,6 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
         die_if_kernel("FP exception in kernel code", regs);
 
         if (fcr31 & FPU_CSR_UNI_X) {
-                int sig;
-                void __user *fault_addr = NULL;
-
                 /*
                  * Unimplemented operation exception.  If we've got the full
                  * software emulator on-board, let's use it...
@@ -815,30 +846,23 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
                 /* Run the emulator */
                 sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1,
                                                &fault_addr);
+                fcr31 = current->thread.fpu.fcr31;
 
-                /* If something went wrong, signal */
-                process_fpemu_return(sig, fault_addr);
+                /*
+                 * We can't allow the emulated instruction to leave any of
+                 * the cause bits set in $fcr31.
+                 */
+                current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
 
                 /* Restore the hardware register state */
                 own_fpu(1);     /* Using the FPU again.  */
+        } else {
+                sig = SIGFPE;
+                fault_addr = (void __user *) regs->cp0_epc;
+        }
 
-                goto out;
-        } else if (fcr31 & FPU_CSR_INV_X)
-                info.si_code = FPE_FLTINV;
-        else if (fcr31 & FPU_CSR_DIV_X)
-                info.si_code = FPE_FLTDIV;
-        else if (fcr31 & FPU_CSR_OVF_X)
-                info.si_code = FPE_FLTOVF;
-        else if (fcr31 & FPU_CSR_UDF_X)
-                info.si_code = FPE_FLTUND;
-        else if (fcr31 & FPU_CSR_INE_X)
-                info.si_code = FPE_FLTRES;
-        else
-                info.si_code = __SI_FAULT;
-        info.si_signo = SIGFPE;
-        info.si_errno = 0;
-        info.si_addr = (void __user *) regs->cp0_epc;
-        force_sig_info(SIGFPE, &info, current);
+        /* Send a signal if required.  */
+        process_fpemu_return(sig, fault_addr, fcr31);
 
 out:
         exception_exit(prev_state);
@@ -885,9 +909,9 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
                 break;
         case BRK_MEMU:
                 /*
-                 * Address errors may be deliberately induced by the FPU
-                 * emulator to retake control of the CPU after executing the
-                 * instruction in the delay slot of an emulated branch.
+                 * This breakpoint code is used by the FPU emulator to retake
+                 * control of the CPU after executing the instruction from the
+                 * delay slot of an emulated branch.
                  *
                  * Terminate if exception was recognized as a delay slot return
                  * otherwise handle as normal.
@@ -907,10 +931,9 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
 
 asmlinkage void do_bp(struct pt_regs *regs)
 {
+        unsigned long epc = msk_isa16_mode(exception_epc(regs));
         unsigned int opcode, bcode;
         enum ctx_state prev_state;
-        unsigned long epc;
-        u16 instr[2];
         mm_segment_t seg;
 
         seg = get_fs();
@@ -919,26 +942,28 @@ asmlinkage void do_bp(struct pt_regs *regs)
 
         prev_state = exception_enter();
         if (get_isa16_mode(regs->cp0_epc)) {
-                /* Calculate EPC. */
-                epc = exception_epc(regs);
-                if (cpu_has_mmips) {
-                        if ((__get_user(instr[0], (u16 __user *)msk_isa16_mode(epc)) ||
-                            (__get_user(instr[1], (u16 __user *)msk_isa16_mode(epc + 2)))))
-                                goto out_sigsegv;
-                        opcode = (instr[0] << 16) | instr[1];
-                } else {
+                u16 instr[2];
+
+                if (__get_user(instr[0], (u16 __user *)epc))
+                        goto out_sigsegv;
+
+                if (!cpu_has_mmips) {
                         /* MIPS16e mode */
-                        if (__get_user(instr[0],
-                                       (u16 __user *)msk_isa16_mode(epc)))
+                        bcode = (instr[0] >> 5) & 0x3f;
+                } else if (mm_insn_16bit(instr[0])) {
+                        /* 16-bit microMIPS BREAK */
+                        bcode = instr[0] & 0xf;
+                } else {
+                        /* 32-bit microMIPS BREAK */
+                        if (__get_user(instr[1], (u16 __user *)(epc + 2)))
                                 goto out_sigsegv;
-                        bcode = (instr[0] >> 6) & 0x3f;
-                        do_trap_or_bp(regs, bcode, "Break");
-                        goto out;
+                        opcode = (instr[0] << 16) | instr[1];
+                        bcode = (opcode >> 6) & ((1 << 20) - 1);
                 }
         } else {
-                if (__get_user(opcode,
-                               (unsigned int __user *) exception_epc(regs)))
+                if (__get_user(opcode, (unsigned int __user *)epc))
                         goto out_sigsegv;
+                bcode = (opcode >> 6) & ((1 << 20) - 1);
         }
 
         /*
@@ -947,9 +972,8 @@ asmlinkage void do_bp(struct pt_regs *regs)
          * Gas is bug-compatible, but not always, grrr...
          * We handle both cases with a simple heuristics.  --macro
          */
-        bcode = ((opcode >> 6) & ((1 << 20) - 1));
         if (bcode >= (1 << 10))
-                bcode >>= 10;
+                bcode = ((bcode & ((1 << 10) - 1)) << 10) | (bcode >> 10);
 
         /*
          * notify the kprobe handlers, if instruction is likely to
@@ -1039,22 +1063,24 @@ asmlinkage void do_ri(struct pt_regs *regs)
          * as quickly as possible.
          */
         if (mipsr2_emulation && cpu_has_mips_r6 &&
-            likely(user_mode(regs))) {
-                if (likely(get_user(opcode, epc) >= 0)) {
-                        status = mipsr2_decoder(regs, opcode);
-                        switch (status) {
-                        case 0:
-                        case SIGEMT:
-                                task_thread_info(current)->r2_emul_return = 1;
-                                return;
-                        case SIGILL:
-                                goto no_r2_instr;
-                        default:
-                                process_fpemu_return(status,
-                                                     &current->thread.cp0_baduaddr);
-                                task_thread_info(current)->r2_emul_return = 1;
-                                return;
-                        }
+            likely(user_mode(regs)) &&
+            likely(get_user(opcode, epc) >= 0)) {
+                unsigned long fcr31 = 0;
+
+                status = mipsr2_decoder(regs, opcode, &fcr31);
+                switch (status) {
+                case 0:
+                case SIGEMT:
+                        task_thread_info(current)->r2_emul_return = 1;
+                        return;
+                case SIGILL:
+                        goto no_r2_instr;
+                default:
+                        process_fpemu_return(status,
+                                             &current->thread.cp0_baduaddr,
+                                             fcr31);
+                        task_thread_info(current)->r2_emul_return = 1;
+                        return;
                 }
         }
 
@@ -1299,10 +1325,13 @@ asmlinkage void do_cpu(struct pt_regs *regs)
         enum ctx_state prev_state;
         unsigned int __user *epc;
         unsigned long old_epc, old31;
+        void __user *fault_addr;
         unsigned int opcode;
+        unsigned long fcr31;
         unsigned int cpid;
         int status, err;
         unsigned long __maybe_unused flags;
+        int sig;
 
         prev_state = exception_enter();
         cpid = (regs->cp0_cause >> CAUSEB_CE) & 3;
@@ -1319,7 +1348,7 @@ asmlinkage void do_cpu(struct pt_regs *regs)
                 status = -1;
 
                 if (unlikely(compute_return_epc(regs) < 0))
-                        goto out;
+                        break;
 
                 if (get_isa16_mode(regs->cp0_epc)) {
                         unsigned short mmop[2] = { 0 };
@@ -1352,49 +1381,54 @@ asmlinkage void do_cpu(struct pt_regs *regs)
                         force_sig(status, current);
                 }
 
-                goto out;
+                break;
 
         case 3:
                 /*
-                 * Old (MIPS I and MIPS II) processors will set this code
-                 * for COP1X opcode instructions that replaced the original
-                 * COP3 space.  We don't limit COP1 space instructions in
-                 * the emulator according to the CPU ISA, so we want to
-                 * treat COP1X instructions consistently regardless of which
-                 * code the CPU chose.  Therefore we redirect this trap to
-                 * the FP emulator too.
-                 *
-                 * Then some newer FPU-less processors use this code
-                 * erroneously too, so they are covered by this choice
-                 * as well.
+                 * The COP3 opcode space and consequently the CP0.Status.CU3
+                 * bit and the CP0.Cause.CE=3 encoding have been removed as
+                 * of the MIPS III ISA.  From the MIPS IV and MIPS32r2 ISAs
+                 * up the space has been reused for COP1X instructions, that
+                 * are enabled by the CP0.Status.CU1 bit and consequently
+                 * use the CP0.Cause.CE=1 encoding for Coprocessor Unusable
+                 * exceptions.  Some FPU-less processors that implement one
+                 * of these ISAs however use this code erroneously for COP1X
+                 * instructions.  Therefore we redirect this trap to the FP
+                 * emulator too.
                  */
-                if (raw_cpu_has_fpu)
+                if (raw_cpu_has_fpu || !cpu_has_mips_4_5_64_r2_r6) {
+                        force_sig(SIGILL, current);
                         break;
+                }
                 /* Fall through.  */
 
         case 1:
                 err = enable_restore_fp_context(0);
 
-                if (!raw_cpu_has_fpu || err) {
-                        int sig;
-                        void __user *fault_addr = NULL;
-                        sig = fpu_emulator_cop1Handler(regs,
-                                                       &current->thread.fpu,
-                                                       0, &fault_addr);
-                        if (!process_fpemu_return(sig, fault_addr) && !err)
-                                mt_ase_fp_affinity();
-                }
+                if (raw_cpu_has_fpu && !err)
+                        break;
 
-                goto out;
+                sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 0,
+                                               &fault_addr);
+                fcr31 = current->thread.fpu.fcr31;
+
+                /*
+                 * We can't allow the emulated instruction to leave
+                 * any of the cause bits set in $fcr31.
+                 */
+                current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
+
+                /* Send a signal if required.  */
+                if (!process_fpemu_return(sig, fault_addr, fcr31) && !err)
+                        mt_ase_fp_affinity();
+
+                break;
 
         case 2:
                 raw_notifier_call_chain(&cu2_chain, CU2_EXCEPTION, regs);
-                goto out;
+                break;
         }
 
-        force_sig(SIGILL, current);
-
-out:
         exception_exit(prev_state);
 }
 
@@ -1984,6 +2018,12 @@ int cp0_compare_irq_shift;
 int cp0_perfcount_irq;
 EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
 
+/*
+ * Fast debug channel IRQ or -1 if not present
+ */
+int cp0_fdc_irq;
+EXPORT_SYMBOL_GPL(cp0_fdc_irq);
+
 static int noulri;
 
 static int __init ulri_disable(char *s)
@@ -2065,17 +2105,21 @@ void per_cpu_trap_init(bool is_boot_cpu)
          *
          *  o read IntCtl.IPTI to determine the timer interrupt
          *  o read IntCtl.IPPCI to determine the performance counter interrupt
+         *  o read IntCtl.IPFDC to determine the fast debug channel interrupt
          */
         if (cpu_has_mips_r2_r6) {
                 cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
                 cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
                 cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
-                if (cp0_perfcount_irq == cp0_compare_irq)
-                        cp0_perfcount_irq = -1;
+                cp0_fdc_irq = (read_c0_intctl() >> INTCTLB_IPFDC) & 7;
+                if (!cp0_fdc_irq)
+                        cp0_fdc_irq = -1;
+
         } else {
                 cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
                 cp0_compare_irq_shift = CP0_LEGACY_PERFCNT_IRQ;
                 cp0_perfcount_irq = -1;
+                cp0_fdc_irq = -1;
         }
 
         if (!cpu_data[cpu].asid_cache)
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index bbb69695a0a1..af84bef0c90d 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -89,8 +89,6 @@
 #include <asm/fpu_emulator.h>
 #include <asm/inst.h>
 #include <asm/uaccess.h>
-#include <asm/fpu.h>
-#include <asm/fpu_emulator.h>
 
 #define STR(x)  __STR(x)
 #define __STR(x)  #x
@@ -109,10 +107,11 @@ static u32 unaligned_action;
 extern void show_registers(struct pt_regs *regs);
 
 #ifdef __BIG_ENDIAN
-#define     LoadHW(addr, value, res)  \
+#define     _LoadHW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (".set\tnoat\n"        \
-                        "1:\t"user_lb("%0", "0(%2)")"\n"    \
-                        "2:\t"user_lbu("$1", "1(%2)")"\n\t" \
+                        "1:\t"type##_lb("%0", "0(%2)")"\n"  \
+                        "2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -127,13 +126,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadW(addr, value, res)   \
+#define     _LoadW(addr, value, res, type)   \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_lwl("%0", "(%2)")"\n"    \
-                        "2:\t"user_lwr("%0", "3(%2)")"\n\t" \
+                        "1:\t"type##_lwl("%0", "(%2)")"\n"   \
+                        "2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
                         "li\t%1, 0\n"                       \
                         "3:\n\t"                            \
                         ".insn\n\t"                         \
@@ -146,21 +147,24 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has no lwl instruction */
-#define     LoadW(addr, value, res) \
+#define     _LoadW(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n"                      \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_lb("%0", "0(%2)")"\n\t"    \
-                        "2:"user_lbu("$1", "1(%2)")"\n\t"   \
+                        "1:"type##_lb("%0", "0(%2)")"\n\t"  \
+                        "2:"type##_lbu("$1", "1(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "3:"user_lbu("$1", "2(%2)")"\n\t"   \
+                        "3:"type##_lbu("$1", "2(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "4:"user_lbu("$1", "3(%2)")"\n\t"   \
+                        "4:"type##_lbu("$1", "3(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -178,14 +182,17 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t4b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
-#define     LoadHWU(addr, value, res) \
+#define     _LoadHWU(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tnoat\n"                      \
-                        "1:\t"user_lbu("%0", "0(%2)")"\n"   \
-                        "2:\t"user_lbu("$1", "1(%2)")"\n\t" \
+                        "1:\t"type##_lbu("%0", "0(%2)")"\n" \
+                        "2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -201,13 +208,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadWU(addr, value, res)  \
+#define     _LoadWU(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_lwl("%0", "(%2)")"\n"    \
-                        "2:\t"user_lwr("%0", "3(%2)")"\n\t" \
+                        "1:\t"type##_lwl("%0", "(%2)")"\n"  \
+                        "2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
                         "dsll\t%0, %0, 32\n\t"              \
                         "dsrl\t%0, %0, 32\n\t"              \
                         "li\t%1, 0\n"                       \
@@ -222,9 +231,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         "1:\tldl\t%0, (%2)\n"               \
                         "2:\tldr\t%0, 7(%2)\n\t"            \
@@ -240,21 +251,24 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has not lwl and ldl instructions */
-#define     LoadWU(addr, value, res) \
+#define     _LoadWU(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_lbu("%0", "0(%2)")"\n\t"   \
-                        "2:"user_lbu("$1", "1(%2)")"\n\t"   \
+                        "1:"type##_lbu("%0", "0(%2)")"\n\t" \
+                        "2:"type##_lbu("$1", "1(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "3:"user_lbu("$1", "2(%2)")"\n\t"   \
+                        "3:"type##_lbu("$1", "2(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "4:"user_lbu("$1", "3(%2)")"\n\t"   \
+                        "4:"type##_lbu("$1", "3(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -272,9 +286,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t4b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
@@ -319,16 +335,19 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t8b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 
-#define     StoreHW(addr, value, res) \
+#define     _StoreHW(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tnoat\n"                      \
-                        "1:\t"user_sb("%1", "1(%2)")"\n"    \
+                        "1:\t"type##_sb("%1", "1(%2)")"\n"  \
                         "srl\t$1, %1, 0x8\n"                \
-                        "2:\t"user_sb("$1", "0(%2)")"\n"    \
+                        "2:\t"type##_sb("$1", "0(%2)")"\n"  \
                         ".set\tat\n\t"                      \
                         "li\t%0, 0\n"                       \
                         "3:\n\t"                            \
@@ -342,13 +361,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=r" (res)                        \
-                        : "r" (value), "r" (addr), "i" (-EFAULT));
+                        : "r" (value), "r" (addr), "i" (-EFAULT));\
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_swl("%1", "(%2)")"\n"    \
-                        "2:\t"user_swr("%1", "3(%2)")"\n\t" \
+                        "1:\t"type##_swl("%1", "(%2)")"\n"  \
+                        "2:\t"type##_swr("%1", "3(%2)")"\n\t"\
                         "li\t%0, 0\n"                       \
                         "3:\n\t"                            \
                         ".insn\n\t"                         \
@@ -361,9 +382,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                 : "=r" (res)                                \
-                : "r" (value), "r" (addr), "i" (-EFAULT));
+                : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         "1:\tsdl\t%1,(%2)\n"                \
                         "2:\tsdr\t%1, 7(%2)\n\t"            \
@@ -379,20 +402,23 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                 : "=r" (res)                                \
-                : "r" (value), "r" (addr), "i" (-EFAULT));
+                : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
+
 #else
 /* MIPSR6 has no swl and sdl instructions */
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_sb("%1", "3(%2)")"\n\t"    \
+                        "1:"type##_sb("%1", "3(%2)")"\n\t"  \
                         "srl\t$1, %1, 0x8\n\t"              \
-                        "2:"user_sb("$1", "2(%2)")"\n\t"    \
+                        "2:"type##_sb("$1", "2(%2)")"\n\t"  \
                         "srl\t$1, $1,  0x8\n\t"             \
-                        "3:"user_sb("$1", "1(%2)")"\n\t"    \
+                        "3:"type##_sb("$1", "1(%2)")"\n\t"  \
                         "srl\t$1, $1, 0x8\n\t"              \
-                        "4:"user_sb("$1", "0(%2)")"\n\t"    \
+                        "4:"type##_sb("$1", "0(%2)")"\n\t"  \
                         ".set\tpop\n\t"                     \
                         "li\t%0, 0\n"                       \
                         "10:\n\t"                           \
@@ -409,9 +435,11 @@ extern void show_registers(struct pt_regs *regs);
                         ".previous"                         \
                 : "=&r" (res)                               \
                 : "r" (value), "r" (addr), "i" (-EFAULT)    \
-                : "memory");
+                : "memory");                                \
+} while(0)
 
 #define     StoreDW(addr, value, res) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
@@ -451,15 +479,18 @@ extern void show_registers(struct pt_regs *regs);
                         ".previous"                         \
                 : "=&r" (res)                               \
                 : "r" (value), "r" (addr), "i" (-EFAULT)    \
-                : "memory");
+                : "memory");                                \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 #else /* __BIG_ENDIAN */
 
-#define     LoadHW(addr, value, res)  \
+#define     _LoadHW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (".set\tnoat\n"        \
-                        "1:\t"user_lb("%0", "1(%2)")"\n"    \
-                        "2:\t"user_lbu("$1", "0(%2)")"\n\t" \
+                        "1:\t"type##_lb("%0", "1(%2)")"\n"  \
+                        "2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -474,13 +505,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadW(addr, value, res)   \
+#define     _LoadW(addr, value, res, type)   \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_lwl("%0", "3(%2)")"\n"   \
-                        "2:\t"user_lwr("%0", "(%2)")"\n\t"  \
+                        "1:\t"type##_lwl("%0", "3(%2)")"\n" \
+                        "2:\t"type##_lwr("%0", "(%2)")"\n\t"\
                         "li\t%1, 0\n"                       \
                         "3:\n\t"                            \
                         ".insn\n\t"                         \
@@ -493,21 +526,24 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has no lwl instruction */
-#define     LoadW(addr, value, res) \
+#define     _LoadW(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n"                      \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_lb("%0", "3(%2)")"\n\t"    \
-                        "2:"user_lbu("$1", "2(%2)")"\n\t"   \
+                        "1:"type##_lb("%0", "3(%2)")"\n\t"  \
+                        "2:"type##_lbu("$1", "2(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "3:"user_lbu("$1", "1(%2)")"\n\t"   \
+                        "3:"type##_lbu("$1", "1(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "4:"user_lbu("$1", "0(%2)")"\n\t"   \
+                        "4:"type##_lbu("$1", "0(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -525,15 +561,18 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t4b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 
 
-#define     LoadHWU(addr, value, res) \
+#define     _LoadHWU(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tnoat\n"                      \
-                        "1:\t"user_lbu("%0", "1(%2)")"\n"   \
-                        "2:\t"user_lbu("$1", "0(%2)")"\n\t" \
+                        "1:\t"type##_lbu("%0", "1(%2)")"\n" \
+                        "2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -549,13 +588,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
 #ifndef CONFIG_CPU_MIPSR6
-#define     LoadWU(addr, value, res)  \
+#define     _LoadWU(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_lwl("%0", "3(%2)")"\n"   \
-                        "2:\t"user_lwr("%0", "(%2)")"\n\t"  \
+                        "1:\t"type##_lwl("%0", "3(%2)")"\n" \
+                        "2:\t"type##_lwr("%0", "(%2)")"\n\t"\
                         "dsll\t%0, %0, 32\n\t"              \
                         "dsrl\t%0, %0, 32\n\t"              \
                         "li\t%1, 0\n"                       \
@@ -570,9 +611,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         "1:\tldl\t%0, 7(%2)\n"              \
                         "2:\tldr\t%0, (%2)\n\t"             \
@@ -588,21 +631,24 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
+
 #else
 /* MIPSR6 has not lwl and ldl instructions */
-#define     LoadWU(addr, value, res) \
+#define     _LoadWU(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_lbu("%0", "3(%2)")"\n\t"   \
-                        "2:"user_lbu("$1", "2(%2)")"\n\t"   \
+                        "1:"type##_lbu("%0", "3(%2)")"\n\t" \
+                        "2:"type##_lbu("$1", "2(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "3:"user_lbu("$1", "1(%2)")"\n\t"   \
+                        "3:"type##_lbu("$1", "1(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
-                        "4:"user_lbu("$1", "0(%2)")"\n\t"   \
+                        "4:"type##_lbu("$1", "0(%2)")"\n\t" \
                         "sll\t%0, 0x8\n\t"                  \
                         "or\t%0, $1\n\t"                    \
                         "li\t%1, 0\n"                       \
@@ -620,9 +666,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t4b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 
-#define     LoadDW(addr, value, res)  \
+#define     _LoadDW(addr, value, res)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
@@ -667,15 +715,17 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t8b, 11b\n\t"             \
                         ".previous"                         \
                         : "=&r" (value), "=r" (res)         \
-                        : "r" (addr), "i" (-EFAULT));
+                        : "r" (addr), "i" (-EFAULT));       \
+} while(0)
 #endif /* CONFIG_CPU_MIPSR6 */
 
-#define     StoreHW(addr, value, res) \
+#define     _StoreHW(addr, value, res, type) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tnoat\n"                      \
-                        "1:\t"user_sb("%1", "0(%2)")"\n"    \
+                        "1:\t"type##_sb("%1", "0(%2)")"\n"  \
                         "srl\t$1,%1, 0x8\n"                 \
-                        "2:\t"user_sb("$1", "1(%2)")"\n"    \
+                        "2:\t"type##_sb("$1", "1(%2)")"\n"  \
                         ".set\tat\n\t"                      \
                         "li\t%0, 0\n"                       \
                         "3:\n\t"                            \
@@ -689,12 +739,15 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                         : "=r" (res)                        \
-                        : "r" (value), "r" (addr), "i" (-EFAULT));
+                        : "r" (value), "r" (addr), "i" (-EFAULT));\
+} while(0)
+
 #ifndef CONFIG_CPU_MIPSR6
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
-                        "1:\t"user_swl("%1", "3(%2)")"\n"   \
-                        "2:\t"user_swr("%1", "(%2)")"\n\t"  \
+                        "1:\t"type##_swl("%1", "3(%2)")"\n" \
+                        "2:\t"type##_swr("%1", "(%2)")"\n\t"\
                         "li\t%0, 0\n"                       \
                         "3:\n\t"                            \
                         ".insn\n\t"                         \
@@ -707,9 +760,11 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                 : "=r" (res)                                \
-                : "r" (value), "r" (addr), "i" (-EFAULT));
+                : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         "1:\tsdl\t%1, 7(%2)\n"              \
                         "2:\tsdr\t%1, (%2)\n\t"             \
@@ -725,20 +780,23 @@ extern void show_registers(struct pt_regs *regs);
                         STR(PTR)"\t2b, 4b\n\t"              \
                         ".previous"                         \
                 : "=r" (res)                                \
-                : "r" (value), "r" (addr), "i" (-EFAULT));
+                : "r" (value), "r" (addr), "i" (-EFAULT));  \
+} while(0)
+
 #else
 /* MIPSR6 has no swl and sdl instructions */
-#define     StoreW(addr, value, res)  \
+#define     _StoreW(addr, value, res, type)  \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
-                        "1:"user_sb("%1", "0(%2)")"\n\t"    \
+                        "1:"type##_sb("%1", "0(%2)")"\n\t"  \
                         "srl\t$1, %1, 0x8\n\t"              \
-                        "2:"user_sb("$1", "1(%2)")"\n\t"    \
+                        "2:"type##_sb("$1", "1(%2)")"\n\t"  \
                         "srl\t$1, $1,  0x8\n\t"             \
-                        "3:"user_sb("$1", "2(%2)")"\n\t"    \
+                        "3:"type##_sb("$1", "2(%2)")"\n\t"  \
                         "srl\t$1, $1, 0x8\n\t"              \
-                        "4:"user_sb("$1", "3(%2)")"\n\t"    \
+                        "4:"type##_sb("$1", "3(%2)")"\n\t"  \
                         ".set\tpop\n\t"                     \
                         "li\t%0, 0\n"                       \
                         "10:\n\t"                           \
@@ -755,9 +813,11 @@ extern void show_registers(struct pt_regs *regs);
                         ".previous"                         \
                 : "=&r" (res)                               \
                 : "r" (value), "r" (addr), "i" (-EFAULT)    \
-                : "memory");
+                : "memory");                                \
+} while(0)
 
-#define     StoreDW(addr, value, res) \
+#define     _StoreDW(addr, value, res) \
+do {                                                        \
                 __asm__ __volatile__ (                      \
                         ".set\tpush\n\t"                    \
                         ".set\tnoat\n\t"                    \
@@ -797,10 +857,28 @@ extern void show_registers(struct pt_regs *regs);
                         ".previous"                         \
                 : "=&r" (res)                               \
                 : "r" (value), "r" (addr), "i" (-EFAULT)    \
-                : "memory");
+                : "memory");                                \
+} while(0)
+
 #endif /* CONFIG_CPU_MIPSR6 */
 #endif
 
+#define LoadHWU(addr, value, res)       _LoadHWU(addr, value, res, kernel)
+#define LoadHWUE(addr, value, res)      _LoadHWU(addr, value, res, user)
+#define LoadWU(addr, value, res)        _LoadWU(addr, value, res, kernel)
+#define LoadWUE(addr, value, res)       _LoadWU(addr, value, res, user)
+#define LoadHW(addr, value, res)        _LoadHW(addr, value, res, kernel)
+#define LoadHWE(addr, value, res)       _LoadHW(addr, value, res, user)
+#define LoadW(addr, value, res)         _LoadW(addr, value, res, kernel)
+#define LoadWE(addr, value, res)        _LoadW(addr, value, res, user)
+#define LoadDW(addr, value, res)        _LoadDW(addr, value, res)
+
+#define StoreHW(addr, value, res)       _StoreHW(addr, value, res, kernel)
+#define StoreHWE(addr, value, res)      _StoreHW(addr, value, res, user)
+#define StoreW(addr, value, res)        _StoreW(addr, value, res, kernel)
+#define StoreWE(addr, value, res)       _StoreW(addr, value, res, user)
+#define StoreDW(addr, value, res)       _StoreDW(addr, value, res)
+
 static void emulate_load_store_insn(struct pt_regs *regs,
         void __user *addr, unsigned int __user *pc)
 {
@@ -872,7 +950,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                 set_fs(seg);
                                 goto sigbus;
                         }
-                        LoadHW(addr, value, res);
+                        LoadHWE(addr, value, res);
                         if (res) {
                                 set_fs(seg);
                                 goto fault;
@@ -885,7 +963,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                 set_fs(seg);
                                 goto sigbus;
                         }
-                                LoadW(addr, value, res);
+                                LoadWE(addr, value, res);
                         if (res) {
                                 set_fs(seg);
                                 goto fault;
@@ -898,7 +976,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                                 set_fs(seg);
                                 goto sigbus;
                         }
-                        LoadHWU(addr, value, res);
+                        LoadHWUE(addr, value, res);
                         if (res) {
                                 set_fs(seg);
                                 goto fault;
@@ -913,7 +991,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                         }
                         compute_return_epc(regs);
                         value = regs->regs[insn.spec3_format.rt];
-                        StoreHW(addr, value, res);
+                        StoreHWE(addr, value, res);
                         if (res) {
                                 set_fs(seg);
                                 goto fault;
@@ -926,7 +1004,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                         }
                         compute_return_epc(regs);
                         value = regs->regs[insn.spec3_format.rt];
-                        StoreW(addr, value, res);
+                        StoreWE(addr, value, res);
                         if (res) {
                                 set_fs(seg);
                                 goto fault;
@@ -943,7 +1021,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                 if (!access_ok(VERIFY_READ, addr, 2))
                         goto sigbus;
 
-                LoadHW(addr, value, res);
+                if (config_enabled(CONFIG_EVA)) {
+                        if (segment_eq(get_fs(), get_ds()))
+                                LoadHW(addr, value, res);
+                        else
+                                LoadHWE(addr, value, res);
+                } else {
+                        LoadHW(addr, value, res);
+                }
+
                 if (res)
                         goto fault;
                 compute_return_epc(regs);
@@ -954,7 +1040,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                 if (!access_ok(VERIFY_READ, addr, 4))
                         goto sigbus;
 
-                LoadW(addr, value, res);
+                if (config_enabled(CONFIG_EVA)) {
+                        if (segment_eq(get_fs(), get_ds()))
+                                LoadW(addr, value, res);
+                        else
+                                LoadWE(addr, value, res);
+                } else {
+                        LoadW(addr, value, res);
+                }
+
                 if (res)
                         goto fault;
                 compute_return_epc(regs);
@@ -965,7 +1059,15 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                 if (!access_ok(VERIFY_READ, addr, 2))
                         goto sigbus;
 
-                LoadHWU(addr, value, res);
+                if (config_enabled(CONFIG_EVA)) {
+                        if (segment_eq(get_fs(), get_ds()))
+                                LoadHWU(addr, value, res);
+                        else
+                                LoadHWUE(addr, value, res);
+                } else {
+                        LoadHWU(addr, value, res);
+                }
+
                 if (res)
                         goto fault;
                 compute_return_epc(regs);
@@ -1024,7 +1126,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
 
                 compute_return_epc(regs);
                 value = regs->regs[insn.i_format.rt];
-                StoreHW(addr, value, res);
+
+                if (config_enabled(CONFIG_EVA)) {
+                        if (segment_eq(get_fs(), get_ds()))
+                                StoreHW(addr, value, res);
+                        else
+                                StoreHWE(addr, value, res);
+                } else {
+                        StoreHW(addr, value, res);
+                }
+
                 if (res)
                         goto fault;
                 break;
@@ -1035,7 +1146,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
 
                 compute_return_epc(regs);
                 value = regs->regs[insn.i_format.rt];
-                StoreW(addr, value, res);
+
+                if (config_enabled(CONFIG_EVA)) {
+                        if (segment_eq(get_fs(), get_ds()))
+                                StoreW(addr, value, res);
+                        else
+                                StoreWE(addr, value, res);
+                } else {
+                        StoreW(addr, value, res);
+                }
+
                 if (res)
                         goto fault;
                 break;
@@ -1076,7 +1196,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                 own_fpu(1);     /* Restore FPU state. */
 
                 /* Signal if something went wrong. */
-                process_fpemu_return(res, fault_addr);
+                process_fpemu_return(res, fault_addr, 0);
 
                 if (res == 0)
                         break;
@@ -1511,7 +1631,7 @@ fpu_emul:
                 own_fpu(1);     /* restore FPU state */
 
                 /* If something went wrong, signal */
-                process_fpemu_return(res, fault_addr);
+                process_fpemu_return(res, fault_addr, 0);
 
                 if (res == 0)
                         goto success;
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 39ab3e786e59..0db099ecc016 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -41,7 +41,7 @@ int ltq_soc_type(void)
         return soc_info.type;
 }
 
-void prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
 }
 
diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index 696cd57f6f13..d001bc38908a 100644
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -61,7 +61,6 @@ static struct platform_driver vmmc_driver = {
         .probe = vmmc_probe,
         .driver = {
                 .name = "lantiq,vmmc",
-                .owner = THIS_MODULE,
                 .of_match_table = vmmc_match,
         },
 };
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index cf9b4633257e..a57959e648a6 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -53,21 +53,6 @@ int proc_dolasatstring(struct ctl_table *table, int write,
         return 0;
 }
 
-/* proc function to write EEPROM after changing int entry */
-int proc_dolasatint(struct ctl_table *table, int write,
-                       void *buffer, size_t *lenp, loff_t *ppos)
-{
-        int r;
-
-        r = proc_dointvec(table, write, buffer, lenp, ppos);
-        if ((!write) || r)
-                return r;
-
-        lasat_write_eeprom_info();
-
-        return 0;
-}
-
 #ifdef CONFIG_DS1603
 static int rtctmp;
 
diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S
index 4c721e247ac9..ed88647b57e2 100644
--- a/arch/mips/lib/csum_partial.S
+++ b/arch/mips/lib/csum_partial.S
@@ -76,10 +76,10 @@
         LOAD    _t1, (offset + UNIT(1))(src);                   \
         LOAD    _t2, (offset + UNIT(2))(src);                   \
         LOAD    _t3, (offset + UNIT(3))(src);                   \
+        ADDC(_t0, _t1);                                         \
+        ADDC(_t2, _t3);                                         \
         ADDC(sum, _t0);                                         \
-        ADDC(sum, _t1);                                         \
-        ADDC(sum, _t2);                                         \
-        ADDC(sum, _t3)
+        ADDC(sum, _t2)
 
 #ifdef USE_DOUBLE
 #define CSUM_BIGCHUNK(src, offset, sum, _t0, _t1, _t2, _t3)     \
@@ -504,21 +504,21 @@ LEAF(csum_partial)
         SUB     len, len, 8*NBYTES
         ADD     src, src, 8*NBYTES
         STORE(t0, UNIT(0)(dst), .Ls_exc\@)
-        ADDC(sum, t0)
+        ADDC(t0, t1)
         STORE(t1, UNIT(1)(dst), .Ls_exc\@)
-        ADDC(sum, t1)
+        ADDC(sum, t0)
         STORE(t2, UNIT(2)(dst), .Ls_exc\@)
-        ADDC(sum, t2)
+        ADDC(t2, t3)
         STORE(t3, UNIT(3)(dst), .Ls_exc\@)
-        ADDC(sum, t3)
+        ADDC(sum, t2)
         STORE(t4, UNIT(4)(dst), .Ls_exc\@)
-        ADDC(sum, t4)
+        ADDC(t4, t5)
         STORE(t5, UNIT(5)(dst), .Ls_exc\@)
-        ADDC(sum, t5)
+        ADDC(sum, t4)
         STORE(t6, UNIT(6)(dst), .Ls_exc\@)
-        ADDC(sum, t6)
+        ADDC(t6, t7)
         STORE(t7, UNIT(7)(dst), .Ls_exc\@)
-        ADDC(sum, t7)
+        ADDC(sum, t6)
         .set    reorder                         /* DADDI_WAR */
         ADD     dst, dst, 8*NBYTES
         bgez    len, 1b
@@ -544,13 +544,13 @@ LEAF(csum_partial)
         SUB     len, len, 4*NBYTES
         ADD     src, src, 4*NBYTES
         STORE(t0, UNIT(0)(dst), .Ls_exc\@)
-        ADDC(sum, t0)
+        ADDC(t0, t1)
         STORE(t1, UNIT(1)(dst), .Ls_exc\@)
-        ADDC(sum, t1)
+        ADDC(sum, t0)
         STORE(t2, UNIT(2)(dst), .Ls_exc\@)
-        ADDC(sum, t2)
+        ADDC(t2, t3)
         STORE(t3, UNIT(3)(dst), .Ls_exc\@)
-        ADDC(sum, t3)
+        ADDC(sum, t2)
         .set    reorder                         /* DADDI_WAR */
         ADD     dst, dst, 4*NBYTES
         beqz    len, .Ldone\@
@@ -649,13 +649,13 @@ LEAF(csum_partial)
         nop                             # improves slotting
 #endif
         STORE(t0, UNIT(0)(dst), .Ls_exc\@)
-        ADDC(sum, t0)
+        ADDC(t0, t1)
         STORE(t1, UNIT(1)(dst), .Ls_exc\@)
-        ADDC(sum, t1)
+        ADDC(sum, t0)
         STORE(t2, UNIT(2)(dst), .Ls_exc\@)
-        ADDC(sum, t2)
+        ADDC(t2, t3)
         STORE(t3, UNIT(3)(dst), .Ls_exc\@)
-        ADDC(sum, t3)
+        ADDC(sum, t2)
         .set    reorder                         /* DADDI_WAR */
         ADD     dst, dst, 4*NBYTES
         bne     len, rem, 1b
diff --git a/arch/mips/loongson/common/env.c b/arch/mips/loongson/common/env.c
index 045ea3d47c87..22f04ca2ff3e 100644
--- a/arch/mips/loongson/common/env.c
+++ b/arch/mips/loongson/common/env.c
@@ -29,6 +29,7 @@ struct efi_memory_map_loongson *loongson_memmap;
 struct loongson_system_configuration loongson_sysconf;
 
 u64 loongson_chipcfg[MAX_PACKAGES] = {0xffffffffbfc00180};
+u64 loongson_chiptemp[MAX_PACKAGES];
 u64 loongson_freqctrl[MAX_PACKAGES];
 
 unsigned long long smp_group[4];
@@ -97,6 +98,10 @@ void __init prom_init_env(void)
                 loongson_chipcfg[1] = 0x900010001fe00180;
                 loongson_chipcfg[2] = 0x900020001fe00180;
                 loongson_chipcfg[3] = 0x900030001fe00180;
+                loongson_chiptemp[0] = 0x900000001fe0019c;
+                loongson_chiptemp[1] = 0x900010001fe0019c;
+                loongson_chiptemp[2] = 0x900020001fe0019c;
+                loongson_chiptemp[3] = 0x900030001fe0019c;
                 loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
                 loongson_sysconf.workarounds = WORKAROUND_CPUFREQ;
         } else if (ecpu->cputype == Loongson_3B) {
@@ -110,6 +115,10 @@ void __init prom_init_env(void)
                 loongson_chipcfg[1] = 0x900020001fe00180;
                 loongson_chipcfg[2] = 0x900040001fe00180;
                 loongson_chipcfg[3] = 0x900060001fe00180;
+                loongson_chiptemp[0] = 0x900000001fe0019c;
+                loongson_chiptemp[1] = 0x900020001fe0019c;
+                loongson_chiptemp[2] = 0x900040001fe0019c;
+                loongson_chiptemp[3] = 0x900060001fe0019c;
                 loongson_freqctrl[0] = 0x900000001fe001d0;
                 loongson_freqctrl[1] = 0x900020001fe001d0;
                 loongson_freqctrl[2] = 0x900040001fe001d0;
diff --git a/arch/mips/loongson/common/pci.c b/arch/mips/loongson/common/pci.c
index 003ab4e618b3..4e2575643781 100644
--- a/arch/mips/loongson/common/pci.c
+++ b/arch/mips/loongson/common/pci.c
@@ -78,6 +78,8 @@ static void __init setup_pcimap(void)
 #endif
 }
 
+extern int sbx00_acpi_init(void);
+
 static int __init pcibios_init(void)
 {
         setup_pcimap();
@@ -89,6 +91,10 @@ static int __init pcibios_init(void)
 #endif
         register_pci_controller(&loongson_pci_controller);
 
+#ifdef CONFIG_CPU_LOONGSON3
+        sbx00_acpi_init();
+#endif
+
         return 0;
 }
 
diff --git a/arch/mips/loongson/loongson-3/cop2-ex.c b/arch/mips/loongson/loongson-3/cop2-ex.c
index b03e37d2071a..ea13764d0a03 100644
--- a/arch/mips/loongson/loongson-3/cop2-ex.c
+++ b/arch/mips/loongson/loongson-3/cop2-ex.c
@@ -43,7 +43,7 @@ static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
                 if (!fpu_owned) {
                         set_thread_flag(TIF_USEDFPU);
                         if (!used_math()) {
-                                _init_fpu();
+                                _init_fpu(current->thread.fpu.fcr31);
                                 set_used_math();
                         } else
                                 _restore_fp(current);
diff --git a/arch/mips/loongson/loongson-3/irq.c b/arch/mips/loongson/loongson-3/irq.c
index 21221edda7a9..0f75b6b3d218 100644
--- a/arch/mips/loongson/loongson-3/irq.c
+++ b/arch/mips/loongson/loongson-3/irq.c
@@ -44,6 +44,7 @@ void mach_irq_dispatch(unsigned int pending)
 
 static struct irqaction cascade_irqaction = {
         .handler = no_action,
+        .flags = IRQF_NO_SUSPEND,
         .name = "cascade",
 };
 
diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
index 619cfc1a2442..2e5f96275c38 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,15 @@
 # Makefile for the Linux/MIPS kernel FPU emulation.
 #
 
-obj-y   += cp1emu.o ieee754dp.o ieee754sp.o ieee754.o dp_div.o dp_mul.o \
-           dp_sub.o dp_add.o dp_fsp.o dp_cmp.o dp_simple.o dp_tint.o \
-           dp_fint.o dp_tlong.o dp_flong.o sp_div.o sp_mul.o sp_sub.o \
-           sp_add.o sp_fdp.o sp_cmp.o sp_simple.o sp_tint.o sp_fint.o \
-           sp_tlong.o sp_flong.o dsemul.o
+obj-y   += cp1emu.o ieee754dp.o ieee754sp.o ieee754.o \
+           dp_div.o dp_mul.o dp_sub.o dp_add.o dp_fsp.o dp_cmp.o dp_simple.o \
+           dp_tint.o dp_fint.o \
+           sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_simple.o \
+           sp_tint.o sp_fint.o \
+           dsemul.o
 
-lib-y   += ieee754d.o dp_sqrt.o sp_sqrt.o
+lib-y   += ieee754d.o \
+           dp_tlong.o dp_flong.o dp_sqrt.o \
+           sp_tlong.o sp_flong.o sp_sqrt.o
 
 obj-$(CONFIG_DEBUG_FS) += me-debugfs.o
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index b30bf65c7d7d..d31c537ace1d 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -45,6 +45,7 @@
 #include <asm/signal.h>
 #include <asm/uaccess.h>
 
+#include <asm/cpu-info.h>
 #include <asm/processor.h>
 #include <asm/fpu_emulator.h>
 #include <asm/fpu.h>
@@ -63,14 +64,14 @@ static int fpux_emu(struct pt_regs *,
 /* Control registers */
 
 #define FPCREG_RID      0       /* $0  = revision id */
+#define FPCREG_FCCR     25      /* $25 = fccr */
+#define FPCREG_FEXR     26      /* $26 = fexr */
+#define FPCREG_FENR     28      /* $28 = fenr */
 #define FPCREG_CSR      31      /* $31 = csr */
 
-/* Determine rounding mode from the RM bits of the FCSR */
-#define modeindex(v) ((v) & FPU_CSR_RM)
-
 /* convert condition code register number to csr bit */
 const unsigned int fpucondbit[8] = {
-        FPU_CSR_COND0,
+        FPU_CSR_COND,
         FPU_CSR_COND1,
         FPU_CSR_COND2,
         FPU_CSR_COND3,
@@ -843,6 +844,127 @@ do {									\
 #define DPTOREG(dp, x)  DITOREG((dp).bits, x)
 
 /*
+ * Emulate a CFC1 instruction.
+ */
+static inline void cop1_cfc(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
+                            mips_instruction ir)
+{
+        u32 fcr31 = ctx->fcr31;
+        u32 value = 0;
+
+        switch (MIPSInst_RD(ir)) {
+        case FPCREG_CSR:
+                value = fcr31;
+                pr_debug("%p gpr[%d]<-csr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                break;
+
+        case FPCREG_FENR:
+                if (!cpu_has_mips_r)
+                        break;
+                value = (fcr31 >> (FPU_CSR_FS_S - MIPS_FENR_FS_S)) &
+                        MIPS_FENR_FS;
+                value |= fcr31 & (FPU_CSR_ALL_E | FPU_CSR_RM);
+                pr_debug("%p gpr[%d]<-enr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                break;
+
+        case FPCREG_FEXR:
+                if (!cpu_has_mips_r)
+                        break;
+                value = fcr31 & (FPU_CSR_ALL_X | FPU_CSR_ALL_S);
+                pr_debug("%p gpr[%d]<-exr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                break;
+
+        case FPCREG_FCCR:
+                if (!cpu_has_mips_r)
+                        break;
+                value = (fcr31 >> (FPU_CSR_COND_S - MIPS_FCCR_COND0_S)) &
+                        MIPS_FCCR_COND0;
+                value |= (fcr31 >> (FPU_CSR_COND1_S - MIPS_FCCR_COND1_S)) &
+                         (MIPS_FCCR_CONDX & ~MIPS_FCCR_COND0);
+                pr_debug("%p gpr[%d]<-ccr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                break;
+
+        case FPCREG_RID:
+                value = current_cpu_data.fpu_id;
+                break;
+
+        default:
+                break;
+        }
+
+        if (MIPSInst_RT(ir))
+                xcp->regs[MIPSInst_RT(ir)] = value;
+}
+
+/*
+ * Emulate a CTC1 instruction.
+ */
+static inline void cop1_ctc(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
+                            mips_instruction ir)
+{
+        u32 fcr31 = ctx->fcr31;
+        u32 value;
+        u32 mask;
+
+        if (MIPSInst_RT(ir) == 0)
+                value = 0;
+        else
+                value = xcp->regs[MIPSInst_RT(ir)];
+
+        switch (MIPSInst_RD(ir)) {
+        case FPCREG_CSR:
+                pr_debug("%p gpr[%d]->csr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+
+                /* Preserve read-only bits.  */
+                mask = current_cpu_data.fpu_msk31;
+                fcr31 = (value & ~mask) | (fcr31 & mask);
+                break;
+
+        case FPCREG_FENR:
+                if (!cpu_has_mips_r)
+                        break;
+                pr_debug("%p gpr[%d]->enr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                fcr31 &= ~(FPU_CSR_FS | FPU_CSR_ALL_E | FPU_CSR_RM);
+                fcr31 |= (value << (FPU_CSR_FS_S - MIPS_FENR_FS_S)) &
+                         FPU_CSR_FS;
+                fcr31 |= value & (FPU_CSR_ALL_E | FPU_CSR_RM);
+                break;
+
+        case FPCREG_FEXR:
+                if (!cpu_has_mips_r)
+                        break;
+                pr_debug("%p gpr[%d]->exr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                fcr31 &= ~(FPU_CSR_ALL_X | FPU_CSR_ALL_S);
+                fcr31 |= value & (FPU_CSR_ALL_X | FPU_CSR_ALL_S);
+                break;
+
+        case FPCREG_FCCR:
+                if (!cpu_has_mips_r)
+                        break;
+                pr_debug("%p gpr[%d]->ccr=%08x\n",
+                         (void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
+                fcr31 &= ~(FPU_CSR_CONDX | FPU_CSR_COND);
+                fcr31 |= (value << (FPU_CSR_COND_S - MIPS_FCCR_COND0_S)) &
+                         FPU_CSR_COND;
+                fcr31 |= (value << (FPU_CSR_COND1_S - MIPS_FCCR_COND1_S)) &
+                         FPU_CSR_CONDX;
+                break;
+
+        default:
+                break;
+        }
+
+        ctx->fcr31 = fcr31;
+}
+
+/*
  * Emulate the single floating point instruction pointed at by EPC.
  * Two instructions if the instruction is in a branch delay slot.
  */
@@ -856,7 +978,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
         int likely, pc_inc;
         u32 __user *wva;
         u64 __user *dva;
-        u32 value;
         u32 wval;
         u64 dval;
         int sig;
@@ -1049,42 +1170,12 @@ emul:
 
                 case cfc_op:
                         /* cop control register rd -> gpr[rt] */
-                        if (MIPSInst_RD(ir) == FPCREG_CSR) {
-                                value = ctx->fcr31;
-                                value = (value & ~FPU_CSR_RM) | modeindex(value);
-                                pr_debug("%p gpr[%d]<-csr=%08x\n",
-                                         (void *) (xcp->cp0_epc),
-                                         MIPSInst_RT(ir), value);
-                        }
-                        else if (MIPSInst_RD(ir) == FPCREG_RID)
-                                value = 0;
-                        else
-                                value = 0;
-                        if (MIPSInst_RT(ir))
-                                xcp->regs[MIPSInst_RT(ir)] = value;
+                        cop1_cfc(xcp, ctx, ir);
                         break;
 
                 case ctc_op:
                         /* copregister rd <- rt */
-                        if (MIPSInst_RT(ir) == 0)
-                                value = 0;
-                        else
-                                value = xcp->regs[MIPSInst_RT(ir)];
-
-                        /* we only have one writable control reg
-                         */
-                        if (MIPSInst_RD(ir) == FPCREG_CSR) {
-                                pr_debug("%p gpr[%d]->csr=%08x\n",
-                                         (void *) (xcp->cp0_epc),
-                                         MIPSInst_RT(ir), value);
-
-                                /*
-                                 * Don't write reserved bits,
-                                 * and convert to ieee library modes
-                                 */
-                                ctx->fcr31 = (value & ~(FPU_CSR_RSVD | FPU_CSR_RM)) |
-                                             modeindex(value);
-                        }
+                        cop1_ctc(xcp, ctx, ir);
                         if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
                                 return SIGFPE;
                         }
@@ -1103,17 +1194,18 @@ emul:
                         likely = 0;
                         switch (MIPSInst_RT(ir) & 3) {
                         case bcfl_op:
-                                likely = 1;
+                                if (cpu_has_mips_2_3_4_5_r)
+                                        likely = 1;
+                                /* Fall through */
                         case bcf_op:
                                 cond = !cond;
                                 break;
                         case bctl_op:
-                                likely = 1;
+                                if (cpu_has_mips_2_3_4_5_r)
+                                        likely = 1;
+                                /* Fall through */
                         case bct_op:
                                 break;
-                        default:
-                                /* thats an illegal instruction */
-                                return SIGILL;
                         }
 
                         set_delay_slot(xcp);
@@ -1121,6 +1213,14 @@ emul:
                                 /*
                                  * Branch taken: emulate dslot instruction
                                  */
+                                unsigned long bcpc;
+
+                                /*
+                                 * Remember EPC at the branch to point back
+                                 * at so that any delay-slot instruction
+                                 * signal is not silently ignored.
+                                 */
+                                bcpc = xcp->cp0_epc;
                                 xcp->cp0_epc += dec_insn.pc_inc;
 
                                 contpc = MIPSInst_SIMM(ir);
@@ -1146,63 +1246,77 @@ emul:
                                                  * Single step the non-CP1
                                                  * instruction in the dslot.
                                                  */
-                                                return mips_dsemul(xcp, ir, contpc);
+                                                sig = mips_dsemul(xcp, ir,
+                                                                  contpc);
+                                                if (sig)
+                                                        xcp->cp0_epc = bcpc;
+                                                /*
+                                                 * SIGILL forces out of
+                                                 * the emulation loop.
+                                                 */
+                                                return sig ? sig : SIGILL;
                                         }
                                 } else
                                         contpc = (xcp->cp0_epc + (contpc << 2));
 
                                 switch (MIPSInst_OPCODE(ir)) {
                                 case lwc1_op:
-                                        goto emul;
-
                                 case swc1_op:
                                         goto emul;
 
                                 case ldc1_op:
                                 case sdc1_op:
-                                        if (cpu_has_mips_2_3_4_5 ||
-                                            cpu_has_mips64)
+                                        if (cpu_has_mips_2_3_4_5_r)
                                                 goto emul;
 
-                                        return SIGILL;
-                                        goto emul;
+                                        goto bc_sigill;
 
                                 case cop1_op:
                                         goto emul;
 
                                 case cop1x_op:
-                                        if (cpu_has_mips_4_5 || cpu_has_mips64 || cpu_has_mips32r2)
+                                        if (cpu_has_mips_4_5_64_r2_r6)
                                                 /* its one of ours */
                                                 goto emul;
 
-                                        return SIGILL;
+                                        goto bc_sigill;
 
                                 case spec_op:
-                                        if (!cpu_has_mips_4_5_r)
-                                                return SIGILL;
+                                        switch (MIPSInst_FUNC(ir)) {
+                                        case movc_op:
+                                                if (cpu_has_mips_4_5_r)
+                                                        goto emul;
 
-                                        if (MIPSInst_FUNC(ir) == movc_op)
-                                                goto emul;
+                                                goto bc_sigill;
+                                        }
                                         break;
+
+                                bc_sigill:
+                                        xcp->cp0_epc = bcpc;
+                                        return SIGILL;
                                 }
 
                                 /*
                                  * Single step the non-cp1
                                  * instruction in the dslot
                                  */
-                                return mips_dsemul(xcp, ir, contpc);
+                                sig = mips_dsemul(xcp, ir, contpc);
+                                if (sig)
+                                        xcp->cp0_epc = bcpc;
+                                /* SIGILL forces out of the emulation loop.  */
+                                return sig ? sig : SIGILL;
                         } else if (likely) {    /* branch not taken */
-                                        /*
-                                         * branch likely nullifies
-                                         * dslot if not taken
-                                         */
-                                        xcp->cp0_epc += dec_insn.pc_inc;
-                                        contpc += dec_insn.pc_inc;
-                                        /*
-                                         * else continue & execute
-                                         * dslot as normal insn
-                                         */
-                                }
+                                /*
+                                 * branch likely nullifies
+                                 * dslot if not taken
+                                 */
+                                xcp->cp0_epc += dec_insn.pc_inc;
+                                contpc += dec_insn.pc_inc;
+                                /*
+                                 * else continue & execute
+                                 * dslot as normal insn
+                                 */
+                        }
                         break;
 
                 default:
@@ -1216,7 +1330,7 @@ emul:
                 break;
 
         case cop1x_op:
-                if (!cpu_has_mips_4_5 && !cpu_has_mips64 && !cpu_has_mips32r2)
+                if (!cpu_has_mips_4_5_64_r2_r6)
                         return SIGILL;
 
                 sig = fpux_emu(xcp, ctx, ir, fault_addr);
@@ -1549,7 +1663,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
 
                         /* unary  ops */
                 case fsqrt_op:
-                        if (!cpu_has_mips_4_5_r)
+                        if (!cpu_has_mips_2_3_4_5_r)
                                 return SIGILL;
 
                         handler.u = ieee754sp_sqrt;
@@ -1561,14 +1675,14 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
                  * achieve full IEEE-754 accuracy - however this emulator does.
                  */
                 case frsqrt_op:
-                        if (!cpu_has_mips_4_5_r2_r6)
+                        if (!cpu_has_mips_4_5_64_r2_r6)
                                 return SIGILL;
 
                         handler.u = fpemu_sp_rsqrt;
                         goto scopuop;
 
                 case frecip_op:
-                        if (!cpu_has_mips_4_5_r2_r6)
+                        if (!cpu_has_mips_4_5_64_r2_r6)
                                 return SIGILL;
 
                         handler.u = fpemu_sp_recip;
@@ -1670,19 +1784,19 @@ copcsr:
                 case ftrunc_op:
                 case fceil_op:
                 case ffloor_op:
-                        if (!cpu_has_mips_2_3_4_5 && !cpu_has_mips64)
+                        if (!cpu_has_mips_2_3_4_5_r)
                                 return SIGILL;
 
                         oldrm = ieee754_csr.rm;
                         SPFROMREG(fs, MIPSInst_FS(ir));
-                        ieee754_csr.rm = modeindex(MIPSInst_FUNC(ir));
+                        ieee754_csr.rm = MIPSInst_FUNC(ir);
                         rv.w = ieee754sp_tint(fs);
                         ieee754_csr.rm = oldrm;
                         rfmt = w_fmt;
                         goto copcsr;
 
                 case fcvtl_op:
-                        if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                        if (!cpu_has_mips_3_4_5_64_r2_r6)
                                 return SIGILL;
 
                         SPFROMREG(fs, MIPSInst_FS(ir));
@@ -1694,12 +1808,12 @@ copcsr:
                 case ftruncl_op:
                 case fceill_op:
                 case ffloorl_op:
-                        if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                        if (!cpu_has_mips_3_4_5_64_r2_r6)
                                 return SIGILL;
 
                         oldrm = ieee754_csr.rm;
                         SPFROMREG(fs, MIPSInst_FS(ir));
-                        ieee754_csr.rm = modeindex(MIPSInst_FUNC(ir));
+                        ieee754_csr.rm = MIPSInst_FUNC(ir);
                         rv.l = ieee754sp_tlong(fs);
                         ieee754_csr.rm = oldrm;
                         rfmt = l_fmt;
@@ -1763,13 +1877,13 @@ copcsr:
                  * achieve full IEEE-754 accuracy - however this emulator does.
                  */
                 case frsqrt_op:
-                        if (!cpu_has_mips_4_5_r2_r6)
+                        if (!cpu_has_mips_4_5_64_r2_r6)
                                 return SIGILL;
 
                         handler.u = fpemu_dp_rsqrt;
                         goto dcopuop;
                 case frecip_op:
-                        if (!cpu_has_mips_4_5_r2_r6)
+                        if (!cpu_has_mips_4_5_64_r2_r6)
                                 return SIGILL;
 
                         handler.u = fpemu_dp_recip;
@@ -1852,14 +1966,14 @@ dcopuop:
 
                         oldrm = ieee754_csr.rm;
                         DPFROMREG(fs, MIPSInst_FS(ir));
-                        ieee754_csr.rm = modeindex(MIPSInst_FUNC(ir));
+                        ieee754_csr.rm = MIPSInst_FUNC(ir);
                         rv.w = ieee754dp_tint(fs);
                         ieee754_csr.rm = oldrm;
                         rfmt = w_fmt;
                         goto copcsr;
 
                 case fcvtl_op:
-                        if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                        if (!cpu_has_mips_3_4_5_64_r2_r6)
                                 return SIGILL;
 
                         DPFROMREG(fs, MIPSInst_FS(ir));
@@ -1871,12 +1985,12 @@ dcopuop:
                 case ftruncl_op:
                 case fceill_op:
                 case ffloorl_op:
-                        if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                        if (!cpu_has_mips_3_4_5_64_r2_r6)
                                 return SIGILL;
 
                         oldrm = ieee754_csr.rm;
                         DPFROMREG(fs, MIPSInst_FS(ir));
-                        ieee754_csr.rm = modeindex(MIPSInst_FUNC(ir));
+                        ieee754_csr.rm = MIPSInst_FUNC(ir);
                         rv.l = ieee754dp_tlong(fs);
                         ieee754_csr.rm = oldrm;
                         rfmt = l_fmt;
@@ -1930,7 +2044,7 @@ dcopuop:
 
         case l_fmt:
 
-                if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                if (!cpu_has_mips_3_4_5_64_r2_r6)
                         return SIGILL;
 
                 DIFROMREG(bits, MIPSInst_FS(ir));
@@ -1994,7 +2108,7 @@ dcopuop:
                 SITOREG(rv.w, MIPSInst_FD(ir));
                 break;
         case l_fmt:
-                if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
+                if (!cpu_has_mips_3_4_5_64_r2_r6)
                         return SIGILL;
 
                 DITOREG(rv.l, MIPSInst_FD(ir));
@@ -2081,10 +2195,8 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
                         xcp->cp0_epc += dec_insn.pc_inc;        /* Skip NOPs */
                 else {
                         /*
-                         * The 'ieee754_csr' is an alias of
-                         * ctx->fcr31.  No need to copy ctx->fcr31 to
-                         * ieee754_csr.  But ieee754_csr.rm is ieee
-                         * library modes. (not mips rounding mode)
+                         * The 'ieee754_csr' is an alias of ctx->fcr31.
+                         * No need to copy ctx->fcr31 to ieee754_csr.
                          */
                         sig = cop1Emulate(xcp, ctx, dec_insn, fault_addr);
                 }
diff --git a/arch/mips/math-emu/dp_add.c b/arch/mips/math-emu/dp_add.c
index 7f64577df984..8954ef031f84 100644
--- a/arch/mips/math-emu/dp_add.c
+++ b/arch/mips/math-emu/dp_add.c
@@ -37,19 +37,20 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
         FLUSHYDP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754dp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+                return ieee754dp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -150,8 +151,6 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
                  * leaving result in xm, xs and xe.
                  */
                 xm = xm + ym;
-                xe = xe;
-                xs = xs;
 
                 if (xm >> (DP_FBITS + 1 + 3)) { /* carry out */
                         xm = XDPSRS1(xm);
@@ -160,11 +159,8 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
         } else {
                 if (xm >= ym) {
                         xm = xm - ym;
-                        xe = xe;
-                        xs = xs;
                 } else {
                         xm = ym - xm;
-                        xe = xe;
                         xs = ys;
                 }
                 if (xm == 0)
diff --git a/arch/mips/math-emu/dp_cmp.c b/arch/mips/math-emu/dp_cmp.c
index 30f95f6e9ac4..a29880e29ae4 100644
--- a/arch/mips/math-emu/dp_cmp.c
+++ b/arch/mips/math-emu/dp_cmp.c
@@ -35,16 +35,11 @@ int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig)
         FLUSHYDP;
         ieee754_clearcx();      /* Even clear inexact flag here */
 
-        if (ieee754dp_isnan(x) || ieee754dp_isnan(y)) {
-                if (sig || xc == IEEE754_CLASS_SNAN || yc == IEEE754_CLASS_SNAN)
+        if (ieee754_class_nan(xc) || ieee754_class_nan(yc)) {
+                if (sig ||
+                    xc == IEEE754_CLASS_SNAN || yc == IEEE754_CLASS_SNAN)
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                if (cmp & IEEE754_CUN)
-                        return 1;
-                if (cmp & (IEEE754_CLT | IEEE754_CGT)) {
-                        if (sig && ieee754_setandtestcx(IEEE754_INVALID_OPERATION))
-                                return 0;
-                }
-                return 0;
+                return (cmp & IEEE754_CUN) != 0;
         } else {
                 vx = x.bits;
                 vy = y.bits;
diff --git a/arch/mips/math-emu/dp_div.c b/arch/mips/math-emu/dp_div.c
index bef0e55e5938..f4746f7c5f63 100644
--- a/arch/mips/math-emu/dp_div.c
+++ b/arch/mips/math-emu/dp_div.c
@@ -39,19 +39,20 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y)
         FLUSHYDP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754dp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+                return ieee754dp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
diff --git a/arch/mips/math-emu/dp_fsp.c b/arch/mips/math-emu/dp_fsp.c
index ffb69c5830b0..57d09ca5403a 100644
--- a/arch/mips/math-emu/dp_fsp.c
+++ b/arch/mips/math-emu/dp_fsp.c
@@ -22,6 +22,12 @@
 #include "ieee754sp.h"
 #include "ieee754dp.h"
 
+static inline union ieee754dp ieee754dp_nan_fsp(int xs, u64 xm)
+{
+        return builddp(xs, DP_EMAX + 1 + DP_EBIAS,
+                       xm << (DP_FBITS - SP_FBITS));
+}
+
 union ieee754dp ieee754dp_fsp(union ieee754sp x)
 {
         COMPXSP;
@@ -34,15 +40,11 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x)
 
         switch (xc) {
         case IEEE754_CLASS_SNAN:
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+                return ieee754dp_nanxcpt(ieee754dp_nan_fsp(xs, xm));
 
         case IEEE754_CLASS_QNAN:
-                return ieee754dp_nanxcpt(builddp(xs,
-                                                 DP_EMAX + 1 + DP_EBIAS,
-                                                 ((u64) xm
-                                                  << (DP_FBITS -
-                                                      SP_FBITS))));
+                return ieee754dp_nan_fsp(xs, xm);
+
         case IEEE754_CLASS_INF:
                 return ieee754dp_inf(xs);
 
diff --git a/arch/mips/math-emu/dp_mul.c b/arch/mips/math-emu/dp_mul.c
index d3acdedb5b9d..d0901f03fa19 100644
--- a/arch/mips/math-emu/dp_mul.c
+++ b/arch/mips/math-emu/dp_mul.c
@@ -47,19 +47,20 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y)
         FLUSHYDP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754dp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+                return ieee754dp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
diff --git a/arch/mips/math-emu/dp_simple.c b/arch/mips/math-emu/dp_simple.c
index bccbe90efceb..926d56bf37f2 100644
--- a/arch/mips/math-emu/dp_simple.c
+++ b/arch/mips/math-emu/dp_simple.c
@@ -23,44 +23,27 @@
 
 union ieee754dp ieee754dp_neg(union ieee754dp x)
 {
-        COMPXDP;
-
-        EXPLODEXDP;
-        ieee754_clearcx();
-        FLUSHXDP;
-
-        /*
-         * Invert the sign ALWAYS to prevent an endless recursion on
-         * pow() in libc.
-         */
-        /* quick fix up */
-        DPSIGN(x) ^= 1;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                union ieee754dp y = ieee754dp_indef();
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                DPSIGN(y) = DPSIGN(x);
-                return ieee754dp_nanxcpt(y);
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754dp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        y = ieee754dp_sub(ieee754dp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
 
 union ieee754dp ieee754dp_abs(union ieee754dp x)
 {
-        COMPXDP;
-
-        EXPLODEXDP;
-        ieee754_clearcx();
-        FLUSHXDP;
-
-        /* Clear sign ALWAYS, irrespective of NaN */
-        DPSIGN(x) = 0;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754dp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        if (DPSIGN(x))
+                y = ieee754dp_sub(ieee754dp_zero(0), x);
+        else
+                y = ieee754dp_add(ieee754dp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
diff --git a/arch/mips/math-emu/dp_sqrt.c b/arch/mips/math-emu/dp_sqrt.c
index 041bbb6124bb..cd5bc083001e 100644
--- a/arch/mips/math-emu/dp_sqrt.c
+++ b/arch/mips/math-emu/dp_sqrt.c
@@ -42,13 +42,12 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
 
         /* x == INF or NAN? */
         switch (xc) {
-        case IEEE754_CLASS_QNAN:
-                /* sqrt(Nan) = Nan */
+        case IEEE754_CLASS_SNAN:
                 return ieee754dp_nanxcpt(x);
 
-        case IEEE754_CLASS_SNAN:
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+        case IEEE754_CLASS_QNAN:
+                /* sqrt(Nan) = Nan */
+                return x;
 
         case IEEE754_CLASS_ZERO:
                 /* sqrt(0) = 0 */
@@ -58,7 +57,7 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
                 if (xs) {
                         /* sqrt(-Inf) = Nan */
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                        return ieee754dp_nanxcpt(ieee754dp_indef());
+                        return ieee754dp_indef();
                 }
                 /* sqrt(+Inf) = Inf */
                 return x;
@@ -71,7 +70,7 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
                 if (xs) {
                         /* sqrt(-x) = Nan */
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                        return ieee754dp_nanxcpt(ieee754dp_indef());
+                        return ieee754dp_indef();
                 }
                 break;
         }
diff --git a/arch/mips/math-emu/dp_sub.c b/arch/mips/math-emu/dp_sub.c
index 7a174029043a..fc17a781b9ae 100644
--- a/arch/mips/math-emu/dp_sub.c
+++ b/arch/mips/math-emu/dp_sub.c
@@ -37,19 +37,20 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
         FLUSHYDP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754dp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
+                return ieee754dp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -153,8 +154,6 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
                 /* generate 28 bit result of adding two 27 bit numbers
                  */
                 xm = xm + ym;
-                xe = xe;
-                xs = xs;
 
                 if (xm >> (DP_FBITS + 1 + 3)) { /* carry out */
                         xm = XDPSRS1(xm);       /* shift preserving sticky */
@@ -163,11 +162,8 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
         } else {
                 if (xm >= ym) {
                         xm = xm - ym;
-                        xe = xe;
-                        xs = xs;
                 } else {
                         xm = ym - xm;
-                        xe = xe;
                         xs = ys;
                 }
                 if (xm == 0) {
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index 4f514f3724cb..e0b5cc27d78b 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -94,9 +94,9 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
         regs->cp0_epc = ((unsigned long) &fr->emul) |
                 get_isa16_mode(regs->cp0_epc);
 
-        flush_cache_sigtramp((unsigned long)&fr->badinst);
+        flush_cache_sigtramp((unsigned long)&fr->emul);
 
-        return SIGILL;          /* force out of emulation loop */
+        return 0;
 }
 
 int do_dsemulret(struct pt_regs *xcp)
@@ -158,6 +158,6 @@ int do_dsemulret(struct pt_regs *xcp)
 
         /* Set EPC to return to post-branch instruction */
         xcp->cp0_epc = epc;
-
+        MIPS_FPU_EMU_INC_STATS(ds_emul);
         return 1;
 }
diff --git a/arch/mips/math-emu/ieee754.h b/arch/mips/math-emu/ieee754.h
index 43c4fb522ac2..a5ca108ce467 100644
--- a/arch/mips/math-emu/ieee754.h
+++ b/arch/mips/math-emu/ieee754.h
@@ -126,84 +126,21 @@ enum {
 #define IEEE754_CGT     0x04
 #define IEEE754_CUN     0x08
 
-/* "normal" comparisons
-*/
-static inline int ieee754sp_eq(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y, IEEE754_CEQ, 0);
-}
-
-static inline int ieee754sp_ne(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y,
-                             IEEE754_CLT | IEEE754_CGT | IEEE754_CUN, 0);
-}
-
-static inline int ieee754sp_lt(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y, IEEE754_CLT, 0);
-}
-
-static inline int ieee754sp_le(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y, IEEE754_CLT | IEEE754_CEQ, 0);
-}
-
-static inline int ieee754sp_gt(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y, IEEE754_CGT, 0);
-}
-
-
-static inline int ieee754sp_ge(union ieee754sp x, union ieee754sp y)
-{
-        return ieee754sp_cmp(x, y, IEEE754_CGT | IEEE754_CEQ, 0);
-}
-
-static inline int ieee754dp_eq(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y, IEEE754_CEQ, 0);
-}
-
-static inline int ieee754dp_ne(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y,
-                             IEEE754_CLT | IEEE754_CGT | IEEE754_CUN, 0);
-}
-
-static inline int ieee754dp_lt(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y, IEEE754_CLT, 0);
-}
-
-static inline int ieee754dp_le(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y, IEEE754_CLT | IEEE754_CEQ, 0);
-}
-
-static inline int ieee754dp_gt(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y, IEEE754_CGT, 0);
-}
-
-static inline int ieee754dp_ge(union ieee754dp x, union ieee754dp y)
-{
-        return ieee754dp_cmp(x, y, IEEE754_CGT | IEEE754_CEQ, 0);
-}
-
 /*
  * The control status register
  */
 struct _ieee754_csr {
-        __BITFIELD_FIELD(unsigned pad0:7,
-        __BITFIELD_FIELD(unsigned nod:1,        /* set 1 for no denormalised numbers */
-        __BITFIELD_FIELD(unsigned c:1,          /* condition */
-        __BITFIELD_FIELD(unsigned pad1:5,
+        __BITFIELD_FIELD(unsigned fcc:7,        /* condition[7:1] */
+        __BITFIELD_FIELD(unsigned nod:1,        /* set 1 for no denormals */
+        __BITFIELD_FIELD(unsigned c:1,          /* condition[0] */
+        __BITFIELD_FIELD(unsigned pad0:3,
+        __BITFIELD_FIELD(unsigned abs2008:1,    /* IEEE 754-2008 ABS/NEG.fmt */
+        __BITFIELD_FIELD(unsigned nan2008:1,    /* IEEE 754-2008 NaN mode */
         __BITFIELD_FIELD(unsigned cx:6,         /* exceptions this operation */
         __BITFIELD_FIELD(unsigned mx:5,         /* exception enable  mask */
         __BITFIELD_FIELD(unsigned sx:5,         /* exceptions total */
         __BITFIELD_FIELD(unsigned rm:2,         /* current rounding mode */
-        ;))))))))
+        ;))))))))))
 };
 #define ieee754_csr (*(struct _ieee754_csr *)(&current->thread.fpu.fcr31))
 
@@ -257,23 +194,23 @@ static inline int ieee754_sxtest(unsigned n)
 union ieee754sp ieee754sp_dump(char *s, union ieee754sp x);
 union ieee754dp ieee754dp_dump(char *s, union ieee754dp x);
 
-#define IEEE754_SPCVAL_PZERO    0
-#define IEEE754_SPCVAL_NZERO    1
-#define IEEE754_SPCVAL_PONE     2
-#define IEEE754_SPCVAL_NONE     3
-#define IEEE754_SPCVAL_PTEN     4
-#define IEEE754_SPCVAL_NTEN     5
-#define IEEE754_SPCVAL_PINFINITY        6
-#define IEEE754_SPCVAL_NINFINITY        7
-#define IEEE754_SPCVAL_INDEF    8
-#define IEEE754_SPCVAL_PMAX     9       /* +max norm */
-#define IEEE754_SPCVAL_NMAX     10      /* -max norm */
-#define IEEE754_SPCVAL_PMIN     11      /* +min norm */
-#define IEEE754_SPCVAL_NMIN     12      /* +min norm */
-#define IEEE754_SPCVAL_PMIND    13      /* +min denorm */
-#define IEEE754_SPCVAL_NMIND    14      /* +min denorm */
-#define IEEE754_SPCVAL_P1E31    15      /* + 1.0e31 */
-#define IEEE754_SPCVAL_P1E63    16      /* + 1.0e63 */
+#define IEEE754_SPCVAL_PZERO            0       /* +0.0 */
+#define IEEE754_SPCVAL_NZERO            1       /* -0.0 */
+#define IEEE754_SPCVAL_PONE             2       /* +1.0 */
+#define IEEE754_SPCVAL_NONE             3       /* -1.0 */
+#define IEEE754_SPCVAL_PTEN             4       /* +10.0 */
+#define IEEE754_SPCVAL_NTEN             5       /* -10.0 */
+#define IEEE754_SPCVAL_PINFINITY        6       /* +inf */
+#define IEEE754_SPCVAL_NINFINITY        7       /* -inf */
+#define IEEE754_SPCVAL_INDEF            8       /* quiet NaN */
+#define IEEE754_SPCVAL_PMAX             9       /* +max norm */
+#define IEEE754_SPCVAL_NMAX             10      /* -max norm */
+#define IEEE754_SPCVAL_PMIN             11      /* +min norm */
+#define IEEE754_SPCVAL_NMIN             12      /* -min norm */
+#define IEEE754_SPCVAL_PMIND            13      /* +min denorm */
+#define IEEE754_SPCVAL_NMIND            14      /* -min denorm */
+#define IEEE754_SPCVAL_P1E31            15      /* + 1.0e31 */
+#define IEEE754_SPCVAL_P1E63            16      /* + 1.0e63 */
 
 extern const union ieee754dp __ieee754dp_spcvals[];
 extern const union ieee754sp __ieee754sp_spcvals[];
diff --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c
index 068f45a415fc..522d843f2ffd 100644
--- a/arch/mips/math-emu/ieee754dp.c
+++ b/arch/mips/math-emu/ieee754dp.c
@@ -30,9 +30,9 @@ int ieee754dp_class(union ieee754dp x)
         return xc;
 }
 
-int ieee754dp_isnan(union ieee754dp x)
+static inline int ieee754dp_isnan(union ieee754dp x)
 {
-        return ieee754dp_class(x) >= IEEE754_CLASS_SNAN;
+        return ieee754_class_nan(ieee754dp_class(x));
 }
 
 static inline int ieee754dp_issnan(union ieee754dp x)
@@ -42,23 +42,16 @@ static inline int ieee754dp_issnan(union ieee754dp x)
 }
 
 
+/*
+ * Raise the Invalid Operation IEEE 754 exception
+ * and convert the signaling NaN supplied to a quiet NaN.
+ */
 union ieee754dp __cold ieee754dp_nanxcpt(union ieee754dp r)
 {
-        assert(ieee754dp_isnan(r));
-
-        if (!ieee754dp_issnan(r))       /* QNAN does not cause invalid op !! */
-                return r;
-
-        if (!ieee754_setandtestcx(IEEE754_INVALID_OPERATION)) {
-                /* not enabled convert to a quiet NaN */
-                DPMANT(r) &= (~DP_MBIT(DP_FBITS-1));
-                if (ieee754dp_isnan(r))
-                        return r;
-                else
-                        return ieee754dp_indef();
-        }
+        assert(ieee754dp_issnan(r));
 
-        return r;
+        ieee754_setcx(IEEE754_INVALID_OPERATION);
+        return ieee754dp_indef();
 }
 
 static u64 ieee754dp_get_rounding(int sn, u64 xm)
diff --git a/arch/mips/math-emu/ieee754dp.h b/arch/mips/math-emu/ieee754dp.h
index 61fd6fd31350..e2babd98fee3 100644
--- a/arch/mips/math-emu/ieee754dp.h
+++ b/arch/mips/math-emu/ieee754dp.h
@@ -77,6 +77,5 @@ static inline union ieee754dp builddp(int s, int bx, u64 m)
         return r;
 }
 
-extern int ieee754dp_isnan(union ieee754dp);
 extern union ieee754dp __cold ieee754dp_nanxcpt(union ieee754dp);
 extern union ieee754dp ieee754dp_format(int, int, u64);
diff --git a/arch/mips/math-emu/ieee754int.h b/arch/mips/math-emu/ieee754int.h
index f0365bb86747..05389d5e3a93 100644
--- a/arch/mips/math-emu/ieee754int.h
+++ b/arch/mips/math-emu/ieee754int.h
@@ -44,6 +44,11 @@ static inline int ieee754_setandtestcx(const unsigned int x)
         return ieee754_csr.mx & x;
 }
 
+static inline int ieee754_class_nan(int xc)
+{
+        return xc >= IEEE754_CLASS_SNAN;
+}
+
 #define COMPXSP \
         unsigned xm; int xe; int xs __maybe_unused; int xc
 
diff --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c
index ba88301579c2..ca8e35e33bf7 100644
--- a/arch/mips/math-emu/ieee754sp.c
+++ b/arch/mips/math-emu/ieee754sp.c
@@ -30,9 +30,9 @@ int ieee754sp_class(union ieee754sp x)
         return xc;
 }
 
-int ieee754sp_isnan(union ieee754sp x)
+static inline int ieee754sp_isnan(union ieee754sp x)
 {
-        return ieee754sp_class(x) >= IEEE754_CLASS_SNAN;
+        return ieee754_class_nan(ieee754sp_class(x));
 }
 
 static inline int ieee754sp_issnan(union ieee754sp x)
@@ -42,23 +42,16 @@ static inline int ieee754sp_issnan(union ieee754sp x)
 }
 
 
+/*
+ * Raise the Invalid Operation IEEE 754 exception
+ * and convert the signaling NaN supplied to a quiet NaN.
+ */
 union ieee754sp __cold ieee754sp_nanxcpt(union ieee754sp r)
 {
-        assert(ieee754sp_isnan(r));
-
-        if (!ieee754sp_issnan(r))       /* QNAN does not cause invalid op !! */
-                return r;
-
-        if (!ieee754_setandtestcx(IEEE754_INVALID_OPERATION)) {
-                /* not enabled convert to a quiet NaN */
-                SPMANT(r) &= (~SP_MBIT(SP_FBITS-1));
-                if (ieee754sp_isnan(r))
-                        return r;
-                else
-                        return ieee754sp_indef();
-        }
+        assert(ieee754sp_issnan(r));
 
-        return r;
+        ieee754_setcx(IEEE754_INVALID_OPERATION);
+        return ieee754sp_indef();
 }
 
 static unsigned ieee754sp_get_rounding(int sn, unsigned xm)
diff --git a/arch/mips/math-emu/ieee754sp.h b/arch/mips/math-emu/ieee754sp.h
index ad268e332318..374a3f00a589 100644
--- a/arch/mips/math-emu/ieee754sp.h
+++ b/arch/mips/math-emu/ieee754sp.h
@@ -82,6 +82,5 @@ static inline union ieee754sp buildsp(int s, int bx, unsigned m)
         return r;
 }
 
-extern int ieee754sp_isnan(union ieee754sp);
 extern union ieee754sp __cold ieee754sp_nanxcpt(union ieee754sp);
 extern union ieee754sp ieee754sp_format(int, int, unsigned);
diff --git a/arch/mips/math-emu/me-debugfs.c b/arch/mips/math-emu/me-debugfs.c
index becdd63e14a9..f308e0f05fc5 100644
--- a/arch/mips/math-emu/me-debugfs.c
+++ b/arch/mips/math-emu/me-debugfs.c
@@ -61,6 +61,7 @@ do {									\
         FPU_STAT_CREATE(ieee754_overflow);
         FPU_STAT_CREATE(ieee754_zerodiv);
         FPU_STAT_CREATE(ieee754_invalidop);
+        FPU_STAT_CREATE(ds_emul);
 
         return 0;
 }
diff --git a/arch/mips/math-emu/sp_add.c b/arch/mips/math-emu/sp_add.c
index 2d84d460cb67..f1c87b07d3b4 100644
--- a/arch/mips/math-emu/sp_add.c
+++ b/arch/mips/math-emu/sp_add.c
@@ -37,19 +37,20 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
         FLUSHYSP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754sp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+                return ieee754sp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -148,8 +149,6 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
                  * leaving result in xm, xs and xe.
                  */
                 xm = xm + ym;
-                xe = xe;
-                xs = xs;
 
                 if (xm >> (SP_FBITS + 1 + 3)) { /* carry out */
                         SPXSRSX1();
@@ -157,11 +156,8 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
         } else {
                 if (xm >= ym) {
                         xm = xm - ym;
-                        xe = xe;
-                        xs = xs;
                 } else {
                         xm = ym - xm;
-                        xe = xe;
                         xs = ys;
                 }
                 if (xm == 0)
diff --git a/arch/mips/math-emu/sp_cmp.c b/arch/mips/math-emu/sp_cmp.c
index addbccb2f556..67b82f1e2c4a 100644
--- a/arch/mips/math-emu/sp_cmp.c
+++ b/arch/mips/math-emu/sp_cmp.c
@@ -35,16 +35,11 @@ int ieee754sp_cmp(union ieee754sp x, union ieee754sp y, int cmp, int sig)
         FLUSHYSP;
         ieee754_clearcx();      /* Even clear inexact flag here */
 
-        if (ieee754sp_isnan(x) || ieee754sp_isnan(y)) {
-                if (sig || xc == IEEE754_CLASS_SNAN || yc == IEEE754_CLASS_SNAN)
+        if (ieee754_class_nan(xc) || ieee754_class_nan(yc)) {
+                if (sig ||
+                    xc == IEEE754_CLASS_SNAN || yc == IEEE754_CLASS_SNAN)
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                if (cmp & IEEE754_CUN)
-                        return 1;
-                if (cmp & (IEEE754_CLT | IEEE754_CGT)) {
-                        if (sig && ieee754_setandtestcx(IEEE754_INVALID_OPERATION))
-                                return 0;
-                }
-                return 0;
+                return (cmp & IEEE754_CUN) != 0;
         } else {
                 vx = x.bits;
                 vy = y.bits;
diff --git a/arch/mips/math-emu/sp_div.c b/arch/mips/math-emu/sp_div.c
index 721f317aa877..27f6db3a0a4c 100644
--- a/arch/mips/math-emu/sp_div.c
+++ b/arch/mips/math-emu/sp_div.c
@@ -39,19 +39,20 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
         FLUSHYSP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754sp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+                return ieee754sp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
diff --git a/arch/mips/math-emu/sp_fdp.c b/arch/mips/math-emu/sp_fdp.c
index 1b266fb16973..3797148893ad 100644
--- a/arch/mips/math-emu/sp_fdp.c
+++ b/arch/mips/math-emu/sp_fdp.c
@@ -22,12 +22,19 @@
 #include "ieee754sp.h"
 #include "ieee754dp.h"
 
+static inline union ieee754sp ieee754sp_nan_fdp(int xs, u64 xm)
+{
+        return buildsp(xs, SP_EMAX + 1 + SP_EBIAS,
+                       xm >> (DP_FBITS - SP_FBITS));
+}
+
 union ieee754sp ieee754sp_fdp(union ieee754dp x)
 {
+        union ieee754sp y;
         u32 rm;
 
         COMPXDP;
-        union ieee754sp nan;
+        COMPYSP;
 
         EXPLODEXDP;
 
@@ -37,15 +44,14 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x)
 
         switch (xc) {
         case IEEE754_CLASS_SNAN:
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+                return ieee754sp_nanxcpt(ieee754sp_nan_fdp(xs, xm));
 
         case IEEE754_CLASS_QNAN:
-                nan = buildsp(xs, SP_EMAX + 1 + SP_EBIAS, (u32)
-                                (xm >> (DP_FBITS - SP_FBITS)));
-                if (!ieee754sp_isnan(nan))
-                        nan = ieee754sp_indef();
-                return ieee754sp_nanxcpt(nan);
+                y = ieee754sp_nan_fdp(xs, xm);
+                EXPLODEYSP;
+                if (!ieee754_class_nan(yc))
+                        y = ieee754sp_indef();
+                return y;
 
         case IEEE754_CLASS_INF:
                 return ieee754sp_inf(xs);
diff --git a/arch/mips/math-emu/sp_mul.c b/arch/mips/math-emu/sp_mul.c
index 890c13a2965e..d910c43a6f30 100644
--- a/arch/mips/math-emu/sp_mul.c
+++ b/arch/mips/math-emu/sp_mul.c
@@ -47,19 +47,20 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y)
         FLUSHYSP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754sp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+                return ieee754sp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
diff --git a/arch/mips/math-emu/sp_simple.c b/arch/mips/math-emu/sp_simple.c
index f1ffaa9a17e0..c50e9451f2d2 100644
--- a/arch/mips/math-emu/sp_simple.c
+++ b/arch/mips/math-emu/sp_simple.c
@@ -23,44 +23,27 @@
 
 union ieee754sp ieee754sp_neg(union ieee754sp x)
 {
-        COMPXSP;
-
-        EXPLODEXSP;
-        ieee754_clearcx();
-        FLUSHXSP;
-
-        /*
-         * Invert the sign ALWAYS to prevent an endless recursion on
-         * pow() in libc.
-         */
-        /* quick fix up */
-        SPSIGN(x) ^= 1;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                union ieee754sp y = ieee754sp_indef();
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                SPSIGN(y) = SPSIGN(x);
-                return ieee754sp_nanxcpt(y);
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754sp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        y = ieee754sp_sub(ieee754sp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
 
 union ieee754sp ieee754sp_abs(union ieee754sp x)
 {
-        COMPXSP;
-
-        EXPLODEXSP;
-        ieee754_clearcx();
-        FLUSHXSP;
-
-        /* Clear sign ALWAYS, irrespective of NaN */
-        SPSIGN(x) = 0;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754sp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        if (SPSIGN(x))
+                y = ieee754sp_sub(ieee754sp_zero(0), x);
+        else
+                y = ieee754sp_add(ieee754sp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
diff --git a/arch/mips/math-emu/sp_sqrt.c b/arch/mips/math-emu/sp_sqrt.c
index b7c098a86f95..67059c33a250 100644
--- a/arch/mips/math-emu/sp_sqrt.c
+++ b/arch/mips/math-emu/sp_sqrt.c
@@ -35,13 +35,12 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
 
         /* x == INF or NAN? */
         switch (xc) {
-        case IEEE754_CLASS_QNAN:
-                /* sqrt(Nan) = Nan */
+        case IEEE754_CLASS_SNAN:
                 return ieee754sp_nanxcpt(x);
 
-        case IEEE754_CLASS_SNAN:
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+        case IEEE754_CLASS_QNAN:
+                /* sqrt(Nan) = Nan */
+                return x;
 
         case IEEE754_CLASS_ZERO:
                 /* sqrt(0) = 0 */
@@ -51,7 +50,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
                 if (xs) {
                         /* sqrt(-Inf) = Nan */
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                        return ieee754sp_nanxcpt(ieee754sp_indef());
+                        return ieee754sp_indef();
                 }
                 /* sqrt(+Inf) = Inf */
                 return x;
@@ -61,7 +60,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
                 if (xs) {
                         /* sqrt(-x) = Nan */
                         ieee754_setcx(IEEE754_INVALID_OPERATION);
-                        return ieee754sp_nanxcpt(ieee754sp_indef());
+                        return ieee754sp_indef();
                 }
                 break;
         }
diff --git a/arch/mips/math-emu/sp_sub.c b/arch/mips/math-emu/sp_sub.c
index 8592e49032b8..ec5f937a8b3e 100644
--- a/arch/mips/math-emu/sp_sub.c
+++ b/arch/mips/math-emu/sp_sub.c
@@ -37,19 +37,20 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
         FLUSHYSP;
 
         switch (CLPAIR(xc, yc)) {
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):
-        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):
+                return ieee754sp_nanxcpt(y);
+
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):
+        case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):
         case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
+                return ieee754sp_nanxcpt(x);
 
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -148,8 +149,6 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
                 /* generate 28 bit result of adding two 27 bit numbers
                  */
                 xm = xm + ym;
-                xe = xe;
-                xs = xs;
 
                 if (xm >> (SP_FBITS + 1 + 3)) { /* carry out */
                         SPXSRSX1();     /* shift preserving sticky */
@@ -157,11 +156,8 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
         } else {
                 if (xm >= ym) {
                         xm = xm - ym;
-                        xe = xe;
-                        xs = xs;
                 } else {
                         xm = ym - xm;
-                        xe = xe;
                         xs = ys;
                 }
                 if (xm == 0) {
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 3f8059602765..0dbb65a51ce5 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -430,6 +430,7 @@ static inline void local_r4k___flush_cache_all(void * args)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 /*
                  * These caches are inclusive caches, that is, if something
                  * is not cached in the S-cache, we know it also won't be
@@ -506,7 +507,7 @@ static inline void local_r4k_flush_cache_mm(void * args)
 
         /*
          * Kludge alert.  For obscure reasons R4000SC and R4400SC go nuts if we
-         * only flush the primary caches but R10000 and R12000 behave sane ...
+         * only flush the primary caches but R1x000 behave sane ...
          * R4000SC and R4400SC indexed S-cache ops also invalidate primary
          * caches, so we can bail out early.
          */
@@ -888,33 +889,39 @@ static inline void rm7k_erratum31(void)
         }
 }
 
-static inline void alias_74k_erratum(struct cpuinfo_mips *c)
+static inline int alias_74k_erratum(struct cpuinfo_mips *c)
 {
         unsigned int imp = c->processor_id & PRID_IMP_MASK;
         unsigned int rev = c->processor_id & PRID_REV_MASK;
+        int present = 0;
 
         /*
          * Early versions of the 74K do not update the cache tags on a
          * vtag miss/ptag hit which can occur in the case of KSEG0/KUSEG
-         * aliases. In this case it is better to treat the cache as always
-         * having aliases.
+         * aliases.  In this case it is better to treat the cache as always
+         * having aliases.  Also disable the synonym tag update feature
+         * where available.  In this case no opportunistic tag update will
+         * happen where a load causes a virtual address miss but a physical
+         * address hit during a D-cache look-up.
          */
         switch (imp) {
         case PRID_IMP_74K:
                 if (rev <= PRID_REV_ENCODE_332(2, 4, 0))
-                        c->dcache.flags |= MIPS_CACHE_VTAG;
+                        present = 1;
                 if (rev == PRID_REV_ENCODE_332(2, 4, 0))
                         write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
                 break;
         case PRID_IMP_1074K:
                 if (rev <= PRID_REV_ENCODE_332(1, 1, 0)) {
-                        c->dcache.flags |= MIPS_CACHE_VTAG;
+                        present = 1;
                         write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
                 }
                 break;
         default:
                 BUG();
         }
+
+        return present;
 }
 
 static void b5k_instruction_hazard(void)
@@ -938,6 +945,7 @@ static void probe_pcache(void)
         struct cpuinfo_mips *c = &current_cpu_data;
         unsigned int config = read_c0_config();
         unsigned int prid = read_c0_prid();
+        int has_74k_erratum = 0;
         unsigned long config1;
         unsigned int lsize;
 
@@ -1012,6 +1020,7 @@ static void probe_pcache(void)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 icache_size = 1 << (12 + ((config & R10K_CONF_IC) >> 29));
                 c->icache.linesz = 64;
                 c->icache.ways = 2;
@@ -1223,8 +1232,8 @@ static void probe_pcache(void)
                 dcache_size / (c->dcache.linesz * c->dcache.ways) : 0;
 
         /*
-         * R10000 and R12000 P-caches are odd in a positive way.  They're 32kB
-         * 2-way virtually indexed so normally would suffer from aliases.  So
+         * R1x000 P-caches are odd in a positive way.  They're 32kB 2-way
+         * virtually indexed so normally would suffer from aliases.  So
          * normally they'd suffer from aliases but magic in the hardware deals
          * with that for us so we don't need to take care ourselves.
          */
@@ -1240,11 +1249,12 @@ static void probe_pcache(void)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 break;
 
         case CPU_74K:
         case CPU_1074K:
-                alias_74k_erratum(c);
+                has_74k_erratum = alias_74k_erratum(c);
                 /* Fall through. */
         case CPU_M14KC:
         case CPU_M14KEC:
@@ -1259,7 +1269,7 @@ static void probe_pcache(void)
                 if (!(read_c0_config7() & MIPS_CONF7_IAR) &&
                     (c->icache.waysize > PAGE_SIZE))
                         c->icache.flags |= MIPS_CACHE_ALIASES;
-                if (read_c0_config7() & MIPS_CONF7_AR) {
+                if (!has_74k_erratum && (read_c0_config7() & MIPS_CONF7_AR)) {
                         /*
                          * Effectively physically indexed dcache,
                          * thus no virtual aliases.
@@ -1268,7 +1278,7 @@ static void probe_pcache(void)
                         break;
                 }
         default:
-                if (c->dcache.waysize > PAGE_SIZE)
+                if (has_74k_erratum || c->dcache.waysize > PAGE_SIZE)
                         c->dcache.flags |= MIPS_CACHE_ALIASES;
         }
 
@@ -1438,6 +1448,7 @@ static void setup_scache(void)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 scache_size = 0x80000 << ((config & R10K_CONF_SS) >> 16);
                 c->scache.linesz = 64 << ((config >> 13) & 1);
                 c->scache.ways = 2;
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 7e3ea7766822..77d96db8253c 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -119,36 +119,37 @@ void __flush_anon_page(struct page *page, unsigned long vmaddr)
 
 EXPORT_SYMBOL(__flush_anon_page);
 
-static void mips_flush_dcache_from_pte(pte_t pteval, unsigned long address)
+void __flush_icache_page(struct vm_area_struct *vma, struct page *page)
+{
+        unsigned long addr;
+
+        if (PageHighMem(page))
+                return;
+
+        addr = (unsigned long) page_address(page);
+        flush_data_cache_page(addr);
+}
+EXPORT_SYMBOL_GPL(__flush_icache_page);
+
+void __update_cache(struct vm_area_struct *vma, unsigned long address,
+        pte_t pte)
 {
         struct page *page;
-        unsigned long pfn = pte_pfn(pteval);
+        unsigned long pfn, addr;
+        int exec = (vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc;
 
+        pfn = pte_pfn(pte);
         if (unlikely(!pfn_valid(pfn)))
                 return;
-
         page = pfn_to_page(pfn);
         if (page_mapping(page) && Page_dcache_dirty(page)) {
-                unsigned long page_addr = (unsigned long) page_address(page);
-
-                if (!cpu_has_ic_fills_f_dc ||
-                    pages_do_alias(page_addr, address & PAGE_MASK))
-                        flush_data_cache_page(page_addr);
+                addr = (unsigned long) page_address(page);
+                if (exec || pages_do_alias(addr, address & PAGE_MASK))
+                        flush_data_cache_page(addr);
                 ClearPageDcacheDirty(page);
         }
 }
 
-void set_pte_at(struct mm_struct *mm, unsigned long addr,
-        pte_t *ptep, pte_t pteval)
-{
-        if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc) {
-                if (pte_present(pteval))
-                        mips_flush_dcache_from_pte(pteval, addr);
-        }
-
-        set_pte(ptep, pteval);
-}
-
 unsigned long _page_cachable_default;
 EXPORT_SYMBOL(_page_cachable_default);
 
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index af5f046e627e..609d1241b0c4 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -258,7 +258,7 @@ static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
         if (cpu_needs_post_dma_flush(dev))
                 __dma_sync(dma_addr_to_page(dev, dma_addr),
                            dma_addr & ~PAGE_MASK, size, direction);
-
+        plat_post_dma_flush(dev);
         plat_unmap_dma_mem(dev, dma_addr, size, direction);
 }
 
@@ -312,6 +312,7 @@ static void mips_dma_sync_single_for_cpu(struct device *dev,
         if (cpu_needs_post_dma_flush(dev))
                 __dma_sync(dma_addr_to_page(dev, dma_handle),
                            dma_handle & ~PAGE_MASK, size, direction);
+        plat_post_dma_flush(dev);
 }
 
 static void mips_dma_sync_single_for_device(struct device *dev,
@@ -331,6 +332,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
                 for (i = 0; i < nelems; i++, sg++)
                         __dma_sync(sg_page(sg), sg->offset, sg->length,
                                    direction);
+        plat_post_dma_flush(dev);
 }
 
 static void mips_dma_sync_sg_for_device(struct device *dev,
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 448cde372af0..faa5c9822ecc 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -96,7 +96,7 @@ static void *__kmap_pgprot(struct page *page, unsigned long addr, pgprot_t prot)
         vaddr = __fix_to_virt(FIX_CMAP_END - idx);
         pte = mk_pte(page, prot);
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
-        entrylo = pte.pte_high;
+        entrylo = pte_to_entrylo(pte.pte_high);
 #else
         entrylo = pte_to_entrylo(pte_val(pte));
 #endif
@@ -106,6 +106,11 @@ static void *__kmap_pgprot(struct page *page, unsigned long addr, pgprot_t prot)
         write_c0_entryhi(vaddr & (PAGE_MASK << 1));
         write_c0_entrylo0(entrylo);
         write_c0_entrylo1(entrylo);
+#ifdef CONFIG_XPA
+        entrylo = (pte.pte_low & _PFNX_MASK);
+        writex_c0_entrylo0(entrylo);
+        writex_c0_entrylo1(entrylo);
+#endif
         tlbidx = read_c0_wired();
         write_c0_wired(tlbidx + 1);
         write_c0_index(tlbidx);
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
index 3f85f921801b..885d73ffd6fb 100644
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
@@ -157,6 +157,7 @@ static void set_prefetch_parameters(void)
                 case CPU_R10000:
                 case CPU_R12000:
                 case CPU_R14000:
+                case CPU_R16000:
                         /*
                          * Those values have been experimentally tuned for an
                          * Origin 200.
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index b2afa49beab0..a27a088e6f9f 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -333,9 +333,17 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
                 ptep = pte_offset_map(pmdp, address);
 
 #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
+#ifdef CONFIG_XPA
+                write_c0_entrylo0(pte_to_entrylo(ptep->pte_high));
+                writex_c0_entrylo0(ptep->pte_low & _PFNX_MASK);
+                ptep++;
+                write_c0_entrylo1(pte_to_entrylo(ptep->pte_high));
+                writex_c0_entrylo1(ptep->pte_low & _PFNX_MASK);
+#else
                 write_c0_entrylo0(ptep->pte_high);
                 ptep++;
                 write_c0_entrylo1(ptep->pte_high);
+#endif
 #else
                 write_c0_entrylo0(pte_to_entrylo(pte_val(*ptep++)));
                 write_c0_entrylo1(pte_to_entrylo(pte_val(*ptep)));
@@ -355,6 +363,9 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
 void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
                      unsigned long entryhi, unsigned long pagemask)
 {
+#ifdef CONFIG_XPA
+        panic("Broken for XPA kernels");
+#else
         unsigned long flags;
         unsigned long wired;
         unsigned long old_pagemask;
@@ -383,6 +394,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
         write_c0_pagemask(old_pagemask);
         local_flush_tlb_all();
         local_irq_restore(flags);
+#endif
 }
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -477,7 +489,8 @@ static void r4k_tlb_configure(void)
         write_c0_wired(0);
         if (current_cpu_type() == CPU_R10000 ||
             current_cpu_type() == CPU_R12000 ||
-            current_cpu_type() == CPU_R14000)
+            current_cpu_type() == CPU_R14000 ||
+            current_cpu_type() == CPU_R16000)
                 write_c0_framemask(0);
 
         if (cpu_has_rixi) {
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index d75ff73a2012..97c87027c17f 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -35,6 +35,17 @@
 #include <asm/uasm.h>
 #include <asm/setup.h>
 
+static int __cpuinitdata mips_xpa_disabled;
+
+static int __init xpa_disable(char *s)
+{
+        mips_xpa_disabled = 1;
+
+        return 1;
+}
+
+__setup("noxpa", xpa_disable);
+
 /*
  * TLB load/store/modify handlers.
  *
@@ -231,14 +242,14 @@ static void output_pgtable_bits_defines(void)
         pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT);
         pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT);
 #endif
+#ifdef CONFIG_CPU_MIPSR2
         if (cpu_has_rixi) {
 #ifdef _PAGE_NO_EXEC_SHIFT
                 pr_define("_PAGE_NO_EXEC_SHIFT %d\n", _PAGE_NO_EXEC_SHIFT);
-#endif
-#ifdef _PAGE_NO_READ_SHIFT
                 pr_define("_PAGE_NO_READ_SHIFT %d\n", _PAGE_NO_READ_SHIFT);
 #endif
         }
+#endif
         pr_define("_PAGE_GLOBAL_SHIFT %d\n", _PAGE_GLOBAL_SHIFT);
         pr_define("_PAGE_VALID_SHIFT %d\n", _PAGE_VALID_SHIFT);
         pr_define("_PAGE_DIRTY_SHIFT %d\n", _PAGE_DIRTY_SHIFT);
@@ -501,26 +512,9 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,
         case tlb_indexed: tlbw = uasm_i_tlbwi; break;
         }
 
-        if (cpu_has_mips_r2_exec_hazard) {
-                /*
-                 * The architecture spec says an ehb is required here,
-                 * but a number of cores do not have the hazard and
-                 * using an ehb causes an expensive pipeline stall.
-                 */
-                switch (current_cpu_type()) {
-                case CPU_M14KC:
-                case CPU_74K:
-                case CPU_1074K:
-                case CPU_PROAPTIV:
-                case CPU_P5600:
-                case CPU_M5150:
-                case CPU_QEMU_GENERIC:
-                        break;
-
-                default:
+        if (cpu_has_mips_r2_r6) {
+                if (cpu_has_mips_r2_exec_hazard)
                         uasm_i_ehb(p);
-                        break;
-                }
                 tlbw(p);
                 return;
         }
@@ -569,6 +563,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
         case CPU_4KC:
         case CPU_4KEC:
         case CPU_M14KC:
@@ -1027,12 +1022,27 @@ static void build_update_entries(u32 **p, unsigned int tmp, unsigned int ptep)
         } else {
                 int pte_off_even = sizeof(pte_t) / 2;
                 int pte_off_odd = pte_off_even + sizeof(pte_t);
+#ifdef CONFIG_XPA
+                const int scratch = 1; /* Our extra working register */
 
-                /* The pte entries are pre-shifted */
-                uasm_i_lw(p, tmp, pte_off_even, ptep); /* get even pte */
-                UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
-                uasm_i_lw(p, ptep, pte_off_odd, ptep); /* get odd pte */
-                UASM_i_MTC0(p, ptep, C0_ENTRYLO1); /* load it */
+                uasm_i_addu(p, scratch, 0, ptep);
+#endif
+                uasm_i_lw(p, tmp, pte_off_even, ptep); /* even pte */
+                uasm_i_lw(p, ptep, pte_off_odd, ptep); /* odd pte */
+                UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL));
+                UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL));
+                UASM_i_MTC0(p, tmp, C0_ENTRYLO0);
+                UASM_i_MTC0(p, ptep, C0_ENTRYLO1);
+#ifdef CONFIG_XPA
+                uasm_i_lw(p, tmp, 0, scratch);
+                uasm_i_lw(p, ptep, sizeof(pte_t), scratch);
+                uasm_i_lui(p, scratch, 0xff);
+                uasm_i_ori(p, scratch, scratch, 0xffff);
+                uasm_i_and(p, tmp, scratch, tmp);
+                uasm_i_and(p, ptep, scratch, ptep);
+                uasm_i_mthc0(p, tmp, C0_ENTRYLO0);
+                uasm_i_mthc0(p, ptep, C0_ENTRYLO1);
+#endif
         }
 #else
         UASM_i_LW(p, tmp, 0, ptep); /* get even pte */
@@ -1533,8 +1543,14 @@ iPTE_SW(u32 **p, struct uasm_reloc **r, unsigned int pte, unsigned int ptr,
 {
 #ifdef CONFIG_PHYS_ADDR_T_64BIT
         unsigned int hwmode = mode & (_PAGE_VALID | _PAGE_DIRTY);
-#endif
 
+        if (!cpu_has_64bits) {
+                const int scratch = 1; /* Our extra working register */
+
+                uasm_i_lui(p, scratch, (mode >> 16));
+                uasm_i_or(p, pte, pte, scratch);
+        } else
+#endif
         uasm_i_ori(p, pte, pte, mode);
 #ifdef CONFIG_SMP
 # ifdef CONFIG_PHYS_ADDR_T_64BIT
@@ -1598,15 +1614,17 @@ build_pte_present(u32 **p, struct uasm_reloc **r,
                         uasm_il_bbit0(p, r, pte, ilog2(_PAGE_PRESENT), lid);
                         uasm_i_nop(p);
                 } else {
-                        uasm_i_andi(p, t, pte, _PAGE_PRESENT);
+                        uasm_i_srl(p, t, pte, _PAGE_PRESENT_SHIFT);
+                        uasm_i_andi(p, t, t, 1);
                         uasm_il_beqz(p, r, t, lid);
                         if (pte == t)
                                 /* You lose the SMP race :-(*/
                                 iPTE_LW(p, pte, ptr);
                 }
         } else {
-                uasm_i_andi(p, t, pte, _PAGE_PRESENT | _PAGE_READ);
-                uasm_i_xori(p, t, t, _PAGE_PRESENT | _PAGE_READ);
+                uasm_i_srl(p, t, pte, _PAGE_PRESENT_SHIFT);
+                uasm_i_andi(p, t, t, 3);
+                uasm_i_xori(p, t, t, 3);
                 uasm_il_bnez(p, r, t, lid);
                 if (pte == t)
                         /* You lose the SMP race :-(*/
@@ -1635,8 +1653,9 @@ build_pte_writable(u32 **p, struct uasm_reloc **r,
 {
         int t = scratch >= 0 ? scratch : pte;
 
-        uasm_i_andi(p, t, pte, _PAGE_PRESENT | _PAGE_WRITE);
-        uasm_i_xori(p, t, t, _PAGE_PRESENT | _PAGE_WRITE);
+        uasm_i_srl(p, t, pte, _PAGE_PRESENT_SHIFT);
+        uasm_i_andi(p, t, t, 5);
+        uasm_i_xori(p, t, t, 5);
         uasm_il_bnez(p, r, t, lid);
         if (pte == t)
                 /* You lose the SMP race :-(*/
@@ -1672,7 +1691,8 @@ build_pte_modifiable(u32 **p, struct uasm_reloc **r,
                 uasm_i_nop(p);
         } else {
                 int t = scratch >= 0 ? scratch : pte;
-                uasm_i_andi(p, t, pte, _PAGE_WRITE);
+                uasm_i_srl(p, t, pte, _PAGE_WRITE_SHIFT);
+                uasm_i_andi(p, t, t, 1);
                 uasm_il_beqz(p, r, t, lid);
                 if (pte == t)
                         /* You lose the SMP race :-(*/
@@ -2285,6 +2305,11 @@ static void config_htw_params(void)
 
         pwsize = ilog2(PTRS_PER_PGD) << MIPS_PWSIZE_GDW_SHIFT;
         pwsize |= ilog2(PTRS_PER_PTE) << MIPS_PWSIZE_PTW_SHIFT;
+
+        /* If XPA has been enabled, PTEs are 64-bit in size. */
+        if (read_c0_pagegrain() & PG_ELPA)
+                pwsize |= 1;
+
         write_c0_pwsize(pwsize);
 
         /* Make sure everything is set before we enable the HTW */
@@ -2298,6 +2323,28 @@ static void config_htw_params(void)
         print_htw_config();
 }
 
+static void config_xpa_params(void)
+{
+#ifdef CONFIG_XPA
+        unsigned int pagegrain;
+
+        if (mips_xpa_disabled) {
+                pr_info("Extended Physical Addressing (XPA) disabled\n");
+                return;
+        }
+
+        pagegrain = read_c0_pagegrain();
+        write_c0_pagegrain(pagegrain | PG_ELPA);
+        back_to_back_c0_hazard();
+        pagegrain = read_c0_pagegrain();
+
+        if (pagegrain & PG_ELPA)
+                pr_info("Extended Physical Addressing (XPA) enabled\n");
+        else
+                panic("Extended Physical Addressing (XPA) disabled");
+#endif
+}
+
 void build_tlb_refill_handler(void)
 {
         /*
@@ -2362,8 +2409,9 @@ void build_tlb_refill_handler(void)
                 }
                 if (cpu_has_local_ebase)
                         build_r4000_tlb_refill_handler();
+                if (cpu_has_xpa)
+                        config_xpa_params();
                 if (cpu_has_htw)
                         config_htw_params();
-
         }
 }
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index 8fddd2cdbff7..b769657be4d4 100644
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/cdmm.h>
 #include <asm/maar.h>
 #include <asm/sections.h>
 #include <asm/fw/fw.h>
@@ -53,6 +54,12 @@ fw_memblock_t * __init fw_getmdesc(int eva)
                 pr_warn("memsize not set in YAMON, set to default (32Mb)\n");
                 physical_memsize = 0x02000000;
         } else {
+                if (memsize > (256 << 20)) { /* memsize should be capped to 256M */
+                        pr_warn("Unsupported memsize value (0x%lx) detected! "
+                                "Using 0x10000000 (256M) instead\n",
+                                memsize);
+                        memsize = 256 << 20;
+                }
                 /* If ememsize is set, then set physical_memsize to that */
                 physical_memsize = ememsize ? : memsize;
         }
@@ -196,3 +203,9 @@ unsigned platform_maar_init(unsigned num_pairs)
 
         return maar_config(cfg, num_cfg, num_pairs);
 }
+
+phys_addr_t mips_cdmm_phys_base(void)
+{
+        /* This address is "typically unused" */
+        return 0x1fc10000;
+}
diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index ce02dbdedc62..185e68261f45 100644
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -87,8 +87,10 @@ static void __init estimate_frequencies(void)
 
         /* Initialize counters. */
         start = read_c0_count();
-        if (gic_present)
+        if (gic_present) {
+                gic_start_count();
                 gicstart = gic_read_count();
+        }
 
         /* Read counter exactly on falling edge of update flag. */
         while (CMOS_READ(RTC_REG_A) & RTC_UIP);
@@ -115,6 +117,22 @@ void read_persistent_clock(struct timespec *ts)
         ts->tv_nsec = 0;
 }
 
+int get_c0_fdc_int(void)
+{
+        int mips_cpu_fdc_irq;
+
+        if (cpu_has_veic)
+                mips_cpu_fdc_irq = -1;
+        else if (gic_present)
+                mips_cpu_fdc_irq = gic_get_c0_fdc_int();
+        else if (cp0_fdc_irq >= 0)
+                mips_cpu_fdc_irq = MIPS_CPU_IRQ_BASE + cp0_fdc_irq;
+        else
+                mips_cpu_fdc_irq = -1;
+
+        return mips_cpu_fdc_irq;
+}
+
 int get_c0_perfcount_int(void)
 {
         if (cpu_has_veic) {
diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile
index 2ae49e99eb67..ecd71db6258b 100644
--- a/arch/mips/mti-sead3/Makefile
+++ b/arch/mips/mti-sead3/Makefile
@@ -9,14 +9,11 @@
 # Steven J. Hill <sjhill@mips.com>
 #
 obj-y                           := sead3-lcd.o sead3-display.o sead3-init.o \
-                                   sead3-int.o sead3-mtd.o sead3-net.o \
-                                   sead3-platform.o sead3-reset.o \
+                                   sead3-int.o sead3-platform.o sead3-reset.o \
                                    sead3-setup.o sead3-time.o
 
-obj-y                           += sead3-i2c-dev.o sead3-i2c.o \
-                                   leds-sead3.o sead3-leds.o
+obj-y                           += leds-sead3.o
 
 obj-$(CONFIG_EARLY_PRINTK)      += sead3-console.o
-obj-$(CONFIG_USB_EHCI_HCD)      += sead3-ehci.o
 
 CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt
diff --git a/arch/mips/mti-sead3/leds-sead3.c b/arch/mips/mti-sead3/leds-sead3.c
index 3abe47b316aa..c938ceeb8848 100644
--- a/arch/mips/mti-sead3/leds-sead3.c
+++ b/arch/mips/mti-sead3/leds-sead3.c
@@ -4,6 +4,7 @@
  * for more details.
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
+ * Copyright (C) 2015 Imagination Technologies, Inc.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -13,22 +14,18 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#define DRVNAME "sead3-led"
-
-static struct platform_device *pdev;
+#include <asm/mips-boards/sead3-addr.h>
 
 static void sead3_pled_set(struct led_classdev *led_cdev,
                 enum led_brightness value)
 {
-        pr_debug("sead3_pled_set\n");
-        writel(value, (void __iomem *)0xBF000210);      /* FIXME */
+        writel(value, (void __iomem *)SEAD3_CPLD_P_LED);
 }
 
 static void sead3_fled_set(struct led_classdev *led_cdev,
                 enum led_brightness value)
 {
-        pr_debug("sead3_fled_set\n");
-        writel(value, (void __iomem *)0xBF000218);      /* FIXME */
+        writel(value, (void __iomem *)SEAD3_CPLD_F_LED);
 }
 
 static struct led_classdev sead3_pled = {
@@ -69,37 +66,11 @@ static struct platform_driver sead3_led_driver = {
         .probe          = sead3_led_probe,
         .remove         = sead3_led_remove,
         .driver         = {
-                .name           = DRVNAME,
+                .name           = "sead3-led",
         },
 };
 
-static int __init sead3_led_init(void)
-{
-        int ret;
-
-        ret = platform_driver_register(&sead3_led_driver);
-        if (ret < 0)
-                goto out;
-
-        pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
-        if (IS_ERR(pdev)) {
-                ret = PTR_ERR(pdev);
-                platform_driver_unregister(&sead3_led_driver);
-                goto out;
-        }
-
-out:
-        return ret;
-}
-
-static void __exit sead3_led_exit(void)
-{
-        platform_device_unregister(pdev);
-        platform_driver_unregister(&sead3_led_driver);
-}
-
-module_init(sead3_led_init);
-module_exit(sead3_led_exit);
+module_platform_driver(sead3_led_driver);
 
 MODULE_AUTHOR("Kristian Kielhofner <kris@krisk.org>");
 MODULE_DESCRIPTION("SEAD3 LED driver");
diff --git a/arch/mips/mti-sead3/sead3-ehci.c b/arch/mips/mti-sead3/sead3-ehci.c
deleted file mode 100644
index 014dd7ba4d68..000000000000
--- a/arch/mips/mti-sead3/sead3-ehci.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/module.h>
-#include <linux/irq.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/irqchip/mips-gic.h>
-
-#include <asm/mips-boards/sead3int.h>
-
-struct resource ehci_resources[] = {
-        {
-                .start                  = 0x1b200000,
-                .end                    = 0x1b200fff,
-                .flags                  = IORESOURCE_MEM
-        },
-        {
-                .flags                  = IORESOURCE_IRQ
-        }
-};
-
-u64 sead3_usbdev_dma_mask = DMA_BIT_MASK(32);
-
-static struct platform_device ehci_device = {
-        .name           = "sead3-ehci",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = &sead3_usbdev_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32)
-        },
-        .num_resources  = ARRAY_SIZE(ehci_resources),
-        .resource       = ehci_resources
-};
-
-static int __init ehci_init(void)
-{
-        if (gic_present)
-                ehci_resources[1].start = MIPS_GIC_IRQ_BASE + GIC_INT_EHCI;
-        else
-                ehci_resources[1].start = MIPS_CPU_IRQ_BASE + CPU_INT_EHCI;
-        return platform_device_register(&ehci_device);
-}
-
-module_init(ehci_init);
-
-MODULE_AUTHOR("Chris Dearman <chris@mips.com>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("EHCI probe driver for SEAD3");
diff --git a/arch/mips/mti-sead3/sead3-i2c-dev.c b/arch/mips/mti-sead3/sead3-i2c-dev.c
deleted file mode 100644
index eca0b53a71dd..000000000000
--- a/arch/mips/mti-sead3/sead3-i2c-dev.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/i2c.h>
-
-static struct i2c_board_info __initdata sead3_i2c_devices[] = {
-        {
-                I2C_BOARD_INFO("adt7476", 0x2c),
-                .irq = 0,
-        },
-        {
-                I2C_BOARD_INFO("m41t80", 0x68),
-                .irq = 0,
-        },
-};
-
-static int __init sead3_i2c_init(void)
-{
-        int err;
-
-        err = i2c_register_board_info(0, sead3_i2c_devices,
-                                        ARRAY_SIZE(sead3_i2c_devices));
-        if (err < 0)
-                pr_err("sead3-i2c-dev: cannot register board I2C devices\n");
-        return err;
-}
-
-arch_initcall(sead3_i2c_init);
diff --git a/arch/mips/mti-sead3/sead3-i2c-drv.c b/arch/mips/mti-sead3/sead3-i2c-drv.c
deleted file mode 100644
index 2bebf0974e39..000000000000
--- a/arch/mips/mti-sead3/sead3-i2c-drv.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/i2c.h>
-#include <linux/platform_device.h>
-
-#define PIC32_I2CxCON           0x0000
-#define  PIC32_I2CCON_ON        (1<<15)
-#define  PIC32_I2CCON_ACKDT     (1<<5)
-#define  PIC32_I2CCON_ACKEN     (1<<4)
-#define  PIC32_I2CCON_RCEN      (1<<3)
-#define  PIC32_I2CCON_PEN       (1<<2)
-#define  PIC32_I2CCON_RSEN      (1<<1)
-#define  PIC32_I2CCON_SEN       (1<<0)
-#define PIC32_I2CxCONCLR        0x0004
-#define PIC32_I2CxCONSET        0x0008
-#define PIC32_I2CxSTAT          0x0010
-#define PIC32_I2CxSTATCLR       0x0014
-#define  PIC32_I2CSTAT_ACKSTAT  (1<<15)
-#define  PIC32_I2CSTAT_TRSTAT   (1<<14)
-#define  PIC32_I2CSTAT_BCL      (1<<10)
-#define  PIC32_I2CSTAT_IWCOL    (1<<7)
-#define  PIC32_I2CSTAT_I2COV    (1<<6)
-#define PIC32_I2CxBRG           0x0040
-#define PIC32_I2CxTRN           0x0050
-#define PIC32_I2CxRCV           0x0060
-
-static DEFINE_SPINLOCK(pic32_bus_lock);
-
-static void __iomem *bus_xfer   = (void __iomem *)0xbf000600;
-static void __iomem *bus_status = (void __iomem *)0xbf000060;
-
-#define DELAY() udelay(100)
-
-static inline unsigned int ioready(void)
-{
-        return readl(bus_status) & 1;
-}
-
-static inline void wait_ioready(void)
-{
-        do { } while (!ioready());
-}
-
-static inline void wait_ioclear(void)
-{
-        do { } while (ioready());
-}
-
-static inline void check_ioclear(void)
-{
-        if (ioready()) {
-                do {
-                        (void) readl(bus_xfer);
-                        DELAY();
-                } while (ioready());
-        }
-}
-
-static u32 pic32_bus_readl(u32 reg)
-{
-        unsigned long flags;
-        u32 status, val;
-
-        spin_lock_irqsave(&pic32_bus_lock, flags);
-
-        check_ioclear();
-        writel((0x01 << 24) | (reg & 0x00ffffff), bus_xfer);
-        DELAY();
-        wait_ioready();
-        status = readl(bus_xfer);
-        DELAY();
-        val = readl(bus_xfer);
-        wait_ioclear();
-
-        spin_unlock_irqrestore(&pic32_bus_lock, flags);
-
-        return val;
-}
-
-static void pic32_bus_writel(u32 val, u32 reg)
-{
-        unsigned long flags;
-        u32 status;
-
-        spin_lock_irqsave(&pic32_bus_lock, flags);
-
-        check_ioclear();
-        writel((0x10 << 24) | (reg & 0x00ffffff), bus_xfer);
-        DELAY();
-        writel(val, bus_xfer);
-        DELAY();
-        wait_ioready();
-        status = readl(bus_xfer);
-        wait_ioclear();
-
-        spin_unlock_irqrestore(&pic32_bus_lock, flags);
-}
-
-struct pic32_i2c_platform_data {
-        u32     base;
-        struct i2c_adapter adap;
-        u32     xfer_timeout;
-        u32     ack_timeout;
-        u32     ctl_timeout;
-};
-
-static inline void pic32_i2c_start(struct pic32_i2c_platform_data *adap)
-{
-        pic32_bus_writel(PIC32_I2CCON_SEN, adap->base + PIC32_I2CxCONSET);
-}
-
-static inline void pic32_i2c_stop(struct pic32_i2c_platform_data *adap)
-{
-        pic32_bus_writel(PIC32_I2CCON_PEN, adap->base + PIC32_I2CxCONSET);
-}
-
-static inline void pic32_i2c_ack(struct pic32_i2c_platform_data *adap)
-{
-        pic32_bus_writel(PIC32_I2CCON_ACKDT, adap->base + PIC32_I2CxCONCLR);
-        pic32_bus_writel(PIC32_I2CCON_ACKEN, adap->base + PIC32_I2CxCONSET);
-}
-
-static inline void pic32_i2c_nack(struct pic32_i2c_platform_data *adap)
-{
-        pic32_bus_writel(PIC32_I2CCON_ACKDT, adap->base + PIC32_I2CxCONSET);
-        pic32_bus_writel(PIC32_I2CCON_ACKEN, adap->base + PIC32_I2CxCONSET);
-}
-
-static inline int pic32_i2c_idle(struct pic32_i2c_platform_data *adap)
-{
-        int i;
-
-        for (i = 0; i < adap->ctl_timeout; i++) {
-                if (((pic32_bus_readl(adap->base + PIC32_I2CxCON) &
-                      (PIC32_I2CCON_ACKEN | PIC32_I2CCON_RCEN |
-                       PIC32_I2CCON_PEN | PIC32_I2CCON_RSEN |
-                       PIC32_I2CCON_SEN)) == 0) &&
-                    ((pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
-                      (PIC32_I2CSTAT_TRSTAT)) == 0))
-                        return 0;
-                udelay(1);
-        }
-        return -ETIMEDOUT;
-}
-
-static inline u32 pic32_i2c_master_write(struct pic32_i2c_platform_data *adap,
-                u32 byte)
-{
-        pic32_bus_writel(byte, adap->base + PIC32_I2CxTRN);
-        return pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
-                        PIC32_I2CSTAT_IWCOL;
-}
-
-static inline u32 pic32_i2c_master_read(struct pic32_i2c_platform_data *adap)
-{
-        pic32_bus_writel(PIC32_I2CCON_RCEN, adap->base + PIC32_I2CxCONSET);
-        while (pic32_bus_readl(adap->base + PIC32_I2CxCON) & PIC32_I2CCON_RCEN)
-                ;
-        pic32_bus_writel(PIC32_I2CSTAT_I2COV, adap->base + PIC32_I2CxSTATCLR);
-        return pic32_bus_readl(adap->base + PIC32_I2CxRCV);
-}
-
-static int pic32_i2c_address(struct pic32_i2c_platform_data *adap,
-                unsigned int addr, int rd)
-{
-        pic32_i2c_idle(adap);
-        pic32_i2c_start(adap);
-        pic32_i2c_idle(adap);
-
-        addr <<= 1;
-        if (rd)
-                addr |= 1;
-
-        if (pic32_i2c_master_write(adap, addr))
-                return -EIO;
-        pic32_i2c_idle(adap);
-        if (pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
-                        PIC32_I2CSTAT_ACKSTAT)
-                return -EIO;
-        return 0;
-}
-
-static int sead3_i2c_read(struct pic32_i2c_platform_data *adap,
-                unsigned char *buf, unsigned int len)
-{
-        u32 data;
-        int i;
-
-        i = 0;
-        while (i < len) {
-                data = pic32_i2c_master_read(adap);
-                buf[i++] = data;
-                if (i < len)
-                        pic32_i2c_ack(adap);
-                else
-                        pic32_i2c_nack(adap);
-        }
-
-        pic32_i2c_stop(adap);
-        pic32_i2c_idle(adap);
-        return 0;
-}
-
-static int sead3_i2c_write(struct pic32_i2c_platform_data *adap,
-                unsigned char *buf, unsigned int len)
-{
-        int i;
-        u32 data;
-
-        i = 0;
-        while (i < len) {
-                data = buf[i];
-                if (pic32_i2c_master_write(adap, data))
-                        return -EIO;
-                pic32_i2c_idle(adap);
-                if (pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
-                                        PIC32_I2CSTAT_ACKSTAT)
-                        return -EIO;
-                i++;
-        }
-
-        pic32_i2c_stop(adap);
-        pic32_i2c_idle(adap);
-        return 0;
-}
-
-static int sead3_pic32_platform_xfer(struct i2c_adapter *i2c_adap,
-                struct i2c_msg *msgs, int num)
-{
-        struct pic32_i2c_platform_data *adap = i2c_adap->algo_data;
-        struct i2c_msg *p;
-        int i, err = 0;
-
-        for (i = 0; i < num; i++) {
-#define __BUFSIZE 80
-                int ii;
-                static char buf[__BUFSIZE];
-                char *b = buf;
-
-                p = &msgs[i];
-                b += sprintf(buf, " [%d bytes]", p->len);
-                if ((p->flags & I2C_M_RD) == 0) {
-                        for (ii = 0; ii < p->len; ii++) {
-                                if (b < &buf[__BUFSIZE-4]) {
-                                        b += sprintf(b, " %02x", p->buf[ii]);
-                                } else {
-                                        strcat(b, "...");
-                                        break;
-                                }
-                        }
-                }
-        }
-
-        for (i = 0; !err && i < num; i++) {
-                p = &msgs[i];
-                err = pic32_i2c_address(adap, p->addr, p->flags & I2C_M_RD);
-                if (err || !p->len)
-                        continue;
-                if (p->flags & I2C_M_RD)
-                        err = sead3_i2c_read(adap, p->buf, p->len);
-                else
-                        err = sead3_i2c_write(adap, p->buf, p->len);
-        }
-
-        /* Return the number of messages processed, or the error code. */
-        if (err == 0)
-                err = num;
-
-        return err;
-}
-
-static u32 sead3_pic32_platform_func(struct i2c_adapter *adap)
-{
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-}
-
-static const struct i2c_algorithm sead3_platform_algo = {
-        .master_xfer    = sead3_pic32_platform_xfer,
-        .functionality  = sead3_pic32_platform_func,
-};
-
-static void sead3_i2c_platform_setup(struct pic32_i2c_platform_data *priv)
-{
-        pic32_bus_writel(500, priv->base + PIC32_I2CxBRG);
-        pic32_bus_writel(PIC32_I2CCON_ON, priv->base + PIC32_I2CxCONCLR);
-        pic32_bus_writel(PIC32_I2CCON_ON, priv->base + PIC32_I2CxCONSET);
-        pic32_bus_writel(PIC32_I2CSTAT_BCL | PIC32_I2CSTAT_IWCOL,
-                priv->base + PIC32_I2CxSTATCLR);
-}
-
-static int sead3_i2c_platform_probe(struct platform_device *pdev)
-{
-        struct pic32_i2c_platform_data *priv;
-        struct resource *r;
-        int ret;
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!r) {
-                ret = -ENODEV;
-                goto out;
-        }
-
-        priv = kzalloc(sizeof(struct pic32_i2c_platform_data), GFP_KERNEL);
-        if (!priv) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        priv->base = r->start;
-        if (!priv->base) {
-                ret = -EBUSY;
-                goto out_mem;
-        }
-
-        priv->xfer_timeout = 200;
-        priv->ack_timeout = 200;
-        priv->ctl_timeout = 200;
-
-        priv->adap.nr = pdev->id;
-        priv->adap.algo = &sead3_platform_algo;
-        priv->adap.algo_data = priv;
-        priv->adap.dev.parent = &pdev->dev;
-        strlcpy(priv->adap.name, "SEAD3 PIC32", sizeof(priv->adap.name));
-
-        sead3_i2c_platform_setup(priv);
-
-        ret = i2c_add_numbered_adapter(&priv->adap);
-        if (ret == 0) {
-                platform_set_drvdata(pdev, priv);
-                return 0;
-        }
-
-out_mem:
-        kfree(priv);
-out:
-        return ret;
-}
-
-static int sead3_i2c_platform_remove(struct platform_device *pdev)
-{
-        struct pic32_i2c_platform_data *priv = platform_get_drvdata(pdev);
-
-        platform_set_drvdata(pdev, NULL);
-        i2c_del_adapter(&priv->adap);
-        kfree(priv);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int sead3_i2c_platform_suspend(struct platform_device *pdev,
-                pm_message_t state)
-{
-        dev_dbg(&pdev->dev, "i2c_platform_disable\n");
-        return 0;
-}
-
-static int sead3_i2c_platform_resume(struct platform_device *pdev)
-{
-        struct pic32_i2c_platform_data *priv = platform_get_drvdata(pdev);
-
-        dev_dbg(&pdev->dev, "sead3_i2c_platform_setup\n");
-        sead3_i2c_platform_setup(priv);
-
-        return 0;
-}
-#else
-#define sead3_i2c_platform_suspend      NULL
-#define sead3_i2c_platform_resume       NULL
-#endif
-
-static struct platform_driver sead3_i2c_platform_driver = {
-        .driver = {
-                .name   = "sead3-i2c",
-        },
-        .probe          = sead3_i2c_platform_probe,
-        .remove         = sead3_i2c_platform_remove,
-        .suspend        = sead3_i2c_platform_suspend,
-        .resume         = sead3_i2c_platform_resume,
-};
-
-static int __init sead3_i2c_platform_init(void)
-{
-        return platform_driver_register(&sead3_i2c_platform_driver);
-}
-module_init(sead3_i2c_platform_init);
-
-static void __exit sead3_i2c_platform_exit(void)
-{
-        platform_driver_unregister(&sead3_i2c_platform_driver);
-}
-module_exit(sead3_i2c_platform_exit);
-
-MODULE_AUTHOR("Chris Dearman, MIPS Technologies INC.");
-MODULE_DESCRIPTION("SEAD3 PIC32 I2C driver");
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/mti-sead3/sead3-i2c.c b/arch/mips/mti-sead3/sead3-i2c.c
deleted file mode 100644
index 795ae83894e0..000000000000
--- a/arch/mips/mti-sead3/sead3-i2c.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-
-struct resource sead3_i2c_resources[] = {
-        {
-                .start  = 0x805200,
-                .end    = 0x8053ff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device sead3_i2c_device = {
-        .name           = "sead3-i2c",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(sead3_i2c_resources),
-        .resource       = sead3_i2c_resources,
-};
-
-static int __init sead3_i2c_init(void)
-{
-        return platform_device_register(&sead3_i2c_device);
-}
-
-device_initcall(sead3_i2c_init);
diff --git a/arch/mips/mti-sead3/sead3-init.c b/arch/mips/mti-sead3/sead3-init.c
index bfbd17b120a2..3572ea30173e 100644
--- a/arch/mips/mti-sead3/sead3-init.c
+++ b/arch/mips/mti-sead3/sead3-init.c
@@ -147,6 +147,6 @@ void __init prom_init(void)
 #endif
 }
 
-void prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
 }
diff --git a/arch/mips/mti-sead3/sead3-leds.c b/arch/mips/mti-sead3/sead3-leds.c
deleted file mode 100644
index c427c5778186..000000000000
--- a/arch/mips/mti-sead3/sead3-leds.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/leds.h>
-#include <linux/platform_device.h>
-
-#define LEDFLAGS(bits, shift)           \
-        ((bits << 8) | (shift << 8))
-
-#define LEDBITS(id, shift, bits)        \
-        .name = id #shift,              \
-        .flags = LEDFLAGS(bits, shift)
-
-struct led_info led_data_info[] = {
-        { LEDBITS("bit", 0, 1) },
-        { LEDBITS("bit", 1, 1) },
-        { LEDBITS("bit", 2, 1) },
-        { LEDBITS("bit", 3, 1) },
-        { LEDBITS("bit", 4, 1) },
-        { LEDBITS("bit", 5, 1) },
-        { LEDBITS("bit", 6, 1) },
-        { LEDBITS("bit", 7, 1) },
-        { LEDBITS("all", 0, 8) },
-};
-
-static struct led_platform_data led_data = {
-        .num_leds       = ARRAY_SIZE(led_data_info),
-        .leds           = led_data_info
-};
-
-static struct resource pled_resources[] = {
-        {
-                .start  = 0x1f000210,
-                .end    = 0x1f000217,
-                .flags  = IORESOURCE_MEM
-        }
-};
-
-static struct platform_device pled_device = {
-        .name                   = "sead3::pled",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = &led_data,
-        },
-        .num_resources          = ARRAY_SIZE(pled_resources),
-        .resource               = pled_resources
-};
-
-
-static struct resource fled_resources[] = {
-        {
-                .start                  = 0x1f000218,
-                .end                    = 0x1f00021f,
-                .flags                  = IORESOURCE_MEM
-        }
-};
-
-static struct platform_device fled_device = {
-        .name                   = "sead3::fled",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = &led_data,
-        },
-        .num_resources          = ARRAY_SIZE(fled_resources),
-        .resource               = fled_resources
-};
-
-static int __init led_init(void)
-{
-        platform_device_register(&pled_device);
-        return platform_device_register(&fled_device);
-}
-
-device_initcall(led_init);
diff --git a/arch/mips/mti-sead3/sead3-mtd.c b/arch/mips/mti-sead3/sead3-mtd.c
deleted file mode 100644
index f9c890d72677..000000000000
--- a/arch/mips/mti-sead3/sead3-mtd.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/physmap.h>
-
-static struct mtd_partition sead3_mtd_partitions[] = {
-        {
-                .name =         "User FS",
-                .offset =       0x00000000,
-                .size =         0x01fc0000,
-        }, {
-                .name =         "Board Config",
-                .offset =       0x01fc0000,
-                .size =         0x00040000,
-                .mask_flags =   MTD_WRITEABLE
-        },
-};
-
-static struct physmap_flash_data sead3_flash_data = {
-        .width          = 4,
-        .nr_parts       = ARRAY_SIZE(sead3_mtd_partitions),
-        .parts          = sead3_mtd_partitions
-};
-
-static struct resource sead3_flash_resource = {
-        .start          = 0x1c000000,
-        .end            = 0x1dffffff,
-        .flags          = IORESOURCE_MEM
-};
-
-static struct platform_device sead3_flash = {
-        .name           = "physmap-flash",
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &sead3_flash_data,
-        },
-        .num_resources  = 1,
-        .resource       = &sead3_flash_resource,
-};
-
-static int __init sead3_mtd_init(void)
-{
-        platform_device_register(&sead3_flash);
-
-        return 0;
-}
-device_initcall(sead3_mtd_init);
diff --git a/arch/mips/mti-sead3/sead3-net.c b/arch/mips/mti-sead3/sead3-net.c
deleted file mode 100644
index 46176b804576..000000000000
--- a/arch/mips/mti-sead3/sead3-net.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/module.h>
-#include <linux/irq.h>
-#include <linux/irqchip/mips-gic.h>
-#include <linux/platform_device.h>
-#include <linux/smsc911x.h>
-
-#include <asm/mips-boards/sead3int.h>
-
-static struct smsc911x_platform_config sead3_smsc911x_data = {
-        .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
-        .flags  = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
-        .phy_interface = PHY_INTERFACE_MODE_MII,
-};
-
-struct resource sead3_net_resources[] = {
-        {
-                .start                  = 0x1f010000,
-                .end                    = 0x1f01ffff,
-                .flags                  = IORESOURCE_MEM
-        },
-        {
-                .flags                  = IORESOURCE_IRQ
-        }
-};
-
-static struct platform_device sead3_net_device = {
-        .name                   = "smsc911x",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = &sead3_smsc911x_data,
-        },
-        .num_resources          = ARRAY_SIZE(sead3_net_resources),
-        .resource               = sead3_net_resources
-};
-
-static int __init sead3_net_init(void)
-{
-        if (gic_present)
-                sead3_net_resources[1].start = MIPS_GIC_IRQ_BASE + GIC_INT_NET;
-        else
-                sead3_net_resources[1].start = MIPS_CPU_IRQ_BASE + CPU_INT_NET;
-        return platform_device_register(&sead3_net_device);
-}
-
-module_init(sead3_net_init);
-
-MODULE_AUTHOR("Chris Dearman <chris@mips.com>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Network probe driver for SEAD-3");
diff --git a/arch/mips/mti-sead3/sead3-platform.c b/arch/mips/mti-sead3/sead3-platform.c
index 53ee6f1f018d..73b73efbfb05 100644
--- a/arch/mips/mti-sead3/sead3-platform.c
+++ b/arch/mips/mti-sead3/sead3-platform.c
@@ -5,10 +5,15 @@
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
-#include <linux/module.h>
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/irqchip/mips-gic.h>
+#include <linux/leds.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
 #include <linux/serial_8250.h>
+#include <linux/smsc911x.h>
 
 #include <asm/mips-boards/sead3int.h>
 
@@ -36,20 +41,183 @@ static struct platform_device uart8250_device = {
         },
 };
 
-static int __init uart8250_init(void)
+static struct smsc911x_platform_config sead3_smsc911x_data = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct resource sead3_net_resources[] = {
+        {
+                .start                  = 0x1f010000,
+                .end                    = 0x1f01ffff,
+                .flags                  = IORESOURCE_MEM
+        }, {
+                .flags                  = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device sead3_net_device = {
+        .name                   = "smsc911x",
+        .id                     = 0,
+        .dev                    = {
+                .platform_data  = &sead3_smsc911x_data,
+        },
+        .num_resources          = ARRAY_SIZE(sead3_net_resources),
+        .resource               = sead3_net_resources
+};
+
+static struct mtd_partition sead3_mtd_partitions[] = {
+        {
+                .name =         "User FS",
+                .offset =       0x00000000,
+                .size =         0x01fc0000,
+        }, {
+                .name =         "Board Config",
+                .offset =       0x01fc0000,
+                .size =         0x00040000,
+                .mask_flags =   MTD_WRITEABLE
+        },
+};
+
+static struct physmap_flash_data sead3_flash_data = {
+        .width          = 4,
+        .nr_parts       = ARRAY_SIZE(sead3_mtd_partitions),
+        .parts          = sead3_mtd_partitions
+};
+
+static struct resource sead3_flash_resource = {
+        .start          = 0x1c000000,
+        .end            = 0x1dffffff,
+        .flags          = IORESOURCE_MEM
+};
+
+static struct platform_device sead3_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &sead3_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &sead3_flash_resource,
+};
+
+#define LEDFLAGS(bits, shift)           \
+        ((bits << 8) | (shift << 8))
+
+#define LEDBITS(id, shift, bits)        \
+        .name = id #shift,              \
+        .flags = LEDFLAGS(bits, shift)
+
+static struct led_info led_data_info[] = {
+        { LEDBITS("bit", 0, 1) },
+        { LEDBITS("bit", 1, 1) },
+        { LEDBITS("bit", 2, 1) },
+        { LEDBITS("bit", 3, 1) },
+        { LEDBITS("bit", 4, 1) },
+        { LEDBITS("bit", 5, 1) },
+        { LEDBITS("bit", 6, 1) },
+        { LEDBITS("bit", 7, 1) },
+        { LEDBITS("all", 0, 8) },
+};
+
+static struct led_platform_data led_data = {
+        .num_leds       = ARRAY_SIZE(led_data_info),
+        .leds           = led_data_info
+};
+
+static struct resource pled_resources[] = {
+        {
+                .start  = 0x1f000210,
+                .end    = 0x1f000217,
+                .flags  = IORESOURCE_MEM
+        }
+};
+
+static struct platform_device pled_device = {
+        .name                   = "sead3::pled",
+        .id                     = 0,
+        .dev                    = {
+                .platform_data  = &led_data,
+        },
+        .num_resources          = ARRAY_SIZE(pled_resources),
+        .resource               = pled_resources
+};
+
+
+static struct resource fled_resources[] = {
+        {
+                .start                  = 0x1f000218,
+                .end                    = 0x1f00021f,
+                .flags                  = IORESOURCE_MEM
+        }
+};
+
+static struct platform_device fled_device = {
+        .name                   = "sead3::fled",
+        .id                     = 0,
+        .dev                    = {
+                .platform_data  = &led_data,
+        },
+        .num_resources          = ARRAY_SIZE(fled_resources),
+        .resource               = fled_resources
+};
+
+static struct platform_device sead3_led_device = {
+        .name   = "sead3-led",
+        .id     = -1,
+};
+
+static struct resource ehci_resources[] = {
+        {
+                .start                  = 0x1b200000,
+                .end                    = 0x1b200fff,
+                .flags                  = IORESOURCE_MEM
+        }, {
+                .flags                  = IORESOURCE_IRQ
+        }
+};
+
+static u64 sead3_usbdev_dma_mask = DMA_BIT_MASK(32);
+
+static struct platform_device ehci_device = {
+        .name           = "sead3-ehci",
+        .id             = 0,
+        .dev            = {
+                .dma_mask               = &sead3_usbdev_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32)
+        },
+        .num_resources  = ARRAY_SIZE(ehci_resources),
+        .resource       = ehci_resources
+};
+
+static struct platform_device *sead3_platform_devices[] __initdata = {
+        &uart8250_device,
+        &sead3_flash,
+        &pled_device,
+        &fled_device,
+        &sead3_led_device,
+        &ehci_device,
+        &sead3_net_device,
+};
+
+static int __init sead3_platforms_device_init(void)
 {
         if (gic_present) {
                 uart8250_data[0].irq = MIPS_GIC_IRQ_BASE + GIC_INT_UART0;
                 uart8250_data[1].irq = MIPS_GIC_IRQ_BASE + GIC_INT_UART1;
+                ehci_resources[1].start = MIPS_GIC_IRQ_BASE + GIC_INT_EHCI;
+                sead3_net_resources[1].start = MIPS_GIC_IRQ_BASE + GIC_INT_NET;
         } else {
                 uart8250_data[0].irq = MIPS_CPU_IRQ_BASE + CPU_INT_UART0;
                 uart8250_data[1].irq = MIPS_CPU_IRQ_BASE + CPU_INT_UART1;
+                ehci_resources[1].start = MIPS_CPU_IRQ_BASE + CPU_INT_EHCI;
+                sead3_net_resources[1].start = MIPS_CPU_IRQ_BASE + CPU_INT_NET;
         }
-        return platform_device_register(&uart8250_device);
-}
 
-module_init(uart8250_init);
+        return platform_add_devices(sead3_platform_devices,
+                                    ARRAY_SIZE(sead3_platform_devices));
+}
 
-MODULE_AUTHOR("Chris Dearman <chris@mips.com>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for SEAD3");
+device_initcall(sead3_platforms_device_init);
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 0823321c10e0..fb00606e352d 100644
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -41,6 +41,15 @@ config DT_XLP_GVP
           pointer to the kernel.  The corresponding DTS file is at
           arch/mips/netlogic/dts/xlp_gvp.dts
 
+config DT_XLP_RVP
+        bool "Built-in device tree for XLP RVP boards"
+        default y
+        help
+          Add an FDT blob for XLP RVP board into the kernel.
+          This DTB will be used if the firmware does not pass in a DTB
+          pointer to the kernel.  The corresponding DTS file is at
+          arch/mips/netlogic/dts/xlp_rvp.dts
+
 config NLM_MULTINODE
         bool "Support for multi-chip boards"
         depends on NLM_XLP_BOARD
diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index c100b9afa0ab..5f5d18b0e94d 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -230,16 +230,16 @@ static void nlm_init_node_irqs(int node)
         }
 }
 
-void nlm_smp_irq_init(int hwcpuid)
+void nlm_smp_irq_init(int hwtid)
 {
-        int node, cpu;
+        int cpu, node;
 
-        node = nlm_cpuid_to_node(hwcpuid);
-        cpu  = hwcpuid % nlm_threads_per_node();
+        cpu = hwtid % nlm_threads_per_node();
+        node = hwtid / nlm_threads_per_node();
 
         if (cpu == 0 && node != 0)
                 nlm_init_node_irqs(node);
-        write_c0_eimr(nlm_current_node()->irqmask);
+        write_c0_eimr(nlm_get_node(node)->irqmask);
 }
 
 asmlinkage void plat_irq_dispatch(void)
diff --git a/arch/mips/netlogic/common/reset.S b/arch/mips/netlogic/common/reset.S
index 701c4bcb9e47..edbab9b8691f 100644
--- a/arch/mips/netlogic/common/reset.S
+++ b/arch/mips/netlogic/common/reset.S
@@ -60,7 +60,7 @@
         li      t0, LSU_DEFEATURE
         mfcr    t1, t0
 
-        lui     t2, 0xc080      /* SUE, Enable Unaligned Access, L2HPE */
+        lui     t2, 0x4080      /* Enable Unaligned Access, L2HPE */
         or      t1, t1, t2
         mtcr    t1, t0
 
@@ -235,6 +235,26 @@ EXPORT(nlm_boot_siblings)
         mfc0    v0, CP0_EBASE, 1
         andi    v0, 0x3ff               /* v0 <- node/core */
 
+        /*
+         * Errata: to avoid potential live lock, setup IFU_BRUB_RESERVE
+         * when running 4 threads per core
+         */
+        andi    v1, v0, 0x3             /* v1 <- thread id */
+        bnez    v1, 2f
+        nop
+
+        /* thread 0 of each core. */
+        li      t0, CKSEG1ADDR(RESET_DATA_PHYS)
+        lw      t1, BOOT_THREAD_MODE(t0)        /* t1 <- thread mode */
+        subu    t1, 0x3                         /* 4-thread per core mode? */
+        bnez    t1, 2f
+        nop
+
+        li      t0, IFU_BRUB_RESERVE
+        li      t1, 0x55
+        mtcr    t1, t0
+        _ehb
+2:
         beqz    v0, 4f          /* boot cpu (cpuid == 0)? */
         nop
 
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index e743bdd6e20c..dc3e327fbbac 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -59,17 +59,17 @@
 
 void nlm_send_ipi_single(int logical_cpu, unsigned int action)
 {
-        int cpu, node;
+        unsigned int hwtid;
         uint64_t picbase;
 
-        cpu = cpu_logical_map(logical_cpu);
-        node = nlm_cpuid_to_node(cpu);
-        picbase = nlm_get_node(node)->picbase;
+        /* node id is part of hwtid, and needed for send_ipi */
+        hwtid = cpu_logical_map(logical_cpu);
+        picbase = nlm_get_node(nlm_hwtid_to_node(hwtid))->picbase;
 
         if (action & SMP_CALL_FUNCTION)
-                nlm_pic_send_ipi(picbase, cpu, IRQ_IPI_SMP_FUNCTION, 0);
+                nlm_pic_send_ipi(picbase, hwtid, IRQ_IPI_SMP_FUNCTION, 0);
         if (action & SMP_RESCHEDULE_YOURSELF)
-                nlm_pic_send_ipi(picbase, cpu, IRQ_IPI_SMP_RESCHEDULE, 0);
+                nlm_pic_send_ipi(picbase, hwtid, IRQ_IPI_SMP_RESCHEDULE, 0);
 }
 
 void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action)
@@ -120,6 +120,7 @@ static void nlm_init_secondary(void)
 
         hwtid = hard_smp_processor_id();
         current_cpu_data.core = hwtid / NLM_THREADS_PER_CORE;
+        current_cpu_data.package = nlm_nodeid();
         nlm_percpu_init(hwtid);
         nlm_smp_irq_init(hwtid);
 }
@@ -145,16 +146,18 @@ static cpumask_t phys_cpu_present_mask;
 
 void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
 {
-        int cpu, node;
+        uint64_t picbase;
+        int hwtid;
+
+        hwtid = cpu_logical_map(logical_cpu);
+        picbase = nlm_get_node(nlm_hwtid_to_node(hwtid))->picbase;
 
-        cpu = cpu_logical_map(logical_cpu);
-        node = nlm_cpuid_to_node(logical_cpu);
         nlm_next_sp = (unsigned long)__KSTK_TOS(idle);
         nlm_next_gp = (unsigned long)task_thread_info(idle);
 
         /* barrier for sp/gp store above */
         __sync();
-        nlm_pic_send_ipi(nlm_get_node(node)->picbase, cpu, 1, 1);  /* NMI */
+        nlm_pic_send_ipi(picbase, hwtid, 1, 1);  /* NMI */
 }
 
 void __init nlm_smp_setup(void)
@@ -182,7 +185,7 @@ void __init nlm_smp_setup(void)
                         __cpu_number_map[i] = num_cpus;
                         __cpu_logical_map[num_cpus] = i;
                         set_cpu_possible(num_cpus, true);
-                        node = nlm_cpuid_to_node(i);
+                        node = nlm_hwtid_to_node(i);
                         cpumask_set_cpu(num_cpus, &nlm_get_node(node)->cpumask);
                         ++num_cpus;
                 }
diff --git a/arch/mips/netlogic/common/time.c b/arch/mips/netlogic/common/time.c
index 0c0a1a606f73..5873c83e65be 100644
--- a/arch/mips/netlogic/common/time.c
+++ b/arch/mips/netlogic/common/time.c
@@ -40,7 +40,6 @@
 #include <asm/netlogic/interrupt.h>
 #include <asm/netlogic/common.h>
 #include <asm/netlogic/haldefs.h>
-#include <asm/netlogic/common.h>
 
 #if defined(CONFIG_CPU_XLP)
 #include <asm/netlogic/xlp-hal/iomap.h>
diff --git a/arch/mips/netlogic/xlp/ahci-init-xlp2.c b/arch/mips/netlogic/xlp/ahci-init-xlp2.c
index c83dbf3689e2..7b066a44e679 100644
--- a/arch/mips/netlogic/xlp/ahci-init-xlp2.c
+++ b/arch/mips/netlogic/xlp/ahci-init-xlp2.c
@@ -203,6 +203,7 @@ static u8 read_phy_reg(u64 regbase, u32 addr, u32 physel)
 static void config_sata_phy(u64 regbase)
 {
         u32 port, i, reg;
+        u8 val;
 
         for (port = 0; port < 2; port++) {
                 for (i = 0, reg = RXCDRCALFOSC0; reg <= CALDUTY; reg++, i++)
@@ -210,6 +211,18 @@ static void config_sata_phy(u64 regbase)
 
                 for (i = 0, reg = RXDPIF; reg <= PPMDRIFTMAX_HI; reg++, i++)
                         write_phy_reg(regbase, reg, port, sata_phy_config2[i]);
+
+                /* Fix for PHY link up failures at lower temperatures */
+                write_phy_reg(regbase, 0x800F, port, 0x1f);
+
+                val = read_phy_reg(regbase, 0x0029, port);
+                write_phy_reg(regbase, 0x0029, port, val | (0x7 << 1));
+
+                val = read_phy_reg(regbase, 0x0056, port);
+                write_phy_reg(regbase, 0x0056, port, val & ~(1 << 3));
+
+                val = read_phy_reg(regbase, 0x0018, port);
+                write_phy_reg(regbase, 0x0018, port, val & ~(0x7 << 0));
         }
 }
 
diff --git a/arch/mips/netlogic/xlp/ahci-init.c b/arch/mips/netlogic/xlp/ahci-init.c
index a9d0fae02103..92be1a3258b1 100644
--- a/arch/mips/netlogic/xlp/ahci-init.c
+++ b/arch/mips/netlogic/xlp/ahci-init.c
@@ -151,7 +151,7 @@ static void nlm_sata_firmware_init(int node)
 static int __init nlm_ahci_init(void)
 {
         int node = 0;
-        int chip = read_c0_prid() & PRID_REV_MASK;
+        int chip = read_c0_prid() & PRID_IMP_MASK;
 
         if (chip == PRID_IMP_NETLOGIC_XLP3XX)
                 nlm_sata_firmware_init(node);
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
index 7cc46032b28e..a625bdb6d6aa 100644
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -41,17 +41,21 @@
 
 #include <asm/prom.h>
 
-extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[],
-        __dtb_xlp_fvp_begin[], __dtb_xlp_gvp_begin[];
+extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], __dtb_xlp_fvp_begin[],
+        __dtb_xlp_gvp_begin[], __dtb_xlp_rvp_begin[];
 static void *xlp_fdt_blob;
 
 void __init *xlp_dt_init(void *fdtp)
 {
         if (!fdtp) {
                 switch (current_cpu_data.processor_id & PRID_IMP_MASK) {
+#ifdef CONFIG_DT_XLP_RVP
+                case PRID_IMP_NETLOGIC_XLP5XX:
+                        fdtp = __dtb_xlp_rvp_begin;
+                        break;
+#endif
 #ifdef CONFIG_DT_XLP_GVP
                 case PRID_IMP_NETLOGIC_XLP9XX:
-                case PRID_IMP_NETLOGIC_XLP5XX:
                         fdtp = __dtb_xlp_gvp_begin;
                         break;
 #endif
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index bc24beb3a426..a8f4144a0297 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -71,10 +71,20 @@ static int xlp9xx_irq_to_irt(int irq)
         switch (irq) {
         case PIC_GPIO_IRQ:
                 return 12;
+        case PIC_I2C_0_IRQ:
+                return 125;
+        case PIC_I2C_1_IRQ:
+                return 126;
+        case PIC_I2C_2_IRQ:
+                return 127;
+        case PIC_I2C_3_IRQ:
+                return 128;
         case PIC_9XX_XHCI_0_IRQ:
                 return 114;
         case PIC_9XX_XHCI_1_IRQ:
                 return 115;
+        case PIC_9XX_XHCI_2_IRQ:
+                return 116;
         case PIC_UART_0_IRQ:
                 return 133;
         case PIC_UART_1_IRQ:
@@ -170,16 +180,23 @@ static int xlp_irq_to_irt(int irq)
         }
 
         if (devoff != 0) {
+                uint32_t val;
+
                 pcibase = nlm_pcicfg_base(devoff);
-                irt = nlm_read_reg(pcibase, XLP_PCI_IRTINFO_REG) & 0xffff;
-                /* HW weirdness, I2C IRT entry has to be fixed up */
-                switch (irq) {
-                case PIC_I2C_1_IRQ:
-                        irt = irt + 1; break;
-                case PIC_I2C_2_IRQ:
-                        irt = irt + 2; break;
-                case PIC_I2C_3_IRQ:
-                        irt = irt + 3; break;
+                val = nlm_read_reg(pcibase, XLP_PCI_IRTINFO_REG);
+                if (val == 0xffffffff) {
+                        irt = -1;
+                } else {
+                        irt = val & 0xffff;
+                        /* HW weirdness, I2C IRT entry has to be fixed up */
+                        switch (irq) {
+                        case PIC_I2C_1_IRQ:
+                                irt = irt + 1; break;
+                        case PIC_I2C_2_IRQ:
+                                irt = irt + 2; break;
+                        case PIC_I2C_3_IRQ:
+                                irt = irt + 3; break;
+                        }
                 }
         } else if (irq >= PIC_PCIE_LINK_LEGACY_IRQ(0) &&
                         irq <= PIC_PCIE_LINK_LEGACY_IRQ(3)) {
@@ -325,7 +342,7 @@ static unsigned int nlm_xlp2_get_pic_frequency(int node)
         /* Find the clock source PLL device for PIC */
         if (cpu_xlp9xx) {
                 reg_select = nlm_read_sys_reg(clockbase,
-                                SYS_9XX_CLK_DEV_SEL) & 0x3;
+                                SYS_9XX_CLK_DEV_SEL_REG) & 0x3;
                 switch (reg_select) {
                 case 0:
                         ctrl_val0 = nlm_read_sys_reg(clockbase,
@@ -354,7 +371,7 @@ static unsigned int nlm_xlp2_get_pic_frequency(int node)
                 }
         } else {
                 reg_select = (nlm_read_sys_reg(sysbase,
-                                        SYS_CLK_DEV_SEL) >> 22) & 0x3;
+                                        SYS_CLK_DEV_SEL_REG) >> 22) & 0x3;
                 switch (reg_select) {
                 case 0:
                         ctrl_val0 = nlm_read_sys_reg(sysbase,
@@ -410,7 +427,7 @@ static unsigned int nlm_xlp2_get_pic_frequency(int node)
 
         fdiv = fdiv/(1 << 13);
         pll_out_freq_num = ((ref_clk >> 1) * (6 + mdiv)) + fdiv;
-        pll_out_freq_den = (1 << vco_post_div) * pll_post_div * 3;
+        pll_out_freq_den = (1 << vco_post_div) * pll_post_div * ref_div;
 
         if (pll_out_freq_den > 0)
                 do_div(pll_out_freq_num, pll_out_freq_den);
@@ -418,10 +435,10 @@ static unsigned int nlm_xlp2_get_pic_frequency(int node)
         /* PIC post divider, which happens after PLL */
         if (cpu_xlp9xx)
                 pic_div = nlm_read_sys_reg(clockbase,
-                                SYS_9XX_CLK_DEV_DIV) & 0x3;
+                                SYS_9XX_CLK_DEV_DIV_REG) & 0x3;
         else
                 pic_div = (nlm_read_sys_reg(sysbase,
-                                        SYS_CLK_DEV_DIV) >> 22) & 0x3;
+                                        SYS_CLK_DEV_DIV_REG) >> 22) & 0x3;
         do_div(pll_out_freq_num, 1 << pic_div);
 
         return pll_out_freq_num;
@@ -442,19 +459,21 @@ unsigned int nlm_get_cpu_frequency(void)
 
 /*
  * Fills upto 8 pairs of entries containing the DRAM map of a node
- * if n < 0, get dram map for all nodes
+ * if node < 0, get dram map for all nodes
  */
-int xlp_get_dram_map(int n, uint64_t *dram_map)
+int nlm_get_dram_map(int node, uint64_t *dram_map, int nentries)
 {
         uint64_t bridgebase, base, lim;
         uint32_t val;
         unsigned int barreg, limreg, xlatreg;
-        int i, node, rv;
+        int i, n, rv;
 
         /* Look only at mapping on Node 0, we don't handle crazy configs */
         bridgebase = nlm_get_bridge_regbase(0);
         rv = 0;
         for (i = 0; i < 8; i++) {
+                if (rv + 1 >= nentries)
+                        break;
                 if (cpu_is_xlp9xx()) {
                         barreg = BRIDGE_9XX_DRAM_BAR(i);
                         limreg = BRIDGE_9XX_DRAM_LIMIT(i);
@@ -464,10 +483,10 @@ int xlp_get_dram_map(int n, uint64_t *dram_map)
                         limreg = BRIDGE_DRAM_LIMIT(i);
                         xlatreg = BRIDGE_DRAM_NODE_TRANSLN(i);
                 }
-                if (n >= 0) {
+                if (node >= 0) {
                         /* node specified, get node mapping of BAR */
                         val = nlm_read_bridge_reg(bridgebase, xlatreg);
-                        node = (val >> 1) & 0x3;
+                        n = (val >> 1) & 0x3;
                         if (n != node)
                                 continue;
                 }
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 4fdd9fd29d1d..f743fd9da323 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -51,7 +51,6 @@ uint64_t nlm_io_base;
 struct nlm_soc_info nlm_nodes[NLM_NR_NODES];
 cpumask_t nlm_cpumask = CPU_MASK_CPU0;
 unsigned int nlm_threads_per_core;
-unsigned int xlp_cores_per_node;
 
 static void nlm_linux_exit(void)
 {
@@ -82,7 +81,7 @@ static void __init xlp_init_mem_from_bars(void)
         uint64_t map[16];
         int i, n;
 
-        n = xlp_get_dram_map(-1, map);  /* -1: info for all nodes */
+        n = nlm_get_dram_map(-1, map, ARRAY_SIZE(map)); /* -1 : all nodes */
         for (i = 0; i < n; i += 2) {
                 /* exclude 0x1000_0000-0x2000_0000, u-boot device */
                 if (map[i] <= 0x10000000 && map[i+1] > 0x10000000)
@@ -163,10 +162,6 @@ void __init prom_init(void)
         void *reset_vec;
 
         nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE);
-        if (cpu_is_xlp9xx())
-                xlp_cores_per_node = 32;
-        else
-                xlp_cores_per_node = 8;
         nlm_init_boot_cpu();
         xlp_mmu_init();
         nlm_node_init(0);
diff --git a/arch/mips/netlogic/xlp/usb-init-xlp2.c b/arch/mips/netlogic/xlp/usb-init-xlp2.c
index 17ade1ce5dfd..2524939a5e3a 100644
--- a/arch/mips/netlogic/xlp/usb-init-xlp2.c
+++ b/arch/mips/netlogic/xlp/usb-init-xlp2.c
@@ -128,6 +128,9 @@ static void xlp9xx_usb_ack(struct irq_data *data)
         case PIC_9XX_XHCI_1_IRQ:
                 port_addr = nlm_xlpii_get_usb_regbase(node, 2);
                 break;
+        case PIC_9XX_XHCI_2_IRQ:
+                port_addr = nlm_xlpii_get_usb_regbase(node, 3);
+                break;
         default:
                 pr_err("No matching USB irq %d node  %d!\n", irq, node);
                 return;
@@ -222,14 +225,16 @@ static int __init nlm_platform_xlpii_usb_init(void)
         }
 
         /* XLP 9XX, multi-node */
-        pr_info("Initializing 9XX USB Interface\n");
+        pr_info("Initializing 9XX/5XX USB Interface\n");
         for (node = 0; node < NLM_NR_NODES; node++) {
                 if (!nlm_node_present(node))
                         continue;
                 nlm_xlpii_usb_hw_reset(node, 1);
                 nlm_xlpii_usb_hw_reset(node, 2);
+                nlm_xlpii_usb_hw_reset(node, 3);
                 nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_0_IRQ, xlp9xx_usb_ack);
                 nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_1_IRQ, xlp9xx_usb_ack);
+                nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_2_IRQ, xlp9xx_usb_ack);
         }
         return 0;
 }
@@ -253,6 +258,9 @@ static void nlm_xlp9xx_usb_fixup_final(struct pci_dev *dev)
         case 0x22:
                 dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_1_IRQ);
                 break;
+        case 0x23:
+                dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_2_IRQ);
+                break;
         }
 }
 
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index e5f44d2605a8..87d7846af2d0 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -99,7 +99,7 @@ static int wait_for_cpus(int cpu, int bootcpu)
         do {
                 notready = nlm_threads_per_core;
                 for (i = 0; i < nlm_threads_per_core; i++)
-                        if (cpu_ready[cpu + i] || cpu == bootcpu)
+                        if (cpu_ready[cpu + i] || (cpu + i) == bootcpu)
                                 --notready;
         } while (notready != 0 && --count > 0);
 
@@ -111,7 +111,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
         struct nlm_soc_info *nodep;
         uint64_t syspcibase, fusebase;
         uint32_t syscoremask, mask, fusemask;
-        int core, n, cpu;
+        int core, n, cpu, ncores;
 
         for (n = 0; n < NLM_NR_NODES; n++) {
                 if (n != 0) {
@@ -168,7 +168,8 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
                 syscoremask = (1 << hweight32(~fusemask & mask)) - 1;
 
                 pr_info("Node %d - SYS/FUSE coremask %x\n", n, syscoremask);
-                for (core = 0; core < nlm_cores_per_node(); core++) {
+                ncores = nlm_cores_per_node();
+                for (core = 0; core < ncores; core++) {
                         /* we will be on node 0 core 0 */
                         if (n == 0 && core == 0)
                                 continue;
@@ -178,8 +179,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)
                                 continue;
 
                         /* see if at least the first hw thread is enabled */
-                        cpu = (n * nlm_cores_per_node() + core)
-                                                * NLM_THREADS_PER_CORE;
+                        cpu = (n * ncores + core) * NLM_THREADS_PER_CORE;
                         if (!cpumask_test_cpu(cpu, wakeup_mask))
                                 continue;
 
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index a26cbe372e06..81f58958cf08 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -98,6 +98,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
         case CPU_XLR:
                 lmodel = &op_model_mipsxx_ops;
                 break;
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 01f721a85c5b..6a6e2cc55b89 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -246,7 +246,7 @@ static int mipsxx_perfcount_handler(void)
         unsigned int counter;
         int handled = IRQ_NONE;
 
-        if (cpu_has_mips_r2 && !(read_c0_cause() & (1 << 26)))
+        if (cpu_has_mips_r2 && !(read_c0_cause() & CAUSEF_PCI))
                 return handled;
 
         switch (counters) {
@@ -296,6 +296,7 @@ static inline int n_counters(void)
 
         case CPU_R12000:
         case CPU_R14000:
+        case CPU_R16000:
                 counters = 4;
                 break;
 
@@ -411,6 +412,10 @@ static int __init mipsxx_init(void)
                 op_model_mipsxx_ops.cpu_type = "mips/r12000";
                 break;
 
+        case CPU_R16000:
+                op_model_mipsxx_ops.cpu_type = "mips/r16000";
+                break;
+
         case CPU_SB1:
         case CPU_SB1A:
                 op_model_mipsxx_ops.cpu_type = "mips/sb1";
@@ -435,15 +440,17 @@ static int __init mipsxx_init(void)
 
         if (get_c0_perfcount_int)
                 perfcount_irq = get_c0_perfcount_int();
-        else if ((cp0_perfcount_irq >= 0) &&
-                 (cp0_compare_irq != cp0_perfcount_irq))
+        else if (cp0_perfcount_irq >= 0)
                 perfcount_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
         else
                 perfcount_irq = -1;
 
         if (perfcount_irq >= 0)
                 return request_irq(perfcount_irq, mipsxx_perfcount_int,
-                        0, "Perfcounter", save_perf_irq);
+                                   IRQF_PERCPU | IRQF_NOBALANCING |
+                                   IRQF_NO_THREAD | IRQF_NO_SUSPEND |
+                                   IRQF_SHARED,
+                                   "Perfcounter", save_perf_irq);
 
         return 0;
 }
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 300591c6278d..2eda01e6e08f 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80)	+= pci-bcm1480.o pci-bcm1480ht.o
 obj-$(CONFIG_SNI_RM)            += fixup-sni.o ops-sni.o
 obj-$(CONFIG_LANTIQ)            += fixup-lantiq.o
 obj-$(CONFIG_PCI_LANTIQ)        += pci-lantiq.o ops-lantiq.o
-obj-$(CONFIG_SOC_RT2880)        += pci-rt2880.o
+obj-$(CONFIG_SOC_RT288X)        += pci-rt2880.o
 obj-$(CONFIG_SOC_RT3883)        += pci-rt3883.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
index 6a40f24c91b4..3407495fcbe2 100644
--- a/arch/mips/pci/msi-xlp.c
+++ b/arch/mips/pci/msi-xlp.c
@@ -178,13 +178,6 @@ static void xlp_msi_mask_ack(struct irq_data *d)
         else
                 nlm_write_reg(md->lnkbase, PCIE_MSI_STATUS, 1u << vec);
 
-        /* Ack at eirr and PIC */
-        ack_c0_eirr(PIC_PCIE_LINK_MSI_IRQ(link));
-        if (cpu_is_xlp9xx())
-                nlm_pic_ack(md->node->picbase,
-                                PIC_9XX_IRT_PCIE_LINK_INDEX(link));
-        else
-                nlm_pic_ack(md->node->picbase, PIC_IRT_PCIE_LINK_INDEX(link));
 }
 
 static struct irq_chip xlp_msi_chip = {
@@ -230,8 +223,6 @@ static void xlp_msix_mask_ack(struct irq_data *d)
         }
         nlm_write_reg(md->lnkbase, status_reg, 1u << bit);
 
-        /* Ack at eirr and PIC */
-        ack_c0_eirr(PIC_PCIE_MSIX_IRQ(link));
         if (!cpu_is_xlp9xx())
                 nlm_pic_ack(md->node->picbase,
                                 PIC_IRT_PCIE_MSIX_INDEX(msixvec));
@@ -541,6 +532,14 @@ void nlm_dispatch_msi(int node, int lirq)
                 do_IRQ(irqbase + i);
                 status &= status - 1;
         }
+
+        /* Ack at eirr and PIC */
+        ack_c0_eirr(PIC_PCIE_LINK_MSI_IRQ(link));
+        if (cpu_is_xlp9xx())
+                nlm_pic_ack(md->node->picbase,
+                                PIC_9XX_IRT_PCIE_LINK_INDEX(link));
+        else
+                nlm_pic_ack(md->node->picbase, PIC_IRT_PCIE_LINK_INDEX(link));
 }
 
 void nlm_dispatch_msix(int node, int lirq)
@@ -567,4 +566,6 @@ void nlm_dispatch_msix(int node, int lirq)
                 do_IRQ(irqbase + i);
                 status &= status - 1;
         }
+        /* Ack at eirr and PIC */
+        ack_c0_eirr(PIC_PCIE_MSIX_IRQ(link));
 }
diff --git a/arch/mips/pci/pci-ar2315.c b/arch/mips/pci/pci-ar2315.c
index bd2b3b60da83..07a18228e63a 100644
--- a/arch/mips/pci/pci-ar2315.c
+++ b/arch/mips/pci/pci-ar2315.c
@@ -488,7 +488,6 @@ static struct platform_driver ar2315_pci_driver = {
         .probe = ar2315_pci_probe,
         .driver = {
                 .name = "ar2315-pci",
-                .owner = THIS_MODULE,
         },
 };
 
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index a04af55d89f1..c258cd406fbb 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -214,6 +214,8 @@ const char *octeon_get_pci_interrupts(void)
                 return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
         case CVMX_BOARD_TYPE_BBGW_REF:
                 return "AABCD";
+        case CVMX_BOARD_TYPE_CUST_DSR1000N:
+                return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";
         case CVMX_BOARD_TYPE_THUNDER:
         case CVMX_BOARD_TYPE_EBH3000:
         default:
@@ -271,9 +273,6 @@ static int octeon_read_config(struct pci_bus *bus, unsigned int devfn,
         pci_addr.s.func = devfn & 0x7;
         pci_addr.s.reg = reg;
 
-#if PCI_CONFIG_SPACE_DELAY
-        udelay(PCI_CONFIG_SPACE_DELAY);
-#endif
         switch (size) {
         case 4:
                 *val = le32_to_cpu(cvmx_read64_uint32(pci_addr.u64));
@@ -308,9 +307,6 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
         pci_addr.s.func = devfn & 0x7;
         pci_addr.s.reg = reg;
 
-#if PCI_CONFIG_SPACE_DELAY
-        udelay(PCI_CONFIG_SPACE_DELAY);
-#endif
         switch (size) {
         case 4:
                 cvmx_write64_uint32(pci_addr.u64, cpu_to_le32(val));
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
index a4574947e698..8a978022630b 100644
--- a/arch/mips/pci/pci-rt2880.c
+++ b/arch/mips/pci/pci-rt2880.c
@@ -267,7 +267,6 @@ static struct platform_driver rt288x_pci_driver = {
         .probe = rt288x_pci_probe,
         .driver = {
                 .name = "rt288x-pci",
-                .owner = THIS_MODULE,
                 .of_match_table = rt288x_pci_match,
         },
 };
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 8bb13a4af68a..b8a0bf5766f2 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -91,7 +91,10 @@ static void pcibios_scanbus(struct pci_controller *hose)
 
         pci_add_resource_offset(&resources,
                                 hose->mem_resource, hose->mem_offset);
-        pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset);
+        pci_add_resource_offset(&resources,
+                                hose->io_resource, hose->io_offset);
+        pci_add_resource_offset(&resources,
+                                hose->busn_resource, hose->busn_offset);
         bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
                                 &resources);
         hose->bus = bus;
diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
index 1bb0b2bf8d6e..99f3db4f0a9b 100644
--- a/arch/mips/pci/pcie-octeon.c
+++ b/arch/mips/pci/pcie-octeon.c
@@ -1762,14 +1762,6 @@ static int octeon_pcie_write_config(unsigned int pcie_port, struct pci_bus *bus,
         default:
                 return PCIBIOS_FUNC_NOT_SUPPORTED;
         }
-#if PCI_CONFIG_SPACE_DELAY
-        /*
-         * Delay on writes so that devices have time to come up. Some
-         * bridges need this to allow time for the secondary busses to
-         * work
-         */
-        udelay(PCI_CONFIG_SPACE_DELAY);
-#endif
         return PCIBIOS_SUCCESSFUL;
 }
 
diff --git a/arch/mips/pistachio/Makefile b/arch/mips/pistachio/Makefile
new file mode 100644
index 000000000000..32189c6ebea5
--- /dev/null
+++ b/arch/mips/pistachio/Makefile
@@ -0,0 +1 @@
+obj-y   += init.o irq.o time.o
diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform
new file mode 100644
index 000000000000..d80cd612df1f
--- /dev/null
+++ b/arch/mips/pistachio/Platform
@@ -0,0 +1,8 @@
+#
+# IMG Pistachio SoC
+#
+platform-$(CONFIG_MACH_PISTACHIO)       += pistachio/
+cflags-$(CONFIG_MACH_PISTACHIO)         +=                              \
+                -I$(srctree)/arch/mips/include/asm/mach-pistachio
+load-$(CONFIG_MACH_PISTACHIO)           += 0xffffffff80400000
+zload-$(CONFIG_MACH_PISTACHIO)          += 0xffffffff81000000
diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
new file mode 100644
index 000000000000..d2dc836523a3
--- /dev/null
+++ b/arch/mips/pistachio/init.c
@@ -0,0 +1,131 @@
+/*
+ * Pistachio platform setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
+
+#include <asm/cacheflush.h>
+#include <asm/dma-coherence.h>
+#include <asm/fw/fw.h>
+#include <asm/mips-boards/generic.h>
+#include <asm/mips-cm.h>
+#include <asm/mips-cpc.h>
+#include <asm/prom.h>
+#include <asm/smp-ops.h>
+#include <asm/traps.h>
+
+const char *get_system_type(void)
+{
+        return "IMG Pistachio SoC";
+}
+
+static void __init plat_setup_iocoherency(void)
+{
+        /*
+         * Kernel has been configured with software coherency
+         * but we might choose to turn it off and use hardware
+         * coherency instead.
+         */
+        if (mips_cm_numiocu() != 0) {
+                /* Nothing special needs to be done to enable coherency */
+                pr_info("CMP IOCU detected\n");
+                hw_coherentio = 1;
+                if (coherentio == 0)
+                        pr_info("Hardware DMA cache coherency disabled\n");
+                else
+                        pr_info("Hardware DMA cache coherency enabled\n");
+        } else {
+                if (coherentio == 1)
+                        pr_info("Hardware DMA cache coherency unsupported, but enabled from command line!\n");
+                else
+                        pr_info("Software DMA cache coherency enabled\n");
+        }
+}
+
+void __init plat_mem_setup(void)
+{
+        if (fw_arg0 != -2)
+                panic("Device-tree not present");
+
+        __dt_setup_arch((void *)fw_arg1);
+        strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+
+        plat_setup_iocoherency();
+}
+
+#define DEFAULT_CPC_BASE_ADDR 0x1bde0000
+
+phys_addr_t mips_cpc_default_phys_base(void)
+{
+        return DEFAULT_CPC_BASE_ADDR;
+}
+
+static void __init mips_nmi_setup(void)
+{
+        void *base;
+        extern char except_vec_nmi;
+
+        base = cpu_has_veic ?
+                (void *)(CAC_BASE + 0xa80) :
+                (void *)(CAC_BASE + 0x380);
+        memcpy(base, &except_vec_nmi, 0x80);
+        flush_icache_range((unsigned long)base,
+                           (unsigned long)base + 0x80);
+}
+
+static void __init mips_ejtag_setup(void)
+{
+        void *base;
+        extern char except_vec_ejtag_debug;
+
+        base = cpu_has_veic ?
+                (void *)(CAC_BASE + 0xa00) :
+                (void *)(CAC_BASE + 0x300);
+        memcpy(base, &except_vec_ejtag_debug, 0x80);
+        flush_icache_range((unsigned long)base,
+                           (unsigned long)base + 0x80);
+}
+
+void __init prom_init(void)
+{
+        board_nmi_handler_setup = mips_nmi_setup;
+        board_ejtag_handler_setup = mips_ejtag_setup;
+
+        mips_cm_probe();
+        mips_cpc_probe();
+        register_cps_smp_ops();
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+void __init device_tree_init(void)
+{
+        if (!initial_boot_params)
+                return;
+
+        unflatten_and_copy_device_tree();
+}
+
+static int __init plat_of_setup(void)
+{
+        if (!of_have_populated_dt())
+                panic("Device tree not present");
+
+        if (of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL))
+                panic("Failed to populate DT");
+
+        return 0;
+}
+arch_initcall(plat_of_setup);
diff --git a/arch/mips/pistachio/irq.c b/arch/mips/pistachio/irq.c
new file mode 100644
index 000000000000..0a6b24c24652
--- /dev/null
+++ b/arch/mips/pistachio/irq.c
@@ -0,0 +1,28 @@
+/*
+ * Pistachio IRQ setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/mips-gic.h>
+#include <linux/kernel.h>
+
+#include <asm/cpu-features.h>
+#include <asm/irq_cpu.h>
+
+void __init arch_init_irq(void)
+{
+        pr_info("EIC is %s\n", cpu_has_veic ? "on" : "off");
+        pr_info("VINT is %s\n", cpu_has_vint ? "on" : "off");
+
+        if (!cpu_has_veic)
+                mips_cpu_irq_init();
+
+        irqchip_init();
+}
diff --git a/arch/mips/pistachio/time.c b/arch/mips/pistachio/time.c
new file mode 100644
index 000000000000..67889fcea8aa
--- /dev/null
+++ b/arch/mips/pistachio/time.c
@@ -0,0 +1,52 @@
+/*
+ * Pistachio clocksource/timer setup
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/clocksource.h>
+#include <linux/init.h>
+#include <linux/irqchip/mips-gic.h>
+#include <linux/of.h>
+
+#include <asm/time.h>
+
+unsigned int get_c0_compare_int(void)
+{
+        return gic_get_c0_compare_int();
+}
+
+int get_c0_perfcount_int(void)
+{
+        return gic_get_c0_perfcount_int();
+}
+
+void __init plat_time_init(void)
+{
+        struct device_node *np;
+        struct clk *clk;
+
+        of_clk_init(NULL);
+        clocksource_of_init();
+
+        np = of_get_cpu_node(0, NULL);
+        if (!np) {
+                pr_err("Failed to get CPU node\n");
+                return;
+        }
+
+        clk = of_clk_get(np, 0);
+        if (IS_ERR(clk)) {
+                pr_err("Failed to get CPU clock: %ld\n", PTR_ERR(clk));
+                return;
+        }
+
+        mips_hpt_frequency = clk_get_rate(clk) / 2;
+        clk_put(clk);
+}
diff --git a/arch/mips/power/Makefile b/arch/mips/power/Makefile
index 73d56b87cb9b..70bd7883bc1b 100644
--- a/arch/mips/power/Makefile
+++ b/arch/mips/power/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o
+obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o hibernate_asm.o
diff --git a/arch/mips/power/hibernate.c b/arch/mips/power/hibernate.c
new file mode 100644
index 000000000000..19a9af68bcdb
--- /dev/null
+++ b/arch/mips/power/hibernate.c
@@ -0,0 +1,10 @@
+#include <asm/tlbflush.h>
+
+extern int restore_image(void);
+
+int swsusp_arch_resume(void)
+{
+        /* Avoid TLB mismatch during and after kernel resume */
+        local_flush_tlb_all();
+        return restore_image();
+}
diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate_asm.S
index 32a7c828f073..b1fab951100f 100644
--- a/arch/mips/power/hibernate.S
+++ b/arch/mips/power/hibernate_asm.S
@@ -29,7 +29,7 @@ LEAF(swsusp_arch_suspend)
         j swsusp_save
 END(swsusp_arch_suspend)
 
-LEAF(swsusp_arch_resume)
+LEAF(restore_image)
         PTR_L t0, restore_pblist
 0:
         PTR_L t1, PBE_ADDRESS(t0)   /* source */
@@ -43,7 +43,6 @@ LEAF(swsusp_arch_resume)
         bne t1, t3, 1b
         PTR_L t0, PBE_NEXT(t0)
         bnez t0, 0b
-        jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */
         PTR_LA t0, saved_regs
         PTR_L ra, PT_R31(t0)
         PTR_L sp, PT_R29(t0)
@@ -59,4 +58,4 @@ LEAF(swsusp_arch_resume)
         PTR_L s7, PT_R23(t0)
         PTR_LI v0, 0x0
         jr ra
-END(swsusp_arch_resume)
+END(restore_image)
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index b1c52ca580f9..e9bc8c96174e 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -7,6 +7,11 @@ config CLKEVT_RT3352
         select CLKSRC_OF
         select CLKSRC_MMIO
 
+config RALINK_ILL_ACC
+        bool
+        depends on SOC_RT305X
+        default y
+
 choice
         prompt "Ralink SoC selection"
         default SOC_RT305X
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 1d97eaba0c5f..a6d10f607f34 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -7,6 +7,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/sched_clock.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/param.h>
@@ -159,11 +160,18 @@ struct clocksource hub_rt_clocksource = {
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static u64 notrace hub_rt_read_sched_clock(void)
+{
+        return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
+}
+
 static void __init hub_rt_clocksource_init(void)
 {
         struct clocksource *cs = &hub_rt_clocksource;
 
         clocksource_register_hz(cs, CYCLES_PER_SEC);
+
+        sched_clock_register(hub_rt_read_sched_clock, 52, CYCLES_PER_SEC);
 }
 
 void __init plat_time_init(void)
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 511e9ff2acfd..0134db2ad0a8 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -5,14 +5,16 @@
  *
  * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
  */
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
+#include <linux/rtc/ds1685.h>
 
 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
 
+extern void ip32_prepare_poweroff(void);
+
 #define MACEISA_SERIAL1_OFFS   offsetof(struct sgi_mace, isa.serial1)
 #define MACEISA_SERIAL2_OFFS   offsetof(struct sgi_mace, isa.serial2)
 
@@ -90,22 +92,47 @@ static __init int sgio2btns_devinit(void)
 
 device_initcall(sgio2btns_devinit);
 
-static struct resource sgio2_cmos_rsrc[] = {
+#define MACE_RTC_RES_START (MACE_BASE + offsetof(struct sgi_mace, isa.rtc))
+#define MACE_RTC_RES_END (MACE_RTC_RES_START + 32767)
+
+static struct resource ip32_rtc_resources[] = {
         {
-                .start = 0x70,
-                .end   = 0x71,
-                .flags = IORESOURCE_IO
+                .start  = MACEISA_RTC_IRQ,
+                .end    = MACEISA_RTC_IRQ,
+                .flags  = IORESOURCE_IRQ
+        }, {
+                .start  = MACE_RTC_RES_START,
+                .end    = MACE_RTC_RES_END,
+                .flags  = IORESOURCE_MEM,
         }
 };
 
-static __init int sgio2_cmos_devinit(void)
+/* RTC registers on IP32 are each padded by 256 bytes (0x100). */
+static struct ds1685_rtc_platform_data
+ip32_rtc_platform_data[] = {
+        {
+                .regstep = 0x100,
+                .bcd_mode = true,
+                .no_irq = false,
+                .uie_unsupported = false,
+                .alloc_io_resources = true,
+                .plat_prepare_poweroff = ip32_prepare_poweroff,
+        },
+};
+
+struct platform_device ip32_rtc_device = {
+        .name                   = "rtc-ds1685",
+        .id                     = -1,
+        .dev                    = {
+                .platform_data  = ip32_rtc_platform_data,
+        },
+        .num_resources          = ARRAY_SIZE(ip32_rtc_resources),
+        .resource               = ip32_rtc_resources,
+};
+
++static int __init sgio2_rtc_devinit(void)
 {
-        return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
-                                                      sgio2_cmos_rsrc, 1));
+        return platform_device_register(&ip32_rtc_device);
 }
 
 device_initcall(sgio2_cmos_devinit);
-
-MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index 44b3470a0bbb..8bd415c8729f 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -11,10 +11,11 @@
 #include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>
 #include <linux/delay.h>
-#include <linux/ds17287rtc.h>
+#include <linux/rtc/ds1685.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
 
@@ -33,53 +34,40 @@
 #define POWERDOWN_FREQ          (HZ / 4)
 #define PANIC_FREQ              (HZ / 8)
 
-static struct timer_list power_timer, blink_timer, debounce_timer;
-static int has_panicked, shuting_down;
+extern struct platform_device ip32_rtc_device;
 
-static void ip32_machine_restart(char *command) __noreturn;
-static void ip32_machine_halt(void) __noreturn;
-static void ip32_machine_power_off(void) __noreturn;
+static struct timer_list power_timer, blink_timer;
+static int has_panicked, shutting_down;
 
-static void ip32_machine_restart(char *cmd)
+static __noreturn void ip32_poweroff(void *data)
 {
-        crime->control = CRIME_CONTROL_HARD_RESET;
-        while (1);
-}
+        void (*poweroff_func)(struct platform_device *) =
+                symbol_get(ds1685_rtc_poweroff);
+
+#ifdef CONFIG_MODULES
+        /* If the first __symbol_get failed, our module wasn't loaded. */
+        if (!poweroff_func) {
+                request_module("rtc-ds1685");
+                poweroff_func = symbol_get(ds1685_rtc_poweroff);
+        }
+#endif
 
-static inline void ip32_machine_halt(void)
-{
-        ip32_machine_power_off();
-}
+        if (!poweroff_func)
+                pr_emerg("RTC not available for power-off.  Spinning forever ...\n");
+        else {
+                (*poweroff_func)((struct platform_device *)data);
+                symbol_put(ds1685_rtc_poweroff);
+        }
 
-static void ip32_machine_power_off(void)
-{
-        unsigned char reg_a, xctrl_a, xctrl_b;
-
-        disable_irq(MACEISA_RTC_IRQ);
-        reg_a = CMOS_READ(RTC_REG_A);
-
-        /* setup for kickstart & wake-up (DS12287 Ref. Man. p. 19) */
-        reg_a &= ~DS_REGA_DV2;
-        reg_a |= DS_REGA_DV1;
-
-        CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
-        wbflush();
-        xctrl_b = CMOS_READ(DS_B1_XCTRL4B)
-                   | DS_XCTRL4B_ABE | DS_XCTRL4B_KFE;
-        CMOS_WRITE(xctrl_b, DS_B1_XCTRL4B);
-        xctrl_a = CMOS_READ(DS_B1_XCTRL4A) & ~DS_XCTRL4A_IFS;
-        CMOS_WRITE(xctrl_a, DS_B1_XCTRL4A);
-        wbflush();
-        /* adios amigos... */
-        CMOS_WRITE(xctrl_a | DS_XCTRL4A_PAB, DS_B1_XCTRL4A);
-        CMOS_WRITE(reg_a, RTC_REG_A);
-        wbflush();
-        while (1);
+        unreachable();
 }
 
-static void power_timeout(unsigned long data)
+static void ip32_machine_restart(char *cmd) __noreturn;
+static void ip32_machine_restart(char *cmd)
 {
-        ip32_machine_power_off();
+        msleep(20);
+        crime->control = CRIME_CONTROL_HARD_RESET;
+        unreachable();
 }
 
 static void blink_timeout(unsigned long data)
@@ -89,44 +77,27 @@ static void blink_timeout(unsigned long data)
         mod_timer(&blink_timer, jiffies + data);
 }
 
-static void debounce(unsigned long data)
+static void ip32_machine_halt(void)
 {
-        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);
-        if ((xctrl_a & DS_XCTRL4A_IFS) || (reg_c & RTC_IRQF )) {
-                /* Interrupt still being sent. */
-                debounce_timer.expires = jiffies + 50;
-                add_timer(&debounce_timer);
-
-                /* clear interrupt source */
-                CMOS_WRITE(xctrl_a & ~DS_XCTRL4A_IFS, DS_B1_XCTRL4A);
-                CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
-                return;
-        }
-        CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
-
-        if (has_panicked)
-                ip32_machine_restart(NULL);
+        ip32_poweroff(&ip32_rtc_device);
+}
 
-        enable_irq(MACEISA_RTC_IRQ);
+static void power_timeout(unsigned long data)
+{
+        ip32_poweroff(&ip32_rtc_device);
 }
 
-static inline void ip32_power_button(void)
+void ip32_prepare_poweroff(void)
 {
         if (has_panicked)
                 return;
 
-        if (shuting_down || kill_cad_pid(SIGINT, 1)) {
+        if (shutting_down || kill_cad_pid(SIGINT, 1)) {
                 /* No init process or button pressed twice.  */
-                ip32_machine_power_off();
+                ip32_poweroff(&ip32_rtc_device);
         }
 
-        shuting_down = 1;
+        shutting_down = 1;
         blink_timer.data = POWERDOWN_FREQ;
         blink_timeout(POWERDOWN_FREQ);
 
@@ -136,27 +107,6 @@ static inline void ip32_power_button(void)
         add_timer(&power_timer);
 }
 
-static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
-{
-        unsigned char reg_c;
-
-        reg_c = CMOS_READ(RTC_INTR_FLAGS);
-        if (!(reg_c & RTC_IRQF)) {
-                printk(KERN_WARNING
-                        "%s: RTC IRQ without RTC_IRQF\n", __func__);
-        }
-        /* Wait until interrupt goes away */
-        disable_irq_nosync(MACEISA_RTC_IRQ);
-        init_timer(&debounce_timer);
-        debounce_timer.function = debounce;
-        debounce_timer.expires = jiffies + 50;
-        add_timer(&debounce_timer);
-
-        printk(KERN_DEBUG "Power button pressed\n");
-        ip32_power_button();
-        return IRQ_HANDLED;
-}
-
 static int panic_event(struct notifier_block *this, unsigned long event,
                        void *ptr)
 {
@@ -190,15 +140,12 @@ static __init int ip32_reboot_setup(void)
 
         _machine_restart = ip32_machine_restart;
         _machine_halt = ip32_machine_halt;
-        pm_power_off = ip32_machine_power_off;
+        pm_power_off = ip32_machine_halt;
 
         init_timer(&blink_timer);
         blink_timer.function = blink_timeout;
         atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 
-        if (request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL))
-                panic("Can't allocate MACEISA RTC IRQ");
-
         return 0;
 }
 
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 8686237a3c3c..12b341d04f88 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -20,6 +20,7 @@ generic-y += param.h
 generic-y += percpu.h
 generic-y += poll.h
 generic-y += preempt.h
+generic-y += seccomp.h
 generic-y += segment.h
 generic-y += topology.h
 generic-y += trace_clock.h
diff --git a/arch/parisc/include/asm/seccomp.h b/arch/parisc/include/asm/seccomp.h
deleted file mode 100644
index 015f7887aa29..000000000000
--- a/arch/parisc/include/asm/seccomp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ASM_PARISC_SECCOMP_H
-#define _ASM_PARISC_SECCOMP_H
-
-#include <linux/unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#define __NR_seccomp_read_32 __NR_read
-#define __NR_seccomp_write_32 __NR_write
-#define __NR_seccomp_exit_32 __NR_exit
-#define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn
-
-#endif  /* _ASM_PARISC_SECCOMP_H */
diff --git a/arch/powerpc/include/asm/seccomp.h b/arch/powerpc/include/asm/seccomp.h
new file mode 100644
index 000000000000..c1818e35cf02
--- /dev/null
+++ b/arch/powerpc/include/asm/seccomp.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_POWERPC_SECCOMP_H
+#define _ASM_POWERPC_SECCOMP_H
+
+#include <linux/unistd.h>
+
+#define __NR_seccomp_sigreturn_32 __NR_sigreturn
+
+#include <asm-generic/seccomp.h>
+
+#endif  /* _ASM_POWERPC_SECCOMP_H */
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild
index 7a3f795ac218..79c4068be278 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -25,7 +25,6 @@ header-y += posix_types.h
 header-y += ps3fb.h
 header-y += ptrace.h
 header-y += resource.h
-header-y += seccomp.h
 header-y += sembuf.h
 header-y += setup.h
 header-y += shmbuf.h
diff --git a/arch/powerpc/include/uapi/asm/seccomp.h b/arch/powerpc/include/uapi/asm/seccomp.h
deleted file mode 100644
index 00c1d9133cfe..000000000000
--- a/arch/powerpc/include/uapi/asm/seccomp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ASM_POWERPC_SECCOMP_H
-#define _ASM_POWERPC_SECCOMP_H
-
-#include <linux/unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#define __NR_seccomp_read_32 __NR_read
-#define __NR_seccomp_write_32 __NR_write
-#define __NR_seccomp_exit_32 __NR_exit
-#define __NR_seccomp_sigreturn_32 __NR_sigreturn
-
-#endif  /* _ASM_POWERPC_SECCOMP_H */
diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c
index 1c27831df1ac..ed7b0977072a 100644
--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -22,6 +22,7 @@
 #include <linux/kref.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
+#include <linux/file.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/numa.h>
@@ -322,18 +323,20 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
         unsigned long app_cookie = 0;
         unsigned int my_offset = 0;
         struct vm_area_struct *vma;
+        struct file *exe_file;
         struct mm_struct *mm = spu->mm;
 
         if (!mm)
                 goto out;
 
-        down_read(&mm->mmap_sem);
-
-        if (mm->exe_file) {
-                app_cookie = fast_get_dcookie(&mm->exe_file->f_path);
-                pr_debug("got dcookie for %pD\n", mm->exe_file);
+        exe_file = get_mm_exe_file(mm);
+        if (exe_file) {
+                app_cookie = fast_get_dcookie(&exe_file->f_path);
+                pr_debug("got dcookie for %pD\n", exe_file);
+                fput(exe_file);
         }
 
+        down_read(&mm->mmap_sem);
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
                 if (vma->vm_start > spu_ref || vma->vm_end <= spu_ref)
                         continue;
diff --git a/arch/sparc/include/asm/seccomp.h b/arch/sparc/include/asm/seccomp.h
index adca1bce41d4..5ef8826d44f8 100644
--- a/arch/sparc/include/asm/seccomp.h
+++ b/arch/sparc/include/asm/seccomp.h
@@ -1,15 +1,10 @@
 #ifndef _ASM_SECCOMP_H
+#define _ASM_SECCOMP_H
 
 #include <linux/unistd.h>
 
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#define __NR_seccomp_read_32 __NR_read
-#define __NR_seccomp_write_32 __NR_write
-#define __NR_seccomp_exit_32 __NR_exit
 #define __NR_seccomp_sigreturn_32 __NR_sigreturn
 
+#include <asm-generic/seccomp.h>
+
 #endif /* _ASM_SECCOMP_H */
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 0142d578b5a8..a07e31b50d3f 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -27,6 +27,7 @@ config TILE
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_DEBUG_STACKOVERFLOW
         select ARCH_WANT_FRAME_POINTERS
+        select HAVE_CONTEXT_TRACKING
 
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index b4c488b65745..f5433e0e34e0 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -16,7 +16,6 @@ generic-y += ioctl.h
 generic-y += ioctls.h
 generic-y += ipcbuf.h
 generic-y += irq_regs.h
-generic-y += irq_work.h
 generic-y += local.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
diff --git a/arch/tile/include/asm/ftrace.h b/arch/tile/include/asm/ftrace.h
index 13a9bb81a8ab..738d239b792f 100644
--- a/arch/tile/include/asm/ftrace.h
+++ b/arch/tile/include/asm/ftrace.h
@@ -23,6 +23,8 @@
 #ifndef __ASSEMBLY__
 extern void __mcount(void);
 
+#define ARCH_SUPPORTS_FTRACE_OPS 1
+
 #ifdef CONFIG_DYNAMIC_FTRACE
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
 {
diff --git a/arch/tile/include/asm/irq_work.h b/arch/tile/include/asm/irq_work.h
new file mode 100644
index 000000000000..48af33a61a2c
--- /dev/null
+++ b/arch/tile/include/asm/irq_work.h
@@ -0,0 +1,14 @@
+#ifndef __ASM_IRQ_WORK_H
+#define __ASM_IRQ_WORK_H
+
+static inline bool arch_irq_work_has_interrupt(void)
+{
+#ifdef CONFIG_SMP
+        extern bool self_interrupt_ok;
+        return self_interrupt_ok;
+#else
+        return false;
+#endif
+}
+
+#endif /* __ASM_IRQ_WORK_H */
diff --git a/arch/tile/include/asm/smp.h b/arch/tile/include/asm/smp.h
index 9a326b64f7ae..735e7f144733 100644
--- a/arch/tile/include/asm/smp.h
+++ b/arch/tile/include/asm/smp.h
@@ -69,6 +69,7 @@ static inline int xy_to_cpu(int x, int y)
 #define MSG_TAG_STOP_CPU                2
 #define MSG_TAG_CALL_FUNCTION_MANY      3
 #define MSG_TAG_CALL_FUNCTION_SINGLE    4
+#define MSG_TAG_IRQ_WORK                5
 
 /* Hook for the generic smp_call_function_many() routine. */
 static inline void arch_send_call_function_ipi_mask(struct cpumask *mask)
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index 98ee10a0ae89..f804c39a5e4d 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -124,6 +124,7 @@ extern void _cpu_idle(void);
 #define TIF_NOTIFY_RESUME       8       /* callback before returning to user */
 #define TIF_SYSCALL_TRACEPOINT  9       /* syscall tracepoint instrumentation */
 #define TIF_POLLING_NRFLAG      10      /* idle is polling for TIF_NEED_RESCHED */
+#define TIF_NOHZ                11      /* in adaptive nohz mode */
 
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
@@ -136,14 +137,16 @@ extern void _cpu_idle(void);
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
+#define _TIF_NOHZ               (1<<TIF_NOHZ)
 
 /* Work to do on any return to user space. */
 #define _TIF_ALLWORK_MASK \
-  (_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SINGLESTEP|\
-   _TIF_ASYNC_TLB|_TIF_NOTIFY_RESUME)
+        (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_SINGLESTEP | \
+         _TIF_ASYNC_TLB | _TIF_NOTIFY_RESUME | _TIF_NOHZ)
 
 /* Work to do at syscall entry. */
-#define _TIF_SYSCALL_ENTRY_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT)
+#define _TIF_SYSCALL_ENTRY_WORK \
+        (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
 
 /* Work to do at syscall exit. */
 #define _TIF_SYSCALL_EXIT_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT)
diff --git a/arch/tile/include/hv/hypervisor.h b/arch/tile/include/hv/hypervisor.h
index dfcdeb61ba34..e0e6af4e783b 100644
--- a/arch/tile/include/hv/hypervisor.h
+++ b/arch/tile/include/hv/hypervisor.h
@@ -961,7 +961,11 @@ typedef enum {
   HV_INQ_TILES_HFH_CACHE       = 2,
 
   /** The set of tiles that can be legally used as a LOTAR for a PTE. */
-  HV_INQ_TILES_LOTAR           = 3
+  HV_INQ_TILES_LOTAR           = 3,
+
+  /** The set of "shared" driver tiles that the hypervisor may
+   *  periodically interrupt. */
+  HV_INQ_TILES_SHARED          = 4
 } HV_InqTileSet;
 
 /** Returns specific information about various sets of tiles within the
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 5cbc864398d3..e8c2c04143cd 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -68,7 +68,7 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, const siginfo_t *fr
         if (from->si_code < 0) {
                 err |= __put_user(from->si_pid, &to->si_pid);
                 err |= __put_user(from->si_uid, &to->si_uid);
-                err |= __put_user(ptr_to_compat(from->si_ptr), &to->si_ptr);
+                err |= __put_user(from->si_int, &to->si_int);
         } else {
                 /*
                  * First 32bits of unions are always present:
@@ -93,8 +93,7 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, const siginfo_t *fr
                         break;
                 case __SI_TIMER >> 16:
                         err |= __put_user(from->si_overrun, &to->si_overrun);
-                        err |= __put_user(ptr_to_compat(from->si_ptr),
-                                          &to->si_ptr);
+                        err |= __put_user(from->si_int, &to->si_int);
                         break;
                          /* This is not generated by the kernel as of now.  */
                 case __SI_RT >> 16:
@@ -110,19 +109,19 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, const siginfo_t *fr
 int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from)
 {
         int err;
-        u32 ptr32;
 
         if (!access_ok(VERIFY_READ, from, sizeof(struct compat_siginfo)))
                 return -EFAULT;
 
+        memset(to, 0, sizeof(*to));
+
         err = __get_user(to->si_signo, &from->si_signo);
         err |= __get_user(to->si_errno, &from->si_errno);
         err |= __get_user(to->si_code, &from->si_code);
 
         err |= __get_user(to->si_pid, &from->si_pid);
         err |= __get_user(to->si_uid, &from->si_uid);
-        err |= __get_user(ptr32, &from->si_ptr);
-        to->si_ptr = compat_ptr(ptr32);
+        err |= __get_user(to->si_int, &from->si_int);
 
         return err;
 }
diff --git a/arch/tile/kernel/ftrace.c b/arch/tile/kernel/ftrace.c
index 8d52d83cc516..0c0996175b1e 100644
--- a/arch/tile/kernel/ftrace.c
+++ b/arch/tile/kernel/ftrace.c
@@ -74,7 +74,11 @@ static unsigned long ftrace_gen_branch(unsigned long pc, unsigned long addr,
                         create_JumpOff_X1(pcrel_by_instr);
         }
 
-        if (addr == FTRACE_ADDR) {
+        /*
+         * Also put { move r10, lr; jal ftrace_stub } in a bundle, which
+         * is used to replace the instruction in address ftrace_call.
+         */
+        if (addr == FTRACE_ADDR || addr == (unsigned long)ftrace_stub) {
                 /* opcode: or r10, lr, zero */
                 opcode_x0 =
                         create_Dest_X0(10) |
diff --git a/arch/tile/kernel/mcount_64.S b/arch/tile/kernel/mcount_64.S
index 3c2b8d5e1d1a..6c6702451962 100644
--- a/arch/tile/kernel/mcount_64.S
+++ b/arch/tile/kernel/mcount_64.S
@@ -81,7 +81,12 @@ STD_ENTRY(ftrace_caller)
 
         /* arg1: self return address */
         /* arg2: parent's return address */
-        { move  r0, lr; move    r1, r10 }
+        /* arg3: ftrace_ops */
+        /* arg4: regs (but make it NULL) */
+        { move  r0, lr;  moveli        r2, hw2_last(function_trace_op) }
+        { move  r1, r10; shl16insli    r2, r2, hw1(function_trace_op) }
+        { movei r3, 0;   shl16insli    r2, r2, hw0(function_trace_op) }
+        ld      r2,r2
 
         .global ftrace_call
 ftrace_call:
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 48e5773dd0b7..b403c2e3e263 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/tracehook.h>
 #include <linux/signal.h>
+#include <linux/context_tracking.h>
 #include <asm/stack.h>
 #include <asm/switch_to.h>
 #include <asm/homecache.h>
@@ -474,6 +475,8 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
         if (!user_mode(regs))
                 return 0;
 
+        user_exit();
+
         /* Enable interrupts; they are disabled again on return to caller. */
         local_irq_enable();
 
@@ -496,11 +499,12 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
                 tracehook_notify_resume(regs);
                 return 1;
         }
-        if (thread_info_flags & _TIF_SINGLESTEP) {
+        if (thread_info_flags & _TIF_SINGLESTEP)
                 single_step_once(regs);
-                return 0;
-        }
-        panic("work_pending: bad flags %#x\n", thread_info_flags);
+
+        user_enter();
+
+        return 0;
 }
 
 unsigned long get_wchan(struct task_struct *p)
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index de98c6ddf136..f84eed8243da 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -22,6 +22,7 @@
 #include <linux/regset.h>
 #include <linux/elf.h>
 #include <linux/tracehook.h>
+#include <linux/context_tracking.h>
 #include <asm/traps.h>
 #include <arch/chip.h>
 
@@ -252,12 +253,21 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 
 int do_syscall_trace_enter(struct pt_regs *regs)
 {
-        if (test_thread_flag(TIF_SYSCALL_TRACE)) {
+        u32 work = ACCESS_ONCE(current_thread_info()->flags);
+
+        /*
+         * If TIF_NOHZ is set, we are required to call user_exit() before
+         * doing anything that could touch RCU.
+         */
+        if (work & _TIF_NOHZ)
+                user_exit();
+
+        if (work & _TIF_SYSCALL_TRACE) {
                 if (tracehook_report_syscall_entry(regs))
                         regs->regs[TREG_SYSCALL_NR] = -1;
         }
 
-        if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
+        if (work & _TIF_SYSCALL_TRACEPOINT)
                 trace_sys_enter(regs, regs->regs[TREG_SYSCALL_NR]);
 
         return regs->regs[TREG_SYSCALL_NR];
@@ -268,6 +278,12 @@ void do_syscall_trace_exit(struct pt_regs *regs)
         long errno;
 
         /*
+         * We may come here right after calling schedule_user()
+         * in which case we can be in RCU user mode.
+         */
+        user_exit();
+
+        /*
          * The standard tile calling convention returns the value (or negative
          * errno) in r0, and zero (or positive errno) in r1.
          * It saves a couple of cycles on the hot path to do this work in
@@ -303,5 +319,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs)
 /* Handle synthetic interrupt delivered only by the simulator. */
 void __kprobes do_breakpoint(struct pt_regs* regs, int fault_num)
 {
+        enum ctx_state prev_state = exception_enter();
         send_sigtrap(current, regs);
+        exception_exit(prev_state);
 }
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index f1f579914952..7833b2ccdfbc 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -32,6 +32,7 @@
 #include <linux/hugetlb.h>
 #include <linux/start_kernel.h>
 #include <linux/screen_info.h>
+#include <linux/tick.h>
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
@@ -1390,6 +1391,28 @@ static int __init dataplane(char *str)
 
 early_param("dataplane", dataplane);
 
+#ifdef CONFIG_NO_HZ_FULL
+/* Warn if hypervisor shared cpus are marked as nohz_full. */
+static int __init check_nohz_full_cpus(void)
+{
+        struct cpumask shared;
+        int cpu;
+
+        if (hv_inquire_tiles(HV_INQ_TILES_SHARED,
+                             (HV_VirtAddr) shared.bits, sizeof(shared)) < 0) {
+                pr_warn("WARNING: No support for inquiring hv shared tiles\n");
+                return 0;
+        }
+        for_each_cpu(cpu, &shared) {
+                if (tick_nohz_full_cpu(cpu))
+                        pr_warn("WARNING: nohz_full cpu %d receives hypervisor interrupts!\n",
+                               cpu);
+        }
+        return 0;
+}
+arch_initcall(check_nohz_full_cpus);
+#endif
+
 #ifdef CONFIG_CMDLINE_BOOL
 static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
 #endif
diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c
index 862973074bf9..53f7b9def07b 100644
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/err.h>
 #include <linux/prctl.h>
+#include <linux/context_tracking.h>
 #include <asm/cacheflush.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
@@ -738,6 +739,7 @@ static DEFINE_PER_CPU(unsigned long, ss_saved_pc);
 
 void gx_singlestep_handle(struct pt_regs *regs, int fault_num)
 {
+        enum ctx_state prev_state = exception_enter();
         unsigned long *ss_pc = this_cpu_ptr(&ss_saved_pc);
         struct thread_info *info = (void *)current_thread_info();
         int is_single_step = test_ti_thread_flag(info, TIF_SINGLESTEP);
@@ -754,6 +756,7 @@ void gx_singlestep_handle(struct pt_regs *regs, int fault_num)
                 __insn_mtspr(SPR_SINGLE_STEP_CONTROL_K, control);
                 send_sigtrap(current, regs);
         }
+        exception_exit(prev_state);
 }
 
 
diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c
index d3c4ed780ce2..07e3ff5cc740 100644
--- a/arch/tile/kernel/smp.c
+++ b/arch/tile/kernel/smp.c
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/irq_work.h>
 #include <linux/module.h>
 #include <asm/cacheflush.h>
 #include <asm/homecache.h>
@@ -33,6 +34,8 @@ EXPORT_SYMBOL(smp_topology);
 static unsigned long __iomem *ipi_mappings[NR_CPUS];
 #endif
 
+/* Does messaging work correctly to the local cpu? */
+bool self_interrupt_ok;
 
 /*
  * Top-level send_IPI*() functions to send messages to other cpus.
@@ -147,6 +150,10 @@ void evaluate_message(int tag)
                 generic_smp_call_function_single_interrupt();
                 break;
 
+        case MSG_TAG_IRQ_WORK: /* Invoke IRQ work */
+                irq_work_run();
+                break;
+
         default:
                 panic("Unknown IPI message tag %d", tag);
                 break;
@@ -186,6 +193,15 @@ void flush_icache_range(unsigned long start, unsigned long end)
 EXPORT_SYMBOL(flush_icache_range);
 
 
+#ifdef CONFIG_IRQ_WORK
+void arch_irq_work_raise(void)
+{
+        if (arch_irq_work_has_interrupt())
+                send_IPI_single(smp_processor_id(), MSG_TAG_IRQ_WORK);
+}
+#endif
+
+
 /* Called when smp_send_reschedule() triggers IRQ_RESCHEDULE. */
 static irqreturn_t handle_reschedule_ipi(int irq, void *token)
 {
@@ -203,8 +219,22 @@ static struct irqaction resched_action = {
 
 void __init ipi_init(void)
 {
+        int cpu = smp_processor_id();
+        HV_Recipient recip = { .y = cpu_y(cpu), .x = cpu_x(cpu),
+                               .state = HV_TO_BE_SENT };
+        int tag = MSG_TAG_CALL_FUNCTION_SINGLE;
+
+        /*
+         * Test if we can message ourselves for arch_irq_work_raise.
+         * This functionality is only available in the Tilera hypervisor
+         * in versions 4.3.4 and following.
+         */
+        if (hv_send_message(&recip, 1, (HV_VirtAddr)&tag, sizeof(tag)) == 1)
+                self_interrupt_ok = true;
+        else
+                pr_warn("Older hypervisor: disabling fast irq_work_raise\n");
+
 #if CHIP_HAS_IPI()
-        int cpu;
         /* Map IPI trigger MMIO addresses. */
         for_each_possible_cpu(cpu) {
                 HV_Coord tile;
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c
index 7ff5afdbd3aa..c42dce50acd8 100644
--- a/arch/tile/kernel/stack.c
+++ b/arch/tile/kernel/stack.c
@@ -108,14 +108,15 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt)
                    p->sp < PAGE_OFFSET && p->sp != 0) {
                 if (kbt->verbose)
                         pr_err("  <%s while in user mode>\n", fault);
-        } else if (kbt->verbose) {
-                pr_err("  (odd fault: pc %#lx, sp %#lx, ex1 %#lx?)\n",
-                       p->pc, p->sp, p->ex1);
-                p = NULL;
+        } else {
+                if (kbt->verbose)
+                        pr_err("  (odd fault: pc %#lx, sp %#lx, ex1 %#lx?)\n",
+                               p->pc, p->sp, p->ex1);
+                return NULL;
         }
-        if (!kbt->profile || ((1ULL << p->faultnum) & QUEUED_INTERRUPTS) == 0)
-                return p;
-        return NULL;
+        if (kbt->profile && ((1ULL << p->faultnum) & QUEUED_INTERRUPTS) != 0)
+                return NULL;
+        return p;
 }
 
 /* Is the pc pointing to a sigreturn trampoline? */
diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index bf841ca517bb..312fc134c1cb 100644
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -20,6 +20,7 @@
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
 #include <linux/ptrace.h>
+#include <linux/context_tracking.h>
 #include <asm/stack.h>
 #include <asm/traps.h>
 #include <asm/setup.h>
@@ -253,6 +254,7 @@ static int do_bpt(struct pt_regs *regs)
 void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                        unsigned long reason)
 {
+        enum ctx_state prev_state = exception_enter();
         siginfo_t info = { 0 };
         int signo, code;
         unsigned long address = 0;
@@ -261,7 +263,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
 
         /* Handle breakpoints, etc. */
         if (is_kernel && fault_num == INT_ILL && do_bpt(regs))
-                return;
+                goto done;
 
         /* Re-enable interrupts, if they were previously enabled. */
         if (!(regs->flags & PT_FLAGS_DISABLE_IRQ))
@@ -275,7 +277,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                 const char *name;
                 char buf[100];
                 if (fixup_exception(regs))  /* ILL_TRANS or UNALIGN_DATA */
-                        return;
+                        goto done;
                 if (fault_num >= 0 &&
                     fault_num < ARRAY_SIZE(int_name) &&
                     int_name[fault_num] != NULL)
@@ -294,7 +296,6 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                          fault_num, name, regs->pc, buf);
                 show_regs(regs);
                 do_exit(SIGKILL);  /* FIXME: implement i386 die() */
-                return;
         }
 
         switch (fault_num) {
@@ -308,7 +309,6 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                         pr_err("Unreadable instruction for INT_ILL: %#lx\n",
                                regs->pc);
                         do_exit(SIGKILL);
-                        return;
                 }
                 if (!special_ill(instr, &signo, &code)) {
                         signo = SIGILL;
@@ -319,7 +319,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
         case INT_GPV:
 #if CHIP_HAS_TILE_DMA()
                 if (retry_gpv(reason))
-                        return;
+                        goto done;
 #endif
                 /*FALLTHROUGH*/
         case INT_UDN_ACCESS:
@@ -346,7 +346,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                         if (!state ||
                             (void __user *)(regs->pc) != state->buffer) {
                                 single_step_once(regs);
-                                return;
+                                goto done;
                         }
                 }
 #endif
@@ -380,7 +380,6 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
 #endif
         default:
                 panic("Unexpected do_trap interrupt number %d", fault_num);
-                return;
         }
 
         info.si_signo = signo;
@@ -391,6 +390,9 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
         if (signo != SIGTRAP)
                 trace_unhandled_signal("trap", regs, address, signo);
         force_sig_info(signo, &info, current);
+
+done:
+        exception_exit(prev_state);
 }
 
 void kernel_double_fault(int dummy, ulong pc, ulong lr, ulong sp, ulong r52)
diff --git a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c
index 7d9a83be0aca..d075f92ccee0 100644
--- a/arch/tile/kernel/unaligned.c
+++ b/arch/tile/kernel/unaligned.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/compat.h>
 #include <linux/prctl.h>
+#include <linux/context_tracking.h>
 #include <asm/cacheflush.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
@@ -1448,6 +1449,7 @@ void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
 
 void do_unaligned(struct pt_regs *regs, int vecnum)
 {
+        enum ctx_state prev_state = exception_enter();
         tilegx_bundle_bits __user  *pc;
         tilegx_bundle_bits bundle;
         struct thread_info *info = current_thread_info();
@@ -1487,12 +1489,11 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                                                 (int)unaligned_fixup,
                                                 (unsigned long long)regs->ex1,
                                                 (unsigned long long)regs->pc);
-                                return;
+                        } else {
+                                /* Not fixable. Go panic. */
+                                panic("Unalign exception in Kernel. pc=%lx",
+                                      regs->pc);
                         }
-                        /* Not fixable. Go panic. */
-                        panic("Unalign exception in Kernel. pc=%lx",
-                              regs->pc);
-                        return;
                 } else {
                         /*
                          * Try to fix the exception. If we can't, panic the
@@ -1501,8 +1502,8 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                         bundle = GX_INSN_BSWAP(
                                 *((tilegx_bundle_bits *)(regs->pc)));
                         jit_bundle_gen(regs, bundle, align_ctl);
-                        return;
                 }
+                goto done;
         }
 
         /*
@@ -1526,7 +1527,7 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
 
                 trace_unhandled_signal("unaligned fixup trap", regs, 0, SIGBUS);
                 force_sig_info(info.si_signo, &info, current);
-                return;
+                goto done;
         }
 
 
@@ -1543,7 +1544,7 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
                 trace_unhandled_signal("segfault in unalign fixup", regs,
                                        (unsigned long)info.si_addr, SIGSEGV);
                 force_sig_info(info.si_signo, &info, current);
-                return;
+                goto done;
         }
 
         if (!info->unalign_jit_base) {
@@ -1578,7 +1579,7 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
 
                 if (IS_ERR((void __force *)user_page)) {
                         pr_err("Out of kernel pages trying do_mmap\n");
-                        return;
+                        goto done;
                 }
 
                 /* Save the address in the thread_info struct */
@@ -1591,6 +1592,9 @@ void do_unaligned(struct pt_regs *regs, int vecnum)
 
         /* Generate unalign JIT */
         jit_bundle_gen(regs, GX_INSN_BSWAP(bundle), align_ctl);
+
+done:
+        exception_exit(prev_state);
 }
 
 #endif /* __tilegx__ */
diff --git a/arch/tile/mm/elf.c b/arch/tile/mm/elf.c
index 23f044e8a7ab..f7ddae3725a4 100644
--- a/arch/tile/mm/elf.c
+++ b/arch/tile/mm/elf.c
@@ -17,6 +17,7 @@
 #include <linux/binfmts.h>
 #include <linux/compat.h>
 #include <linux/mman.h>
+#include <linux/file.h>
 #include <linux/elf.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -39,30 +40,34 @@ static void sim_notify_exec(const char *binary_name)
 
 static int notify_exec(struct mm_struct *mm)
 {
+        int ret = 0;
         char *buf, *path;
         struct vm_area_struct *vma;
+        struct file *exe_file;
 
         if (!sim_is_simulator())
                 return 1;
 
-        if (mm->exe_file == NULL)
-                return 0;
-
-        for (vma = current->mm->mmap; ; vma = vma->vm_next) {
-                if (vma == NULL)
-                        return 0;
-                if (vma->vm_file == mm->exe_file)
-                        break;
-        }
-
         buf = (char *) __get_free_page(GFP_KERNEL);
         if (buf == NULL)
                 return 0;
 
-        path = d_path(&mm->exe_file->f_path, buf, PAGE_SIZE);
-        if (IS_ERR(path)) {
-                free_page((unsigned long)buf);
-                return 0;
+        exe_file = get_mm_exe_file(mm);
+        if (exe_file == NULL)
+                goto done_free;
+
+        path = d_path(&exe_file->f_path, buf, PAGE_SIZE);
+        if (IS_ERR(path))
+                goto done_put;
+
+        down_read(&mm->mmap_sem);
+        for (vma = current->mm->mmap; ; vma = vma->vm_next) {
+                if (vma == NULL) {
+                        up_read(&mm->mmap_sem);
+                        goto done_put;
+                }
+                if (vma->vm_file == exe_file)
+                        break;
         }
 
         /*
@@ -80,14 +85,20 @@ static int notify_exec(struct mm_struct *mm)
                         __insn_mtspr(SPR_SIM_CONTROL,
                                      (SIM_CONTROL_DLOPEN
                                       | (c << _SIM_CONTROL_OPERATOR_BITS)));
-                        if (c == '\0')
+                        if (c == '\0') {
+                                ret = 1; /* success */
                                 break;
+                        }
                 }
         }
+        up_read(&mm->mmap_sem);
 
         sim_notify_exec(path);
+done_put:
+        fput(exe_file);
+done_free:
         free_page((unsigned long)buf);
-        return 1;
+        return ret;
 }
 
 /* Notify a running simulator, if any, that we loaded an interpreter. */
@@ -109,8 +120,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         struct mm_struct *mm = current->mm;
         int retval = 0;
 
-        down_write(&mm->mmap_sem);
-
         /*
          * Notify the simulator that an exec just occurred.
          * If we can't find the filename of the mapping, just use
@@ -119,6 +128,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         if (!notify_exec(mm))
                 sim_notify_exec(bprm->filename);
 
+        down_write(&mm->mmap_sem);
+
         retval = setup_vdso_pages();
 
 #ifndef __tilegx__
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index 0f61a73534e6..e83cc999da02 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -35,6 +35,7 @@
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 #include <linux/kdebug.h>
+#include <linux/context_tracking.h>
 
 #include <asm/pgalloc.h>
 #include <asm/sections.h>
@@ -702,6 +703,7 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                    unsigned long address, unsigned long write)
 {
         int is_page_fault;
+        enum ctx_state prev_state = exception_enter();
 
 #ifdef CONFIG_KPROBES
         /*
@@ -711,7 +713,7 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
          */
         if (notify_die(DIE_PAGE_FAULT, "page fault", regs, -1,
                        regs->faultnum, SIGSEGV) == NOTIFY_STOP)
-                return;
+                goto done;
 #endif
 
 #ifdef __tilegx__
@@ -750,7 +752,6 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                                  current->comm, current->pid, pc, address);
                         show_regs(regs);
                         do_group_exit(SIGKILL);
-                        return;
                 }
         }
 #else
@@ -834,12 +835,15 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                         async->is_fault = is_page_fault;
                         async->is_write = write;
                         async->address = address;
-                        return;
+                        goto done;
                 }
         }
 #endif
 
         handle_page_fault(regs, fault_num, is_page_fault, address, write);
+
+done:
+        exception_exit(prev_state);
 }
 
 
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index ace32d7d3864..5bd252e3fdc5 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -233,9 +233,12 @@ static pgprot_t __init init_pgprot(ulong address)
         if (kdata_huge)
                 return construct_pgprot(PAGE_KERNEL, PAGE_HOME_HASH);
 
-        /* We map the aliased pages of permanent text inaccessible. */
+        /*
+         * We map the aliased pages of permanent text so we can
+         * update them if necessary, for ftrace, etc.
+         */
         if (address < (ulong) _sinittext - CODE_DELTA)
-                return PAGE_NONE;
+                return construct_pgprot(PAGE_KERNEL, PAGE_HOME_HASH);
 
         /* We map read-only data non-coherent for performance. */
         if ((address >= (ulong) __start_rodata &&
diff --git a/arch/x86/include/asm/seccomp.h b/arch/x86/include/asm/seccomp.h
index 0f3d7f099224..0c8c7c8861b4 100644
--- a/arch/x86/include/asm/seccomp.h
+++ b/arch/x86/include/asm/seccomp.h
@@ -1,5 +1,20 @@
+#ifndef _ASM_X86_SECCOMP_H
+#define _ASM_X86_SECCOMP_H
+
+#include <asm/unistd.h>
+
 #ifdef CONFIG_X86_32
-# include <asm/seccomp_32.h>
-#else
-# include <asm/seccomp_64.h>
+#define __NR_seccomp_sigreturn          __NR_sigreturn
 #endif
+
+#ifdef CONFIG_COMPAT
+#include <asm/ia32_unistd.h>
+#define __NR_seccomp_read_32            __NR_ia32_read
+#define __NR_seccomp_write_32           __NR_ia32_write
+#define __NR_seccomp_exit_32            __NR_ia32_exit
+#define __NR_seccomp_sigreturn_32       __NR_ia32_sigreturn
+#endif
+
+#include <asm-generic/seccomp.h>
+
+#endif /* _ASM_X86_SECCOMP_H */
diff --git a/arch/x86/include/asm/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h
deleted file mode 100644
index b811d6f5780c..000000000000
--- a/arch/x86/include/asm/seccomp_32.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_X86_SECCOMP_32_H
-#define _ASM_X86_SECCOMP_32_H
-
-#include <linux/unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_sigreturn
-
-#endif /* _ASM_X86_SECCOMP_32_H */
diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h
deleted file mode 100644
index 84ec1bd161a5..000000000000
--- a/arch/x86/include/asm/seccomp_64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_X86_SECCOMP_64_H
-#define _ASM_X86_SECCOMP_64_H
-
-#include <linux/unistd.h>
-#include <asm/ia32_unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#define __NR_seccomp_read_32 __NR_ia32_read
-#define __NR_seccomp_write_32 __NR_ia32_write
-#define __NR_seccomp_exit_32 __NR_ia32_exit
-#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
-
-#endif /* _ASM_X86_SECCOMP_64_H */
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index e31d4949124a..87be10e8b57a 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -428,6 +428,36 @@ config DEFAULT_MEM_SIZE
 
           If unsure, leave the default value here.
 
+config XTFPGA_LCD
+        bool "Enable XTFPGA LCD driver"
+        depends on XTENSA_PLATFORM_XTFPGA
+        default n
+        help
+          There's a 2x16 LCD on most of XTFPGA boards, kernel may output
+          progress messages there during bootup/shutdown. It may be useful
+          during board bringup.
+
+          If unsure, say N.
+
+config XTFPGA_LCD_BASE_ADDR
+        hex "XTFPGA LCD base address"
+        depends on XTFPGA_LCD
+        default "0x0d0c0000"
+        help
+          Base address of the LCD controller inside KIO region.
+          Different boards from XTFPGA family have LCD controller at different
+          addresses. Please consult prototyping user guide for your board for
+          the correct address. Wrong address here may lead to hardware lockup.
+
+config XTFPGA_LCD_8BIT_ACCESS
+        bool "Use 8-bit access to XTFPGA LCD"
+        depends on XTFPGA_LCD
+        default n
+        help
+          LCD may be connected with 4- or 8-bit interface, 8-bit access may
+          only be used with 8-bit interface. Please consult prototyping user
+          guide for your board for the correct interface width.
+
 endmenu
 
 menu "Executable file formats"
diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi
index dec9178840f6..cd0b9e34adc8 100644
--- a/arch/xtensa/boot/dts/xtfpga.dtsi
+++ b/arch/xtensa/boot/dts/xtfpga.dtsi
@@ -40,6 +40,12 @@
                         #clock-cells = <0>;
                         compatible = "fixed-clock";
                 };
+
+                clk54: clk54 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <54000000>;
+                };
         };
 
         soc {
@@ -65,5 +71,63 @@
                         local-mac-address = [00 50 c2 13 6f 00];
                         clocks = <&osc>;
                 };
+
+                i2s0: xtfpga-i2s@0d080000 {
+                        #sound-dai-cells = <0>;
+                        compatible = "cdns,xtfpga-i2s";
+                        reg = <0x0d080000 0x40>;
+                        interrupts = <2 1>; /* external irq 2 */
+                        clocks = <&cdce706 4>;
+                };
+
+                i2c0: i2c-master@0d090000 {
+                        compatible = "opencores,i2c-ocores";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x0d090000 0x20>;
+                        reg-shift = <2>;
+                        reg-io-width = <1>;
+                        interrupts = <4 1>;
+                        clocks = <&osc>;
+
+                        cdce706: clock-synth@69 {
+                                compatible = "ti,cdce706";
+                                #clock-cells = <1>;
+                                reg = <0x69>;
+                                clocks = <&clk54>;
+                                clock-names = "clk_in0";
+                        };
+                };
+
+                spi0: spi-master@0d0a0000 {
+                        compatible = "cdns,xtfpga-spi";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x0d0a0000 0xc>;
+
+                        tlv320aic23: sound-codec@0 {
+                                #sound-dai-cells = <0>;
+                                compatible = "tlv320aic23";
+                                reg = <0>;
+                                spi-max-frequency = <12500000>;
+                        };
+                };
+        };
+
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,mclk-fs = <256>;
+
+                simple-audio-card,cpu {
+                        sound-dai = <&i2s0>;
+                };
+
+                simple-audio-card,codec {
+                        sound-dai = <&tlv320aic23>;
+                        simple-audio-card,bitclock-master = <0>;
+                        simple-audio-card,frame-master = <0>;
+                        clocks = <&cdce706 4>;
+                };
         };
 };
diff --git a/arch/xtensa/configs/audio_kc705_defconfig b/arch/xtensa/configs/audio_kc705_defconfig
new file mode 100644
index 000000000000..c4904db15582
--- /dev/null
+++ b/arch/xtensa/configs/audio_kc705_defconfig
@@ -0,0 +1,142 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_FHANDLE=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_MEMCG=y
+CONFIG_NAMESPACES=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_XTENSA_VARIANT_CUSTOM=y
+CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_kc705_hifi"
+CONFIG_XTENSA_UNALIGNED_USER=y
+CONFIG_PREEMPT=y
+CONFIG_HIGHMEM=y
+# CONFIG_PCI is not set
+CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"
+CONFIG_USE_OF=y
+CONFIG_BUILTIN_DTB="kc705"
+# CONFIG_COMPACTION is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_PM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_MTD=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_MARVELL_PHY=y
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_OCORES=y
+CONFIG_SPI=y
+CONFIG_SPI_XTENSA_XTFPGA=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_SOFT_WATCHDOG=y
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_XTFPGA_I2S=y
+CONFIG_SND_SOC_TLV320AIC23_SPI=y
+CONFIG_SND_SIMPLE_CARD=y
+# CONFIG_USB_SUPPORT is not set
+CONFIG_COMMON_CLK_CDCE706=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_VFAT_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
+CONFIG_ROOT_NFS=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_STACKTRACE=y
+CONFIG_RCU_TRACE=y
+# CONFIG_FTRACE is not set
+# CONFIG_S32C1I_SELFTEST is not set
+CONFIG_CRYPTO_ANSI_CPRNG=y
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h
index db5bb72e2f4e..b95c30594355 100644
--- a/arch/xtensa/include/uapi/asm/unistd.h
+++ b/arch/xtensa/include/uapi/asm/unistd.h
@@ -715,7 +715,7 @@ __SYSCALL(323, sys_process_vm_writev, 6)
 __SYSCALL(324, sys_name_to_handle_at, 5)
 #define __NR_open_by_handle_at                  325
 __SYSCALL(325, sys_open_by_handle_at, 3)
-#define __NR_sync_file_range                    326
+#define __NR_sync_file_range2                   326
 __SYSCALL(326, sys_sync_file_range2, 6)
 #define __NR_perf_event_open                    327
 __SYSCALL(327, sys_perf_event_open, 5)
@@ -749,8 +749,12 @@ __SYSCALL(337, sys_seccomp, 3)
 __SYSCALL(338, sys_getrandom, 3)
 #define __NR_memfd_create                       339
 __SYSCALL(339, sys_memfd_create, 2)
+#define __NR_bpf                                340
+__SYSCALL(340, sys_bpf, 3)
+#define __NR_execveat                           341
+__SYSCALL(341, sys_execveat, 5)
 
-#define __NR_syscall_count                      340
+#define __NR_syscall_count                      342
 
 /*
  * sysxtensa syscall handler
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index 18d962a8c0c2..d3a0f0fd56dd 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -29,6 +29,7 @@ AFLAGS_head.o += -mtext-section-literals
 
 sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \
         -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g'       \
+        -e 's/\*(\(\.text .*\))/*(.literal \1)/g'                        \
         -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g'
 
 quiet_cmd__cpp_lds_S = LDS     $@
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index d05f8feeb8d7..17b1ef3232e4 100644
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -349,8 +349,8 @@ static void iss_net_timer(unsigned long priv)
 {
         struct iss_net_private *lp = (struct iss_net_private *)priv;
 
-        spin_lock(&lp->lock);
         iss_net_poll();
+        spin_lock(&lp->lock);
         mod_timer(&lp->timer, jiffies + lp->timer_val);
         spin_unlock(&lp->lock);
 }
@@ -361,7 +361,7 @@ static int iss_net_open(struct net_device *dev)
         struct iss_net_private *lp = netdev_priv(dev);
         int err;
 
-        spin_lock(&lp->lock);
+        spin_lock_bh(&lp->lock);
 
         err = lp->tp.open(lp);
         if (err < 0)
@@ -376,9 +376,11 @@ static int iss_net_open(struct net_device *dev)
         while ((err = iss_net_rx(dev)) > 0)
                 ;
 
-        spin_lock(&opened_lock);
+        spin_unlock_bh(&lp->lock);
+        spin_lock_bh(&opened_lock);
         list_add(&lp->opened_list, &opened);
-        spin_unlock(&opened_lock);
+        spin_unlock_bh(&opened_lock);
+        spin_lock_bh(&lp->lock);
 
         init_timer(&lp->timer);
         lp->timer_val = ISS_NET_TIMER_VALUE;
@@ -387,7 +389,7 @@ static int iss_net_open(struct net_device *dev)
         mod_timer(&lp->timer, jiffies + lp->timer_val);
 
 out:
-        spin_unlock(&lp->lock);
+        spin_unlock_bh(&lp->lock);
         return err;
 }
 
@@ -395,7 +397,7 @@ static int iss_net_close(struct net_device *dev)
 {
         struct iss_net_private *lp = netdev_priv(dev);
         netif_stop_queue(dev);
-        spin_lock(&lp->lock);
+        spin_lock_bh(&lp->lock);
 
         spin_lock(&opened_lock);
         list_del(&opened);
@@ -405,18 +407,17 @@ static int iss_net_close(struct net_device *dev)
 
         lp->tp.close(lp);
 
-        spin_unlock(&lp->lock);
+        spin_unlock_bh(&lp->lock);
         return 0;
 }
 
 static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct iss_net_private *lp = netdev_priv(dev);
-        unsigned long flags;
         int len;
 
         netif_stop_queue(dev);
-        spin_lock_irqsave(&lp->lock, flags);
+        spin_lock_bh(&lp->lock);
 
         len = lp->tp.write(lp, &skb);
 
@@ -438,7 +439,7 @@ static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 pr_err("%s: %s failed(%d)\n", dev->name, __func__, len);
         }
 
-        spin_unlock_irqrestore(&lp->lock, flags);
+        spin_unlock_bh(&lp->lock);
 
         dev_kfree_skb(skb);
         return NETDEV_TX_OK;
@@ -466,9 +467,9 @@ static int iss_net_set_mac(struct net_device *dev, void *addr)
 
         if (!is_valid_ether_addr(hwaddr->sa_data))
                 return -EADDRNOTAVAIL;
-        spin_lock(&lp->lock);
+        spin_lock_bh(&lp->lock);
         memcpy(dev->dev_addr, hwaddr->sa_data, ETH_ALEN);
-        spin_unlock(&lp->lock);
+        spin_unlock_bh(&lp->lock);
         return 0;
 }
 
@@ -520,11 +521,11 @@ static int iss_net_configure(int index, char *init)
         *lp = (struct iss_net_private) {
                 .device_list            = LIST_HEAD_INIT(lp->device_list),
                 .opened_list            = LIST_HEAD_INIT(lp->opened_list),
-                .lock                   = __SPIN_LOCK_UNLOCKED(lp.lock),
                 .dev                    = dev,
                 .index                  = index,
-                };
+        };
 
+        spin_lock_init(&lp->lock);
         /*
          * If this name ends up conflicting with an existing registered
          * netdevice, that is OK, register_netdev{,ice}() will notice this
diff --git a/arch/xtensa/platforms/xtfpga/Makefile b/arch/xtensa/platforms/xtfpga/Makefile
index b9ae206340cd..7839d38b2337 100644
--- a/arch/xtensa/platforms/xtfpga/Makefile
+++ b/arch/xtensa/platforms/xtfpga/Makefile
@@ -6,4 +6,5 @@
 #
 # Note 2! The CFLAGS definitions are in the main makefile...
 
-obj-y                   = setup.o lcd.o
+obj-y                   += setup.o
+obj-$(CONFIG_XTFPGA_LCD) += lcd.o
diff --git a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
index 6edd20bb4565..0a55bb9c5420 100644
--- a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
+++ b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
@@ -40,9 +40,6 @@
 
 /* UART */
 #define DUART16552_PADDR        (XCHAL_KIO_PADDR + 0x0D050020)
-/* LCD instruction and data addresses. */
-#define LCD_INSTR_ADDR          ((char *)IOADDR(0x0D040000))
-#define LCD_DATA_ADDR           ((char *)IOADDR(0x0D040004))
 
 /* Misc. */
 #define XTFPGA_FPGAREGS_VADDR   IOADDR(0x0D020000)
@@ -62,4 +59,7 @@
                                 /* 5*rx buffs + 5*tx buffs */
 #define OETH_SRAMBUFF_SIZE      (5 * 0x600 + 5 * 0x600)
 
+#define C67X00_PADDR            (XCHAL_KIO_PADDR + 0x0D0D0000)
+#define C67X00_SIZE             0x10
+#define C67X00_IRQ              5
 #endif /* __XTENSA_XTAVNET_HARDWARE_H */
diff --git a/arch/xtensa/platforms/xtfpga/include/platform/lcd.h b/arch/xtensa/platforms/xtfpga/include/platform/lcd.h
index 0e435645af5a..4c8541ed1139 100644
--- a/arch/xtensa/platforms/xtfpga/include/platform/lcd.h
+++ b/arch/xtensa/platforms/xtfpga/include/platform/lcd.h
@@ -11,10 +11,25 @@
 #ifndef __XTENSA_XTAVNET_LCD_H
 #define __XTENSA_XTAVNET_LCD_H
 
+#ifdef CONFIG_XTFPGA_LCD
 /* Display string STR at position POS on the LCD. */
 void lcd_disp_at_pos(char *str, unsigned char pos);
 
 /* Shift the contents of the LCD display left or right. */
 void lcd_shiftleft(void);
 void lcd_shiftright(void);
+#else
+static inline void lcd_disp_at_pos(char *str, unsigned char pos)
+{
+}
+
+static inline void lcd_shiftleft(void)
+{
+}
+
+static inline void lcd_shiftright(void)
+{
+}
+#endif
+
 #endif
diff --git a/arch/xtensa/platforms/xtfpga/lcd.c b/arch/xtensa/platforms/xtfpga/lcd.c
index 2872301598df..4dc0c1b43f4b 100644
--- a/arch/xtensa/platforms/xtfpga/lcd.c
+++ b/arch/xtensa/platforms/xtfpga/lcd.c
@@ -1,50 +1,63 @@
 /*
- * Driver for the LCD display on the Tensilica LX60 Board.
+ * Driver for the LCD display on the Tensilica XTFPGA board family.
+ * http://www.mytechcorp.com/cfdata/productFile/File1/MOC-16216B-B-A0A04.pdf
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
  * Copyright (C) 2001, 2006 Tensilica Inc.
+ * Copyright (C) 2015 Cadence Design Systems Inc.
  */
 
-/*
- *
- * FIXME: this code is from the examples from the LX60 user guide.
- *
- * The lcd_pause function does busy waiting, which is probably not
- * great. Maybe the code could be changed to use kernel timers, or
- * change the hardware to not need to wait.
- */
-
+#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/io.h>
 
 #include <platform/hardware.h>
 #include <platform/lcd.h>
-#include <linux/delay.h>
 
-#define LCD_PAUSE_ITERATIONS    4000
+/* LCD instruction and data addresses. */
+#define LCD_INSTR_ADDR          ((char *)IOADDR(CONFIG_XTFPGA_LCD_BASE_ADDR))
+#define LCD_DATA_ADDR           (LCD_INSTR_ADDR + 4)
+
 #define LCD_CLEAR               0x1
 #define LCD_DISPLAY_ON          0xc
 
 /* 8bit and 2 lines display */
 #define LCD_DISPLAY_MODE8BIT    0x38
+#define LCD_DISPLAY_MODE4BIT    0x28
 #define LCD_DISPLAY_POS         0x80
 #define LCD_SHIFT_LEFT          0x18
 #define LCD_SHIFT_RIGHT         0x1c
 
+static void lcd_put_byte(u8 *addr, u8 data)
+{
+#ifdef CONFIG_XTFPGA_LCD_8BIT_ACCESS
+        ACCESS_ONCE(*addr) = data;
+#else
+        ACCESS_ONCE(*addr) = data & 0xf0;
+        ACCESS_ONCE(*addr) = (data << 4) & 0xf0;
+#endif
+}
+
 static int __init lcd_init(void)
 {
-        *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT;
+        ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT;
         mdelay(5);
-        *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT;
+        ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT;
         udelay(200);
-        *LCD_INSTR_ADDR = LCD_DISPLAY_MODE8BIT;
+        ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE8BIT;
+        udelay(50);
+#ifndef CONFIG_XTFPGA_LCD_8BIT_ACCESS
+        ACCESS_ONCE(*LCD_INSTR_ADDR) = LCD_DISPLAY_MODE4BIT;
+        udelay(50);
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_MODE4BIT);
         udelay(50);
-        *LCD_INSTR_ADDR = LCD_DISPLAY_ON;
+#endif
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_ON);
         udelay(50);
-        *LCD_INSTR_ADDR = LCD_CLEAR;
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_CLEAR);
         mdelay(10);
         lcd_disp_at_pos("XTENSA LINUX", 0);
         return 0;
@@ -52,10 +65,10 @@ static int __init lcd_init(void)
 
 void lcd_disp_at_pos(char *str, unsigned char pos)
 {
-        *LCD_INSTR_ADDR = LCD_DISPLAY_POS | pos;
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_DISPLAY_POS | pos);
         udelay(100);
         while (*str != 0) {
-                *LCD_DATA_ADDR = *str;
+                lcd_put_byte(LCD_DATA_ADDR, *str);
                 udelay(200);
                 str++;
         }
@@ -63,13 +76,13 @@ void lcd_disp_at_pos(char *str, unsigned char pos)
 
 void lcd_shiftleft(void)
 {
-        *LCD_INSTR_ADDR = LCD_SHIFT_LEFT;
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_SHIFT_LEFT);
         udelay(50);
 }
 
 void lcd_shiftright(void)
 {
-        *LCD_INSTR_ADDR = LCD_SHIFT_RIGHT;
+        lcd_put_byte(LCD_INSTR_ADDR, LCD_SHIFT_RIGHT);
         udelay(50);
 }
 
diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index 57fd08b36f51..b4cf70e535ab 100644
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -189,6 +189,7 @@ void __init platform_calibrate_ccount(void)
 #include <linux/serial_8250.h>
 #include <linux/if.h>
 #include <net/ethoc.h>
+#include <linux/usb/c67x00.h>
 
 /*----------------------------------------------------------------------------
  *  Ethernet -- OpenCores Ethernet MAC (ethoc driver)
@@ -233,6 +234,38 @@ static struct platform_device ethoc_device = {
 };
 
 /*----------------------------------------------------------------------------
+ *  USB Host/Device -- Cypress CY7C67300
+ */
+
+static struct resource c67x00_res[] = {
+        [0] = { /* register space */
+                .start = C67X00_PADDR,
+                .end   = C67X00_PADDR + C67X00_SIZE - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = { /* IRQ number */
+                .start = C67X00_IRQ,
+                .end   = C67X00_IRQ,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct c67x00_platform_data c67x00_pdata = {
+        .sie_config = C67X00_SIE1_HOST | C67X00_SIE2_UNUSED,
+        .hpi_regstep = 4,
+};
+
+static struct platform_device c67x00_device = {
+        .name = "c67x00",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(c67x00_res),
+        .resource = c67x00_res,
+        .dev = {
+                .platform_data = &c67x00_pdata,
+        },
+};
+
+/*----------------------------------------------------------------------------
  *  UART
  */
 
@@ -268,6 +301,7 @@ static struct platform_device xtavnet_uart = {
 /* platform devices */
 static struct platform_device *platform_devices[] __initdata = {
         &ethoc_device,
+        &c67x00_device,
         &xtavnet_uart,
 };
 
diff --git a/block/blk-core.c b/block/blk-core.c
index 794c3e7f01cf..fd154b94447a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -557,6 +557,18 @@ void blk_cleanup_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL(blk_cleanup_queue);
 
+/* Allocate memory local to the request queue */
+static void *alloc_request_struct(gfp_t gfp_mask, void *data)
+{
+        int nid = (int)(long)data;
+        return kmem_cache_alloc_node(request_cachep, gfp_mask, nid);
+}
+
+static void free_request_struct(void *element, void *unused)
+{
+        kmem_cache_free(request_cachep, element);
+}
+
 int blk_init_rl(struct request_list *rl, struct request_queue *q,
                 gfp_t gfp_mask)
 {
@@ -569,9 +581,10 @@ int blk_init_rl(struct request_list *rl, struct request_queue *q,
         init_waitqueue_head(&rl->wait[BLK_RW_SYNC]);
         init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]);
 
-        rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
-                                          mempool_free_slab, request_cachep,
-                                          gfp_mask, q->node);
+        rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, alloc_request_struct,
+                                          free_request_struct,
+                                          (void *)(long)q->node, gfp_mask,
+                                          q->node);
         if (!rl->rq_pool)
                 return -ENOMEM;
 
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 1630a20d5dcf..b79685e06b70 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -436,6 +436,7 @@ int blk_mq_register_disk(struct gendisk *disk)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(blk_mq_register_disk);
 
 void blk_mq_sysfs_unregister(struct request_queue *q)
 {
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 33c428530193..ade8a2d1b0aa 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -33,7 +33,6 @@ static DEFINE_MUTEX(all_q_mutex);
 static LIST_HEAD(all_q_list);
 
 static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx);
-static void blk_mq_run_queues(struct request_queue *q);
 
 /*
  * Check if any of the ctx's have pending work in this hardware queue
@@ -42,7 +41,7 @@ static bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx)
 {
         unsigned int i;
 
-        for (i = 0; i < hctx->ctx_map.map_size; i++)
+        for (i = 0; i < hctx->ctx_map.size; i++)
                 if (hctx->ctx_map.map[i].word)
                         return true;
 
@@ -78,7 +77,7 @@ static void blk_mq_hctx_clear_pending(struct blk_mq_hw_ctx *hctx,
         clear_bit(CTX_TO_BIT(hctx, ctx), &bm->word);
 }
 
-static int blk_mq_queue_enter(struct request_queue *q)
+static int blk_mq_queue_enter(struct request_queue *q, gfp_t gfp)
 {
         while (true) {
                 int ret;
@@ -86,6 +85,9 @@ static int blk_mq_queue_enter(struct request_queue *q)
                 if (percpu_ref_tryget_live(&q->mq_usage_counter))
                         return 0;
 
+                if (!(gfp & __GFP_WAIT))
+                        return -EBUSY;
+
                 ret = wait_event_interruptible(q->mq_freeze_wq,
                                 !q->mq_freeze_depth || blk_queue_dying(q));
                 if (blk_queue_dying(q))
@@ -118,7 +120,7 @@ void blk_mq_freeze_queue_start(struct request_queue *q)
 
         if (freeze) {
                 percpu_ref_kill(&q->mq_usage_counter);
-                blk_mq_run_queues(q);
+                blk_mq_run_hw_queues(q, false);
         }
 }
 EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
@@ -257,7 +259,7 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, gfp_t gfp,
         struct blk_mq_alloc_data alloc_data;
         int ret;
 
-        ret = blk_mq_queue_enter(q);
+        ret = blk_mq_queue_enter(q, gfp);
         if (ret)
                 return ERR_PTR(ret);
 
@@ -728,7 +730,7 @@ static void flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list)
         struct blk_mq_ctx *ctx;
         int i;
 
-        for (i = 0; i < hctx->ctx_map.map_size; i++) {
+        for (i = 0; i < hctx->ctx_map.size; i++) {
                 struct blk_align_bitmap *bm = &hctx->ctx_map.map[i];
                 unsigned int off, bit;
 
@@ -904,7 +906,7 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
                         &hctx->run_work, 0);
 }
 
-static void blk_mq_run_queues(struct request_queue *q)
+void blk_mq_run_hw_queues(struct request_queue *q, bool async)
 {
         struct blk_mq_hw_ctx *hctx;
         int i;
@@ -915,9 +917,10 @@ static void blk_mq_run_queues(struct request_queue *q)
                     test_bit(BLK_MQ_S_STOPPED, &hctx->state))
                         continue;
 
-                blk_mq_run_hw_queue(hctx, false);
+                blk_mq_run_hw_queue(hctx, async);
         }
 }
+EXPORT_SYMBOL(blk_mq_run_hw_queues);
 
 void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx)
 {
@@ -1186,7 +1189,7 @@ static struct request *blk_mq_map_request(struct request_queue *q,
         int rw = bio_data_dir(bio);
         struct blk_mq_alloc_data alloc_data;
 
-        if (unlikely(blk_mq_queue_enter(q))) {
+        if (unlikely(blk_mq_queue_enter(q, GFP_KERNEL))) {
                 bio_endio(bio, -EIO);
                 return NULL;
         }
@@ -1517,8 +1520,6 @@ static int blk_mq_alloc_bitmap(struct blk_mq_ctxmap *bitmap, int node)
         if (!bitmap->map)
                 return -ENOMEM;
 
-        bitmap->map_size = num_maps;
-
         total = nr_cpu_ids;
         for (i = 0; i < num_maps; i++) {
                 bitmap->map[i].depth = min(total, bitmap->bits_per_word);
@@ -1759,8 +1760,6 @@ static void blk_mq_init_cpu_queues(struct request_queue *q,
                         continue;
 
                 hctx = q->mq_ops->map_queue(q, i);
-                cpumask_set_cpu(i, hctx->cpumask);
-                hctx->nr_ctx++;
 
                 /*
                  * Set local node, IFF we have more than one hw queue. If
@@ -1797,6 +1796,8 @@ static void blk_mq_map_swqueue(struct request_queue *q)
         }
 
         queue_for_each_hw_ctx(q, hctx, i) {
+                struct blk_mq_ctxmap *map = &hctx->ctx_map;
+
                 /*
                  * If no software queues are mapped to this hardware queue,
                  * disable it and free the request entries.
@@ -1813,6 +1814,13 @@ static void blk_mq_map_swqueue(struct request_queue *q)
                 }
 
                 /*
+                 * Set the map size to the number of mapped software queues.
+                 * This is more accurate and more efficient than looping
+                 * over all possibly mapped software queues.
+                 */
+                map->size = DIV_ROUND_UP(hctx->nr_ctx, map->bits_per_word);
+
+                /*
                  * Initialize batch roundrobin counts
                  */
                 hctx->next_cpu = cpumask_first(hctx->cpumask);
@@ -1889,9 +1897,25 @@ void blk_mq_release(struct request_queue *q)
 
 struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
 {
+        struct request_queue *uninit_q, *q;
+
+        uninit_q = blk_alloc_queue_node(GFP_KERNEL, set->numa_node);
+        if (!uninit_q)
+                return ERR_PTR(-ENOMEM);
+
+        q = blk_mq_init_allocated_queue(set, uninit_q);
+        if (IS_ERR(q))
+                blk_cleanup_queue(uninit_q);
+
+        return q;
+}
+EXPORT_SYMBOL(blk_mq_init_queue);
+
+struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
+                                                  struct request_queue *q)
+{
         struct blk_mq_hw_ctx **hctxs;
         struct blk_mq_ctx __percpu *ctx;
-        struct request_queue *q;
         unsigned int *map;
         int i;
 
@@ -1926,20 +1950,16 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
                 hctxs[i]->queue_num = i;
         }
 
-        q = blk_alloc_queue_node(GFP_KERNEL, set->numa_node);
-        if (!q)
-                goto err_hctxs;
-
         /*
          * Init percpu_ref in atomic mode so that it's faster to shutdown.
          * See blk_register_queue() for details.
          */
         if (percpu_ref_init(&q->mq_usage_counter, blk_mq_usage_counter_release,
                             PERCPU_REF_INIT_ATOMIC, GFP_KERNEL))
-                goto err_mq_usage;
+                goto err_hctxs;
 
         setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);
-        blk_queue_rq_timeout(q, 30000);
+        blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000);
 
         q->nr_queues = nr_cpu_ids;
         q->nr_hw_queues = set->nr_hw_queues;
@@ -1965,9 +1985,6 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
         else
                 blk_queue_make_request(q, blk_sq_make_request);
 
-        if (set->timeout)
-                blk_queue_rq_timeout(q, set->timeout);
-
         /*
          * Do this after blk_queue_make_request() overrides it...
          */
@@ -1979,7 +1996,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
         blk_mq_init_cpu_queues(q, set->nr_hw_queues);
 
         if (blk_mq_init_hw_queues(q, set))
-                goto err_mq_usage;
+                goto err_hctxs;
 
         mutex_lock(&all_q_mutex);
         list_add_tail(&q->all_q_node, &all_q_list);
@@ -1991,8 +2008,6 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
 
         return q;
 
-err_mq_usage:
-        blk_cleanup_queue(q);
 err_hctxs:
         kfree(map);
         for (i = 0; i < set->nr_hw_queues; i++) {
@@ -2007,7 +2022,7 @@ err_percpu:
         free_percpu(ctx);
         return ERR_PTR(-ENOMEM);
 }
-EXPORT_SYMBOL(blk_mq_init_queue);
+EXPORT_SYMBOL(blk_mq_init_allocated_queue);
 
 void blk_mq_free_queue(struct request_queue *q)
 {
@@ -2159,7 +2174,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
         if (set->queue_depth < set->reserved_tags + BLK_MQ_TAG_MIN)
                 return -EINVAL;
 
-        if (!set->nr_hw_queues || !set->ops->queue_rq || !set->ops->map_queue)
+        if (!set->ops->queue_rq || !set->ops->map_queue)
                 return -EINVAL;
 
         if (set->queue_depth > BLK_MQ_MAX_DEPTH) {
diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h
index d863016565b5..e9f0833e818d 100644
--- a/drivers/acpi/acpica/acapps.h
+++ b/drivers/acpi/acpica/acapps.h
@@ -64,15 +64,15 @@
 /* Macros for signons and file headers */
 
 #define ACPI_COMMON_SIGNON(utility_name) \
-        "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \
+        "\n%s\n%s version %8.8X%s\n%s\n\n", \
         ACPICA_NAME, \
-        utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+        utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \
         ACPICA_COPYRIGHT
 
 #define ACPI_COMMON_HEADER(utility_name, prefix) \
-        "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
+        "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \
         prefix, ACPICA_NAME, \
-        prefix, utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+        prefix, utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \
         prefix, ACPICA_COPYRIGHT, \
         prefix
 
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index a165d25343e8..a0c478784314 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -306,6 +306,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_db_output_flags, ACPI_DB_CONSOLE_OUTPUT);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_no_resource_disassembly, FALSE);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_ignore_noop_operator, FALSE);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);
+ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE);
 
 ACPI_GLOBAL(u8, acpi_gbl_db_opt_disasm);
 ACPI_GLOBAL(u8, acpi_gbl_db_opt_verbose);
@@ -321,9 +322,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_db_terminate_threads, FALSE);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);
 ACPI_INIT_GLOBAL(u8, acpi_gbl_method_executing, FALSE);
 
-ACPI_GLOBAL(u8, acpi_gbl_db_opt_tables);
-ACPI_GLOBAL(u8, acpi_gbl_db_opt_stats);
-ACPI_GLOBAL(u8, acpi_gbl_db_opt_ini_methods);
+ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_ini_methods);
 ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);
 ACPI_GLOBAL(u8, acpi_gbl_db_output_to_file);
 ACPI_GLOBAL(char *, acpi_gbl_db_buffer);
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 7add32e5d8c5..87b27521fcac 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -53,7 +53,7 @@ typedef u32 acpi_mutex_handle;
 
 /* Total number of aml opcodes defined */
 
-#define AML_NUM_OPCODES                 0x81
+#define AML_NUM_OPCODES                 0x82
 
 /* Forward declarations */
 
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index cf607fe69dbd..c240bdf824f2 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -63,23 +63,12 @@
 #define ACPI_SET64(ptr, val)            (*ACPI_CAST64 (ptr) = (u64) (val))
 
 /*
- * printf() format helpers. These macros are workarounds for the difficulties
+ * printf() format helper. This macros is a workaround for the difficulties
  * with emitting 64-bit integers and 64-bit pointers with the same code
  * for both 32-bit and 64-bit hosts.
  */
 #define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)
 
-#if ACPI_MACHINE_WIDTH == 64
-#define ACPI_FORMAT_NATIVE_UINT(i)      ACPI_FORMAT_UINT64(i)
-#define ACPI_FORMAT_TO_UINT(i)          ACPI_FORMAT_UINT64(i)
-#define ACPI_PRINTF_UINT                 "0x%8.8X%8.8X"
-
-#else
-#define ACPI_FORMAT_NATIVE_UINT(i)      0, (u32) (i)
-#define ACPI_FORMAT_TO_UINT(i)          (u32) (i)
-#define ACPI_PRINTF_UINT                 "0x%8.8X"
-#endif
-
 /*
  * Macros for moving data around to/from buffers that are possibly unaligned.
  * If the hardware supports the transfer of unaligned data, just do the store.
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index a5f17de45ac6..fd85ad05a24a 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -111,6 +111,7 @@
 #define ARGP_DWORD_OP                   ARGP_LIST1 (ARGP_DWORDDATA)
 #define ARGP_ELSE_OP                    ARGP_LIST2 (ARGP_PKGLENGTH,  ARGP_TERMLIST)
 #define ARGP_EVENT_OP                   ARGP_LIST1 (ARGP_NAME)
+#define ARGP_EXTERNAL_OP                ARGP_LIST3 (ARGP_NAMESTRING, ARGP_BYTEDATA,      ARGP_BYTEDATA)
 #define ARGP_FATAL_OP                   ARGP_LIST3 (ARGP_BYTEDATA,   ARGP_DWORDDATA,     ARGP_TERMARG)
 #define ARGP_FIELD_OP                   ARGP_LIST4 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_BYTEDATA,  ARGP_FIELDLIST)
 #define ARGP_FIND_SET_LEFT_BIT_OP       ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)
@@ -243,6 +244,7 @@
 #define ARGI_DWORD_OP                   ARGI_INVALID_OPCODE
 #define ARGI_ELSE_OP                    ARGI_INVALID_OPCODE
 #define ARGI_EVENT_OP                   ARGI_INVALID_OPCODE
+#define ARGI_EXTERNAL_OP                ARGI_LIST3 (ARGI_STRING,     ARGI_INTEGER,       ARGI_INTEGER)
 #define ARGI_FATAL_OP                   ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_INTEGER)
 #define ARGI_FIELD_OP                   ARGI_INVALID_OPCODE
 #define ARGI_FIND_SET_LEFT_BIT_OP       ARGI_LIST2 (ARGI_INTEGER,    ARGI_TARGETREF)
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index efc4c7124ccc..6357efb01b93 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -299,11 +299,13 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
                             union aml_resource *aml);
 
 /*
- * rsdump
+ * rsdump - Debugger support
  */
+#ifdef ACPI_DEBUGGER
 void acpi_rs_dump_resource_list(struct acpi_resource *resource);
 
-void acpi_rs_dump_irq_list(u8 * route_table);
+void acpi_rs_dump_irq_list(u8 *route_table);
+#endif
 
 /*
  * Resource conversion tables
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index d14b547b7cd5..87c7860b3394 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -68,11 +68,6 @@
 #define ACPI_WALK_METHOD            0x01
 #define ACPI_WALK_METHOD_RESTART    0x02
 
-/* Flags for iASL compiler only */
-
-#define ACPI_WALK_CONST_REQUIRED    0x10
-#define ACPI_WALK_CONST_OPTIONAL    0x20
-
 struct acpi_walk_state {
         struct acpi_walk_state *next;   /* Next walk_state in list */
         u8 descriptor_type;     /* To differentiate various internal objs */
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 1c127a43017b..7e0b6f1bec9c 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -58,7 +58,9 @@ u8 *acpi_tb_scan_memory_for_rsdp(u8 *start_address, u32 length);
 /*
  * tbdata - table data structure management
  */
-acpi_status acpi_tb_get_next_root_index(u32 *table_index);
+acpi_status
+acpi_tb_get_next_table_descriptor(u32 *table_index,
+                                  struct acpi_table_desc **table_desc);
 
 void
 acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc,
@@ -119,11 +121,6 @@ acpi_tb_install_standard_table(acpi_physical_address address,
                                u8 flags,
                                u8 reload, u8 override, u32 *table_index);
 
-acpi_status
-acpi_tb_store_table(acpi_physical_address address,
-                    struct acpi_table_header *table,
-                    u32 length, u8 flags, u32 *table_index);
-
 void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc);
 
 void acpi_tb_terminate(void);
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index c2f03e8774ad..2b3c5bd222f1 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -502,6 +502,9 @@ const union acpi_predefined_info *acpi_ut_get_next_predefined_method(const union
 
 const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name);
 
+void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes);
+
+#if (defined ACPI_ASL_COMPILER || defined ACPI_HELP_APP)
 const union acpi_predefined_info *acpi_ut_match_resource_name(char *name);
 
 void
@@ -509,9 +512,8 @@ acpi_ut_display_predefined_method(char *buffer,
                                   const union acpi_predefined_info *this_name,
                                   u8 multi_line);
 
-void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes);
-
 u32 acpi_ut_get_resource_bit_width(char *buffer, u16 types);
+#endif
 
 /*
  * utstate - Generic state creation/cache routines
@@ -539,14 +541,6 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
                                      u16 action,
                                      union acpi_generic_state **state_list);
 
-#ifdef  ACPI_FUTURE_USAGE
-acpi_status
-acpi_ut_create_pkg_state_and_push(void *internal_object,
-                                  void *external_object,
-                                  u16 index,
-                                  union acpi_generic_state **state_list);
-#endif                          /* ACPI_FUTURE_USAGE */
-
 union acpi_generic_state *acpi_ut_create_control_state(void);
 
 void acpi_ut_delete_generic_state(union acpi_generic_state *state);
@@ -570,7 +564,9 @@ const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status
 
 u8 acpi_ut_is_pci_root_bridge(char *id);
 
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP)
 u8 acpi_ut_is_aml_table(struct acpi_table_header *table);
+#endif
 
 acpi_status
 acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
@@ -629,15 +625,19 @@ acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag);
  */
 void acpi_ut_strupr(char *src_string);
 
+#ifdef ACPI_ASL_COMPILER
 void acpi_ut_strlwr(char *src_string);
 
 int acpi_ut_stricmp(char *string1, char *string2);
+#endif
 
 acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer);
 
 void acpi_ut_print_string(char *string, u16 max_length);
 
+#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP
 void ut_convert_backslashes(char *pathname);
+#endif
 
 u8 acpi_ut_valid_acpi_name(char *name);
 
@@ -785,6 +785,8 @@ int acpi_ut_file_printf(ACPI_FILE file, const char *format, ...);
 /*
  * utuuid -- UUID support functions
  */
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_HELP_APP)
 void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer);
+#endif
 
 #endif                          /* _ACUTILS_H */
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 3a95068fc119..be9fd009cb28 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -65,6 +65,7 @@
 #define AML_PACKAGE_OP              (u16) 0x12
 #define AML_VAR_PACKAGE_OP          (u16) 0x13  /* ACPI 2.0 */
 #define AML_METHOD_OP               (u16) 0x14
+#define AML_EXTERNAL_OP             (u16) 0x15  /* ACPI 6.0 */
 #define AML_DUAL_NAME_PREFIX        (u16) 0x2e
 #define AML_MULTI_NAME_PREFIX_OP    (u16) 0x2f
 #define AML_NAME_CHAR_SUBSEQ        (u16) 0x30
@@ -206,7 +207,6 @@
 #define AML_INT_RESERVEDFIELD_OP    (u16) 0x0031
 #define AML_INT_ACCESSFIELD_OP      (u16) 0x0032
 #define AML_INT_BYTELIST_OP         (u16) 0x0033
-#define AML_INT_STATICSTRING_OP     (u16) 0x0034
 #define AML_INT_METHODCALL_OP       (u16) 0x0035
 #define AML_INT_RETURN_VALUE_OP     (u16) 0x0036
 #define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 77244182ff02..ea0cc4e08f80 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -446,7 +446,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
                           obj_desc,
-                          ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),
+                          ACPI_FORMAT_UINT64(obj_desc->region.address),
                           obj_desc->region.length));
 
         /* Now the address and length are valid for this opregion */
@@ -539,13 +539,12 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(AE_NOT_EXIST);
         }
 
-        obj_desc->region.address =
-            (acpi_physical_address) ACPI_TO_INTEGER(table);
+        obj_desc->region.address = ACPI_PTR_TO_PHYSADDR(table);
         obj_desc->region.length = table->length;
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
                           obj_desc,
-                          ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),
+                          ACPI_FORMAT_UINT64(obj_desc->region.address),
                           obj_desc->region.length));
 
         /* Now the address and length are valid for this opregion */
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index e5ff89bcb3f5..deeddd6d2f05 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -564,6 +564,17 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                                                  acpi_operand_object,
                                                                  acpi_gbl_root_node);
                                         status = AE_OK;
+                                } else if (parent_op->common.aml_opcode ==
+                                           AML_EXTERNAL_OP) {
+
+                                        /* TBD: May only be temporary */
+
+                                        obj_desc =
+                                            acpi_ut_create_string_object((acpi_size) name_length);
+
+                                        ACPI_STRNCPY(obj_desc->string.pointer,
+                                                     name_string, name_length);
+                                        status = AE_OK;
                                 } else {
                                         /*
                                          * We just plain didn't find it -- which is a
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 5ed064e8673c..ccf793247447 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -92,6 +92,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
                 ACPI_SET_BIT(gpe_register_info->enable_for_run,
                              (u8)register_bit);
         }
+        gpe_register_info->enable_mask = gpe_register_info->enable_for_run;
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -123,7 +124,7 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         /* Enable the requested GPE */
 
-        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE_SAVE);
+        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
         return_ACPI_STATUS(status);
 }
 
@@ -202,7 +203,7 @@ acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
                 if (ACPI_SUCCESS(status)) {
                         status =
                             acpi_hw_low_set_gpe(gpe_event_info,
-                                                ACPI_GPE_DISABLE_SAVE);
+                                                ACPI_GPE_DISABLE);
                 }
 
                 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 9abace3401f9..2ba28a63fb68 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -272,7 +272,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
                           "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
                           &region_obj->region.handler->address_space, handler,
-                          ACPI_FORMAT_NATIVE_UINT(address),
+                          ACPI_FORMAT_UINT64(address),
                           acpi_ut_get_region_name(region_obj->region.
                                                   space_id)));
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index df06a23c4197..faad911d46b5 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -356,7 +356,8 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
         }
 
         if (in_byte) {
-                local_event_status |= ACPI_EVENT_FLAG_ENABLED;
+                local_event_status |=
+                    (ACPI_EVENT_FLAG_ENABLED | ACPI_EVENT_FLAG_ENABLE_SET);
         }
 
         /* Fixed event currently active? */
@@ -369,7 +370,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
         }
 
         if (in_byte) {
-                local_event_status |= ACPI_EVENT_FLAG_SET;
+                local_event_status |= ACPI_EVENT_FLAG_STATUS_SET;
         }
 
         (*event_status) = local_event_status;
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 7c213b6b6472..1da52bef632e 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -767,8 +767,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
                         acpi_os_printf("\n");
                 } else {
                         acpi_os_printf(" base %8.8X%8.8X Length %X\n",
-                                       ACPI_FORMAT_NATIVE_UINT(obj_desc->region.
-                                                               address),
+                                       ACPI_FORMAT_UINT64(obj_desc->region.
+                                                          address),
                                        obj_desc->region.length);
                 }
                 break;
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 49479927e7f7..725a3746a2df 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -263,17 +263,15 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD,
-                              " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %p\n",
+                              " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n",
                               acpi_ut_get_region_name(rgn_desc->region.
                                                       space_id),
                               rgn_desc->region.space_id,
                               obj_desc->common_field.access_byte_width,
                               obj_desc->common_field.base_byte_offset,
-                              field_datum_byte_offset, ACPI_CAST_PTR(void,
-                                                                     (rgn_desc->
-                                                                      region.
-                                                                      address +
-                                                                      region_offset))));
+                              field_datum_byte_offset,
+                              ACPI_FORMAT_UINT64(rgn_desc->region.address +
+                                                 region_offset)));
 
         /* Invoke the appropriate address_space/op_region handler */
 
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index b813fed95e56..1c64a988cbee 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -114,7 +114,18 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
                 /* Might return while OS is shutting down, just continue */
 
                 ACPI_FREE(fatal);
-                break;
+                goto cleanup;
+
+        case AML_EXTERNAL_OP:
+                /*
+                 * If the interpreter sees this opcode, just ignore it. The External
+                 * op is intended for use by disassemblers in order to properly
+                 * disassemble control method invocations. The opcode or group of
+                 * opcodes should be surrounded by an "if (0)" clause to ensure that
+                 * AML interpreters never see the opcode.
+                 */
+                status = AE_OK;
+                goto cleanup;
 
         default:
 
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 0fe188e238ef..f6c2f5499935 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -165,8 +165,8 @@ acpi_ex_system_memory_space_handler(u32 function,
                  * one page, which is similar to the original code that used a 4k
                  * maximum window.
                  */
-                page_boundary_map_length =
-                    ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address;
+                page_boundary_map_length = (acpi_size)
+                    (ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address);
                 if (page_boundary_map_length == 0) {
                         page_boundary_map_length = ACPI_DEFAULT_PAGE_SIZE;
                 }
@@ -177,12 +177,13 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                 /* Create a new mapping starting at the address given */
 
-                mem_info->mapped_logical_address = acpi_os_map_memory((acpi_physical_address) address, map_length);
+                mem_info->mapped_logical_address =
+                    acpi_os_map_memory(address, map_length);
                 if (!mem_info->mapped_logical_address) {
                         ACPI_ERROR((AE_INFO,
                                     "Could not map memory at 0x%8.8X%8.8X, size %u",
-                                    ACPI_FORMAT_NATIVE_UINT(address),
-                                    (u32) map_length));
+                                    ACPI_FORMAT_UINT64(address),
+                                    (u32)map_length));
                         mem_info->mapped_length = 0;
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
@@ -202,8 +203,7 @@ acpi_ex_system_memory_space_handler(u32 function,
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n",
-                          bit_width, function,
-                          ACPI_FORMAT_NATIVE_UINT(address)));
+                          bit_width, function, ACPI_FORMAT_UINT64(address)));
 
         /*
          * Perform the memory read or write
@@ -318,8 +318,7 @@ acpi_ex_system_io_space_handler(u32 function,
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "System-IO (width %u) R/W %u Address=%8.8X%8.8X\n",
-                          bit_width, function,
-                          ACPI_FORMAT_NATIVE_UINT(address)));
+                          bit_width, function, ACPI_FORMAT_UINT64(address)));
 
         /* Decode the function parameter */
 
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 84bc550f4f1d..73cfa5947ff3 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -89,6 +89,8 @@ u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info)
  * RETURN:      Status
  *
  * DESCRIPTION: Enable or disable a single GPE in the parent enable register.
+ *              The enable_mask field of the involved GPE register must be
+ *              updated by the caller if necessary.
  *
  ******************************************************************************/
 
@@ -119,7 +121,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
         /* Set or clear just the bit that corresponds to this GPE */
 
         register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
-        switch (action & ~ACPI_GPE_SAVE_MASK) {
+        switch (action) {
         case ACPI_GPE_CONDITIONAL_ENABLE:
 
                 /* Only enable if the corresponding enable_mask bit is set */
@@ -149,9 +151,6 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
         /* Write the updated enable mask */
 
         status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);
-        if (ACPI_SUCCESS(status) && (action & ACPI_GPE_SAVE_MASK)) {
-                gpe_register_info->enable_mask = (u8)enable_mask;
-        }
         return (status);
 }
 
@@ -250,6 +249,17 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
                 local_event_status |= ACPI_EVENT_FLAG_WAKE_ENABLED;
         }
 
+        /* GPE currently enabled (enable bit == 1)? */
+
+        status = acpi_hw_read(&in_byte, &gpe_register_info->enable_address);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        if (register_bit & in_byte) {
+                local_event_status |= ACPI_EVENT_FLAG_ENABLE_SET;
+        }
+
         /* GPE currently active (status bit == 1)? */
 
         status = acpi_hw_read(&in_byte, &gpe_register_info->status_address);
@@ -258,7 +268,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
         }
 
         if (register_bit & in_byte) {
-                local_event_status |= ACPI_EVENT_FLAG_SET;
+                local_event_status |= ACPI_EVENT_FLAG_STATUS_SET;
         }
 
         /* Set return value */
@@ -286,10 +296,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
 {
         acpi_status status;
 
+        gpe_register_info->enable_mask = enable_mask;
         status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);
-        if (ACPI_SUCCESS(status)) {
-                gpe_register_info->enable_mask = enable_mask;
-        }
         return (status);
 }
 
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index 2bd33fe56cb3..29033d71417b 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -142,17 +142,17 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
         byte_width = ACPI_DIV_8(bit_width);
         last_address = address + byte_width - 1;
 
-        ACPI_DEBUG_PRINT((ACPI_DB_IO, "Address %p LastAddress %p Length %X",
-                          ACPI_CAST_PTR(void, address), ACPI_CAST_PTR(void,
-                                                                      last_address),
-                          byte_width));
+        ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                          "Address %8.8X%8.8X LastAddress %8.8X%8.8X Length %X",
+                          ACPI_FORMAT_UINT64(address),
+                          ACPI_FORMAT_UINT64(last_address), byte_width));
 
         /* Maximum 16-bit address in I/O space */
 
         if (last_address > ACPI_UINT16_MAX) {
                 ACPI_ERROR((AE_INFO,
-                            "Illegal I/O port address/length above 64K: %p/0x%X",
-                            ACPI_CAST_PTR(void, address), byte_width));
+                            "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
+                            ACPI_FORMAT_UINT64(address), byte_width));
                 return_ACPI_STATUS(AE_LIMIT);
         }
 
@@ -181,8 +181,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
 
                         if (acpi_gbl_osi_data >= port_info->osi_dependency) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_IO,
-                                                  "Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)",
-                                                  ACPI_CAST_PTR(void, address),
+                                                  "Denied AML access to port 0x%8.8X%8.8X/%X (%s 0x%.4X-0x%.4X)",
+                                                  ACPI_FORMAT_UINT64(address),
                                                   byte_width, port_info->name,
                                                   port_info->start,
                                                   port_info->end));
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 80f097eb7381..d259393505fa 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -271,12 +271,11 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 switch (type) {
                 case ACPI_TYPE_PROCESSOR:
 
-                        acpi_os_printf("ID %02X Len %02X Addr %p\n",
+                        acpi_os_printf("ID %02X Len %02X Addr %8.8X%8.8X\n",
                                        obj_desc->processor.proc_id,
                                        obj_desc->processor.length,
-                                       ACPI_CAST_PTR(void,
-                                                     obj_desc->processor.
-                                                     address));
+                                       ACPI_FORMAT_UINT64(obj_desc->processor.
+                                                          address));
                         break;
 
                 case ACPI_TYPE_DEVICE:
@@ -347,8 +346,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                                                                space_id));
                         if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
                                 acpi_os_printf(" Addr %8.8X%8.8X Len %.4X\n",
-                                               ACPI_FORMAT_NATIVE_UINT
-                                               (obj_desc->region.address),
+                                               ACPI_FORMAT_UINT64(obj_desc->
+                                                                  region.
+                                                                  address),
                                                obj_desc->region.length);
                         } else {
                                 acpi_os_printf
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 1af4a405e351..ed90fddf2487 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -646,7 +646,13 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                          AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 80 */ ACPI_OP("-ExtAccessField-", ARGP_CONNECTFIELD_OP,
                          ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0)
+                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+
+/* ACPI 6.0 opcodes */
+
+        /* 81 */ ACPI_OP("External", ARGP_EXTERNAL_OP, ARGI_EXTERNAL_OP,
+                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE, /* ? */
+                         AML_TYPE_EXEC_3A_0T_0R, AML_FLAGS_EXEC_3A_0T_0R)
 
 /*! [End] no source code translation !*/
 };
diff --git a/drivers/acpi/acpica/psopinfo.c b/drivers/acpi/acpica/psopinfo.c
index e18e7c47f482..20e1a35169fc 100644
--- a/drivers/acpi/acpica/psopinfo.c
+++ b/drivers/acpi/acpica/psopinfo.c
@@ -210,7 +210,7 @@ const u8 acpi_gbl_short_op_index[256] = {
 /*              8     9     A     B     C     D     E     F  */
 /* 0x00 */ 0x00, 0x01, _UNK, _UNK, _UNK, _UNK, 0x02, _UNK,
 /* 0x08 */ 0x03, _UNK, 0x04, 0x05, 0x06, 0x07, 0x6E, _UNK,
-/* 0x10 */ 0x08, 0x09, 0x0a, 0x6F, 0x0b, _UNK, _UNK, _UNK,
+/* 0x10 */ 0x08, 0x09, 0x0a, 0x6F, 0x0b, 0x81, _UNK, _UNK,
 /* 0x18 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x20 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,
 /* 0x28 */ _UNK, _UNK, _UNK, _UNK, _UNK, 0x63, _PFX, _PFX,
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 1539394c8c52..c428bb33204e 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- * Module Name: rsdump - Functions to display the resource structures.
+ * Module Name: rsdump - AML debugger support for resource structures.
  *
  ******************************************************************************/
 
@@ -48,7 +48,10 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
+/*
+ * All functions in this module are used by the AML Debugger only
+ */
+#if defined(ACPI_DEBUGGER)
 /* Local prototypes */
 static void acpi_rs_out_string(char *title, char *value);
 
@@ -80,6 +83,116 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_rs_dump_resource_list
+ *
+ * PARAMETERS:  resource_list       - Pointer to a resource descriptor list
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Dispatches the structure to the correct dump routine.
+ *
+ ******************************************************************************/
+
+void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
+{
+        u32 count = 0;
+        u32 type;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Check if debug output enabled */
+
+        if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {
+                return;
+        }
+
+        /* Walk list and dump all resource descriptors (END_TAG terminates) */
+
+        do {
+                acpi_os_printf("\n[%02X] ", count);
+                count++;
+
+                /* Validate Type before dispatch */
+
+                type = resource_list->type;
+                if (type > ACPI_RESOURCE_TYPE_MAX) {
+                        acpi_os_printf
+                            ("Invalid descriptor type (%X) in resource list\n",
+                             resource_list->type);
+                        return;
+                }
+
+                /* Sanity check the length. It must not be zero, or we loop forever */
+
+                if (!resource_list->length) {
+                        acpi_os_printf
+                            ("Invalid zero length descriptor in resource list\n");
+                        return;
+                }
+
+                /* Dump the resource descriptor */
+
+                if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
+                        acpi_rs_dump_descriptor(&resource_list->data,
+                                                acpi_gbl_dump_serial_bus_dispatch
+                                                [resource_list->data.
+                                                 common_serial_bus.type]);
+                } else {
+                        acpi_rs_dump_descriptor(&resource_list->data,
+                                                acpi_gbl_dump_resource_dispatch
+                                                [type]);
+                }
+
+                /* Point to the next resource structure */
+
+                resource_list = ACPI_NEXT_RESOURCE(resource_list);
+
+                /* Exit when END_TAG descriptor is reached */
+
+        } while (type != ACPI_RESOURCE_TYPE_END_TAG);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_dump_irq_list
+ *
+ * PARAMETERS:  route_table     - Pointer to the routing table to dump.
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print IRQ routing table
+ *
+ ******************************************************************************/
+
+void acpi_rs_dump_irq_list(u8 *route_table)
+{
+        struct acpi_pci_routing_table *prt_element;
+        u8 count;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Check if debug output enabled */
+
+        if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {
+                return;
+        }
+
+        prt_element = ACPI_CAST_PTR(struct acpi_pci_routing_table, route_table);
+
+        /* Dump all table elements, Exit on zero length element */
+
+        for (count = 0; prt_element->length; count++) {
+                acpi_os_printf("\n[%02X] PCI IRQ Routing Table Package\n",
+                               count);
+                acpi_rs_dump_descriptor(prt_element, acpi_rs_dump_prt);
+
+                prt_element = ACPI_ADD_PTR(struct acpi_pci_routing_table,
+                                           prt_element, prt_element->length);
+        }
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_rs_dump_descriptor
  *
  * PARAMETERS:  resource            - Buffer containing the resource
@@ -357,116 +470,6 @@ static void acpi_rs_dump_address_common(union acpi_resource_data *resource)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_resource_list
- *
- * PARAMETERS:  resource_list       - Pointer to a resource descriptor list
- *
- * RETURN:      None
- *
- * DESCRIPTION: Dispatches the structure to the correct dump routine.
- *
- ******************************************************************************/
-
-void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
-{
-        u32 count = 0;
-        u32 type;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Check if debug output enabled */
-
-        if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {
-                return;
-        }
-
-        /* Walk list and dump all resource descriptors (END_TAG terminates) */
-
-        do {
-                acpi_os_printf("\n[%02X] ", count);
-                count++;
-
-                /* Validate Type before dispatch */
-
-                type = resource_list->type;
-                if (type > ACPI_RESOURCE_TYPE_MAX) {
-                        acpi_os_printf
-                            ("Invalid descriptor type (%X) in resource list\n",
-                             resource_list->type);
-                        return;
-                }
-
-                /* Sanity check the length. It must not be zero, or we loop forever */
-
-                if (!resource_list->length) {
-                        acpi_os_printf
-                            ("Invalid zero length descriptor in resource list\n");
-                        return;
-                }
-
-                /* Dump the resource descriptor */
-
-                if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
-                        acpi_rs_dump_descriptor(&resource_list->data,
-                                                acpi_gbl_dump_serial_bus_dispatch
-                                                [resource_list->data.
-                                                 common_serial_bus.type]);
-                } else {
-                        acpi_rs_dump_descriptor(&resource_list->data,
-                                                acpi_gbl_dump_resource_dispatch
-                                                [type]);
-                }
-
-                /* Point to the next resource structure */
-
-                resource_list = ACPI_NEXT_RESOURCE(resource_list);
-
-                /* Exit when END_TAG descriptor is reached */
-
-        } while (type != ACPI_RESOURCE_TYPE_END_TAG);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_irq_list
- *
- * PARAMETERS:  route_table     - Pointer to the routing table to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print IRQ routing table
- *
- ******************************************************************************/
-
-void acpi_rs_dump_irq_list(u8 * route_table)
-{
-        struct acpi_pci_routing_table *prt_element;
-        u8 count;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Check if debug output enabled */
-
-        if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {
-                return;
-        }
-
-        prt_element = ACPI_CAST_PTR(struct acpi_pci_routing_table, route_table);
-
-        /* Dump all table elements, Exit on zero length element */
-
-        for (count = 0; prt_element->length; count++) {
-                acpi_os_printf("\n[%02X] PCI IRQ Routing Table Package\n",
-                               count);
-                acpi_rs_dump_descriptor(prt_element, acpi_rs_dump_prt);
-
-                prt_element = ACPI_ADD_PTR(struct acpi_pci_routing_table,
-                                           prt_element, prt_element->length);
-        }
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_rs_out*
  *
  * PARAMETERS:  title       - Name of the resource field
diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index 6a144957aadd..d7f8386455bd 100644
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -113,9 +113,9 @@ acpi_tb_acquire_table(struct acpi_table_desc *table_desc,
         case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
         case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
 
-                table =
-                    ACPI_CAST_PTR(struct acpi_table_header,
-                                  table_desc->address);
+                table = ACPI_CAST_PTR(struct acpi_table_header,
+                                      ACPI_PHYSADDR_TO_PTR(table_desc->
+                                                           address));
                 break;
 
         default:
@@ -214,7 +214,8 @@ acpi_tb_acquire_temp_table(struct acpi_table_desc *table_desc,
         case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
         case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
 
-                table_header = ACPI_CAST_PTR(struct acpi_table_header, address);
+                table_header = ACPI_CAST_PTR(struct acpi_table_header,
+                                             ACPI_PHYSADDR_TO_PTR(address));
                 if (!table_header) {
                         return (AE_NO_MEMORY);
                 }
@@ -398,14 +399,14 @@ acpi_tb_verify_temp_table(struct acpi_table_desc * table_desc, char *signature)
                                             table_desc->length);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
-                                        "%4.4s " ACPI_PRINTF_UINT
+                                        "%4.4s 0x%8.8X%8.8X"
                                         " Attempted table install failed",
                                         acpi_ut_valid_acpi_name(table_desc->
                                                                 signature.
                                                                 ascii) ?
                                         table_desc->signature.ascii : "????",
-                                        ACPI_FORMAT_TO_UINT(table_desc->
-                                                            address)));
+                                        ACPI_FORMAT_UINT64(table_desc->
+                                                           address)));
                         goto invalidate_and_exit;
                 }
         }
@@ -483,19 +484,23 @@ acpi_status acpi_tb_resize_root_table_list(void)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_get_next_root_index
+ * FUNCTION:    acpi_tb_get_next_table_descriptor
  *
  * PARAMETERS:  table_index         - Where table index is returned
+ *              table_desc          - Where table descriptor is returned
  *
- * RETURN:      Status and table index.
+ * RETURN:      Status and table index/descriptor.
  *
  * DESCRIPTION: Allocate a new ACPI table entry to the global table list
  *
  ******************************************************************************/
 
-acpi_status acpi_tb_get_next_root_index(u32 *table_index)
+acpi_status
+acpi_tb_get_next_table_descriptor(u32 *table_index,
+                                  struct acpi_table_desc **table_desc)
 {
         acpi_status status;
+        u32 i;
 
         /* Ensure that there is room for the table in the Root Table List */
 
@@ -507,8 +512,16 @@ acpi_status acpi_tb_get_next_root_index(u32 *table_index)
                 }
         }
 
-        *table_index = acpi_gbl_root_table_list.current_table_count;
+        i = acpi_gbl_root_table_list.current_table_count;
         acpi_gbl_root_table_list.current_table_count++;
+
+        if (table_index) {
+                *table_index = i;
+        }
+        if (table_desc) {
+                *table_desc = &acpi_gbl_root_table_list.tables[i];
+        }
+
         return (AE_OK);
 }
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 9bad45e63a45..008a251780f4 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -187,8 +187,9 @@ acpi_tb_install_fixed_table(acpi_physical_address address,
         status = acpi_tb_acquire_temp_table(&new_table_desc, address,
                                             ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);
         if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",
-                            ACPI_CAST_PTR(void, address)));
+                ACPI_ERROR((AE_INFO,
+                            "Could not acquire table length at %8.8X%8.8X",
+                            ACPI_FORMAT_UINT64(address)));
                 return_ACPI_STATUS(status);
         }
 
@@ -246,8 +247,9 @@ acpi_tb_install_standard_table(acpi_physical_address address,
 
         status = acpi_tb_acquire_temp_table(&new_table_desc, address, flags);
         if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",
-                            ACPI_CAST_PTR(void, address)));
+                ACPI_ERROR((AE_INFO,
+                            "Could not acquire table length at %8.8X%8.8X",
+                            ACPI_FORMAT_UINT64(address)));
                 return_ACPI_STATUS(status);
         }
 
@@ -258,9 +260,10 @@ acpi_tb_install_standard_table(acpi_physical_address address,
         if (!reload &&
             acpi_gbl_disable_ssdt_table_install &&
             ACPI_COMPARE_NAME(&new_table_desc.signature, ACPI_SIG_SSDT)) {
-                ACPI_INFO((AE_INFO, "Ignoring installation of %4.4s at %p",
-                           new_table_desc.signature.ascii, ACPI_CAST_PTR(void,
-                                                                         address)));
+                ACPI_INFO((AE_INFO,
+                           "Ignoring installation of %4.4s at %8.8X%8.8X",
+                           new_table_desc.signature.ascii,
+                           ACPI_FORMAT_UINT64(address)));
                 goto release_and_exit;
         }
 
@@ -346,7 +349,6 @@ acpi_tb_install_standard_table(acpi_physical_address address,
                                  */
                                 acpi_tb_uninstall_table(&new_table_desc);
                                 *table_index = i;
-                                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
                                 return_ACPI_STATUS(AE_OK);
                         }
                 }
@@ -354,7 +356,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,
 
         /* Add the table to the global root table list */
 
-        status = acpi_tb_get_next_root_index(&i);
+        status = acpi_tb_get_next_table_descriptor(&i, NULL);
         if (ACPI_FAILURE(status)) {
                 goto release_and_exit;
         }
@@ -429,11 +431,11 @@ finish_override:
                 return;
         }
 
-        ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
-                   " %s table override, new table: " ACPI_PRINTF_UINT,
+        ACPI_INFO((AE_INFO, "%4.4s 0x%8.8X%8.8X"
+                   " %s table override, new table: 0x%8.8X%8.8X",
                    old_table_desc->signature.ascii,
-                   ACPI_FORMAT_TO_UINT(old_table_desc->address),
-                   override_type, ACPI_FORMAT_TO_UINT(new_table_desc.address)));
+                   ACPI_FORMAT_UINT64(old_table_desc->address),
+                   override_type, ACPI_FORMAT_UINT64(new_table_desc.address)));
 
         /* We can now uninstall the original table */
 
@@ -455,43 +457,6 @@ finish_override:
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_tb_store_table
- *
- * PARAMETERS:  address             - Table address
- *              table               - Table header
- *              length              - Table length
- *              flags               - Install flags
- *              table_index         - Where the table index is returned
- *
- * RETURN:      Status and table index.
- *
- * DESCRIPTION: Add an ACPI table to the global table list
- *
- ******************************************************************************/
-
-acpi_status
-acpi_tb_store_table(acpi_physical_address address,
-                    struct acpi_table_header * table,
-                    u32 length, u8 flags, u32 *table_index)
-{
-        acpi_status status;
-        struct acpi_table_desc *table_desc;
-
-        status = acpi_tb_get_next_root_index(table_index);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        /* Initialize added table */
-
-        table_desc = &acpi_gbl_root_table_list.tables[*table_index];
-        acpi_tb_init_table_descriptor(table_desc, address, flags, table);
-        table_desc->pointer = table;
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_tb_uninstall_table
  *
  * PARAMETERS:  table_desc          - Table descriptor
@@ -517,7 +482,7 @@ void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc)
 
         if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==
             ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL) {
-                ACPI_FREE(ACPI_CAST_PTR(void, table_desc->address));
+                ACPI_FREE(ACPI_PHYSADDR_TO_PTR(table_desc->address));
         }
 
         table_desc->address = ACPI_PTR_TO_PHYSADDR(NULL);
diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
index ef16c06e5091..77ba5c71c6e7 100644
--- a/drivers/acpi/acpica/tbprint.c
+++ b/drivers/acpi/acpica/tbprint.c
@@ -127,18 +127,12 @@ acpi_tb_print_table_header(acpi_physical_address address,
 {
         struct acpi_table_header local_header;
 
-        /*
-         * The reason that we use ACPI_PRINTF_UINT and ACPI_FORMAT_TO_UINT is to
-         * support both 32-bit and 64-bit hosts/addresses in a consistent manner.
-         * The %p specifier does not emit uniform output on all hosts. On some,
-         * leading zeros are not supported.
-         */
         if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
 
                 /* FACS only has signature and length fields */
 
-                ACPI_INFO((AE_INFO, "%-4.4s " ACPI_PRINTF_UINT " %06X",
-                           header->signature, ACPI_FORMAT_TO_UINT(address),
+                ACPI_INFO((AE_INFO, "%-4.4s 0x%8.8X%8.8X %06X",
+                           header->signature, ACPI_FORMAT_UINT64(address),
                            header->length));
         } else if (ACPI_VALIDATE_RSDP_SIG(header->signature)) {
 
@@ -149,9 +143,8 @@ acpi_tb_print_table_header(acpi_physical_address address,
                                           header)->oem_id, ACPI_OEM_ID_SIZE);
                 acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
 
-                ACPI_INFO((AE_INFO,
-                           "RSDP " ACPI_PRINTF_UINT " %06X (v%.2d %-6.6s)",
-                           ACPI_FORMAT_TO_UINT(address),
+                ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %06X (v%.2d %-6.6s)",
+                           ACPI_FORMAT_UINT64(address),
                            (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
                             revision >
                             0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
@@ -165,9 +158,9 @@ acpi_tb_print_table_header(acpi_physical_address address,
                 acpi_tb_cleanup_table_header(&local_header, header);
 
                 ACPI_INFO((AE_INFO,
-                           "%-4.4s " ACPI_PRINTF_UINT
+                           "%-4.4s 0x%8.8X%8.8X"
                            " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
-                           local_header.signature, ACPI_FORMAT_TO_UINT(address),
+                           local_header.signature, ACPI_FORMAT_UINT64(address),
                            local_header.length, local_header.revision,
                            local_header.oem_id, local_header.oem_table_id,
                            local_header.oem_revision,
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index eac52cf14f1a..fa76a3603aa1 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp * rsdp)
  *
  ******************************************************************************/
 
-acpi_status __init acpi_find_root_pointer(acpi_size *table_address)
+acpi_status __init acpi_find_root_pointer(acpi_physical_address * table_address)
 {
         u8 *table_ptr;
         u8 *mem_rover;
@@ -200,7 +200,8 @@ acpi_status __init acpi_find_root_pointer(acpi_size *table_address)
                         physical_address +=
                             (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
 
-                        *table_address = physical_address;
+                        *table_address =
+                            (acpi_physical_address) physical_address;
                         return_ACPI_STATUS(AE_OK);
                 }
         }
@@ -233,7 +234,7 @@ acpi_status __init acpi_find_root_pointer(acpi_size *table_address)
                     (ACPI_HI_RSDP_WINDOW_BASE +
                      ACPI_PTR_DIFF(mem_rover, table_ptr));
 
-                *table_address = physical_address;
+                *table_address = (acpi_physical_address) physical_address;
                 return_ACPI_STATUS(AE_OK);
         }
 
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index 1279f50da757..911ea8e7fe87 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -107,10 +107,10 @@ acpi_ut_add_address_range(acpi_adr_space_type space_id,
         acpi_gbl_address_range_list[space_id] = range_info;
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                          "\nAdded [%4.4s] address range: 0x%p-0x%p\n",
+                          "\nAdded [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n",
                           acpi_ut_get_node_name(range_info->region_node),
-                          ACPI_CAST_PTR(void, address),
-                          ACPI_CAST_PTR(void, range_info->end_address)));
+                          ACPI_FORMAT_UINT64(address),
+                          ACPI_FORMAT_UINT64(range_info->end_address)));
 
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_ACPI_STATUS(AE_OK);
@@ -160,15 +160,13 @@ acpi_ut_remove_address_range(acpi_adr_space_type space_id,
                         }
 
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "\nRemoved [%4.4s] address range: 0x%p-0x%p\n",
+                                          "\nRemoved [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n",
                                           acpi_ut_get_node_name(range_info->
                                                                 region_node),
-                                          ACPI_CAST_PTR(void,
-                                                        range_info->
-                                                        start_address),
-                                          ACPI_CAST_PTR(void,
-                                                        range_info->
-                                                        end_address)));
+                                          ACPI_FORMAT_UINT64(range_info->
+                                                             start_address),
+                                          ACPI_FORMAT_UINT64(range_info->
+                                                             end_address)));
 
                         ACPI_FREE(range_info);
                         return_VOID;
@@ -245,16 +243,14 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
                                                                   region_node);
 
                                 ACPI_WARNING((AE_INFO,
-                                              "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)",
+                                              "%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)",
                                               acpi_ut_get_region_name(space_id),
-                                              ACPI_CAST_PTR(void, address),
-                                              ACPI_CAST_PTR(void, end_address),
-                                              ACPI_CAST_PTR(void,
-                                                            range_info->
-                                                            start_address),
-                                              ACPI_CAST_PTR(void,
-                                                            range_info->
-                                                            end_address),
+                                              ACPI_FORMAT_UINT64(address),
+                                              ACPI_FORMAT_UINT64(end_address),
+                                              ACPI_FORMAT_UINT64(range_info->
+                                                                 start_address),
+                                              ACPI_FORMAT_UINT64(range_info->
+                                                                 end_address),
                                               pathname));
                                 ACPI_FREE(pathname);
                         }
diff --git a/drivers/acpi/acpica/utbuffer.c b/drivers/acpi/acpica/utbuffer.c
index 242bd071f007..a8c39643e618 100644
--- a/drivers/acpi/acpica/utbuffer.c
+++ b/drivers/acpi/acpica/utbuffer.c
@@ -150,6 +150,14 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
                                 return;
                         }
 
+                        /*
+                         * Add comment characters so rest of line is ignored when
+                         * compiled
+                         */
+                        if (j == 0) {
+                                acpi_os_printf("// ");
+                        }
+
                         buf_char = buffer[(acpi_size) i + j];
                         if (ACPI_IS_PRINT(buf_char)) {
                                 acpi_os_printf("%c", buf_char);
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 5e8df9177da4..a72685c1e819 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -102,12 +102,19 @@ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
         {"_SB_", ACPI_TYPE_DEVICE, NULL},
         {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL},
         {"_TZ_", ACPI_TYPE_DEVICE, NULL},
-        {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL},
+        /*
+         * March, 2015:
+         * The _REV object is in the process of being deprecated, because
+         * other ACPI implementations permanently return 2. Thus, it
+         * has little or no value. Return 2 for compatibility with
+         * other ACPI implementations.
+         */
+        {"_REV", ACPI_TYPE_INTEGER, ACPI_CAST_PTR(char, 2)},
         {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
-        {"_GL_", ACPI_TYPE_MUTEX, (char *)1},
+        {"_GL_", ACPI_TYPE_MUTEX, ACPI_CAST_PTR(char, 1)},
 
 #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
-        {"_OSI", ACPI_TYPE_METHOD, (char *)1},
+        {"_OSI", ACPI_TYPE_METHOD, ACPI_CAST_PTR(char, 1)},
 #endif
 
         /* Table terminator */
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 56bbacd576f2..cbb7034d28d8 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -75,6 +75,7 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
         return (FALSE);
 }
 
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_is_aml_table
@@ -102,6 +103,7 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
 
         return (FALSE);
 }
+#endif
 
 /*******************************************************************************
  *
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 574cd3118313..44035abdbf29 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -100,6 +100,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
         {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7},      /* Windows 7 and Server 2008 R2 - Added 09/2009 */
         {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8},      /* Windows 8 and Server 2012 - Added 08/2012 */
         {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8},      /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
+        {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10},     /* Windows 10 - Added 03/2015 */
 
         /* Feature Group Strings */
 
diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index 82ca9142e10d..2be6bd4bdc09 100644
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -357,11 +357,11 @@ int
 acpi_ut_vsnprintf(char *string,
                   acpi_size size, const char *format, va_list args)
 {
-        u8 base = 10;
-        u8 type = 0;
-        s32 width = -1;
-        s32 precision = -1;
-        char qualifier = 0;
+        u8 base;
+        u8 type;
+        s32 width;
+        s32 precision;
+        char qualifier;
         u64 number;
         char *pos;
         char *end;
@@ -380,6 +380,9 @@ acpi_ut_vsnprintf(char *string,
                         continue;
                 }
 
+                type = 0;
+                base = 10;
+
                 /* Process sign */
 
                 do {
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index 8274cc16edc3..f201171c5dda 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -49,39 +49,6 @@ ACPI_MODULE_NAME("utstate")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_create_pkg_state_and_push
- *
- * PARAMETERS:  object          - Object to be added to the new state
- *              action          - Increment/Decrement
- *              state_list      - List the state will be added to
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create a new state and push it
- *
- ******************************************************************************/
-acpi_status
-acpi_ut_create_pkg_state_and_push(void *internal_object,
-                                  void *external_object,
-                                  u16 index,
-                                  union acpi_generic_state **state_list)
-{
-        union acpi_generic_state *state;
-
-        ACPI_FUNCTION_ENTRY();
-
-        state =
-            acpi_ut_create_pkg_state(internal_object, external_object, index);
-        if (!state) {
-                return (AE_NO_MEMORY);
-        }
-
-        acpi_ut_push_generic_state(state_list, state);
-        return (AE_OK);
-}
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_ut_push_generic_state
  *
  * PARAMETERS:  list_head           - Head of the state stack
@@ -92,7 +59,6 @@ acpi_ut_create_pkg_state_and_push(void *internal_object,
  * DESCRIPTION: Push a state object onto a state stack
  *
  ******************************************************************************/
-
 void
 acpi_ut_push_generic_state(union acpi_generic_state **list_head,
                            union acpi_generic_state *state)
diff --git a/drivers/acpi/acpica/utuuid.c b/drivers/acpi/acpica/utuuid.c
index c6149a212149..e6cab669bd9c 100644
--- a/drivers/acpi/acpica/utuuid.c
+++ b/drivers/acpi/acpica/utuuid.c
@@ -47,6 +47,7 @@
 #define _COMPONENT          ACPI_COMPILER
 ACPI_MODULE_NAME("utuuid")
 
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_HELP_APP)
 /*
  * UUID support functions.
  *
@@ -94,3 +95,4 @@ void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer)
                                                1]);
         }
 }
+#endif
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index 04faf6df959f..24424f3fef96 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -21,7 +21,7 @@
 #include <linux/serial_reg.h>
 #include <linux/time.h>
 #ifdef CONFIG_BCM47XX
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 #endif
 
 enum bcma_boot_dev {
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 1fc83427199c..81fde9ef7f8e 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2107,13 +2107,12 @@ static int drbd_create_mempools(void)
         if (drbd_md_io_page_pool == NULL)
                 goto Enomem;
 
-        drbd_request_mempool = mempool_create(number,
-                mempool_alloc_slab, mempool_free_slab, drbd_request_cache);
+        drbd_request_mempool = mempool_create_slab_pool(number,
+                drbd_request_cache);
         if (drbd_request_mempool == NULL)
                 goto Enomem;
 
-        drbd_ee_mempool = mempool_create(number,
-                mempool_alloc_slab, mempool_free_slab, drbd_ee_cache);
+        drbd_ee_mempool = mempool_create_slab_pool(number, drbd_ee_cache);
         if (drbd_ee_mempool == NULL)
                 goto Enomem;
 
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 34f2f0ba409b..3907202fb9d9 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -52,9 +52,10 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device,
 {
         struct drbd_request *req;
 
-        req = mempool_alloc(drbd_request_mempool, GFP_NOIO | __GFP_ZERO);
+        req = mempool_alloc(drbd_request_mempool, GFP_NOIO);
         if (!req)
                 return NULL;
+        memset(req, 0, sizeof(*req));
 
         drbd_req_make_private_bio(req, bio_src);
         req->rq_state    = bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c4fd1e45ce1e..ae3fcb4199e9 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -88,28 +88,6 @@ static int part_shift;
 
 static struct workqueue_struct *loop_wq;
 
-/*
- * Transfer functions
- */
-static int transfer_none(struct loop_device *lo, int cmd,
-                         struct page *raw_page, unsigned raw_off,
-                         struct page *loop_page, unsigned loop_off,
-                         int size, sector_t real_block)
-{
-        char *raw_buf = kmap_atomic(raw_page) + raw_off;
-        char *loop_buf = kmap_atomic(loop_page) + loop_off;
-
-        if (cmd == READ)
-                memcpy(loop_buf, raw_buf, size);
-        else
-                memcpy(raw_buf, loop_buf, size);
-
-        kunmap_atomic(loop_buf);
-        kunmap_atomic(raw_buf);
-        cond_resched();
-        return 0;
-}
-
 static int transfer_xor(struct loop_device *lo, int cmd,
                         struct page *raw_page, unsigned raw_off,
                         struct page *loop_page, unsigned loop_off,
@@ -148,14 +126,13 @@ static int xor_init(struct loop_device *lo, const struct loop_info64 *info)
 
 static struct loop_func_table none_funcs = {
         .number = LO_CRYPT_NONE,
-        .transfer = transfer_none,
-};      
+}; 
 
 static struct loop_func_table xor_funcs = {
         .number = LO_CRYPT_XOR,
         .transfer = transfer_xor,
         .init = xor_init
-};      
+}; 
 
 /* xfer_funcs[0] is special - its release function is never called */
 static struct loop_func_table *xfer_funcs[MAX_LO_CRYPT] = {
@@ -215,207 +192,169 @@ lo_do_transfer(struct loop_device *lo, int cmd,
                struct page *lpage, unsigned loffs,
                int size, sector_t rblock)
 {
-        if (unlikely(!lo->transfer))
+        int ret;
+
+        ret = lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock);
+        if (likely(!ret))
                 return 0;
 
-        return lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock);
+        printk_ratelimited(KERN_ERR
+                "loop: Transfer error at byte offset %llu, length %i.\n",
+                (unsigned long long)rblock << 9, size);
+        return ret;
 }
 
-/**
- * __do_lo_send_write - helper for writing data to a loop device
- *
- * This helper just factors out common code between do_lo_send_direct_write()
- * and do_lo_send_write().
- */
-static int __do_lo_send_write(struct file *file,
-                u8 *buf, const int len, loff_t pos)
+static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos)
 {
-        struct kvec kvec = {.iov_base = buf, .iov_len = len};
-        struct iov_iter from;
+        struct iov_iter i;
         ssize_t bw;
 
-        iov_iter_kvec(&from, ITER_KVEC | WRITE, &kvec, 1, len);
+        iov_iter_bvec(&i, ITER_BVEC, bvec, 1, bvec->bv_len);
 
         file_start_write(file);
-        bw = vfs_iter_write(file, &from, &pos);
+        bw = vfs_iter_write(file, &i, ppos);
         file_end_write(file);
-        if (likely(bw == len))
+
+        if (likely(bw ==  bvec->bv_len))
                 return 0;
-        printk_ratelimited(KERN_ERR "loop: Write error at byte offset %llu, length %i.\n",
-                        (unsigned long long)pos, len);
+
+        printk_ratelimited(KERN_ERR
+                "loop: Write error at byte offset %llu, length %i.\n",
+                (unsigned long long)*ppos, bvec->bv_len);
         if (bw >= 0)
                 bw = -EIO;
         return bw;
 }
 
-/**
- * do_lo_send_direct_write - helper for writing data to a loop device
- *
- * This is the fast, non-transforming version that does not need double
- * buffering.
- */
-static int do_lo_send_direct_write(struct loop_device *lo,
-                struct bio_vec *bvec, loff_t pos, struct page *page)
+static int lo_write_simple(struct loop_device *lo, struct request *rq,
+                loff_t pos)
 {
-        ssize_t bw = __do_lo_send_write(lo->lo_backing_file,
-                        kmap(bvec->bv_page) + bvec->bv_offset,
-                        bvec->bv_len, pos);
-        kunmap(bvec->bv_page);
-        cond_resched();
-        return bw;
+        struct bio_vec bvec;
+        struct req_iterator iter;
+        int ret = 0;
+
+        rq_for_each_segment(bvec, rq, iter) {
+                ret = lo_write_bvec(lo->lo_backing_file, &bvec, &pos);
+                if (ret < 0)
+                        break;
+                cond_resched();
+        }
+
+        return ret;
 }
 
-/**
- * do_lo_send_write - helper for writing data to a loop device
- *
+/*
  * This is the slow, transforming version that needs to double buffer the
  * data as it cannot do the transformations in place without having direct
  * access to the destination pages of the backing file.
  */
-static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec,
-                loff_t pos, struct page *page)
+static int lo_write_transfer(struct loop_device *lo, struct request *rq,
+                loff_t pos)
 {
-        int ret = lo_do_transfer(lo, WRITE, page, 0, bvec->bv_page,
-                        bvec->bv_offset, bvec->bv_len, pos >> 9);
-        if (likely(!ret))
-                return __do_lo_send_write(lo->lo_backing_file,
-                                page_address(page), bvec->bv_len,
-                                pos);
-        printk_ratelimited(KERN_ERR "loop: Transfer error at byte offset %llu, "
-                        "length %i.\n", (unsigned long long)pos, bvec->bv_len);
-        if (ret > 0)
-                ret = -EIO;
-        return ret;
-}
-
-static int lo_send(struct loop_device *lo, struct request *rq, loff_t pos)
-{
-        int (*do_lo_send)(struct loop_device *, struct bio_vec *, loff_t,
-                        struct page *page);
-        struct bio_vec bvec;
+        struct bio_vec bvec, b;
         struct req_iterator iter;
-        struct page *page = NULL;
+        struct page *page;
         int ret = 0;
 
-        if (lo->transfer != transfer_none) {
-                page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
-                if (unlikely(!page))
-                        goto fail;
-                kmap(page);
-                do_lo_send = do_lo_send_write;
-        } else {
-                do_lo_send = do_lo_send_direct_write;
-        }
+        page = alloc_page(GFP_NOIO);
+        if (unlikely(!page))
+                return -ENOMEM;
 
         rq_for_each_segment(bvec, rq, iter) {
-                ret = do_lo_send(lo, &bvec, pos, page);
+                ret = lo_do_transfer(lo, WRITE, page, 0, bvec.bv_page,
+                        bvec.bv_offset, bvec.bv_len, pos >> 9);
+                if (unlikely(ret))
+                        break;
+
+                b.bv_page = page;
+                b.bv_offset = 0;
+                b.bv_len = bvec.bv_len;
+                ret = lo_write_bvec(lo->lo_backing_file, &b, &pos);
                 if (ret < 0)
                         break;
-                pos += bvec.bv_len;
         }
-        if (page) {
-                kunmap(page);
-                __free_page(page);
-        }
-out:
+
+        __free_page(page);
         return ret;
-fail:
-        printk_ratelimited(KERN_ERR "loop: Failed to allocate temporary page for write.\n");
-        ret = -ENOMEM;
-        goto out;
 }
 
-struct lo_read_data {
-        struct loop_device *lo;
-        struct page *page;
-        unsigned offset;
-        int bsize;
-};
+static int lo_read_simple(struct loop_device *lo, struct request *rq,
+                loff_t pos)
+{
+        struct bio_vec bvec;
+        struct req_iterator iter;
+        struct iov_iter i;
+        ssize_t len;
 
-static int
-lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
-                struct splice_desc *sd)
-{
-        struct lo_read_data *p = sd->u.data;
-        struct loop_device *lo = p->lo;
-        struct page *page = buf->page;
-        sector_t IV;
-        int size;
-
-        IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +
-                                                        (buf->offset >> 9);
-        size = sd->len;
-        if (size > p->bsize)
-                size = p->bsize;
-
-        if (lo_do_transfer(lo, READ, page, buf->offset, p->page, p->offset, size, IV)) {
-                printk_ratelimited(KERN_ERR "loop: transfer error block %ld\n",
-                       page->index);
-                size = -EINVAL;
-        }
+        rq_for_each_segment(bvec, rq, iter) {
+                iov_iter_bvec(&i, ITER_BVEC, &bvec, 1, bvec.bv_len);
+                len = vfs_iter_read(lo->lo_backing_file, &i, &pos);
+                if (len < 0)
+                        return len;
 
-        flush_dcache_page(p->page);
+                flush_dcache_page(bvec.bv_page);
 
-        if (size > 0)
-                p->offset += size;
+                if (len != bvec.bv_len) {
+                        struct bio *bio;
 
-        return size;
-}
+                        __rq_for_each_bio(bio, rq)
+                                zero_fill_bio(bio);
+                        break;
+                }
+                cond_resched();
+        }
 
-static int
-lo_direct_splice_actor(struct pipe_inode_info *pipe, struct splice_desc *sd)
-{
-        return __splice_from_pipe(pipe, sd, lo_splice_actor);
+        return 0;
 }
 
-static ssize_t
-do_lo_receive(struct loop_device *lo,
-              struct bio_vec *bvec, int bsize, loff_t pos)
+static int lo_read_transfer(struct loop_device *lo, struct request *rq,
+                loff_t pos)
 {
-        struct lo_read_data cookie;
-        struct splice_desc sd;
-        struct file *file;
-        ssize_t retval;
+        struct bio_vec bvec, b;
+        struct req_iterator iter;
+        struct iov_iter i;
+        struct page *page;
+        ssize_t len;
+        int ret = 0;
 
-        cookie.lo = lo;
-        cookie.page = bvec->bv_page;
-        cookie.offset = bvec->bv_offset;
-        cookie.bsize = bsize;
+        page = alloc_page(GFP_NOIO);
+        if (unlikely(!page))
+                return -ENOMEM;
 
-        sd.len = 0;
-        sd.total_len = bvec->bv_len;
-        sd.flags = 0;
-        sd.pos = pos;
-        sd.u.data = &cookie;
+        rq_for_each_segment(bvec, rq, iter) {
+                loff_t offset = pos;
 
-        file = lo->lo_backing_file;
-        retval = splice_direct_to_actor(file, &sd, lo_direct_splice_actor);
+                b.bv_page = page;
+                b.bv_offset = 0;
+                b.bv_len = bvec.bv_len;
 
-        return retval;
-}
+                iov_iter_bvec(&i, ITER_BVEC, &b, 1, b.bv_len);
+                len = vfs_iter_read(lo->lo_backing_file, &i, &pos);
+                if (len < 0) {
+                        ret = len;
+                        goto out_free_page;
+                }
 
-static int
-lo_receive(struct loop_device *lo, struct request *rq, int bsize, loff_t pos)
-{
-        struct bio_vec bvec;
-        struct req_iterator iter;
-        ssize_t s;
+                ret = lo_do_transfer(lo, READ, page, 0, bvec.bv_page,
+                        bvec.bv_offset, len, offset >> 9);
+                if (ret)
+                        goto out_free_page;
 
-        rq_for_each_segment(bvec, rq, iter) {
-                s = do_lo_receive(lo, &bvec, bsize, pos);
-                if (s < 0)
-                        return s;
+                flush_dcache_page(bvec.bv_page);
 
-                if (s != bvec.bv_len) {
+                if (len != bvec.bv_len) {
                         struct bio *bio;
 
                         __rq_for_each_bio(bio, rq)
                                 zero_fill_bio(bio);
                         break;
                 }
-                pos += bvec.bv_len;
         }
-        return 0;
+
+        ret = 0;
+out_free_page:
+        __free_page(page);
+        return ret;
 }
 
 static int lo_discard(struct loop_device *lo, struct request *rq, loff_t pos)
@@ -464,10 +403,17 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
                         ret = lo_req_flush(lo, rq);
                 else if (rq->cmd_flags & REQ_DISCARD)
                         ret = lo_discard(lo, rq, pos);
+                else if (lo->transfer)
+                        ret = lo_write_transfer(lo, rq, pos);
                 else
-                        ret = lo_send(lo, rq, pos);
-        } else
-                ret = lo_receive(lo, rq, lo->lo_blocksize, pos);
+                        ret = lo_write_simple(lo, rq, pos);
+
+        } else {
+                if (lo->transfer)
+                        ret = lo_read_transfer(lo, rq, pos);
+                else
+                        ret = lo_read_simple(lo, rq, pos);
+        }
 
         return ret;
 }
@@ -788,7 +734,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
         lo->lo_device = bdev;
         lo->lo_flags = lo_flags;
         lo->lo_backing_file = file;
-        lo->transfer = transfer_none;
+        lo->transfer = NULL;
         lo->ioctl = NULL;
         lo->lo_sizelimit = 0;
         lo->old_gfp_mask = mapping_gfp_mask(mapping);
@@ -1007,7 +953,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
                 memcpy(lo->lo_encrypt_key, info->lo_encrypt_key,
                        info->lo_encrypt_key_size);
                 lo->lo_key_owner = uid;
-        }       
+        }
 
         return 0;
 }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a98c41f72c63..39e5f7fae3ef 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -32,28 +32,36 @@
 #include <net/sock.h>
 #include <linux/net.h>
 #include <linux/kthread.h>
+#include <linux/types.h>
 
 #include <asm/uaccess.h>
 #include <asm/types.h>
 
 #include <linux/nbd.h>
 
-#define NBD_MAGIC 0x68797548
+struct nbd_device {
+        int flags;
+        int harderror;          /* Code of hard error                   */
+        struct socket * sock;   /* If == NULL, device is not ready, yet */
+        int magic;
+
+        spinlock_t queue_lock;
+        struct list_head queue_head;    /* Requests waiting result */
+        struct request *active_req;
+        wait_queue_head_t active_wq;
+        struct list_head waiting_queue; /* Requests to be sent */
+        wait_queue_head_t waiting_wq;
+
+        struct mutex tx_lock;
+        struct gendisk *disk;
+        int blksize;
+        loff_t bytesize;
+        pid_t pid; /* pid of nbd-client, if attached */
+        int xmit_timeout;
+        int disconnect; /* a disconnect has been requested by user */
+};
 
-#ifdef NDEBUG
-#define dprintk(flags, fmt...)
-#else /* NDEBUG */
-#define dprintk(flags, fmt...) do { \
-        if (debugflags & (flags)) printk(KERN_DEBUG fmt); \
-} while (0)
-#define DBG_IOCTL       0x0004
-#define DBG_INIT        0x0010
-#define DBG_EXIT        0x0020
-#define DBG_BLKDEV      0x0100
-#define DBG_RX          0x0200
-#define DBG_TX          0x0400
-static unsigned int debugflags;
-#endif /* NDEBUG */
+#define NBD_MAGIC 0x68797548
 
 static unsigned int nbds_max = 16;
 static struct nbd_device *nbd_dev;
@@ -71,25 +79,9 @@ static int max_part;
  */
 static DEFINE_SPINLOCK(nbd_lock);
 
-#ifndef NDEBUG
-static const char *ioctl_cmd_to_ascii(int cmd)
+static inline struct device *nbd_to_dev(struct nbd_device *nbd)
 {
-        switch (cmd) {
-        case NBD_SET_SOCK: return "set-sock";
-        case NBD_SET_BLKSIZE: return "set-blksize";
-        case NBD_SET_SIZE: return "set-size";
-        case NBD_SET_TIMEOUT: return "set-timeout";
-        case NBD_SET_FLAGS: return "set-flags";
-        case NBD_DO_IT: return "do-it";
-        case NBD_CLEAR_SOCK: return "clear-sock";
-        case NBD_CLEAR_QUE: return "clear-que";
-        case NBD_PRINT_DEBUG: return "print-debug";
-        case NBD_SET_SIZE_BLOCKS: return "set-size-blocks";
-        case NBD_DISCONNECT: return "disconnect";
-        case BLKROSET: return "set-read-only";
-        case BLKFLSBUF: return "flush-buffer-cache";
-        }
-        return "unknown";
+        return disk_to_dev(nbd->disk);
 }
 
 static const char *nbdcmd_to_ascii(int cmd)
@@ -103,30 +95,26 @@ static const char *nbdcmd_to_ascii(int cmd)
         }
         return "invalid";
 }
-#endif /* NDEBUG */
 
-static void nbd_end_request(struct request *req)
+static void nbd_end_request(struct nbd_device *nbd, struct request *req)
 {
         int error = req->errors ? -EIO : 0;
         struct request_queue *q = req->q;
         unsigned long flags;
 
-        dprintk(DBG_BLKDEV, "%s: request %p: %s\n", req->rq_disk->disk_name,
-                        req, error ? "failed" : "done");
+        dev_dbg(nbd_to_dev(nbd), "request %p: %s\n", req,
+                error ? "failed" : "done");
 
         spin_lock_irqsave(q->queue_lock, flags);
         __blk_end_request_all(req, error);
         spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
+/*
+ * Forcibly shutdown the socket causing all listeners to error
+ */
 static void sock_shutdown(struct nbd_device *nbd, int lock)
 {
-        /* Forcibly shutdown the socket causing all listeners
-         * to error
-         *
-         * FIXME: This code is duplicated from sys_shutdown, but
-         * there should be a more generic interface rather than
-         * calling socket ops directly here */
         if (lock)
                 mutex_lock(&nbd->tx_lock);
         if (nbd->sock) {
@@ -253,17 +241,15 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)
         }
         memcpy(request.handle, &req, sizeof(req));
 
-        dprintk(DBG_TX, "%s: request %p: sending control (%s@%llu,%uB)\n",
-                        nbd->disk->disk_name, req,
-                        nbdcmd_to_ascii(nbd_cmd(req)),
-                        (unsigned long long)blk_rq_pos(req) << 9,
-                        blk_rq_bytes(req));
+        dev_dbg(nbd_to_dev(nbd), "request %p: sending control (%s@%llu,%uB)\n",
+                req, nbdcmd_to_ascii(nbd_cmd(req)),
+                (unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req));
         result = sock_xmit(nbd, 1, &request, sizeof(request),
                         (nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0);
         if (result <= 0) {
                 dev_err(disk_to_dev(nbd->disk),
                         "Send control failed (result %d)\n", result);
-                goto error_out;
+                return -EIO;
         }
 
         if (nbd_cmd(req) == NBD_CMD_WRITE) {
@@ -277,21 +263,18 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)
                         flags = 0;
                         if (!rq_iter_last(bvec, iter))
                                 flags = MSG_MORE;
-                        dprintk(DBG_TX, "%s: request %p: sending %d bytes data\n",
-                                        nbd->disk->disk_name, req, bvec.bv_len);
+                        dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",
+                                req, bvec.bv_len);
                         result = sock_send_bvec(nbd, &bvec, flags);
                         if (result <= 0) {
                                 dev_err(disk_to_dev(nbd->disk),
                                         "Send data failed (result %d)\n",
                                         result);
-                                goto error_out;
+                                return -EIO;
                         }
                 }
         }
         return 0;
-
-error_out:
-        return -EIO;
 }
 
 static struct request *nbd_find_request(struct nbd_device *nbd,
@@ -302,7 +285,7 @@ static struct request *nbd_find_request(struct nbd_device *nbd,
 
         err = wait_event_interruptible(nbd->active_wq, nbd->active_req != xreq);
         if (unlikely(err))
-                goto out;
+                return ERR_PTR(err);
 
         spin_lock(&nbd->queue_lock);
         list_for_each_entry_safe(req, tmp, &nbd->queue_head, queuelist) {
@@ -314,10 +297,7 @@ static struct request *nbd_find_request(struct nbd_device *nbd,
         }
         spin_unlock(&nbd->queue_lock);
 
-        err = -ENOENT;
-
-out:
-        return ERR_PTR(err);
+        return ERR_PTR(-ENOENT);
 }
 
 static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec)
@@ -371,8 +351,7 @@ static struct request *nbd_read_stat(struct nbd_device *nbd)
                 return req;
         }
 
-        dprintk(DBG_RX, "%s: request %p: got reply\n",
-                        nbd->disk->disk_name, req);
+        dev_dbg(nbd_to_dev(nbd), "request %p: got reply\n", req);
         if (nbd_cmd(req) == NBD_CMD_READ) {
                 struct req_iterator iter;
                 struct bio_vec bvec;
@@ -385,8 +364,8 @@ static struct request *nbd_read_stat(struct nbd_device *nbd)
                                 req->errors++;
                                 return req;
                         }
-                        dprintk(DBG_RX, "%s: request %p: got %d bytes data\n",
-                                nbd->disk->disk_name, req, bvec.bv_len);
+                        dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n",
+                                req, bvec.bv_len);
                 }
         }
         return req;
@@ -426,7 +405,7 @@ static int nbd_do_it(struct nbd_device *nbd)
         }
 
         while ((req = nbd_read_stat(nbd)) != NULL)
-                nbd_end_request(req);
+                nbd_end_request(nbd, req);
 
         device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
         nbd->pid = 0;
@@ -455,7 +434,7 @@ static void nbd_clear_que(struct nbd_device *nbd)
                                  queuelist);
                 list_del_init(&req->queuelist);
                 req->errors++;
-                nbd_end_request(req);
+                nbd_end_request(nbd, req);
         }
 
         while (!list_empty(&nbd->waiting_queue)) {
@@ -463,7 +442,7 @@ static void nbd_clear_que(struct nbd_device *nbd)
                                  queuelist);
                 list_del_init(&req->queuelist);
                 req->errors++;
-                nbd_end_request(req);
+                nbd_end_request(nbd, req);
         }
 }
 
@@ -507,7 +486,7 @@ static void nbd_handle_req(struct nbd_device *nbd, struct request *req)
         if (nbd_send_req(nbd, req) != 0) {
                 dev_err(disk_to_dev(nbd->disk), "Request send failed\n");
                 req->errors++;
-                nbd_end_request(req);
+                nbd_end_request(nbd, req);
         } else {
                 spin_lock(&nbd->queue_lock);
                 list_add_tail(&req->queuelist, &nbd->queue_head);
@@ -522,7 +501,7 @@ static void nbd_handle_req(struct nbd_device *nbd, struct request *req)
 
 error_out:
         req->errors++;
-        nbd_end_request(req);
+        nbd_end_request(nbd, req);
 }
 
 static int nbd_thread(void *data)
@@ -570,18 +549,18 @@ static void do_nbd_request(struct request_queue *q)
 
                 spin_unlock_irq(q->queue_lock);
 
-                dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n",
-                                req->rq_disk->disk_name, req, req->cmd_type);
-
                 nbd = req->rq_disk->private_data;
 
                 BUG_ON(nbd->magic != NBD_MAGIC);
 
+                dev_dbg(nbd_to_dev(nbd), "request %p: dequeued (flags=%x)\n",
+                        req, req->cmd_type);
+
                 if (unlikely(!nbd->sock)) {
                         dev_err(disk_to_dev(nbd->disk),
                                 "Attempted send on closed socket\n");
                         req->errors++;
-                        nbd_end_request(req);
+                        nbd_end_request(nbd, req);
                         spin_lock_irq(q->queue_lock);
                         continue;
                 }
@@ -706,13 +685,13 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                 else
                         blk_queue_flush(nbd->disk->queue, 0);
 
-                thread = kthread_create(nbd_thread, nbd, "%s",
-                                        nbd->disk->disk_name);
+                thread = kthread_run(nbd_thread, nbd, "%s",
+                                     nbd->disk->disk_name);
                 if (IS_ERR(thread)) {
                         mutex_lock(&nbd->tx_lock);
                         return PTR_ERR(thread);
                 }
-                wake_up_process(thread);
+
                 error = nbd_do_it(nbd);
                 kthread_stop(thread);
 
@@ -768,10 +747,6 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
 
         BUG_ON(nbd->magic != NBD_MAGIC);
 
-        /* Anyone capable of this syscall can do *real bad* things */
-        dprintk(DBG_IOCTL, "%s: nbd_ioctl cmd=%s(0x%x) arg=%lu\n",
-                nbd->disk->disk_name, ioctl_cmd_to_ascii(cmd), cmd, arg);
-
         mutex_lock(&nbd->tx_lock);
         error = __nbd_ioctl(bdev, nbd, cmd, arg);
         mutex_unlock(&nbd->tx_lock);
@@ -861,7 +836,6 @@ static int __init nbd_init(void)
         }
 
         printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
-        dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
 
         for (i = 0; i < nbds_max; i++) {
                 struct gendisk *disk = nbd_dev[i].disk;
@@ -920,7 +894,3 @@ module_param(nbds_max, int, 0444);
 MODULE_PARM_DESC(nbds_max, "number of network block devices to initialize (default: 16)");
 module_param(max_part, int, 0444);
 MODULE_PARM_DESC(max_part, "number of partitions per device (default: 0)");
-#ifndef NDEBUG
-module_param(debugflags, int, 0644);
-MODULE_PARM_DESC(debugflags, "flags for controlling debug output");
-#endif
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index e23be20a3417..85b8036deaa3 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -44,7 +44,7 @@
 
 #define NVME_MINORS             (1U << MINORBITS)
 #define NVME_Q_DEPTH            1024
-#define NVME_AQ_DEPTH           64
+#define NVME_AQ_DEPTH           256
 #define SQ_SIZE(depth)          (depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)          (depth * sizeof(struct nvme_completion))
 #define ADMIN_TIMEOUT           (admin_timeout * HZ)
@@ -152,6 +152,7 @@ struct nvme_cmd_info {
  */
 #define NVME_INT_PAGES          2
 #define NVME_INT_BYTES(dev)     (NVME_INT_PAGES * (dev)->page_size)
+#define NVME_INT_MASK           0x01
 
 /*
  * Will slightly overestimate the number of pages needed.  This is OK
@@ -257,7 +258,7 @@ static void *iod_get_private(struct nvme_iod *iod)
  */
 static bool iod_should_kfree(struct nvme_iod *iod)
 {
-        return (iod->private & 0x01) == 0;
+        return (iod->private & NVME_INT_MASK) == 0;
 }
 
 /* Special values must be less than 0x1000 */
@@ -301,8 +302,6 @@ static void *cancel_cmd_info(struct nvme_cmd_info *cmd, nvme_completion_fn *fn)
 static void async_req_completion(struct nvme_queue *nvmeq, void *ctx,
                                                 struct nvme_completion *cqe)
 {
-        struct request *req = ctx;
-
         u32 result = le32_to_cpup(&cqe->result);
         u16 status = le16_to_cpup(&cqe->status) >> 1;
 
@@ -311,8 +310,6 @@ static void async_req_completion(struct nvme_queue *nvmeq, void *ctx,
         if (status == NVME_SC_SUCCESS)
                 dev_warn(nvmeq->q_dmadev,
                         "async event result %08x\n", result);
-
-        blk_mq_free_hctx_request(nvmeq->hctx, req);
 }
 
 static void abort_completion(struct nvme_queue *nvmeq, void *ctx,
@@ -432,7 +429,6 @@ static struct nvme_iod *nvme_alloc_iod(struct request *rq, struct nvme_dev *dev,
 {
         unsigned size = !(rq->cmd_flags & REQ_DISCARD) ? blk_rq_bytes(rq) :
                                                 sizeof(struct nvme_dsm_range);
-        unsigned long mask = 0;
         struct nvme_iod *iod;
 
         if (rq->nr_phys_segments <= NVME_INT_PAGES &&
@@ -440,9 +436,8 @@ static struct nvme_iod *nvme_alloc_iod(struct request *rq, struct nvme_dev *dev,
                 struct nvme_cmd_info *cmd = blk_mq_rq_to_pdu(rq);
 
                 iod = cmd->iod;
-                mask = 0x01;
                 iod_init(iod, size, rq->nr_phys_segments,
-                                (unsigned long) rq | 0x01);
+                                (unsigned long) rq | NVME_INT_MASK);
                 return iod;
         }
 
@@ -522,8 +517,6 @@ static void nvme_dif_remap(struct request *req,
                 return;
 
         pmap = kmap_atomic(bip->bip_vec->bv_page) + bip->bip_vec->bv_offset;
-        if (!pmap)
-                return;
 
         p = pmap;
         virt = bip_get_seed(bip);
@@ -645,12 +638,12 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_iod *iod, int total_len,
         struct scatterlist *sg = iod->sg;
         int dma_len = sg_dma_len(sg);
         u64 dma_addr = sg_dma_address(sg);
-        int offset = offset_in_page(dma_addr);
+        u32 page_size = dev->page_size;
+        int offset = dma_addr & (page_size - 1);
         __le64 *prp_list;
         __le64 **list = iod_list(iod);
         dma_addr_t prp_dma;
         int nprps, i;
-        u32 page_size = dev->page_size;
 
         length -= (page_size - offset);
         if (length <= 0)
@@ -1028,18 +1021,19 @@ static int nvme_submit_async_admin_req(struct nvme_dev *dev)
         struct nvme_cmd_info *cmd_info;
         struct request *req;
 
-        req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_ATOMIC, false);
+        req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_ATOMIC, true);
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
         req->cmd_flags |= REQ_NO_TIMEOUT;
         cmd_info = blk_mq_rq_to_pdu(req);
-        nvme_set_info(cmd_info, req, async_req_completion);
+        nvme_set_info(cmd_info, NULL, async_req_completion);
 
         memset(&c, 0, sizeof(c));
         c.common.opcode = nvme_admin_async_event;
         c.common.command_id = req->tag;
 
+        blk_mq_free_hctx_request(nvmeq->hctx, req);
         return __nvme_submit_cmd(nvmeq, &c);
 }
 
@@ -1347,6 +1341,9 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)
         nvmeq->cq_vector = -1;
         spin_unlock_irq(&nvmeq->q_lock);
 
+        if (!nvmeq->qid && nvmeq->dev->admin_q)
+                blk_mq_freeze_queue_start(nvmeq->dev->admin_q);
+
         irq_set_affinity_hint(vector, NULL);
         free_irq(vector, nvmeq);
 
@@ -1378,8 +1375,6 @@ static void nvme_disable_queue(struct nvme_dev *dev, int qid)
                 adapter_delete_sq(dev, qid);
                 adapter_delete_cq(dev, qid);
         }
-        if (!qid && dev->admin_q)
-                blk_mq_freeze_queue_start(dev->admin_q);
 
         spin_lock_irq(&nvmeq->q_lock);
         nvme_process_cq(nvmeq);
@@ -1583,6 +1578,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
                 dev->admin_tagset.ops = &nvme_mq_admin_ops;
                 dev->admin_tagset.nr_hw_queues = 1;
                 dev->admin_tagset.queue_depth = NVME_AQ_DEPTH - 1;
+                dev->admin_tagset.reserved_tags = 1;
                 dev->admin_tagset.timeout = ADMIN_TIMEOUT;
                 dev->admin_tagset.numa_node = dev_to_node(&dev->pci_dev->dev);
                 dev->admin_tagset.cmd_size = nvme_cmd_size(dev);
@@ -1749,25 +1745,31 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         struct nvme_dev *dev = ns->dev;
         struct nvme_user_io io;
         struct nvme_command c;
-        unsigned length, meta_len;
-        int status, i;
-        struct nvme_iod *iod, *meta_iod = NULL;
-        dma_addr_t meta_dma_addr;
-        void *meta, *uninitialized_var(meta_mem);
+        unsigned length, meta_len, prp_len;
+        int status, write;
+        struct nvme_iod *iod;
+        dma_addr_t meta_dma = 0;
+        void *meta = NULL;
 
         if (copy_from_user(&io, uio, sizeof(io)))
                 return -EFAULT;
         length = (io.nblocks + 1) << ns->lba_shift;
         meta_len = (io.nblocks + 1) * ns->ms;
 
-        if (meta_len && ((io.metadata & 3) || !io.metadata))
+        if (meta_len && ((io.metadata & 3) || !io.metadata) && !ns->ext)
                 return -EINVAL;
+        else if (meta_len && ns->ext) {
+                length += meta_len;
+                meta_len = 0;
+        }
+
+        write = io.opcode & 1;
 
         switch (io.opcode) {
         case nvme_cmd_write:
         case nvme_cmd_read:
         case nvme_cmd_compare:
-                iod = nvme_map_user_pages(dev, io.opcode & 1, io.addr, length);
+                iod = nvme_map_user_pages(dev, write, io.addr, length);
                 break;
         default:
                 return -EINVAL;
@@ -1776,6 +1778,27 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         if (IS_ERR(iod))
                 return PTR_ERR(iod);
 
+        prp_len = nvme_setup_prps(dev, iod, length, GFP_KERNEL);
+        if (length != prp_len) {
+                status = -ENOMEM;
+                goto unmap;
+        }
+        if (meta_len) {
+                meta = dma_alloc_coherent(&dev->pci_dev->dev, meta_len,
+                                                &meta_dma, GFP_KERNEL);
+                if (!meta) {
+                        status = -ENOMEM;
+                        goto unmap;
+                }
+                if (write) {
+                        if (copy_from_user(meta, (void __user *)io.metadata,
+                                                                meta_len)) {
+                                status = -EFAULT;
+                                goto unmap;
+                        }
+                }
+        }
+
         memset(&c, 0, sizeof(c));
         c.rw.opcode = io.opcode;
         c.rw.flags = io.flags;
@@ -1787,75 +1810,21 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         c.rw.reftag = cpu_to_le32(io.reftag);
         c.rw.apptag = cpu_to_le16(io.apptag);
         c.rw.appmask = cpu_to_le16(io.appmask);
-
-        if (meta_len) {
-                meta_iod = nvme_map_user_pages(dev, io.opcode & 1, io.metadata,
-                                                                meta_len);
-                if (IS_ERR(meta_iod)) {
-                        status = PTR_ERR(meta_iod);
-                        meta_iod = NULL;
-                        goto unmap;
-                }
-
-                meta_mem = dma_alloc_coherent(&dev->pci_dev->dev, meta_len,
-                                                &meta_dma_addr, GFP_KERNEL);
-                if (!meta_mem) {
-                        status = -ENOMEM;
-                        goto unmap;
-                }
-
-                if (io.opcode & 1) {
-                        int meta_offset = 0;
-
-                        for (i = 0; i < meta_iod->nents; i++) {
-                                meta = kmap_atomic(sg_page(&meta_iod->sg[i])) +
-                                                meta_iod->sg[i].offset;
-                                memcpy(meta_mem + meta_offset, meta,
-                                                meta_iod->sg[i].length);
-                                kunmap_atomic(meta);
-                                meta_offset += meta_iod->sg[i].length;
-                        }
-                }
-
-                c.rw.metadata = cpu_to_le64(meta_dma_addr);
-        }
-
-        length = nvme_setup_prps(dev, iod, length, GFP_KERNEL);
         c.rw.prp1 = cpu_to_le64(sg_dma_address(iod->sg));
         c.rw.prp2 = cpu_to_le64(iod->first_dma);
-
-        if (length != (io.nblocks + 1) << ns->lba_shift)
-                status = -ENOMEM;
-        else
-                status = nvme_submit_io_cmd(dev, ns, &c, NULL);
-
-        if (meta_len) {
-                if (status == NVME_SC_SUCCESS && !(io.opcode & 1)) {
-                        int meta_offset = 0;
-
-                        for (i = 0; i < meta_iod->nents; i++) {
-                                meta = kmap_atomic(sg_page(&meta_iod->sg[i])) +
-                                                meta_iod->sg[i].offset;
-                                memcpy(meta, meta_mem + meta_offset,
-                                                meta_iod->sg[i].length);
-                                kunmap_atomic(meta);
-                                meta_offset += meta_iod->sg[i].length;
-                        }
-                }
-
-                dma_free_coherent(&dev->pci_dev->dev, meta_len, meta_mem,
-                                                                meta_dma_addr);
-        }
-
+        c.rw.metadata = cpu_to_le64(meta_dma);
+        status = nvme_submit_io_cmd(dev, ns, &c, NULL);
  unmap:
-        nvme_unmap_user_pages(dev, io.opcode & 1, iod);
+        nvme_unmap_user_pages(dev, write, iod);
         nvme_free_iod(dev, iod);
-
-        if (meta_iod) {
-                nvme_unmap_user_pages(dev, io.opcode & 1, meta_iod);
-                nvme_free_iod(dev, meta_iod);
+        if (meta) {
+                if (status == NVME_SC_SUCCESS && !write) {
+                        if (copy_to_user((void __user *)io.metadata, meta,
+                                                                meta_len))
+                                status = -EFAULT;
+                }
+                dma_free_coherent(&dev->pci_dev->dev, meta_len, meta, meta_dma);
         }
-
         return status;
 }
 
@@ -2018,7 +1987,8 @@ static int nvme_revalidate_disk(struct gendisk *disk)
         struct nvme_dev *dev = ns->dev;
         struct nvme_id_ns *id;
         dma_addr_t dma_addr;
-        int lbaf, pi_type, old_ms;
+        u8 lbaf, pi_type;
+        u16 old_ms;
         unsigned short bs;
 
         id = dma_alloc_coherent(&dev->pci_dev->dev, 4096, &dma_addr,
@@ -2039,6 +2009,7 @@ static int nvme_revalidate_disk(struct gendisk *disk)
         lbaf = id->flbas & NVME_NS_FLBAS_LBA_MASK;
         ns->lba_shift = id->lbaf[lbaf].ds;
         ns->ms = le16_to_cpu(id->lbaf[lbaf].ms);
+        ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);
 
         /*
          * If identify namespace failed, use default 512 byte block size so
@@ -2055,14 +2026,14 @@ static int nvme_revalidate_disk(struct gendisk *disk)
         if (blk_get_integrity(disk) && (ns->pi_type != pi_type ||
                                 ns->ms != old_ms ||
                                 bs != queue_logical_block_size(disk->queue) ||
-                                (ns->ms && id->flbas & NVME_NS_FLBAS_META_EXT)))
+                                (ns->ms && ns->ext)))
                 blk_integrity_unregister(disk);
 
         ns->pi_type = pi_type;
         blk_queue_logical_block_size(ns->queue, bs);
 
         if (ns->ms && !blk_get_integrity(disk) && (disk->flags & GENHD_FL_UP) &&
-                                !(id->flbas & NVME_NS_FLBAS_META_EXT))
+                                                                !ns->ext)
                 nvme_init_integrity(ns);
 
         if (id->ncap == 0 || (ns->ms && !blk_get_integrity(disk)))
@@ -2334,7 +2305,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
         dev->oncs = le16_to_cpup(&ctrl->oncs);
         dev->abort_limit = ctrl->acl + 1;
         dev->vwc = ctrl->vwc;
-        dev->event_limit = min(ctrl->aerl + 1, 8);
         memcpy(dev->serial, ctrl->sn, sizeof(ctrl->sn));
         memcpy(dev->model, ctrl->mn, sizeof(ctrl->mn));
         memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
@@ -2881,6 +2851,7 @@ static int nvme_dev_start(struct nvme_dev *dev)
 
         nvme_set_irq_hints(dev);
 
+        dev->event_limit = 1;
         return result;
 
  free_tags:
@@ -3166,8 +3137,10 @@ static int __init nvme_init(void)
                 nvme_char_major = result;
 
         nvme_class = class_create(THIS_MODULE, "nvme");
-        if (!nvme_class)
+        if (IS_ERR(nvme_class)) {
+                result = PTR_ERR(nvme_class);
                 goto unregister_chrdev;
+        }
 
         result = pci_register_driver(&nvme_driver);
         if (result)
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index e10196e0182d..6b736b00f63e 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -55,6 +55,7 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #define VPD_SERIAL_NUMBER                               0x80
 #define VPD_DEVICE_IDENTIFIERS                          0x83
 #define VPD_EXTENDED_INQUIRY                            0x86
+#define VPD_BLOCK_LIMITS                                0xB0
 #define VPD_BLOCK_DEV_CHARACTERISTICS                   0xB1
 
 /* CDB offsets */
@@ -132,9 +133,10 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #define INQ_UNIT_SERIAL_NUMBER_PAGE                     0x80
 #define INQ_DEVICE_IDENTIFICATION_PAGE                  0x83
 #define INQ_EXTENDED_INQUIRY_DATA_PAGE                  0x86
+#define INQ_BDEV_LIMITS_PAGE                            0xB0
 #define INQ_BDEV_CHARACTERISTICS_PAGE                   0xB1
 #define INQ_SERIAL_NUMBER_LENGTH                        0x14
-#define INQ_NUM_SUPPORTED_VPD_PAGES                     5
+#define INQ_NUM_SUPPORTED_VPD_PAGES                     6
 #define VERSION_SPC_4                                   0x06
 #define ACA_UNSUPPORTED                                 0
 #define STANDARD_INQUIRY_LENGTH                         36
@@ -747,6 +749,7 @@ static int nvme_trans_supported_vpd_pages(struct nvme_ns *ns,
         inq_response[6] = INQ_DEVICE_IDENTIFICATION_PAGE;
         inq_response[7] = INQ_EXTENDED_INQUIRY_DATA_PAGE;
         inq_response[8] = INQ_BDEV_CHARACTERISTICS_PAGE;
+        inq_response[9] = INQ_BDEV_LIMITS_PAGE;
 
         xfer_len = min(alloc_len, STANDARD_INQUIRY_LENGTH);
         res = nvme_trans_copy_to_user(hdr, inq_response, xfer_len);
@@ -938,6 +941,25 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
         return res;
 }
 
+static int nvme_trans_bdev_limits_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
+                                        u8 *inq_response, int alloc_len)
+{
+        __be32 max_sectors = cpu_to_be32(queue_max_hw_sectors(ns->queue));
+        __be32 max_discard = cpu_to_be32(ns->queue->limits.max_discard_sectors);
+        __be32 discard_desc_count = cpu_to_be32(0x100);
+
+        memset(inq_response, 0, STANDARD_INQUIRY_LENGTH);
+        inq_response[1] = VPD_BLOCK_LIMITS;
+        inq_response[3] = 0x3c; /* Page Length */
+        memcpy(&inq_response[8], &max_sectors, sizeof(u32));
+        memcpy(&inq_response[20], &max_discard, sizeof(u32));
+
+        if (max_discard)
+                memcpy(&inq_response[24], &discard_desc_count, sizeof(u32));
+
+        return nvme_trans_copy_to_user(hdr, inq_response, 0x3c);
+}
+
 static int nvme_trans_bdev_char_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                                         int alloc_len)
 {
@@ -2268,6 +2290,10 @@ static int nvme_trans_inquiry(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                 case VPD_EXTENDED_INQUIRY:
                         res = nvme_trans_ext_inq_page(ns, hdr, alloc_len);
                         break;
+                case VPD_BLOCK_LIMITS:
+                        res = nvme_trans_bdev_limits_page(ns, hdr, inq_response,
+                                                                alloc_len);
+                        break;
                 case VPD_BLOCK_DEV_CHARACTERISTICS:
                         res = nvme_trans_bdev_char_page(ns, hdr, alloc_len);
                         break;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 655e570b9b31..5ea2f0bbbc7c 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -342,7 +342,7 @@ static void virtblk_config_changed_work(struct work_struct *work)
         struct request_queue *q = vblk->disk->queue;
         char cap_str_2[10], cap_str_10[10];
         char *envp[] = { "RESIZE=1", NULL };
-        u64 capacity, size;
+        u64 capacity;
 
         /* Host must always specify the capacity. */
         virtio_cread(vdev, struct virtio_blk_config, capacity, &capacity);
@@ -354,9 +354,10 @@ static void virtblk_config_changed_work(struct work_struct *work)
                 capacity = (sector_t)-1;
         }
 
-        size = capacity * queue_logical_block_size(q);
-        string_get_size(size, STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
-        string_get_size(size, STRING_UNITS_10, cap_str_10, sizeof(cap_str_10));
+        string_get_size(capacity, queue_logical_block_size(q),
+                        STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
+        string_get_size(capacity, queue_logical_block_size(q),
+                        STRING_UNITS_10, cap_str_10, sizeof(cap_str_10));
 
         dev_notice(&vdev->dev,
                   "new size: %llu %d-byte logical blocks (%s/%s)\n",
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 2a04d341e598..bd2b3bbbb22c 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -34,6 +34,8 @@
  * IN THE SOFTWARE.
  */
 
+#define pr_fmt(fmt) "xen-blkback: " fmt
+
 #include <linux/spinlock.h>
 #include <linux/kthread.h>
 #include <linux/list.h>
@@ -211,7 +213,7 @@ static int add_persistent_gnt(struct xen_blkif *blkif,
                 else if (persistent_gnt->gnt > this->gnt)
                         new = &((*new)->rb_right);
                 else {
-                        pr_alert_ratelimited(DRV_PFX " trying to add a gref that's already in the tree\n");
+                        pr_alert_ratelimited("trying to add a gref that's already in the tree\n");
                         return -EINVAL;
                 }
         }
@@ -242,7 +244,7 @@ static struct persistent_gnt *get_persistent_gnt(struct xen_blkif *blkif,
                         node = node->rb_right;
                 else {
                         if(test_bit(PERSISTENT_GNT_ACTIVE, data->flags)) {
-                                pr_alert_ratelimited(DRV_PFX " requesting a grant already in use\n");
+                                pr_alert_ratelimited("requesting a grant already in use\n");
                                 return NULL;
                         }
                         set_bit(PERSISTENT_GNT_ACTIVE, data->flags);
@@ -257,7 +259,7 @@ static void put_persistent_gnt(struct xen_blkif *blkif,
                                struct persistent_gnt *persistent_gnt)
 {
         if(!test_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags))
-                  pr_alert_ratelimited(DRV_PFX " freeing a grant already unused");
+                pr_alert_ratelimited("freeing a grant already unused\n");
         set_bit(PERSISTENT_GNT_WAS_ACTIVE, persistent_gnt->flags);
         clear_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags);
         atomic_dec(&blkif->persistent_gnt_in_use);
@@ -374,7 +376,7 @@ static void purge_persistent_gnt(struct xen_blkif *blkif)
         }
 
         if (work_pending(&blkif->persistent_purge_work)) {
-                pr_alert_ratelimited(DRV_PFX "Scheduled work from previous purge is still pending, cannot purge list\n");
+                pr_alert_ratelimited("Scheduled work from previous purge is still pending, cannot purge list\n");
                 return;
         }
 
@@ -396,7 +398,7 @@ static void purge_persistent_gnt(struct xen_blkif *blkif)
 
         total = num_clean;
 
-        pr_debug(DRV_PFX "Going to purge %u persistent grants\n", num_clean);
+        pr_debug("Going to purge %u persistent grants\n", num_clean);
 
         BUG_ON(!list_empty(&blkif->persistent_purge_list));
         root = &blkif->persistent_gnts;
@@ -428,13 +430,13 @@ purge_list:
          * with the requested num
          */
         if (!scan_used && !clean_used) {
-                pr_debug(DRV_PFX "Still missing %u purged frames\n", num_clean);
+                pr_debug("Still missing %u purged frames\n", num_clean);
                 scan_used = true;
                 goto purge_list;
         }
 finished:
         if (!clean_used) {
-                pr_debug(DRV_PFX "Finished scanning for grants to clean, removing used flag\n");
+                pr_debug("Finished scanning for grants to clean, removing used flag\n");
                 clean_used = true;
                 goto purge_list;
         }
@@ -444,7 +446,7 @@ finished:
 
         /* We can defer this work */
         schedule_work(&blkif->persistent_purge_work);
-        pr_debug(DRV_PFX "Purged %u/%u\n", (total - num_clean), total);
+        pr_debug("Purged %u/%u\n", (total - num_clean), total);
         return;
 }
 
@@ -520,20 +522,20 @@ static void xen_vbd_resize(struct xen_blkif *blkif)
         struct xenbus_device *dev = xen_blkbk_xenbus(blkif->be);
         unsigned long long new_size = vbd_sz(vbd);
 
-        pr_info(DRV_PFX "VBD Resize: Domid: %d, Device: (%d, %d)\n",
+        pr_info("VBD Resize: Domid: %d, Device: (%d, %d)\n",
                 blkif->domid, MAJOR(vbd->pdevice), MINOR(vbd->pdevice));
-        pr_info(DRV_PFX "VBD Resize: new size %llu\n", new_size);
+        pr_info("VBD Resize: new size %llu\n", new_size);
         vbd->size = new_size;
 again:
         err = xenbus_transaction_start(&xbt);
         if (err) {
-                pr_warn(DRV_PFX "Error starting transaction");
+                pr_warn("Error starting transaction\n");
                 return;
         }
         err = xenbus_printf(xbt, dev->nodename, "sectors", "%llu",
                             (unsigned long long)vbd_sz(vbd));
         if (err) {
-                pr_warn(DRV_PFX "Error writing new size");
+                pr_warn("Error writing new size\n");
                 goto abort;
         }
         /*
@@ -543,7 +545,7 @@ again:
          */
         err = xenbus_printf(xbt, dev->nodename, "state", "%d", dev->state);
         if (err) {
-                pr_warn(DRV_PFX "Error writing the state");
+                pr_warn("Error writing the state\n");
                 goto abort;
         }
 
@@ -551,7 +553,7 @@ again:
         if (err == -EAGAIN)
                 goto again;
         if (err)
-                pr_warn(DRV_PFX "Error ending transaction");
+                pr_warn("Error ending transaction\n");
         return;
 abort:
         xenbus_transaction_end(xbt, 1);
@@ -578,7 +580,7 @@ irqreturn_t xen_blkif_be_int(int irq, void *dev_id)
 
 static void print_stats(struct xen_blkif *blkif)
 {
-        pr_info("xen-blkback (%s): oo %3llu  |  rd %4llu  |  wr %4llu  |  f %4llu"
+        pr_info("(%s): oo %3llu  |  rd %4llu  |  wr %4llu  |  f %4llu"
                  "  |  ds %4llu | pg: %4u/%4d\n",
                  current->comm, blkif->st_oo_req,
                  blkif->st_rd_req, blkif->st_wr_req,
@@ -855,7 +857,7 @@ again:
                         /* This is a newly mapped grant */
                         BUG_ON(new_map_idx >= segs_to_map);
                         if (unlikely(map[new_map_idx].status != 0)) {
-                                pr_debug(DRV_PFX "invalid buffer -- could not remap it\n");
+                                pr_debug("invalid buffer -- could not remap it\n");
                                 put_free_pages(blkif, &pages[seg_idx]->page, 1);
                                 pages[seg_idx]->handle = BLKBACK_INVALID_HANDLE;
                                 ret |= 1;
@@ -891,14 +893,14 @@ again:
                                 goto next;
                         }
                         pages[seg_idx]->persistent_gnt = persistent_gnt;
-                        pr_debug(DRV_PFX " grant %u added to the tree of persistent grants, using %u/%u\n",
+                        pr_debug("grant %u added to the tree of persistent grants, using %u/%u\n",
                                  persistent_gnt->gnt, blkif->persistent_gnt_c,
                                  xen_blkif_max_pgrants);
                         goto next;
                 }
                 if (use_persistent_gnts && !blkif->vbd.overflow_max_grants) {
                         blkif->vbd.overflow_max_grants = 1;
-                        pr_debug(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n",
+                        pr_debug("domain %u, device %#x is using maximum number of persistent grants\n",
                                  blkif->domid, blkif->vbd.handle);
                 }
                 /*
@@ -916,7 +918,7 @@ next:
         return ret;
 
 out_of_memory:
-        pr_alert(DRV_PFX "%s: out of memory\n", __func__);
+        pr_alert("%s: out of memory\n", __func__);
         put_free_pages(blkif, pages_to_gnt, segs_to_map);
         return -ENOMEM;
 }
@@ -996,7 +998,7 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
 
         err = xen_vbd_translate(&preq, blkif, WRITE);
         if (err) {
-                pr_warn(DRV_PFX "access denied: DISCARD [%llu->%llu] on dev=%04x\n",
+                pr_warn("access denied: DISCARD [%llu->%llu] on dev=%04x\n",
                         preq.sector_number,
                         preq.sector_number + preq.nr_sects, blkif->vbd.pdevice);
                 goto fail_response;
@@ -1012,7 +1014,7 @@ static int dispatch_discard_io(struct xen_blkif *blkif,
                                    GFP_KERNEL, secure);
 fail_response:
         if (err == -EOPNOTSUPP) {
-                pr_debug(DRV_PFX "discard op failed, not supported\n");
+                pr_debug("discard op failed, not supported\n");
                 status = BLKIF_RSP_EOPNOTSUPP;
         } else if (err)
                 status = BLKIF_RSP_ERROR;
@@ -1056,16 +1058,16 @@ static void __end_block_io_op(struct pending_req *pending_req, int error)
         /* An error fails the entire request. */
         if ((pending_req->operation == BLKIF_OP_FLUSH_DISKCACHE) &&
             (error == -EOPNOTSUPP)) {
-                pr_debug(DRV_PFX "flush diskcache op failed, not supported\n");
+                pr_debug("flush diskcache op failed, not supported\n");
                 xen_blkbk_flush_diskcache(XBT_NIL, pending_req->blkif->be, 0);
                 pending_req->status = BLKIF_RSP_EOPNOTSUPP;
         } else if ((pending_req->operation == BLKIF_OP_WRITE_BARRIER) &&
                     (error == -EOPNOTSUPP)) {
-                pr_debug(DRV_PFX "write barrier op failed, not supported\n");
+                pr_debug("write barrier op failed, not supported\n");
                 xen_blkbk_barrier(XBT_NIL, pending_req->blkif->be, 0);
                 pending_req->status = BLKIF_RSP_EOPNOTSUPP;
         } else if (error) {
-                pr_debug(DRV_PFX "Buffer not up-to-date at end of operation,"
+                pr_debug("Buffer not up-to-date at end of operation,"
                          " error=%d\n", error);
                 pending_req->status = BLKIF_RSP_ERROR;
         }
@@ -1110,7 +1112,7 @@ __do_block_io_op(struct xen_blkif *blkif)
 
         if (RING_REQUEST_PROD_OVERFLOW(&blk_rings->common, rp)) {
                 rc = blk_rings->common.rsp_prod_pvt;
-                pr_warn(DRV_PFX "Frontend provided bogus ring requests (%d - %d = %d). Halting ring processing on dev=%04x\n",
+                pr_warn("Frontend provided bogus ring requests (%d - %d = %d). Halting ring processing on dev=%04x\n",
                         rp, rc, rp - rc, blkif->vbd.pdevice);
                 return -EACCES;
         }
@@ -1217,8 +1219,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
         if ((req->operation == BLKIF_OP_INDIRECT) &&
             (req_operation != BLKIF_OP_READ) &&
             (req_operation != BLKIF_OP_WRITE)) {
-                pr_debug(DRV_PFX "Invalid indirect operation (%u)\n",
-                         req_operation);
+                pr_debug("Invalid indirect operation (%u)\n", req_operation);
                 goto fail_response;
         }
 
@@ -1252,8 +1253,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
                      (nseg > BLKIF_MAX_SEGMENTS_PER_REQUEST)) ||
             unlikely((req->operation == BLKIF_OP_INDIRECT) &&
                      (nseg > MAX_INDIRECT_SEGMENTS))) {
-                pr_debug(DRV_PFX "Bad number of segments in request (%d)\n",
-                         nseg);
+                pr_debug("Bad number of segments in request (%d)\n", nseg);
                 /* Haven't submitted any bio's yet. */
                 goto fail_response;
         }
@@ -1288,7 +1288,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
         }
 
         if (xen_vbd_translate(&preq, blkif, operation) != 0) {
-                pr_debug(DRV_PFX "access denied: %s of [%llu,%llu] on dev=%04x\n",
+                pr_debug("access denied: %s of [%llu,%llu] on dev=%04x\n",
                          operation == READ ? "read" : "write",
                          preq.sector_number,
                          preq.sector_number + preq.nr_sects,
@@ -1303,7 +1303,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
         for (i = 0; i < nseg; i++) {
                 if (((int)preq.sector_number|(int)seg[i].nsec) &
                     ((bdev_logical_block_size(preq.bdev) >> 9) - 1)) {
-                        pr_debug(DRV_PFX "Misaligned I/O request from domain %d",
+                        pr_debug("Misaligned I/O request from domain %d\n",
                                  blkif->domid);
                         goto fail_response;
                 }
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index 375d28851860..f620b5d3f77c 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -44,12 +44,6 @@
 #include <xen/interface/io/blkif.h>
 #include <xen/interface/io/protocols.h>
 
-#define DRV_PFX "xen-blkback:"
-#define DPRINTK(fmt, args...)                           \
-        pr_debug(DRV_PFX "(%s:%d) " fmt ".\n",          \
-                 __func__, __LINE__, ##args)
-
-
 /*
  * This is the maximum number of segments that would be allowed in indirect
  * requests. This value will also be passed to the frontend.
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index ff3025922c14..6ab69ad61ee1 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -14,6 +14,8 @@
 
 */
 
+#define pr_fmt(fmt) "xen-blkback: " fmt
+
 #include <stdarg.h>
 #include <linux/module.h>
 #include <linux/kthread.h>
@@ -21,6 +23,9 @@
 #include <xen/grant_table.h>
 #include "common.h"
 
+/* Enlarge the array size in order to fully show blkback name. */
+#define BLKBACK_NAME_LEN (20)
+
 struct backend_info {
         struct xenbus_device    *dev;
         struct xen_blkif        *blkif;
@@ -70,7 +75,7 @@ static int blkback_name(struct xen_blkif *blkif, char *buf)
         else
                 devname  = devpath;
 
-        snprintf(buf, TASK_COMM_LEN, "blkback.%d.%s", blkif->domid, devname);
+        snprintf(buf, BLKBACK_NAME_LEN, "blkback.%d.%s", blkif->domid, devname);
         kfree(devpath);
 
         return 0;
@@ -79,7 +84,7 @@ static int blkback_name(struct xen_blkif *blkif, char *buf)
 static void xen_update_blkif_status(struct xen_blkif *blkif)
 {
         int err;
-        char name[TASK_COMM_LEN];
+        char name[BLKBACK_NAME_LEN];
 
         /* Not ready to connect? */
         if (!blkif->irq || !blkif->vbd.bdev)
@@ -424,14 +429,14 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
                                  FMODE_READ : FMODE_WRITE, NULL);
 
         if (IS_ERR(bdev)) {
-                DPRINTK("xen_vbd_create: device %08x could not be opened.\n",
+                pr_warn("xen_vbd_create: device %08x could not be opened\n",
                         vbd->pdevice);
                 return -ENOENT;
         }
 
         vbd->bdev = bdev;
         if (vbd->bdev->bd_disk == NULL) {
-                DPRINTK("xen_vbd_create: device %08x doesn't exist.\n",
+                pr_warn("xen_vbd_create: device %08x doesn't exist\n",
                         vbd->pdevice);
                 xen_vbd_free(vbd);
                 return -ENOENT;
@@ -450,7 +455,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
         if (q && blk_queue_secdiscard(q))
                 vbd->discard_secure = true;
 
-        DPRINTK("Successful creation of handle=%04x (dom=%u)\n",
+        pr_debug("Successful creation of handle=%04x (dom=%u)\n",
                 handle, blkif->domid);
         return 0;
 }
@@ -458,7 +463,7 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
 {
         struct backend_info *be = dev_get_drvdata(&dev->dev);
 
-        DPRINTK("");
+        pr_debug("%s %p %d\n", __func__, dev, dev->otherend_id);
 
         if (be->major || be->minor)
                 xenvbd_sysfs_delif(dev);
@@ -564,6 +569,10 @@ static int xen_blkbk_probe(struct xenbus_device *dev,
         int err;
         struct backend_info *be = kzalloc(sizeof(struct backend_info),
                                           GFP_KERNEL);
+
+        /* match the pr_debug in xen_blkbk_remove */
+        pr_debug("%s %p %d\n", __func__, dev, dev->otherend_id);
+
         if (!be) {
                 xenbus_dev_fatal(dev, -ENOMEM,
                                  "allocating backend structure");
@@ -595,7 +604,7 @@ static int xen_blkbk_probe(struct xenbus_device *dev,
         return 0;
 
 fail:
-        DPRINTK("failed");
+        pr_warn("%s failed\n", __func__);
         xen_blkbk_remove(dev);
         return err;
 }
@@ -619,7 +628,7 @@ static void backend_changed(struct xenbus_watch *watch,
         unsigned long handle;
         char *device_type;
 
-        DPRINTK("");
+        pr_debug("%s %p %d\n", __func__, dev, dev->otherend_id);
 
         err = xenbus_scanf(XBT_NIL, dev->nodename, "physical-device", "%x:%x",
                            &major, &minor);
@@ -638,7 +647,7 @@ static void backend_changed(struct xenbus_watch *watch,
 
         if (be->major | be->minor) {
                 if (be->major != major || be->minor != minor)
-                        pr_warn(DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n",
+                        pr_warn("changing physical device (from %x:%x to %x:%x) not supported.\n",
                                 be->major, be->minor, major, minor);
                 return;
         }
@@ -699,13 +708,12 @@ static void frontend_changed(struct xenbus_device *dev,
         struct backend_info *be = dev_get_drvdata(&dev->dev);
         int err;
 
-        DPRINTK("%s", xenbus_strstate(frontend_state));
+        pr_debug("%s %p %s\n", __func__, dev, xenbus_strstate(frontend_state));
 
         switch (frontend_state) {
         case XenbusStateInitialising:
                 if (dev->state == XenbusStateClosed) {
-                        pr_info(DRV_PFX "%s: prepare for reconnect\n",
-                                dev->nodename);
+                        pr_info("%s: prepare for reconnect\n", dev->nodename);
                         xenbus_switch_state(dev, XenbusStateInitWait);
                 }
                 break;
@@ -772,7 +780,7 @@ static void connect(struct backend_info *be)
         int err;
         struct xenbus_device *dev = be->dev;
 
-        DPRINTK("%s", dev->otherend);
+        pr_debug("%s %s\n", __func__, dev->otherend);
 
         /* Supply the information about the device the frontend needs */
 again:
@@ -858,7 +866,7 @@ static int connect_ring(struct backend_info *be)
         char protocol[64] = "";
         int err;
 
-        DPRINTK("%s", dev->otherend);
+        pr_debug("%s %s\n", __func__, dev->otherend);
 
         err = xenbus_gather(XBT_NIL, dev->otherend, "ring-ref", "%lu",
                             &ring_ref, "event-channel", "%u", &evtchn, NULL);
@@ -893,7 +901,7 @@ static int connect_ring(struct backend_info *be)
         be->blkif->vbd.feature_gnt_persistent = pers_grants;
         be->blkif->vbd.overflow_max_grants = 0;
 
-        pr_info(DRV_PFX "ring-ref %ld, event-channel %d, protocol %d (%s) %s\n",
+        pr_info("ring-ref %ld, event-channel %d, protocol %d (%s) %s\n",
                 ring_ref, evtchn, be->blkif->blk_protocol, protocol,
                 pers_grants ? "persistent grants" : "");
 
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index b99729e36860..cbddbaddb347 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -20,6 +20,19 @@ config IMX_WEIM
           The WEIM(Wireless External Interface Module) works like a bus.
           You can attach many different devices on it, such as NOR, onenand.
 
+config MIPS_CDMM
+        bool "MIPS Common Device Memory Map (CDMM) Driver"
+        depends on CPU_MIPSR2
+        help
+          Driver needed for the MIPS Common Device Memory Map bus in MIPS
+          cores. This bus is for per-CPU tightly coupled devices such as the
+          Fast Debug Channel (FDC).
+
+          For this to work, either your bootloader needs to enable the CDMM
+          region at an unused physical address on the boot CPU, or else your
+          platform code needs to implement mips_cdmm_phys_base() (see
+          asm/cdmm.h).
+
 config MVEBU_MBUS
         bool
         depends on PLAT_ORION
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 2973c18cbcc2..807dd17ef2f8 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_BRCMSTB_GISB_ARB)  += brcmstb_gisb.o
 obj-$(CONFIG_IMX_WEIM)  += imx-weim.o
+obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
 obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
 obj-$(CONFIG_OMAP_OCP2SCP)      += omap-ocp2scp.o
 
diff --git a/drivers/bus/mips_cdmm.c b/drivers/bus/mips_cdmm.c
new file mode 100644
index 000000000000..5bd792c68f9b
--- /dev/null
+++ b/drivers/bus/mips_cdmm.c
@@ -0,0 +1,716 @@
+/*
+ * Bus driver for MIPS Common Device Memory Map (CDMM).
+ *
+ * Copyright (C) 2014-2015 Imagination Technologies Ltd.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/atomic.h>
+#include <linux/err.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+#include <asm/cdmm.h>
+#include <asm/hazards.h>
+#include <asm/mipsregs.h>
+
+/* Access control and status register fields */
+#define CDMM_ACSR_DEVTYPE_SHIFT 24
+#define CDMM_ACSR_DEVTYPE       (255ul << CDMM_ACSR_DEVTYPE_SHIFT)
+#define CDMM_ACSR_DEVSIZE_SHIFT 16
+#define CDMM_ACSR_DEVSIZE       (31ul << CDMM_ACSR_DEVSIZE_SHIFT)
+#define CDMM_ACSR_DEVREV_SHIFT  12
+#define CDMM_ACSR_DEVREV        (15ul << CDMM_ACSR_DEVREV_SHIFT)
+#define CDMM_ACSR_UW            (1ul << 3)
+#define CDMM_ACSR_UR            (1ul << 2)
+#define CDMM_ACSR_SW            (1ul << 1)
+#define CDMM_ACSR_SR            (1ul << 0)
+
+/* Each block of device registers is 64 bytes */
+#define CDMM_DRB_SIZE           64
+
+#define to_mips_cdmm_driver(d)  container_of(d, struct mips_cdmm_driver, drv)
+
+/* Default physical base address */
+static phys_addr_t mips_cdmm_default_base;
+
+/* Bus operations */
+
+static const struct mips_cdmm_device_id *
+mips_cdmm_lookup(const struct mips_cdmm_device_id *table,
+                 struct mips_cdmm_device *dev)
+{
+        int ret = 0;
+
+        for (; table->type; ++table) {
+                ret = (dev->type == table->type);
+                if (ret)
+                        break;
+        }
+
+        return ret ? table : NULL;
+}
+
+static int mips_cdmm_match(struct device *dev, struct device_driver *drv)
+{
+        struct mips_cdmm_device *cdev = to_mips_cdmm_device(dev);
+        struct mips_cdmm_driver *cdrv = to_mips_cdmm_driver(drv);
+
+        return mips_cdmm_lookup(cdrv->id_table, cdev) != NULL;
+}
+
+static int mips_cdmm_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct mips_cdmm_device *cdev = to_mips_cdmm_device(dev);
+        int retval = 0;
+
+        retval = add_uevent_var(env, "CDMM_CPU=%u", cdev->cpu);
+        if (retval)
+                return retval;
+
+        retval = add_uevent_var(env, "CDMM_TYPE=0x%02x", cdev->type);
+        if (retval)
+                return retval;
+
+        retval = add_uevent_var(env, "CDMM_REV=%u", cdev->rev);
+        if (retval)
+                return retval;
+
+        retval = add_uevent_var(env, "MODALIAS=mipscdmm:t%02X", cdev->type);
+        return retval;
+}
+
+/* Device attributes */
+
+#define CDMM_ATTR(name, fmt, arg...)                                    \
+static ssize_t name##_show(struct device *_dev,                         \
+                           struct device_attribute *attr, char *buf)    \
+{                                                                       \
+        struct mips_cdmm_device *dev = to_mips_cdmm_device(_dev);       \
+        return sprintf(buf, fmt, arg);                                  \
+}                                                                       \
+static DEVICE_ATTR_RO(name);
+
+CDMM_ATTR(cpu, "%u\n", dev->cpu);
+CDMM_ATTR(type, "0x%02x\n", dev->type);
+CDMM_ATTR(revision, "%u\n", dev->rev);
+CDMM_ATTR(modalias, "mipscdmm:t%02X\n", dev->type);
+CDMM_ATTR(resource, "\t%016llx\t%016llx\t%016lx\n",
+          (unsigned long long)dev->res.start,
+          (unsigned long long)dev->res.end,
+          dev->res.flags);
+
+static struct attribute *mips_cdmm_dev_attrs[] = {
+        &dev_attr_cpu.attr,
+        &dev_attr_type.attr,
+        &dev_attr_revision.attr,
+        &dev_attr_modalias.attr,
+        &dev_attr_resource.attr,
+        NULL,
+};
+ATTRIBUTE_GROUPS(mips_cdmm_dev);
+
+struct bus_type mips_cdmm_bustype = {
+        .name           = "cdmm",
+        .dev_groups     = mips_cdmm_dev_groups,
+        .match          = mips_cdmm_match,
+        .uevent         = mips_cdmm_uevent,
+};
+EXPORT_SYMBOL_GPL(mips_cdmm_bustype);
+
+/*
+ * Standard driver callback helpers.
+ *
+ * All the CDMM driver callbacks need to be executed on the appropriate CPU from
+ * workqueues. For the standard driver callbacks we need a work function
+ * (mips_cdmm_{void,int}_work()) to do the actual call from the right CPU, and a
+ * wrapper function (generated with BUILD_PERCPU_HELPER) to arrange for the work
+ * function to be called on that CPU.
+ */
+
+/**
+ * struct mips_cdmm_work_dev - Data for per-device call work.
+ * @fn:         CDMM driver callback function to call for the device.
+ * @dev:        CDMM device to pass to @fn.
+ */
+struct mips_cdmm_work_dev {
+        void                    *fn;
+        struct mips_cdmm_device *dev;
+};
+
+/**
+ * mips_cdmm_void_work() - Call a void returning CDMM driver callback.
+ * @data:       struct mips_cdmm_work_dev pointer.
+ *
+ * A work_on_cpu() callback function to call an arbitrary CDMM driver callback
+ * function which doesn't return a value.
+ */
+static long mips_cdmm_void_work(void *data)
+{
+        struct mips_cdmm_work_dev *work = data;
+        void (*fn)(struct mips_cdmm_device *) = work->fn;
+
+        fn(work->dev);
+        return 0;
+}
+
+/**
+ * mips_cdmm_int_work() - Call an int returning CDMM driver callback.
+ * @data:       struct mips_cdmm_work_dev pointer.
+ *
+ * A work_on_cpu() callback function to call an arbitrary CDMM driver callback
+ * function which returns an int.
+ */
+static long mips_cdmm_int_work(void *data)
+{
+        struct mips_cdmm_work_dev *work = data;
+        int (*fn)(struct mips_cdmm_device *) = work->fn;
+
+        return fn(work->dev);
+}
+
+#define _BUILD_RET_void
+#define _BUILD_RET_int  return
+
+/**
+ * BUILD_PERCPU_HELPER() - Helper to call a CDMM driver callback on right CPU.
+ * @_ret:       Return type (void or int).
+ * @_name:      Name of CDMM driver callback function.
+ *
+ * Generates a specific device callback function to call a CDMM driver callback
+ * function on the appropriate CPU for the device, and if applicable return the
+ * result.
+ */
+#define BUILD_PERCPU_HELPER(_ret, _name)                                \
+static _ret mips_cdmm_##_name(struct device *dev)                       \
+{                                                                       \
+        struct mips_cdmm_device *cdev = to_mips_cdmm_device(dev);       \
+        struct mips_cdmm_driver *cdrv = to_mips_cdmm_driver(dev->driver); \
+        struct mips_cdmm_work_dev work = {                              \
+                .fn     = cdrv->_name,                                  \
+                .dev    = cdev,                                         \
+        };                                                              \
+                                                                        \
+        _BUILD_RET_##_ret work_on_cpu(cdev->cpu,                        \
+                                      mips_cdmm_##_ret##_work, &work);  \
+}
+
+/* Driver callback functions */
+BUILD_PERCPU_HELPER(int, probe)     /* int mips_cdmm_probe(struct device) */
+BUILD_PERCPU_HELPER(int, remove)    /* int mips_cdmm_remove(struct device) */
+BUILD_PERCPU_HELPER(void, shutdown) /* void mips_cdmm_shutdown(struct device) */
+
+
+/* Driver registration */
+
+/**
+ * mips_cdmm_driver_register() - Register a CDMM driver.
+ * @drv:        CDMM driver information.
+ *
+ * Register a CDMM driver with the CDMM subsystem. The driver will be informed
+ * of matching devices which are discovered.
+ *
+ * Returns:     0 on success.
+ */
+int mips_cdmm_driver_register(struct mips_cdmm_driver *drv)
+{
+        drv->drv.bus = &mips_cdmm_bustype;
+
+        if (drv->probe)
+                drv->drv.probe = mips_cdmm_probe;
+        if (drv->remove)
+                drv->drv.remove = mips_cdmm_remove;
+        if (drv->shutdown)
+                drv->drv.shutdown = mips_cdmm_shutdown;
+
+        return driver_register(&drv->drv);
+}
+EXPORT_SYMBOL_GPL(mips_cdmm_driver_register);
+
+/**
+ * mips_cdmm_driver_unregister() - Unregister a CDMM driver.
+ * @drv:        CDMM driver information.
+ *
+ * Unregister a CDMM driver from the CDMM subsystem.
+ */
+void mips_cdmm_driver_unregister(struct mips_cdmm_driver *drv)
+{
+        driver_unregister(&drv->drv);
+}
+EXPORT_SYMBOL_GPL(mips_cdmm_driver_unregister);
+
+
+/* CDMM initialisation and bus discovery */
+
+/**
+ * struct mips_cdmm_bus - Info about CDMM bus.
+ * @phys:               Physical address at which it is mapped.
+ * @regs:               Virtual address where registers can be accessed.
+ * @drbs:               Total number of DRBs.
+ * @drbs_reserved:      Number of DRBs reserved.
+ * @discovered:         Whether the devices on the bus have been discovered yet.
+ * @offline:            Whether the CDMM bus is going offline (or very early
+ *                      coming back online), in which case it should be
+ *                      reconfigured each time.
+ */
+struct mips_cdmm_bus {
+        phys_addr_t      phys;
+        void __iomem    *regs;
+        unsigned int     drbs;
+        unsigned int     drbs_reserved;
+        bool             discovered;
+        bool             offline;
+};
+
+static struct mips_cdmm_bus mips_cdmm_boot_bus;
+static DEFINE_PER_CPU(struct mips_cdmm_bus *, mips_cdmm_buses);
+static atomic_t mips_cdmm_next_id = ATOMIC_INIT(-1);
+
+/**
+ * mips_cdmm_get_bus() - Get the per-CPU CDMM bus information.
+ *
+ * Get information about the per-CPU CDMM bus, if the bus is present.
+ *
+ * The caller must prevent migration to another CPU, either by disabling
+ * pre-emption or by running from a pinned kernel thread.
+ *
+ * Returns:     Pointer to CDMM bus information for the current CPU.
+ *              May return ERR_PTR(-errno) in case of error, so check with
+ *              IS_ERR().
+ */
+static struct mips_cdmm_bus *mips_cdmm_get_bus(void)
+{
+        struct mips_cdmm_bus *bus, **bus_p;
+        unsigned long flags;
+        unsigned int cpu;
+
+        if (!cpu_has_cdmm)
+                return ERR_PTR(-ENODEV);
+
+        cpu = smp_processor_id();
+        /* Avoid early use of per-cpu primitives before initialised */
+        if (cpu == 0)
+                return &mips_cdmm_boot_bus;
+
+        /* Get bus pointer */
+        bus_p = per_cpu_ptr(&mips_cdmm_buses, cpu);
+        local_irq_save(flags);
+        bus = *bus_p;
+        /* Attempt allocation if NULL */
+        if (unlikely(!bus)) {
+                bus = kzalloc(sizeof(*bus), GFP_ATOMIC);
+                if (unlikely(!bus))
+                        bus = ERR_PTR(-ENOMEM);
+                else
+                        *bus_p = bus;
+        }
+        local_irq_restore(flags);
+        return bus;
+}
+
+/**
+ * mips_cdmm_cur_base() - Find current physical base address of CDMM region.
+ *
+ * Returns:     Physical base address of CDMM region according to cdmmbase CP0
+ *              register, or 0 if the CDMM region is disabled.
+ */
+static phys_addr_t mips_cdmm_cur_base(void)
+{
+        unsigned long cdmmbase = read_c0_cdmmbase();
+
+        if (!(cdmmbase & MIPS_CDMMBASE_EN))
+                return 0;
+
+        return (cdmmbase >> MIPS_CDMMBASE_ADDR_SHIFT)
+                << MIPS_CDMMBASE_ADDR_START;
+}
+
+/**
+ * mips_cdmm_setup() - Ensure the CDMM bus is initialised and usable.
+ * @bus:        Pointer to bus information for current CPU.
+ *              IS_ERR(bus) is checked, so no need for caller to check.
+ *
+ * The caller must prevent migration to another CPU, either by disabling
+ * pre-emption or by running from a pinned kernel thread.
+ *
+ * Returns      0 on success, -errno on failure.
+ */
+static int mips_cdmm_setup(struct mips_cdmm_bus *bus)
+{
+        unsigned long cdmmbase, flags;
+        int ret = 0;
+
+        if (IS_ERR(bus))
+                return PTR_ERR(bus);
+
+        local_irq_save(flags);
+        /* Don't set up bus a second time unless marked offline */
+        if (bus->offline) {
+                /* If CDMM region is still set up, nothing to do */
+                if (bus->phys == mips_cdmm_cur_base())
+                        goto out;
+                /*
+                 * The CDMM region isn't set up as expected, so it needs
+                 * reconfiguring, but then we can stop checking it.
+                 */
+                bus->offline = false;
+        } else if (bus->phys > 1) {
+                goto out;
+        }
+
+        /* If the CDMM region is already configured, inherit that setup */
+        if (!bus->phys)
+                bus->phys = mips_cdmm_cur_base();
+        /* Otherwise, ask platform code for suggestions */
+        if (!bus->phys && mips_cdmm_phys_base)
+                bus->phys = mips_cdmm_phys_base();
+        /* Otherwise, copy what other CPUs have done */
+        if (!bus->phys)
+                bus->phys = mips_cdmm_default_base;
+        /* Otherwise, complain once */
+        if (!bus->phys) {
+                bus->phys = 1;
+                /*
+                 * If you hit this, either your bootloader needs to set up the
+                 * CDMM on the boot CPU, or else you need to implement
+                 * mips_cdmm_phys_base() for your platform (see asm/cdmm.h).
+                 */
+                pr_err("cdmm%u: Failed to choose a physical base\n",
+                       smp_processor_id());
+        }
+        /* Already complained? */
+        if (bus->phys == 1) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        /* Record our success for other CPUs to copy */
+        mips_cdmm_default_base = bus->phys;
+
+        pr_debug("cdmm%u: Enabling CDMM region at %pa\n",
+                 smp_processor_id(), &bus->phys);
+
+        /* Enable CDMM */
+        cdmmbase = read_c0_cdmmbase();
+        cdmmbase &= (1ul << MIPS_CDMMBASE_ADDR_SHIFT) - 1;
+        cdmmbase |= (bus->phys >> MIPS_CDMMBASE_ADDR_START)
+                        << MIPS_CDMMBASE_ADDR_SHIFT;
+        cdmmbase |= MIPS_CDMMBASE_EN;
+        write_c0_cdmmbase(cdmmbase);
+        tlbw_use_hazard();
+
+        bus->regs = (void __iomem *)CKSEG1ADDR(bus->phys);
+        bus->drbs = 1 + ((cdmmbase & MIPS_CDMMBASE_SIZE) >>
+                         MIPS_CDMMBASE_SIZE_SHIFT);
+        bus->drbs_reserved = !!(cdmmbase & MIPS_CDMMBASE_CI);
+
+out:
+        local_irq_restore(flags);
+        return ret;
+}
+
+/**
+ * mips_cdmm_early_probe() - Minimally probe for a specific device on CDMM.
+ * @dev_type:   CDMM type code to look for.
+ *
+ * Minimally configure the in-CPU Common Device Memory Map (CDMM) and look for a
+ * specific device. This can be used to find a device very early in boot for
+ * example to configure an early FDC console device.
+ *
+ * The caller must prevent migration to another CPU, either by disabling
+ * pre-emption or by running from a pinned kernel thread.
+ *
+ * Returns:     MMIO pointer to device memory. The caller can read the ACSR
+ *              register to find more information about the device (such as the
+ *              version number or the number of blocks).
+ *              May return IOMEM_ERR_PTR(-errno) in case of error, so check with
+ *              IS_ERR().
+ */
+void __iomem *mips_cdmm_early_probe(unsigned int dev_type)
+{
+        struct mips_cdmm_bus *bus;
+        void __iomem *cdmm;
+        u32 acsr;
+        unsigned int drb, type, size;
+        int err;
+
+        if (WARN_ON(!dev_type))
+                return IOMEM_ERR_PTR(-ENODEV);
+
+        bus = mips_cdmm_get_bus();
+        err = mips_cdmm_setup(bus);
+        if (err)
+                return IOMEM_ERR_PTR(err);
+
+        /* Skip the first block if it's reserved for more registers */
+        drb = bus->drbs_reserved;
+        cdmm = bus->regs;
+
+        /* Look for a specific device type */
+        for (; drb < bus->drbs; drb += size + 1) {
+                acsr = readl(cdmm + drb * CDMM_DRB_SIZE);
+                type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;
+                if (type == dev_type)
+                        return cdmm + drb * CDMM_DRB_SIZE;
+                size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT;
+        }
+
+        return IOMEM_ERR_PTR(-ENODEV);
+}
+EXPORT_SYMBOL_GPL(mips_cdmm_early_probe);
+
+/**
+ * mips_cdmm_release() - Release a removed CDMM device.
+ * @dev:        Device object
+ *
+ * Clean up the struct mips_cdmm_device for an unused CDMM device. This is
+ * called automatically by the driver core when a device is removed.
+ */
+static void mips_cdmm_release(struct device *dev)
+{
+        struct mips_cdmm_device *cdev = to_mips_cdmm_device(dev);
+
+        kfree(cdev);
+}
+
+/**
+ * mips_cdmm_bus_discover() - Discover the devices on the CDMM bus.
+ * @bus:        CDMM bus information, must already be set up.
+ */
+static void mips_cdmm_bus_discover(struct mips_cdmm_bus *bus)
+{
+        void __iomem *cdmm;
+        u32 acsr;
+        unsigned int drb, type, size, rev;
+        struct mips_cdmm_device *dev;
+        unsigned int cpu = smp_processor_id();
+        int ret = 0;
+        int id = 0;
+
+        /* Skip the first block if it's reserved for more registers */
+        drb = bus->drbs_reserved;
+        cdmm = bus->regs;
+
+        /* Discover devices */
+        bus->discovered = true;
+        pr_info("cdmm%u discovery (%u blocks)\n", cpu, bus->drbs);
+        for (; drb < bus->drbs; drb += size + 1) {
+                acsr = readl(cdmm + drb * CDMM_DRB_SIZE);
+                type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT;
+                size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT;
+                rev  = (acsr & CDMM_ACSR_DEVREV)  >> CDMM_ACSR_DEVREV_SHIFT;
+
+                if (!type)
+                        continue;
+
+                pr_info("cdmm%u-%u: @%u (%#x..%#x), type 0x%02x, rev %u\n",
+                        cpu, id, drb, drb * CDMM_DRB_SIZE,
+                        (drb + size + 1) * CDMM_DRB_SIZE - 1,
+                        type, rev);
+
+                dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+                if (!dev)
+                        break;
+
+                dev->cpu = cpu;
+                dev->res.start = bus->phys + drb * CDMM_DRB_SIZE;
+                dev->res.end = bus->phys +
+                                (drb + size + 1) * CDMM_DRB_SIZE - 1;
+                dev->res.flags = IORESOURCE_MEM;
+                dev->type = type;
+                dev->rev = rev;
+                dev->dev.parent = get_cpu_device(cpu);
+                dev->dev.bus = &mips_cdmm_bustype;
+                dev->dev.id = atomic_inc_return(&mips_cdmm_next_id);
+                dev->dev.release = mips_cdmm_release;
+
+                dev_set_name(&dev->dev, "cdmm%u-%u", cpu, id);
+                ++id;
+                ret = device_register(&dev->dev);
+                if (ret) {
+                        put_device(&dev->dev);
+                        kfree(dev);
+                }
+        }
+}
+
+
+/*
+ * CPU hotplug and initialisation
+ *
+ * All the CDMM driver callbacks need to be executed on the appropriate CPU from
+ * workqueues. For the CPU callbacks, they need to be called for all devices on
+ * that CPU, so the work function calls bus_for_each_dev, using a helper
+ * (generated with BUILD_PERDEV_HELPER) to call the driver callback if the
+ * device's CPU matches.
+ */
+
+/**
+ * BUILD_PERDEV_HELPER() - Helper to call a CDMM driver callback if CPU matches.
+ * @_name:      Name of CDMM driver callback function.
+ *
+ * Generates a bus_for_each_dev callback function to call a specific CDMM driver
+ * callback function for the device if the device's CPU matches that pointed to
+ * by the data argument.
+ *
+ * This is used for informing drivers for all devices on a given CPU of some
+ * event (such as the CPU going online/offline).
+ *
+ * It is expected to already be called from the appropriate CPU.
+ */
+#define BUILD_PERDEV_HELPER(_name)                                      \
+static int mips_cdmm_##_name##_helper(struct device *dev, void *data)   \
+{                                                                       \
+        struct mips_cdmm_device *cdev = to_mips_cdmm_device(dev);       \
+        struct mips_cdmm_driver *cdrv;                                  \
+        unsigned int cpu = *(unsigned int *)data;                       \
+                                                                        \
+        if (cdev->cpu != cpu || !dev->driver)                           \
+                return 0;                                               \
+                                                                        \
+        cdrv = to_mips_cdmm_driver(dev->driver);                        \
+        if (!cdrv->_name)                                               \
+                return 0;                                               \
+        return cdrv->_name(cdev);                                       \
+}
+
+/* bus_for_each_dev callback helper functions */
+BUILD_PERDEV_HELPER(cpu_down)       /* int mips_cdmm_cpu_down_helper(...) */
+BUILD_PERDEV_HELPER(cpu_up)         /* int mips_cdmm_cpu_up_helper(...) */
+
+/**
+ * mips_cdmm_bus_down() - Tear down the CDMM bus.
+ * @data:       Pointer to unsigned int CPU number.
+ *
+ * This work_on_cpu callback function is executed on a given CPU to call the
+ * CDMM driver cpu_down callback for all devices on that CPU.
+ */
+static long mips_cdmm_bus_down(void *data)
+{
+        struct mips_cdmm_bus *bus;
+        long ret;
+
+        /* Inform all the devices on the bus */
+        ret = bus_for_each_dev(&mips_cdmm_bustype, NULL, data,
+                               mips_cdmm_cpu_down_helper);
+
+        /*
+         * While bus is offline, each use of it should reconfigure it just in
+         * case it is first use when coming back online again.
+         */
+        bus = mips_cdmm_get_bus();
+        if (!IS_ERR(bus))
+                bus->offline = true;
+
+        return ret;
+}
+
+/**
+ * mips_cdmm_bus_up() - Bring up the CDMM bus.
+ * @data:       Pointer to unsigned int CPU number.
+ *
+ * This work_on_cpu callback function is executed on a given CPU to discover
+ * CDMM devices on that CPU, or to call the CDMM driver cpu_up callback for all
+ * devices already discovered on that CPU.
+ *
+ * It is used during initialisation and when CPUs are brought online.
+ */
+static long mips_cdmm_bus_up(void *data)
+{
+        struct mips_cdmm_bus *bus;
+        long ret;
+
+        bus = mips_cdmm_get_bus();
+        ret = mips_cdmm_setup(bus);
+        if (ret)
+                return ret;
+
+        /* Bus now set up, so we can drop the offline flag if still set */
+        bus->offline = false;
+
+        if (!bus->discovered)
+                mips_cdmm_bus_discover(bus);
+        else
+                /* Inform all the devices on the bus */
+                ret = bus_for_each_dev(&mips_cdmm_bustype, NULL, data,
+                                       mips_cdmm_cpu_up_helper);
+
+        return ret;
+}
+
+/**
+ * mips_cdmm_cpu_notify() - Take action when a CPU is going online or offline.
+ * @nb:         CPU notifier block .
+ * @action:     Event that has taken place (CPU_*).
+ * @data:       CPU number.
+ *
+ * This notifier is used to keep the CDMM buses updated as CPUs are offlined and
+ * onlined. When CPUs go offline or come back online, so does their CDMM bus, so
+ * devices must be informed. Also when CPUs come online for the first time the
+ * devices on the CDMM bus need discovering.
+ *
+ * Returns:     NOTIFY_OK if event was used.
+ *              NOTIFY_DONE if we didn't care.
+ */
+static int mips_cdmm_cpu_notify(struct notifier_block *nb,
+                                unsigned long action, void *data)
+{
+        unsigned int cpu = (unsigned int)data;
+
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_ONLINE:
+        case CPU_DOWN_FAILED:
+                work_on_cpu(cpu, mips_cdmm_bus_up, &cpu);
+                break;
+        case CPU_DOWN_PREPARE:
+                work_on_cpu(cpu, mips_cdmm_bus_down, &cpu);
+                break;
+        default:
+                return NOTIFY_DONE;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block mips_cdmm_cpu_nb = {
+        .notifier_call = mips_cdmm_cpu_notify,
+};
+
+/**
+ * mips_cdmm_init() - Initialise CDMM bus.
+ *
+ * Initialise CDMM bus, discover CDMM devices for online CPUs, and arrange for
+ * hotplug notifications so the CDMM drivers can be kept up to date.
+ */
+static int __init mips_cdmm_init(void)
+{
+        unsigned int cpu;
+        int ret;
+
+        /* Register the bus */
+        ret = bus_register(&mips_cdmm_bustype);
+        if (ret)
+                return ret;
+
+        /* We want to be notified about new CPUs */
+        ret = register_cpu_notifier(&mips_cdmm_cpu_nb);
+        if (ret) {
+                pr_warn("cdmm: Failed to register CPU notifier\n");
+                goto out;
+        }
+
+        /* Discover devices on CDMM of online CPUs */
+        for_each_online_cpu(cpu)
+                work_on_cpu(cpu, mips_cdmm_bus_up, &cpu);
+
+        return 0;
+out:
+        bus_unregister(&mips_cdmm_bustype);
+        return ret;
+}
+subsys_initcall(mips_cdmm_init);
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index d478ceb69c5f..e43ff53f85a6 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -54,6 +54,7 @@ obj-$(CONFIG_ARCH_MMP)			+= mmp/
 endif
 obj-$(CONFIG_PLAT_ORION)                += mvebu/
 obj-$(CONFIG_ARCH_MXS)                  += mxs/
+obj-$(CONFIG_MACH_PISTACHIO)            += pistachio/
 obj-$(CONFIG_COMMON_CLK_PXA)            += pxa/
 obj-$(CONFIG_COMMON_CLK_QCOM)           += qcom/
 obj-$(CONFIG_ARCH_ROCKCHIP)             += rockchip/
diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c
index 05abae89262e..a0ef4f75d457 100644
--- a/drivers/clk/bcm/clk-kona.c
+++ b/drivers/clk/bcm/clk-kona.c
@@ -15,6 +15,7 @@
 #include "clk-kona.h"
 
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 /*
  * "Policies" affect the frequencies of bus clocks provided by a
@@ -51,21 +52,6 @@ static inline u32 bitfield_replace(u32 reg_val, u32 shift, u32 width, u32 val)
 
 /* Divider and scaling helpers */
 
-/*
- * Implement DIV_ROUND_CLOSEST() for 64-bit dividend and both values
- * unsigned.  Note that unlike do_div(), the remainder is discarded
- * and the return value is the quotient (not the remainder).
- */
-u64 do_div_round_closest(u64 dividend, unsigned long divisor)
-{
-        u64 result;
-
-        result = dividend + ((u64)divisor >> 1);
-        (void)do_div(result, divisor);
-
-        return result;
-}
-
 /* Convert a divider into the scaled divisor value it represents. */
 static inline u64 scaled_div_value(struct bcm_clk_div *div, u32 reg_div)
 {
@@ -87,7 +73,7 @@ u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value, u32 billionths)
         combined = (u64)div_value * BILLION + billionths;
         combined <<= div->u.s.frac_width;
 
-        return do_div_round_closest(combined, BILLION);
+        return DIV_ROUND_CLOSEST_ULL(combined, BILLION);
 }
 
 /* The scaled minimum divisor representable by a divider */
@@ -731,7 +717,7 @@ static unsigned long clk_recalc_rate(struct ccu_data *ccu,
                 scaled_rate = scale_rate(pre_div, parent_rate);
                 scaled_rate = scale_rate(div, scaled_rate);
                 scaled_div = divider_read_scaled(ccu, pre_div);
-                scaled_parent_rate = do_div_round_closest(scaled_rate,
+                scaled_parent_rate = DIV_ROUND_CLOSEST_ULL(scaled_rate,
                                                         scaled_div);
         } else  {
                 scaled_parent_rate = scale_rate(div, parent_rate);
@@ -743,7 +729,7 @@ static unsigned long clk_recalc_rate(struct ccu_data *ccu,
          * rate.
          */
         scaled_div = divider_read_scaled(ccu, div);
-        result = do_div_round_closest(scaled_parent_rate, scaled_div);
+        result = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate, scaled_div);
 
         return (unsigned long)result;
 }
@@ -790,7 +776,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div,
                 scaled_rate = scale_rate(pre_div, parent_rate);
                 scaled_rate = scale_rate(div, scaled_rate);
                 scaled_pre_div = divider_read_scaled(ccu, pre_div);
-                scaled_parent_rate = do_div_round_closest(scaled_rate,
+                scaled_parent_rate = DIV_ROUND_CLOSEST_ULL(scaled_rate,
                                                         scaled_pre_div);
         } else {
                 scaled_parent_rate = scale_rate(div, parent_rate);
@@ -802,7 +788,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div,
          * the best we can do.
          */
         if (!divider_is_fixed(div)) {
-                best_scaled_div = do_div_round_closest(scaled_parent_rate,
+                best_scaled_div = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate,
                                                         rate);
                 min_scaled_div = scaled_div_min(div);
                 max_scaled_div = scaled_div_max(div);
@@ -815,7 +801,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div,
         }
 
         /* OK, figure out the resulting rate */
-        result = do_div_round_closest(scaled_parent_rate, best_scaled_div);
+        result = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate, best_scaled_div);
 
         if (scaled_div)
                 *scaled_div = best_scaled_div;
diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h
index 2537b3072910..6849a64baf6d 100644
--- a/drivers/clk/bcm/clk-kona.h
+++ b/drivers/clk/bcm/clk-kona.h
@@ -503,7 +503,6 @@ extern struct clk_ops kona_peri_clk_ops;
 
 /* Externally visible functions */
 
-extern u64 do_div_round_closest(u64 dividend, unsigned long divisor);
 extern u64 scaled_div_max(struct bcm_clk_div *div);
 extern u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value,
                                 u32 billionths);
diff --git a/drivers/clk/pistachio/Makefile b/drivers/clk/pistachio/Makefile
new file mode 100644
index 000000000000..f1e151fbef65
--- /dev/null
+++ b/drivers/clk/pistachio/Makefile
@@ -0,0 +1,3 @@
+obj-y   += clk.o
+obj-y   += clk-pll.o
+obj-y   += clk-pistachio.o
diff --git a/drivers/clk/pistachio/clk-pistachio.c b/drivers/clk/pistachio/clk-pistachio.c
new file mode 100644
index 000000000000..8c0fe8828f99
--- /dev/null
+++ b/drivers/clk/pistachio/clk-pistachio.c
@@ -0,0 +1,329 @@
+/*
+ * Pistachio SoC clock controllers
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+
+#include <dt-bindings/clock/pistachio-clk.h>
+
+#include "clk.h"
+
+static struct pistachio_gate pistachio_gates[] __initdata = {
+        GATE(CLK_MIPS, "mips", "mips_div", 0x104, 0),
+        GATE(CLK_AUDIO_IN, "audio_in", "audio_clk_in_gate", 0x104, 1),
+        GATE(CLK_AUDIO, "audio", "audio_div", 0x104, 2),
+        GATE(CLK_I2S, "i2s", "i2s_div", 0x104, 3),
+        GATE(CLK_SPDIF, "spdif", "spdif_div", 0x104, 4),
+        GATE(CLK_AUDIO_DAC, "audio_dac", "audio_dac_div", 0x104, 5),
+        GATE(CLK_RPU_V, "rpu_v", "rpu_v_div", 0x104, 6),
+        GATE(CLK_RPU_L, "rpu_l", "rpu_l_div", 0x104, 7),
+        GATE(CLK_RPU_SLEEP, "rpu_sleep", "rpu_sleep_div", 0x104, 8),
+        GATE(CLK_WIFI_PLL_GATE, "wifi_pll_gate", "wifi_pll_mux", 0x104, 9),
+        GATE(CLK_RPU_CORE, "rpu_core", "rpu_core_div", 0x104, 10),
+        GATE(CLK_WIFI_ADC, "wifi_adc", "wifi_div8_mux", 0x104, 11),
+        GATE(CLK_WIFI_DAC, "wifi_dac", "wifi_div4_mux", 0x104, 12),
+        GATE(CLK_USB_PHY, "usb_phy", "usb_phy_div", 0x104, 13),
+        GATE(CLK_ENET_IN, "enet_in", "enet_clk_in_gate", 0x104, 14),
+        GATE(CLK_ENET, "enet", "enet_div", 0x104, 15),
+        GATE(CLK_UART0, "uart0", "uart0_div", 0x104, 16),
+        GATE(CLK_UART1, "uart1", "uart1_div", 0x104, 17),
+        GATE(CLK_PERIPH_SYS, "periph_sys", "sys_internal_div", 0x104, 18),
+        GATE(CLK_SPI0, "spi0", "spi0_div", 0x104, 19),
+        GATE(CLK_SPI1, "spi1", "spi1_div", 0x104, 20),
+        GATE(CLK_EVENT_TIMER, "event_timer", "event_timer_div", 0x104, 21),
+        GATE(CLK_AUX_ADC_INTERNAL, "aux_adc_internal", "sys_internal_div",
+             0x104, 22),
+        GATE(CLK_AUX_ADC, "aux_adc", "aux_adc_div", 0x104, 23),
+        GATE(CLK_SD_HOST, "sd_host", "sd_host_div", 0x104, 24),
+        GATE(CLK_BT, "bt", "bt_div", 0x104, 25),
+        GATE(CLK_BT_DIV4, "bt_div4", "bt_div4_div", 0x104, 26),
+        GATE(CLK_BT_DIV8, "bt_div8", "bt_div8_div", 0x104, 27),
+        GATE(CLK_BT_1MHZ, "bt_1mhz", "bt_1mhz_div", 0x104, 28),
+};
+
+static struct pistachio_fixed_factor pistachio_ffs[] __initdata = {
+        FIXED_FACTOR(CLK_WIFI_DIV4, "wifi_div4", "wifi_pll", 4),
+        FIXED_FACTOR(CLK_WIFI_DIV8, "wifi_div8", "wifi_pll", 8),
+};
+
+static struct pistachio_div pistachio_divs[] __initdata = {
+        DIV(CLK_MIPS_INTERNAL_DIV, "mips_internal_div", "mips_pll_mux",
+            0x204, 2),
+        DIV(CLK_MIPS_DIV, "mips_div", "mips_internal_div", 0x208, 8),
+        DIV_F(CLK_AUDIO_DIV, "audio_div", "audio_mux",
+                0x20c, 8, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_I2S_DIV, "i2s_div", "audio_pll_mux",
+                0x210, 8, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_SPDIF_DIV, "spdif_div", "audio_pll_mux",
+                0x214, 8, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_AUDIO_DAC_DIV, "audio_dac_div", "audio_pll_mux",
+                0x218, 8, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV(CLK_RPU_V_DIV, "rpu_v_div", "rpu_v_pll_mux", 0x21c, 2),
+        DIV(CLK_RPU_L_DIV, "rpu_l_div", "rpu_l_mux", 0x220, 2),
+        DIV(CLK_RPU_SLEEP_DIV, "rpu_sleep_div", "xtal", 0x224, 10),
+        DIV(CLK_RPU_CORE_DIV, "rpu_core_div", "rpu_core_mux", 0x228, 3),
+        DIV(CLK_USB_PHY_DIV, "usb_phy_div", "sys_internal_div", 0x22c, 6),
+        DIV(CLK_ENET_DIV, "enet_div", "enet_mux", 0x230, 6),
+        DIV_F(CLK_UART0_INTERNAL_DIV, "uart0_internal_div", "sys_pll_mux",
+              0x234, 3, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_UART0_DIV, "uart0_div", "uart0_internal_div", 0x238, 10,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_UART1_INTERNAL_DIV, "uart1_internal_div", "sys_pll_mux",
+              0x23c, 3, CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(CLK_UART1_DIV, "uart1_div", "uart1_internal_div", 0x240, 10,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV(CLK_SYS_INTERNAL_DIV, "sys_internal_div", "sys_pll_mux", 0x244, 3),
+        DIV(CLK_SPI0_INTERNAL_DIV, "spi0_internal_div", "sys_pll_mux",
+            0x248, 3),
+        DIV(CLK_SPI0_DIV, "spi0_div", "spi0_internal_div", 0x24c, 7),
+        DIV(CLK_SPI1_INTERNAL_DIV, "spi1_internal_div", "sys_pll_mux",
+            0x250, 3),
+        DIV(CLK_SPI1_DIV, "spi1_div", "spi1_internal_div", 0x254, 7),
+        DIV(CLK_EVENT_TIMER_INTERNAL_DIV, "event_timer_internal_div",
+            "event_timer_mux", 0x258, 3),
+        DIV(CLK_EVENT_TIMER_DIV, "event_timer_div", "event_timer_internal_div",
+            0x25c, 12),
+        DIV(CLK_AUX_ADC_INTERNAL_DIV, "aux_adc_internal_div",
+            "aux_adc_internal", 0x260, 3),
+        DIV(CLK_AUX_ADC_DIV, "aux_adc_div", "aux_adc_internal_div", 0x264, 10),
+        DIV(CLK_SD_HOST_DIV, "sd_host_div", "sd_host_mux", 0x268, 6),
+        DIV(CLK_BT_DIV, "bt_div", "bt_pll_mux", 0x26c, 6),
+        DIV(CLK_BT_DIV4_DIV, "bt_div4_div", "bt_pll_mux", 0x270, 6),
+        DIV(CLK_BT_DIV8_DIV, "bt_div8_div", "bt_pll_mux", 0x274, 6),
+        DIV(CLK_BT_1MHZ_INTERNAL_DIV, "bt_1mhz_internal_div", "bt_pll_mux",
+            0x278, 3),
+        DIV(CLK_BT_1MHZ_DIV, "bt_1mhz_div", "bt_1mhz_internal_div", 0x27c, 10),
+};
+
+PNAME(mux_xtal_audio_refclk) = { "xtal", "audio_clk_in_gate" };
+PNAME(mux_xtal_mips) = { "xtal", "mips_pll" };
+PNAME(mux_xtal_audio) = { "xtal", "audio_pll", "audio_in" };
+PNAME(mux_audio_debug) = { "audio_pll_mux", "debug_mux" };
+PNAME(mux_xtal_rpu_v) = { "xtal", "rpu_v_pll" };
+PNAME(mux_xtal_rpu_l) = { "xtal", "rpu_l_pll" };
+PNAME(mux_rpu_l_mips) = { "rpu_l_pll_mux", "mips_pll_mux" };
+PNAME(mux_xtal_wifi) = { "xtal", "wifi_pll" };
+PNAME(mux_xtal_wifi_div4) = { "xtal", "wifi_div4" };
+PNAME(mux_xtal_wifi_div8) = { "xtal", "wifi_div8" };
+PNAME(mux_wifi_div4_rpu_l) = { "wifi_pll_gate", "wifi_div4_mux",
+                               "rpu_l_pll_mux" };
+PNAME(mux_xtal_sys) = { "xtal", "sys_pll" };
+PNAME(mux_sys_enet) = { "sys_internal_div", "enet_in" };
+PNAME(mux_audio_sys) = { "audio_pll_mux", "sys_internal_div" };
+PNAME(mux_sys_bt) = { "sys_internal_div", "bt_pll_mux" };
+PNAME(mux_xtal_bt) = { "xtal", "bt_pll" };
+
+static struct pistachio_mux pistachio_muxes[] __initdata = {
+        MUX(CLK_AUDIO_REF_MUX, "audio_refclk_mux", mux_xtal_audio_refclk,
+            0x200, 0),
+        MUX(CLK_MIPS_PLL_MUX, "mips_pll_mux", mux_xtal_mips, 0x200, 1),
+        MUX(CLK_AUDIO_PLL_MUX, "audio_pll_mux", mux_xtal_audio, 0x200, 2),
+        MUX(CLK_AUDIO_MUX, "audio_mux", mux_audio_debug, 0x200, 4),
+        MUX(CLK_RPU_V_PLL_MUX, "rpu_v_pll_mux", mux_xtal_rpu_v, 0x200, 5),
+        MUX(CLK_RPU_L_PLL_MUX, "rpu_l_pll_mux", mux_xtal_rpu_l, 0x200, 6),
+        MUX(CLK_RPU_L_MUX, "rpu_l_mux", mux_rpu_l_mips, 0x200, 7),
+        MUX(CLK_WIFI_PLL_MUX, "wifi_pll_mux", mux_xtal_wifi, 0x200, 8),
+        MUX(CLK_WIFI_DIV4_MUX, "wifi_div4_mux", mux_xtal_wifi_div4, 0x200, 9),
+        MUX(CLK_WIFI_DIV8_MUX, "wifi_div8_mux", mux_xtal_wifi_div8, 0x200, 10),
+        MUX(CLK_RPU_CORE_MUX, "rpu_core_mux", mux_wifi_div4_rpu_l, 0x200, 11),
+        MUX(CLK_SYS_PLL_MUX, "sys_pll_mux", mux_xtal_sys, 0x200, 13),
+        MUX(CLK_ENET_MUX, "enet_mux", mux_sys_enet, 0x200, 14),
+        MUX(CLK_EVENT_TIMER_MUX, "event_timer_mux", mux_audio_sys, 0x200, 15),
+        MUX(CLK_SD_HOST_MUX, "sd_host_mux", mux_sys_bt, 0x200, 16),
+        MUX(CLK_BT_PLL_MUX, "bt_pll_mux", mux_xtal_bt, 0x200, 17),
+};
+
+static struct pistachio_pll pistachio_plls[] __initdata = {
+        PLL_FIXED(CLK_MIPS_PLL, "mips_pll", "xtal", PLL_GF40LP_LAINT, 0x0),
+        PLL_FIXED(CLK_AUDIO_PLL, "audio_pll", "audio_refclk_mux",
+                  PLL_GF40LP_FRAC, 0xc),
+        PLL_FIXED(CLK_RPU_V_PLL, "rpu_v_pll", "xtal", PLL_GF40LP_LAINT, 0x20),
+        PLL_FIXED(CLK_RPU_L_PLL, "rpu_l_pll", "xtal", PLL_GF40LP_LAINT, 0x2c),
+        PLL_FIXED(CLK_SYS_PLL, "sys_pll", "xtal", PLL_GF40LP_FRAC, 0x38),
+        PLL_FIXED(CLK_WIFI_PLL, "wifi_pll", "xtal", PLL_GF40LP_FRAC, 0x4c),
+        PLL_FIXED(CLK_BT_PLL, "bt_pll", "xtal", PLL_GF40LP_LAINT, 0x60),
+};
+
+PNAME(mux_debug) = { "mips_pll_mux", "rpu_v_pll_mux",
+                     "rpu_l_pll_mux", "sys_pll_mux",
+                     "wifi_pll_mux", "bt_pll_mux" };
+static u32 mux_debug_idx[] = { 0x0, 0x1, 0x2, 0x4, 0x8, 0x10 };
+
+static unsigned int pistachio_critical_clks[] __initdata = {
+        CLK_MIPS,
+        CLK_PERIPH_SYS,
+};
+
+static void __init pistachio_clk_init(struct device_node *np)
+{
+        struct pistachio_clk_provider *p;
+        struct clk *debug_clk;
+
+        p = pistachio_clk_alloc_provider(np, CLK_NR_CLKS);
+        if (!p)
+                return;
+
+        pistachio_clk_register_pll(p, pistachio_plls,
+                                   ARRAY_SIZE(pistachio_plls));
+        pistachio_clk_register_mux(p, pistachio_muxes,
+                                   ARRAY_SIZE(pistachio_muxes));
+        pistachio_clk_register_div(p, pistachio_divs,
+                                   ARRAY_SIZE(pistachio_divs));
+        pistachio_clk_register_fixed_factor(p, pistachio_ffs,
+                                            ARRAY_SIZE(pistachio_ffs));
+        pistachio_clk_register_gate(p, pistachio_gates,
+                                    ARRAY_SIZE(pistachio_gates));
+
+        debug_clk = clk_register_mux_table(NULL, "debug_mux", mux_debug,
+                                           ARRAY_SIZE(mux_debug),
+                                           CLK_SET_RATE_NO_REPARENT,
+                                           p->base + 0x200, 18, 0x1f, 0,
+                                           mux_debug_idx, NULL);
+        p->clk_data.clks[CLK_DEBUG_MUX] = debug_clk;
+
+        pistachio_clk_register_provider(p);
+
+        pistachio_clk_force_enable(p, pistachio_critical_clks,
+                                   ARRAY_SIZE(pistachio_critical_clks));
+}
+CLK_OF_DECLARE(pistachio_clk, "img,pistachio-clk", pistachio_clk_init);
+
+static struct pistachio_gate pistachio_periph_gates[] __initdata = {
+        GATE(PERIPH_CLK_SYS, "sys", "periph_sys", 0x100, 0),
+        GATE(PERIPH_CLK_SYS_BUS, "bus_sys", "periph_sys", 0x100, 1),
+        GATE(PERIPH_CLK_DDR, "ddr", "periph_sys", 0x100, 2),
+        GATE(PERIPH_CLK_ROM, "rom", "rom_div", 0x100, 3),
+        GATE(PERIPH_CLK_COUNTER_FAST, "counter_fast", "counter_fast_div",
+             0x100, 4),
+        GATE(PERIPH_CLK_COUNTER_SLOW, "counter_slow", "counter_slow_div",
+             0x100, 5),
+        GATE(PERIPH_CLK_IR, "ir", "ir_div", 0x100, 6),
+        GATE(PERIPH_CLK_WD, "wd", "wd_div", 0x100, 7),
+        GATE(PERIPH_CLK_PDM, "pdm", "pdm_div", 0x100, 8),
+        GATE(PERIPH_CLK_PWM, "pwm", "pwm_div", 0x100, 9),
+        GATE(PERIPH_CLK_I2C0, "i2c0", "i2c0_div", 0x100, 10),
+        GATE(PERIPH_CLK_I2C1, "i2c1", "i2c1_div", 0x100, 11),
+        GATE(PERIPH_CLK_I2C2, "i2c2", "i2c2_div", 0x100, 12),
+        GATE(PERIPH_CLK_I2C3, "i2c3", "i2c3_div", 0x100, 13),
+};
+
+static struct pistachio_div pistachio_periph_divs[] __initdata = {
+        DIV(PERIPH_CLK_ROM_DIV, "rom_div", "periph_sys", 0x10c, 7),
+        DIV(PERIPH_CLK_COUNTER_FAST_DIV, "counter_fast_div", "periph_sys",
+            0x110, 7),
+        DIV(PERIPH_CLK_COUNTER_SLOW_PRE_DIV, "counter_slow_pre_div",
+            "periph_sys", 0x114, 7),
+        DIV(PERIPH_CLK_COUNTER_SLOW_DIV, "counter_slow_div",
+            "counter_slow_pre_div", 0x118, 7),
+        DIV_F(PERIPH_CLK_IR_PRE_DIV, "ir_pre_div", "periph_sys", 0x11c, 7,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(PERIPH_CLK_IR_DIV, "ir_div", "ir_pre_div", 0x120, 7,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(PERIPH_CLK_WD_PRE_DIV, "wd_pre_div", "periph_sys", 0x124, 7,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV_F(PERIPH_CLK_WD_DIV, "wd_div", "wd_pre_div", 0x128, 7,
+              CLK_DIVIDER_ROUND_CLOSEST),
+        DIV(PERIPH_CLK_PDM_PRE_DIV, "pdm_pre_div", "periph_sys", 0x12c, 7),
+        DIV(PERIPH_CLK_PDM_DIV, "pdm_div", "pdm_pre_div", 0x130, 7),
+        DIV(PERIPH_CLK_PWM_PRE_DIV, "pwm_pre_div", "periph_sys", 0x134, 7),
+        DIV(PERIPH_CLK_PWM_DIV, "pwm_div", "pwm_pre_div", 0x138, 7),
+        DIV(PERIPH_CLK_I2C0_PRE_DIV, "i2c0_pre_div", "periph_sys", 0x13c, 7),
+        DIV(PERIPH_CLK_I2C0_DIV, "i2c0_div", "i2c0_pre_div", 0x140, 7),
+        DIV(PERIPH_CLK_I2C1_PRE_DIV, "i2c1_pre_div", "periph_sys", 0x144, 7),
+        DIV(PERIPH_CLK_I2C1_DIV, "i2c1_div", "i2c1_pre_div", 0x148, 7),
+        DIV(PERIPH_CLK_I2C2_PRE_DIV, "i2c2_pre_div", "periph_sys", 0x14c, 7),
+        DIV(PERIPH_CLK_I2C2_DIV, "i2c2_div", "i2c2_pre_div", 0x150, 7),
+        DIV(PERIPH_CLK_I2C3_PRE_DIV, "i2c3_pre_div", "periph_sys", 0x154, 7),
+        DIV(PERIPH_CLK_I2C3_DIV, "i2c3_div", "i2c3_pre_div", 0x158, 7),
+};
+
+static void __init pistachio_clk_periph_init(struct device_node *np)
+{
+        struct pistachio_clk_provider *p;
+
+        p = pistachio_clk_alloc_provider(np, PERIPH_CLK_NR_CLKS);
+        if (!p)
+                return;
+
+        pistachio_clk_register_div(p, pistachio_periph_divs,
+                                   ARRAY_SIZE(pistachio_periph_divs));
+        pistachio_clk_register_gate(p, pistachio_periph_gates,
+                                    ARRAY_SIZE(pistachio_periph_gates));
+
+        pistachio_clk_register_provider(p);
+}
+CLK_OF_DECLARE(pistachio_clk_periph, "img,pistachio-clk-periph",
+               pistachio_clk_periph_init);
+
+static struct pistachio_gate pistachio_sys_gates[] __initdata = {
+        GATE(SYS_CLK_I2C0, "i2c0_sys", "sys", 0x8, 0),
+        GATE(SYS_CLK_I2C1, "i2c1_sys", "sys", 0x8, 1),
+        GATE(SYS_CLK_I2C2, "i2c2_sys", "sys", 0x8, 2),
+        GATE(SYS_CLK_I2C3, "i2c3_sys", "sys", 0x8, 3),
+        GATE(SYS_CLK_I2S_IN, "i2s_in_sys", "sys", 0x8, 4),
+        GATE(SYS_CLK_PAUD_OUT, "paud_out_sys", "sys", 0x8, 5),
+        GATE(SYS_CLK_SPDIF_OUT, "spdif_out_sys", "sys", 0x8, 6),
+        GATE(SYS_CLK_SPI0_MASTER, "spi0_master_sys", "sys", 0x8, 7),
+        GATE(SYS_CLK_SPI0_SLAVE, "spi0_slave_sys", "sys", 0x8, 8),
+        GATE(SYS_CLK_PWM, "pwm_sys", "sys", 0x8, 9),
+        GATE(SYS_CLK_UART0, "uart0_sys", "sys", 0x8, 10),
+        GATE(SYS_CLK_UART1, "uart1_sys", "sys", 0x8, 11),
+        GATE(SYS_CLK_SPI1, "spi1_sys", "sys", 0x8, 12),
+        GATE(SYS_CLK_MDC, "mdc_sys", "sys", 0x8, 13),
+        GATE(SYS_CLK_SD_HOST, "sd_host_sys", "sys", 0x8, 14),
+        GATE(SYS_CLK_ENET, "enet_sys", "sys", 0x8, 15),
+        GATE(SYS_CLK_IR, "ir_sys", "sys", 0x8, 16),
+        GATE(SYS_CLK_WD, "wd_sys", "sys", 0x8, 17),
+        GATE(SYS_CLK_TIMER, "timer_sys", "sys", 0x8, 18),
+        GATE(SYS_CLK_I2S_OUT, "i2s_out_sys", "sys", 0x8, 24),
+        GATE(SYS_CLK_SPDIF_IN, "spdif_in_sys", "sys", 0x8, 25),
+        GATE(SYS_CLK_EVENT_TIMER, "event_timer_sys", "sys", 0x8, 26),
+        GATE(SYS_CLK_HASH, "hash_sys", "sys", 0x8, 27),
+};
+
+static void __init pistachio_cr_periph_init(struct device_node *np)
+{
+        struct pistachio_clk_provider *p;
+
+        p = pistachio_clk_alloc_provider(np, SYS_CLK_NR_CLKS);
+        if (!p)
+                return;
+
+        pistachio_clk_register_gate(p, pistachio_sys_gates,
+                                    ARRAY_SIZE(pistachio_sys_gates));
+
+        pistachio_clk_register_provider(p);
+}
+CLK_OF_DECLARE(pistachio_cr_periph, "img,pistachio-cr-periph",
+               pistachio_cr_periph_init);
+
+static struct pistachio_gate pistachio_ext_gates[] __initdata = {
+        GATE(EXT_CLK_ENET_IN, "enet_clk_in_gate", "enet_clk_in", 0x58, 5),
+        GATE(EXT_CLK_AUDIO_IN, "audio_clk_in_gate", "audio_clk_in", 0x58, 8)
+};
+
+static void __init pistachio_cr_top_init(struct device_node *np)
+{
+        struct pistachio_clk_provider *p;
+
+        p = pistachio_clk_alloc_provider(np, EXT_CLK_NR_CLKS);
+        if (!p)
+                return;
+
+        pistachio_clk_register_gate(p, pistachio_ext_gates,
+                                    ARRAY_SIZE(pistachio_ext_gates));
+
+        pistachio_clk_register_provider(p);
+}
+CLK_OF_DECLARE(pistachio_cr_top, "img,pistachio-cr-top",
+               pistachio_cr_top_init);
diff --git a/drivers/clk/pistachio/clk-pll.c b/drivers/clk/pistachio/clk-pll.c
new file mode 100644
index 000000000000..de537560bf70
--- /dev/null
+++ b/drivers/clk/pistachio/clk-pll.c
@@ -0,0 +1,401 @@
+/*
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include "clk.h"
+
+#define PLL_STATUS                      0x0
+#define PLL_STATUS_LOCK                 BIT(0)
+
+#define PLL_CTRL1                       0x4
+#define PLL_CTRL1_REFDIV_SHIFT          0
+#define PLL_CTRL1_REFDIV_MASK           0x3f
+#define PLL_CTRL1_FBDIV_SHIFT           6
+#define PLL_CTRL1_FBDIV_MASK            0xfff
+#define PLL_INT_CTRL1_POSTDIV1_SHIFT    18
+#define PLL_INT_CTRL1_POSTDIV1_MASK     0x7
+#define PLL_INT_CTRL1_POSTDIV2_SHIFT    21
+#define PLL_INT_CTRL1_POSTDIV2_MASK     0x7
+#define PLL_INT_CTRL1_PD                BIT(24)
+#define PLL_INT_CTRL1_DSMPD             BIT(25)
+#define PLL_INT_CTRL1_FOUTPOSTDIVPD     BIT(26)
+#define PLL_INT_CTRL1_FOUTVCOPD         BIT(27)
+
+#define PLL_CTRL2                       0x8
+#define PLL_FRAC_CTRL2_FRAC_SHIFT       0
+#define PLL_FRAC_CTRL2_FRAC_MASK        0xffffff
+#define PLL_FRAC_CTRL2_POSTDIV1_SHIFT   24
+#define PLL_FRAC_CTRL2_POSTDIV1_MASK    0x7
+#define PLL_FRAC_CTRL2_POSTDIV2_SHIFT   27
+#define PLL_FRAC_CTRL2_POSTDIV2_MASK    0x7
+#define PLL_INT_CTRL2_BYPASS            BIT(28)
+
+#define PLL_CTRL3                       0xc
+#define PLL_FRAC_CTRL3_PD               BIT(0)
+#define PLL_FRAC_CTRL3_DACPD            BIT(1)
+#define PLL_FRAC_CTRL3_DSMPD            BIT(2)
+#define PLL_FRAC_CTRL3_FOUTPOSTDIVPD    BIT(3)
+#define PLL_FRAC_CTRL3_FOUT4PHASEPD     BIT(4)
+#define PLL_FRAC_CTRL3_FOUTVCOPD        BIT(5)
+
+#define PLL_CTRL4                       0x10
+#define PLL_FRAC_CTRL4_BYPASS           BIT(28)
+
+struct pistachio_clk_pll {
+        struct clk_hw hw;
+        void __iomem *base;
+        struct pistachio_pll_rate_table *rates;
+        unsigned int nr_rates;
+};
+
+static inline u32 pll_readl(struct pistachio_clk_pll *pll, u32 reg)
+{
+        return readl(pll->base + reg);
+}
+
+static inline void pll_writel(struct pistachio_clk_pll *pll, u32 val, u32 reg)
+{
+        writel(val, pll->base + reg);
+}
+
+static inline u32 do_div_round_closest(u64 dividend, u32 divisor)
+{
+        dividend += divisor / 2;
+        do_div(dividend, divisor);
+
+        return dividend;
+}
+
+static inline struct pistachio_clk_pll *to_pistachio_pll(struct clk_hw *hw)
+{
+        return container_of(hw, struct pistachio_clk_pll, hw);
+}
+
+static struct pistachio_pll_rate_table *
+pll_get_params(struct pistachio_clk_pll *pll, unsigned long fref,
+               unsigned long fout)
+{
+        unsigned int i;
+
+        for (i = 0; i < pll->nr_rates; i++) {
+                if (pll->rates[i].fref == fref && pll->rates[i].fout == fout)
+                        return &pll->rates[i];
+        }
+
+        return NULL;
+}
+
+static long pll_round_rate(struct clk_hw *hw, unsigned long rate,
+                           unsigned long *parent_rate)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        unsigned int i;
+
+        for (i = 0; i < pll->nr_rates; i++) {
+                if (i > 0 && pll->rates[i].fref == *parent_rate &&
+                    pll->rates[i].fout <= rate)
+                        return pll->rates[i - 1].fout;
+        }
+
+        return pll->rates[0].fout;
+}
+
+static int pll_gf40lp_frac_enable(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val;
+
+        val = pll_readl(pll, PLL_CTRL3);
+        val &= ~(PLL_FRAC_CTRL3_PD | PLL_FRAC_CTRL3_DACPD |
+                 PLL_FRAC_CTRL3_DSMPD | PLL_FRAC_CTRL3_FOUTPOSTDIVPD |
+                 PLL_FRAC_CTRL3_FOUT4PHASEPD | PLL_FRAC_CTRL3_FOUTVCOPD);
+        pll_writel(pll, val, PLL_CTRL3);
+
+        val = pll_readl(pll, PLL_CTRL4);
+        val &= ~PLL_FRAC_CTRL4_BYPASS;
+        pll_writel(pll, val, PLL_CTRL4);
+
+        return 0;
+}
+
+static void pll_gf40lp_frac_disable(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val;
+
+        val = pll_readl(pll, PLL_CTRL3);
+        val |= PLL_FRAC_CTRL3_PD;
+        pll_writel(pll, val, PLL_CTRL3);
+}
+
+static int pll_gf40lp_frac_is_enabled(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+
+        return !(pll_readl(pll, PLL_CTRL3) & PLL_FRAC_CTRL3_PD);
+}
+
+static int pll_gf40lp_frac_set_rate(struct clk_hw *hw, unsigned long rate,
+                                    unsigned long parent_rate)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        struct pistachio_pll_rate_table *params;
+        bool was_enabled;
+        u32 val;
+
+        params = pll_get_params(pll, parent_rate, rate);
+        if (!params)
+                return -EINVAL;
+
+        was_enabled = pll_gf40lp_frac_is_enabled(hw);
+        if (!was_enabled)
+                pll_gf40lp_frac_enable(hw);
+
+        val = pll_readl(pll, PLL_CTRL1);
+        val &= ~((PLL_CTRL1_REFDIV_MASK << PLL_CTRL1_REFDIV_SHIFT) |
+                 (PLL_CTRL1_FBDIV_MASK << PLL_CTRL1_FBDIV_SHIFT));
+        val |= (params->refdiv << PLL_CTRL1_REFDIV_SHIFT) |
+                (params->fbdiv << PLL_CTRL1_FBDIV_SHIFT);
+        pll_writel(pll, val, PLL_CTRL1);
+
+        val = pll_readl(pll, PLL_CTRL2);
+        val &= ~((PLL_FRAC_CTRL2_FRAC_MASK << PLL_FRAC_CTRL2_FRAC_SHIFT) |
+                 (PLL_FRAC_CTRL2_POSTDIV1_MASK <<
+                  PLL_FRAC_CTRL2_POSTDIV1_SHIFT) |
+                 (PLL_FRAC_CTRL2_POSTDIV2_MASK <<
+                  PLL_FRAC_CTRL2_POSTDIV2_SHIFT));
+        val |= (params->frac << PLL_FRAC_CTRL2_FRAC_SHIFT) |
+                (params->postdiv1 << PLL_FRAC_CTRL2_POSTDIV1_SHIFT) |
+                (params->postdiv2 << PLL_FRAC_CTRL2_POSTDIV2_SHIFT);
+        pll_writel(pll, val, PLL_CTRL2);
+
+        while (!(pll_readl(pll, PLL_STATUS) & PLL_STATUS_LOCK))
+                cpu_relax();
+
+        if (!was_enabled)
+                pll_gf40lp_frac_disable(hw);
+
+        return 0;
+}
+
+static unsigned long pll_gf40lp_frac_recalc_rate(struct clk_hw *hw,
+                                                 unsigned long parent_rate)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val, prediv, fbdiv, frac, postdiv1, postdiv2;
+        u64 rate = parent_rate;
+
+        val = pll_readl(pll, PLL_CTRL1);
+        prediv = (val >> PLL_CTRL1_REFDIV_SHIFT) & PLL_CTRL1_REFDIV_MASK;
+        fbdiv = (val >> PLL_CTRL1_FBDIV_SHIFT) & PLL_CTRL1_FBDIV_MASK;
+
+        val = pll_readl(pll, PLL_CTRL2);
+        postdiv1 = (val >> PLL_FRAC_CTRL2_POSTDIV1_SHIFT) &
+                PLL_FRAC_CTRL2_POSTDIV1_MASK;
+        postdiv2 = (val >> PLL_FRAC_CTRL2_POSTDIV2_SHIFT) &
+                PLL_FRAC_CTRL2_POSTDIV2_MASK;
+        frac = (val >> PLL_FRAC_CTRL2_FRAC_SHIFT) & PLL_FRAC_CTRL2_FRAC_MASK;
+
+        rate *= (fbdiv << 24) + frac;
+        rate = do_div_round_closest(rate, (prediv * postdiv1 * postdiv2) << 24);
+
+        return rate;
+}
+
+static struct clk_ops pll_gf40lp_frac_ops = {
+        .enable = pll_gf40lp_frac_enable,
+        .disable = pll_gf40lp_frac_disable,
+        .is_enabled = pll_gf40lp_frac_is_enabled,
+        .recalc_rate = pll_gf40lp_frac_recalc_rate,
+        .round_rate = pll_round_rate,
+        .set_rate = pll_gf40lp_frac_set_rate,
+};
+
+static struct clk_ops pll_gf40lp_frac_fixed_ops = {
+        .enable = pll_gf40lp_frac_enable,
+        .disable = pll_gf40lp_frac_disable,
+        .is_enabled = pll_gf40lp_frac_is_enabled,
+        .recalc_rate = pll_gf40lp_frac_recalc_rate,
+};
+
+static int pll_gf40lp_laint_enable(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val;
+
+        val = pll_readl(pll, PLL_CTRL1);
+        val &= ~(PLL_INT_CTRL1_PD | PLL_INT_CTRL1_DSMPD |
+                 PLL_INT_CTRL1_FOUTPOSTDIVPD | PLL_INT_CTRL1_FOUTVCOPD);
+        pll_writel(pll, val, PLL_CTRL1);
+
+        val = pll_readl(pll, PLL_CTRL2);
+        val &= ~PLL_INT_CTRL2_BYPASS;
+        pll_writel(pll, val, PLL_CTRL2);
+
+        return 0;
+}
+
+static void pll_gf40lp_laint_disable(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val;
+
+        val = pll_readl(pll, PLL_CTRL1);
+        val |= PLL_INT_CTRL1_PD;
+        pll_writel(pll, val, PLL_CTRL1);
+}
+
+static int pll_gf40lp_laint_is_enabled(struct clk_hw *hw)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+
+        return !(pll_readl(pll, PLL_CTRL1) & PLL_INT_CTRL1_PD);
+}
+
+static int pll_gf40lp_laint_set_rate(struct clk_hw *hw, unsigned long rate,
+                                     unsigned long parent_rate)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        struct pistachio_pll_rate_table *params;
+        bool was_enabled;
+        u32 val;
+
+        params = pll_get_params(pll, parent_rate, rate);
+        if (!params)
+                return -EINVAL;
+
+        was_enabled = pll_gf40lp_laint_is_enabled(hw);
+        if (!was_enabled)
+                pll_gf40lp_laint_enable(hw);
+
+        val = pll_readl(pll, PLL_CTRL1);
+        val &= ~((PLL_CTRL1_REFDIV_MASK << PLL_CTRL1_REFDIV_SHIFT) |
+                 (PLL_CTRL1_FBDIV_MASK << PLL_CTRL1_FBDIV_SHIFT) |
+                 (PLL_INT_CTRL1_POSTDIV1_MASK << PLL_INT_CTRL1_POSTDIV1_SHIFT) |
+                 (PLL_INT_CTRL1_POSTDIV2_MASK << PLL_INT_CTRL1_POSTDIV2_SHIFT));
+        val |= (params->refdiv << PLL_CTRL1_REFDIV_SHIFT) |
+                (params->fbdiv << PLL_CTRL1_FBDIV_SHIFT) |
+                (params->postdiv1 << PLL_INT_CTRL1_POSTDIV1_SHIFT) |
+                (params->postdiv2 << PLL_INT_CTRL1_POSTDIV2_SHIFT);
+        pll_writel(pll, val, PLL_CTRL1);
+
+        while (!(pll_readl(pll, PLL_STATUS) & PLL_STATUS_LOCK))
+                cpu_relax();
+
+        if (!was_enabled)
+                pll_gf40lp_laint_disable(hw);
+
+        return 0;
+}
+
+static unsigned long pll_gf40lp_laint_recalc_rate(struct clk_hw *hw,
+                                                  unsigned long parent_rate)
+{
+        struct pistachio_clk_pll *pll = to_pistachio_pll(hw);
+        u32 val, prediv, fbdiv, postdiv1, postdiv2;
+        u64 rate = parent_rate;
+
+        val = pll_readl(pll, PLL_CTRL1);
+        prediv = (val >> PLL_CTRL1_REFDIV_SHIFT) & PLL_CTRL1_REFDIV_MASK;
+        fbdiv = (val >> PLL_CTRL1_FBDIV_SHIFT) & PLL_CTRL1_FBDIV_MASK;
+        postdiv1 = (val >> PLL_INT_CTRL1_POSTDIV1_SHIFT) &
+                PLL_INT_CTRL1_POSTDIV1_MASK;
+        postdiv2 = (val >> PLL_INT_CTRL1_POSTDIV2_SHIFT) &
+                PLL_INT_CTRL1_POSTDIV2_MASK;
+
+        rate *= fbdiv;
+        rate = do_div_round_closest(rate, prediv * postdiv1 * postdiv2);
+
+        return rate;
+}
+
+static struct clk_ops pll_gf40lp_laint_ops = {
+        .enable = pll_gf40lp_laint_enable,
+        .disable = pll_gf40lp_laint_disable,
+        .is_enabled = pll_gf40lp_laint_is_enabled,
+        .recalc_rate = pll_gf40lp_laint_recalc_rate,
+        .round_rate = pll_round_rate,
+        .set_rate = pll_gf40lp_laint_set_rate,
+};
+
+static struct clk_ops pll_gf40lp_laint_fixed_ops = {
+        .enable = pll_gf40lp_laint_enable,
+        .disable = pll_gf40lp_laint_disable,
+        .is_enabled = pll_gf40lp_laint_is_enabled,
+        .recalc_rate = pll_gf40lp_laint_recalc_rate,
+};
+
+static struct clk *pll_register(const char *name, const char *parent_name,
+                                unsigned long flags, void __iomem *base,
+                                enum pistachio_pll_type type,
+                                struct pistachio_pll_rate_table *rates,
+                                unsigned int nr_rates)
+{
+        struct pistachio_clk_pll *pll;
+        struct clk_init_data init;
+        struct clk *clk;
+
+        pll = kzalloc(sizeof(*pll), GFP_KERNEL);
+        if (!pll)
+                return ERR_PTR(-ENOMEM);
+
+        init.name = name;
+        init.flags = flags | CLK_GET_RATE_NOCACHE;
+        init.parent_names = &parent_name;
+        init.num_parents = 1;
+
+        switch (type) {
+        case PLL_GF40LP_FRAC:
+                if (rates)
+                        init.ops = &pll_gf40lp_frac_ops;
+                else
+                        init.ops = &pll_gf40lp_frac_fixed_ops;
+                break;
+        case PLL_GF40LP_LAINT:
+                if (rates)
+                        init.ops = &pll_gf40lp_laint_ops;
+                else
+                        init.ops = &pll_gf40lp_laint_fixed_ops;
+                break;
+        default:
+                pr_err("Unrecognized PLL type %u\n", type);
+                kfree(pll);
+                return ERR_PTR(-EINVAL);
+        }
+
+        pll->hw.init = &init;
+        pll->base = base;
+        pll->rates = rates;
+        pll->nr_rates = nr_rates;
+
+        clk = clk_register(NULL, &pll->hw);
+        if (IS_ERR(clk))
+                kfree(pll);
+
+        return clk;
+}
+
+void pistachio_clk_register_pll(struct pistachio_clk_provider *p,
+                                struct pistachio_pll *pll,
+                                unsigned int num)
+{
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < num; i++) {
+                clk = pll_register(pll[i].name, pll[i].parent,
+                                   0, p->base + pll[i].reg_base,
+                                   pll[i].type, pll[i].rates,
+                                   pll[i].nr_rates);
+                p->clk_data.clks[pll[i].id] = clk;
+        }
+}
diff --git a/drivers/clk/pistachio/clk.c b/drivers/clk/pistachio/clk.c
new file mode 100644
index 000000000000..85faa83e1bd7
--- /dev/null
+++ b/drivers/clk/pistachio/clk.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/slab.h>
+
+#include "clk.h"
+
+struct pistachio_clk_provider *
+pistachio_clk_alloc_provider(struct device_node *node, unsigned int num_clks)
+{
+        struct pistachio_clk_provider *p;
+
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
+        if (!p)
+                return p;
+
+        p->clk_data.clks = kcalloc(num_clks, sizeof(struct clk *), GFP_KERNEL);
+        if (!p->clk_data.clks)
+                goto free_provider;
+        p->clk_data.clk_num = num_clks;
+        p->node = node;
+        p->base = of_iomap(node, 0);
+        if (!p->base) {
+                pr_err("Failed to map clock provider registers\n");
+                goto free_clks;
+        }
+
+        return p;
+
+free_clks:
+        kfree(p->clk_data.clks);
+free_provider:
+        kfree(p);
+        return NULL;
+}
+
+void pistachio_clk_register_provider(struct pistachio_clk_provider *p)
+{
+        unsigned int i;
+
+        for (i = 0; i < p->clk_data.clk_num; i++) {
+                if (IS_ERR(p->clk_data.clks[i]))
+                        pr_warn("Failed to register clock %d: %ld\n", i,
+                                PTR_ERR(p->clk_data.clks[i]));
+        }
+
+        of_clk_add_provider(p->node, of_clk_src_onecell_get, &p->clk_data);
+}
+
+void pistachio_clk_register_gate(struct pistachio_clk_provider *p,
+                                 struct pistachio_gate *gate,
+                                 unsigned int num)
+{
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < num; i++) {
+                clk = clk_register_gate(NULL, gate[i].name, gate[i].parent,
+                                        CLK_SET_RATE_PARENT,
+                                        p->base + gate[i].reg, gate[i].shift,
+                                        0, NULL);
+                p->clk_data.clks[gate[i].id] = clk;
+        }
+}
+
+void pistachio_clk_register_mux(struct pistachio_clk_provider *p,
+                                struct pistachio_mux *mux,
+                                unsigned int num)
+{
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < num; i++) {
+                clk = clk_register_mux(NULL, mux[i].name, mux[i].parents,
+                                       mux[i].num_parents,
+                                       CLK_SET_RATE_NO_REPARENT,
+                                       p->base + mux[i].reg, mux[i].shift,
+                                       get_count_order(mux[i].num_parents),
+                                       0, NULL);
+                p->clk_data.clks[mux[i].id] = clk;
+        }
+}
+
+void pistachio_clk_register_div(struct pistachio_clk_provider *p,
+                                struct pistachio_div *div,
+                                unsigned int num)
+{
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < num; i++) {
+                clk = clk_register_divider(NULL, div[i].name, div[i].parent,
+                                           0, p->base + div[i].reg, 0,
+                                           div[i].width, div[i].div_flags,
+                                           NULL);
+                p->clk_data.clks[div[i].id] = clk;
+        }
+}
+
+void pistachio_clk_register_fixed_factor(struct pistachio_clk_provider *p,
+                                         struct pistachio_fixed_factor *ff,
+                                         unsigned int num)
+{
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < num; i++) {
+                clk = clk_register_fixed_factor(NULL, ff[i].name, ff[i].parent,
+                                                0, 1, ff[i].div);
+                p->clk_data.clks[ff[i].id] = clk;
+        }
+}
+
+void pistachio_clk_force_enable(struct pistachio_clk_provider *p,
+                                unsigned int *clk_ids, unsigned int num)
+{
+        unsigned int i;
+        int err;
+
+        for (i = 0; i < num; i++) {
+                struct clk *clk = p->clk_data.clks[clk_ids[i]];
+
+                if (IS_ERR(clk))
+                        continue;
+
+                err = clk_prepare_enable(clk);
+                if (err)
+                        pr_err("Failed to enable clock %s: %d\n",
+                               __clk_get_name(clk), err);
+        }
+}
diff --git a/drivers/clk/pistachio/clk.h b/drivers/clk/pistachio/clk.h
new file mode 100644
index 000000000000..52fabbc24624
--- /dev/null
+++ b/drivers/clk/pistachio/clk.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __PISTACHIO_CLK_H
+#define __PISTACHIO_CLK_H
+
+#include <linux/clk-provider.h>
+
+struct pistachio_gate {
+        unsigned int id;
+        unsigned long reg;
+        unsigned int shift;
+        const char *name;
+        const char *parent;
+};
+
+#define GATE(_id, _name, _pname, _reg, _shift)  \
+        {                                       \
+                .id     = _id,                  \
+                .reg    = _reg,                 \
+                .shift  = _shift,               \
+                .name   = _name,                \
+                .parent = _pname,               \
+        }
+
+struct pistachio_mux {
+        unsigned int id;
+        unsigned long reg;
+        unsigned int shift;
+        unsigned int num_parents;
+        const char *name;
+        const char **parents;
+};
+
+#define PNAME(x) static const char *x[] __initconst
+
+#define MUX(_id, _name, _pnames, _reg, _shift)                  \
+        {                                                       \
+                .id             = _id,                          \
+                .reg            = _reg,                         \
+                .shift          = _shift,                       \
+                .name           = _name,                        \
+                .parents        = _pnames,                      \
+                .num_parents    = ARRAY_SIZE(_pnames)           \
+        }
+
+
+struct pistachio_div {
+        unsigned int id;
+        unsigned long reg;
+        unsigned int width;
+        unsigned int div_flags;
+        const char *name;
+        const char *parent;
+};
+
+#define DIV(_id, _name, _pname, _reg, _width)                   \
+        {                                                       \
+                .id             = _id,                          \
+                .reg            = _reg,                         \
+                .width          = _width,                       \
+                .div_flags      = 0,                            \
+                .name           = _name,                        \
+                .parent         = _pname,                       \
+        }
+
+#define DIV_F(_id, _name, _pname, _reg, _width, _div_flags)     \
+        {                                                       \
+                .id             = _id,                          \
+                .reg            = _reg,                         \
+                .width          = _width,                       \
+                .div_flags      = _div_flags,                   \
+                .name           = _name,                        \
+                .parent         = _pname,                       \
+        }
+
+struct pistachio_fixed_factor {
+        unsigned int id;
+        unsigned int div;
+        const char *name;
+        const char *parent;
+};
+
+#define FIXED_FACTOR(_id, _name, _pname, _div)                  \
+        {                                                       \
+                .id             = _id,                          \
+                .div            = _div,                         \
+                .name           = _name,                        \
+                .parent         = _pname,                       \
+        }
+
+struct pistachio_pll_rate_table {
+        unsigned long fref;
+        unsigned long fout;
+        unsigned int refdiv;
+        unsigned int fbdiv;
+        unsigned int postdiv1;
+        unsigned int postdiv2;
+        unsigned int frac;
+};
+
+enum pistachio_pll_type {
+        PLL_GF40LP_LAINT,
+        PLL_GF40LP_FRAC,
+};
+
+struct pistachio_pll {
+        unsigned int id;
+        unsigned long reg_base;
+        enum pistachio_pll_type type;
+        struct pistachio_pll_rate_table *rates;
+        unsigned int nr_rates;
+        const char *name;
+        const char *parent;
+};
+
+#define PLL(_id, _name, _pname, _type, _reg, _rates)            \
+        {                                                       \
+                .id             = _id,                          \
+                .reg_base       = _reg,                         \
+                .type           = _type,                        \
+                .rates          = _rates,                       \
+                .nr_rates       = ARRAY_SIZE(_rates),           \
+                .name           = _name,                        \
+                .parent         = _pname,                       \
+        }
+
+#define PLL_FIXED(_id, _name, _pname, _type, _reg)              \
+        {                                                       \
+                .id             = _id,                          \
+                .reg_base       = _reg,                         \
+                .type           = _type,                        \
+                .rates          = NULL,                         \
+                .nr_rates       = 0,                            \
+                .name           = _name,                        \
+                .parent         = _pname,                       \
+        }
+
+struct pistachio_clk_provider {
+        struct device_node *node;
+        void __iomem *base;
+        struct clk_onecell_data clk_data;
+};
+
+extern struct pistachio_clk_provider *
+pistachio_clk_alloc_provider(struct device_node *node, unsigned int num_clks);
+extern void pistachio_clk_register_provider(struct pistachio_clk_provider *p);
+
+extern void pistachio_clk_register_gate(struct pistachio_clk_provider *p,
+                                        struct pistachio_gate *gate,
+                                        unsigned int num);
+extern void pistachio_clk_register_mux(struct pistachio_clk_provider *p,
+                                       struct pistachio_mux *mux,
+                                       unsigned int num);
+extern void pistachio_clk_register_div(struct pistachio_clk_provider *p,
+                                       struct pistachio_div *div,
+                                       unsigned int num);
+extern void
+pistachio_clk_register_fixed_factor(struct pistachio_clk_provider *p,
+                                    struct pistachio_fixed_factor *ff,
+                                    unsigned int num);
+extern void pistachio_clk_register_pll(struct pistachio_clk_provider *p,
+                                       struct pistachio_pll *pll,
+                                       unsigned int num);
+
+extern void pistachio_clk_force_enable(struct pistachio_clk_provider *p,
+                                       unsigned int *clk_ids, unsigned int num);
+
+#endif
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index a0b036ccb118..b4ac7cfae441 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -233,7 +233,7 @@ config CLKSRC_QCOM
 
 config CLKSRC_VERSATILE
         bool "ARM Versatile (Express) reference platforms clock source"
-        depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
+        depends on PLAT_VERSATILE && GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
         select CLKSRC_OF
         default y if MFD_VEXPRESS_SYSREG
         help
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 3bd31b1321f6..b81ed1a5342d 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
+#include <linux/clk.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
 #include <linux/init.h>
@@ -133,6 +134,9 @@ static void __init __gic_clocksource_init(void)
         clocksource_register_hz(&gic_clocksource, gic_frequency);
 
         gic_clockevent_init();
+
+        /* And finally start the counter */
+        gic_start_count();
 }
 
 void __init gic_clocksource_init(unsigned int frequency)
@@ -146,11 +150,18 @@ void __init gic_clocksource_init(unsigned int frequency)
 
 static void __init gic_clocksource_of_init(struct device_node *node)
 {
+        struct clk *clk;
+
         if (WARN_ON(!gic_present || !node->parent ||
                     !of_device_is_compatible(node->parent, "mti,gic")))
                 return;
 
-        if (of_property_read_u32(node, "clock-frequency", &gic_frequency)) {
+        clk = of_clk_get(node, 0);
+        if (!IS_ERR(clk)) {
+                gic_frequency = clk_get_rate(clk);
+                clk_put(clk);
+        } else if (of_property_read_u32(node, "clock-frequency",
+                                        &gic_frequency)) {
                 pr_err("GIC frequency not specified.\n");
                 return;
         }
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 40580794e23d..b8a5fa15ca24 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -190,12 +190,6 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
 static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev);
 
-/* This implements DIV_ROUND_CLOSEST but avoids 64 bit division */
-static u64 div_round64(u64 dividend, u32 divisor)
-{
-        return div_u64(dividend + (divisor / 2), divisor);
-}
-
 /*
  * Try detecting repeating patterns by keeping track of the last 8
  * intervals, and checking if the standard deviation of that set
@@ -317,7 +311,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
          * operands are 32 bits.
          * Make sure to round up for half microseconds.
          */
-        data->predicted_us = div_round64((uint64_t)data->next_timer_us *
+        data->predicted_us = DIV_ROUND_CLOSEST_ULL((uint64_t)data->next_timer_us *
                                          data->correction_factor[data->bucket],
                                          RESOLUTION * DECAY);
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index eef79ccd0b7c..ba243db35840 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -36,9 +36,6 @@
 #include <drm/drm_dp_mst_helper.h>
 #include <drm/drm_rect.h>
 
-#define DIV_ROUND_CLOSEST_ULL(ll, d)    \
-({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })
-
 /**
  * _wait_for - magic (register) wait macro
  *
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index d8686ce89160..08532d4ffe0a 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -30,6 +30,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include "intel_drv.h"
 
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index d1542b7d4bc3..4d2815079fc2 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -36,6 +36,7 @@
 #include <linux/jiffies.h>
 #include <linux/of.h>
 #include <linux/delay.h>
+#include <linux/util_macros.h>
 
 #include <linux/platform_data/ina2xx.h>
 
@@ -141,19 +142,6 @@ static const struct ina2xx_config ina2xx_config[] = {
  */
 static const int ina226_avg_tab[] = { 1, 4, 16, 64, 128, 256, 512, 1024 };
 
-static int ina226_avg_bits(int avg)
-{
-        int i;
-
-        /* Get the closest average from the tab. */
-        for (i = 0; i < ARRAY_SIZE(ina226_avg_tab) - 1; i++) {
-                if (avg <= (ina226_avg_tab[i] + ina226_avg_tab[i + 1]) / 2)
-                        break;
-        }
-
-        return i; /* Return 0b0111 for values greater than 1024. */
-}
-
 static int ina226_reg_to_interval(u16 config)
 {
         int avg = ina226_avg_tab[INA226_READ_AVG(config)];
@@ -171,7 +159,8 @@ static u16 ina226_interval_to_reg(int interval, u16 config)
 
         avg = DIV_ROUND_CLOSEST(interval * 1000,
                                 INA226_TOTAL_CONV_TIME_DEFAULT);
-        avg_bits = ina226_avg_bits(avg);
+        avg_bits = find_closest(avg, ina226_avg_tab,
+                                ARRAY_SIZE(ina226_avg_tab));
 
         return (config & ~INA226_AVG_RD_MASK) | INA226_SHIFT_AVG(avg_bits);
 }
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 2b4b419273fe..6ff773fcaefb 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -34,6 +34,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/util_macros.h>
 
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -190,15 +191,7 @@ static const int lm85_range_map[] = {
 
 static int RANGE_TO_REG(long range)
 {
-        int i;
-
-        /* Find the closest match */
-        for (i = 0; i < 15; ++i) {
-                if (range <= (lm85_range_map[i] + lm85_range_map[i + 1]) / 2)
-                        break;
-        }
-
-        return i;
+        return find_closest(range, lm85_range_map, ARRAY_SIZE(lm85_range_map));
 }
 #define RANGE_FROM_REG(val)     lm85_range_map[(val) & 0x0f]
 
@@ -209,16 +202,12 @@ static const int lm85_freq_map[8] = { /* 1 Hz */
 static const int adm1027_freq_map[8] = { /* 1 Hz */
         11, 15, 22, 29, 35, 44, 59, 88
 };
+#define FREQ_MAP_LEN    8
 
-static int FREQ_TO_REG(const int *map, unsigned long freq)
+static int FREQ_TO_REG(const int *map,
+                       unsigned int map_size, unsigned long freq)
 {
-        int i;
-
-        /* Find the closest match */
-        for (i = 0; i < 7; ++i)
-                if (freq <= (map[i] + map[i + 1]) / 2)
-                        break;
-        return i;
+        return find_closest(freq, map, map_size);
 }
 
 static int FREQ_FROM_REG(const int *map, u8 reg)
@@ -828,7 +817,8 @@ static ssize_t set_pwm_freq(struct device *dev,
                 data->cfg5 &= ~ADT7468_HFPWM;
                 lm85_write_value(client, ADT7468_REG_CFG5, data->cfg5);
         } else {                                        /* Low freq. mode */
-                data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map, val);
+                data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map,
+                                                 FREQ_MAP_LEN, val);
                 lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),
                                  (data->zone[nr].range << 4)
                                  | data->pwm_freq[nr]);
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index 21894131190f..49276bbdac3d 100644
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -35,6 +35,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/jiffies.h>
+#include <linux/util_macros.h>
 
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = {
@@ -308,11 +309,8 @@ static u8 pwm_freq_to_reg(unsigned long val, u16 clkin)
         unsigned long best0, best1;
 
         /* Best fit for cksel = 0 */
-        for (reg0 = 0; reg0 < ARRAY_SIZE(pwm_freq_cksel0) - 1; reg0++) {
-                if (val > (pwm_freq_cksel0[reg0] +
-                           pwm_freq_cksel0[reg0 + 1]) / 2)
-                        break;
-        }
+        reg0 = find_closest_descending(val, pwm_freq_cksel0,
+                                       ARRAY_SIZE(pwm_freq_cksel0));
         if (val < 375)  /* cksel = 1 can't beat this */
                 return reg0;
         best0 = pwm_freq_cksel0[reg0];
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index c8d260e33a90..6de62a96e79c 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -60,6 +60,11 @@ config ATMEL_AIC5_IRQ
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
 
+config BCM7038_L1_IRQ
+        bool
+        select GENERIC_IRQ_CHIP
+        select IRQ_DOMAIN
+
 config BCM7120_L2_IRQ
         bool
         select GENERIC_IRQ_CHIP
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 552a74027601..dda4927e47a6 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_XTENSA)			+= irq-xtensa-pic.o
 obj-$(CONFIG_XTENSA_MX)                 += irq-xtensa-mx.o
 obj-$(CONFIG_IRQ_CROSSBAR)              += irq-crossbar.o
 obj-$(CONFIG_SOC_VF610)                 += irq-vf610-mscm-ir.o
+obj-$(CONFIG_BCM7038_L1_IRQ)            += irq-bcm7038-l1.o
 obj-$(CONFIG_BCM7120_L2_IRQ)            += irq-bcm7120-l2.o
 obj-$(CONFIG_BRCMSTB_L2_IRQ)            += irq-brcmstb-l2.o
 obj-$(CONFIG_KEYSTONE_IRQ)              += irq-keystone.o
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
new file mode 100644
index 000000000000..d3b8c8be15f6
--- /dev/null
+++ b/drivers/irqchip/irq-bcm7038-l1.c
@@ -0,0 +1,335 @@
+/*
+ * Broadcom BCM7038 style Level 1 interrupt controller driver
+ *
+ * Copyright (C) 2014 Broadcom Corporation
+ * Author: Kevin Cernekee
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt)     KBUILD_MODNAME  ": " fmt
+
+#include <linux/bitops.h>
+#include <linux/kconfig.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+#include <linux/types.h>
+#include <linux/irqchip/chained_irq.h>
+
+#include "irqchip.h"
+
+#define IRQS_PER_WORD           32
+#define REG_BYTES_PER_IRQ_WORD  (sizeof(u32) * 4)
+#define MAX_WORDS               8
+
+struct bcm7038_l1_cpu;
+
+struct bcm7038_l1_chip {
+        raw_spinlock_t          lock;
+        unsigned int            n_words;
+        struct irq_domain       *domain;
+        struct bcm7038_l1_cpu   *cpus[NR_CPUS];
+        u8                      affinity[MAX_WORDS * IRQS_PER_WORD];
+};
+
+struct bcm7038_l1_cpu {
+        void __iomem            *map_base;
+        u32                     mask_cache[0];
+};
+
+/*
+ * STATUS/MASK_STATUS/MASK_SET/MASK_CLEAR are packed one right after another:
+ *
+ * 7038:
+ *   0x1000_1400: W0_STATUS
+ *   0x1000_1404: W1_STATUS
+ *   0x1000_1408: W0_MASK_STATUS
+ *   0x1000_140c: W1_MASK_STATUS
+ *   0x1000_1410: W0_MASK_SET
+ *   0x1000_1414: W1_MASK_SET
+ *   0x1000_1418: W0_MASK_CLEAR
+ *   0x1000_141c: W1_MASK_CLEAR
+ *
+ * 7445:
+ *   0xf03e_1500: W0_STATUS
+ *   0xf03e_1504: W1_STATUS
+ *   0xf03e_1508: W2_STATUS
+ *   0xf03e_150c: W3_STATUS
+ *   0xf03e_1510: W4_STATUS
+ *   0xf03e_1514: W0_MASK_STATUS
+ *   0xf03e_1518: W1_MASK_STATUS
+ *   [...]
+ */
+
+static inline unsigned int reg_status(struct bcm7038_l1_chip *intc,
+                                      unsigned int word)
+{
+        return (0 * intc->n_words + word) * sizeof(u32);
+}
+
+static inline unsigned int reg_mask_status(struct bcm7038_l1_chip *intc,
+                                           unsigned int word)
+{
+        return (1 * intc->n_words + word) * sizeof(u32);
+}
+
+static inline unsigned int reg_mask_set(struct bcm7038_l1_chip *intc,
+                                        unsigned int word)
+{
+        return (2 * intc->n_words + word) * sizeof(u32);
+}
+
+static inline unsigned int reg_mask_clr(struct bcm7038_l1_chip *intc,
+                                        unsigned int word)
+{
+        return (3 * intc->n_words + word) * sizeof(u32);
+}
+
+static inline u32 l1_readl(void __iomem *reg)
+{
+        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
+                return ioread32be(reg);
+        else
+                return readl(reg);
+}
+
+static inline void l1_writel(u32 val, void __iomem *reg)
+{
+        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
+                iowrite32be(val, reg);
+        else
+                writel(val, reg);
+}
+
+static void bcm7038_l1_irq_handle(unsigned int irq, struct irq_desc *desc)
+{
+        struct bcm7038_l1_chip *intc = irq_desc_get_handler_data(desc);
+        struct bcm7038_l1_cpu *cpu;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        unsigned int idx;
+
+#ifdef CONFIG_SMP
+        cpu = intc->cpus[cpu_logical_map(smp_processor_id())];
+#else
+        cpu = intc->cpus[0];
+#endif
+
+        chained_irq_enter(chip, desc);
+
+        for (idx = 0; idx < intc->n_words; idx++) {
+                int base = idx * IRQS_PER_WORD;
+                unsigned long pending, flags;
+                int hwirq;
+
+                raw_spin_lock_irqsave(&intc->lock, flags);
+                pending = l1_readl(cpu->map_base + reg_status(intc, idx)) &
+                          ~cpu->mask_cache[idx];
+                raw_spin_unlock_irqrestore(&intc->lock, flags);
+
+                for_each_set_bit(hwirq, &pending, IRQS_PER_WORD) {
+                        generic_handle_irq(irq_find_mapping(intc->domain,
+                                                            base + hwirq));
+                }
+        }
+
+        chained_irq_exit(chip, desc);
+}
+
+static void __bcm7038_l1_unmask(struct irq_data *d, unsigned int cpu_idx)
+{
+        struct bcm7038_l1_chip *intc = irq_data_get_irq_chip_data(d);
+        u32 word = d->hwirq / IRQS_PER_WORD;
+        u32 mask = BIT(d->hwirq % IRQS_PER_WORD);
+
+        intc->cpus[cpu_idx]->mask_cache[word] &= ~mask;
+        l1_writel(mask, intc->cpus[cpu_idx]->map_base +
+                        reg_mask_clr(intc, word));
+}
+
+static void __bcm7038_l1_mask(struct irq_data *d, unsigned int cpu_idx)
+{
+        struct bcm7038_l1_chip *intc = irq_data_get_irq_chip_data(d);
+        u32 word = d->hwirq / IRQS_PER_WORD;
+        u32 mask = BIT(d->hwirq % IRQS_PER_WORD);
+
+        intc->cpus[cpu_idx]->mask_cache[word] |= mask;
+        l1_writel(mask, intc->cpus[cpu_idx]->map_base +
+                        reg_mask_set(intc, word));
+}
+
+static void bcm7038_l1_unmask(struct irq_data *d)
+{
+        struct bcm7038_l1_chip *intc = irq_data_get_irq_chip_data(d);
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&intc->lock, flags);
+        __bcm7038_l1_unmask(d, intc->affinity[d->hwirq]);
+        raw_spin_unlock_irqrestore(&intc->lock, flags);
+}
+
+static void bcm7038_l1_mask(struct irq_data *d)
+{
+        struct bcm7038_l1_chip *intc = irq_data_get_irq_chip_data(d);
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&intc->lock, flags);
+        __bcm7038_l1_mask(d, intc->affinity[d->hwirq]);
+        raw_spin_unlock_irqrestore(&intc->lock, flags);
+}
+
+static int bcm7038_l1_set_affinity(struct irq_data *d,
+                                   const struct cpumask *dest,
+                                   bool force)
+{
+        struct bcm7038_l1_chip *intc = irq_data_get_irq_chip_data(d);
+        unsigned long flags;
+        irq_hw_number_t hw = d->hwirq;
+        u32 word = hw / IRQS_PER_WORD;
+        u32 mask = BIT(hw % IRQS_PER_WORD);
+        unsigned int first_cpu = cpumask_any_and(dest, cpu_online_mask);
+        bool was_disabled;
+
+        raw_spin_lock_irqsave(&intc->lock, flags);
+
+        was_disabled = !!(intc->cpus[intc->affinity[hw]]->mask_cache[word] &
+                          mask);
+        __bcm7038_l1_mask(d, intc->affinity[hw]);
+        intc->affinity[hw] = first_cpu;
+        if (!was_disabled)
+                __bcm7038_l1_unmask(d, first_cpu);
+
+        raw_spin_unlock_irqrestore(&intc->lock, flags);
+        return 0;
+}
+
+static int __init bcm7038_l1_init_one(struct device_node *dn,
+                                      unsigned int idx,
+                                      struct bcm7038_l1_chip *intc)
+{
+        struct resource res;
+        resource_size_t sz;
+        struct bcm7038_l1_cpu *cpu;
+        unsigned int i, n_words, parent_irq;
+
+        if (of_address_to_resource(dn, idx, &res))
+                return -EINVAL;
+        sz = resource_size(&res);
+        n_words = sz / REG_BYTES_PER_IRQ_WORD;
+
+        if (n_words > MAX_WORDS)
+                return -EINVAL;
+        else if (!intc->n_words)
+                intc->n_words = n_words;
+        else if (intc->n_words != n_words)
+                return -EINVAL;
+
+        cpu = intc->cpus[idx] = kzalloc(sizeof(*cpu) + n_words * sizeof(u32),
+                                        GFP_KERNEL);
+        if (!cpu)
+                return -ENOMEM;
+
+        cpu->map_base = ioremap(res.start, sz);
+        if (!cpu->map_base)
+                return -ENOMEM;
+
+        for (i = 0; i < n_words; i++) {
+                l1_writel(0xffffffff, cpu->map_base + reg_mask_set(intc, i));
+                cpu->mask_cache[i] = 0xffffffff;
+        }
+
+        parent_irq = irq_of_parse_and_map(dn, idx);
+        if (!parent_irq) {
+                pr_err("failed to map parent interrupt %d\n", parent_irq);
+                return -EINVAL;
+        }
+        irq_set_handler_data(parent_irq, intc);
+        irq_set_chained_handler(parent_irq, bcm7038_l1_irq_handle);
+
+        return 0;
+}
+
+static struct irq_chip bcm7038_l1_irq_chip = {
+        .name                   = "bcm7038-l1",
+        .irq_mask               = bcm7038_l1_mask,
+        .irq_unmask             = bcm7038_l1_unmask,
+        .irq_set_affinity       = bcm7038_l1_set_affinity,
+};
+
+static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,
+                          irq_hw_number_t hw_irq)
+{
+        irq_set_chip_and_handler(virq, &bcm7038_l1_irq_chip, handle_level_irq);
+        irq_set_chip_data(virq, d->host_data);
+        return 0;
+}
+
+static const struct irq_domain_ops bcm7038_l1_domain_ops = {
+        .xlate                  = irq_domain_xlate_onecell,
+        .map                    = bcm7038_l1_map,
+};
+
+int __init bcm7038_l1_of_init(struct device_node *dn,
+                              struct device_node *parent)
+{
+        struct bcm7038_l1_chip *intc;
+        int idx, ret;
+
+        intc = kzalloc(sizeof(*intc), GFP_KERNEL);
+        if (!intc)
+                return -ENOMEM;
+
+        raw_spin_lock_init(&intc->lock);
+        for_each_possible_cpu(idx) {
+                ret = bcm7038_l1_init_one(dn, idx, intc);
+                if (ret < 0) {
+                        if (idx)
+                                break;
+                        pr_err("failed to remap intc L1 registers\n");
+                        goto out_free;
+                }
+        }
+
+        intc->domain = irq_domain_add_linear(dn, IRQS_PER_WORD * intc->n_words,
+                                             &bcm7038_l1_domain_ops,
+                                             intc);
+        if (!intc->domain) {
+                ret = -ENOMEM;
+                goto out_unmap;
+        }
+
+        pr_info("registered BCM7038 L1 intc (mem: 0x%p, IRQs: %d)\n",
+                intc->cpus[0]->map_base, IRQS_PER_WORD * intc->n_words);
+
+        return 0;
+
+out_unmap:
+        for_each_possible_cpu(idx) {
+                struct bcm7038_l1_cpu *cpu = intc->cpus[idx];
+
+                if (cpu) {
+                        if (cpu->map_base)
+                                iounmap(cpu->map_base);
+                        kfree(cpu);
+                }
+        }
+out_free:
+        kfree(intc);
+        return ret;
+}
+
+IRQCHIP_DECLARE(bcm7038_l1, "brcm,bcm7038-l1-intc", bcm7038_l1_of_init);
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index 8eec8e1201d9..3ba5cc780fcb 100644
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kconfig.h>
+#include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
@@ -34,15 +35,21 @@
 #define IRQSTAT         0x04
 
 #define MAX_WORDS       4
+#define MAX_MAPPINGS    (MAX_WORDS * 2)
 #define IRQS_PER_WORD   32
 
 struct bcm7120_l2_intc_data {
         unsigned int n_words;
-        void __iomem *base[MAX_WORDS];
+        void __iomem *map_base[MAX_MAPPINGS];
+        void __iomem *pair_base[MAX_WORDS];
+        int en_offset[MAX_WORDS];
+        int stat_offset[MAX_WORDS];
         struct irq_domain *domain;
         bool can_wake;
         u32 irq_fwd_mask[MAX_WORDS];
         u32 irq_map_mask[MAX_WORDS];
+        int num_parent_irqs;
+        const __be32 *map_mask_prop;
 };
 
 static void bcm7120_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
@@ -61,7 +68,8 @@ static void bcm7120_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
                 int hwirq;
 
                 irq_gc_lock(gc);
-                pending = irq_reg_readl(gc, IRQSTAT) & gc->mask_cache;
+                pending = irq_reg_readl(gc, b->stat_offset[idx]) &
+                                            gc->mask_cache;
                 irq_gc_unlock(gc);
 
                 for_each_set_bit(hwirq, &pending, IRQS_PER_WORD) {
@@ -76,27 +84,30 @@ static void bcm7120_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
 static void bcm7120_l2_intc_suspend(struct irq_data *d)
 {
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct irq_chip_type *ct = irq_data_get_chip_type(d);
         struct bcm7120_l2_intc_data *b = gc->private;
 
         irq_gc_lock(gc);
         if (b->can_wake)
-                irq_reg_writel(gc, gc->mask_cache | gc->wake_active, IRQEN);
+                irq_reg_writel(gc, gc->mask_cache | gc->wake_active,
+                               ct->regs.mask);
         irq_gc_unlock(gc);
 }
 
 static void bcm7120_l2_intc_resume(struct irq_data *d)
 {
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct irq_chip_type *ct = irq_data_get_chip_type(d);
 
         /* Restore the saved mask */
         irq_gc_lock(gc);
-        irq_reg_writel(gc, gc->mask_cache, IRQEN);
+        irq_reg_writel(gc, gc->mask_cache, ct->regs.mask);
         irq_gc_unlock(gc);
 }
 
 static int bcm7120_l2_intc_init_one(struct device_node *dn,
                                         struct bcm7120_l2_intc_data *data,
-                                        int irq, const __be32 *map_mask)
+                                        int irq)
 {
         int parent_irq;
         unsigned int idx;
@@ -110,9 +121,15 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
         /* For multiple parent IRQs with multiple words, this looks like:
          * <irq0_w0 irq0_w1 irq1_w0 irq1_w1 ...>
          */
-        for (idx = 0; idx < data->n_words; idx++)
-                data->irq_map_mask[idx] |=
-                        be32_to_cpup(map_mask + irq * data->n_words + idx);
+        for (idx = 0; idx < data->n_words; idx++) {
+                if (data->map_mask_prop) {
+                        data->irq_map_mask[idx] |=
+                                be32_to_cpup(data->map_mask_prop +
+                                             irq * data->n_words + idx);
+                } else {
+                        data->irq_map_mask[idx] = 0xffffffff;
+                }
+        }
 
         irq_set_handler_data(parent_irq, data);
         irq_set_chained_handler(parent_irq, bcm7120_l2_intc_irq_handle);
@@ -120,68 +137,107 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
         return 0;
 }
 
-int __init bcm7120_l2_intc_of_init(struct device_node *dn,
-                                        struct device_node *parent)
+static int __init bcm7120_l2_intc_iomap_7120(struct device_node *dn,
+                                             struct bcm7120_l2_intc_data *data)
+{
+        int ret;
+
+        data->map_base[0] = of_iomap(dn, 0);
+        if (!data->map_base[0]) {
+                pr_err("unable to map registers\n");
+                return -ENOMEM;
+        }
+
+        data->pair_base[0] = data->map_base[0];
+        data->en_offset[0] = IRQEN;
+        data->stat_offset[0] = IRQSTAT;
+        data->n_words = 1;
+
+        ret = of_property_read_u32_array(dn, "brcm,int-fwd-mask",
+                                         data->irq_fwd_mask, data->n_words);
+        if (ret != 0 && ret != -EINVAL) {
+                /* property exists but has the wrong number of words */
+                pr_err("invalid brcm,int-fwd-mask property\n");
+                return -EINVAL;
+        }
+
+        data->map_mask_prop = of_get_property(dn, "brcm,int-map-mask", &ret);
+        if (!data->map_mask_prop ||
+            (ret != (sizeof(__be32) * data->num_parent_irqs * data->n_words))) {
+                pr_err("invalid brcm,int-map-mask property\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn,
+                                             struct bcm7120_l2_intc_data *data)
+{
+        unsigned int gc_idx;
+
+        for (gc_idx = 0; gc_idx < MAX_WORDS; gc_idx++) {
+                unsigned int map_idx = gc_idx * 2;
+                void __iomem *en = of_iomap(dn, map_idx + 0);
+                void __iomem *stat = of_iomap(dn, map_idx + 1);
+                void __iomem *base = min(en, stat);
+
+                data->map_base[map_idx + 0] = en;
+                data->map_base[map_idx + 1] = stat;
+
+                if (!base)
+                        break;
+
+                data->pair_base[gc_idx] = base;
+                data->en_offset[gc_idx] = en - base;
+                data->stat_offset[gc_idx] = stat - base;
+        }
+
+        if (!gc_idx) {
+                pr_err("unable to map registers\n");
+                return -EINVAL;
+        }
+
+        data->n_words = gc_idx;
+        return 0;
+}
+
+int __init bcm7120_l2_intc_probe(struct device_node *dn,
+                                 struct device_node *parent,
+                                 int (*iomap_regs_fn)(struct device_node *,
+                                        struct bcm7120_l2_intc_data *),
+                                 const char *intc_name)
 {
         unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
         struct bcm7120_l2_intc_data *data;
         struct irq_chip_generic *gc;
         struct irq_chip_type *ct;
-        const __be32 *map_mask;
-        int num_parent_irqs;
-        int ret = 0, len;
+        int ret = 0;
         unsigned int idx, irq, flags;
 
         data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
-        for (idx = 0; idx < MAX_WORDS; idx++) {
-                data->base[idx] = of_iomap(dn, idx);
-                if (!data->base[idx])
-                        break;
-                data->n_words = idx + 1;
-        }
-        if (!data->n_words) {
-                pr_err("failed to remap intc L2 registers\n");
-                ret = -ENOMEM;
-                goto out_unmap;
-        }
-
-        /* Enable all interrupts specified in the interrupt forward mask;
-         * disable all others.  If the property doesn't exist (-EINVAL),
-         * assume all zeroes.
-         */
-        ret = of_property_read_u32_array(dn, "brcm,int-fwd-mask",
-                                         data->irq_fwd_mask, data->n_words);
-        if (ret == 0 || ret == -EINVAL) {
-                for (idx = 0; idx < data->n_words; idx++)
-                        __raw_writel(data->irq_fwd_mask[idx],
-                                     data->base[idx] + IRQEN);
-        } else {
-                /* property exists but has the wrong number of words */
-                pr_err("invalid int-fwd-mask property\n");
-                ret = -EINVAL;
-                goto out_unmap;
-        }
-
-        num_parent_irqs = of_irq_count(dn);
-        if (num_parent_irqs <= 0) {
+        data->num_parent_irqs = of_irq_count(dn);
+        if (data->num_parent_irqs <= 0) {
                 pr_err("invalid number of parent interrupts\n");
                 ret = -ENOMEM;
                 goto out_unmap;
         }
 
-        map_mask = of_get_property(dn, "brcm,int-map-mask", &len);
-        if (!map_mask ||
-            (len != (sizeof(*map_mask) * num_parent_irqs * data->n_words))) {
-                pr_err("invalid brcm,int-map-mask property\n");
-                ret = -EINVAL;
+        ret = iomap_regs_fn(dn, data);
+        if (ret < 0)
                 goto out_unmap;
+
+        for (idx = 0; idx < data->n_words; idx++) {
+                __raw_writel(data->irq_fwd_mask[idx],
+                             data->pair_base[idx] +
+                             data->en_offset[idx]);
         }
 
-        for (irq = 0; irq < num_parent_irqs; irq++) {
-                ret = bcm7120_l2_intc_init_one(dn, data, irq, map_mask);
+        for (irq = 0; irq < data->num_parent_irqs; irq++) {
+                ret = bcm7120_l2_intc_init_one(dn, data, irq);
                 if (ret)
                         goto out_unmap;
         }
@@ -215,11 +271,12 @@ int __init bcm7120_l2_intc_of_init(struct device_node *dn,
                 gc = irq_get_domain_generic_chip(data->domain, irq);
 
                 gc->unused = 0xffffffff & ~data->irq_map_mask[idx];
-                gc->reg_base = data->base[idx];
                 gc->private = data;
                 ct = gc->chip_types;
 
-                ct->regs.mask = IRQEN;
+                gc->reg_base = data->pair_base[idx];
+                ct->regs.mask = data->en_offset[idx];
+
                 ct->chip.irq_mask = irq_gc_mask_clr_bit;
                 ct->chip.irq_unmask = irq_gc_mask_set_bit;
                 ct->chip.irq_ack = irq_gc_noop;
@@ -236,20 +293,38 @@ int __init bcm7120_l2_intc_of_init(struct device_node *dn,
                 }
         }
 
-        pr_info("registered BCM7120 L2 intc (mem: 0x%p, parent IRQ(s): %d)\n",
-                        data->base[0], num_parent_irqs);
+        pr_info("registered %s intc (mem: 0x%p, parent IRQ(s): %d)\n",
+                        intc_name, data->map_base[0], data->num_parent_irqs);
 
         return 0;
 
 out_free_domain:
         irq_domain_remove(data->domain);
 out_unmap:
-        for (idx = 0; idx < MAX_WORDS; idx++) {
-                if (data->base[idx])
-                        iounmap(data->base[idx]);
+        for (idx = 0; idx < MAX_MAPPINGS; idx++) {
+                if (data->map_base[idx])
+                        iounmap(data->map_base[idx]);
         }
         kfree(data);
         return ret;
 }
+
+int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,
+                                      struct device_node *parent)
+{
+        return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120,
+                                     "BCM7120 L2");
+}
+
+int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
+                                      struct device_node *parent)
+{
+        return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380,
+                                     "BCM3380 L2");
+}
+
 IRQCHIP_DECLARE(bcm7120_l2_intc, "brcm,bcm7120-l2-intc",
-                bcm7120_l2_intc_of_init);
+                bcm7120_l2_intc_probe_7120);
+
+IRQCHIP_DECLARE(bcm3380_l2_intc, "brcm,bcm3380-l2-intc",
+                bcm7120_l2_intc_probe_3380);
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c
index 313c2c64498a..d6bcc6be0777 100644
--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -136,7 +136,11 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
 
         /* Disable all interrupts by default */
         writel(0xffffffff, data->base + CPU_MASK_SET);
-        writel(0xffffffff, data->base + CPU_CLEAR);
+
+        /* Wakeup interrupts may be retained from S5 (cold boot) */
+        data->can_wake = of_property_read_bool(np, "brcm,irq-can-wake");
+        if (!data->can_wake)
+                writel(0xffffffff, data->base + CPU_CLEAR);
 
         data->parent_irq = irq_of_parse_and_map(np, 0);
         if (!data->parent_irq) {
@@ -188,8 +192,7 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
         ct->chip.irq_suspend = brcmstb_l2_intc_suspend;
         ct->chip.irq_resume = brcmstb_l2_intc_resume;
 
-        if (of_property_read_bool(np, "brcm,irq-can-wake")) {
-                data->can_wake = true;
+        if (data->can_wake) {
                 /* This IRQ chip can wake the system, set all child interrupts
                  * in wake_enabled mask
                  */
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index f2d269bca789..bc48b7dc89ec 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -239,7 +239,7 @@ int gic_get_c0_compare_int(void)
 int gic_get_c0_perfcount_int(void)
 {
         if (!gic_local_irq_is_routable(GIC_LOCAL_INT_PERFCTR)) {
-                /* Is the erformance counter shared with the timer? */
+                /* Is the performance counter shared with the timer? */
                 if (cp0_perfcount_irq < 0)
                         return -1;
                 return MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
@@ -248,6 +248,29 @@ int gic_get_c0_perfcount_int(void)
                                   GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_PERFCTR));
 }
 
+int gic_get_c0_fdc_int(void)
+{
+        if (!gic_local_irq_is_routable(GIC_LOCAL_INT_FDC)) {
+                /* Is the FDC IRQ even present? */
+                if (cp0_fdc_irq < 0)
+                        return -1;
+                return MIPS_CPU_IRQ_BASE + cp0_fdc_irq;
+        }
+
+        /*
+         * Some cores claim the FDC is routable but it doesn't actually seem to
+         * be connected.
+         */
+        switch (current_cpu_type()) {
+        case CPU_INTERAPTIV:
+        case CPU_PROAPTIV:
+                return -1;
+        }
+
+        return irq_create_mapping(gic_irq_domain,
+                                  GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_FDC));
+}
+
 static void gic_handle_shared_int(void)
 {
         unsigned int i, intr, virq;
@@ -613,15 +636,20 @@ static int gic_local_irq_domain_map(struct irq_domain *d, unsigned int virq,
          * of the MIPS kernel code does not use the percpu IRQ API for
          * the CP0 timer and performance counter interrupts.
          */
-        if (intr != GIC_LOCAL_INT_TIMER && intr != GIC_LOCAL_INT_PERFCTR) {
+        switch (intr) {
+        case GIC_LOCAL_INT_TIMER:
+        case GIC_LOCAL_INT_PERFCTR:
+        case GIC_LOCAL_INT_FDC:
+                irq_set_chip_and_handler(virq,
+                                         &gic_all_vpes_local_irq_controller,
+                                         handle_percpu_irq);
+                break;
+        default:
                 irq_set_chip_and_handler(virq,
                                          &gic_local_irq_controller,
                                          handle_percpu_devid_irq);
                 irq_set_percpu_devid(virq);
-        } else {
-                irq_set_chip_and_handler(virq,
-                                         &gic_all_vpes_local_irq_controller,
-                                         handle_percpu_irq);
+                break;
         }
 
         spin_lock_irqsave(&gic_lock, flags);
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 84325f267acf..84b0a2d74d60 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -6,6 +6,15 @@ menuconfig MAILBOX
           signals. Say Y if your platform supports hardware mailboxes.
 
 if MAILBOX
+
+config ARM_MHU
+        tristate "ARM MHU Mailbox"
+        depends on ARM_AMBA
+        help
+          Say Y here if you want to build the ARM MHU controller driver.
+          The controller has 3 mailbox channels, the last of which can be
+          used in Secure mode only.
+
 config PL320_MBOX
         bool "ARM PL320 Mailbox"
         depends on ARM_AMBA
diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile
index 2e79231154cf..b18201e97e29 100644
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@ -2,6 +2,8 @@
 
 obj-$(CONFIG_MAILBOX)           += mailbox.o
 
+obj-$(CONFIG_ARM_MHU)   += arm_mhu.o
+
 obj-$(CONFIG_PL320_MBOX)        += pl320-ipc.o
 
 obj-$(CONFIG_OMAP2PLUS_MBOX)    += omap-mailbox.o
diff --git a/drivers/mailbox/arm_mhu.c b/drivers/mailbox/arm_mhu.c
new file mode 100644
index 000000000000..ac693c635357
--- /dev/null
+++ b/drivers/mailbox/arm_mhu.c
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2013-2015 Fujitsu Semiconductor Ltd.
+ * Copyright (C) 2015 Linaro Ltd.
+ * Author: Jassi Brar <jaswinder.singh@linaro.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/amba/bus.h>
+#include <linux/mailbox_controller.h>
+
+#define INTR_STAT_OFS   0x0
+#define INTR_SET_OFS    0x8
+#define INTR_CLR_OFS    0x10
+
+#define MHU_LP_OFFSET   0x0
+#define MHU_HP_OFFSET   0x20
+#define MHU_SEC_OFFSET  0x200
+#define TX_REG_OFFSET   0x100
+
+#define MHU_CHANS       3
+
+struct mhu_link {
+        unsigned irq;
+        void __iomem *tx_reg;
+        void __iomem *rx_reg;
+};
+
+struct arm_mhu {
+        void __iomem *base;
+        struct mhu_link mlink[MHU_CHANS];
+        struct mbox_chan chan[MHU_CHANS];
+        struct mbox_controller mbox;
+};
+
+static irqreturn_t mhu_rx_interrupt(int irq, void *p)
+{
+        struct mbox_chan *chan = p;
+        struct mhu_link *mlink = chan->con_priv;
+        u32 val;
+
+        val = readl_relaxed(mlink->rx_reg + INTR_STAT_OFS);
+        if (!val)
+                return IRQ_NONE;
+
+        mbox_chan_received_data(chan, (void *)&val);
+
+        writel_relaxed(val, mlink->rx_reg + INTR_CLR_OFS);
+
+        return IRQ_HANDLED;
+}
+
+static bool mhu_last_tx_done(struct mbox_chan *chan)
+{
+        struct mhu_link *mlink = chan->con_priv;
+        u32 val = readl_relaxed(mlink->tx_reg + INTR_STAT_OFS);
+
+        return (val == 0);
+}
+
+static int mhu_send_data(struct mbox_chan *chan, void *data)
+{
+        struct mhu_link *mlink = chan->con_priv;
+        u32 *arg = data;
+
+        writel_relaxed(*arg, mlink->tx_reg + INTR_SET_OFS);
+
+        return 0;
+}
+
+static int mhu_startup(struct mbox_chan *chan)
+{
+        struct mhu_link *mlink = chan->con_priv;
+        u32 val;
+        int ret;
+
+        val = readl_relaxed(mlink->tx_reg + INTR_STAT_OFS);
+        writel_relaxed(val, mlink->tx_reg + INTR_CLR_OFS);
+
+        ret = request_irq(mlink->irq, mhu_rx_interrupt,
+                          IRQF_SHARED, "mhu_link", chan);
+        if (ret) {
+                dev_err(chan->mbox->dev,
+                        "Unable to aquire IRQ %d\n", mlink->irq);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void mhu_shutdown(struct mbox_chan *chan)
+{
+        struct mhu_link *mlink = chan->con_priv;
+
+        free_irq(mlink->irq, chan);
+}
+
+static struct mbox_chan_ops mhu_ops = {
+        .send_data = mhu_send_data,
+        .startup = mhu_startup,
+        .shutdown = mhu_shutdown,
+        .last_tx_done = mhu_last_tx_done,
+};
+
+static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
+{
+        int i, err;
+        struct arm_mhu *mhu;
+        struct device *dev = &adev->dev;
+        int mhu_reg[MHU_CHANS] = {MHU_LP_OFFSET, MHU_HP_OFFSET, MHU_SEC_OFFSET};
+
+        /* Allocate memory for device */
+        mhu = devm_kzalloc(dev, sizeof(*mhu), GFP_KERNEL);
+        if (!mhu)
+                return -ENOMEM;
+
+        mhu->base = devm_ioremap_resource(dev, &adev->res);
+        if (IS_ERR(mhu->base)) {
+                dev_err(dev, "ioremap failed\n");
+                return PTR_ERR(mhu->base);
+        }
+
+        for (i = 0; i < MHU_CHANS; i++) {
+                mhu->chan[i].con_priv = &mhu->mlink[i];
+                mhu->mlink[i].irq = adev->irq[i];
+                mhu->mlink[i].rx_reg = mhu->base + mhu_reg[i];
+                mhu->mlink[i].tx_reg = mhu->mlink[i].rx_reg + TX_REG_OFFSET;
+        }
+
+        mhu->mbox.dev = dev;
+        mhu->mbox.chans = &mhu->chan[0];
+        mhu->mbox.num_chans = MHU_CHANS;
+        mhu->mbox.ops = &mhu_ops;
+        mhu->mbox.txdone_irq = false;
+        mhu->mbox.txdone_poll = true;
+        mhu->mbox.txpoll_period = 10;
+
+        amba_set_drvdata(adev, mhu);
+
+        err = mbox_controller_register(&mhu->mbox);
+        if (err) {
+                dev_err(dev, "Failed to register mailboxes %d\n", err);
+                return err;
+        }
+
+        dev_info(dev, "ARM MHU Mailbox registered\n");
+        return 0;
+}
+
+static int mhu_remove(struct amba_device *adev)
+{
+        struct arm_mhu *mhu = amba_get_drvdata(adev);
+
+        mbox_controller_unregister(&mhu->mbox);
+
+        return 0;
+}
+
+static struct amba_id mhu_ids[] = {
+        {
+                .id     = 0x1bb098,
+                .mask   = 0xffffff,
+        },
+        { 0, 0 },
+};
+MODULE_DEVICE_TABLE(amba, mhu_ids);
+
+static struct amba_driver arm_mhu_driver = {
+        .drv = {
+                .name   = "mhu",
+        },
+        .id_table       = mhu_ids,
+        .probe          = mhu_probe,
+        .remove         = mhu_remove,
+};
+module_amba_driver(arm_mhu_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ARM MHU Driver");
+MODULE_AUTHOR("Jassi Brar <jassisinghbrar@gmail.com>");
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 977c814cdf6f..7e91d68a3ac3 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -20,10 +20,35 @@
  *  shared memory regions as defined in the PCC table entries. The PCC
  *  specification supports a Doorbell mechanism for the PCC clients
  *  to notify the platform about new data. This Doorbell information
- *  is also specified in each PCC table entry. See pcc_send_data()
- *  and pcc_tx_done() for basic mode of operation.
+ *  is also specified in each PCC table entry.
  *
- *  For more details about PCC, please see the ACPI specification from
+ *  Typical high level flow of operation is:
+ *
+ *  PCC Reads:
+ *  * Client tries to acquire a channel lock.
+ *  * After it is acquired it writes READ cmd in communication region cmd
+ *              address.
+ *  * Client issues mbox_send_message() which rings the PCC doorbell
+ *              for its PCC channel.
+ *  * If command completes, then client has control over channel and
+ *              it can proceed with its reads.
+ *  * Client releases lock.
+ *
+ *  PCC Writes:
+ *  * Client tries to acquire channel lock.
+ *  * Client writes to its communication region after it acquires a
+ *              channel lock.
+ *  * Client writes WRITE cmd in communication region cmd address.
+ *  * Client issues mbox_send_message() which rings the PCC doorbell
+ *              for its PCC channel.
+ *  * If command completes, then writes have succeded and it can release
+ *              the channel lock.
+ *
+ *  There is a Nominal latency defined for each channel which indicates
+ *  how long to wait until a command completes. If command is not complete
+ *  the client needs to retry or assume failure.
+ *
+ *      For more details about PCC, please see the ACPI specification from
  *  http://www.uefi.org/ACPIv5.1 Section 14.
  *
  *  This file implements PCC as a Mailbox controller and allows for PCC
@@ -42,8 +67,6 @@
 #include "mailbox.h"
 
 #define MAX_PCC_SUBSPACES       256
-#define PCCS_SS_SIG_MAGIC       0x50434300
-#define PCC_CMD_COMPLETE        0x1
 
 static struct mbox_chan *pcc_mbox_channels;
 
@@ -71,23 +94,6 @@ static struct mbox_chan *get_pcc_channel(int id)
 }
 
 /**
- * get_subspace_id - Given a Mailbox channel, find out the
- *              PCC subspace id.
- * @chan: Pointer to Mailbox Channel from which we want
- *              the index.
- * Return: Errno if not found, else positive index number.
- */
-static int get_subspace_id(struct mbox_chan *chan)
-{
-        unsigned int id = chan - pcc_mbox_channels;
-
-        if (id < 0 || id > pcc_mbox_ctrl.num_chans)
-                return -ENOENT;
-
-        return id;
-}
-
-/**
  * pcc_mbox_request_channel - PCC clients call this function to
  *              request a pointer to their PCC subspace, from which they
  *              can get the details of communicating with the remote.
@@ -117,7 +123,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
         chan = get_pcc_channel(subspace_id);
 
         if (!chan || chan->cl) {
-                dev_err(dev, "%s: PCC mailbox not free\n", __func__);
+                dev_err(dev, "Channel not found for idx: %d\n", subspace_id);
                 return ERR_PTR(-EBUSY);
         }
 
@@ -161,81 +167,30 @@ void pcc_mbox_free_channel(struct mbox_chan *chan)
 EXPORT_SYMBOL_GPL(pcc_mbox_free_channel);
 
 /**
- * pcc_tx_done - Callback from Mailbox controller code to
- *              check if PCC message transmission completed.
- * @chan: Pointer to Mailbox channel on which previous
- *              transmission occurred.
- *
- * Return: TRUE if succeeded.
- */
-static bool pcc_tx_done(struct mbox_chan *chan)
-{
-        struct acpi_pcct_hw_reduced *pcct_ss = chan->con_priv;
-        struct acpi_pcct_shared_memory *generic_comm_base =
-                (struct acpi_pcct_shared_memory *) pcct_ss->base_address;
-        u16 cmd_delay = pcct_ss->latency;
-        unsigned int retries = 0;
-
-        /* Try a few times while waiting for platform to consume */
-        while (!(readw_relaxed(&generic_comm_base->status)
-                    & PCC_CMD_COMPLETE)) {
-
-                if (retries++ < 5)
-                        udelay(cmd_delay);
-                else {
-                        /*
-                         * If the remote is dead, this will cause the Mbox
-                         * controller to timeout after mbox client.tx_tout
-                         * msecs.
-                         */
-                        pr_err("PCC platform did not respond.\n");
-                        return false;
-                }
-        }
-        return true;
-}
-
-/**
- * pcc_send_data - Called from Mailbox Controller code to finally
- *      transmit data over channel.
+ * pcc_send_data - Called from Mailbox Controller code. Used
+ *              here only to ring the channel doorbell. The PCC client
+ *              specific read/write is done in the client driver in
+ *              order to maintain atomicity over PCC channel once
+ *              OS has control over it. See above for flow of operations.
  * @chan: Pointer to Mailbox channel over which to send data.
- * @data: Actual data to be written over channel.
+ * @data: Client specific data written over channel. Used here
+ *              only for debug after PCC transaction completes.
  *
  * Return: Err if something failed else 0 for success.
  */
 static int pcc_send_data(struct mbox_chan *chan, void *data)
 {
         struct acpi_pcct_hw_reduced *pcct_ss = chan->con_priv;
-        struct acpi_pcct_shared_memory *generic_comm_base =
-                (struct acpi_pcct_shared_memory *) pcct_ss->base_address;
         struct acpi_generic_address doorbell;
         u64 doorbell_preserve;
         u64 doorbell_val;
         u64 doorbell_write;
-        u16 cmd = *(u16 *) data;
-        u16 ss_idx = -1;
-
-        ss_idx = get_subspace_id(chan);
-
-        if (ss_idx < 0) {
-                pr_err("Invalid Subspace ID from PCC client\n");
-                return -EINVAL;
-        }
 
         doorbell = pcct_ss->doorbell_register;
         doorbell_preserve = pcct_ss->preserve_mask;
         doorbell_write = pcct_ss->write_mask;
 
-        /* Write to the shared comm region. */
-        writew(cmd, &generic_comm_base->command);
-
-        /* Write Subspace MAGIC value so platform can identify destination. */
-        writel((PCCS_SS_SIG_MAGIC | ss_idx), &generic_comm_base->signature);
-
-        /* Flip CMD COMPLETE bit */
-        writew(0, &generic_comm_base->status);
-
-        /* Sync notification from OSPM to Platform. */
+        /* Sync notification from OS to Platform. */
         acpi_read(&doorbell_val, &doorbell);
         acpi_write((doorbell_val & doorbell_preserve) | doorbell_write,
                         &doorbell);
@@ -245,7 +200,6 @@ static int pcc_send_data(struct mbox_chan *chan, void *data)
 
 static struct mbox_chan_ops pcc_chan_ops = {
         .send_data = pcc_send_data,
-        .last_tx_done = pcc_tx_done,
 };
 
 /**
@@ -351,8 +305,6 @@ static int pcc_mbox_probe(struct platform_device *pdev)
 
         pcc_mbox_ctrl.chans = pcc_mbox_channels;
         pcc_mbox_ctrl.ops = &pcc_chan_ops;
-        pcc_mbox_ctrl.txdone_poll = true;
-        pcc_mbox_ctrl.txpoll_period = 10;
         pcc_mbox_ctrl.dev = &pdev->dev;
 
         pr_info("Registering PCC driver as Mailbox controller\n");
diff --git a/drivers/media/dvb-frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c
index 149fdca3fb44..72b0e2db3aab 100644
--- a/drivers/media/dvb-frontends/cxd2820r_c.c
+++ b/drivers/media/dvb-frontends/cxd2820r_c.c
@@ -79,7 +79,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe)
 
         num = if_freq / 1000; /* Hz => kHz */
         num *= 0x4000;
-        if_ctl = 0x4000 - cxd2820r_div_u64_round_closest(num, 41000);
+        if_ctl = 0x4000 - DIV_ROUND_CLOSEST_ULL(num, 41000);
         buf[0] = (if_ctl >> 8) & 0x3f;
         buf[1] = (if_ctl >> 0) & 0xff;
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 422e84bbb008..490e090048ef 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -244,12 +244,6 @@ error:
         return ret;
 }
 
-/* 64 bit div with round closest, like DIV_ROUND_CLOSEST but 64 bit */
-u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor)
-{
-        return div_u64(dividend + (divisor / 2), divisor);
-}
-
 static int cxd2820r_set_frontend(struct dvb_frontend *fe)
 {
         struct cxd2820r_priv *priv = fe->demodulator_priv;
diff --git a/drivers/media/dvb-frontends/cxd2820r_priv.h b/drivers/media/dvb-frontends/cxd2820r_priv.h
index 7ff5f60c83e1..4b428959b16e 100644
--- a/drivers/media/dvb-frontends/cxd2820r_priv.h
+++ b/drivers/media/dvb-frontends/cxd2820r_priv.h
@@ -64,8 +64,6 @@ int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val,
 int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
         int len);
 
-u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor);
-
 int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
         int len);
 
diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
index 51401d036530..008cb2ac8480 100644
--- a/drivers/media/dvb-frontends/cxd2820r_t.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t.c
@@ -103,7 +103,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe)
 
         num = if_freq / 1000; /* Hz => kHz */
         num *= 0x1000000;
-        if_ctl = cxd2820r_div_u64_round_closest(num, 41000);
+        if_ctl = DIV_ROUND_CLOSEST_ULL(num, 41000);
         buf[0] = ((if_ctl >> 16) & 0xff);
         buf[1] = ((if_ctl >>  8) & 0xff);
         buf[2] = ((if_ctl >>  0) & 0xff);
diff --git a/drivers/media/dvb-frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
index 9c0c4f42175c..35fe364c7182 100644
--- a/drivers/media/dvb-frontends/cxd2820r_t2.c
+++ b/drivers/media/dvb-frontends/cxd2820r_t2.c
@@ -120,7 +120,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe)
 
         num = if_freq / 1000; /* Hz => kHz */
         num *= 0x1000000;
-        if_ctl = cxd2820r_div_u64_round_closest(num, 41000);
+        if_ctl = DIV_ROUND_CLOSEST_ULL(num, 41000);
         buf[0] = ((if_ctl >> 16) & 0xff);
         buf[1] = ((if_ctl >>  8) & 0xff);
         buf[2] = ((if_ctl >>  0) & 0xff);
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index fc145d202c46..922a750640e8 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -758,7 +758,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
 
                 if (error || (card->current_mrq.tpc == MSPRO_CMD_STOP)) {
                         if (msb->data_dir == READ) {
-                                for (cnt = 0; cnt < msb->current_seg; cnt++)
+                                for (cnt = 0; cnt < msb->current_seg; cnt++) {
                                         t_len += msb->req_sg[cnt].length
                                                  / msb->page_size;
 
@@ -766,6 +766,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
                                                 t_len += msb->current_page - 1;
 
                                         t_len *= msb->page_size;
+                                }
                         }
                 } else
                         t_len = blk_rq_bytes(msb->block_req);
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index c69afb5e264e..2fc426926574 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2230,7 +2230,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card,
         part_md->part_type = part_type;
         list_add(&part_md->part, &md->part);
 
-        string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2,
+        string_get_size((u64)get_capacity(part_md->disk), 512, STRING_UNITS_2,
                         cap_str, sizeof(cap_str));
         pr_info("%s: %s %s partition %u %s\n",
                part_md->disk->disk_name, mmc_card_id(card),
@@ -2436,7 +2436,7 @@ static int mmc_blk_probe(struct device *dev)
         if (IS_ERR(md))
                 return PTR_ERR(md);
 
-        string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
+        string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
                         cap_str, sizeof(cap_str));
         pr_info("%s: %s %s %s %s\n",
                 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index bd5916a60cb5..77363d680532 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
 }
 
 #ifdef CONFIG_BCM47XX
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 static void b44_wap54g10_workaround(struct b44 *bp)
 {
         char buf[20];
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 5cb93d1f50a4..de77d3a74abc 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -17,7 +17,7 @@
 #include <linux/phy_fixed.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 
 static const struct bcma_device_id bgmac_bcma_tbl[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index d93b2b6b1f7a..82f7000a285d 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -21,6 +21,7 @@
  * objects.
  */
 
+#include <linux/file.h>
 #include <linux/mm.h>
 #include <linux/workqueue.h>
 #include <linux/notifier.h>
@@ -224,10 +225,18 @@ static inline unsigned long fast_get_dcookie(struct path *path)
 static unsigned long get_exec_dcookie(struct mm_struct *mm)
 {
         unsigned long cookie = NO_COOKIE;
+        struct file *exe_file;
 
-        if (mm && mm->exe_file)
-                cookie = fast_get_dcookie(&mm->exe_file->f_path);
+        if (!mm)
+                goto done;
+
+        exe_file = get_mm_exe_file(mm);
+        if (!exe_file)
+                goto done;
 
+        cookie = fast_get_dcookie(&exe_file->f_path);
+        fput(exe_file);
+done:
         return cookie;
 }
 
@@ -236,6 +245,8 @@ static unsigned long get_exec_dcookie(struct mm_struct *mm)
  * pair that can then be added to the global event buffer. We make
  * sure to do this lookup before a mm->mmap modification happens so
  * we don't lose track.
+ *
+ * The caller must ensure the mm is not nil (ie: not a kernel thread).
  */
 static unsigned long
 lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
@@ -243,6 +254,7 @@ lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
         unsigned long cookie = NO_COOKIE;
         struct vm_area_struct *vma;
 
+        down_read(&mm->mmap_sem);
         for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) {
 
                 if (addr < vma->vm_start || addr >= vma->vm_end)
@@ -262,6 +274,7 @@ lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
 
         if (!vma)
                 cookie = INVALID_COOKIE;
+        up_read(&mm->mmap_sem);
 
         return cookie;
 }
@@ -402,20 +415,9 @@ static void release_mm(struct mm_struct *mm)
 {
         if (!mm)
                 return;
-        up_read(&mm->mmap_sem);
         mmput(mm);
 }
 
-
-static struct mm_struct *take_tasks_mm(struct task_struct *task)
-{
-        struct mm_struct *mm = get_task_mm(task);
-        if (mm)
-                down_read(&mm->mmap_sem);
-        return mm;
-}
-
-
 static inline int is_code(unsigned long val)
 {
         return val == ESCAPE_CODE;
@@ -532,7 +534,7 @@ void sync_buffer(int cpu)
                                 new = (struct task_struct *)val;
                                 oldmm = mm;
                                 release_mm(oldmm);
-                                mm = take_tasks_mm(new);
+                                mm = get_task_mm(new);
                                 if (mm != oldmm)
                                         cookie = get_exec_dcookie(mm);
                                 add_user_ctx_switch(new, cookie);
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
index 09fde58b12e0..0adccbf5c83f 100644
--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -1,6 +1,9 @@
 if X86
 source "drivers/platform/x86/Kconfig"
 endif
+if MIPS
+source "drivers/platform/mips/Kconfig"
+endif
 if GOLDFISH
 source "drivers/platform/goldfish/Kconfig"
 endif
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index 3656b7b17b99..ca2692510733 100644
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_X86)               += x86/
+obj-$(CONFIG_MIPS)              += mips/
 obj-$(CONFIG_OLPC)              += olpc/
 obj-$(CONFIG_GOLDFISH)          += goldfish/
 obj-$(CONFIG_CHROME_PLATFORMS)  += chrome/
diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig
new file mode 100644
index 000000000000..125e569017be
--- /dev/null
+++ b/drivers/platform/mips/Kconfig
@@ -0,0 +1,30 @@
+#
+# MIPS Platform Specific Drivers
+#
+
+menuconfig MIPS_PLATFORM_DEVICES
+        bool "MIPS Platform Specific Device Drivers"
+        default y
+        help
+          Say Y here to get to see options for device drivers of various
+          MIPS platforms, including vendor-specific netbook/laptop/desktop
+          extension and hardware monitor drivers. This option itself does
+          not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
+
+if MIPS_PLATFORM_DEVICES
+
+config MIPS_ACPI
+        bool
+        default y if LOONGSON_MACH3X
+
+config CPU_HWMON
+        tristate "Loongson CPU HWMon Driver"
+        depends on LOONGSON_MACH3X
+        select HWMON
+        default y
+        help
+          Loongson-3A/3B CPU Hwmon (temperature sensor) driver.
+
+endif # MIPS_PLATFORM_DEVICES
diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile
new file mode 100644
index 000000000000..43412849b195
--- /dev/null
+++ b/drivers/platform/mips/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MIPS_ACPI) += acpi_init.o
+obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o
diff --git a/drivers/platform/mips/acpi_init.c b/drivers/platform/mips/acpi_init.c
new file mode 100644
index 000000000000..dbdad79ead8f
--- /dev/null
+++ b/drivers/platform/mips/acpi_init.c
@@ -0,0 +1,150 @@
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/export.h>
+
+#define SBX00_ACPI_IO_BASE 0x800
+#define SBX00_ACPI_IO_SIZE 0x100
+
+#define ACPI_PM_EVT_BLK         (SBX00_ACPI_IO_BASE + 0x00) /* 4 bytes */
+#define ACPI_PM_CNT_BLK         (SBX00_ACPI_IO_BASE + 0x04) /* 2 bytes */
+#define ACPI_PMA_CNT_BLK        (SBX00_ACPI_IO_BASE + 0x0F) /* 1 byte */
+#define ACPI_PM_TMR_BLK         (SBX00_ACPI_IO_BASE + 0x18) /* 4 bytes */
+#define ACPI_GPE0_BLK           (SBX00_ACPI_IO_BASE + 0x10) /* 8 bytes */
+#define ACPI_END                (SBX00_ACPI_IO_BASE + 0x80)
+
+#define PM_INDEX        0xCD6
+#define PM_DATA         0xCD7
+#define PM2_INDEX       0xCD0
+#define PM2_DATA        0xCD1
+
+/*
+ * SCI interrupt need acpi space, allocate here
+ */
+
+static int __init register_acpi_resource(void)
+{
+        request_region(SBX00_ACPI_IO_BASE, SBX00_ACPI_IO_SIZE, "acpi");
+        return 0;
+}
+
+static void pmio_write_index(u16 index, u8 reg, u8 value)
+{
+        outb(reg, index);
+        outb(value, index + 1);
+}
+
+static u8 pmio_read_index(u16 index, u8 reg)
+{
+        outb(reg, index);
+        return inb(index + 1);
+}
+
+void pm_iowrite(u8 reg, u8 value)
+{
+        pmio_write_index(PM_INDEX, reg, value);
+}
+EXPORT_SYMBOL(pm_iowrite);
+
+u8 pm_ioread(u8 reg)
+{
+        return pmio_read_index(PM_INDEX, reg);
+}
+EXPORT_SYMBOL(pm_ioread);
+
+void pm2_iowrite(u8 reg, u8 value)
+{
+        pmio_write_index(PM2_INDEX, reg, value);
+}
+EXPORT_SYMBOL(pm2_iowrite);
+
+u8 pm2_ioread(u8 reg)
+{
+        return pmio_read_index(PM2_INDEX, reg);
+}
+EXPORT_SYMBOL(pm2_ioread);
+
+static void acpi_hw_clear_status(void)
+{
+        u16 value;
+
+        /* PMStatus: Clear WakeStatus/PwrBtnStatus */
+        value = inw(ACPI_PM_EVT_BLK);
+        value |= (1 << 8 | 1 << 15);
+        outw(value, ACPI_PM_EVT_BLK);
+
+        /* GPEStatus: Clear all generated events */
+        outl(inl(ACPI_GPE0_BLK), ACPI_GPE0_BLK);
+}
+
+void acpi_registers_setup(void)
+{
+        u32 value;
+
+        /* PM Status Base */
+        pm_iowrite(0x20, ACPI_PM_EVT_BLK & 0xff);
+        pm_iowrite(0x21, ACPI_PM_EVT_BLK >> 8);
+
+        /* PM Control Base */
+        pm_iowrite(0x22, ACPI_PM_CNT_BLK & 0xff);
+        pm_iowrite(0x23, ACPI_PM_CNT_BLK >> 8);
+
+        /* GPM Base */
+        pm_iowrite(0x28, ACPI_GPE0_BLK & 0xff);
+        pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
+
+        /* ACPI End */
+        pm_iowrite(0x2e, ACPI_END & 0xff);
+        pm_iowrite(0x2f, ACPI_END >> 8);
+
+        /* IO Decode: When AcpiDecodeEnable set, South-Bridge uses the contents
+         * of the PM registers at index 0x20~0x2B to decode ACPI I/O address. */
+        pm_iowrite(0x0e, 1 << 3);
+
+        /* SCI_EN set */
+        outw(1, ACPI_PM_CNT_BLK);
+
+        /* Enable to generate SCI */
+        pm_iowrite(0x10, pm_ioread(0x10) | 1);
+
+        /* GPM3/GPM9 enable */
+        value = inl(ACPI_GPE0_BLK + 4);
+        outl(value | (1 << 14) | (1 << 22), ACPI_GPE0_BLK + 4);
+
+        /* Set GPM9 as input */
+        pm_iowrite(0x8d, pm_ioread(0x8d) & (~(1 << 1)));
+
+        /* Set GPM9 as non-output */
+        pm_iowrite(0x94, pm_ioread(0x94) | (1 << 3));
+
+        /* GPM3 config ACPI trigger SCIOUT */
+        pm_iowrite(0x33, pm_ioread(0x33) & (~(3 << 4)));
+
+        /* GPM9 config ACPI trigger SCIOUT */
+        pm_iowrite(0x3d, pm_ioread(0x3d) & (~(3 << 2)));
+
+        /* GPM3 config falling edge trigger */
+        pm_iowrite(0x37, pm_ioread(0x37) & (~(1 << 6)));
+
+        /* No wait for STPGNT# in ACPI Sx state */
+        pm_iowrite(0x7c, pm_ioread(0x7c) | (1 << 6));
+
+        /* Set GPM3 pull-down enable */
+        value = pm2_ioread(0xf6);
+        value |= ((1 << 7) | (1 << 3));
+        pm2_iowrite(0xf6, value);
+
+        /* Set GPM9 pull-down enable */
+        value = pm2_ioread(0xf8);
+        value |= ((1 << 5) | (1 << 1));
+        pm2_iowrite(0xf8, value);
+}
+
+int __init sbx00_acpi_init(void)
+{
+        register_acpi_resource();
+        acpi_registers_setup();
+        acpi_hw_clear_status();
+
+        return 0;
+}
diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c
new file mode 100644
index 000000000000..0f6c63e17049
--- /dev/null
+++ b/drivers/platform/mips/cpu_hwmon.c
@@ -0,0 +1,207 @@
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/reboot.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+
+#include <loongson.h>
+#include <boot_param.h>
+#include <loongson_hwmon.h>
+
+/*
+ * Loongson-3 series cpu has two sensors inside,
+ * each of them from 0 to 255,
+ * if more than 127, that is dangerous.
+ * here only provide sensor1 data, because it always hot than sensor0
+ */
+int loongson3_cpu_temp(int cpu)
+{
+        u32 reg;
+
+        reg = LOONGSON_CHIPTEMP(cpu);
+        if (loongson_sysconf.cputype == Loongson_3A)
+                reg = (reg >> 8) & 0xff;
+        else if (loongson_sysconf.cputype == Loongson_3B)
+                reg = ((reg >> 8) & 0xff) - 100;
+
+        return (int)reg * 1000;
+}
+
+static struct device *cpu_hwmon_dev;
+
+static ssize_t get_hwmon_name(struct device *dev,
+                        struct device_attribute *attr, char *buf);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, get_hwmon_name, NULL, 0);
+
+static struct attribute *cpu_hwmon_attributes[] = {
+        &sensor_dev_attr_name.dev_attr.attr,
+        NULL
+};
+
+/* Hwmon device attribute group */
+static struct attribute_group cpu_hwmon_attribute_group = {
+        .attrs = cpu_hwmon_attributes,
+};
+
+/* Hwmon device get name */
+static ssize_t get_hwmon_name(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "cpu-hwmon\n");
+}
+
+static ssize_t get_cpu0_temp(struct device *dev,
+                        struct device_attribute *attr, char *buf);
+static ssize_t get_cpu1_temp(struct device *dev,
+                        struct device_attribute *attr, char *buf);
+static ssize_t cpu0_temp_label(struct device *dev,
+                        struct device_attribute *attr, char *buf);
+static ssize_t cpu1_temp_label(struct device *dev,
+                        struct device_attribute *attr, char *buf);
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, get_cpu0_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, cpu0_temp_label, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, get_cpu1_temp, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_label, S_IRUGO, cpu1_temp_label, NULL, 2);
+
+static const struct attribute *hwmon_cputemp1[] = {
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_label.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute *hwmon_cputemp2[] = {
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_label.dev_attr.attr,
+        NULL
+};
+
+static ssize_t cpu0_temp_label(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "CPU 0 Temprature\n");
+}
+
+static ssize_t cpu1_temp_label(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "CPU 1 Temprature\n");
+}
+
+static ssize_t get_cpu0_temp(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        int value = loongson3_cpu_temp(0);
+        return sprintf(buf, "%d\n", value);
+}
+
+static ssize_t get_cpu1_temp(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        int value = loongson3_cpu_temp(1);
+        return sprintf(buf, "%d\n", value);
+}
+
+static int create_sysfs_cputemp_files(struct kobject *kobj)
+{
+        int ret;
+
+        ret = sysfs_create_files(kobj, hwmon_cputemp1);
+        if (ret)
+                goto sysfs_create_temp1_fail;
+
+        if (loongson_sysconf.nr_cpus <= loongson_sysconf.cores_per_package)
+                return 0;
+
+        ret = sysfs_create_files(kobj, hwmon_cputemp2);
+        if (ret)
+                goto sysfs_create_temp2_fail;
+
+        return 0;
+
+sysfs_create_temp2_fail:
+        sysfs_remove_files(kobj, hwmon_cputemp1);
+
+sysfs_create_temp1_fail:
+        return -1;
+}
+
+static void remove_sysfs_cputemp_files(struct kobject *kobj)
+{
+        sysfs_remove_files(&cpu_hwmon_dev->kobj, hwmon_cputemp1);
+
+        if (loongson_sysconf.nr_cpus > loongson_sysconf.cores_per_package)
+                sysfs_remove_files(&cpu_hwmon_dev->kobj, hwmon_cputemp2);
+}
+
+#define CPU_THERMAL_THRESHOLD 90000
+static struct delayed_work thermal_work;
+
+static void do_thermal_timer(struct work_struct *work)
+{
+        int value = loongson3_cpu_temp(0);
+        if (value <= CPU_THERMAL_THRESHOLD)
+                schedule_delayed_work(&thermal_work, msecs_to_jiffies(5000));
+        else
+                orderly_poweroff(true);
+}
+
+static int __init loongson_hwmon_init(void)
+{
+        int ret;
+
+        pr_info("Loongson Hwmon Enter...\n");
+
+        cpu_hwmon_dev = hwmon_device_register(NULL);
+        if (IS_ERR(cpu_hwmon_dev)) {
+                ret = -ENOMEM;
+                pr_err("hwmon_device_register fail!\n");
+                goto fail_hwmon_device_register;
+        }
+
+        ret = sysfs_create_group(&cpu_hwmon_dev->kobj,
+                                &cpu_hwmon_attribute_group);
+        if (ret) {
+                pr_err("fail to create loongson hwmon!\n");
+                goto fail_sysfs_create_group_hwmon;
+        }
+
+        ret = create_sysfs_cputemp_files(&cpu_hwmon_dev->kobj);
+        if (ret) {
+                pr_err("fail to create cpu temprature interface!\n");
+                goto fail_create_sysfs_cputemp_files;
+        }
+
+        INIT_DEFERRABLE_WORK(&thermal_work, do_thermal_timer);
+        schedule_delayed_work(&thermal_work, msecs_to_jiffies(20000));
+
+        return ret;
+
+fail_create_sysfs_cputemp_files:
+        sysfs_remove_group(&cpu_hwmon_dev->kobj,
+                                &cpu_hwmon_attribute_group);
+
+fail_sysfs_create_group_hwmon:
+        hwmon_device_unregister(cpu_hwmon_dev);
+
+fail_hwmon_device_register:
+        return ret;
+}
+
+static void __exit loongson_hwmon_exit(void)
+{
+        cancel_delayed_work_sync(&thermal_work);
+        remove_sysfs_cputemp_files(&cpu_hwmon_dev->kobj);
+        sysfs_remove_group(&cpu_hwmon_dev->kobj,
+                                &cpu_hwmon_attribute_group);
+        hwmon_device_unregister(cpu_hwmon_dev);
+}
+
+module_init(loongson_hwmon_init);
+module_exit(loongson_hwmon_exit);
+
+MODULE_AUTHOR("Yu Xiang <xiangy@lemote.com>");
+MODULE_AUTHOR("Huacai Chen <chenhc@lemote.com>");
+MODULE_DESCRIPTION("Loongson CPU Hwmon driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b5b5c3d485d6..6149ae01e11f 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1111,6 +1111,16 @@ config RTC_DRV_DAVINCI
           This driver can also be built as a module. If so, the module
           will be called rtc-davinci.
 
+config RTC_DRV_DIGICOLOR
+        tristate "Conexant Digicolor RTC"
+        depends on ARCH_DIGICOLOR
+        help
+          If you say yes here you get support for the RTC on Conexant
+          Digicolor platforms. This currently includes the CX92755 SoC.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-digicolor.
+
 config RTC_DRV_IMXDI
         tristate "Freescale IMX DryIce Real Time Clock"
         depends on ARCH_MXC
@@ -1121,11 +1131,11 @@ config RTC_DRV_IMXDI
            will be called "rtc-imxdi".
 
 config RTC_DRV_OMAP
-        tristate "TI OMAP1"
-        depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX || SOC_AM33XX
+        tristate "TI OMAP Real Time Clock"
+        depends on ARCH_OMAP || ARCH_DAVINCI
         help
           Say "yes" here to support the on chip real time clock
-          present on TI OMAP1, AM33xx and DA8xx/OMAP-L13x.
+          present on TI OMAP1, AM33xx, DA8xx/OMAP-L13x, AM43xx and DRA7xx.
 
           This driver can also be built as a module, if so, module
           will be called rtc-omap.
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 69c87062b098..c31731c29762 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_DA9052)	+= rtc-da9052.o
 obj-$(CONFIG_RTC_DRV_DA9055)    += rtc-da9055.o
 obj-$(CONFIG_RTC_DRV_DA9063)    += rtc-da9063.o
 obj-$(CONFIG_RTC_DRV_DAVINCI)   += rtc-davinci.o
+obj-$(CONFIG_RTC_DRV_DIGICOLOR) += rtc-digicolor.o
 obj-$(CONFIG_RTC_DRV_DM355EVM)  += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_VRTC)      += rtc-mrst.o
 obj-$(CONFIG_RTC_DRV_DS1216)    += rtc-ds1216.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index c29ba7e14304..ea2a315df6b7 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -221,15 +221,15 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->pie_timer.function = rtc_pie_update_irq;
         rtc->pie_enabled = 0;
 
+        strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
+        dev_set_name(&rtc->dev, "rtc%d", id);
+
         /* Check to see if there is an ALARM already set in hw */
         err = __rtc_read_alarm(rtc, &alrm);
 
         if (!err && !rtc_valid_tm(&alrm.time))
                 rtc_initialize_alarm(rtc, &alrm);
 
-        strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
-        dev_set_name(&rtc->dev, "rtc%d", id);
-
         rtc_dev_prepare(rtc);
 
         err = device_register(&rtc->dev);
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
index 6c719f23520a..e1cfa06810ef 100644
--- a/drivers/rtc/hctosys.c
+++ b/drivers/rtc/hctosys.c
@@ -9,6 +9,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/rtc.h>
 
 /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary
@@ -32,8 +34,8 @@ static int __init rtc_hctosys(void)
         struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
 
         if (rtc == NULL) {
-                pr_err("%s: unable to open rtc device (%s)\n",
-                        __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
+                pr_info("unable to open rtc device (%s)\n",
+                        CONFIG_RTC_HCTOSYS_DEVICE);
                 goto err_open;
         }
 
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index d43ee409a5f2..166fc60d8b55 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -31,13 +31,14 @@ static int __rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm)
                 memset(tm, 0, sizeof(struct rtc_time));
                 err = rtc->ops->read_time(rtc->dev.parent, tm);
                 if (err < 0) {
-                        dev_err(&rtc->dev, "read_time: fail to read\n");
+                        dev_dbg(&rtc->dev, "read_time: fail to read: %d\n",
+                                err);
                         return err;
                 }
 
                 err = rtc_valid_tm(tm);
                 if (err < 0)
-                        dev_err(&rtc->dev, "read_time: rtc_time isn't valid\n");
+                        dev_dbg(&rtc->dev, "read_time: rtc_time isn't valid\n");
         }
         return err;
 }
diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c
index cfc2ef98d393..b5cbc1bf5a3e 100644
--- a/drivers/rtc/rtc-ab-b5ze-s3.c
+++ b/drivers/rtc/rtc-ab-b5ze-s3.c
@@ -881,7 +881,7 @@ static const struct rtc_class_ops rtc_ops = {
         .alarm_irq_enable = abb5zes3_rtc_alarm_irq_enable,
 };
 
-static struct regmap_config abb5zes3_rtc_regmap_config = {
+static const struct regmap_config abb5zes3_rtc_regmap_config = {
         .reg_bits = 8,
         .val_bits = 8,
 };
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index b283a1a573b3..35efd3f75b18 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -37,9 +37,9 @@
 #include "rtc-at91rm9200.h"
 
 #define at91_rtc_read(field) \
-        __raw_readl(at91_rtc_regs + field)
+        readl_relaxed(at91_rtc_regs + field)
 #define at91_rtc_write(field, val) \
-        __raw_writel((val), at91_rtc_regs + field)
+        writel_relaxed((val), at91_rtc_regs + field)
 
 #define AT91_RTC_EPOCH          1900UL  /* just like arch/arm/common/rtctime.c */
 
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 87647f459198..a82556a0757a 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -28,6 +28,9 @@
  * interrupts disabled, holding the global rtc_lock, to exclude those
  * other drivers and utilities on correctly configured systems.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -385,8 +388,7 @@ static bool alarm_disable_quirk;
 static int __init set_alarm_disable_quirk(const struct dmi_system_id *id)
 {
         alarm_disable_quirk = true;
-        pr_info("rtc-cmos: BIOS has alarm-disable quirk. ");
-        pr_info("RTC alarms disabled\n");
+        pr_info("BIOS has alarm-disable quirk - RTC alarms disabled\n");
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 613c43b7e9ae..1ba4371cbc2d 100644
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/err.h>
+#include <linux/delay.h>
 
 #include <linux/mfd/da9052/da9052.h>
 #include <linux/mfd/da9052/reg.h>
@@ -23,6 +24,8 @@
 #define rtc_err(rtc, fmt, ...) \
                 dev_err(rtc->da9052->dev, "%s: " fmt, __func__, ##__VA_ARGS__)
 
+#define DA9052_GET_TIME_RETRIES 5
+
 struct da9052_rtc {
         struct rtc_device *rtc;
         struct da9052 *da9052;
@@ -58,22 +61,43 @@ static irqreturn_t da9052_rtc_irq(int irq, void *data)
 static int da9052_read_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
 {
         int ret;
-        uint8_t v[5];
+        uint8_t v[2][5];
+        int idx = 1;
+        int timeout = DA9052_GET_TIME_RETRIES;
 
-        ret = da9052_group_read(rtc->da9052, DA9052_ALARM_MI_REG, 5, v);
-        if (ret != 0) {
+        ret = da9052_group_read(rtc->da9052, DA9052_ALARM_MI_REG, 5, &v[0][0]);
+        if (ret) {
                 rtc_err(rtc, "Failed to group read ALM: %d\n", ret);
                 return ret;
         }
 
-        rtc_tm->tm_year = (v[4] & DA9052_RTC_YEAR) + 100;
-        rtc_tm->tm_mon  = (v[3] & DA9052_RTC_MONTH) - 1;
-        rtc_tm->tm_mday = v[2] & DA9052_RTC_DAY;
-        rtc_tm->tm_hour = v[1] & DA9052_RTC_HOUR;
-        rtc_tm->tm_min  = v[0] & DA9052_RTC_MIN;
+        do {
+                ret = da9052_group_read(rtc->da9052,
+                                        DA9052_ALARM_MI_REG, 5, &v[idx][0]);
+                if (ret) {
+                        rtc_err(rtc, "Failed to group read ALM: %d\n", ret);
+                        return ret;
+                }
 
-        ret = rtc_valid_tm(rtc_tm);
-        return ret;
+                if (memcmp(&v[0][0], &v[1][0], 5) == 0) {
+                        rtc_tm->tm_year = (v[0][4] & DA9052_RTC_YEAR) + 100;
+                        rtc_tm->tm_mon  = (v[0][3] & DA9052_RTC_MONTH) - 1;
+                        rtc_tm->tm_mday = v[0][2] & DA9052_RTC_DAY;
+                        rtc_tm->tm_hour = v[0][1] & DA9052_RTC_HOUR;
+                        rtc_tm->tm_min  = v[0][0] & DA9052_RTC_MIN;
+
+                        ret = rtc_valid_tm(rtc_tm);
+                        return ret;
+                }
+
+                idx = (1-idx);
+                msleep(20);
+
+        } while (timeout--);
+
+        rtc_err(rtc, "Timed out reading alarm time\n");
+
+        return -EIO;
 }
 
 static int da9052_set_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
@@ -135,24 +159,45 @@ static int da9052_rtc_get_alarm_status(struct da9052_rtc *rtc)
 static int da9052_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
 {
         struct da9052_rtc *rtc = dev_get_drvdata(dev);
-        uint8_t v[6];
         int ret;
+        uint8_t v[2][6];
+        int idx = 1;
+        int timeout = DA9052_GET_TIME_RETRIES;
 
-        ret = da9052_group_read(rtc->da9052, DA9052_COUNT_S_REG, 6, v);
-        if (ret < 0) {
+        ret = da9052_group_read(rtc->da9052, DA9052_COUNT_S_REG, 6, &v[0][0]);
+        if (ret) {
                 rtc_err(rtc, "Failed to read RTC time : %d\n", ret);
                 return ret;
         }
 
-        rtc_tm->tm_year = (v[5] & DA9052_RTC_YEAR) + 100;
-        rtc_tm->tm_mon  = (v[4] & DA9052_RTC_MONTH) - 1;
-        rtc_tm->tm_mday = v[3] & DA9052_RTC_DAY;
-        rtc_tm->tm_hour = v[2] & DA9052_RTC_HOUR;
-        rtc_tm->tm_min  = v[1] & DA9052_RTC_MIN;
-        rtc_tm->tm_sec  = v[0] & DA9052_RTC_SEC;
+        do {
+                ret = da9052_group_read(rtc->da9052,
+                                        DA9052_COUNT_S_REG, 6, &v[idx][0]);
+                if (ret) {
+                        rtc_err(rtc, "Failed to read RTC time : %d\n", ret);
+                        return ret;
+                }
 
-        ret = rtc_valid_tm(rtc_tm);
-        return ret;
+                if (memcmp(&v[0][0], &v[1][0], 6) == 0) {
+                        rtc_tm->tm_year = (v[0][5] & DA9052_RTC_YEAR) + 100;
+                        rtc_tm->tm_mon  = (v[0][4] & DA9052_RTC_MONTH) - 1;
+                        rtc_tm->tm_mday = v[0][3] & DA9052_RTC_DAY;
+                        rtc_tm->tm_hour = v[0][2] & DA9052_RTC_HOUR;
+                        rtc_tm->tm_min  = v[0][1] & DA9052_RTC_MIN;
+                        rtc_tm->tm_sec  = v[0][0] & DA9052_RTC_SEC;
+
+                        ret = rtc_valid_tm(rtc_tm);
+                        return ret;
+                }
+
+                idx = (1-idx);
+                msleep(20);
+
+        } while (timeout--);
+
+        rtc_err(rtc, "Timed out reading time\n");
+
+        return -EIO;
 }
 
 static int da9052_rtc_set_time(struct device *dev, struct rtc_time *tm)
@@ -161,6 +206,10 @@ static int da9052_rtc_set_time(struct device *dev, struct rtc_time *tm)
         uint8_t v[6];
         int ret;
 
+        /* DA9052 only has 6 bits for year - to represent 2000-2063 */
+        if ((tm->tm_year < 100) || (tm->tm_year > 163))
+                return -EINVAL;
+
         rtc = dev_get_drvdata(dev);
 
         v[0] = tm->tm_sec;
@@ -198,6 +247,10 @@ static int da9052_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct rtc_time *tm = &alrm->time;
         struct da9052_rtc *rtc = dev_get_drvdata(dev);
 
+        /* DA9052 only has 6 bits for year - to represent 2000-2063 */
+        if ((tm->tm_year < 100) || (tm->tm_year > 163))
+                return -EINVAL;
+
         ret = da9052_rtc_enable_alarm(rtc, 0);
         if (ret < 0)
                 return ret;
@@ -256,6 +309,8 @@ static int da9052_rtc_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        device_init_wakeup(&pdev->dev, true);
+
         rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                        &da9052_rtc_ops, THIS_MODULE);
         return PTR_ERR_OR_ZERO(rtc->rtc);
diff --git a/drivers/rtc/rtc-digicolor.c b/drivers/rtc/rtc-digicolor.c
new file mode 100644
index 000000000000..8d05596a6765
--- /dev/null
+++ b/drivers/rtc/rtc-digicolor.c
@@ -0,0 +1,227 @@
+/*
+ * Real Time Clock driver for Conexant Digicolor
+ *
+ * Copyright (C) 2015 Paradox Innovation Ltd.
+ *
+ * Author: Baruch Siach <baruch@tkos.co.il>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/of.h>
+
+#define DC_RTC_CONTROL          0x0
+#define DC_RTC_TIME             0x8
+#define DC_RTC_REFERENCE        0xc
+#define DC_RTC_ALARM            0x10
+#define DC_RTC_INTFLAG_CLEAR    0x14
+#define DC_RTC_INTENABLE        0x16
+
+#define DC_RTC_CMD_MASK         0xf
+#define DC_RTC_GO_BUSY          BIT(7)
+
+#define CMD_NOP                 0
+#define CMD_RESET               1
+#define CMD_WRITE               3
+#define CMD_READ                4
+
+#define CMD_DELAY_US            (10*1000)
+#define CMD_TIMEOUT_US          (500*CMD_DELAY_US)
+
+struct dc_rtc {
+        struct rtc_device       *rtc_dev;
+        void __iomem            *regs;
+};
+
+static int dc_rtc_cmds(struct dc_rtc *rtc, const u8 *cmds, int len)
+{
+        u8 val;
+        int i, ret;
+
+        for (i = 0; i < len; i++) {
+                writeb_relaxed((cmds[i] & DC_RTC_CMD_MASK) | DC_RTC_GO_BUSY,
+                               rtc->regs + DC_RTC_CONTROL);
+                ret = readb_relaxed_poll_timeout(
+                        rtc->regs + DC_RTC_CONTROL, val,
+                        !(val & DC_RTC_GO_BUSY), CMD_DELAY_US, CMD_TIMEOUT_US);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int dc_rtc_read(struct dc_rtc *rtc, unsigned long *val)
+{
+        static const u8 read_cmds[] = {CMD_READ, CMD_NOP};
+        u32 reference, time1, time2;
+        int ret;
+
+        ret = dc_rtc_cmds(rtc, read_cmds, ARRAY_SIZE(read_cmds));
+        if (ret < 0)
+                return ret;
+
+        reference = readl_relaxed(rtc->regs + DC_RTC_REFERENCE);
+        time1 = readl_relaxed(rtc->regs + DC_RTC_TIME);
+        /* Read twice to ensure consistency */
+        while (1) {
+                time2 = readl_relaxed(rtc->regs + DC_RTC_TIME);
+                if (time1 == time2)
+                        break;
+                time1 = time2;
+        }
+
+        *val = reference + time1;
+        return 0;
+}
+
+static int dc_rtc_write(struct dc_rtc *rtc, u32 val)
+{
+        static const u8 write_cmds[] = {CMD_WRITE, CMD_NOP, CMD_RESET, CMD_NOP};
+
+        writel_relaxed(val, rtc->regs + DC_RTC_REFERENCE);
+        return dc_rtc_cmds(rtc, write_cmds, ARRAY_SIZE(write_cmds));
+}
+
+static int dc_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct dc_rtc *rtc = dev_get_drvdata(dev);
+        unsigned long now;
+        int ret;
+
+        ret = dc_rtc_read(rtc, &now);
+        if (ret < 0)
+                return ret;
+        rtc_time64_to_tm(now, tm);
+
+        return 0;
+}
+
+static int dc_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+        struct dc_rtc *rtc = dev_get_drvdata(dev);
+
+        return dc_rtc_write(rtc, secs);
+}
+
+static int dc_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        struct dc_rtc *rtc = dev_get_drvdata(dev);
+        u32 alarm_reg, reference;
+        unsigned long now;
+        int ret;
+
+        alarm_reg = readl_relaxed(rtc->regs + DC_RTC_ALARM);
+        reference = readl_relaxed(rtc->regs + DC_RTC_REFERENCE);
+        rtc_time64_to_tm(reference + alarm_reg, &alarm->time);
+
+        ret = dc_rtc_read(rtc, &now);
+        if (ret < 0)
+                return ret;
+
+        alarm->pending = alarm_reg + reference > now;
+        alarm->enabled = readl_relaxed(rtc->regs + DC_RTC_INTENABLE);
+
+        return 0;
+}
+
+static int dc_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        struct dc_rtc *rtc = dev_get_drvdata(dev);
+        time64_t alarm_time;
+        u32 reference;
+
+        alarm_time = rtc_tm_to_time64(&alarm->time);
+
+        reference = readl_relaxed(rtc->regs + DC_RTC_REFERENCE);
+        writel_relaxed(alarm_time - reference, rtc->regs + DC_RTC_ALARM);
+
+        writeb_relaxed(!!alarm->enabled, rtc->regs + DC_RTC_INTENABLE);
+
+        return 0;
+}
+
+static int dc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct dc_rtc *rtc = dev_get_drvdata(dev);
+
+        writeb_relaxed(!!enabled, rtc->regs + DC_RTC_INTENABLE);
+
+        return 0;
+}
+
+static struct rtc_class_ops dc_rtc_ops = {
+        .read_time              = dc_rtc_read_time,
+        .set_mmss               = dc_rtc_set_mmss,
+        .read_alarm             = dc_rtc_read_alarm,
+        .set_alarm              = dc_rtc_set_alarm,
+        .alarm_irq_enable       = dc_rtc_alarm_irq_enable,
+};
+
+static irqreturn_t dc_rtc_irq(int irq, void *dev_id)
+{
+        struct dc_rtc *rtc = dev_id;
+
+        writeb_relaxed(1, rtc->regs + DC_RTC_INTFLAG_CLEAR);
+        rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
+
+        return IRQ_HANDLED;
+}
+
+static int __init dc_rtc_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct dc_rtc *rtc;
+        int irq, ret;
+
+        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
+        if (!rtc)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rtc->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(rtc->regs))
+                return PTR_ERR(rtc->regs);
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+        ret = devm_request_irq(&pdev->dev, irq, dc_rtc_irq, 0, pdev->name, rtc);
+        if (ret < 0)
+                return ret;
+
+        platform_set_drvdata(pdev, rtc);
+        rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                                &dc_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc->rtc_dev))
+                return PTR_ERR(rtc->rtc_dev);
+
+        return 0;
+}
+
+static const struct of_device_id dc_dt_ids[] = {
+        { .compatible = "cnxt,cx92755-rtc" },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, dc_dt_ids);
+
+static struct platform_driver dc_rtc_driver = {
+        .driver = {
+                .name = "digicolor_rtc",
+                .of_match_table = of_match_ptr(dc_dt_ids),
+        },
+};
+module_platform_driver_probe(dc_rtc_driver, dc_rtc_probe);
+
+MODULE_AUTHOR("Baruch Siach <baruch@tkos.co.il>");
+MODULE_DESCRIPTION("Conexant Digicolor Realtime Clock Driver (RTC)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 8605fde394b2..167783fa7ac1 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -18,6 +18,8 @@
  * "Sending and receiving", using SMBus level communication is preferred.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -406,7 +408,7 @@ static int ds1374_wdt_settimeout(unsigned int timeout)
         /* Set new watchdog time */
         ret = ds1374_write_rtc(save_client, timeout, DS1374_REG_WDALM0, 3);
         if (ret) {
-                pr_info("rtc-ds1374 - couldn't set new watchdog time\n");
+                pr_info("couldn't set new watchdog time\n");
                 goto out;
         }
 
@@ -539,12 +541,12 @@ static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd,
                         return -EFAULT;
 
                 if (options & WDIOS_DISABLECARD) {
-                        pr_info("rtc-ds1374: disable watchdog\n");
+                        pr_info("disable watchdog\n");
                         ds1374_wdt_disable();
                 }
 
                 if (options & WDIOS_ENABLECARD) {
-                        pr_info("rtc-ds1374: enable watchdog\n");
+                        pr_info("enable watchdog\n");
                         ds1374_wdt_settimeout(wdt_margin);
                         ds1374_wdt_ping();
                 }
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 803869c7d7c2..818a3635a8c8 100644
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -16,6 +16,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/bcd.h>
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -799,7 +801,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
         struct platform_device *pdev = to_platform_device(dev);
         struct ds1685_priv *rtc = platform_get_drvdata(pdev);
         u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8];
-        char *model = '\0';
+        char *model;
 #ifdef CONFIG_RTC_DS1685_PROC_REGS
         char bits[NUM_REGS][(NUM_BITS * NUM_SPACES) + NUM_BITS + 1];
 #endif
@@ -2139,7 +2141,6 @@ ds1685_rtc_remove(struct platform_device *pdev)
 static struct platform_driver ds1685_rtc_driver = {
         .driver         = {
                 .name   = "rtc-ds1685",
-                .owner  = THIS_MODULE,
         },
         .probe          = ds1685_rtc_probe,
         .remove         = ds1685_rtc_remove,
@@ -2175,7 +2176,7 @@ module_exit(ds1685_rtc_exit);
  * ds1685_rtc_poweroff - uses the RTC chip to power the system off.
  * @pdev: pointer to platform_device structure.
  */
-extern void __noreturn
+void __noreturn
 ds1685_rtc_poweroff(struct platform_device *pdev)
 {
         u8 ctrla, ctrl4a, ctrl4b;
@@ -2183,7 +2184,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev)
 
         /* Check for valid RTC data, else, spin forever. */
         if (unlikely(!pdev)) {
-                pr_emerg("rtc-ds1685: platform device data not available, spinning forever ...\n");
+                pr_emerg("platform device data not available, spinning forever ...\n");
                 unreachable();
         } else {
                 /* Get the rtc data. */
diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index adaf06c41479..7e48e532214f 100644
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -15,6 +15,8 @@
  * "Sending and receiving", using SMBus level communication is preferred.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -373,8 +375,8 @@ static void ds3232_work(struct work_struct *work)
         if (stat & DS3232_REG_SR_A1F) {
                 control = i2c_smbus_read_byte_data(client, DS3232_REG_CR);
                 if (control < 0) {
-                        pr_warn("Read DS3232 Control Register error."
-                                "Disable IRQ%d.\n", client->irq);
+                        pr_warn("Read Control Register error - Disable IRQ%d\n",
+                                client->irq);
                 } else {
                         /* disable alarm1 interrupt */
                         control &= ~(DS3232_REG_CR_A1IE);
diff --git a/drivers/rtc/rtc-efi-platform.c b/drivers/rtc/rtc-efi-platform.c
index b40fbe332af4..1a7f1d1bc174 100644
--- a/drivers/rtc/rtc-efi-platform.c
+++ b/drivers/rtc/rtc-efi-platform.c
@@ -8,6 +8,9 @@
  * Copyright (C) 1999-2000 VA Linux Systems
  * Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com>
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index fccf36699245..4f4930a2004c 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -15,6 +15,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/module.h>
+#include <linux/of.h>
 
 /* Registers */
 #define EM3027_REG_ON_OFF_CTRL  0x00
@@ -135,10 +136,20 @@ static struct i2c_device_id em3027_id[] = {
         { "em3027", 0 },
         { }
 };
+MODULE_DEVICE_TABLE(i2c, em3027_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id em3027_of_match[] = {
+        { .compatible = "emmicro,em3027", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, em3027_of_match);
+#endif
 
 static struct i2c_driver em3027_driver = {
         .driver = {
                    .name = "rtc-em3027",
+                   .of_match_table = of_match_ptr(em3027_of_match),
         },
         .probe = &em3027_probe,
         .id_table = em3027_id,
diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c
index b936bb4096b5..0f710e98538f 100644
--- a/drivers/rtc/rtc-hym8563.c
+++ b/drivers/rtc/rtc-hym8563.c
@@ -66,7 +66,7 @@
 #define HYM8563_ALM_BIT_DISABLE BIT(7)
 
 #define HYM8563_CLKOUT          0x0d
-#define HYM8563_CLKOUT_DISABLE  BIT(7)
+#define HYM8563_CLKOUT_ENABLE   BIT(7)
 #define HYM8563_CLKOUT_32768    0
 #define HYM8563_CLKOUT_1024     1
 #define HYM8563_CLKOUT_32       2
@@ -309,7 +309,7 @@ static unsigned long hym8563_clkout_recalc_rate(struct clk_hw *hw,
         struct i2c_client *client = hym8563->client;
         int ret = i2c_smbus_read_byte_data(client, HYM8563_CLKOUT);
 
-        if (ret < 0 || ret & HYM8563_CLKOUT_DISABLE)
+        if (ret < 0)
                 return 0;
 
         ret &= HYM8563_CLKOUT_MASK;
@@ -360,9 +360,9 @@ static int hym8563_clkout_control(struct clk_hw *hw, bool enable)
                 return ret;
 
         if (enable)
-                ret &= ~HYM8563_CLKOUT_DISABLE;
+                ret |= HYM8563_CLKOUT_ENABLE;
         else
-                ret |= HYM8563_CLKOUT_DISABLE;
+                ret &= ~HYM8563_CLKOUT_ENABLE;
 
         return i2c_smbus_write_byte_data(client, HYM8563_CLKOUT, ret);
 }
@@ -386,7 +386,7 @@ static int hym8563_clkout_is_prepared(struct clk_hw *hw)
         if (ret < 0)
                 return ret;
 
-        return !(ret & HYM8563_CLKOUT_DISABLE);
+        return !!(ret & HYM8563_CLKOUT_ENABLE);
 }
 
 static const struct clk_ops hym8563_clkout_ops = {
@@ -407,7 +407,7 @@ static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563)
         int ret;
 
         ret = i2c_smbus_write_byte_data(client, HYM8563_CLKOUT,
-                                                HYM8563_CLKOUT_DISABLE);
+                                                0);
         if (ret < 0)
                 return ERR_PTR(ret);
 
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 7ff7427c2e6a..a82937e2f824 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/bcd.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
@@ -513,12 +515,12 @@ static int wdt_ioctl(struct file *file, unsigned int cmd,
                         return -EFAULT;
 
                 if (rv & WDIOS_DISABLECARD) {
-                        pr_info("rtc-m41t80: disable watchdog\n");
+                        pr_info("disable watchdog\n");
                         wdt_disable();
                 }
 
                 if (rv & WDIOS_ENABLECARD) {
-                        pr_info("rtc-m41t80: enable watchdog\n");
+                        pr_info("enable watchdog\n");
                         wdt_ping();
                 }
 
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 9d71328e59b9..7632a87784c3 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -12,6 +12,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
@@ -103,8 +105,8 @@ static int max77686_rtc_tm_to_data(struct rtc_time *tm, u8 *data)
         data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
 
         if (tm->tm_year < 100) {
-                pr_warn("%s: MAX77686 RTC cannot handle the year %d."
-                        "Assume it's 2000.\n", __func__, 1900 + tm->tm_year);
+                pr_warn("RTC cannot handle the year %d.  Assume it's 2000.\n",
+                        1900 + tm->tm_year);
                 return -EINVAL;
         }
         return 0;
diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
index 67fbe559d535..9e02bcda0c09 100644
--- a/drivers/rtc/rtc-max8997.c
+++ b/drivers/rtc/rtc-max8997.c
@@ -12,6 +12,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
@@ -107,8 +109,8 @@ static int max8997_rtc_tm_to_data(struct rtc_time *tm, u8 *data)
         data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
 
         if (tm->tm_year < 100) {
-                pr_warn("%s: MAX8997 RTC cannot handle the year %d."
-                        "Assume it's 2000.\n", __func__, 1900 + tm->tm_year);
+                pr_warn("RTC cannot handle the year %d.  Assume it's 2000.\n",
+                        1900 + tm->tm_year);
                 return -EINVAL;
         }
         return 0;
@@ -424,7 +426,7 @@ static void max8997_rtc_enable_smpl(struct max8997_rtc_info *info, bool enable)
 
         val = 0;
         max8997_read_reg(info->rtc, MAX8997_RTC_WTSR_SMPL, &val);
-        pr_info("%s: WTSR_SMPL(0x%02x)\n", __func__, val);
+        pr_info("WTSR_SMPL(0x%02x)\n", val);
 }
 
 static int max8997_rtc_init_reg(struct max8997_rtc_info *info)
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c
index 9bf877bdf836..c1c5c4e3b3b4 100644
--- a/drivers/rtc/rtc-msm6242.c
+++ b/drivers/rtc/rtc-msm6242.c
@@ -7,6 +7,8 @@
  *  Copyright (C) 1993 Hamish Macdonald
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -111,7 +113,7 @@ static void msm6242_lock(struct msm6242_priv *priv)
         }
 
         if (!cnt)
-                pr_warn("msm6242: timed out waiting for RTC (0x%x)\n",
+                pr_warn("timed out waiting for RTC (0x%x)\n",
                         msm6242_read(priv, MSM6242_CD));
 }
 
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 8e5851aa4369..8b6355ffaff9 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -118,12 +118,15 @@
 #define KICK0_VALUE                     0x83e70b13
 #define KICK1_VALUE                     0x95a4f1e0
 
+struct omap_rtc;
+
 struct omap_rtc_device_type {
         bool has_32kclk_en;
-        bool has_kicker;
         bool has_irqwakeen;
         bool has_pmic_mode;
         bool has_power_up_reset;
+        void (*lock)(struct omap_rtc *rtc);
+        void (*unlock)(struct omap_rtc *rtc);
 };
 
 struct omap_rtc {
@@ -156,6 +159,26 @@ static inline void rtc_writel(struct omap_rtc *rtc, unsigned int reg, u32 val)
         writel(val, rtc->base + reg);
 }
 
+static void am3352_rtc_unlock(struct omap_rtc *rtc)
+{
+        rtc_writel(rtc, OMAP_RTC_KICK0_REG, KICK0_VALUE);
+        rtc_writel(rtc, OMAP_RTC_KICK1_REG, KICK1_VALUE);
+}
+
+static void am3352_rtc_lock(struct omap_rtc *rtc)
+{
+        rtc_writel(rtc, OMAP_RTC_KICK0_REG, 0);
+        rtc_writel(rtc, OMAP_RTC_KICK1_REG, 0);
+}
+
+static void default_rtc_unlock(struct omap_rtc *rtc)
+{
+}
+
+static void default_rtc_lock(struct omap_rtc *rtc)
+{
+}
+
 /*
  * We rely on the rtc framework to handle locking (rtc->ops_lock),
  * so the only other requirement is that register accesses which
@@ -186,7 +209,9 @@ static irqreturn_t rtc_irq(int irq, void *dev_id)
 
         /* alarm irq? */
         if (irq_data & OMAP_RTC_STATUS_ALARM) {
+                rtc->type->unlock(rtc);
                 rtc_write(rtc, OMAP_RTC_STATUS_REG, OMAP_RTC_STATUS_ALARM);
+                rtc->type->lock(rtc);
                 events |= RTC_IRQF | RTC_AF;
         }
 
@@ -218,9 +243,11 @@ static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
                 irqwake_reg &= ~OMAP_RTC_IRQWAKEEN_ALARM_WAKEEN;
         }
         rtc_wait_not_busy(rtc);
+        rtc->type->unlock(rtc);
         rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, reg);
         if (rtc->type->has_irqwakeen)
                 rtc_write(rtc, OMAP_RTC_IRQWAKEEN, irqwake_reg);
+        rtc->type->lock(rtc);
         local_irq_enable();
 
         return 0;
@@ -293,12 +320,14 @@ static int omap_rtc_set_time(struct device *dev, struct rtc_time *tm)
         local_irq_disable();
         rtc_wait_not_busy(rtc);
 
+        rtc->type->unlock(rtc);
         rtc_write(rtc, OMAP_RTC_YEARS_REG, tm->tm_year);
         rtc_write(rtc, OMAP_RTC_MONTHS_REG, tm->tm_mon);
         rtc_write(rtc, OMAP_RTC_DAYS_REG, tm->tm_mday);
         rtc_write(rtc, OMAP_RTC_HOURS_REG, tm->tm_hour);
         rtc_write(rtc, OMAP_RTC_MINUTES_REG, tm->tm_min);
         rtc_write(rtc, OMAP_RTC_SECONDS_REG, tm->tm_sec);
+        rtc->type->lock(rtc);
 
         local_irq_enable();
 
@@ -341,6 +370,7 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
         local_irq_disable();
         rtc_wait_not_busy(rtc);
 
+        rtc->type->unlock(rtc);
         rtc_write(rtc, OMAP_RTC_ALARM_YEARS_REG, alm->time.tm_year);
         rtc_write(rtc, OMAP_RTC_ALARM_MONTHS_REG, alm->time.tm_mon);
         rtc_write(rtc, OMAP_RTC_ALARM_DAYS_REG, alm->time.tm_mday);
@@ -362,6 +392,7 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
         rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, reg);
         if (rtc->type->has_irqwakeen)
                 rtc_write(rtc, OMAP_RTC_IRQWAKEEN, irqwake_reg);
+        rtc->type->lock(rtc);
 
         local_irq_enable();
 
@@ -391,6 +422,7 @@ static void omap_rtc_power_off(void)
         unsigned long now;
         u32 val;
 
+        rtc->type->unlock(rtc);
         /* enable pmic_power_en control */
         val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
         rtc_writel(rtc, OMAP_RTC_PMIC_REG, val | OMAP_RTC_PMIC_POWER_EN_EN);
@@ -423,6 +455,7 @@ static void omap_rtc_power_off(void)
         val = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
         rtc_writel(rtc, OMAP_RTC_INTERRUPTS_REG,
                         val | OMAP_RTC_INTERRUPTS_IT_ALARM2);
+        rtc->type->lock(rtc);
 
         /*
          * Wait for alarm to trigger (within two seconds) and external PMIC to
@@ -442,17 +475,21 @@ static struct rtc_class_ops omap_rtc_ops = {
 
 static const struct omap_rtc_device_type omap_rtc_default_type = {
         .has_power_up_reset = true,
+        .lock           = default_rtc_lock,
+        .unlock         = default_rtc_unlock,
 };
 
 static const struct omap_rtc_device_type omap_rtc_am3352_type = {
         .has_32kclk_en  = true,
-        .has_kicker     = true,
         .has_irqwakeen  = true,
         .has_pmic_mode  = true,
+        .lock           = am3352_rtc_lock,
+        .unlock         = am3352_rtc_unlock,
 };
 
 static const struct omap_rtc_device_type omap_rtc_da830_type = {
-        .has_kicker     = true,
+        .lock           = am3352_rtc_lock,
+        .unlock         = am3352_rtc_unlock,
 };
 
 static const struct platform_device_id omap_rtc_id_table[] = {
@@ -484,7 +521,7 @@ static const struct of_device_id omap_rtc_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, omap_rtc_of_match);
 
-static int __init omap_rtc_probe(struct platform_device *pdev)
+static int omap_rtc_probe(struct platform_device *pdev)
 {
         struct omap_rtc *rtc;
         struct resource *res;
@@ -527,10 +564,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_get_sync(&pdev->dev);
 
-        if (rtc->type->has_kicker) {
-                rtc_writel(rtc, OMAP_RTC_KICK0_REG, KICK0_VALUE);
-                rtc_writel(rtc, OMAP_RTC_KICK1_REG, KICK1_VALUE);
-        }
+        rtc->type->unlock(rtc);
 
         /*
          * disable interrupts
@@ -593,6 +627,8 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         if (reg != new_ctrl)
                 rtc_write(rtc, OMAP_RTC_CTRL_REG, new_ctrl);
 
+        rtc->type->lock(rtc);
+
         device_init_wakeup(&pdev->dev, true);
 
         rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
@@ -626,8 +662,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
 
 err:
         device_init_wakeup(&pdev->dev, false);
-        if (rtc->type->has_kicker)
-                rtc_writel(rtc, OMAP_RTC_KICK0_REG, 0);
+        rtc->type->lock(rtc);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
@@ -646,11 +681,11 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
 
         device_init_wakeup(&pdev->dev, 0);
 
+        rtc->type->unlock(rtc);
         /* leave rtc running, but disable irqs */
         rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
 
-        if (rtc->type->has_kicker)
-                rtc_writel(rtc, OMAP_RTC_KICK0_REG, 0);
+        rtc->type->lock(rtc);
 
         /* Disable the clock/module */
         pm_runtime_put_sync(&pdev->dev);
@@ -666,6 +701,7 @@ static int omap_rtc_suspend(struct device *dev)
 
         rtc->interrupts_reg = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
 
+        rtc->type->unlock(rtc);
         /*
          * FIXME: the RTC alarm is not currently acting as a wakeup event
          * source on some platforms, and in fact this enable() call is just
@@ -675,6 +711,7 @@ static int omap_rtc_suspend(struct device *dev)
                 enable_irq_wake(rtc->irq_alarm);
         else
                 rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
+        rtc->type->lock(rtc);
 
         /* Disable the clock/module */
         pm_runtime_put_sync(dev);
@@ -689,10 +726,12 @@ static int omap_rtc_resume(struct device *dev)
         /* Enable the clock/module so that we can access the registers */
         pm_runtime_get_sync(dev);
 
+        rtc->type->unlock(rtc);
         if (device_may_wakeup(dev))
                 disable_irq_wake(rtc->irq_alarm);
         else
                 rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, rtc->interrupts_reg);
+        rtc->type->lock(rtc);
 
         return 0;
 }
@@ -709,12 +748,15 @@ static void omap_rtc_shutdown(struct platform_device *pdev)
          * Keep the ALARM interrupt enabled to allow the system to power up on
          * alarm events.
          */
+        rtc->type->unlock(rtc);
         mask = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
         mask &= OMAP_RTC_INTERRUPTS_IT_ALARM;
         rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, mask);
+        rtc->type->lock(rtc);
 }
 
 static struct platform_driver omap_rtc_driver = {
+        .probe          = omap_rtc_probe,
         .remove         = __exit_p(omap_rtc_remove),
         .shutdown       = omap_rtc_shutdown,
         .driver         = {
@@ -725,7 +767,7 @@ static struct platform_driver omap_rtc_driver = {
         .id_table       = omap_rtc_id_table,
 };
 
-module_platform_driver_probe(omap_rtc_driver, omap_rtc_probe);
+module_platform_driver(omap_rtc_driver);
 
 MODULE_ALIAS("platform:omap_rtc");
 MODULE_AUTHOR("George G. Davis (and others)");
diff --git a/drivers/rtc/rtc-opal.c b/drivers/rtc/rtc-opal.c
index 95f652165fe9..7061dcae2b09 100644
--- a/drivers/rtc/rtc-opal.c
+++ b/drivers/rtc/rtc-opal.c
@@ -16,8 +16,9 @@
  * along with this program.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DRVNAME         "rtc-opal"
-#define pr_fmt(fmt)     DRVNAME ": " fmt
 
 #include <linux/module.h>
 #include <linux/err.h>
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 96fb32e7d6f8..0ba7e59929be 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -246,7 +246,6 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
         struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
-        int err;
         unsigned char buf[9];
 
         dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
@@ -272,12 +271,8 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         buf[PCF8563_REG_DW] = tm->tm_wday & 0x07;
 
-        err = pcf8563_write_block_data(client, PCF8563_REG_SC,
+        return pcf8563_write_block_data(client, PCF8563_REG_SC,
                                 9 - PCF8563_REG_SC, buf + PCF8563_REG_SC);
-        if (err)
-                return err;
-
-        return 0;
 }
 
 #ifdef CONFIG_RTC_INTF_DEV
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index f4cf6851fae9..76cbad7a99d3 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -39,7 +39,6 @@ struct s3c_rtc {
         void __iomem *base;
         struct clk *rtc_clk;
         struct clk *rtc_src_clk;
-        bool enabled;
 
         struct s3c_rtc_data *data;
 
@@ -67,26 +66,25 @@ struct s3c_rtc_data {
         void (*disable) (struct s3c_rtc *info);
 };
 
-static void s3c_rtc_alarm_clk_enable(struct s3c_rtc *info, bool enable)
+static void s3c_rtc_enable_clk(struct s3c_rtc *info)
 {
         unsigned long irq_flags;
 
         spin_lock_irqsave(&info->alarm_clk_lock, irq_flags);
-        if (enable) {
-                if (!info->enabled) {
-                        clk_enable(info->rtc_clk);
-                        if (info->data->needs_src_clk)
-                                clk_enable(info->rtc_src_clk);
-                        info->enabled = true;
-                }
-        } else {
-                if (info->enabled) {
-                        if (info->data->needs_src_clk)
-                                clk_disable(info->rtc_src_clk);
-                        clk_disable(info->rtc_clk);
-                        info->enabled = false;
-                }
-        }
+        clk_enable(info->rtc_clk);
+        if (info->data->needs_src_clk)
+                clk_enable(info->rtc_src_clk);
+        spin_unlock_irqrestore(&info->alarm_clk_lock, irq_flags);
+}
+
+static void s3c_rtc_disable_clk(struct s3c_rtc *info)
+{
+        unsigned long irq_flags;
+
+        spin_lock_irqsave(&info->alarm_clk_lock, irq_flags);
+        if (info->data->needs_src_clk)
+                clk_disable(info->rtc_src_clk);
+        clk_disable(info->rtc_clk);
         spin_unlock_irqrestore(&info->alarm_clk_lock, irq_flags);
 }
 
@@ -119,20 +117,16 @@ static int s3c_rtc_setaie(struct device *dev, unsigned int enabled)
 
         dev_dbg(info->dev, "%s: aie=%d\n", __func__, enabled);
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
+
         tmp = readb(info->base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
 
         if (enabled)
                 tmp |= S3C2410_RTCALM_ALMEN;
 
         writeb(tmp, info->base + S3C2410_RTCALM);
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
 
-        s3c_rtc_alarm_clk_enable(info, enabled);
+        s3c_rtc_disable_clk(info);
 
         return 0;
 }
@@ -143,18 +137,12 @@ static int s3c_rtc_setfreq(struct s3c_rtc *info, int freq)
         if (!is_power_of_2(freq))
                 return -EINVAL;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
         spin_lock_irq(&info->pie_lock);
 
         if (info->data->set_freq)
                 info->data->set_freq(info, freq);
 
         spin_unlock_irq(&info->pie_lock);
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
 
         return 0;
 }
@@ -165,9 +153,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
         struct s3c_rtc *info = dev_get_drvdata(dev);
         unsigned int have_retried = 0;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
 
  retry_get_time:
         rtc_tm->tm_min  = readb(info->base + S3C2410_RTCMIN);
@@ -194,6 +180,8 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
         rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
         rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
 
+        s3c_rtc_disable_clk(info);
+
         rtc_tm->tm_year += 100;
 
         dev_dbg(dev, "read time %04d.%02d.%02d %02d:%02d:%02d\n",
@@ -202,10 +190,6 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
 
         rtc_tm->tm_mon -= 1;
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
         return rtc_valid_tm(rtc_tm);
 }
 
@@ -225,9 +209,7 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
                 return -EINVAL;
         }
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
 
         writeb(bin2bcd(tm->tm_sec),  info->base + S3C2410_RTCSEC);
         writeb(bin2bcd(tm->tm_min),  info->base + S3C2410_RTCMIN);
@@ -236,9 +218,7 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
         writeb(bin2bcd(tm->tm_mon + 1), info->base + S3C2410_RTCMON);
         writeb(bin2bcd(year), info->base + S3C2410_RTCYEAR);
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
+        s3c_rtc_disable_clk(info);
 
         return 0;
 }
@@ -249,9 +229,7 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct rtc_time *alm_tm = &alrm->time;
         unsigned int alm_en;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
 
         alm_tm->tm_sec  = readb(info->base + S3C2410_ALMSEC);
         alm_tm->tm_min  = readb(info->base + S3C2410_ALMMIN);
@@ -262,6 +240,8 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         alm_en = readb(info->base + S3C2410_RTCALM);
 
+        s3c_rtc_disable_clk(info);
+
         alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
 
         dev_dbg(dev, "read alarm %d, %04d.%02d.%02d %02d:%02d:%02d\n",
@@ -269,9 +249,7 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
                  1900 + alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
                  alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec);
 
-
         /* decode the alarm enable field */
-
         if (alm_en & S3C2410_RTCALM_SECEN)
                 alm_tm->tm_sec = bcd2bin(alm_tm->tm_sec);
         else
@@ -304,10 +282,6 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
         else
                 alm_tm->tm_year = -1;
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
         return 0;
 }
 
@@ -317,15 +291,13 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct rtc_time *tm = &alrm->time;
         unsigned int alrm_en;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
-
         dev_dbg(dev, "s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
                  alrm->enabled,
                  1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
                  tm->tm_hour, tm->tm_min, tm->tm_sec);
 
+        s3c_rtc_enable_clk(info);
+
         alrm_en = readb(info->base + S3C2410_RTCALM) & S3C2410_RTCALM_ALMEN;
         writeb(0x00, info->base + S3C2410_RTCALM);
 
@@ -348,11 +320,9 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         writeb(alrm_en, info->base + S3C2410_RTCALM);
 
-        s3c_rtc_setaie(dev, alrm->enabled);
+        s3c_rtc_disable_clk(info);
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
+        s3c_rtc_setaie(dev, alrm->enabled);
 
         return 0;
 }
@@ -361,16 +331,12 @@ static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
 
         if (info->data->enable_tick)
                 info->data->enable_tick(info, seq);
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
+        s3c_rtc_disable_clk(info);
 
         return 0;
 }
@@ -388,10 +354,6 @@ static void s3c24xx_rtc_enable(struct s3c_rtc *info)
 {
         unsigned int con, tmp;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
-
         con = readw(info->base + S3C2410_RTCCON);
         /* re-enable the device, and check it is ok */
         if ((con & S3C2410_RTCCON_RTCEN) == 0) {
@@ -417,20 +379,12 @@ static void s3c24xx_rtc_enable(struct s3c_rtc *info)
                 writew(tmp & ~S3C2410_RTCCON_CLKRST,
                         info->base + S3C2410_RTCCON);
         }
-
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
 }
 
 static void s3c24xx_rtc_disable(struct s3c_rtc *info)
 {
         unsigned int con;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
-
         con = readw(info->base + S3C2410_RTCCON);
         con &= ~S3C2410_RTCCON_RTCEN;
         writew(con, info->base + S3C2410_RTCCON);
@@ -438,28 +392,16 @@ static void s3c24xx_rtc_disable(struct s3c_rtc *info)
         con = readb(info->base + S3C2410_TICNT);
         con &= ~S3C2410_TICNT_ENABLE;
         writeb(con, info->base + S3C2410_TICNT);
-
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
 }
 
 static void s3c6410_rtc_disable(struct s3c_rtc *info)
 {
         unsigned int con;
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
-
         con = readw(info->base + S3C2410_RTCCON);
         con &= ~S3C64XX_RTCCON_TICEN;
         con &= ~S3C2410_RTCCON_RTCEN;
         writew(con, info->base + S3C2410_RTCCON);
-
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
 }
 
 static int s3c_rtc_remove(struct platform_device *pdev)
@@ -554,6 +496,20 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
         device_init_wakeup(&pdev->dev, 1);
 
+        /* Check RTC Time */
+        if (s3c_rtc_gettime(&pdev->dev, &rtc_tm)) {
+                rtc_tm.tm_year  = 100;
+                rtc_tm.tm_mon   = 0;
+                rtc_tm.tm_mday  = 1;
+                rtc_tm.tm_hour  = 0;
+                rtc_tm.tm_min   = 0;
+                rtc_tm.tm_sec   = 0;
+
+                s3c_rtc_settime(&pdev->dev, &rtc_tm);
+
+                dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
+        }
+
         /* register RTC and exit */
         info->rtc = devm_rtc_device_register(&pdev->dev, "s3c", &s3c_rtcops,
                                   THIS_MODULE);
@@ -577,36 +533,21 @@ static int s3c_rtc_probe(struct platform_device *pdev)
                 goto err_nortc;
         }
 
-        /* Check RTC Time */
-        s3c_rtc_gettime(&pdev->dev, &rtc_tm);
-
-        if (rtc_valid_tm(&rtc_tm)) {
-                rtc_tm.tm_year  = 100;
-                rtc_tm.tm_mon   = 0;
-                rtc_tm.tm_mday  = 1;
-                rtc_tm.tm_hour  = 0;
-                rtc_tm.tm_min   = 0;
-                rtc_tm.tm_sec   = 0;
-
-                s3c_rtc_settime(&pdev->dev, &rtc_tm);
-
-                dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
-        }
-
         if (info->data->select_tick_clk)
                 info->data->select_tick_clk(info);
 
         s3c_rtc_setfreq(info, 1);
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
+        s3c_rtc_disable_clk(info);
 
         return 0;
 
  err_nortc:
         if (info->data->disable)
                 info->data->disable(info);
+
+        if (info->data->needs_src_clk)
+                clk_disable_unprepare(info->rtc_src_clk);
         clk_disable_unprepare(info->rtc_clk);
 
         return ret;
@@ -618,9 +559,7 @@ static int s3c_rtc_suspend(struct device *dev)
 {
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
+        s3c_rtc_enable_clk(info);
 
         /* save TICNT for anyone using periodic interrupts */
         if (info->data->save_tick_cnt)
@@ -636,10 +575,6 @@ static int s3c_rtc_suspend(struct device *dev)
                         dev_err(dev, "enable_irq_wake failed\n");
         }
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
         return 0;
 }
 
@@ -647,25 +582,19 @@ static int s3c_rtc_resume(struct device *dev)
 {
         struct s3c_rtc *info = dev_get_drvdata(dev);
 
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
-
         if (info->data->enable)
                 info->data->enable(info);
 
         if (info->data->restore_tick_cnt)
                 info->data->restore_tick_cnt(info);
 
+        s3c_rtc_disable_clk(info);
+
         if (device_may_wakeup(dev) && info->wake_en) {
                 disable_irq_wake(info->irq_alarm);
                 info->wake_en = false;
         }
 
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
         return 0;
 }
 #endif
@@ -673,29 +602,13 @@ static SIMPLE_DEV_PM_OPS(s3c_rtc_pm_ops, s3c_rtc_suspend, s3c_rtc_resume);
 
 static void s3c24xx_rtc_irq(struct s3c_rtc *info, int mask)
 {
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
         rtc_update_irq(info->rtc, 1, RTC_AF | RTC_IRQF);
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
-        s3c_rtc_alarm_clk_enable(info, false);
 }
 
 static void s3c6410_rtc_irq(struct s3c_rtc *info, int mask)
 {
-        clk_enable(info->rtc_clk);
-        if (info->data->needs_src_clk)
-                clk_enable(info->rtc_src_clk);
         rtc_update_irq(info->rtc, 1, RTC_AF | RTC_IRQF);
         writeb(mask, info->base + S3C2410_INTP);
-        if (info->data->needs_src_clk)
-                clk_disable(info->rtc_src_clk);
-        clk_disable(info->rtc_clk);
-
-        s3c_rtc_alarm_clk_enable(info, false);
 }
 
 static void s3c2410_rtc_setfreq(struct s3c_rtc *info, int freq)
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 4008b84246ca..8c70d785ba73 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -15,6 +15,8 @@
  *  GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/bcd.h>
@@ -90,7 +92,7 @@ struct s5m_rtc_info {
         struct regmap *regmap;
         struct rtc_device *rtc_dev;
         int irq;
-        int device_type;
+        enum sec_device_type device_type;
         int rtc_24hr_mode;
         const struct s5m_rtc_reg_config *regs;
 };
@@ -146,7 +148,7 @@ static int s5m8767_tm_to_data(struct rtc_time *tm, u8 *data)
         data[RTC_YEAR1] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
 
         if (tm->tm_year < 100) {
-                pr_err("s5m8767 RTC cannot handle the year %d.\n",
+                pr_err("RTC cannot handle the year %d\n",
                        1900 + tm->tm_year);
                 return -EINVAL;
         } else {
@@ -187,6 +189,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,
                 val &= S5M_ALARM0_STATUS;
                 break;
         case S2MPS14X:
+        case S2MPS13X:
                 ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,
                                 &val);
                 val &= S2MPS_ALARM0_STATUS;
@@ -252,6 +255,9 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
         case S2MPS14X:
                 data |= S2MPS_RTC_RUDR_MASK;
                 break;
+        case S2MPS13X:
+                data |= S2MPS13_RTC_AUDR_MASK;
+                break;
         default:
                 return -EINVAL;
         }
@@ -265,6 +271,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
 
         ret = s5m8767_wait_for_udr_update(info);
 
+        /* On S2MPS13 the AUDR is not auto-cleared */
+        if (info->device_type == S2MPS13X)
+                regmap_update_bits(info->regmap, info->regs->rtc_udr_update,
+                                   S2MPS13_RTC_AUDR_MASK, 0);
+
         return ret;
 }
 
@@ -306,7 +317,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
         u8 data[info->regs->regs_count];
         int ret;
 
-        if (info->device_type == S2MPS14X) {
+        if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {
                 ret = regmap_update_bits(info->regmap,
                                 info->regs->rtc_udr_update,
                                 S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);
@@ -329,6 +340,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);
                 break;
 
@@ -355,6 +367,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)
                 break;
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 ret = s5m8767_tm_to_data(tm, data);
                 break;
         default:
@@ -402,6 +415,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);
                 alrm->enabled = 0;
                 for (i = 0; i < info->regs->regs_count; i++) {
@@ -450,6 +464,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
 
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 for (i = 0; i < info->regs->regs_count; i++)
                         data[i] &= ~ALARM_ENABLE_MASK;
 
@@ -494,6 +509,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
 
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 data[RTC_SEC] |= ALARM_ENABLE_MASK;
                 data[RTC_MIN] |= ALARM_ENABLE_MASK;
                 data[RTC_HOUR] |= ALARM_ENABLE_MASK;
@@ -533,6 +549,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         case S5M8767X:
         case S2MPS14X:
+        case S2MPS13X:
                 s5m8767_tm_to_data(&alrm->time, data);
                 break;
 
@@ -615,6 +632,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)
                 break;
 
         case S2MPS14X:
+        case S2MPS13X:
                 data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);
                 ret = regmap_write(info->regmap, info->regs->ctrl, data[0]);
                 break;
@@ -650,8 +668,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         if (!info)
                 return -ENOMEM;
 
-        switch (pdata->device_type) {
+        switch (platform_get_device_id(pdev)->driver_data) {
         case S2MPS14X:
+        case S2MPS13X:
                 regmap_cfg = &s2mps14_rtc_regmap_config;
                 info->regs = &s2mps_rtc_regs;
                 alarm_irq = S2MPS14_IRQ_RTCA0;
@@ -667,7 +686,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                 alarm_irq = S5M8767_IRQ_RTCA1;
                 break;
         default:
-                dev_err(&pdev->dev, "Device type is not supported by RTC driver\n");
+                dev_err(&pdev->dev,
+                                "Device type %lu is not supported by RTC driver\n",
+                                platform_get_device_id(pdev)->driver_data);
                 return -ENODEV;
         }
 
@@ -687,7 +708,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
 
         info->dev = &pdev->dev;
         info->s5m87xx = s5m87xx;
-        info->device_type = s5m87xx->device_type;
+        info->device_type = platform_get_device_id(pdev)->driver_data;
 
         if (s5m87xx->irq_data) {
                 info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
@@ -772,6 +793,7 @@ static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);
 
 static const struct platform_device_id s5m_rtc_id[] = {
         { "s5m-rtc",            S5M8767X },
+        { "s2mps13-rtc",        S2MPS13X },
         { "s2mps14-rtc",        S2MPS14X },
         { },
 };
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index 2939cdcb2688..eb09eddf39b8 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -42,6 +42,8 @@
 #define STMP3XXX_RTC_STAT                       0x10
 #define STMP3XXX_RTC_STAT_STALE_SHIFT           16
 #define STMP3XXX_RTC_STAT_RTC_PRESENT           0x80000000
+#define STMP3XXX_RTC_STAT_XTAL32000_PRESENT     0x10000000
+#define STMP3XXX_RTC_STAT_XTAL32768_PRESENT     0x08000000
 
 #define STMP3XXX_RTC_SECONDS                    0x30
 
@@ -52,9 +54,13 @@
 #define STMP3XXX_RTC_PERSISTENT0                0x60
 #define STMP3XXX_RTC_PERSISTENT0_SET            0x64
 #define STMP3XXX_RTC_PERSISTENT0_CLR            0x68
-#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN  0x00000002
-#define STMP3XXX_RTC_PERSISTENT0_ALARM_EN       0x00000004
-#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE     0x00000080
+#define STMP3XXX_RTC_PERSISTENT0_CLOCKSOURCE            (1 << 0)
+#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN          (1 << 1)
+#define STMP3XXX_RTC_PERSISTENT0_ALARM_EN               (1 << 2)
+#define STMP3XXX_RTC_PERSISTENT0_XTAL24MHZ_PWRUP        (1 << 4)
+#define STMP3XXX_RTC_PERSISTENT0_XTAL32KHZ_PWRUP        (1 << 5)
+#define STMP3XXX_RTC_PERSISTENT0_XTAL32_FREQ            (1 << 6)
+#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE             (1 << 7)
 
 #define STMP3XXX_RTC_PERSISTENT1                0x70
 /* missing bitmask in headers */
@@ -248,6 +254,9 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
 {
         struct stmp3xxx_rtc_data *rtc_data;
         struct resource *r;
+        u32 rtc_stat;
+        u32 pers0_set, pers0_clr;
+        u32 crystalfreq = 0;
         int err;
 
         rtc_data = devm_kzalloc(&pdev->dev, sizeof(*rtc_data), GFP_KERNEL);
@@ -268,8 +277,8 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
 
         rtc_data->irq_alarm = platform_get_irq(pdev, 0);
 
-        if (!(readl(STMP3XXX_RTC_STAT + rtc_data->io) &
-                        STMP3XXX_RTC_STAT_RTC_PRESENT)) {
+        rtc_stat = readl(rtc_data->io + STMP3XXX_RTC_STAT);
+        if (!(rtc_stat & STMP3XXX_RTC_STAT_RTC_PRESENT)) {
                 dev_err(&pdev->dev, "no device onboard\n");
                 return -ENODEV;
         }
@@ -282,9 +291,54 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
                 return err;
         }
 
+        /*
+         * Obviously the rtc needs a clock input to be able to run.
+         * This clock can be provided by an external 32k crystal. If that one is
+         * missing XTAL must not be disabled in suspend which consumes a
+         * lot of power. Normally the presence and exact frequency (supported
+         * are 32000 Hz and 32768 Hz) is detectable from fuses, but as reality
+         * proves these fuses are not blown correctly on all machines, so the
+         * frequency can be overridden in the device tree.
+         */
+        if (rtc_stat & STMP3XXX_RTC_STAT_XTAL32000_PRESENT)
+                crystalfreq = 32000;
+        else if (rtc_stat & STMP3XXX_RTC_STAT_XTAL32768_PRESENT)
+                crystalfreq = 32768;
+
+        of_property_read_u32(pdev->dev.of_node, "stmp,crystal-freq",
+                             &crystalfreq);
+
+        switch (crystalfreq) {
+        case 32000:
+                /* keep 32kHz crystal running in low-power mode */
+                pers0_set = STMP3XXX_RTC_PERSISTENT0_XTAL32_FREQ |
+                        STMP3XXX_RTC_PERSISTENT0_XTAL32KHZ_PWRUP |
+                        STMP3XXX_RTC_PERSISTENT0_CLOCKSOURCE;
+                pers0_clr = STMP3XXX_RTC_PERSISTENT0_XTAL24MHZ_PWRUP;
+                break;
+        case 32768:
+                /* keep 32.768kHz crystal running in low-power mode */
+                pers0_set = STMP3XXX_RTC_PERSISTENT0_XTAL32KHZ_PWRUP |
+                        STMP3XXX_RTC_PERSISTENT0_CLOCKSOURCE;
+                pers0_clr = STMP3XXX_RTC_PERSISTENT0_XTAL24MHZ_PWRUP |
+                        STMP3XXX_RTC_PERSISTENT0_XTAL32_FREQ;
+                break;
+        default:
+                dev_warn(&pdev->dev,
+                         "invalid crystal-freq specified in device-tree. Assuming no crystal\n");
+                /* fall-through */
+        case 0:
+                /* keep XTAL on in low-power mode */
+                pers0_set = STMP3XXX_RTC_PERSISTENT0_XTAL24MHZ_PWRUP;
+                pers0_clr = STMP3XXX_RTC_PERSISTENT0_XTAL32KHZ_PWRUP |
+                        STMP3XXX_RTC_PERSISTENT0_CLOCKSOURCE;
+        }
+
+        writel(pers0_set, rtc_data->io + STMP3XXX_RTC_PERSISTENT0_SET);
+
         writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
                         STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
-                        STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
+                        STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE | pers0_clr,
                         rtc_data->io + STMP3XXX_RTC_PERSISTENT0_CLR);
 
         writel(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN |
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 5baea3f54926..2dc787dc06c1 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -18,6 +18,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -145,8 +147,7 @@ static int twl_rtc_read_u8(u8 *data, u8 reg)
 
         ret = twl_i2c_read_u8(TWL_MODULE_RTC, data, (rtc_reg_map[reg]));
         if (ret < 0)
-                pr_err("twl_rtc: Could not read TWL"
-                       "register %X - error %d\n", reg, ret);
+                pr_err("Could not read TWL register %X - error %d\n", reg, ret);
         return ret;
 }
 
@@ -159,8 +160,8 @@ static int twl_rtc_write_u8(u8 data, u8 reg)
 
         ret = twl_i2c_write_u8(TWL_MODULE_RTC, data, (rtc_reg_map[reg]));
         if (ret < 0)
-                pr_err("twl_rtc: Could not write TWL"
-                       "register %X - error %d\n", reg, ret);
+                pr_err("Could not write TWL register %X - error %d\n",
+                       reg, ret);
         return ret;
 }
 
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index b1de58e0b3d0..5638b7ba8b06 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -22,6 +22,7 @@
 #include <linux/rtc.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #define DRV_VERSION "1.0.8"
 
@@ -366,8 +367,7 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
          * perform sign extension. The formula is
          * Catr = (atr * 0.25pF) + 11.00pF.
          */
-        if (atr & 0x20)
-                atr |= 0xC0;
+        atr = sign_extend32(atr, 5);
 
         dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __func__, atr, atr);
 
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 8981701802ca..a777e5c412df 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -474,11 +474,11 @@ static void NCR5380_print_phase(struct Scsi_Host *instance)
  */
 #ifndef USLEEP_SLEEP
 /* 20 ms (reasonable hard disk speed) */
-#define USLEEP_SLEEP (20*HZ/1000)
+#define USLEEP_SLEEP msecs_to_jiffies(20)
 #endif
 /* 300 RPM (floppy speed) */
 #ifndef USLEEP_POLL
-#define USLEEP_POLL (200*HZ/1000)
+#define USLEEP_POLL msecs_to_jiffies(200)
 #endif
 #ifndef USLEEP_WAITLONG
 /* RvC: (reasonable time to wait on select error) */
@@ -576,7 +576,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,
                 if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))
                         trying_irqs |= mask;
 
-        timeout = jiffies + (250 * HZ / 1000);
+        timeout = jiffies + msecs_to_jiffies(250);
         probe_irq = NO_IRQ;
 
         /*
@@ -634,7 +634,7 @@ static void prepare_info(struct Scsi_Host *instance)
                  "sg_tablesize %d, this_id %d, "
                  "flags { %s%s%s}, "
 #if defined(USLEEP_POLL) && defined(USLEEP_WAITLONG)
-                 "USLEEP_POLL %d, USLEEP_WAITLONG %d, "
+                 "USLEEP_POLL %lu, USLEEP_WAITLONG %lu, "
 #endif
                  "options { %s} ",
                  instance->hostt->name, instance->io_port, instance->n_io_port,
@@ -1346,7 +1346,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
          * selection.
          */
 
-        timeout = jiffies + (250 * HZ / 1000);
+        timeout = jiffies + msecs_to_jiffies(250);
 
         /* 
          * XXX very interesting - we're seeing a bounce where the BSY we 
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index b32e77db0c48..9b3dd6ef6a0b 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -111,6 +111,41 @@
 #define BYTE2(x) (unsigned char)((x) >> 16)
 #define BYTE3(x) (unsigned char)((x) >> 24)
 
+/* MODE_SENSE data format */
+typedef struct {
+        struct {
+                u8      data_length;
+                u8      med_type;
+                u8      dev_par;
+                u8      bd_length;
+        } __attribute__((packed)) hd;
+        struct {
+                u8      dens_code;
+                u8      block_count[3];
+                u8      reserved;
+                u8      block_length[3];
+        } __attribute__((packed)) bd;
+                u8      mpc_buf[3];
+} __attribute__((packed)) aac_modep_data;
+
+/* MODE_SENSE_10 data format */
+typedef struct {
+        struct {
+                u8      data_length[2];
+                u8      med_type;
+                u8      dev_par;
+                u8      rsrvd[2];
+                u8      bd_length[2];
+        } __attribute__((packed)) hd;
+        struct {
+                u8      dens_code;
+                u8      block_count[3];
+                u8      reserved;
+                u8      block_length[3];
+        } __attribute__((packed)) bd;
+                u8      mpc_buf[3];
+} __attribute__((packed)) aac_modep10_data;
+
 /*------------------------------------------------------------------------------
  *              S T R U C T S / T Y P E D E F S
  *----------------------------------------------------------------------------*/
@@ -128,6 +163,48 @@ struct inquiry_data {
         u8 inqd_prl[4]; /* Product Revision Level */
 };
 
+/* Added for VPD 0x83 */
+typedef struct {
+        u8 CodeSet:4;   /* VPD_CODE_SET */
+        u8 Reserved:4;
+        u8 IdentifierType:4;    /* VPD_IDENTIFIER_TYPE */
+        u8 Reserved2:4;
+        u8 Reserved3;
+        u8 IdentifierLength;
+        u8 VendId[8];
+        u8 ProductId[16];
+        u8 SerialNumber[8];     /* SN in ASCII */
+
+} TVPD_ID_Descriptor_Type_1;
+
+typedef struct {
+        u8 CodeSet:4;   /* VPD_CODE_SET */
+        u8 Reserved:4;
+        u8 IdentifierType:4;    /* VPD_IDENTIFIER_TYPE */
+        u8 Reserved2:4;
+        u8 Reserved3;
+        u8 IdentifierLength;
+        struct TEU64Id {
+                u32 Serial;
+                 /* The serial number supposed to be 40 bits,
+                  * bit we only support 32, so make the last byte zero. */
+                u8 Reserved;
+                u8 VendId[3];
+        } EU64Id;
+
+} TVPD_ID_Descriptor_Type_2;
+
+typedef struct {
+        u8 DeviceType:5;
+        u8 DeviceTypeQualifier:3;
+        u8 PageCode;
+        u8 Reserved;
+        u8 PageLength;
+        TVPD_ID_Descriptor_Type_1 IdDescriptorType1;
+        TVPD_ID_Descriptor_Type_2 IdDescriptorType2;
+
+} TVPD_Page83;
+
 /*
  *              M O D U L E   G L O B A L S
  */
@@ -385,6 +462,11 @@ int aac_get_containers(struct aac_dev *dev)
         if (status >= 0) {
                 dresp = (struct aac_get_container_count_resp *)fib_data(fibptr);
                 maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);
+                if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &
+                    AAC_OPTION_SUPPORTED_240_VOLUMES) {
+                        maximum_num_containers =
+                                le32_to_cpu(dresp->MaxSimpleVolumes);
+                }
                 aac_fib_complete(fibptr);
         }
         /* FIB should be freed only after getting the response from the F/W */
@@ -438,7 +520,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         if ((le32_to_cpu(get_name_reply->status) == CT_OK)
          && (get_name_reply->data[0] != '\0')) {
                 char *sp = get_name_reply->data;
-                sp[sizeof(((struct aac_get_name_resp *)NULL)->data)-1] = '\0';
+                sp[sizeof(((struct aac_get_name_resp *)NULL)->data)] = '\0';
                 while (*sp == ' ')
                         ++sp;
                 if (*sp) {
@@ -539,6 +621,14 @@ static void _aac_probe_container2(void * context, struct fib * fibptr)
                 if ((le32_to_cpu(dresp->status) == ST_OK) &&
                     (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
                     (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
+                        if (!(fibptr->dev->supplement_adapter_info.SupportedOptions2 &
+                            AAC_OPTION_VARIABLE_BLOCK_SIZE)) {
+                                dresp->mnt[0].fileinfo.bdevinfo.block_size = 0x200;
+                                fsa_dev_ptr->block_size = 0x200;
+                        } else {
+                                fsa_dev_ptr->block_size =
+                                        le32_to_cpu(dresp->mnt[0].fileinfo.bdevinfo.block_size);
+                        }
                         fsa_dev_ptr->valid = 1;
                         /* sense_key holds the current state of the spin-up */
                         if (dresp->mnt[0].state & cpu_to_le32(FSCS_NOT_READY))
@@ -571,7 +661,9 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)
         int status;
 
         dresp = (struct aac_mount *) fib_data(fibptr);
-        dresp->mnt[0].capacityhigh = 0;
+        if (!(fibptr->dev->supplement_adapter_info.SupportedOptions2 &
+            AAC_OPTION_VARIABLE_BLOCK_SIZE))
+                dresp->mnt[0].capacityhigh = 0;
         if ((le32_to_cpu(dresp->status) != ST_OK) ||
             (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE)) {
                 _aac_probe_container2(context, fibptr);
@@ -586,7 +678,12 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)
 
         dinfo = (struct aac_query_mount *)fib_data(fibptr);
 
-        dinfo->command = cpu_to_le32(VM_NameServe64);
+        if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &
+            AAC_OPTION_VARIABLE_BLOCK_SIZE)
+                dinfo->command = cpu_to_le32(VM_NameServeAllBlk);
+        else
+                dinfo->command = cpu_to_le32(VM_NameServe64);
+
         dinfo->count = cpu_to_le32(scmd_id(scsicmd));
         dinfo->type = cpu_to_le32(FT_FILESYS);
 
@@ -621,7 +718,12 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(stru
 
                 dinfo = (struct aac_query_mount *)fib_data(fibptr);
 
-                dinfo->command = cpu_to_le32(VM_NameServe);
+                if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &
+                    AAC_OPTION_VARIABLE_BLOCK_SIZE)
+                        dinfo->command = cpu_to_le32(VM_NameServeAllBlk);
+                else
+                        dinfo->command = cpu_to_le32(VM_NameServe);
+
                 dinfo->count = cpu_to_le32(scmd_id(scsicmd));
                 dinfo->type = cpu_to_le32(FT_FILESYS);
                 scsicmd->SCp.ptr = (char *)callback;
@@ -835,14 +937,88 @@ static void get_container_serial_callback(void *context, struct fib * fibptr)
         get_serial_reply = (struct aac_get_serial_resp *) fib_data(fibptr);
         /* Failure is irrelevant, using default value instead */
         if (le32_to_cpu(get_serial_reply->status) == CT_OK) {
-                char sp[13];
-                /* EVPD bit set */
-                sp[0] = INQD_PDT_DA;
-                sp[1] = scsicmd->cmnd[2];
-                sp[2] = 0;
-                sp[3] = snprintf(sp+4, sizeof(sp)-4, "%08X",
-                  le32_to_cpu(get_serial_reply->uid));
-                scsi_sg_copy_from_buffer(scsicmd, sp, sizeof(sp));
+                /*Check to see if it's for VPD 0x83 or 0x80 */
+                if (scsicmd->cmnd[2] == 0x83) {
+                        /* vpd page 0x83 - Device Identification Page */
+                        int i;
+                        TVPD_Page83 VPDPage83Data;
+
+                        memset(((u8 *)&VPDPage83Data), 0,
+                               sizeof(VPDPage83Data));
+
+                        /* DIRECT_ACCESS_DEVIC */
+                        VPDPage83Data.DeviceType = 0;
+                        /* DEVICE_CONNECTED */
+                        VPDPage83Data.DeviceTypeQualifier = 0;
+                        /* VPD_DEVICE_IDENTIFIERS */
+                        VPDPage83Data.PageCode = 0x83;
+                        VPDPage83Data.Reserved = 0;
+                        VPDPage83Data.PageLength =
+                                sizeof(VPDPage83Data.IdDescriptorType1) +
+                                sizeof(VPDPage83Data.IdDescriptorType2);
+
+                        /* T10 Vendor Identifier Field Format */
+                        /* VpdCodeSetAscii */
+                        VPDPage83Data.IdDescriptorType1.CodeSet = 2;
+                        /* VpdIdentifierTypeVendorId */
+                        VPDPage83Data.IdDescriptorType1.IdentifierType = 1;
+                        VPDPage83Data.IdDescriptorType1.IdentifierLength =
+                                sizeof(VPDPage83Data.IdDescriptorType1) - 4;
+
+                        /* "ADAPTEC " for adaptec */
+                        memcpy(VPDPage83Data.IdDescriptorType1.VendId,
+                                "ADAPTEC ",
+                                sizeof(VPDPage83Data.IdDescriptorType1.VendId));
+                        memcpy(VPDPage83Data.IdDescriptorType1.ProductId,
+                                "ARRAY           ",
+                                sizeof(
+                                VPDPage83Data.IdDescriptorType1.ProductId));
+
+                        /* Convert to ascii based serial number.
+                         * The LSB is the the end.
+                         */
+                        for (i = 0; i < 8; i++) {
+                                u8 temp =
+                                        (u8)((get_serial_reply->uid >> ((7 - i) * 4)) & 0xF);
+                                if (temp  > 0x9) {
+                                        VPDPage83Data.IdDescriptorType1.SerialNumber[i] =
+                                                        'A' + (temp - 0xA);
+                                } else {
+                                        VPDPage83Data.IdDescriptorType1.SerialNumber[i] =
+                                                        '0' + temp;
+                                }
+                        }
+
+                        /* VpdCodeSetBinary */
+                        VPDPage83Data.IdDescriptorType2.CodeSet = 1;
+                        /* VpdIdentifierTypeEUI64 */
+                        VPDPage83Data.IdDescriptorType2.IdentifierType = 2;
+                        VPDPage83Data.IdDescriptorType2.IdentifierLength =
+                                sizeof(VPDPage83Data.IdDescriptorType2) - 4;
+
+                        VPDPage83Data.IdDescriptorType2.EU64Id.VendId[0] = 0xD0;
+                        VPDPage83Data.IdDescriptorType2.EU64Id.VendId[1] = 0;
+                        VPDPage83Data.IdDescriptorType2.EU64Id.VendId[2] = 0;
+
+                        VPDPage83Data.IdDescriptorType2.EU64Id.Serial =
+                                                        get_serial_reply->uid;
+                        VPDPage83Data.IdDescriptorType2.EU64Id.Reserved = 0;
+
+                        /* Move the inquiry data to the response buffer. */
+                        scsi_sg_copy_from_buffer(scsicmd, &VPDPage83Data,
+                                                 sizeof(VPDPage83Data));
+                } else {
+                        /* It must be for VPD 0x80 */
+                        char sp[13];
+                        /* EVPD bit set */
+                        sp[0] = INQD_PDT_DA;
+                        sp[1] = scsicmd->cmnd[2];
+                        sp[2] = 0;
+                        sp[3] = snprintf(sp+4, sizeof(sp)-4, "%08X",
+                                le32_to_cpu(get_serial_reply->uid));
+                        scsi_sg_copy_from_buffer(scsicmd, sp,
+                                                 sizeof(sp));
+                }
         }
 
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
@@ -982,7 +1158,8 @@ static int aac_read_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3
                 memset(readcmd2, 0, sizeof(struct aac_raw_io2));
                 readcmd2->blockLow = cpu_to_le32((u32)(lba&0xffffffff));
                 readcmd2->blockHigh = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
-                readcmd2->byteCount = cpu_to_le32(count<<9);
+                readcmd2->byteCount = cpu_to_le32(count *
+                        dev->fsa_dev[scmd_id(cmd)].block_size);
                 readcmd2->cid = cpu_to_le16(scmd_id(cmd));
                 readcmd2->flags = cpu_to_le16(RIO2_IO_TYPE_READ);
                 ret = aac_build_sgraw2(cmd, readcmd2,
@@ -997,7 +1174,8 @@ static int aac_read_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3
                 readcmd = (struct aac_raw_io *) fib_data(fib);
                 readcmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
                 readcmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
-                readcmd->count = cpu_to_le32(count<<9);
+                readcmd->count = cpu_to_le32(count *
+                        dev->fsa_dev[scmd_id(cmd)].block_size);
                 readcmd->cid = cpu_to_le16(scmd_id(cmd));
                 readcmd->flags = cpu_to_le16(RIO_TYPE_READ);
                 readcmd->bpTotal = 0;
@@ -1062,6 +1240,7 @@ static int aac_read_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32
 {
         u16 fibsize;
         struct aac_read *readcmd;
+        struct aac_dev *dev = fib->dev;
         long ret;
 
         aac_fib_init(fib);
@@ -1069,7 +1248,8 @@ static int aac_read_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32
         readcmd->command = cpu_to_le32(VM_CtBlockRead);
         readcmd->cid = cpu_to_le32(scmd_id(cmd));
         readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
-        readcmd->count = cpu_to_le32(count * 512);
+        readcmd->count = cpu_to_le32(count *
+                dev->fsa_dev[scmd_id(cmd)].block_size);
 
         ret = aac_build_sg(cmd, &readcmd->sg);
         if (ret < 0)
@@ -1104,7 +1284,8 @@ static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u
                 memset(writecmd2, 0, sizeof(struct aac_raw_io2));
                 writecmd2->blockLow = cpu_to_le32((u32)(lba&0xffffffff));
                 writecmd2->blockHigh = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
-                writecmd2->byteCount = cpu_to_le32(count<<9);
+                writecmd2->byteCount = cpu_to_le32(count *
+                        dev->fsa_dev[scmd_id(cmd)].block_size);
                 writecmd2->cid = cpu_to_le16(scmd_id(cmd));
                 writecmd2->flags = (fua && ((aac_cache & 5) != 1) &&
                                                    (((aac_cache & 5) != 5) || !fib->dev->cache_protected)) ?
@@ -1122,7 +1303,8 @@ static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u
                 writecmd = (struct aac_raw_io *) fib_data(fib);
                 writecmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
                 writecmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
-                writecmd->count = cpu_to_le32(count<<9);
+                writecmd->count = cpu_to_le32(count *
+                        dev->fsa_dev[scmd_id(cmd)].block_size);
                 writecmd->cid = cpu_to_le16(scmd_id(cmd));
                 writecmd->flags = (fua && ((aac_cache & 5) != 1) &&
                                                    (((aac_cache & 5) != 5) || !fib->dev->cache_protected)) ?
@@ -1190,6 +1372,7 @@ static int aac_write_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3
 {
         u16 fibsize;
         struct aac_write *writecmd;
+        struct aac_dev *dev = fib->dev;
         long ret;
 
         aac_fib_init(fib);
@@ -1197,7 +1380,8 @@ static int aac_write_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3
         writecmd->command = cpu_to_le32(VM_CtBlockWrite);
         writecmd->cid = cpu_to_le32(scmd_id(cmd));
         writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
-        writecmd->count = cpu_to_le32(count * 512);
+        writecmd->count = cpu_to_le32(count *
+                dev->fsa_dev[scmd_id(cmd)].block_size);
         writecmd->sg.count = cpu_to_le32(1);
         /* ->stable is not used - it did mean which type of write */
 
@@ -2246,9 +2430,10 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                           INQD_PDT_PROC : INQD_PDT_DA;
                         if (scsicmd->cmnd[2] == 0) {
                                 /* supported vital product data pages */
-                                arr[3] = 2;
+                                arr[3] = 3;
                                 arr[4] = 0x0;
                                 arr[5] = 0x80;
+                                arr[6] = 0x83;
                                 arr[1] = scsicmd->cmnd[2];
                                 scsi_sg_copy_from_buffer(scsicmd, &inq_data,
                                                          sizeof(inq_data));
@@ -2264,7 +2449,16 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 if (aac_wwn != 2)
                                         return aac_get_container_serial(
                                                 scsicmd);
-                                /* SLES 10 SP1 special */
+                                scsicmd->result = DID_OK << 16 |
+                                  COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
+                        } else if (scsicmd->cmnd[2] == 0x83) {
+                                /* vpd page 0x83 - Device Identification Page */
+                                char *sno = (char *)&inq_data;
+                                sno[3] = setinqserial(dev, &sno[4],
+                                                      scmd_id(scsicmd));
+                                if (aac_wwn != 2)
+                                        return aac_get_container_serial(
+                                                scsicmd);
                                 scsicmd->result = DID_OK << 16 |
                                   COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                         } else {
@@ -2329,10 +2523,10 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[5] = (capacity >> 16) & 0xff;
                 cp[6] = (capacity >> 8) & 0xff;
                 cp[7] = (capacity >> 0) & 0xff;
-                cp[8] = 0;
-                cp[9] = 0;
-                cp[10] = 2;
-                cp[11] = 0;
+                cp[8] = (fsa_dev_ptr[cid].block_size >> 24) & 0xff;
+                cp[9] = (fsa_dev_ptr[cid].block_size >> 16) & 0xff;
+                cp[10] = (fsa_dev_ptr[cid].block_size >> 8) & 0xff;
+                cp[11] = (fsa_dev_ptr[cid].block_size) & 0xff;
                 cp[12] = 0;
 
                 alloc_len = ((scsicmd->cmnd[10] << 24)
@@ -2369,10 +2563,10 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[1] = (capacity >> 16) & 0xff;
                 cp[2] = (capacity >> 8) & 0xff;
                 cp[3] = (capacity >> 0) & 0xff;
-                cp[4] = 0;
-                cp[5] = 0;
-                cp[6] = 2;
-                cp[7] = 0;
+                cp[4] = (fsa_dev_ptr[cid].block_size >> 24) & 0xff;
+                cp[5] = (fsa_dev_ptr[cid].block_size >> 16) & 0xff;
+                cp[6] = (fsa_dev_ptr[cid].block_size >> 8) & 0xff;
+                cp[7] = (fsa_dev_ptr[cid].block_size) & 0xff;
                 scsi_sg_copy_from_buffer(scsicmd, cp, sizeof(cp));
                 /* Do not cache partition table for arrays */
                 scsicmd->device->removable = 1;
@@ -2385,30 +2579,79 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
 
         case MODE_SENSE:
         {
-                char mode_buf[7];
                 int mode_buf_length = 4;
+                u32 capacity;
+                aac_modep_data mpd;
+
+                if (fsa_dev_ptr[cid].size <= 0x100000000ULL)
+                        capacity = fsa_dev_ptr[cid].size - 1;
+                else
+                        capacity = (u32)-1;
 
                 dprintk((KERN_DEBUG "MODE SENSE command.\n"));
-                mode_buf[0] = 3;        /* Mode data length */
-                mode_buf[1] = 0;        /* Medium type - default */
-                mode_buf[2] = 0;        /* Device-specific param,
-                                           bit 8: 0/1 = write enabled/protected
-                                           bit 4: 0/1 = FUA enabled */
+                memset((char *)&mpd, 0, sizeof(aac_modep_data));
+
+                /* Mode data length */
+                mpd.hd.data_length = sizeof(mpd.hd) - 1;
+                /* Medium type - default */
+                mpd.hd.med_type = 0;
+                /* Device-specific param,
+                   bit 8: 0/1 = write enabled/protected
+                   bit 4: 0/1 = FUA enabled */
+                mpd.hd.dev_par = 0;
+
                 if (dev->raw_io_interface && ((aac_cache & 5) != 1))
-                        mode_buf[2] = 0x10;
-                mode_buf[3] = 0;        /* Block descriptor length */
+                        mpd.hd.dev_par = 0x10;
+                if (scsicmd->cmnd[1] & 0x8)
+                        mpd.hd.bd_length = 0;   /* Block descriptor length */
+                else {
+                        mpd.hd.bd_length = sizeof(mpd.bd);
+                        mpd.hd.data_length += mpd.hd.bd_length;
+                        mpd.bd.block_length[0] =
+                                (fsa_dev_ptr[cid].block_size >> 16) & 0xff;
+                        mpd.bd.block_length[1] =
+                                (fsa_dev_ptr[cid].block_size >> 8) &  0xff;
+                        mpd.bd.block_length[2] =
+                                fsa_dev_ptr[cid].block_size  & 0xff;
+
+                        mpd.mpc_buf[0] = scsicmd->cmnd[2];
+                        if (scsicmd->cmnd[2] == 0x1C) {
+                                /* page length */
+                                mpd.mpc_buf[1] = 0xa;
+                                /* Mode data length */
+                                mpd.hd.data_length = 23;
+                        } else {
+                                /* Mode data length */
+                                mpd.hd.data_length = 15;
+                        }
+
+                        if (capacity > 0xffffff) {
+                                mpd.bd.block_count[0] = 0xff;
+                                mpd.bd.block_count[1] = 0xff;
+                                mpd.bd.block_count[2] = 0xff;
+                        } else {
+                                mpd.bd.block_count[0] = (capacity >> 16) & 0xff;
+                                mpd.bd.block_count[1] = (capacity >> 8) & 0xff;
+                                mpd.bd.block_count[2] = capacity  & 0xff;
+                        }
+                }
                 if (((scsicmd->cmnd[2] & 0x3f) == 8) ||
                   ((scsicmd->cmnd[2] & 0x3f) == 0x3f)) {
-                        mode_buf[0] = 6;
-                        mode_buf[4] = 8;
-                        mode_buf[5] = 1;
-                        mode_buf[6] = ((aac_cache & 6) == 2)
+                        mpd.hd.data_length += 3;
+                        mpd.mpc_buf[0] = 8;
+                        mpd.mpc_buf[1] = 1;
+                        mpd.mpc_buf[2] = ((aac_cache & 6) == 2)
                                 ? 0 : 0x04; /* WCE */
-                        mode_buf_length = 7;
-                        if (mode_buf_length > scsicmd->cmnd[4])
-                                mode_buf_length = scsicmd->cmnd[4];
+                        mode_buf_length = sizeof(mpd);
                 }
-                scsi_sg_copy_from_buffer(scsicmd, mode_buf, mode_buf_length);
+
+                if (mode_buf_length > scsicmd->cmnd[4])
+                        mode_buf_length = scsicmd->cmnd[4];
+                else
+                        mode_buf_length = sizeof(mpd);
+                scsi_sg_copy_from_buffer(scsicmd,
+                                         (char *)&mpd,
+                                         mode_buf_length);
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
 
@@ -2416,34 +2659,77 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         }
         case MODE_SENSE_10:
         {
-                char mode_buf[11];
+                u32 capacity;
                 int mode_buf_length = 8;
+                aac_modep10_data mpd10;
+
+                if (fsa_dev_ptr[cid].size <= 0x100000000ULL)
+                        capacity = fsa_dev_ptr[cid].size - 1;
+                else
+                        capacity = (u32)-1;
 
                 dprintk((KERN_DEBUG "MODE SENSE 10 byte command.\n"));
-                mode_buf[0] = 0;        /* Mode data length (MSB) */
-                mode_buf[1] = 6;        /* Mode data length (LSB) */
-                mode_buf[2] = 0;        /* Medium type - default */
-                mode_buf[3] = 0;        /* Device-specific param,
-                                           bit 8: 0/1 = write enabled/protected
-                                           bit 4: 0/1 = FUA enabled */
+                memset((char *)&mpd10, 0, sizeof(aac_modep10_data));
+                /* Mode data length (MSB) */
+                mpd10.hd.data_length[0] = 0;
+                /* Mode data length (LSB) */
+                mpd10.hd.data_length[1] = sizeof(mpd10.hd) - 1;
+                /* Medium type - default */
+                mpd10.hd.med_type = 0;
+                /* Device-specific param,
+                   bit 8: 0/1 = write enabled/protected
+                   bit 4: 0/1 = FUA enabled */
+                mpd10.hd.dev_par = 0;
+
                 if (dev->raw_io_interface && ((aac_cache & 5) != 1))
-                        mode_buf[3] = 0x10;
-                mode_buf[4] = 0;        /* reserved */
-                mode_buf[5] = 0;        /* reserved */
-                mode_buf[6] = 0;        /* Block descriptor length (MSB) */
-                mode_buf[7] = 0;        /* Block descriptor length (LSB) */
+                        mpd10.hd.dev_par = 0x10;
+                mpd10.hd.rsrvd[0] = 0;  /* reserved */
+                mpd10.hd.rsrvd[1] = 0;  /* reserved */
+                if (scsicmd->cmnd[1] & 0x8) {
+                        /* Block descriptor length (MSB) */
+                        mpd10.hd.bd_length[0] = 0;
+                        /* Block descriptor length (LSB) */
+                        mpd10.hd.bd_length[1] = 0;
+                } else {
+                        mpd10.hd.bd_length[0] = 0;
+                        mpd10.hd.bd_length[1] = sizeof(mpd10.bd);
+
+                        mpd10.hd.data_length[1] += mpd10.hd.bd_length[1];
+
+                        mpd10.bd.block_length[0] =
+                                (fsa_dev_ptr[cid].block_size >> 16) & 0xff;
+                        mpd10.bd.block_length[1] =
+                                (fsa_dev_ptr[cid].block_size >> 8) & 0xff;
+                        mpd10.bd.block_length[2] =
+                                fsa_dev_ptr[cid].block_size  & 0xff;
+
+                        if (capacity > 0xffffff) {
+                                mpd10.bd.block_count[0] = 0xff;
+                                mpd10.bd.block_count[1] = 0xff;
+                                mpd10.bd.block_count[2] = 0xff;
+                        } else {
+                                mpd10.bd.block_count[0] =
+                                        (capacity >> 16) & 0xff;
+                                mpd10.bd.block_count[1] =
+                                        (capacity >> 8) & 0xff;
+                                mpd10.bd.block_count[2] =
+                                        capacity  & 0xff;
+                        }
+                }
                 if (((scsicmd->cmnd[2] & 0x3f) == 8) ||
                   ((scsicmd->cmnd[2] & 0x3f) == 0x3f)) {
-                        mode_buf[1] = 9;
-                        mode_buf[8] = 8;
-                        mode_buf[9] = 1;
-                        mode_buf[10] = ((aac_cache & 6) == 2)
+                        mpd10.hd.data_length[1] += 3;
+                        mpd10.mpc_buf[0] = 8;
+                        mpd10.mpc_buf[1] = 1;
+                        mpd10.mpc_buf[2] = ((aac_cache & 6) == 2)
                                 ? 0 : 0x04; /* WCE */
-                        mode_buf_length = 11;
+                        mode_buf_length = sizeof(mpd10);
                         if (mode_buf_length > scsicmd->cmnd[8])
                                 mode_buf_length = scsicmd->cmnd[8];
                 }
-                scsi_sg_copy_from_buffer(scsicmd, mode_buf, mode_buf_length);
+                scsi_sg_copy_from_buffer(scsicmd,
+                                         (char *)&mpd10,
+                                         mode_buf_length);
 
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index eaaf8705a5f4..40fe65c91b41 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -6,13 +6,63 @@
 #define nblank(x) _nblank(x)[0]
 
 #include <linux/interrupt.h>
+#include <linux/pci.h>
 
 /*------------------------------------------------------------------------------
  *              D E F I N E S
  *----------------------------------------------------------------------------*/
 
+#define AAC_MAX_MSIX            8       /* vectors */
+#define AAC_PCI_MSI_ENABLE      0x8000
+
+enum {
+        AAC_ENABLE_INTERRUPT    = 0x0,
+        AAC_DISABLE_INTERRUPT,
+        AAC_ENABLE_MSIX,
+        AAC_DISABLE_MSIX,
+        AAC_CLEAR_AIF_BIT,
+        AAC_CLEAR_SYNC_BIT,
+        AAC_ENABLE_INTX
+};
+
+#define AAC_INT_MODE_INTX               (1<<0)
+#define AAC_INT_MODE_MSI                (1<<1)
+#define AAC_INT_MODE_AIF                (1<<2)
+#define AAC_INT_MODE_SYNC               (1<<3)
+
+#define AAC_INT_ENABLE_TYPE1_INTX       0xfffffffb
+#define AAC_INT_ENABLE_TYPE1_MSIX       0xfffffffa
+#define AAC_INT_DISABLE_ALL             0xffffffff
+
+/* Bit definitions in IOA->Host Interrupt Register */
+#define PMC_TRANSITION_TO_OPERATIONAL   (1<<31)
+#define PMC_IOARCB_TRANSFER_FAILED      (1<<28)
+#define PMC_IOA_UNIT_CHECK              (1<<27)
+#define PMC_NO_HOST_RRQ_FOR_CMD_RESPONSE (1<<26)
+#define PMC_CRITICAL_IOA_OP_IN_PROGRESS (1<<25)
+#define PMC_IOARRIN_LOST                (1<<4)
+#define PMC_SYSTEM_BUS_MMIO_ERROR       (1<<3)
+#define PMC_IOA_PROCESSOR_IN_ERROR_STATE (1<<2)
+#define PMC_HOST_RRQ_VALID              (1<<1)
+#define PMC_OPERATIONAL_STATUS          (1<<31)
+#define PMC_ALLOW_MSIX_VECTOR0          (1<<0)
+
+#define PMC_IOA_ERROR_INTERRUPTS        (PMC_IOARCB_TRANSFER_FAILED | \
+                                         PMC_IOA_UNIT_CHECK | \
+                                         PMC_NO_HOST_RRQ_FOR_CMD_RESPONSE | \
+                                         PMC_IOARRIN_LOST | \
+                                         PMC_SYSTEM_BUS_MMIO_ERROR | \
+                                         PMC_IOA_PROCESSOR_IN_ERROR_STATE)
+
+#define PMC_ALL_INTERRUPT_BITS          (PMC_IOA_ERROR_INTERRUPTS | \
+                                         PMC_HOST_RRQ_VALID | \
+                                         PMC_TRANSITION_TO_OPERATIONAL | \
+                                         PMC_ALLOW_MSIX_VECTOR0)
+#define PMC_GLOBAL_INT_BIT2             0x00000004
+#define PMC_GLOBAL_INT_BIT0             0x00000001
+
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 30300
+# define AAC_DRIVER_BUILD 40709
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
@@ -36,6 +86,7 @@
 #define CONTAINER_TO_ID(cont)           (cont)
 #define CONTAINER_TO_LUN(cont)          (0)
 
+#define PMC_DEVICE_S6   0x28b
 #define PMC_DEVICE_S7   0x28c
 #define PMC_DEVICE_S8   0x28d
 #define PMC_DEVICE_S9   0x28f
@@ -434,7 +485,7 @@ enum fib_xfer_state {
 struct aac_init
 {
         __le32  InitStructRevision;
-        __le32  MiniPortRevision;
+        __le32  Sa_MSIXVectors;
         __le32  fsrev;
         __le32  CommHeaderAddress;
         __le32  FastIoCommAreaAddress;
@@ -582,7 +633,8 @@ struct aac_queue {
         spinlock_t              lockdata;       /* Actual lock (used only on one side of the lock) */
         struct list_head        cmdq;           /* A queue of FIBs which need to be prcessed by the FS thread. This is */
                                                 /* only valid for command queues which receive entries from the adapter. */
-        u32                     numpending;     /* Number of entries on outstanding queue. */
+        /* Number of entries on outstanding queue. */
+        atomic_t                numpending;
         struct aac_dev *        dev;            /* Back pointer to adapter structure */
 };
 
@@ -755,7 +807,8 @@ struct rkt_registers {
 
 struct src_mu_registers {
                                 /*      PCI*| Name */
-        __le32  reserved0[8];   /*      00h | Reserved */
+        __le32  reserved0[6];   /*      00h | Reserved */
+        __le32  IOAR[2];        /*      18h | IOA->host interrupt register */
         __le32  IDR;            /*      20h | Inbound Doorbell Register */
         __le32  IISR;           /*      24h | Inbound Int. Status Register */
         __le32  reserved1[3];   /*      28h | Reserved */
@@ -767,17 +820,18 @@ struct src_mu_registers {
         __le32  OMR;            /*      bch | Outbound Message Register */
         __le32  IQ_L;           /*  c0h | Inbound Queue (Low address) */
         __le32  IQ_H;           /*  c4h | Inbound Queue (High address) */
+        __le32  ODR_MSI;        /*  c8h | MSI register for sync./AIF */
 };
 
 struct src_registers {
-        struct src_mu_registers MUnit;  /* 00h - c7h */
+        struct src_mu_registers MUnit;  /* 00h - cbh */
         union {
                 struct {
-                        __le32 reserved1[130790];       /* c8h - 7fc5fh */
+                        __le32 reserved1[130789];       /* cch - 7fc5fh */
                         struct src_inbound IndexRegs;   /* 7fc60h */
                 } tupelo;
                 struct {
-                        __le32 reserved1[974];          /* c8h - fffh */
+                        __le32 reserved1[973];          /* cch - fffh */
                         struct src_inbound IndexRegs;   /* 1000h */
                 } denali;
         } u;
@@ -857,6 +911,7 @@ struct fsa_dev_info {
         u8              deleted;
         char            devname[8];
         struct sense_data sense_data;
+        u32             block_size;
 };
 
 struct fib {
@@ -960,6 +1015,10 @@ struct aac_supplement_adapter_info
 #define AAC_OPTION_IGNORE_RESET         cpu_to_le32(0x00000002)
 #define AAC_OPTION_POWER_MANAGEMENT     cpu_to_le32(0x00000004)
 #define AAC_OPTION_DOORBELL_RESET       cpu_to_le32(0x00004000)
+/* 4KB sector size */
+#define AAC_OPTION_VARIABLE_BLOCK_SIZE  cpu_to_le32(0x00040000)
+/* 240 simple volume support */
+#define AAC_OPTION_SUPPORTED_240_VOLUMES cpu_to_le32(0x10000000)
 #define AAC_SIS_VERSION_V3      3
 #define AAC_SIS_SLOT_UNKNOWN    0xFF
 
@@ -1026,6 +1085,11 @@ struct aac_bus_info_response {
 #define AAC_OPT_NEW_COMM_TYPE3          cpu_to_le32(1<<30)
 #define AAC_OPT_NEW_COMM_TYPE4          cpu_to_le32(1<<31)
 
+/* MSIX context */
+struct aac_msix_ctx {
+        int             vector_no;
+        struct aac_dev  *dev;
+};
 
 struct aac_dev
 {
@@ -1081,8 +1145,10 @@ struct aac_dev
                                                  * if AAC_COMM_MESSAGE_TYPE1 */
 
         dma_addr_t              host_rrq_pa;    /* phys. address */
-        u32                     host_rrq_idx;   /* index into rrq buffer */
-
+        /* index into rrq buffer */
+        u32                     host_rrq_idx[AAC_MAX_MSIX];
+        atomic_t                rrq_outstanding[AAC_MAX_MSIX];
+        u32                     fibs_pushed_no;
         struct pci_dev          *pdev;          /* Our PCI interface */
         void *                  printfbuf;      /* pointer to buffer used for printf's from the adapter */
         void *                  comm_addr;      /* Base address of Comm area */
@@ -1151,6 +1217,13 @@ struct aac_dev
         int                     sync_mode;
         struct fib              *sync_fib;
         struct list_head        sync_fib_list;
+        u32                     doorbell_mask;
+        u32                     max_msix;       /* max. MSI-X vectors */
+        u32                     vector_cap;     /* MSI-X vector capab.*/
+        int                     msi_enabled;    /* MSI/MSI-X enabled */
+        struct msix_entry       msixentry[AAC_MAX_MSIX];
+        struct aac_msix_ctx     aac_msix[AAC_MAX_MSIX]; /* context */
+        u8                      adapter_shutdown;
 };
 
 #define aac_adapter_interrupt(dev) \
@@ -1589,6 +1662,7 @@ struct aac_srb_reply
 #define         VM_CtHostWrite64        20
 #define         VM_DrvErrTblLog         21
 #define         VM_NameServe64          22
+#define         VM_NameServeAllBlk      30
 
 #define         MAX_VMCOMMAND_NUM       23      /* used for sizing stats array - leave last */
 
@@ -1611,8 +1685,13 @@ struct aac_fsinfo {
         __le32  fsInodeDensity;
 };      /* valid iff ObjType == FT_FILESYS && !(ContentState & FSCS_NOTCLEAN) */
 
+struct  aac_blockdevinfo {
+        __le32  block_size;
+};
+
 union aac_contentinfo {
-        struct aac_fsinfo filesys;      /* valid iff ObjType == FT_FILESYS && !(ContentState & FSCS_NOTCLEAN) */
+        struct  aac_fsinfo              filesys;
+        struct  aac_blockdevinfo        bdevinfo;
 };
 
 /*
@@ -1677,6 +1756,7 @@ struct aac_get_container_count_resp {
         __le32          MaxContainers;
         __le32          ContainerSwitchEntries;
         __le32          MaxPartitions;
+        __le32          MaxSimpleVolumes;
 };
 
 
@@ -1951,6 +2031,8 @@ extern struct aac_common aac_config;
 #define                 AifEnEnclosureManagement 13     /* EM_DRIVE_* */
 #define                         EM_DRIVE_INSERTION      31
 #define                         EM_DRIVE_REMOVAL        32
+#define                 EM_SES_DRIVE_INSERTION  33
+#define                 EM_SES_DRIVE_REMOVAL    26
 #define                 AifEnBatteryEvent       14      /* Change in Battery State */
 #define                 AifEnAddContainer       15      /* A new array was created */
 #define                 AifEnDeleteContainer    16      /* A container was deleted */
@@ -1983,6 +2065,9 @@ extern struct aac_common aac_config;
 /* PMC NEW COMM: Request the event data */
 #define         AifReqEvent             200
 
+/* RAW device deleted */
+#define         AifRawDeviceRemove      203
+
 /*
  *      Adapter Initiated FIB command structures. Start with the adapter
  *      initiated FIBs that really come from the adapter, and get responded
@@ -2025,6 +2110,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum);
 int aac_fib_complete(struct fib * context);
 #define fib_data(fibctx) ((void *)(fibctx)->hw_fib_va->data)
 struct aac_dev *aac_init_adapter(struct aac_dev *dev);
+void aac_src_access_devreg(struct aac_dev *dev, int mode);
 int aac_get_config_status(struct aac_dev *dev, int commit_flag);
 int aac_get_containers(struct aac_dev *dev);
 int aac_scsi_cmd(struct scsi_cmnd *cmd);
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index fbcd48d0bfc3..54195a117f72 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -689,7 +689,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         kfree (usg);
                 }
                 srbcmd->count = cpu_to_le32(byte_count);
-                psg->count = cpu_to_le32(sg_indx+1);
+                if (user_srbcmd->sg.count)
+                        psg->count = cpu_to_le32(sg_indx+1);
+                else
+                        psg->count = 0;
                 status = aac_fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL);
         } else {
                 struct user_sgmap* upsg = &user_srbcmd->sg;
@@ -775,7 +778,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         }
                 }
                 srbcmd->count = cpu_to_le32(byte_count);
-                psg->count = cpu_to_le32(sg_indx+1);
+                if (user_srbcmd->sg.count)
+                        psg->count = cpu_to_le32(sg_indx+1);
+                else
+                        psg->count = 0;
                 status = aac_fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL);
         }
         if (status == -ERESTARTSYS) {
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 177b094c7792..45db84ad322f 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -43,6 +43,8 @@
 
 #include "aacraid.h"
 
+static void aac_define_int_mode(struct aac_dev *dev);
+
 struct aac_common aac_config = {
         .irq_mod = 1
 };
@@ -51,7 +53,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
 {
         unsigned char *base;
         unsigned long size, align;
-        const unsigned long fibsize = 4096;
+        const unsigned long fibsize = dev->max_fib_size;
         const unsigned long printfbufsiz = 256;
         unsigned long host_rrq_size = 0;
         struct aac_init *init;
@@ -91,7 +93,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         init->InitStructRevision = cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION);
         if (dev->max_fib_size != sizeof(struct hw_fib))
                 init->InitStructRevision = cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4);
-        init->MiniPortRevision = cpu_to_le32(Sa_MINIPORT_REVISION);
+        init->Sa_MSIXVectors = cpu_to_le32(Sa_MINIPORT_REVISION);
         init->fsrev = cpu_to_le32(dev->fsrev);
 
         /*
@@ -140,7 +142,8 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
                         INITFLAGS_NEW_COMM_TYPE2_SUPPORTED | INITFLAGS_FAST_JBOD_SUPPORTED);
                 init->HostRRQ_AddrHigh = cpu_to_le32((u32)((u64)dev->host_rrq_pa >> 32));
                 init->HostRRQ_AddrLow = cpu_to_le32((u32)(dev->host_rrq_pa & 0xffffffff));
-                init->MiniPortRevision = cpu_to_le32(0L);               /* number of MSI-X */
+                /* number of MSI-X */
+                init->Sa_MSIXVectors = cpu_to_le32(dev->max_msix);
                 dprintk((KERN_WARNING"aacraid: New Comm Interface type2 enabled\n"));
         }
 
@@ -179,7 +182,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
     
 static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem, int qsize)
 {
-        q->numpending = 0;
+        atomic_set(&q->numpending, 0);
         q->dev = dev;
         init_waitqueue_head(&q->cmdready);
         INIT_LIST_HEAD(&q->cmdq);
@@ -228,6 +231,12 @@ int aac_send_shutdown(struct aac_dev * dev)
         /* FIB should be freed only after getting the response from the F/W */
         if (status != -ERESTARTSYS)
                 aac_fib_free(fibctx);
+        dev->adapter_shutdown = 1;
+        if ((dev->pdev->device == PMC_DEVICE_S7 ||
+             dev->pdev->device == PMC_DEVICE_S8 ||
+             dev->pdev->device == PMC_DEVICE_S9) &&
+             dev->msi_enabled)
+                aac_src_access_devreg(dev, AAC_ENABLE_INTX);
         return status;
 }
 
@@ -350,8 +359,10 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         dev->raw_io_interface = dev->raw_io_64 = 0;
 
         if ((!aac_adapter_sync_cmd(dev, GET_ADAPTER_PROPERTIES,
-                0, 0, 0, 0, 0, 0, status+0, status+1, status+2, NULL, NULL)) &&
+                0, 0, 0, 0, 0, 0,
+                status+0, status+1, status+2, status+3, NULL)) &&
                         (status[0] == 0x00000001)) {
+                dev->doorbell_mask = status[3];
                 if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_64))
                         dev->raw_io_64 = 1;
                 dev->sync_mode = aac_sync_mode;
@@ -388,6 +399,9 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
                         }
                 }
         }
+        dev->max_msix = 0;
+        dev->msi_enabled = 0;
+        dev->adapter_shutdown = 0;
         if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
           0, 0, 0, 0, 0, 0,
           status+0, status+1, status+2, status+3, status+4))
@@ -461,6 +475,11 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         if (host->can_queue > AAC_NUM_IO_FIB)
                 host->can_queue = AAC_NUM_IO_FIB;
 
+        if (dev->pdev->device == PMC_DEVICE_S6 ||
+            dev->pdev->device == PMC_DEVICE_S7 ||
+            dev->pdev->device == PMC_DEVICE_S8 ||
+            dev->pdev->device == PMC_DEVICE_S9)
+                aac_define_int_mode(dev);
         /*
          *      Ok now init the communication subsystem
          */
@@ -489,4 +508,79 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         return dev;
 }
 
-    
+static void aac_define_int_mode(struct aac_dev *dev)
+{
+
+        int i, msi_count;
+
+        msi_count = i = 0;
+        /* max. vectors from GET_COMM_PREFERRED_SETTINGS */
+        if (dev->max_msix == 0 ||
+            dev->pdev->device == PMC_DEVICE_S6 ||
+            dev->sync_mode) {
+                dev->max_msix = 1;
+                dev->vector_cap =
+                        dev->scsi_host_ptr->can_queue +
+                        AAC_NUM_MGT_FIB;
+                return;
+        }
+
+        msi_count = min(dev->max_msix,
+                (unsigned int)num_online_cpus());
+
+        dev->max_msix = msi_count;
+
+        if (msi_count > AAC_MAX_MSIX)
+                msi_count = AAC_MAX_MSIX;
+
+        for (i = 0; i < msi_count; i++)
+                dev->msixentry[i].entry = i;
+
+        if (msi_count > 1 &&
+            pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) {
+                i = pci_enable_msix(dev->pdev,
+                                    dev->msixentry,
+                                    msi_count);
+                 /* Check how many MSIX vectors are allocated */
+                if (i >= 0) {
+                        dev->msi_enabled = 1;
+                        if (i) {
+                                msi_count = i;
+                                if (pci_enable_msix(dev->pdev,
+                                    dev->msixentry,
+                                    msi_count)) {
+                                        dev->msi_enabled = 0;
+                                        printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
+                                                        dev->name, dev->id, i);
+                                }
+                        }
+                } else {
+                        dev->msi_enabled = 0;
+                        printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
+                                        dev->name, dev->id, i);
+                }
+        }
+
+        if (!dev->msi_enabled) {
+                msi_count = 1;
+                i = pci_enable_msi(dev->pdev);
+
+                if (!i) {
+                        dev->msi_enabled = 1;
+                        dev->msi = 1;
+                } else {
+                        printk(KERN_ERR "%s%d: MSI not supported!! Will try INTx 0x%x.\n",
+                                        dev->name, dev->id, i);
+                }
+        }
+
+        if (!dev->msi_enabled)
+                dev->max_msix = msi_count = 1;
+        else {
+                if (dev->max_msix > msi_count)
+                        dev->max_msix = msi_count;
+        }
+        dev->vector_cap =
+                (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB) /
+                msi_count;
+}
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index cab190af6345..4da574925284 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -208,14 +208,10 @@ struct fib *aac_fib_alloc(struct aac_dev *dev)
 
 void aac_fib_free(struct fib *fibptr)
 {
-        unsigned long flags, flagsv;
+        unsigned long flags;
 
-        spin_lock_irqsave(&fibptr->event_lock, flagsv);
-        if (fibptr->done == 2) {
-                spin_unlock_irqrestore(&fibptr->event_lock, flagsv);
+        if (fibptr->done == 2)
                 return;
-        }
-        spin_unlock_irqrestore(&fibptr->event_lock, flagsv);
 
         spin_lock_irqsave(&fibptr->dev->fib_lock, flags);
         if (unlikely(fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
@@ -321,7 +317,7 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
         /* Queue is full */
         if ((*index + 1) == le32_to_cpu(*(q->headers.consumer))) {
                 printk(KERN_WARNING "Queue %d full, %u outstanding.\n",
-                                qid, q->numpending);
+                                qid, atomic_read(&q->numpending));
                 return 0;
         } else {
                 *entry = q->base + *index;
@@ -414,7 +410,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         struct aac_dev * dev = fibptr->dev;
         struct hw_fib * hw_fib = fibptr->hw_fib_va;
         unsigned long flags = 0;
-        unsigned long qflags;
         unsigned long mflags = 0;
         unsigned long sflags = 0;
 
@@ -568,9 +563,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                                 int blink;
                                 if (time_is_before_eq_jiffies(timeout)) {
                                         struct aac_queue * q = &dev->queues->queue[AdapNormCmdQueue];
-                                        spin_lock_irqsave(q->lock, qflags);
-                                        q->numpending--;
-                                        spin_unlock_irqrestore(q->lock, qflags);
+                                        atomic_dec(&q->numpending);
                                         if (wait == -1) {
                                                 printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"
                                                   "Usually a result of a PCI interrupt routing problem;\n"
@@ -775,7 +768,6 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
 
 int aac_fib_complete(struct fib *fibptr)
 {
-        unsigned long flags;
         struct hw_fib * hw_fib = fibptr->hw_fib_va;
 
         /*
@@ -798,12 +790,6 @@ int aac_fib_complete(struct fib *fibptr)
          *      command is complete that we had sent to the adapter and this
          *      cdb could be reused.
          */
-        spin_lock_irqsave(&fibptr->event_lock, flags);
-        if (fibptr->done == 2) {
-                spin_unlock_irqrestore(&fibptr->event_lock, flags);
-                return 0;
-        }
-        spin_unlock_irqrestore(&fibptr->event_lock, flags);
 
         if((hw_fib->header.XferState & cpu_to_le32(SentFromHost)) &&
                 (hw_fib->header.XferState & cpu_to_le32(AdapterProcessed)))
@@ -868,7 +854,7 @@ void aac_printf(struct aac_dev *dev, u32 val)
  *      dispatches it to the appropriate routine for handling.
  */
 
-#define AIF_SNIFF_TIMEOUT       (30*HZ)
+#define AIF_SNIFF_TIMEOUT       (500*HZ)
 static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 {
         struct hw_fib * hw_fib = fibptr->hw_fib_va;
@@ -897,6 +883,39 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
         switch (le32_to_cpu(aifcmd->command)) {
         case AifCmdDriverNotify:
                 switch (le32_to_cpu(((__le32 *)aifcmd->data)[0])) {
+                case AifRawDeviceRemove:
+                        container = le32_to_cpu(((__le32 *)aifcmd->data)[1]);
+                        if ((container >> 28)) {
+                                container = (u32)-1;
+                                break;
+                        }
+                        channel = (container >> 24) & 0xF;
+                        if (channel >= dev->maximum_num_channels) {
+                                container = (u32)-1;
+                                break;
+                        }
+                        id = container & 0xFFFF;
+                        if (id >= dev->maximum_num_physicals) {
+                                container = (u32)-1;
+                                break;
+                        }
+                        lun = (container >> 16) & 0xFF;
+                        container = (u32)-1;
+                        channel = aac_phys_to_logical(channel);
+                        device_config_needed =
+                          (((__le32 *)aifcmd->data)[0] ==
+                            cpu_to_le32(AifRawDeviceRemove)) ? DELETE : ADD;
+
+                        if (device_config_needed == ADD) {
+                                device = scsi_device_lookup(
+                                        dev->scsi_host_ptr,
+                                        channel, id, lun);
+                                if (device) {
+                                        scsi_remove_device(device);
+                                        scsi_device_put(device);
+                                }
+                        }
+                        break;
                 /*
                  *      Morph or Expand complete
                  */
@@ -1044,6 +1063,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         switch (le32_to_cpu(((__le32 *)aifcmd->data)[3])) {
                         case EM_DRIVE_INSERTION:
                         case EM_DRIVE_REMOVAL:
+                        case EM_SES_DRIVE_INSERTION:
+                        case EM_SES_DRIVE_REMOVAL:
                                 container = le32_to_cpu(
                                         ((__le32 *)aifcmd->data)[2]);
                                 if ((container >> 28)) {
@@ -1069,8 +1090,10 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 }
                                 channel = aac_phys_to_logical(channel);
                                 device_config_needed =
-                                  (((__le32 *)aifcmd->data)[3]
-                                    == cpu_to_le32(EM_DRIVE_INSERTION)) ?
+                                  ((((__le32 *)aifcmd->data)[3]
+                                    == cpu_to_le32(EM_DRIVE_INSERTION)) ||
+                                    (((__le32 *)aifcmd->data)[3]
+                                    == cpu_to_le32(EM_SES_DRIVE_INSERTION))) ?
                                   ADD : DELETE;
                                 break;
                         }
@@ -1247,12 +1270,13 @@ retry_next:
 static int _aac_reset_adapter(struct aac_dev *aac, int forced)
 {
         int index, quirks;
-        int retval;
+        int retval, i;
         struct Scsi_Host *host;
         struct scsi_device *dev;
         struct scsi_cmnd *command;
         struct scsi_cmnd *command_list;
         int jafo = 0;
+        int cpu;
 
         /*
          * Assumptions:
@@ -1315,7 +1339,33 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
         aac->comm_phys = 0;
         kfree(aac->queues);
         aac->queues = NULL;
-        free_irq(aac->pdev->irq, aac);
+        cpu = cpumask_first(cpu_online_mask);
+        if (aac->pdev->device == PMC_DEVICE_S6 ||
+            aac->pdev->device == PMC_DEVICE_S7 ||
+            aac->pdev->device == PMC_DEVICE_S8 ||
+            aac->pdev->device == PMC_DEVICE_S9) {
+                if (aac->max_msix > 1) {
+                        for (i = 0; i < aac->max_msix; i++) {
+                                if (irq_set_affinity_hint(
+                                    aac->msixentry[i].vector,
+                                    NULL)) {
+                                        printk(KERN_ERR "%s%d: Failed to reset IRQ affinity for cpu %d\n",
+                                                aac->name,
+                                                aac->id,
+                                                cpu);
+                                }
+                                cpu = cpumask_next(cpu,
+                                                cpu_online_mask);
+                                free_irq(aac->msixentry[i].vector,
+                                         &(aac->aac_msix[i]));
+                        }
+                        pci_disable_msix(aac->pdev);
+                } else {
+                        free_irq(aac->pdev->irq, &(aac->aac_msix[0]));
+                }
+        } else {
+                free_irq(aac->pdev->irq, aac);
+        }
         if (aac->msi)
                 pci_disable_msi(aac->pdev);
         kfree(aac->fsa_dev);
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index d81b2810f0f7..da9d9936e995 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -84,7 +84,7 @@ unsigned int aac_response_normal(struct aac_queue * q)
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                dev->queues->queue[AdapNormCmdQueue].numpending--;
+                atomic_dec(&dev->queues->queue[AdapNormCmdQueue].numpending);
 
                 if (unlikely(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
                         spin_unlock_irqrestore(q->lock, flags);
@@ -354,7 +354,7 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                dev->queues->queue[AdapNormCmdQueue].numpending--;
+                atomic_dec(&dev->queues->queue[AdapNormCmdQueue].numpending);
 
                 if (unlikely(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
                         aac_fib_complete(fib);
@@ -389,8 +389,13 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
                          *      NOTE:  we cannot touch the fib after this
                          *          call, because it may have been deallocated.
                          */
-                        fib->flags &= FIB_CONTEXT_FLAG_FASTRESP;
-                        fib->callback(fib->callback_data, fib);
+                        if (likely(fib->callback && fib->callback_data)) {
+                                fib->flags &= FIB_CONTEXT_FLAG_FASTRESP;
+                                fib->callback(fib->callback_data, fib);
+                        } else {
+                                aac_fib_complete(fib);
+                                aac_fib_free(fib);
+                        }
                 } else {
                         unsigned long flagv;
                         dprintk((KERN_INFO "event_wait up\n"));
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index fdcdf9f781bc..9eec02733c86 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -56,7 +56,7 @@
 
 #include "aacraid.h"
 
-#define AAC_DRIVER_VERSION              "1.2-0"
+#define AAC_DRIVER_VERSION              "1.2-1"
 #ifndef AAC_DRIVER_BRANCH
 #define AAC_DRIVER_BRANCH               ""
 #endif
@@ -251,27 +251,15 @@ static struct aac_driver_ident aac_drivers[] = {
  *      TODO: unify with aac_scsi_cmd().
  */
 
-static int aac_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
+static int aac_queuecommand(struct Scsi_Host *shost,
+                            struct scsi_cmnd *cmd)
 {
-        struct Scsi_Host *host = cmd->device->host;
-        struct aac_dev *dev = (struct aac_dev *)host->hostdata;
-        u32 count = 0;
-        cmd->scsi_done = done;
-        for (; count < (host->can_queue + AAC_NUM_MGT_FIB); ++count) {
-                struct fib * fib = &dev->fibs[count];
-                struct scsi_cmnd * command;
-                if (fib->hw_fib_va->header.XferState &&
-                    ((command = fib->callback_data)) &&
-                    (command == cmd) &&
-                    (cmd->SCp.phase == AAC_OWNER_FIRMWARE))
-                        return 0; /* Already owned by Adapter */
-        }
+        int r = 0;
         cmd->SCp.phase = AAC_OWNER_LOWLEVEL;
-        return (aac_scsi_cmd(cmd) ? FAILED : 0);
+        r = (aac_scsi_cmd(cmd) ? FAILED : 0);
+        return r;
 }
 
-static DEF_SCSI_QCMD(aac_queuecommand)
-
 /**
  *      aac_info                -       Returns the host adapter name
  *      @shost:         Scsi host to report on
@@ -713,7 +701,9 @@ static long aac_cfg_ioctl(struct file *file,
                 unsigned int cmd, unsigned long arg)
 {
         int ret;
-        if (!capable(CAP_SYS_RAWIO))
+        struct aac_dev *aac;
+        aac = (struct aac_dev *)file->private_data;
+        if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
                 return -EPERM;
         mutex_lock(&aac_mutex);
         ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);
@@ -1082,6 +1072,9 @@ static struct scsi_host_template aac_driver_template = {
 
 static void __aac_shutdown(struct aac_dev * aac)
 {
+        int i;
+        int cpu;
+
         if (aac->aif_thread) {
                 int i;
                 /* Clear out events first */
@@ -1095,9 +1088,37 @@ static void __aac_shutdown(struct aac_dev * aac)
         }
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
-        free_irq(aac->pdev->irq, aac);
+        cpu = cpumask_first(cpu_online_mask);
+        if (aac->pdev->device == PMC_DEVICE_S6 ||
+            aac->pdev->device == PMC_DEVICE_S7 ||
+            aac->pdev->device == PMC_DEVICE_S8 ||
+            aac->pdev->device == PMC_DEVICE_S9) {
+                if (aac->max_msix > 1) {
+                        for (i = 0; i < aac->max_msix; i++) {
+                                if (irq_set_affinity_hint(
+                                    aac->msixentry[i].vector,
+                                    NULL)) {
+                                        printk(KERN_ERR "%s%d: Failed to reset IRQ affinity for cpu %d\n",
+                                                aac->name,
+                                                aac->id,
+                                                cpu);
+                                }
+                                cpu = cpumask_next(cpu,
+                                                cpu_online_mask);
+                                free_irq(aac->msixentry[i].vector,
+                                         &(aac->aac_msix[i]));
+                        }
+                } else {
+                        free_irq(aac->pdev->irq,
+                                 &(aac->aac_msix[0]));
+                }
+        } else {
+                free_irq(aac->pdev->irq, aac);
+        }
         if (aac->msi)
                 pci_disable_msi(aac->pdev);
+        else if (aac->max_msix > 1)
+                pci_disable_msix(aac->pdev);
 }
 
 static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 5c6a8703f535..9570612b80ce 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -400,16 +400,13 @@ int aac_rx_deliver_producer(struct fib * fib)
 {
         struct aac_dev *dev = fib->dev;
         struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
-        unsigned long qflags;
         u32 Index;
         unsigned long nointr = 0;
 
-        spin_lock_irqsave(q->lock, qflags);
         aac_queue_get( dev, &Index, AdapNormCmdQueue, fib->hw_fib_va, 1, fib, &nointr);
 
-        q->numpending++;
+        atomic_inc(&q->numpending);
         *(q->headers.producer) = cpu_to_le32(Index + 1);
-        spin_unlock_irqrestore(q->lock, qflags);
         if (!(nointr & aac_config.irq_mod))
                 aac_adapter_notify(dev, AdapNormCmdQueue);
 
@@ -426,15 +423,12 @@ static int aac_rx_deliver_message(struct fib * fib)
 {
         struct aac_dev *dev = fib->dev;
         struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
-        unsigned long qflags;
         u32 Index;
         u64 addr;
         volatile void __iomem *device;
 
         unsigned long count = 10000000L; /* 50 seconds */
-        spin_lock_irqsave(q->lock, qflags);
-        q->numpending++;
-        spin_unlock_irqrestore(q->lock, qflags);
+        atomic_inc(&q->numpending);
         for(;;) {
                 Index = rx_readl(dev, MUnit.InboundQueue);
                 if (unlikely(Index == 0xFFFFFFFFL))
@@ -442,9 +436,7 @@ static int aac_rx_deliver_message(struct fib * fib)
                 if (likely(Index != 0xFFFFFFFFL))
                         break;
                 if (--count == 0) {
-                        spin_lock_irqsave(q->lock, qflags);
-                        q->numpending--;
-                        spin_unlock_irqrestore(q->lock, qflags);
+                        atomic_dec(&q->numpending);
                         return -ETIMEDOUT;
                 }
                 udelay(5);
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 9c65aed26212..4596e9dd757c 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -44,98 +44,128 @@
 
 #include "aacraid.h"
 
-static irqreturn_t aac_src_intr_message(int irq, void *dev_id)
+static int aac_src_get_sync_status(struct aac_dev *dev);
+
+irqreturn_t aac_src_intr_message(int irq, void *dev_id)
 {
-        struct aac_dev *dev = dev_id;
+        struct aac_msix_ctx *ctx;
+        struct aac_dev *dev;
         unsigned long bellbits, bellbits_shifted;
-        int our_interrupt = 0;
-        int isFastResponse;
+        int vector_no;
+        int isFastResponse, mode;
         u32 index, handle;
 
-        bellbits = src_readl(dev, MUnit.ODR_R);
-        if (bellbits & PmDoorBellResponseSent) {
-                bellbits = PmDoorBellResponseSent;
-                /* handle async. status */
-                src_writel(dev, MUnit.ODR_C, bellbits);
-                src_readl(dev, MUnit.ODR_C);
-                our_interrupt = 1;
-                index = dev->host_rrq_idx;
-                for (;;) {
-                        isFastResponse = 0;
-                        /* remove toggle bit (31) */
-                        handle = le32_to_cpu(dev->host_rrq[index]) & 0x7fffffff;
-                        /* check fast response bit (30) */
-                        if (handle & 0x40000000)
-                                isFastResponse = 1;
-                        handle &= 0x0000ffff;
-                        if (handle == 0)
-                                break;
-
-                        aac_intr_normal(dev, handle-1, 0, isFastResponse, NULL);
-
-                        dev->host_rrq[index++] = 0;
-                        if (index == dev->scsi_host_ptr->can_queue +
-                                                AAC_NUM_MGT_FIB)
-                                index = 0;
-                        dev->host_rrq_idx = index;
+        ctx = (struct aac_msix_ctx *)dev_id;
+        dev = ctx->dev;
+        vector_no = ctx->vector_no;
+
+        if (dev->msi_enabled) {
+                mode = AAC_INT_MODE_MSI;
+                if (vector_no == 0) {
+                        bellbits = src_readl(dev, MUnit.ODR_MSI);
+                        if (bellbits & 0x40000)
+                                mode |= AAC_INT_MODE_AIF;
+                        if (bellbits & 0x1000)
+                                mode |= AAC_INT_MODE_SYNC;
                 }
         } else {
-                bellbits_shifted = (bellbits >> SRC_ODR_SHIFT);
-                if (bellbits_shifted & DoorBellAifPending) {
+                mode = AAC_INT_MODE_INTX;
+                bellbits = src_readl(dev, MUnit.ODR_R);
+                if (bellbits & PmDoorBellResponseSent) {
+                        bellbits = PmDoorBellResponseSent;
+                        src_writel(dev, MUnit.ODR_C, bellbits);
+                        src_readl(dev, MUnit.ODR_C);
+                } else {
+                        bellbits_shifted = (bellbits >> SRC_ODR_SHIFT);
                         src_writel(dev, MUnit.ODR_C, bellbits);
                         src_readl(dev, MUnit.ODR_C);
-                        our_interrupt = 1;
-                        /* handle AIF */
-                        aac_intr_normal(dev, 0, 2, 0, NULL);
-                } else if (bellbits_shifted & OUTBOUNDDOORBELL_0) {
-                        unsigned long sflags;
-                        struct list_head *entry;
-                        int send_it = 0;
-                        extern int aac_sync_mode;
 
+                        if (bellbits_shifted & DoorBellAifPending)
+                                mode |= AAC_INT_MODE_AIF;
+                        else if (bellbits_shifted & OUTBOUNDDOORBELL_0)
+                                mode |= AAC_INT_MODE_SYNC;
+                }
+        }
+
+        if (mode & AAC_INT_MODE_SYNC) {
+                unsigned long sflags;
+                struct list_head *entry;
+                int send_it = 0;
+                extern int aac_sync_mode;
+
+                if (!aac_sync_mode && !dev->msi_enabled) {
                         src_writel(dev, MUnit.ODR_C, bellbits);
                         src_readl(dev, MUnit.ODR_C);
+                }
 
-                        if (!aac_sync_mode) {
-                                src_writel(dev, MUnit.ODR_C, bellbits);
-                                src_readl(dev, MUnit.ODR_C);
-                                our_interrupt = 1;
+                if (dev->sync_fib) {
+                        if (dev->sync_fib->callback)
+                                dev->sync_fib->callback(dev->sync_fib->callback_data,
+                                        dev->sync_fib);
+                        spin_lock_irqsave(&dev->sync_fib->event_lock, sflags);
+                        if (dev->sync_fib->flags & FIB_CONTEXT_FLAG_WAIT) {
+                                dev->management_fib_count--;
+                                up(&dev->sync_fib->event_wait);
                         }
-
-                        if (dev->sync_fib) {
-                                our_interrupt = 1;
-                                if (dev->sync_fib->callback)
-                                        dev->sync_fib->callback(dev->sync_fib->callback_data,
-                                                dev->sync_fib);
-                                spin_lock_irqsave(&dev->sync_fib->event_lock, sflags);
-                                if (dev->sync_fib->flags & FIB_CONTEXT_FLAG_WAIT) {
-                                        dev->management_fib_count--;
-                                        up(&dev->sync_fib->event_wait);
-                                }
-                                spin_unlock_irqrestore(&dev->sync_fib->event_lock, sflags);
-                                spin_lock_irqsave(&dev->sync_lock, sflags);
-                                if (!list_empty(&dev->sync_fib_list)) {
-                                        entry = dev->sync_fib_list.next;
-                                        dev->sync_fib = list_entry(entry, struct fib, fiblink);
-                                        list_del(entry);
-                                        send_it = 1;
-                                } else {
-                                        dev->sync_fib = NULL;
-                                }
-                                spin_unlock_irqrestore(&dev->sync_lock, sflags);
-                                if (send_it) {
-                                        aac_adapter_sync_cmd(dev, SEND_SYNCHRONOUS_FIB,
-                                                (u32)dev->sync_fib->hw_fib_pa, 0, 0, 0, 0, 0,
-                                                NULL, NULL, NULL, NULL, NULL);
-                                }
+                        spin_unlock_irqrestore(&dev->sync_fib->event_lock,
+                                                sflags);
+                        spin_lock_irqsave(&dev->sync_lock, sflags);
+                        if (!list_empty(&dev->sync_fib_list)) {
+                                entry = dev->sync_fib_list.next;
+                                dev->sync_fib = list_entry(entry,
+                                                           struct fib,
+                                                           fiblink);
+                                list_del(entry);
+                                send_it = 1;
+                        } else {
+                                dev->sync_fib = NULL;
+                        }
+                        spin_unlock_irqrestore(&dev->sync_lock, sflags);
+                        if (send_it) {
+                                aac_adapter_sync_cmd(dev, SEND_SYNCHRONOUS_FIB,
+                                        (u32)dev->sync_fib->hw_fib_pa,
+                                        0, 0, 0, 0, 0,
+                                        NULL, NULL, NULL, NULL, NULL);
                         }
                 }
+                if (!dev->msi_enabled)
+                        mode = 0;
+
+        }
+
+        if (mode & AAC_INT_MODE_AIF) {
+                /* handle AIF */
+                aac_intr_normal(dev, 0, 2, 0, NULL);
+                if (dev->msi_enabled)
+                        aac_src_access_devreg(dev, AAC_CLEAR_AIF_BIT);
+                mode = 0;
         }
 
-        if (our_interrupt) {
-                return IRQ_HANDLED;
+        if (mode) {
+                index = dev->host_rrq_idx[vector_no];
+
+                for (;;) {
+                        isFastResponse = 0;
+                        /* remove toggle bit (31) */
+                        handle = (dev->host_rrq[index] & 0x7fffffff);
+                        /* check fast response bit (30) */
+                        if (handle & 0x40000000)
+                                isFastResponse = 1;
+                        handle &= 0x0000ffff;
+                        if (handle == 0)
+                                break;
+                        if (dev->msi_enabled && dev->max_msix > 1)
+                                atomic_dec(&dev->rrq_outstanding[vector_no]);
+                        aac_intr_normal(dev, handle-1, 0, isFastResponse, NULL);
+                        dev->host_rrq[index++] = 0;
+                        if (index == (vector_no + 1) * dev->vector_cap)
+                                index = vector_no * dev->vector_cap;
+                        dev->host_rrq_idx[vector_no] = index;
+                }
+                mode = 0;
         }
-        return IRQ_NONE;
+
+        return IRQ_HANDLED;
 }
 
 /**
@@ -155,7 +185,7 @@ static void aac_src_disable_interrupt(struct aac_dev *dev)
 
 static void aac_src_enable_interrupt_message(struct aac_dev *dev)
 {
-        src_writel(dev, MUnit.OIMR, dev->OIMR = 0xfffffff8);
+        aac_src_access_devreg(dev, AAC_ENABLE_INTERRUPT);
 }
 
 /**
@@ -174,6 +204,7 @@ static int src_sync_cmd(struct aac_dev *dev, u32 command,
         u32 *status, u32 * r1, u32 * r2, u32 * r3, u32 * r4)
 {
         unsigned long start;
+        unsigned long delay;
         int ok;
 
         /*
@@ -191,7 +222,10 @@ static int src_sync_cmd(struct aac_dev *dev, u32 command,
         /*
          *      Clear the synch command doorbell to start on a clean slate.
          */
-        src_writel(dev, MUnit.ODR_C, OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+        if (!dev->msi_enabled)
+                src_writel(dev,
+                           MUnit.ODR_C,
+                           OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
 
         /*
          *      Disable doorbell interrupts
@@ -213,19 +247,29 @@ static int src_sync_cmd(struct aac_dev *dev, u32 command,
                 ok = 0;
                 start = jiffies;
 
-                /*
-                 *      Wait up to 5 minutes
-                 */
-                while (time_before(jiffies, start+300*HZ)) {
+                if (command == IOP_RESET_ALWAYS) {
+                        /* Wait up to 10 sec */
+                        delay = 10*HZ;
+                } else {
+                        /* Wait up to 5 minutes */
+                        delay = 300*HZ;
+                }
+                while (time_before(jiffies, start+delay)) {
                         udelay(5);      /* Delay 5 microseconds to let Mon960 get info. */
                         /*
                          *      Mon960 will set doorbell0 bit when it has completed the command.
                          */
-                        if ((src_readl(dev, MUnit.ODR_R) >> SRC_ODR_SHIFT) & OUTBOUNDDOORBELL_0) {
+                        if (aac_src_get_sync_status(dev) & OUTBOUNDDOORBELL_0) {
                                 /*
                                  *      Clear the doorbell.
                                  */
-                                src_writel(dev, MUnit.ODR_C, OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+                                if (dev->msi_enabled)
+                                        aac_src_access_devreg(dev,
+                                                AAC_CLEAR_SYNC_BIT);
+                                else
+                                        src_writel(dev,
+                                                MUnit.ODR_C,
+                                                OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
                                 ok = 1;
                                 break;
                         }
@@ -254,11 +298,16 @@ static int src_sync_cmd(struct aac_dev *dev, u32 command,
                         *r3 = readl(&dev->IndexRegs->Mailbox[3]);
                 if (r4)
                         *r4 = readl(&dev->IndexRegs->Mailbox[4]);
-
+                if (command == GET_COMM_PREFERRED_SETTINGS)
+                        dev->max_msix =
+                                readl(&dev->IndexRegs->Mailbox[5]) & 0xFFFF;
                 /*
                  *      Clear the synch command doorbell.
                  */
-                src_writel(dev, MUnit.ODR_C, OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+                if (!dev->msi_enabled)
+                        src_writel(dev,
+                                MUnit.ODR_C,
+                                OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
         }
 
         /*
@@ -335,9 +384,14 @@ static void aac_src_notify_adapter(struct aac_dev *dev, u32 event)
 static void aac_src_start_adapter(struct aac_dev *dev)
 {
         struct aac_init *init;
+        int i;
 
          /* reset host_rrq_idx first */
-        dev->host_rrq_idx = 0;
+        for (i = 0; i < dev->max_msix; i++) {
+                dev->host_rrq_idx[i] = i * dev->vector_cap;
+                atomic_set(&dev->rrq_outstanding[i], 0);
+        }
+        dev->fibs_pushed_no = 0;
 
         init = dev->init;
         init->HostElapsedSeconds = cpu_to_le32(get_seconds());
@@ -390,15 +444,39 @@ static int aac_src_deliver_message(struct fib *fib)
 {
         struct aac_dev *dev = fib->dev;
         struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
-        unsigned long qflags;
         u32 fibsize;
         dma_addr_t address;
         struct aac_fib_xporthdr *pFibX;
         u16 hdr_size = le16_to_cpu(fib->hw_fib_va->header.Size);
 
-        spin_lock_irqsave(q->lock, qflags);
-        q->numpending++;
-        spin_unlock_irqrestore(q->lock, qflags);
+        atomic_inc(&q->numpending);
+
+        if (dev->msi_enabled && fib->hw_fib_va->header.Command != AifRequest &&
+            dev->max_msix > 1) {
+                u_int16_t vector_no, first_choice = 0xffff;
+
+                vector_no = dev->fibs_pushed_no % dev->max_msix;
+                do {
+                        vector_no += 1;
+                        if (vector_no == dev->max_msix)
+                                vector_no = 1;
+                        if (atomic_read(&dev->rrq_outstanding[vector_no]) <
+                            dev->vector_cap)
+                                break;
+                        if (0xffff == first_choice)
+                                first_choice = vector_no;
+                        else if (vector_no == first_choice)
+                                break;
+                } while (1);
+                if (vector_no == first_choice)
+                        vector_no = 0;
+                atomic_inc(&dev->rrq_outstanding[vector_no]);
+                if (dev->fibs_pushed_no == 0xffffffff)
+                        dev->fibs_pushed_no = 0;
+                else
+                        dev->fibs_pushed_no++;
+                fib->hw_fib_va->header.Handle += (vector_no << 16);
+        }
 
         if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE2) {
                 /* Calculate the amount to the fibsize bits */
@@ -498,15 +576,34 @@ static int aac_src_restart_adapter(struct aac_dev *dev, int bled)
                 if (bled)
                         printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",
                                 dev->name, dev->id, bled);
+                dev->a_ops.adapter_enable_int = aac_src_disable_interrupt;
                 bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
                         0, 0, 0, 0, 0, 0, &var, &reset_mask, NULL, NULL, NULL);
-                        if (bled || (var != 0x00000001))
-                                return -EINVAL;
-                if (dev->supplement_adapter_info.SupportedOptions2 &
-                        AAC_OPTION_DOORBELL_RESET) {
-                        src_writel(dev, MUnit.IDR, reset_mask);
+                if ((bled || (var != 0x00000001)) &&
+                    !dev->doorbell_mask)
+                        return -EINVAL;
+                else if (dev->doorbell_mask) {
+                        reset_mask = dev->doorbell_mask;
+                        bled = 0;
+                        var = 0x00000001;
+                }
+
+                if ((dev->pdev->device == PMC_DEVICE_S7 ||
+                    dev->pdev->device == PMC_DEVICE_S8 ||
+                    dev->pdev->device == PMC_DEVICE_S9) && dev->msi_enabled) {
+                        aac_src_access_devreg(dev, AAC_ENABLE_INTX);
+                        dev->msi_enabled = 0;
                         msleep(5000); /* Delay 5 seconds */
                 }
+
+                if (!bled && (dev->supplement_adapter_info.SupportedOptions2 &
+                    AAC_OPTION_DOORBELL_RESET)) {
+                        src_writel(dev, MUnit.IDR, reset_mask);
+                        ssleep(45);
+                } else {
+                        src_writel(dev, MUnit.IDR, 0x100);
+                        ssleep(45);
+                }
         }
 
         if (src_readl(dev, MUnit.OMR) & KERNEL_PANIC)
@@ -527,7 +624,6 @@ int aac_src_select_comm(struct aac_dev *dev, int comm)
 {
         switch (comm) {
         case AAC_COMM_MESSAGE:
-                dev->a_ops.adapter_enable_int = aac_src_enable_interrupt_message;
                 dev->a_ops.adapter_intr = aac_src_intr_message;
                 dev->a_ops.adapter_deliver = aac_src_deliver_message;
                 break;
@@ -625,6 +721,7 @@ int aac_src_init(struct aac_dev *dev)
          */
         dev->a_ops.adapter_interrupt = aac_src_interrupt_adapter;
         dev->a_ops.adapter_disable_int = aac_src_disable_interrupt;
+        dev->a_ops.adapter_enable_int = aac_src_disable_interrupt;
         dev->a_ops.adapter_notify = aac_src_notify_adapter;
         dev->a_ops.adapter_sync_cmd = src_sync_cmd;
         dev->a_ops.adapter_check_health = aac_src_check_health;
@@ -646,8 +743,11 @@ int aac_src_init(struct aac_dev *dev)
 
         dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
 
+        dev->aac_msix[0].vector_no = 0;
+        dev->aac_msix[0].dev = dev;
+
         if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                        IRQF_SHARED, "aacraid", dev) < 0) {
+                        IRQF_SHARED, "aacraid", &(dev->aac_msix[0]))  < 0) {
 
                 if (dev->msi)
                         pci_disable_msi(dev->pdev);
@@ -659,6 +759,7 @@ int aac_src_init(struct aac_dev *dev)
         dev->dbg_base = pci_resource_start(dev->pdev, 2);
         dev->dbg_base_mapped = dev->regs.src.bar1;
         dev->dbg_size = AAC_MIN_SRC_BAR1_SIZE;
+        dev->a_ops.adapter_enable_int = aac_src_enable_interrupt_message;
 
         aac_adapter_enable_int(dev);
 
@@ -688,7 +789,9 @@ int aac_srcv_init(struct aac_dev *dev)
         unsigned long status;
         int restart = 0;
         int instance = dev->id;
+        int i, j;
         const char *name = dev->name;
+        int cpu;
 
         dev->a_ops.adapter_ioremap = aac_srcv_ioremap;
         dev->a_ops.adapter_comm = aac_src_select_comm;
@@ -784,6 +887,7 @@ int aac_srcv_init(struct aac_dev *dev)
          */
         dev->a_ops.adapter_interrupt = aac_src_interrupt_adapter;
         dev->a_ops.adapter_disable_int = aac_src_disable_interrupt;
+        dev->a_ops.adapter_enable_int = aac_src_disable_interrupt;
         dev->a_ops.adapter_notify = aac_src_notify_adapter;
         dev->a_ops.adapter_sync_cmd = src_sync_cmd;
         dev->a_ops.adapter_check_health = aac_src_check_health;
@@ -802,18 +906,54 @@ int aac_srcv_init(struct aac_dev *dev)
                 goto error_iounmap;
         if (dev->comm_interface != AAC_COMM_MESSAGE_TYPE2)
                 goto error_iounmap;
-        dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
-        if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                IRQF_SHARED, "aacraid", dev) < 0) {
-                if (dev->msi)
-                        pci_disable_msi(dev->pdev);
-                printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
-                        name, instance);
-                goto error_iounmap;
+        if (dev->msi_enabled)
+                aac_src_access_devreg(dev, AAC_ENABLE_MSIX);
+        if (!dev->sync_mode && dev->msi_enabled && dev->max_msix > 1) {
+                cpu = cpumask_first(cpu_online_mask);
+                for (i = 0; i < dev->max_msix; i++) {
+                        dev->aac_msix[i].vector_no = i;
+                        dev->aac_msix[i].dev = dev;
+
+                        if (request_irq(dev->msixentry[i].vector,
+                                        dev->a_ops.adapter_intr,
+                                        0,
+                                        "aacraid",
+                                        &(dev->aac_msix[i]))) {
+                                printk(KERN_ERR "%s%d: Failed to register IRQ for vector %d.\n",
+                                                name, instance, i);
+                                for (j = 0 ; j < i ; j++)
+                                        free_irq(dev->msixentry[j].vector,
+                                                 &(dev->aac_msix[j]));
+                                pci_disable_msix(dev->pdev);
+                                goto error_iounmap;
+                        }
+                        if (irq_set_affinity_hint(
+                           dev->msixentry[i].vector,
+                           get_cpu_mask(cpu))) {
+                                printk(KERN_ERR "%s%d: Failed to set IRQ affinity for cpu %d\n",
+                                                name, instance, cpu);
+                        }
+                        cpu = cpumask_next(cpu, cpu_online_mask);
+                }
+        } else {
+                dev->aac_msix[0].vector_no = 0;
+                dev->aac_msix[0].dev = dev;
+
+                if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
+                                IRQF_SHARED,
+                                "aacraid",
+                                &(dev->aac_msix[0])) < 0) {
+                        if (dev->msi)
+                                pci_disable_msi(dev->pdev);
+                        printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
+                                        name, instance);
+                        goto error_iounmap;
+                }
         }
         dev->dbg_base = dev->base_start;
         dev->dbg_base_mapped = dev->base;
         dev->dbg_size = dev->base_size;
+        dev->a_ops.adapter_enable_int = aac_src_enable_interrupt_message;
 
         aac_adapter_enable_int(dev);
 
@@ -831,3 +971,93 @@ error_iounmap:
         return -1;
 }
 
+void aac_src_access_devreg(struct aac_dev *dev, int mode)
+{
+        u_int32_t val;
+
+        switch (mode) {
+        case AAC_ENABLE_INTERRUPT:
+                src_writel(dev,
+                           MUnit.OIMR,
+                           dev->OIMR = (dev->msi_enabled ?
+                                        AAC_INT_ENABLE_TYPE1_MSIX :
+                                        AAC_INT_ENABLE_TYPE1_INTX));
+                break;
+
+        case AAC_DISABLE_INTERRUPT:
+                src_writel(dev,
+                           MUnit.OIMR,
+                           dev->OIMR = AAC_INT_DISABLE_ALL);
+                break;
+
+        case AAC_ENABLE_MSIX:
+                /* set bit 6 */
+                val = src_readl(dev, MUnit.IDR);
+                val |= 0x40;
+                src_writel(dev,  MUnit.IDR, val);
+                src_readl(dev, MUnit.IDR);
+                /* unmask int. */
+                val = PMC_ALL_INTERRUPT_BITS;
+                src_writel(dev, MUnit.IOAR, val);
+                val = src_readl(dev, MUnit.OIMR);
+                src_writel(dev,
+                           MUnit.OIMR,
+                           val & (~(PMC_GLOBAL_INT_BIT2 | PMC_GLOBAL_INT_BIT0)));
+                break;
+
+        case AAC_DISABLE_MSIX:
+                /* reset bit 6 */
+                val = src_readl(dev, MUnit.IDR);
+                val &= ~0x40;
+                src_writel(dev, MUnit.IDR, val);
+                src_readl(dev, MUnit.IDR);
+                break;
+
+        case AAC_CLEAR_AIF_BIT:
+                /* set bit 5 */
+                val = src_readl(dev, MUnit.IDR);
+                val |= 0x20;
+                src_writel(dev, MUnit.IDR, val);
+                src_readl(dev, MUnit.IDR);
+                break;
+
+        case AAC_CLEAR_SYNC_BIT:
+                /* set bit 4 */
+                val = src_readl(dev, MUnit.IDR);
+                val |= 0x10;
+                src_writel(dev, MUnit.IDR, val);
+                src_readl(dev, MUnit.IDR);
+                break;
+
+        case AAC_ENABLE_INTX:
+                /* set bit 7 */
+                val = src_readl(dev, MUnit.IDR);
+                val |= 0x80;
+                src_writel(dev, MUnit.IDR, val);
+                src_readl(dev, MUnit.IDR);
+                /* unmask int. */
+                val = PMC_ALL_INTERRUPT_BITS;
+                src_writel(dev, MUnit.IOAR, val);
+                src_readl(dev, MUnit.IOAR);
+                val = src_readl(dev, MUnit.OIMR);
+                src_writel(dev, MUnit.OIMR,
+                                val & (~(PMC_GLOBAL_INT_BIT2)));
+                break;
+
+        default:
+                break;
+        }
+}
+
+static int aac_src_get_sync_status(struct aac_dev *dev)
+{
+
+        int val;
+
+        if (dev->msi_enabled)
+                val = src_readl(dev, MUnit.ODR_MSI) & 0x1000 ? 1 : 0;
+        else
+                val = src_readl(dev, MUnit.ODR_R) >> SRC_ODR_SHIFT;
+
+        return val;
+}
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 770c48ddbe5e..ec432763a29a 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1,28 +1,9 @@
-/* $Id: aha1542.c,v 1.1 1992/07/24 06:27:38 root Exp root $
- *  linux/kernel/aha1542.c
+/*
+ *  Driver for Adaptec AHA-1542 SCSI host adapters
  *
  *  Copyright (C) 1992  Tommy Thorn
  *  Copyright (C) 1993, 1994, 1995 Eric Youngdale
- *
- *  Modified by Eric Youngdale
- *        Use request_irq and request_dma to help prevent unexpected conflicts
- *        Set up on-board DMA controller, such that we do not have to
- *        have the bios enabled to use the aha1542.
- *  Modified by David Gentzel
- *        Don't call request_dma if dma mask is 0 (for BusLogic BT-445S VL-Bus
- *        controller).
- *  Modified by Matti Aarnio
- *        Accept parameters from LILO cmd-line. -- 1-Oct-94
- *  Modified by Mike McLagan <mike.mclagan@linux.org>
- *        Recognise extended mode on AHA1542CP, different bit than 1542CF
- *        1-Jan-97
- *  Modified by Bjorn L. Thordarson and Einar Thor Einarsson
- *        Recognize that DMA0 is valid DMA channel -- 13-Jul-98
- *  Modified by Chris Faulhaber <jedgar@fxp.org>
- *        Added module command-line options
- *        19-Jul-99
- *  Modified by Adam Fritzler
- *        Added proper detection of the AHA-1640 (MCA, now deleted)
+ *  Copyright (C) 2015 Ondrej Zary
  */
 
 #include <linux/module.h>
@@ -30,96 +11,44 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/isapnp.h>
-#include <linux/blkdev.h>
+#include <linux/isa.h>
+#include <linux/pnp.h>
 #include <linux/slab.h>
-
+#include <linux/io.h>
 #include <asm/dma.h>
-#include <asm/io.h>
-
-#include "scsi.h"
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include "aha1542.h"
 
-#define SCSI_BUF_PA(address)    isa_virt_to_bus(address)
-#define SCSI_SG_PA(sgent)       (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)
-
-#include <linux/stat.h>
-
-#ifdef DEBUG
-#define DEB(x) x
-#else
-#define DEB(x)
-#endif
-
-/*
-   static const char RCSid[] = "$Header: /usr/src/linux/kernel/blk_drv/scsi/RCS/aha1542.c,v 1.1 1992/07/24 06:27:38 root Exp root $";
- */
-
-/* The adaptec can be configured for quite a number of addresses, but
-   I generally do not want the card poking around at random.  We allow
-   two addresses - this allows people to use the Adaptec with a Midi
-   card, which also used 0x330 -- can be overridden with LILO! */
-
-#define MAXBOARDS 4             /* Increase this and the sizes of the
-                                   arrays below, if you need more.. */
-
-/* Boards 3,4 slots are reserved for ISAPnP scans */
-
-static unsigned int bases[MAXBOARDS] __initdata = {0x330, 0x334, 0, 0};
-
-/* set by aha1542_setup according to the command line; they also may
-   be marked __initdata, but require zero initializers then */
-
-static int setup_called[MAXBOARDS];
-static int setup_buson[MAXBOARDS];
-static int setup_busoff[MAXBOARDS];
-static int setup_dmaspeed[MAXBOARDS] __initdata = { -1, -1, -1, -1 };
+#define MAXBOARDS 4
 
-/*
- * LILO/Module params:  aha1542=<PORTBASE>[,<BUSON>,<BUSOFF>[,<DMASPEED>]]
- *
- * Where:  <PORTBASE> is any of the valid AHA addresses:
- *                      0x130, 0x134, 0x230, 0x234, 0x330, 0x334
- *         <BUSON>  is the time (in microsecs) that AHA spends on the AT-bus
- *                  when transferring data.  1542A power-on default is 11us,
- *                  valid values are in range: 2..15 (decimal)
- *         <BUSOFF> is the time that AHA spends OFF THE BUS after while
- *                  it is transferring data (not to monopolize the bus).
- *                  Power-on default is 4us, valid range: 1..64 microseconds.
- *         <DMASPEED> Default is jumper selected (1542A: on the J1),
- *                  but experimenter can alter it with this.
- *                  Valid values: 5, 6, 7, 8, 10 (MB/s)
- *                  Factory default is 5 MB/s.
- */
-
-#if defined(MODULE)
-static bool isapnp = 0;
-static int aha1542[] = {0x330, 11, 4, -1};
-module_param_array(aha1542, int, NULL, 0);
+static bool isapnp = 1;
 module_param(isapnp, bool, 0);
+MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)");
 
-static struct isapnp_device_id id_table[] __initdata = {
-        {
-                ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-                ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1542),
-                0
-        },
-        {0}
-};
+static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 };
+module_param_array(io, int, NULL, 0);
+MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)");
 
-MODULE_DEVICE_TABLE(isapnp, id_table);
+/* time AHA spends on the AT-bus during data transfer */
+static int bus_on[MAXBOARDS] = { -1, -1, -1, -1 }; /* power-on default: 11us */
+module_param_array(bus_on, int, NULL, 0);
+MODULE_PARM_DESC(bus_on, "bus on time [us] (2-15, default=-1 [HW default: 11])");
 
-#else
-static int isapnp = 1;
-#endif
+/* time AHA spends off the bus (not to monopolize it) during data transfer  */
+static int bus_off[MAXBOARDS] = { -1, -1, -1, -1 }; /* power-on default: 4us */
+module_param_array(bus_off, int, NULL, 0);
+MODULE_PARM_DESC(bus_off, "bus off time [us] (1-64, default=-1 [HW default: 4])");
+
+/* default is jumper selected (J1 on 1542A), factory default = 5 MB/s */
+static int dma_speed[MAXBOARDS] = { -1, -1, -1, -1 };
+module_param_array(dma_speed, int, NULL, 0);
+MODULE_PARM_DESC(dma_speed, "DMA speed [MB/s] (5,6,7,8,10, default=-1 [by jumper])");
 
-#define BIOS_TRANSLATION_1632 0 /* Used by some old 1542A boards */
 #define BIOS_TRANSLATION_6432 1 /* Default case these days */
 #define BIOS_TRANSLATION_25563 2        /* Big disk case */
 
@@ -128,134 +57,71 @@ struct aha1542_hostdata {
         int bios_translation;   /* Mapping bios uses - for compatibility */
         int aha1542_last_mbi_used;
         int aha1542_last_mbo_used;
-        Scsi_Cmnd *SCint[AHA1542_MAILBOXES];
+        struct scsi_cmnd *int_cmds[AHA1542_MAILBOXES];
         struct mailbox mb[2 * AHA1542_MAILBOXES];
         struct ccb ccb[AHA1542_MAILBOXES];
 };
 
-#define HOSTDATA(host) ((struct aha1542_hostdata *) &host->hostdata)
-
-static DEFINE_SPINLOCK(aha1542_lock);
-
-
-
-#define WAITnexttimeout 3000000
-
-static void setup_mailboxes(int base_io, struct Scsi_Host *shpnt);
-static int aha1542_restart(struct Scsi_Host *shost);
-static void aha1542_intr_handle(struct Scsi_Host *shost);
+static inline void aha1542_intr_reset(u16 base)
+{
+        outb(IRST, CONTROL(base));
+}
 
-#define aha1542_intr_reset(base)  outb(IRST, CONTROL(base))
+static inline bool wait_mask(u16 port, u8 mask, u8 allof, u8 noneof, int timeout)
+{
+        bool delayed = true;
 
-#define WAIT(port, mask, allof, noneof)                                 \
- { register int WAITbits;                                               \
-   register int WAITtimeout = WAITnexttimeout;                          \
-   while (1) {                                                          \
-     WAITbits = inb(port) & (mask);                                     \
-     if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
-       break;                                                           \
-     if (--WAITtimeout == 0) goto fail;                                 \
-   }                                                                    \
- }
+        if (timeout == 0) {
+                timeout = 3000000;
+                delayed = false;
+        }
 
-/* Similar to WAIT, except we use the udelay call to regulate the
-   amount of time we wait.  */
-#define WAITd(port, mask, allof, noneof, timeout)                       \
- { register int WAITbits;                                               \
-   register int WAITtimeout = timeout;                                  \
-   while (1) {                                                          \
-     WAITbits = inb(port) & (mask);                                     \
-     if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
-       break;                                                           \
-     mdelay(1);                                                 \
-     if (--WAITtimeout == 0) goto fail;                                 \
-   }                                                                    \
- }
+        while (1) {
+                u8 bits = inb(port) & mask;
+                if ((bits & allof) == allof && ((bits & noneof) == 0))
+                        break;
+                if (delayed)
+                        mdelay(1);
+                if (--timeout == 0)
+                        return false;
+        }
 
-static void aha1542_stat(void)
-{
-/*      int s = inb(STATUS), i = inb(INTRFLAGS);
-        printk("status=%x intrflags=%x\n", s, i, WAITnexttimeout-WAITtimeout); */
+        return true;
 }
 
-/* This is a bit complicated, but we need to make sure that an interrupt
-   routine does not send something out while we are in the middle of this.
-   Fortunately, it is only at boot time that multi-byte messages
-   are ever sent. */
-static int aha1542_out(unsigned int base, unchar * cmdp, int len)
+static int aha1542_outb(unsigned int base, u8 val)
 {
-        unsigned long flags = 0;
-        int got_lock;
-
-        if (len == 1) {
-                got_lock = 0;
-                while (1 == 1) {
-                        WAIT(STATUS(base), CDF, 0, CDF);
-                        spin_lock_irqsave(&aha1542_lock, flags);
-                        if (inb(STATUS(base)) & CDF) {
-                                spin_unlock_irqrestore(&aha1542_lock, flags);
-                                continue;
-                        }
-                        outb(*cmdp, DATA(base));
-                        spin_unlock_irqrestore(&aha1542_lock, flags);
-                        return 0;
-                }
-        } else {
-                spin_lock_irqsave(&aha1542_lock, flags);
-                got_lock = 1;
-                while (len--) {
-                        WAIT(STATUS(base), CDF, 0, CDF);
-                        outb(*cmdp++, DATA(base));
-                }
-                spin_unlock_irqrestore(&aha1542_lock, flags);
-        }
+        if (!wait_mask(STATUS(base), CDF, 0, CDF, 0))
+                return 1;
+        outb(val, DATA(base));
+
         return 0;
-fail:
-        if (got_lock)
-                spin_unlock_irqrestore(&aha1542_lock, flags);
-        printk(KERN_ERR "aha1542_out failed(%d): ", len + 1);
-        aha1542_stat();
-        return 1;
 }
 
-/* Only used at boot time, so we do not need to worry about latency as much
-   here */
-
-static int __init aha1542_in(unsigned int base, unchar * cmdp, int len)
+static int aha1542_out(unsigned int base, u8 *buf, int len)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&aha1542_lock, flags);
         while (len--) {
-                WAIT(STATUS(base), DF, DF, 0);
-                *cmdp++ = inb(DATA(base));
+                if (!wait_mask(STATUS(base), CDF, 0, CDF, 0))
+                        return 1;
+                outb(*buf++, DATA(base));
         }
-        spin_unlock_irqrestore(&aha1542_lock, flags);
+        if (!wait_mask(INTRFLAGS(base), INTRMASK, HACC, 0, 0))
+                return 1;
+
         return 0;
-fail:
-        spin_unlock_irqrestore(&aha1542_lock, flags);
-        printk(KERN_ERR "aha1542_in failed(%d): ", len + 1);
-        aha1542_stat();
-        return 1;
 }
 
-/* Similar to aha1542_in, except that we wait a very short period of time.
-   We use this if we know the board is alive and awake, but we are not sure
-   if the board will respond to the command we are about to send or not */
-static int __init aha1542_in1(unsigned int base, unchar * cmdp, int len)
-{
-        unsigned long flags;
+/* Only used at boot time, so we do not need to worry about latency as much
+   here */
 
-        spin_lock_irqsave(&aha1542_lock, flags);
+static int aha1542_in(unsigned int base, u8 *buf, int len, int timeout)
+{
         while (len--) {
-                WAITd(STATUS(base), DF, DF, 0, 100);
-                *cmdp++ = inb(DATA(base));
+                if (!wait_mask(STATUS(base), DF, DF, 0, timeout))
+                        return 1;
+                *buf++ = inb(DATA(base));
         }
-        spin_unlock_irqrestore(&aha1542_lock, flags);
         return 0;
-fail:
-        spin_unlock_irqrestore(&aha1542_lock, flags);
-        return 1;
 }
 
 static int makecode(unsigned hosterr, unsigned scsierr)
@@ -297,7 +163,9 @@ static int makecode(unsigned hosterr, unsigned scsierr)
         case 0x1a:              /* Invalid CCB or Segment List Parameter-A segment list with a zero
                                    length segment or invalid segment list boundaries was received.
                                    A CCB parameter was invalid. */
-                DEB(printk("Aha1542: %x %x\n", hosterr, scsierr));
+#ifdef DEBUG
+                printk("Aha1542: %x %x\n", hosterr, scsierr);
+#endif
                 hosterr = DID_ERROR;    /* Couldn't find any better */
                 break;
 
@@ -314,106 +182,74 @@ static int makecode(unsigned hosterr, unsigned scsierr)
         return scsierr | (hosterr << 16);
 }
 
-static int __init aha1542_test_port(int bse, struct Scsi_Host *shpnt)
+static int aha1542_test_port(struct Scsi_Host *sh)
 {
-        unchar inquiry_cmd[] = {CMD_INQUIRY};
-        unchar inquiry_result[4];
-        unchar *cmdp;
-        int len;
-        volatile int debug = 0;
+        u8 inquiry_result[4];
+        int i;
 
         /* Quick and dirty test for presence of the card. */
-        if (inb(STATUS(bse)) == 0xff)
+        if (inb(STATUS(sh->io_port)) == 0xff)
                 return 0;
 
         /* Reset the adapter. I ought to make a hard reset, but it's not really necessary */
 
-        /*  DEB(printk("aha1542_test_port called \n")); */
-
         /* In case some other card was probing here, reset interrupts */
-        aha1542_intr_reset(bse);        /* reset interrupts, so they don't block */
+        aha1542_intr_reset(sh->io_port);        /* reset interrupts, so they don't block */
 
-        outb(SRST | IRST /*|SCRST */ , CONTROL(bse));
+        outb(SRST | IRST /*|SCRST */ , CONTROL(sh->io_port));
 
         mdelay(20);             /* Wait a little bit for things to settle down. */
 
-        debug = 1;
         /* Expect INIT and IDLE, any of the others are bad */
-        WAIT(STATUS(bse), STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF);
+        if (!wait_mask(STATUS(sh->io_port), STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0))
+                return 0;
 
-        debug = 2;
         /* Shouldn't have generated any interrupts during reset */
-        if (inb(INTRFLAGS(bse)) & INTRMASK)
-                goto fail;
-
+        if (inb(INTRFLAGS(sh->io_port)) & INTRMASK)
+                return 0;
 
         /* Perform a host adapter inquiry instead so we do not need to set
            up the mailboxes ahead of time */
 
-        aha1542_out(bse, inquiry_cmd, 1);
-
-        debug = 3;
-        len = 4;
-        cmdp = &inquiry_result[0];
+        aha1542_outb(sh->io_port, CMD_INQUIRY);
 
-        while (len--) {
-                WAIT(STATUS(bse), DF, DF, 0);
-                *cmdp++ = inb(DATA(bse));
+        for (i = 0; i < 4; i++) {
+                if (!wait_mask(STATUS(sh->io_port), DF, DF, 0, 0))
+                        return 0;
+                inquiry_result[i] = inb(DATA(sh->io_port));
         }
 
-        debug = 8;
         /* Reading port should reset DF */
-        if (inb(STATUS(bse)) & DF)
-                goto fail;
+        if (inb(STATUS(sh->io_port)) & DF)
+                return 0;
 
-        debug = 9;
         /* When HACC, command is completed, and we're though testing */
-        WAIT(INTRFLAGS(bse), HACC, HACC, 0);
-        /* now initialize adapter */
+        if (!wait_mask(INTRFLAGS(sh->io_port), HACC, HACC, 0, 0))
+                return 0;
 
-        debug = 10;
         /* Clear interrupts */
-        outb(IRST, CONTROL(bse));
-
-        debug = 11;
-
-        return debug;           /* 1 = ok */
-fail:
-        return 0;               /* 0 = not ok */
-}
+        outb(IRST, CONTROL(sh->io_port));
 
-/* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */
-static irqreturn_t do_aha1542_intr_handle(int dummy, void *dev_id)
-{
-        unsigned long flags;
-        struct Scsi_Host *shost = dev_id;
-
-        spin_lock_irqsave(shost->host_lock, flags);
-        aha1542_intr_handle(shost);
-        spin_unlock_irqrestore(shost->host_lock, flags);
-        return IRQ_HANDLED;
+        return 1;
 }
 
-/* A "high" level interrupt handler */
-static void aha1542_intr_handle(struct Scsi_Host *shost)
+static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 {
-        void (*my_done) (Scsi_Cmnd *) = NULL;
+        struct Scsi_Host *sh = dev_id;
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
+        void (*my_done)(struct scsi_cmnd *) = NULL;
         int errstatus, mbi, mbo, mbistatus;
         int number_serviced;
         unsigned long flags;
-        Scsi_Cmnd *SCtmp;
+        struct scsi_cmnd *tmp_cmd;
         int flag;
-        int needs_restart;
-        struct mailbox *mb;
-        struct ccb *ccb;
-
-        mb = HOSTDATA(shost)->mb;
-        ccb = HOSTDATA(shost)->ccb;
+        struct mailbox *mb = aha1542->mb;
+        struct ccb *ccb = aha1542->ccb;
 
 #ifdef DEBUG
         {
-                flag = inb(INTRFLAGS(shost->io_port));
-                printk(KERN_DEBUG "aha1542_intr_handle: ");
+                flag = inb(INTRFLAGS(sh->io_port));
+                shost_printk(KERN_DEBUG, sh, "aha1542_intr_handle: ");
                 if (!(flag & ANYINTR))
                         printk("no interrupt?");
                 if (flag & MBIF)
@@ -424,14 +260,14 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
                         printk("HACC ");
                 if (flag & SCRD)
                         printk("SCRD ");
-                printk("status %02x\n", inb(STATUS(shost->io_port)));
+                printk("status %02x\n", inb(STATUS(sh->io_port)));
         };
 #endif
         number_serviced = 0;
-        needs_restart = 0;
 
-        while (1 == 1) {
-                flag = inb(INTRFLAGS(shost->io_port));
+        spin_lock_irqsave(sh->host_lock, flags);
+        while (1) {
+                flag = inb(INTRFLAGS(sh->io_port));
 
                 /* Check for unusual interrupts.  If any of these happen, we should
                    probably do something special, but for now just printing a message
@@ -442,15 +278,12 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
                                 printk("MBOF ");
                         if (flag & HACC)
                                 printk("HACC ");
-                        if (flag & SCRD) {
-                                needs_restart = 1;
+                        if (flag & SCRD)
                                 printk("SCRD ");
-                        }
                 }
-                aha1542_intr_reset(shost->io_port);
+                aha1542_intr_reset(sh->io_port);
 
-                spin_lock_irqsave(&aha1542_lock, flags);
-                mbi = HOSTDATA(shost)->aha1542_last_mbi_used + 1;
+                mbi = aha1542->aha1542_last_mbi_used + 1;
                 if (mbi >= 2 * AHA1542_MAILBOXES)
                         mbi = AHA1542_MAILBOXES;
 
@@ -460,57 +293,51 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
                         mbi++;
                         if (mbi >= 2 * AHA1542_MAILBOXES)
                                 mbi = AHA1542_MAILBOXES;
-                } while (mbi != HOSTDATA(shost)->aha1542_last_mbi_used);
+                } while (mbi != aha1542->aha1542_last_mbi_used);
 
                 if (mb[mbi].status == 0) {
-                        spin_unlock_irqrestore(&aha1542_lock, flags);
+                        spin_unlock_irqrestore(sh->host_lock, flags);
                         /* Hmm, no mail.  Must have read it the last time around */
-                        if (!number_serviced && !needs_restart)
-                                printk(KERN_WARNING "aha1542.c: interrupt received, but no mail.\n");
-                        /* We detected a reset.  Restart all pending commands for
-                           devices that use the hard reset option */
-                        if (needs_restart)
-                                aha1542_restart(shost);
-                        return;
+                        if (!number_serviced)
+                                shost_printk(KERN_WARNING, sh, "interrupt received, but no mail.\n");
+                        return IRQ_HANDLED;
                 };
 
-                mbo = (scsi2int(mb[mbi].ccbptr) - (SCSI_BUF_PA(&ccb[0]))) / sizeof(struct ccb);
+                mbo = (scsi2int(mb[mbi].ccbptr) - (isa_virt_to_bus(&ccb[0]))) / sizeof(struct ccb);
                 mbistatus = mb[mbi].status;
                 mb[mbi].status = 0;
-                HOSTDATA(shost)->aha1542_last_mbi_used = mbi;
-                spin_unlock_irqrestore(&aha1542_lock, flags);
+                aha1542->aha1542_last_mbi_used = mbi;
 
 #ifdef DEBUG
-                {
-                        if (ccb[mbo].tarstat | ccb[mbo].hastat)
-                                printk(KERN_DEBUG "aha1542_command: returning %x (status %d)\n",
-                                       ccb[mbo].tarstat + ((int) ccb[mbo].hastat << 16), mb[mbi].status);
-                };
+                if (ccb[mbo].tarstat | ccb[mbo].hastat)
+                        shost_printk(KERN_DEBUG, sh, "aha1542_command: returning %x (status %d)\n",
+                               ccb[mbo].tarstat + ((int) ccb[mbo].hastat << 16), mb[mbi].status);
 #endif
 
                 if (mbistatus == 3)
                         continue;       /* Aborted command not found */
 
 #ifdef DEBUG
-                printk(KERN_DEBUG "...done %d %d\n", mbo, mbi);
+                shost_printk(KERN_DEBUG, sh, "...done %d %d\n", mbo, mbi);
 #endif
 
-                SCtmp = HOSTDATA(shost)->SCint[mbo];
+                tmp_cmd = aha1542->int_cmds[mbo];
 
-                if (!SCtmp || !SCtmp->scsi_done) {
-                        printk(KERN_WARNING "aha1542_intr_handle: Unexpected interrupt\n");
-                        printk(KERN_WARNING "tarstat=%x, hastat=%x idlun=%x ccb#=%d \n", ccb[mbo].tarstat,
+                if (!tmp_cmd || !tmp_cmd->scsi_done) {
+                        spin_unlock_irqrestore(sh->host_lock, flags);
+                        shost_printk(KERN_WARNING, sh, "Unexpected interrupt\n");
+                        shost_printk(KERN_WARNING, sh, "tarstat=%x, hastat=%x idlun=%x ccb#=%d\n", ccb[mbo].tarstat,
                                ccb[mbo].hastat, ccb[mbo].idlun, mbo);
-                        return;
+                        return IRQ_HANDLED;
                 }
-                my_done = SCtmp->scsi_done;
-                kfree(SCtmp->host_scribble);
-                SCtmp->host_scribble = NULL;
+                my_done = tmp_cmd->scsi_done;
+                kfree(tmp_cmd->host_scribble);
+                tmp_cmd->host_scribble = NULL;
                 /* Fetch the sense data, and tuck it away, in the required slot.  The
                    Adaptec automatically fetches it, and there is no guarantee that
                    we will still have it in the cdb when we come back */
                 if (ccb[mbo].tarstat == 2)
-                        memcpy(SCtmp->sense_buffer, &ccb[mbo].cdb[ccb[mbo].cdblen],
+                        memcpy(tmp_cmd->sense_buffer, &ccb[mbo].cdb[ccb[mbo].cdblen],
                                SCSI_SENSE_BUFFERSIZE);
 
 
@@ -525,166 +352,122 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
 
 #ifdef DEBUG
                 if (errstatus)
-                        printk(KERN_DEBUG "(aha1542 error:%x %x %x) ", errstatus,
+                        shost_printk(KERN_DEBUG, sh, "(aha1542 error:%x %x %x) ", errstatus,
                                ccb[mbo].hastat, ccb[mbo].tarstat);
+                if (ccb[mbo].tarstat == 2)
+                        print_hex_dump_bytes("sense: ", DUMP_PREFIX_NONE, &ccb[mbo].cdb[ccb[mbo].cdblen], 12);
+                if (errstatus)
+                        printk("aha1542_intr_handle: returning %6x\n", errstatus);
 #endif
-
-                if (ccb[mbo].tarstat == 2) {
-#ifdef DEBUG
-                        int i;
-#endif
-                        DEB(printk("aha1542_intr_handle: sense:"));
-#ifdef DEBUG
-                        for (i = 0; i < 12; i++)
-                                printk("%02x ", ccb[mbo].cdb[ccb[mbo].cdblen + i]);
-                        printk("\n");
-#endif
-                        /*
-                           DEB(printk("aha1542_intr_handle: buf:"));
-                           for (i = 0; i < bufflen; i++)
-                           printk("%02x ", ((unchar *)buff)[i]);
-                           printk("\n");
-                         */
-                }
-                DEB(if (errstatus) printk("aha1542_intr_handle: returning %6x\n", errstatus));
-                SCtmp->result = errstatus;
-                HOSTDATA(shost)->SCint[mbo] = NULL;     /* This effectively frees up the mailbox slot, as
-                                                           far as queuecommand is concerned */
-                my_done(SCtmp);
+                tmp_cmd->result = errstatus;
+                aha1542->int_cmds[mbo] = NULL;  /* This effectively frees up the mailbox slot, as
+                                                   far as queuecommand is concerned */
+                my_done(tmp_cmd);
                 number_serviced++;
         };
 }
 
-static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
+static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
 {
-        unchar ahacmd = CMD_START_SCSI;
-        unchar direction;
-        unchar *cmd = (unchar *) SCpnt->cmnd;
-        unchar target = SCpnt->device->id;
-        unchar lun = SCpnt->device->lun;
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
+        u8 direction;
+        u8 target = cmd->device->id;
+        u8 lun = cmd->device->lun;
         unsigned long flags;
-        int bufflen = scsi_bufflen(SCpnt);
+        int bufflen = scsi_bufflen(cmd);
         int mbo;
-        struct mailbox *mb;
-        struct ccb *ccb;
+        struct mailbox *mb = aha1542->mb;
+        struct ccb *ccb = aha1542->ccb;
 
-        DEB(int i);
-
-        mb = HOSTDATA(SCpnt->device->host)->mb;
-        ccb = HOSTDATA(SCpnt->device->host)->ccb;
-
-        DEB(if (target > 1) {
-            SCpnt->result = DID_TIME_OUT << 16;
-            done(SCpnt); return 0;
-            }
-        );
-
-        if (*cmd == REQUEST_SENSE) {
+        if (*cmd->cmnd == REQUEST_SENSE) {
                 /* Don't do the command - we have the sense data already */
-#if 0
-                /* scsi_request_sense() provides a buffer of size 256,
-                   so there is no reason to expect equality */
-                if (bufflen != SCSI_SENSE_BUFFERSIZE)
-                        printk(KERN_CRIT "aha1542: Wrong buffer length supplied "
-                               "for request sense (%d)\n", bufflen);
-#endif
-                SCpnt->result = 0;
-                done(SCpnt);
+                cmd->result = 0;
+                cmd->scsi_done(cmd);
                 return 0;
         }
 #ifdef DEBUG
-        if (*cmd == READ_10 || *cmd == WRITE_10)
-                i = xscsi2int(cmd + 2);
-        else if (*cmd == READ_6 || *cmd == WRITE_6)
-                i = scsi2int(cmd + 2);
-        else
-                i = -1;
-        if (done)
-                printk(KERN_DEBUG "aha1542_queuecommand: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen);
-        else
-                printk(KERN_DEBUG "aha1542_command: dev %d cmd %02x pos %d len %d ", target, *cmd, i, bufflen);
-        aha1542_stat();
-        printk(KERN_DEBUG "aha1542_queuecommand: dumping scsi cmd:");
-        for (i = 0; i < SCpnt->cmd_len; i++)
-                printk("%02x ", cmd[i]);
-        printk("\n");
-        if (*cmd == WRITE_10 || *cmd == WRITE_6)
-                return 0;       /* we are still testing, so *don't* write */
+        {
+                int i = -1;
+                if (*cmd->cmnd == READ_10 || *cmd->cmnd == WRITE_10)
+                        i = xscsi2int(cmd->cmnd + 2);
+                else if (*cmd->cmnd == READ_6 || *cmd->cmnd == WRITE_6)
+                        i = scsi2int(cmd->cmnd + 2);
+                shost_printk(KERN_DEBUG, sh, "aha1542_queuecommand: dev %d cmd %02x pos %d len %d",
+                                                target, *cmd->cmnd, i, bufflen);
+                print_hex_dump_bytes("command: ", DUMP_PREFIX_NONE, cmd->cmnd, cmd->cmd_len);
+        }
 #endif
         /* Use the outgoing mailboxes in a round-robin fashion, because this
            is how the host adapter will scan for them */
 
-        spin_lock_irqsave(&aha1542_lock, flags);
-        mbo = HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used + 1;
+        spin_lock_irqsave(sh->host_lock, flags);
+        mbo = aha1542->aha1542_last_mbo_used + 1;
         if (mbo >= AHA1542_MAILBOXES)
                 mbo = 0;
 
         do {
-                if (mb[mbo].status == 0 && HOSTDATA(SCpnt->device->host)->SCint[mbo] == NULL)
+                if (mb[mbo].status == 0 && aha1542->int_cmds[mbo] == NULL)
                         break;
                 mbo++;
                 if (mbo >= AHA1542_MAILBOXES)
                         mbo = 0;
-        } while (mbo != HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used);
+        } while (mbo != aha1542->aha1542_last_mbo_used);
 
-        if (mb[mbo].status || HOSTDATA(SCpnt->device->host)->SCint[mbo])
+        if (mb[mbo].status || aha1542->int_cmds[mbo])
                 panic("Unable to find empty mailbox for aha1542.\n");
 
-        HOSTDATA(SCpnt->device->host)->SCint[mbo] = SCpnt;      /* This will effectively prevent someone else from
-                                                           screwing with this cdb. */
+        aha1542->int_cmds[mbo] = cmd;   /* This will effectively prevent someone else from
+                                           screwing with this cdb. */
 
-        HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used = mbo;
-        spin_unlock_irqrestore(&aha1542_lock, flags);
+        aha1542->aha1542_last_mbo_used = mbo;
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "Sending command (%d %x)...", mbo, done);
+        shost_printk(KERN_DEBUG, sh, "Sending command (%d %p)...", mbo, cmd->scsi_done);
 #endif
 
-        any2scsi(mb[mbo].ccbptr, SCSI_BUF_PA(&ccb[mbo]));       /* This gets trashed for some reason */
+        any2scsi(mb[mbo].ccbptr, isa_virt_to_bus(&ccb[mbo]));   /* This gets trashed for some reason */
 
         memset(&ccb[mbo], 0, sizeof(struct ccb));
 
-        ccb[mbo].cdblen = SCpnt->cmd_len;
+        ccb[mbo].cdblen = cmd->cmd_len;
 
         direction = 0;
-        if (*cmd == READ_10 || *cmd == READ_6)
+        if (*cmd->cmnd == READ_10 || *cmd->cmnd == READ_6)
                 direction = 8;
-        else if (*cmd == WRITE_10 || *cmd == WRITE_6)
+        else if (*cmd->cmnd == WRITE_10 || *cmd->cmnd == WRITE_6)
                 direction = 16;
 
-        memcpy(ccb[mbo].cdb, cmd, ccb[mbo].cdblen);
+        memcpy(ccb[mbo].cdb, cmd->cmnd, ccb[mbo].cdblen);
 
         if (bufflen) {
                 struct scatterlist *sg;
                 struct chain *cptr;
-#ifdef DEBUG
-                unsigned char *ptr;
-#endif
-                int i, sg_count = scsi_sg_count(SCpnt);
+                int i, sg_count = scsi_sg_count(cmd);
+
                 ccb[mbo].op = 2;        /* SCSI Initiator Command  w/scatter-gather */
-                SCpnt->host_scribble = kmalloc(sizeof(*cptr)*sg_count,
+                cmd->host_scribble = kmalloc(sizeof(*cptr)*sg_count,
                                                          GFP_KERNEL | GFP_DMA);
-                cptr = (struct chain *) SCpnt->host_scribble;
+                cptr = (struct chain *) cmd->host_scribble;
                 if (cptr == NULL) {
                         /* free the claimed mailbox slot */
-                        HOSTDATA(SCpnt->device->host)->SCint[mbo] = NULL;
+                        aha1542->int_cmds[mbo] = NULL;
+                        spin_unlock_irqrestore(sh->host_lock, flags);
                         return SCSI_MLQUEUE_HOST_BUSY;
                 }
-                scsi_for_each_sg(SCpnt, sg, sg_count, i) {
-                        any2scsi(cptr[i].dataptr, SCSI_SG_PA(sg));
+                scsi_for_each_sg(cmd, sg, sg_count, i) {
+                        any2scsi(cptr[i].dataptr, isa_page_to_bus(sg_page(sg))
+                                                                + sg->offset);
                         any2scsi(cptr[i].datalen, sg->length);
                 };
                 any2scsi(ccb[mbo].datalen, sg_count * sizeof(struct chain));
-                any2scsi(ccb[mbo].dataptr, SCSI_BUF_PA(cptr));
+                any2scsi(ccb[mbo].dataptr, isa_virt_to_bus(cptr));
 #ifdef DEBUG
-                printk("cptr %x: ", cptr);
-                ptr = (unsigned char *) cptr;
-                for (i = 0; i < 18; i++)
-                        printk("%02x ", ptr[i]);
+                shost_printk(KERN_DEBUG, sh, "cptr %p: ", cptr);
+                print_hex_dump_bytes("cptr: ", DUMP_PREFIX_NONE, cptr, 18);
 #endif
         } else {
                 ccb[mbo].op = 0;        /* SCSI Initiator Command */
-                SCpnt->host_scribble = NULL;
+                cmd->host_scribble = NULL;
                 any2scsi(ccb[mbo].datalen, 0);
                 any2scsi(ccb[mbo].dataptr, 0);
         };
@@ -694,139 +477,116 @@ static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *
         ccb[mbo].commlinkid = 0;
 
 #ifdef DEBUG
-        {
-                int i;
-                printk(KERN_DEBUG "aha1542_command: sending.. ");
-                for (i = 0; i < sizeof(ccb[mbo]) - 10; i++)
-                        printk("%02x ", ((unchar *) & ccb[mbo])[i]);
-        };
+        print_hex_dump_bytes("sending: ", DUMP_PREFIX_NONE, &ccb[mbo], sizeof(ccb[mbo]) - 10);
+        printk("aha1542_queuecommand: now waiting for interrupt ");
 #endif
-
-        if (done) {
-                DEB(printk("aha1542_queuecommand: now waiting for interrupt ");
-                    aha1542_stat());
-                SCpnt->scsi_done = done;
-                mb[mbo].status = 1;
-                aha1542_out(SCpnt->device->host->io_port, &ahacmd, 1);  /* start scsi command */
-                DEB(aha1542_stat());
-        } else
-                printk("aha1542_queuecommand: done can't be NULL\n");
+        mb[mbo].status = 1;
+        aha1542_outb(cmd->device->host->io_port, CMD_START_SCSI);
+        spin_unlock_irqrestore(sh->host_lock, flags);
 
         return 0;
 }
 
-static DEF_SCSI_QCMD(aha1542_queuecommand)
-
 /* Initialize mailboxes */
-static void setup_mailboxes(int bse, struct Scsi_Host *shpnt)
+static void setup_mailboxes(struct Scsi_Host *sh)
 {
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
         int i;
-        struct mailbox *mb;
-        struct ccb *ccb;
-
-        unchar cmd[5] = { CMD_MBINIT, AHA1542_MAILBOXES, 0, 0, 0};
+        struct mailbox *mb = aha1542->mb;
+        struct ccb *ccb = aha1542->ccb;
 
-        mb = HOSTDATA(shpnt)->mb;
-        ccb = HOSTDATA(shpnt)->ccb;
+        u8 mb_cmd[5] = { CMD_MBINIT, AHA1542_MAILBOXES, 0, 0, 0};
 
         for (i = 0; i < AHA1542_MAILBOXES; i++) {
                 mb[i].status = mb[AHA1542_MAILBOXES + i].status = 0;
-                any2scsi(mb[i].ccbptr, SCSI_BUF_PA(&ccb[i]));
+                any2scsi(mb[i].ccbptr, isa_virt_to_bus(&ccb[i]));
         };
-        aha1542_intr_reset(bse);        /* reset interrupts, so they don't block */
-        any2scsi((cmd + 2), SCSI_BUF_PA(mb));
-        aha1542_out(bse, cmd, 5);
-        WAIT(INTRFLAGS(bse), INTRMASK, HACC, 0);
-        while (0) {
-fail:
-                printk(KERN_ERR "aha1542_detect: failed setting up mailboxes\n");
-        }
-        aha1542_intr_reset(bse);
+        aha1542_intr_reset(sh->io_port);        /* reset interrupts, so they don't block */
+        any2scsi((mb_cmd + 2), isa_virt_to_bus(mb));
+        if (aha1542_out(sh->io_port, mb_cmd, 5))
+                shost_printk(KERN_ERR, sh, "failed setting up mailboxes\n");
+        aha1542_intr_reset(sh->io_port);
 }
 
-static int __init aha1542_getconfig(int base_io, unsigned char *irq_level, unsigned char *dma_chan, unsigned char *scsi_id)
+static int aha1542_getconfig(struct Scsi_Host *sh)
 {
-        unchar inquiry_cmd[] = {CMD_RETCONF};
-        unchar inquiry_result[3];
+        u8 inquiry_result[3];
         int i;
-        i = inb(STATUS(base_io));
+        i = inb(STATUS(sh->io_port));
         if (i & DF) {
-                i = inb(DATA(base_io));
+                i = inb(DATA(sh->io_port));
         };
-        aha1542_out(base_io, inquiry_cmd, 1);
-        aha1542_in(base_io, inquiry_result, 3);
-        WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0);
-        while (0) {
-fail:
-                printk(KERN_ERR "aha1542_detect: query board settings\n");
-        }
-        aha1542_intr_reset(base_io);
+        aha1542_outb(sh->io_port, CMD_RETCONF);
+        aha1542_in(sh->io_port, inquiry_result, 3, 0);
+        if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0))
+                shost_printk(KERN_ERR, sh, "error querying board settings\n");
+        aha1542_intr_reset(sh->io_port);
         switch (inquiry_result[0]) {
         case 0x80:
-                *dma_chan = 7;
+                sh->dma_channel = 7;
                 break;
         case 0x40:
-                *dma_chan = 6;
+                sh->dma_channel = 6;
                 break;
         case 0x20:
-                *dma_chan = 5;
+                sh->dma_channel = 5;
                 break;
         case 0x01:
-                *dma_chan = 0;
+                sh->dma_channel = 0;
                 break;
         case 0:
                 /* This means that the adapter, although Adaptec 1542 compatible, doesn't use a DMA channel.
                    Currently only aware of the BusLogic BT-445S VL-Bus adapter which needs this. */
-                *dma_chan = 0xFF;
+                sh->dma_channel = 0xFF;
                 break;
         default:
-                printk(KERN_ERR "Unable to determine Adaptec DMA priority.  Disabling board\n");
+                shost_printk(KERN_ERR, sh, "Unable to determine DMA channel.\n");
                 return -1;
         };
         switch (inquiry_result[1]) {
         case 0x40:
-                *irq_level = 15;
+                sh->irq = 15;
                 break;
         case 0x20:
-                *irq_level = 14;
+                sh->irq = 14;
                 break;
         case 0x8:
-                *irq_level = 12;
+                sh->irq = 12;
                 break;
         case 0x4:
-                *irq_level = 11;
+                sh->irq = 11;
                 break;
         case 0x2:
-                *irq_level = 10;
+                sh->irq = 10;
                 break;
         case 0x1:
-                *irq_level = 9;
+                sh->irq = 9;
                 break;
         default:
-                printk(KERN_ERR "Unable to determine Adaptec IRQ level.  Disabling board\n");
+                shost_printk(KERN_ERR, sh, "Unable to determine IRQ level.\n");
                 return -1;
         };
-        *scsi_id = inquiry_result[2] & 7;
+        sh->this_id = inquiry_result[2] & 7;
         return 0;
 }
 
 /* This function should only be called for 1542C boards - we can detect
    the special firmware settings and unlock the board */
 
-static int __init aha1542_mbenable(int base)
+static int aha1542_mbenable(struct Scsi_Host *sh)
 {
-        static unchar mbenable_cmd[3];
-        static unchar mbenable_result[2];
+        static u8 mbenable_cmd[3];
+        static u8 mbenable_result[2];
         int retval;
 
         retval = BIOS_TRANSLATION_6432;
 
-        mbenable_cmd[0] = CMD_EXTBIOS;
-        aha1542_out(base, mbenable_cmd, 1);
-        if (aha1542_in1(base, mbenable_result, 2))
+        aha1542_outb(sh->io_port, CMD_EXTBIOS);
+        if (aha1542_in(sh->io_port, mbenable_result, 2, 100))
                 return retval;
-        WAITd(INTRFLAGS(base), INTRMASK, HACC, 0, 100);
-        aha1542_intr_reset(base);
+        if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 100))
+                goto fail;
+        aha1542_intr_reset(sh->io_port);
 
         if ((mbenable_result[0] & 0x08) || mbenable_result[1]) {
                 mbenable_cmd[0] = CMD_MBENABLE;
@@ -836,37 +596,34 @@ static int __init aha1542_mbenable(int base)
                 if ((mbenable_result[0] & 0x08) && (mbenable_result[1] & 0x03))
                         retval = BIOS_TRANSLATION_25563;
 
-                aha1542_out(base, mbenable_cmd, 3);
-                WAIT(INTRFLAGS(base), INTRMASK, HACC, 0);
+                if (aha1542_out(sh->io_port, mbenable_cmd, 3))
+                        goto fail;
         };
         while (0) {
 fail:
-                printk(KERN_ERR "aha1542_mbenable: Mailbox init failed\n");
+                shost_printk(KERN_ERR, sh, "Mailbox init failed\n");
         }
-        aha1542_intr_reset(base);
+        aha1542_intr_reset(sh->io_port);
         return retval;
 }
 
 /* Query the board to find out if it is a 1542 or a 1740, or whatever. */
-static int __init aha1542_query(int base_io, int *transl)
+static int aha1542_query(struct Scsi_Host *sh)
 {
-        unchar inquiry_cmd[] = {CMD_INQUIRY};
-        unchar inquiry_result[4];
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
+        u8 inquiry_result[4];
         int i;
-        i = inb(STATUS(base_io));
+        i = inb(STATUS(sh->io_port));
         if (i & DF) {
-                i = inb(DATA(base_io));
+                i = inb(DATA(sh->io_port));
         };
-        aha1542_out(base_io, inquiry_cmd, 1);
-        aha1542_in(base_io, inquiry_result, 4);
-        WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0);
-        while (0) {
-fail:
-                printk(KERN_ERR "aha1542_detect: query card type\n");
-        }
-        aha1542_intr_reset(base_io);
+        aha1542_outb(sh->io_port, CMD_INQUIRY);
+        aha1542_in(sh->io_port, inquiry_result, 4, 0);
+        if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0))
+                shost_printk(KERN_ERR, sh, "error querying card type\n");
+        aha1542_intr_reset(sh->io_port);
 
-        *transl = BIOS_TRANSLATION_6432;        /* Default case */
+        aha1542->bios_translation = BIOS_TRANSLATION_6432;      /* Default case */
 
         /* For an AHA1740 series board, we ignore the board since there is a
            hardware bug which can lead to wrong blocks being returned if the board
@@ -875,391 +632,198 @@ fail:
          */
 
         if (inquiry_result[0] == 0x43) {
-                printk(KERN_INFO "aha1542.c: Emulation mode not supported for AHA 174N hardware.\n");
+                shost_printk(KERN_INFO, sh, "Emulation mode not supported for AHA-1740 hardware, use aha1740 driver instead.\n");
                 return 1;
         };
 
         /* Always call this - boards that do not support extended bios translation
            will ignore the command, and we will set the proper default */
 
-        *transl = aha1542_mbenable(base_io);
+        aha1542->bios_translation = aha1542_mbenable(sh);
 
         return 0;
 }
 
-#ifndef MODULE
-static char *setup_str[MAXBOARDS] __initdata;
-static int setup_idx = 0;
-
-static void __init aha1542_setup(char *str, int *ints)
+static u8 dma_speed_hw(int dma_speed)
 {
-        const char *ahausage = "aha1542: usage: aha1542=<PORTBASE>[,<BUSON>,<BUSOFF>[,<DMASPEED>]]\n";
-        int setup_portbase;
-
-        if (setup_idx >= MAXBOARDS) {
-                printk(KERN_ERR "aha1542: aha1542_setup called too many times! Bad LILO params ?\n");
-                printk(KERN_ERR "   Entryline 1: %s\n", setup_str[0]);
-                printk(KERN_ERR "   Entryline 2: %s\n", setup_str[1]);
-                printk(KERN_ERR "   This line:   %s\n", str);
-                return;
-        }
-        if (ints[0] < 1 || ints[0] > 4) {
-                printk(KERN_ERR "aha1542: %s\n", str);
-                printk(ahausage);
-                printk(KERN_ERR "aha1542: Wrong parameters may cause system malfunction.. We try anyway..\n");
-        }
-        setup_called[setup_idx] = ints[0];
-        setup_str[setup_idx] = str;
-
-        setup_portbase = ints[0] >= 1 ? ints[1] : 0;    /* Preserve the default value.. */
-        setup_buson[setup_idx] = ints[0] >= 2 ? ints[2] : 7;
-        setup_busoff[setup_idx] = ints[0] >= 3 ? ints[3] : 5;
-        if (ints[0] >= 4) 
-        {
-                int atbt = -1;
-                switch (ints[4]) {
-                case 5:
-                        atbt = 0x00;
-                        break;
-                case 6:
-                        atbt = 0x04;
-                        break;
-                case 7:
-                        atbt = 0x01;
-                        break;
-                case 8:
-                        atbt = 0x02;
-                        break;
-                case 10:
-                        atbt = 0x03;
-                        break;
-                default:
-                        printk(KERN_ERR "aha1542: %s\n", str);
-                        printk(ahausage);
-                        printk(KERN_ERR "aha1542: Valid values for DMASPEED are 5-8, 10 MB/s.  Using jumper defaults.\n");
-                        break;
-                }
-                setup_dmaspeed[setup_idx] = atbt;
+        switch (dma_speed) {
+        case 5:
+                return 0x00;
+        case 6:
+                return 0x04;
+        case 7:
+                return 0x01;
+        case 8:
+                return 0x02;
+        case 10:
+                return 0x03;
         }
-        if (setup_portbase != 0)
-                bases[setup_idx] = setup_portbase;
 
-        ++setup_idx;
+        return 0xff;    /* invalid */
 }
 
-static int __init do_setup(char *str)
+/* Set the Bus on/off-times as not to ruin floppy performance */
+static void aha1542_set_bus_times(struct Scsi_Host *sh, int bus_on, int bus_off, int dma_speed)
 {
-        int ints[5];
+        if (bus_on > 0) {
+                u8 oncmd[] = { CMD_BUSON_TIME, clamp(bus_on, 2, 15) };
 
-        int count=setup_idx;
+                aha1542_intr_reset(sh->io_port);
+                if (aha1542_out(sh->io_port, oncmd, 2))
+                        goto fail;
+        }
 
-        get_options(str, ARRAY_SIZE(ints), ints);
-        aha1542_setup(str,ints);
+        if (bus_off > 0) {
+                u8 offcmd[] = { CMD_BUSOFF_TIME, clamp(bus_off, 1, 64) };
 
-        return count<setup_idx;
-}
+                aha1542_intr_reset(sh->io_port);
+                if (aha1542_out(sh->io_port, offcmd, 2))
+                        goto fail;
+        }
 
-__setup("aha1542=",do_setup);
-#endif
+        if (dma_speed_hw(dma_speed) != 0xff) {
+                u8 dmacmd[] = { CMD_DMASPEED, dma_speed_hw(dma_speed) };
+
+                aha1542_intr_reset(sh->io_port);
+                if (aha1542_out(sh->io_port, dmacmd, 2))
+                        goto fail;
+        }
+        aha1542_intr_reset(sh->io_port);
+        return;
+fail:
+        shost_printk(KERN_ERR, sh, "setting bus on/off-time failed\n");
+        aha1542_intr_reset(sh->io_port);
+}
 
 /* return non-zero on detection */
-static int __init aha1542_detect(struct scsi_host_template * tpnt)
+static struct Scsi_Host *aha1542_hw_init(struct scsi_host_template *tpnt, struct device *pdev, int indx)
 {
-        unsigned char dma_chan;
-        unsigned char irq_level;
-        unsigned char scsi_id;
-        unsigned long flags;
-        unsigned int base_io;
-        int trans;
-        struct Scsi_Host *shpnt = NULL;
-        int count = 0;
-        int indx;
-
-        DEB(printk("aha1542_detect: \n"));
-
-        tpnt->proc_name = "aha1542";
-
-#ifdef MODULE
-        bases[0] = aha1542[0];
-        setup_buson[0] = aha1542[1];
-        setup_busoff[0] = aha1542[2];
-        {
-                int atbt = -1;
-                switch (aha1542[3]) {
-                case 5:
-                        atbt = 0x00;
-                        break;
-                case 6:
-                        atbt = 0x04;
-                        break;
-                case 7:
-                        atbt = 0x01;
-                        break;
-                case 8:
-                        atbt = 0x02;
-                        break;
-                case 10:
-                        atbt = 0x03;
-                        break;
-                };
-                setup_dmaspeed[0] = atbt;
+        unsigned int base_io = io[indx];
+        struct Scsi_Host *sh;
+        struct aha1542_hostdata *aha1542;
+        char dma_info[] = "no DMA";
+
+        if (base_io == 0)
+                return NULL;
+
+        if (!request_region(base_io, AHA1542_REGION_SIZE, "aha1542"))
+                return NULL;
+
+        sh = scsi_host_alloc(tpnt, sizeof(struct aha1542_hostdata));
+        if (!sh)
+                goto release;
+        aha1542 = shost_priv(sh);
+
+        sh->unique_id = base_io;
+        sh->io_port = base_io;
+        sh->n_io_port = AHA1542_REGION_SIZE;
+        aha1542->aha1542_last_mbi_used = 2 * AHA1542_MAILBOXES - 1;
+        aha1542->aha1542_last_mbo_used = AHA1542_MAILBOXES - 1;
+
+        if (!aha1542_test_port(sh))
+                goto unregister;
+
+        aha1542_set_bus_times(sh, bus_on[indx], bus_off[indx], dma_speed[indx]);
+        if (aha1542_query(sh))
+                goto unregister;
+        if (aha1542_getconfig(sh) == -1)
+                goto unregister;
+
+        if (sh->dma_channel != 0xFF)
+                snprintf(dma_info, sizeof(dma_info), "DMA %d", sh->dma_channel);
+        shost_printk(KERN_INFO, sh, "Adaptec AHA-1542 (SCSI-ID %d) at IO 0x%x, IRQ %d, %s\n",
+                                sh->this_id, base_io, sh->irq, dma_info);
+        if (aha1542->bios_translation == BIOS_TRANSLATION_25563)
+                shost_printk(KERN_INFO, sh, "Using extended bios translation\n");
+
+        setup_mailboxes(sh);
+
+        if (request_irq(sh->irq, aha1542_interrupt, 0, "aha1542", sh)) {
+                shost_printk(KERN_ERR, sh, "Unable to allocate IRQ.\n");
+                goto unregister;
         }
-#endif
-
-        /*
-         *      Hunt for ISA Plug'n'Pray Adaptecs (AHA1535)
-         */
-
-        if(isapnp)
-        {
-                struct pnp_dev *pdev = NULL;
-                for(indx = 0; indx < ARRAY_SIZE(bases); indx++) {
-                        if(bases[indx])
-                                continue;
-                        pdev = pnp_find_dev(NULL, ISAPNP_VENDOR('A', 'D', 'P'), 
-                                ISAPNP_FUNCTION(0x1542), pdev);
-                        if(pdev==NULL)
-                                break;
-                        /*
-                         *      Activate the PnP card
-                         */
-
-                        if(pnp_device_attach(pdev)<0)
-                                continue;
-
-                        if(pnp_activate_dev(pdev)<0) {
-                                pnp_device_detach(pdev);
-                                continue;
-                        }
-
-                        if(!pnp_port_valid(pdev, 0)) {
-                                pnp_device_detach(pdev);
-                                continue;
-                        }
-
-                        bases[indx] = pnp_port_start(pdev, 0);
-
-                        /* The card can be queried for its DMA, we have 
-                           the DMA set up that is enough */
-
-                        printk(KERN_INFO "ISAPnP found an AHA1535 at I/O 0x%03X\n", bases[indx]);
+        if (sh->dma_channel != 0xFF) {
+                if (request_dma(sh->dma_channel, "aha1542")) {
+                        shost_printk(KERN_ERR, sh, "Unable to allocate DMA channel.\n");
+                        goto free_irq;
+                }
+                if (sh->dma_channel == 0 || sh->dma_channel >= 5) {
+                        set_dma_mode(sh->dma_channel, DMA_MODE_CASCADE);
+                        enable_dma(sh->dma_channel);
                 }
         }
-        for (indx = 0; indx < ARRAY_SIZE(bases); indx++)
-                if (bases[indx] != 0 && request_region(bases[indx], 4, "aha1542")) {
-                        shpnt = scsi_register(tpnt,
-                                        sizeof(struct aha1542_hostdata));
-
-                        if(shpnt==NULL) {
-                                release_region(bases[indx], 4);
-                                continue;
-                        }
-                        if (!aha1542_test_port(bases[indx], shpnt))
-                                goto unregister;
-
-                        base_io = bases[indx];
-
-                        /* Set the Bus on/off-times as not to ruin floppy performance */
-                        {
-                                unchar oncmd[] = {CMD_BUSON_TIME, 7};
-                                unchar offcmd[] = {CMD_BUSOFF_TIME, 5};
-
-                                if (setup_called[indx]) {
-                                        oncmd[1] = setup_buson[indx];
-                                        offcmd[1] = setup_busoff[indx];
-                                }
-                                aha1542_intr_reset(base_io);
-                                aha1542_out(base_io, oncmd, 2);
-                                WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0);
-                                aha1542_intr_reset(base_io);
-                                aha1542_out(base_io, offcmd, 2);
-                                WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0);
-                                if (setup_dmaspeed[indx] >= 0) {
-                                        unchar dmacmd[] = {CMD_DMASPEED, 0};
-                                        dmacmd[1] = setup_dmaspeed[indx];
-                                        aha1542_intr_reset(base_io);
-                                        aha1542_out(base_io, dmacmd, 2);
-                                        WAIT(INTRFLAGS(base_io), INTRMASK, HACC, 0);
-                                }
-                                while (0) {
-fail:
-                                        printk(KERN_ERR "aha1542_detect: setting bus on/off-time failed\n");
-                                }
-                                aha1542_intr_reset(base_io);
-                        }
-                        if (aha1542_query(base_io, &trans))
-                                goto unregister;
-
-                        if (aha1542_getconfig(base_io, &irq_level, &dma_chan, &scsi_id) == -1)
-                                goto unregister;
-
-                        printk(KERN_INFO "Configuring Adaptec (SCSI-ID %d) at IO:%x, IRQ %d", scsi_id, base_io, irq_level);
-                        if (dma_chan != 0xFF)
-                                printk(", DMA priority %d", dma_chan);
-                        printk("\n");
-
-                        DEB(aha1542_stat());
-                        setup_mailboxes(base_io, shpnt);
-
-                        DEB(aha1542_stat());
-
-                        DEB(printk("aha1542_detect: enable interrupt channel %d\n", irq_level));
-                        spin_lock_irqsave(&aha1542_lock, flags);
-                        if (request_irq(irq_level, do_aha1542_intr_handle, 0,
-                                        "aha1542", shpnt)) {
-                                printk(KERN_ERR "Unable to allocate IRQ for adaptec controller.\n");
-                                spin_unlock_irqrestore(&aha1542_lock, flags);
-                                goto unregister;
-                        }
-                        if (dma_chan != 0xFF) {
-                                if (request_dma(dma_chan, "aha1542")) {
-                                        printk(KERN_ERR "Unable to allocate DMA channel for Adaptec.\n");
-                                        free_irq(irq_level, shpnt);
-                                        spin_unlock_irqrestore(&aha1542_lock, flags);
-                                        goto unregister;
-                                }
-                                if (dma_chan == 0 || dma_chan >= 5) {
-                                        set_dma_mode(dma_chan, DMA_MODE_CASCADE);
-                                        enable_dma(dma_chan);
-                                }
-                        }
-
-                        shpnt->this_id = scsi_id;
-                        shpnt->unique_id = base_io;
-                        shpnt->io_port = base_io;
-                        shpnt->n_io_port = 4;   /* Number of bytes of I/O space used */
-                        shpnt->dma_channel = dma_chan;
-                        shpnt->irq = irq_level;
-                        HOSTDATA(shpnt)->bios_translation = trans;
-                        if (trans == BIOS_TRANSLATION_25563)
-                                printk(KERN_INFO "aha1542.c: Using extended bios translation\n");
-                        HOSTDATA(shpnt)->aha1542_last_mbi_used = (2 * AHA1542_MAILBOXES - 1);
-                        HOSTDATA(shpnt)->aha1542_last_mbo_used = (AHA1542_MAILBOXES - 1);
-                        memset(HOSTDATA(shpnt)->SCint, 0, sizeof(HOSTDATA(shpnt)->SCint));
-                        spin_unlock_irqrestore(&aha1542_lock, flags);
-#if 0
-                        DEB(printk(" *** READ CAPACITY ***\n"));
-
-                        {
-                                unchar buf[8];
-                                static unchar cmd[] = { READ_CAPACITY, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-                                int i;
-
-                                for (i = 0; i < sizeof(buf); ++i)
-                                        buf[i] = 0x87;
-                                for (i = 0; i < 2; ++i)
-                                        if (!aha1542_command(i, cmd, buf, sizeof(buf))) {
-                                                printk(KERN_DEBUG "aha_detect: LU %d sector_size %d device_size %d\n",
-                                                       i, xscsi2int(buf + 4), xscsi2int(buf));
-                                        }
-                        }
 
-                        DEB(printk(" *** NOW RUNNING MY OWN TEST *** \n"));
+        if (scsi_add_host(sh, pdev))
+                goto free_dma;
 
-                        for (i = 0; i < 4; ++i) {
-                                unsigned char cmd[10];
-                                static buffer[512];
+        scsi_scan_host(sh);
 
-                                cmd[0] = READ_10;
-                                cmd[1] = 0;
-                                xany2scsi(cmd + 2, i);
-                                cmd[6] = 0;
-                                cmd[7] = 0;
-                                cmd[8] = 1;
-                                cmd[9] = 0;
-                                aha1542_command(0, cmd, buffer, 512);
-                        }
-#endif
-                        count++;
-                        continue;
+        return sh;
+free_dma:
+        if (sh->dma_channel != 0xff)
+                free_dma(sh->dma_channel);
+free_irq:
+        free_irq(sh->irq, sh);
 unregister:
-                        release_region(bases[indx], 4);
-                        scsi_unregister(shpnt);
-                        continue;
+        scsi_host_put(sh);
+release:
+        release_region(base_io, AHA1542_REGION_SIZE);
 
-                };
-
-        return count;
+        return NULL;
 }
 
-static int aha1542_release(struct Scsi_Host *shost)
+static int aha1542_release(struct Scsi_Host *sh)
 {
-        if (shost->irq)
-                free_irq(shost->irq, shost);
-        if (shost->dma_channel != 0xff)
-                free_dma(shost->dma_channel);
-        if (shost->io_port && shost->n_io_port)
-                release_region(shost->io_port, shost->n_io_port);
-        scsi_unregister(shost);
+        scsi_remove_host(sh);
+        if (sh->dma_channel != 0xff)
+                free_dma(sh->dma_channel);
+        if (sh->irq)
+                free_irq(sh->irq, sh);
+        if (sh->io_port && sh->n_io_port)
+                release_region(sh->io_port, sh->n_io_port);
+        scsi_host_put(sh);
         return 0;
 }
 
-static int aha1542_restart(struct Scsi_Host *shost)
-{
-        int i;
-        int count = 0;
-#if 0
-        unchar ahacmd = CMD_START_SCSI;
-#endif
-
-        for (i = 0; i < AHA1542_MAILBOXES; i++)
-                if (HOSTDATA(shost)->SCint[i] &&
-                    !(HOSTDATA(shost)->SCint[i]->device->soft_reset)) {
-#if 0
-                        HOSTDATA(shost)->mb[i].status = 1;      /* Indicate ready to restart... */
-#endif
-                        count++;
-                }
-        printk(KERN_DEBUG "Potential to restart %d stalled commands...\n", count);
-#if 0
-        /* start scsi command */
-        if (count)
-                aha1542_out(shost->io_port, &ahacmd, 1);
-#endif
-        return 0;
-}
 
 /*
  * This is a device reset.  This is handled by sending a special command
  * to the device.
  */
-static int aha1542_dev_reset(Scsi_Cmnd * SCpnt)
+static int aha1542_dev_reset(struct scsi_cmnd *cmd)
 {
+        struct Scsi_Host *sh = cmd->device->host;
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
         unsigned long flags;
-        struct mailbox *mb;
-        unchar target = SCpnt->device->id;
-        unchar lun = SCpnt->device->lun;
+        struct mailbox *mb = aha1542->mb;
+        u8 target = cmd->device->id;
+        u8 lun = cmd->device->lun;
         int mbo;
-        struct ccb *ccb;
-        unchar ahacmd = CMD_START_SCSI;
-
-        ccb = HOSTDATA(SCpnt->device->host)->ccb;
-        mb = HOSTDATA(SCpnt->device->host)->mb;
+        struct ccb *ccb = aha1542->ccb;
 
-        spin_lock_irqsave(&aha1542_lock, flags);
-        mbo = HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used + 1;
+        spin_lock_irqsave(sh->host_lock, flags);
+        mbo = aha1542->aha1542_last_mbo_used + 1;
         if (mbo >= AHA1542_MAILBOXES)
                 mbo = 0;
 
         do {
-                if (mb[mbo].status == 0 && HOSTDATA(SCpnt->device->host)->SCint[mbo] == NULL)
+                if (mb[mbo].status == 0 && aha1542->int_cmds[mbo] == NULL)
                         break;
                 mbo++;
                 if (mbo >= AHA1542_MAILBOXES)
                         mbo = 0;
-        } while (mbo != HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used);
+        } while (mbo != aha1542->aha1542_last_mbo_used);
 
-        if (mb[mbo].status || HOSTDATA(SCpnt->device->host)->SCint[mbo])
+        if (mb[mbo].status || aha1542->int_cmds[mbo])
                 panic("Unable to find empty mailbox for aha1542.\n");
 
-        HOSTDATA(SCpnt->device->host)->SCint[mbo] = SCpnt;      /* This will effectively
-                                                           prevent someone else from
-                                                           screwing with this cdb. */
+        aha1542->int_cmds[mbo] = cmd;   /* This will effectively
+                                           prevent someone else from
+                                           screwing with this cdb. */
 
-        HOSTDATA(SCpnt->device->host)->aha1542_last_mbo_used = mbo;
-        spin_unlock_irqrestore(&aha1542_lock, flags);
+        aha1542->aha1542_last_mbo_used = mbo;
 
-        any2scsi(mb[mbo].ccbptr, SCSI_BUF_PA(&ccb[mbo]));       /* This gets trashed for some reason */
+        any2scsi(mb[mbo].ccbptr, isa_virt_to_bus(&ccb[mbo]));   /* This gets trashed for some reason */
 
         memset(&ccb[mbo], 0, sizeof(struct ccb));
 
@@ -1274,141 +838,43 @@ static int aha1542_dev_reset(Scsi_Cmnd * SCpnt)
          * Now tell the 1542 to flush all pending commands for this 
          * target 
          */
-        aha1542_out(SCpnt->device->host->io_port, &ahacmd, 1);
+        aha1542_outb(sh->io_port, CMD_START_SCSI);
+        spin_unlock_irqrestore(sh->host_lock, flags);
 
-        scmd_printk(KERN_WARNING, SCpnt,
+        scmd_printk(KERN_WARNING, cmd,
                 "Trying device reset for target\n");
 
         return SUCCESS;
-
-
-#ifdef ERIC_neverdef
-        /* 
-         * With the 1542 we apparently never get an interrupt to
-         * acknowledge a device reset being sent.  Then again, Leonard
-         * says we are doing this wrong in the first place...
-         *
-         * Take a wait and see attitude.  If we get spurious interrupts,
-         * then the device reset is doing something sane and useful, and
-         * we will wait for the interrupt to post completion.
-         */
-        printk(KERN_WARNING "Sent BUS DEVICE RESET to target %d\n", SCpnt->target);
-
-        /*
-         * Free the command block for all commands running on this 
-         * target... 
-         */
-        for (i = 0; i < AHA1542_MAILBOXES; i++) {
-                if (HOSTDATA(SCpnt->host)->SCint[i] &&
-                    HOSTDATA(SCpnt->host)->SCint[i]->target == SCpnt->target) {
-                        Scsi_Cmnd *SCtmp;
-                        SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
-                        kfree(SCtmp->host_scribble);
-                        SCtmp->host_scribble = NULL;
-                        HOSTDATA(SCpnt->host)->SCint[i] = NULL;
-                        HOSTDATA(SCpnt->host)->mb[i].status = 0;
-                }
-        }
-        return SUCCESS;
-
-        return FAILED;
-#endif                          /* ERIC_neverdef */
 }
 
-static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
+static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
 {
+        struct Scsi_Host *sh = cmd->device->host;
+        struct aha1542_hostdata *aha1542 = shost_priv(sh);
+        unsigned long flags;
         int i;
 
+        spin_lock_irqsave(sh->host_lock, flags);
         /* 
          * This does a scsi reset for all devices on the bus.
          * In principle, we could also reset the 1542 - should
          * we do this?  Try this first, and we can add that later
          * if it turns out to be useful.
          */
-        outb(SCRST, CONTROL(SCpnt->device->host->io_port));
+        outb(reset_cmd, CONTROL(cmd->device->host->io_port));
 
-        /*
-         * Wait for the thing to settle down a bit.  Unfortunately
-         * this is going to basically lock up the machine while we
-         * wait for this to complete.  To be 100% correct, we need to
-         * check for timeout, and if we are doing something like this
-         * we are pretty desperate anyways.
-         */
-        ssleep(4);
-
-        spin_lock_irq(SCpnt->device->host->host_lock);
-
-        WAIT(STATUS(SCpnt->device->host->io_port),
-             STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF);
-
-        /*
-         * Now try to pick up the pieces.  For all pending commands,
-         * free any internal data structures, and basically clear things
-         * out.  We do not try and restart any commands or anything - 
-         * the strategy handler takes care of that crap.
-         */
-        printk(KERN_WARNING "Sent BUS RESET to scsi host %d\n", SCpnt->device->host->host_no);
-
-        for (i = 0; i < AHA1542_MAILBOXES; i++) {
-                if (HOSTDATA(SCpnt->device->host)->SCint[i] != NULL) {
-                        Scsi_Cmnd *SCtmp;
-                        SCtmp = HOSTDATA(SCpnt->device->host)->SCint[i];
-
-
-                        if (SCtmp->device->soft_reset) {
-                                /*
-                                 * If this device implements the soft reset option,
-                                 * then it is still holding onto the command, and
-                                 * may yet complete it.  In this case, we don't
-                                 * flush the data.
-                                 */
-                                continue;
-                        }
-                        kfree(SCtmp->host_scribble);
-                        SCtmp->host_scribble = NULL;
-                        HOSTDATA(SCpnt->device->host)->SCint[i] = NULL;
-                        HOSTDATA(SCpnt->device->host)->mb[i].status = 0;
-                }
+        if (!wait_mask(STATUS(cmd->device->host->io_port),
+             STATMASK, IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0)) {
+                spin_unlock_irqrestore(sh->host_lock, flags);
+                return FAILED;
         }
 
-        spin_unlock_irq(SCpnt->device->host->host_lock);
-        return SUCCESS;
-
-fail:
-        spin_unlock_irq(SCpnt->device->host->host_lock);
-        return FAILED;
-}
-
-static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
-{
-        int i;
-
-        /* 
-         * This does a scsi reset for all devices on the bus.
-         * In principle, we could also reset the 1542 - should
-         * we do this?  Try this first, and we can add that later
-         * if it turns out to be useful.
-         */
-        outb(HRST | SCRST, CONTROL(SCpnt->device->host->io_port));
-
-        /*
-         * Wait for the thing to settle down a bit.  Unfortunately
-         * this is going to basically lock up the machine while we
-         * wait for this to complete.  To be 100% correct, we need to
-         * check for timeout, and if we are doing something like this
-         * we are pretty desperate anyways.
-         */
-        ssleep(4);
-        spin_lock_irq(SCpnt->device->host->host_lock);
-
-        WAIT(STATUS(SCpnt->device->host->io_port),
-             STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF);
-
         /*
          * We need to do this too before the 1542 can interact with
-         * us again.
+         * us again after host reset.
          */
-        setup_mailboxes(SCpnt->device->host->io_port, SCpnt->device->host);
+        if (reset_cmd & HRST)
+                setup_mailboxes(cmd->device->host);
 
         /*
          * Now try to pick up the pieces.  For all pending commands,
@@ -1416,14 +882,14 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
          * out.  We do not try and restart any commands or anything - 
          * the strategy handler takes care of that crap.
          */
-        printk(KERN_WARNING "Sent BUS RESET to scsi host %d\n", SCpnt->device->host->host_no);
+        shost_printk(KERN_WARNING, cmd->device->host, "Sent BUS RESET to scsi host %d\n", cmd->device->host->host_no);
 
         for (i = 0; i < AHA1542_MAILBOXES; i++) {
-                if (HOSTDATA(SCpnt->device->host)->SCint[i] != NULL) {
-                        Scsi_Cmnd *SCtmp;
-                        SCtmp = HOSTDATA(SCpnt->device->host)->SCint[i];
+                if (aha1542->int_cmds[i] != NULL) {
+                        struct scsi_cmnd *tmp_cmd;
+                        tmp_cmd = aha1542->int_cmds[i];
 
-                        if (SCtmp->device->soft_reset) {
+                        if (tmp_cmd->device->soft_reset) {
                                 /*
                                  * If this device implements the soft reset option,
                                  * then it is still holding onto the command, and
@@ -1432,241 +898,51 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
                                  */
                                 continue;
                         }
-                        kfree(SCtmp->host_scribble);
-                        SCtmp->host_scribble = NULL;
-                        HOSTDATA(SCpnt->device->host)->SCint[i] = NULL;
-                        HOSTDATA(SCpnt->device->host)->mb[i].status = 0;
+                        kfree(tmp_cmd->host_scribble);
+                        tmp_cmd->host_scribble = NULL;
+                        aha1542->int_cmds[i] = NULL;
+                        aha1542->mb[i].status = 0;
                 }
         }
 
-        spin_unlock_irq(SCpnt->device->host->host_lock);
+        spin_unlock_irqrestore(sh->host_lock, flags);
         return SUCCESS;
-
-fail:
-        spin_unlock_irq(SCpnt->device->host->host_lock);
-        return FAILED;
 }
 
-#if 0
-/*
- * These are the old error handling routines.  They are only temporarily
- * here while we play with the new error handling code.
- */
-static int aha1542_old_abort(Scsi_Cmnd * SCpnt)
+static int aha1542_bus_reset(struct scsi_cmnd *cmd)
 {
-#if 0
-        unchar ahacmd = CMD_START_SCSI;
-        unsigned long flags;
-        struct mailbox *mb;
-        int mbi, mbo, i;
-
-        printk(KERN_DEBUG "In aha1542_abort: %x %x\n",
-               inb(STATUS(SCpnt->host->io_port)),
-               inb(INTRFLAGS(SCpnt->host->io_port)));
-
-        spin_lock_irqsave(&aha1542_lock, flags);
-        mb = HOSTDATA(SCpnt->host)->mb;
-        mbi = HOSTDATA(SCpnt->host)->aha1542_last_mbi_used + 1;
-        if (mbi >= 2 * AHA1542_MAILBOXES)
-                mbi = AHA1542_MAILBOXES;
-
-        do {
-                if (mb[mbi].status != 0)
-                        break;
-                mbi++;
-                if (mbi >= 2 * AHA1542_MAILBOXES)
-                        mbi = AHA1542_MAILBOXES;
-        } while (mbi != HOSTDATA(SCpnt->host)->aha1542_last_mbi_used);
-        spin_unlock_irqrestore(&aha1542_lock, flags);
-
-        if (mb[mbi].status) {
-                printk(KERN_ERR "Lost interrupt discovered on irq %d - attempting to recover\n",
-                       SCpnt->host->irq);
-                aha1542_intr_handle(SCpnt->host, NULL);
-                return 0;
-        }
-        /* OK, no lost interrupt.  Try looking to see how many pending commands
-           we think we have. */
-
-        for (i = 0; i < AHA1542_MAILBOXES; i++)
-                if (HOSTDATA(SCpnt->host)->SCint[i]) {
-                        if (HOSTDATA(SCpnt->host)->SCint[i] == SCpnt) {
-                                printk(KERN_ERR "Timed out command pending for %s\n",
-                                       SCpnt->request->rq_disk ?
-                                       SCpnt->request->rq_disk->disk_name : "?"
-                                       );
-                                if (HOSTDATA(SCpnt->host)->mb[i].status) {
-                                        printk(KERN_ERR "OGMB still full - restarting\n");
-                                        aha1542_out(SCpnt->host->io_port, &ahacmd, 1);
-                                };
-                        } else
-                                printk(KERN_ERR "Other pending command %s\n",
-                                       SCpnt->request->rq_disk ?
-                                       SCpnt->request->rq_disk->disk_name : "?"
-                                       );
-                }
-#endif
-
-        DEB(printk("aha1542_abort\n"));
-#if 0
-        spin_lock_irqsave(&aha1542_lock, flags);
-        for (mbo = 0; mbo < AHA1542_MAILBOXES; mbo++) {
-                if (SCpnt == HOSTDATA(SCpnt->host)->SCint[mbo]) {
-                        mb[mbo].status = 2;     /* Abort command */
-                        aha1542_out(SCpnt->host->io_port, &ahacmd, 1);  /* start scsi command */
-                        spin_unlock_irqrestore(&aha1542_lock, flags);
-                        break;
-                }
-        }
-        if (AHA1542_MAILBOXES == mbo)
-                spin_unlock_irqrestore(&aha1542_lock, flags);
-#endif
-        return SCSI_ABORT_SNOOZE;
+        return aha1542_reset(cmd, SCRST);
 }
 
-/* We do not implement a reset function here, but the upper level code
-   assumes that it will get some kind of response for the command in
-   SCpnt.  We must oblige, or the command will hang the scsi system.
-   For a first go, we assume that the 1542 notifies us with all of the
-   pending commands (it does implement soft reset, after all). */
-
-static int aha1542_old_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags)
+static int aha1542_host_reset(struct scsi_cmnd *cmd)
 {
-        unchar ahacmd = CMD_START_SCSI;
-        int i;
-
-        /*
-         * See if a bus reset was suggested.
-         */
-        if (reset_flags & SCSI_RESET_SUGGEST_BUS_RESET) {
-                /* 
-                 * This does a scsi reset for all devices on the bus.
-                 * In principle, we could also reset the 1542 - should
-                 * we do this?  Try this first, and we can add that later
-                 * if it turns out to be useful.
-                 */
-                outb(HRST | SCRST, CONTROL(SCpnt->host->io_port));
-
-                /*
-                 * Wait for the thing to settle down a bit.  Unfortunately
-                 * this is going to basically lock up the machine while we
-                 * wait for this to complete.  To be 100% correct, we need to
-                 * check for timeout, and if we are doing something like this
-                 * we are pretty desperate anyways.
-                 */
-                WAIT(STATUS(SCpnt->host->io_port),
-                STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF);
-
-                /*
-                 * We need to do this too before the 1542 can interact with
-                 * us again.
-                 */
-                setup_mailboxes(SCpnt->host->io_port, SCpnt->host);
-
-                /*
-                 * Now try to pick up the pieces.  Restart all commands
-                 * that are currently active on the bus, and reset all of
-                 * the datastructures.  We have some time to kill while
-                 * things settle down, so print a nice message.
-                 */
-                printk(KERN_WARNING "Sent BUS RESET to scsi host %d\n", SCpnt->host->host_no);
-
-                for (i = 0; i < AHA1542_MAILBOXES; i++)
-                        if (HOSTDATA(SCpnt->host)->SCint[i] != NULL) {
-                                Scsi_Cmnd *SCtmp;
-                                SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
-                                SCtmp->result = DID_RESET << 16;
-                                kfree(SCtmp->host_scribble);
-                                SCtmp->host_scribble = NULL;
-                                printk(KERN_WARNING "Sending DID_RESET for target %d\n", SCpnt->target);
-                                SCtmp->scsi_done(SCpnt);
-
-                                HOSTDATA(SCpnt->host)->SCint[i] = NULL;
-                                HOSTDATA(SCpnt->host)->mb[i].status = 0;
-                        }
-                /*
-                 * Now tell the mid-level code what we did here.  Since
-                 * we have restarted all of the outstanding commands,
-                 * then report SUCCESS.
-                 */
-                return (SCSI_RESET_SUCCESS | SCSI_RESET_BUS_RESET);
-fail:
-                printk(KERN_CRIT "aha1542.c: Unable to perform hard reset.\n");
-                printk(KERN_CRIT "Power cycle machine to reset\n");
-                return (SCSI_RESET_ERROR | SCSI_RESET_BUS_RESET);
-
-
-        } else {
-                /* This does a selective reset of just the one device */
-                /* First locate the ccb for this command */
-                for (i = 0; i < AHA1542_MAILBOXES; i++)
-                        if (HOSTDATA(SCpnt->host)->SCint[i] == SCpnt) {
-                                HOSTDATA(SCpnt->host)->ccb[i].op = 0x81;        /* BUS DEVICE RESET */
-                                /* Now tell the 1542 to flush all pending commands for this target */
-                                aha1542_out(SCpnt->host->io_port, &ahacmd, 1);
-
-                                /* Here is the tricky part.  What to do next.  Do we get an interrupt
-                                   for the commands that we aborted with the specified target, or
-                                   do we generate this on our own?  Try it without first and see
-                                   what happens */
-                                printk(KERN_WARNING "Sent BUS DEVICE RESET to target %d\n", SCpnt->target);
-
-                                /* If the first does not work, then try the second.  I think the
-                                   first option is more likely to be correct. Free the command
-                                   block for all commands running on this target... */
-                                for (i = 0; i < AHA1542_MAILBOXES; i++)
-                                        if (HOSTDATA(SCpnt->host)->SCint[i] &&
-                                            HOSTDATA(SCpnt->host)->SCint[i]->target == SCpnt->target) {
-                                                Scsi_Cmnd *SCtmp;
-                                                SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
-                                                SCtmp->result = DID_RESET << 16;
-                                                kfree(SCtmp->host_scribble);
-                                                SCtmp->host_scribble = NULL;
-                                                printk(KERN_WARNING "Sending DID_RESET for target %d\n", SCpnt->target);
-                                                SCtmp->scsi_done(SCpnt);
-
-                                                HOSTDATA(SCpnt->host)->SCint[i] = NULL;
-                                                HOSTDATA(SCpnt->host)->mb[i].status = 0;
-                                        }
-                                return SCSI_RESET_SUCCESS;
-                        }
-        }
-        /* No active command at this time, so this means that each time we got
-           some kind of response the last time through.  Tell the mid-level code
-           to request sense information in order to decide what to do next. */
-        return SCSI_RESET_PUNT;
+        return aha1542_reset(cmd, HRST | SCRST);
 }
-#endif    /* end of big comment block around old_abort + old_reset */
 
 static int aha1542_biosparam(struct scsi_device *sdev,
-                struct block_device *bdev, sector_t capacity, int *ip)
+                struct block_device *bdev, sector_t capacity, int geom[])
 {
-        int translation_algorithm;
-        int size = capacity;
-
-        translation_algorithm = HOSTDATA(sdev->host)->bios_translation;
+        struct aha1542_hostdata *aha1542 = shost_priv(sdev->host);
 
-        if ((size >> 11) > 1024 && translation_algorithm == BIOS_TRANSLATION_25563) {
+        if (capacity >= 0x200000 &&
+                        aha1542->bios_translation == BIOS_TRANSLATION_25563) {
                 /* Please verify that this is the same as what DOS returns */
-                ip[0] = 255;
-                ip[1] = 63;
-                ip[2] = size / 255 / 63;
+                geom[0] = 255;  /* heads */
+                geom[1] = 63;   /* sectors */
         } else {
-                ip[0] = 64;
-                ip[1] = 32;
-                ip[2] = size >> 11;
+                geom[0] = 64;   /* heads */
+                geom[1] = 32;   /* sectors */
         }
+        geom[2] = sector_div(capacity, geom[0] * geom[1]);      /* cylinders */
 
         return 0;
 }
 MODULE_LICENSE("GPL");
 
-
 static struct scsi_host_template driver_template = {
+        .module                 = THIS_MODULE,
         .proc_name              = "aha1542",
         .name                   = "Adaptec 1542",
-        .detect                 = aha1542_detect,
-        .release                = aha1542_release,
         .queuecommand           = aha1542_queuecommand,
         .eh_device_reset_handler= aha1542_dev_reset,
         .eh_bus_reset_handler   = aha1542_bus_reset,
@@ -1674,9 +950,124 @@ static struct scsi_host_template driver_template = {
         .bios_param             = aha1542_biosparam,
         .can_queue              = AHA1542_MAILBOXES, 
         .this_id                = 7,
-        .sg_tablesize           = AHA1542_SCATTER,
-        .cmd_per_lun            = AHA1542_CMDLUN,
+        .sg_tablesize           = 16,
+        .cmd_per_lun            = 1,
         .unchecked_isa_dma      = 1, 
         .use_clustering         = ENABLE_CLUSTERING,
 };
-#include "scsi_module.c"
+
+static int aha1542_isa_match(struct device *pdev, unsigned int ndev)
+{
+        struct Scsi_Host *sh = aha1542_hw_init(&driver_template, pdev, ndev);
+
+        if (!sh)
+                return 0;
+
+        dev_set_drvdata(pdev, sh);
+        return 1;
+}
+
+static int aha1542_isa_remove(struct device *pdev,
+                                    unsigned int ndev)
+{
+        aha1542_release(dev_get_drvdata(pdev));
+        dev_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+static struct isa_driver aha1542_isa_driver = {
+        .match          = aha1542_isa_match,
+        .remove         = aha1542_isa_remove,
+        .driver         = {
+                .name   = "aha1542"
+        },
+};
+static int isa_registered;
+
+#ifdef CONFIG_PNP
+static struct pnp_device_id aha1542_pnp_ids[] = {
+        { .id = "ADP1542" },
+        { .id = "" }
+};
+MODULE_DEVICE_TABLE(pnp, aha1542_pnp_ids);
+
+static int aha1542_pnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *id)
+{
+        int indx;
+        struct Scsi_Host *sh;
+
+        for (indx = 0; indx < ARRAY_SIZE(io); indx++) {
+                if (io[indx])
+                        continue;
+
+                if (pnp_activate_dev(pdev) < 0)
+                        continue;
+
+                io[indx] = pnp_port_start(pdev, 0);
+
+                /* The card can be queried for its DMA, we have
+                   the DMA set up that is enough */
+
+                dev_info(&pdev->dev, "ISAPnP found an AHA1535 at I/O 0x%03X", io[indx]);
+        }
+
+        sh = aha1542_hw_init(&driver_template, &pdev->dev, indx);
+        if (!sh)
+                return -ENODEV;
+
+        pnp_set_drvdata(pdev, sh);
+        return 0;
+}
+
+static void aha1542_pnp_remove(struct pnp_dev *pdev)
+{
+        aha1542_release(pnp_get_drvdata(pdev));
+        pnp_set_drvdata(pdev, NULL);
+}
+
+static struct pnp_driver aha1542_pnp_driver = {
+        .name           = "aha1542",
+        .id_table       = aha1542_pnp_ids,
+        .probe          = aha1542_pnp_probe,
+        .remove         = aha1542_pnp_remove,
+};
+static int pnp_registered;
+#endif /* CONFIG_PNP */
+
+static int __init aha1542_init(void)
+{
+        int ret = 0;
+
+#ifdef CONFIG_PNP
+        if (isapnp) {
+                ret = pnp_register_driver(&aha1542_pnp_driver);
+                if (!ret)
+                        pnp_registered = 1;
+        }
+#endif
+        ret = isa_register_driver(&aha1542_isa_driver, MAXBOARDS);
+        if (!ret)
+                isa_registered = 1;
+
+#ifdef CONFIG_PNP
+        if (pnp_registered)
+                ret = 0;
+#endif
+        if (isa_registered)
+                ret = 0;
+
+        return ret;
+}
+
+static void __exit aha1542_exit(void)
+{
+#ifdef CONFIG_PNP
+        if (pnp_registered)
+                pnp_unregister_driver(&aha1542_pnp_driver);
+#endif
+        if (isa_registered)
+                isa_unregister_driver(&aha1542_isa_driver);
+}
+
+module_init(aha1542_init);
+module_exit(aha1542_exit);
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index b871d2b57f93..0fe9bae1b3d1 100644
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -1,64 +1,35 @@
-#ifndef _AHA1542_H
-
-/* $Id: aha1542.h,v 1.1 1992/07/24 06:27:38 root Exp root $
- *
- * Header file for the adaptec 1542 driver for Linux
- *
- * $Log: aha1542.h,v $
- * Revision 1.1  1992/07/24  06:27:38  root
- * Initial revision
- *
- * Revision 1.2  1992/07/04  18:41:49  root
- * Replaced distribution with current drivers
- *
- * Revision 1.3  1992/06/23  23:58:20  root
- * Fixes.
- *
- * Revision 1.2  1992/05/26  22:13:23  root
- * Changed bug that prevented DMA above first 2 mbytes.
- *
- * Revision 1.1  1992/05/22  21:00:29  root
- * Initial revision
- *
- * Revision 1.1  1992/04/24  18:01:50  root
- * Initial revision
- *
- * Revision 1.1  1992/04/02  03:23:13  drew
- * Initial revision
- *
- * Revision 1.3  1992/01/27  14:46:29  tthorn
- * *** empty log message ***
- *
- */
+#ifndef _AHA1542_H_
+#define _AHA1542_H_
 
 #include <linux/types.h>
 
 /* I/O Port interface 4.2 */
 /* READ */
 #define STATUS(base) base
-#define STST    0x80            /* Self Test in Progress */
-#define DIAGF   0x40            /* Internal Diagnostic Failure */
-#define INIT    0x20            /* Mailbox Initialization Required */
-#define IDLE    0x10            /* SCSI Host Adapter Idle */
-#define CDF     0x08            /* Command/Data Out Port Full */
-#define DF      0x04            /* Data In Port Full */
-#define INVDCMD 0x01            /* Invalid H A Command */
-#define STATMASK 0xfd           /* 0x02 is reserved */
+#define STST    BIT(7)          /* Self Test in Progress */
+#define DIAGF   BIT(6)          /* Internal Diagnostic Failure */
+#define INIT    BIT(5)          /* Mailbox Initialization Required */
+#define IDLE    BIT(4)          /* SCSI Host Adapter Idle */
+#define CDF     BIT(3)          /* Command/Data Out Port Full */
+#define DF      BIT(2)          /* Data In Port Full */
+/* BIT(1) is reserved */
+#define INVDCMD BIT(0)          /* Invalid H A Command */
+#define STATMASK (STST | DIAGF | INIT | IDLE | CDF | DF | INVDCMD)
 
 #define INTRFLAGS(base) (STATUS(base)+2)
-#define ANYINTR 0x80            /* Any Interrupt */
-#define SCRD    0x08            /* SCSI Reset Detected */
-#define HACC    0x04            /* HA Command Complete */
-#define MBOA    0x02            /* MBO Empty */
-#define MBIF    0x01            /* MBI Full */
-#define INTRMASK 0x8f
+#define ANYINTR BIT(7)          /* Any Interrupt */
+#define SCRD    BIT(3)          /* SCSI Reset Detected */
+#define HACC    BIT(2)          /* HA Command Complete */
+#define MBOA    BIT(1)          /* MBO Empty */
+#define MBIF    BIT(0)          /* MBI Full */
+#define INTRMASK (ANYINTR | SCRD | HACC | MBOA | MBIF)
 
 /* WRITE */
 #define CONTROL(base) STATUS(base)
-#define HRST    0x80            /* Hard Reset */
-#define SRST    0x40            /* Soft Reset */
-#define IRST    0x20            /* Interrupt Reset */
-#define SCRST   0x10            /* SCSI Bus Reset */
+#define HRST    BIT(7)          /* Hard Reset */
+#define SRST    BIT(6)          /* Soft Reset */
+#define IRST    BIT(5)          /* Interrupt Reset */
+#define SCRST   BIT(4)          /* SCSI Bus Reset */
 
 /* READ/WRITE */
 #define DATA(base) (STATUS(base)+1)
@@ -80,14 +51,14 @@
 
 /* Mailbox Definition 5.2.1 and 5.2.2 */
 struct mailbox {
-  unchar status;                /* Command/Status */
-  unchar ccbptr[3];             /* msb, .., lsb */
+        u8 status;      /* Command/Status */
+        u8 ccbptr[3];   /* msb, .., lsb */
 };
 
 /* This is used with scatter-gather */
 struct chain {
-  unchar datalen[3];            /* Size of this part of chain */
-  unchar dataptr[3];            /* Location of data */
+        u8 datalen[3];  /* Size of this part of chain */
+        u8 dataptr[3];  /* Location of data */
 };
 
 /* These belong in scsi.h also */
@@ -100,51 +71,32 @@ static inline void any2scsi(u8 *p, u32 v)
 
 #define scsi2int(up) ( (((long)*(up)) << 16) + (((long)(up)[1]) << 8) + ((long)(up)[2]) )
 
-#define xany2scsi(up, p)        \
-(up)[0] = ((long)(p)) >> 24;    \
-(up)[1] = ((long)(p)) >> 16;    \
-(up)[2] = ((long)(p)) >> 8;     \
-(up)[3] = ((long)(p));
-
 #define xscsi2int(up) ( (((long)(up)[0]) << 24) + (((long)(up)[1]) << 16) \
                       + (((long)(up)[2]) <<  8) +  ((long)(up)[3]) )
 
 #define MAX_CDB 12
 #define MAX_SENSE 14
 
-struct ccb {                    /* Command Control Block 5.3 */
-  unchar op;                    /* Command Control Block Operation Code */
-  unchar idlun;                 /* op=0,2:Target Id, op=1:Initiator Id */
-                                /* Outbound data transfer, length is checked*/
-                                /* Inbound data transfer, length is checked */
-                                /* Logical Unit Number */
-  unchar cdblen;                /* SCSI Command Length */
-  unchar rsalen;                /* Request Sense Allocation Length/Disable */
-  unchar datalen[3];            /* Data Length (msb, .., lsb) */
-  unchar dataptr[3];            /* Data Pointer */
-  unchar linkptr[3];            /* Link Pointer */
-  unchar commlinkid;            /* Command Linking Identifier */
-  unchar hastat;                /* Host Adapter Status (HASTAT) */
-  unchar tarstat;               /* Target Device Status */
-  unchar reserved[2];
-  unchar cdb[MAX_CDB+MAX_SENSE];/* SCSI Command Descriptor Block */
-                                /* REQUEST SENSE */
+struct ccb {            /* Command Control Block 5.3 */
+        u8 op;          /* Command Control Block Operation Code */
+        u8 idlun;       /* op=0,2:Target Id, op=1:Initiator Id */
+                        /* Outbound data transfer, length is checked*/
+                        /* Inbound data transfer, length is checked */
+                        /* Logical Unit Number */
+        u8 cdblen;      /* SCSI Command Length */
+        u8 rsalen;      /* Request Sense Allocation Length/Disable */
+        u8 datalen[3];  /* Data Length (msb, .., lsb) */
+        u8 dataptr[3];  /* Data Pointer */
+        u8 linkptr[3];  /* Link Pointer */
+        u8 commlinkid;  /* Command Linking Identifier */
+        u8 hastat;      /* Host Adapter Status (HASTAT) */
+        u8 tarstat;     /* Target Device Status */
+        u8 reserved[2];
+        u8 cdb[MAX_CDB+MAX_SENSE];      /* SCSI Command Descriptor Block */
+                                        /* REQUEST SENSE */
 };
 
-static int aha1542_detect(struct scsi_host_template *);
-static int aha1542_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
-static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
-static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
-static int aha1542_host_reset(Scsi_Cmnd * SCpnt);
-#if 0
-static int aha1542_old_abort(Scsi_Cmnd * SCpnt);
-static int aha1542_old_reset(Scsi_Cmnd *, unsigned int);
-#endif
-static int aha1542_biosparam(struct scsi_device *, struct block_device *,
-                sector_t, int *);
-
+#define AHA1542_REGION_SIZE 4
 #define AHA1542_MAILBOXES 8
-#define AHA1542_SCATTER 16
-#define AHA1542_CMDLUN 1
 
-#endif
+#endif /* _AHA1542_H_ */
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 97f2accd3dbb..109e2c99e6c1 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -10437,14 +10437,13 @@ ahd_handle_en_lun(struct ahd_softc *ahd, struct cam_sim *sim, union ccb *ccb)
                                 return;
                         }
                 }
-                lstate = kmalloc(sizeof(*lstate), GFP_ATOMIC);
+                lstate = kzalloc(sizeof(*lstate), GFP_ATOMIC);
                 if (lstate == NULL) {
                         xpt_print_path(ccb->ccb_h.path);
                         printk("Couldn't allocate lstate\n");
                         ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
                         return;
                 }
-                memset(lstate, 0, sizeof(*lstate));
                 status = xpt_create_path(&lstate->path, /*periph*/NULL,
                                          xpt_path_path_id(ccb->ccb_h.path),
                                          xpt_path_target_id(ccb->ccb_h.path),
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index d5c7b193d8d3..ce96a0be3282 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1326,10 +1326,9 @@ int
 ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
 {
         ahd->platform_data =
-            kmalloc(sizeof(struct ahd_platform_data), GFP_ATOMIC);
+            kzalloc(sizeof(struct ahd_platform_data), GFP_ATOMIC);
         if (ahd->platform_data == NULL)
                 return (ENOMEM);
-        memset(ahd->platform_data, 0, sizeof(struct ahd_platform_data));
         ahd->platform_data->irq = AHD_LINUX_NOIRQ;
         ahd_lockinit(ahd);
         ahd->seltime = (aic79xx_seltime & 0x3) << 4;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 10172a3af1b9..c4829d84b335 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -4464,10 +4464,9 @@ ahc_softc_init(struct ahc_softc *ahc)
         ahc->pause = ahc->unpause | PAUSE; 
         /* XXX The shared scb data stuff should be deprecated */
         if (ahc->scb_data == NULL) {
-                ahc->scb_data = kmalloc(sizeof(*ahc->scb_data), GFP_ATOMIC);
+                ahc->scb_data = kzalloc(sizeof(*ahc->scb_data), GFP_ATOMIC);
                 if (ahc->scb_data == NULL)
                         return (ENOMEM);
-                memset(ahc->scb_data, 0, sizeof(*ahc->scb_data));
         }
 
         return (0);
@@ -4780,10 +4779,10 @@ ahc_init_scbdata(struct ahc_softc *ahc)
         SLIST_INIT(&scb_data->sg_maps);
 
         /* Allocate SCB resources */
-        scb_data->scbarray = kmalloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC, GFP_ATOMIC);
+        scb_data->scbarray = kzalloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
+                                GFP_ATOMIC);
         if (scb_data->scbarray == NULL)
                 return (ENOMEM);
-        memset(scb_data->scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX_ALLOC);
 
         /* Determine the number of hardware SCBs and initialize them */
 
@@ -7558,14 +7557,13 @@ ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb)
                                 return;
                         }
                 }
-                lstate = kmalloc(sizeof(*lstate), GFP_ATOMIC);
+                lstate = kzalloc(sizeof(*lstate), GFP_ATOMIC);
                 if (lstate == NULL) {
                         xpt_print_path(ccb->ccb_h.path);
                         printk("Couldn't allocate lstate\n");
                         ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
                         return;
                 }
-                memset(lstate, 0, sizeof(*lstate));
                 status = xpt_create_path(&lstate->path, /*periph*/NULL,
                                          xpt_path_path_id(ccb->ccb_h.path),
                                          xpt_path_target_id(ccb->ccb_h.path),
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 88360116dbcb..a2f2c774cd6b 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1214,10 +1214,9 @@ ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg)
 {
 
         ahc->platform_data =
-            kmalloc(sizeof(struct ahc_platform_data), GFP_ATOMIC);
+            kzalloc(sizeof(struct ahc_platform_data), GFP_ATOMIC);
         if (ahc->platform_data == NULL)
                 return (ENOMEM);
-        memset(ahc->platform_data, 0, sizeof(struct ahc_platform_data));
         ahc->platform_data->irq = AHC_LINUX_NOIRQ;
         ahc_lockinit(ahc);
         ahc->seltime = (aic7xxx_seltime & 0x3) << 4;
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index a70255413e7f..db87ece6edb2 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -1486,7 +1486,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
          * selection.
          */
 
-        timeout = jiffies + (250 * HZ / 1000);
+        timeout = jiffies + msecs_to_jiffies(250);
 
         /*
          * XXX very interesting - we're seeing a bounce where the BSY we
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index d1c37a386947..5ede3daa93dc 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -1014,7 +1014,6 @@ static struct platform_driver atari_scsi_driver = {
         .remove = __exit_p(atari_scsi_remove),
         .driver = {
                 .name   = DRV_MODULE_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index e90a3742f09d..cc3b9d3d6d40 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1079,22 +1079,18 @@ bfad_start_ops(struct bfad_s *bfad) {
 int
 bfad_worker(void *ptr)
 {
-        struct bfad_s *bfad;
-        unsigned long   flags;
-
-        bfad = (struct bfad_s *)ptr;
-
-        while (!kthread_should_stop()) {
+        struct bfad_s *bfad = ptr;
+        unsigned long flags;
 
-                /* Send event BFAD_E_INIT_SUCCESS */
-                bfa_sm_send_event(bfad, BFAD_E_INIT_SUCCESS);
+        if (kthread_should_stop())
+                return 0;
 
-                spin_lock_irqsave(&bfad->bfad_lock, flags);
-                bfad->bfad_tsk = NULL;
-                spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+        /* Send event BFAD_E_INIT_SUCCESS */
+        bfa_sm_send_event(bfad, BFAD_E_INIT_SUCCESS);
 
-                break;
-        }
+        spin_lock_irqsave(&bfad->bfad_lock, flags);
+        bfad->bfad_tsk = NULL;
+        spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
         return 0;
 }
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index f35792f7051c..f8d2478b11cc 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -57,9 +57,9 @@
  */
 
 /* settings for DTC3181E card with only Mustek scanner attached */
-#define USLEEP_POLL     1
-#define USLEEP_SLEEP    20
-#define USLEEP_WAITLONG 500
+#define USLEEP_POLL     msecs_to_jiffies(10)
+#define USLEEP_SLEEP    msecs_to_jiffies(200)
+#define USLEEP_WAITLONG msecs_to_jiffies(5000)
 
 #define AUTOPROBE_IRQ
 
@@ -723,7 +723,7 @@ module_param(ncr_53c400a, int, 0);
 module_param(dtc_3181e, int, 0);
 MODULE_LICENSE("GPL");
 
-#ifndef SCSI_G_NCR5380_MEM
+#if !defined(SCSI_G_NCR5380_MEM) && defined(MODULE)
 static struct isapnp_device_id id_table[] = {
         {
          ISAPNP_ANY_ID, ISAPNP_ANY_ID,
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d9afc51af7d3..882744852aac 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -99,6 +99,7 @@ static unsigned int ipr_debug = 0;
 static unsigned int ipr_max_devs = IPR_DEFAULT_SIS64_DEVS;
 static unsigned int ipr_dual_ioa_raid = 1;
 static unsigned int ipr_number_of_msix = 2;
+static unsigned int ipr_fast_reboot;
 static DEFINE_SPINLOCK(ipr_driver_lock);
 
 /* This table describes the differences between DMA controller chips */
@@ -221,6 +222,8 @@ MODULE_PARM_DESC(max_devs, "Specify the maximum number of physical devices. "
                  "[Default=" __stringify(IPR_DEFAULT_SIS64_DEVS) "]");
 module_param_named(number_of_msix, ipr_number_of_msix, int, 0);
 MODULE_PARM_DESC(number_of_msix, "Specify the number of MSIX interrupts to use on capable adapters (1 - 16).  (default:2)");
+module_param_named(fast_reboot, ipr_fast_reboot, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(fast_reboot, "Skip adapter shutdown during reboot. Set to 1 to enable. (default: 0)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
@@ -495,6 +498,10 @@ struct ipr_error_table_t ipr_error_table[] = {
         "4061: Multipath redundancy level got better"},
         {0x066B9200, 0, IPR_DEFAULT_LOG_LEVEL,
         "4060: Multipath redundancy level got worse"},
+        {0x06808100, 0, IPR_DEFAULT_LOG_LEVEL,
+        "9083: Device raw mode enabled"},
+        {0x06808200, 0, IPR_DEFAULT_LOG_LEVEL,
+        "9084: Device raw mode disabled"},
         {0x07270000, 0, 0,
         "Failure due to other device"},
         {0x07278000, 0, IPR_DEFAULT_LOG_LEVEL,
@@ -1462,7 +1469,8 @@ static void ipr_process_ccn(struct ipr_cmnd *ipr_cmd)
         list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);
 
         if (ioasc) {
-                if (ioasc != IPR_IOASC_IOA_WAS_RESET)
+                if (ioasc != IPR_IOASC_IOA_WAS_RESET &&
+                    ioasc != IPR_IOASC_ABORTED_CMD_TERM_BY_HOST)
                         dev_err(&ioa_cfg->pdev->dev,
                                 "Host RCB failed with IOASC: 0x%08X\n", ioasc);
 
@@ -2566,7 +2574,8 @@ static void ipr_process_error(struct ipr_cmnd *ipr_cmd)
                 ipr_handle_log_data(ioa_cfg, hostrcb);
                 if (fd_ioasc == IPR_IOASC_NR_IOA_RESET_REQUIRED)
                         ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_ABBREV);
-        } else if (ioasc != IPR_IOASC_IOA_WAS_RESET) {
+        } else if (ioasc != IPR_IOASC_IOA_WAS_RESET &&
+                   ioasc != IPR_IOASC_ABORTED_CMD_TERM_BY_HOST) {
                 dev_err(&ioa_cfg->pdev->dev,
                         "Host RCB failed with IOASC: 0x%08X\n", ioasc);
         }
@@ -4491,11 +4500,83 @@ static struct device_attribute ipr_resource_type_attr = {
         .show = ipr_show_resource_type
 };
 
+/**
+ * ipr_show_raw_mode - Show the adapter's raw mode
+ * @dev:        class device struct
+ * @buf:        buffer
+ *
+ * Return value:
+ *      number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_raw_mode(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
+        struct ipr_resource_entry *res;
+        unsigned long lock_flags = 0;
+        ssize_t len;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        res = (struct ipr_resource_entry *)sdev->hostdata;
+        if (res)
+                len = snprintf(buf, PAGE_SIZE, "%d\n", res->raw_mode);
+        else
+                len = -ENXIO;
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        return len;
+}
+
+/**
+ * ipr_store_raw_mode - Change the adapter's raw mode
+ * @dev:        class device struct
+ * @buf:        buffer
+ *
+ * Return value:
+ *      number of bytes printed to buffer
+ **/
+static ssize_t ipr_store_raw_mode(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
+        struct ipr_resource_entry *res;
+        unsigned long lock_flags = 0;
+        ssize_t len;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        res = (struct ipr_resource_entry *)sdev->hostdata;
+        if (res) {
+                if (ioa_cfg->sis64 && ipr_is_af_dasd_device(res)) {
+                        res->raw_mode = simple_strtoul(buf, NULL, 10);
+                        len = strlen(buf);
+                        if (res->sdev)
+                                sdev_printk(KERN_INFO, res->sdev, "raw mode is %s\n",
+                                        res->raw_mode ? "enabled" : "disabled");
+                } else
+                        len = -EINVAL;
+        } else
+                len = -ENXIO;
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        return len;
+}
+
+static struct device_attribute ipr_raw_mode_attr = {
+        .attr = {
+                .name =         "raw_mode",
+                .mode =         S_IRUGO | S_IWUSR,
+        },
+        .show = ipr_show_raw_mode,
+        .store = ipr_store_raw_mode
+};
+
 static struct device_attribute *ipr_dev_attrs[] = {
         &ipr_adapter_handle_attr,
         &ipr_resource_path_attr,
         &ipr_device_id_attr,
         &ipr_resource_type_attr,
+        &ipr_raw_mode_attr,
         NULL,
 };
 
@@ -5379,9 +5460,6 @@ static irqreturn_t ipr_handle_other_interrupt(struct ipr_ioa_cfg *ioa_cfg,
         if (int_reg & IPR_PCII_IOA_TRANS_TO_OPER) {
                 /* Mask the interrupt */
                 writel(IPR_PCII_IOA_TRANS_TO_OPER, ioa_cfg->regs.set_interrupt_mask_reg);
-
-                /* Clear the interrupt */
-                writel(IPR_PCII_IOA_TRANS_TO_OPER, ioa_cfg->regs.clr_interrupt_reg);
                 int_reg = readl(ioa_cfg->regs.sense_interrupt_reg);
 
                 list_del(&ioa_cfg->reset_cmd->queue);
@@ -6150,6 +6228,13 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
                 break;
         case IPR_IOASC_NR_INIT_CMD_REQUIRED:
                 break;
+        case IPR_IOASC_IR_NON_OPTIMIZED:
+                if (res->raw_mode) {
+                        res->raw_mode = 0;
+                        scsi_cmd->result |= (DID_IMM_RETRY << 16);
+                } else
+                        scsi_cmd->result |= (DID_ERROR << 16);
+                break;
         default:
                 if (IPR_IOASC_SENSE_KEY(ioasc) > RECOVERED_ERROR)
                         scsi_cmd->result |= (DID_ERROR << 16);
@@ -6289,6 +6374,8 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
             (!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE)) {
                 ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
         }
+        if (res->raw_mode && ipr_is_af_dasd_device(res))
+                ioarcb->cmd_pkt.request_type = IPR_RQTYPE_PIPE;
 
         if (ioa_cfg->sis64)
                 rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd);
@@ -6402,7 +6489,6 @@ static struct scsi_host_template driver_template = {
         .shost_attrs = ipr_ioa_attrs,
         .sdev_attrs = ipr_dev_attrs,
         .proc_name = IPR_NAME,
-        .no_write_same = 1,
         .use_blk_tags = 1,
 };
 
@@ -8318,7 +8404,6 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
 static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
 {
         ENTER;
-        pci_set_pcie_reset_state(ipr_cmd->ioa_cfg->pdev, pcie_deassert_reset);
         ipr_cmd->job_step = ipr_reset_bist_done;
         ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);
         LEAVE;
@@ -8326,6 +8411,32 @@ static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_reset_reset_work - Pulse a PCIe fundamental reset
+ * @work:       work struct
+ *
+ * Description: This pulses warm reset to a slot.
+ *
+ **/
+static void ipr_reset_reset_work(struct work_struct *work)
+{
+        struct ipr_cmnd *ipr_cmd = container_of(work, struct ipr_cmnd, work);
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct pci_dev *pdev = ioa_cfg->pdev;
+        unsigned long lock_flags = 0;
+
+        ENTER;
+        pci_set_pcie_reset_state(pdev, pcie_warm_reset);
+        msleep(jiffies_to_msecs(IPR_PCI_RESET_TIMEOUT));
+        pci_set_pcie_reset_state(pdev, pcie_deassert_reset);
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        if (ioa_cfg->reset_cmd == ipr_cmd)
+                ipr_reset_ioa_job(ipr_cmd);
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        LEAVE;
+}
+
+/**
  * ipr_reset_slot_reset - Reset the PCI slot of the adapter.
  * @ipr_cmd:    ipr command struct
  *
@@ -8337,12 +8448,11 @@ static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
 static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)
 {
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
-        struct pci_dev *pdev = ioa_cfg->pdev;
 
         ENTER;
-        pci_set_pcie_reset_state(pdev, pcie_warm_reset);
+        INIT_WORK(&ipr_cmd->work, ipr_reset_reset_work);
+        queue_work(ioa_cfg->reset_work_q, &ipr_cmd->work);
         ipr_cmd->job_step = ipr_reset_slot_reset_done;
-        ipr_reset_start_timer(ipr_cmd, IPR_PCI_RESET_TIMEOUT);
         LEAVE;
         return IPR_RC_JOB_RETURN;
 }
@@ -8480,6 +8590,122 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_reset_quiesce_done - Complete IOA disconnect
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: Freeze the adapter to complete quiesce processing
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE
+ **/
+static int ipr_reset_quiesce_done(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+
+        ENTER;
+        ipr_cmd->job_step = ipr_ioa_bringdown_done;
+        ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
+        LEAVE;
+        return IPR_RC_JOB_CONTINUE;
+}
+
+/**
+ * ipr_reset_cancel_hcam_done - Check for outstanding commands
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: Ensure nothing is outstanding to the IOA and
+ *                      proceed with IOA disconnect. Otherwise reset the IOA.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN / IPR_RC_JOB_CONTINUE
+ **/
+static int ipr_reset_cancel_hcam_done(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct ipr_cmnd *loop_cmd;
+        struct ipr_hrr_queue *hrrq;
+        int rc = IPR_RC_JOB_CONTINUE;
+        int count = 0;
+
+        ENTER;
+        ipr_cmd->job_step = ipr_reset_quiesce_done;
+
+        for_each_hrrq(hrrq, ioa_cfg) {
+                spin_lock(&hrrq->_lock);
+                list_for_each_entry(loop_cmd, &hrrq->hrrq_pending_q, queue) {
+                        count++;
+                        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
+                        list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);
+                        rc = IPR_RC_JOB_RETURN;
+                        break;
+                }
+                spin_unlock(&hrrq->_lock);
+
+                if (count)
+                        break;
+        }
+
+        LEAVE;
+        return rc;
+}
+
+/**
+ * ipr_reset_cancel_hcam - Cancel outstanding HCAMs
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: Cancel any oustanding HCAMs to the IOA.
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_cancel_hcam(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        int rc = IPR_RC_JOB_CONTINUE;
+        struct ipr_cmd_pkt *cmd_pkt;
+        struct ipr_cmnd *hcam_cmd;
+        struct ipr_hrr_queue *hrrq = &ioa_cfg->hrrq[IPR_INIT_HRRQ];
+
+        ENTER;
+        ipr_cmd->job_step = ipr_reset_cancel_hcam_done;
+
+        if (!hrrq->ioa_is_dead) {
+                if (!list_empty(&ioa_cfg->hostrcb_pending_q)) {
+                        list_for_each_entry(hcam_cmd, &hrrq->hrrq_pending_q, queue) {
+                                if (hcam_cmd->ioarcb.cmd_pkt.cdb[0] != IPR_HOST_CONTROLLED_ASYNC)
+                                        continue;
+
+                                ipr_cmd->ioarcb.res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
+                                ipr_cmd->ioarcb.cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
+                                cmd_pkt = &ipr_cmd->ioarcb.cmd_pkt;
+                                cmd_pkt->request_type = IPR_RQTYPE_IOACMD;
+                                cmd_pkt->cdb[0] = IPR_CANCEL_REQUEST;
+                                cmd_pkt->cdb[1] = IPR_CANCEL_64BIT_IOARCB;
+                                cmd_pkt->cdb[10] = ((u64) hcam_cmd->dma_addr >> 56) & 0xff;
+                                cmd_pkt->cdb[11] = ((u64) hcam_cmd->dma_addr >> 48) & 0xff;
+                                cmd_pkt->cdb[12] = ((u64) hcam_cmd->dma_addr >> 40) & 0xff;
+                                cmd_pkt->cdb[13] = ((u64) hcam_cmd->dma_addr >> 32) & 0xff;
+                                cmd_pkt->cdb[2] = ((u64) hcam_cmd->dma_addr >> 24) & 0xff;
+                                cmd_pkt->cdb[3] = ((u64) hcam_cmd->dma_addr >> 16) & 0xff;
+                                cmd_pkt->cdb[4] = ((u64) hcam_cmd->dma_addr >> 8) & 0xff;
+                                cmd_pkt->cdb[5] = ((u64) hcam_cmd->dma_addr) & 0xff;
+
+                                ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout,
+                                           IPR_CANCEL_TIMEOUT);
+
+                                rc = IPR_RC_JOB_RETURN;
+                                ipr_cmd->job_step = ipr_reset_cancel_hcam;
+                                break;
+                        }
+                }
+        } else
+                ipr_cmd->job_step = ipr_reset_alert;
+
+        LEAVE;
+        return rc;
+}
+
+/**
  * ipr_reset_ucode_download_done - Microcode download completion
  * @ipr_cmd:    ipr command struct
  *
@@ -8561,7 +8787,9 @@ static int ipr_reset_shutdown_ioa(struct ipr_cmnd *ipr_cmd)
         int rc = IPR_RC_JOB_CONTINUE;
 
         ENTER;
-        if (shutdown_type != IPR_SHUTDOWN_NONE &&
+        if (shutdown_type == IPR_SHUTDOWN_QUIESCE)
+                ipr_cmd->job_step = ipr_reset_cancel_hcam;
+        else if (shutdown_type != IPR_SHUTDOWN_NONE &&
                         !ioa_cfg->hrrq[IPR_INIT_HRRQ].ioa_is_dead) {
                 ipr_cmd->ioarcb.res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
                 ipr_cmd->ioarcb.cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
@@ -8917,13 +9145,15 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
 {
         int i;
 
-        for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
-                if (ioa_cfg->ipr_cmnd_list[i])
-                        dma_pool_free(ioa_cfg->ipr_cmd_pool,
-                                      ioa_cfg->ipr_cmnd_list[i],
-                                      ioa_cfg->ipr_cmnd_list_dma[i]);
+        if (ioa_cfg->ipr_cmnd_list) {
+                for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
+                        if (ioa_cfg->ipr_cmnd_list[i])
+                                dma_pool_free(ioa_cfg->ipr_cmd_pool,
+                                              ioa_cfg->ipr_cmnd_list[i],
+                                              ioa_cfg->ipr_cmnd_list_dma[i]);
 
-                ioa_cfg->ipr_cmnd_list[i] = NULL;
+                        ioa_cfg->ipr_cmnd_list[i] = NULL;
+                }
         }
 
         if (ioa_cfg->ipr_cmd_pool)
@@ -8973,26 +9203,25 @@ static void ipr_free_mem(struct ipr_ioa_cfg *ioa_cfg)
 }
 
 /**
- * ipr_free_all_resources - Free all allocated resources for an adapter.
- * @ipr_cmd:    ipr command struct
+ * ipr_free_irqs - Free all allocated IRQs for the adapter.
+ * @ioa_cfg:    ipr cfg struct
  *
- * This function frees all allocated resources for the
+ * This function frees all allocated IRQs for the
  * specified adapter.
  *
  * Return value:
  *      none
  **/
-static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg)
+static void ipr_free_irqs(struct ipr_ioa_cfg *ioa_cfg)
 {
         struct pci_dev *pdev = ioa_cfg->pdev;
 
-        ENTER;
         if (ioa_cfg->intr_flag == IPR_USE_MSI ||
             ioa_cfg->intr_flag == IPR_USE_MSIX) {
                 int i;
                 for (i = 0; i < ioa_cfg->nvectors; i++)
                         free_irq(ioa_cfg->vectors_info[i].vec,
-                                &ioa_cfg->hrrq[i]);
+                                 &ioa_cfg->hrrq[i]);
         } else
                 free_irq(pdev->irq, &ioa_cfg->hrrq[0]);
 
@@ -9003,7 +9232,26 @@ static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg)
                 pci_disable_msix(pdev);
                 ioa_cfg->intr_flag &= ~IPR_USE_MSIX;
         }
+}
 
+/**
+ * ipr_free_all_resources - Free all allocated resources for an adapter.
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function frees all allocated resources for the
+ * specified adapter.
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg)
+{
+        struct pci_dev *pdev = ioa_cfg->pdev;
+
+        ENTER;
+        ipr_free_irqs(ioa_cfg);
+        if (ioa_cfg->reset_work_q)
+                destroy_workqueue(ioa_cfg->reset_work_q);
         iounmap(ioa_cfg->hdw_dma_regs);
         pci_release_regions(pdev);
         ipr_free_mem(ioa_cfg);
@@ -9823,6 +10071,14 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
             (dev_id->device == PCI_DEVICE_ID_IBM_OBSIDIAN_E && !ioa_cfg->revid)) {
                 ioa_cfg->needs_warm_reset = 1;
                 ioa_cfg->reset = ipr_reset_slot_reset;
+
+                ioa_cfg->reset_work_q = alloc_ordered_workqueue("ipr_reset_%d",
+                                                                WQ_MEM_RECLAIM, host->host_no);
+
+                if (!ioa_cfg->reset_work_q) {
+                        dev_err(&pdev->dev, "Couldn't register reset workqueue\n");
+                        goto out_free_irq;
+                }
         } else
                 ioa_cfg->reset = ipr_reset_start_bist;
 
@@ -9834,6 +10090,8 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
 out:
         return rc;
 
+out_free_irq:
+        ipr_free_irqs(ioa_cfg);
 cleanup_nolog:
         ipr_free_mem(ioa_cfg);
 out_msi_disable:
@@ -9914,6 +10172,8 @@ static void __ipr_remove(struct pci_dev *pdev)
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
         wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
         flush_work(&ioa_cfg->work_q);
+        if (ioa_cfg->reset_work_q)
+                flush_workqueue(ioa_cfg->reset_work_q);
         INIT_LIST_HEAD(&ioa_cfg->used_res_q);
         spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
 
@@ -10036,6 +10296,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
 {
         struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
         unsigned long lock_flags = 0;
+        enum ipr_shutdown_type shutdown_type = IPR_SHUTDOWN_NORMAL;
         int i;
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -10051,9 +10312,16 @@ static void ipr_shutdown(struct pci_dev *pdev)
                 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
         }
 
-        ipr_initiate_ioa_bringdown(ioa_cfg, IPR_SHUTDOWN_NORMAL);
+        if (ipr_fast_reboot && system_state == SYSTEM_RESTART && ioa_cfg->sis64)
+                shutdown_type = IPR_SHUTDOWN_QUIESCE;
+
+        ipr_initiate_ioa_bringdown(ioa_cfg, shutdown_type);
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
         wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+        if (ipr_fast_reboot && system_state == SYSTEM_RESTART && ioa_cfg->sis64) {
+                ipr_free_irqs(ioa_cfg);
+                pci_disable_device(ioa_cfg->pdev);
+        }
 }
 
 static struct pci_device_id ipr_pci_table[] = {
@@ -10211,7 +10479,8 @@ static int ipr_halt(struct notifier_block *nb, ulong event, void *buf)
 
         list_for_each_entry(ioa_cfg, &ipr_ioa_head, queue) {
                 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
-                if (!ioa_cfg->hrrq[IPR_INIT_HRRQ].allow_cmds) {
+                if (!ioa_cfg->hrrq[IPR_INIT_HRRQ].allow_cmds ||
+                    (ipr_fast_reboot && event == SYS_RESTART && ioa_cfg->sis64)) {
                         spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
                         continue;
                 }
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index ec03b42fa2b9..47412cf4eaac 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -39,8 +39,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.6.0"
-#define IPR_DRIVER_DATE "(November 16, 2012)"
+#define IPR_DRIVER_VERSION "2.6.1"
+#define IPR_DRIVER_DATE "(March 12, 2015)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -138,6 +138,7 @@
 #define IPR_IOASC_BUS_WAS_RESET                 0x06290000
 #define IPR_IOASC_BUS_WAS_RESET_BY_OTHER                0x06298000
 #define IPR_IOASC_ABORTED_CMD_TERM_BY_HOST      0x0B5A0000
+#define IPR_IOASC_IR_NON_OPTIMIZED              0x05258200
 
 #define IPR_FIRST_DRIVER_IOASC                  0x10000000
 #define IPR_IOASC_IOA_WAS_RESET                 0x10000001
@@ -196,6 +197,8 @@
 /*
  * Adapter Commands
  */
+#define IPR_CANCEL_REQUEST                              0xC0
+#define IPR_CANCEL_64BIT_IOARCB                 0x01
 #define IPR_QUERY_RSRC_STATE                            0xC2
 #define IPR_RESET_DEVICE                                0xC3
 #define IPR_RESET_TYPE_SELECT                           0x80
@@ -222,6 +225,7 @@
 #define IPR_ABBREV_SHUTDOWN_TIMEOUT             (10 * HZ)
 #define IPR_DUAL_IOA_ABBR_SHUTDOWN_TO   (2 * 60 * HZ)
 #define IPR_DEVICE_RESET_TIMEOUT                (ipr_fastfail ? 10 * HZ : 30 * HZ)
+#define IPR_CANCEL_TIMEOUT                      (ipr_fastfail ? 10 * HZ : 30 * HZ)
 #define IPR_CANCEL_ALL_TIMEOUT          (ipr_fastfail ? 10 * HZ : 30 * HZ)
 #define IPR_ABORT_TASK_TIMEOUT          (ipr_fastfail ? 10 * HZ : 30 * HZ)
 #define IPR_INTERNAL_TIMEOUT                    (ipr_fastfail ? 10 * HZ : 30 * HZ)
@@ -518,6 +522,7 @@ struct ipr_cmd_pkt {
 #define IPR_RQTYPE_IOACMD               0x01
 #define IPR_RQTYPE_HCAM                 0x02
 #define IPR_RQTYPE_ATA_PASSTHRU 0x04
+#define IPR_RQTYPE_PIPE                 0x05
 
         u8 reserved2;
 
@@ -1271,6 +1276,7 @@ struct ipr_resource_entry {
         u8 del_from_ml:1;
         u8 resetting_device:1;
         u8 reset_occurred:1;
+        u8 raw_mode:1;
 
         u32 bus;                /* AKA channel */
         u32 target;             /* AKA id */
@@ -1402,7 +1408,8 @@ enum ipr_shutdown_type {
         IPR_SHUTDOWN_NORMAL = 0x00,
         IPR_SHUTDOWN_PREPARE_FOR_NORMAL = 0x40,
         IPR_SHUTDOWN_ABBREV = 0x80,
-        IPR_SHUTDOWN_NONE = 0x100
+        IPR_SHUTDOWN_NONE = 0x100,
+        IPR_SHUTDOWN_QUIESCE = 0x101,
 };
 
 struct ipr_trace_entry {
@@ -1536,6 +1543,7 @@ struct ipr_ioa_cfg {
         u8 saved_mode_page_len;
 
         struct work_struct work_q;
+        struct workqueue_struct *reset_work_q;
 
         wait_queue_head_t reset_wait_q;
         wait_queue_head_t msi_wait_q;
@@ -1587,6 +1595,7 @@ struct ipr_cmnd {
         struct ata_queued_cmd *qc;
         struct completion completion;
         struct timer_list timer;
+        struct work_struct work;
         void (*fast_done) (struct ipr_cmnd *);
         void (*done) (struct ipr_cmnd *);
         int (*job_step) (struct ipr_cmnd *);
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 434e9037908e..9b81a34d7449 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -413,6 +413,9 @@ struct lpfc_vport {
         uint32_t cfg_fcp_class;
         uint32_t cfg_use_adisc;
         uint32_t cfg_fdmi_on;
+#define LPFC_FDMI_SUPPORT       1       /* bit 0 - FDMI supported? */
+#define LPFC_FDMI_REG_DELAY     2       /* bit 1 - 60 sec registration delay */
+#define LPFC_FDMI_ALL_ATTRIB    4       /* bit 2 - register ALL attributes? */
         uint32_t cfg_discovery_threads;
         uint32_t cfg_log_verbose;
         uint32_t cfg_max_luns;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 2f9b96826ac0..d65bd178d131 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -406,8 +406,13 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,
         struct Scsi_Host  *shost = class_to_shost(dev);
         struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
         struct lpfc_hba   *phba = vport->phba;
+        char fwrev[FW_REV_STR_SIZE];
+
+        if (phba->sli_rev < LPFC_SLI_REV4)
+                return snprintf(buf, PAGE_SIZE, "%s\n", phba->OptionROMVersion);
 
-        return snprintf(buf, PAGE_SIZE, "%s\n", phba->OptionROMVersion);
+        lpfc_decode_firmware_rev(phba, fwrev, 1);
+        return snprintf(buf, PAGE_SIZE, "%s\n", fwrev);
 }
 
 /**
@@ -4568,12 +4573,18 @@ LPFC_ATTR_R(multi_ring_type, FC_TYPE_IP, 1,
 
 /*
 # lpfc_fdmi_on: controls FDMI support.
-#       0 = no FDMI support
-#       1 = support FDMI without attribute of hostname
-#       2 = support FDMI with attribute of hostname
-# Value range [0,2]. Default value is 0.
+#               Set                NOT Set
+#       bit 0 = FDMI support       no FDMI support
+#           LPFC_FDMI_SUPPORT just turns basic support on/off
+#       bit 1 = Register delay     no register delay  (60 seconds)
+#           LPFC_FDMI_REG_DELAY 60 sec registration delay after FDMI login
+#       bit 2 = All attributes     Use a attribute subset
+#           LPFC_FDMI_ALL_ATTRIB applies to both port and HBA attributes
+#           Port attrutes subset: 1 thru 6 OR all: 1 thru 0xd 0x101 0x102 0x103
+#           HBA attributes subset: 1 thru 0xb OR all: 1 thru 0xc
+# Value range [0,7]. Default value is 0.
 */
-LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 2, "Enable FDMI support");
+LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 7, "Enable FDMI support");
 
 /*
 # Specifies the maximum number of ELS cmds we can have outstanding (for
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index a7bf359aa0c6..b705068079c0 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2009-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -3194,6 +3194,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
                 cmd->unsli3.rcvsli3.ox_id = 0xffff;
         }
         cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;
+        cmdiocbq->iocb_flag |= LPFC_IO_LOOPBACK;
         cmdiocbq->vport = phba->pport;
         cmdiocbq->iocb_cmpl = NULL;
         iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq,
@@ -4179,6 +4180,7 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
                         switch (opcode) {
                         case COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES:
                         case COMN_OPCODE_GET_CNTL_ATTRIBUTES:
+                        case COMN_OPCODE_GET_PROFILE_CONFIG:
                                 lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
                                                 "3106 Handled SLI_CONFIG "
                                                 "subsys_comn, opcode:x%x\n",
diff --git a/drivers/scsi/lpfc/lpfc_bsg.h b/drivers/scsi/lpfc/lpfc_bsg.h
index 928ef609f363..e557bcdbcb19 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.h
+++ b/drivers/scsi/lpfc/lpfc_bsg.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2010-2014 Emulex.  All rights reserved.                *
+ * Copyright (C) 2010-2015 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -246,6 +246,7 @@ struct lpfc_sli_config_emb1_subsys {
 #define lpfc_emb1_subcmnd_subsys_WORD   word6
 /* Subsystem COMN (0x01) OpCodes */
 #define SLI_CONFIG_SUBSYS_COMN          0x01
+#define COMN_OPCODE_GET_PROFILE_CONFIG  0xA4
 #define COMN_OPCODE_READ_OBJECT         0xAB
 #define COMN_OPCODE_WRITE_OBJECT        0xAC
 #define COMN_OPCODE_READ_OBJECT_LIST    0xAD
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 00665a5d92fd..587e3e962f2b 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -284,6 +284,7 @@ void lpfc_sli_handle_slow_ring_event(struct lpfc_hba *,
                                     struct lpfc_sli_ring *, uint32_t);
 void lpfc_sli4_handle_received_buffer(struct lpfc_hba *, struct hbq_dmabuf *);
 void lpfc_sli_def_mbox_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);
+void lpfc_sli4_unreg_rpi_cmpl_clr(struct lpfc_hba *, LPFC_MBOXQ_t *);
 int lpfc_sli_issue_iocb(struct lpfc_hba *, uint32_t,
                         struct lpfc_iocbq *, uint32_t);
 void lpfc_sli_pcimem_bcopy(void *, void *, uint32_t);
@@ -354,6 +355,7 @@ void lpfc_free_sysfs_attr(struct lpfc_vport *);
 extern struct device_attribute *lpfc_hba_attrs[];
 extern struct device_attribute *lpfc_vport_attrs[];
 extern struct scsi_host_template lpfc_template;
+extern struct scsi_host_template lpfc_template_s3;
 extern struct scsi_host_template lpfc_vport_template;
 extern struct fc_function_template lpfc_transport_functions;
 extern struct fc_function_template lpfc_vport_transport_functions;
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 61a32cd23f79..af129966bd11 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -555,7 +555,7 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                         }
                                 }
                         }
-                        if (CTentry & (be32_to_cpu(SLI_CT_LAST_ENTRY)))
+                        if (CTentry & (cpu_to_be32(SLI_CT_LAST_ENTRY)))
                                 goto nsout1;
                         Cnt -= sizeof (uint32_t);
                 }
@@ -641,7 +641,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 /* Good status, continue checking */
                 CTrsp = (struct lpfc_sli_ct_request *) outp->virt;
                 if (CTrsp->CommandResponse.bits.CmdRsp ==
-                    be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
+                    cpu_to_be16(SLI_CT_RESPONSE_FS_ACC)) {
                         lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                          "0208 NameServer Rsp Data: x%x\n",
                                          vport->fc_flag);
@@ -1074,11 +1074,48 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol,
 
         lpfc_decode_firmware_rev(vport->phba, fwrev, 0);
 
-        n = snprintf(symbol, size, "Emulex %s FV%s DV%s",
-                vport->phba->ModelName, fwrev, lpfc_release_version);
+        n = snprintf(symbol, size, "Emulex %s", vport->phba->ModelName);
+
+        if (size < n)
+                return n;
+        n += snprintf(symbol + n, size - n, " FV%s", fwrev);
+
+        if (size < n)
+                return n;
+        n += snprintf(symbol + n, size - n, " DV%s", lpfc_release_version);
+
+        if (size < n)
+                return n;
+        n += snprintf(symbol + n, size - n, " HN:%s", init_utsname()->nodename);
+
+        /* Note :- OS name is "Linux" */
+        if (size < n)
+                return n;
+        n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname);
+
         return n;
 }
 
+static uint32_t
+lpfc_find_map_node(struct lpfc_vport *vport)
+{
+        struct lpfc_nodelist *ndlp, *next_ndlp;
+        struct Scsi_Host  *shost;
+        uint32_t cnt = 0;
+
+        shost = lpfc_shost_from_vport(vport);
+        spin_lock_irq(shost->host_lock);
+        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_type & NLP_FABRIC)
+                        continue;
+                if ((ndlp->nlp_state == NLP_STE_MAPPED_NODE) ||
+                    (ndlp->nlp_state == NLP_STE_UNMAPPED_NODE))
+                        cnt++;
+        }
+        spin_unlock_irq(shost->host_lock);
+        return cnt;
+}
+
 /*
  * lpfc_ns_cmd
  * Description:
@@ -1177,7 +1214,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         switch (cmdcode) {
         case SLI_CTNS_GID_FT:
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_GID_FT);
+                    cpu_to_be16(SLI_CTNS_GID_FT);
                 CtReq->un.gid.Fc4Type = SLI_CTPT_FCP;
                 if (vport->port_state < LPFC_NS_QRY)
                         vport->port_state = LPFC_NS_QRY;
@@ -1188,7 +1225,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
 
         case SLI_CTNS_GFF_ID:
                 CtReq->CommandResponse.bits.CmdRsp =
-                        be16_to_cpu(SLI_CTNS_GFF_ID);
+                        cpu_to_be16(SLI_CTNS_GFF_ID);
                 CtReq->un.gff.PortId = cpu_to_be32(context);
                 cmpl = lpfc_cmpl_ct_cmd_gff_id;
                 break;
@@ -1196,7 +1233,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         case SLI_CTNS_RFT_ID:
                 vport->ct_flags &= ~FC_CT_RFT_ID;
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_RFT_ID);
+                    cpu_to_be16(SLI_CTNS_RFT_ID);
                 CtReq->un.rft.PortId = cpu_to_be32(vport->fc_myDID);
                 CtReq->un.rft.fcpReg = 1;
                 cmpl = lpfc_cmpl_ct_cmd_rft_id;
@@ -1205,7 +1242,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         case SLI_CTNS_RNN_ID:
                 vport->ct_flags &= ~FC_CT_RNN_ID;
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_RNN_ID);
+                    cpu_to_be16(SLI_CTNS_RNN_ID);
                 CtReq->un.rnn.PortId = cpu_to_be32(vport->fc_myDID);
                 memcpy(CtReq->un.rnn.wwnn,  &vport->fc_nodename,
                        sizeof (struct lpfc_name));
@@ -1215,7 +1252,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         case SLI_CTNS_RSPN_ID:
                 vport->ct_flags &= ~FC_CT_RSPN_ID;
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_RSPN_ID);
+                    cpu_to_be16(SLI_CTNS_RSPN_ID);
                 CtReq->un.rspn.PortId = cpu_to_be32(vport->fc_myDID);
                 size = sizeof(CtReq->un.rspn.symbname);
                 CtReq->un.rspn.len =
@@ -1226,7 +1263,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         case SLI_CTNS_RSNN_NN:
                 vport->ct_flags &= ~FC_CT_RSNN_NN;
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_RSNN_NN);
+                    cpu_to_be16(SLI_CTNS_RSNN_NN);
                 memcpy(CtReq->un.rsnn.wwnn, &vport->fc_nodename,
                        sizeof (struct lpfc_name));
                 size = sizeof(CtReq->un.rsnn.symbname);
@@ -1238,14 +1275,14 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         case SLI_CTNS_DA_ID:
                 /* Implement DA_ID Nameserver request */
                 CtReq->CommandResponse.bits.CmdRsp =
-                        be16_to_cpu(SLI_CTNS_DA_ID);
+                        cpu_to_be16(SLI_CTNS_DA_ID);
                 CtReq->un.da_id.port_id = cpu_to_be32(vport->fc_myDID);
                 cmpl = lpfc_cmpl_ct_cmd_da_id;
                 break;
         case SLI_CTNS_RFF_ID:
                 vport->ct_flags &= ~FC_CT_RFF_ID;
                 CtReq->CommandResponse.bits.CmdRsp =
-                    be16_to_cpu(SLI_CTNS_RFF_ID);
+                    cpu_to_be16(SLI_CTNS_RFF_ID);
                 CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
                 CtReq->un.rff.fbits = FC4_FEATURE_INIT;
                 CtReq->un.rff.type_code = FC_TYPE_FCP;
@@ -1299,7 +1336,6 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         uint32_t latt;
 
         latt = lpfc_els_chk_latt(vport);
-
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
                 "FDMI cmpl:       status:x%x/x%x latt:%d",
                 irsp->ulpStatus, irsp->un.ulpWord[4], latt);
@@ -1310,29 +1346,49 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                  "ulpStatus: x%x, rid x%x\n",
                                  be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus,
                                  irsp->un.ulpWord[4]);
-                lpfc_ct_free_iocb(phba, cmdiocb);
-                return;
+                goto fail_out;
         }
 
         ndlp = lpfc_findnode_did(vport, FDMI_DID);
         if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
                 goto fail_out;
 
-        if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
+        if (fdmi_rsp == cpu_to_be16(SLI_CT_RESPONSE_FS_RJT)) {
                 /* FDMI rsp failed */
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                  "0220 FDMI rsp failed Data: x%x\n",
                                  be16_to_cpu(fdmi_cmd));
         }
 
+fail_out:
+        lpfc_ct_free_iocb(phba, cmdiocb);
+}
+
+static void
+lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                       struct lpfc_iocbq *rspiocb)
+{
+        struct lpfc_vport *vport = cmdiocb->vport;
+        struct lpfc_dmabuf *inp = cmdiocb->context1;
+        struct lpfc_sli_ct_request *CTcmd = inp->virt;
+        uint16_t fdmi_cmd = CTcmd->CommandResponse.bits.CmdRsp;
+        struct lpfc_nodelist *ndlp;
+
+        lpfc_cmpl_ct_cmd_fdmi(phba, cmdiocb, rspiocb);
+
+        ndlp = lpfc_findnode_did(vport, FDMI_DID);
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+                return;
+
+        /*
+         * Need to cycle thru FDMI registration for discovery
+         * DHBA -> DPRT -> RHBA -> RPA
+         */
         switch (be16_to_cpu(fdmi_cmd)) {
         case SLI_MGMT_RHBA:
                 lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_RPA);
                 break;
 
-        case SLI_MGMT_RPA:
-                break;
-
         case SLI_MGMT_DHBA:
                 lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DPRT);
                 break;
@@ -1341,12 +1397,9 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_RHBA);
                 break;
         }
-
-fail_out:
-        lpfc_ct_free_iocb(phba, cmdiocb);
-        return;
 }
 
+
 int
 lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
 {
@@ -1355,18 +1408,28 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
         struct lpfc_sli_ct_request *CtReq;
         struct ulp_bde64 *bpl;
         uint32_t size;
-        REG_HBA *rh;
-        PORT_ENTRY *pe;
-        REG_PORT_ATTRIBUTE *pab;
-        ATTRIBUTE_BLOCK *ab;
-        ATTRIBUTE_ENTRY *ae;
+        uint32_t rsp_size;
+        struct lpfc_fdmi_reg_hba *rh;
+        struct lpfc_fdmi_port_entry *pe;
+        struct lpfc_fdmi_reg_portattr *pab = NULL;
+        struct lpfc_fdmi_attr_block *ab = NULL;
+        struct lpfc_fdmi_attr_entry *ae;
+        struct lpfc_fdmi_attr_def *ad;
         void (*cmpl) (struct lpfc_hba *, struct lpfc_iocbq *,
                       struct lpfc_iocbq *);
 
+        if (ndlp == NULL) {
+                ndlp = lpfc_findnode_did(vport, FDMI_DID);
+                if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+                        return 0;
+                cmpl = lpfc_cmpl_ct_cmd_fdmi; /* cmd interface */
+        } else {
+                cmpl = lpfc_cmpl_ct_disc_fdmi; /* called from discovery */
+        }
 
         /* fill in BDEs for command */
         /* Allocate buffer for command payload */
-        mp = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
+        mp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
         if (!mp)
                 goto fdmi_cmd_exit;
 
@@ -1375,7 +1438,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                 goto fdmi_cmd_free_mp;
 
         /* Allocate buffer for Buffer ptr list */
-        bmp = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
+        bmp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
         if (!bmp)
                 goto fdmi_cmd_free_mpvirt;
 
@@ -1390,205 +1453,330 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
         lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                          "0218 FDMI Request Data: x%x x%x x%x\n",
                          vport->fc_flag, vport->port_state, cmdcode);
-        CtReq = (struct lpfc_sli_ct_request *) mp->virt;
+        CtReq = (struct lpfc_sli_ct_request *)mp->virt;
 
+        /* First populate the CT_IU preamble */
         memset(CtReq, 0, sizeof(struct lpfc_sli_ct_request));
         CtReq->RevisionId.bits.Revision = SLI_CT_REVISION;
         CtReq->RevisionId.bits.InId = 0;
 
         CtReq->FsType = SLI_CT_MANAGEMENT_SERVICE;
         CtReq->FsSubType = SLI_CT_FDMI_Subtypes;
+
+        CtReq->CommandResponse.bits.CmdRsp = cpu_to_be16(cmdcode);
+        rsp_size = LPFC_BPL_SIZE;
         size = 0;
 
+        /* Next fill in the specific FDMI cmd information */
         switch (cmdcode) {
+        case SLI_MGMT_RHAT:
         case SLI_MGMT_RHBA:
                 {
                         lpfc_vpd_t *vp = &phba->vpd;
                         uint32_t i, j, incr;
-                        int len;
+                        int len = 0;
 
-                        CtReq->CommandResponse.bits.CmdRsp =
-                            be16_to_cpu(SLI_MGMT_RHBA);
-                        CtReq->CommandResponse.bits.Size = 0;
-                        rh = (REG_HBA *) & CtReq->un.PortID;
+                        rh = (struct lpfc_fdmi_reg_hba *)&CtReq->un.PortID;
+                        /* HBA Identifier */
                         memcpy(&rh->hi.PortName, &vport->fc_sparam.portName,
-                               sizeof (struct lpfc_name));
-                        /* One entry (port) per adapter */
-                        rh->rpl.EntryCnt = be32_to_cpu(1);
-                        memcpy(&rh->rpl.pe, &vport->fc_sparam.portName,
-                               sizeof (struct lpfc_name));
-
-                        /* point to the HBA attribute block */
-                        size = 2 * sizeof (struct lpfc_name) + FOURBYTES;
-                        ab = (ATTRIBUTE_BLOCK *) ((uint8_t *) rh + size);
+                               sizeof(struct lpfc_name));
+
+                        if (cmdcode == SLI_MGMT_RHBA) {
+                                /* Registered Port List */
+                                /* One entry (port) per adapter */
+                                rh->rpl.EntryCnt = cpu_to_be32(1);
+                                memcpy(&rh->rpl.pe, &vport->fc_sparam.portName,
+                                       sizeof(struct lpfc_name));
+
+                                /* point to the HBA attribute block */
+                                size = 2 * sizeof(struct lpfc_name) +
+                                        FOURBYTES;
+                        } else {
+                                size = sizeof(struct lpfc_name);
+                        }
+                        ab = (struct lpfc_fdmi_attr_block *)
+                                ((uint8_t *)rh + size);
                         ab->EntryCnt = 0;
+                        size += FOURBYTES;
 
-                        /* Point to the beginning of the first HBA attribute
-                           entry */
+                        /*
+                         * Point to beginning of first HBA attribute entry
+                         */
                         /* #1 HBA attribute entry */
-                        size += FOURBYTES;
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(NODE_NAME);
-                        ae->ad.bits.AttrLen =  be16_to_cpu(FOURBYTES
-                                                + sizeof (struct lpfc_name));
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(struct lpfc_name));
+                        ad->AttrType = cpu_to_be16(RHBA_NODENAME);
+                        ad->AttrLen =  cpu_to_be16(FOURBYTES
+                                                + sizeof(struct lpfc_name));
                         memcpy(&ae->un.NodeName, &vport->fc_sparam.nodeName,
-                               sizeof (struct lpfc_name));
+                               sizeof(struct lpfc_name));
                         ab->EntryCnt++;
-                        size += FOURBYTES + sizeof (struct lpfc_name);
+                        size += FOURBYTES + sizeof(struct lpfc_name);
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #2 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(MANUFACTURER);
-                        strncpy(ae->un.Manufacturer, "Emulex Corporation", 64);
-                        len = strlen(ae->un.Manufacturer);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.Manufacturer));
+                        ad->AttrType = cpu_to_be16(RHBA_MANUFACTURER);
+                        strncpy(ae->un.Manufacturer, "Emulex Corporation",
+                                sizeof(ae->un.Manufacturer));
+                        len = strnlen(ae->un.Manufacturer,
+                                          sizeof(ae->un.Manufacturer));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #3 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(SERIAL_NUMBER);
-                        strncpy(ae->un.SerialNumber, phba->SerialNumber, 64);
-                        len = strlen(ae->un.SerialNumber);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.SerialNumber));
+                        ad->AttrType = cpu_to_be16(RHBA_SERIAL_NUMBER);
+                        strncpy(ae->un.SerialNumber, phba->SerialNumber,
+                                sizeof(ae->un.SerialNumber));
+                        len = strnlen(ae->un.SerialNumber,
+                                          sizeof(ae->un.SerialNumber));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #4 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(MODEL);
-                        strncpy(ae->un.Model, phba->ModelName, 256);
-                        len = strlen(ae->un.Model);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.Model));
+                        ad->AttrType = cpu_to_be16(RHBA_MODEL);
+                        strncpy(ae->un.Model, phba->ModelName,
+                                sizeof(ae->un.Model));
+                        len = strnlen(ae->un.Model, sizeof(ae->un.Model));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #5 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(MODEL_DESCRIPTION);
-                        strncpy(ae->un.ModelDescription, phba->ModelDesc, 256);
-                        len = strlen(ae->un.ModelDescription);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.ModelDescription));
+                        ad->AttrType = cpu_to_be16(RHBA_MODEL_DESCRIPTION);
+                        strncpy(ae->un.ModelDescription, phba->ModelDesc,
+                                sizeof(ae->un.ModelDescription));
+                        len = strnlen(ae->un.ModelDescription,
+                                          sizeof(ae->un.ModelDescription));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + 8) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #6 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(HARDWARE_VERSION);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 8);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, 8);
+                        ad->AttrType = cpu_to_be16(RHBA_HARDWARE_VERSION);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 8);
                         /* Convert JEDEC ID to ascii for hardware version */
                         incr = vp->rev.biuRev;
                         for (i = 0; i < 8; i++) {
                                 j = (incr & 0xf);
                                 if (j <= 9)
                                         ae->un.HardwareVersion[7 - i] =
-                                            (char)((uint8_t) 0x30 +
-                                                   (uint8_t) j);
+                                            (char)((uint8_t)0x30 +
+                                                   (uint8_t)j);
                                 else
                                         ae->un.HardwareVersion[7 - i] =
-                                            (char)((uint8_t) 0x61 +
-                                                   (uint8_t) (j - 10));
+                                            (char)((uint8_t)0x61 +
+                                                   (uint8_t)(j - 10));
                                 incr = (incr >> 4);
                         }
                         ab->EntryCnt++;
                         size += FOURBYTES + 8;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #7 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(DRIVER_VERSION);
-                        strncpy(ae->un.DriverVersion,
-                                lpfc_release_version, 256);
-                        len = strlen(ae->un.DriverVersion);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.DriverVersion));
+                        ad->AttrType = cpu_to_be16(RHBA_DRIVER_VERSION);
+                        strncpy(ae->un.DriverVersion, lpfc_release_version,
+                                sizeof(ae->un.DriverVersion));
+                        len = strnlen(ae->un.DriverVersion,
+                                        sizeof(ae->un.DriverVersion));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #8 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(OPTION_ROM_VERSION);
-                        strncpy(ae->un.OptionROMVersion,
-                                phba->OptionROMVersion, 256);
-                        len = strlen(ae->un.OptionROMVersion);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.OptionROMVersion));
+                        ad->AttrType = cpu_to_be16(RHBA_OPTION_ROM_VERSION);
+                        strncpy(ae->un.OptionROMVersion, phba->OptionROMVersion,
+                                sizeof(ae->un.OptionROMVersion));
+                        len = strnlen(ae->un.OptionROMVersion,
+                                      sizeof(ae->un.OptionROMVersion));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #9 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(FIRMWARE_VERSION);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.FirmwareVersion));
+                        ad->AttrType = cpu_to_be16(RHBA_FIRMWARE_VERSION);
                         lpfc_decode_firmware_rev(phba, ae->un.FirmwareVersion,
                                 1);
-                        len = strlen(ae->un.FirmwareVersion);
+                        len = strnlen(ae->un.FirmwareVersion,
+                                        sizeof(ae->un.FirmwareVersion));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #10 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(OS_NAME_VERSION);
-                        sprintf(ae->un.OsNameVersion, "%s %s %s",
-                                init_utsname()->sysname,
-                                init_utsname()->release,
-                                init_utsname()->version);
-                        len = strlen(ae->un.OsNameVersion);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.OsNameVersion));
+                        ad->AttrType = cpu_to_be16(RHBA_OS_NAME_VERSION);
+                        snprintf(ae->un.OsNameVersion,
+                                 sizeof(ae->un.OsNameVersion),
+                                 "%s %s %s",
+                                 init_utsname()->sysname,
+                                 init_utsname()->release,
+                                 init_utsname()->version);
+                        len = strnlen(ae->un.OsNameVersion,
+                                      sizeof(ae->un.OsNameVersion));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         ab->EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
                         /* #11 HBA attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) rh + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(MAX_CT_PAYLOAD_LEN);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
-                        ae->un.MaxCTPayloadLen = (65 * 4096);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType =
+                                cpu_to_be16(RHBA_MAX_CT_PAYLOAD_LEN);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        ae->un.MaxCTPayloadLen = cpu_to_be32(LPFC_MAX_CT_SIZE);
                         ab->EntryCnt++;
                         size += FOURBYTES + 4;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto hba_out;
 
-                        ab->EntryCnt = be32_to_cpu(ab->EntryCnt);
+                        /*
+                         * Currently switches don't seem to support the
+                         * following extended HBA attributes.
+                         */
+                        if (!(vport->cfg_fdmi_on & LPFC_FDMI_ALL_ATTRIB))
+                                goto hba_out;
+
+                        /* #12 HBA attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)rh + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.NodeSymName));
+                        ad->AttrType = cpu_to_be16(RHBA_SYM_NODENAME);
+                        len = lpfc_vport_symbolic_node_name(vport,
+                                ae->un.NodeSymName, sizeof(ae->un.NodeSymName));
+                        len += (len & 3) ? (4 - (len & 3)) : 4;
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
+                        ab->EntryCnt++;
+                        size += FOURBYTES + len;
+hba_out:
+                        ab->EntryCnt = cpu_to_be32(ab->EntryCnt);
                         /* Total size */
                         size = GID_REQUEST_SZ - 4 + size;
                 }
                 break;
 
+        case SLI_MGMT_RPRT:
         case SLI_MGMT_RPA:
                 {
                         lpfc_vpd_t *vp;
                         struct serv_parm *hsp;
-                        int len;
+                        int len = 0;
 
                         vp = &phba->vpd;
 
-                        CtReq->CommandResponse.bits.CmdRsp =
-                            be16_to_cpu(SLI_MGMT_RPA);
-                        CtReq->CommandResponse.bits.Size = 0;
-                        pab = (REG_PORT_ATTRIBUTE *) & CtReq->un.PortID;
-                        size = sizeof (struct lpfc_name) + FOURBYTES;
-                        memcpy((uint8_t *) & pab->PortName,
-                               (uint8_t *) & vport->fc_sparam.portName,
-                               sizeof (struct lpfc_name));
+                        if (cmdcode == SLI_MGMT_RPRT) {
+                                rh = (struct lpfc_fdmi_reg_hba *)
+                                        &CtReq->un.PortID;
+                                /* HBA Identifier */
+                                memcpy(&rh->hi.PortName,
+                                       &vport->fc_sparam.portName,
+                                       sizeof(struct lpfc_name));
+                                pab = (struct lpfc_fdmi_reg_portattr *)
+                                        &rh->rpl.EntryCnt;
+                        } else
+                                pab = (struct lpfc_fdmi_reg_portattr *)
+                                        &CtReq->un.PortID;
+                        size = sizeof(struct lpfc_name) + FOURBYTES;
+                        memcpy((uint8_t *)&pab->PortName,
+                               (uint8_t *)&vport->fc_sparam.portName,
+                               sizeof(struct lpfc_name));
                         pab->ab.EntryCnt = 0;
 
                         /* #1 Port attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(SUPPORTED_FC4_TYPES);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 32);
-                        ae->un.SupportFC4Types[2] = 1;
-                        ae->un.SupportFC4Types[7] = 1;
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.FC4Types));
+                        ad->AttrType =
+                                cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 32);
+                        ae->un.FC4Types[0] = 0x40; /* Type 1 - ELS */
+                        ae->un.FC4Types[1] = 0x80; /* Type 8 - FCP */
+                        ae->un.FC4Types[4] = 0x80; /* Type 32 - CT */
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + 32;
 
                         /* #2 Port attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(SUPPORTED_SPEED);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
-
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_SPEED);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
                         ae->un.SupportSpeed = 0;
                         if (phba->lmt & LMT_16Gb)
                                 ae->un.SupportSpeed |= HBA_PORTSPEED_16GBIT;
@@ -1602,15 +1790,19 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                                 ae->un.SupportSpeed |= HBA_PORTSPEED_2GBIT;
                         if (phba->lmt & LMT_1Gb)
                                 ae->un.SupportSpeed |= HBA_PORTSPEED_1GBIT;
+                        ae->un.SupportSpeed =
+                                cpu_to_be32(ae->un.SupportSpeed);
 
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + 4;
 
                         /* #3 Port attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(PORT_SPEED);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
-                        switch(phba->fc_linkspeed) {
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_PORT_SPEED);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        switch (phba->fc_linkspeed) {
                         case LPFC_LINK_SPEED_1GHZ:
                                 ae->un.PortSpeed = HBA_PORTSPEED_1GBIT;
                                 break;
@@ -1633,93 +1825,273 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                                 ae->un.PortSpeed = HBA_PORTSPEED_UNKNOWN;
                                 break;
                         }
+                        ae->un.PortSpeed = cpu_to_be32(ae->un.PortSpeed);
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + 4;
 
                         /* #4 Port attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(MAX_FRAME_SIZE);
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + 4);
-                        hsp = (struct serv_parm *) & vport->fc_sparam;
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_MAX_FRAME_SIZE);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        hsp = (struct serv_parm *)&vport->fc_sparam;
                         ae->un.MaxFrameSize =
-                            (((uint32_t) hsp->cmn.
-                              bbRcvSizeMsb) << 8) | (uint32_t) hsp->cmn.
+                            (((uint32_t)hsp->cmn.
+                              bbRcvSizeMsb) << 8) | (uint32_t)hsp->cmn.
                             bbRcvSizeLsb;
+                        ae->un.MaxFrameSize =
+                                cpu_to_be32(ae->un.MaxFrameSize);
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + 4;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
 
                         /* #5 Port attribute entry */
-                        ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab + size);
-                        ae->ad.bits.AttrType = be16_to_cpu(OS_DEVICE_NAME);
-                        strcpy((char *)ae->un.OsDeviceName, LPFC_DRIVER_NAME);
-                        len = strlen((char *)ae->un.OsDeviceName);
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.OsDeviceName));
+                        ad->AttrType = cpu_to_be16(RPRT_OS_DEVICE_NAME);
+                        strncpy((char *)ae->un.OsDeviceName, LPFC_DRIVER_NAME,
+                                sizeof(ae->un.OsDeviceName));
+                        len = strnlen((char *)ae->un.OsDeviceName,
+                                          sizeof(ae->un.OsDeviceName));
                         len += (len & 3) ? (4 - (len & 3)) : 4;
-                        ae->ad.bits.AttrLen = be16_to_cpu(FOURBYTES + len);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + len;
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #6 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.HostName));
+                        snprintf(ae->un.HostName, sizeof(ae->un.HostName), "%s",
+                                 init_utsname()->nodename);
+                        ad->AttrType = cpu_to_be16(RPRT_HOST_NAME);
+                        len = strnlen(ae->un.HostName,
+                                        sizeof(ae->un.HostName));
+                        len += (len & 3) ? (4 - (len & 3)) : 4;
+                        ad->AttrLen =
+                                cpu_to_be16(FOURBYTES + len);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + len;
+                        if ((size + sizeof(struct lpfc_name)) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
 
-                        if (vport->cfg_fdmi_on == 2) {
-                                /* #6 Port attribute entry */
-                                ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab +
-                                                          size);
-                                ae->ad.bits.AttrType = be16_to_cpu(HOST_NAME);
-                                sprintf(ae->un.HostName, "%s",
-                                        init_utsname()->nodename);
-                                len = strlen(ae->un.HostName);
-                                len += (len & 3) ? (4 - (len & 3)) : 4;
-                                ae->ad.bits.AttrLen =
-                                    be16_to_cpu(FOURBYTES + len);
-                                pab->ab.EntryCnt++;
-                                size += FOURBYTES + len;
-                        }
-
-                        pab->ab.EntryCnt = be32_to_cpu(pab->ab.EntryCnt);
+                        /*
+                         * Currently switches don't seem to support the
+                         * following extended Port attributes.
+                         */
+                        if (!(vport->cfg_fdmi_on & LPFC_FDMI_ALL_ATTRIB))
+                                goto port_out;
+
+                        /* #7 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0,  sizeof(struct lpfc_name));
+                        ad->AttrType = cpu_to_be16(RPRT_NODENAME);
+                        ad->AttrLen =  cpu_to_be16(FOURBYTES
+                                                + sizeof(struct lpfc_name));
+                        memcpy(&ae->un.NodeName, &vport->fc_sparam.nodeName,
+                               sizeof(struct lpfc_name));
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + sizeof(struct lpfc_name);
+                        if ((size + sizeof(struct lpfc_name)) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #8 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0,  sizeof(struct lpfc_name));
+                        ad->AttrType = cpu_to_be16(RPRT_PORTNAME);
+                        ad->AttrLen =  cpu_to_be16(FOURBYTES
+                                                + sizeof(struct lpfc_name));
+                        memcpy(&ae->un.PortName, &vport->fc_sparam.portName,
+                               sizeof(struct lpfc_name));
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + sizeof(struct lpfc_name);
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #9 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.NodeSymName));
+                        ad->AttrType = cpu_to_be16(RPRT_SYM_PORTNAME);
+                        len = lpfc_vport_symbolic_port_name(vport,
+                                ae->un.NodeSymName, sizeof(ae->un.NodeSymName));
+                        len += (len & 3) ? (4 - (len & 3)) : 4;
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + len);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + len;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #10 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_PORT_TYPE);
+                        ae->un.PortState = 0;
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 4;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #11 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_CLASS);
+                        ae->un.SupportClass =
+                                cpu_to_be32(FC_COS_CLASS2 | FC_COS_CLASS3);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 4;
+                        if ((size + sizeof(struct lpfc_name)) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #12 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(struct lpfc_name));
+                        ad->AttrType = cpu_to_be16(RPRT_FABRICNAME);
+                        ad->AttrLen =  cpu_to_be16(FOURBYTES
+                                                + sizeof(struct lpfc_name));
+                        memcpy(&ae->un.FabricName, &vport->fabric_nodename,
+                               sizeof(struct lpfc_name));
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + sizeof(struct lpfc_name);
+                        if ((size + LPFC_FDMI_MAX_AE_SIZE) >
+                                        (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #13 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        memset(ae, 0, sizeof(ae->un.FC4Types));
+                        ad->AttrType =
+                                cpu_to_be16(RPRT_ACTIVE_FC4_TYPES);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 32);
+                        ae->un.FC4Types[0] = 0x40; /* Type 1 - ELS */
+                        ae->un.FC4Types[1] = 0x80; /* Type 8 - FCP */
+                        ae->un.FC4Types[4] = 0x80; /* Type 32 - CT */
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 32;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #257 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_PORT_STATE);
+                        ae->un.PortState = 0;
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 4;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #258 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_DISC_PORT);
+                        ae->un.PortState = lpfc_find_map_node(vport);
+                        ae->un.PortState = cpu_to_be32(ae->un.PortState);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 4;
+                        if ((size + 4) > (LPFC_BPL_SIZE - LPFC_CT_PREAMBLE))
+                                goto port_out;
+
+                        /* #259 Port attribute entry */
+                        ad = (struct lpfc_fdmi_attr_def *)
+                                ((uint8_t *)pab + size);
+                        ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
+                        ad->AttrType = cpu_to_be16(RPRT_PORT_ID);
+                        ae->un.PortId =  cpu_to_be32(vport->fc_myDID);
+                        ad->AttrLen = cpu_to_be16(FOURBYTES + 4);
+                        pab->ab.EntryCnt++;
+                        size += FOURBYTES + 4;
+port_out:
+                        pab->ab.EntryCnt = cpu_to_be32(pab->ab.EntryCnt);
                         /* Total size */
                         size = GID_REQUEST_SZ - 4 + size;
                 }
                 break;
 
+        case SLI_MGMT_GHAT:
+        case SLI_MGMT_GRPL:
+                rsp_size = FC_MAX_NS_RSP;
         case SLI_MGMT_DHBA:
-                CtReq->CommandResponse.bits.CmdRsp = be16_to_cpu(SLI_MGMT_DHBA);
-                CtReq->CommandResponse.bits.Size = 0;
-                pe = (PORT_ENTRY *) & CtReq->un.PortID;
-                memcpy((uint8_t *) & pe->PortName,
-                       (uint8_t *) & vport->fc_sparam.portName,
-                       sizeof (struct lpfc_name));
-                size = GID_REQUEST_SZ - 4 + sizeof (struct lpfc_name);
+        case SLI_MGMT_DHAT:
+                pe = (struct lpfc_fdmi_port_entry *)&CtReq->un.PortID;
+                memcpy((uint8_t *)&pe->PortName,
+                       (uint8_t *)&vport->fc_sparam.portName,
+                       sizeof(struct lpfc_name));
+                size = GID_REQUEST_SZ - 4 + sizeof(struct lpfc_name);
                 break;
 
+        case SLI_MGMT_GPAT:
+        case SLI_MGMT_GPAS:
+                rsp_size = FC_MAX_NS_RSP;
         case SLI_MGMT_DPRT:
-                CtReq->CommandResponse.bits.CmdRsp = be16_to_cpu(SLI_MGMT_DPRT);
-                CtReq->CommandResponse.bits.Size = 0;
-                pe = (PORT_ENTRY *) & CtReq->un.PortID;
-                memcpy((uint8_t *) & pe->PortName,
-                       (uint8_t *) & vport->fc_sparam.portName,
-                       sizeof (struct lpfc_name));
-                size = GID_REQUEST_SZ - 4 + sizeof (struct lpfc_name);
+        case SLI_MGMT_DPA:
+                pe = (struct lpfc_fdmi_port_entry *)&CtReq->un.PortID;
+                memcpy((uint8_t *)&pe->PortName,
+                       (uint8_t *)&vport->fc_sparam.portName,
+                       sizeof(struct lpfc_name));
+                size = GID_REQUEST_SZ - 4 + sizeof(struct lpfc_name);
+                break;
+        case SLI_MGMT_GRHL:
+                size = GID_REQUEST_SZ - 4;
                 break;
+        default:
+                lpfc_printf_vlog(vport, KERN_WARNING, LOG_DISCOVERY,
+                                 "0298 FDMI cmdcode x%x not supported\n",
+                                 cmdcode);
+                goto fdmi_cmd_free_bmpvirt;
         }
+        CtReq->CommandResponse.bits.Size = cpu_to_be16(rsp_size);
 
-        bpl = (struct ulp_bde64 *) bmp->virt;
-        bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys) );
-        bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys) );
+        bpl = (struct ulp_bde64 *)bmp->virt;
+        bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys));
+        bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys));
         bpl->tus.f.bdeFlags = 0;
         bpl->tus.f.bdeSize = size;
-        bpl->tus.w = le32_to_cpu(bpl->tus.w);
-
-        cmpl = lpfc_cmpl_ct_cmd_fdmi;
 
-        /* The lpfc_ct_cmd/lpfc_get_req shall increment ndlp reference count
+        /*
+         * The lpfc_ct_cmd/lpfc_get_req shall increment ndlp reference count
          * to hold ndlp reference for the corresponding callback function.
          */
-        if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, FC_MAX_NS_RSP, 0))
+        if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, rsp_size, 0))
                 return 0;
 
-        /* Decrement ndlp reference count to release ndlp reference held
+        /*
+         * Decrement ndlp reference count to release ndlp reference held
          * for the failed command's callback function.
          */
         lpfc_nlp_put(ndlp);
 
+fdmi_cmd_free_bmpvirt:
         lpfc_mbuf_free(phba, bmp->virt, bmp->phys);
 fdmi_cmd_free_bmp:
         kfree(bmp);
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 5633e7dadc08..513edcb0c2da 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2007-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2007-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index c66088d0fd2a..851e8efe364e 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -2243,8 +2243,7 @@ lpfc_adisc_done(struct lpfc_vport *vport)
         */
         if (vport->port_state < LPFC_VPORT_READY) {
                 /* If we get here, there is nothing to ADISC */
-                if (vport->port_type == LPFC_PHYSICAL_PORT)
-                        lpfc_issue_clear_la(phba, vport);
+                lpfc_issue_clear_la(phba, vport);
                 if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
                         vport->num_disc_nodes = 0;
                         /* go thru NPR list, issue ELS PLOGIs */
@@ -3338,7 +3337,11 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 /* FLOGI retry policy */
                 retry = 1;
                 /* retry FLOGI forever */
-                maxretry = 0;
+                if (phba->link_flag != LS_LOOPBACK_MODE)
+                        maxretry = 0;
+                else
+                        maxretry = 2;
+
                 if (cmdiocb->retry >= 100)
                         delay = 5000;
                 else if (cmdiocb->retry >= 32)
@@ -3701,6 +3704,11 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         kfree(mp);
         mempool_free(pmb, phba->mbox_mem_pool);
         if (ndlp) {
+                lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,
+                                 "0006 rpi%x DID:%x flg:%x %d map:%x %p\n",
+                                 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,
+                                 atomic_read(&ndlp->kref.refcount),
+                                 ndlp->nlp_usg_map, ndlp);
                 if (NLP_CHK_NODE_ACT(ndlp)) {
                         lpfc_nlp_put(ndlp);
                         /* This is the end of the default RPI cleanup logic for
@@ -5198,7 +5206,6 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 port_state = vport->port_state;
                 vport->fc_flag |= FC_PT2PT;
                 vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
-                vport->port_state = LPFC_FLOGI;
                 spin_unlock_irq(shost->host_lock);
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
                                  "3311 Rcv Flogi PS x%x new PS x%x "
@@ -7173,7 +7180,7 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
                 return;
         }
 
-        if (vport->cfg_fdmi_on) {
+        if (vport->cfg_fdmi_on & LPFC_FDMI_SUPPORT) {
                 /* If this is the first time, allocate an ndlp and initialize
                  * it. Otherwise, make sure the node is enabled and then do the
                  * login.
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 5452f1f4220e..2500f15d437f 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -3439,6 +3439,11 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         pmb->context1 = NULL;
         pmb->context2 = NULL;
 
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                         "0002 rpi:%x DID:%x flg:%x %d map:%x %p\n",
+                         ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,
+                         atomic_read(&ndlp->kref.refcount),
+                         ndlp->nlp_usg_map, ndlp);
         if (ndlp->nlp_flag & NLP_REG_LOGIN_SEND)
                 ndlp->nlp_flag &= ~NLP_REG_LOGIN_SEND;
 
@@ -3855,6 +3860,11 @@ out:
         ndlp->nlp_flag |= NLP_RPI_REGISTERED;
         ndlp->nlp_type |= NLP_FABRIC;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                         "0003 rpi:%x DID:%x flg:%x %d map%x %p\n",
+                         ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,
+                         atomic_read(&ndlp->kref.refcount),
+                         ndlp->nlp_usg_map, ndlp);
 
         if (vport->port_state < LPFC_VPORT_READY) {
                 /* Link up discovery requires Fabric registration. */
@@ -4250,8 +4260,15 @@ lpfc_enable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 ndlp->active_rrqs_xri_bitmap = active_rrqs_xri_bitmap;
 
         spin_unlock_irqrestore(&phba->ndlp_lock, flags);
-        if (vport->phba->sli_rev == LPFC_SLI_REV4)
+        if (vport->phba->sli_rev == LPFC_SLI_REV4) {
                 ndlp->nlp_rpi = lpfc_sli4_alloc_rpi(vport->phba);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                 "0008 rpi:%x DID:%x flg:%x refcnt:%d "
+                                 "map:%x %p\n", ndlp->nlp_rpi, ndlp->nlp_DID,
+                                 ndlp->nlp_flag,
+                                 atomic_read(&ndlp->kref.refcount),
+                                 ndlp->nlp_usg_map, ndlp);
+        }
 
 
         if (state != NLP_STE_UNUSED_NODE)
@@ -4276,9 +4293,12 @@ lpfc_drop_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                 return;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNUSED_NODE);
-        if (vport->phba->sli_rev == LPFC_SLI_REV4)
+        if (vport->phba->sli_rev == LPFC_SLI_REV4) {
                 lpfc_cleanup_vports_rrqs(vport, ndlp);
-        lpfc_nlp_put(ndlp);
+                lpfc_unreg_rpi(vport, ndlp);
+        } else {
+                lpfc_nlp_put(ndlp);
+        }
         return;
 }
 
@@ -4515,7 +4535,17 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                                 mbox->context1 = ndlp;
                                 mbox->mbox_cmpl = lpfc_nlp_logo_unreg;
                         } else {
-                                mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                                if (phba->sli_rev == LPFC_SLI_REV4 &&
+                                    (!(vport->load_flag & FC_UNLOADING)) &&
+                                    (bf_get(lpfc_sli_intf_if_type,
+                                     &phba->sli4_hba.sli_intf) ==
+                                      LPFC_SLI_INTF_IF_TYPE_2)) {
+                                        mbox->context1 = lpfc_nlp_get(ndlp);
+                                        mbox->mbox_cmpl =
+                                                lpfc_sli4_unreg_rpi_cmpl_clr;
+                                } else
+                                        mbox->mbox_cmpl =
+                                                lpfc_sli_def_mbox_cmpl;
                         }
 
                         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);
@@ -4741,6 +4771,11 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                 /* For this case we need to cleanup the default rpi
                  * allocated by the firmware.
                  */
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                 "0005 rpi:%x DID:%x flg:%x %d map:%x %p\n",
+                                 ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,
+                                 atomic_read(&ndlp->kref.refcount),
+                                 ndlp->nlp_usg_map, ndlp);
                 if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))
                         != NULL) {
                         rc = lpfc_reg_rpi(phba, vport->vpi, ndlp->nlp_DID,
@@ -5070,8 +5105,7 @@ lpfc_disc_start(struct lpfc_vport *vport)
             !(vport->fc_flag & FC_PT2PT) &&
             !(vport->fc_flag & FC_RSCN_MODE) &&
             (phba->sli_rev < LPFC_SLI_REV4)) {
-                if (vport->port_type == LPFC_PHYSICAL_PORT)
-                        lpfc_issue_clear_la(phba, vport);
+                lpfc_issue_clear_la(phba, vport);
                 lpfc_issue_reg_vpi(phba, vport);
                 return;
         }
@@ -5082,8 +5116,7 @@ lpfc_disc_start(struct lpfc_vport *vport)
          */
         if (vport->port_state < LPFC_VPORT_READY && !clear_la_pending) {
                 /* If we get here, there is nothing to ADISC */
-                if (vport->port_type == LPFC_PHYSICAL_PORT)
-                        lpfc_issue_clear_la(phba, vport);
+                lpfc_issue_clear_la(phba, vport);
 
                 if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
                         vport->num_disc_nodes = 0;
@@ -5484,18 +5517,22 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         ndlp->nlp_flag |= NLP_RPI_REGISTERED;
         ndlp->nlp_type |= NLP_FABRIC;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
-
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                         "0004 rpi:%x DID:%x flg:%x %d map:%x %p\n",
+                         ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag,
+                         atomic_read(&ndlp->kref.refcount),
+                         ndlp->nlp_usg_map, ndlp);
         /*
          * Start issuing Fabric-Device Management Interface (FDMI) command to
          * 0xfffffa (FDMI well known port) or Delay issuing FDMI command if
          * fdmi-on=2 (supporting RPA/hostnmae)
          */
 
-        if (vport->cfg_fdmi_on == 1)
-                lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
-        else
+        if (vport->cfg_fdmi_on & LPFC_FDMI_REG_DELAY)
                 mod_timer(&vport->fc_fdmitmo,
                           jiffies + msecs_to_jiffies(1000 * 60));
+        else
+                lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
 
         /* decrement the node reference count held for this callback
          * function.
@@ -5650,6 +5687,13 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         INIT_LIST_HEAD(&ndlp->nlp_listp);
         if (vport->phba->sli_rev == LPFC_SLI_REV4) {
                 ndlp->nlp_rpi = lpfc_sli4_alloc_rpi(vport->phba);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                 "0007 rpi:%x DID:%x flg:%x refcnt:%d "
+                                 "map:%x %p\n", ndlp->nlp_rpi, ndlp->nlp_DID,
+                                 ndlp->nlp_flag,
+                                 atomic_read(&ndlp->kref.refcount),
+                                 ndlp->nlp_usg_map, ndlp);
+
                 ndlp->active_rrqs_xri_bitmap =
                                 mempool_alloc(vport->phba->active_rrq_pool,
                                               GFP_KERNEL);
@@ -5684,9 +5728,9 @@ lpfc_nlp_release(struct kref *kref)
 
         lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,
                         "0279 lpfc_nlp_release: ndlp:x%p did %x "
-                        "usgmap:x%x refcnt:%d\n",
+                        "usgmap:x%x refcnt:%d rpi:%x\n",
                         (void *)ndlp, ndlp->nlp_DID, ndlp->nlp_usg_map,
-                        atomic_read(&ndlp->kref.refcount));
+                        atomic_read(&ndlp->kref.refcount), ndlp->nlp_rpi);
 
         /* remove ndlp from action. */
         lpfc_nlp_remove(ndlp->vport, ndlp);
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 236259252379..37beb9dc1311 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -107,6 +107,7 @@ struct lpfc_sli_ct_request {
         uint8_t ReasonCode;
         uint8_t Explanation;
         uint8_t VendorUnique;
+#define LPFC_CT_PREAMBLE        20      /* Size of CTReq + 4 up to here */
 
         union {
                 uint32_t PortID;
@@ -170,6 +171,8 @@ struct lpfc_sli_ct_request {
         } un;
 };
 
+#define LPFC_MAX_CT_SIZE        (60 * 4096)
+
 #define  SLI_CT_REVISION        1
 #define  GID_REQUEST_SZ   (offsetof(struct lpfc_sli_ct_request, un) + \
                            sizeof(struct gid))
@@ -1007,78 +1010,45 @@ typedef struct _ELS_PKT {	/* Structure is in Big Endian format */
         } un;
 } ELS_PKT;
 
-/*
- * FDMI
- * HBA MAnagement Operations Command Codes
- */
-#define  SLI_MGMT_GRHL     0x100        /* Get registered HBA list */
-#define  SLI_MGMT_GHAT     0x101        /* Get HBA attributes */
-#define  SLI_MGMT_GRPL     0x102        /* Get registered Port list */
-#define  SLI_MGMT_GPAT     0x110        /* Get Port attributes */
-#define  SLI_MGMT_RHBA     0x200        /* Register HBA */
-#define  SLI_MGMT_RHAT     0x201        /* Register HBA attributes */
-#define  SLI_MGMT_RPRT     0x210        /* Register Port */
-#define  SLI_MGMT_RPA      0x211        /* Register Port attributes */
-#define  SLI_MGMT_DHBA     0x300        /* De-register HBA */
-#define  SLI_MGMT_DPRT     0x310        /* De-register Port */
+/******** FDMI ********/
 
-/*
- * Management Service Subtypes
- */
-#define  SLI_CT_FDMI_Subtypes     0x10
+/* lpfc_sli_ct_request defines the CT_IU preamble for FDMI commands */
+#define  SLI_CT_FDMI_Subtypes     0x10  /* Management Service Subtype */
 
 /*
- * HBA Management Service Reject Code
+ * Registered Port List Format
  */
-#define  REJECT_CODE             0x9    /* Unable to perform command request */
+struct lpfc_fdmi_reg_port_list {
+        uint32_t EntryCnt;
+        uint32_t pe;            /* Variable-length array */
+};
 
-/*
- * HBA Management Service Reject Reason Code
- * Please refer to the Reason Codes above
- */
 
-/*
- * HBA Attribute Types
- */
-#define  NODE_NAME               0x1
-#define  MANUFACTURER            0x2
-#define  SERIAL_NUMBER           0x3
-#define  MODEL                   0x4
-#define  MODEL_DESCRIPTION       0x5
-#define  HARDWARE_VERSION        0x6
-#define  DRIVER_VERSION          0x7
-#define  OPTION_ROM_VERSION      0x8
-#define  FIRMWARE_VERSION        0x9
-#define  OS_NAME_VERSION         0xa
-#define  MAX_CT_PAYLOAD_LEN      0xb
+/* Definitions for HBA / Port attribute entries */
 
-/*
- * Port Attrubute Types
- */
-#define  SUPPORTED_FC4_TYPES     0x1
-#define  SUPPORTED_SPEED         0x2
-#define  PORT_SPEED              0x3
-#define  MAX_FRAME_SIZE          0x4
-#define  OS_DEVICE_NAME          0x5
-#define  HOST_NAME               0x6
-
-union AttributesDef {
+struct lpfc_fdmi_attr_def { /* Defined in TLV format */
         /* Structure is in Big Endian format */
-        struct {
-                uint32_t AttrType:16;
-                uint32_t AttrLen:16;
-        } bits;
-        uint32_t word;
+        uint32_t AttrType:16;
+        uint32_t AttrLen:16;
+        uint32_t AttrValue;  /* Marks start of Value (ATTRIBUTE_ENTRY) */
 };
 
 
-/*
- * HBA Attribute Entry (8 - 260 bytes)
- */
-typedef struct {
-        union AttributesDef ad;
+/* Attribute Entry */
+struct lpfc_fdmi_attr_entry {
         union {
                 uint32_t VendorSpecific;
+                uint32_t SupportClass;
+                uint32_t SupportSpeed;
+                uint32_t PortSpeed;
+                uint32_t MaxFrameSize;
+                uint32_t MaxCTPayloadLen;
+                uint32_t PortState;
+                uint32_t PortId;
+                struct lpfc_name NodeName;
+                struct lpfc_name PortName;
+                struct lpfc_name FabricName;
+                uint8_t FC4Types[32];
                 uint8_t Manufacturer[64];
                 uint8_t SerialNumber[64];
                 uint8_t Model[256];
@@ -1087,97 +1057,115 @@ typedef struct {
                 uint8_t DriverVersion[256];
                 uint8_t OptionROMVersion[256];
                 uint8_t FirmwareVersion[256];
-                struct lpfc_name NodeName;
-                uint8_t SupportFC4Types[32];
-                uint32_t SupportSpeed;
-                uint32_t PortSpeed;
-                uint32_t MaxFrameSize;
+                uint8_t OsHostName[256];
+                uint8_t NodeSymName[256];
                 uint8_t OsDeviceName[256];
                 uint8_t OsNameVersion[256];
-                uint32_t MaxCTPayloadLen;
                 uint8_t HostName[256];
         } un;
-} ATTRIBUTE_ENTRY;
+};
+
+#define LPFC_FDMI_MAX_AE_SIZE   sizeof(struct lpfc_fdmi_attr_entry)
 
 /*
  * HBA Attribute Block
  */
-typedef struct {
-        uint32_t EntryCnt;      /* Number of HBA attribute entries */
-        ATTRIBUTE_ENTRY Entry;  /* Variable-length array */
-} ATTRIBUTE_BLOCK;
+struct lpfc_fdmi_attr_block {
+        uint32_t EntryCnt;              /* Number of HBA attribute entries */
+        struct lpfc_fdmi_attr_entry Entry;      /* Variable-length array */
+};
 
 /*
  * Port Entry
  */
-typedef struct {
+struct lpfc_fdmi_port_entry {
         struct lpfc_name PortName;
-} PORT_ENTRY;
+};
 
 /*
  * HBA Identifier
  */
-typedef struct {
+struct lpfc_fdmi_hba_ident {
         struct lpfc_name PortName;
-} HBA_IDENTIFIER;
-
-/*
- * Registered Port List Format
- */
-typedef struct {
-        uint32_t EntryCnt;
-        PORT_ENTRY pe;          /* Variable-length array */
-} REG_PORT_LIST;
+};
 
 /*
  * Register HBA(RHBA)
  */
-typedef struct {
-        HBA_IDENTIFIER hi;
-        REG_PORT_LIST rpl;      /* variable-length array */
-/* ATTRIBUTE_BLOCK   ab; */
-} REG_HBA;
+struct lpfc_fdmi_reg_hba {
+        struct lpfc_fdmi_hba_ident hi;
+        struct lpfc_fdmi_reg_port_list rpl;     /* variable-length array */
+/* struct lpfc_fdmi_attr_block   ab; */
+};
 
 /*
  * Register HBA Attributes (RHAT)
  */
-typedef struct {
+struct lpfc_fdmi_reg_hbaattr {
         struct lpfc_name HBA_PortName;
-        ATTRIBUTE_BLOCK ab;
-} REG_HBA_ATTRIBUTE;
+        struct lpfc_fdmi_attr_block ab;
+};
 
 /*
  * Register Port Attributes (RPA)
  */
-typedef struct {
+struct lpfc_fdmi_reg_portattr {
         struct lpfc_name PortName;
-        ATTRIBUTE_BLOCK ab;
-} REG_PORT_ATTRIBUTE;
+        struct lpfc_fdmi_attr_block ab;
+};
 
 /*
- * Get Registered HBA List (GRHL) Accept Payload Format
+ * HBA MAnagement Operations Command Codes
  */
-typedef struct {
-        uint32_t HBA__Entry_Cnt; /* Number of Registered HBA Identifiers */
-        struct lpfc_name HBA_PortName;  /* Variable-length array */
-} GRHL_ACC_PAYLOAD;
+#define  SLI_MGMT_GRHL     0x100        /* Get registered HBA list */
+#define  SLI_MGMT_GHAT     0x101        /* Get HBA attributes */
+#define  SLI_MGMT_GRPL     0x102        /* Get registered Port list */
+#define  SLI_MGMT_GPAT     0x110        /* Get Port attributes */
+#define  SLI_MGMT_GPAS     0x120        /* Get Port Statistics */
+#define  SLI_MGMT_RHBA     0x200        /* Register HBA */
+#define  SLI_MGMT_RHAT     0x201        /* Register HBA attributes */
+#define  SLI_MGMT_RPRT     0x210        /* Register Port */
+#define  SLI_MGMT_RPA      0x211        /* Register Port attributes */
+#define  SLI_MGMT_DHBA     0x300        /* De-register HBA */
+#define  SLI_MGMT_DHAT     0x301        /* De-register HBA attributes */
+#define  SLI_MGMT_DPRT     0x310        /* De-register Port */
+#define  SLI_MGMT_DPA      0x311        /* De-register Port attributes */
 
 /*
- * Get Registered Port List (GRPL) Accept Payload Format
+ * HBA Attribute Types
  */
-typedef struct {
-        uint32_t RPL_Entry_Cnt; /* Number of Registered Port Entries */
-        PORT_ENTRY Reg_Port_Entry[1];   /* Variable-length array */
-} GRPL_ACC_PAYLOAD;
+#define  RHBA_NODENAME           0x1 /* 8 byte WWNN */
+#define  RHBA_MANUFACTURER       0x2 /* 4 to 64 byte ASCII string */
+#define  RHBA_SERIAL_NUMBER      0x3 /* 4 to 64 byte ASCII string */
+#define  RHBA_MODEL              0x4 /* 4 to 256 byte ASCII string */
+#define  RHBA_MODEL_DESCRIPTION  0x5 /* 4 to 256 byte ASCII string */
+#define  RHBA_HARDWARE_VERSION   0x6 /* 4 to 256 byte ASCII string */
+#define  RHBA_DRIVER_VERSION     0x7 /* 4 to 256 byte ASCII string */
+#define  RHBA_OPTION_ROM_VERSION 0x8 /* 4 to 256 byte ASCII string */
+#define  RHBA_FIRMWARE_VERSION   0x9 /* 4 to 256 byte ASCII string */
+#define  RHBA_OS_NAME_VERSION    0xa /* 4 to 256 byte ASCII string */
+#define  RHBA_MAX_CT_PAYLOAD_LEN 0xb /* 32-bit unsigned int */
+#define  RHBA_SYM_NODENAME       0xc /* 4 to 256 byte ASCII string */
 
 /*
- * Get Port Attributes (GPAT) Accept Payload Format
+ * Port Attrubute Types
  */
-
-typedef struct {
-        ATTRIBUTE_BLOCK pab;
-} GPAT_ACC_PAYLOAD;
-
+#define  RPRT_SUPPORTED_FC4_TYPES     0x1 /* 32 byte binary array */
+#define  RPRT_SUPPORTED_SPEED         0x2 /* 32-bit unsigned int */
+#define  RPRT_PORT_SPEED              0x3 /* 32-bit unsigned int */
+#define  RPRT_MAX_FRAME_SIZE          0x4 /* 32-bit unsigned int */
+#define  RPRT_OS_DEVICE_NAME          0x5 /* 4 to 256 byte ASCII string */
+#define  RPRT_HOST_NAME               0x6 /* 4 to 256 byte ASCII string */
+#define  RPRT_NODENAME                0x7 /* 8 byte WWNN */
+#define  RPRT_PORTNAME                0x8 /* 8 byte WWNN */
+#define  RPRT_SYM_PORTNAME            0x9 /* 4 to 256 byte ASCII string */
+#define  RPRT_PORT_TYPE               0xa /* 32-bit unsigned int */
+#define  RPRT_SUPPORTED_CLASS         0xb /* 32-bit unsigned int */
+#define  RPRT_FABRICNAME              0xc /* 8 byte Fabric WWNN */
+#define  RPRT_ACTIVE_FC4_TYPES        0xd /* 32 byte binary array */
+#define  RPRT_PORT_STATE              0x101 /* 32-bit unsigned int */
+#define  RPRT_DISC_PORT               0x102 /* 32-bit unsigned int */
+#define  RPRT_PORT_ID                 0x103 /* 32-bit unsigned int */
 
 /*
  *  Begin HBA configuration parameters.
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index f432ec180cf8..1813c45946f4 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2014 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2015 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -3085,6 +3085,9 @@ struct lpfc_acqe_link {
 #define LPFC_ASYNC_LINK_SPEED_100MBPS           0x2
 #define LPFC_ASYNC_LINK_SPEED_1GBPS             0x3
 #define LPFC_ASYNC_LINK_SPEED_10GBPS            0x4
+#define LPFC_ASYNC_LINK_SPEED_20GBPS            0x5
+#define LPFC_ASYNC_LINK_SPEED_25GBPS            0x6
+#define LPFC_ASYNC_LINK_SPEED_40GBPS            0x7
 #define lpfc_acqe_link_duplex_SHIFT             16
 #define lpfc_acqe_link_duplex_MASK              0x000000FF
 #define lpfc_acqe_link_duplex_WORD              word0
@@ -3166,7 +3169,7 @@ struct lpfc_acqe_fc_la {
 #define lpfc_acqe_fc_la_speed_SHIFT             24
 #define lpfc_acqe_fc_la_speed_MASK              0x000000FF
 #define lpfc_acqe_fc_la_speed_WORD              word0
-#define LPFC_FC_LA_SPEED_UNKOWN         0x0
+#define LPFC_FC_LA_SPEED_UNKNOWN                0x0
 #define LPFC_FC_LA_SPEED_1G             0x1
 #define LPFC_FC_LA_SPEED_2G             0x2
 #define LPFC_FC_LA_SPEED_4G             0x4
@@ -3244,6 +3247,7 @@ struct lpfc_acqe_sli {
 #define LPFC_SLI_EVENT_TYPE_NVLOG_POST          0x4
 #define LPFC_SLI_EVENT_TYPE_DIAG_DUMP           0x5
 #define LPFC_SLI_EVENT_TYPE_MISCONFIGURED       0x9
+#define LPFC_SLI_EVENT_TYPE_REMOTE_DPORT        0xA
 };
 
 /*
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 0b2c53af85c7..e8c8c1ecc1f5 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -1330,13 +1330,14 @@ lpfc_offline_eratt(struct lpfc_hba *phba)
 void
 lpfc_sli4_offline_eratt(struct lpfc_hba *phba)
 {
+        spin_lock_irq(&phba->hbalock);
+        phba->link_state = LPFC_HBA_ERROR;
+        spin_unlock_irq(&phba->hbalock);
+
         lpfc_offline_prep(phba, LPFC_MBX_NO_WAIT);
         lpfc_offline(phba);
-        lpfc_sli4_brdreset(phba);
         lpfc_hba_down_post(phba);
-        lpfc_sli4_post_status_check(phba);
         lpfc_unblock_mgmt_io(phba);
-        phba->link_state = LPFC_HBA_ERROR;
 }
 
 /**
@@ -1629,6 +1630,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)
         uint32_t uerrlo_reg, uemasklo_reg;
         uint32_t pci_rd_rc1, pci_rd_rc2;
         bool en_rn_msg = true;
+        struct temp_event temp_event_data;
         int rc;
 
         /* If the pci channel is offline, ignore possible errors, since
@@ -1636,9 +1638,6 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)
          */
         if (pci_channel_offline(phba->pcidev))
                 return;
-        /* If resets are disabled then leave the HBA alone and return */
-        if (!phba->cfg_enable_hba_reset)
-                return;
 
         if_type = bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf);
         switch (if_type) {
@@ -1654,6 +1653,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)
                         return;
                 lpfc_sli4_offline_eratt(phba);
                 break;
+
         case LPFC_SLI_INTF_IF_TYPE_2:
                 pci_rd_rc1 = lpfc_readl(
                                 phba->sli4_hba.u.if_type2.STATUSregaddr,
@@ -1668,15 +1668,27 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)
                 reg_err1 = readl(phba->sli4_hba.u.if_type2.ERR1regaddr);
                 reg_err2 = readl(phba->sli4_hba.u.if_type2.ERR2regaddr);
                 if (bf_get(lpfc_sliport_status_oti, &portstat_reg)) {
-                        /* TODO: Register for Overtemp async events. */
                         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                 "2889 Port Overtemperature event, "
-                                "taking port offline\n");
+                                "taking port offline Data: x%x x%x\n",
+                                reg_err1, reg_err2);
+
+                        temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;
+                        temp_event_data.event_code = LPFC_CRIT_TEMP;
+                        temp_event_data.data = 0xFFFFFFFF;
+
+                        shost = lpfc_shost_from_vport(phba->pport);
+                        fc_host_post_vendor_event(shost, fc_get_event_number(),
+                                                  sizeof(temp_event_data),
+                                                  (char *)&temp_event_data,
+                                                  SCSI_NL_VID_TYPE_PCI
+                                                  | PCI_VENDOR_ID_EMULEX);
+
                         spin_lock_irq(&phba->hbalock);
                         phba->over_temp_state = HBA_OVER_TEMP;
                         spin_unlock_irq(&phba->hbalock);
                         lpfc_sli4_offline_eratt(phba);
-                        break;
+                        return;
                 }
                 if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &&
                     reg_err2 == SLIPORT_ERR2_REG_FW_RESTART) {
@@ -1693,6 +1705,10 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)
                         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                         "3145 Port Down: Provisioning\n");
 
+                /* If resets are disabled then leave the HBA alone and return */
+                if (!phba->cfg_enable_hba_reset)
+                        return;
+
                 /* Check port status register for function reset */
                 rc = lpfc_sli4_port_sta_fn_reset(phba, LPFC_MBX_NO_WAIT,
                                 en_rn_msg);
@@ -2759,9 +2775,19 @@ lpfc_sli4_node_prep(struct lpfc_hba *phba)
                         list_for_each_entry_safe(ndlp, next_ndlp,
                                                  &vports[i]->fc_nodes,
                                                  nlp_listp) {
-                                if (NLP_CHK_NODE_ACT(ndlp))
+                                if (NLP_CHK_NODE_ACT(ndlp)) {
                                         ndlp->nlp_rpi =
                                                 lpfc_sli4_alloc_rpi(phba);
+                                        lpfc_printf_vlog(ndlp->vport, KERN_INFO,
+                                                         LOG_NODE,
+                                                         "0009 rpi:%x DID:%x "
+                                                         "flg:%x map:%x %p\n",
+                                                         ndlp->nlp_rpi,
+                                                         ndlp->nlp_DID,
+                                                         ndlp->nlp_flag,
+                                                         ndlp->nlp_usg_map,
+                                                         ndlp);
+                                }
                         }
                 }
         }
@@ -2925,8 +2951,18 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action)
                                  * RPI. Get a new RPI when the adapter port
                                  * comes back online.
                                  */
-                                if (phba->sli_rev == LPFC_SLI_REV4)
+                                if (phba->sli_rev == LPFC_SLI_REV4) {
+                                        lpfc_printf_vlog(ndlp->vport,
+                                                         KERN_INFO, LOG_NODE,
+                                                         "0011 lpfc_offline: "
+                                                         "ndlp:x%p did %x "
+                                                         "usgmap:x%x rpi:%x\n",
+                                                         ndlp, ndlp->nlp_DID,
+                                                         ndlp->nlp_usg_map,
+                                                         ndlp->nlp_rpi);
+
                                         lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);
+                                }
                                 lpfc_unreg_rpi(vports[i], ndlp);
                         }
                 }
@@ -3241,12 +3277,17 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
         struct Scsi_Host  *shost;
         int error = 0;
 
-        if (dev != &phba->pcidev->dev)
+        if (dev != &phba->pcidev->dev) {
                 shost = scsi_host_alloc(&lpfc_vport_template,
                                         sizeof(struct lpfc_vport));
-        else
-                shost = scsi_host_alloc(&lpfc_template,
+        } else {
+                if (phba->sli_rev == LPFC_SLI_REV4)
+                        shost = scsi_host_alloc(&lpfc_template,
                                         sizeof(struct lpfc_vport));
+                else
+                        shost = scsi_host_alloc(&lpfc_template_s3,
+                                        sizeof(struct lpfc_vport));
+        }
         if (!shost)
                 goto out;
 
@@ -3685,6 +3726,11 @@ lpfc_sli4_parse_latt_link_speed(struct lpfc_hba *phba,
         case LPFC_ASYNC_LINK_SPEED_10GBPS:
                 link_speed = LPFC_LINK_SPEED_10GHZ;
                 break;
+        case LPFC_ASYNC_LINK_SPEED_20GBPS:
+        case LPFC_ASYNC_LINK_SPEED_25GBPS:
+        case LPFC_ASYNC_LINK_SPEED_40GBPS:
+                link_speed = LPFC_LINK_SPEED_UNKNOWN;
+                break;
         default:
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                 "0483 Invalid link-attention link speed: x%x\n",
@@ -3756,46 +3802,55 @@ lpfc_sli4_port_speed_parse(struct lpfc_hba *phba, uint32_t evt_code,
         switch (evt_code) {
         case LPFC_TRAILER_CODE_LINK:
                 switch (speed_code) {
-                case LPFC_EVT_CODE_LINK_NO_LINK:
+                case LPFC_ASYNC_LINK_SPEED_ZERO:
                         port_speed = 0;
                         break;
-                case LPFC_EVT_CODE_LINK_10_MBIT:
+                case LPFC_ASYNC_LINK_SPEED_10MBPS:
                         port_speed = 10;
                         break;
-                case LPFC_EVT_CODE_LINK_100_MBIT:
+                case LPFC_ASYNC_LINK_SPEED_100MBPS:
                         port_speed = 100;
                         break;
-                case LPFC_EVT_CODE_LINK_1_GBIT:
+                case LPFC_ASYNC_LINK_SPEED_1GBPS:
                         port_speed = 1000;
                         break;
-                case LPFC_EVT_CODE_LINK_10_GBIT:
+                case LPFC_ASYNC_LINK_SPEED_10GBPS:
                         port_speed = 10000;
                         break;
+                case LPFC_ASYNC_LINK_SPEED_20GBPS:
+                        port_speed = 20000;
+                        break;
+                case LPFC_ASYNC_LINK_SPEED_25GBPS:
+                        port_speed = 25000;
+                        break;
+                case LPFC_ASYNC_LINK_SPEED_40GBPS:
+                        port_speed = 40000;
+                        break;
                 default:
                         port_speed = 0;
                 }
                 break;
         case LPFC_TRAILER_CODE_FC:
                 switch (speed_code) {
-                case LPFC_EVT_CODE_FC_NO_LINK:
+                case LPFC_FC_LA_SPEED_UNKNOWN:
                         port_speed = 0;
                         break;
-                case LPFC_EVT_CODE_FC_1_GBAUD:
+                case LPFC_FC_LA_SPEED_1G:
                         port_speed = 1000;
                         break;
-                case LPFC_EVT_CODE_FC_2_GBAUD:
+                case LPFC_FC_LA_SPEED_2G:
                         port_speed = 2000;
                         break;
-                case LPFC_EVT_CODE_FC_4_GBAUD:
+                case LPFC_FC_LA_SPEED_4G:
                         port_speed = 4000;
                         break;
-                case LPFC_EVT_CODE_FC_8_GBAUD:
+                case LPFC_FC_LA_SPEED_8G:
                         port_speed = 8000;
                         break;
-                case LPFC_EVT_CODE_FC_10_GBAUD:
+                case LPFC_FC_LA_SPEED_10G:
                         port_speed = 10000;
                         break;
-                case LPFC_EVT_CODE_FC_16_GBAUD:
+                case LPFC_FC_LA_SPEED_16G:
                         port_speed = 16000;
                         break;
                 default:
@@ -4044,18 +4099,21 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
         char port_name;
         char message[128];
         uint8_t status;
+        uint8_t evt_type;
+        struct temp_event temp_event_data;
         struct lpfc_acqe_misconfigured_event *misconfigured;
+        struct Scsi_Host  *shost;
+
+        evt_type = bf_get(lpfc_trailer_type, acqe_sli);
 
-        /* special case misconfigured event as it contains data for all ports */
-        if ((bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) !=
-                 LPFC_SLI_INTF_IF_TYPE_2) ||
-                (bf_get(lpfc_trailer_type, acqe_sli) !=
-                        LPFC_SLI_EVENT_TYPE_MISCONFIGURED)) {
+        /* Special case Lancer */
+        if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) !=
+                 LPFC_SLI_INTF_IF_TYPE_2) {
                 lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
                                 "2901 Async SLI event - Event Data1:x%08x Event Data2:"
                                 "x%08x SLI Event Type:%d\n",
                                 acqe_sli->event_data1, acqe_sli->event_data2,
-                                bf_get(lpfc_trailer_type, acqe_sli));
+                                evt_type);
                 return;
         }
 
@@ -4063,58 +4121,107 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
         if (port_name == 0x00)
                 port_name = '?'; /* get port name is empty */
 
-        misconfigured = (struct lpfc_acqe_misconfigured_event *)
+        switch (evt_type) {
+        case LPFC_SLI_EVENT_TYPE_OVER_TEMP:
+                temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;
+                temp_event_data.event_code = LPFC_THRESHOLD_TEMP;
+                temp_event_data.data = (uint32_t)acqe_sli->event_data1;
+
+                lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
+                                "3190 Over Temperature:%d Celsius- Port Name %c\n",
+                                acqe_sli->event_data1, port_name);
+
+                shost = lpfc_shost_from_vport(phba->pport);
+                fc_host_post_vendor_event(shost, fc_get_event_number(),
+                                          sizeof(temp_event_data),
+                                          (char *)&temp_event_data,
+                                          SCSI_NL_VID_TYPE_PCI
+                                          | PCI_VENDOR_ID_EMULEX);
+                break;
+        case LPFC_SLI_EVENT_TYPE_NORM_TEMP:
+                temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;
+                temp_event_data.event_code = LPFC_NORMAL_TEMP;
+                temp_event_data.data = (uint32_t)acqe_sli->event_data1;
+
+                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                                "3191 Normal Temperature:%d Celsius - Port Name %c\n",
+                                acqe_sli->event_data1, port_name);
+
+                shost = lpfc_shost_from_vport(phba->pport);
+                fc_host_post_vendor_event(shost, fc_get_event_number(),
+                                          sizeof(temp_event_data),
+                                          (char *)&temp_event_data,
+                                          SCSI_NL_VID_TYPE_PCI
+                                          | PCI_VENDOR_ID_EMULEX);
+                break;
+        case LPFC_SLI_EVENT_TYPE_MISCONFIGURED:
+                misconfigured = (struct lpfc_acqe_misconfigured_event *)
                                         &acqe_sli->event_data1;
 
-        /* fetch the status for this port */
-        switch (phba->sli4_hba.lnk_info.lnk_no) {
-        case LPFC_LINK_NUMBER_0:
-                status = bf_get(lpfc_sli_misconfigured_port0,
+                /* fetch the status for this port */
+                switch (phba->sli4_hba.lnk_info.lnk_no) {
+                case LPFC_LINK_NUMBER_0:
+                        status = bf_get(lpfc_sli_misconfigured_port0,
                                         &misconfigured->theEvent);
-                break;
-        case LPFC_LINK_NUMBER_1:
-                status = bf_get(lpfc_sli_misconfigured_port1,
+                        break;
+                case LPFC_LINK_NUMBER_1:
+                        status = bf_get(lpfc_sli_misconfigured_port1,
                                         &misconfigured->theEvent);
-                break;
-        case LPFC_LINK_NUMBER_2:
-                status = bf_get(lpfc_sli_misconfigured_port2,
+                        break;
+                case LPFC_LINK_NUMBER_2:
+                        status = bf_get(lpfc_sli_misconfigured_port2,
                                         &misconfigured->theEvent);
-                break;
-        case LPFC_LINK_NUMBER_3:
-                status = bf_get(lpfc_sli_misconfigured_port3,
+                        break;
+                case LPFC_LINK_NUMBER_3:
+                        status = bf_get(lpfc_sli_misconfigured_port3,
                                         &misconfigured->theEvent);
-                break;
-        default:
-                status = ~LPFC_SLI_EVENT_STATUS_VALID;
-                break;
-        }
+                        break;
+                default:
+                        status = ~LPFC_SLI_EVENT_STATUS_VALID;
+                        break;
+                }
 
-        switch (status) {
-        case LPFC_SLI_EVENT_STATUS_VALID:
-                return; /* no message if the sfp is okay */
-        case LPFC_SLI_EVENT_STATUS_NOT_PRESENT:
-                sprintf(message, "Optics faulted/incorrectly installed/not " \
-                                "installed - Reseat optics, if issue not "
-                                "resolved, replace.");
-                break;
-        case LPFC_SLI_EVENT_STATUS_WRONG_TYPE:
-                sprintf(message,
-                        "Optics of two types installed - Remove one optic or " \
-                        "install matching pair of optics.");
-                break;
-        case LPFC_SLI_EVENT_STATUS_UNSUPPORTED:
-                sprintf(message, "Incompatible optics - Replace with " \
+                switch (status) {
+                case LPFC_SLI_EVENT_STATUS_VALID:
+                        return; /* no message if the sfp is okay */
+                case LPFC_SLI_EVENT_STATUS_NOT_PRESENT:
+                        sprintf(message, "Optics faulted/incorrectly "
+                                "installed/not installed - Reseat optics, "
+                                "if issue not resolved, replace.");
+                        break;
+                case LPFC_SLI_EVENT_STATUS_WRONG_TYPE:
+                        sprintf(message,
+                                "Optics of two types installed - Remove one "
+                                "optic or install matching pair of optics.");
+                        break;
+                case LPFC_SLI_EVENT_STATUS_UNSUPPORTED:
+                        sprintf(message, "Incompatible optics - Replace with "
                                 "compatible optics for card to function.");
+                        break;
+                default:
+                        /* firmware is reporting a status we don't know about */
+                        sprintf(message, "Unknown event status x%02x", status);
+                        break;
+                }
+
+                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                "3176 Misconfigured Physical Port - "
+                                "Port Name %c %s\n", port_name, message);
+                break;
+        case LPFC_SLI_EVENT_TYPE_REMOTE_DPORT:
+                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                                "3192 Remote DPort Test Initiated - "
+                                "Event Data1:x%08x Event Data2: x%08x\n",
+                                acqe_sli->event_data1, acqe_sli->event_data2);
                 break;
         default:
-                /* firmware is reporting a status we don't know about */
-                sprintf(message, "Unknown event status x%02x", status);
+                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                                "3193 Async SLI event - Event Data1:x%08x Event Data2:"
+                                "x%08x SLI Event Type:%d\n",
+                                acqe_sli->event_data1, acqe_sli->event_data2,
+                                evt_type);
                 break;
         }
-
-        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                        "3176 Misconfigured Physical Port - "
-                        "Port Name %c %s\n", port_name, message);
 }
 
 /**
@@ -5183,6 +5290,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
                 rc = lpfc_pci_function_reset(phba);
                 if (unlikely(rc))
                         return -ENODEV;
+                phba->temp_sensor_support = 1;
         }
 
         /* Create the bootstrap mailbox command */
@@ -7647,6 +7755,14 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)
                         goto out_destroy_els_rq;
                 }
         }
+
+        /*
+         * Configure EQ delay multipier for interrupt coalescing using
+         * MODIFY_EQ_DELAY for all EQs created, LPFC_MAX_EQ_DELAY at a time.
+         */
+        for (fcp_eqidx = 0; fcp_eqidx < phba->cfg_fcp_io_channel;
+                        fcp_eqidx += LPFC_MAX_EQ_DELAY)
+                lpfc_modify_fcp_eq_delay(phba, fcp_eqidx);
         return 0;
 
 out_destroy_els_rq:
@@ -7953,7 +8069,7 @@ wait:
                  * up to 30 seconds. If the port doesn't respond, treat
                  * it as an error.
                  */
-                for (rdy_chk = 0; rdy_chk < 3000; rdy_chk++) {
+                for (rdy_chk = 0; rdy_chk < 1500; rdy_chk++) {
                         if (lpfc_readl(phba->sli4_hba.u.if_type2.
                                 STATUSregaddr, &reg_data.word0)) {
                                 rc = -ENODEV;
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 06241f590c1e..816f596cda60 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 5cc1103d811e..4cb9882af157 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,7 +1,7 @@
  /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -276,6 +276,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
         struct lpfc_hba    *phba = vport->phba;
         struct lpfc_dmabuf *pcmd;
+        uint64_t nlp_portwwn = 0;
         uint32_t *lp;
         IOCB_t *icmd;
         struct serv_parm *sp;
@@ -332,6 +333,8 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                         NULL);
                 return 0;
         }
+
+        nlp_portwwn = wwn_to_u64(ndlp->nlp_portname.u.wwn);
         if ((lpfc_check_sparm(vport, ndlp, sp, CLASS3, 0) == 0)) {
                 /* Reject this request because invalid parameters */
                 stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
@@ -367,7 +370,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         ndlp->nlp_maxframe =
                 ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) | sp->cmn.bbRcvSizeLsb;
 
-        /* no need to reg_login if we are already in one of these states */
+        /* if already logged in, do implicit logout */
         switch (ndlp->nlp_state) {
         case  NLP_STE_NPR_NODE:
                 if (!(ndlp->nlp_flag & NLP_NPR_ADISC))
@@ -376,8 +379,26 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         case  NLP_STE_PRLI_ISSUE:
         case  NLP_STE_UNMAPPED_NODE:
         case  NLP_STE_MAPPED_NODE:
-                lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL);
-                return 1;
+                /* lpfc_plogi_confirm_nport skips fabric did, handle it here */
+                if (!(ndlp->nlp_type & NLP_FABRIC)) {
+                        lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb,
+                                         ndlp, NULL);
+                        return 1;
+                }
+                if (nlp_portwwn != 0 &&
+                    nlp_portwwn != wwn_to_u64(sp->portName.u.wwn))
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                         "0143 PLOGI recv'd from DID: x%x "
+                                         "WWPN changed: old %llx new %llx\n",
+                                         ndlp->nlp_DID,
+                                         (unsigned long long)nlp_portwwn,
+                                         (unsigned long long)
+                                         wwn_to_u64(sp->portName.u.wwn));
+
+                ndlp->nlp_prev_state = ndlp->nlp_state;
+                /* rport needs to be unregistered first */
+                lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+                break;
         }
 
         /* Check for Nport to NPort pt2pt protocol */
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 4f9222eb2266..cb73cf9e9ba5 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -1130,6 +1130,25 @@ lpfc_release_scsi_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb)
 }
 
 /**
+ * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB
+ * @data: A pointer to the immediate command data portion of the IOCB.
+ * @fcp_cmnd: The FCP Command that is provided by the SCSI layer.
+ *
+ * The routine copies the entire FCP command from @fcp_cmnd to @data while
+ * byte swapping the data to big endian format for transmission on the wire.
+ **/
+static void
+lpfc_fcpcmd_to_iocb(uint8_t *data, struct fcp_cmnd *fcp_cmnd)
+{
+        int i, j;
+
+        for (i = 0, j = 0; i < sizeof(struct fcp_cmnd);
+             i += sizeof(uint32_t), j++) {
+                ((uint32_t *)data)[j] = cpu_to_be32(((uint32_t *)fcp_cmnd)[j]);
+        }
+}
+
+/**
  * lpfc_scsi_prep_dma_buf_s3 - DMA mapping for scsi buffer to SLI3 IF spec
  * @phba: The Hba for which this call is being executed.
  * @lpfc_cmd: The scsi buffer which is going to be mapped.
@@ -1264,6 +1283,7 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
          * we need to set word 4 of IOCB here
          */
         iocb_cmd->un.fcpi.fcpi_parm = scsi_bufflen(scsi_cmnd);
+        lpfc_fcpcmd_to_iocb(iocb_cmd->unsli3.fcp_ext.icd, fcp_cmnd);
         return 0;
 }
 
@@ -4127,24 +4147,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
 }
 
 /**
- * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB
- * @data: A pointer to the immediate command data portion of the IOCB.
- * @fcp_cmnd: The FCP Command that is provided by the SCSI layer.
- *
- * The routine copies the entire FCP command from @fcp_cmnd to @data while
- * byte swapping the data to big endian format for transmission on the wire.
- **/
-static void
-lpfc_fcpcmd_to_iocb(uint8_t *data, struct fcp_cmnd *fcp_cmnd)
-{
-        int i, j;
-        for (i = 0, j = 0; i < sizeof(struct fcp_cmnd);
-             i += sizeof(uint32_t), j++) {
-                ((uint32_t *)data)[j] = cpu_to_be32(((uint32_t *)fcp_cmnd)[j]);
-        }
-}
-
-/**
  * lpfc_scsi_prep_cmnd - Wrapper func for convert scsi cmnd to FCP info unit
  * @vport: The virtual port for which this call is being executed.
  * @lpfc_cmd: The scsi command which needs to send.
@@ -4223,9 +4225,6 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                 fcp_cmnd->fcpCntl3 = 0;
                 phba->fc4ControlRequests++;
         }
-        if (phba->sli_rev == 3 &&
-            !(phba->sli3_options & LPFC_SLI3_BG_ENABLED))
-                lpfc_fcpcmd_to_iocb(iocb_cmd->unsli3.fcp_ext.icd, fcp_cmnd);
         /*
          * Finish initializing those IOCB fields that are independent
          * of the scsi_cmnd request_buffer
@@ -5118,9 +5117,10 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
         int status;
 
         rdata = lpfc_rport_data_from_scsi_device(cmnd->device);
-        if (!rdata) {
+        if (!rdata || !rdata->pnode) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,
-                        "0798 Device Reset rport failure: rdata x%p\n", rdata);
+                                 "0798 Device Reset rport failure: rdata x%p\n",
+                                 rdata);
                 return FAILED;
         }
         pnode = rdata->pnode;
@@ -5202,10 +5202,12 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
         if (status == FAILED) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,
                         "0722 Target Reset rport failure: rdata x%p\n", rdata);
-                spin_lock_irq(shost->host_lock);
-                pnode->nlp_flag &= ~NLP_NPR_ADISC;
-                pnode->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
-                spin_unlock_irq(shost->host_lock);
+                if (pnode) {
+                        spin_lock_irq(shost->host_lock);
+                        pnode->nlp_flag &= ~NLP_NPR_ADISC;
+                        pnode->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
+                        spin_unlock_irq(shost->host_lock);
+                }
                 lpfc_reset_flush_io_context(vport, tgt_id, lun_id,
                                           LPFC_CTX_TGT);
                 return FAST_IO_FAIL;
@@ -5857,6 +5859,31 @@ lpfc_disable_oas_lun(struct lpfc_hba *phba, struct lpfc_name *vport_wwpn,
         return false;
 }
 
+struct scsi_host_template lpfc_template_s3 = {
+        .module                 = THIS_MODULE,
+        .name                   = LPFC_DRIVER_NAME,
+        .info                   = lpfc_info,
+        .queuecommand           = lpfc_queuecommand,
+        .eh_abort_handler       = lpfc_abort_handler,
+        .eh_device_reset_handler = lpfc_device_reset_handler,
+        .eh_target_reset_handler = lpfc_target_reset_handler,
+        .eh_bus_reset_handler   = lpfc_bus_reset_handler,
+        .slave_alloc            = lpfc_slave_alloc,
+        .slave_configure        = lpfc_slave_configure,
+        .slave_destroy          = lpfc_slave_destroy,
+        .scan_finished          = lpfc_scan_finished,
+        .this_id                = -1,
+        .sg_tablesize           = LPFC_DEFAULT_SG_SEG_CNT,
+        .cmd_per_lun            = LPFC_CMD_PER_LUN,
+        .use_clustering         = ENABLE_CLUSTERING,
+        .shost_attrs            = lpfc_hba_attrs,
+        .max_sectors            = 0xFFFF,
+        .vendor_id              = LPFC_NL_VENDOR_ID,
+        .change_queue_depth     = scsi_change_queue_depth,
+        .use_blk_tags           = 1,
+        .track_queue_depth      = 1,
+};
+
 struct scsi_host_template lpfc_template = {
         .module                 = THIS_MODULE,
         .name                   = LPFC_DRIVER_NAME,
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 0389ac1e7b83..474e30cdee6e 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 207a43d952fa..56f73682d4bd 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -918,12 +918,16 @@ __lpfc_sli_get_sglq(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq)
                 lpfc_cmd = (struct lpfc_scsi_buf *) piocbq->context1;
                 ndlp = lpfc_cmd->rdata->pnode;
         } else  if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) &&
-                        !(piocbq->iocb_flag & LPFC_IO_LIBDFC))
+                        !(piocbq->iocb_flag & LPFC_IO_LIBDFC)) {
                 ndlp = piocbq->context_un.ndlp;
-        else  if (piocbq->iocb_flag & LPFC_IO_LIBDFC)
-                ndlp = piocbq->context_un.ndlp;
-        else
+        } else  if (piocbq->iocb_flag & LPFC_IO_LIBDFC) {
+                if (piocbq->iocb_flag & LPFC_IO_LOOPBACK)
+                        ndlp = NULL;
+                else
+                        ndlp = piocbq->context_un.ndlp;
+        } else {
                 ndlp = piocbq->context1;
+        }
 
         list_remove_head(lpfc_sgl_list, sglq, struct lpfc_sglq, list);
         start_sglq = sglq;
@@ -2213,6 +2217,46 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         else
                 mempool_free(pmb, phba->mbox_mem_pool);
 }
+ /**
+ * lpfc_sli4_unreg_rpi_cmpl_clr - mailbox completion handler
+ * @phba: Pointer to HBA context object.
+ * @pmb: Pointer to mailbox object.
+ *
+ * This function is the unreg rpi mailbox completion handler. It
+ * frees the memory resources associated with the completed mailbox
+ * command. An additional refrenece is put on the ndlp to prevent
+ * lpfc_nlp_release from freeing the rpi bit in the bitmask before
+ * the unreg mailbox command completes, this routine puts the
+ * reference back.
+ *
+ **/
+void
+lpfc_sli4_unreg_rpi_cmpl_clr(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+        struct lpfc_vport  *vport = pmb->vport;
+        struct lpfc_nodelist *ndlp;
+
+        ndlp = pmb->context1;
+        if (pmb->u.mb.mbxCommand == MBX_UNREG_LOGIN) {
+                if (phba->sli_rev == LPFC_SLI_REV4 &&
+                    (bf_get(lpfc_sli_intf_if_type,
+                     &phba->sli4_hba.sli_intf) ==
+                     LPFC_SLI_INTF_IF_TYPE_2)) {
+                        if (ndlp) {
+                                lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                                                 "0010 UNREG_LOGIN vpi:%x "
+                                                 "rpi:%x DID:%x map:%x %p\n",
+                                                 vport->vpi, ndlp->nlp_rpi,
+                                                 ndlp->nlp_DID,
+                                                 ndlp->nlp_usg_map, ndlp);
+
+                                lpfc_nlp_put(ndlp);
+                        }
+                }
+        }
+
+        mempool_free(pmb, phba->mbox_mem_pool);
+}
 
 /**
  * lpfc_sli_handle_mb_event - Handle mailbox completions from firmware
@@ -12842,7 +12886,7 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset)
  * fails this function will return -ENXIO.
  **/
 int
-lpfc_modify_fcp_eq_delay(struct lpfc_hba *phba, uint16_t startq)
+lpfc_modify_fcp_eq_delay(struct lpfc_hba *phba, uint32_t startq)
 {
         struct lpfc_mbx_modify_eq_delay *eq_delay;
         LPFC_MBOXQ_t *mbox;
@@ -12959,11 +13003,8 @@ lpfc_eq_create(struct lpfc_hba *phba, struct lpfc_queue *eq, uint32_t imax)
         bf_set(lpfc_eq_context_size, &eq_create->u.request.context,
                LPFC_EQE_SIZE);
         bf_set(lpfc_eq_context_valid, &eq_create->u.request.context, 1);
-        /* Calculate delay multiper from maximum interrupt per second */
-        if (imax > LPFC_DMULT_CONST)
-                dmult = 0;
-        else
-                dmult = LPFC_DMULT_CONST/imax - 1;
+        /* don't setup delay multiplier using EQ_CREATE */
+        dmult = 0;
         bf_set(lpfc_eq_context_delay_multi, &eq_create->u.request.context,
                dmult);
         switch (eq->entry_count) {
@@ -15662,14 +15703,14 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba)
         struct lpfc_rpi_hdr *rpi_hdr;
         unsigned long iflag;
 
-        max_rpi = phba->sli4_hba.max_cfg_param.max_rpi;
-        rpi_limit = phba->sli4_hba.next_rpi;
-
         /*
          * Fetch the next logical rpi.  Because this index is logical,
          * the  driver starts at 0 each time.
          */
         spin_lock_irqsave(&phba->hbalock, iflag);
+        max_rpi = phba->sli4_hba.max_cfg_param.max_rpi;
+        rpi_limit = phba->sli4_hba.next_rpi;
+
         rpi = find_next_zero_bit(phba->sli4_hba.rpi_bmask, rpi_limit, 0);
         if (rpi >= rpi_limit)
                 rpi = LPFC_RPI_ALLOC_ERROR;
@@ -15678,6 +15719,9 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba)
                 phba->sli4_hba.max_cfg_param.rpi_used++;
                 phba->sli4_hba.rpi_count++;
         }
+        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                        "0001 rpi:%x max:%x lim:%x\n",
+                        (int) rpi, max_rpi, rpi_limit);
 
         /*
          * Don't try to allocate more rpi header regions if the device limit
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h
index 4a01452415cf..7fe99ff80846 100644
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -80,6 +80,7 @@ struct lpfc_iocbq {
 
 #define LPFC_IO_OAS             0x10000 /* OAS FCP IO */
 #define LPFC_IO_FOF             0x20000 /* FOF FCP IO */
+#define LPFC_IO_LOOPBACK        0x40000 /* Loopback IO */
 
         uint32_t drvrTimeout;   /* driver timeout in seconds */
         uint32_t fcp_wqidx;     /* index to FCP work queue */
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 22ceb2b05ba1..6eca3b8124d3 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2009-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -671,7 +671,7 @@ struct lpfc_queue *lpfc_sli4_queue_alloc(struct lpfc_hba *, uint32_t,
                         uint32_t);
 void lpfc_sli4_queue_free(struct lpfc_queue *);
 int lpfc_eq_create(struct lpfc_hba *, struct lpfc_queue *, uint32_t);
-int lpfc_modify_fcp_eq_delay(struct lpfc_hba *, uint16_t);
+int lpfc_modify_fcp_eq_delay(struct lpfc_hba *, uint32_t);
 int lpfc_cq_create(struct lpfc_hba *, struct lpfc_queue *,
                         struct lpfc_queue *, uint32_t, uint32_t);
 int32_t lpfc_mq_create(struct lpfc_hba *, struct lpfc_queue *,
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 89413add2252..c37bb9f91c3b 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "10.4.8000.0."
+#define LPFC_DRIVER_VERSION "10.5.0.0."
 #define LPFC_DRIVER_NAME                "lpfc"
 
 /* Used for SLI 2/3 */
@@ -30,4 +30,4 @@
 
 #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \
                 LPFC_DRIVER_VERSION
-#define LPFC_COPYRIGHT "Copyright(c) 2004-2014 Emulex.  All rights reserved."
+#define LPFC_COPYRIGHT "Copyright(c) 2004-2015 Emulex.  All rights reserved."
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 1e85c07e3b62..d64a769b8155 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -483,7 +483,6 @@ static struct platform_driver mac_scsi_driver = {
         .remove = __exit_p(mac_scsi_remove),
         .driver = {
                 .name   = DRV_MODULE_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 113e6c9826a1..33f60c92e20e 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -18,6 +18,9 @@ config SCSI_QLA_FC
         2322, 6322        ql2322_fw.bin
         24xx, 54xx        ql2400_fw.bin
         25xx              ql2500_fw.bin
+        2031              ql2600_fw.bin
+        8031              ql8300_fw.bin
+        27xx              ql2700_fw.bin
 
         Upon request, the driver caches the firmware image until
         the driver is unloaded.
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index d77fe43793b6..0e6ee3ca30e6 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -11,9 +11,9 @@
  * ----------------------------------------------------------------------
  * |             Level            |   Last Value Used  |     Holes      |
  * ----------------------------------------------------------------------
- * | Module Init and Probe        |       0x017d       | 0x0144,0x0146  |
+ * | Module Init and Probe        |       0x017f       | 0x0146         |
  * |                              |                    | 0x015b-0x0160  |
- * |                              |                    | 0x016e-0x0170  |
+ * |                              |                    | 0x016e-0x0170  |
  * | Mailbox commands             |       0x118d       | 0x1115-0x1116  |
  * |                              |                    | 0x111a-0x111b  |
  * | Device Discovery             |       0x2016       | 0x2020-0x2022, |
@@ -60,7 +60,7 @@
  * |                              |                    | 0xb13c-0xb140  |
  * |                              |                    | 0xb149         |
  * | MultiQ                       |       0xc00c       |                |
- * | Misc                         |       0xd213       | 0xd011-0xd017  |
+ * | Misc                         |       0xd300       | 0xd016-0xd017  |
  * |                              |                    | 0xd021,0xd024  |
  * |                              |                    | 0xd025,0xd029  |
  * |                              |                    | 0xd02a,0xd02e  |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 5f6b2960cccb..e86201d3b8c6 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2163,7 +2163,7 @@ struct ct_fdmi_hba_attr {
                 uint8_t node_name[WWN_SIZE];
                 uint8_t manufacturer[64];
                 uint8_t serial_num[32];
-                uint8_t model[16];
+                uint8_t model[16+1];
                 uint8_t model_desc[80];
                 uint8_t hw_version[32];
                 uint8_t driver_version[32];
@@ -2184,9 +2184,9 @@ struct ct_fdmiv2_hba_attr {
         uint16_t len;
         union {
                 uint8_t node_name[WWN_SIZE];
-                uint8_t manufacturer[32];
+                uint8_t manufacturer[64];
                 uint8_t serial_num[32];
-                uint8_t model[16];
+                uint8_t model[16+1];
                 uint8_t model_desc[80];
                 uint8_t hw_version[16];
                 uint8_t driver_version[32];
@@ -2252,7 +2252,7 @@ struct ct_fdmiv2_port_attr {
                 uint32_t cur_speed;
                 uint32_t max_frame_size;
                 uint8_t os_dev_name[32];
-                uint8_t host_name[32];
+                uint8_t host_name[256];
                 uint8_t node_name[WWN_SIZE];
                 uint8_t port_name[WWN_SIZE];
                 uint8_t port_sym_name[128];
@@ -2283,7 +2283,7 @@ struct ct_fdmi_port_attr {
                 uint32_t cur_speed;
                 uint32_t max_frame_size;
                 uint8_t os_dev_name[32];
-                uint8_t host_name[32];
+                uint8_t host_name[256];
         } a;
 };
 
@@ -3132,7 +3132,8 @@ struct qla_hw_data {
                                 IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
                                 IS_QLA82XX(ha) || IS_QLA83XX(ha) || \
                                 IS_QLA8044(ha) || IS_QLA27XX(ha))
-#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
+#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha) || \
+                                IS_QLA27XX(ha))
 #define IS_NOPOLLING_TYPE(ha)   (IS_QLA81XX(ha) && (ha)->flags.msix_enabled)
 #define IS_FAC_REQUIRED(ha)     (IS_QLA81XX(ha) || IS_QLA83XX(ha) || \
                                 IS_QLA27XX(ha))
@@ -3300,6 +3301,8 @@ struct qla_hw_data {
 #define RISC_RDY_AFT_RESET      3
 #define RISC_SRAM_DUMP_CMPL     4
 #define RISC_EXT_MEM_DUMP_CMPL  5
+#define ISP_MBX_RDY             6
+#define ISP_SOFT_RESET_CMPL     7
         int             fw_dump_reading;
         int             prev_minidump_failed;
         dma_addr_t      eft_dma;
@@ -3587,6 +3590,7 @@ typedef struct scsi_qla_host {
 #define VP_BIND_NEEDED          2
 #define VP_DELETE_NEEDED        3
 #define VP_SCR_NEEDED           4       /* State Change Request registration */
+#define VP_CONFIG_OK            5       /* Flag to cfg VP, if FW is ready */
         atomic_t                vp_state;
 #define VP_OFFLINE              0
 #define VP_ACTIVE               1
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5bb57c5282c9..285cb204f300 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1121,7 +1121,7 @@ qla81xx_reset_mpi(scsi_qla_host_t *vha)
  *
  * Returns 0 on success.
  */
-static inline void
+static inline int
 qla24xx_reset_risc(scsi_qla_host_t *vha)
 {
         unsigned long flags = 0;
@@ -1130,6 +1130,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
         uint32_t cnt, d2;
         uint16_t wd;
         static int abts_cnt; /* ISP abort retry counts */
+        int rval = QLA_SUCCESS;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
@@ -1142,26 +1143,57 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
                 udelay(10);
         }
 
+        if (!(RD_REG_DWORD(&reg->ctrl_status) & CSRX_DMA_ACTIVE))
+                set_bit(DMA_SHUTDOWN_CMPL, &ha->fw_dump_cap_flags);
+
+        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x017e,
+            "HCCR: 0x%x, Control Status %x, DMA active status:0x%x\n",
+            RD_REG_DWORD(&reg->hccr),
+            RD_REG_DWORD(&reg->ctrl_status),
+            (RD_REG_DWORD(&reg->ctrl_status) & CSRX_DMA_ACTIVE));
+
         WRT_REG_DWORD(&reg->ctrl_status,
             CSRX_ISP_SOFT_RESET|CSRX_DMA_SHUTDOWN|MWB_4096_BYTES);
         pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
         udelay(100);
+
         /* Wait for firmware to complete NVRAM accesses. */
         d2 = (uint32_t) RD_REG_WORD(&reg->mailbox0);
-        for (cnt = 10000 ; cnt && d2; cnt--) {
-                udelay(5);
-                d2 = (uint32_t) RD_REG_WORD(&reg->mailbox0);
+        for (cnt = 10000; RD_REG_WORD(&reg->mailbox0) != 0 &&
+            rval == QLA_SUCCESS; cnt--) {
                 barrier();
+                if (cnt)
+                        udelay(5);
+                else
+                        rval = QLA_FUNCTION_TIMEOUT;
         }
 
+        if (rval == QLA_SUCCESS)
+                set_bit(ISP_MBX_RDY, &ha->fw_dump_cap_flags);
+
+        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x017f,
+            "HCCR: 0x%x, MailBox0 Status 0x%x\n",
+            RD_REG_DWORD(&reg->hccr),
+            RD_REG_DWORD(&reg->mailbox0));
+
         /* Wait for soft-reset to complete. */
         d2 = RD_REG_DWORD(&reg->ctrl_status);
-        for (cnt = 6000000 ; cnt && (d2 & CSRX_ISP_SOFT_RESET); cnt--) {
-                udelay(5);
-                d2 = RD_REG_DWORD(&reg->ctrl_status);
+        for (cnt = 0; cnt < 6000000; cnt++) {
                 barrier();
+                if ((RD_REG_DWORD(&reg->ctrl_status) &
+                    CSRX_ISP_SOFT_RESET) == 0)
+                        break;
+
+                udelay(5);
         }
+        if (!(RD_REG_DWORD(&reg->ctrl_status) & CSRX_ISP_SOFT_RESET))
+                set_bit(ISP_SOFT_RESET_CMPL, &ha->fw_dump_cap_flags);
+
+        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x015d,
+            "HCCR: 0x%x, Soft Reset status: 0x%x\n",
+            RD_REG_DWORD(&reg->hccr),
+            RD_REG_DWORD(&reg->ctrl_status));
 
         /* If required, do an MPI FW reset now */
         if (test_and_clear_bit(MPI_RESET_NEEDED, &vha->dpc_flags)) {
@@ -1190,16 +1222,32 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
         RD_REG_DWORD(&reg->hccr);
 
         d2 = (uint32_t) RD_REG_WORD(&reg->mailbox0);
-        for (cnt = 6000000 ; cnt && d2; cnt--) {
-                udelay(5);
-                d2 = (uint32_t) RD_REG_WORD(&reg->mailbox0);
+        for (cnt = 6000000; RD_REG_WORD(&reg->mailbox0) != 0 &&
+            rval == QLA_SUCCESS; cnt--) {
                 barrier();
+                if (cnt)
+                        udelay(5);
+                else
+                        rval = QLA_FUNCTION_TIMEOUT;
         }
+        if (rval == QLA_SUCCESS)
+                set_bit(RISC_RDY_AFT_RESET, &ha->fw_dump_cap_flags);
+
+        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x015e,
+            "Host Risc 0x%x, mailbox0 0x%x\n",
+            RD_REG_DWORD(&reg->hccr),
+             RD_REG_WORD(&reg->mailbox0));
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
+        ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x015f,
+            "Driver in %s mode\n",
+            IS_NOPOLLING_TYPE(ha) ? "Interrupt" : "Polling");
+
         if (IS_NOPOLLING_TYPE(ha))
                 ha->isp_ops->enable_intrs(ha);
+
+        return rval;
 }
 
 static void
@@ -2243,8 +2291,11 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
 
         rval = QLA_SUCCESS;
 
-        /* 20 seconds for loop down. */
-        min_wait = 20;
+        /* Time to wait for loop down */
+        if (IS_P3P_TYPE(ha))
+                min_wait = 30;
+        else
+                min_wait = 20;
 
         /*
          * Firmware should take at most one RATOV to login, plus 5 seconds for
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index a04a1b1f7f32..6dc14cd782b2 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -756,11 +756,21 @@ skip_rio:
                         /*
                          * In case of loop down, restore WWPN from
                          * NVRAM in case of FA-WWPN capable ISP
+                         * Restore for Physical Port only
                          */
-                        if (ha->flags.fawwpn_enabled) {
-                                void *wwpn = ha->init_cb->port_name;
+                        if (!vha->vp_idx) {
+                                if (ha->flags.fawwpn_enabled) {
+                                        void *wwpn = ha->init_cb->port_name;
+                                        memcpy(vha->port_name, wwpn, WWN_SIZE);
+                                        fc_host_port_name(vha->host) =
+                                            wwn_to_u64(vha->port_name);
+                                        ql_dbg(ql_dbg_init + ql_dbg_verbose,
+                                            vha, 0x0144, "LOOP DOWN detected,"
+                                            "restore WWPN %016llx\n",
+                                            wwn_to_u64(vha->port_name));
+                                }
 
-                                memcpy(vha->port_name, wwpn, WWN_SIZE);
+                                clear_bit(VP_CONFIG_OK, &vha->vp_flags);
                         }
 
                         vha->device_flags |= DFLG_NO_CABLE;
@@ -947,6 +957,7 @@ skip_rio:
 
                 set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                 set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
+                set_bit(VP_CONFIG_OK, &vha->vp_flags);
 
                 qlt_async_event(mb[0], vha, mb);
                 break;
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 72971daa2552..02b1c1c5355b 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -33,7 +33,7 @@
 static int
 qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 {
-        int             rval;
+        int             rval, i;
         unsigned long    flags = 0;
         device_reg_t *reg;
         uint8_t         abort_active;
@@ -43,10 +43,12 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
         uint16_t __iomem *optr;
         uint32_t        cnt;
         uint32_t        mboxes;
+        uint16_t __iomem *mbx_reg;
         unsigned long   wait_time;
         struct qla_hw_data *ha = vha->hw;
         scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
+
         ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);
 
         if (ha->pdev->error_state > pci_channel_io_frozen) {
@@ -376,6 +378,18 @@ mbx_done:
                 ql_dbg(ql_dbg_disc, base_vha, 0x1020,
                     "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x, cmd=%x ****.\n",
                     mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3], command);
+
+                ql_dbg(ql_dbg_disc, vha, 0x1115,
+                    "host status: 0x%x, flags:0x%lx, intr ctrl reg:0x%x, intr status:0x%x\n",
+                    RD_REG_DWORD(&reg->isp24.host_status),
+                    ha->fw_dump_cap_flags,
+                    RD_REG_DWORD(&reg->isp24.ictrl),
+                    RD_REG_DWORD(&reg->isp24.istatus));
+
+                mbx_reg = &reg->isp24.mailbox0;
+                for (i = 0; i < 6; i++)
+                        ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x1116,
+                            "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));
         } else {
                 ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__);
         }
@@ -2838,7 +2852,7 @@ qla2x00_write_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        if (!IS_QLA2031(vha->hw))
+        if (!IS_QLA2031(vha->hw) && !IS_QLA27XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1182,
@@ -2846,7 +2860,11 @@ qla2x00_write_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t data)
 
         mcp->mb[0] = MBC_WRITE_SERDES;
         mcp->mb[1] = addr;
-        mcp->mb[2] = data & 0xff;
+        if (IS_QLA2031(vha->hw))
+                mcp->mb[2] = data & 0xff;
+        else
+                mcp->mb[2] = data;
+
         mcp->mb[3] = 0;
         mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
         mcp->in_mb = MBX_0;
@@ -2872,7 +2890,7 @@ qla2x00_read_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t *data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        if (!IS_QLA2031(vha->hw))
+        if (!IS_QLA2031(vha->hw) && !IS_QLA27XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
         ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1185,
@@ -2887,7 +2905,10 @@ qla2x00_read_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t *data)
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(vha, mcp);
 
-        *data = mcp->mb[1] & 0xff;
+        if (IS_QLA2031(vha->hw))
+                *data = mcp->mb[1] & 0xff;
+        else
+                *data = mcp->mb[1];
 
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1186,
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index ca3804e34833..cc94192511cf 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -306,19 +306,25 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 static int
 qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
 {
+        struct qla_hw_data *ha = vha->hw;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
+
         ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
             "Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);
 
         qla2x00_do_work(vha);
 
-        if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {
-                /* VP acquired. complete port configuration */
-                ql_dbg(ql_dbg_dpc, vha, 0x4014,
-                    "Configure VP scheduled.\n");
-                qla24xx_configure_vp(vha);
-                ql_dbg(ql_dbg_dpc, vha, 0x4015,
-                    "Configure VP end.\n");
-                return 0;
+        /* Check if Fw is ready to configure VP first */
+        if (test_bit(VP_CONFIG_OK, &base_vha->vp_flags)) {
+                if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {
+                        /* VP acquired. complete port configuration */
+                        ql_dbg(ql_dbg_dpc, vha, 0x4014,
+                            "Configure VP scheduled.\n");
+                        qla24xx_configure_vp(vha);
+                        ql_dbg(ql_dbg_dpc, vha, 0x4015,
+                            "Configure VP end.\n");
+                        return 0;
+                }
         }
 
         if (test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags)) {
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5319b3cb219e..7462dd70b150 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5834,3 +5834,6 @@ MODULE_FIRMWARE(FW_FILE_ISP2300);
 MODULE_FIRMWARE(FW_FILE_ISP2322);
 MODULE_FIRMWARE(FW_FILE_ISP24XX);
 MODULE_FIRMWARE(FW_FILE_ISP25XX);
+MODULE_FIRMWARE(FW_FILE_ISP2031);
+MODULE_FIRMWARE(FW_FILE_ISP8031);
+MODULE_FIRMWARE(FW_FILE_ISP27XX);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index b656a05613e8..028e8c8a7de9 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1718,13 +1718,16 @@ qla83xx_beacon_blink(struct scsi_qla_host *vha)
         uint16_t orig_led_cfg[6];
         uint32_t led_10_value, led_43_value;
 
-        if (!IS_QLA83XX(ha) && !IS_QLA81XX(ha))
+        if (!IS_QLA83XX(ha) && !IS_QLA81XX(ha) && !IS_QLA27XX(ha))
                 return;
 
         if (!ha->beacon_blink_led)
                 return;
 
-        if (IS_QLA2031(ha)) {
+        if (IS_QLA27XX(ha)) {
+                qla2x00_write_ram_word(vha, 0x1003, 0x40000230);
+                qla2x00_write_ram_word(vha, 0x1004, 0x40000230);
+        } else if (IS_QLA2031(ha)) {
                 led_select_value = qla83xx_select_led_port(ha);
 
                 qla83xx_wr_reg(vha, led_select_value, 0x40000230);
@@ -1811,7 +1814,7 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)
                         return QLA_FUNCTION_FAILED;
                 }
 
-                if (IS_QLA2031(ha))
+                if (IS_QLA2031(ha) || IS_QLA27XX(ha))
                         goto skip_gpio;
 
                 spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -1848,7 +1851,7 @@ qla24xx_beacon_off(struct scsi_qla_host *vha)
 
         ha->beacon_blink_led = 0;
 
-        if (IS_QLA2031(ha))
+        if (IS_QLA2031(ha) || IS_QLA27XX(ha))
                 goto set_fw_options;
 
         if (IS_QLA8031(ha) || IS_QLA81XX(ha))
diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c
index a8c0c7362e48..962cb89fe0ae 100644
--- a/drivers/scsi/qla2xxx/qla_tmpl.c
+++ b/drivers/scsi/qla2xxx/qla_tmpl.c
@@ -190,7 +190,7 @@ static inline void
 qla27xx_write_reg(__iomem struct device_reg_24xx *reg,
         uint offset, uint32_t data, void *buf)
 {
-        __iomem void *window = reg + offset;
+        __iomem void *window = (void __iomem *)reg + offset;
 
         if (buf) {
                 WRT_REG_DWORD(window, data);
@@ -219,6 +219,8 @@ qla27xx_skip_entry(struct qla27xx_fwdt_entry *ent, void *buf)
 {
         if (buf)
                 ent->hdr.driver_flags |= DRIVER_FLAG_SKIP_ENTRY;
+        ql_dbg(ql_dbg_misc + ql_dbg_verbose, NULL, 0xd011,
+            "Skipping entry %d\n", ent->hdr.entry_type);
 }
 
 static int
@@ -784,6 +786,13 @@ qla27xx_walk_template(struct scsi_qla_host *vha,
 
         ql_dbg(ql_dbg_misc, vha, 0xd01b,
             "%s: len=%lx\n", __func__, *len);
+
+        if (buf) {
+                ql_log(ql_log_warn, vha, 0xd015,
+                    "Firmware dump saved to temp buffer (%ld/%p)\n",
+                    vha->host_no, vha->hw->fw_dump);
+                qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);
+        }
 }
 
 static void
@@ -938,6 +947,10 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked)
                 ql_log(ql_log_warn, vha, 0xd01e, "fwdump buffer missing.\n");
         else if (!vha->hw->fw_dump_template)
                 ql_log(ql_log_warn, vha, 0xd01f, "fwdump template missing.\n");
+        else if (vha->hw->fw_dumped)
+                ql_log(ql_log_warn, vha, 0xd300,
+                    "Firmware has been previously dumped (%p),"
+                    " -- ignoring request\n", vha->hw->fw_dump);
         else
                 qla27xx_execute_fwdt_template(vha);
 
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index d88b86214ec5..2ed9ab90a455 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.07.00.16-k"
+#define QLA2XXX_VERSION      "8.07.00.18-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    7
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c9c3b579eece..3833bf59fb66 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -972,18 +972,24 @@ EXPORT_SYMBOL(scsi_report_opcode);
  * Description: Gets a reference to the scsi_device and increments the use count
  * of the underlying LLDD module.  You must hold host_lock of the
  * parent Scsi_Host or already have a reference when calling this.
+ *
+ * This will fail if a device is deleted or cancelled, or when the LLD module
+ * is in the process of being unloaded.
  */
 int scsi_device_get(struct scsi_device *sdev)
 {
-        if (sdev->sdev_state == SDEV_DEL)
-                return -ENXIO;
+        if (sdev->sdev_state == SDEV_DEL || sdev->sdev_state == SDEV_CANCEL)
+                goto fail;
         if (!get_device(&sdev->sdev_gendev))
-                return -ENXIO;
-        /* We can fail try_module_get if we're doing SCSI operations
-         * from module exit (like cache flush) */
-        __module_get(sdev->host->hostt->module);
-
+                goto fail;
+        if (!try_module_get(sdev->host->hostt->module))
+                goto fail_put_device;
         return 0;
+
+fail_put_device:
+        put_device(&sdev->sdev_gendev);
+fail:
+        return -ENXIO;
 }
 EXPORT_SYMBOL(scsi_device_get);
 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 9c0a520d933c..60aae01caa89 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1570,16 +1570,15 @@ EXPORT_SYMBOL(scsi_add_device);
 
 void scsi_rescan_device(struct device *dev)
 {
-        if (!dev->driver)
-                return;
-
-        if (try_module_get(dev->driver->owner)) {
+        device_lock(dev);
+        if (dev->driver && try_module_get(dev->driver->owner)) {
                 struct scsi_driver *drv = to_scsi_driver(dev->driver);
 
                 if (drv->rescan)
                         drv->rescan(dev);
                 module_put(dev->driver->owner);
         }
+        device_unlock(dev);
 }
 EXPORT_SYMBOL(scsi_rescan_device);
 
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 5d6f348eb3d8..24eaaf66af71 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -265,6 +265,7 @@ static const struct {
         { FC_PORTSPEED_40GBIT,          "40 Gbit" },
         { FC_PORTSPEED_50GBIT,          "50 Gbit" },
         { FC_PORTSPEED_100GBIT,         "100 Gbit" },
+        { FC_PORTSPEED_25GBIT,          "25 Gbit" },
         { FC_PORTSPEED_NOT_NEGOTIATED,  "Not Negotiated" },
 };
 fc_bitfield_name_search(port_speed, fc_port_speed_names)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6b78476d04bb..dcc42446f58a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -564,10 +564,12 @@ static int sd_major(int major_idx)
         }
 }
 
-static struct scsi_disk *__scsi_disk_get(struct gendisk *disk)
+static struct scsi_disk *scsi_disk_get(struct gendisk *disk)
 {
         struct scsi_disk *sdkp = NULL;
 
+        mutex_lock(&sd_ref_mutex);
+
         if (disk->private_data) {
                 sdkp = scsi_disk(disk);
                 if (scsi_device_get(sdkp->device) == 0)
@@ -575,27 +577,6 @@ static struct scsi_disk *__scsi_disk_get(struct gendisk *disk)
                 else
                         sdkp = NULL;
         }
-        return sdkp;
-}
-
-static struct scsi_disk *scsi_disk_get(struct gendisk *disk)
-{
-        struct scsi_disk *sdkp;
-
-        mutex_lock(&sd_ref_mutex);
-        sdkp = __scsi_disk_get(disk);
-        mutex_unlock(&sd_ref_mutex);
-        return sdkp;
-}
-
-static struct scsi_disk *scsi_disk_get_from_dev(struct device *dev)
-{
-        struct scsi_disk *sdkp;
-
-        mutex_lock(&sd_ref_mutex);
-        sdkp = dev_get_drvdata(dev);
-        if (sdkp)
-                sdkp = __scsi_disk_get(sdkp->disk);
         mutex_unlock(&sd_ref_mutex);
         return sdkp;
 }
@@ -610,8 +591,6 @@ static void scsi_disk_put(struct scsi_disk *sdkp)
         mutex_unlock(&sd_ref_mutex);
 }
 
-
-
 static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
                                            unsigned int dix, unsigned int dif)
 {
@@ -1525,12 +1504,9 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
 
 static void sd_rescan(struct device *dev)
 {
-        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+        struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
-        if (sdkp) {
-                revalidate_disk(sdkp->disk);
-                scsi_disk_put(sdkp);
-        }
+        revalidate_disk(sdkp->disk);
 }
 
 
@@ -2235,11 +2211,11 @@ got_data:
 
         {
                 char cap_str_2[10], cap_str_10[10];
-                u64 sz = (u64)sdkp->capacity << ilog2(sector_size);
 
-                string_get_size(sz, STRING_UNITS_2, cap_str_2,
-                                sizeof(cap_str_2));
-                string_get_size(sz, STRING_UNITS_10, cap_str_10,
+                string_get_size(sdkp->capacity, sector_size,
+                                STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
+                string_get_size(sdkp->capacity, sector_size,
+                                STRING_UNITS_10, cap_str_10,
                                 sizeof(cap_str_10));
 
                 if (sdkp->first_scan || old_capacity != sdkp->capacity) {
@@ -3149,13 +3125,13 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
  */
 static void sd_shutdown(struct device *dev)
 {
-        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+        struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
         if (!sdkp)
                 return;         /* this can happen */
 
         if (pm_runtime_suspended(dev))
-                goto exit;
+                return;
 
         if (sdkp->WCE && sdkp->media_present) {
                 sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
@@ -3166,14 +3142,11 @@ static void sd_shutdown(struct device *dev)
                 sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
                 sd_start_stop_device(sdkp, 0);
         }
-
-exit:
-        scsi_disk_put(sdkp);
 }
 
 static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
 {
-        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
+        struct scsi_disk *sdkp = dev_get_drvdata(dev);
         int ret = 0;
 
         if (!sdkp)
@@ -3199,7 +3172,6 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
         }
 
 done:
-        scsi_disk_put(sdkp);
         return ret;
 }
 
@@ -3215,18 +3187,13 @@ static int sd_suspend_runtime(struct device *dev)
 
 static int sd_resume(struct device *dev)
 {
-        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
-        int ret = 0;
+        struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
         if (!sdkp->device->manage_start_stop)
-                goto done;
+                return 0;
 
         sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
-        ret = sd_start_stop_device(sdkp, 1);
-
-done:
-        scsi_disk_put(sdkp);
-        return ret;
+        return sd_start_stop_device(sdkp, 1);
 }
 
 /**
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index efc6e446b6c8..d9dad90344d5 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -308,11 +308,16 @@ enum storvsc_request_type {
  * This is the end of Protocol specific defines.
  */
 
-static int storvsc_ringbuffer_size = (20 * PAGE_SIZE);
+static int storvsc_ringbuffer_size = (256 * PAGE_SIZE);
+static u32 max_outstanding_req_per_channel;
+
+static int storvsc_vcpus_per_sub_channel = 4;
 
 module_param(storvsc_ringbuffer_size, int, S_IRUGO);
 MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)");
 
+module_param(storvsc_vcpus_per_sub_channel, int, S_IRUGO);
+MODULE_PARM_DESC(vcpus_per_sub_channel, "Ratio of VCPUs to subchannels");
 /*
  * Timeout in seconds for all devices managed by this driver.
  */
@@ -320,7 +325,6 @@ static int storvsc_timeout = 180;
 
 static int msft_blist_flags = BLIST_TRY_VPD_PAGES;
 
-#define STORVSC_MAX_IO_REQUESTS                         200
 
 static void storvsc_on_channel_callback(void *context);
 
@@ -347,7 +351,10 @@ struct storvsc_cmd_request {
         /* Synchronize the request/response if needed */
         struct completion wait_event;
 
-        struct hv_multipage_buffer data_buffer;
+        struct vmbus_channel_packet_multipage_buffer mpb;
+        struct vmbus_packet_mpb_array *payload;
+        u32 payload_sz;
+
         struct vstor_packet vstor_packet;
 };
 
@@ -373,6 +380,10 @@ struct storvsc_device {
         unsigned char path_id;
         unsigned char target_id;
 
+        /*
+         * Max I/O, the device can support.
+         */
+        u32   max_transfer_bytes;
         /* Used for vsc/vsp channel reset process */
         struct storvsc_cmd_request init_request;
         struct storvsc_cmd_request reset_request;
@@ -618,19 +629,6 @@ cleanup:
         return NULL;
 }
 
-/* Disgusting wrapper functions */
-static inline unsigned long sg_kmap_atomic(struct scatterlist *sgl, int idx)
-{
-        void *addr = kmap_atomic(sg_page(sgl + idx));
-        return (unsigned long)addr;
-}
-
-static inline void sg_kunmap_atomic(unsigned long addr)
-{
-        kunmap_atomic((void *)addr);
-}
-
-
 /* Assume the original sgl has enough room */
 static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
                                             struct scatterlist *bounce_sgl,
@@ -645,32 +643,38 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
         unsigned long bounce_addr = 0;
         unsigned long dest_addr = 0;
         unsigned long flags;
+        struct scatterlist *cur_dest_sgl;
+        struct scatterlist *cur_src_sgl;
 
         local_irq_save(flags);
-
+        cur_dest_sgl = orig_sgl;
+        cur_src_sgl = bounce_sgl;
         for (i = 0; i < orig_sgl_count; i++) {
-                dest_addr = sg_kmap_atomic(orig_sgl,i) + orig_sgl[i].offset;
+                dest_addr = (unsigned long)
+                                kmap_atomic(sg_page(cur_dest_sgl)) +
+                                cur_dest_sgl->offset;
                 dest = dest_addr;
-                destlen = orig_sgl[i].length;
+                destlen = cur_dest_sgl->length;
 
                 if (bounce_addr == 0)
-                        bounce_addr = sg_kmap_atomic(bounce_sgl,j);
+                        bounce_addr = (unsigned long)kmap_atomic(
+                                                        sg_page(cur_src_sgl));
 
                 while (destlen) {
-                        src = bounce_addr + bounce_sgl[j].offset;
-                        srclen = bounce_sgl[j].length - bounce_sgl[j].offset;
+                        src = bounce_addr + cur_src_sgl->offset;
+                        srclen = cur_src_sgl->length - cur_src_sgl->offset;
 
                         copylen = min(srclen, destlen);
                         memcpy((void *)dest, (void *)src, copylen);
 
                         total_copied += copylen;
-                        bounce_sgl[j].offset += copylen;
+                        cur_src_sgl->offset += copylen;
                         destlen -= copylen;
                         dest += copylen;
 
-                        if (bounce_sgl[j].offset == bounce_sgl[j].length) {
+                        if (cur_src_sgl->offset == cur_src_sgl->length) {
                                 /* full */
-                                sg_kunmap_atomic(bounce_addr);
+                                kunmap_atomic((void *)bounce_addr);
                                 j++;
 
                                 /*
@@ -684,21 +688,27 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
                                         /*
                                          * We are done; cleanup and return.
                                          */
-                                        sg_kunmap_atomic(dest_addr - orig_sgl[i].offset);
+                                        kunmap_atomic((void *)(dest_addr -
+                                                cur_dest_sgl->offset));
                                         local_irq_restore(flags);
                                         return total_copied;
                                 }
 
                                 /* if we need to use another bounce buffer */
-                                if (destlen || i != orig_sgl_count - 1)
-                                        bounce_addr = sg_kmap_atomic(bounce_sgl,j);
+                                if (destlen || i != orig_sgl_count - 1) {
+                                        cur_src_sgl = sg_next(cur_src_sgl);
+                                        bounce_addr = (unsigned long)
+                                                        kmap_atomic(
+                                                        sg_page(cur_src_sgl));
+                                }
                         } else if (destlen == 0 && i == orig_sgl_count - 1) {
                                 /* unmap the last bounce that is < PAGE_SIZE */
-                                sg_kunmap_atomic(bounce_addr);
+                                kunmap_atomic((void *)bounce_addr);
                         }
                 }
 
-                sg_kunmap_atomic(dest_addr - orig_sgl[i].offset);
+                kunmap_atomic((void *)(dest_addr - cur_dest_sgl->offset));
+                cur_dest_sgl = sg_next(cur_dest_sgl);
         }
 
         local_irq_restore(flags);
@@ -719,48 +729,62 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
         unsigned long bounce_addr = 0;
         unsigned long src_addr = 0;
         unsigned long flags;
+        struct scatterlist *cur_src_sgl;
+        struct scatterlist *cur_dest_sgl;
 
         local_irq_save(flags);
 
+        cur_src_sgl = orig_sgl;
+        cur_dest_sgl = bounce_sgl;
+
         for (i = 0; i < orig_sgl_count; i++) {
-                src_addr = sg_kmap_atomic(orig_sgl,i) + orig_sgl[i].offset;
+                src_addr = (unsigned long)
+                                kmap_atomic(sg_page(cur_src_sgl)) +
+                                cur_src_sgl->offset;
                 src = src_addr;
-                srclen = orig_sgl[i].length;
+                srclen = cur_src_sgl->length;
 
                 if (bounce_addr == 0)
-                        bounce_addr = sg_kmap_atomic(bounce_sgl,j);
+                        bounce_addr = (unsigned long)
+                                        kmap_atomic(sg_page(cur_dest_sgl));
 
                 while (srclen) {
                         /* assume bounce offset always == 0 */
-                        dest = bounce_addr + bounce_sgl[j].length;
-                        destlen = PAGE_SIZE - bounce_sgl[j].length;
+                        dest = bounce_addr + cur_dest_sgl->length;
+                        destlen = PAGE_SIZE - cur_dest_sgl->length;
 
                         copylen = min(srclen, destlen);
                         memcpy((void *)dest, (void *)src, copylen);
 
                         total_copied += copylen;
-                        bounce_sgl[j].length += copylen;
+                        cur_dest_sgl->length += copylen;
                         srclen -= copylen;
                         src += copylen;
 
-                        if (bounce_sgl[j].length == PAGE_SIZE) {
+                        if (cur_dest_sgl->length == PAGE_SIZE) {
                                 /* full..move to next entry */
-                                sg_kunmap_atomic(bounce_addr);
+                                kunmap_atomic((void *)bounce_addr);
+                                bounce_addr = 0;
                                 j++;
+                        }
 
-                                /* if we need to use another bounce buffer */
-                                if (srclen || i != orig_sgl_count - 1)
-                                        bounce_addr = sg_kmap_atomic(bounce_sgl,j);
-
-                        } else if (srclen == 0 && i == orig_sgl_count - 1) {
-                                /* unmap the last bounce that is < PAGE_SIZE */
-                                sg_kunmap_atomic(bounce_addr);
+                        /* if we need to use another bounce buffer */
+                        if (srclen && bounce_addr == 0) {
+                                cur_dest_sgl = sg_next(cur_dest_sgl);
+                                bounce_addr = (unsigned long)
+                                                kmap_atomic(
+                                                sg_page(cur_dest_sgl));
                         }
+
                 }
 
-                sg_kunmap_atomic(src_addr - orig_sgl[i].offset);
+                kunmap_atomic((void *)(src_addr - cur_src_sgl->offset));
+                cur_src_sgl = sg_next(cur_src_sgl);
         }
 
+        if (bounce_addr)
+                kunmap_atomic((void *)bounce_addr);
+
         local_irq_restore(flags);
 
         return total_copied;
@@ -970,6 +994,8 @@ static int storvsc_channel_init(struct hv_device *device)
                     STORAGE_CHANNEL_SUPPORTS_MULTI_CHANNEL)
                         process_sub_channels = true;
         }
+        stor_device->max_transfer_bytes =
+                vstor_packet->storage_channel_properties.max_transfer_bytes;
 
         memset(vstor_packet, 0, sizeof(struct vstor_packet));
         vstor_packet->operation = VSTOR_OPERATION_END_INITIALIZATION;
@@ -1080,6 +1106,8 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
         struct Scsi_Host *host;
         struct storvsc_device *stor_dev;
         struct hv_device *dev = host_dev->dev;
+        u32 payload_sz = cmd_request->payload_sz;
+        void *payload = cmd_request->payload;
 
         stor_dev = get_in_stor_device(dev);
         host = stor_dev->host;
@@ -1109,10 +1137,14 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
                                          sense_hdr.ascq);
 
         scsi_set_resid(scmnd,
-                cmd_request->data_buffer.len -
+                cmd_request->payload->range.len -
                 vm_srb->data_transfer_length);
 
         scmnd->scsi_done(scmnd);
+
+        if (payload_sz >
+                sizeof(struct vmbus_channel_packet_multipage_buffer))
+                kfree(payload);
 }
 
 static void storvsc_on_io_completion(struct hv_device *device,
@@ -1314,7 +1346,7 @@ static int storvsc_dev_remove(struct hv_device *device)
 }
 
 static int storvsc_do_io(struct hv_device *device,
-                              struct storvsc_cmd_request *request)
+                         struct storvsc_cmd_request *request)
 {
         struct storvsc_device *stor_device;
         struct vstor_packet *vstor_packet;
@@ -1346,19 +1378,20 @@ static int storvsc_do_io(struct hv_device *device,
 
 
         vstor_packet->vm_srb.data_transfer_length =
-        request->data_buffer.len;
+        request->payload->range.len;
 
         vstor_packet->operation = VSTOR_OPERATION_EXECUTE_SRB;
 
-        if (request->data_buffer.len) {
-                ret = vmbus_sendpacket_multipagebuffer(outgoing_channel,
-                                &request->data_buffer,
+        if (request->payload->range.len) {
+
+                ret = vmbus_sendpacket_mpb_desc(outgoing_channel,
+                                request->payload, request->payload_sz,
                                 vstor_packet,
                                 (sizeof(struct vstor_packet) -
                                 vmscsi_size_delta),
                                 (unsigned long)request);
         } else {
-                ret = vmbus_sendpacket(device->channel, vstor_packet,
+                ret = vmbus_sendpacket(outgoing_channel, vstor_packet,
                                (sizeof(struct vstor_packet) -
                                 vmscsi_size_delta),
                                (unsigned long)request,
@@ -1376,7 +1409,6 @@ static int storvsc_do_io(struct hv_device *device,
 
 static int storvsc_device_configure(struct scsi_device *sdevice)
 {
-        scsi_change_queue_depth(sdevice, STORVSC_MAX_IO_REQUESTS);
 
         blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);
 
@@ -1526,6 +1558,10 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
         struct scatterlist *sgl;
         unsigned int sg_count = 0;
         struct vmscsi_request *vm_srb;
+        struct scatterlist *cur_sgl;
+        struct vmbus_packet_mpb_array  *payload;
+        u32 payload_sz;
+        u32 length;
 
         if (vmstor_current_major <= VMSTOR_WIN8_MAJOR) {
                 /*
@@ -1579,46 +1615,71 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
 
         memcpy(vm_srb->cdb, scmnd->cmnd, vm_srb->cdb_length);
 
-        cmd_request->data_buffer.len = scsi_bufflen(scmnd);
-        if (scsi_sg_count(scmnd)) {
-                sgl = (struct scatterlist *)scsi_sglist(scmnd);
-                sg_count = scsi_sg_count(scmnd);
+        sgl = (struct scatterlist *)scsi_sglist(scmnd);
+        sg_count = scsi_sg_count(scmnd);
+
+        length = scsi_bufflen(scmnd);
+        payload = (struct vmbus_packet_mpb_array *)&cmd_request->mpb;
+        payload_sz = sizeof(cmd_request->mpb);
 
+        if (sg_count) {
                 /* check if we need to bounce the sgl */
                 if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) {
                         cmd_request->bounce_sgl =
-                                create_bounce_buffer(sgl, scsi_sg_count(scmnd),
-                                                     scsi_bufflen(scmnd),
+                                create_bounce_buffer(sgl, sg_count,
+                                                     length,
                                                      vm_srb->data_in);
                         if (!cmd_request->bounce_sgl)
                                 return SCSI_MLQUEUE_HOST_BUSY;
 
                         cmd_request->bounce_sgl_count =
-                                ALIGN(scsi_bufflen(scmnd), PAGE_SIZE) >>
-                                        PAGE_SHIFT;
+                                ALIGN(length, PAGE_SIZE) >> PAGE_SHIFT;
 
                         if (vm_srb->data_in == WRITE_TYPE)
                                 copy_to_bounce_buffer(sgl,
-                                        cmd_request->bounce_sgl,
-                                        scsi_sg_count(scmnd));
+                                        cmd_request->bounce_sgl, sg_count);
 
                         sgl = cmd_request->bounce_sgl;
                         sg_count = cmd_request->bounce_sgl_count;
                 }
 
-                cmd_request->data_buffer.offset = sgl[0].offset;
 
-                for (i = 0; i < sg_count; i++)
-                        cmd_request->data_buffer.pfn_array[i] =
-                                page_to_pfn(sg_page((&sgl[i])));
+                if (sg_count > MAX_PAGE_BUFFER_COUNT) {
+
+                        payload_sz = (sg_count * sizeof(void *) +
+                                      sizeof(struct vmbus_packet_mpb_array));
+                        payload = kmalloc(payload_sz, GFP_ATOMIC);
+                        if (!payload) {
+                                if (cmd_request->bounce_sgl_count)
+                                        destroy_bounce_buffer(
+                                        cmd_request->bounce_sgl,
+                                        cmd_request->bounce_sgl_count);
+
+                                        return SCSI_MLQUEUE_DEVICE_BUSY;
+                        }
+                }
+
+                payload->range.len = length;
+                payload->range.offset = sgl[0].offset;
+
+                cur_sgl = sgl;
+                for (i = 0; i < sg_count; i++) {
+                        payload->range.pfn_array[i] =
+                                page_to_pfn(sg_page((cur_sgl)));
+                        cur_sgl = sg_next(cur_sgl);
+                }
 
         } else if (scsi_sglist(scmnd)) {
-                cmd_request->data_buffer.offset =
+                payload->range.len = length;
+                payload->range.offset =
                         virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
-                cmd_request->data_buffer.pfn_array[0] =
+                payload->range.pfn_array[0] =
                         virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
         }
 
+        cmd_request->payload = payload;
+        cmd_request->payload_sz = payload_sz;
+
         /* Invokes the vsc to start an IO */
         ret = storvsc_do_io(dev, cmd_request);
 
@@ -1646,12 +1707,8 @@ static struct scsi_host_template scsi_driver = {
         .eh_timed_out =         storvsc_eh_timed_out,
         .slave_configure =      storvsc_device_configure,
         .cmd_per_lun =          255,
-        .can_queue =            STORVSC_MAX_IO_REQUESTS*STORVSC_MAX_TARGETS,
         .this_id =              -1,
-        /* no use setting to 0 since ll_blk_rw reset it to 1 */
-        /* currently 32 */
-        .sg_tablesize =         MAX_MULTIPAGE_BUFFER_COUNT,
-        .use_clustering =       DISABLE_CLUSTERING,
+        .use_clustering =       ENABLE_CLUSTERING,
         /* Make sure we dont get a sg segment crosses a page boundary */
         .dma_boundary =         PAGE_SIZE-1,
         .no_write_same =        1,
@@ -1686,6 +1743,7 @@ static int storvsc_probe(struct hv_device *device,
                         const struct hv_vmbus_device_id *dev_id)
 {
         int ret;
+        int num_cpus = num_online_cpus();
         struct Scsi_Host *host;
         struct hv_host_device *host_dev;
         bool dev_is_ide = ((dev_id->driver_data == IDE_GUID) ? true : false);
@@ -1694,6 +1752,7 @@ static int storvsc_probe(struct hv_device *device,
         int max_luns_per_target;
         int max_targets;
         int max_channels;
+        int max_sub_channels = 0;
 
         /*
          * Based on the windows host we are running on,
@@ -1719,12 +1778,18 @@ static int storvsc_probe(struct hv_device *device,
                 max_luns_per_target = STORVSC_MAX_LUNS_PER_TARGET;
                 max_targets = STORVSC_MAX_TARGETS;
                 max_channels = STORVSC_MAX_CHANNELS;
+                /*
+                 * On Windows8 and above, we support sub-channels for storage.
+                 * The number of sub-channels offerred is based on the number of
+                 * VCPUs in the guest.
+                 */
+                max_sub_channels = (num_cpus / storvsc_vcpus_per_sub_channel);
                 break;
         }
 
-        if (dev_id->driver_data == SFC_GUID)
-                scsi_driver.can_queue = (STORVSC_MAX_IO_REQUESTS *
-                                         STORVSC_FC_MAX_TARGETS);
+        scsi_driver.can_queue = (max_outstanding_req_per_channel *
+                                 (max_sub_channels + 1));
+
         host = scsi_host_alloc(&scsi_driver,
                                sizeof(struct hv_host_device));
         if (!host)
@@ -1780,6 +1845,12 @@ static int storvsc_probe(struct hv_device *device,
         /* max cmd length */
         host->max_cmd_len = STORVSC_MAX_CMD_LEN;
 
+        /*
+         * set the table size based on the info we got
+         * from the host.
+         */
+        host->sg_tablesize = (stor_device->max_transfer_bytes >> PAGE_SHIFT);
+
         /* Register the HBA and start the scsi bus scan */
         ret = scsi_add_host(host, &device->device);
         if (ret != 0)
@@ -1837,7 +1908,6 @@ static struct hv_driver storvsc_drv = {
 
 static int __init storvsc_drv_init(void)
 {
-        u32 max_outstanding_req_per_channel;
 
         /*
          * Divide the ring buffer data size (which is 1 page less
@@ -1852,10 +1922,6 @@ static int __init storvsc_drv_init(void)
                 vmscsi_size_delta,
                 sizeof(u64)));
 
-        if (max_outstanding_req_per_channel <
-            STORVSC_MAX_IO_REQUESTS)
-                return -EINVAL;
-
         return vmbus_driver_register(&storvsc_drv);
 }
 
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 2a906d1d34ba..22a42836d193 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -676,7 +676,6 @@ static struct platform_driver sun3_scsi_driver = {
         .remove = __exit_p(sun3_scsi_remove),
         .driver = {
                 .name   = DRV_MODULE_NAME,
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 9217af9bf734..6652a8171de6 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -214,8 +214,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
         struct ufs_qcom_host *host = hba->priv;
         struct phy *phy = host->generic_phy;
         int ret = 0;
-        u8 major;
-        u16 minor, step;
         bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
                                                         ? true : false;
 
@@ -224,8 +222,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
         /* provide 1ms delay to let the reset pulse propagate */
         usleep_range(1000, 1100);
 
-        ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
-        ufs_qcom_phy_save_controller_version(phy, major, minor, step);
         ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B);
         if (ret) {
                 dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = %d\n",
@@ -698,16 +694,24 @@ out:
  */
 static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
 {
-        u8 major;
-        u16 minor, step;
+        struct ufs_qcom_host *host = hba->priv;
 
-        ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
+        if (host->hw_ver.major == 0x1)
+                hba->quirks |= UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS;
 
-        /*
-         * TBD
-         * here we should be advertising controller quirks according to
-         * controller version.
-         */
+        if (host->hw_ver.major >= 0x2) {
+                if (!ufs_qcom_cap_qunipro(host))
+                        /* Legacy UniPro mode still need following quirks */
+                        hba->quirks |= UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS;
+        }
+}
+
+static void ufs_qcom_set_caps(struct ufs_hba *hba)
+{
+        struct ufs_qcom_host *host = hba->priv;
+
+        if (host->hw_ver.major >= 0x2)
+                host->caps = UFS_QCOM_CAP_QUNIPRO;
 }
 
 static int ufs_qcom_get_bus_vote(struct ufs_qcom_host *host,
@@ -929,6 +933,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         if (err)
                 goto out_host_free;
 
+        ufs_qcom_get_controller_revision(hba, &host->hw_ver.major,
+                &host->hw_ver.minor, &host->hw_ver.step);
+
+        /* update phy revision information before calling phy_init() */
+        ufs_qcom_phy_save_controller_version(host->generic_phy,
+                host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);
+
         phy_init(host->generic_phy);
         err = phy_power_on(host->generic_phy);
         if (err)
@@ -938,6 +949,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         if (err)
                 goto out_disable_phy;
 
+        ufs_qcom_set_caps(hba);
         ufs_qcom_advertise_quirks(hba);
 
         hba->caps |= UFSHCD_CAP_CLK_GATING | UFSHCD_CAP_CLK_SCALING;
diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h
index 9a6febd007df..db2c0a00e846 100644
--- a/drivers/scsi/ufs/ufs-qcom.h
+++ b/drivers/scsi/ufs/ufs-qcom.h
@@ -151,7 +151,23 @@ struct ufs_qcom_bus_vote {
         struct device_attribute max_bus_bw;
 };
 
+/* Host controller hardware version: major.minor.step */
+struct ufs_hw_version {
+        u16 step;
+        u16 minor;
+        u8 major;
+};
 struct ufs_qcom_host {
+
+        /*
+         * Set this capability if host controller supports the QUniPro mode
+         * and if driver wants the Host controller to operate in QUniPro mode.
+         * Note: By default this capability will be kept enabled if host
+         * controller supports the QUniPro mode.
+         */
+        #define UFS_QCOM_CAP_QUNIPRO    UFS_BIT(0)
+        u32 caps;
+
         struct phy *generic_phy;
         struct ufs_hba *hba;
         struct ufs_qcom_bus_vote bus_vote;
@@ -161,10 +177,20 @@ struct ufs_qcom_host {
         struct clk *rx_l1_sync_clk;
         struct clk *tx_l1_sync_clk;
         bool is_lane_clks_enabled;
+
+        struct ufs_hw_version hw_ver;
 };
 
 #define ufs_qcom_is_link_off(hba) ufshcd_is_link_off(hba)
 #define ufs_qcom_is_link_active(hba) ufshcd_is_link_active(hba)
 #define ufs_qcom_is_link_hibern8(hba) ufshcd_is_link_hibern8(hba)
 
+static inline bool ufs_qcom_cap_qunipro(struct ufs_qcom_host *host)
+{
+        if (host->caps & UFS_QCOM_CAP_QUNIPRO)
+                return true;
+        else
+                return false;
+}
+
 #endif /* UFS_QCOM_H_ */
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2aa85e398f76..648a44675880 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -183,6 +183,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
 static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
 static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
 static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
+static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
 static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
 static irqreturn_t ufshcd_intr(int irq, void *__hba);
 static int ufshcd_config_pwr_mode(struct ufs_hba *hba,
@@ -972,6 +973,8 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
 
         ufshcd_hold(hba, false);
         mutex_lock(&hba->uic_cmd_mutex);
+        ufshcd_add_delay_before_dme_cmd(hba);
+
         spin_lock_irqsave(hba->host->host_lock, flags);
         ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
         spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -2058,6 +2061,37 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)
         return ret;
 }
 
+static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba)
+{
+        #define MIN_DELAY_BEFORE_DME_CMDS_US    1000
+        unsigned long min_sleep_time_us;
+
+        if (!(hba->quirks & UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS))
+                return;
+
+        /*
+         * last_dme_cmd_tstamp will be 0 only for 1st call to
+         * this function
+         */
+        if (unlikely(!ktime_to_us(hba->last_dme_cmd_tstamp))) {
+                min_sleep_time_us = MIN_DELAY_BEFORE_DME_CMDS_US;
+        } else {
+                unsigned long delta =
+                        (unsigned long) ktime_to_us(
+                                ktime_sub(ktime_get(),
+                                hba->last_dme_cmd_tstamp));
+
+                if (delta < MIN_DELAY_BEFORE_DME_CMDS_US)
+                        min_sleep_time_us =
+                                MIN_DELAY_BEFORE_DME_CMDS_US - delta;
+                else
+                        return; /* no more delay required */
+        }
+
+        /* allow sleep for extra 50us if needed */
+        usleep_range(min_sleep_time_us, min_sleep_time_us + 50);
+}
+
 /**
  * ufshcd_dme_set_attr - UIC command for DME_SET, DME_PEER_SET
  * @hba: per adapter instance
@@ -2157,6 +2191,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)
 
         mutex_lock(&hba->uic_cmd_mutex);
         init_completion(&uic_async_done);
+        ufshcd_add_delay_before_dme_cmd(hba);
 
         spin_lock_irqsave(hba->host->host_lock, flags);
         hba->uic_async_done = &uic_async_done;
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 4a574aa45855..b47ff07698e8 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -366,6 +366,7 @@ struct ufs_init_prefetch {
  * @saved_err: sticky error mask
  * @saved_uic_err: sticky UIC error mask
  * @dev_cmd: ufs device management command information
+ * @last_dme_cmd_tstamp: time stamp of the last completed DME command
  * @auto_bkops_enabled: to track whether bkops is enabled in device
  * @vreg_info: UFS device voltage regulator information
  * @clk_list_head: UFS host controller clocks list node head
@@ -416,6 +417,13 @@ struct ufs_hba {
         unsigned int irq;
         bool is_irq_enabled;
 
+        /*
+         * delay before each dme command is required as the unipro
+         * layer has shown instabilities
+         */
+        #define UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS              UFS_BIT(0)
+
+        unsigned int quirks;    /* Deviations from standard UFSHCI spec. */
 
         wait_queue_head_t tm_wq;
         wait_queue_head_t tm_tag_wq;
@@ -446,6 +454,7 @@ struct ufs_hba {
 
         /* Device management request data */
         struct ufs_dev_cmd dev_cmd;
+        ktime_t last_dme_cmd_tstamp;
 
         /* Keeps information of the UFS device connected to this host */
         struct ufs_dev_info dev_info;
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 75b3603906c1..f0d22cdb51cd 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -130,6 +130,7 @@ config SSB_DRIVER_MIPS
         bool "SSB Broadcom MIPS core driver"
         depends on SSB && MIPS
         select SSB_SERIAL
+        select SSB_SFLASH
         help
           Driver for the Sonics Silicon Backplane attached
           Broadcom MIPS core.
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 1173a091b402..09428412139e 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -14,7 +14,7 @@
 #include <linux/delay.h>
 #include <linux/export.h>
 #ifdef CONFIG_BCM47XX
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 #endif
 
 #include "ssb_private.h"
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 7b986f9f213f..f87efef42252 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -16,7 +16,7 @@
 #include <linux/serial_reg.h>
 #include <linux/time.h>
 #ifdef CONFIG_BCM47XX
-#include <bcm47xx_nvram.h>
+#include <linux/bcm47xx_nvram.h>
 #endif
 
 #include "ssb_private.h"
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 91442fab5725..c6c824356464 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -359,8 +359,8 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,
  * up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. */
 #define MAX_DIO_SIZE ((MAX_MALLOC / sizeof(struct brw_page) * PAGE_CACHE_SIZE) & \
                       ~(DT_MAX_BRW_SIZE - 1))
-static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
-                               struct iov_iter *iter, loff_t file_offset)
+static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,
+                               loff_t file_offset)
 {
         struct lu_env *env;
         struct cl_io *io;
@@ -399,7 +399,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
          *    size changing by concurrent truncates and writes.
          * 1. Need inode mutex to operate transient pages.
          */
-        if (rw == READ)
+        if (iov_iter_rw(iter) == READ)
                 mutex_lock(&inode->i_mutex);
 
         LASSERT(obj->cob_transient_pages == 0);
@@ -408,7 +408,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
                 size_t offs;
 
                 count = min_t(size_t, iov_iter_count(iter), size);
-                if (rw == READ) {
+                if (iov_iter_rw(iter) == READ) {
                         if (file_offset >= i_size_read(inode))
                                 break;
                         if (file_offset + count > i_size_read(inode))
@@ -418,11 +418,11 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
                 result = iov_iter_get_pages_alloc(iter, &pages, count, &offs);
                 if (likely(result > 0)) {
                         int n = DIV_ROUND_UP(result + offs, PAGE_SIZE);
-                        result = ll_direct_IO_26_seg(env, io, rw, inode,
-                                                     file->f_mapping,
-                                                     result, file_offset,
-                                                     pages, n);
-                        ll_free_user_pages(pages, n, rw==READ);
+                        result = ll_direct_IO_26_seg(env, io, iov_iter_rw(iter),
+                                                     inode, file->f_mapping,
+                                                     result, file_offset, pages,
+                                                     n);
+                        ll_free_user_pages(pages, n, iov_iter_rw(iter) == READ);
                 }
                 if (unlikely(result <= 0)) {
                         /* If we can't allocate a large enough buffer
@@ -449,11 +449,11 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
         }
 out:
         LASSERT(obj->cob_transient_pages == 0);
-        if (rw == READ)
+        if (iov_iter_rw(iter) == READ)
                 mutex_unlock(&inode->i_mutex);
 
         if (tot_bytes > 0) {
-                if (rw == WRITE) {
+                if (iov_iter_rw(iter) == WRITE) {
                         struct lov_stripe_md *lsm;
 
                         lsm = ccc_inode_lsm_get(inode);
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index b7a7854d3f7e..5b9ac1f6d6f0 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -274,6 +274,9 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Build the PKO command */
         pko_command.u64 = 0;
+#ifdef __LITTLE_ENDIAN
+        pko_command.s.le = 1;
+#endif
         pko_command.s.n2 = 1;   /* Don't pollute L2 with the outgoing packet */
         pko_command.s.segs = 1;
         pko_command.s.total_bytes = skb->len;
@@ -410,7 +413,7 @@ dont_put_skbuff_in_hw:
         /* Check if we can use the hardware checksumming */
         if (USE_HW_TCPUDP_CHECKSUM && (skb->protocol == htons(ETH_P_IP)) &&
             (ip_hdr(skb)->version == 4) && (ip_hdr(skb)->ihl == 5) &&
-            ((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == 1 << 14))
+            ((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == htons(1 << 14)))
             && ((ip_hdr(skb)->protocol == IPPROTO_TCP)
                 || (ip_hdr(skb)->protocol == IPPROTO_UDP))) {
                 /* Use hardware checksum calc */
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index f539d82f2f11..fbbe866485c7 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -170,6 +170,16 @@ static void cvm_oct_configure_common_hw(void)
                 cvm_oct_mem_fill_fpa(CVMX_FPA_OUTPUT_BUFFER_POOL,
                                      CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128);
 
+#ifdef __LITTLE_ENDIAN
+        {
+                union cvmx_ipd_ctl_status ipd_ctl_status;
+                ipd_ctl_status.u64 = cvmx_read_csr(CVMX_IPD_CTL_STATUS);
+                ipd_ctl_status.s.pkt_lend = 1;
+                ipd_ctl_status.s.wqe_lend = 1;
+                cvmx_write_csr(CVMX_IPD_CTL_STATUS, ipd_ctl_status.u64);
+        }
+#endif
+
         if (USE_RED)
                 cvmx_helper_setup_red(num_packet_buffers / 4,
                                       num_packet_buffers / 8);
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index b24aa010f68c..c01f45095877 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -419,4 +419,51 @@ config DA_CONSOLE
         help
           This enables a console on a Dash channel.
 
+config MIPS_EJTAG_FDC_TTY
+        bool "MIPS EJTAG Fast Debug Channel TTY"
+        depends on MIPS_CDMM
+        help
+          This enables a TTY and console on the MIPS EJTAG Fast Debug Channels,
+          if they are present. This can be useful when working with an EJTAG
+          probe which supports it, to get console output and a login prompt via
+          EJTAG without needing to connect a serial cable.
+
+          TTY devices are named e.g. ttyFDC3c2 (for FDC channel 2 of the FDC on
+          CPU3).
+
+          The console can be enabled with console=fdc1 (for FDC channel 1 on all
+          CPUs). Do not use the console unless there is a debug probe attached
+          to drain the FDC TX FIFO.
+
+          If unsure, say N.
+
+config MIPS_EJTAG_FDC_EARLYCON
+        bool "Early FDC console"
+        depends on MIPS_EJTAG_FDC_TTY
+        help
+          This registers a console on FDC channel 1 very early during boot (from
+          MIPS arch code). This is useful for bring-up and debugging early boot
+          issues.
+
+          Do not enable unless there is a debug probe attached to drain the FDC
+          TX FIFO.
+
+          If unsure, say N.
+
+config MIPS_EJTAG_FDC_KGDB
+        bool "Use KGDB over an FDC channel"
+        depends on MIPS_EJTAG_FDC_TTY && KGDB
+        default y
+        help
+          This enables the use of KGDB over an FDC channel, allowing KGDB to be
+          used remotely or when a serial port isn't available.
+
+config MIPS_EJTAG_FDC_KGDB_CHAN
+        int "KGDB FDC channel"
+        depends on MIPS_EJTAG_FDC_KGDB
+        range 2 15
+        default 3
+        help
+          FDC channel number to use for KGDB.
+
 endif # TTY
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 58ad1c05b7f8..5817e2397463 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -29,5 +29,6 @@ obj-$(CONFIG_SYNCLINK)		+= synclink.o
 obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o
 obj-$(CONFIG_GOLDFISH_TTY)      += goldfish.o
 obj-$(CONFIG_DA_TTY)            += metag_da.o
+obj-$(CONFIG_MIPS_EJTAG_FDC_TTY) += mips_ejtag_fdc.o
 
 obj-y += ipwireless/
diff --git a/drivers/tty/mips_ejtag_fdc.c b/drivers/tty/mips_ejtag_fdc.c
new file mode 100644
index 000000000000..04d9e23d1ee1
--- /dev/null
+++ b/drivers/tty/mips_ejtag_fdc.c
@@ -0,0 +1,1303 @@
+/*
+ * TTY driver for MIPS EJTAG Fast Debug Channels.
+ *
+ * Copyright (C) 2007-2015 Imagination Technologies Ltd
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for more
+ * details.
+ */
+
+#include <linux/atomic.h>
+#include <linux/bitops.h>
+#include <linux/completion.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/export.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/kgdb.h>
+#include <linux/kthread.h>
+#include <linux/sched.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/uaccess.h>
+
+#include <asm/cdmm.h>
+#include <asm/irq.h>
+
+/* Register offsets */
+#define REG_FDACSR      0x00    /* FDC Access Control and Status Register */
+#define REG_FDCFG       0x08    /* FDC Configuration Register */
+#define REG_FDSTAT      0x10    /* FDC Status Register */
+#define REG_FDRX        0x18    /* FDC Receive Register */
+#define REG_FDTX(N)     (0x20+0x8*(N))  /* FDC Transmit Register n (0..15) */
+
+/* Register fields */
+
+#define REG_FDCFG_TXINTTHRES_SHIFT      18
+#define REG_FDCFG_TXINTTHRES            (0x3 << REG_FDCFG_TXINTTHRES_SHIFT)
+#define REG_FDCFG_TXINTTHRES_DISABLED   (0x0 << REG_FDCFG_TXINTTHRES_SHIFT)
+#define REG_FDCFG_TXINTTHRES_EMPTY      (0x1 << REG_FDCFG_TXINTTHRES_SHIFT)
+#define REG_FDCFG_TXINTTHRES_NOTFULL    (0x2 << REG_FDCFG_TXINTTHRES_SHIFT)
+#define REG_FDCFG_TXINTTHRES_NEAREMPTY  (0x3 << REG_FDCFG_TXINTTHRES_SHIFT)
+#define REG_FDCFG_RXINTTHRES_SHIFT      16
+#define REG_FDCFG_RXINTTHRES            (0x3 << REG_FDCFG_RXINTTHRES_SHIFT)
+#define REG_FDCFG_RXINTTHRES_DISABLED   (0x0 << REG_FDCFG_RXINTTHRES_SHIFT)
+#define REG_FDCFG_RXINTTHRES_FULL       (0x1 << REG_FDCFG_RXINTTHRES_SHIFT)
+#define REG_FDCFG_RXINTTHRES_NOTEMPTY   (0x2 << REG_FDCFG_RXINTTHRES_SHIFT)
+#define REG_FDCFG_RXINTTHRES_NEARFULL   (0x3 << REG_FDCFG_RXINTTHRES_SHIFT)
+#define REG_FDCFG_TXFIFOSIZE_SHIFT      8
+#define REG_FDCFG_TXFIFOSIZE            (0xff << REG_FDCFG_TXFIFOSIZE_SHIFT)
+#define REG_FDCFG_RXFIFOSIZE_SHIFT      0
+#define REG_FDCFG_RXFIFOSIZE            (0xff << REG_FDCFG_RXFIFOSIZE_SHIFT)
+
+#define REG_FDSTAT_TXCOUNT_SHIFT        24
+#define REG_FDSTAT_TXCOUNT              (0xff << REG_FDSTAT_TXCOUNT_SHIFT)
+#define REG_FDSTAT_RXCOUNT_SHIFT        16
+#define REG_FDSTAT_RXCOUNT              (0xff << REG_FDSTAT_RXCOUNT_SHIFT)
+#define REG_FDSTAT_RXCHAN_SHIFT         4
+#define REG_FDSTAT_RXCHAN               (0xf << REG_FDSTAT_RXCHAN_SHIFT)
+#define REG_FDSTAT_RXE                  BIT(3)  /* Rx Empty */
+#define REG_FDSTAT_RXF                  BIT(2)  /* Rx Full */
+#define REG_FDSTAT_TXE                  BIT(1)  /* Tx Empty */
+#define REG_FDSTAT_TXF                  BIT(0)  /* Tx Full */
+
+/* Default channel for the early console */
+#define CONSOLE_CHANNEL      1
+
+#define NUM_TTY_CHANNELS     16
+
+#define RX_BUF_SIZE 1024
+
+/*
+ * When the IRQ is unavailable, the FDC state must be polled for incoming data
+ * and space becoming available in TX FIFO.
+ */
+#define FDC_TTY_POLL (HZ / 50)
+
+struct mips_ejtag_fdc_tty;
+
+/**
+ * struct mips_ejtag_fdc_tty_port - Wrapper struct for FDC tty_port.
+ * @port:               TTY port data
+ * @driver:             TTY driver.
+ * @rx_lock:            Lock for rx_buf.
+ *                      This protects between the hard interrupt and user
+ *                      context. It's also held during read SWITCH operations.
+ * @rx_buf:             Read buffer.
+ * @xmit_lock:          Lock for xmit_*, and port.xmit_buf.
+ *                      This protects between user context and kernel thread.
+ *                      It is used from chars_in_buffer()/write_room() TTY
+ *                      callbacks which are used during wait operations, so a
+ *                      mutex is unsuitable.
+ * @xmit_cnt:           Size of xmit buffer contents.
+ * @xmit_head:          Head of xmit buffer where data is written.
+ * @xmit_tail:          Tail of xmit buffer where data is read.
+ * @xmit_empty:         Completion for xmit buffer being empty.
+ */
+struct mips_ejtag_fdc_tty_port {
+        struct tty_port                  port;
+        struct mips_ejtag_fdc_tty       *driver;
+        raw_spinlock_t                   rx_lock;
+        void                            *rx_buf;
+        spinlock_t                       xmit_lock;
+        unsigned int                     xmit_cnt;
+        unsigned int                     xmit_head;
+        unsigned int                     xmit_tail;
+        struct completion                xmit_empty;
+};
+
+/**
+ * struct mips_ejtag_fdc_tty - Driver data for FDC as a whole.
+ * @dev:                FDC device (for dev_*() logging).
+ * @driver:             TTY driver.
+ * @cpu:                CPU number for this FDC.
+ * @fdc_name:           FDC name (not for base of channel names).
+ * @driver_name:        Base of driver name.
+ * @ports:              Per-channel data.
+ * @waitqueue:          Wait queue for waiting for TX data, or for space in TX
+ *                      FIFO.
+ * @lock:               Lock to protect FDCFG (interrupt enable).
+ * @thread:             KThread for writing out data to FDC.
+ * @reg:                FDC registers.
+ * @tx_fifo:            TX FIFO size.
+ * @xmit_size:          Size of each port's xmit buffer.
+ * @xmit_total:         Total number of bytes (from all ports) to transmit.
+ * @xmit_next:          Next port number to transmit from (round robin).
+ * @xmit_full:          Indicates TX FIFO is full, we're waiting for space.
+ * @irq:                IRQ number (negative if no IRQ).
+ * @removing:           Indicates the device is being removed and @poll_timer
+ *                      should not be restarted.
+ * @poll_timer:         Timer for polling for interrupt events when @irq < 0.
+ * @sysrq_pressed:      Whether the magic sysrq key combination has been
+ *                      detected. See mips_ejtag_fdc_handle().
+ */
+struct mips_ejtag_fdc_tty {
+        struct device                   *dev;
+        struct tty_driver               *driver;
+        unsigned int                     cpu;
+        char                             fdc_name[16];
+        char                             driver_name[16];
+        struct mips_ejtag_fdc_tty_port   ports[NUM_TTY_CHANNELS];
+        wait_queue_head_t                waitqueue;
+        raw_spinlock_t                   lock;
+        struct task_struct              *thread;
+
+        void __iomem                    *reg;
+        u8                               tx_fifo;
+
+        unsigned int                     xmit_size;
+        atomic_t                         xmit_total;
+        unsigned int                     xmit_next;
+        bool                             xmit_full;
+
+        int                              irq;
+        bool                             removing;
+        struct timer_list                poll_timer;
+
+#ifdef CONFIG_MAGIC_SYSRQ
+        bool                             sysrq_pressed;
+#endif
+};
+
+/* Hardware access */
+
+static inline void mips_ejtag_fdc_write(struct mips_ejtag_fdc_tty *priv,
+                                        unsigned int offs, unsigned int data)
+{
+        iowrite32(data, priv->reg + offs);
+}
+
+static inline unsigned int mips_ejtag_fdc_read(struct mips_ejtag_fdc_tty *priv,
+                                               unsigned int offs)
+{
+        return ioread32(priv->reg + offs);
+}
+
+/* Encoding of byte stream in FDC words */
+
+/**
+ * struct fdc_word - FDC word encoding some number of bytes of data.
+ * @word:               Raw FDC word.
+ * @bytes:              Number of bytes encoded by @word.
+ */
+struct fdc_word {
+        u32             word;
+        unsigned int    bytes;
+};
+
+/*
+ * This is a compact encoding which allows every 1 byte, 2 byte, and 3 byte
+ * sequence to be encoded in a single word, while allowing the majority of 4
+ * byte sequences (including all ASCII and common binary data) to be encoded in
+ * a single word too.
+ *    _______________________ _____________
+ *   |       FDC Word        |             |
+ *   |31-24|23-16|15-8 | 7-0 |    Bytes    |
+ *   |_____|_____|_____|_____|_____________|
+ *   |     |     |     |     |             |
+ *   |0x80 |0x80 |0x80 |  WW | WW          |
+ *   |0x81 |0x81 |  XX |  WW | WW XX       |
+ *   |0x82 |  YY |  XX |  WW | WW XX YY    |
+ *   |  ZZ |  YY |  XX |  WW | WW XX YY ZZ |
+ *   |_____|_____|_____|_____|_____________|
+ *
+ * Note that the 4-byte encoding can only be used where none of the other 3
+ * encodings match, otherwise it must fall back to the 3 byte encoding.
+ */
+
+/* ranges >= 1 && sizes[0] >= 1 */
+static struct fdc_word mips_ejtag_fdc_encode(const char **ptrs,
+                                             unsigned int *sizes,
+                                             unsigned int ranges)
+{
+        struct fdc_word word = { 0, 0 };
+        const char **ptrs_end = ptrs + ranges;
+
+        for (; ptrs < ptrs_end; ++ptrs) {
+                const char *ptr = *(ptrs++);
+                const char *end = ptr + *(sizes++);
+
+                for (; ptr < end; ++ptr) {
+                        word.word |= (u8)*ptr << (8*word.bytes);
+                        ++word.bytes;
+                        if (word.bytes == 4)
+                                goto done;
+                }
+        }
+done:
+        /* Choose the appropriate encoding */
+        switch (word.bytes) {
+        case 4:
+                /* 4 byte encoding, but don't match the 1-3 byte encodings */
+                if ((word.word >> 8) != 0x808080 &&
+                    (word.word >> 16) != 0x8181 &&
+                    (word.word >> 24) != 0x82)
+                        break;
+                /* Fall back to a 3 byte encoding */
+                word.bytes = 3;
+                word.word &= 0x00ffffff;
+        case 3:
+                /* 3 byte encoding */
+                word.word |= 0x82000000;
+                break;
+        case 2:
+                /* 2 byte encoding */
+                word.word |= 0x81810000;
+                break;
+        case 1:
+                /* 1 byte encoding */
+                word.word |= 0x80808000;
+                break;
+        }
+        return word;
+}
+
+static unsigned int mips_ejtag_fdc_decode(u32 word, char *buf)
+{
+        buf[0] = (u8)word;
+        word >>= 8;
+        if (word == 0x808080)
+                return 1;
+        buf[1] = (u8)word;
+        word >>= 8;
+        if (word == 0x8181)
+                return 2;
+        buf[2] = (u8)word;
+        word >>= 8;
+        if (word == 0x82)
+                return 3;
+        buf[3] = (u8)word;
+        return 4;
+}
+
+/* Console operations */
+
+/**
+ * struct mips_ejtag_fdc_console - Wrapper struct for FDC consoles.
+ * @cons:               Console object.
+ * @tty_drv:            TTY driver associated with this console.
+ * @lock:               Lock to protect concurrent access to other fields.
+ *                      This is raw because it may be used very early.
+ * @initialised:        Whether the console is initialised.
+ * @regs:               Registers base address for each CPU.
+ */
+struct mips_ejtag_fdc_console {
+        struct console           cons;
+        struct tty_driver       *tty_drv;
+        raw_spinlock_t           lock;
+        bool                     initialised;
+        void __iomem            *regs[NR_CPUS];
+};
+
+/* Low level console write shared by early console and normal console */
+static void mips_ejtag_fdc_console_write(struct console *c, const char *s,
+                                         unsigned int count)
+{
+        struct mips_ejtag_fdc_console *cons =
+                container_of(c, struct mips_ejtag_fdc_console, cons);
+        void __iomem *regs;
+        struct fdc_word word;
+        unsigned long flags;
+        unsigned int i, buf_len, cpu;
+        bool done_cr = false;
+        char buf[4];
+        const char *buf_ptr = buf;
+        /* Number of bytes of input data encoded up to each byte in buf */
+        u8 inc[4];
+
+        local_irq_save(flags);
+        cpu = smp_processor_id();
+        regs = cons->regs[cpu];
+        /* First console output on this CPU? */
+        if (!regs) {
+                regs = mips_cdmm_early_probe(0xfd);
+                cons->regs[cpu] = regs;
+        }
+        /* Already tried and failed to find FDC on this CPU? */
+        if (IS_ERR(regs))
+                goto out;
+        while (count) {
+                /*
+                 * Copy the next few characters to a buffer so we can inject
+                 * carriage returns before newlines.
+                 */
+                for (buf_len = 0, i = 0; buf_len < 4 && i < count; ++buf_len) {
+                        if (s[i] == '\n' && !done_cr) {
+                                buf[buf_len] = '\r';
+                                done_cr = true;
+                        } else {
+                                buf[buf_len] = s[i];
+                                done_cr = false;
+                                ++i;
+                        }
+                        inc[buf_len] = i;
+                }
+                word = mips_ejtag_fdc_encode(&buf_ptr, &buf_len, 1);
+                count -= inc[word.bytes - 1];
+                s += inc[word.bytes - 1];
+
+                /* Busy wait until there's space in fifo */
+                while (ioread32(regs + REG_FDSTAT) & REG_FDSTAT_TXF)
+                        ;
+                iowrite32(word.word, regs + REG_FDTX(c->index));
+        }
+out:
+        local_irq_restore(flags);
+}
+
+static struct tty_driver *mips_ejtag_fdc_console_device(struct console *c,
+                                                        int *index)
+{
+        struct mips_ejtag_fdc_console *cons =
+                container_of(c, struct mips_ejtag_fdc_console, cons);
+
+        *index = c->index;
+        return cons->tty_drv;
+}
+
+/* Initialise an FDC console (early or normal */
+static int __init mips_ejtag_fdc_console_init(struct mips_ejtag_fdc_console *c)
+{
+        void __iomem *regs;
+        unsigned long flags;
+        int ret = 0;
+
+        raw_spin_lock_irqsave(&c->lock, flags);
+        /* Don't init twice */
+        if (c->initialised)
+                goto out;
+        /* Look for the FDC device */
+        regs = mips_cdmm_early_probe(0xfd);
+        if (IS_ERR(regs)) {
+                ret = PTR_ERR(regs);
+                goto out;
+        }
+
+        c->initialised = true;
+        c->regs[smp_processor_id()] = regs;
+        register_console(&c->cons);
+out:
+        raw_spin_unlock_irqrestore(&c->lock, flags);
+        return ret;
+}
+
+static struct mips_ejtag_fdc_console mips_ejtag_fdc_con = {
+        .cons   = {
+                .name   = "fdc",
+                .write  = mips_ejtag_fdc_console_write,
+                .device = mips_ejtag_fdc_console_device,
+                .flags  = CON_PRINTBUFFER,
+                .index  = -1,
+        },
+        .lock   = __RAW_SPIN_LOCK_UNLOCKED(mips_ejtag_fdc_con.lock),
+};
+
+/* TTY RX/TX operations */
+
+/**
+ * mips_ejtag_fdc_put_chan() - Write out a block of channel data.
+ * @priv:       Pointer to driver private data.
+ * @chan:       Channel number.
+ *
+ * Write a single block of data out to the debug adapter. If the circular buffer
+ * is wrapped then only the first block is written.
+ *
+ * Returns:     The number of bytes that were written.
+ */
+static unsigned int mips_ejtag_fdc_put_chan(struct mips_ejtag_fdc_tty *priv,
+                                            unsigned int chan)
+{
+        struct mips_ejtag_fdc_tty_port *dport;
+        struct tty_struct *tty;
+        const char *ptrs[2];
+        unsigned int sizes[2] = { 0 };
+        struct fdc_word word = { .bytes = 0 };
+        unsigned long flags;
+
+        dport = &priv->ports[chan];
+        spin_lock(&dport->xmit_lock);
+        if (dport->xmit_cnt) {
+                ptrs[0] = dport->port.xmit_buf + dport->xmit_tail;
+                sizes[0] = min_t(unsigned int,
+                                 priv->xmit_size - dport->xmit_tail,
+                                 dport->xmit_cnt);
+                ptrs[1] = dport->port.xmit_buf;
+                sizes[1] = dport->xmit_cnt - sizes[0];
+                word = mips_ejtag_fdc_encode(ptrs, sizes, 1 + !!sizes[1]);
+
+                dev_dbg(priv->dev, "%s%u: out %08x: \"%*pE%*pE\"\n",
+                        priv->driver_name, chan, word.word,
+                        min_t(int, word.bytes, sizes[0]), ptrs[0],
+                        max_t(int, 0, word.bytes - sizes[0]), ptrs[1]);
+
+                local_irq_save(flags);
+                /* Maybe we raced with the console and TX FIFO is full */
+                if (mips_ejtag_fdc_read(priv, REG_FDSTAT) & REG_FDSTAT_TXF)
+                        word.bytes = 0;
+                else
+                        mips_ejtag_fdc_write(priv, REG_FDTX(chan), word.word);
+                local_irq_restore(flags);
+
+                dport->xmit_cnt -= word.bytes;
+                if (!dport->xmit_cnt) {
+                        /* Reset pointers to avoid wraps */
+                        dport->xmit_head = 0;
+                        dport->xmit_tail = 0;
+                        complete(&dport->xmit_empty);
+                } else {
+                        dport->xmit_tail += word.bytes;
+                        if (dport->xmit_tail >= priv->xmit_size)
+                                dport->xmit_tail -= priv->xmit_size;
+                }
+                atomic_sub(word.bytes, &priv->xmit_total);
+        }
+        spin_unlock(&dport->xmit_lock);
+
+        /* If we've made more data available, wake up tty */
+        if (sizes[0] && word.bytes) {
+                tty = tty_port_tty_get(&dport->port);
+                if (tty) {
+                        tty_wakeup(tty);
+                        tty_kref_put(tty);
+                }
+        }
+
+        return word.bytes;
+}
+
+/**
+ * mips_ejtag_fdc_put() - Kernel thread to write out channel data to FDC.
+ * @arg:        Driver pointer.
+ *
+ * This kernel thread runs while @priv->xmit_total != 0, and round robins the
+ * channels writing out blocks of buffered data to the FDC TX FIFO.
+ */
+static int mips_ejtag_fdc_put(void *arg)
+{
+        struct mips_ejtag_fdc_tty *priv = arg;
+        struct mips_ejtag_fdc_tty_port *dport;
+        unsigned int ret;
+        u32 cfg;
+
+        __set_current_state(TASK_RUNNING);
+        while (!kthread_should_stop()) {
+                /* Wait for data to actually write */
+                wait_event_interruptible(priv->waitqueue,
+                                         atomic_read(&priv->xmit_total) ||
+                                         kthread_should_stop());
+                if (kthread_should_stop())
+                        break;
+
+                /* Wait for TX FIFO space to write data */
+                raw_spin_lock_irq(&priv->lock);
+                if (mips_ejtag_fdc_read(priv, REG_FDSTAT) & REG_FDSTAT_TXF) {
+                        priv->xmit_full = true;
+                        if (priv->irq >= 0) {
+                                /* Enable TX interrupt */
+                                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                                cfg &= ~REG_FDCFG_TXINTTHRES;
+                                cfg |= REG_FDCFG_TXINTTHRES_NOTFULL;
+                                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                        }
+                }
+                raw_spin_unlock_irq(&priv->lock);
+                wait_event_interruptible(priv->waitqueue,
+                                         !(mips_ejtag_fdc_read(priv, REG_FDSTAT)
+                                           & REG_FDSTAT_TXF) ||
+                                         kthread_should_stop());
+                if (kthread_should_stop())
+                        break;
+
+                /* Find next channel with data to output */
+                for (;;) {
+                        dport = &priv->ports[priv->xmit_next];
+                        spin_lock(&dport->xmit_lock);
+                        ret = dport->xmit_cnt;
+                        spin_unlock(&dport->xmit_lock);
+                        if (ret)
+                                break;
+                        /* Round robin */
+                        ++priv->xmit_next;
+                        if (priv->xmit_next >= NUM_TTY_CHANNELS)
+                                priv->xmit_next = 0;
+                }
+
+                /* Try writing data to the chosen channel */
+                ret = mips_ejtag_fdc_put_chan(priv, priv->xmit_next);
+
+                /*
+                 * If anything was output, move on to the next channel so as not
+                 * to starve other channels.
+                 */
+                if (ret) {
+                        ++priv->xmit_next;
+                        if (priv->xmit_next >= NUM_TTY_CHANNELS)
+                                priv->xmit_next = 0;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ * mips_ejtag_fdc_handle() - Handle FDC events.
+ * @priv:       Pointer to driver private data.
+ *
+ * Handle FDC events, such as new incoming data which needs draining out of the
+ * RX FIFO and feeding into the appropriate TTY ports, and space becoming
+ * available in the TX FIFO which would allow more data to be written out.
+ */
+static void mips_ejtag_fdc_handle(struct mips_ejtag_fdc_tty *priv)
+{
+        struct mips_ejtag_fdc_tty_port *dport;
+        unsigned int stat, channel, data, cfg, i, flipped;
+        int len;
+        char buf[4];
+
+        for (;;) {
+                /* Find which channel the next FDC word is destined for */
+                stat = mips_ejtag_fdc_read(priv, REG_FDSTAT);
+                if (stat & REG_FDSTAT_RXE)
+                        break;
+                channel = (stat & REG_FDSTAT_RXCHAN) >> REG_FDSTAT_RXCHAN_SHIFT;
+                dport = &priv->ports[channel];
+
+                /* Read out the FDC word, decode it, and pass to tty layer */
+                raw_spin_lock(&dport->rx_lock);
+                data = mips_ejtag_fdc_read(priv, REG_FDRX);
+
+                len = mips_ejtag_fdc_decode(data, buf);
+                dev_dbg(priv->dev, "%s%u: in  %08x: \"%*pE\"\n",
+                        priv->driver_name, channel, data, len, buf);
+
+                flipped = 0;
+                for (i = 0; i < len; ++i) {
+#ifdef CONFIG_MAGIC_SYSRQ
+#ifdef CONFIG_MIPS_EJTAG_FDC_KGDB
+                        /* Support just Ctrl+C with KGDB channel */
+                        if (channel == CONFIG_MIPS_EJTAG_FDC_KGDB_CHAN) {
+                                if (buf[i] == '\x03') { /* ^C */
+                                        handle_sysrq('g');
+                                        continue;
+                                }
+                        }
+#endif
+                        /* Support Ctrl+O for console channel */
+                        if (channel == mips_ejtag_fdc_con.cons.index) {
+                                if (buf[i] == '\x0f') { /* ^O */
+                                        priv->sysrq_pressed =
+                                                !priv->sysrq_pressed;
+                                        if (priv->sysrq_pressed)
+                                                continue;
+                                } else if (priv->sysrq_pressed) {
+                                        handle_sysrq(buf[i]);
+                                        priv->sysrq_pressed = false;
+                                        continue;
+                                }
+                        }
+#endif /* CONFIG_MAGIC_SYSRQ */
+
+                        /* Check the port isn't being shut down */
+                        if (!dport->rx_buf)
+                                continue;
+
+                        flipped += tty_insert_flip_char(&dport->port, buf[i],
+                                                        TTY_NORMAL);
+                }
+                if (flipped)
+                        tty_flip_buffer_push(&dport->port);
+
+                raw_spin_unlock(&dport->rx_lock);
+        }
+
+        /* If TX FIFO no longer full we may be able to write more data */
+        raw_spin_lock(&priv->lock);
+        if (priv->xmit_full && !(stat & REG_FDSTAT_TXF)) {
+                priv->xmit_full = false;
+
+                /* Disable TX interrupt */
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                cfg &= ~REG_FDCFG_TXINTTHRES;
+                cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+
+                /* Wait the kthread so it can try writing more data */
+                wake_up_interruptible(&priv->waitqueue);
+        }
+        raw_spin_unlock(&priv->lock);
+}
+
+/**
+ * mips_ejtag_fdc_isr() - Interrupt handler.
+ * @irq:        IRQ number.
+ * @dev_id:     Pointer to driver private data.
+ *
+ * This is the interrupt handler, used when interrupts are enabled.
+ *
+ * It simply triggers the common FDC handler code.
+ *
+ * Returns:     IRQ_HANDLED if an FDC interrupt was pending.
+ *              IRQ_NONE otherwise.
+ */
+static irqreturn_t mips_ejtag_fdc_isr(int irq, void *dev_id)
+{
+        struct mips_ejtag_fdc_tty *priv = dev_id;
+
+        /*
+         * We're not using proper per-cpu IRQs, so we must be careful not to
+         * handle IRQs on CPUs we're not interested in.
+         *
+         * Ideally proper per-cpu IRQ handlers could be used, but that doesn't
+         * fit well with the whole sharing of the main CPU IRQ lines. When we
+         * have something with a GIC that routes the FDC IRQs (i.e. no sharing
+         * between handlers) then support could be added more easily.
+         */
+        if (smp_processor_id() != priv->cpu)
+                return IRQ_NONE;
+
+        /* If no FDC interrupt pending, it wasn't for us */
+        if (!(read_c0_cause() & CAUSEF_FDCI))
+                return IRQ_NONE;
+
+        mips_ejtag_fdc_handle(priv);
+        return IRQ_HANDLED;
+}
+
+/**
+ * mips_ejtag_fdc_tty_timer() - Poll FDC for incoming data.
+ * @opaque:     Pointer to driver private data.
+ *
+ * This is the timer handler for when interrupts are disabled and polling the
+ * FDC state is required.
+ *
+ * It simply triggers the common FDC handler code and arranges for further
+ * polling.
+ */
+static void mips_ejtag_fdc_tty_timer(unsigned long opaque)
+{
+        struct mips_ejtag_fdc_tty *priv = (void *)opaque;
+
+        mips_ejtag_fdc_handle(priv);
+        if (!priv->removing)
+                mod_timer_pinned(&priv->poll_timer, jiffies + FDC_TTY_POLL);
+}
+
+/* TTY Port operations */
+
+static int mips_ejtag_fdc_tty_port_activate(struct tty_port *port,
+                                            struct tty_struct *tty)
+{
+        struct mips_ejtag_fdc_tty_port *dport =
+                container_of(port, struct mips_ejtag_fdc_tty_port, port);
+        void *rx_buf;
+
+        /* Allocate the buffer we use for writing data */
+        if (tty_port_alloc_xmit_buf(port) < 0)
+                goto err;
+
+        /* Allocate the buffer we use for reading data */
+        rx_buf = kzalloc(RX_BUF_SIZE, GFP_KERNEL);
+        if (!rx_buf)
+                goto err_free_xmit;
+
+        raw_spin_lock_irq(&dport->rx_lock);
+        dport->rx_buf = rx_buf;
+        raw_spin_unlock_irq(&dport->rx_lock);
+
+        return 0;
+err_free_xmit:
+        tty_port_free_xmit_buf(port);
+err:
+        return -ENOMEM;
+}
+
+static void mips_ejtag_fdc_tty_port_shutdown(struct tty_port *port)
+{
+        struct mips_ejtag_fdc_tty_port *dport =
+                container_of(port, struct mips_ejtag_fdc_tty_port, port);
+        struct mips_ejtag_fdc_tty *priv = dport->driver;
+        void *rx_buf;
+        unsigned int count;
+
+        spin_lock(&dport->xmit_lock);
+        count = dport->xmit_cnt;
+        spin_unlock(&dport->xmit_lock);
+        if (count) {
+                /*
+                 * There's still data to write out, so wake and wait for the
+                 * writer thread to drain the buffer.
+                 */
+                wake_up_interruptible(&priv->waitqueue);
+                wait_for_completion(&dport->xmit_empty);
+        }
+
+        /* Null the read buffer (timer could still be running!) */
+        raw_spin_lock_irq(&dport->rx_lock);
+        rx_buf = dport->rx_buf;
+        dport->rx_buf = NULL;
+        raw_spin_unlock_irq(&dport->rx_lock);
+        /* Free the read buffer */
+        kfree(rx_buf);
+
+        /* Free the write buffer */
+        tty_port_free_xmit_buf(port);
+}
+
+static const struct tty_port_operations mips_ejtag_fdc_tty_port_ops = {
+        .activate       = mips_ejtag_fdc_tty_port_activate,
+        .shutdown       = mips_ejtag_fdc_tty_port_shutdown,
+};
+
+/* TTY operations */
+
+static int mips_ejtag_fdc_tty_install(struct tty_driver *driver,
+                                      struct tty_struct *tty)
+{
+        struct mips_ejtag_fdc_tty *priv = driver->driver_state;
+
+        tty->driver_data = &priv->ports[tty->index];
+        return tty_port_install(&priv->ports[tty->index].port, driver, tty);
+}
+
+static int mips_ejtag_fdc_tty_open(struct tty_struct *tty, struct file *filp)
+{
+        return tty_port_open(tty->port, tty, filp);
+}
+
+static void mips_ejtag_fdc_tty_close(struct tty_struct *tty, struct file *filp)
+{
+        return tty_port_close(tty->port, tty, filp);
+}
+
+static void mips_ejtag_fdc_tty_hangup(struct tty_struct *tty)
+{
+        struct mips_ejtag_fdc_tty_port *dport = tty->driver_data;
+        struct mips_ejtag_fdc_tty *priv = dport->driver;
+
+        /* Drop any data in the xmit buffer */
+        spin_lock(&dport->xmit_lock);
+        if (dport->xmit_cnt) {
+                atomic_sub(dport->xmit_cnt, &priv->xmit_total);
+                dport->xmit_cnt = 0;
+                dport->xmit_head = 0;
+                dport->xmit_tail = 0;
+                complete(&dport->xmit_empty);
+        }
+        spin_unlock(&dport->xmit_lock);
+
+        tty_port_hangup(tty->port);
+}
+
+static int mips_ejtag_fdc_tty_write(struct tty_struct *tty,
+                                    const unsigned char *buf, int total)
+{
+        int count, block;
+        struct mips_ejtag_fdc_tty_port *dport = tty->driver_data;
+        struct mips_ejtag_fdc_tty *priv = dport->driver;
+
+        /*
+         * Write to output buffer.
+         *
+         * The reason that we asynchronously write the buffer is because if we
+         * were to write the buffer synchronously then because the channels are
+         * per-CPU the buffer would be written to the channel of whatever CPU
+         * we're running on.
+         *
+         * What we actually want to happen is have all input and output done on
+         * one CPU.
+         */
+        spin_lock(&dport->xmit_lock);
+        /* Work out how many bytes we can write to the xmit buffer */
+        total = min(total, (int)(priv->xmit_size - dport->xmit_cnt));
+        atomic_add(total, &priv->xmit_total);
+        dport->xmit_cnt += total;
+        /* Write the actual bytes (may need splitting if it wraps) */
+        for (count = total; count; count -= block) {
+                block = min(count, (int)(priv->xmit_size - dport->xmit_head));
+                memcpy(dport->port.xmit_buf + dport->xmit_head, buf, block);
+                dport->xmit_head += block;
+                if (dport->xmit_head >= priv->xmit_size)
+                        dport->xmit_head -= priv->xmit_size;
+                buf += block;
+        }
+        count = dport->xmit_cnt;
+        /* Xmit buffer no longer empty? */
+        if (count)
+                reinit_completion(&dport->xmit_empty);
+        spin_unlock(&dport->xmit_lock);
+
+        /* Wake up the kthread */
+        if (total)
+                wake_up_interruptible(&priv->waitqueue);
+        return total;
+}
+
+static int mips_ejtag_fdc_tty_write_room(struct tty_struct *tty)
+{
+        struct mips_ejtag_fdc_tty_port *dport = tty->driver_data;
+        struct mips_ejtag_fdc_tty *priv = dport->driver;
+        int room;
+
+        /* Report the space in the xmit buffer */
+        spin_lock(&dport->xmit_lock);
+        room = priv->xmit_size - dport->xmit_cnt;
+        spin_unlock(&dport->xmit_lock);
+
+        return room;
+}
+
+static int mips_ejtag_fdc_tty_chars_in_buffer(struct tty_struct *tty)
+{
+        struct mips_ejtag_fdc_tty_port *dport = tty->driver_data;
+        int chars;
+
+        /* Report the number of bytes in the xmit buffer */
+        spin_lock(&dport->xmit_lock);
+        chars = dport->xmit_cnt;
+        spin_unlock(&dport->xmit_lock);
+
+        return chars;
+}
+
+static const struct tty_operations mips_ejtag_fdc_tty_ops = {
+        .install                = mips_ejtag_fdc_tty_install,
+        .open                   = mips_ejtag_fdc_tty_open,
+        .close                  = mips_ejtag_fdc_tty_close,
+        .hangup                 = mips_ejtag_fdc_tty_hangup,
+        .write                  = mips_ejtag_fdc_tty_write,
+        .write_room             = mips_ejtag_fdc_tty_write_room,
+        .chars_in_buffer        = mips_ejtag_fdc_tty_chars_in_buffer,
+};
+
+static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
+{
+        int ret, nport;
+        struct mips_ejtag_fdc_tty_port *dport;
+        struct mips_ejtag_fdc_tty *priv;
+        struct tty_driver *driver;
+        unsigned int cfg, tx_fifo;
+
+        priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        priv->cpu = dev->cpu;
+        priv->dev = &dev->dev;
+        mips_cdmm_set_drvdata(dev, priv);
+        atomic_set(&priv->xmit_total, 0);
+        raw_spin_lock_init(&priv->lock);
+
+        priv->reg = devm_ioremap_nocache(priv->dev, dev->res.start,
+                                         resource_size(&dev->res));
+        if (!priv->reg) {
+                dev_err(priv->dev, "ioremap failed for resource %pR\n",
+                        &dev->res);
+                return -ENOMEM;
+        }
+
+        cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+        tx_fifo = (cfg & REG_FDCFG_TXFIFOSIZE) >> REG_FDCFG_TXFIFOSIZE_SHIFT;
+        /* Disable interrupts */
+        cfg &= ~(REG_FDCFG_TXINTTHRES | REG_FDCFG_RXINTTHRES);
+        cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+        cfg |= REG_FDCFG_RXINTTHRES_DISABLED;
+        mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+
+        /* Make each port's xmit FIFO big enough to fill FDC TX FIFO */
+        priv->xmit_size = min(tx_fifo * 4, (unsigned int)SERIAL_XMIT_SIZE);
+
+        driver = tty_alloc_driver(NUM_TTY_CHANNELS, TTY_DRIVER_REAL_RAW);
+        if (IS_ERR(driver))
+                return PTR_ERR(driver);
+        priv->driver = driver;
+
+        driver->driver_name = "ejtag_fdc";
+        snprintf(priv->fdc_name, sizeof(priv->fdc_name), "ttyFDC%u", dev->cpu);
+        snprintf(priv->driver_name, sizeof(priv->driver_name), "%sc",
+                 priv->fdc_name);
+        driver->name = priv->driver_name;
+        driver->major = 0; /* Auto-allocate */
+        driver->minor_start = 0;
+        driver->type = TTY_DRIVER_TYPE_SERIAL;
+        driver->subtype = SERIAL_TYPE_NORMAL;
+        driver->init_termios = tty_std_termios;
+        driver->init_termios.c_cflag |= CLOCAL;
+        driver->driver_state = priv;
+
+        tty_set_operations(driver, &mips_ejtag_fdc_tty_ops);
+        for (nport = 0; nport < NUM_TTY_CHANNELS; nport++) {
+                dport = &priv->ports[nport];
+                dport->driver = priv;
+                tty_port_init(&dport->port);
+                dport->port.ops = &mips_ejtag_fdc_tty_port_ops;
+                raw_spin_lock_init(&dport->rx_lock);
+                spin_lock_init(&dport->xmit_lock);
+                /* The xmit buffer starts empty, i.e. completely written */
+                init_completion(&dport->xmit_empty);
+                complete(&dport->xmit_empty);
+        }
+
+        /* Set up the console */
+        mips_ejtag_fdc_con.regs[dev->cpu] = priv->reg;
+        if (dev->cpu == 0)
+                mips_ejtag_fdc_con.tty_drv = driver;
+
+        init_waitqueue_head(&priv->waitqueue);
+        priv->thread = kthread_create(mips_ejtag_fdc_put, priv, priv->fdc_name);
+        if (IS_ERR(priv->thread)) {
+                ret = PTR_ERR(priv->thread);
+                dev_err(priv->dev, "Couldn't create kthread (%d)\n", ret);
+                goto err_destroy_ports;
+        }
+        /*
+         * Bind the writer thread to the right CPU so it can't migrate.
+         * The channels are per-CPU and we want all channel I/O to be on a
+         * single predictable CPU.
+         */
+        kthread_bind(priv->thread, dev->cpu);
+        wake_up_process(priv->thread);
+
+        /* Look for an FDC IRQ */
+        priv->irq = -1;
+        if (get_c0_fdc_int)
+                priv->irq = get_c0_fdc_int();
+
+        /* Try requesting the IRQ */
+        if (priv->irq >= 0) {
+                /*
+                 * IRQF_SHARED, IRQF_NO_SUSPEND: The FDC IRQ may be shared with
+                 * other local interrupts such as the timer which sets
+                 * IRQF_TIMER (including IRQF_NO_SUSPEND).
+                 *
+                 * IRQF_NO_THREAD: The FDC IRQ isn't individually maskable so it
+                 * cannot be deferred and handled by a thread on RT kernels. For
+                 * this reason any spinlocks used from the ISR are raw.
+                 */
+                ret = devm_request_irq(priv->dev, priv->irq, mips_ejtag_fdc_isr,
+                                       IRQF_PERCPU | IRQF_SHARED |
+                                       IRQF_NO_THREAD | IRQF_NO_SUSPEND,
+                                       priv->fdc_name, priv);
+                if (ret)
+                        priv->irq = -1;
+        }
+        if (priv->irq >= 0) {
+                /* IRQ is usable, enable RX interrupt */
+                raw_spin_lock_irq(&priv->lock);
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                cfg &= ~REG_FDCFG_RXINTTHRES;
+                cfg |= REG_FDCFG_RXINTTHRES_NOTEMPTY;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                raw_spin_unlock_irq(&priv->lock);
+        } else {
+                /* If we didn't get an usable IRQ, poll instead */
+                setup_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer,
+                            (unsigned long)priv);
+                priv->poll_timer.expires = jiffies + FDC_TTY_POLL;
+                /*
+                 * Always attach the timer to the right CPU. The channels are
+                 * per-CPU so all polling should be from a single CPU.
+                 */
+                add_timer_on(&priv->poll_timer, dev->cpu);
+
+                dev_info(priv->dev, "No usable IRQ, polling enabled\n");
+        }
+
+        ret = tty_register_driver(driver);
+        if (ret < 0) {
+                dev_err(priv->dev, "Couldn't install tty driver (%d)\n", ret);
+                goto err_stop_irq;
+        }
+
+        return 0;
+
+err_stop_irq:
+        if (priv->irq >= 0) {
+                raw_spin_lock_irq(&priv->lock);
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                /* Disable interrupts */
+                cfg &= ~(REG_FDCFG_TXINTTHRES | REG_FDCFG_RXINTTHRES);
+                cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+                cfg |= REG_FDCFG_RXINTTHRES_DISABLED;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                raw_spin_unlock_irq(&priv->lock);
+        } else {
+                priv->removing = true;
+                del_timer_sync(&priv->poll_timer);
+        }
+        kthread_stop(priv->thread);
+err_destroy_ports:
+        if (dev->cpu == 0)
+                mips_ejtag_fdc_con.tty_drv = NULL;
+        for (nport = 0; nport < NUM_TTY_CHANNELS; nport++) {
+                dport = &priv->ports[nport];
+                tty_port_destroy(&dport->port);
+        }
+        put_tty_driver(priv->driver);
+        return ret;
+}
+
+static int mips_ejtag_fdc_tty_remove(struct mips_cdmm_device *dev)
+{
+        struct mips_ejtag_fdc_tty *priv = mips_cdmm_get_drvdata(dev);
+        struct mips_ejtag_fdc_tty_port *dport;
+        int nport;
+        unsigned int cfg;
+
+        if (priv->irq >= 0) {
+                raw_spin_lock_irq(&priv->lock);
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                /* Disable interrupts */
+                cfg &= ~(REG_FDCFG_TXINTTHRES | REG_FDCFG_RXINTTHRES);
+                cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+                cfg |= REG_FDCFG_RXINTTHRES_DISABLED;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                raw_spin_unlock_irq(&priv->lock);
+        } else {
+                priv->removing = true;
+                del_timer_sync(&priv->poll_timer);
+        }
+        kthread_stop(priv->thread);
+        if (dev->cpu == 0)
+                mips_ejtag_fdc_con.tty_drv = NULL;
+        tty_unregister_driver(priv->driver);
+        for (nport = 0; nport < NUM_TTY_CHANNELS; nport++) {
+                dport = &priv->ports[nport];
+                tty_port_destroy(&dport->port);
+        }
+        put_tty_driver(priv->driver);
+        return 0;
+}
+
+static int mips_ejtag_fdc_tty_cpu_down(struct mips_cdmm_device *dev)
+{
+        struct mips_ejtag_fdc_tty *priv = mips_cdmm_get_drvdata(dev);
+        unsigned int cfg;
+
+        if (priv->irq >= 0) {
+                raw_spin_lock_irq(&priv->lock);
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                /* Disable interrupts */
+                cfg &= ~(REG_FDCFG_TXINTTHRES | REG_FDCFG_RXINTTHRES);
+                cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+                cfg |= REG_FDCFG_RXINTTHRES_DISABLED;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                raw_spin_unlock_irq(&priv->lock);
+        } else {
+                priv->removing = true;
+                del_timer_sync(&priv->poll_timer);
+        }
+        kthread_stop(priv->thread);
+
+        return 0;
+}
+
+static int mips_ejtag_fdc_tty_cpu_up(struct mips_cdmm_device *dev)
+{
+        struct mips_ejtag_fdc_tty *priv = mips_cdmm_get_drvdata(dev);
+        unsigned int cfg;
+        int ret = 0;
+
+        if (priv->irq >= 0) {
+                /*
+                 * IRQ is usable, enable RX interrupt
+                 * This must be before kthread is restarted, as kthread may
+                 * enable TX interrupt.
+                 */
+                raw_spin_lock_irq(&priv->lock);
+                cfg = mips_ejtag_fdc_read(priv, REG_FDCFG);
+                cfg &= ~(REG_FDCFG_TXINTTHRES | REG_FDCFG_RXINTTHRES);
+                cfg |= REG_FDCFG_TXINTTHRES_DISABLED;
+                cfg |= REG_FDCFG_RXINTTHRES_NOTEMPTY;
+                mips_ejtag_fdc_write(priv, REG_FDCFG, cfg);
+                raw_spin_unlock_irq(&priv->lock);
+        } else {
+                /* Restart poll timer */
+                priv->removing = false;
+                add_timer_on(&priv->poll_timer, dev->cpu);
+        }
+
+        /* Restart the kthread */
+        priv->thread = kthread_create(mips_ejtag_fdc_put, priv, priv->fdc_name);
+        if (IS_ERR(priv->thread)) {
+                ret = PTR_ERR(priv->thread);
+                dev_err(priv->dev, "Couldn't re-create kthread (%d)\n", ret);
+                goto out;
+        }
+        /* Bind it back to the right CPU and set it off */
+        kthread_bind(priv->thread, dev->cpu);
+        wake_up_process(priv->thread);
+out:
+        return ret;
+}
+
+static struct mips_cdmm_device_id mips_ejtag_fdc_tty_ids[] = {
+        { .type = 0xfd },
+        { }
+};
+
+static struct mips_cdmm_driver mips_ejtag_fdc_tty_driver = {
+        .drv            = {
+                .name   = "mips_ejtag_fdc",
+        },
+        .probe          = mips_ejtag_fdc_tty_probe,
+        .remove         = mips_ejtag_fdc_tty_remove,
+        .cpu_down       = mips_ejtag_fdc_tty_cpu_down,
+        .cpu_up         = mips_ejtag_fdc_tty_cpu_up,
+        .id_table       = mips_ejtag_fdc_tty_ids,
+};
+module_mips_cdmm_driver(mips_ejtag_fdc_tty_driver);
+
+static int __init mips_ejtag_fdc_init_console(void)
+{
+        return mips_ejtag_fdc_console_init(&mips_ejtag_fdc_con);
+}
+console_initcall(mips_ejtag_fdc_init_console);
+
+#ifdef CONFIG_MIPS_EJTAG_FDC_EARLYCON
+static struct mips_ejtag_fdc_console mips_ejtag_fdc_earlycon = {
+        .cons   = {
+                .name   = "early_fdc",
+                .write  = mips_ejtag_fdc_console_write,
+                .flags  = CON_PRINTBUFFER | CON_BOOT,
+                .index  = CONSOLE_CHANNEL,
+        },
+        .lock   = __RAW_SPIN_LOCK_UNLOCKED(mips_ejtag_fdc_earlycon.lock),
+};
+
+int __init setup_early_fdc_console(void)
+{
+        return mips_ejtag_fdc_console_init(&mips_ejtag_fdc_earlycon);
+}
+#endif
+
+#ifdef CONFIG_MIPS_EJTAG_FDC_KGDB
+
+/* read buffer to allow decompaction */
+static unsigned int kgdbfdc_rbuflen;
+static unsigned int kgdbfdc_rpos;
+static char kgdbfdc_rbuf[4];
+
+/* write buffer to allow compaction */
+static unsigned int kgdbfdc_wbuflen;
+static char kgdbfdc_wbuf[4];
+
+static void __iomem *kgdbfdc_setup(void)
+{
+        void __iomem *regs;
+        unsigned int cpu;
+
+        /* Find address, piggy backing off console percpu regs */
+        cpu = smp_processor_id();
+        regs = mips_ejtag_fdc_con.regs[cpu];
+        /* First console output on this CPU? */
+        if (!regs) {
+                regs = mips_cdmm_early_probe(0xfd);
+                mips_ejtag_fdc_con.regs[cpu] = regs;
+        }
+        /* Already tried and failed to find FDC on this CPU? */
+        if (IS_ERR(regs))
+                return regs;
+
+        return regs;
+}
+
+/* read a character from the read buffer, filling from FDC RX FIFO */
+static int kgdbfdc_read_char(void)
+{
+        unsigned int stat, channel, data;
+        void __iomem *regs;
+
+        /* No more data, try and read another FDC word from RX FIFO */
+        if (kgdbfdc_rpos >= kgdbfdc_rbuflen) {
+                kgdbfdc_rpos = 0;
+                kgdbfdc_rbuflen = 0;
+
+                regs = kgdbfdc_setup();
+                if (IS_ERR(regs))
+                        return NO_POLL_CHAR;
+
+                /* Read next word from KGDB channel */
+                do {
+                        stat = ioread32(regs + REG_FDSTAT);
+
+                        /* No data waiting? */
+                        if (stat & REG_FDSTAT_RXE)
+                                return NO_POLL_CHAR;
+
+                        /* Read next word */
+                        channel = (stat & REG_FDSTAT_RXCHAN) >>
+                                        REG_FDSTAT_RXCHAN_SHIFT;
+                        data = ioread32(regs + REG_FDRX);
+                } while (channel != CONFIG_MIPS_EJTAG_FDC_KGDB_CHAN);
+
+                /* Decode into rbuf */
+                kgdbfdc_rbuflen = mips_ejtag_fdc_decode(data, kgdbfdc_rbuf);
+        }
+        pr_devel("kgdbfdc r %c\n", kgdbfdc_rbuf[kgdbfdc_rpos]);
+        return kgdbfdc_rbuf[kgdbfdc_rpos++];
+}
+
+/* push an FDC word from write buffer to TX FIFO */
+static void kgdbfdc_push_one(void)
+{
+        const char *bufs[1] = { kgdbfdc_wbuf };
+        struct fdc_word word;
+        void __iomem *regs;
+        unsigned int i;
+
+        /* Construct a word from any data in buffer */
+        word = mips_ejtag_fdc_encode(bufs, &kgdbfdc_wbuflen, 1);
+        /* Relocate any remaining data to beginnning of buffer */
+        kgdbfdc_wbuflen -= word.bytes;
+        for (i = 0; i < kgdbfdc_wbuflen; ++i)
+                kgdbfdc_wbuf[i] = kgdbfdc_wbuf[i + word.bytes];
+
+        regs = kgdbfdc_setup();
+        if (IS_ERR(regs))
+                return;
+
+        /* Busy wait until there's space in fifo */
+        while (ioread32(regs + REG_FDSTAT) & REG_FDSTAT_TXF)
+                ;
+        iowrite32(word.word, regs + REG_FDTX(CONFIG_MIPS_EJTAG_FDC_KGDB_CHAN));
+}
+
+/* flush the whole write buffer to the TX FIFO */
+static void kgdbfdc_flush(void)
+{
+        while (kgdbfdc_wbuflen)
+                kgdbfdc_push_one();
+}
+
+/* write a character into the write buffer, writing out if full */
+static void kgdbfdc_write_char(u8 chr)
+{
+        pr_devel("kgdbfdc w %c\n", chr);
+        kgdbfdc_wbuf[kgdbfdc_wbuflen++] = chr;
+        if (kgdbfdc_wbuflen >= sizeof(kgdbfdc_wbuf))
+                kgdbfdc_push_one();
+}
+
+static struct kgdb_io kgdbfdc_io_ops = {
+        .name           = "kgdbfdc",
+        .read_char      = kgdbfdc_read_char,
+        .write_char     = kgdbfdc_write_char,
+        .flush          = kgdbfdc_flush,
+};
+
+static int __init kgdbfdc_init(void)
+{
+        kgdb_register_io_module(&kgdbfdc_io_ops);
+        return 0;
+}
+early_initcall(kgdbfdc_init);
+#endif
diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
index cf38e159131a..08d90e25abf0 100644
--- a/firmware/ihex2fw.c
+++ b/firmware/ihex2fw.c
@@ -86,6 +86,7 @@ int main(int argc, char **argv)
                 case 'j':
                         include_jump = 1;
                         break;
+                default:
                         return usage();
                 }
         }
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 2e38f9a5b472..be35d05a4d0e 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -230,7 +230,6 @@ static int v9fs_launder_page(struct page *page)
 
 /**
  * v9fs_direct_IO - 9P address space operation for direct I/O
- * @rw: direction (read or write)
  * @iocb: target I/O control block
  * @iov: array of vectors that define I/O buffer
  * @pos: offset in file to begin the operation
@@ -248,12 +247,12 @@ static int v9fs_launder_page(struct page *page)
  *
  */
 static ssize_t
-v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
+v9fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
 {
         struct file *file = iocb->ki_filp;
         ssize_t n;
         int err = 0;
-        if (rw & WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 n = p9_client_write(file->private_data, pos, iter, &err);
                 if (n) {
                         struct inode *inode = file_inode(file);
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index d7fcb775311e..2a9dd37dc426 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -404,21 +404,16 @@ static ssize_t
 v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
-        ssize_t retval = 0;
-        loff_t origin = iocb->ki_pos;
-        size_t count = iov_iter_count(from);
+        ssize_t retval;
+        loff_t origin;
         int err = 0;
 
-        retval = generic_write_checks(file, &origin, &count, 0);
-        if (retval)
+        retval = generic_write_checks(iocb, from);
+        if (retval <= 0)
                 return retval;
 
-        iov_iter_truncate(from, count);
-
-        if (!count)
-                return 0;
-
-        retval = p9_client_write(file->private_data, origin, from, &err);
+        origin = iocb->ki_pos;
+        retval = p9_client_write(file->private_data, iocb->ki_pos, from, &err);
         if (retval > 0) {
                 struct inode *inode = file_inode(file);
                 loff_t i_size;
@@ -428,12 +423,11 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 if (inode->i_mapping && inode->i_mapping->nrpages)
                         invalidate_inode_pages2_range(inode->i_mapping,
                                                       pg_start, pg_end);
-                origin += retval;
+                iocb->ki_pos += retval;
                 i_size = i_size_read(inode);
-                iocb->ki_pos = origin;
-                if (origin > i_size) {
-                        inode_add_bytes(inode, origin - i_size);
-                        i_size_write(inode, origin);
+                if (iocb->ki_pos > i_size) {
+                        inode_add_bytes(inode, iocb->ki_pos - i_size);
+                        i_size_write(inode, iocb->ki_pos);
                 }
                 return retval;
         }
diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index f2ba88ab4aed..82d14cdf70f9 100644
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -61,6 +61,7 @@ adfs_fplus_read(struct super_block *sb, unsigned int id, unsigned int sz, struct
                         kcalloc(size, sizeof(struct buffer_head *),
                                 GFP_KERNEL);
                 if (!bh_fplus) {
+                        ret = -ENOMEM;
                         adfs_error(sb, "not enough memory for"
                                         " dir object %X (%d blocks)", id, size);
                         goto out;
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 9852bdf34d76..a19c31d3f369 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -316,7 +316,7 @@ static struct adfs_discmap *adfs_read_map(struct super_block *sb, struct adfs_di
         dm = kmalloc(nzones * sizeof(*dm), GFP_KERNEL);
         if (dm == NULL) {
                 adfs_error(sb, "not enough memory");
-                return NULL;
+                return ERR_PTR(-ENOMEM);
         }
 
         for (zone = 0; zone < nzones; zone++, map_addr++) {
@@ -349,7 +349,7 @@ error_free:
                 brelse(dm[zone].dm_bh);
 
         kfree(dm);
-        return NULL;
+        return ERR_PTR(-EIO);
 }
 
 static inline unsigned long adfs_discsize(struct adfs_discrecord *dr, int block_bits)
@@ -370,6 +370,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
         unsigned char *b_data;
         struct adfs_sb_info *asb;
         struct inode *root;
+        int ret = -EINVAL;
 
         sb->s_flags |= MS_NODIRATIME;
 
@@ -391,6 +392,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
         sb_set_blocksize(sb, BLOCK_SIZE);
         if (!(bh = sb_bread(sb, ADFS_DISCRECORD / BLOCK_SIZE))) {
                 adfs_error(sb, "unable to read superblock");
+                ret = -EIO;
                 goto error;
         }
 
@@ -400,6 +402,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!silent)
                         printk("VFS: Can't find an adfs filesystem on dev "
                                 "%s.\n", sb->s_id);
+                ret = -EINVAL;
                 goto error_free_bh;
         }
 
@@ -412,6 +415,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!silent)
                         printk("VPS: Can't find an adfs filesystem on dev "
                                 "%s.\n", sb->s_id);
+                ret = -EINVAL;
                 goto error_free_bh;
         }
 
@@ -421,11 +425,13 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!bh) {
                         adfs_error(sb, "couldn't read superblock on "
                                 "2nd try.");
+                        ret = -EIO;
                         goto error;
                 }
                 b_data = bh->b_data + (ADFS_DISCRECORD % sb->s_blocksize);
                 if (adfs_checkbblk(b_data)) {
                         adfs_error(sb, "disc record mismatch, very weird!");
+                        ret = -EINVAL;
                         goto error_free_bh;
                 }
                 dr = (struct adfs_discrecord *)(b_data + ADFS_DR_OFFSET);
@@ -433,6 +439,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!silent)
                         printk(KERN_ERR "VFS: Unsupported blocksize on dev "
                                 "%s.\n", sb->s_id);
+                ret = -EINVAL;
                 goto error;
         }
 
@@ -447,10 +454,12 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
         asb->s_size             = adfs_discsize(dr, sb->s_blocksize_bits);
         asb->s_version          = dr->format_version;
         asb->s_log2sharesize    = dr->log2sharesize;
-        
+
         asb->s_map = adfs_read_map(sb, dr);
-        if (!asb->s_map)
+        if (IS_ERR(asb->s_map)) {
+                ret =  PTR_ERR(asb->s_map);
                 goto error_free_bh;
+        }
 
         brelse(bh);
 
@@ -499,6 +508,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
                         brelse(asb->s_map[i].dm_bh);
                 kfree(asb->s_map);
                 adfs_error(sb, "get root inode failed\n");
+                ret = -EIO;
                 goto error;
         }
         return 0;
@@ -508,7 +518,7 @@ error_free_bh:
 error:
         sb->s_fs_info = NULL;
         kfree(asb);
-        return -EINVAL;
+        return ret;
 }
 
 static struct dentry *adfs_mount(struct file_system_type *fs_type,
diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index c8764bd7497d..cffe8370fb44 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -106,18 +106,22 @@ struct affs_sb_info {
         spinlock_t work_lock;           /* protects sb_work and work_queued */
 };
 
-#define SF_INTL         0x0001          /* International filesystem. */
-#define SF_BM_VALID     0x0002          /* Bitmap is valid. */
-#define SF_IMMUTABLE    0x0004          /* Protection bits cannot be changed */
-#define SF_QUIET        0x0008          /* chmod errors will be not reported */
-#define SF_SETUID       0x0010          /* Ignore Amiga uid */
-#define SF_SETGID       0x0020          /* Ignore Amiga gid */
-#define SF_SETMODE      0x0040          /* Ignore Amiga protection bits */
-#define SF_MUFS         0x0100          /* Use MUFS uid/gid mapping */
-#define SF_OFS          0x0200          /* Old filesystem */
-#define SF_PREFIX       0x0400          /* Buffer for prefix is allocated */
-#define SF_VERBOSE      0x0800          /* Talk about fs when mounting */
-#define SF_NO_TRUNCATE  0x1000          /* Don't truncate filenames */
+#define AFFS_MOUNT_SF_INTL              0x0001 /* International filesystem. */
+#define AFFS_MOUNT_SF_BM_VALID          0x0002 /* Bitmap is valid. */
+#define AFFS_MOUNT_SF_IMMUTABLE         0x0004 /* Protection bits cannot be changed */
+#define AFFS_MOUNT_SF_QUIET             0x0008 /* chmod errors will be not reported */
+#define AFFS_MOUNT_SF_SETUID            0x0010 /* Ignore Amiga uid */
+#define AFFS_MOUNT_SF_SETGID            0x0020 /* Ignore Amiga gid */
+#define AFFS_MOUNT_SF_SETMODE           0x0040 /* Ignore Amiga protection bits */
+#define AFFS_MOUNT_SF_MUFS              0x0100 /* Use MUFS uid/gid mapping */
+#define AFFS_MOUNT_SF_OFS               0x0200 /* Old filesystem */
+#define AFFS_MOUNT_SF_PREFIX            0x0400 /* Buffer for prefix is allocated */
+#define AFFS_MOUNT_SF_VERBOSE           0x0800 /* Talk about fs when mounting */
+#define AFFS_MOUNT_SF_NO_TRUNCATE       0x1000 /* Don't truncate filenames */
+
+#define affs_clear_opt(o, opt)    (o &= ~AFFS_MOUNT_##opt)
+#define affs_set_opt(o, opt)      (o |= AFFS_MOUNT_##opt)
+#define affs_test_opt(o, opt)     ((o) & AFFS_MOUNT_##opt)
 
 /* short cut to get to the affs specific sb data */
 static inline struct affs_sb_info *AFFS_SB(struct super_block *sb)
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 388da1ea815d..5022ac96aa40 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -472,7 +472,8 @@ bool
 affs_nofilenametruncate(const struct dentry *dentry)
 {
         struct inode *inode = dentry->d_inode;
-        return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE;
+
+        return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);
 
 }
 
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 7c1a3d4c19c2..659c579c4588 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -389,8 +389,7 @@ static void affs_write_failed(struct address_space *mapping, loff_t to)
 }
 
 static ssize_t
-affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
-               loff_t offset)
+affs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -398,15 +397,15 @@ affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        if (rw == WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 loff_t size = offset + count;
 
                 if (AFFS_I(inode)->mmu_private < size)
                         return 0;
         }
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, affs_get_block);
-        if (ret < 0 && (rw & WRITE))
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, affs_get_block);
+        if (ret < 0 && iov_iter_rw(iter) == WRITE)
                 affs_write_failed(mapping, offset + count);
         return ret;
 }
@@ -915,7 +914,7 @@ affs_truncate(struct inode *inode)
         if (inode->i_size) {
                 AFFS_I(inode)->i_blkcnt = last_blk + 1;
                 AFFS_I(inode)->i_extcnt = ext + 1;
-                if (AFFS_SB(sb)->s_flags & SF_OFS) {
+                if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_OFS)) {
                         struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
                         u32 tmp;
                         if (IS_ERR(bh)) {
diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 6f34510449e8..9628003ccd2f 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -66,23 +66,23 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
         AFFS_I(inode)->i_lastalloc = 0;
         AFFS_I(inode)->i_pa_cnt = 0;
 
-        if (sbi->s_flags & SF_SETMODE)
+        if (affs_test_opt(sbi->s_flags, SF_SETMODE))
                 inode->i_mode = sbi->s_mode;
         else
                 inode->i_mode = prot_to_mode(prot);
 
         id = be16_to_cpu(tail->uid);
-        if (id == 0 || sbi->s_flags & SF_SETUID)
+        if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETUID))
                 inode->i_uid = sbi->s_uid;
-        else if (id == 0xFFFF && sbi->s_flags & SF_MUFS)
+        else if (id == 0xFFFF && affs_test_opt(sbi->s_flags, SF_MUFS))
                 i_uid_write(inode, 0);
         else
                 i_uid_write(inode, id);
 
         id = be16_to_cpu(tail->gid);
-        if (id == 0 || sbi->s_flags & SF_SETGID)
+        if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETGID))
                 inode->i_gid = sbi->s_gid;
-        else if (id == 0xFFFF && sbi->s_flags & SF_MUFS)
+        else if (id == 0xFFFF && affs_test_opt(sbi->s_flags, SF_MUFS))
                 i_gid_write(inode, 0);
         else
                 i_gid_write(inode, id);
@@ -94,7 +94,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
                 /* fall through */
         case ST_USERDIR:
                 if (be32_to_cpu(tail->stype) == ST_USERDIR ||
-                    sbi->s_flags & SF_SETMODE) {
+                    affs_test_opt(sbi->s_flags, SF_SETMODE)) {
                         if (inode->i_mode & S_IRUSR)
                                 inode->i_mode |= S_IXUSR;
                         if (inode->i_mode & S_IRGRP)
@@ -133,7 +133,8 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
                 }
                 if (tail->link_chain)
                         set_nlink(inode, 2);
-                inode->i_mapping->a_ops = (sbi->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;
+                inode->i_mapping->a_ops = affs_test_opt(sbi->s_flags, SF_OFS) ?
+                                          &affs_aops_ofs : &affs_aops;
                 inode->i_op = &affs_file_inode_operations;
                 inode->i_fop = &affs_file_operations;
                 break;
@@ -190,15 +191,15 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
                 if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
                         uid = i_uid_read(inode);
                         gid = i_gid_read(inode);
-                        if (AFFS_SB(sb)->s_flags & SF_MUFS) {
+                        if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_MUFS)) {
                                 if (uid == 0 || uid == 0xFFFF)
                                         uid = uid ^ ~0;
                                 if (gid == 0 || gid == 0xFFFF)
                                         gid = gid ^ ~0;
                         }
-                        if (!(AFFS_SB(sb)->s_flags & SF_SETUID))
+                        if (!affs_test_opt(AFFS_SB(sb)->s_flags, SF_SETUID))
                                 tail->uid = cpu_to_be16(uid);
-                        if (!(AFFS_SB(sb)->s_flags & SF_SETGID))
+                        if (!affs_test_opt(AFFS_SB(sb)->s_flags, SF_SETGID))
                                 tail->gid = cpu_to_be16(gid);
                 }
         }
@@ -221,11 +222,14 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
         if (error)
                 goto out;
 
-        if (((attr->ia_valid & ATTR_UID) && (AFFS_SB(inode->i_sb)->s_flags & SF_SETUID)) ||
-            ((attr->ia_valid & ATTR_GID) && (AFFS_SB(inode->i_sb)->s_flags & SF_SETGID)) ||
+        if (((attr->ia_valid & ATTR_UID) &&
+              affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_SETUID)) ||
+            ((attr->ia_valid & ATTR_GID) &&
+              affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_SETGID)) ||
             ((attr->ia_valid & ATTR_MODE) &&
-             (AFFS_SB(inode->i_sb)->s_flags & (SF_SETMODE | SF_IMMUTABLE)))) {
-                if (!(AFFS_SB(inode->i_sb)->s_flags & SF_QUIET))
+             (AFFS_SB(inode->i_sb)->s_flags &
+              (AFFS_MOUNT_SF_SETMODE | AFFS_MOUNT_SF_IMMUTABLE)))) {
+                if (!affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_QUIET))
                         error = -EPERM;
                 goto out;
         }
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index ffb7bd82c2a5..ec8ca0efb960 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -53,7 +53,8 @@ affs_intl_toupper(int ch)
 static inline toupper_t
 affs_get_toupper(struct super_block *sb)
 {
-        return AFFS_SB(sb)->s_flags & SF_INTL ? affs_intl_toupper : affs_toupper;
+        return affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL) ?
+               affs_intl_toupper : affs_toupper;
 }
 
 /*
@@ -275,7 +276,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)
 
         inode->i_op = &affs_file_inode_operations;
         inode->i_fop = &affs_file_operations;
-        inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;
+        inode->i_mapping->a_ops = affs_test_opt(AFFS_SB(sb)->s_flags, SF_OFS) ?
+                                  &affs_aops_ofs : &affs_aops;
         error = affs_add_entry(dir, inode, dentry, ST_FILE);
         if (error) {
                 clear_nlink(inode);
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 4cf0e9113fb6..3f89c9e05b40 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -227,22 +227,22 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
                         if (match_octal(&args[0], &option))
                                 return 0;
                         *mode = option & 0777;
-                        *mount_opts |= SF_SETMODE;
+                        affs_set_opt(*mount_opts, SF_SETMODE);
                         break;
                 case Opt_mufs:
-                        *mount_opts |= SF_MUFS;
+                        affs_set_opt(*mount_opts, SF_MUFS);
                         break;
                 case Opt_notruncate:
-                        *mount_opts |= SF_NO_TRUNCATE;
+                        affs_set_opt(*mount_opts, SF_NO_TRUNCATE);
                         break;
                 case Opt_prefix:
                         *prefix = match_strdup(&args[0]);
                         if (!*prefix)
                                 return 0;
-                        *mount_opts |= SF_PREFIX;
+                        affs_set_opt(*mount_opts, SF_PREFIX);
                         break;
                 case Opt_protect:
-                        *mount_opts |= SF_IMMUTABLE;
+                        affs_set_opt(*mount_opts, SF_IMMUTABLE);
                         break;
                 case Opt_reserved:
                         if (match_int(&args[0], reserved))
@@ -258,7 +258,7 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
                         *gid = make_kgid(current_user_ns(), option);
                         if (!gid_valid(*gid))
                                 return 0;
-                        *mount_opts |= SF_SETGID;
+                        affs_set_opt(*mount_opts, SF_SETGID);
                         break;
                 case Opt_setuid:
                         if (match_int(&args[0], &option))
@@ -266,10 +266,10 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
                         *uid = make_kuid(current_user_ns(), option);
                         if (!uid_valid(*uid))
                                 return 0;
-                        *mount_opts |= SF_SETUID;
+                        affs_set_opt(*mount_opts, SF_SETUID);
                         break;
                 case Opt_verbose:
-                        *mount_opts |= SF_VERBOSE;
+                        affs_set_opt(*mount_opts, SF_VERBOSE);
                         break;
                 case Opt_volume: {
                         char *vol = match_strdup(&args[0]);
@@ -435,30 +435,31 @@ got_root:
         case MUFS_FS:
         case MUFS_INTLFFS:
         case MUFS_DCFFS:
-                sbi->s_flags |= SF_MUFS;
+                affs_set_opt(sbi->s_flags, SF_MUFS);
                 /* fall thru */
         case FS_INTLFFS:
         case FS_DCFFS:
-                sbi->s_flags |= SF_INTL;
+                affs_set_opt(sbi->s_flags, SF_INTL);
                 break;
         case MUFS_FFS:
-                sbi->s_flags |= SF_MUFS;
+                affs_set_opt(sbi->s_flags, SF_MUFS);
                 break;
         case FS_FFS:
                 break;
         case MUFS_OFS:
-                sbi->s_flags |= SF_MUFS;
+                affs_set_opt(sbi->s_flags, SF_MUFS);
                 /* fall thru */
         case FS_OFS:
-                sbi->s_flags |= SF_OFS;
+                affs_set_opt(sbi->s_flags, SF_OFS);
                 sb->s_flags |= MS_NOEXEC;
                 break;
         case MUFS_DCOFS:
         case MUFS_INTLOFS:
-                sbi->s_flags |= SF_MUFS;
+                affs_set_opt(sbi->s_flags, SF_MUFS);
         case FS_DCOFS:
         case FS_INTLOFS:
-                sbi->s_flags |= SF_INTL | SF_OFS;
+                affs_set_opt(sbi->s_flags, SF_INTL);
+                affs_set_opt(sbi->s_flags, SF_OFS);
                 sb->s_flags |= MS_NOEXEC;
                 break;
         default:
@@ -467,7 +468,7 @@ got_root:
                 return -EINVAL;
         }
 
-        if (mount_flags & SF_VERBOSE) {
+        if (affs_test_opt(mount_flags, SF_VERBOSE)) {
                 u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0];
                 pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
                         len > 31 ? 31 : len,
@@ -478,7 +479,7 @@ got_root:
         sb->s_flags |= MS_NODEV | MS_NOSUID;
 
         sbi->s_data_blksize = sb->s_blocksize;
-        if (sbi->s_flags & SF_OFS)
+        if (affs_test_opt(sbi->s_flags, SF_OFS))
                 sbi->s_data_blksize -= 24;
 
         tmp_flags = sb->s_flags;
@@ -493,7 +494,7 @@ got_root:
         if (IS_ERR(root_inode))
                 return PTR_ERR(root_inode);
 
-        if (AFFS_SB(sb)->s_flags & SF_INTL)
+        if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_INTL))
                 sb->s_d_op = &affs_intl_dentry_operations;
         else
                 sb->s_d_op = &affs_dentry_operations;
@@ -520,10 +521,14 @@ affs_remount(struct super_block *sb, int *flags, char *data)
         int                      root_block;
         unsigned long            mount_flags;
         int                      res = 0;
-        char                    *new_opts = kstrdup(data, GFP_KERNEL);
+        char                    *new_opts;
         char                     volume[32];
         char                    *prefix = NULL;
 
+        new_opts = kstrdup(data, GFP_KERNEL);
+        if (!new_opts)
+                return -ENOMEM;
+
         pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data);
 
         sync_filesystem(sb);
diff --git a/fs/aio.c b/fs/aio.c
index 5785c4b58fea..480440f4701f 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -77,6 +77,11 @@ struct kioctx_cpu {
         unsigned                reqs_available;
 };
 
+struct ctx_rq_wait {
+        struct completion comp;
+        atomic_t count;
+};
+
 struct kioctx {
         struct percpu_ref       users;
         atomic_t                dead;
@@ -115,7 +120,7 @@ struct kioctx {
         /*
          * signals when all in-flight requests are done
          */
-        struct completion *requests_done;
+        struct ctx_rq_wait      *rq_wait;
 
         struct {
                 /*
@@ -572,8 +577,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
         struct kioctx *ctx = container_of(ref, struct kioctx, reqs);
 
         /* At this point we know that there are no any in-flight requests */
-        if (ctx->requests_done)
-                complete(ctx->requests_done);
+        if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
+                complete(&ctx->rq_wait->comp);
 
         INIT_WORK(&ctx->free_work, free_ioctx);
         schedule_work(&ctx->free_work);
@@ -783,7 +788,7 @@ err:
  *      the rapid destruction of the kioctx.
  */
 static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
-                struct completion *requests_done)
+                      struct ctx_rq_wait *wait)
 {
         struct kioctx_table *table;
 
@@ -813,7 +818,7 @@ static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
         if (ctx->mmap_size)
                 vm_munmap(ctx->mmap_base, ctx->mmap_size);
 
-        ctx->requests_done = requests_done;
+        ctx->rq_wait = wait;
         percpu_ref_kill(&ctx->users);
         return 0;
 }
@@ -829,18 +834,24 @@ static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
 void exit_aio(struct mm_struct *mm)
 {
         struct kioctx_table *table = rcu_dereference_raw(mm->ioctx_table);
-        int i;
+        struct ctx_rq_wait wait;
+        int i, skipped;
 
         if (!table)
                 return;
 
+        atomic_set(&wait.count, table->nr);
+        init_completion(&wait.comp);
+
+        skipped = 0;
         for (i = 0; i < table->nr; ++i) {
                 struct kioctx *ctx = table->table[i];
-                struct completion requests_done =
-                        COMPLETION_INITIALIZER_ONSTACK(requests_done);
 
-                if (!ctx)
+                if (!ctx) {
+                        skipped++;
                         continue;
+                }
+
                 /*
                  * We don't need to bother with munmap() here - exit_mmap(mm)
                  * is coming and it'll unmap everything. And we simply can't,
@@ -849,10 +860,12 @@ void exit_aio(struct mm_struct *mm)
                  * that it needs to unmap the area, just set it to 0.
                  */
                 ctx->mmap_size = 0;
-                kill_ioctx(mm, ctx, &requests_done);
+                kill_ioctx(mm, ctx, &wait);
+        }
 
+        if (!atomic_sub_and_test(skipped, &wait.count)) {
                 /* Wait until all IO for the context are done. */
-                wait_for_completion(&requests_done);
+                wait_for_completion(&wait.comp);
         }
 
         RCU_INIT_POINTER(mm->ioctx_table, NULL);
@@ -1331,15 +1344,17 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
 {
         struct kioctx *ioctx = lookup_ioctx(ctx);
         if (likely(NULL != ioctx)) {
-                struct completion requests_done =
-                        COMPLETION_INITIALIZER_ONSTACK(requests_done);
+                struct ctx_rq_wait wait;
                 int ret;
 
+                init_completion(&wait.comp);
+                atomic_set(&wait.count, 1);
+
                 /* Pass requests_done to kill_ioctx() where it can be set
                  * in a thread-safe way. If we try to set it here then we have
                  * a race condition if two io_destroy() called simultaneously.
                  */
-                ret = kill_ioctx(current->mm, ioctx, &requests_done);
+                ret = kill_ioctx(current->mm, ioctx, &wait);
                 percpu_ref_put(&ioctx->users);
 
                 /* Wait until all IO for the context are done. Otherwise kernel
@@ -1347,7 +1362,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
                  * is destroyed.
                  */
                 if (!ret)
-                        wait_for_completion(&requests_done);
+                        wait_for_completion(&wait.comp);
 
                 return ret;
         }
@@ -1502,7 +1517,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
         }
         req->common.ki_pos = iocb->aio_offset;
         req->common.ki_complete = aio_complete;
-        req->common.ki_flags = 0;
+        req->common.ki_flags = iocb_flags(req->common.ki_filp);
 
         if (iocb->aio_flags & IOCB_FLAG_RESFD) {
                 /*
diff --git a/fs/befs/befs.h b/fs/befs/befs.h
index 3a7813ab8c95..1fead8d56a98 100644
--- a/fs/befs/befs.h
+++ b/fs/befs/befs.h
@@ -19,16 +19,16 @@ typedef u64 befs_blocknr_t;
  * BeFS in memory structures
  */
 
-typedef struct befs_mount_options {
+struct befs_mount_options {
         kgid_t gid;
         kuid_t uid;
         int use_gid;
         int use_uid;
         int debug;
         char *iocharset;
-} befs_mount_options;
+};
 
-typedef struct befs_sb_info {
+struct befs_sb_info {
         u32 magic1;
         u32 block_size;
         u32 block_shift;
@@ -52,12 +52,11 @@ typedef struct befs_sb_info {
         befs_inode_addr indices;
         u32 magic3;
 
-        befs_mount_options mount_opts;
+        struct befs_mount_options mount_opts;
         struct nls_table *nls;
+};
 
-} befs_sb_info;
-
-typedef struct befs_inode_info {
+struct befs_inode_info {
         u32 i_flags;
         u32 i_type;
 
@@ -71,8 +70,7 @@ typedef struct befs_inode_info {
         } i_data;
 
         struct inode vfs_inode;
-
-} befs_inode_info;
+};
 
 enum befs_err {
         BEFS_OK,
@@ -105,13 +103,13 @@ void befs_dump_index_node(const struct super_block *sb, befs_btree_nodehead *);
 /* Gets a pointer to the private portion of the super_block
  * structure from the public part
  */
-static inline befs_sb_info *
+static inline struct befs_sb_info *
 BEFS_SB(const struct super_block *super)
 {
-        return (befs_sb_info *) super->s_fs_info;
+        return (struct befs_sb_info *) super->s_fs_info;
 }
 
-static inline befs_inode_info *
+static inline struct befs_inode_info *
 BEFS_I(const struct inode *inode)
 {
         return list_entry(inode, struct befs_inode_info, vfs_inode);
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index 1e8e0b8d8836..ebd50718659f 100644
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -168,7 +168,7 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
         befs_blocknr_t blocks;
         befs_blocknr_t datablocks;      /* File data blocks */
         befs_blocknr_t metablocks;      /* FS metadata blocks */
-        befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
 
         befs_debug(sb, "---> %s", __func__);
 
@@ -428,7 +428,7 @@ befs_find_brun_dblindirect(struct super_block *sb,
         struct buffer_head *indir_block;
         befs_block_run indir_run;
         befs_disk_inode_addr *iaddr_array = NULL;
-        befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
 
         befs_blocknr_t indir_start_blk =
             data->max_indirect_range >> befs_sb->block_shift;
diff --git a/fs/befs/io.c b/fs/befs/io.c
index 0408a3d601d0..7a5b4ec21c56 100644
--- a/fs/befs/io.c
+++ b/fs/befs/io.c
@@ -28,7 +28,7 @@ befs_bread_iaddr(struct super_block *sb, befs_inode_addr iaddr)
 {
         struct buffer_head *bh = NULL;
         befs_blocknr_t block = 0;
-        befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
 
         befs_debug(sb, "---> Enter %s "
                    "[%u, %hu, %hu]", __func__, iaddr.allocation_group,
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index e089f1985fca..16e0a48bfccd 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -51,7 +51,7 @@ static int befs_nls2utf(struct super_block *sb, const char *in, int in_len,
 static void befs_put_super(struct super_block *);
 static int befs_remount(struct super_block *, int *, char *);
 static int befs_statfs(struct dentry *, struct kstatfs *);
-static int parse_options(char *, befs_mount_options *);
+static int parse_options(char *, struct befs_mount_options *);
 
 static const struct super_operations befs_sops = {
         .alloc_inode    = befs_alloc_inode,     /* allocate a new inode */
@@ -304,9 +304,8 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
 {
         struct buffer_head *bh = NULL;
         befs_inode *raw_inode = NULL;
-
-        befs_sb_info *befs_sb = BEFS_SB(sb);
-        befs_inode_info *befs_ino = NULL;
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_inode_info *befs_ino = NULL;
         struct inode *inode;
         long ret = -EIO;
 
@@ -472,7 +471,7 @@ static void *
 befs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
         struct super_block *sb = dentry->d_sb;
-        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
+        struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
         befs_data_stream *data = &befs_ino->i_data.ds;
         befs_off_t len = data->size;
         char *link;
@@ -502,7 +501,8 @@ befs_follow_link(struct dentry *dentry, struct nameidata *nd)
 static void *
 befs_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
+        struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
+
         nd_set_link(nd, befs_ino->i_data.symlink);
         return NULL;
 }
@@ -669,7 +669,7 @@ static const match_table_t befs_tokens = {
 };
 
 static int
-parse_options(char *options, befs_mount_options * opts)
+parse_options(char *options, struct befs_mount_options *opts)
 {
         char *p;
         substring_t args[MAX_OPT_ARGS];
@@ -769,7 +769,7 @@ static int
 befs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct buffer_head *bh;
-        befs_sb_info *befs_sb;
+        struct befs_sb_info *befs_sb;
         befs_super_block *disk_sb;
         struct inode *root;
         long ret = -EINVAL;
diff --git a/fs/befs/super.c b/fs/befs/super.c
index ca40f828f64d..aeafc4d84278 100644
--- a/fs/befs/super.c
+++ b/fs/befs/super.c
@@ -24,7 +24,7 @@
 int
 befs_load_sb(struct super_block *sb, befs_super_block * disk_sb)
 {
-        befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
 
         /* Check the byte order of the filesystem */
         if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE)
@@ -59,7 +59,7 @@ befs_load_sb(struct super_block *sb, befs_super_block * disk_sb)
 int
 befs_check_sb(struct super_block *sb)
 {
-        befs_sb_info *befs_sb = BEFS_SB(sb);
+        struct befs_sb_info *befs_sb = BEFS_SB(sb);
 
         /* Check magic headers of super block */
         if ((befs_sb->magic1 != BEFS_SUPER_MAGIC1)
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index 08063ae0a17c..7a8182770649 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -86,7 +86,7 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
         inode = new_inode(s);
         if (!inode)
-                return -ENOSPC;
+                return -ENOMEM;
         mutex_lock(&info->bfs_lock);
         ino = find_first_zero_bit(info->si_imap, info->si_lasti + 1);
         if (ino > info->si_lasti) {
@@ -293,7 +293,7 @@ static int bfs_add_entry(struct inode *dir, const unsigned char *name,
         for (block = sblock; block <= eblock; block++) {
                 bh = sb_bread(dir->i_sb, block);
                 if (!bh)
-                        return -ENOSPC;
+                        return -EIO;
                 for (off = 0; off < BFS_BSIZE; off += BFS_DIRENT_SIZE) {
                         de = (struct bfs_dirent *)(bh->b_data + off);
                         if (!de->ino) {
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 97aff2879cda..9dcb05409ba7 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -9,6 +9,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -521,9 +522,8 @@ static int parse_command(const char __user *buffer, size_t count)
 
 static void entry_status(Node *e, char *page)
 {
-        char *dp;
-        char *status = "disabled";
-        const char *flags = "flags: ";
+        char *dp = page;
+        const char *status = "disabled";
 
         if (test_bit(Enabled, &e->flags))
                 status = "enabled";
@@ -533,12 +533,10 @@ static void entry_status(Node *e, char *page)
                 return;
         }
 
-        sprintf(page, "%s\ninterpreter %s\n", status, e->interpreter);
-        dp = page + strlen(page);
+        dp += sprintf(dp, "%s\ninterpreter %s\n", status, e->interpreter);
 
         /* print the special flags */
-        sprintf(dp, "%s", flags);
-        dp += strlen(flags);
+        dp += sprintf(dp, "flags: ");
         if (e->flags & MISC_FMT_PRESERVE_ARGV0)
                 *dp++ = 'P';
         if (e->flags & MISC_FMT_OPEN_BINARY)
@@ -550,21 +548,11 @@ static void entry_status(Node *e, char *page)
         if (!test_bit(Magic, &e->flags)) {
                 sprintf(dp, "extension .%s\n", e->magic);
         } else {
-                int i;
-
-                sprintf(dp, "offset %i\nmagic ", e->offset);
-                dp = page + strlen(page);
-                for (i = 0; i < e->size; i++) {
-                        sprintf(dp, "%02x", 0xff & (int) (e->magic[i]));
-                        dp += 2;
-                }
+                dp += sprintf(dp, "offset %i\nmagic ", e->offset);
+                dp = bin2hex(dp, e->magic, e->size);
                 if (e->mask) {
-                        sprintf(dp, "\nmask ");
-                        dp += 6;
-                        for (i = 0; i < e->size; i++) {
-                                sprintf(dp, "%02x", 0xff & (int) (e->mask[i]));
-                                dp += 2;
-                        }
+                        dp += sprintf(dp, "\nmask ");
+                        dp = bin2hex(dp, e->mask, e->size);
                 }
                 *dp++ = '\n';
                 *dp = '\0';
diff --git a/fs/block_dev.c b/fs/block_dev.c
index b5e87896f517..897ee0503932 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -146,15 +146,13 @@ blkdev_get_block(struct inode *inode, sector_t iblock,
 }
 
 static ssize_t
-blkdev_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
-                        loff_t offset)
+blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
 
-        return __blockdev_direct_IO(rw, iocb, inode, I_BDEV(inode), iter,
-                                    offset, blkdev_get_block,
-                                    NULL, NULL, 0);
+        return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter, offset,
+                                    blkdev_get_block, NULL, NULL, 0);
 }
 
 int __sync_blockdev(struct block_device *bdev, int wait)
@@ -1597,9 +1595,22 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
+        struct inode *bd_inode = file->f_mapping->host;
+        loff_t size = i_size_read(bd_inode);
         struct blk_plug plug;
         ssize_t ret;
 
+        if (bdev_read_only(I_BDEV(bd_inode)))
+                return -EPERM;
+
+        if (!iov_iter_count(from))
+                return 0;
+
+        if (iocb->ki_pos >= size)
+                return -ENOSPC;
+
+        iov_iter_truncate(from, size - iocb->ki_pos);
+
         blk_start_plug(&plug);
         ret = __generic_file_write_iter(iocb, from);
         if (ret > 0) {
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index cdc801c85105..faa7d390841b 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1739,27 +1739,19 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         u64 start_pos;
         u64 end_pos;
         ssize_t num_written = 0;
-        ssize_t err = 0;
-        size_t count = iov_iter_count(from);
         bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
-        loff_t pos = iocb->ki_pos;
+        ssize_t err;
+        loff_t pos;
+        size_t count;
 
         mutex_lock(&inode->i_mutex);
-
-        current->backing_dev_info = inode_to_bdi(inode);
-        err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-        if (err) {
+        err = generic_write_checks(iocb, from);
+        if (err <= 0) {
                 mutex_unlock(&inode->i_mutex);
-                goto out;
-        }
-
-        if (count == 0) {
-                mutex_unlock(&inode->i_mutex);
-                goto out;
+                return err;
         }
 
-        iov_iter_truncate(from, count);
-
+        current->backing_dev_info = inode_to_bdi(inode);
         err = file_remove_suid(file);
         if (err) {
                 mutex_unlock(&inode->i_mutex);
@@ -1786,6 +1778,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
          */
         update_time_for_write(inode);
 
+        pos = iocb->ki_pos;
+        count = iov_iter_count(from);
         start_pos = round_down(pos, root->sectorsize);
         if (start_pos > i_size_read(inode)) {
                 /* Expand hole size to cover write data, preventing empty gap */
@@ -1800,7 +1794,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         if (sync)
                 atomic_inc(&BTRFS_I(inode)->sync_writers);
 
-        if (file->f_flags & O_DIRECT) {
+        if (iocb->ki_flags & IOCB_DIRECT) {
                 num_written = __btrfs_direct_write(iocb, from, pos);
         } else {
                 num_written = __btrfs_buffered_write(file, from, pos);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 686331f22b15..43192e10cc43 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8081,7 +8081,7 @@ free_ordered:
         bio_endio(dio_bio, ret);
 }
 
-static ssize_t check_direct_IO(struct btrfs_root *root, int rw, struct kiocb *iocb,
+static ssize_t check_direct_IO(struct btrfs_root *root, struct kiocb *iocb,
                         const struct iov_iter *iter, loff_t offset)
 {
         int seg;
@@ -8096,7 +8096,7 @@ static ssize_t check_direct_IO(struct btrfs_root *root, int rw, struct kiocb *io
                 goto out;
 
         /* If this is a write we don't need to check anymore */
-        if (rw & WRITE)
+        if (iov_iter_rw(iter) == WRITE)
                 return 0;
         /*
          * Check to make sure we don't have duplicate iov_base's in this
@@ -8114,8 +8114,8 @@ out:
         return retval;
 }
 
-static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
-                        struct iov_iter *iter, loff_t offset)
+static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                               loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -8126,7 +8126,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
         bool relock = false;
         ssize_t ret;
 
-        if (check_direct_IO(BTRFS_I(inode)->root, rw, iocb, iter, offset))
+        if (check_direct_IO(BTRFS_I(inode)->root, iocb, iter, offset))
                 return 0;
 
         atomic_inc(&inode->i_dio_count);
@@ -8144,7 +8144,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
                 filemap_fdatawrite_range(inode->i_mapping, offset,
                                          offset + count - 1);
 
-        if (rw & WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 /*
                  * If the write DIO is beyond the EOF, we need update
                  * the isize, but it is protected by i_mutex. So we can
@@ -8174,11 +8174,11 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
                 wakeup = false;
         }
 
-        ret = __blockdev_direct_IO(rw, iocb, inode,
-                        BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev,
-                        iter, offset, btrfs_get_blocks_direct, NULL,
-                        btrfs_submit_direct, flags);
-        if (rw & WRITE) {
+        ret = __blockdev_direct_IO(iocb, inode,
+                                   BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev,
+                                   iter, offset, btrfs_get_blocks_direct, NULL,
+                                   btrfs_submit_direct, flags);
+        if (iov_iter_rw(iter) == WRITE) {
                 current->journal_info = NULL;
                 if (ret < 0 && ret != -EIOCBQUEUED)
                         btrfs_delalloc_release_space(inode, count);
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index fd5599d32362..155ab9c0246b 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1198,8 +1198,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping,
  * intercept O_DIRECT reads and writes early, this function should
  * never get called.
  */
-static ssize_t ceph_direct_io(int rw, struct kiocb *iocb,
-                              struct iov_iter *iter,
+static ssize_t ceph_direct_io(struct kiocb *iocb, struct iov_iter *iter,
                               loff_t pos)
 {
         WARN_ON(1);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 56237ea5fc22..b9b8eb225f66 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -457,7 +457,7 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *i,
         if (ret < 0)
                 return ret;
 
-        if (file->f_flags & O_DIRECT) {
+        if (iocb->ki_flags & IOCB_DIRECT) {
                 while (iov_iter_count(i)) {
                         size_t start;
                         ssize_t n;
@@ -828,7 +828,7 @@ again:
                 return ret;
 
         if ((got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0 ||
-            (iocb->ki_filp->f_flags & O_DIRECT) ||
+            (iocb->ki_flags & IOCB_DIRECT) ||
             (fi->flags & CEPH_F_SYNC)) {
 
                 dout("aio_sync_read %p %llx.%llx %llu~%u got cap refs on %s\n",
@@ -941,9 +941,9 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
         struct ceph_inode_info *ci = ceph_inode(inode);
         struct ceph_osd_client *osdc =
                 &ceph_sb_to_client(inode->i_sb)->client->osdc;
-        ssize_t count = iov_iter_count(from), written = 0;
+        ssize_t count, written = 0;
         int err, want, got;
-        loff_t pos = iocb->ki_pos;
+        loff_t pos;
 
         if (ceph_snap(inode) != CEPH_NOSNAP)
                 return -EROFS;
@@ -953,14 +953,12 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = inode_to_bdi(inode);
 
-        err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-        if (err)
-                goto out;
-
-        if (count == 0)
+        err = generic_write_checks(iocb, from);
+        if (err <= 0)
                 goto out;
-        iov_iter_truncate(from, count);
 
+        pos = iocb->ki_pos;
+        count = iov_iter_count(from);
         err = file_remove_suid(file);
         if (err)
                 goto out;
@@ -997,12 +995,12 @@ retry_snap:
              inode, ceph_vinop(inode), pos, count, ceph_cap_string(got));
 
         if ((got & (CEPH_CAP_FILE_BUFFER|CEPH_CAP_FILE_LAZYIO)) == 0 ||
-            (file->f_flags & O_DIRECT) || (fi->flags & CEPH_F_SYNC)) {
+            (iocb->ki_flags & IOCB_DIRECT) || (fi->flags & CEPH_F_SYNC)) {
                 struct iov_iter data;
                 mutex_unlock(&inode->i_mutex);
                 /* we might need to revert back to that point */
                 data = *from;
-                if (file->f_flags & O_DIRECT)
+                if (iocb->ki_flags & IOCB_DIRECT)
                         written = ceph_sync_direct_write(iocb, &data, pos);
                 else
                         written = ceph_sync_write(iocb, &data, pos);
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ca30c391a894..ca2bc5406306 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2560,10 +2560,9 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from,
         return rc;
 }
 
-static ssize_t
-cifs_iovec_write(struct file *file, struct iov_iter *from, loff_t *poffset)
+ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from)
 {
-        size_t len;
+        struct file *file = iocb->ki_filp;
         ssize_t total_written = 0;
         struct cifsFileInfo *open_file;
         struct cifs_tcon *tcon;
@@ -2573,15 +2572,15 @@ cifs_iovec_write(struct file *file, struct iov_iter *from, loff_t *poffset)
         struct iov_iter saved_from;
         int rc;
 
-        len = iov_iter_count(from);
-        rc = generic_write_checks(file, poffset, &len, 0);
-        if (rc)
-                return rc;
-
-        if (!len)
-                return 0;
+        /*
+         * BB - optimize the way when signing is disabled. We can drop this
+         * extra memory-to-memory copying and use iovec buffers for constructing
+         * write request.
+         */
 
-        iov_iter_truncate(from, len);
+        rc = generic_write_checks(iocb, from);
+        if (rc <= 0)
+                return rc;
 
         INIT_LIST_HEAD(&wdata_list);
         cifs_sb = CIFS_FILE_SB(file);
@@ -2593,8 +2592,8 @@ cifs_iovec_write(struct file *file, struct iov_iter *from, loff_t *poffset)
 
         memcpy(&saved_from, from, sizeof(struct iov_iter));
 
-        rc = cifs_write_from_iter(*poffset, len, from, open_file, cifs_sb,
-                                  &wdata_list);
+        rc = cifs_write_from_iter(iocb->ki_pos, iov_iter_count(from), from,
+                                  open_file, cifs_sb, &wdata_list);
 
         /*
          * If at least one write was successfully sent, then discard any rc
@@ -2633,7 +2632,7 @@ restart_loop:
                                 memcpy(&tmp_from, &saved_from,
                                        sizeof(struct iov_iter));
                                 iov_iter_advance(&tmp_from,
-                                                 wdata->offset - *poffset);
+                                                 wdata->offset - iocb->ki_pos);
 
                                 rc = cifs_write_from_iter(wdata->offset,
                                                 wdata->bytes, &tmp_from,
@@ -2650,34 +2649,13 @@ restart_loop:
                 kref_put(&wdata->refcount, cifs_uncached_writedata_release);
         }
 
-        if (total_written > 0)
-                *poffset += total_written;
+        if (unlikely(!total_written))
+                return rc;
 
+        iocb->ki_pos += total_written;
+        set_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(file_inode(file))->flags);
         cifs_stats_bytes_written(tcon, total_written);
-        return total_written ? total_written : (ssize_t)rc;
-}
-
-ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from)
-{
-        ssize_t written;
-        struct inode *inode;
-        loff_t pos = iocb->ki_pos;
-
-        inode = file_inode(iocb->ki_filp);
-
-        /*
-         * BB - optimize the way when signing is disabled. We can drop this
-         * extra memory-to-memory copying and use iovec buffers for constructing
-         * write request.
-         */
-
-        written = cifs_iovec_write(iocb->ki_filp, from, &pos);
-        if (written > 0) {
-                set_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags);
-                iocb->ki_pos = pos;
-        }
-
-        return written;
+        return total_written;
 }
 
 static ssize_t
@@ -2688,8 +2666,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
         struct inode *inode = file->f_mapping->host;
         struct cifsInodeInfo *cinode = CIFS_I(inode);
         struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
-        ssize_t rc = -EACCES;
-        loff_t lock_pos = iocb->ki_pos;
+        ssize_t rc;
 
         /*
          * We need to hold the sem to be sure nobody modifies lock list
@@ -2697,23 +2674,24 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
          */
         down_read(&cinode->lock_sem);
         mutex_lock(&inode->i_mutex);
-        if (file->f_flags & O_APPEND)
-                lock_pos = i_size_read(inode);
-        if (!cifs_find_lock_conflict(cfile, lock_pos, iov_iter_count(from),
+
+        rc = generic_write_checks(iocb, from);
+        if (rc <= 0)
+                goto out;
+
+        if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
                                      server->vals->exclusive_lock_type, NULL,
-                                     CIFS_WRITE_OP)) {
+                                     CIFS_WRITE_OP))
                 rc = __generic_file_write_iter(iocb, from);
-                mutex_unlock(&inode->i_mutex);
-
-                if (rc > 0) {
-                        ssize_t err;
+        else
+                rc = -EACCES;
+out:
+        mutex_unlock(&inode->i_mutex);
 
-                        err = generic_write_sync(file, iocb->ki_pos - rc, rc);
-                        if (err < 0)
-                                rc = err;
-                }
-        } else {
-                mutex_unlock(&inode->i_mutex);
+        if (rc > 0) {
+                ssize_t err = generic_write_sync(file, iocb->ki_pos - rc, rc);
+                if (err < 0)
+                        rc = err;
         }
         up_read(&cinode->lock_sem);
         return rc;
@@ -3877,8 +3855,7 @@ void cifs_oplock_break(struct work_struct *work)
  * Direct IO is not yet supported in the cached mode. 
  */
 static ssize_t
-cifs_direct_io(int rw, struct kiocb *iocb, struct iov_iter *iter,
-               loff_t pos)
+cifs_direct_io(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
 {
         /*
          * FIXME
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index cf0db005d2f5..acb3d63bc9dc 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1598,7 +1598,7 @@ static loff_t configfs_dir_lseek(struct file *file, loff_t offset, int whence)
                         if (offset >= 0)
                                 break;
                 default:
-                        mutex_unlock(&file_inode(file)->i_mutex);
+                        mutex_unlock(&dentry->d_inode->i_mutex);
                         return -EINVAL;
         }
         if (offset != file->f_pos) {
diff --git a/fs/dax.c b/fs/dax.c
index d0bd1f4f81b3..0bb0aecb556c 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -98,9 +98,9 @@ static bool buffer_size_valid(struct buffer_head *bh)
         return bh->b_state != 0;
 }
 
-static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
-                        loff_t start, loff_t end, get_block_t get_block,
-                        struct buffer_head *bh)
+static ssize_t dax_io(struct inode *inode, struct iov_iter *iter,
+                      loff_t start, loff_t end, get_block_t get_block,
+                      struct buffer_head *bh)
 {
         ssize_t retval = 0;
         loff_t pos = start;
@@ -109,7 +109,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
         void *addr;
         bool hole = false;
 
-        if (rw != WRITE)
+        if (iov_iter_rw(iter) != WRITE)
                 end = min(end, i_size_read(inode));
 
         while (pos < end) {
@@ -124,7 +124,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                                 bh->b_size = PAGE_ALIGN(end - pos);
                                 bh->b_state = 0;
                                 retval = get_block(inode, block, bh,
-                                                                rw == WRITE);
+                                                   iov_iter_rw(iter) == WRITE);
                                 if (retval)
                                         break;
                                 if (!buffer_size_valid(bh))
@@ -137,7 +137,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                                 bh->b_size -= done;
                         }
 
-                        hole = (rw != WRITE) && !buffer_written(bh);
+                        hole = iov_iter_rw(iter) != WRITE && !buffer_written(bh);
                         if (hole) {
                                 addr = NULL;
                                 size = bh->b_size - first;
@@ -154,7 +154,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                         max = min(pos + size, end);
                 }
 
-                if (rw == WRITE)
+                if (iov_iter_rw(iter) == WRITE)
                         len = copy_from_iter(addr, max - pos, iter);
                 else if (!hole)
                         len = copy_to_iter(addr, max - pos, iter);
@@ -173,7 +173,6 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
 
 /**
  * dax_do_io - Perform I/O to a DAX file
- * @rw: READ to read or WRITE to write
  * @iocb: The control block for this I/O
  * @inode: The file which the I/O is directed at
  * @iter: The addresses to do I/O from or to
@@ -189,9 +188,9 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
  * As with do_blockdev_direct_IO(), we increment i_dio_count while the I/O
  * is in progress.
  */
-ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
-                        struct iov_iter *iter, loff_t pos,
-                        get_block_t get_block, dio_iodone_t end_io, int flags)
+ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode,
+                  struct iov_iter *iter, loff_t pos, get_block_t get_block,
+                  dio_iodone_t end_io, int flags)
 {
         struct buffer_head bh;
         ssize_t retval = -EINVAL;
@@ -199,7 +198,7 @@ ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
 
         memset(&bh, 0, sizeof(bh));
 
-        if ((flags & DIO_LOCKING) && (rw == READ)) {
+        if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ) {
                 struct address_space *mapping = inode->i_mapping;
                 mutex_lock(&inode->i_mutex);
                 retval = filemap_write_and_wait_range(mapping, pos, end - 1);
@@ -212,9 +211,9 @@ ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
         /* Protects against truncate */
         atomic_inc(&inode->i_dio_count);
 
-        retval = dax_io(rw, inode, iter, pos, end, get_block, &bh);
+        retval = dax_io(inode, iter, pos, end, get_block, &bh);
 
-        if ((flags & DIO_LOCKING) && (rw == READ))
+        if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
                 mutex_unlock(&inode->i_mutex);
 
         if ((retval > 0) && end_io)
diff --git a/fs/dcache.c b/fs/dcache.c
index d99736a63e3c..656ce522a218 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -269,6 +269,41 @@ static inline int dname_external(const struct dentry *dentry)
         return dentry->d_name.name != dentry->d_iname;
 }
 
+/*
+ * Make sure other CPUs see the inode attached before the type is set.
+ */
+static inline void __d_set_inode_and_type(struct dentry *dentry,
+                                          struct inode *inode,
+                                          unsigned type_flags)
+{
+        unsigned flags;
+
+        dentry->d_inode = inode;
+        smp_wmb();
+        flags = READ_ONCE(dentry->d_flags);
+        flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU);
+        flags |= type_flags;
+        WRITE_ONCE(dentry->d_flags, flags);
+}
+
+/*
+ * Ideally, we want to make sure that other CPUs see the flags cleared before
+ * the inode is detached, but this is really a violation of RCU principles
+ * since the ordering suggests we should always set inode before flags.
+ *
+ * We should instead replace or discard the entire dentry - but that sucks
+ * performancewise on mass deletion/rename.
+ */
+static inline void __d_clear_type_and_inode(struct dentry *dentry)
+{
+        unsigned flags = READ_ONCE(dentry->d_flags);
+
+        flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU);
+        WRITE_ONCE(dentry->d_flags, flags);
+        smp_wmb();
+        dentry->d_inode = NULL;
+}
+
 static void dentry_free(struct dentry *dentry)
 {
         WARN_ON(!hlist_unhashed(&dentry->d_u.d_alias));
@@ -311,7 +346,7 @@ static void dentry_iput(struct dentry * dentry)
 {
         struct inode *inode = dentry->d_inode;
         if (inode) {
-                dentry->d_inode = NULL;
+                __d_clear_type_and_inode(dentry);
                 hlist_del_init(&dentry->d_u.d_alias);
                 spin_unlock(&dentry->d_lock);
                 spin_unlock(&inode->i_lock);
@@ -335,8 +370,7 @@ static void dentry_unlink_inode(struct dentry * dentry)
         __releases(dentry->d_inode->i_lock)
 {
         struct inode *inode = dentry->d_inode;
-        __d_clear_type(dentry);
-        dentry->d_inode = NULL;
+        __d_clear_type_and_inode(dentry);
         hlist_del_init(&dentry->d_u.d_alias);
         dentry_rcuwalk_barrier(dentry);
         spin_unlock(&dentry->d_lock);
@@ -1715,11 +1749,9 @@ static void __d_instantiate(struct dentry *dentry, struct inode *inode)
         unsigned add_flags = d_flags_for_inode(inode);
 
         spin_lock(&dentry->d_lock);
-        dentry->d_flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU);
-        dentry->d_flags |= add_flags;
         if (inode)
                 hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
-        dentry->d_inode = inode;
+        __d_set_inode_and_type(dentry, inode, add_flags);
         dentry_rcuwalk_barrier(dentry);
         spin_unlock(&dentry->d_lock);
         fsnotify_d_instantiate(dentry, inode);
@@ -1937,8 +1969,7 @@ static struct dentry *__d_obtain_alias(struct inode *inode, int disconnected)
                 add_flags |= DCACHE_DISCONNECTED;
 
         spin_lock(&tmp->d_lock);
-        tmp->d_inode = inode;
-        tmp->d_flags |= add_flags;
+        __d_set_inode_and_type(tmp, inode, add_flags);
         hlist_add_head(&tmp->d_u.d_alias, &inode->i_dentry);
         hlist_bl_lock(&tmp->d_sb->s_anon);
         hlist_bl_add_head(&tmp->d_hash, &tmp->d_sb->s_anon);
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 61e72d44cf94..c9ee0dfe90b5 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -524,7 +524,7 @@ static int __debugfs_remove(struct dentry *dentry, struct dentry *parent)
 
         if (debugfs_positive(dentry)) {
                 dget(dentry);
-                if (S_ISDIR(dentry->d_inode->i_mode))
+                if (d_is_dir(dentry))
                         ret = simple_rmdir(parent->d_inode, dentry);
                 else
                         simple_unlink(parent->d_inode, dentry);
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 6fb00e3f1059..c3b560b24a46 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1093,10 +1093,10 @@ static inline int drop_refcount(struct dio *dio)
  * for the whole file.
  */
 static inline ssize_t
-do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-        struct block_device *bdev, struct iov_iter *iter, loff_t offset, 
-        get_block_t get_block, dio_iodone_t end_io,
-        dio_submit_t submit_io, int flags)
+do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
+                      struct block_device *bdev, struct iov_iter *iter,
+                      loff_t offset, get_block_t get_block, dio_iodone_t end_io,
+                      dio_submit_t submit_io, int flags)
 {
         unsigned i_blkbits = ACCESS_ONCE(inode->i_blkbits);
         unsigned blkbits = i_blkbits;
@@ -1110,9 +1110,6 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         struct blk_plug plug;
         unsigned long align = offset | iov_iter_alignment(iter);
 
-        if (rw & WRITE)
-                rw = WRITE_ODIRECT;
-
         /*
          * Avoid references to bdev if not absolutely needed to give
          * the early prefetch in the caller enough time.
@@ -1127,7 +1124,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         }
 
         /* watch out for a 0 len io from a tricksy fs */
-        if (rw == READ && !iov_iter_count(iter))
+        if (iov_iter_rw(iter) == READ && !iov_iter_count(iter))
                 return 0;
 
         dio = kmem_cache_alloc(dio_cache, GFP_KERNEL);
@@ -1143,7 +1140,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
 
         dio->flags = flags;
         if (dio->flags & DIO_LOCKING) {
-                if (rw == READ) {
+                if (iov_iter_rw(iter) == READ) {
                         struct address_space *mapping =
                                         iocb->ki_filp->f_mapping;
 
@@ -1169,19 +1166,19 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         if (is_sync_kiocb(iocb))
                 dio->is_async = false;
         else if (!(dio->flags & DIO_ASYNC_EXTEND) &&
-            (rw & WRITE) && end > i_size_read(inode))
+                 iov_iter_rw(iter) == WRITE && end > i_size_read(inode))
                 dio->is_async = false;
         else
                 dio->is_async = true;
 
         dio->inode = inode;
-        dio->rw = rw;
+        dio->rw = iov_iter_rw(iter) == WRITE ? WRITE_ODIRECT : READ;
 
         /*
          * For AIO O_(D)SYNC writes we need to defer completions to a workqueue
          * so that we can call ->fsync.
          */
-        if (dio->is_async && (rw & WRITE) &&
+        if (dio->is_async && iov_iter_rw(iter) == WRITE &&
             ((iocb->ki_filp->f_flags & O_DSYNC) ||
              IS_SYNC(iocb->ki_filp->f_mapping->host))) {
                 retval = dio_set_defer_completion(dio);
@@ -1274,7 +1271,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
          * we can let i_mutex go now that its achieved its purpose
          * of protecting us from looking up uninitialized blocks.
          */
-        if (rw == READ && (dio->flags & DIO_LOCKING))
+        if (iov_iter_rw(iter) == READ && (dio->flags & DIO_LOCKING))
                 mutex_unlock(&dio->inode->i_mutex);
 
         /*
@@ -1286,7 +1283,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
          */
         BUG_ON(retval == -EIOCBQUEUED);
         if (dio->is_async && retval == 0 && dio->result &&
-            (rw == READ || dio->result == count))
+            (iov_iter_rw(iter) == READ || dio->result == count))
                 retval = -EIOCBQUEUED;
         else
                 dio_await_completion(dio);
@@ -1300,11 +1297,11 @@ out:
         return retval;
 }
 
-ssize_t
-__blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-        struct block_device *bdev, struct iov_iter *iter, loff_t offset,
-        get_block_t get_block, dio_iodone_t end_io,
-        dio_submit_t submit_io, int flags)
+ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
+                             struct block_device *bdev, struct iov_iter *iter,
+                             loff_t offset, get_block_t get_block,
+                             dio_iodone_t end_io, dio_submit_t submit_io,
+                             int flags)
 {
         /*
          * The block device state is needed in the end to finally
@@ -1318,8 +1315,8 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         prefetch(bdev->bd_queue);
         prefetch((char *)bdev->bd_queue + SMP_CACHE_BYTES);
 
-        return do_blockdev_direct_IO(rw, iocb, inode, bdev, iter, offset,
-                                     get_block, end_io, submit_io, flags);
+        return do_blockdev_direct_IO(iocb, inode, bdev, iter, offset, get_block,
+                                     end_io, submit_io, flags);
 }
 
 EXPORT_SYMBOL(__blockdev_direct_IO);
diff --git a/fs/exec.c b/fs/exec.c
index c7f9b733406d..02bfd980a40c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -926,10 +926,14 @@ static int de_thread(struct task_struct *tsk)
         if (!thread_group_leader(tsk)) {
                 struct task_struct *leader = tsk->group_leader;
 
-                sig->notify_count = -1; /* for exit_notify() */
                 for (;;) {
                         threadgroup_change_begin(tsk);
                         write_lock_irq(&tasklist_lock);
+                        /*
+                         * Do this under tasklist_lock to ensure that
+                         * exit_notify() can't miss ->group_exit_task
+                         */
+                        sig->notify_count = -1;
                         if (likely(leader->exit_state))
                                 break;
                         __set_current_state(TASK_KILLABLE);
@@ -1078,7 +1082,13 @@ int flush_old_exec(struct linux_binprm * bprm)
         if (retval)
                 goto out;
 
+        /*
+         * Must be called _before_ exec_mmap() as bprm->mm is
+         * not visibile until then. This also enables the update
+         * to be lockless.
+         */
         set_mm_exe_file(bprm->mm, bprm->file);
+
         /*
          * Release all of the old mmap stuff
          */
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index a198e94813fe..35073aaec6e0 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -963,8 +963,8 @@ static void exofs_invalidatepage(struct page *page, unsigned int offset,
 
 
  /* TODO: Should be easy enough to do proprly */
-static ssize_t exofs_direct_IO(int rw, struct kiocb *iocb,
-                struct iov_iter *iter, loff_t offset)
+static ssize_t exofs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                               loff_t offset)
 {
         return 0;
 }
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index b29eb6747116..5d9213963fae 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -851,8 +851,7 @@ static sector_t ext2_bmap(struct address_space *mapping, sector_t block)
 }
 
 static ssize_t
-ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
-                        loff_t offset)
+ext2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -861,12 +860,12 @@ ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
         ssize_t ret;
 
         if (IS_DAX(inode))
-                ret = dax_do_io(rw, iocb, inode, iter, offset, ext2_get_block,
-                                NULL, DIO_LOCKING);
+                ret = dax_do_io(iocb, inode, iter, offset, ext2_get_block, NULL,
+                                DIO_LOCKING);
         else
-                ret = blockdev_direct_IO(rw, iocb, inode, iter, offset,
+                ret = blockdev_direct_IO(iocb, inode, iter, offset,
                                          ext2_get_block);
-        if (ret < 0 && (rw & WRITE))
+        if (ret < 0 && iov_iter_rw(iter) == WRITE)
                 ext2_write_failed(mapping, offset + count);
         return ret;
 }
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index db07ffbe7c85..13c0868c7160 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1820,8 +1820,8 @@ static int ext3_releasepage(struct page *page, gfp_t wait)
  * crashes then stale disk data _may_ be exposed inside the file. But current
  * VFS code falls back into buffered path in that case so we are safe.
  */
-static ssize_t ext3_direct_IO(int rw, struct kiocb *iocb,
-                        struct iov_iter *iter, loff_t offset)
+static ssize_t ext3_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -1832,9 +1832,9 @@ static ssize_t ext3_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         int retries = 0;
 
-        trace_ext3_direct_IO_enter(inode, offset, count, rw);
+        trace_ext3_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));
 
-        if (rw == WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 loff_t final_size = offset + count;
 
                 if (final_size > inode->i_size) {
@@ -1856,12 +1856,12 @@ static ssize_t ext3_direct_IO(int rw, struct kiocb *iocb,
         }
 
 retry:
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, ext3_get_block);
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, ext3_get_block);
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && ret < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
@@ -1908,7 +1908,7 @@ retry:
                         ret = err;
         }
 out:
-        trace_ext3_direct_IO_exit(inode, offset, count, rw, ret);
+        trace_ext3_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), ret);
         return ret;
 }
 
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d4dbf3c259b3..f037b4b27300 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -789,7 +789,7 @@ static const struct quotactl_ops ext3_qctl_operations = {
         .quota_on       = ext3_quota_on,
         .quota_off      = dquot_quota_off,
         .quota_sync     = dquot_quota_sync,
-        .get_info       = dquot_get_dqinfo,
+        .get_state      = dquot_get_state,
         .set_info       = dquot_set_dqinfo,
         .get_dqblk      = dquot_get_dqblk,
         .set_dqblk      = dquot_set_dqblk
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index c6874be6d58b..24215dc09a18 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -546,8 +546,7 @@ ext3_xattr_set_entry(struct ext3_xattr_info *i, struct ext3_xattr_search *s)
                 free += EXT3_XATTR_LEN(name_len);
         }
         if (i->value) {
-                if (free < EXT3_XATTR_SIZE(i->value_len) ||
-                    free < EXT3_XATTR_LEN(name_len) +
+                if (free < EXT3_XATTR_LEN(name_len) +
                            EXT3_XATTR_SIZE(i->value_len))
                         return -ENOSPC;
         }
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8a3981ea35d8..c8eb32eefc3c 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2152,8 +2152,8 @@ extern void ext4_da_update_reserve_space(struct inode *inode,
 /* indirect.c */
 extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
                                 struct ext4_map_blocks *map, int flags);
-extern ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
-                                struct iov_iter *iter, loff_t offset);
+extern ssize_t ext4_ind_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                                  loff_t offset);
 extern int ext4_ind_calc_metadata_amount(struct inode *inode, sector_t lblock);
 extern int ext4_ind_trans_blocks(struct inode *inode, int nrblocks);
 extern void ext4_ind_truncate(handle_t *, struct inode *inode);
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 7a6defcf3352..e576d682b353 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -95,11 +95,9 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         struct inode *inode = file_inode(iocb->ki_filp);
         struct mutex *aio_mutex = NULL;
         struct blk_plug plug;
-        int o_direct = io_is_direct(file);
+        int o_direct = iocb->ki_flags & IOCB_DIRECT;
         int overwrite = 0;
-        size_t length = iov_iter_count(from);
         ssize_t ret;
-        loff_t pos = iocb->ki_pos;
 
         /*
          * Unaligned direct AIO must be serialized; see comment above
@@ -108,16 +106,17 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (o_direct &&
             ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
             !is_sync_kiocb(iocb) &&
-            (file->f_flags & O_APPEND ||
-             ext4_unaligned_aio(inode, from, pos))) {
+            (iocb->ki_flags & IOCB_APPEND ||
+             ext4_unaligned_aio(inode, from, iocb->ki_pos))) {
                 aio_mutex = ext4_aio_mutex(inode);
                 mutex_lock(aio_mutex);
                 ext4_unwritten_wait(inode);
         }
 
         mutex_lock(&inode->i_mutex);
-        if (file->f_flags & O_APPEND)
-                iocb->ki_pos = pos = i_size_read(inode);
+        ret = generic_write_checks(iocb, from);
+        if (ret <= 0)
+                goto out;
 
         /*
          * If we have encountered a bitmap-format file, the size limit
@@ -126,22 +125,19 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
                 struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
 
-                if ((pos > sbi->s_bitmap_maxbytes) ||
-                    (pos == sbi->s_bitmap_maxbytes && length > 0)) {
-                        mutex_unlock(&inode->i_mutex);
+                if (iocb->ki_pos >= sbi->s_bitmap_maxbytes) {
                         ret = -EFBIG;
-                        goto errout;
+                        goto out;
                 }
-
-                if (pos + length > sbi->s_bitmap_maxbytes)
-                        iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos);
+                iov_iter_truncate(from, sbi->s_bitmap_maxbytes - iocb->ki_pos);
         }
 
         iocb->private = &overwrite;
         if (o_direct) {
+                size_t length = iov_iter_count(from);
+                loff_t pos = iocb->ki_pos;
                 blk_start_plug(&plug);
 
-
                 /* check whether we do a DIO overwrite or not */
                 if (ext4_should_dioread_nolock(inode) && !aio_mutex &&
                     !file->f_mapping->nrpages && pos + length <= i_size_read(inode)) {
@@ -185,7 +181,12 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (o_direct)
                 blk_finish_plug(&plug);
 
-errout:
+        if (aio_mutex)
+                mutex_unlock(aio_mutex);
+        return ret;
+
+out:
+        mutex_unlock(&inode->i_mutex);
         if (aio_mutex)
                 mutex_unlock(aio_mutex);
         return ret;
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 740c7871c117..3580629e42d3 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -642,8 +642,8 @@ out:
  * crashes then stale disk data _may_ be exposed inside the file. But current
  * VFS code falls back into buffered path in that case so we are safe.
  */
-ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
-                           struct iov_iter *iter, loff_t offset)
+ssize_t ext4_ind_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                           loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -654,7 +654,7 @@ ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         int retries = 0;
 
-        if (rw == WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 loff_t final_size = offset + count;
 
                 if (final_size > inode->i_size) {
@@ -676,7 +676,7 @@ ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
         }
 
 retry:
-        if (rw == READ && ext4_should_dioread_nolock(inode)) {
+        if (iov_iter_rw(iter) == READ && ext4_should_dioread_nolock(inode)) {
                 /*
                  * Nolock dioread optimization may be dynamically disabled
                  * via ext4_inode_block_unlocked_dio(). Check inode's state
@@ -690,23 +690,24 @@ retry:
                         goto locked;
                 }
                 if (IS_DAX(inode))
-                        ret = dax_do_io(rw, iocb, inode, iter, offset,
+                        ret = dax_do_io(iocb, inode, iter, offset,
                                         ext4_get_block, NULL, 0);
                 else
-                        ret = __blockdev_direct_IO(rw, iocb, inode,
-                                        inode->i_sb->s_bdev, iter, offset,
-                                        ext4_get_block, NULL, NULL, 0);
+                        ret = __blockdev_direct_IO(iocb, inode,
+                                                   inode->i_sb->s_bdev, iter,
+                                                   offset, ext4_get_block, NULL,
+                                                   NULL, 0);
                 inode_dio_done(inode);
         } else {
 locked:
                 if (IS_DAX(inode))
-                        ret = dax_do_io(rw, iocb, inode, iter, offset,
+                        ret = dax_do_io(iocb, inode, iter, offset,
                                         ext4_get_block, NULL, DIO_LOCKING);
                 else
-                        ret = blockdev_direct_IO(rw, iocb, inode, iter,
-                                        offset, ext4_get_block);
+                        ret = blockdev_direct_IO(iocb, inode, iter, offset,
+                                                 ext4_get_block);
 
-                if (unlikely((rw & WRITE) && ret < 0)) {
+                if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                         loff_t isize = i_size_read(inode);
                         loff_t end = offset + count;
 
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 035b7a06f1c3..b49cf6e59953 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2952,8 +2952,8 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
  * if the machine crashes during the write.
  *
  */
-static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
-                              struct iov_iter *iter, loff_t offset)
+static ssize_t ext4_ext_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                                  loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -2966,8 +2966,8 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
         ext4_io_end_t *io_end = NULL;
 
         /* Use the old path for reads and writes beyond i_size. */
-        if (rw != WRITE || final_size > inode->i_size)
-                return ext4_ind_direct_IO(rw, iocb, iter, offset);
+        if (iov_iter_rw(iter) != WRITE || final_size > inode->i_size)
+                return ext4_ind_direct_IO(iocb, iter, offset);
 
         BUG_ON(iocb->private == NULL);
 
@@ -2976,7 +2976,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
          * conversion. This also disallows race between truncate() and
          * overwrite DIO as i_dio_count needs to be incremented under i_mutex.
          */
-        if (rw == WRITE)
+        if (iov_iter_rw(iter) == WRITE)
                 atomic_inc(&inode->i_dio_count);
 
         /* If we do a overwrite dio, i_mutex locking can be released */
@@ -3034,10 +3034,10 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
                 dio_flags = DIO_LOCKING;
         }
         if (IS_DAX(inode))
-                ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func,
+                ret = dax_do_io(iocb, inode, iter, offset, get_block_func,
                                 ext4_end_io_dio, dio_flags);
         else
-                ret = __blockdev_direct_IO(rw, iocb, inode,
+                ret = __blockdev_direct_IO(iocb, inode,
                                            inode->i_sb->s_bdev, iter, offset,
                                            get_block_func,
                                            ext4_end_io_dio, NULL, dio_flags);
@@ -3078,7 +3078,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
         }
 
 retake_lock:
-        if (rw == WRITE)
+        if (iov_iter_rw(iter) == WRITE)
                 inode_dio_done(inode);
         /* take i_mutex locking again if we do a ovewrite dio */
         if (overwrite) {
@@ -3089,8 +3089,8 @@ retake_lock:
         return ret;
 }
 
-static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
-                              struct iov_iter *iter, loff_t offset)
+static ssize_t ext4_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -3107,12 +3107,12 @@ static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
         if (ext4_has_inline_data(inode))
                 return 0;
 
-        trace_ext4_direct_IO_enter(inode, offset, count, rw);
+        trace_ext4_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));
         if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
-                ret = ext4_ext_direct_IO(rw, iocb, iter, offset);
+                ret = ext4_ext_direct_IO(iocb, iter, offset);
         else
-                ret = ext4_ind_direct_IO(rw, iocb, iter, offset);
-        trace_ext4_direct_IO_exit(inode, offset, count, rw, ret);
+                ret = ext4_ind_direct_IO(iocb, iter, offset);
+        trace_ext4_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), ret);
         return ret;
 }
 
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e061e66c8280..d348c7d29d80 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1076,7 +1076,7 @@ static const struct quotactl_ops ext4_qctl_operations = {
         .quota_on       = ext4_quota_on,
         .quota_off      = ext4_quota_off,
         .quota_sync     = dquot_quota_sync,
-        .get_info       = dquot_get_dqinfo,
+        .get_state      = dquot_get_state,
         .set_info       = dquot_set_dqinfo,
         .get_dqblk      = dquot_get_dqblk,
         .set_dqblk      = dquot_set_dqblk
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 497f8515d205..319eda511c4f 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1118,12 +1118,12 @@ static int f2fs_write_end(struct file *file,
         return copied;
 }
 
-static int check_direct_IO(struct inode *inode, int rw,
-                struct iov_iter *iter, loff_t offset)
+static int check_direct_IO(struct inode *inode, struct iov_iter *iter,
+                           loff_t offset)
 {
         unsigned blocksize_mask = inode->i_sb->s_blocksize - 1;
 
-        if (rw == READ)
+        if (iov_iter_rw(iter) == READ)
                 return 0;
 
         if (offset & blocksize_mask)
@@ -1135,8 +1135,8 @@ static int check_direct_IO(struct inode *inode, int rw,
         return 0;
 }
 
-static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,
-                struct iov_iter *iter, loff_t offset)
+static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -1151,19 +1151,19 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,
                         return err;
         }
 
-        if (check_direct_IO(inode, rw, iter, offset))
+        if (check_direct_IO(inode, iter, offset))
                 return 0;
 
-        trace_f2fs_direct_IO_enter(inode, offset, count, rw);
+        trace_f2fs_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));
 
-        if (rw & WRITE)
+        if (iov_iter_rw(iter) == WRITE)
                 __allocate_data_blocks(inode, offset, count);
 
-        err = blockdev_direct_IO(rw, iocb, inode, iter, offset, get_data_block);
-        if (err < 0 && (rw & WRITE))
+        err = blockdev_direct_IO(iocb, inode, iter, offset, get_data_block);
+        if (err < 0 && iov_iter_rw(iter) == WRITE)
                 f2fs_write_failed(mapping, offset + count);
 
-        trace_f2fs_direct_IO_exit(inode, offset, count, rw, err);
+        trace_f2fs_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), err);
 
         return err;
 }
diff --git a/fs/fat/cache.c b/fs/fat/cache.c
index 91ad9e1c9441..93fc62232ec2 100644
--- a/fs/fat/cache.c
+++ b/fs/fat/cache.c
@@ -8,9 +8,7 @@
  *  May 1999. AV. Fixed the bogosity with FAT32 (read "FAT28"). Fscking lusers.
  */
 
-#include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/buffer_head.h>
 #include "fat.h"
 
 /* this must be > 0. */
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index c5d6bb939d19..4afc4d9d2e41 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -13,13 +13,9 @@
  *  Short name translation 1999, 2001 by Wolfram Pienkoss <wp@bszh.de>
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/time.h>
-#include <linux/buffer_head.h>
 #include <linux/compat.h>
 #include <linux/uaccess.h>
-#include <linux/kernel.h>
 #include "fat.h"
 
 /*
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index 64e295e8ff38..be5e15323bab 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -2,11 +2,8 @@
 #define _FAT_H
 
 #include <linux/buffer_head.h>
-#include <linux/string.h>
 #include <linux/nls.h>
-#include <linux/fs.h>
 #include <linux/hash.h>
-#include <linux/mutex.h>
 #include <linux/ratelimit.h>
 #include <linux/msdos_fs.h>
 
@@ -66,7 +63,7 @@ struct msdos_sb_info {
         unsigned short sec_per_clus;  /* sectors/cluster */
         unsigned short cluster_bits;  /* log2(cluster_size) */
         unsigned int cluster_size;    /* cluster size */
-        unsigned char fats, fat_bits; /* number of FATs, FAT bits (12 or 16) */
+        unsigned char fats, fat_bits; /* number of FATs, FAT bits (12,16 or 32) */
         unsigned short fat_start;
         unsigned long fat_length;     /* FAT start & length (sec.) */
         unsigned long dir_start;
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 260705c58062..8226557130a2 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -3,9 +3,6 @@
  * Released under GPL v2.
  */
 
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/msdos_fs.h>
 #include <linux/blkdev.h>
 #include "fat.h"
 
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 1e98d333879f..cf50d93565a2 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -10,10 +10,6 @@
 #include <linux/module.h>
 #include <linux/compat.h>
 #include <linux/mount.h>
-#include <linux/time.h>
-#include <linux/buffer_head.h>
-#include <linux/writeback.h>
-#include <linux/backing-dev.h>
 #include <linux/blkdev.h>
 #include <linux/fsnotify.h>
 #include <linux/security.h>
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 8521207de229..c06774658345 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -11,20 +11,12 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/slab.h>
-#include <linux/seq_file.h>
 #include <linux/pagemap.h>
 #include <linux/mpage.h>
-#include <linux/buffer_head.h>
-#include <linux/mount.h>
 #include <linux/vfs.h>
+#include <linux/seq_file.h>
 #include <linux/parser.h>
 #include <linux/uio.h>
-#include <linux/writeback.h>
-#include <linux/log2.h>
-#include <linux/hash.h>
 #include <linux/blkdev.h>
 #include <asm/unaligned.h>
 #include "fat.h"
@@ -245,8 +237,7 @@ static int fat_write_end(struct file *file, struct address_space *mapping,
         return err;
 }
 
-static ssize_t fat_direct_IO(int rw, struct kiocb *iocb,
-                             struct iov_iter *iter,
+static ssize_t fat_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
@@ -255,7 +246,7 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        if (rw == WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 /*
                  * FIXME: blockdev_direct_IO() doesn't use ->write_begin(),
                  * so we need to update the ->mmu_private to block boundary.
@@ -274,8 +265,8 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb,
          * FAT need to use the DIO_LOCKING for avoiding the race
          * condition of fat_get_block() and ->truncate().
          */
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, fat_get_block);
-        if (ret < 0 && (rw & WRITE))
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, fat_get_block);
+        if (ret < 0 && iov_iter_rw(iter) == WRITE)
                 fat_write_failed(mapping, offset + count);
 
         return ret;
@@ -1279,8 +1270,7 @@ out:
 
 static int fat_read_root(struct inode *inode)
 {
-        struct super_block *sb = inode->i_sb;
-        struct msdos_sb_info *sbi = MSDOS_SB(sb);
+        struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
         int error;
 
         MSDOS_I(inode)->i_pos = MSDOS_ROOT_INO;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index d8da2d2e30ae..c4589e981760 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -6,10 +6,6 @@
  *               and date_dos2unix for date==0 by Igor Zhbanov(bsg@uniyar.ac.ru)
  */
 
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/buffer_head.h>
-#include <linux/time.h>
 #include "fat.h"
 
 /*
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index a783b0e1272a..cc6a8541b668 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -7,8 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/time.h>
-#include <linux/buffer_head.h>
 #include "fat.h"
 
 /* Characters that are undesirable in an MS-DOS file name */
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index b8b92c2f9683..7e0974eebd8e 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -16,10 +16,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/jiffies.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
-#include <linux/buffer_head.h>
 #include <linux/namei.h>
 #include "fat.h"
 
diff --git a/fs/file.c b/fs/file.c
index ee738ea028fa..93c5f89c248b 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -638,8 +638,7 @@ static struct file *__fget(unsigned int fd, fmode_t mask)
         file = fcheck_files(files, fd);
         if (file) {
                 /* File object ref couldn't be taken */
-                if ((file->f_mode & mask) ||
-                    !atomic_long_inc_not_zero(&file->f_count))
+                if ((file->f_mode & mask) || !get_file_rcu(file))
                         file = NULL;
         }
         rcu_read_unlock();
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e1afdd7abf90..5ef05b5c4cff 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1145,13 +1145,11 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
-        size_t count = iov_iter_count(from);
         ssize_t written = 0;
         ssize_t written_buffered = 0;
         struct inode *inode = mapping->host;
         ssize_t err;
         loff_t endbyte = 0;
-        loff_t pos = iocb->ki_pos;
 
         if (get_fuse_conn(inode)->writeback_cache) {
                 /* Update size (EOF optimization) and mode (SUID clearing) */
@@ -1167,14 +1165,10 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = inode_to_bdi(inode);
 
-        err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-        if (err)
-                goto out;
-
-        if (count == 0)
+        err = generic_write_checks(iocb, from);
+        if (err <= 0)
                 goto out;
 
-        iov_iter_truncate(from, count);
         err = file_remove_suid(file);
         if (err)
                 goto out;
@@ -1183,7 +1177,8 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (err)
                 goto out;
 
-        if (file->f_flags & O_DIRECT) {
+        if (iocb->ki_flags & IOCB_DIRECT) {
+                loff_t pos = iocb->ki_pos;
                 written = generic_file_direct_write(iocb, from, pos);
                 if (written < 0 || !iov_iter_count(from))
                         goto out;
@@ -1209,9 +1204,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 written += written_buffered;
                 iocb->ki_pos = pos + written_buffered;
         } else {
-                written = fuse_perform_write(file, mapping, from, pos);
+                written = fuse_perform_write(file, mapping, from, iocb->ki_pos);
                 if (written >= 0)
-                        iocb->ki_pos = pos + written;
+                        iocb->ki_pos += written;
         }
 out:
         current->backing_dev_info = NULL;
@@ -1412,7 +1407,6 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
         struct fuse_io_priv io = { .async = 0, .file = file };
-        size_t count = iov_iter_count(from);
         ssize_t res;
 
         if (is_bad_inode(inode))
@@ -1420,11 +1414,9 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
 
         /* Don't allow parallel writes to the same file */
         mutex_lock(&inode->i_mutex);
-        res = generic_write_checks(file, &iocb->ki_pos, &count, 0);
-        if (!res) {
-                iov_iter_truncate(from, count);
+        res = generic_write_checks(iocb, from);
+        if (res > 0)
                 res = fuse_direct_io(&io, from, &iocb->ki_pos, FUSE_DIO_WRITE);
-        }
         fuse_invalidate_attr(inode);
         if (res > 0)
                 fuse_write_update_size(inode, iocb->ki_pos);
@@ -2782,8 +2774,7 @@ static inline loff_t fuse_round_up(loff_t off)
 }
 
 static ssize_t
-fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
-                        loff_t offset)
+fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 {
         DECLARE_COMPLETION_ONSTACK(wait);
         ssize_t ret = 0;
@@ -2800,15 +2791,15 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
         inode = file->f_mapping->host;
         i_size = i_size_read(inode);
 
-        if ((rw == READ) && (offset > i_size))
+        if ((iov_iter_rw(iter) == READ) && (offset > i_size))
                 return 0;
 
         /* optimization for short read */
-        if (async_dio && rw != WRITE && offset + count > i_size) {
+        if (async_dio && iov_iter_rw(iter) != WRITE && offset + count > i_size) {
                 if (offset >= i_size)
                         return 0;
-                count = min_t(loff_t, count, fuse_round_up(i_size - offset));
-                iov_iter_truncate(iter, count);
+                iov_iter_truncate(iter, fuse_round_up(i_size - offset));
+                count = iov_iter_count(iter);
         }
 
         io = kmalloc(sizeof(struct fuse_io_priv), GFP_KERNEL);
@@ -2819,7 +2810,7 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
         io->bytes = -1;
         io->size = 0;
         io->offset = offset;
-        io->write = (rw == WRITE);
+        io->write = (iov_iter_rw(iter) == WRITE);
         io->err = 0;
         io->file = file;
         /*
@@ -2834,19 +2825,15 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
          * to wait on real async I/O requests, so we must submit this request
          * synchronously.
          */
-        if (!is_sync_kiocb(iocb) && (offset + count > i_size) && rw == WRITE)
+        if (!is_sync_kiocb(iocb) && (offset + count > i_size) &&
+            iov_iter_rw(iter) == WRITE)
                 io->async = false;
 
         if (io->async && is_sync_kiocb(iocb))
                 io->done = &wait;
 
-        if (rw == WRITE) {
-                ret = generic_write_checks(file, &pos, &count, 0);
-                if (!ret) {
-                        iov_iter_truncate(iter, count);
-                        ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE);
-                }
-
+        if (iov_iter_rw(iter) == WRITE) {
+                ret = fuse_direct_io(io, iter, &pos, FUSE_DIO_WRITE);
                 fuse_invalidate_attr(inode);
         } else {
                 ret = __fuse_direct_read(io, iter, &pos);
@@ -2865,7 +2852,7 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
 
         kfree(io);
 
-        if (rw == WRITE) {
+        if (iov_iter_rw(iter) == WRITE) {
                 if (ret > 0)
                         fuse_write_update_size(inode, pos);
                 else if (ret < 0 && offset + count > i_size)
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index a6e6990aea39..5551fea0afd7 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -1016,13 +1016,12 @@ out:
 /**
  * gfs2_ok_for_dio - check that dio is valid on this file
  * @ip: The inode
- * @rw: READ or WRITE
  * @offset: The offset at which we are reading or writing
  *
  * Returns: 0 (to ignore the i/o request and thus fall back to buffered i/o)
  *          1 (to accept the i/o request)
  */
-static int gfs2_ok_for_dio(struct gfs2_inode *ip, int rw, loff_t offset)
+static int gfs2_ok_for_dio(struct gfs2_inode *ip, loff_t offset)
 {
         /*
          * Should we return an error here? I can't see that O_DIRECT for
@@ -1039,8 +1038,8 @@ static int gfs2_ok_for_dio(struct gfs2_inode *ip, int rw, loff_t offset)
 
 
 
-static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb,
-                              struct iov_iter *iter, loff_t offset)
+static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -1061,7 +1060,7 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb,
         rv = gfs2_glock_nq(&gh);
         if (rv)
                 return rv;
-        rv = gfs2_ok_for_dio(ip, rw, offset);
+        rv = gfs2_ok_for_dio(ip, offset);
         if (rv != 1)
                 goto out; /* dio not valid, fall back to buffered i/o */
 
@@ -1091,13 +1090,12 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb,
                 rv = filemap_write_and_wait_range(mapping, lstart, end);
                 if (rv)
                         goto out;
-                if (rw == WRITE)
+                if (iov_iter_rw(iter) == WRITE)
                         truncate_inode_pages_range(mapping, lstart, end);
         }
 
-        rv = __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,
-                                  iter, offset,
-                                  gfs2_get_block_direct, NULL, NULL, 0);
+        rv = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
+                                  offset, gfs2_get_block_direct, NULL, NULL, 0);
 out:
         gfs2_glock_dq(&gh);
         gfs2_holder_uninit(&gh);
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 207eb4a8135e..31892871ea87 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -709,7 +709,7 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 
         gfs2_size_hint(file, iocb->ki_pos, iov_iter_count(from));
 
-        if (file->f_flags & O_APPEND) {
+        if (iocb->ki_flags & IOCB_APPEND) {
                 struct gfs2_holder gh;
 
                 ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &gh);
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 5c27e48aa76f..e3065cb9ab08 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1494,32 +1494,34 @@ int gfs2_quotad(void *data)
         return 0;
 }
 
-static int gfs2_quota_get_xstate(struct super_block *sb,
-                                 struct fs_quota_stat *fqs)
+static int gfs2_quota_get_state(struct super_block *sb, struct qc_state *state)
 {
         struct gfs2_sbd *sdp = sb->s_fs_info;
 
-        memset(fqs, 0, sizeof(struct fs_quota_stat));
-        fqs->qs_version = FS_QSTAT_VERSION;
+        memset(state, 0, sizeof(*state));
 
         switch (sdp->sd_args.ar_quota) {
         case GFS2_QUOTA_ON:
-                fqs->qs_flags |= (FS_QUOTA_UDQ_ENFD | FS_QUOTA_GDQ_ENFD);
+                state->s_state[USRQUOTA].flags |= QCI_LIMITS_ENFORCED;
+                state->s_state[GRPQUOTA].flags |= QCI_LIMITS_ENFORCED;
                 /*FALLTHRU*/
         case GFS2_QUOTA_ACCOUNT:
-                fqs->qs_flags |= (FS_QUOTA_UDQ_ACCT | FS_QUOTA_GDQ_ACCT);
+                state->s_state[USRQUOTA].flags |= QCI_ACCT_ENABLED |
+                                                  QCI_SYSFILE;
+                state->s_state[GRPQUOTA].flags |= QCI_ACCT_ENABLED |
+                                                  QCI_SYSFILE;
                 break;
         case GFS2_QUOTA_OFF:
                 break;
         }
-
         if (sdp->sd_quota_inode) {
-                fqs->qs_uquota.qfs_ino = GFS2_I(sdp->sd_quota_inode)->i_no_addr;
-                fqs->qs_uquota.qfs_nblks = sdp->sd_quota_inode->i_blocks;
+                state->s_state[USRQUOTA].ino =
+                                        GFS2_I(sdp->sd_quota_inode)->i_no_addr;
+                state->s_state[USRQUOTA].blocks = sdp->sd_quota_inode->i_blocks;
         }
-        fqs->qs_uquota.qfs_nextents = 1; /* unsupported */
-        fqs->qs_gquota = fqs->qs_uquota; /* its the same inode in both cases */
-        fqs->qs_incoredqs = list_lru_count(&gfs2_qd_lru);
+        state->s_state[USRQUOTA].nextents = 1;  /* unsupported */
+        state->s_state[GRPQUOTA] = state->s_state[USRQUOTA];
+        state->s_incoredqs = list_lru_count(&gfs2_qd_lru);
         return 0;
 }
 
@@ -1664,7 +1666,7 @@ out_put:
 
 const struct quotactl_ops gfs2_quotactl_ops = {
         .quota_sync     = gfs2_quota_sync,
-        .get_xstate     = gfs2_quota_get_xstate,
+        .get_state      = gfs2_quota_get_state,
         .get_dqblk      = gfs2_get_dqblk,
         .set_dqblk      = gfs2_set_dqblk,
 };
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 145566851e7a..36d1a6ae7655 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -197,7 +197,7 @@ static int hfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
         inode = hfs_new_inode(dir, &dentry->d_name, mode);
         if (!inode)
-                return -ENOSPC;
+                return -ENOMEM;
 
         res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode);
         if (res) {
@@ -226,7 +226,7 @@ static int hfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 
         inode = hfs_new_inode(dir, &dentry->d_name, S_IFDIR | mode);
         if (!inode)
-                return -ENOSPC;
+                return -ENOMEM;
 
         res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode);
         if (res) {
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 9337065bcc67..75fd5d873c19 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -124,8 +124,8 @@ static int hfs_releasepage(struct page *page, gfp_t mask)
         return res ? try_to_free_buffers(page) : 0;
 }
 
-static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
-                struct iov_iter *iter, loff_t offset)
+static ssize_t hfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                             loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -133,13 +133,13 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, hfs_get_block);
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, hfs_get_block);
 
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && ret < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
diff --git a/fs/hfsplus/bfind.c b/fs/hfsplus/bfind.c
index c1422d91cd36..528e38b5af7f 100644
--- a/fs/hfsplus/bfind.c
+++ b/fs/hfsplus/bfind.c
@@ -118,9 +118,7 @@ int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd,
         int b, e;
         int res;
 
-        if (!rec_found)
-                BUG();
-
+        BUG_ON(!rec_found);
         b = 0;
         e = bnode->num_recs - 1;
         res = -ENOENT;
diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index 7892e6fddb66..022974ab6e3c 100644
--- a/fs/hfsplus/catalog.c
+++ b/fs/hfsplus/catalog.c
@@ -350,10 +350,11 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
                         &fd.search_key->cat.name.unicode,
                         off + 2, len);
                 fd.search_key->key_len = cpu_to_be16(6 + len);
-        } else
+        } else {
                 err = hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, str);
                 if (unlikely(err))
                         goto out;
+        }
 
         err = hfs_brec_find(&fd, hfs_find_rec_by_key);
         if (err)
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index f0235c1640af..3074609befc3 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -434,7 +434,7 @@ static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,
 {
         struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
         struct inode *inode;
-        int res = -ENOSPC;
+        int res = -ENOMEM;
 
         mutex_lock(&sbi->vh_mutex);
         inode = hfsplus_new_inode(dir->i_sb, S_IFLNK | S_IRWXUGO);
@@ -476,7 +476,7 @@ static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
 {
         struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
         struct inode *inode;
-        int res = -ENOSPC;
+        int res = -ENOMEM;
 
         mutex_lock(&sbi->vh_mutex);
         inode = hfsplus_new_inode(dir->i_sb, mode);
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 5f86cadb0542..b0afedbef12b 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -122,8 +122,8 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask)
         return res ? try_to_free_buffers(page) : 0;
 }
 
-static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb,
-                struct iov_iter *iter, loff_t offset)
+static ssize_t hfsplus_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                                 loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -131,14 +131,13 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, 
-                                 hfsplus_get_block);
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, hfsplus_get_block);
 
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && ret < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
@@ -254,6 +253,12 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)
         if ((attr->ia_valid & ATTR_SIZE) &&
             attr->ia_size != i_size_read(inode)) {
                 inode_dio_wait(inode);
+                if (attr->ia_size > inode->i_size) {
+                        error = generic_cont_expand_simple(inode,
+                                                           attr->ia_size);
+                        if (error)
+                                return error;
+                }
                 truncate_setsize(inode, attr->ia_size);
                 hfsplus_file_truncate(inode);
         }
diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index d3ff5cc317d7..8e98f5db6ad6 100644
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -76,7 +76,7 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
 {
         struct inode *inode = file_inode(file);
         struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
-        unsigned int flags;
+        unsigned int flags, new_fl = 0;
         int err = 0;
 
         err = mnt_want_write_file(file);
@@ -110,14 +110,12 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
         }
 
         if (flags & FS_IMMUTABLE_FL)
-                inode->i_flags |= S_IMMUTABLE;
-        else
-                inode->i_flags &= ~S_IMMUTABLE;
+                new_fl |= S_IMMUTABLE;
 
         if (flags & FS_APPEND_FL)
-                inode->i_flags |= S_APPEND;
-        else
-                inode->i_flags &= ~S_APPEND;
+                new_fl |= S_APPEND;
+
+        inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND);
 
         if (flags & FS_NODUMP_FL)
                 hip->userflags |= HFSPLUS_FLG_NODUMP;
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index d98094a9f476..89f262d8fcd8 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -44,7 +44,7 @@ static int strcmp_xattr_acl(const char *name)
         return -1;
 }
 
-static inline int is_known_namespace(const char *name)
+static bool is_known_namespace(const char *name)
 {
         if (strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN) &&
             strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) &&
@@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char *xattr_name, int name_len)
         return len;
 }
 
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+                     const void *value, size_t size, int flags,
+                     const char *prefix, size_t prefixlen)
+{
+        char *xattr_name;
+        int res;
+
+        if (!strcmp(name, ""))
+                return -EINVAL;
+
+        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+                GFP_KERNEL);
+        if (!xattr_name)
+                return -ENOMEM;
+        strcpy(xattr_name, prefix);
+        strcpy(xattr_name + prefixlen, name);
+        res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
+                                 flags);
+        kfree(xattr_name);
+        return res;
+}
+
 static ssize_t hfsplus_getxattr_finder_info(struct inode *inode,
                                                 void *value, size_t size)
 {
@@ -560,6 +582,30 @@ failed_getxattr_init:
         return res;
 }
 
+ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
+                         void *value, size_t size,
+                         const char *prefix, size_t prefixlen)
+{
+        int res;
+        char *xattr_name;
+
+        if (!strcmp(name, ""))
+                return -EINVAL;
+
+        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+                             GFP_KERNEL);
+        if (!xattr_name)
+                return -ENOMEM;
+
+        strcpy(xattr_name, prefix);
+        strcpy(xattr_name + prefixlen, name);
+
+        res = __hfsplus_getxattr(dentry->d_inode, xattr_name, value, size);
+        kfree(xattr_name);
+        return res;
+
+}
+
 static inline int can_list(const char *xattr_name)
 {
         if (!xattr_name)
@@ -806,9 +852,6 @@ end_removexattr:
 static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
                                         void *buffer, size_t size, int type)
 {
-        char *xattr_name;
-        int res;
-
         if (!strcmp(name, ""))
                 return -EINVAL;
 
@@ -818,24 +861,19 @@ static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
          */
         if (is_known_namespace(name))
                 return -EOPNOTSUPP;
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN
-                + XATTR_MAC_OSX_PREFIX_LEN + 1, GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_MAC_OSX_PREFIX);
-        strcpy(xattr_name + XATTR_MAC_OSX_PREFIX_LEN, name);
 
-        res = hfsplus_getxattr(dentry, xattr_name, buffer, size);
-        kfree(xattr_name);
-        return res;
+        /*
+         * osx is the namespace we use to indicate an unprefixed
+         * attribute on the filesystem (like the ones that OS X
+         * creates), so we pass the name through unmodified (after
+         * ensuring it doesn't conflict with another namespace).
+         */
+        return __hfsplus_getxattr(dentry->d_inode, name, buffer, size);
 }
 
 static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
                 const void *buffer, size_t size, int flags, int type)
 {
-        char *xattr_name;
-        int res;
-
         if (!strcmp(name, ""))
                 return -EINVAL;
 
@@ -845,16 +883,14 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
          */
         if (is_known_namespace(name))
                 return -EOPNOTSUPP;
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN
-                + XATTR_MAC_OSX_PREFIX_LEN + 1, GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_MAC_OSX_PREFIX);
-        strcpy(xattr_name + XATTR_MAC_OSX_PREFIX_LEN, name);
 
-        res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-        kfree(xattr_name);
-        return res;
+        /*
+         * osx is the namespace we use to indicate an unprefixed
+         * attribute on the filesystem (like the ones that OS X
+         * creates), so we pass the name through unmodified (after
+         * ensuring it doesn't conflict with another namespace).
+         */
+        return __hfsplus_setxattr(dentry->d_inode, name, buffer, size, flags);
 }
 
 static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h
index 288530cf80b5..f9b0955b3d28 100644
--- a/fs/hfsplus/xattr.h
+++ b/fs/hfsplus/xattr.h
@@ -21,22 +21,16 @@ extern const struct xattr_handler *hfsplus_xattr_handlers[];
 int __hfsplus_setxattr(struct inode *inode, const char *name,
                         const void *value, size_t size, int flags);
 
-static inline int hfsplus_setxattr(struct dentry *dentry, const char *name,
-                        const void *value, size_t size, int flags)
-{
-        return __hfsplus_setxattr(dentry->d_inode, name, value, size, flags);
-}
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+                                   const void *value, size_t size, int flags,
+                                   const char *prefix, size_t prefixlen);
 
 ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,
-                        void *value, size_t size);
-
-static inline ssize_t hfsplus_getxattr(struct dentry *dentry,
-                                        const char *name,
-                                        void *value,
-                                        size_t size)
-{
-        return __hfsplus_getxattr(dentry->d_inode, name, value, size);
-}
+                           void *value, size_t size);
+
+ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
+                         void *value, size_t size,
+                         const char *prefix, size_t prefixlen);
 
 ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);
 
diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index 6ec5e107691f..aacff00a9ff9 100644
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -16,43 +16,17 @@
 static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
                                         void *buffer, size_t size, int type)
 {
-        char *xattr_name;
-        int res;
-
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_SECURITY_PREFIX);
-        strcpy(xattr_name + XATTR_SECURITY_PREFIX_LEN, name);
-
-        res = hfsplus_getxattr(dentry, xattr_name, buffer, size);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_getxattr(dentry, name, buffer, size,
+                                XATTR_SECURITY_PREFIX,
+                                XATTR_SECURITY_PREFIX_LEN);
 }
 
 static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
                 const void *buffer, size_t size, int flags, int type)
 {
-        char *xattr_name;
-        int res;
-
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_SECURITY_PREFIX);
-        strcpy(xattr_name + XATTR_SECURITY_PREFIX_LEN, name);
-
-        res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                                XATTR_SECURITY_PREFIX,
+                                XATTR_SECURITY_PREFIX_LEN);
 }
 
 static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index 3c5f27e4746a..bcf65089b7f7 100644
--- a/fs/hfsplus/xattr_trusted.c
+++ b/fs/hfsplus/xattr_trusted.c
@@ -14,43 +14,16 @@
 static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
                                         void *buffer, size_t size, int type)
 {
-        char *xattr_name;
-        int res;
-
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_TRUSTED_PREFIX);
-        strcpy(xattr_name + XATTR_TRUSTED_PREFIX_LEN, name);
-
-        res = hfsplus_getxattr(dentry, xattr_name, buffer, size);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_getxattr(dentry, name, buffer, size,
+                                XATTR_TRUSTED_PREFIX,
+                                XATTR_TRUSTED_PREFIX_LEN);
 }
 
 static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
                 const void *buffer, size_t size, int flags, int type)
 {
-        char *xattr_name;
-        int res;
-
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_TRUSTED_PREFIX);
-        strcpy(xattr_name + XATTR_TRUSTED_PREFIX_LEN, name);
-
-        res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                                XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
 }
 
 static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index 2b625a538b64..5aa0e6dc4a1e 100644
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -14,43 +14,16 @@
 static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
                                         void *buffer, size_t size, int type)
 {
-        char *xattr_name;
-        int res;
 
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_USER_PREFIX);
-        strcpy(xattr_name + XATTR_USER_PREFIX_LEN, name);
-
-        res = hfsplus_getxattr(dentry, xattr_name, buffer, size);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_getxattr(dentry, name, buffer, size,
+                                XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
 static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
                 const void *buffer, size_t size, int flags, int type)
 {
-        char *xattr_name;
-        int res;
-
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
-        xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-                GFP_KERNEL);
-        if (!xattr_name)
-                return -ENOMEM;
-        strcpy(xattr_name, XATTR_USER_PREFIX);
-        strcpy(xattr_name + XATTR_USER_PREFIX_LEN, name);
-
-        res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-        kfree(xattr_name);
-        return res;
+        return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                                XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
 static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 3197aed10614..070dc4b33544 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -330,8 +330,8 @@ static sector_t jfs_bmap(struct address_space *mapping, sector_t block)
         return generic_block_bmap(mapping, block, jfs_get_block);
 }
 
-static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
-        struct iov_iter *iter, loff_t offset)
+static ssize_t jfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                             loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -339,13 +339,13 @@ static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, jfs_get_block);
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, jfs_get_block);
 
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && ret < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
diff --git a/fs/locks.c b/fs/locks.c
index 52b780fb5258..653faabb07f4 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2590,6 +2590,44 @@ static int locks_show(struct seq_file *f, void *v)
         return 0;
 }
 
+static void __show_fd_locks(struct seq_file *f,
+                        struct list_head *head, int *id,
+                        struct file *filp, struct files_struct *files)
+{
+        struct file_lock *fl;
+
+        list_for_each_entry(fl, head, fl_list) {
+
+                if (filp != fl->fl_file)
+                        continue;
+                if (fl->fl_owner != files &&
+                    fl->fl_owner != filp)
+                        continue;
+
+                (*id)++;
+                seq_puts(f, "lock:\t");
+                lock_get_status(f, fl, *id, "");
+        }
+}
+
+void show_fd_locks(struct seq_file *f,
+                  struct file *filp, struct files_struct *files)
+{
+        struct inode *inode = file_inode(filp);
+        struct file_lock_context *ctx;
+        int id = 0;
+
+        ctx = inode->i_flctx;
+        if (!ctx)
+                return;
+
+        spin_lock(&ctx->flc_lock);
+        __show_fd_locks(f, &ctx->flc_flock, &id, filp, files);
+        __show_fd_locks(f, &ctx->flc_posix, &id, filp, files);
+        __show_fd_locks(f, &ctx->flc_lease, &id, filp, files);
+        spin_unlock(&ctx->flc_lock);
+}
+
 static void *locks_start(struct seq_file *f, loff_t *pos)
         __acquires(&blocked_lock_lock)
 {
diff --git a/fs/namei.c b/fs/namei.c
index 76fb76a0818b..ffab2e06e147 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1585,7 +1585,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
                 inode = path->dentry->d_inode;
         }
         err = -ENOENT;
-        if (!inode || d_is_negative(path->dentry))
+        if (d_is_negative(path->dentry))
                 goto out_path_put;
 
         if (should_follow_link(path->dentry, follow)) {
@@ -2310,7 +2310,7 @@ mountpoint_last(struct nameidata *nd, struct path *path)
         mutex_unlock(&dir->d_inode->i_mutex);
 
 done:
-        if (!dentry->d_inode || d_is_negative(dentry)) {
+        if (d_is_negative(dentry)) {
                 error = -ENOENT;
                 dput(dentry);
                 goto out;
@@ -3038,7 +3038,7 @@ retry_lookup:
 finish_lookup:
         /* we _can_ be in RCU mode here */
         error = -ENOENT;
-        if (!inode || d_is_negative(path->dentry)) {
+        if (d_is_negative(path->dentry)) {
                 path_to_nameidata(path, nd);
                 goto out;
         }
@@ -3077,7 +3077,7 @@ finish_open:
         error = -ENOTDIR;
         if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
                 goto out;
-        if (!S_ISREG(nd->inode->i_mode))
+        if (!d_is_reg(nd->path.dentry))
                 will_truncate = false;
 
         if (will_truncate) {
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 479bf8db264e..011324ce9df2 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -170,20 +170,15 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
         size_t already_written = 0;
-        loff_t pos = iocb->ki_pos;
-        size_t count = iov_iter_count(from);
         size_t bufsize;
         int errno;
         void *bouncebuffer;
+        off_t pos;
 
         ncp_dbg(1, "enter %pD2\n", file);
-        errno = generic_write_checks(file, &pos, &count, 0);
-        if (errno)
+        errno = generic_write_checks(iocb, from);
+        if (errno <= 0)
                 return errno;
-        iov_iter_truncate(from, count);
-        
-        if (!count)
-                return 0;
 
         errno = ncp_make_open(inode, O_WRONLY);
         if (errno) {
@@ -201,10 +196,11 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 errno = -EIO;   /* -ENOMEM */
                 goto outrel;
         }
+        pos = iocb->ki_pos;
         while (iov_iter_count(from)) {
                 int written_this_time;
                 size_t to_write = min_t(size_t,
-                                      bufsize - ((off_t)pos % bufsize),
+                                      bufsize - (pos % bufsize),
                                       iov_iter_count(from));
 
                 if (copy_from_iter(bouncebuffer, to_write, from) != to_write) {
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index c3929fb2ab26..682f65fe09b5 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -240,7 +240,6 @@ static int nfs_direct_cmp_commit_data_verf(struct nfs_direct_req *dreq,
 
 /**
  * nfs_direct_IO - NFS address space operation for direct I/O
- * @rw: direction (read or write)
  * @iocb: target I/O control block
  * @iov: array of vectors that define I/O buffer
  * @pos: offset in file to begin the operation
@@ -251,7 +250,7 @@ static int nfs_direct_cmp_commit_data_verf(struct nfs_direct_req *dreq,
  * shunt off direct read and write requests before the VFS gets them,
  * so this method is only ever called for swap.
  */
-ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
+ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
 {
         struct inode *inode = iocb->ki_filp->f_mapping->host;
 
@@ -267,9 +266,9 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t
 #else
         VM_BUG_ON(iov_iter_count(iter) != PAGE_SIZE);
 
-        if (rw == READ)
+        if (iov_iter_rw(iter) == READ)
                 return nfs_file_direct_read(iocb, iter, pos);
-        return nfs_file_direct_write(iocb, iter, pos);
+        return nfs_file_direct_write(iocb, iter);
 #endif /* CONFIG_NFS_SWAP */
 }
 
@@ -960,8 +959,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
  * Note that O_APPEND is not supported for NFS direct writes, as there
  * is no atomic O_APPEND write facility in the NFS protocol.
  */
-ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
-                                loff_t pos)
+ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
 {
         ssize_t result = -EINVAL;
         struct file *file = iocb->ki_filp;
@@ -969,25 +967,16 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
         struct inode *inode = mapping->host;
         struct nfs_direct_req *dreq;
         struct nfs_lock_context *l_ctx;
-        loff_t end;
-        size_t count = iov_iter_count(iter);
-        end = (pos + count - 1) >> PAGE_CACHE_SHIFT;
-
-        nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count);
+        loff_t pos, end;
 
         dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n",
-                file, count, (long long) pos);
+                file, iov_iter_count(iter), (long long) iocb->ki_pos);
 
-        result = generic_write_checks(file, &pos, &count, 0);
-        if (result)
-                goto out;
+        nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES,
+                      iov_iter_count(iter));
 
-        result = -EINVAL;
-        if ((ssize_t) count < 0)
-                goto out;
-        result = 0;
-        if (!count)
-                goto out;
+        pos = iocb->ki_pos;
+        end = (pos + iov_iter_count(iter) - 1) >> PAGE_CACHE_SHIFT;
 
         mutex_lock(&inode->i_mutex);
 
@@ -1002,7 +991,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
                         goto out_unlock;
         }
 
-        task_io_account_write(count);
+        task_io_account_write(iov_iter_count(iter));
 
         result = -ENOMEM;
         dreq = nfs_direct_req_alloc();
@@ -1010,7 +999,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
                 goto out_unlock;
 
         dreq->inode = inode;
-        dreq->bytes_left = count;
+        dreq->bytes_left = iov_iter_count(iter);
         dreq->io_start = pos;
         dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));
         l_ctx = nfs_get_lock_context(dreq->ctx);
@@ -1050,7 +1039,6 @@ out_release:
         nfs_direct_req_release(dreq);
 out_unlock:
         mutex_unlock(&inode->i_mutex);
-out:
         return result;
 }
 
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index f6a3adedf027..c40e4363e746 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -170,7 +170,7 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to)
         struct inode *inode = file_inode(iocb->ki_filp);
         ssize_t result;
 
-        if (iocb->ki_filp->f_flags & O_DIRECT)
+        if (iocb->ki_flags & IOCB_DIRECT)
                 return nfs_file_direct_read(iocb, to, iocb->ki_pos);
 
         dprintk("NFS: read(%pD2, %zu@%lu)\n",
@@ -674,17 +674,20 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
         unsigned long written = 0;
         ssize_t result;
         size_t count = iov_iter_count(from);
-        loff_t pos = iocb->ki_pos;
 
         result = nfs_key_timeout_notify(file, inode);
         if (result)
                 return result;
 
-        if (file->f_flags & O_DIRECT)
-                return nfs_file_direct_write(iocb, from, pos);
+        if (iocb->ki_flags & IOCB_DIRECT) {
+                result = generic_write_checks(iocb, from);
+                if (result <= 0)
+                        return result;
+                return nfs_file_direct_write(iocb, from);
+        }
 
         dprintk("NFS: write(%pD2, %zu@%Ld)\n",
-                file, count, (long long) pos);
+                file, count, (long long) iocb->ki_pos);
 
         result = -EBUSY;
         if (IS_SWAPFILE(inode))
@@ -692,7 +695,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
         /*
          * O_APPEND implies that we must revalidate the file length.
          */
-        if (file->f_flags & O_APPEND) {
+        if (iocb->ki_flags & IOCB_APPEND) {
                 result = nfs_revalidate_file_size(inode, file);
                 if (result)
                         goto out;
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 568ecf0a880f..b8f5c63f77b2 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -117,15 +117,15 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
 
 static void nfs_readpage_release(struct nfs_page *req)
 {
-        struct inode *d_inode = req->wb_context->dentry->d_inode;
+        struct inode *inode = req->wb_context->dentry->d_inode;
 
-        dprintk("NFS: read done (%s/%llu %d@%lld)\n", d_inode->i_sb->s_id,
-                (unsigned long long)NFS_FILEID(d_inode), req->wb_bytes,
+        dprintk("NFS: read done (%s/%llu %d@%lld)\n", inode->i_sb->s_id,
+                (unsigned long long)NFS_FILEID(inode), req->wb_bytes,
                 (long long)req_offset(req));
 
         if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE)) {
                 if (PageUptodate(req->wb_page))
-                        nfs_readpage_to_fscache(d_inode, req->wb_page, 0);
+                        nfs_readpage_to_fscache(inode, req->wb_page, 0);
 
                 unlock_page(req->wb_page);
         }
diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 741fd02e0444..8df0f3b7839b 100644
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -405,13 +405,14 @@ nilfs_palloc_rest_groups_in_desc_block(const struct inode *inode,
 static int nilfs_palloc_count_desc_blocks(struct inode *inode,
                                             unsigned long *desc_blocks)
 {
-        unsigned long blknum;
+        __u64 blknum;
         int ret;
 
         ret = nilfs_bmap_last_key(NILFS_I(inode)->i_bmap, &blknum);
         if (likely(!ret))
                 *desc_blocks = DIV_ROUND_UP(
-                        blknum, NILFS_MDT(inode)->mi_blocks_per_desc_block);
+                        (unsigned long)blknum,
+                        NILFS_MDT(inode)->mi_blocks_per_desc_block);
         return ret;
 }
 
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
index aadbd0b5e3e8..27f75bcbeb30 100644
--- a/fs/nilfs2/bmap.c
+++ b/fs/nilfs2/bmap.c
@@ -152,9 +152,7 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
  *
  * %-EEXIST - A record associated with @key already exist.
  */
-int nilfs_bmap_insert(struct nilfs_bmap *bmap,
-                      unsigned long key,
-                      unsigned long rec)
+int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec)
 {
         int ret;
 
@@ -191,19 +189,47 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key)
         return bmap->b_ops->bop_delete(bmap, key);
 }
 
-int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key)
+/**
+ * nilfs_bmap_seek_key - seek a valid entry and return its key
+ * @bmap: bmap struct
+ * @start: start key number
+ * @keyp: place to store valid key
+ *
+ * Description: nilfs_bmap_seek_key() seeks a valid key on @bmap
+ * starting from @start, and stores it to @keyp if found.
+ *
+ * Return Value: On success, 0 is returned. On error, one of the following
+ * negative error codes is returned.
+ *
+ * %-EIO - I/O error.
+ *
+ * %-ENOMEM - Insufficient amount of memory available.
+ *
+ * %-ENOENT - No valid entry was found
+ */
+int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp)
 {
-        __u64 lastkey;
         int ret;
 
         down_read(&bmap->b_sem);
-        ret = bmap->b_ops->bop_last_key(bmap, &lastkey);
+        ret = bmap->b_ops->bop_seek_key(bmap, start, keyp);
+        up_read(&bmap->b_sem);
+
+        if (ret < 0)
+                ret = nilfs_bmap_convert_error(bmap, __func__, ret);
+        return ret;
+}
+
+int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp)
+{
+        int ret;
+
+        down_read(&bmap->b_sem);
+        ret = bmap->b_ops->bop_last_key(bmap, keyp);
         up_read(&bmap->b_sem);
 
         if (ret < 0)
                 ret = nilfs_bmap_convert_error(bmap, __func__, ret);
-        else
-                *key = lastkey;
         return ret;
 }
 
@@ -224,7 +250,7 @@ int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key)
  *
  * %-ENOENT - A record associated with @key does not exist.
  */
-int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key)
+int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key)
 {
         int ret;
 
@@ -235,7 +261,7 @@ int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key)
         return nilfs_bmap_convert_error(bmap, __func__, ret);
 }
 
-static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key)
+static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, __u64 key)
 {
         __u64 lastkey;
         int ret;
@@ -276,7 +302,7 @@ static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key)
  *
  * %-ENOMEM - Insufficient amount of memory available.
  */
-int nilfs_bmap_truncate(struct nilfs_bmap *bmap, unsigned long key)
+int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key)
 {
         int ret;
 
diff --git a/fs/nilfs2/bmap.h b/fs/nilfs2/bmap.h
index b89e68076adc..bfa817ce40b3 100644
--- a/fs/nilfs2/bmap.h
+++ b/fs/nilfs2/bmap.h
@@ -76,8 +76,10 @@ struct nilfs_bmap_operations {
                           union nilfs_binfo *);
         int (*bop_mark)(struct nilfs_bmap *, __u64, int);
 
-        /* The following functions are internal use only. */
+        int (*bop_seek_key)(const struct nilfs_bmap *, __u64, __u64 *);
         int (*bop_last_key)(const struct nilfs_bmap *, __u64 *);
+
+        /* The following functions are internal use only. */
         int (*bop_check_insert)(const struct nilfs_bmap *, __u64);
         int (*bop_check_delete)(struct nilfs_bmap *, __u64);
         int (*bop_gather_data)(struct nilfs_bmap *, __u64 *, __u64 *, int);
@@ -153,10 +155,11 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *);
 int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *);
 void nilfs_bmap_write(struct nilfs_bmap *, struct nilfs_inode *);
 int nilfs_bmap_lookup_contig(struct nilfs_bmap *, __u64, __u64 *, unsigned);
-int nilfs_bmap_insert(struct nilfs_bmap *, unsigned long, unsigned long);
-int nilfs_bmap_delete(struct nilfs_bmap *, unsigned long);
-int nilfs_bmap_last_key(struct nilfs_bmap *, unsigned long *);
-int nilfs_bmap_truncate(struct nilfs_bmap *, unsigned long);
+int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec);
+int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key);
+int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp);
+int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp);
+int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key);
 void nilfs_bmap_clear(struct nilfs_bmap *);
 int nilfs_bmap_propagate(struct nilfs_bmap *, struct buffer_head *);
 void nilfs_bmap_lookup_dirty_buffers(struct nilfs_bmap *, struct list_head *);
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index ecdbae19a766..059f37137f9a 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -633,6 +633,44 @@ static int nilfs_btree_do_lookup_last(const struct nilfs_bmap *btree,
         return 0;
 }
 
+/**
+ * nilfs_btree_get_next_key - get next valid key from btree path array
+ * @btree: bmap struct of btree
+ * @path: array of nilfs_btree_path struct
+ * @minlevel: start level
+ * @nextkey: place to store the next valid key
+ *
+ * Return Value: If a next key was found, 0 is returned. Otherwise,
+ * -ENOENT is returned.
+ */
+static int nilfs_btree_get_next_key(const struct nilfs_bmap *btree,
+                                    const struct nilfs_btree_path *path,
+                                    int minlevel, __u64 *nextkey)
+{
+        struct nilfs_btree_node *node;
+        int maxlevel = nilfs_btree_height(btree) - 1;
+        int index, next_adj, level;
+
+        /* Next index is already set to bp_index for leaf nodes. */
+        next_adj = 0;
+        for (level = minlevel; level <= maxlevel; level++) {
+                if (level == maxlevel)
+                        node = nilfs_btree_get_root(btree);
+                else
+                        node = nilfs_btree_get_nonroot_node(path, level);
+
+                index = path[level].bp_index + next_adj;
+                if (index < nilfs_btree_node_get_nchildren(node)) {
+                        /* Next key is in this node */
+                        *nextkey = nilfs_btree_node_get_key(node, index);
+                        return 0;
+                }
+                /* For non-leaf nodes, next index is stored at bp_index + 1. */
+                next_adj = 1;
+        }
+        return -ENOENT;
+}
+
 static int nilfs_btree_lookup(const struct nilfs_bmap *btree,
                               __u64 key, int level, __u64 *ptrp)
 {
@@ -1563,6 +1601,27 @@ out:
         return ret;
 }
 
+static int nilfs_btree_seek_key(const struct nilfs_bmap *btree, __u64 start,
+                                __u64 *keyp)
+{
+        struct nilfs_btree_path *path;
+        const int minlevel = NILFS_BTREE_LEVEL_NODE_MIN;
+        int ret;
+
+        path = nilfs_btree_alloc_path();
+        if (!path)
+                return -ENOMEM;
+
+        ret = nilfs_btree_do_lookup(btree, path, start, NULL, minlevel, 0);
+        if (!ret)
+                *keyp = start;
+        else if (ret == -ENOENT)
+                ret = nilfs_btree_get_next_key(btree, path, minlevel, keyp);
+
+        nilfs_btree_free_path(path);
+        return ret;
+}
+
 static int nilfs_btree_last_key(const struct nilfs_bmap *btree, __u64 *keyp)
 {
         struct nilfs_btree_path *path;
@@ -2298,7 +2357,9 @@ static const struct nilfs_bmap_operations nilfs_btree_ops = {
         .bop_assign             =       nilfs_btree_assign,
         .bop_mark               =       nilfs_btree_mark,
 
+        .bop_seek_key           =       nilfs_btree_seek_key,
         .bop_last_key           =       nilfs_btree_last_key,
+
         .bop_check_insert       =       NULL,
         .bop_check_delete       =       nilfs_btree_check_delete,
         .bop_gather_data        =       nilfs_btree_gather_data,
@@ -2318,7 +2379,9 @@ static const struct nilfs_bmap_operations nilfs_btree_ops_gc = {
         .bop_assign             =       nilfs_btree_assign_gc,
         .bop_mark               =       NULL,
 
+        .bop_seek_key           =       NULL,
         .bop_last_key           =       NULL,
+
         .bop_check_insert       =       NULL,
         .bop_check_delete       =       NULL,
         .bop_gather_data        =       NULL,
diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index 0d58075f34e2..b6596cab9e99 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -53,6 +53,13 @@ nilfs_cpfile_get_offset(const struct inode *cpfile, __u64 cno)
         return do_div(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));
 }
 
+static __u64 nilfs_cpfile_first_checkpoint_in_block(const struct inode *cpfile,
+                                                    unsigned long blkoff)
+{
+        return (__u64)nilfs_cpfile_checkpoints_per_block(cpfile) * blkoff
+                + 1 - NILFS_MDT(cpfile)->mi_first_entry_offset;
+}
+
 static unsigned long
 nilfs_cpfile_checkpoints_in_block(const struct inode *cpfile,
                                   __u64 curr,
@@ -146,6 +153,44 @@ static inline int nilfs_cpfile_get_checkpoint_block(struct inode *cpfile,
                                    create, nilfs_cpfile_block_init, bhp);
 }
 
+/**
+ * nilfs_cpfile_find_checkpoint_block - find and get a buffer on cpfile
+ * @cpfile: inode of cpfile
+ * @start_cno: start checkpoint number (inclusive)
+ * @end_cno: end checkpoint number (inclusive)
+ * @cnop: place to store the next checkpoint number
+ * @bhp: place to store a pointer to buffer_head struct
+ *
+ * Return Value: On success, it returns 0. On error, the following negative
+ * error code is returned.
+ *
+ * %-ENOMEM - Insufficient memory available.
+ *
+ * %-EIO - I/O error
+ *
+ * %-ENOENT - no block exists in the range.
+ */
+static int nilfs_cpfile_find_checkpoint_block(struct inode *cpfile,
+                                              __u64 start_cno, __u64 end_cno,
+                                              __u64 *cnop,
+                                              struct buffer_head **bhp)
+{
+        unsigned long start, end, blkoff;
+        int ret;
+
+        if (unlikely(start_cno > end_cno))
+                return -ENOENT;
+
+        start = nilfs_cpfile_get_blkoff(cpfile, start_cno);
+        end = nilfs_cpfile_get_blkoff(cpfile, end_cno);
+
+        ret = nilfs_mdt_find_block(cpfile, start, end, &blkoff, bhp);
+        if (!ret)
+                *cnop = (blkoff == start) ? start_cno :
+                        nilfs_cpfile_first_checkpoint_in_block(cpfile, blkoff);
+        return ret;
+}
+
 static inline int nilfs_cpfile_delete_checkpoint_block(struct inode *cpfile,
                                                        __u64 cno)
 {
@@ -403,14 +448,15 @@ static ssize_t nilfs_cpfile_do_get_cpinfo(struct inode *cpfile, __u64 *cnop,
                 return -ENOENT; /* checkpoint number 0 is invalid */
         down_read(&NILFS_MDT(cpfile)->mi_sem);
 
-        for (n = 0; cno < cur_cno && n < nci; cno += ncps) {
-                ncps = nilfs_cpfile_checkpoints_in_block(cpfile, cno, cur_cno);
-                ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &bh);
+        for (n = 0; n < nci; cno += ncps) {
+                ret = nilfs_cpfile_find_checkpoint_block(
+                        cpfile, cno, cur_cno - 1, &cno, &bh);
                 if (ret < 0) {
-                        if (ret != -ENOENT)
-                                goto out;
-                        continue; /* skip hole */
+                        if (likely(ret == -ENOENT))
+                                break;
+                        goto out;
                 }
+                ncps = nilfs_cpfile_checkpoints_in_block(cpfile, cno, cur_cno);
 
                 kaddr = kmap_atomic(bh->b_page);
                 cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, bh, kaddr);
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 82f4865e86dd..ebf89fd8ac1a 100644
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -173,6 +173,21 @@ static int nilfs_direct_delete(struct nilfs_bmap *bmap, __u64 key)
         return ret;
 }
 
+static int nilfs_direct_seek_key(const struct nilfs_bmap *direct, __u64 start,
+                                 __u64 *keyp)
+{
+        __u64 key;
+
+        for (key = start; key <= NILFS_DIRECT_KEY_MAX; key++) {
+                if (nilfs_direct_get_ptr(direct, key) !=
+                    NILFS_BMAP_INVALID_PTR) {
+                        *keyp = key;
+                        return 0;
+                }
+        }
+        return -ENOENT;
+}
+
 static int nilfs_direct_last_key(const struct nilfs_bmap *direct, __u64 *keyp)
 {
         __u64 key, lastkey;
@@ -355,7 +370,9 @@ static const struct nilfs_bmap_operations nilfs_direct_ops = {
         .bop_assign             =       nilfs_direct_assign,
         .bop_mark               =       NULL,
 
+        .bop_seek_key           =       nilfs_direct_seek_key,
         .bop_last_key           =       nilfs_direct_last_key,
+
         .bop_check_insert       =       nilfs_direct_check_insert,
         .bop_check_delete       =       NULL,
         .bop_gather_data        =       nilfs_direct_gather_data,
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index ab4987bc637f..be936df4ba73 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -106,7 +106,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,
                 err = nilfs_transaction_begin(inode->i_sb, &ti, 1);
                 if (unlikely(err))
                         goto out;
-                err = nilfs_bmap_insert(ii->i_bmap, (unsigned long)blkoff,
+                err = nilfs_bmap_insert(ii->i_bmap, blkoff,
                                         (unsigned long)bh_result);
                 if (unlikely(err != 0)) {
                         if (err == -EEXIST) {
@@ -305,8 +305,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping,
 }
 
 static ssize_t
-nilfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
-                loff_t offset)
+nilfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct address_space *mapping = file->f_mapping;
@@ -314,18 +313,17 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
         size_t count = iov_iter_count(iter);
         ssize_t size;
 
-        if (rw == WRITE)
+        if (iov_iter_rw(iter) == WRITE)
                 return 0;
 
         /* Needs synchronization with the cleaner */
-        size = blockdev_direct_IO(rw, iocb, inode, iter, offset,
-                                  nilfs_get_block);
+        size = blockdev_direct_IO(iocb, inode, iter, offset, nilfs_get_block);
 
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && size < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && size < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
@@ -443,21 +441,20 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
 void nilfs_set_inode_flags(struct inode *inode)
 {
         unsigned int flags = NILFS_I(inode)->i_flags;
+        unsigned int new_fl = 0;
 
-        inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME |
-                            S_DIRSYNC);
         if (flags & FS_SYNC_FL)
-                inode->i_flags |= S_SYNC;
+                new_fl |= S_SYNC;
         if (flags & FS_APPEND_FL)
-                inode->i_flags |= S_APPEND;
+                new_fl |= S_APPEND;
         if (flags & FS_IMMUTABLE_FL)
-                inode->i_flags |= S_IMMUTABLE;
+                new_fl |= S_IMMUTABLE;
         if (flags & FS_NOATIME_FL)
-                inode->i_flags |= S_NOATIME;
+                new_fl |= S_NOATIME;
         if (flags & FS_DIRSYNC_FL)
-                inode->i_flags |= S_DIRSYNC;
-        mapping_set_gfp_mask(inode->i_mapping,
-                             mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
+                new_fl |= S_DIRSYNC;
+        inode_set_flags(inode, new_fl, S_SYNC | S_APPEND | S_IMMUTABLE |
+                        S_NOATIME | S_DIRSYNC);
 }
 
 int nilfs_read_inode_common(struct inode *inode,
@@ -542,6 +539,8 @@ static int __nilfs_read_inode(struct super_block *sb,
         brelse(bh);
         up_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem);
         nilfs_set_inode_flags(inode);
+        mapping_set_gfp_mask(inode->i_mapping,
+                             mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
         return 0;
 
  failed_unmap:
@@ -714,7 +713,7 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)
 static void nilfs_truncate_bmap(struct nilfs_inode_info *ii,
                                 unsigned long from)
 {
-        unsigned long b;
+        __u64 b;
         int ret;
 
         if (!test_bit(NILFS_I_BMAP, &ii->i_state))
@@ -729,7 +728,7 @@ repeat:
         if (b < from)
                 return;
 
-        b -= min_t(unsigned long, NILFS_MAX_TRUNCATE_BLOCKS, b - from);
+        b -= min_t(__u64, NILFS_MAX_TRUNCATE_BLOCKS, b - from);
         ret = nilfs_bmap_truncate(ii->i_bmap, b);
         nilfs_relax_pressure_in_lock(ii->vfs_inode.i_sb);
         if (!ret || (ret == -ENOMEM &&
diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 892cf5ffdb8e..dee34d990281 100644
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -261,6 +261,60 @@ int nilfs_mdt_get_block(struct inode *inode, unsigned long blkoff, int create,
 }
 
 /**
+ * nilfs_mdt_find_block - find and get a buffer on meta data file.
+ * @inode: inode of the meta data file
+ * @start: start block offset (inclusive)
+ * @end: end block offset (inclusive)
+ * @blkoff: block offset
+ * @out_bh: place to store a pointer to buffer_head struct
+ *
+ * nilfs_mdt_find_block() looks up an existing block in range of
+ * [@start, @end] and stores pointer to a buffer head of the block to
+ * @out_bh, and block offset to @blkoff, respectively.  @out_bh and
+ * @blkoff are substituted only when zero is returned.
+ *
+ * Return Value: On success, it returns 0. On error, the following negative
+ * error code is returned.
+ *
+ * %-ENOMEM - Insufficient memory available.
+ *
+ * %-EIO - I/O error
+ *
+ * %-ENOENT - no block was found in the range
+ */
+int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
+                         unsigned long end, unsigned long *blkoff,
+                         struct buffer_head **out_bh)
+{
+        __u64 next;
+        int ret;
+
+        if (unlikely(start > end))
+                return -ENOENT;
+
+        ret = nilfs_mdt_read_block(inode, start, true, out_bh);
+        if (!ret) {
+                *blkoff = start;
+                goto out;
+        }
+        if (unlikely(ret != -ENOENT || start == ULONG_MAX))
+                goto out;
+
+        ret = nilfs_bmap_seek_key(NILFS_I(inode)->i_bmap, start + 1, &next);
+        if (!ret) {
+                if (next <= end) {
+                        ret = nilfs_mdt_read_block(inode, next, true, out_bh);
+                        if (!ret)
+                                *blkoff = next;
+                } else {
+                        ret = -ENOENT;
+                }
+        }
+out:
+        return ret;
+}
+
+/**
  * nilfs_mdt_delete_block - make a hole on the meta data file.
  * @inode: inode of the meta data file
  * @block: block offset
diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h
index ab172e8549c5..fe529a87a208 100644
--- a/fs/nilfs2/mdt.h
+++ b/fs/nilfs2/mdt.h
@@ -78,6 +78,9 @@ int nilfs_mdt_get_block(struct inode *, unsigned long, int,
                         void (*init_block)(struct inode *,
                                            struct buffer_head *, void *),
                         struct buffer_head **);
+int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
+                         unsigned long end, unsigned long *blkoff,
+                         struct buffer_head **out_bh);
 int nilfs_mdt_delete_block(struct inode *, unsigned long);
 int nilfs_mdt_forget_block(struct inode *, unsigned long);
 int nilfs_mdt_mark_block_dirty(struct inode *, unsigned long);
@@ -111,7 +114,10 @@ static inline __u64 nilfs_mdt_cno(struct inode *inode)
         return ((struct the_nilfs *)inode->i_sb->s_fs_info)->ns_cno;
 }
 
-#define nilfs_mdt_bgl_lock(inode, bg) \
-        (&NILFS_MDT(inode)->mi_bgl->locks[(bg) & (NR_BG_LOCKS-1)].lock)
+static inline spinlock_t *
+nilfs_mdt_bgl_lock(struct inode *inode, unsigned int block_group)
+{
+        return bgl_lock_ptr(NILFS_MDT(inode)->mi_bgl, block_group);
+}
 
 #endif /* _NILFS_MDT_H */
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 700ecbcca55d..45d650addd56 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -89,18 +89,16 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,
 void nilfs_forget_buffer(struct buffer_head *bh)
 {
         struct page *page = bh->b_page;
+        const unsigned long clear_bits =
+                (1 << BH_Uptodate | 1 << BH_Dirty | 1 << BH_Mapped |
+                 1 << BH_Async_Write | 1 << BH_NILFS_Volatile |
+                 1 << BH_NILFS_Checked | 1 << BH_NILFS_Redirected);
 
         lock_buffer(bh);
-        clear_buffer_nilfs_volatile(bh);
-        clear_buffer_nilfs_checked(bh);
-        clear_buffer_nilfs_redirected(bh);
-        clear_buffer_async_write(bh);
-        clear_buffer_dirty(bh);
+        set_mask_bits(&bh->b_state, clear_bits, 0);
         if (nilfs_page_buffers_clean(page))
                 __nilfs_clear_page_dirty(page);
 
-        clear_buffer_uptodate(bh);
-        clear_buffer_mapped(bh);
         bh->b_blocknr = -1;
         ClearPageUptodate(page);
         ClearPageMappedToDisk(page);
@@ -421,6 +419,10 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
 
         if (page_has_buffers(page)) {
                 struct buffer_head *bh, *head;
+                const unsigned long clear_bits =
+                        (1 << BH_Uptodate | 1 << BH_Dirty | 1 << BH_Mapped |
+                         1 << BH_Async_Write | 1 << BH_NILFS_Volatile |
+                         1 << BH_NILFS_Checked | 1 << BH_NILFS_Redirected);
 
                 bh = head = page_buffers(page);
                 do {
@@ -430,13 +432,7 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
                                         "discard block %llu, size %zu",
                                         (u64)bh->b_blocknr, bh->b_size);
                         }
-                        clear_buffer_async_write(bh);
-                        clear_buffer_dirty(bh);
-                        clear_buffer_nilfs_volatile(bh);
-                        clear_buffer_nilfs_checked(bh);
-                        clear_buffer_nilfs_redirected(bh);
-                        clear_buffer_uptodate(bh);
-                        clear_buffer_mapped(bh);
+                        set_mask_bits(&bh->b_state, clear_bits, 0);
                         unlock_buffer(bh);
                 } while (bh = bh->b_this_page, bh != head);
         }
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 0c3f303baf32..c6abbad9b8e3 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -24,6 +24,7 @@
 #include <linux/pagemap.h>
 #include <linux/buffer_head.h>
 #include <linux/writeback.h>
+#include <linux/bitops.h>
 #include <linux/bio.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
@@ -1588,7 +1589,6 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)
 
                 list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
                                     b_assoc_buffers) {
-                        set_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page) {
                                         lock_page(bd_page);
@@ -1688,7 +1688,6 @@ static void nilfs_abort_logs(struct list_head *logs, int err)
         list_for_each_entry(segbuf, logs, sb_list) {
                 list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
                                     b_assoc_buffers) {
-                        clear_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page)
                                         end_page_writeback(bd_page);
@@ -1768,7 +1767,6 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)
                                     b_assoc_buffers) {
                         set_buffer_uptodate(bh);
                         clear_buffer_dirty(bh);
-                        clear_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page)
                                         end_page_writeback(bd_page);
@@ -1788,12 +1786,13 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)
                  */
                 list_for_each_entry(bh, &segbuf->sb_payload_buffers,
                                     b_assoc_buffers) {
-                        set_buffer_uptodate(bh);
-                        clear_buffer_dirty(bh);
-                        clear_buffer_async_write(bh);
-                        clear_buffer_delay(bh);
-                        clear_buffer_nilfs_volatile(bh);
-                        clear_buffer_nilfs_redirected(bh);
+                        const unsigned long set_bits = (1 << BH_Uptodate);
+                        const unsigned long clear_bits =
+                                (1 << BH_Dirty | 1 << BH_Async_Write |
+                                 1 << BH_Delay | 1 << BH_NILFS_Volatile |
+                                 1 << BH_NILFS_Redirected);
+
+                        set_mask_bits(&bh->b_state, clear_bits, set_bits);
                         if (bh == segbuf->sb_super_root) {
                                 if (bh->b_page != bd_page) {
                                         end_page_writeback(bd_page);
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 5bc2a1cf73c3..c1725f20a9d1 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1020,7 +1020,7 @@ int nilfs_checkpoint_is_mounted(struct super_block *sb, __u64 cno)
         struct dentry *dentry;
         int ret;
 
-        if (cno < 0 || cno > nilfs->ns_cno)
+        if (cno > nilfs->ns_cno)
                 return false;
 
         if (cno >= nilfs_last_cno(nilfs))
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 840e95e3f1d2..7bb487e663b4 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -328,25 +328,25 @@ err_out:
         return err;
 }
 
-static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
-                size_t *count)
+static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,
+                struct iov_iter *from)
 {
         loff_t pos;
         s64 end, ll;
         ssize_t err;
         unsigned long flags;
+        struct file *file = iocb->ki_filp;
         struct inode *vi = file_inode(file);
         ntfs_inode *base_ni, *ni = NTFS_I(vi);
         ntfs_volume *vol = ni->vol;
 
         ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, pos "
-                        "0x%llx, count 0x%lx.", vi->i_ino,
+                        "0x%llx, count 0x%zx.", vi->i_ino,
                         (unsigned)le32_to_cpu(ni->type),
-                        (unsigned long long)*ppos, (unsigned long)*count);
-        /* We can write back this queue in page reclaim. */
-        current->backing_dev_info = inode_to_bdi(vi);
-        err = generic_write_checks(file, ppos, count, S_ISBLK(vi->i_mode));
-        if (unlikely(err))
+                        (unsigned long long)iocb->ki_pos,
+                        iov_iter_count(from));
+        err = generic_write_checks(iocb, from);
+        if (unlikely(err <= 0))
                 goto out;
         /*
          * All checks have passed.  Before we start doing any writing we want
@@ -379,8 +379,6 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
                 err = -EOPNOTSUPP;
                 goto out;
         }
-        if (*count == 0)
-                goto out;
         base_ni = ni;
         if (NInoAttr(ni))
                 base_ni = ni->ext.base_ntfs_ino;
@@ -392,9 +390,9 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
          * cannot fail either so there is no need to check the return code.
          */
         file_update_time(file);
-        pos = *ppos;
+        pos = iocb->ki_pos;
         /* The first byte after the last cluster being written to. */
-        end = (pos + *count + vol->cluster_size_mask) &
+        end = (pos + iov_iter_count(from) + vol->cluster_size_mask) &
                         ~(u64)vol->cluster_size_mask;
         /*
          * If the write goes beyond the allocated size, extend the allocation
@@ -422,7 +420,7 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
                                                 "partially extended.",
                                                 vi->i_ino, (unsigned)
                                                 le32_to_cpu(ni->type));
-                                *count = ll - pos;
+                                iov_iter_truncate(from, ll - pos);
                         }
                 } else {
                         err = ll;
@@ -438,7 +436,7 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
                                                 vi->i_ino, (unsigned)
                                                 le32_to_cpu(ni->type),
                                                 (int)-err);
-                                *count = ll - pos;
+                                iov_iter_truncate(from, ll - pos);
                         } else {
                                 if (err != -ENOSPC)
                                         ntfs_error(vi->i_sb, "Cannot perform "
@@ -1930,60 +1928,36 @@ again:
 }
 
 /**
- * ntfs_file_write_iter_nolock - write data to a file
- * @iocb:       IO state structure (file, offset, etc.)
- * @from:       iov_iter with data to write
- *
- * Basically the same as __generic_file_write_iter() except that it ends
- * up calling ntfs_perform_write() instead of generic_perform_write() and that
- * O_DIRECT is not implemented.
- */
-static ssize_t ntfs_file_write_iter_nolock(struct kiocb *iocb,
-                struct iov_iter *from)
-{
-        struct file *file = iocb->ki_filp;
-        loff_t pos = iocb->ki_pos;
-        ssize_t written = 0;
-        ssize_t err;
-        size_t count = iov_iter_count(from);
-
-        err = ntfs_prepare_file_for_write(file, &pos, &count);
-        if (count && !err) {
-                iov_iter_truncate(from, count);
-                written = ntfs_perform_write(file, from, pos);
-                if (likely(written >= 0))
-                        iocb->ki_pos = pos + written;
-        }
-        current->backing_dev_info = NULL;
-        return written ? written : err;
-}
-
-/**
  * ntfs_file_write_iter - simple wrapper for ntfs_file_write_iter_nolock()
  * @iocb:       IO state structure
  * @from:       iov_iter with data to write
  *
  * Basically the same as generic_file_write_iter() except that it ends up
- * calling ntfs_file_write_iter_nolock() instead of
- * __generic_file_write_iter().
+ * up calling ntfs_perform_write() instead of generic_perform_write() and that
+ * O_DIRECT is not implemented.
  */
 static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct inode *vi = file_inode(file);
-        ssize_t ret;
+        ssize_t written = 0;
+        ssize_t err;
 
         mutex_lock(&vi->i_mutex);
-        ret = ntfs_file_write_iter_nolock(iocb, from);
+        /* We can write back this queue in page reclaim. */
+        current->backing_dev_info = inode_to_bdi(vi);
+        err = ntfs_prepare_file_for_write(iocb, from);
+        if (iov_iter_count(from) && !err)
+                written = ntfs_perform_write(file, from, iocb->ki_pos);
+        current->backing_dev_info = NULL;
         mutex_unlock(&vi->i_mutex);
-        if (ret > 0) {
-                ssize_t err;
-
-                err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+        if (likely(written > 0)) {
+                err = generic_write_sync(file, iocb->ki_pos, written);
                 if (err < 0)
-                        ret = err;
+                        written = 0;
         }
-        return ret;
+        iocb->ki_pos += written;
+        return written ? written : err;
 }
 
 /**
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 8d2bc840c288..f906a250da6a 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -855,10 +855,9 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
                 ocfs2_inode_unlock(inode, 1);
         }
 
-        written = __blockdev_direct_IO(WRITE, iocb, inode, inode->i_sb->s_bdev,
-                        iter, offset,
-                        ocfs2_direct_IO_get_blocks,
-                        ocfs2_dio_end_io, NULL, 0);
+        written = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
+                                       offset, ocfs2_direct_IO_get_blocks,
+                                       ocfs2_dio_end_io, NULL, 0);
         if (unlikely(written < 0)) {
                 loff_t i_size = i_size_read(inode);
 
@@ -946,9 +945,7 @@ out:
         return ret;
 }
 
-static ssize_t ocfs2_direct_IO(int rw,
-                               struct kiocb *iocb,
-                               struct iov_iter *iter,
+static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
                                loff_t offset)
 {
         struct file *file = iocb->ki_filp;
@@ -970,12 +967,11 @@ static ssize_t ocfs2_direct_IO(int rw,
         if (i_size_read(inode) <= offset && !full_coherency)
                 return 0;
 
-        if (rw == READ)
-                return __blockdev_direct_IO(rw, iocb, inode,
-                                    inode->i_sb->s_bdev,
-                                    iter, offset,
-                                    ocfs2_direct_IO_get_blocks,
-                                    ocfs2_dio_end_io, NULL, 0);
+        if (iov_iter_rw(iter) == READ)
+                return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev,
+                                            iter, offset,
+                                            ocfs2_direct_IO_get_blocks,
+                                            ocfs2_dio_end_io, NULL, 0);
         else
                 return ocfs2_direct_IO_write(iocb, iter, offset);
 }
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 8c48e989beba..913fc250d85a 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2106,7 +2106,7 @@ out:
 }
 
 static int ocfs2_prepare_inode_for_write(struct file *file,
-                                         loff_t *ppos,
+                                         loff_t pos,
                                          size_t count,
                                          int appending,
                                          int *direct_io,
@@ -2115,7 +2115,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
         int ret = 0, meta_level = 0;
         struct dentry *dentry = file->f_path.dentry;
         struct inode *inode = dentry->d_inode;
-        loff_t saved_pos = 0, end;
+        loff_t end;
         struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
         int full_coherency = !(osb->s_mount_opt &
                 OCFS2_MOUNT_COHERENCY_BUFFERED);
@@ -2155,23 +2155,16 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
                         }
                 }
 
-                /* work on a copy of ppos until we're sure that we won't have
-                 * to recalculate it due to relocking. */
-                if (appending)
-                        saved_pos = i_size_read(inode);
-                else
-                        saved_pos = *ppos;
-
-                end = saved_pos + count;
+                end = pos + count;
 
-                ret = ocfs2_check_range_for_refcount(inode, saved_pos, count);
+                ret = ocfs2_check_range_for_refcount(inode, pos, count);
                 if (ret == 1) {
                         ocfs2_inode_unlock(inode, meta_level);
                         meta_level = -1;
 
                         ret = ocfs2_prepare_inode_for_refcount(inode,
                                                                file,
-                                                               saved_pos,
+                                                               pos,
                                                                count,
                                                                &meta_level);
                         if (has_refcount)
@@ -2227,7 +2220,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
                  * caller will have to retake some cluster
                  * locks and initiate the io as buffered.
                  */
-                ret = ocfs2_check_range_for_holes(inode, saved_pos, count);
+                ret = ocfs2_check_range_for_holes(inode, pos, count);
                 if (ret == 1) {
                         /*
                          * Fallback to old way if the feature bit is not set.
@@ -2242,12 +2235,9 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
                 break;
         }
 
-        if (appending)
-                *ppos = saved_pos;
-
 out_unlock:
         trace_ocfs2_prepare_inode_for_write(OCFS2_I(inode)->ip_blkno,
-                                            saved_pos, appending, count,
+                                            pos, appending, count,
                                             direct_io, has_refcount);
 
         if (meta_level >= 0)
@@ -2260,19 +2250,20 @@ out:
 static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
                                     struct iov_iter *from)
 {
-        int ret, direct_io, appending, rw_level, have_alloc_sem  = 0;
+        int direct_io, appending, rw_level, have_alloc_sem  = 0;
         int can_do_direct, has_refcount = 0;
         ssize_t written = 0;
-        size_t count = iov_iter_count(from);
-        loff_t old_size, *ppos = &iocb->ki_pos;
+        ssize_t ret;
+        size_t count = iov_iter_count(from), orig_count;
+        loff_t old_size;
         u32 old_clusters;
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
-        struct address_space *mapping = file->f_mapping;
         struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
         int full_coherency = !(osb->s_mount_opt &
                                OCFS2_MOUNT_COHERENCY_BUFFERED);
         int unaligned_dio = 0;
+        int dropped_dio = 0;
 
         trace_ocfs2_file_aio_write(inode, file, file->f_path.dentry,
                 (unsigned long long)OCFS2_I(inode)->ip_blkno,
@@ -2283,8 +2274,8 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
         if (count == 0)
                 return 0;
 
-        appending = file->f_flags & O_APPEND ? 1 : 0;
-        direct_io = file->f_flags & O_DIRECT ? 1 : 0;
+        appending = iocb->ki_flags & IOCB_APPEND ? 1 : 0;
+        direct_io = iocb->ki_flags & IOCB_DIRECT ? 1 : 0;
 
         mutex_lock(&inode->i_mutex);
 
@@ -2329,8 +2320,17 @@ relock:
                 ocfs2_inode_unlock(inode, 1);
         }
 
+        orig_count = iov_iter_count(from);
+        ret = generic_write_checks(iocb, from);
+        if (ret <= 0) {
+                if (ret)
+                        mlog_errno(ret);
+                goto out;
+        }
+        count = ret;
+
         can_do_direct = direct_io;
-        ret = ocfs2_prepare_inode_for_write(file, ppos, count, appending,
+        ret = ocfs2_prepare_inode_for_write(file, iocb->ki_pos, count, appending,
                                             &can_do_direct, &has_refcount);
         if (ret < 0) {
                 mlog_errno(ret);
@@ -2338,7 +2338,7 @@ relock:
         }
 
         if (direct_io && !is_sync_kiocb(iocb))
-                unaligned_dio = ocfs2_is_io_unaligned(inode, count, *ppos);
+                unaligned_dio = ocfs2_is_io_unaligned(inode, count, iocb->ki_pos);
 
         /*
          * We can't complete the direct I/O as requested, fall back to
@@ -2351,6 +2351,9 @@ relock:
                 rw_level = -1;
 
                 direct_io = 0;
+                iocb->ki_flags &= ~IOCB_DIRECT;
+                iov_iter_reexpand(from, orig_count);
+                dropped_dio = 1;
                 goto relock;
         }
 
@@ -2374,74 +2377,15 @@ relock:
         /* communicate with ocfs2_dio_end_io */
         ocfs2_iocb_set_rw_locked(iocb, rw_level);
 
-        ret = generic_write_checks(file, ppos, &count,
-                                   S_ISBLK(inode->i_mode));
-        if (ret)
-                goto out_dio;
-
-        iov_iter_truncate(from, count);
-        if (direct_io) {
-                loff_t endbyte;
-                ssize_t written_buffered;
-                written = generic_file_direct_write(iocb, from, *ppos);
-                if (written < 0 || written == count) {
-                        ret = written;
-                        goto out_dio;
-                }
-
-                /*
-                 * for completing the rest of the request.
-                 */
-                count -= written;
-                written_buffered = generic_perform_write(file, from, *ppos);
-                /*
-                 * If generic_file_buffered_write() returned a synchronous error
-                 * then we want to return the number of bytes which were
-                 * direct-written, or the error code if that was zero. Note
-                 * that this differs from normal direct-io semantics, which
-                 * will return -EFOO even if some bytes were written.
-                 */
-                if (written_buffered < 0) {
-                        ret = written_buffered;
-                        goto out_dio;
-                }
-
-                /* We need to ensure that the page cache pages are written to
-                 * disk and invalidated to preserve the expected O_DIRECT
-                 * semantics.
-                 */
-                endbyte = *ppos + written_buffered - 1;
-                ret = filemap_write_and_wait_range(file->f_mapping, *ppos,
-                                endbyte);
-                if (ret == 0) {
-                        iocb->ki_pos = *ppos + written_buffered;
-                        written += written_buffered;
-                        invalidate_mapping_pages(mapping,
-                                        *ppos >> PAGE_CACHE_SHIFT,
-                                        endbyte >> PAGE_CACHE_SHIFT);
-                } else {
-                        /*
-                         * We don't know how much we wrote, so just return
-                         * the number of bytes which were direct-written
-                         */
-                }
-        } else {
-                current->backing_dev_info = inode_to_bdi(inode);
-                written = generic_perform_write(file, from, *ppos);
-                if (likely(written >= 0))
-                        iocb->ki_pos = *ppos + written;
-                current->backing_dev_info = NULL;
-        }
-
-out_dio:
+        written = __generic_file_write_iter(iocb, from);
         /* buffered aio wouldn't have proper lock coverage today */
-        BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT));
+        BUG_ON(written == -EIOCBQUEUED && !(iocb->ki_flags & IOCB_DIRECT));
 
         if (unlikely(written <= 0))
                 goto no_sync;
 
-        if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) ||
-            ((file->f_flags & O_DIRECT) && !direct_io)) {
+        if (((file->f_flags & O_DSYNC) && !direct_io) ||
+            IS_SYNC(inode) || dropped_dio) {
                 ret = filemap_fdatawrite_range(file->f_mapping,
                                                iocb->ki_pos - written,
                                                iocb->ki_pos - 1);
@@ -2552,7 +2496,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,
          * buffered reads protect themselves in ->readpage().  O_DIRECT reads
          * need locks to protect pending reads from racing with truncate.
          */
-        if (filp->f_flags & O_DIRECT) {
+        if (iocb->ki_flags & IOCB_DIRECT) {
                 have_alloc_sem = 1;
                 ocfs2_iocb_set_sem_locked(iocb);
 
@@ -2586,7 +2530,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,
         trace_generic_file_aio_read_ret(ret);
 
         /* buffered aio wouldn't have proper lock coverage today */
-        BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT));
+        BUG_ON(ret == -EIOCBQUEUED && !(iocb->ki_flags & IOCB_DIRECT));
 
         /* see ocfs2_file_write_iter */
         if (ret == -EIOCBQUEUED || !ocfs2_iocb_is_rw_locked(iocb)) {
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 8e5ad83b629a..af84ad04df77 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -8,6 +8,7 @@
 #include <linux/security.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/fs.h>
 
 #include <linux/proc_fs.h>
 
@@ -48,17 +49,23 @@ static int seq_show(struct seq_file *m, void *v)
                 put_files_struct(files);
         }
 
-        if (!ret) {
-                seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
-                           (long long)file->f_pos, f_flags,
-                           real_mount(file->f_path.mnt)->mnt_id);
-                if (file->f_op->show_fdinfo)
-                        file->f_op->show_fdinfo(m, file);
-                ret = seq_has_overflowed(m);
-                fput(file);
-        }
+        if (ret)
+                return ret;
 
-        return ret;
+        seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+                   (long long)file->f_pos, f_flags,
+                   real_mount(file->f_path.mnt)->mnt_id);
+
+        show_fd_locks(m, file, files);
+        if (seq_has_overflowed(m))
+                goto out;
+
+        if (file->f_op->show_fdinfo)
+                file->f_op->show_fdinfo(m, file);
+
+out:
+        fput(file);
+        return 0;
 }
 
 static int seq_fdinfo_open(struct inode *inode, struct file *file)
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 0ccd4ba3a246..ecc25cf0ee6e 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -900,14 +900,17 @@ static inline struct dquot **i_dquot(struct inode *inode)
 
 static int dqinit_needed(struct inode *inode, int type)
 {
+        struct dquot * const *dquots;
         int cnt;
 
         if (IS_NOQUOTA(inode))
                 return 0;
+
+        dquots = i_dquot(inode);
         if (type != -1)
-                return !i_dquot(inode)[type];
+                return !dquots[type];
         for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-                if (!i_dquot(inode)[cnt])
+                if (!dquots[cnt])
                         return 1;
         return 0;
 }
@@ -970,12 +973,13 @@ static void add_dquot_ref(struct super_block *sb, int type)
 static void remove_inode_dquot_ref(struct inode *inode, int type,
                                    struct list_head *tofree_head)
 {
-        struct dquot *dquot = i_dquot(inode)[type];
+        struct dquot **dquots = i_dquot(inode);
+        struct dquot *dquot = dquots[type];
 
-        i_dquot(inode)[type] = NULL;
         if (!dquot)
                 return;
 
+        dquots[type] = NULL;
         if (list_empty(&dquot->dq_free)) {
                 /*
                  * The inode still has reference to dquot so it can't be in the
@@ -1159,8 +1163,8 @@ static int need_print_warning(struct dquot_warn *warn)
                         return uid_eq(current_fsuid(), warn->w_dq_id.uid);
                 case GRPQUOTA:
                         return in_group_p(warn->w_dq_id.gid);
-                case PRJQUOTA:  /* Never taken... Just make gcc happy */
-                        return 0;
+                case PRJQUOTA:
+                        return 1;
         }
         return 0;
 }
@@ -1389,16 +1393,21 @@ static int dquot_active(const struct inode *inode)
 static void __dquot_initialize(struct inode *inode, int type)
 {
         int cnt, init_needed = 0;
-        struct dquot *got[MAXQUOTAS];
+        struct dquot **dquots, *got[MAXQUOTAS];
         struct super_block *sb = inode->i_sb;
         qsize_t rsv;
 
         if (!dquot_active(inode))
                 return;
 
+        dquots = i_dquot(inode);
+
         /* First get references to structures we might need. */
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
                 struct kqid qid;
+                kprojid_t projid;
+                int rc;
+
                 got[cnt] = NULL;
                 if (type != -1 && cnt != type)
                         continue;
@@ -1407,8 +1416,12 @@ static void __dquot_initialize(struct inode *inode, int type)
                  * we check it without locking here to avoid unnecessary
                  * dqget()/dqput() calls.
                  */
-                if (i_dquot(inode)[cnt])
+                if (dquots[cnt])
+                        continue;
+
+                if (!sb_has_quota_active(sb, cnt))
                         continue;
+
                 init_needed = 1;
 
                 switch (cnt) {
@@ -1418,6 +1431,12 @@ static void __dquot_initialize(struct inode *inode, int type)
                 case GRPQUOTA:
                         qid = make_kqid_gid(inode->i_gid);
                         break;
+                case PRJQUOTA:
+                        rc = inode->i_sb->dq_op->get_projid(inode, &projid);
+                        if (rc)
+                                continue;
+                        qid = make_kqid_projid(projid);
+                        break;
                 }
                 got[cnt] = dqget(sb, qid);
         }
@@ -1438,8 +1457,8 @@ static void __dquot_initialize(struct inode *inode, int type)
                 /* We could race with quotaon or dqget() could have failed */
                 if (!got[cnt])
                         continue;
-                if (!i_dquot(inode)[cnt]) {
-                        i_dquot(inode)[cnt] = got[cnt];
+                if (!dquots[cnt]) {
+                        dquots[cnt] = got[cnt];
                         got[cnt] = NULL;
                         /*
                          * Make quota reservation system happy if someone
@@ -1447,7 +1466,7 @@ static void __dquot_initialize(struct inode *inode, int type)
                          */
                         rsv = inode_get_rsv_space(inode);
                         if (unlikely(rsv))
-                                dquot_resv_space(i_dquot(inode)[cnt], rsv);
+                                dquot_resv_space(dquots[cnt], rsv);
                 }
         }
 out_err:
@@ -1473,12 +1492,13 @@ EXPORT_SYMBOL(dquot_initialize);
 static void __dquot_drop(struct inode *inode)
 {
         int cnt;
+        struct dquot **dquots = i_dquot(inode);
         struct dquot *put[MAXQUOTAS];
 
         spin_lock(&dq_data_lock);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-                put[cnt] = i_dquot(inode)[cnt];
-                i_dquot(inode)[cnt] = NULL;
+                put[cnt] = dquots[cnt];
+                dquots[cnt] = NULL;
         }
         spin_unlock(&dq_data_lock);
         dqput_all(put);
@@ -1486,6 +1506,7 @@ static void __dquot_drop(struct inode *inode)
 
 void dquot_drop(struct inode *inode)
 {
+        struct dquot * const *dquots;
         int cnt;
 
         if (IS_NOQUOTA(inode))
@@ -1498,8 +1519,9 @@ void dquot_drop(struct inode *inode)
          * must assure that nobody can come after the DQUOT_DROP and
          * add quota pointers back anyway.
          */
+        dquots = i_dquot(inode);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-                if (i_dquot(inode)[cnt])
+                if (dquots[cnt])
                         break;
         }
 
@@ -1600,8 +1622,8 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
 {
         int cnt, ret = 0, index;
         struct dquot_warn warn[MAXQUOTAS];
-        struct dquot **dquots = i_dquot(inode);
         int reserve = flags & DQUOT_SPACE_RESERVE;
+        struct dquot **dquots;
 
         if (!dquot_active(inode)) {
                 inode_incr_space(inode, number, reserve);
@@ -1611,6 +1633,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
         for (cnt = 0; cnt < MAXQUOTAS; cnt++)
                 warn[cnt].w_type = QUOTA_NL_NOWARN;
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -1652,13 +1675,14 @@ int dquot_alloc_inode(struct inode *inode)
 {
         int cnt, ret = 0, index;
         struct dquot_warn warn[MAXQUOTAS];
-        struct dquot * const *dquots = i_dquot(inode);
+        struct dquot * const *dquots;
 
         if (!dquot_active(inode))
                 return 0;
         for (cnt = 0; cnt < MAXQUOTAS; cnt++)
                 warn[cnt].w_type = QUOTA_NL_NOWARN;
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -1690,6 +1714,7 @@ EXPORT_SYMBOL(dquot_alloc_inode);
  */
 int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
 {
+        struct dquot **dquots;
         int cnt, index;
 
         if (!dquot_active(inode)) {
@@ -1697,18 +1722,18 @@ int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
                 return 0;
         }
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         /* Claim reserved quotas to allocated quotas */
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-                if (i_dquot(inode)[cnt])
-                        dquot_claim_reserved_space(i_dquot(inode)[cnt],
-                                                        number);
+                if (dquots[cnt])
+                        dquot_claim_reserved_space(dquots[cnt], number);
         }
         /* Update inode bytes */
         inode_claim_rsv_space(inode, number);
         spin_unlock(&dq_data_lock);
-        mark_all_dquot_dirty(i_dquot(inode));
+        mark_all_dquot_dirty(dquots);
         srcu_read_unlock(&dquot_srcu, index);
         return 0;
 }
@@ -1719,6 +1744,7 @@ EXPORT_SYMBOL(dquot_claim_space_nodirty);
  */
 void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)
 {
+        struct dquot **dquots;
         int cnt, index;
 
         if (!dquot_active(inode)) {
@@ -1726,18 +1752,18 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)
                 return;
         }
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         /* Claim reserved quotas to allocated quotas */
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-                if (i_dquot(inode)[cnt])
-                        dquot_reclaim_reserved_space(i_dquot(inode)[cnt],
-                                                     number);
+                if (dquots[cnt])
+                        dquot_reclaim_reserved_space(dquots[cnt], number);
         }
         /* Update inode bytes */
         inode_reclaim_rsv_space(inode, number);
         spin_unlock(&dq_data_lock);
-        mark_all_dquot_dirty(i_dquot(inode));
+        mark_all_dquot_dirty(dquots);
         srcu_read_unlock(&dquot_srcu, index);
         return;
 }
@@ -1750,7 +1776,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
 {
         unsigned int cnt;
         struct dquot_warn warn[MAXQUOTAS];
-        struct dquot **dquots = i_dquot(inode);
+        struct dquot **dquots;
         int reserve = flags & DQUOT_SPACE_RESERVE, index;
 
         if (!dquot_active(inode)) {
@@ -1758,6 +1784,7 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
                 return;
         }
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -1793,12 +1820,13 @@ void dquot_free_inode(struct inode *inode)
 {
         unsigned int cnt;
         struct dquot_warn warn[MAXQUOTAS];
-        struct dquot * const *dquots = i_dquot(inode);
+        struct dquot * const *dquots;
         int index;
 
         if (!dquot_active(inode))
                 return;
 
+        dquots = i_dquot(inode);
         index = srcu_read_lock(&dquot_srcu);
         spin_lock(&dq_data_lock);
         for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -2161,7 +2189,8 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
                 error = -EROFS;
                 goto out_fmt;
         }
-        if (!sb->s_op->quota_write || !sb->s_op->quota_read) {
+        if (!sb->s_op->quota_write || !sb->s_op->quota_read ||
+            (type == PRJQUOTA && sb->dq_op->get_projid == NULL)) {
                 error = -EINVAL;
                 goto out_fmt;
         }
@@ -2614,55 +2643,73 @@ out:
 EXPORT_SYMBOL(dquot_set_dqblk);
 
 /* Generic routine for getting common part of quota file information */
-int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
+int dquot_get_state(struct super_block *sb, struct qc_state *state)
 {
         struct mem_dqinfo *mi;
+        struct qc_type_state *tstate;
+        struct quota_info *dqopt = sb_dqopt(sb);
+        int type;
   
         mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
-        if (!sb_has_quota_active(sb, type)) {
-                mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-                return -ESRCH;
+        memset(state, 0, sizeof(*state));
+        for (type = 0; type < MAXQUOTAS; type++) {
+                if (!sb_has_quota_active(sb, type))
+                        continue;
+                tstate = state->s_state + type;
+                mi = sb_dqopt(sb)->info + type;
+                tstate->flags = QCI_ACCT_ENABLED;
+                spin_lock(&dq_data_lock);
+                if (mi->dqi_flags & DQF_SYS_FILE)
+                        tstate->flags |= QCI_SYSFILE;
+                if (mi->dqi_flags & DQF_ROOT_SQUASH)
+                        tstate->flags |= QCI_ROOT_SQUASH;
+                if (sb_has_quota_limits_enabled(sb, type))
+                        tstate->flags |= QCI_LIMITS_ENFORCED;
+                tstate->spc_timelimit = mi->dqi_bgrace;
+                tstate->ino_timelimit = mi->dqi_igrace;
+                tstate->ino = dqopt->files[type]->i_ino;
+                tstate->blocks = dqopt->files[type]->i_blocks;
+                tstate->nextents = 1;   /* We don't know... */
+                spin_unlock(&dq_data_lock);
         }
-        mi = sb_dqopt(sb)->info + type;
-        spin_lock(&dq_data_lock);
-        ii->dqi_bgrace = mi->dqi_bgrace;
-        ii->dqi_igrace = mi->dqi_igrace;
-        ii->dqi_flags = mi->dqi_flags & DQF_GETINFO_MASK;
-        ii->dqi_valid = IIF_ALL;
-        spin_unlock(&dq_data_lock);
         mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
         return 0;
 }
-EXPORT_SYMBOL(dquot_get_dqinfo);
+EXPORT_SYMBOL(dquot_get_state);
 
 /* Generic routine for setting common part of quota file information */
-int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
+int dquot_set_dqinfo(struct super_block *sb, int type, struct qc_info *ii)
 {
         struct mem_dqinfo *mi;
         int err = 0;
 
+        if ((ii->i_fieldmask & QC_WARNS_MASK) ||
+            (ii->i_fieldmask & QC_RT_SPC_TIMER))
+                return -EINVAL;
         mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
         if (!sb_has_quota_active(sb, type)) {
                 err = -ESRCH;
                 goto out;
         }
         mi = sb_dqopt(sb)->info + type;
-        if (ii->dqi_valid & IIF_FLAGS) {
-                if (ii->dqi_flags & ~DQF_SETINFO_MASK ||
-                    (ii->dqi_flags & DQF_ROOT_SQUASH &&
+        if (ii->i_fieldmask & QC_FLAGS) {
+                if ((ii->i_flags & QCI_ROOT_SQUASH &&
                      mi->dqi_format->qf_fmt_id != QFMT_VFS_OLD)) {
                         err = -EINVAL;
                         goto out;
                 }
         }
         spin_lock(&dq_data_lock);
-        if (ii->dqi_valid & IIF_BGRACE)
-                mi->dqi_bgrace = ii->dqi_bgrace;
-        if (ii->dqi_valid & IIF_IGRACE)
-                mi->dqi_igrace = ii->dqi_igrace;
-        if (ii->dqi_valid & IIF_FLAGS)
-                mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK) |
-                                (ii->dqi_flags & DQF_SETINFO_MASK);
+        if (ii->i_fieldmask & QC_SPC_TIMER)
+                mi->dqi_bgrace = ii->i_spc_timelimit;
+        if (ii->i_fieldmask & QC_INO_TIMER)
+                mi->dqi_igrace = ii->i_ino_timelimit;
+        if (ii->i_fieldmask & QC_FLAGS) {
+                if (ii->i_flags & QCI_ROOT_SQUASH)
+                        mi->dqi_flags |= DQF_ROOT_SQUASH;
+                else
+                        mi->dqi_flags &= ~DQF_ROOT_SQUASH;
+        }
         spin_unlock(&dq_data_lock);
         mark_info_dirty(sb, type);
         /* Force write to disk */
@@ -2677,7 +2724,7 @@ const struct quotactl_ops dquot_quotactl_ops = {
         .quota_on       = dquot_quota_on,
         .quota_off      = dquot_quota_off,
         .quota_sync     = dquot_quota_sync,
-        .get_info       = dquot_get_dqinfo,
+        .get_state      = dquot_get_state,
         .set_info       = dquot_set_dqinfo,
         .get_dqblk      = dquot_get_dqblk,
         .set_dqblk      = dquot_set_dqblk
@@ -2688,7 +2735,7 @@ const struct quotactl_ops dquot_quotactl_sysfile_ops = {
         .quota_enable   = dquot_quota_enable,
         .quota_disable  = dquot_quota_disable,
         .quota_sync     = dquot_quota_sync,
-        .get_info       = dquot_get_dqinfo,
+        .get_state      = dquot_get_state,
         .set_info       = dquot_set_dqinfo,
         .get_dqblk      = dquot_get_dqblk,
         .set_dqblk      = dquot_set_dqblk
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index d14a799c7785..86ded7375c21 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -118,13 +118,30 @@ static int quota_getfmt(struct super_block *sb, int type, void __user *addr)
 
 static int quota_getinfo(struct super_block *sb, int type, void __user *addr)
 {
-        struct if_dqinfo info;
+        struct qc_state state;
+        struct qc_type_state *tstate;
+        struct if_dqinfo uinfo;
         int ret;
 
-        if (!sb->s_qcop->get_info)
+        /* This checks whether qc_state has enough entries... */
+        BUILD_BUG_ON(MAXQUOTAS > XQM_MAXQUOTAS);
+        if (!sb->s_qcop->get_state)
                 return -ENOSYS;
-        ret = sb->s_qcop->get_info(sb, type, &info);
-        if (!ret && copy_to_user(addr, &info, sizeof(info)))
+        ret = sb->s_qcop->get_state(sb, &state);
+        if (ret)
+                return ret;
+        tstate = state.s_state + type;
+        if (!(tstate->flags & QCI_ACCT_ENABLED))
+                return -ESRCH;
+        memset(&uinfo, 0, sizeof(uinfo));
+        uinfo.dqi_bgrace = tstate->spc_timelimit;
+        uinfo.dqi_igrace = tstate->ino_timelimit;
+        if (tstate->flags & QCI_SYSFILE)
+                uinfo.dqi_flags |= DQF_SYS_FILE;
+        if (tstate->flags & QCI_ROOT_SQUASH)
+                uinfo.dqi_flags |= DQF_ROOT_SQUASH;
+        uinfo.dqi_valid = IIF_ALL;
+        if (!ret && copy_to_user(addr, &uinfo, sizeof(uinfo)))
                 return -EFAULT;
         return ret;
 }
@@ -132,12 +149,31 @@ static int quota_getinfo(struct super_block *sb, int type, void __user *addr)
 static int quota_setinfo(struct super_block *sb, int type, void __user *addr)
 {
         struct if_dqinfo info;
+        struct qc_info qinfo;
 
         if (copy_from_user(&info, addr, sizeof(info)))
                 return -EFAULT;
         if (!sb->s_qcop->set_info)
                 return -ENOSYS;
-        return sb->s_qcop->set_info(sb, type, &info);
+        if (info.dqi_valid & ~(IIF_FLAGS | IIF_BGRACE | IIF_IGRACE))
+                return -EINVAL;
+        memset(&qinfo, 0, sizeof(qinfo));
+        if (info.dqi_valid & IIF_FLAGS) {
+                if (info.dqi_flags & ~DQF_SETINFO_MASK)
+                        return -EINVAL;
+                if (info.dqi_flags & DQF_ROOT_SQUASH)
+                        qinfo.i_flags |= QCI_ROOT_SQUASH;
+                qinfo.i_fieldmask |= QC_FLAGS;
+        }
+        if (info.dqi_valid & IIF_BGRACE) {
+                qinfo.i_spc_timelimit = info.dqi_bgrace;
+                qinfo.i_fieldmask |= QC_SPC_TIMER;
+        }
+        if (info.dqi_valid & IIF_IGRACE) {
+                qinfo.i_ino_timelimit = info.dqi_igrace;
+                qinfo.i_fieldmask |= QC_INO_TIMER;
+        }
+        return sb->s_qcop->set_info(sb, type, &qinfo);
 }
 
 static inline qsize_t qbtos(qsize_t blocks)
@@ -252,25 +288,149 @@ static int quota_disable(struct super_block *sb, void __user *addr)
         return sb->s_qcop->quota_disable(sb, flags);
 }
 
+static int quota_state_to_flags(struct qc_state *state)
+{
+        int flags = 0;
+
+        if (state->s_state[USRQUOTA].flags & QCI_ACCT_ENABLED)
+                flags |= FS_QUOTA_UDQ_ACCT;
+        if (state->s_state[USRQUOTA].flags & QCI_LIMITS_ENFORCED)
+                flags |= FS_QUOTA_UDQ_ENFD;
+        if (state->s_state[GRPQUOTA].flags & QCI_ACCT_ENABLED)
+                flags |= FS_QUOTA_GDQ_ACCT;
+        if (state->s_state[GRPQUOTA].flags & QCI_LIMITS_ENFORCED)
+                flags |= FS_QUOTA_GDQ_ENFD;
+        if (state->s_state[PRJQUOTA].flags & QCI_ACCT_ENABLED)
+                flags |= FS_QUOTA_PDQ_ACCT;
+        if (state->s_state[PRJQUOTA].flags & QCI_LIMITS_ENFORCED)
+                flags |= FS_QUOTA_PDQ_ENFD;
+        return flags;
+}
+
+static int quota_getstate(struct super_block *sb, struct fs_quota_stat *fqs)
+{
+        int type;
+        struct qc_state state;
+        int ret;
+
+        ret = sb->s_qcop->get_state(sb, &state);
+        if (ret < 0)
+                return ret;
+
+        memset(fqs, 0, sizeof(*fqs));
+        fqs->qs_version = FS_QSTAT_VERSION;
+        fqs->qs_flags = quota_state_to_flags(&state);
+        /* No quota enabled? */
+        if (!fqs->qs_flags)
+                return -ENOSYS;
+        fqs->qs_incoredqs = state.s_incoredqs;
+        /*
+         * GETXSTATE quotactl has space for just one set of time limits so
+         * report them for the first enabled quota type
+         */
+        for (type = 0; type < XQM_MAXQUOTAS; type++)
+                if (state.s_state[type].flags & QCI_ACCT_ENABLED)
+                        break;
+        BUG_ON(type == XQM_MAXQUOTAS);
+        fqs->qs_btimelimit = state.s_state[type].spc_timelimit;
+        fqs->qs_itimelimit = state.s_state[type].ino_timelimit;
+        fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit;
+        fqs->qs_bwarnlimit = state.s_state[type].spc_warnlimit;
+        fqs->qs_iwarnlimit = state.s_state[type].ino_warnlimit;
+        if (state.s_state[USRQUOTA].flags & QCI_ACCT_ENABLED) {
+                fqs->qs_uquota.qfs_ino = state.s_state[USRQUOTA].ino;
+                fqs->qs_uquota.qfs_nblks = state.s_state[USRQUOTA].blocks;
+                fqs->qs_uquota.qfs_nextents = state.s_state[USRQUOTA].nextents;
+        }
+        if (state.s_state[GRPQUOTA].flags & QCI_ACCT_ENABLED) {
+                fqs->qs_gquota.qfs_ino = state.s_state[GRPQUOTA].ino;
+                fqs->qs_gquota.qfs_nblks = state.s_state[GRPQUOTA].blocks;
+                fqs->qs_gquota.qfs_nextents = state.s_state[GRPQUOTA].nextents;
+        }
+        if (state.s_state[PRJQUOTA].flags & QCI_ACCT_ENABLED) {
+                /*
+                 * Q_XGETQSTAT doesn't have room for both group and project
+                 * quotas.  So, allow the project quota values to be copied out
+                 * only if there is no group quota information available.
+                 */
+                if (!(state.s_state[GRPQUOTA].flags & QCI_ACCT_ENABLED)) {
+                        fqs->qs_gquota.qfs_ino = state.s_state[PRJQUOTA].ino;
+                        fqs->qs_gquota.qfs_nblks =
+                                        state.s_state[PRJQUOTA].blocks;
+                        fqs->qs_gquota.qfs_nextents =
+                                        state.s_state[PRJQUOTA].nextents;
+                }
+        }
+        return 0;
+}
+
 static int quota_getxstate(struct super_block *sb, void __user *addr)
 {
         struct fs_quota_stat fqs;
         int ret;
 
-        if (!sb->s_qcop->get_xstate)
+        if (!sb->s_qcop->get_state)
                 return -ENOSYS;
-        ret = sb->s_qcop->get_xstate(sb, &fqs);
+        ret = quota_getstate(sb, &fqs);
         if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))
                 return -EFAULT;
         return ret;
 }
 
+static int quota_getstatev(struct super_block *sb, struct fs_quota_statv *fqs)
+{
+        int type;
+        struct qc_state state;
+        int ret;
+
+        ret = sb->s_qcop->get_state(sb, &state);
+        if (ret < 0)
+                return ret;
+
+        memset(fqs, 0, sizeof(*fqs));
+        fqs->qs_version = FS_QSTAT_VERSION;
+        fqs->qs_flags = quota_state_to_flags(&state);
+        /* No quota enabled? */
+        if (!fqs->qs_flags)
+                return -ENOSYS;
+        fqs->qs_incoredqs = state.s_incoredqs;
+        /*
+         * GETXSTATV quotactl has space for just one set of time limits so
+         * report them for the first enabled quota type
+         */
+        for (type = 0; type < XQM_MAXQUOTAS; type++)
+                if (state.s_state[type].flags & QCI_ACCT_ENABLED)
+                        break;
+        BUG_ON(type == XQM_MAXQUOTAS);
+        fqs->qs_btimelimit = state.s_state[type].spc_timelimit;
+        fqs->qs_itimelimit = state.s_state[type].ino_timelimit;
+        fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit;
+        fqs->qs_bwarnlimit = state.s_state[type].spc_warnlimit;
+        fqs->qs_iwarnlimit = state.s_state[type].ino_warnlimit;
+        if (state.s_state[USRQUOTA].flags & QCI_ACCT_ENABLED) {
+                fqs->qs_uquota.qfs_ino = state.s_state[USRQUOTA].ino;
+                fqs->qs_uquota.qfs_nblks = state.s_state[USRQUOTA].blocks;
+                fqs->qs_uquota.qfs_nextents = state.s_state[USRQUOTA].nextents;
+        }
+        if (state.s_state[GRPQUOTA].flags & QCI_ACCT_ENABLED) {
+                fqs->qs_gquota.qfs_ino = state.s_state[GRPQUOTA].ino;
+                fqs->qs_gquota.qfs_nblks = state.s_state[GRPQUOTA].blocks;
+                fqs->qs_gquota.qfs_nextents = state.s_state[GRPQUOTA].nextents;
+        }
+        if (state.s_state[PRJQUOTA].flags & QCI_ACCT_ENABLED) {
+                fqs->qs_pquota.qfs_ino = state.s_state[PRJQUOTA].ino;
+                fqs->qs_pquota.qfs_nblks = state.s_state[PRJQUOTA].blocks;
+                fqs->qs_pquota.qfs_nextents = state.s_state[PRJQUOTA].nextents;
+        }
+        return 0;
+}
+
 static int quota_getxstatev(struct super_block *sb, void __user *addr)
 {
         struct fs_quota_statv fqs;
         int ret;
 
-        if (!sb->s_qcop->get_xstatev)
+        if (!sb->s_qcop->get_state)
                 return -ENOSYS;
 
         memset(&fqs, 0, sizeof(fqs));
@@ -284,7 +444,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)
         default:
                 return -EINVAL;
         }
-        ret = sb->s_qcop->get_xstatev(sb, &fqs);
+        ret = quota_getstatev(sb, &fqs);
         if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))
                 return -EFAULT;
         return ret;
@@ -357,6 +517,30 @@ static void copy_from_xfs_dqblk(struct qc_dqblk *dst, struct fs_disk_quota *src)
                 dst->d_fieldmask |= QC_RT_SPACE;
 }
 
+static void copy_qcinfo_from_xfs_dqblk(struct qc_info *dst,
+                                       struct fs_disk_quota *src)
+{
+        memset(dst, 0, sizeof(*dst));
+        dst->i_spc_timelimit = src->d_btimer;
+        dst->i_ino_timelimit = src->d_itimer;
+        dst->i_rt_spc_timelimit = src->d_rtbtimer;
+        dst->i_ino_warnlimit = src->d_iwarns;
+        dst->i_spc_warnlimit = src->d_bwarns;
+        dst->i_rt_spc_warnlimit = src->d_rtbwarns;
+        if (src->d_fieldmask & FS_DQ_BWARNS)
+                dst->i_fieldmask |= QC_SPC_WARNS;
+        if (src->d_fieldmask & FS_DQ_IWARNS)
+                dst->i_fieldmask |= QC_INO_WARNS;
+        if (src->d_fieldmask & FS_DQ_RTBWARNS)
+                dst->i_fieldmask |= QC_RT_SPC_WARNS;
+        if (src->d_fieldmask & FS_DQ_BTIMER)
+                dst->i_fieldmask |= QC_SPC_TIMER;
+        if (src->d_fieldmask & FS_DQ_ITIMER)
+                dst->i_fieldmask |= QC_INO_TIMER;
+        if (src->d_fieldmask & FS_DQ_RTBTIMER)
+                dst->i_fieldmask |= QC_RT_SPC_TIMER;
+}
+
 static int quota_setxquota(struct super_block *sb, int type, qid_t id,
                            void __user *addr)
 {
@@ -371,6 +555,21 @@ static int quota_setxquota(struct super_block *sb, int type, qid_t id,
         qid = make_kqid(current_user_ns(), type, id);
         if (!qid_valid(qid))
                 return -EINVAL;
+        /* Are we actually setting timer / warning limits for all users? */
+        if (from_kqid(&init_user_ns, qid) == 0 &&
+            fdq.d_fieldmask & (FS_DQ_WARNS_MASK | FS_DQ_TIMER_MASK)) {
+                struct qc_info qinfo;
+                int ret;
+
+                if (!sb->s_qcop->set_info)
+                        return -EINVAL;
+                copy_qcinfo_from_xfs_dqblk(&qinfo, &fdq);
+                ret = sb->s_qcop->set_info(sb, type, &qinfo);
+                if (ret)
+                        return ret;
+                /* These are already done */
+                fdq.d_fieldmask &= ~(FS_DQ_WARNS_MASK | FS_DQ_TIMER_MASK);
+        }
         copy_from_xfs_dqblk(&qdq, &fdq);
         return sb->s_qcop->set_dqblk(sb, qid, &qdq);
 }
diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c
index d65877fbe8f4..58efb83dec1c 100644
--- a/fs/quota/quota_tree.c
+++ b/fs/quota/quota_tree.c
@@ -349,6 +349,13 @@ static inline int dq_insert_tree(struct qtree_mem_dqinfo *info,
                                  struct dquot *dquot)
 {
         int tmp = QT_TREEOFF;
+
+#ifdef __QUOTA_QT_PARANOIA
+        if (info->dqi_blocks <= QT_TREEOFF) {
+                quota_error(dquot->dq_sb, "Quota tree root isn't allocated!");
+                return -EIO;
+        }
+#endif
         return do_insert_tree(info, dquot, &tmp, 0);
 }
 
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 9cb10d7197f7..2aa012a68e90 100644
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -117,12 +117,16 @@ static int v2_read_file_info(struct super_block *sb, int type)
         qinfo = info->dqi_priv;
         if (version == 0) {
                 /* limits are stored as unsigned 32-bit data */
-                info->dqi_max_spc_limit = 0xffffffffULL << QUOTABLOCK_BITS;
+                info->dqi_max_spc_limit = 0xffffffffLL << QUOTABLOCK_BITS;
                 info->dqi_max_ino_limit = 0xffffffff;
         } else {
-                /* used space is stored as unsigned 64-bit value in bytes */
-                info->dqi_max_spc_limit = 0xffffffffffffffffULL; /* 2^64-1 */
-                info->dqi_max_ino_limit = 0xffffffffffffffffULL;
+                /*
+                 * Used space is stored as unsigned 64-bit value in bytes but
+                 * quota core supports only signed 64-bit values so use that
+                 * as a limit
+                 */
+                info->dqi_max_spc_limit = 0x7fffffffffffffffLL; /* 2^63-1 */
+                info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
         }
         info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
         info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
diff --git a/fs/quota/quotaio_v2.h b/fs/quota/quotaio_v2.h
index f1966b42c2fd..4e95430093d9 100644
--- a/fs/quota/quotaio_v2.h
+++ b/fs/quota/quotaio_v2.h
@@ -13,12 +13,14 @@
  */
 #define V2_INITQMAGICS {\
         0xd9c01f11,     /* USRQUOTA */\
-        0xd9c01927      /* GRPQUOTA */\
+        0xd9c01927,     /* GRPQUOTA */\
+        0xd9c03f14,     /* PRJQUOTA */\
 }
 
 #define V2_INITQVERSIONS {\
         1,              /* USRQUOTA */\
-        1               /* GRPQUOTA */\
+        1,              /* GRPQUOTA */\
+        1,              /* PRJQUOTA */\
 }
 
 /* First generic header */
diff --git a/fs/read_write.c b/fs/read_write.c
index 45d583c33879..819ef3faf1bb 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -477,7 +477,8 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t
 
         ret = filp->f_op->write_iter(&kiocb, &iter);
         BUG_ON(ret == -EIOCBQUEUED);
-        *ppos = kiocb.ki_pos;
+        if (ret > 0)
+                *ppos = kiocb.ki_pos;
         return ret;
 }
 
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 9312b7842e03..742242b60972 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -3278,22 +3278,22 @@ static int reiserfs_releasepage(struct page *page, gfp_t unused_gfp_flags)
  * We thank Mingming Cao for helping us understand in great detail what
  * to do in this section of the code.
  */
-static ssize_t reiserfs_direct_IO(int rw, struct kiocb *iocb,
-                                  struct iov_iter *iter, loff_t offset)
+static ssize_t reiserfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
+                                  loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset,
+        ret = blockdev_direct_IO(iocb, inode, iter, offset,
                                  reiserfs_get_blocks_direct_io);
 
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again.
          */
-        if (unlikely((rw & WRITE) && ret < 0)) {
+        if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
                 loff_t isize = i_size_read(inode);
                 loff_t end = offset + count;
 
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index bb79cddf0a1f..2adcde137c3f 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -910,7 +910,6 @@ do {									\
         if (!(cond))                                                    \
                 reiserfs_panic(NULL, "assertion failure", "(" #cond ") at " \
                                __FILE__ ":%i:%s: " format "\n",         \
-                               in_interrupt() ? -1 : task_pid_nr(current), \
                                __LINE__, __func__ , ##args);            \
 } while (0)
 
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 71fbbe3e2dab..68b5f182984e 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -805,7 +805,7 @@ static const struct quotactl_ops reiserfs_qctl_operations = {
         .quota_on = reiserfs_quota_on,
         .quota_off = dquot_quota_off,
         .quota_sync = dquot_quota_sync,
-        .get_info = dquot_get_dqinfo,
+        .get_state = dquot_get_state,
         .set_info = dquot_set_dqinfo,
         .get_dqblk = dquot_get_dqblk,
         .set_dqblk = dquot_set_dqblk,
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 1ba2baaf4367..6d6a96b4e73f 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -21,7 +21,6 @@
 
 #include "udfdecl.h"
 
-#include <linux/buffer_head.h>
 #include <linux/bitops.h>
 
 #include "udf_i.h"
@@ -63,15 +62,14 @@ static int __load_block_bitmap(struct super_block *sb,
                           block_group, nr_groups);
         }
 
-        if (bitmap->s_block_bitmap[block_group]) {
+        if (bitmap->s_block_bitmap[block_group])
                 return block_group;
-        } else {
-                retval = read_block_bitmap(sb, bitmap, block_group,
-                                           block_group);
-                if (retval < 0)
-                        return retval;
-                return block_group;
-        }
+
+        retval = read_block_bitmap(sb, bitmap, block_group, block_group);
+        if (retval < 0)
+                return retval;
+
+        return block_group;
 }
 
 static inline int load_block_bitmap(struct super_block *sb,
@@ -358,7 +356,6 @@ static void udf_table_free_blocks(struct super_block *sb,
         struct kernel_lb_addr eloc;
         struct extent_position oepos, epos;
         int8_t etype;
-        int i;
         struct udf_inode_info *iinfo;
 
         mutex_lock(&sbi->s_alloc_mutex);
@@ -425,7 +422,6 @@ static void udf_table_free_blocks(struct super_block *sb,
                 }
 
                 if (epos.bh != oepos.bh) {
-                        i = -1;
                         oepos.block = epos.block;
                         brelse(oepos.bh);
                         get_bh(epos.bh);
@@ -762,7 +758,7 @@ inline int udf_prealloc_blocks(struct super_block *sb,
                                uint32_t block_count)
 {
         struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[partition];
-        sector_t allocated;
+        int allocated;
 
         if (map->s_partition_flags & UDF_PART_FLAG_UNALLOC_BITMAP)
                 allocated = udf_bitmap_prealloc_blocks(sb,
diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 05e90edd1992..541a12b5792d 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/buffer_head.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"
diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index 3e44f575fb9c..c763fda257bf 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -16,7 +16,6 @@
 
 #include <linux/fs.h>
 #include <linux/string.h>
-#include <linux/buffer_head.h>
 
 struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                          struct udf_fileident_bh *fibh,
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 74050bff64f4..5dadad9960b9 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -33,7 +33,6 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/pagemap.h>
-#include <linux/buffer_head.h>
 #include <linux/uio.h>
 
 #include "udf_i.h"
@@ -100,8 +99,7 @@ static int udf_adinicb_write_begin(struct file *file,
         return 0;
 }
 
-static ssize_t udf_adinicb_direct_IO(int rw, struct kiocb *iocb,
-                                     struct iov_iter *iter,
+static ssize_t udf_adinicb_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
                                      loff_t offset)
 {
         /* Fallback to buffered I/O. */
@@ -121,21 +119,21 @@ static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         ssize_t retval;
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
-        int err, pos;
-        size_t count = iov_iter_count(from);
         struct udf_inode_info *iinfo = UDF_I(inode);
+        int err;
 
         mutex_lock(&inode->i_mutex);
+
+        retval = generic_write_checks(iocb, from);
+        if (retval <= 0)
+                goto out;
+
         down_write(&iinfo->i_data_sem);
         if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
-                if (file->f_flags & O_APPEND)
-                        pos = inode->i_size;
-                else
-                        pos = iocb->ki_pos;
+                loff_t end = iocb->ki_pos + iov_iter_count(from);
 
                 if (inode->i_sb->s_blocksize <
-                                (udf_file_entry_alloc_offset(inode) +
-                                                pos + count)) {
+                                (udf_file_entry_alloc_offset(inode) + end)) {
                         err = udf_expand_file_adinicb(inode);
                         if (err) {
                                 mutex_unlock(&inode->i_mutex);
@@ -143,16 +141,14 @@ static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                                 return err;
                         }
                 } else {
-                        if (pos + count > inode->i_size)
-                                iinfo->i_lenAlloc = pos + count;
-                        else
-                                iinfo->i_lenAlloc = inode->i_size;
+                        iinfo->i_lenAlloc = max(end, inode->i_size);
                         up_write(&iinfo->i_data_sem);
                 }
         } else
                 up_write(&iinfo->i_data_sem);
 
         retval = __generic_file_write_iter(iocb, from);
+out:
         mutex_unlock(&inode->i_mutex);
 
         if (retval > 0) {
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 9c1fbd23913d..6afac3d561ac 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -33,7 +33,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
-#include <linux/buffer_head.h>
 #include <linux/writeback.h>
 #include <linux/slab.h>
 #include <linux/crc-itu-t.h>
@@ -215,8 +214,7 @@ static int udf_write_begin(struct file *file, struct address_space *mapping,
         return ret;
 }
 
-static ssize_t udf_direct_IO(int rw, struct kiocb *iocb,
-                             struct iov_iter *iter,
+static ssize_t udf_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
                              loff_t offset)
 {
         struct file *file = iocb->ki_filp;
@@ -225,8 +223,8 @@ static ssize_t udf_direct_IO(int rw, struct kiocb *iocb,
         size_t count = iov_iter_count(iter);
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, iter, offset, udf_get_block);
-        if (unlikely(ret < 0 && (rw & WRITE)))
+        ret = blockdev_direct_IO(iocb, inode, iter, offset, udf_get_block);
+        if (unlikely(ret < 0 && iov_iter_rw(iter) == WRITE))
                 udf_write_failed(mapping, offset + count);
         return ret;
 }
@@ -1637,7 +1635,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)
                         udf_get_lb_pblock(inode->i_sb, &iinfo->i_location, 0));
         if (!bh) {
                 udf_debug("getblk failure\n");
-                return -ENOMEM;
+                return -EIO;
         }
 
         lock_buffer(bh);
diff --git a/fs/udf/misc.c b/fs/udf/misc.c
index c175b4dabc14..71d1c25f360d 100644
--- a/fs/udf/misc.c
+++ b/fs/udf/misc.c
@@ -23,7 +23,6 @@
 
 #include <linux/fs.h>
 #include <linux/string.h>
-#include <linux/buffer_head.h>
 #include <linux/crc-itu-t.h>
 
 #include "udf_i.h"
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 33b246b82c98..39661977c89c 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -27,7 +27,6 @@
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/buffer_head.h>
 #include <linux/sched.h>
 #include <linux/crc-itu-t.h>
 #include <linux/exportfs.h>
@@ -569,8 +568,8 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode)
         *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
                 cpu_to_le32(iinfo->i_unique & 0x00000000FFFFFFFFUL);
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        if (UDF_I(dir)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
-                mark_inode_dirty(dir);
+        dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
+        mark_inode_dirty(dir);
         if (fibh.sbh != fibh.ebh)
                 brelse(fibh.ebh);
         brelse(fibh.sbh);
@@ -683,6 +682,7 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
         cfi.fileCharacteristics |= FID_FILE_CHAR_DIRECTORY;
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
         inc_nlink(dir);
+        dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
         mark_inode_dirty(dir);
         unlock_new_inode(inode);
         d_instantiate(dentry, inode);
@@ -1024,6 +1024,8 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir,
         inc_nlink(inode);
         inode->i_ctime = current_fs_time(inode->i_sb);
         mark_inode_dirty(inode);
+        dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
+        mark_inode_dirty(dir);
         ihold(inode);
         d_instantiate(dentry, inode);
 
@@ -1127,7 +1129,9 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
                 inode_dec_link_count(new_inode);
         }
         old_dir->i_ctime = old_dir->i_mtime = current_fs_time(old_dir->i_sb);
+        new_dir->i_ctime = new_dir->i_mtime = current_fs_time(new_dir->i_sb);
         mark_inode_dirty(old_dir);
+        mark_inode_dirty(new_dir);
 
         if (dir_fi) {
                 dir_fi->icb.extLocation = cpu_to_lelb(UDF_I(new_dir)->i_location);
diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index d6caf01a2097..5f861ed287c3 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -24,7 +24,6 @@
 
 #include <linux/fs.h>
 #include <linux/string.h>
-#include <linux/buffer_head.h>
 #include <linux/mutex.h>
 
 uint32_t udf_get_pblock(struct super_block *sb, uint32_t block,
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f169411c4ea0..6299f341967b 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -48,7 +48,6 @@
 #include <linux/stat.h>
 #include <linux/cdrom.h>
 #include <linux/nls.h>
-#include <linux/buffer_head.h>
 #include <linux/vfs.h>
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index ac10ca939f26..8dfbc4025e2f 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -27,7 +27,6 @@
 #include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/pagemap.h>
-#include <linux/buffer_head.h>
 #include "udf_i.h"
 
 static int udf_pc_to_char(struct super_block *sb, unsigned char *from,
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index 8a9657d7f7c6..42b8c57795cb 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -22,7 +22,6 @@
 #include "udfdecl.h"
 #include <linux/fs.h>
 #include <linux/mm.h>
-#include <linux/buffer_head.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 4f8cdc59bc38..1d8eef9cf0f5 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1495,7 +1495,6 @@ xfs_end_io_direct_write(
 
 STATIC ssize_t
 xfs_vm_direct_IO(
-        int                     rw,
         struct kiocb            *iocb,
         struct iov_iter         *iter,
         loff_t                  offset)
@@ -1503,15 +1502,14 @@ xfs_vm_direct_IO(
         struct inode            *inode = iocb->ki_filp->f_mapping->host;
         struct block_device     *bdev = xfs_find_bdev_for_inode(inode);
 
-        if (rw & WRITE) {
-                return __blockdev_direct_IO(rw, iocb, inode, bdev, iter,
-                                            offset, xfs_get_blocks_direct,
+        if (iov_iter_rw(iter) == WRITE) {
+                return __blockdev_direct_IO(iocb, inode, bdev, iter, offset,
+                                            xfs_get_blocks_direct,
                                             xfs_end_io_direct_write, NULL,
                                             DIO_ASYNC_EXTEND);
         }
-        return __blockdev_direct_IO(rw, iocb, inode, bdev, iter,
-                                    offset, xfs_get_blocks_direct,
-                                    NULL, NULL, 0);
+        return __blockdev_direct_IO(iocb, inode, bdev, iter, offset,
+                                    xfs_get_blocks_direct, NULL, NULL, 0);
 }
 
 /*
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 44856c3b9617..1f12ad0a8585 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -279,7 +279,7 @@ xfs_file_read_iter(
 
         XFS_STATS_INC(xs_read_calls);
 
-        if (unlikely(file->f_flags & O_DIRECT))
+        if (unlikely(iocb->ki_flags & IOCB_DIRECT))
                 ioflags |= XFS_IO_ISDIRECT;
         if (file->f_mode & FMODE_NOCMTIME)
                 ioflags |= XFS_IO_INVIS;
@@ -544,18 +544,19 @@ xfs_zero_eof(
  */
 STATIC ssize_t
 xfs_file_aio_write_checks(
-        struct file             *file,
-        loff_t                  *pos,
-        size_t                  *count,
+        struct kiocb            *iocb,
+        struct iov_iter         *from,
         int                     *iolock)
 {
+        struct file             *file = iocb->ki_filp;
         struct inode            *inode = file->f_mapping->host;
         struct xfs_inode        *ip = XFS_I(inode);
-        int                     error = 0;
+        ssize_t                 error = 0;
+        size_t                  count = iov_iter_count(from);
 
 restart:
-        error = generic_write_checks(file, pos, count, S_ISBLK(inode->i_mode));
-        if (error)
+        error = generic_write_checks(iocb, from);
+        if (error <= 0)
                 return error;
 
         error = xfs_break_layouts(inode, iolock);
@@ -569,16 +570,17 @@ restart:
          * iolock shared, we need to update it to exclusive which implies
          * having to redo all checks before.
          */
-        if (*pos > i_size_read(inode)) {
+        if (iocb->ki_pos > i_size_read(inode)) {
                 bool    zero = false;
 
                 if (*iolock == XFS_IOLOCK_SHARED) {
                         xfs_rw_iunlock(ip, *iolock);
                         *iolock = XFS_IOLOCK_EXCL;
                         xfs_rw_ilock(ip, *iolock);
+                        iov_iter_reexpand(from, count);
                         goto restart;
                 }
-                error = xfs_zero_eof(ip, *pos, i_size_read(inode), &zero);
+                error = xfs_zero_eof(ip, iocb->ki_pos, i_size_read(inode), &zero);
                 if (error)
                         return error;
         }
@@ -678,10 +680,11 @@ xfs_file_dio_aio_write(
                 xfs_rw_ilock(ip, iolock);
         }
 
-        ret = xfs_file_aio_write_checks(file, &pos, &count, &iolock);
+        ret = xfs_file_aio_write_checks(iocb, from, &iolock);
         if (ret)
                 goto out;
-        iov_iter_truncate(from, count);
+        count = iov_iter_count(from);
+        pos = iocb->ki_pos;
 
         if (mapping->nrpages) {
                 ret = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
@@ -734,24 +737,22 @@ xfs_file_buffered_aio_write(
         ssize_t                 ret;
         int                     enospc = 0;
         int                     iolock = XFS_IOLOCK_EXCL;
-        loff_t                  pos = iocb->ki_pos;
-        size_t                  count = iov_iter_count(from);
 
         xfs_rw_ilock(ip, iolock);
 
-        ret = xfs_file_aio_write_checks(file, &pos, &count, &iolock);
+        ret = xfs_file_aio_write_checks(iocb, from, &iolock);
         if (ret)
                 goto out;
 
-        iov_iter_truncate(from, count);
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = inode_to_bdi(inode);
 
 write_retry:
-        trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, 0);
-        ret = generic_perform_write(file, from, pos);
+        trace_xfs_file_buffered_write(ip, iov_iter_count(from),
+                                      iocb->ki_pos, 0);
+        ret = generic_perform_write(file, from, iocb->ki_pos);
         if (likely(ret >= 0))
-                iocb->ki_pos = pos + ret;
+                iocb->ki_pos += ret;
 
         /*
          * If we hit a space limit, try to free up some lingering preallocated
@@ -803,7 +804,7 @@ xfs_file_write_iter(
         if (XFS_FORCED_SHUTDOWN(ip->i_mount))
                 return -EIO;
 
-        if (unlikely(file->f_flags & O_DIRECT))
+        if (unlikely(iocb->ki_flags & IOCB_DIRECT))
                 ret = xfs_file_dio_aio_write(iocb, from);
         else
                 ret = xfs_file_buffered_aio_write(iocb, from);
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 0d4d3590cf85..996a04064894 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -168,10 +168,6 @@ extern int		xfs_qm_scall_getquota(struct xfs_mount *, xfs_dqid_t,
                                         uint, struct qc_dqblk *);
 extern int              xfs_qm_scall_setqlim(struct xfs_mount *, xfs_dqid_t, uint,
                                         struct qc_dqblk *);
-extern int              xfs_qm_scall_getqstat(struct xfs_mount *,
-                                        struct fs_quota_stat *);
-extern int              xfs_qm_scall_getqstatv(struct xfs_mount *,
-                                        struct fs_quota_statv *);
 extern int              xfs_qm_scall_quotaon(struct xfs_mount *, uint);
 extern int              xfs_qm_scall_quotaoff(struct xfs_mount *, uint);
 
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 9b965db45800..9a25c9275fb3 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -38,7 +38,6 @@
 STATIC int      xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint);
 STATIC int      xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *,
                                         uint);
-STATIC uint     xfs_qm_export_flags(uint);
 
 /*
  * Turn off quota accounting and/or enforcement for all udquots and/or
@@ -389,159 +388,6 @@ xfs_qm_scall_quotaon(
         return 0;
 }
 
-
-/*
- * Return quota status information, such as uquota-off, enforcements, etc.
- * for Q_XGETQSTAT command.
- */
-int
-xfs_qm_scall_getqstat(
-        struct xfs_mount        *mp,
-        struct fs_quota_stat    *out)
-{
-        struct xfs_quotainfo    *q = mp->m_quotainfo;
-        struct xfs_inode        *uip = NULL;
-        struct xfs_inode        *gip = NULL;
-        struct xfs_inode        *pip = NULL;
-        bool                    tempuqip = false;
-        bool                    tempgqip = false;
-        bool                    temppqip = false;
-
-        memset(out, 0, sizeof(fs_quota_stat_t));
-
-        out->qs_version = FS_QSTAT_VERSION;
-        out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
-                                                        (XFS_ALL_QUOTA_ACCT|
-                                                         XFS_ALL_QUOTA_ENFD));
-        uip = q->qi_uquotaip;
-        gip = q->qi_gquotaip;
-        pip = q->qi_pquotaip;
-        if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
-                if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
-                                        0, 0, &uip) == 0)
-                        tempuqip = true;
-        }
-        if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {
-                if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
-                                        0, 0, &gip) == 0)
-                        tempgqip = true;
-        }
-        /*
-         * Q_XGETQSTAT doesn't have room for both group and project quotas.
-         * So, allow the project quota values to be copied out only if
-         * there is no group quota information available.
-         */
-        if (!gip) {
-                if (!pip && mp->m_sb.sb_pquotino != NULLFSINO) {
-                        if (xfs_iget(mp, NULL, mp->m_sb.sb_pquotino,
-                                                0, 0, &pip) == 0)
-                                temppqip = true;
-                }
-        } else
-                pip = NULL;
-        if (uip) {
-                out->qs_uquota.qfs_ino = mp->m_sb.sb_uquotino;
-                out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;
-                out->qs_uquota.qfs_nextents = uip->i_d.di_nextents;
-                if (tempuqip)
-                        IRELE(uip);
-        }
-
-        if (gip) {
-                out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
-                out->qs_gquota.qfs_nblks = gip->i_d.di_nblocks;
-                out->qs_gquota.qfs_nextents = gip->i_d.di_nextents;
-                if (tempgqip)
-                        IRELE(gip);
-        }
-        if (pip) {
-                out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
-                out->qs_gquota.qfs_nblks = pip->i_d.di_nblocks;
-                out->qs_gquota.qfs_nextents = pip->i_d.di_nextents;
-                if (temppqip)
-                        IRELE(pip);
-        }
-        out->qs_incoredqs = q->qi_dquots;
-        out->qs_btimelimit = q->qi_btimelimit;
-        out->qs_itimelimit = q->qi_itimelimit;
-        out->qs_rtbtimelimit = q->qi_rtbtimelimit;
-        out->qs_bwarnlimit = q->qi_bwarnlimit;
-        out->qs_iwarnlimit = q->qi_iwarnlimit;
-
-        return 0;
-}
-
-/*
- * Return quota status information, such as uquota-off, enforcements, etc.
- * for Q_XGETQSTATV command, to support separate project quota field.
- */
-int
-xfs_qm_scall_getqstatv(
-        struct xfs_mount        *mp,
-        struct fs_quota_statv   *out)
-{
-        struct xfs_quotainfo    *q = mp->m_quotainfo;
-        struct xfs_inode        *uip = NULL;
-        struct xfs_inode        *gip = NULL;
-        struct xfs_inode        *pip = NULL;
-        bool                    tempuqip = false;
-        bool                    tempgqip = false;
-        bool                    temppqip = false;
-
-        out->qs_flags = (__uint16_t) xfs_qm_export_flags(mp->m_qflags &
-                                                        (XFS_ALL_QUOTA_ACCT|
-                                                         XFS_ALL_QUOTA_ENFD));
-        out->qs_uquota.qfs_ino = mp->m_sb.sb_uquotino;
-        out->qs_gquota.qfs_ino = mp->m_sb.sb_gquotino;
-        out->qs_pquota.qfs_ino = mp->m_sb.sb_pquotino;
-
-        uip = q->qi_uquotaip;
-        gip = q->qi_gquotaip;
-        pip = q->qi_pquotaip;
-        if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
-                if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
-                                        0, 0, &uip) == 0)
-                        tempuqip = true;
-        }
-        if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {
-                if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
-                                        0, 0, &gip) == 0)
-                        tempgqip = true;
-        }
-        if (!pip && mp->m_sb.sb_pquotino != NULLFSINO) {
-                if (xfs_iget(mp, NULL, mp->m_sb.sb_pquotino,
-                                        0, 0, &pip) == 0)
-                        temppqip = true;
-        }
-        if (uip) {
-                out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;
-                out->qs_uquota.qfs_nextents = uip->i_d.di_nextents;
-                if (tempuqip)
-                        IRELE(uip);
-        }
-
-        if (gip) {
-                out->qs_gquota.qfs_nblks = gip->i_d.di_nblocks;
-                out->qs_gquota.qfs_nextents = gip->i_d.di_nextents;
-                if (tempgqip)
-                        IRELE(gip);
-        }
-        if (pip) {
-                out->qs_pquota.qfs_nblks = pip->i_d.di_nblocks;
-                out->qs_pquota.qfs_nextents = pip->i_d.di_nextents;
-                if (temppqip)
-                        IRELE(pip);
-        }
-        out->qs_incoredqs = q->qi_dquots;
-        out->qs_btimelimit = q->qi_btimelimit;
-        out->qs_itimelimit = q->qi_itimelimit;
-        out->qs_rtbtimelimit = q->qi_rtbtimelimit;
-        out->qs_bwarnlimit = q->qi_bwarnlimit;
-        out->qs_iwarnlimit = q->qi_iwarnlimit;
-
-        return 0;
-}
-
 #define XFS_QC_MASK \
         (QC_LIMIT_MASK | QC_TIMER_MASK | QC_WARNS_MASK)
 
@@ -873,28 +719,6 @@ out_put:
         return error;
 }
 
-STATIC uint
-xfs_qm_export_flags(
-        uint flags)
-{
-        uint uflags;
-
-        uflags = 0;
-        if (flags & XFS_UQUOTA_ACCT)
-                uflags |= FS_QUOTA_UDQ_ACCT;
-        if (flags & XFS_GQUOTA_ACCT)
-                uflags |= FS_QUOTA_GDQ_ACCT;
-        if (flags & XFS_PQUOTA_ACCT)
-                uflags |= FS_QUOTA_PDQ_ACCT;
-        if (flags & XFS_UQUOTA_ENFD)
-                uflags |= FS_QUOTA_UDQ_ENFD;
-        if (flags & XFS_GQUOTA_ENFD)
-                uflags |= FS_QUOTA_GDQ_ENFD;
-        if (flags & XFS_PQUOTA_ENFD)
-                uflags |= FS_QUOTA_PDQ_ENFD;
-        return uflags;
-}
-
 
 STATIC int
 xfs_dqrele_inode(
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 6923905ab33d..7795e0d01382 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -23,10 +23,81 @@
 #include "xfs_inode.h"
 #include "xfs_quota.h"
 #include "xfs_trans.h"
+#include "xfs_trace.h"
+#include "xfs_icache.h"
 #include "xfs_qm.h"
 #include <linux/quota.h>
 
 
+static void
+xfs_qm_fill_state(
+        struct qc_type_state    *tstate,
+        struct xfs_mount        *mp,
+        struct xfs_inode        *ip,
+        xfs_ino_t               ino)
+{
+        struct xfs_quotainfo *q = mp->m_quotainfo;
+        bool tempqip = false;
+
+        tstate->ino = ino;
+        if (!ip && ino == NULLFSINO)
+                return;
+        if (!ip) {
+                if (xfs_iget(mp, NULL, ino, 0, 0, &ip))
+                        return;
+                tempqip = true;
+        }
+        tstate->flags |= QCI_SYSFILE;
+        tstate->blocks = ip->i_d.di_nblocks;
+        tstate->nextents = ip->i_d.di_nextents;
+        tstate->spc_timelimit = q->qi_btimelimit;
+        tstate->ino_timelimit = q->qi_itimelimit;
+        tstate->rt_spc_timelimit = q->qi_rtbtimelimit;
+        tstate->spc_warnlimit = q->qi_bwarnlimit;
+        tstate->ino_warnlimit = q->qi_iwarnlimit;
+        tstate->rt_spc_warnlimit = q->qi_rtbwarnlimit;
+        if (tempqip)
+                IRELE(ip);
+}
+
+/*
+ * Return quota status information, such as enforcements, quota file inode
+ * numbers etc.
+ */
+static int
+xfs_fs_get_quota_state(
+        struct super_block      *sb,
+        struct qc_state         *state)
+{
+        struct xfs_mount *mp = XFS_M(sb);
+        struct xfs_quotainfo *q = mp->m_quotainfo;
+
+        memset(state, 0, sizeof(*state));
+        if (!XFS_IS_QUOTA_RUNNING(mp))
+                return 0;
+        state->s_incoredqs = q->qi_dquots;
+        if (XFS_IS_UQUOTA_RUNNING(mp))
+                state->s_state[USRQUOTA].flags |= QCI_ACCT_ENABLED;
+        if (XFS_IS_UQUOTA_ENFORCED(mp))
+                state->s_state[USRQUOTA].flags |= QCI_LIMITS_ENFORCED;
+        if (XFS_IS_GQUOTA_RUNNING(mp))
+                state->s_state[GRPQUOTA].flags |= QCI_ACCT_ENABLED;
+        if (XFS_IS_GQUOTA_ENFORCED(mp))
+                state->s_state[GRPQUOTA].flags |= QCI_LIMITS_ENFORCED;
+        if (XFS_IS_PQUOTA_RUNNING(mp))
+                state->s_state[PRJQUOTA].flags |= QCI_ACCT_ENABLED;
+        if (XFS_IS_PQUOTA_ENFORCED(mp))
+                state->s_state[PRJQUOTA].flags |= QCI_LIMITS_ENFORCED;
+
+        xfs_qm_fill_state(&state->s_state[USRQUOTA], mp, q->qi_uquotaip,
+                          mp->m_sb.sb_uquotino);
+        xfs_qm_fill_state(&state->s_state[GRPQUOTA], mp, q->qi_gquotaip,
+                          mp->m_sb.sb_gquotino);
+        xfs_qm_fill_state(&state->s_state[PRJQUOTA], mp, q->qi_pquotaip,
+                          mp->m_sb.sb_pquotino);
+        return 0;
+}
+
 STATIC int
 xfs_quota_type(int type)
 {
@@ -40,28 +111,40 @@ xfs_quota_type(int type)
         }
 }
 
-STATIC int
-xfs_fs_get_xstate(
+#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK | QC_WARNS_MASK)
+
+/*
+ * Adjust quota timers & warnings
+ */
+static int
+xfs_fs_set_info(
         struct super_block      *sb,
-        struct fs_quota_stat    *fqs)
+        int                     type,
+        struct qc_info          *info)
 {
-        struct xfs_mount        *mp = XFS_M(sb);
+        struct xfs_mount *mp = XFS_M(sb);
+        struct qc_dqblk newlim;
 
+        if (sb->s_flags & MS_RDONLY)
+                return -EROFS;
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
-        return xfs_qm_scall_getqstat(mp, fqs);
-}
+        if (!XFS_IS_QUOTA_ON(mp))
+                return -ESRCH;
+        if (info->i_fieldmask & ~XFS_QC_SETINFO_MASK)
+                return -EINVAL;
+        if ((info->i_fieldmask & XFS_QC_SETINFO_MASK) == 0)
+                return 0;
 
-STATIC int
-xfs_fs_get_xstatev(
-        struct super_block      *sb,
-        struct fs_quota_statv   *fqs)
-{
-        struct xfs_mount        *mp = XFS_M(sb);
+        newlim.d_fieldmask = info->i_fieldmask;
+        newlim.d_spc_timer = info->i_spc_timelimit;
+        newlim.d_ino_timer = info->i_ino_timelimit;
+        newlim.d_rt_spc_timer = info->i_rt_spc_timelimit;
+        newlim.d_ino_warns = info->i_ino_warnlimit;
+        newlim.d_spc_warns = info->i_spc_warnlimit;
+        newlim.d_rt_spc_warns = info->i_rt_spc_warnlimit;
 
-        if (!XFS_IS_QUOTA_RUNNING(mp))
-                return -ENOSYS;
-        return xfs_qm_scall_getqstatv(mp, fqs);
+        return xfs_qm_scall_setqlim(mp, 0, xfs_quota_type(type), &newlim);
 }
 
 static unsigned int
@@ -178,8 +261,8 @@ xfs_fs_set_dqblk(
 }
 
 const struct quotactl_ops xfs_quotactl_operations = {
-        .get_xstatev            = xfs_fs_get_xstatev,
-        .get_xstate             = xfs_fs_get_xstate,
+        .get_state              = xfs_fs_get_quota_state,
+        .set_info               = xfs_fs_set_info,
         .quota_enable           = xfs_quota_enable,
         .quota_disable          = xfs_quota_disable,
         .rm_xquota              = xfs_fs_rm_xquota,
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index d56f5d722138..08ef57bc8d63 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20150204
+#define ACPI_CA_VERSION                 0x20150410
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
@@ -431,13 +431,13 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_load_tables(void))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void))
 
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init
-                            acpi_find_root_pointer(acpi_size * rsdp_address))
-
+                            acpi_find_root_pointer(acpi_physical_address *
+                                                   rsdp_address))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
-                            acpi_get_table_header(acpi_string signature,
-                                                  u32 instance,
-                                                  struct acpi_table_header
-                                                  *out_table_header))
+                             acpi_get_table_header(acpi_string signature,
+                                                   u32 instance,
+                                                   struct acpi_table_header
+                                                   *out_table_header))
 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
                              acpi_get_table(acpi_string signature, u32 instance,
                                             struct acpi_table_header
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index f06d75e5fa54..cafdeb50fbdf 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -73,6 +73,7 @@
 #define ACPI_SIG_LPIT           "LPIT"  /* Low Power Idle Table */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
+#define ACPI_SIG_MSDM           "MSDM"  /* Microsoft Data Management Table */
 #define ACPI_SIG_MTMR           "MTMR"  /* MID Timer table */
 #define ACPI_SIG_SLIC           "SLIC"  /* Software Licensing Description Table */
 #define ACPI_SIG_SPCR           "SPCR"  /* Serial Port Console Redirection table */
@@ -845,7 +846,8 @@ struct acpi_lpit_header {
 
 enum acpi_lpit_type {
         ACPI_LPIT_TYPE_NATIVE_CSTATE = 0x00,
-        ACPI_LPIT_TYPE_SIMPLE_IO = 0x01
+        ACPI_LPIT_TYPE_SIMPLE_IO = 0x01,
+        ACPI_LPIT_TYPE_RESERVED = 0x02  /* 2 and above are reserved */
 };
 
 /* Masks for Flags field above  */
@@ -935,6 +937,21 @@ struct acpi_table_mchi {
 
 /*******************************************************************************
  *
+ * MSDM - Microsoft Data Management table
+ *
+ * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",
+ * November 29, 2011. Copyright 2011 Microsoft
+ *
+ ******************************************************************************/
+
+/* Basic MSDM table is only the common ACPI header */
+
+struct acpi_table_msdm {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/*******************************************************************************
+ *
  * MTMR - MID Timer Table
  *        Version 1
  *
@@ -959,10 +976,9 @@ struct acpi_mtmr_entry {
 /*******************************************************************************
  *
  * SLIC - Software Licensing Description Table
- *        Version 1
  *
- * Conforms to "OEM Activation 2.0 for Windows Vista Operating Systems",
- * Copyright 2006
+ * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",
+ * November 29, 2011. Copyright 2011 Microsoft
  *
  ******************************************************************************/
 
@@ -972,52 +988,6 @@ struct acpi_table_slic {
         struct acpi_table_header header;        /* Common ACPI table header */
 };
 
-/* Common SLIC subtable header */
-
-struct acpi_slic_header {
-        u32 type;
-        u32 length;
-};
-
-/* Values for Type field above */
-
-enum acpi_slic_type {
-        ACPI_SLIC_TYPE_PUBLIC_KEY = 0,
-        ACPI_SLIC_TYPE_WINDOWS_MARKER = 1,
-        ACPI_SLIC_TYPE_RESERVED = 2     /* 2 and greater are reserved */
-};
-
-/*
- * SLIC Subtables, correspond to Type in struct acpi_slic_header
- */
-
-/* 0: Public Key Structure */
-
-struct acpi_slic_key {
-        struct acpi_slic_header header;
-        u8 key_type;
-        u8 version;
-        u16 reserved;
-        u32 algorithm;
-        char magic[4];
-        u32 bit_length;
-        u32 exponent;
-        u8 modulus[128];
-};
-
-/* 1: Windows Marker Structure */
-
-struct acpi_slic_marker {
-        struct acpi_slic_header header;
-        u32 version;
-        char oem_id[ACPI_OEM_ID_SIZE];  /* ASCII OEM identification */
-        char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];      /* ASCII OEM table identification */
-        char windows_flag[8];
-        u32 slic_version;
-        u8 reserved[16];
-        u8 signature[128];
-};
-
 /*******************************************************************************
  *
  * SPCR - Serial Port Console Redirection table
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index b034f1068dfe..f5ca0e989bba 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -199,9 +199,29 @@ typedef int s32;
 typedef s32 acpi_native_int;
 
 typedef u32 acpi_size;
+
+#ifdef ACPI_32BIT_PHYSICAL_ADDRESS
+
+/*
+ * OSPMs can define this to shrink the size of the structures for 32-bit
+ * none PAE environment. ASL compiler may always define this to generate
+ * 32-bit OSPM compliant tables.
+ */
 typedef u32 acpi_io_address;
 typedef u32 acpi_physical_address;
 
+#else                           /* ACPI_32BIT_PHYSICAL_ADDRESS */
+
+/*
+ * It is reported that, after some calculations, the physical addresses can
+ * wrap over the 32-bit boundary on 32-bit PAE environment.
+ * https://bugzilla.kernel.org/show_bug.cgi?id=87971
+ */
+typedef u64 acpi_io_address;
+typedef u64 acpi_physical_address;
+
+#endif                          /* ACPI_32BIT_PHYSICAL_ADDRESS */
+
 #define ACPI_MAX_PTR                    ACPI_UINT32_MAX
 #define ACPI_SIZE_MAX                   ACPI_UINT32_MAX
 
@@ -713,33 +733,32 @@ typedef u32 acpi_event_type;
  * The encoding of acpi_event_status is illustrated below.
  * Note that a set bit (1) indicates the property is TRUE
  * (e.g. if bit 0 is set then the event is enabled).
- * +-------------+-+-+-+-+
- * |   Bits 31:4 |3|2|1|0|
- * +-------------+-+-+-+-+
- *          |     | | | |
- *          |     | | | +- Enabled?
- *          |     | | +--- Enabled for wake?
- *          |     | +----- Set?
- *          |     +------- Has a handler?
- *          +------------- <Reserved>
+ * +-------------+-+-+-+-+-+
+ * |   Bits 31:5 |4|3|2|1|0|
+ * +-------------+-+-+-+-+-+
+ *          |     | | | | |
+ *          |     | | | | +- Enabled?
+ *          |     | | | +--- Enabled for wake?
+ *          |     | | +----- Status bit set?
+ *          |     | +------- Enable bit set?
+ *          |     +--------- Has a handler?
+ *          +--------------- <Reserved>
  */
 typedef u32 acpi_event_status;
 
 #define ACPI_EVENT_FLAG_DISABLED        (acpi_event_status) 0x00
 #define ACPI_EVENT_FLAG_ENABLED         (acpi_event_status) 0x01
 #define ACPI_EVENT_FLAG_WAKE_ENABLED    (acpi_event_status) 0x02
-#define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04
-#define ACPI_EVENT_FLAG_HAS_HANDLER     (acpi_event_status) 0x08
+#define ACPI_EVENT_FLAG_STATUS_SET      (acpi_event_status) 0x04
+#define ACPI_EVENT_FLAG_ENABLE_SET      (acpi_event_status) 0x08
+#define ACPI_EVENT_FLAG_HAS_HANDLER     (acpi_event_status) 0x10
+#define ACPI_EVENT_FLAG_SET             ACPI_EVENT_FLAG_STATUS_SET
 
 /* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */
 
 #define ACPI_GPE_ENABLE                 0
 #define ACPI_GPE_DISABLE                1
 #define ACPI_GPE_CONDITIONAL_ENABLE     2
-#define ACPI_GPE_SAVE_MASK              4
-
-#define ACPI_GPE_ENABLE_SAVE            (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK)
-#define ACPI_GPE_DISABLE_SAVE           (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK)
 
 /*
  * GPE info flags - Per GPE
@@ -1251,6 +1270,7 @@ struct acpi_memory_list {
 #define ACPI_OSI_WIN_VISTA_SP2          0x0A
 #define ACPI_OSI_WIN_7                  0x0B
 #define ACPI_OSI_WIN_8                  0x0C
+#define ACPI_OSI_WIN_10                 0x0D
 
 /* Definitions of file IO */
 
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index ad74dc51d5b7..ecdf9405dd3a 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -76,6 +76,7 @@
 #define ACPI_LARGE_NAMESPACE_NODE
 #define ACPI_DATA_TABLE_DISASSEMBLY
 #define ACPI_SINGLE_THREADED
+#define ACPI_32BIT_PHYSICAL_ADDRESS
 #endif
 
 /* acpi_exec configuration. Multithreaded with full AML debugger */
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
index 3378dcf4c31e..940d5ec122c9 100644
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
@@ -39,6 +39,10 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
         debug_dma_unmap_page(dev, addr, size, dir, true);
 }
 
+/*
+ * dma_maps_sg_attrs returns 0 on error and > 0 on success.
+ * It should never return a value < 0.
+ */
 static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
                                    int nents, enum dma_data_direction dir,
                                    struct dma_attrs *attrs)
@@ -51,6 +55,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
                 kmemcheck_mark_initialized(sg_virt(s), s->length);
         BUG_ON(!valid_dma_direction(dir));
         ents = ops->map_sg(dev, sg, nents, dir, attrs);
+        BUG_ON(ents < 0);
         debug_dma_map_sg(dev, sg, nents, ents, dir);
 
         return ents;
diff --git a/include/asm-generic/seccomp.h b/include/asm-generic/seccomp.h
index 9fa1f653ed3b..c9ccafa0d99a 100644
--- a/include/asm-generic/seccomp.h
+++ b/include/asm-generic/seccomp.h
@@ -17,7 +17,9 @@
 #define __NR_seccomp_read_32            __NR_read
 #define __NR_seccomp_write_32           __NR_write
 #define __NR_seccomp_exit_32            __NR_exit
+#ifndef __NR_seccomp_sigreturn_32
 #define __NR_seccomp_sigreturn_32       __NR_rt_sigreturn
+#endif
 #endif /* CONFIG_COMPAT && ! already defined */
 
 #define __NR_seccomp_read               __NR_read
diff --git a/include/dt-bindings/clock/pistachio-clk.h b/include/dt-bindings/clock/pistachio-clk.h
new file mode 100644
index 000000000000..039f83facb68
--- /dev/null
+++ b/include/dt-bindings/clock/pistachio-clk.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef _DT_BINDINGS_CLOCK_PISTACHIO_H
+#define _DT_BINDINGS_CLOCK_PISTACHIO_H
+
+/* PLLs */
+#define CLK_MIPS_PLL                    0
+#define CLK_AUDIO_PLL                   1
+#define CLK_RPU_V_PLL                   2
+#define CLK_RPU_L_PLL                   3
+#define CLK_SYS_PLL                     4
+#define CLK_WIFI_PLL                    5
+#define CLK_BT_PLL                      6
+
+/* Fixed-factor clocks */
+#define CLK_WIFI_DIV4                   16
+#define CLK_WIFI_DIV8                   17
+
+/* Gate clocks */
+#define CLK_MIPS                        32
+#define CLK_AUDIO_IN                    33
+#define CLK_AUDIO                       34
+#define CLK_I2S                         35
+#define CLK_SPDIF                       36
+#define CLK_AUDIO_DAC                   37
+#define CLK_RPU_V                       38
+#define CLK_RPU_L                       39
+#define CLK_RPU_SLEEP                   40
+#define CLK_WIFI_PLL_GATE               41
+#define CLK_RPU_CORE                    42
+#define CLK_WIFI_ADC                    43
+#define CLK_WIFI_DAC                    44
+#define CLK_USB_PHY                     45
+#define CLK_ENET_IN                     46
+#define CLK_ENET                        47
+#define CLK_UART0                       48
+#define CLK_UART1                       49
+#define CLK_PERIPH_SYS                  50
+#define CLK_SPI0                        51
+#define CLK_SPI1                        52
+#define CLK_EVENT_TIMER                 53
+#define CLK_AUX_ADC_INTERNAL            54
+#define CLK_AUX_ADC                     55
+#define CLK_SD_HOST                     56
+#define CLK_BT                          57
+#define CLK_BT_DIV4                     58
+#define CLK_BT_DIV8                     59
+#define CLK_BT_1MHZ                     60
+
+/* Divider clocks */
+#define CLK_MIPS_INTERNAL_DIV           64
+#define CLK_MIPS_DIV                    65
+#define CLK_AUDIO_DIV                   66
+#define CLK_I2S_DIV                     67
+#define CLK_SPDIF_DIV                   68
+#define CLK_AUDIO_DAC_DIV               69
+#define CLK_RPU_V_DIV                   70
+#define CLK_RPU_L_DIV                   71
+#define CLK_RPU_SLEEP_DIV               72
+#define CLK_RPU_CORE_DIV                73
+#define CLK_USB_PHY_DIV                 74
+#define CLK_ENET_DIV                    75
+#define CLK_UART0_INTERNAL_DIV          76
+#define CLK_UART0_DIV                   77
+#define CLK_UART1_INTERNAL_DIV          78
+#define CLK_UART1_DIV                   79
+#define CLK_SYS_INTERNAL_DIV            80
+#define CLK_SPI0_INTERNAL_DIV           81
+#define CLK_SPI0_DIV                    82
+#define CLK_SPI1_INTERNAL_DIV           83
+#define CLK_SPI1_DIV                    84
+#define CLK_EVENT_TIMER_INTERNAL_DIV    85
+#define CLK_EVENT_TIMER_DIV             86
+#define CLK_AUX_ADC_INTERNAL_DIV        87
+#define CLK_AUX_ADC_DIV                 88
+#define CLK_SD_HOST_DIV                 89
+#define CLK_BT_DIV                      90
+#define CLK_BT_DIV4_DIV                 91
+#define CLK_BT_DIV8_DIV                 92
+#define CLK_BT_1MHZ_INTERNAL_DIV        93
+#define CLK_BT_1MHZ_DIV                 94
+
+/* Mux clocks */
+#define CLK_AUDIO_REF_MUX               96
+#define CLK_MIPS_PLL_MUX                97
+#define CLK_AUDIO_PLL_MUX               98
+#define CLK_AUDIO_MUX                   99
+#define CLK_RPU_V_PLL_MUX               100
+#define CLK_RPU_L_PLL_MUX               101
+#define CLK_RPU_L_MUX                   102
+#define CLK_WIFI_PLL_MUX                103
+#define CLK_WIFI_DIV4_MUX               104
+#define CLK_WIFI_DIV8_MUX               105
+#define CLK_RPU_CORE_MUX                106
+#define CLK_SYS_PLL_MUX                 107
+#define CLK_ENET_MUX                    108
+#define CLK_EVENT_TIMER_MUX             109
+#define CLK_SD_HOST_MUX                 110
+#define CLK_BT_PLL_MUX                  111
+#define CLK_DEBUG_MUX                   112
+
+#define CLK_NR_CLKS                     113
+
+/* Peripheral gate clocks */
+#define PERIPH_CLK_SYS                  0
+#define PERIPH_CLK_SYS_BUS              1
+#define PERIPH_CLK_DDR                  2
+#define PERIPH_CLK_ROM                  3
+#define PERIPH_CLK_COUNTER_FAST         4
+#define PERIPH_CLK_COUNTER_SLOW         5
+#define PERIPH_CLK_IR                   6
+#define PERIPH_CLK_WD                   7
+#define PERIPH_CLK_PDM                  8
+#define PERIPH_CLK_PWM                  9
+#define PERIPH_CLK_I2C0                 10
+#define PERIPH_CLK_I2C1                 11
+#define PERIPH_CLK_I2C2                 12
+#define PERIPH_CLK_I2C3                 13
+
+/* Peripheral divider clocks */
+#define PERIPH_CLK_ROM_DIV              32
+#define PERIPH_CLK_COUNTER_FAST_DIV     33
+#define PERIPH_CLK_COUNTER_SLOW_PRE_DIV 34
+#define PERIPH_CLK_COUNTER_SLOW_DIV     35
+#define PERIPH_CLK_IR_PRE_DIV           36
+#define PERIPH_CLK_IR_DIV               37
+#define PERIPH_CLK_WD_PRE_DIV           38
+#define PERIPH_CLK_WD_DIV               39
+#define PERIPH_CLK_PDM_PRE_DIV          40
+#define PERIPH_CLK_PDM_DIV              41
+#define PERIPH_CLK_PWM_PRE_DIV          42
+#define PERIPH_CLK_PWM_DIV              43
+#define PERIPH_CLK_I2C0_PRE_DIV         44
+#define PERIPH_CLK_I2C0_DIV             45
+#define PERIPH_CLK_I2C1_PRE_DIV         46
+#define PERIPH_CLK_I2C1_DIV             47
+#define PERIPH_CLK_I2C2_PRE_DIV         48
+#define PERIPH_CLK_I2C2_DIV             49
+#define PERIPH_CLK_I2C3_PRE_DIV         50
+#define PERIPH_CLK_I2C3_DIV             51
+
+#define PERIPH_CLK_NR_CLKS              52
+
+/* System gate clocks */
+#define SYS_CLK_I2C0                    0
+#define SYS_CLK_I2C1                    1
+#define SYS_CLK_I2C2                    2
+#define SYS_CLK_I2C3                    3
+#define SYS_CLK_I2S_IN                  4
+#define SYS_CLK_PAUD_OUT                5
+#define SYS_CLK_SPDIF_OUT               6
+#define SYS_CLK_SPI0_MASTER             7
+#define SYS_CLK_SPI0_SLAVE              8
+#define SYS_CLK_PWM                     9
+#define SYS_CLK_UART0                   10
+#define SYS_CLK_UART1                   11
+#define SYS_CLK_SPI1                    12
+#define SYS_CLK_MDC                     13
+#define SYS_CLK_SD_HOST                 14
+#define SYS_CLK_ENET                    15
+#define SYS_CLK_IR                      16
+#define SYS_CLK_WD                      17
+#define SYS_CLK_TIMER                   18
+#define SYS_CLK_I2S_OUT                 24
+#define SYS_CLK_SPDIF_IN                25
+#define SYS_CLK_EVENT_TIMER             26
+#define SYS_CLK_HASH                    27
+
+#define SYS_CLK_NR_CLKS                 28
+
+/* Gates for external input clocks */
+#define EXT_CLK_AUDIO_IN                0
+#define EXT_CLK_ENET_IN                 1
+
+#define EXT_CLK_NR_CLKS                 2
+
+#endif /* _DT_BINDINGS_CLOCK_PISTACHIO_H */
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h
index ee59ffe99922..b12b07e75929 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
+++ b/include/linux/bcm47xx_nvram.h
@@ -1,7 +1,4 @@
 /*
- *  Copyright (C) 2005, Broadcom Corporation
- *  Copyright (C) 2006, Felix Fietkau <nbd@openwrt.org>
- *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *  Free Software Foundation;  either version 2 of the  License, or (at your
@@ -14,8 +11,24 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 
+#ifdef CONFIG_BCM47XX
 int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
 int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
 int bcm47xx_nvram_gpio_pin(const char *name);
+#else
+static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
+{
+        return -ENOTSUPP;
+};
+static inline int bcm47xx_nvram_getenv(const char *name, char *val,
+                                       size_t val_len)
+{
+        return -ENOTSUPP;
+};
+static inline int bcm47xx_nvram_gpio_pin(const char *name)
+{
+        return -ENOTSUPP;
+};
+#endif
 
 #endif /* __BCM47XX_NVRAM_H */
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index be4fa5ddf36c..ea17cca9e685 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -283,16 +283,16 @@ static inline int bitmap_empty(const unsigned long *src, unsigned nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_empty(src, nbits);
+
+        return find_first_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_full(src, nbits);
+
+        return find_first_zero_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 5d858e02997f..297f5bda4fdf 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -218,9 +218,9 @@ static inline unsigned long __ffs64(u64 word)
 /**
  * find_last_bit - find the last set bit in a memory region
  * @addr: The address to start the search at
- * @size: The maximum size to search
+ * @size: The number of bits to search
  *
- * Returns the bit number of the first set bit, or size.
+ * Returns the bit number of the last set bit, or size.
  */
 extern unsigned long find_last_bit(const unsigned long *addr,
                                    unsigned long size);
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 7aec86127335..2056a99b92f8 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -13,7 +13,7 @@ struct blk_mq_cpu_notifier {
 };
 
 struct blk_mq_ctxmap {
-        unsigned int map_size;
+        unsigned int size;
         unsigned int bits_per_word;
         struct blk_align_bitmap *map;
 };
@@ -164,6 +164,8 @@ enum {
                 << BLK_MQ_F_ALLOC_POLICY_START_BIT)
 
 struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *);
+struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
+                                                  struct request_queue *q);
 void blk_mq_finish_init(struct request_queue *q);
 int blk_mq_register_disk(struct gendisk *);
 void blk_mq_unregister_disk(struct gendisk *);
@@ -218,6 +220,7 @@ void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx);
 void blk_mq_stop_hw_queues(struct request_queue *q);
 void blk_mq_start_hw_queues(struct request_queue *q);
 void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async);
+void blk_mq_run_hw_queues(struct request_queue *q, bool async);
 void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
 void blk_mq_tag_busy_iter(struct blk_mq_hw_ctx *hctx, busy_iter_fn *fn,
                 void *priv);
@@ -227,7 +230,7 @@ void blk_mq_freeze_queue_start(struct request_queue *q);
 
 /*
  * Driver command data is immediately after the request. So subtract request
- * size to get back to the original request.
+ * size to get back to the original request, add request size to get the PDU.
  */
 static inline struct request *blk_mq_rq_from_pdu(void *pdu)
 {
@@ -235,7 +238,7 @@ static inline struct request *blk_mq_rq_from_pdu(void *pdu)
 }
 static inline void *blk_mq_rq_to_pdu(struct request *rq)
 {
-        return (void *) rq + sizeof(*rq);
+        return rq + 1;
 }
 
 #define queue_for_each_hw_ctx(q, hctx, i)                               \
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index d8358799c594..df334cbacc6d 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -404,26 +404,11 @@ static inline bool d_mountpoint(const struct dentry *dentry)
 /*
  * Directory cache entry type accessor functions.
  */
-static inline void __d_set_type(struct dentry *dentry, unsigned type)
-{
-        dentry->d_flags = (dentry->d_flags & ~DCACHE_ENTRY_TYPE) | type;
-}
-
-static inline void __d_clear_type(struct dentry *dentry)
-{
-        __d_set_type(dentry, DCACHE_MISS_TYPE);
-}
-
-static inline void d_set_type(struct dentry *dentry, unsigned type)
-{
-        spin_lock(&dentry->d_lock);
-        __d_set_type(dentry, type);
-        spin_unlock(&dentry->d_lock);
-}
-
 static inline unsigned __d_entry_type(const struct dentry *dentry)
 {
-        return dentry->d_flags & DCACHE_ENTRY_TYPE;
+        unsigned type = READ_ONCE(dentry->d_flags);
+        smp_rmb();
+        return type & DCACHE_ENTRY_TYPE;
 }
 
 static inline bool d_is_miss(const struct dentry *dentry)
@@ -482,6 +467,44 @@ static inline bool d_is_positive(const struct dentry *dentry)
         return !d_is_negative(dentry);
 }
 
+/**
+ * d_really_is_negative - Determine if a dentry is really negative (ignoring fallthroughs)
+ * @dentry: The dentry in question
+ *
+ * Returns true if the dentry represents either an absent name or a name that
+ * doesn't map to an inode (ie. ->d_inode is NULL).  The dentry could represent
+ * a true miss, a whiteout that isn't represented by a 0,0 chardev or a
+ * fallthrough marker in an opaque directory.
+ *
+ * Note!  (1) This should be used *only* by a filesystem to examine its own
+ * dentries.  It should not be used to look at some other filesystem's
+ * dentries.  (2) It should also be used in combination with d_inode() to get
+ * the inode.  (3) The dentry may have something attached to ->d_lower and the
+ * type field of the flags may be set to something other than miss or whiteout.
+ */
+static inline bool d_really_is_negative(const struct dentry *dentry)
+{
+        return dentry->d_inode == NULL;
+}
+
+/**
+ * d_really_is_positive - Determine if a dentry is really positive (ignoring fallthroughs)
+ * @dentry: The dentry in question
+ *
+ * Returns true if the dentry represents a name that maps to an inode
+ * (ie. ->d_inode is not NULL).  The dentry might still represent a whiteout if
+ * that is represented on medium as a 0,0 chardev.
+ *
+ * Note!  (1) This should be used *only* by a filesystem to examine its own
+ * dentries.  It should not be used to look at some other filesystem's
+ * dentries.  (2) It should also be used in combination with d_inode() to get
+ * the inode.
+ */
+static inline bool d_really_is_positive(const struct dentry *dentry)
+{
+        return dentry->d_inode != NULL;
+}
+
 extern void d_set_fallthru(struct dentry *dentry);
 
 static inline bool d_is_fallthru(const struct dentry *dentry)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index c3007cb4bfa6..ac07ff090919 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -34,6 +34,10 @@ struct dma_map_ops {
         void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
                            size_t size, enum dma_data_direction dir,
                            struct dma_attrs *attrs);
+        /*
+         * map_sg returns 0 on error and a value > 0 on success.
+         * It should never return a value < 0.
+         */
         int (*map_sg)(struct device *dev, struct scatterlist *sg,
                       int nents, enum dma_data_direction dir,
                       struct dma_attrs *attrs);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f4fc60727b8d..c7496f263860 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -315,6 +315,8 @@ struct address_space;
 struct writeback_control;
 
 #define IOCB_EVENTFD            (1 << 0)
+#define IOCB_APPEND             (1 << 1)
+#define IOCB_DIRECT             (1 << 2)
 
 struct kiocb {
         struct file             *ki_filp;
@@ -329,10 +331,13 @@ static inline bool is_sync_kiocb(struct kiocb *kiocb)
         return kiocb->ki_complete == NULL;
 }
 
+static inline int iocb_flags(struct file *file);
+
 static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
 {
         *kiocb = (struct kiocb) {
                 .ki_filp = filp,
+                .ki_flags = iocb_flags(filp),
         };
 }
 
@@ -383,7 +388,7 @@ struct address_space_operations {
         void (*invalidatepage) (struct page *, unsigned int, unsigned int);
         int (*releasepage) (struct page *, gfp_t);
         void (*freepage)(struct page *);
-        ssize_t (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);
+        ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);
         /*
          * migrate the contents of a page to the specified target. If
          * migrate_mode is MIGRATE_ASYNC, it must not block.
@@ -870,6 +875,7 @@ static inline struct file *get_file(struct file *f)
         atomic_long_inc(&f->f_count);
         return f;
 }
+#define get_file_rcu(x) atomic_long_inc_not_zero(&(x)->f_count)
 #define fput_atomic(x)  atomic_long_add_unless(&(x)->f_count, -1, 1)
 #define file_count(x)   atomic_long_read(&(x)->f_count)
 
@@ -1041,6 +1047,9 @@ extern void lease_get_mtime(struct inode *, struct timespec *time);
 extern int generic_setlease(struct file *, long, struct file_lock **, void **priv);
 extern int vfs_setlease(struct file *, long, struct file_lock **, void **);
 extern int lease_modify(struct file_lock *, int, struct list_head *);
+struct files_struct;
+extern void show_fd_locks(struct seq_file *f,
+                         struct file *filp, struct files_struct *files);
 #else /* !CONFIG_FILE_LOCKING */
 static inline int fcntl_getlk(struct file *file, unsigned int cmd,
                               struct flock __user *user)
@@ -1177,6 +1186,10 @@ static inline int lease_modify(struct file_lock *fl, int arg,
 {
         return -EINVAL;
 }
+
+struct files_struct;
+static inline void show_fd_locks(struct seq_file *f,
+                        struct file *filp, struct files_struct *files) {}
 #endif /* !CONFIG_FILE_LOCKING */
 
 
@@ -2566,7 +2579,7 @@ extern int sb_min_blocksize(struct super_block *, int);
 
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
-int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
+extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
@@ -2609,8 +2622,8 @@ extern loff_t fixed_size_llseek(struct file *file, loff_t offset,
 extern int generic_file_open(struct inode * inode, struct file * filp);
 extern int nonseekable_open(struct inode * inode, struct file * filp);
 
-ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *,
-                loff_t, get_block_t, dio_iodone_t, int flags);
+ssize_t dax_do_io(struct kiocb *, struct inode *, struct iov_iter *, loff_t,
+                  get_block_t, dio_iodone_t, int flags);
 int dax_clear_blocks(struct inode *, sector_t block, long size);
 int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t);
 int dax_truncate_page(struct inode *, loff_t from, get_block_t);
@@ -2635,16 +2648,18 @@ enum {
 
 void dio_end_io(struct bio *bio, int error);
 
-ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-        struct block_device *bdev, struct iov_iter *iter, loff_t offset,
-        get_block_t get_block, dio_iodone_t end_io,
-        dio_submit_t submit_io, int flags);
+ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
+                             struct block_device *bdev, struct iov_iter *iter,
+                             loff_t offset, get_block_t get_block,
+                             dio_iodone_t end_io, dio_submit_t submit_io,
+                             int flags);
 
-static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
-                struct inode *inode, struct iov_iter *iter, loff_t offset,
-                get_block_t get_block)
+static inline ssize_t blockdev_direct_IO(struct kiocb *iocb,
+                                         struct inode *inode,
+                                         struct iov_iter *iter, loff_t offset,
+                                         get_block_t get_block)
 {
-        return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iter,
+        return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
                                     offset, get_block, NULL, NULL,
                                     DIO_LOCKING | DIO_SKIP_HOLES);
 }
@@ -2777,6 +2792,16 @@ static inline bool io_is_direct(struct file *filp)
         return (filp->f_flags & O_DIRECT) || IS_DAX(file_inode(filp));
 }
 
+static inline int iocb_flags(struct file *file)
+{
+        int res = 0;
+        if (file->f_flags & O_APPEND)
+                res |= IOCB_APPEND;
+        if (io_is_direct(file))
+                res |= IOCB_DIRECT;
+        return res;
+}
+
 static inline ino_t parent_ino(struct dentry *dentry)
 {
         ino_t res;
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h
index 3ea2e4754c40..9b1ad3734911 100644
--- a/include/linux/irqchip/mips-gic.h
+++ b/include/linux/irqchip/mips-gic.h
@@ -165,6 +165,8 @@
 #define GIC_VPE_PEND_SWINT0_MSK         (MSK(1) << GIC_VPE_PEND_SWINT0_SHF)
 #define GIC_VPE_PEND_SWINT1_SHF         5
 #define GIC_VPE_PEND_SWINT1_MSK         (MSK(1) << GIC_VPE_PEND_SWINT1_SHF)
+#define GIC_VPE_PEND_FDC_SHF            6
+#define GIC_VPE_PEND_FDC_MSK            (MSK(1) << GIC_VPE_PEND_FDC_SHF)
 
 /* GIC_VPE_RMASK Masks */
 #define GIC_VPE_RMASK_WD_SHF            0
@@ -179,6 +181,8 @@
 #define GIC_VPE_RMASK_SWINT0_MSK        (MSK(1) << GIC_VPE_RMASK_SWINT0_SHF)
 #define GIC_VPE_RMASK_SWINT1_SHF        5
 #define GIC_VPE_RMASK_SWINT1_MSK        (MSK(1) << GIC_VPE_RMASK_SWINT1_SHF)
+#define GIC_VPE_RMASK_FDC_SHF           6
+#define GIC_VPE_RMASK_FDC_MSK           (MSK(1) << GIC_VPE_RMASK_FDC_SHF)
 
 /* GIC_VPE_SMASK Masks */
 #define GIC_VPE_SMASK_WD_SHF            0
@@ -193,6 +197,8 @@
 #define GIC_VPE_SMASK_SWINT0_MSK        (MSK(1) << GIC_VPE_SMASK_SWINT0_SHF)
 #define GIC_VPE_SMASK_SWINT1_SHF        5
 #define GIC_VPE_SMASK_SWINT1_MSK        (MSK(1) << GIC_VPE_SMASK_SWINT1_SHF)
+#define GIC_VPE_SMASK_FDC_SHF           6
+#define GIC_VPE_SMASK_FDC_MSK           (MSK(1) << GIC_VPE_SMASK_FDC_SHF)
 
 /* GIC nomenclature for Core Interrupt Pins. */
 #define GIC_CPU_INT0            0 /* Core Interrupt 2 */
@@ -247,4 +253,5 @@ extern unsigned int plat_ipi_call_int_xlate(unsigned int);
 extern unsigned int plat_ipi_resched_int_xlate(unsigned int);
 extern int gic_get_c0_compare_int(void);
 extern int gic_get_c0_perfcount_int(void);
+extern int gic_get_c0_fdc_int(void);
 #endif /* __LINUX_IRQCHIP_MIPS_GIC_H */
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index be342b94c640..63ca8dacec59 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -23,14 +23,6 @@
 #define ___config_enabled(__ignored, val, ...) val
 
 /*
- * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
- * 0 otherwise.
- *
- */
-#define IS_ENABLED(option) \
-        (config_enabled(option) || config_enabled(option##_MODULE))
-
-/*
  * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
  * otherwise. For boolean options, this is equivalent to
  * IS_ENABLED(CONFIG_FOO).
@@ -43,4 +35,11 @@
  */
 #define IS_MODULE(option) config_enabled(option##_MODULE)
 
+/*
+ * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
+ * 0 otherwise.
+ */
+#define IS_ENABLED(option) \
+        (IS_BUILTIN(option) || IS_MODULE(option))
+
 #endif /* __LINUX_KCONFIG_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d6d630d31ef3..3a5b48e52a9e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -103,6 +103,18 @@
                 (((__x) - ((__d) / 2)) / (__d));        \
 }                                                       \
 )
+/*
+ * Same as above but for u64 dividends. divisor must be a 32-bit
+ * number.
+ */
+#define DIV_ROUND_CLOSEST_ULL(x, divisor)(              \
+{                                                       \
+        typeof(divisor) __d = divisor;                  \
+        unsigned long long _tmp = (x) + (__d) / 2;      \
+        do_div(_tmp, __d);                              \
+        _tmp;                                           \
+}                                                       \
+)
 
 /*
  * Multiplies an integer by a fraction, while avoiding unnecessary
diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h
index b6401e7661c7..29c30ac36020 100644
--- a/include/linux/mfd/samsung/rtc.h
+++ b/include/linux/mfd/samsung/rtc.h
@@ -105,6 +105,8 @@ enum s2mps_rtc_reg {
 #define S5M_RTC_UDR_MASK        (1 << S5M_RTC_UDR_SHIFT)
 #define S2MPS_RTC_WUDR_SHIFT    4
 #define S2MPS_RTC_WUDR_MASK     (1 << S2MPS_RTC_WUDR_SHIFT)
+#define S2MPS13_RTC_AUDR_SHIFT  1
+#define S2MPS13_RTC_AUDR_MASK   (1 << S2MPS13_RTC_AUDR_SHIFT)
 #define S2MPS_RTC_RUDR_SHIFT    0
 #define S2MPS_RTC_RUDR_MASK     (1 << S2MPS_RTC_RUDR_SHIFT)
 #define RTC_TCON_SHIFT          1
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 590630eb59ba..8d37e26a1007 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -429,7 +429,7 @@ struct mm_struct {
 #endif
 
         /* store ref to file /proc/<pid>/exe symlink points to */
-        struct file *exe_file;
+        struct file __rcu *exe_file;
 #ifdef CONFIG_MMU_NOTIFIER
         struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index e530533b94be..3bfd56778c29 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -546,6 +546,14 @@ struct amba_id {
         void                    *data;
 };
 
+/**
+ * struct mips_cdmm_device_id - identifies devices in MIPS CDMM bus
+ * @type:       Device type identifier.
+ */
+struct mips_cdmm_device_id {
+        __u8    type;
+};
+
 /*
  * Match x86 CPUs for CPU specific drivers.
  * See documentation of "x86_match_cpu" for details.
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
deleted file mode 100644
index f62f78aef4ac..000000000000
--- a/include/linux/nbd.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.
- * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)
- *            Made nbd_end_request() use the io_request_lock
- * 2001 Copyright (C) Steven Whitehouse
- *            New nbd_end_request() for compatibility with new linux block
- *            layer code.
- * 2003/06/24 Louis D. Langholtz <ldl@aros.net>
- *            Removed unneeded blksize_bits field from nbd_device struct.
- *            Cleanup PARANOIA usage & code.
- * 2004/02/19 Paul Clements
- *            Removed PARANOIA, plus various cleanup and comments
- */
-#ifndef LINUX_NBD_H
-#define LINUX_NBD_H
-
-
-#include <linux/wait.h>
-#include <linux/mutex.h>
-#include <uapi/linux/nbd.h>
-
-struct request;
-
-struct nbd_device {
-        int flags;
-        int harderror;          /* Code of hard error                   */
-        struct socket * sock;   /* If == NULL, device is not ready, yet */
-        int magic;
-
-        spinlock_t queue_lock;
-        struct list_head queue_head;    /* Requests waiting result */
-        struct request *active_req;
-        wait_queue_head_t active_wq;
-        struct list_head waiting_queue; /* Requests to be sent */
-        wait_queue_head_t waiting_wq;
-
-        struct mutex tx_lock;
-        struct gendisk *disk;
-        int blksize;
-        u64 bytesize;
-        pid_t pid; /* pid of nbd-client, if attached */
-        int xmit_timeout;
-        int disconnect; /* a disconnect has been requested by user */
-};
-
-#endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index b01ccf371fdc..410abd172feb 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -447,13 +447,12 @@ static inline struct rpc_cred *nfs_file_cred(struct file *file)
 /*
  * linux/fs/nfs/direct.c
  */
-extern ssize_t nfs_direct_IO(int, struct kiocb *, struct iov_iter *, loff_t);
+extern ssize_t nfs_direct_IO(struct kiocb *, struct iov_iter *, loff_t);
 extern ssize_t nfs_file_direct_read(struct kiocb *iocb,
                         struct iov_iter *iter,
                         loff_t pos);
 extern ssize_t nfs_file_direct_write(struct kiocb *iocb,
-                        struct iov_iter *iter,
-                        loff_t pos);
+                        struct iov_iter *iter);
 
 /*
  * linux/fs/nfs/dir.c
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 0adad4a5419b..8dbd05e70f09 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -117,8 +117,9 @@ struct nvme_ns {
 
         unsigned ns_id;
         int lba_shift;
-        int ms;
-        int pi_type;
+        u16 ms;
+        bool ext;
+        u8 pi_type;
         u64 mode_select_num_blocks;
         u32 mode_select_block_len;
 };
diff --git a/include/linux/quota.h b/include/linux/quota.h
index d534e8ed308a..b2505acfd3c0 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -50,6 +50,7 @@
 
 #undef USRQUOTA
 #undef GRPQUOTA
+#undef PRJQUOTA
 enum quota_type {
         USRQUOTA = 0,           /* element used for user quotas */
         GRPQUOTA = 1,           /* element used for group quotas */
@@ -319,6 +320,7 @@ struct dquot_operations {
         /* get reserved quota for delayed alloc, value returned is managed by
          * quota code only */
         qsize_t *(*get_reserved_space) (struct inode *);
+        int (*get_projid) (struct inode *, kprojid_t *);/* Get project ID */
 };
 
 struct path;
@@ -344,7 +346,10 @@ struct qc_dqblk {
         int d_rt_spc_warns;     /* # warnings issued wrt RT space */
 };
 
-/* Field specifiers for ->set_dqblk() in struct qc_dqblk */
+/*
+ * Field specifiers for ->set_dqblk() in struct qc_dqblk and also for
+ * ->set_info() in struct qc_info
+ */
 #define QC_INO_SOFT     (1<<0)
 #define QC_INO_HARD     (1<<1)
 #define QC_SPC_SOFT     (1<<2)
@@ -365,6 +370,51 @@ struct qc_dqblk {
 #define QC_INO_COUNT    (1<<13)
 #define QC_RT_SPACE     (1<<14)
 #define QC_ACCT_MASK (QC_SPACE | QC_INO_COUNT | QC_RT_SPACE)
+#define QC_FLAGS        (1<<15)
+
+#define QCI_SYSFILE             (1 << 0)        /* Quota file is hidden from userspace */
+#define QCI_ROOT_SQUASH         (1 << 1)        /* Root squash turned on */
+#define QCI_ACCT_ENABLED        (1 << 2)        /* Quota accounting enabled */
+#define QCI_LIMITS_ENFORCED     (1 << 3)        /* Quota limits enforced */
+
+/* Structures for communicating via ->get_state */
+struct qc_type_state {
+        unsigned int flags;             /* Flags QCI_* */
+        unsigned int spc_timelimit;     /* Time after which space softlimit is
+                                         * enforced */
+        unsigned int ino_timelimit;     /* Ditto for inode softlimit */
+        unsigned int rt_spc_timelimit;  /* Ditto for real-time space */
+        unsigned int spc_warnlimit;     /* Limit for number of space warnings */
+        unsigned int ino_warnlimit;     /* Ditto for inodes */
+        unsigned int rt_spc_warnlimit;  /* Ditto for real-time space */
+        unsigned long long ino;         /* Inode number of quota file */
+        blkcnt_t blocks;                /* Number of 512-byte blocks in the file */
+        blkcnt_t nextents;              /* Number of extents in the file */
+};
+
+struct qc_state {
+        unsigned int s_incoredqs;       /* Number of dquots in core */
+        /*
+         * Per quota type information. The array should really have
+         * max(MAXQUOTAS, XQM_MAXQUOTAS) entries. BUILD_BUG_ON in
+         * quota_getinfo() makes sure XQM_MAXQUOTAS is large enough.  Once VFS
+         * supports project quotas, this can be changed to MAXQUOTAS
+         */
+        struct qc_type_state s_state[XQM_MAXQUOTAS];
+};
+
+/* Structure for communicating via ->set_info */
+struct qc_info {
+        int i_fieldmask;        /* mask of fields to change in ->set_info() */
+        unsigned int i_flags;           /* Flags QCI_* */
+        unsigned int i_spc_timelimit;   /* Time after which space softlimit is
+                                         * enforced */
+        unsigned int i_ino_timelimit;   /* Ditto for inode softlimit */
+        unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */
+        unsigned int i_spc_warnlimit;   /* Limit for number of space warnings */
+        unsigned int i_ino_warnlimit;   /* Limit for number of inode warnings */
+        unsigned int i_rt_spc_warnlimit;        /* Ditto for real-time space */
+};
 
 /* Operations handling requests from userspace */
 struct quotactl_ops {
@@ -373,12 +423,10 @@ struct quotactl_ops {
         int (*quota_enable)(struct super_block *, unsigned int);
         int (*quota_disable)(struct super_block *, unsigned int);
         int (*quota_sync)(struct super_block *, int);
-        int (*get_info)(struct super_block *, int, struct if_dqinfo *);
-        int (*set_info)(struct super_block *, int, struct if_dqinfo *);
+        int (*set_info)(struct super_block *, int, struct qc_info *);
         int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
         int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
-        int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
-        int (*get_xstatev)(struct super_block *, struct fs_quota_statv *);
+        int (*get_state)(struct super_block *, struct qc_state *);
         int (*rm_xquota)(struct super_block *, unsigned int);
 };
 
@@ -389,7 +437,19 @@ struct quota_format_type {
         struct quota_format_type *qf_next;
 };
 
-/* Quota state flags - they actually come in two flavors - for users and groups */
+/**
+ * Quota state flags - they actually come in two flavors - for users and groups.
+ *
+ * Actual typed flags layout:
+ *                              USRQUOTA        GRPQUOTA
+ *  DQUOT_USAGE_ENABLED         0x0001          0x0002
+ *  DQUOT_LIMITS_ENABLED        0x0004          0x0008
+ *  DQUOT_SUSPENDED             0x0010          0x0020
+ *
+ * Following bits are used for non-typed flags:
+ *  DQUOT_QUOTA_SYS_FILE        0x0040
+ *  DQUOT_NEGATIVE_USAGE        0x0080
+ */
 enum {
         _DQUOT_USAGE_ENABLED = 0,               /* Track disk usage for users */
         _DQUOT_LIMITS_ENABLED,                  /* Enforce quota limits for users */
@@ -398,9 +458,9 @@ enum {
                                                  * memory to turn them on */
         _DQUOT_STATE_FLAGS
 };
-#define DQUOT_USAGE_ENABLED     (1 << _DQUOT_USAGE_ENABLED)
-#define DQUOT_LIMITS_ENABLED    (1 << _DQUOT_LIMITS_ENABLED)
-#define DQUOT_SUSPENDED         (1 << _DQUOT_SUSPENDED)
+#define DQUOT_USAGE_ENABLED     (1 << _DQUOT_USAGE_ENABLED * MAXQUOTAS)
+#define DQUOT_LIMITS_ENABLED    (1 << _DQUOT_LIMITS_ENABLED * MAXQUOTAS)
+#define DQUOT_SUSPENDED         (1 << _DQUOT_SUSPENDED * MAXQUOTAS)
 #define DQUOT_STATE_FLAGS       (DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED | \
                                  DQUOT_SUSPENDED)
 /* Other quota flags */
@@ -414,15 +474,21 @@ enum {
                                                  */
 #define DQUOT_NEGATIVE_USAGE    (1 << (DQUOT_STATE_LAST + 1))
                                                /* Allow negative quota usage */
-
 static inline unsigned int dquot_state_flag(unsigned int flags, int type)
 {
-        return flags << _DQUOT_STATE_FLAGS * type;
+        return flags << type;
 }
 
 static inline unsigned int dquot_generic_flag(unsigned int flags, int type)
 {
-        return (flags >> _DQUOT_STATE_FLAGS * type) & DQUOT_STATE_FLAGS;
+        return (flags >> type) & DQUOT_STATE_FLAGS;
+}
+
+/* Bitmap of quota types where flag is set in flags */
+static __always_inline unsigned dquot_state_types(unsigned flags, unsigned flag)
+{
+        BUILD_BUG_ON_NOT_POWER_OF_2(flag);
+        return (flags / flag) & ((1 << MAXQUOTAS) - 1);
 }
 
 #ifdef CONFIG_QUOTA_NETLINK_INTERFACE
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index df73258cca47..77ca6601ff25 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -95,8 +95,8 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
 int dquot_quota_off(struct super_block *sb, int type);
 int dquot_writeback_dquots(struct super_block *sb, int type);
 int dquot_quota_sync(struct super_block *sb, int type);
-int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
-int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
+int dquot_get_state(struct super_block *sb, struct qc_state *state);
+int dquot_set_dqinfo(struct super_block *sb, int type, struct qc_info *ii);
 int dquot_get_dqblk(struct super_block *sb, struct kqid id,
                 struct qc_dqblk *di);
 int dquot_set_dqblk(struct super_block *sb, struct kqid id,
@@ -134,10 +134,7 @@ static inline bool sb_has_quota_suspended(struct super_block *sb, int type)
 
 static inline unsigned sb_any_quota_suspended(struct super_block *sb)
 {
-        unsigned type, tmsk = 0;
-        for (type = 0; type < MAXQUOTAS; type++)
-                tmsk |= sb_has_quota_suspended(sb, type) << type;
-        return tmsk;
+        return dquot_state_types(sb_dqopt(sb)->flags, DQUOT_SUSPENDED);
 }
 
 /* Does kernel know about any quota information for given sb + type? */
@@ -149,10 +146,7 @@ static inline bool sb_has_quota_loaded(struct super_block *sb, int type)
 
 static inline unsigned sb_any_quota_loaded(struct super_block *sb)
 {
-        unsigned type, tmsk = 0;
-        for (type = 0; type < MAXQUOTAS; type++)
-                tmsk |= sb_has_quota_loaded(sb, type) << type;
-        return  tmsk;
+        return dquot_state_types(sb_dqopt(sb)->flags, DQUOT_USAGE_ENABLED);
 }
 
 static inline bool sb_has_quota_active(struct super_block *sb, int type)
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 0991913f4953..71f711db4500 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -10,7 +10,7 @@ enum string_size_units {
         STRING_UNITS_2,         /* use binary powers of 2^10 */
 };
 
-void string_get_size(u64 size, enum string_size_units units,
+void string_get_size(u64 size, u64 blk_size, enum string_size_units units,
                      char *buf, int len);
 
 #define UNESCAPE_SPACE          0x01
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index b7361f831226..795d5fea5697 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -212,4 +212,7 @@ static inline void setup_sysctl_set(struct ctl_table_set *p,
 
 #endif /* CONFIG_SYSCTL */
 
+int sysctl_max_threads(struct ctl_table *table, int write,
+                       void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #endif /* _LINUX_SYSCTL_H */
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 15f11fb9fff6..8b01e1c3c614 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -112,6 +112,14 @@ static inline bool iter_is_iovec(struct iov_iter *i)
 }
 
 /*
+ * Get one of READ or WRITE out of iter->type without any other flags OR'd in
+ * with it.
+ *
+ * The ?: is just for type safety.
+ */
+#define iov_iter_rw(i) ((0 ? (struct iov_iter *)0 : (i))->type & RW_MASK)
+
+/*
  * Cap the iov_iter by given limit; note that the second argument is
  * *not* the new size - it's upper limit for such.  Passing it a value
  * greater than the amount of data in iov_iter is fine - it'll just do
diff --git a/include/linux/util_macros.h b/include/linux/util_macros.h
new file mode 100644
index 000000000000..d5f4fb69dba3
--- /dev/null
+++ b/include/linux/util_macros.h
@@ -0,0 +1,40 @@
+#ifndef _LINUX_HELPER_MACROS_H_
+#define _LINUX_HELPER_MACROS_H_
+
+#define __find_closest(x, a, as, op)                                    \
+({                                                                      \
+        typeof(as) __fc_i, __fc_as = (as) - 1;                          \
+        typeof(x) __fc_x = (x);                                         \
+        typeof(*a) *__fc_a = (a);                                       \
+        for (__fc_i = 0; __fc_i < __fc_as; __fc_i++) {                  \
+                if (__fc_x op DIV_ROUND_CLOSEST(__fc_a[__fc_i] +        \
+                                                __fc_a[__fc_i + 1], 2)) \
+                        break;                                          \
+        }                                                               \
+        (__fc_i);                                                       \
+})
+
+/**
+ * find_closest - locate the closest element in a sorted array
+ * @x: The reference value.
+ * @a: The array in which to look for the closest element. Must be sorted
+ *  in ascending order.
+ * @as: Size of 'a'.
+ *
+ * Returns the index of the element closest to 'x'.
+ */
+#define find_closest(x, a, as) __find_closest(x, a, as, <=)
+
+/**
+ * find_closest_descending - locate the closest element in a sorted array
+ * @x: The reference value.
+ * @a: The array in which to look for the closest element. Must be sorted
+ *  in descending order.
+ * @as: Size of 'a'.
+ *
+ * Similar to find_closest() but 'a' is expected to be sorted in descending
+ * order.
+ */
+#define find_closest_descending(x, a, as) __find_closest(x, a, as, >=)
+
+#endif
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 007a0bc01b74..784bc2c0929f 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -135,6 +135,7 @@ enum fc_vport_state {
 #define FC_PORTSPEED_40GBIT             0x100
 #define FC_PORTSPEED_50GBIT             0x200
 #define FC_PORTSPEED_100GBIT            0x400
+#define FC_PORTSPEED_25GBIT             0x800
 #define FC_PORTSPEED_NOT_NEGOTIATED     (1 << 15) /* Speed not established */
 
 /*
diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h
index 1e1ea6e6e7a5..88e0914cf2d9 100644
--- a/include/uapi/asm-generic/errno.h
+++ b/include/uapi/asm-generic/errno.h
@@ -6,7 +6,16 @@
 #define EDEADLK         35      /* Resource deadlock would occur */
 #define ENAMETOOLONG    36      /* File name too long */
 #define ENOLCK          37      /* No record locks available */
-#define ENOSYS          38      /* Function not implemented */
+
+/*
+ * This error code is special: arch syscall entry code will return
+ * -ENOSYS if users try to call a syscall that doesn't exist.  To keep
+ * failures of syscalls that really do exist distinguishable from
+ * failures due to attempts to use a nonexistent syscall, syscall
+ * implementations should refrain from returning -ENOSYS.
+ */
+#define ENOSYS          38      /* Invalid system call number */
+
 #define ENOTEMPTY       39      /* Directory not empty */
 #define ELOOP           40      /* Too many symbolic links encountered */
 #define EWOULDBLOCK     EAGAIN  /* Operation would block */
diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h
index 1f49b8341c99..9c95b2c1c88a 100644
--- a/include/uapi/linux/quota.h
+++ b/include/uapi/linux/quota.h
@@ -36,11 +36,12 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
-#define __DQUOT_VERSION__       "dquot_6.5.2"
+#define __DQUOT_VERSION__       "dquot_6.6.0"
 
-#define MAXQUOTAS 2
+#define MAXQUOTAS 3
 #define USRQUOTA  0             /* element used for user quotas */
 #define GRPQUOTA  1             /* element used for group quotas */
+#define PRJQUOTA  2             /* element used for project quotas */
 
 /*
  * Definitions for the default names of the quotas files.
@@ -48,6 +49,7 @@
 #define INITQFNAMES { \
         "user",    /* USRQUOTA */ \
         "group",   /* GRPQUOTA */ \
+        "project", /* PRJQUOTA */ \
         "undefined", \
 };
 
diff --git a/init/main.c b/init/main.c
index a7e969d12f51..2115055faeac 100644
--- a/init/main.c
+++ b/init/main.c
@@ -91,7 +91,7 @@
 static int kernel_init(void *);
 
 extern void init_IRQ(void);
-extern void fork_init(unsigned long);
+extern void fork_init(void);
 extern void radix_tree_init(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
@@ -645,7 +645,7 @@ asmlinkage __visible void __init start_kernel(void)
 #endif
         thread_info_cache_init();
         cred_init();
-        fork_init(totalram_pages);
+        fork_init();
         proc_caches_init();
         buffer_init();
         key_init();
diff --git a/kernel/fork.c b/kernel/fork.c
index f2c1e7352298..03c1eaaa6ef5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -74,6 +74,7 @@
 #include <linux/uprobes.h>
 #include <linux/aio.h>
 #include <linux/compiler.h>
+#include <linux/sysctl.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -88,6 +89,16 @@
 #include <trace/events/task.h>
 
 /*
+ * Minimum number of threads to boot the kernel
+ */
+#define MIN_THREADS 20
+
+/*
+ * Maximum number of threads
+ */
+#define MAX_THREADS FUTEX_TID_MASK
+
+/*
  * Protected counters by write_lock_irq(&tasklist_lock)
  */
 unsigned long total_forks;      /* Handle normal Linux uptimes. */
@@ -253,7 +264,30 @@ EXPORT_SYMBOL_GPL(__put_task_struct);
 
 void __init __weak arch_task_cache_init(void) { }
 
-void __init fork_init(unsigned long mempages)
+/*
+ * set_max_threads
+ */
+static void set_max_threads(unsigned int max_threads_suggested)
+{
+        u64 threads;
+
+        /*
+         * The number of threads shall be limited such that the thread
+         * structures may only consume a small part of the available memory.
+         */
+        if (fls64(totalram_pages) + fls64(PAGE_SIZE) > 64)
+                threads = MAX_THREADS;
+        else
+                threads = div64_u64((u64) totalram_pages * (u64) PAGE_SIZE,
+                                    (u64) THREAD_SIZE * 8UL);
+
+        if (threads > max_threads_suggested)
+                threads = max_threads_suggested;
+
+        max_threads = clamp_t(u64, threads, MIN_THREADS, MAX_THREADS);
+}
+
+void __init fork_init(void)
 {
 #ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
 #ifndef ARCH_MIN_TASKALIGN
@@ -268,18 +302,7 @@ void __init fork_init(unsigned long mempages)
         /* do the arch specific task caches init */
         arch_task_cache_init();
 
-        /*
-         * The default maximum number of threads is set to a safe
-         * value: the thread structures can take up at most half
-         * of memory.
-         */
-        max_threads = mempages / (8 * THREAD_SIZE / PAGE_SIZE);
-
-        /*
-         * we need to allow at least 20 threads to boot a system
-         */
-        if (max_threads < 20)
-                max_threads = 20;
+        set_max_threads(MAX_THREADS);
 
         init_task.signal->rlim[RLIMIT_NPROC].rlim_cur = max_threads/2;
         init_task.signal->rlim[RLIMIT_NPROC].rlim_max = max_threads/2;
@@ -380,6 +403,9 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
          */
         down_write_nested(&mm->mmap_sem, SINGLE_DEPTH_NESTING);
 
+        /* No ordering required: file already has been exposed. */
+        RCU_INIT_POINTER(mm->exe_file, get_mm_exe_file(oldmm));
+
         mm->total_vm = oldmm->total_vm;
         mm->shared_vm = oldmm->shared_vm;
         mm->exec_vm = oldmm->exec_vm;
@@ -505,7 +531,13 @@ static inline void mm_free_pgd(struct mm_struct *mm)
         pgd_free(mm, mm->pgd);
 }
 #else
-#define dup_mmap(mm, oldmm)     (0)
+static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        down_write(&oldmm->mmap_sem);
+        RCU_INIT_POINTER(mm->exe_file, get_mm_exe_file(oldmm));
+        up_write(&oldmm->mmap_sem);
+        return 0;
+}
 #define mm_alloc_pgd(mm)        (0)
 #define mm_free_pgd(mm)
 #endif /* CONFIG_MMU */
@@ -674,34 +706,53 @@ void mmput(struct mm_struct *mm)
 }
 EXPORT_SYMBOL_GPL(mmput);
 
+/**
+ * set_mm_exe_file - change a reference to the mm's executable file
+ *
+ * This changes mm's executable file (shown as symlink /proc/[pid]/exe).
+ *
+ * Main users are mmput() and sys_execve(). Callers prevent concurrent
+ * invocations: in mmput() nobody alive left, in execve task is single
+ * threaded. sys_prctl(PR_SET_MM_MAP/EXE_FILE) also needs to set the
+ * mm->exe_file, but does so without using set_mm_exe_file() in order
+ * to do avoid the need for any locks.
+ */
 void set_mm_exe_file(struct mm_struct *mm, struct file *new_exe_file)
 {
+        struct file *old_exe_file;
+
+        /*
+         * It is safe to dereference the exe_file without RCU as
+         * this function is only called if nobody else can access
+         * this mm -- see comment above for justification.
+         */
+        old_exe_file = rcu_dereference_raw(mm->exe_file);
+
         if (new_exe_file)
                 get_file(new_exe_file);
-        if (mm->exe_file)
-                fput(mm->exe_file);
-        mm->exe_file = new_exe_file;
+        rcu_assign_pointer(mm->exe_file, new_exe_file);
+        if (old_exe_file)
+                fput(old_exe_file);
 }
 
+/**
+ * get_mm_exe_file - acquire a reference to the mm's executable file
+ *
+ * Returns %NULL if mm has no associated executable file.
+ * User must release file via fput().
+ */
 struct file *get_mm_exe_file(struct mm_struct *mm)
 {
         struct file *exe_file;
 
-        /* We need mmap_sem to protect against races with removal of exe_file */
-        down_read(&mm->mmap_sem);
-        exe_file = mm->exe_file;
-        if (exe_file)
-                get_file(exe_file);
-        up_read(&mm->mmap_sem);
+        rcu_read_lock();
+        exe_file = rcu_dereference(mm->exe_file);
+        if (exe_file && !get_file_rcu(exe_file))
+                exe_file = NULL;
+        rcu_read_unlock();
         return exe_file;
 }
-
-static void dup_mm_exe_file(struct mm_struct *oldmm, struct mm_struct *newmm)
-{
-        /* It's safe to write the exe_file pointer without exe_file_lock because
-         * this is called during fork when the task is not yet in /proc */
-        newmm->exe_file = get_mm_exe_file(oldmm);
-}
+EXPORT_SYMBOL(get_mm_exe_file);
 
 /**
  * get_task_mm - acquire a reference to the task's mm
@@ -864,8 +915,6 @@ static struct mm_struct *dup_mm(struct task_struct *tsk)
         if (!mm_init(mm, tsk))
                 goto fail_nomem;
 
-        dup_mm_exe_file(oldmm, mm);
-
         err = dup_mmap(mm, oldmm);
         if (err)
                 goto free_pt;
@@ -1403,10 +1452,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                 goto bad_fork_cleanup_io;
 
         if (pid != &init_struct_pid) {
-                retval = -ENOMEM;
                 pid = alloc_pid(p->nsproxy->pid_ns_for_children);
-                if (!pid)
+                if (IS_ERR(pid)) {
+                        retval = PTR_ERR(pid);
                         goto bad_fork_cleanup_io;
+                }
         }
 
         p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
@@ -2000,3 +2050,26 @@ int unshare_files(struct files_struct **displaced)
         task_unlock(task);
         return 0;
 }
+
+int sysctl_max_threads(struct ctl_table *table, int write,
+                       void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+        struct ctl_table t;
+        int ret;
+        int threads = max_threads;
+        int min = MIN_THREADS;
+        int max = MAX_THREADS;
+
+        t = *table;
+        t.data = &threads;
+        t.extra1 = &min;
+        t.extra2 = &max;
+
+        ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos);
+        if (ret || !write)
+                return ret;
+
+        set_max_threads(threads);
+
+        return 0;
+}
diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
index b358a802fd18..a744098e4eb7 100644
--- a/kernel/gcov/base.c
+++ b/kernel/gcov/base.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
 #include "gcov.h"
 
 static int gcov_events_enabled;
@@ -107,8 +108,10 @@ void gcov_enable_events(void)
         gcov_events_enabled = 1;
 
         /* Perform event callback for previously registered entries. */
-        while ((info = gcov_info_next(info)))
+        while ((info = gcov_info_next(info))) {
                 gcov_event(GCOV_ADD, info);
+                cond_resched();
+        }
 
         mutex_unlock(&gcov_lock);
 }
diff --git a/kernel/pid.c b/kernel/pid.c
index cd36a5e0d173..4fd07d5b7baf 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -182,7 +182,7 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
                         spin_unlock_irq(&pidmap_lock);
                         kfree(page);
                         if (unlikely(!map->page))
-                                break;
+                                return -ENOMEM;
                 }
                 if (likely(atomic_read(&map->nr_free))) {
                         for ( ; ; ) {
@@ -210,7 +210,7 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
                 }
                 pid = mk_pid(pid_ns, map, offset);
         }
-        return -1;
+        return -EAGAIN;
 }
 
 int next_pidmap(struct pid_namespace *pid_ns, unsigned int last)
@@ -301,17 +301,20 @@ struct pid *alloc_pid(struct pid_namespace *ns)
         int i, nr;
         struct pid_namespace *tmp;
         struct upid *upid;
+        int retval = -ENOMEM;
 
         pid = kmem_cache_alloc(ns->pid_cachep, GFP_KERNEL);
         if (!pid)
-                goto out;
+                return ERR_PTR(retval);
 
         tmp = ns;
         pid->level = ns->level;
         for (i = ns->level; i >= 0; i--) {
                 nr = alloc_pidmap(tmp);
-                if (nr < 0)
+                if (IS_ERR_VALUE(nr)) {
+                        retval = nr;
                         goto out_free;
+                }
 
                 pid->numbers[i].nr = nr;
                 pid->numbers[i].ns = tmp;
@@ -339,7 +342,6 @@ struct pid *alloc_pid(struct pid_namespace *ns)
         }
         spin_unlock_irq(&pidmap_lock);
 
-out:
         return pid;
 
 out_unlock:
@@ -351,8 +353,7 @@ out_free:
                 free_pidmap(pid->numbers + i);
 
         kmem_cache_free(ns->pid_cachep, pid);
-        pid = NULL;
-        goto out;
+        return ERR_PTR(retval);
 }
 
 void disable_pid_allocation(struct pid_namespace *ns)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 227fec36b12a..c8e0e050a36a 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -456,8 +456,6 @@ static bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
 
 static int ptrace_detach(struct task_struct *child, unsigned int data)
 {
-        bool dead = false;
-
         if (!valid_signal(data))
                 return -EIO;
 
@@ -467,18 +465,19 @@ static int ptrace_detach(struct task_struct *child, unsigned int data)
 
         write_lock_irq(&tasklist_lock);
         /*
-         * This child can be already killed. Make sure de_thread() or
-         * our sub-thread doing do_wait() didn't do release_task() yet.
+         * We rely on ptrace_freeze_traced(). It can't be killed and
+         * untraced by another thread, it can't be a zombie.
          */
-        if (child->ptrace) {
-                child->exit_code = data;
-                dead = __ptrace_detach(current, child);
-        }
+        WARN_ON(!child->ptrace || child->exit_state);
+        /*
+         * tasklist_lock avoids the race with wait_task_stopped(), see
+         * the comment in ptrace_resume().
+         */
+        child->exit_code = data;
+        __ptrace_detach(current, child);
         write_unlock_irq(&tasklist_lock);
 
         proc_ptrace_connector(child, PTRACE_DETACH);
-        if (unlikely(dead))
-                release_task(child);
 
         return 0;
 }
@@ -697,6 +696,8 @@ static int ptrace_peek_siginfo(struct task_struct *child,
 static int ptrace_resume(struct task_struct *child, long request,
                          unsigned long data)
 {
+        bool need_siglock;
+
         if (!valid_signal(data))
                 return -EIO;
 
@@ -724,8 +725,26 @@ static int ptrace_resume(struct task_struct *child, long request,
                 user_disable_single_step(child);
         }
 
+        /*
+         * Change ->exit_code and ->state under siglock to avoid the race
+         * with wait_task_stopped() in between; a non-zero ->exit_code will
+         * wrongly look like another report from tracee.
+         *
+         * Note that we need siglock even if ->exit_code == data and/or this
+         * status was not reported yet, the new status must not be cleared by
+         * wait_task_stopped() after resume.
+         *
+         * If data == 0 we do not care if wait_task_stopped() reports the old
+         * status and clears the code too; this can't race with the tracee, it
+         * takes siglock after resume.
+         */
+        need_siglock = data && !thread_group_empty(current);
+        if (need_siglock)
+                spin_lock_irq(&child->sighand->siglock);
         child->exit_code = data;
         wake_up_state(child, __TASK_TRACED);
+        if (need_siglock)
+                spin_unlock_irq(&child->sighand->siglock);
 
         return 0;
 }
diff --git a/kernel/signal.c b/kernel/signal.c
index a390499943e4..d51c5ddd855c 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2992,11 +2992,9 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info)
          * Nor can they impersonate a kill()/tgkill(), which adds source info.
          */
         if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
-            (task_pid_vnr(current) != pid)) {
-                /* We used to allow any < 0 si_code */
-                WARN_ON_ONCE(info->si_code < 0);
+            (task_pid_vnr(current) != pid))
                 return -EPERM;
-        }
+
         info->si_signo = sig;
 
         /* POSIX.1b doesn't mention process groups.  */
@@ -3041,12 +3039,10 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
         /* Not even root can pretend to send signals from the kernel.
          * Nor can they impersonate a kill()/tgkill(), which adds source info.
          */
-        if (((info->si_code >= 0 || info->si_code == SI_TKILL)) &&
-            (task_pid_vnr(current) != pid)) {
-                /* We used to allow any < 0 si_code */
-                WARN_ON_ONCE(info->si_code < 0);
+        if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
+            (task_pid_vnr(current) != pid))
                 return -EPERM;
-        }
+
         info->si_signo = sig;
 
         return do_send_specific(tgid, pid, sig, info);
diff --git a/kernel/sys.c b/kernel/sys.c
index 3be344902316..a4e372b798a5 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1649,14 +1649,13 @@ SYSCALL_DEFINE1(umask, int, mask)
         return mask;
 }
 
-static int prctl_set_mm_exe_file_locked(struct mm_struct *mm, unsigned int fd)
+static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
 {
         struct fd exe;
+        struct file *old_exe, *exe_file;
         struct inode *inode;
         int err;
 
-        VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm);
-
         exe = fdget(fd);
         if (!exe.file)
                 return -EBADF;
@@ -1680,15 +1679,22 @@ static int prctl_set_mm_exe_file_locked(struct mm_struct *mm, unsigned int fd)
         /*
          * Forbid mm->exe_file change if old file still mapped.
          */
+        exe_file = get_mm_exe_file(mm);
         err = -EBUSY;
-        if (mm->exe_file) {
+        if (exe_file) {
                 struct vm_area_struct *vma;
 
-                for (vma = mm->mmap; vma; vma = vma->vm_next)
-                        if (vma->vm_file &&
-                            path_equal(&vma->vm_file->f_path,
-                                       &mm->exe_file->f_path))
-                                goto exit;
+                down_read(&mm->mmap_sem);
+                for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                        if (!vma->vm_file)
+                                continue;
+                        if (path_equal(&vma->vm_file->f_path,
+                                       &exe_file->f_path))
+                                goto exit_err;
+                }
+
+                up_read(&mm->mmap_sem);
+                fput(exe_file);
         }
 
         /*
@@ -1702,10 +1708,18 @@ static int prctl_set_mm_exe_file_locked(struct mm_struct *mm, unsigned int fd)
                 goto exit;
 
         err = 0;
-        set_mm_exe_file(mm, exe.file);  /* this grabs a reference to exe.file */
+        /* set the new file, lockless */
+        get_file(exe.file);
+        old_exe = xchg(&mm->exe_file, exe.file);
+        if (old_exe)
+                fput(old_exe);
 exit:
         fdput(exe);
         return err;
+exit_err:
+        up_read(&mm->mmap_sem);
+        fput(exe_file);
+        goto exit;
 }
 
 #ifdef CONFIG_CHECKPOINT_RESTORE
@@ -1840,10 +1854,9 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data
                 user_auxv[AT_VECTOR_SIZE - 1] = AT_NULL;
         }
 
-        down_write(&mm->mmap_sem);
         if (prctl_map.exe_fd != (u32)-1)
-                error = prctl_set_mm_exe_file_locked(mm, prctl_map.exe_fd);
-        downgrade_write(&mm->mmap_sem);
+                error = prctl_set_mm_exe_file(mm, prctl_map.exe_fd);
+        down_read(&mm->mmap_sem);
         if (error)
                 goto out;
 
@@ -1909,12 +1922,8 @@ static int prctl_set_mm(int opt, unsigned long addr,
         if (!capable(CAP_SYS_RESOURCE))
                 return -EPERM;
 
-        if (opt == PR_SET_MM_EXE_FILE) {
-                down_write(&mm->mmap_sem);
-                error = prctl_set_mm_exe_file_locked(mm, (unsigned int)addr);
-                up_write(&mm->mmap_sem);
-                return error;
-        }
+        if (opt == PR_SET_MM_EXE_FILE)
+                return prctl_set_mm_exe_file(mm, (unsigned int)addr);
 
         if (addr >= TASK_SIZE || addr < mmap_min_addr)
                 return -EINVAL;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 42b7fc2860c1..2082b1a88fb9 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -93,11 +93,9 @@
 #include <linux/nmi.h>
 #endif
 
-
 #if defined(CONFIG_SYSCTL)
 
 /* External variables not in a header file. */
-extern int max_threads;
 extern int suid_dumpable;
 #ifdef CONFIG_COREDUMP
 extern int core_uses_pid;
@@ -710,10 +708,10 @@ static struct ctl_table kern_table[] = {
 #endif
         {
                 .procname       = "threads-max",
-                .data           = &max_threads,
+                .data           = NULL,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = proc_dointvec,
+                .proc_handler   = sysctl_max_threads,
         },
         {
                 .procname       = "random",
@@ -1983,7 +1981,15 @@ static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp,
                                  int write, void *data)
 {
         if (write) {
-                *valp = *negp ? -*lvalp : *lvalp;
+                if (*negp) {
+                        if (*lvalp > (unsigned long) INT_MAX + 1)
+                                return -EINVAL;
+                        *valp = -*lvalp;
+                } else {
+                        if (*lvalp > (unsigned long) INT_MAX)
+                                return -EINVAL;
+                        *valp = *lvalp;
+                }
         } else {
                 int val = *valp;
                 if (val < 0) {
diff --git a/lib/Kconfig b/lib/Kconfig
index 87da53bb1fef..f5440221d929 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -18,9 +18,8 @@ config HAVE_ARCH_BITREVERSE
         default n
         depends on BITREVERSE
         help
-          This option provides an config for the architecture which have instruction
-          can do bitreverse operation, we use the hardware instruction if the architecture
-          have this capability.
+          This option enables the use of hardware bit-reversal instructions on
+          architectures which support such operations.
 
 config RATIONAL
         bool
diff --git a/lib/Makefile b/lib/Makefile
index 60c22e65b793..6c37933336a0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,7 +25,7 @@ obj-y	+= lockref.o
 obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
          bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
          gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \
-         bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
+         bsearch.o find_bit.o llist.o memweight.o kfifo.o \
          percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
 obj-y += string_helpers.o
 obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o
diff --git a/lib/bitmap.c b/lib/bitmap.c
index d456f4c15a9f..64c0926f5dd8 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -42,36 +42,6 @@
  * for the best explanations of this ordering.
  */
 
-int __bitmap_empty(const unsigned long *bitmap, unsigned int bits)
-{
-        unsigned int k, lim = bits/BITS_PER_LONG;
-        for (k = 0; k < lim; ++k)
-                if (bitmap[k])
-                        return 0;
-
-        if (bits % BITS_PER_LONG)
-                if (bitmap[k] & BITMAP_LAST_WORD_MASK(bits))
-                        return 0;
-
-        return 1;
-}
-EXPORT_SYMBOL(__bitmap_empty);
-
-int __bitmap_full(const unsigned long *bitmap, unsigned int bits)
-{
-        unsigned int k, lim = bits/BITS_PER_LONG;
-        for (k = 0; k < lim; ++k)
-                if (~bitmap[k])
-                        return 0;
-
-        if (bits % BITS_PER_LONG)
-                if (~bitmap[k] & BITMAP_LAST_WORD_MASK(bits))
-                        return 0;
-
-        return 1;
-}
-EXPORT_SYMBOL(__bitmap_full);
-
 int __bitmap_equal(const unsigned long *bitmap1,
                 const unsigned long *bitmap2, unsigned int bits)
 {
diff --git a/lib/cpumask.c b/lib/cpumask.c
index b6513a9f2892..5ab1553fd076 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -37,10 +37,11 @@ EXPORT_SYMBOL(__next_cpu_nr);
 int cpumask_next_and(int n, const struct cpumask *src1p,
                      const struct cpumask *src2p)
 {
-        while ((n = cpumask_next(n, src1p)) < nr_cpu_ids)
-                if (cpumask_test_cpu(n, src2p))
-                        break;
-        return n;
+        struct cpumask tmp;
+
+        if (cpumask_and(&tmp, src1p, src2p))
+                return cpumask_next(n, &tmp);
+        return nr_cpu_ids;
 }
 EXPORT_SYMBOL(cpumask_next_and);
 
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 9722bd2dbc9b..ae4b65e17e64 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -361,7 +361,7 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket,
         unsigned int range = 0;
 
         while (range <= max_range) {
-                entry = __hash_bucket_find(*bucket, &index, containing_match);
+                entry = __hash_bucket_find(*bucket, ref, containing_match);
 
                 if (entry)
                         return entry;
diff --git a/lib/find_bit.c b/lib/find_bit.c
new file mode 100644
index 000000000000..18072ea9c20e
--- /dev/null
+++ b/lib/find_bit.c
@@ -0,0 +1,193 @@
+/* bit search implementation
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * Copyright (C) 2008 IBM Corporation
+ * 'find_last_bit' is written by Rusty Russell <rusty@rustcorp.com.au>
+ * (Inspired by David Howell's find_next_bit implementation)
+ *
+ * Rewritten by Yury Norov <yury.norov@gmail.com> to decrease
+ * size and improve performance, 2015.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/bitops.h>
+#include <linux/bitmap.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+
+#if !defined(find_next_bit) || !defined(find_next_zero_bit)
+
+/*
+ * This is a common helper function for find_next_bit and
+ * find_next_zero_bit.  The difference is the "invert" argument, which
+ * is XORed with each fetched word before searching it for one bits.
+ */
+static unsigned long _find_next_bit(const unsigned long *addr,
+                unsigned long nbits, unsigned long start, unsigned long invert)
+{
+        unsigned long tmp;
+
+        if (!nbits || start >= nbits)
+                return nbits;
+
+        tmp = addr[start / BITS_PER_LONG] ^ invert;
+
+        /* Handle 1st word. */
+        tmp &= BITMAP_FIRST_WORD_MASK(start);
+        start = round_down(start, BITS_PER_LONG);
+
+        while (!tmp) {
+                start += BITS_PER_LONG;
+                if (start >= nbits)
+                        return nbits;
+
+                tmp = addr[start / BITS_PER_LONG] ^ invert;
+        }
+
+        return min(start + __ffs(tmp), nbits);
+}
+#endif
+
+#ifndef find_next_bit
+/*
+ * Find the next set bit in a memory region.
+ */
+unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
+                            unsigned long offset)
+{
+        return _find_next_bit(addr, size, offset, 0UL);
+}
+EXPORT_SYMBOL(find_next_bit);
+#endif
+
+#ifndef find_next_zero_bit
+unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
+                                 unsigned long offset)
+{
+        return _find_next_bit(addr, size, offset, ~0UL);
+}
+EXPORT_SYMBOL(find_next_zero_bit);
+#endif
+
+#ifndef find_first_bit
+/*
+ * Find the first set bit in a memory region.
+ */
+unsigned long find_first_bit(const unsigned long *addr, unsigned long size)
+{
+        unsigned long idx;
+
+        for (idx = 0; idx * BITS_PER_LONG < size; idx++) {
+                if (addr[idx])
+                        return min(idx * BITS_PER_LONG + __ffs(addr[idx]), size);
+        }
+
+        return size;
+}
+EXPORT_SYMBOL(find_first_bit);
+#endif
+
+#ifndef find_first_zero_bit
+/*
+ * Find the first cleared bit in a memory region.
+ */
+unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)
+{
+        unsigned long idx;
+
+        for (idx = 0; idx * BITS_PER_LONG < size; idx++) {
+                if (addr[idx] != ~0UL)
+                        return min(idx * BITS_PER_LONG + ffz(addr[idx]), size);
+        }
+
+        return size;
+}
+EXPORT_SYMBOL(find_first_zero_bit);
+#endif
+
+#ifndef find_last_bit
+unsigned long find_last_bit(const unsigned long *addr, unsigned long size)
+{
+        if (size) {
+                unsigned long val = BITMAP_LAST_WORD_MASK(size);
+                unsigned long idx = (size-1) / BITS_PER_LONG;
+
+                do {
+                        val &= addr[idx];
+                        if (val)
+                                return idx * BITS_PER_LONG + __fls(val);
+
+                        val = ~0ul;
+                } while (idx--);
+        }
+        return size;
+}
+EXPORT_SYMBOL(find_last_bit);
+#endif
+
+#ifdef __BIG_ENDIAN
+
+/* include/linux/byteorder does not support "unsigned long" type */
+static inline unsigned long ext2_swab(const unsigned long y)
+{
+#if BITS_PER_LONG == 64
+        return (unsigned long) __swab64((u64) y);
+#elif BITS_PER_LONG == 32
+        return (unsigned long) __swab32((u32) y);
+#else
+#error BITS_PER_LONG not defined
+#endif
+}
+
+#if !defined(find_next_bit_le) || !defined(find_next_zero_bit_le)
+static unsigned long _find_next_bit_le(const unsigned long *addr,
+                unsigned long nbits, unsigned long start, unsigned long invert)
+{
+        unsigned long tmp;
+
+        if (!nbits || start >= nbits)
+                return nbits;
+
+        tmp = addr[start / BITS_PER_LONG] ^ invert;
+
+        /* Handle 1st word. */
+        tmp &= ext2_swab(BITMAP_FIRST_WORD_MASK(start));
+        start = round_down(start, BITS_PER_LONG);
+
+        while (!tmp) {
+                start += BITS_PER_LONG;
+                if (start >= nbits)
+                        return nbits;
+
+                tmp = addr[start / BITS_PER_LONG] ^ invert;
+        }
+
+        return min(start + __ffs(ext2_swab(tmp)), nbits);
+}
+#endif
+
+#ifndef find_next_zero_bit_le
+unsigned long find_next_zero_bit_le(const void *addr, unsigned
+                long size, unsigned long offset)
+{
+        return _find_next_bit_le(addr, size, offset, ~0UL);
+}
+EXPORT_SYMBOL(find_next_zero_bit_le);
+#endif
+
+#ifndef find_next_bit_le
+unsigned long find_next_bit_le(const void *addr, unsigned
+                long size, unsigned long offset)
+{
+        return _find_next_bit_le(addr, size, offset, 0UL);
+}
+EXPORT_SYMBOL(find_next_bit_le);
+#endif
+
+#endif /* __BIG_ENDIAN */
diff --git a/lib/find_last_bit.c b/lib/find_last_bit.c
index 91ca09fbf6f9..3e3be40c6a6e 100644
--- a/lib/find_last_bit.c
+++ b/lib/find_last_bit.c
@@ -4,6 +4,9 @@
  * Written by Rusty Russell <rusty@rustcorp.com.au>
  * (Inspired by David Howell's find_next_bit implementation)
  *
+ * Rewritten by Yury Norov <yury.norov@gmail.com> to decrease
+ * size and improve performance, 2015.
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
@@ -11,37 +14,26 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/bitmap.h>
 #include <linux/export.h>
-#include <asm/types.h>
-#include <asm/byteorder.h>
+#include <linux/kernel.h>
 
 #ifndef find_last_bit
 
 unsigned long find_last_bit(const unsigned long *addr, unsigned long size)
 {
-        unsigned long words;
-        unsigned long tmp;
-
-        /* Start at final word. */
-        words = size / BITS_PER_LONG;
+        if (size) {
+                unsigned long val = BITMAP_LAST_WORD_MASK(size);
+                unsigned long idx = (size-1) / BITS_PER_LONG;
 
-        /* Partial final word? */
-        if (size & (BITS_PER_LONG-1)) {
-                tmp = (addr[words] & (~0UL >> (BITS_PER_LONG
-                                         - (size & (BITS_PER_LONG-1)))));
-                if (tmp)
-                        goto found;
-        }
+                do {
+                        val &= addr[idx];
+                        if (val)
+                                return idx * BITS_PER_LONG + __fls(val);
 
-        while (words) {
-                tmp = addr[--words];
-                if (tmp) {
-found:
-                        return words * BITS_PER_LONG + __fls(tmp);
-                }
+                        val = ~0ul;
+                } while (idx--);
         }
-
-        /* Not found */
         return size;
 }
 EXPORT_SYMBOL(find_last_bit);
diff --git a/lib/find_next_bit.c b/lib/find_next_bit.c
deleted file mode 100644
index 0cbfc0b4398f..000000000000
--- a/lib/find_next_bit.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/* find_next_bit.c: fallback find next bit implementation
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/bitops.h>
-#include <linux/export.h>
-#include <asm/types.h>
-#include <asm/byteorder.h>
-
-#define BITOP_WORD(nr)          ((nr) / BITS_PER_LONG)
-
-#ifndef find_next_bit
-/*
- * Find the next set bit in a memory region.
- */
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-                            unsigned long offset)
-{
-        const unsigned long *p = addr + BITOP_WORD(offset);
-        unsigned long result = offset & ~(BITS_PER_LONG-1);
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset %= BITS_PER_LONG;
-        if (offset) {
-                tmp = *(p++);
-                tmp &= (~0UL << offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-        while (size & ~(BITS_PER_LONG-1)) {
-                if ((tmp = *(p++)))
-                        goto found_middle;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-
-found_first:
-        tmp &= (~0UL >> (BITS_PER_LONG - size));
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size;   /* Nope. */
-found_middle:
-        return result + __ffs(tmp);
-}
-EXPORT_SYMBOL(find_next_bit);
-#endif
-
-#ifndef find_next_zero_bit
-/*
- * This implementation of find_{first,next}_zero_bit was stolen from
- * Linus' asm-alpha/bitops.h.
- */
-unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
-                                 unsigned long offset)
-{
-        const unsigned long *p = addr + BITOP_WORD(offset);
-        unsigned long result = offset & ~(BITS_PER_LONG-1);
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset %= BITS_PER_LONG;
-        if (offset) {
-                tmp = *(p++);
-                tmp |= ~0UL >> (BITS_PER_LONG - offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (~tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-        while (size & ~(BITS_PER_LONG-1)) {
-                if (~(tmp = *(p++)))
-                        goto found_middle;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-
-found_first:
-        tmp |= ~0UL << size;
-        if (tmp == ~0UL)        /* Are any bits zero? */
-                return result + size;   /* Nope. */
-found_middle:
-        return result + ffz(tmp);
-}
-EXPORT_SYMBOL(find_next_zero_bit);
-#endif
-
-#ifndef find_first_bit
-/*
- * Find the first set bit in a memory region.
- */
-unsigned long find_first_bit(const unsigned long *addr, unsigned long size)
-{
-        const unsigned long *p = addr;
-        unsigned long result = 0;
-        unsigned long tmp;
-
-        while (size & ~(BITS_PER_LONG-1)) {
-                if ((tmp = *(p++)))
-                        goto found;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-
-        tmp = (*p) & (~0UL >> (BITS_PER_LONG - size));
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size;   /* Nope. */
-found:
-        return result + __ffs(tmp);
-}
-EXPORT_SYMBOL(find_first_bit);
-#endif
-
-#ifndef find_first_zero_bit
-/*
- * Find the first cleared bit in a memory region.
- */
-unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)
-{
-        const unsigned long *p = addr;
-        unsigned long result = 0;
-        unsigned long tmp;
-
-        while (size & ~(BITS_PER_LONG-1)) {
-                if (~(tmp = *(p++)))
-                        goto found;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-
-        tmp = (*p) | (~0UL << size);
-        if (tmp == ~0UL)        /* Are any bits zero? */
-                return result + size;   /* Nope. */
-found:
-        return result + ffz(tmp);
-}
-EXPORT_SYMBOL(find_first_zero_bit);
-#endif
-
-#ifdef __BIG_ENDIAN
-
-/* include/linux/byteorder does not support "unsigned long" type */
-static inline unsigned long ext2_swabp(const unsigned long * x)
-{
-#if BITS_PER_LONG == 64
-        return (unsigned long) __swab64p((u64 *) x);
-#elif BITS_PER_LONG == 32
-        return (unsigned long) __swab32p((u32 *) x);
-#else
-#error BITS_PER_LONG not defined
-#endif
-}
-
-/* include/linux/byteorder doesn't support "unsigned long" type */
-static inline unsigned long ext2_swab(const unsigned long y)
-{
-#if BITS_PER_LONG == 64
-        return (unsigned long) __swab64((u64) y);
-#elif BITS_PER_LONG == 32
-        return (unsigned long) __swab32((u32) y);
-#else
-#error BITS_PER_LONG not defined
-#endif
-}
-
-#ifndef find_next_zero_bit_le
-unsigned long find_next_zero_bit_le(const void *addr, unsigned
-                long size, unsigned long offset)
-{
-        const unsigned long *p = addr;
-        unsigned long result = offset & ~(BITS_PER_LONG - 1);
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        p += BITOP_WORD(offset);
-        size -= result;
-        offset &= (BITS_PER_LONG - 1UL);
-        if (offset) {
-                tmp = ext2_swabp(p++);
-                tmp |= (~0UL >> (BITS_PER_LONG - offset));
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (~tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-
-        while (size & ~(BITS_PER_LONG - 1)) {
-                if (~(tmp = *(p++)))
-                        goto found_middle_swap;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = ext2_swabp(p);
-found_first:
-        tmp |= ~0UL << size;
-        if (tmp == ~0UL)        /* Are any bits zero? */
-                return result + size; /* Nope. Skip ffz */
-found_middle:
-        return result + ffz(tmp);
-
-found_middle_swap:
-        return result + ffz(ext2_swab(tmp));
-}
-EXPORT_SYMBOL(find_next_zero_bit_le);
-#endif
-
-#ifndef find_next_bit_le
-unsigned long find_next_bit_le(const void *addr, unsigned
-                long size, unsigned long offset)
-{
-        const unsigned long *p = addr;
-        unsigned long result = offset & ~(BITS_PER_LONG - 1);
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        p += BITOP_WORD(offset);
-        size -= result;
-        offset &= (BITS_PER_LONG - 1UL);
-        if (offset) {
-                tmp = ext2_swabp(p++);
-                tmp &= (~0UL << offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-
-        while (size & ~(BITS_PER_LONG - 1)) {
-                tmp = *(p++);
-                if (tmp)
-                        goto found_middle_swap;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = ext2_swabp(p);
-found_first:
-        tmp &= (~0UL >> (BITS_PER_LONG - size));
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size; /* Nope. */
-found_middle:
-        return result + __ffs(tmp);
-
-found_middle_swap:
-        return result + __ffs(ext2_swab(tmp));
-}
-EXPORT_SYMBOL(find_next_bit_le);
-#endif
-
-#endif /* __BIG_ENDIAN */
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 1826c7407258..c98ae818eb4e 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -4,6 +4,7 @@
  * Copyright 31 August 2008 James Bottomley
  * Copyright (C) 2013, Intel Corporation
  */
+#include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/export.h>
@@ -14,7 +15,8 @@
 
 /**
  * string_get_size - get the size in the specified units
- * @size:       The size to be converted
+ * @size:       The size to be converted in blocks
+ * @blk_size:   Size of the block (use 1 for size in bytes)
  * @units:      units to use (powers of 1000 or 1024)
  * @buf:        buffer to format to
  * @len:        length of buffer
@@ -24,14 +26,14 @@
  * at least 9 bytes and will always be zero terminated.
  *
  */
-void string_get_size(u64 size, const enum string_size_units units,
+void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
                      char *buf, int len)
 {
         static const char *const units_10[] = {
-                "B", "kB", "MB", "GB", "TB", "PB", "EB"
+                "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"
         };
         static const char *const units_2[] = {
-                "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"
+                "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"
         };
         static const char *const *const units_str[] = {
                 [STRING_UNITS_10] = units_10,
@@ -42,31 +44,57 @@ void string_get_size(u64 size, const enum string_size_units units,
                 [STRING_UNITS_2] = 1024,
         };
         int i, j;
-        u32 remainder = 0, sf_cap;
+        u32 remainder = 0, sf_cap, exp;
         char tmp[8];
+        const char *unit;
 
         tmp[0] = '\0';
         i = 0;
-        if (size >= divisor[units]) {
-                while (size >= divisor[units]) {
-                        remainder = do_div(size, divisor[units]);
-                        i++;
-                }
+        if (!size)
+                goto out;
 
-                sf_cap = size;
-                for (j = 0; sf_cap*10 < 1000; j++)
-                        sf_cap *= 10;
+        while (blk_size >= divisor[units]) {
+                remainder = do_div(blk_size, divisor[units]);
+                i++;
+        }
 
-                if (j) {
-                        remainder *= 1000;
-                        remainder /= divisor[units];
-                        snprintf(tmp, sizeof(tmp), ".%03u", remainder);
-                        tmp[j+1] = '\0';
-                }
+        exp = divisor[units] / (u32)blk_size;
+        if (size >= exp) {
+                remainder = do_div(size, divisor[units]);
+                remainder *= blk_size;
+                i++;
+        } else {
+                remainder *= size;
+        }
+
+        size *= blk_size;
+        size += remainder / divisor[units];
+        remainder %= divisor[units];
+
+        while (size >= divisor[units]) {
+                remainder = do_div(size, divisor[units]);
+                i++;
         }
 
+        sf_cap = size;
+        for (j = 0; sf_cap*10 < 1000; j++)
+                sf_cap *= 10;
+
+        if (j) {
+                remainder *= 1000;
+                remainder /= divisor[units];
+                snprintf(tmp, sizeof(tmp), ".%03u", remainder);
+                tmp[j+1] = '\0';
+        }
+
+ out:
+        if (i >= ARRAY_SIZE(units_2))
+                unit = "UNK";
+        else
+                unit = units_str[units][i];
+
         snprintf(buf, len, "%u%s %s", (u32)size,
-                 tmp, units_str[units][i]);
+                 tmp, unit);
 }
 EXPORT_SYMBOL(string_get_size);
 
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 3a1e0843f9a2..da39c608a28c 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -33,6 +33,7 @@
 
 #include <asm/page.h>           /* for PAGE_SIZE */
 #include <asm/sections.h>       /* for dereference_function_descriptor() */
+#include <asm/byteorder.h>      /* cpu_to_le16 */
 
 #include <linux/string_helpers.h>
 #include "kstrtox.h"
@@ -122,142 +123,145 @@ int skip_atoi(const char **s)
         return i;
 }
 
-/* Decimal conversion is by far the most typical, and is used
- * for /proc and /sys data. This directly impacts e.g. top performance
- * with many processes running. We optimize it for speed
- * using ideas described at <http://www.cs.uiowa.edu/~jones/bcd/divide.html>
- * (with permission from the author, Douglas W. Jones).
+/*
+ * Decimal conversion is by far the most typical, and is used for
+ * /proc and /sys data. This directly impacts e.g. top performance
+ * with many processes running. We optimize it for speed by emitting
+ * two characters at a time, using a 200 byte lookup table. This
+ * roughly halves the number of multiplications compared to computing
+ * the digits one at a time. Implementation strongly inspired by the
+ * previous version, which in turn used ideas described at
+ * <http://www.cs.uiowa.edu/~jones/bcd/divide.html> (with permission
+ * from the author, Douglas W. Jones).
+ *
+ * It turns out there is precisely one 26 bit fixed-point
+ * approximation a of 64/100 for which x/100 == (x * (u64)a) >> 32
+ * holds for all x in [0, 10^8-1], namely a = 0x28f5c29. The actual
+ * range happens to be somewhat larger (x <= 1073741898), but that's
+ * irrelevant for our purpose.
+ *
+ * For dividing a number in the range [10^4, 10^6-1] by 100, we still
+ * need a 32x32->64 bit multiply, so we simply use the same constant.
+ *
+ * For dividing a number in the range [100, 10^4-1] by 100, there are
+ * several options. The simplest is (x * 0x147b) >> 19, which is valid
+ * for all x <= 43698.
  */
 
-#if BITS_PER_LONG != 32 || BITS_PER_LONG_LONG != 64
-/* Formats correctly any integer in [0, 999999999] */
+static const u16 decpair[100] = {
+#define _(x) (__force u16) cpu_to_le16(((x % 10) | ((x / 10) << 8)) + 0x3030)
+        _( 0), _( 1), _( 2), _( 3), _( 4), _( 5), _( 6), _( 7), _( 8), _( 9),
+        _(10), _(11), _(12), _(13), _(14), _(15), _(16), _(17), _(18), _(19),
+        _(20), _(21), _(22), _(23), _(24), _(25), _(26), _(27), _(28), _(29),
+        _(30), _(31), _(32), _(33), _(34), _(35), _(36), _(37), _(38), _(39),
+        _(40), _(41), _(42), _(43), _(44), _(45), _(46), _(47), _(48), _(49),
+        _(50), _(51), _(52), _(53), _(54), _(55), _(56), _(57), _(58), _(59),
+        _(60), _(61), _(62), _(63), _(64), _(65), _(66), _(67), _(68), _(69),
+        _(70), _(71), _(72), _(73), _(74), _(75), _(76), _(77), _(78), _(79),
+        _(80), _(81), _(82), _(83), _(84), _(85), _(86), _(87), _(88), _(89),
+        _(90), _(91), _(92), _(93), _(94), _(95), _(96), _(97), _(98), _(99),
+#undef _
+};
+
+/*
+ * This will print a single '0' even if r == 0, since we would
+ * immediately jump to out_r where two 0s would be written but only
+ * one of them accounted for in buf. This is needed by ip4_string
+ * below. All other callers pass a non-zero value of r.
+*/
 static noinline_for_stack
-char *put_dec_full9(char *buf, unsigned q)
+char *put_dec_trunc8(char *buf, unsigned r)
 {
-        unsigned r;
+        unsigned q;
 
-        /*
-         * Possible ways to approx. divide by 10
-         * (x * 0x1999999a) >> 32 x < 1073741829 (multiply must be 64-bit)
-         * (x * 0xcccd) >> 19     x <      81920 (x < 262149 when 64-bit mul)
-         * (x * 0x6667) >> 18     x <      43699
-         * (x * 0x3334) >> 17     x <      16389
-         * (x * 0x199a) >> 16     x <      16389
-         * (x * 0x0ccd) >> 15     x <      16389
-         * (x * 0x0667) >> 14     x <       2739
-         * (x * 0x0334) >> 13     x <       1029
-         * (x * 0x019a) >> 12     x <       1029
-         * (x * 0x00cd) >> 11     x <       1029 shorter code than * 0x67 (on i386)
-         * (x * 0x0067) >> 10     x <        179
-         * (x * 0x0034) >>  9     x <         69 same
-         * (x * 0x001a) >>  8     x <         69 same
-         * (x * 0x000d) >>  7     x <         69 same, shortest code (on i386)
-         * (x * 0x0007) >>  6     x <         19
-         * See <http://www.cs.uiowa.edu/~jones/bcd/divide.html>
-         */
-        r      = (q * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (q - 10 * r) + '0'; /* 1 */
-        q      = (r * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (r - 10 * q) + '0'; /* 2 */
-        r      = (q * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (q - 10 * r) + '0'; /* 3 */
-        q      = (r * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (r - 10 * q) + '0'; /* 4 */
-        r      = (q * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (q - 10 * r) + '0'; /* 5 */
-        /* Now value is under 10000, can avoid 64-bit multiply */
-        q      = (r * 0x199a) >> 16;
-        *buf++ = (r - 10 * q)  + '0'; /* 6 */
-        r      = (q * 0xcd) >> 11;
-        *buf++ = (q - 10 * r)  + '0'; /* 7 */
-        q      = (r * 0xcd) >> 11;
-        *buf++ = (r - 10 * q) + '0'; /* 8 */
-        *buf++ = q + '0'; /* 9 */
+        /* 1 <= r < 10^8 */
+        if (r < 100)
+                goto out_r;
+
+        /* 100 <= r < 10^8 */
+        q = (r * (u64)0x28f5c29) >> 32;
+        *((u16 *)buf) = decpair[r - 100*q];
+        buf += 2;
+
+        /* 1 <= q < 10^6 */
+        if (q < 100)
+                goto out_q;
+
+        /*  100 <= q < 10^6 */
+        r = (q * (u64)0x28f5c29) >> 32;
+        *((u16 *)buf) = decpair[q - 100*r];
+        buf += 2;
+
+        /* 1 <= r < 10^4 */
+        if (r < 100)
+                goto out_r;
+
+        /* 100 <= r < 10^4 */
+        q = (r * 0x147b) >> 19;
+        *((u16 *)buf) = decpair[r - 100*q];
+        buf += 2;
+out_q:
+        /* 1 <= q < 100 */
+        r = q;
+out_r:
+        /* 1 <= r < 100 */
+        *((u16 *)buf) = decpair[r];
+        buf += r < 10 ? 1 : 2;
         return buf;
 }
-#endif
 
-/* Similar to above but do not pad with zeros.
- * Code can be easily arranged to print 9 digits too, but our callers
- * always call put_dec_full9() instead when the number has 9 decimal digits.
- */
+#if BITS_PER_LONG == 64 && BITS_PER_LONG_LONG == 64
 static noinline_for_stack
-char *put_dec_trunc8(char *buf, unsigned r)
+char *put_dec_full8(char *buf, unsigned r)
 {
         unsigned q;
 
-        /* Copy of previous function's body with added early returns */
-        while (r >= 10000) {
-                q = r + '0';
-                r  = (r * (uint64_t)0x1999999a) >> 32;
-                *buf++ = q - 10*r;
-        }
+        /* 0 <= r < 10^8 */
+        q = (r * (u64)0x28f5c29) >> 32;
+        *((u16 *)buf) = decpair[r - 100*q];
+        buf += 2;
 
-        q      = (r * 0x199a) >> 16;    /* r <= 9999 */
-        *buf++ = (r - 10 * q)  + '0';
-        if (q == 0)
-                return buf;
-        r      = (q * 0xcd) >> 11;      /* q <= 999 */
-        *buf++ = (q - 10 * r)  + '0';
-        if (r == 0)
-                return buf;
-        q      = (r * 0xcd) >> 11;      /* r <= 99 */
-        *buf++ = (r - 10 * q) + '0';
-        if (q == 0)
-                return buf;
-        *buf++ = q + '0';                /* q <= 9 */
-        return buf;
-}
+        /* 0 <= q < 10^6 */
+        r = (q * (u64)0x28f5c29) >> 32;
+        *((u16 *)buf) = decpair[q - 100*r];
+        buf += 2;
 
-/* There are two algorithms to print larger numbers.
- * One is generic: divide by 1000000000 and repeatedly print
- * groups of (up to) 9 digits. It's conceptually simple,
- * but requires a (unsigned long long) / 1000000000 division.
- *
- * Second algorithm splits 64-bit unsigned long long into 16-bit chunks,
- * manipulates them cleverly and generates groups of 4 decimal digits.
- * It so happens that it does NOT require long long division.
- *
- * If long is > 32 bits, division of 64-bit values is relatively easy,
- * and we will use the first algorithm.
- * If long long is > 64 bits (strange architecture with VERY large long long),
- * second algorithm can't be used, and we again use the first one.
- *
- * Else (if long is 32 bits and long long is 64 bits) we use second one.
- */
+        /* 0 <= r < 10^4 */
+        q = (r * 0x147b) >> 19;
+        *((u16 *)buf) = decpair[r - 100*q];
+        buf += 2;
 
-#if BITS_PER_LONG != 32 || BITS_PER_LONG_LONG != 64
-
-/* First algorithm: generic */
+        /* 0 <= q < 100 */
+        *((u16 *)buf) = decpair[q];
+        buf += 2;
+        return buf;
+}
 
-static
+static noinline_for_stack
 char *put_dec(char *buf, unsigned long long n)
 {
-        if (n >= 100*1000*1000) {
-                while (n >= 1000*1000*1000)
-                        buf = put_dec_full9(buf, do_div(n, 1000*1000*1000));
-                if (n >= 100*1000*1000)
-                        return put_dec_full9(buf, n);
-        }
+        if (n >= 100*1000*1000)
+                buf = put_dec_full8(buf, do_div(n, 100*1000*1000));
+        /* 1 <= n <= 1.6e11 */
+        if (n >= 100*1000*1000)
+                buf = put_dec_full8(buf, do_div(n, 100*1000*1000));
+        /* 1 <= n < 1e8 */
         return put_dec_trunc8(buf, n);
 }
 
-#else
+#elif BITS_PER_LONG == 32 && BITS_PER_LONG_LONG == 64
 
-/* Second algorithm: valid only for 64-bit long longs */
-
-/* See comment in put_dec_full9 for choice of constants */
-static noinline_for_stack
-void put_dec_full4(char *buf, unsigned q)
+static void
+put_dec_full4(char *buf, unsigned r)
 {
-        unsigned r;
-        r      = (q * 0xccd) >> 15;
-        buf[0] = (q - 10 * r) + '0';
-        q      = (r * 0xcd) >> 11;
-        buf[1] = (r - 10 * q)  + '0';
-        r      = (q * 0xcd) >> 11;
-        buf[2] = (q - 10 * r)  + '0';
-        buf[3] = r + '0';
+        unsigned q;
+
+        /* 0 <= r < 10^4 */
+        q = (r * 0x147b) >> 19;
+        *((u16 *)buf) = decpair[r - 100*q];
+        buf += 2;
+        /* 0 <= q < 100 */
+        *((u16 *)buf) = decpair[q];
 }
 
 /*
@@ -265,9 +269,9 @@ void put_dec_full4(char *buf, unsigned q)
  * The approximation x/10000 == (x * 0x346DC5D7) >> 43
  * holds for all x < 1,128,869,999.  The largest value this
  * helper will ever be asked to convert is 1,125,520,955.
- * (d1 in the put_dec code, assuming n is all-ones).
+ * (second call in the put_dec code, assuming n is all-ones).
  */
-static
+static noinline_for_stack
 unsigned put_dec_helper4(char *buf, unsigned x)
 {
         uint32_t q = (x * (uint64_t)0x346DC5D7) >> 43;
@@ -294,6 +298,8 @@ char *put_dec(char *buf, unsigned long long n)
         d2  = (h      ) & 0xffff;
         d3  = (h >> 16); /* implicit "& 0xffff" */
 
+        /* n = 2^48 d3 + 2^32 d2 + 2^16 d1 + d0
+             = 281_4749_7671_0656 d3 + 42_9496_7296 d2 + 6_5536 d1 + d0 */
         q   = 656 * d3 + 7296 * d2 + 5536 * d1 + ((uint32_t)n & 0xffff);
         q = put_dec_helper4(buf, q);
 
@@ -323,7 +329,8 @@ char *put_dec(char *buf, unsigned long long n)
  */
 int num_to_str(char *buf, int size, unsigned long long num)
 {
-        char tmp[sizeof(num) * 3];
+        /* put_dec requires 2-byte alignment of the buffer. */
+        char tmp[sizeof(num) * 3] __aligned(2);
         int idx, len;
 
         /* put_dec() may work incorrectly for num = 0 (generate "", not "0") */
@@ -384,7 +391,8 @@ static noinline_for_stack
 char *number(char *buf, char *end, unsigned long long num,
              struct printf_spec spec)
 {
-        char tmp[3 * sizeof(num)];
+        /* put_dec requires 2-byte alignment of the buffer. */
+        char tmp[3 * sizeof(num)] __aligned(2);
         char sign;
         char locase;
         int need_pfx = ((spec.flags & SPECIAL) && spec.base != 10);
@@ -944,7 +952,7 @@ char *ip4_string(char *p, const u8 *addr, const char *fmt)
                 break;
         }
         for (i = 0; i < 4; i++) {
-                char temp[3];   /* hold each IP quad in reverse order */
+                char temp[4] __aligned(2);      /* hold each IP quad in reverse order */
                 int digits = put_dec_trunc8(temp, addr[index]) - temp;
                 if (leading_zeros) {
                         if (digits < 3)
diff --git a/mm/filemap.c b/mm/filemap.c
index 12548d03c11d..6bf5e42d560a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1693,7 +1693,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
         loff_t *ppos = &iocb->ki_pos;
         loff_t pos = *ppos;
 
-        if (io_is_direct(file)) {
+        if (iocb->ki_flags & IOCB_DIRECT) {
                 struct address_space *mapping = file->f_mapping;
                 struct inode *inode = mapping->host;
                 size_t count = iov_iter_count(iter);
@@ -1706,7 +1706,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
                                         pos + count - 1);
                 if (!retval) {
                         struct iov_iter data = *iter;
-                        retval = mapping->a_ops->direct_IO(READ, iocb, &data, pos);
+                        retval = mapping->a_ops->direct_IO(iocb, &data, pos);
                 }
 
                 if (retval > 0) {
@@ -2259,41 +2259,38 @@ EXPORT_SYMBOL(read_cache_page_gfp);
  * Returns appropriate error code that caller should return or
  * zero in case that write should be allowed.
  */
-inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
+inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
 {
+        struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
         unsigned long limit = rlimit(RLIMIT_FSIZE);
+        loff_t pos;
 
-        if (unlikely(*pos < 0))
-                return -EINVAL;
+        if (!iov_iter_count(from))
+                return 0;
 
-        if (!isblk) {
-                /* FIXME: this is for backwards compatibility with 2.4 */
-                if (file->f_flags & O_APPEND)
-                        *pos = i_size_read(inode);
+        /* FIXME: this is for backwards compatibility with 2.4 */
+        if (iocb->ki_flags & IOCB_APPEND)
+                iocb->ki_pos = i_size_read(inode);
 
-                if (limit != RLIM_INFINITY) {
-                        if (*pos >= limit) {
-                                send_sig(SIGXFSZ, current, 0);
-                                return -EFBIG;
-                        }
-                        if (*count > limit - (typeof(limit))*pos) {
-                                *count = limit - (typeof(limit))*pos;
-                        }
+        pos = iocb->ki_pos;
+
+        if (limit != RLIM_INFINITY) {
+                if (iocb->ki_pos >= limit) {
+                        send_sig(SIGXFSZ, current, 0);
+                        return -EFBIG;
                 }
+                iov_iter_truncate(from, limit - (unsigned long)pos);
         }
 
         /*
          * LFS rule
          */
-        if (unlikely(*pos + *count > MAX_NON_LFS &&
+        if (unlikely(pos + iov_iter_count(from) > MAX_NON_LFS &&
                                 !(file->f_flags & O_LARGEFILE))) {
-                if (*pos >= MAX_NON_LFS) {
+                if (pos >= MAX_NON_LFS)
                         return -EFBIG;
-                }
-                if (*count > MAX_NON_LFS - (unsigned long)*pos) {
-                        *count = MAX_NON_LFS - (unsigned long)*pos;
-                }
+                iov_iter_truncate(from, MAX_NON_LFS - (unsigned long)pos);
         }
 
         /*
@@ -2303,34 +2300,11 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
          * exceeded without writing data we send a signal and return EFBIG.
          * Linus frestrict idea will clean these up nicely..
          */
-        if (likely(!isblk)) {
-                if (unlikely(*pos >= inode->i_sb->s_maxbytes)) {
-                        if (*count || *pos > inode->i_sb->s_maxbytes) {
-                                return -EFBIG;
-                        }
-                        /* zero-length writes at ->s_maxbytes are OK */
-                }
+        if (unlikely(pos >= inode->i_sb->s_maxbytes))
+                return -EFBIG;
 
-                if (unlikely(*pos + *count > inode->i_sb->s_maxbytes))
-                        *count = inode->i_sb->s_maxbytes - *pos;
-        } else {
-#ifdef CONFIG_BLOCK
-                loff_t isize;
-                if (bdev_read_only(I_BDEV(inode)))
-                        return -EPERM;
-                isize = i_size_read(inode);
-                if (*pos >= isize) {
-                        if (*count || *pos > isize)
-                                return -ENOSPC;
-                }
-
-                if (*pos + *count > isize)
-                        *count = isize - *pos;
-#else
-                return -EPERM;
-#endif
-        }
-        return 0;
+        iov_iter_truncate(from, inode->i_sb->s_maxbytes - pos);
+        return iov_iter_count(from);
 }
 EXPORT_SYMBOL(generic_write_checks);
 
@@ -2394,7 +2368,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos)
         }
 
         data = *from;
-        written = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos);
+        written = mapping->a_ops->direct_IO(iocb, &data, pos);
 
         /*
          * Finally, try again to invalidate clean pages which might have been
@@ -2556,23 +2530,12 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         struct file *file = iocb->ki_filp;
         struct address_space * mapping = file->f_mapping;
         struct inode    *inode = mapping->host;
-        loff_t          pos = iocb->ki_pos;
         ssize_t         written = 0;
         ssize_t         err;
         ssize_t         status;
-        size_t          count = iov_iter_count(from);
 
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = inode_to_bdi(inode);
-        err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-        if (err)
-                goto out;
-
-        if (count == 0)
-                goto out;
-
-        iov_iter_truncate(from, count);
-
         err = file_remove_suid(file);
         if (err)
                 goto out;
@@ -2581,10 +2544,10 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (err)
                 goto out;
 
-        if (io_is_direct(file)) {
-                loff_t endbyte;
+        if (iocb->ki_flags & IOCB_DIRECT) {
+                loff_t pos, endbyte;
 
-                written = generic_file_direct_write(iocb, from, pos);
+                written = generic_file_direct_write(iocb, from, iocb->ki_pos);
                 /*
                  * If the write stopped short of completing, fall back to
                  * buffered writes.  Some filesystems do this for writes to
@@ -2592,13 +2555,10 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                  * not succeed (even if it did, DAX does not handle dirty
                  * page-cache pages correctly).
                  */
-                if (written < 0 || written == count || IS_DAX(inode))
+                if (written < 0 || !iov_iter_count(from) || IS_DAX(inode))
                         goto out;
 
-                pos += written;
-                count -= written;
-
-                status = generic_perform_write(file, from, pos);
+                status = generic_perform_write(file, from, pos = iocb->ki_pos);
                 /*
                  * If generic_perform_write() returned a synchronous error
                  * then we want to return the number of bytes which were
@@ -2610,15 +2570,15 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                         err = status;
                         goto out;
                 }
-                iocb->ki_pos = pos + status;
                 /*
                  * We need to ensure that the page cache pages are written to
                  * disk and invalidated to preserve the expected O_DIRECT
                  * semantics.
                  */
                 endbyte = pos + status - 1;
-                err = filemap_write_and_wait_range(file->f_mapping, pos, endbyte);
+                err = filemap_write_and_wait_range(mapping, pos, endbyte);
                 if (err == 0) {
+                        iocb->ki_pos = endbyte + 1;
                         written += status;
                         invalidate_mapping_pages(mapping,
                                                  pos >> PAGE_CACHE_SHIFT,
@@ -2630,9 +2590,9 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                          */
                 }
         } else {
-                written = generic_perform_write(file, from, pos);
-                if (likely(written >= 0))
-                        iocb->ki_pos = pos + written;
+                written = generic_perform_write(file, from, iocb->ki_pos);
+                if (likely(written > 0))
+                        iocb->ki_pos += written;
         }
 out:
         current->backing_dev_info = NULL;
@@ -2656,7 +2616,9 @@ ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         ssize_t ret;
 
         mutex_lock(&inode->i_mutex);
-        ret = __generic_file_write_iter(iocb, from);
+        ret = generic_write_checks(iocb, from);
+        if (ret > 0)
+                ret = __generic_file_write_iter(iocb, from);
         mutex_unlock(&inode->i_mutex);
 
         if (ret > 0) {
diff --git a/mm/page_io.c b/mm/page_io.c
index a96c8562d835..6424869e275e 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -277,9 +277,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
 
                 set_page_writeback(page);
                 unlock_page(page);
-                ret = mapping->a_ops->direct_IO(ITER_BVEC | WRITE,
-                                                &kiocb, &from,
-                                                kiocb.ki_pos);
+                ret = mapping->a_ops->direct_IO(&kiocb, &from, kiocb.ki_pos);
                 if (ret == PAGE_SIZE) {
                         count_vm_event(PSWPOUT);
                         ret = 0;
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 631619b2b118..3f874d24234f 100644
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -13,12 +13,16 @@ CFLAGS_KASAN := $(call cc-option, -fsanitize=kernel-address \
                 --param asan-instrumentation-with-call-threshold=$(call_threshold))
 
 ifeq ($(call cc-option, $(CFLAGS_KASAN_MINIMAL) -Werror),)
+   ifneq ($(CONFIG_COMPILE_TEST),y)
         $(warning Cannot use CONFIG_KASAN: \
             -fsanitize=kernel-address is not supported by compiler)
+   endif
 else
     ifeq ($(CFLAGS_KASAN),)
-        $(warning CONFIG_KASAN: compiler does not support all options.\
-            Trying minimal configuration)
+        ifneq ($(CONFIG_COMPILE_TEST),y)
+            $(warning CONFIG_KASAN: compiler does not support all options.\
+                Trying minimal configuration)
+        endif
         CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
     endif
 endif
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d12435992dea..89b1df4e72ab 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -47,6 +47,8 @@ my $ignore_perl_version = 0;
 my $minimum_perl_version = 5.10.0;
 my $min_conf_desc_length = 4;
 my $spelling_file = "$D/spelling.txt";
+my $codespell = 0;
+my $codespellfile = "/usr/local/share/codespell/dictionary.txt";
 
 sub help {
         my ($exitcode) = @_;
@@ -88,6 +90,9 @@ Options:
                              file.  It's your fault if there's no backup or git
   --ignore-perl-version      override checking of perl version.  expect
                              runtime errors.
+  --codespell                Use the codespell dictionary for spelling/typos
+                             (default:/usr/local/share/codespell/dictionary.txt)
+  --codespellfile            Use this codespell dictionary
   -h, --help, --version      display this help and exit
 
 When FILE is - read standard input.
@@ -146,6 +151,8 @@ GetOptions(
         'ignore-perl-version!' => \$ignore_perl_version,
         'debug=s'       => \%debug,
         'test-only=s'   => \$tst_only,
+        'codespell!'    => \$codespell,
+        'codespellfile=s'       => \$codespellfile,
         'h|help'        => \$help,
         'version'       => \$help
 ) or help(1);
@@ -316,6 +323,7 @@ our $Operators	= qr{
 
 our $c90_Keywords = qr{do|for|while|if|else|return|goto|continue|switch|default|case|break}x;
 
+our $BasicType;
 our $NonptrType;
 our $NonptrTypeMisordered;
 our $NonptrTypeWithAttr;
@@ -436,6 +444,14 @@ foreach my $entry (@mode_permission_funcs) {
         $mode_perms_search .= $entry->[0];
 }
 
+our $mode_perms_world_writable = qr{
+        S_IWUGO         |
+        S_IWOTH         |
+        S_IRWXUGO       |
+        S_IALLUGO       |
+        0[0-7][0-7][2367]
+}x;
+
 our $allowed_asm_includes = qr{(?x:
         irq|
         memory|
@@ -449,7 +465,6 @@ my $misspellings;
 my %spelling_fix;
 
 if (open(my $spelling, '<', $spelling_file)) {
-        my @spelling_list;
         while (<$spelling>) {
                 my $line = $_;
 
@@ -461,21 +476,50 @@ if (open(my $spelling, '<', $spelling_file)) {
 
                 my ($suspect, $fix) = split(/\|\|/, $line);
 
-                push(@spelling_list, $suspect);
                 $spelling_fix{$suspect} = $fix;
         }
         close($spelling);
-        $misspellings = join("|", @spelling_list);
 } else {
         warn "No typos will be found - file '$spelling_file': $!\n";
 }
 
+if ($codespell) {
+        if (open(my $spelling, '<', $codespellfile)) {
+                while (<$spelling>) {
+                        my $line = $_;
+
+                        $line =~ s/\s*\n?$//g;
+                        $line =~ s/^\s*//g;
+
+                        next if ($line =~ m/^\s*#/);
+                        next if ($line =~ m/^\s*$/);
+                        next if ($line =~ m/, disabled/i);
+
+                        $line =~ s/,.*$//;
+
+                        my ($suspect, $fix) = split(/->/, $line);
+
+                        $spelling_fix{$suspect} = $fix;
+                }
+                close($spelling);
+        } else {
+                warn "No codespell typos will be found - file '$codespellfile': $!\n";
+        }
+}
+
+$misspellings = join("|", sort keys %spelling_fix) if keys %spelling_fix;
+
 sub build_types {
         my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
         my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
         my $Misordered = "(?x:  \n" . join("|\n  ", @typeListMisordered) . "\n)";
         my $allWithAttr = "(?x:  \n" . join("|\n  ", @typeListWithAttr) . "\n)";
         $Modifier       = qr{(?:$Attribute|$Sparse|$mods)};
+        $BasicType      = qr{
+                                (?:$typeOtherOSTypedefs\b)|
+                                (?:$typeTypedefs\b)|
+                                (?:${all}\b)
+                }x;
         $NonptrType     = qr{
                         (?:$Modifier\s+|const\s+)*
                         (?:
@@ -1646,7 +1690,7 @@ sub fix_inserted_deleted_lines {
         foreach my $old_line (@{$linesRef}) {
                 my $save_line = 1;
                 my $line = $old_line;   #don't modify the array
-                if ($line =~ /^(?:\+\+\+\|\-\-\-)\s+\S+/) {     #new filename
+                if ($line =~ /^(?:\+\+\+|\-\-\-)\s+\S+/) {      #new filename
                         $delta_offset = 0;
                 } elsif ($line =~ /^\@\@ -\d+,\d+ \+\d+,\d+ \@\@/) {    #new hunk
                         $range_last_linenr = $new_linenr;
@@ -1854,6 +1898,7 @@ sub process {
 
         my $in_header_lines = $file ? 0 : 1;
         my $in_commit_log = 0;          #Scanning lines before patch
+        my $commit_log_long_line = 0;
         my $reported_maintainer_file = 0;
         my $non_utf8_charset = 0;
 
@@ -2189,6 +2234,14 @@ sub process {
                               "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
                 }
 
+# Check for line lengths > 75 in commit log, warn once
+                if ($in_commit_log && !$commit_log_long_line &&
+                    length($line) > 75) {
+                        WARN("COMMIT_LOG_LONG_LINE",
+                             "Possible unwrapped commit description (prefer a maximum 75 chars per line)\n" . $herecurr);
+                        $commit_log_long_line = 1;
+                }
+
 # Check for git id commit length and improperly formed commit descriptions
                 if ($in_commit_log && $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i) {
                         my $init_char = $1;
@@ -2303,8 +2356,9 @@ sub process {
                 }
 
 # Check for various typo / spelling mistakes
-                if (defined($misspellings) && ($in_commit_log || $line =~ /^\+/)) {
-                        while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:$|[^a-z@])/gi) {
+                if (defined($misspellings) &&
+                    ($in_commit_log || $line =~ /^(?:\+|Subject:)/i)) {
+                        while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:\b|$|[^a-z@])/gi) {
                                 my $typo = $1;
                                 my $typo_fix = $spelling_fix{lc($typo)};
                                 $typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/);
@@ -2459,8 +2513,9 @@ sub process {
 #line length limit
                 if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                     $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
-                    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
+                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?$String\s*(?:|,|\)\s*;)\s*$/ ||
+                      $line =~ /^\+\s*$String\s*(?:\s*|,|\)\s*;)\s*$/ ||
+                      $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) &&
                     $length > $max_line_length)
                 {
                         WARN("LONG_LINE",
@@ -2552,8 +2607,15 @@ sub process {
                         }
                 }
 
-                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;:\?\(\{\}\[\<\>]|&&|\|\||\\$)/ &&
-                    (!defined($1) || $1 !~ /sizeof\s*/)) {
+# check for space after cast like "(int) foo" or "(struct foo) bar"
+# avoid checking a few false positives:
+#   "sizeof(<type>)" or "__alignof__(<type>)"
+#   function pointer declarations like "(*foo)(int) = bar;"
+#   structure definitions like "(struct foo) { 0 };"
+#   multiline macros that define functions
+#   known attributes or the __attribute__ keyword
+                if ($line =~ /^\+(.*)\(\s*$Type\s*\)([ \t]++)((?![={]|\\$|$Attribute|__attribute__))/ &&
+                    (!defined($1) || $1 !~ /\b(?:sizeof|__alignof__)\s*$/)) {
                         if (CHK("SPACING",
                                 "No space is necessary after a cast\n" . $herecurr) &&
                             $fix) {
@@ -3146,6 +3208,18 @@ sub process {
                                 $herecurr);
                }
 
+# check for const <foo> const where <foo> is not a pointer or array type
+                if ($sline =~ /\bconst\s+($BasicType)\s+const\b/) {
+                        my $found = $1;
+                        if ($sline =~ /\bconst\s+\Q$found\E\s+const\b\s*\*/) {
+                                WARN("CONST_CONST",
+                                     "'const $found const *' should probably be 'const $found * const'\n" . $herecurr);
+                        } elsif ($sline !~ /\bconst\s+\Q$found\E\s+const\s+\w+\s*\[/) {
+                                WARN("CONST_CONST",
+                                     "'const $found const' should probably be 'const $found'\n" . $herecurr);
+                        }
+                }
+
 # check for non-global char *foo[] = {"bar", ...} declarations.
                 if ($line =~ /^.\s+(?:static\s+|const\s+)?char\s+\*\s*\w+\s*\[\s*\]\s*=\s*\{/) {
                         WARN("STATIC_CONST_CHAR_ARRAY",
@@ -3153,6 +3227,19 @@ sub process {
                                 $herecurr);
                }
 
+# check for sizeof(foo)/sizeof(foo[0]) that could be ARRAY_SIZE(foo)
+                if ($line =~ m@\bsizeof\s*\(\s*($Lval)\s*\)@) {
+                        my $array = $1;
+                        if ($line =~ m@\b(sizeof\s*\(\s*\Q$array\E\s*\)\s*/\s*sizeof\s*\(\s*\Q$array\E\s*\[\s*0\s*\]\s*\))@) {
+                                my $array_div = $1;
+                                if (WARN("ARRAY_SIZE",
+                                         "Prefer ARRAY_SIZE($array)\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$fixlinenr] =~ s/\Q$array_div\E/ARRAY_SIZE($array)/;
+                                }
+                        }
+                }
+
 # check for function declarations without arguments like "int foo()"
                 if ($line =~ /(\b$Type\s+$Ident)\s*\(\s*\)/) {
                         if (ERROR("FUNCTION_WITHOUT_ARGS",
@@ -3309,6 +3396,14 @@ sub process {
                              "Prefer dev_$level(... to dev_printk(KERN_$orig, ...\n" . $herecurr);
                 }
 
+# ENOSYS means "bad syscall nr" and nothing else.  This will have a small
+# number of false positives, but assembly files are not checked, so at
+# least the arch entry code will not trigger this warning.
+                if ($line =~ /\bENOSYS\b/) {
+                        WARN("ENOSYS",
+                             "ENOSYS means 'invalid syscall nr' and nothing else\n" . $herecurr);
+                }
+
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
@@ -3565,7 +3660,7 @@ sub process {
 
                                 # Ignore operators passed as parameters.
                                 if ($op_type ne 'V' &&
-                                    $ca =~ /\s$/ && $cc =~ /^\s*,/) {
+                                    $ca =~ /\s$/ && $cc =~ /^\s*[,\)]/) {
 
 #                               # Ignore comments
 #                               } elsif ($op =~ /^$;+$/) {
@@ -3750,6 +3845,14 @@ sub process {
                                                 $ok = 1;
                                         }
 
+                                        # for asm volatile statements
+                                        # ignore a colon with another
+                                        # colon immediately before or after
+                                        if (($op eq ':') &&
+                                            ($ca =~ /:$/ || $cc =~ /^:/)) {
+                                                $ok = 1;
+                                        }
+
                                         # messages are ERROR, but ?: are CHK
                                         if ($ok == 0) {
                                                 my $msg_type = \&ERROR;
@@ -3963,12 +4066,12 @@ sub process {
                         }
                 }
 
-# Return of what appears to be an errno should normally be -'ve
-                if ($line =~ /^.\s*return\s*(E[A-Z]*)\s*;/) {
+# Return of what appears to be an errno should normally be negative
+                if ($sline =~ /\breturn(?:\s*\(+\s*|\s+)(E[A-Z]+)(?:\s*\)+\s*|\s*)[;:,]/) {
                         my $name = $1;
                         if ($name ne 'EOF' && $name ne 'ERROR') {
                                 WARN("USE_NEGATIVE_ERRNO",
-                                     "return of an errno should typically be -ve (return -$1)\n" . $herecurr);
+                                     "return of an errno should typically be negative (ie: return -$1)\n" . $herecurr);
                         }
                 }
 
@@ -4178,7 +4281,8 @@ sub process {
                         }
                 }
 
-#warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
+# warn if <asm/foo.h> is #included and <linux/foo.h> is available and includes
+# itself <asm/foo.h> (uses RAW line)
                 if ($tree && $rawline =~ m{^.\s*\#\s*include\s*\<asm\/(.*)\.h\>}) {
                         my $file = "$1.h";
                         my $checkfile = "include/linux/$file";
@@ -4186,12 +4290,15 @@ sub process {
                             $realfile ne $checkfile &&
                             $1 !~ /$allowed_asm_includes/)
                         {
-                                if ($realfile =~ m{^arch/}) {
-                                        CHK("ARCH_INCLUDE_LINUX",
-                                            "Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
-                                } else {
-                                        WARN("INCLUDE_LINUX",
-                                             "Use #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+                                my $asminclude = `grep -Ec "#include\\s+<asm/$file>" $root/$checkfile`;
+                                if ($asminclude > 0) {
+                                        if ($realfile =~ m{^arch/}) {
+                                                CHK("ARCH_INCLUDE_LINUX",
+                                                    "Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+                                        } else {
+                                                WARN("INCLUDE_LINUX",
+                                                     "Use #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+                                        }
                                 }
                         }
                 }
@@ -4700,6 +4807,16 @@ sub process {
                         }
                 }
 
+# check for __read_mostly with const non-pointer (should just be const)
+                if ($line =~ /\b__read_mostly\b/ &&
+                    $line =~ /($Type)\s*$Ident/ && $1 !~ /\*\s*$/ && $1 =~ /\bconst\b/) {
+                        if (ERROR("CONST_READ_MOSTLY",
+                                  "Invalid use of __read_mostly with const type\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\s+__read_mostly\b//;
+                        }
+                }
+
 # don't use __constant_<foo> functions outside of include/uapi/
                 if ($realfile !~ m@^include/uapi/@ &&
                     $line =~ /(__constant_(?:htons|ntohs|[bl]e(?:16|32|64)_to_cpu|cpu_to_[bl]e(?:16|32|64)))\s*\(/) {
@@ -5261,6 +5378,7 @@ sub process {
                                 stacktrace_ops|
                                 sysfs_ops|
                                 tty_operations|
+                                uart_ops|
                                 usb_mon_operations|
                                 wd_ops}x;
                 if ($line !~ /\bconst\b/ &&
@@ -5318,8 +5436,8 @@ sub process {
                         }
                 }
 
-                if ($line =~ /debugfs_create_file.*S_IWUGO/ ||
-                    $line =~ /DEVICE_ATTR.*S_IWUGO/ ) {
+                if ($line =~ /debugfs_create_\w+.*\b$mode_perms_world_writable\b/ ||
+                    $line =~ /DEVICE_ATTR.*\b$mode_perms_world_writable\b/) {
                         WARN("EXPORTED_WORLD_WRITABLE",
                              "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                 }
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index f282516acc7b..fce36d0f6898 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -168,6 +168,9 @@ int main(void)
         DEVID_FIELD(amba_id, id);
         DEVID_FIELD(amba_id, mask);
 
+        DEVID(mips_cdmm_device_id);
+        DEVID_FIELD(mips_cdmm_device_id, type);
+
         DEVID(x86_cpu_id);
         DEVID_FIELD(x86_cpu_id, feature);
         DEVID_FIELD(x86_cpu_id, family);
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e614ef689eee..78691d51a479 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1109,6 +1109,22 @@ static int do_amba_entry(const char *filename,
 }
 ADD_TO_DEVTABLE("amba", amba_id, do_amba_entry);
 
+/*
+ * looks like: "mipscdmm:tN"
+ *
+ * N is exactly 2 digits, where each is an upper-case hex digit, or
+ *      a ? or [] pattern matching exactly one digit.
+ */
+static int do_mips_cdmm_entry(const char *filename,
+                              void *symval, char *alias)
+{
+        DEF_FIELD(symval, mips_cdmm_device_id, type);
+
+        sprintf(alias, "mipscdmm:t%02X*", type);
+        return 1;
+}
+ADD_TO_DEVTABLE("mipscdmm", mips_cdmm_device_id, do_mips_cdmm_entry);
+
 /* LOOKS like cpu:type:x86,venVVVVfamFFFFmodMMMM:feature:*,FEAT,*
  * All fields are numbers. It would be nicer to use strings for vendor
  * and feature, but getting those out of the build system here is too
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index fc7fd52b5e03..bb8e4d0a1911 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -825,6 +825,7 @@ retreived||retrieved
 retreive||retrieve
 retrive||retrieve
 retuned||returned
+reudce||reduce
 reuest||request
 reuqest||request
 reutnred||returned
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c
index 2952ba576fb9..b974a6997d7f 100644
--- a/security/tomoyo/util.c
+++ b/security/tomoyo/util.c
@@ -948,15 +948,18 @@ bool tomoyo_path_matches_pattern(const struct tomoyo_path_info *filename,
  */
 const char *tomoyo_get_exe(void)
 {
+        struct file *exe_file;
+        const char *cp;
         struct mm_struct *mm = current->mm;
-        const char *cp = NULL;
 
         if (!mm)
                 return NULL;
-        down_read(&mm->mmap_sem);
-        if (mm->exe_file)
-                cp = tomoyo_realpath_from_path(&mm->exe_file->f_path);
-        up_read(&mm->mmap_sem);
+        exe_file = get_mm_exe_file(mm);
+        if (!exe_file)
+                return NULL;
+
+        cp = tomoyo_realpath_from_path(&exe_file->f_path);
+        fput(exe_file);
         return cp;
 }
 
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 5a30fdd0da00..e12764d15431 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/clk.h>
+#include <linux/kernel.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -31,8 +32,6 @@
 
 #define DIV_ROUND_DOWN_ULL(ll, d) \
         ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })
-#define DIV_ROUND_CLOSEST_ULL(ll, d) \
-        ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })
 
 #define PCM512x_NUM_SUPPLIES 3
 static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {
diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
index 92f1fd700344..db15c9d2049e 100644
--- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -1156,7 +1156,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
         /* Extract instance number */
 
         if (isdigit((int)filename[ACPI_NAME_SIZE])) {
-                sscanf(&filename[ACPI_NAME_SIZE], "%d", instance);
+                sscanf(&filename[ACPI_NAME_SIZE], "%u", instance);
         } else if (strlen(filename) != ACPI_NAME_SIZE) {
                 return (AE_BAD_SIGNATURE);
         } else {
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
index 3853a7350440..0b1fa290245a 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixmap.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.c
@@ -146,6 +146,6 @@ void acpi_os_unmap_memory(void *where, acpi_size length)
         acpi_size page_size;
 
         page_size = acpi_os_get_page_size();
-        offset = (acpi_physical_address) where % page_size;
+        offset = ACPI_TO_INTEGER(where) % page_size;
         munmap((u8 *)where - offset, (length + offset));
 }