842 files changed, 21142 insertions, 11089 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power
index 7dbf96b724ed..676fdf5f2a99 100644
--- a/Documentation/ABI/testing/sysfs-devices-power
+++ b/Documentation/ABI/testing/sysfs-devices-power
@@ -83,8 +83,10 @@ Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_count attribute contains the number
                 of signaled wakeup events associated with the device.  This
-                attribute is read-only.  If the device is not enabled to wake up
+                attribute is read-only.  If the device is not capable to wake up
                 the system from sleep states, this attribute is not present.
+                If the device is not enabled to wake up the system from sleep
+                states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_active_count
 Date:           September 2010
@@ -93,8 +95,10 @@ Description:
                 The /sys/devices/.../wakeup_active_count attribute contains the
                 number of times the processing of wakeup events associated with
                 the device was completed (at the kernel level).  This attribute
-                is read-only.  If the device is not enabled to wake up the
-                system from sleep states, this attribute is not present.
+                is read-only.  If the device is not capable to wake up the
+                system from sleep states, this attribute is not present.  If
+                the device is not enabled to wake up the system from sleep
+                states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_abort_count
 Date:           February 2012
@@ -104,8 +108,9 @@ Description:
                 number of times the processing of a wakeup event associated with
                 the device might have aborted system transition into a sleep
                 state in progress.  This attribute is read-only.  If the device
-                is not enabled to wake up the system from sleep states, this
-                attribute is not present.
+                is not capable to wake up the system from sleep states, this
+                attribute is not present.  If the device is not enabled to wake
+                up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_expire_count
 Date:           February 2012
@@ -114,8 +119,10 @@ Description:
                 The /sys/devices/.../wakeup_expire_count attribute contains the
                 number of times a wakeup event associated with the device has
                 been reported with a timeout that expired.  This attribute is
-                read-only.  If the device is not enabled to wake up the system
-                from sleep states, this attribute is not present.
+                read-only.  If the device is not capable to wake up the system
+                from sleep states, this attribute is not present.  If the
+                device is not enabled to wake up the system from sleep states,
+                this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_active
 Date:           September 2010
@@ -124,8 +131,10 @@ Description:
                 The /sys/devices/.../wakeup_active attribute contains either 1,
                 or 0, depending on whether or not a wakeup event associated with
                 the device is being processed (1).  This attribute is read-only.
-                If the device is not enabled to wake up the system from sleep
-                states, this attribute is not present.
+                If the device is not capable to wake up the system from sleep
+                states, this attribute is not present.  If the device is not
+                enabled to wake up the system from sleep states, this attribute
+                is empty.
 
 What:           /sys/devices/.../power/wakeup_total_time_ms
 Date:           September 2010
@@ -134,8 +143,9 @@ Description:
                 The /sys/devices/.../wakeup_total_time_ms attribute contains
                 the total time of processing wakeup events associated with the
                 device, in milliseconds.  This attribute is read-only.  If the
-                device is not enabled to wake up the system from sleep states,
-                this attribute is not present.
+                device is not capable to wake up the system from sleep states,
+                this attribute is not present.  If the device is not enabled to
+                wake up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_max_time_ms
 Date:           September 2010
@@ -144,8 +154,10 @@ Description:
                 The /sys/devices/.../wakeup_max_time_ms attribute contains
                 the maximum time of processing a single wakeup event associated
                 with the device, in milliseconds.  This attribute is read-only.
-                If the device is not enabled to wake up the system from sleep
-                states, this attribute is not present.
+                If the device is not capable to wake up the system from sleep
+                states, this attribute is not present.  If the device is not
+                enabled to wake up the system from sleep states, this attribute
+                is empty.
 
 What:           /sys/devices/.../power/wakeup_last_time_ms
 Date:           September 2010
@@ -156,7 +168,8 @@ Description:
                 signaling the last wakeup event associated with the device, in
                 milliseconds.  This attribute is read-only.  If the device is
                 not enabled to wake up the system from sleep states, this
-                attribute is not present.
+                attribute is not present.  If the device is not enabled to wake
+                up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_prevent_sleep_time_ms
 Date:           February 2012
@@ -165,9 +178,10 @@ Description:
                 The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
                 contains the total time the device has been preventing
                 opportunistic transitions to sleep states from occurring.
-                This attribute is read-only.  If the device is not enabled to
+                This attribute is read-only.  If the device is not capable to
                 wake up the system from sleep states, this attribute is not
-                present.
+                present.  If the device is not enabled to wake up the system
+                from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/autosuspend_delay_ms
 Date:           September 2010
diff --git a/Documentation/devicetree/bindings/dma/fsl-edma.txt b/Documentation/devicetree/bindings/dma/fsl-edma.txt
new file mode 100644
index 000000000000..191d7bd8a6fe
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/fsl-edma.txt
@@ -0,0 +1,76 @@
+* Freescale enhanced Direct Memory Access(eDMA) Controller
+
+  The eDMA channels have multiplex capability by programmble memory-mapped
+registers. channels are split into two groups, called DMAMUX0 and DMAMUX1,
+specific DMA request source can only be multiplexed by any channel of certain
+group, DMAMUX0 or DMAMUX1, but not both.
+
+* eDMA Controller
+Required properties:
+- compatible :
+        - "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
+- reg : Specifies base physical address(s) and size of the eDMA registers.
+        The 1st region is eDMA control register's address and size.
+        The 2nd and the 3rd regions are programmable channel multiplexing
+        control register's address and size.
+- interrupts : A list of interrupt-specifiers, one for each entry in
+        interrupt-names.
+- interrupt-names : Should contain:
+        "edma-tx" - the transmission interrupt
+        "edma-err" - the error interrupt
+- #dma-cells : Must be <2>.
+        The 1st cell specifies the DMAMUX(0 for DMAMUX0 and 1 for DMAMUX1).
+        Specific request source can only be multiplexed by specific channels
+        group called DMAMUX.
+        The 2nd cell specifies the request source(slot) ID.
+        See the SoC's reference manual for all the supported request sources.
+- dma-channels : Number of channels supported by the controller
+- clock-names : A list of channel group clock names. Should contain:
+        "dmamux0" - clock name of mux0 group
+        "dmamux1" - clock name of mux1 group
+- clocks : A list of phandle and clock-specifier pairs, one for each entry in
+        clock-names.
+
+Optional properties:
+- big-endian: If present registers and hardware scatter/gather descriptors
+        of the eDMA are implemented in big endian mode, otherwise in little
+        mode.
+
+
+Examples:
+
+edma0: dma-controller@40018000 {
+        #dma-cells = <2>;
+        compatible = "fsl,vf610-edma";
+        reg = <0x40018000 0x2000>,
+                <0x40024000 0x1000>,
+                <0x40025000 0x1000>;
+        interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>,
+                <0 9 IRQ_TYPE_LEVEL_HIGH>;
+        interrupt-names = "edma-tx", "edma-err";
+        dma-channels = <32>;
+        clock-names = "dmamux0", "dmamux1";
+        clocks = <&clks VF610_CLK_DMAMUX0>,
+                <&clks VF610_CLK_DMAMUX1>;
+};
+
+
+* DMA clients
+DMA client drivers that uses the DMA function must use the format described
+in the dma.txt file, using a two-cell specifier for each channel: the 1st
+specifies the channel group(DMAMUX) in which this request can be multiplexed,
+and the 2nd specifies the request source.
+
+Examples:
+
+sai2: sai@40031000 {
+        compatible = "fsl,vf610-sai";
+        reg = <0x40031000 0x1000>;
+        interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
+        clock-names = "sai";
+        clocks = <&clks VF610_CLK_SAI2>;
+        dma-names = "tx", "rx";
+        dmas = <&edma0 0 21>,
+                <&edma0 0 20>;
+        status = "disabled";
+};
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
new file mode 100644
index 000000000000..d75a9d767022
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
@@ -0,0 +1,41 @@
+QCOM BAM DMA controller
+
+Required properties:
+- compatible: must contain "qcom,bam-v1.4.0" for MSM8974
+- reg: Address range for DMA registers
+- interrupts: Should contain the one interrupt shared by all channels
+- #dma-cells: must be <1>, the cell in the dmas property of the client device
+  represents the channel number
+- clocks: required clock
+- clock-names: must contain "bam_clk" entry
+- qcom,ee : indicates the active Execution Environment identifier (0-7) used in
+  the secure world.
+
+Example:
+
+        uart-bam: dma@f9984000 = {
+                compatible = "qcom,bam-v1.4.0";
+                reg = <0xf9984000 0x15000>;
+                interrupts = <0 94 0>;
+                clocks = <&gcc GCC_BAM_DMA_AHB_CLK>;
+                clock-names = "bam_clk";
+                #dma-cells = <1>;
+                qcom,ee = <0>;
+        };
+
+DMA clients must use the format described in the dma.txt file, using a two cell
+specifier for each channel.
+
+Example:
+        serial@f991e000 {
+                compatible = "qcom,msm-uart";
+                reg = <0xf991e000 0x1000>
+                        <0xf9944000 0x19000>;
+                interrupts = <0 108 0>;
+                clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,
+                        <&gcc GCC_BLSP1_AHB_CLK>;
+                clock-names = "core", "iface";
+
+                dmas = <&uart-bam 0>, <&uart-bam 1>;
+                dma-names = "rx", "tx";
+        };
diff --git a/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt b/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt
new file mode 100644
index 000000000000..ecbc96ad36f8
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt
@@ -0,0 +1,43 @@
+* CSR SiRFSoC DMA controller
+
+See dma.txt first
+
+Required properties:
+- compatible: Should be "sirf,prima2-dmac" or "sirf,marco-dmac"
+- reg: Should contain DMA registers location and length.
+- interrupts: Should contain one interrupt shared by all channel
+- #dma-cells: must be <1>. used to represent the number of integer
+    cells in the dmas property of client device.
+- clocks: clock required
+
+Example:
+
+Controller:
+dmac0: dma-controller@b00b0000 {
+        compatible = "sirf,prima2-dmac";
+        reg = <0xb00b0000 0x10000>;
+        interrupts = <12>;
+        clocks = <&clks 24>;
+        #dma-cells = <1>;
+};
+
+
+Client:
+Fill the specific dma request line in dmas. In the below example, spi0 read
+channel request line is 9 of the 2nd dma controller, while write channel uses
+4 of the 2nd dma controller; spi1 read channel request line is 12 of the 1st
+dma controller, while write channel uses 13 of the 1st dma controller:
+
+spi0: spi@b00d0000 {
+        compatible = "sirf,prima2-spi";
+        dmas = <&dmac1 9>,
+                <&dmac1 4>;
+        dma-names = "rx", "tx";
+};
+
+spi1: spi@b0170000 {
+        compatible = "sirf,prima2-spi";
+        dmas = <&dmac0 12>,
+                <&dmac0 13>;
+        dma-names = "rx", "tx";
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-at91.txt b/Documentation/devicetree/bindings/i2c/i2c-at91.txt
index 4fade84bea16..388f0a275fba 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-at91.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-at91.txt
@@ -12,6 +12,7 @@ Required properties :
 - clocks: phandles to input clocks.
 
 Optional properties:
+- clock-frequency: Desired I2C bus frequency in Hz, otherwise defaults to 100000
 - Child nodes conforming to i2c bus binding
 
 Examples :
@@ -23,6 +24,7 @@ i2c0: i2c@fff84000 {
         #address-cells = <1>;
         #size-cells = <0>;
         clocks = <&twi0_clk>;
+        clock-frequency = <400000>;
 
         24c512@50 {
                 compatible = "24c512";
diff --git a/Documentation/devicetree/bindings/i2c/i2c-cadence.txt b/Documentation/devicetree/bindings/i2c/i2c-cadence.txt
new file mode 100644
index 000000000000..7cb0b5608f49
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-cadence.txt
@@ -0,0 +1,24 @@
+Binding for the Cadence I2C controller
+
+Required properties:
+  - reg: Physical base address and size of the controller's register area.
+  - compatible: Compatibility string. Must be 'cdns,i2c-r1p10'.
+  - clocks: Input clock specifier. Refer to common clock bindings.
+  - interrupts: Interrupt specifier. Refer to interrupt bindings.
+  - #address-cells: Should be 1.
+  - #size-cells: Should be 0.
+
+Optional properties:
+  - clock-frequency: Desired operating frequency, in Hz, of the bus.
+  - clock-names: Input clock name, should be 'pclk'.
+
+Example:
+        i2c@e0004000 {
+                compatible = "cdns,i2c-r1p10";
+                clocks = <&clkc 38>;
+                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                reg = <0xe0004000 0x1000>;
+                clock-frequency = <400000>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
index 7fd7fa25e9b0..5199b0c8cf7a 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
@@ -14,6 +14,12 @@ Optional properties :
  - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.
    This option is only supported in hardware blocks version 1.11a or newer.
 
+ - i2c-scl-falling-time : should contain the SCL falling time in nanoseconds.
+   This value which is by default 300ns is used to compute the tLOW period.
+
+ - i2c-sda-falling-time : should contain the SDA falling time in nanoseconds.
+   This value which is by default 300ns is used to compute the tHIGH period.
+
 Example :
 
         i2c@f0000 {
@@ -34,4 +40,6 @@ Example :
                 interrupts = <12 1>;
                 clock-frequency = <400000>;
                 i2c-sda-hold-time-ns = <300>;
+                i2c-sda-falling-time-ns = <300>;
+                i2c-scl-falling-time-ns = <300>;
         };
diff --git a/Documentation/devicetree/bindings/i2c/i2c-efm32.txt b/Documentation/devicetree/bindings/i2c/i2c-efm32.txt
new file mode 100644
index 000000000000..fc15ac519437
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-efm32.txt
@@ -0,0 +1,34 @@
+* Energymicro efm32 i2c controller
+
+Required properties :
+
+ - reg : Offset and length of the register set for the device
+ - compatible : should be "energymicro,efm32-i2c"
+ - interrupts : the interrupt number
+ - clocks : reference to the module clock
+
+Recommended properties :
+
+ - clock-frequency : maximal I2C bus clock frequency in Hz.
+ - efm32,location : Decides the location of the USART I/O pins.
+   Allowed range : [0 .. 6]
+
+Example:
+        i2c0: i2c@4000a000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "energymicro,efm32-i2c";
+                reg = <0x4000a000 0x400>;
+                interrupts = <9>;
+                clocks = <&cmu clk_HFPERCLKI2C0>;
+                clock-frequency = <100000>;
+                status = "ok";
+                efm32,location = <3>;
+
+                eeprom@50 {
+                        compatible = "microchip,24c02";
+                        reg = <0x50>;
+                        pagesize = <16>;
+                };
+        };
+
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
index 582b4652a82a..befd4fb4764f 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
@@ -4,12 +4,16 @@
 Required properties :
 
  - reg             : Offset and length of the register set for the device
- - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"
-                     or "marvell,mv78230-i2c" or "marvell,mv78230-a0-i2c"
-                     Note: Only use "marvell,mv78230-a0-i2c" for a very rare,
-                     initial version of the SoC which had broken offload
-                     support.  Linux auto-detects this and sets it
-                     appropriately.
+ - compatible      : Should be either:
+                     - "allwinner,sun4i-i2c"
+                     - "allwinner,sun6i-a31-i2c"
+                     - "marvell,mv64xxx-i2c"
+                     - "marvell,mv78230-i2c"
+                     - "marvell,mv78230-a0-i2c"
+                       * Note: Only use "marvell,mv78230-a0-i2c" for a
+                         very rare, initial version of the SoC which
+                         had broken offload support.  Linux
+                         auto-detects this and sets it appropriately.
  - interrupts      : The interrupt number
 
 Optional properties :
@@ -17,6 +21,10 @@ Optional properties :
  - clock-frequency : Desired I2C bus clock frequency in Hz. If not set the
 default frequency is 100kHz
 
+ - resets          : phandle to the parent reset controller. Mandatory
+                     whenever you're using the "allwinner,sun6i-a31-i2c"
+                     compatible.
+
 Examples:
 
         i2c@11000 {
diff --git a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt
index 897cfcd5ce92..dd8b2dd1edeb 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt
@@ -6,6 +6,7 @@ Required properties:
         "renesas,i2c-r8a7778"
         "renesas,i2c-r8a7779"
         "renesas,i2c-r8a7790"
+        "renesas,i2c-r8a7791"
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: interrupt specifier.
@@ -13,11 +14,16 @@ Required properties:
 Optional properties:
 - clock-frequency: desired I2C bus clock frequency in Hz. The absence of this
   propoerty indicates the default frequency 100 kHz.
+- clocks: clock specifier.
 
 Examples :
 
-i2c0: i2c@e6500000 {
-        compatible = "renesas,i2c-rcar-h2";
-        reg = <0 0xe6500000 0 0x428>;
-        interrupts = <0 174 0x4>;
+i2c0: i2c@e6508000 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        compatible = "renesas,i2c-r8a7791";
+        reg = <0 0xe6508000 0 0x40>;
+        interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&mstp9_clks R8A7791_CLK_I2C0>;
+        clock-frequency = <400000>;
 };
diff --git a/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt b/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt
new file mode 100644
index 000000000000..dc71754a56af
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt
@@ -0,0 +1,40 @@
+Qualcomm Universal Peripheral (QUP) I2C controller
+
+Required properties:
+ - compatible: Should be:
+   * "qcom,i2c-qup-v1.1.1" for 8660, 8960 and 8064.
+   * "qcom,i2c-qup-v2.1.1" for 8974 v1.
+   * "qcom,i2c-qup-v2.2.1" for 8974 v2 and later.
+ - reg: Should contain QUP register address and length.
+ - interrupts: Should contain I2C interrupt.
+
+ - clocks: A list of phandles + clock-specifiers, one for each entry in
+   clock-names.
+ - clock-names: Should contain:
+   * "core" for the core clock
+   * "iface" for the AHB clock
+
+ - #address-cells: Should be <1> Address cells for i2c device address
+ - #size-cells: Should be <0> as i2c addresses have no size component
+
+Optional properties:
+ - clock-frequency: Should specify the desired i2c bus clock frequency in Hz,
+                    defaults to 100kHz if omitted.
+
+Child nodes should conform to i2c bus binding.
+
+Example:
+
+ i2c@f9924000 {
+        compatible = "qcom,i2c-qup-v2.2.1";
+        reg = <0xf9924000 0x1000>;
+        interrupts = <0 96 0>;
+
+        clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+        clock-names = "core", "iface";
+
+        clock-frequency = <355000>;
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+ };
diff --git a/Documentation/devicetree/bindings/leds/leds-gpio.txt b/Documentation/devicetree/bindings/leds/leds-gpio.txt
index df1b3080f6b8..f77148f372ea 100644
--- a/Documentation/devicetree/bindings/leds/leds-gpio.txt
+++ b/Documentation/devicetree/bindings/leds/leds-gpio.txt
@@ -21,6 +21,8 @@ LED sub-node properties:
   on).  The "keep" setting will keep the LED at whatever its current
   state is, without producing a glitch.  The default is off if this
   property is not present.
+- retain-state-suspended: (optional) The suspend state can be retained.Such
+  as charge-led gpio.
 
 Examples:
 
@@ -50,3 +52,13 @@ run-control {
                 default-state = "on";
         };
 };
+
+leds {
+        compatible = "gpio-leds";
+
+        charger-led {
+                gpios = <&gpio1 2 0>;
+                linux,default-trigger = "max8903-charger-charging";
+                retain-state-suspended;
+        };
+};
diff --git a/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
index abd9e3cb2db7..1413f39912d3 100644
--- a/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+++ b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
@@ -10,9 +10,44 @@ Optional properties:
 - fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used
 
 Sub-nodes:
+- leds : Contain the led nodes and initial register values in property
+  "led-control". Number of register depends of used IC, for MC13783 is 6,
+  for MC13892 is 4, for MC34708 is 1. See datasheet for bits definitions of
+  these registers.
+  - #address-cells: Must be 1.
+  - #size-cells: Must be 0.
+  Each led node should contain "reg", which used as LED ID (described below).
+  Optional properties "label" and "linux,default-trigger" is described in
+  Documentation/devicetree/bindings/leds/common.txt.
 - regulators : Contain the regulator nodes. The regulators are bound using
   their names as listed below with their registers and bits for enabling.
 
+MC13783 LED IDs:
+    0  : Main display
+    1  : AUX display
+    2  : Keypad
+    3  : Red 1
+    4  : Green 1
+    5  : Blue 1
+    6  : Red 2
+    7  : Green 2
+    8  : Blue 2
+    9  : Red 3
+    10 : Green 3
+    11 : Blue 3
+
+MC13892 LED IDs:
+    0  : Main display
+    1  : AUX display
+    2  : Keypad
+    3  : Red
+    4  : Green
+    5  : Blue
+
+MC34708 LED IDs:
+    0  : Charger Red
+    1  : Charger Green
+
 MC13783 regulators:
     sw1a      : regulator SW1A      (register 24, bit 0)
     sw1b      : regulator SW1B      (register 25, bit 0)
@@ -89,6 +124,18 @@ ecspi@70010000 { /* ECSPI1 */
                 interrupt-parent = <&gpio0>;
                 interrupts = <8>;
 
+                leds {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        led-control = <0x000 0x000 0x0e0 0x000>;
+
+                        sysled {
+                                reg = <3>;
+                                label = "system:red:live";
+                                linux,default-trigger = "heartbeat";
+                        };
+                };
+
                 regulators {
                         sw1_reg: mc13892__sw1 {
                                 regulator-min-microvolt = <600000>;
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 458b57f199af..9dce540771fb 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -26,9 +26,18 @@ Optional properties:
   this system, even if the controller claims it is.
 - cap-sd-highspeed: SD high-speed timing is supported
 - cap-mmc-highspeed: MMC high-speed timing is supported
+- sd-uhs-sdr12: SD UHS SDR12 speed is supported
+- sd-uhs-sdr25: SD UHS SDR25 speed is supported
+- sd-uhs-sdr50: SD UHS SDR50 speed is supported
+- sd-uhs-sdr104: SD UHS SDR104 speed is supported
+- sd-uhs-ddr50: SD UHS DDR50 speed is supported
 - cap-power-off-card: powering off the card is safe
 - cap-sdio-irq: enable SDIO IRQ signalling on this interface
 - full-pwr-cycle: full power cycle of the card is supported
+- mmc-highspeed-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported
+- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported
+- mmc-hs200-1_8v: eMMC HS200 mode(1.8V I/O) is supported
+- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
 
 *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
 polarity properties, we have to fix the meaning of the "normal" and "inverted"
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt
new file mode 100644
index 000000000000..81b33b5b20fc
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt
@@ -0,0 +1,55 @@
+* Qualcomm SDHCI controller (sdhci-msm)
+
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci-msm driver.
+
+Required properties:
+- compatible: Should contain "qcom,sdhci-msm-v4".
+- reg: Base address and length of the register in the following order:
+        - Host controller register map (required)
+        - SD Core register map (required)
+- interrupts: Should contain an interrupt-specifiers for the interrupts:
+        - Host controller interrupt (required)
+- pinctrl-names: Should contain only one value - "default".
+- pinctrl-0: Should specify pin control groups used for this controller.
+- clocks: A list of phandle + clock-specifier pairs for the clocks listed in clock-names.
+- clock-names: Should contain the following:
+        "iface" - Main peripheral bus clock (PCLK/HCLK - AHB Bus clock) (required)
+        "core"  - SDC MMC clock (MCLK) (required)
+        "bus"   - SDCC bus voter clock (optional)
+
+Example:
+
+        sdhc_1: sdhci@f9824900 {
+                compatible = "qcom,sdhci-msm-v4";
+                reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
+                interrupts = <0 123 0>;
+                bus-width = <8>;
+                non-removable;
+
+                vmmc = <&pm8941_l20>;
+                vqmmc = <&pm8941_s3>;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&sdc1_clk &sdc1_cmd &sdc1_data>;
+
+                clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>;
+                clock-names = "core", "iface";
+        };
+
+        sdhc_2: sdhci@f98a4900 {
+                compatible = "qcom,sdhci-msm-v4";
+                reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
+                interrupts = <0 125 0>;
+                bus-width = <4>;
+                cd-gpios = <&msmgpio 62 0x1>;
+
+                vmmc = <&pm8941_l21>;
+                vqmmc = <&pm8941_l13>;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data>;
+
+                clocks = <&gcc GCC_SDCC2_APPS_CLK>, <&gcc GCC_SDCC2_AHB_CLK>;
+                clock-names = "core", "iface";
+        };
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
index dbe98a3c183a..86223c3eda90 100644
--- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
@@ -4,7 +4,14 @@ This file documents differences between the core properties in mmc.txt
 and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers.
 
 Required properties:
-- compatible: Should be "mrvl,pxav2-mmc" or "mrvl,pxav3-mmc".
+- compatible: Should be "mrvl,pxav2-mmc", "mrvl,pxav3-mmc" or
+  "marvell,armada-380-sdhci".
+- reg:
+  * for "mrvl,pxav2-mmc" and "mrvl,pxav3-mmc", one register area for
+    the SDHCI registers.
+  * for "marvell,armada-380-sdhci", two register areas. The first one
+    for the SDHCI registers themselves, and the second one for the
+    AXI/Mbus bridge registers of the SDHCI unit.
 
 Optional properties:
 - mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning.
@@ -19,3 +26,11 @@ sdhci@d4280800 {
         non-removable;
         mrvl,clk-delay-cycles = <31>;
 };
+
+sdhci@d8000 {
+        compatible = "marvell,armada-380-sdhci";
+        reg = <0xd8000 0x1000>, <0xdc000 0x100>;
+        interrupts = <0 25 0x4>;
+        clocks = <&gateclk 17>;
+        mrvl,clk-delay-cycles = <0x1F>;
+};
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index 8c8908ab84ba..ce8056116fb0 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -10,6 +10,7 @@ Required properties:
 - compatible:
  Should be "ti,omap2-hsmmc", for OMAP2 controllers
  Should be "ti,omap3-hsmmc", for OMAP3 controllers
+ Should be "ti,omap3-pre-es3-hsmmc" for OMAP3 controllers pre ES3.0
  Should be "ti,omap4-hsmmc", for OMAP4 controllers
 - ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
 
diff --git a/Documentation/devicetree/bindings/regulator/pbias-regulator.txt b/Documentation/devicetree/bindings/regulator/pbias-regulator.txt
new file mode 100644
index 000000000000..32aa26f1e434
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/pbias-regulator.txt
@@ -0,0 +1,27 @@
+PBIAS internal regulator for SD card dual voltage i/o pads on OMAP SoCs.
+
+Required properties:
+- compatible:
+  - "ti,pbias-omap" for OMAP2, OMAP3, OMAP4, OMAP5, DRA7.
+- reg: pbias register offset from syscon base and size of pbias register.
+- syscon : phandle of the system control module
+- regulator-name : should be
+                        pbias_mmc_omap2430 for OMAP2430, OMAP3 SoCs
+                        pbias_sim_omap3 for OMAP3 SoCs
+                        pbias_mmc_omap4 for OMAP4 SoCs
+                        pbias_mmc_omap5 for OMAP5 and DRA7 SoC
+
+Optional properties:
+- Any optional property defined in bindings/regulator/regulator.txt
+
+Example:
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0 0x4>;
+                        syscon = <&omap5_padconf_global>;
+                        pbias_mmc_reg: pbias_mmc_omap5 {
+                                regulator-name = "pbias_mmc_omap5";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
index b93e9a91e30e..3aa4a8f528f4 100644
--- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
@@ -20,15 +20,6 @@ Required properties:
                     have.
 - interrupt-parent: The phandle for the interrupt controller that
                     services interrupts for this device.
-- fsl,mode:         The operating mode for the SSI interface.
-                    "i2s-slave" - I2S mode, SSI is clock slave
-                    "i2s-master" - I2S mode, SSI is clock master
-                    "lj-slave" - left-justified mode, SSI is clock slave
-                    "lj-master" - l.j. mode, SSI is clock master
-                    "rj-slave" - right-justified mode, SSI is clock slave
-                    "rj-master" - r.j., SSI is clock master
-                    "ac97-slave" - AC97 mode, SSI is clock slave
-                    "ac97-master" - AC97 mode, SSI is clock master
 - fsl,playback-dma: Phandle to a node for the DMA channel to use for
                     playback of audio.  This is typically dictated by SOC
                     design.  See the notes below.
@@ -47,6 +38,9 @@ Required properties:
                     be connected together, and SRFS and STFS be connected
                     together.  This would still allow different sample sizes,
                     but not different sample rates.
+ - clocks:          "ipg" - Required clock for the SSI unit
+                    "baud" - Required clock for SSI master mode. Otherwise this
+                      clock is not used
 
 Required are also ac97 link bindings if ac97 is used. See
 Documentation/devicetree/bindings/sound/soc-ac97link.txt for the necessary
@@ -64,6 +58,15 @@ Optional properties:
                     Documentation/devicetree/bindings/dma/dma.txt.
 - dma-names:        Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq
                     is not defined.
+- fsl,mode:         The operating mode for the SSI interface.
+                    "i2s-slave" - I2S mode, SSI is clock slave
+                    "i2s-master" - I2S mode, SSI is clock master
+                    "lj-slave" - left-justified mode, SSI is clock slave
+                    "lj-master" - l.j. mode, SSI is clock master
+                    "rj-slave" - right-justified mode, SSI is clock slave
+                    "rj-master" - r.j., SSI is clock master
+                    "ac97-slave" - AC97 mode, SSI is clock slave
+                    "ac97-master" - AC97 mode, SSI is clock master
 
 Child 'codec' node required properties:
 - compatible:       Compatible list, contains the name of the codec
diff --git a/Documentation/devicetree/bindings/spi/efm32-spi.txt b/Documentation/devicetree/bindings/spi/efm32-spi.txt
index 8f081c96a4fa..130cd17e3680 100644
--- a/Documentation/devicetree/bindings/spi/efm32-spi.txt
+++ b/Documentation/devicetree/bindings/spi/efm32-spi.txt
@@ -8,7 +8,13 @@ Required properties:
 - interrupts: pair specifying rx and tx irq
 - clocks: phandle to the spi clock
 - cs-gpios: see spi-bus.txt
-- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to configure the pinmux for the device, see datasheet for values.
+
+Recommended properties :
+- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to
+                  configure the pinmux for the device, see datasheet for values.
+                  If "efm32,location" property is not provided, keeping what is
+                  already configured in the hardware, so its either the reset
+                  default 0 or whatever the bootloader did.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt b/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt
new file mode 100644
index 000000000000..321be6640533
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt
@@ -0,0 +1,16 @@
+gpio-backlight bindings
+
+Required properties:
+  - compatible: "gpio-backlight"
+  - gpios: describes the gpio that is used for enabling/disabling the backlight.
+    refer to bindings/gpio/gpio.txt for more details.
+
+Optional properties:
+  - default-on: enable the backlight at boot.
+
+Example:
+        backlight {
+                compatible = "gpio-backlight";
+                gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+                default-on;
+        };
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b89a739a3276..9de9813d0ec5 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -1,5 +1,6 @@
 *.a
 *.aux
+*.bc
 *.bin
 *.bz2
 *.cis
@@ -21,6 +22,7 @@
 *.i
 *.jpeg
 *.ko
+*.ll
 *.log
 *.lst
 *.lzma
@@ -35,6 +37,7 @@
 *.out
 *.patch
 *.pdf
+*.plist
 *.png
 *.pot
 *.ps
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index efca5c1bbb10..eba790134253 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -202,7 +202,7 @@ prototypes:
                                 unsigned long *);
         int (*migratepage)(struct address_space *, struct page *, struct page *);
         int (*launder_page)(struct page *);
-        int (*is_partially_uptodate)(struct page *, read_descriptor_t *, unsigned long);
+        int (*is_partially_uptodate)(struct page *, unsigned long, unsigned long);
         int (*error_remove_page)(struct address_space *, struct page *);
         int (*swap_activate)(struct file *);
         int (*swap_deactivate)(struct file *);
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 94eb86287bcb..617f6d70c077 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -596,7 +596,7 @@ struct address_space_operations {
         /* migrate the contents of a page to the specified target */
         int (*migratepage) (struct page *, struct page *);
         int (*launder_page) (struct page *);
-        int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+        int (*is_partially_uptodate) (struct page *, unsigned long,
                                         unsigned long);
         void (*is_dirty_writeback) (struct page *, bool *, bool *);
         int (*error_remove_page) (struct mapping *mapping, struct page *page);
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index aaaf069306a3..adf5e33e8312 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -26,6 +26,7 @@ Supported adapters:
   * Intel Wellsburg (PCH)
   * Intel Coleto Creek (PCH)
   * Intel Wildcat Point-LP (PCH)
+  * Intel BayTrail (SOC)
    Datasheets: Publicly available at the Intel website
 
 On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/Documentation/i2c/functionality b/Documentation/i2c/functionality
index b0ff2ab596ce..4556a3eb87c4 100644
--- a/Documentation/i2c/functionality
+++ b/Documentation/i2c/functionality
@@ -46,7 +46,7 @@ A few combinations of the above flags are also defined for your convenience:
                                   and write_block_data commands
   I2C_FUNC_SMBUS_I2C_BLOCK        Handles the SMBus read_i2c_block_data
                                   and write_i2c_block_data commands
-  I2C_FUNC_SMBUS_EMUL             Handles all SMBus commands than can be
+  I2C_FUNC_SMBUS_EMUL             Handles all SMBus commands that can be
                                   emulated by a real I2C adapter (using
                                   the transparent emulation layer)
 
diff --git a/Documentation/i2c/i2c-protocol b/Documentation/i2c/i2c-protocol
index 0b3e62d1f77a..ff6d6cee6c7e 100644
--- a/Documentation/i2c/i2c-protocol
+++ b/Documentation/i2c/i2c-protocol
@@ -6,8 +6,8 @@ Key to symbols
 S     (1 bit) : Start bit
 P     (1 bit) : Stop bit
 Rd/Wr (1 bit) : Read/Write bit. Rd equals 1, Wr equals 0.
-A, NA (1 bit) : Accept and reverse accept bit. 
-Addr  (7 bits): I2C 7 bit address. Note that this can be expanded as usual to 
+A, NA (1 bit) : Accept and reverse accept bit.
+Addr  (7 bits): I2C 7 bit address. Note that this can be expanded as usual to
                 get a 10 bit I2C address.
 Comm  (8 bits): Command byte, a data byte which often selects a register on
                 the device.
@@ -49,11 +49,20 @@ a byte read, followed by a byte write:
 Modified transactions
 =====================
 
-The following modifications to the I2C protocol can also be generated,
-with the exception of I2C_M_NOSTART these are usually only needed to
-work around device issues:
+The following modifications to the I2C protocol can also be generated by
+setting these flags for i2c messages. With the exception of I2C_M_NOSTART, they
+are usually only needed to work around device issues:
 
-  Flag I2C_M_NOSTART: 
+I2C_M_IGNORE_NAK:
+    Normally message is interrupted immediately if there is [NA] from the
+    client. Setting this flag treats any [NA] as [A], and all of
+    message is sent.
+    These messages may still fail to SCL lo->hi timeout.
+
+I2C_M_NO_RD_ACK:
+    In a read message, master A/NA bit is skipped.
+
+I2C_M_NOSTART:
     In a combined transaction, no 'S Addr Wr/Rd [A]' is generated at some
     point. For example, setting I2C_M_NOSTART on the second partial message
     generates something like:
@@ -67,17 +76,13 @@ work around device issues:
     I2C device but may also be used between direction changes by some
     rare devices.
 
-  Flags I2C_M_REV_DIR_ADDR
+I2C_M_REV_DIR_ADDR:
     This toggles the Rd/Wr flag. That is, if you want to do a write, but
     need to emit an Rd instead of a Wr, or vice versa, you set this
     flag. For example:
       S Addr Rd [A] Data [A] Data [A] ... [A] Data [A] P
 
-  Flags I2C_M_IGNORE_NAK
-    Normally message is interrupted immediately if there is [NA] from the
-    client. Setting this flag treats any [NA] as [A], and all of
-    message is sent.
-    These messages may still fail to SCL lo->hi timeout.
-
-  Flags I2C_M_NO_RD_ACK
-    In a read message, master A/NA bit is skipped.
+I2C_M_STOP:
+    Force a stop condition (P) after the message. Some I2C related protocols
+    like SCCB require that. Normally, you really don't want to get interrupted
+    between the messages of one transfer.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b6c67d592be5..03e50b4883a8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2563,6 +2563,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         pcmv=           [HW,PCMCIA] BadgePAD 4
 
+        pd_ignore_unused
+                        [PM]
+                        Keep all power-domains already enabled by bootloader on,
+                        even if no driver has claimed them. This is useful
+                        for debug and development, but should not be
+                        needed on a platform with proper driver support.
+
         pd.             [PARIDE]
                         See Documentation/blockdev/paride.txt.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 7faf31001437..6dc67b1fdb50 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1427,6 +1427,7 @@ F:	drivers/cpuidle/cpuidle-zynq.c
 N:      zynq
 N:      xilinx
 F:      drivers/clocksource/cadence_ttc_timer.c
+F:      drivers/i2c/busses/i2c-cadence.c
 F:      drivers/mmc/host/sdhci-of-arasan.c
 
 ARM SMMU DRIVER
@@ -4308,7 +4309,8 @@ F:	drivers/i2c/i2c-stub.c
 I2C SUBSYSTEM
 M:      Wolfram Sang <wsa@the-dreams.de>
 L:      linux-i2c@vger.kernel.org
-W:      http://i2c.wiki.kernel.org/
+W:      https://i2c.wiki.kernel.org/
+Q:      https://patchwork.ozlabs.org/project/linux-i2c/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 S:      Maintained
 F:      Documentation/i2c/
@@ -5930,6 +5932,7 @@ F:	include/linux/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 M:      Chris Ball <chris@printf.net>
+M:      Ulf Hansson <ulf.hansson@linaro.org>
 L:      linux-mmc@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 S:      Maintained
@@ -6540,7 +6543,7 @@ F:	drivers/net/wireless/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:      Boaz Harrosh <bharrosh@panasas.com>
-M:      Benny Halevy <bhalevy@tonian.com>
+M:      Benny Halevy <bhalevy@primarydata.com>
 L:      osd-dev@open-osd.org
 W:      http://open-osd.org
 T:      git git://git.open-osd.org/open-osd.git
diff --git a/Makefile b/Makefile
index cf3e07516a04..e709613d68e5 100644
--- a/Makefile
+++ b/Makefile
@@ -248,6 +248,11 @@ HOSTCXX      = g++
 HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
 HOSTCXXFLAGS = -O2
 
+ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
+HOSTCFLAGS  += -Wno-unused-value -Wno-unused-parameter \
+                -Wno-missing-field-initializers -fno-delete-null-pointer-checks
+endif
+
 # Decide whether to build built-in, modular, or both.
 # Normally, just do built-in.
 
@@ -324,6 +329,14 @@ endif
 
 export quiet Q KBUILD_VERBOSE
 
+ifneq ($(CC),)
+ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
+COMPILER := clang
+else
+COMPILER := gcc
+endif
+export COMPILER
+endif
 
 # Look for make include files relative to root of kernel src
 MAKEFLAGS += --include-dir=$(srctree)
@@ -383,7 +396,7 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                    -fno-strict-aliasing -fno-common \
                    -Werror-implicit-function-declaration \
                    -Wno-format-security \
-                   -fno-delete-null-pointer-checks
+                   $(call cc-option,-fno-delete-null-pointer-checks,)
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
 KBUILD_AFLAGS   := -D__ASSEMBLY__
@@ -415,8 +428,9 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve
 
 # Files to ignore in find ... statements
 
-RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
-                   -o -name .pc -o -name .hg -o -name .git \) -prune -o
+export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o    \
+                          -name CVS -o -name .pc -o -name .hg -o -name .git \) \
+                          -prune -o
 export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
                          --exclude CVS --exclude .pc --exclude .hg --exclude .git
 
@@ -623,9 +637,24 @@ endif
 endif
 KBUILD_CFLAGS += $(stackp-flag)
 
+ifeq ($(COMPILER),clang)
+KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
+KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)
+KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
+KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
+KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
+# Quiet clang warning: comparison of unsigned expression < 0 is always false
+KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
+# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
+# source of a reference will be _MergedGlobals and not on of the whitelisted names.
+# See modpost pattern 2
+KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
+else
+
 # This warning generated too much noise in a regular build.
 # Use make W=1 to enable this warning (see scripts/Makefile.build)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
+endif
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS   += -fno-omit-frame-pointer -fno-optimize-sibling-calls
@@ -1075,7 +1104,7 @@ CLEAN_DIRS  += $(MODVERDIR)
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated          \
-                  arch/*/include/generated
+                  arch/*/include/generated .tmp_objdiff
 MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
                   Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
                   signing_key.priv signing_key.x509 x509.genkey         \
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index f6c6b345388c..b7ff9a318c31 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -22,6 +22,7 @@ config ALPHA
         select GENERIC_SMP_IDLE_THREAD
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
+        select HAVE_ARCH_AUDITSYSCALL
         select HAVE_MOD_ARCH_SPECIFIC
         select MODULES_USE_ELF_RELA
         select ODD_RT_SIGACTION
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5db05f6a0412..ab438cb5af55 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -24,6 +24,7 @@ config ARM
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select HARDIRQS_SW_RESEND
+        select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
         select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 55d3f79c2ef5..9d72674049d6 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -271,6 +271,7 @@
                                 reg = <0xb00b0000 0x10000>;
                                 interrupts = <12>;
                                 clocks = <&clks 24>;
+                                #dma-cells = <1>;
                         };
 
                         dmac1: dma-controller@b0160000 {
@@ -279,6 +280,7 @@
                                 reg = <0xb0160000 0x10000>;
                                 interrupts = <13>;
                                 clocks = <&clks 25>;
+                                #dma-cells = <1>;
                         };
 
                         vip@b00C0000 {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 9e3caf3d19fb..1c0f8e1893ae 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -154,6 +154,22 @@
                         ti,hwmods = "counter_32k";
                 };
 
+                dra7_ctrl_general: tisyscon@4a002e00 {
+                        compatible = "syscon";
+                        reg = <0x4a002e00 0x7c>;
+                };
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0 0x4>;
+                        syscon = <&dra7_ctrl_general>;
+                        pbias_mmc_reg: pbias_mmc_omap5 {
+                                regulator-name = "pbias_mmc_omap5";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+                };
+
                 dra7_pmx_core: pinmux@4a003400 {
                         compatible = "pinctrl-single";
                         reg = <0x4a003400 0x0464>;
@@ -543,6 +559,7 @@
                         dmas = <&sdma 61>, <&sdma 62>;
                         dma-names = "tx", "rx";
                         status = "disabled";
+                        pbias-supply = <&pbias_mmc_reg>;
                 };
 
                 mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 9d2f028fd687..d09697dab55e 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -29,6 +29,22 @@
                         pinctrl-single,function-mask = <0x3f>;
                 };
 
+                omap2_scm_general: tisyscon@49002270 {
+                        compatible = "syscon";
+                        reg = <0x49002270 0x240>;
+                };
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0x230 0x4>;
+                        syscon = <&omap2_scm_general>;
+                        pbias_mmc_reg: pbias_mmc_omap2430 {
+                                regulator-name = "pbias_mmc_omap2430";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+                };
+
                 gpio1: gpio@4900c000 {
                         compatible = "ti,omap2-gpio";
                         reg = <0x4900c000 0x200>;
@@ -188,6 +204,7 @@
                         ti,dual-volt;
                         dmas = <&sdma 61>, <&sdma 62>;
                         dma-names = "tx", "rx";
+                        pbias-supply = <&pbias_mmc_reg>;
                 };
 
                 mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index ddce0d807f70..0abe986a4ecc 100644
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -174,8 +174,20 @@
 };
 
 &mmc1 {
+        /* See 35xx errata 2.1.1.128 in SPRZ278F */
+        compatible = "ti,omap3-pre-es3-hsmmc";
         vmmc-supply = <&vmmc1>;
         bus-width = <4>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+        status="disabled";
+};
+
+&mmc3 {
+        status="disabled";
 };
 
 &omap3_pmx_core {
@@ -209,6 +221,17 @@
                         0x174 (PIN_OUTPUT | MUX_MODE0)  /* hsusb0_stp.hsusb0_stp */
                 >;
         };
+
+        mmc1_pins: pinmux_mmc1_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.mmc1_clk */
+                        OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc1_cmd */
+                        OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.mmc1_dat0 */
+                        OMAP3_CORE1_IOPAD(0x214A, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.mmc1_dat1 */
+                        OMAP3_CORE1_IOPAD(0x214C, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.mmc1_dat2 */
+                        OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.mmc1_dat3 */
+                >;
+        };
 };
 
 &usb_otg_hs {
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 3d05eff67e25..5e5790f631eb 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -181,6 +181,22 @@
                         pinctrl-single,function-mask = <0xff1f>;
                 };
 
+                omap3_scm_general: tisyscon@48002270 {
+                        compatible = "syscon";
+                        reg = <0x48002270 0x2f0>;
+                };
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0x2b0 0x4>;
+                        syscon = <&omap3_scm_general>;
+                        pbias_mmc_reg: pbias_mmc_omap2430 {
+                                regulator-name = "pbias_mmc_omap2430";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+                };
+
                 gpio1: gpio@48310000 {
                         compatible = "ti,omap3-gpio";
                         reg = <0x48310000 0x200>;
@@ -395,6 +411,7 @@
                         ti,dual-volt;
                         dmas = <&sdma 61>, <&sdma 62>;
                         dma-names = "tx", "rx";
+                        pbias-supply = <&pbias_mmc_reg>;
                 };
 
                 mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2b4c1cbbce33..27fcac874742 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -191,6 +191,22 @@
                         pinctrl-single,function-mask = <0x7fff>;
                 };
 
+                omap4_padconf_global: tisyscon@4a1005a0 {
+                        compatible = "syscon";
+                        reg = <0x4a1005a0 0x170>;
+                };
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0x60 0x4>;
+                        syscon = <&omap4_padconf_global>;
+                        pbias_mmc_reg: pbias_mmc_omap4 {
+                                regulator-name = "pbias_mmc_omap4";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+                };
+
                 sdma: dma-controller@4a056000 {
                         compatible = "ti,omap4430-sdma";
                         reg = <0x4a056000 0x1000>;
@@ -427,6 +443,7 @@
                         ti,needs-special-reset;
                         dmas = <&sdma 61>, <&sdma 62>;
                         dma-names = "tx", "rx";
+                        pbias-supply = <&pbias_mmc_reg>;
                 };
 
                 mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 19155bb84835..6f3de22fb266 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -198,6 +198,22 @@
                         pinctrl-single,function-mask = <0x7fff>;
                 };
 
+                omap5_padconf_global: tisyscon@4a002da0 {
+                        compatible = "syscon";
+                        reg = <0x4A002da0 0xec>;
+                };
+
+                pbias_regulator: pbias_regulator {
+                        compatible = "ti,pbias-omap";
+                        reg = <0x60 0x4>;
+                        syscon = <&omap5_padconf_global>;
+                        pbias_mmc_reg: pbias_mmc_omap5 {
+                                regulator-name = "pbias_mmc_omap5";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+                };
+
                 sdma: dma-controller@4a056000 {
                         compatible = "ti,omap4430-sdma";
                         reg = <0x4a056000 0x1000>;
@@ -480,6 +496,7 @@
                         ti,needs-special-reset;
                         dmas = <&sdma 61>, <&sdma 62>;
                         dma-names = "tx", "rx";
+                        pbias-supply = <&pbias_mmc_reg>;
                 };
 
                 mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 20145526cd7b..1e82571d6823 100644
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -287,6 +287,7 @@
                                 reg = <0xb00b0000 0x10000>;
                                 interrupts = <12>;
                                 clocks = <&clks 24>;
+                                #dma-cells = <1>;
                         };
 
                         dmac1: dma-controller@b0160000 {
@@ -295,6 +296,7 @@
                                 reg = <0xb0160000 0x10000>;
                                 interrupts = <13>;
                                 clocks = <&clks 25>;
+                                #dma-cells = <1>;
                         };
 
                         vip@b00C0000 {
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 364ba38e40f3..a9667957b757 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -170,6 +170,7 @@ CONFIG_DRA752_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
+CONFIG_MFD_SYSCON=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65217=y
 CONFIG_MFD_TPS65910=y
@@ -181,6 +182,7 @@ CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_PBIAS=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 380ac4f20000..b974184f9941 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -23,6 +23,7 @@
 #include <asm/ptrace.h>
 #include <asm/domain.h>
 #include <asm/opcodes-virt.h>
+#include <asm/asm-offsets.h>
 
 #define IOMEM(x)        (x)
 
@@ -174,6 +175,47 @@
         restore_irqs_notrace \oldcpsr
         .endm
 
+/*
+ * Get current thread_info.
+ */
+        .macro  get_thread_info, rd
+ ARM(   mov     \rd, sp, lsr #13        )
+ THUMB( mov     \rd, sp                 )
+ THUMB( lsr     \rd, \rd, #13           )
+        mov     \rd, \rd, lsl #13
+        .endm
+
+/*
+ * Increment/decrement the preempt count.
+ */
+#ifdef CONFIG_PREEMPT_COUNT
+        .macro  inc_preempt_count, ti, tmp
+        ldr     \tmp, [\ti, #TI_PREEMPT]        @ get preempt count
+        add     \tmp, \tmp, #1                  @ increment it
+        str     \tmp, [\ti, #TI_PREEMPT]
+        .endm
+
+        .macro  dec_preempt_count, ti, tmp
+        ldr     \tmp, [\ti, #TI_PREEMPT]        @ get preempt count
+        sub     \tmp, \tmp, #1                  @ decrement it
+        str     \tmp, [\ti, #TI_PREEMPT]
+        .endm
+
+        .macro  dec_preempt_count_ti, ti, tmp
+        get_thread_info \ti
+        dec_preempt_count \ti, \tmp
+        .endm
+#else
+        .macro  inc_preempt_count, ti, tmp
+        .endm
+
+        .macro  dec_preempt_count, ti, tmp
+        .endm
+
+        .macro  dec_preempt_count_ti, ti, tmp
+        .endm
+#endif
+
 #define USER(x...)                              \
 9999:   x;                                      \
         .pushsection __ex_table,"a";            \
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index 42f0889f0584..c651e3b26ec7 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -221,4 +221,23 @@ static inline int cpu_is_xsc3(void)
 #define cpu_is_xscale() 1
 #endif
 
+/*
+ * Marvell's PJ4 core is based on V7 version. It has some modification
+ * for coprocessor setting. For this reason, we need a way to distinguish
+ * it.
+ */
+#ifndef CONFIG_CPU_PJ4
+#define cpu_is_pj4()    0
+#else
+static inline int cpu_is_pj4(void)
+{
+        unsigned int id;
+
+        id = read_cpuid_id();
+        if ((id & 0xfffffff0) == 0x562f5840)
+                return 1;
+
+        return 0;
+}
+#endif
 #endif
diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
index 73ddd7239b33..4651f6999b7d 100644
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -7,7 +7,7 @@
 #ifndef _ASM_ARM_SYSCALL_H
 #define _ASM_ARM_SYSCALL_H
 
-#include <linux/audit.h> /* for AUDIT_ARCH_* */
+#include <uapi/linux/audit.h> /* for AUDIT_ARCH_* */
 #include <linux/elf.h> /* for ELF_EM */
 #include <linux/err.h>
 #include <linux/sched.h>
@@ -103,8 +103,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
         memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));
 }
 
-static inline int syscall_get_arch(struct task_struct *task,
-                                   struct pt_regs *regs)
+static inline int syscall_get_arch(void)
 {
         /* ARM tasks don't change audit architectures on the fly. */
         return AUDIT_ARCH_ARM;
diff --git a/arch/arm/kernel/crash_dump.c b/arch/arm/kernel/crash_dump.c
index 90c50d4b43f7..5d1286d51154 100644
--- a/arch/arm/kernel/crash_dump.c
+++ b/arch/arm/kernel/crash_dump.c
@@ -39,7 +39,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
         if (!csize)
                 return 0;
 
-        vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
+        vaddr = ioremap(__pfn_to_phys(pfn), PAGE_SIZE);
         if (!vaddr)
                 return -ENOMEM;
 
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 39f89fbd5111..1420725142ca 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -236,11 +236,6 @@
         movs    pc, lr                          @ return & move spsr_svc into cpsr
         .endm
 
-        .macro  get_thread_info, rd
-        mov     \rd, sp, lsr #13
-        mov     \rd, \rd, lsl #13
-        .endm
-
         @
         @ 32-bit wide "mov pc, reg"
         @
@@ -306,12 +301,6 @@
         .endm
 #endif  /* ifdef CONFIG_CPU_V7M / else */
 
-        .macro  get_thread_info, rd
-        mov     \rd, sp
-        lsr     \rd, \rd, #13
-        mov     \rd, \rd, lsl #13
-        .endm
-
         @
         @ 32-bit wide "mov pc, reg"
         @
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/kernel/kprobes-common.c
index c311ed94ff1c..0bf5d64eba1d 100644
--- a/arch/arm/kernel/kprobes-common.c
+++ b/arch/arm/kernel/kprobes-common.c
@@ -13,6 +13,7 @@
 
 #include <linux/kernel.h>
 #include <linux/kprobes.h>
+#include <asm/opcodes.h>
 
 #include "kprobes.h"
 
@@ -153,7 +154,8 @@ kprobe_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi,
 
         if (handler) {
                 /* We can emulate the instruction in (possibly) modified form */
-                asi->insn[0] = (insn & 0xfff00000) | (rn << 16) | reglist;
+                asi->insn[0] = __opcode_to_mem_arm((insn & 0xfff00000) |
+                                                   (rn << 16) | reglist);
                 asi->insn_handler = handler;
                 return INSN_GOOD;
         }
diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/kernel/kprobes-test-arm.c
index 87839de77e5f..9db4b659d03e 100644
--- a/arch/arm/kernel/kprobes-test-arm.c
+++ b/arch/arm/kernel/kprobes-test-arm.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/system_info.h>
+#include <asm/opcodes.h>
 
 #include "kprobes-test.h"
 
@@ -159,9 +160,9 @@ void kprobe_arm_test_cases(void)
         TEST_SUPPORTED("cmp     sp, #0x1000");
 
         /* Data-processing with PC as shift*/
-        TEST_UNSUPPORTED(".word 0xe15c0f1e      @ cmp   r12, r14, asl pc")
-        TEST_UNSUPPORTED(".word 0xe1a0cf1e      @ mov   r12, r14, asl pc")
-        TEST_UNSUPPORTED(".word 0xe08caf1e      @ add   r10, r12, r14, asl pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe15c0f1e) "       @ cmp   r12, r14, asl pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe1a0cf1e) "       @ mov   r12, r14, asl pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe08caf1e) "       @ add   r10, r12, r14, asl pc")
 
         /* Data-processing with PC as shift*/
         TEST_UNSUPPORTED("movs  pc, r1")
@@ -203,7 +204,7 @@ void kprobe_arm_test_cases(void)
         TEST("mrs       r0, cpsr")
         TEST("mrspl     r7, cpsr")
         TEST("mrs       r14, cpsr")
-        TEST_UNSUPPORTED(".word 0xe10ff000      @ mrs r15, cpsr")
+        TEST_UNSUPPORTED(__inst_arm(0xe10ff000) "       @ mrs r15, cpsr")
         TEST_UNSUPPORTED("mrs   r0, spsr")
         TEST_UNSUPPORTED("mrs   lr, spsr")
 
@@ -219,8 +220,8 @@ void kprobe_arm_test_cases(void)
         TEST_R("clzeq   r7, r",14,0x1,"")
         TEST_R("clz     lr, r",7, 0xffffffff,"")
         TEST(  "clz     r4, sp")
-        TEST_UNSUPPORTED(".word 0x016fff10      @ clz pc, r0")
-        TEST_UNSUPPORTED(".word 0x016f0f1f      @ clz r0, pc")
+        TEST_UNSUPPORTED(__inst_arm(0x016fff10) "       @ clz pc, r0")
+        TEST_UNSUPPORTED(__inst_arm(0x016f0f1f) "       @ clz r0, pc")
 
 #if __LINUX_ARM_ARCH__ >= 6
         TEST_UNSUPPORTED("bxj   r0")
@@ -229,7 +230,7 @@ void kprobe_arm_test_cases(void)
         TEST_BF_R("blx  r",0,2f,"")
         TEST_BB_R("blx  r",7,2f,"")
         TEST_BF_R("blxeq        r",14,2f,"")
-        TEST_UNSUPPORTED(".word 0x0120003f      @ blx pc")
+        TEST_UNSUPPORTED(__inst_arm(0x0120003f) "       @ blx pc")
 
         TEST_RR(   "qadd        r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(   "qaddvs      lr, r",9, VAL2,", r",8, VAL1,"")
@@ -243,190 +244,190 @@ void kprobe_arm_test_cases(void)
         TEST_RR(   "qdsub       r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(   "qdsubvs     lr, r",9, VAL2,", r",8, VAL1,"")
         TEST_R(    "qdsub       lr, r",9, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe101f050      @ qadd pc, r0, r1")
-        TEST_UNSUPPORTED(".word 0xe121f050      @ qsub pc, r0, r1")
-        TEST_UNSUPPORTED(".word 0xe141f050      @ qdadd pc, r0, r1")
-        TEST_UNSUPPORTED(".word 0xe161f050      @ qdsub pc, r0, r1")
-        TEST_UNSUPPORTED(".word 0xe16f2050      @ qdsub r2, r0, pc")
-        TEST_UNSUPPORTED(".word 0xe161205f      @ qdsub r2, pc, r1")
+        TEST_UNSUPPORTED(__inst_arm(0xe101f050) "       @ qadd pc, r0, r1")
+        TEST_UNSUPPORTED(__inst_arm(0xe121f050) "       @ qsub pc, r0, r1")
+        TEST_UNSUPPORTED(__inst_arm(0xe141f050) "       @ qdadd pc, r0, r1")
+        TEST_UNSUPPORTED(__inst_arm(0xe161f050) "       @ qdsub pc, r0, r1")
+        TEST_UNSUPPORTED(__inst_arm(0xe16f2050) "       @ qdsub r2, r0, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe161205f) "       @ qdsub r2, pc, r1")
 
         TEST_UNSUPPORTED("bkpt  0xffff")
         TEST_UNSUPPORTED("bkpt  0x0000")
 
-        TEST_UNSUPPORTED(".word 0xe1600070 @ smc #0")
+        TEST_UNSUPPORTED(__inst_arm(0xe1600070) " @ smc #0")
 
         TEST_GROUP("Halfword multiply and multiply-accumulate")
 
         TEST_RRR(    "smlabb    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlabbge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlabb    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe10f3281 @ smlabb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe10f3281) " @ smlabb pc, r1, r2, r3")
         TEST_RRR(    "smlatb    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlatbge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlatb    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe10f32a1 @ smlatb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe10f32a1) " @ smlatb pc, r1, r2, r3")
         TEST_RRR(    "smlabt    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlabtge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlabt    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe10f32c1 @ smlabt pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe10f32c1) " @ smlabt pc, r1, r2, r3")
         TEST_RRR(    "smlatt    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlattge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlatt    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe10f32e1 @ smlatt pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe10f32e1) " @ smlatt pc, r1, r2, r3")
 
         TEST_RRR(    "smlawb    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlawbge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlawb    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe12f3281 @ smlawb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe12f3281) " @ smlawb pc, r1, r2, r3")
         TEST_RRR(    "smlawt    r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "smlawtge  r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "smlawt    lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe12f32c1 @ smlawt pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe12032cf @ smlawt r0, pc, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe1203fc1 @ smlawt r0, r1, pc, r3")
-        TEST_UNSUPPORTED(".word 0xe120f2c1 @ smlawt r0, r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe12f32c1) " @ smlawt pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe12032cf) " @ smlawt r0, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe1203fc1) " @ smlawt r0, r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe120f2c1) " @ smlawt r0, r1, r2, pc")
 
         TEST_RR(    "smulwb     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smulwbge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smulwb     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe12f02a1 @ smulwb pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe12f02a1) " @ smulwb pc, r1, r2")
         TEST_RR(    "smulwt     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smulwtge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smulwt     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe12f02e1 @ smulwt pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe12f02e1) " @ smulwt pc, r1, r2")
 
         TEST_RRRR(  "smlalbb    r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlalbble  r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlalbb    r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe14f1382 @ smlalbb pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe141f382 @ smlalbb r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe14f1382) " @ smlalbb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe141f382) " @ smlalbb r1, pc, r2, r3")
         TEST_RRRR(  "smlaltb    r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlaltble  r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlaltb    r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe14f13a2 @ smlaltb pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe141f3a2 @ smlaltb r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe14f13a2) " @ smlaltb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe141f3a2) " @ smlaltb r1, pc, r2, r3")
         TEST_RRRR(  "smlalbt    r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlalbtle  r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlalbt    r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe14f13c2 @ smlalbt pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe141f3c2 @ smlalbt r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe14f13c2) " @ smlalbt pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe141f3c2) " @ smlalbt r1, pc, r2, r3")
         TEST_RRRR(  "smlaltt    r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlalttle  r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlaltt    r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe14f13e2 @ smlalbb pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe140f3e2 @ smlalbb r0, pc, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe14013ef @ smlalbb r0, r1, pc, r3")
-        TEST_UNSUPPORTED(".word 0xe1401fe2 @ smlalbb r0, r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe14f13e2) " @ smlalbb pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe140f3e2) " @ smlalbb r0, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe14013ef) " @ smlalbb r0, r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe1401fe2) " @ smlalbb r0, r1, r2, pc")
 
         TEST_RR(    "smulbb     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smulbbge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smulbb     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe16f0281 @ smulbb pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe16f0281) " @ smulbb pc, r1, r2")
         TEST_RR(    "smultb     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smultbge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smultb     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe16f02a1 @ smultb pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe16f02a1) " @ smultb pc, r1, r2")
         TEST_RR(    "smulbt     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smulbtge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smulbt     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe16f02c1 @ smultb pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe16f02c1) " @ smultb pc, r1, r2")
         TEST_RR(    "smultt     r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "smulttge   r7, r",8, VAL3,", r",9, VAL1,"")
         TEST_R(     "smultt     lr, r",1, VAL2,", r13")
-        TEST_UNSUPPORTED(".word 0xe16f02e1 @ smultt pc, r1, r2")
-        TEST_UNSUPPORTED(".word 0xe16002ef @ smultt r0, pc, r2")
-        TEST_UNSUPPORTED(".word 0xe1600fe1 @ smultt r0, r1, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe16f02e1) " @ smultt pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe16002ef) " @ smultt r0, pc, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe1600fe1) " @ smultt r0, r1, pc")
 
         TEST_GROUP("Multiply and multiply-accumulate")
 
         TEST_RR(    "mul        r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "mulls      r7, r",8, VAL2,", r",9, VAL2,"")
         TEST_R(     "mul        lr, r",4, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe00f0291 @ mul pc, r1, r2")
-        TEST_UNSUPPORTED(".word 0xe000029f @ mul r0, pc, r2")
-        TEST_UNSUPPORTED(".word 0xe0000f91 @ mul r0, r1, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe00f0291) " @ mul pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe000029f) " @ mul r0, pc, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe0000f91) " @ mul r0, r1, pc")
         TEST_RR(    "muls       r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "mullss     r7, r",8, VAL2,", r",9, VAL2,"")
         TEST_R(     "muls       lr, r",4, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe01f0291 @ muls pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_arm(0xe01f0291) " @ muls pc, r1, r2")
 
         TEST_RRR(    "mla       r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "mlahi     r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "mla       lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe02f3291 @ mla pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe02f3291) " @ mla pc, r1, r2, r3")
         TEST_RRR(    "mlas      r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(    "mlahis    r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(     "mlas      lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe03f3291 @ mlas pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe03f3291) " @ mlas pc, r1, r2, r3")
 
 #if __LINUX_ARM_ARCH__ >= 6
         TEST_RR(  "umaal        r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(  "umaalls      r7, r8, r",9, VAL2,", r",10, VAL1,"")
         TEST_R(   "umaal        lr, r12, r",11,VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe041f392 @ umaal pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe04f0392 @ umaal r0, pc, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0500090 @ undef")
-        TEST_UNSUPPORTED(".word 0xe05fff9f @ undef")
+        TEST_UNSUPPORTED(__inst_arm(0xe041f392) " @ umaal pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe04f0392) " @ umaal r0, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0500090) " @ undef")
+        TEST_UNSUPPORTED(__inst_arm(0xe05fff9f) " @ undef")
 #endif
 
 #if __LINUX_ARM_ARCH__ >= 7
         TEST_RRR(  "mls         r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(  "mlshi       r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
         TEST_RR(   "mls         lr, r",1, VAL2,", r",2, VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe06f3291 @ mls pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe060329f @ mls r0, pc, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0603f91 @ mls r0, r1, pc, r3")
-        TEST_UNSUPPORTED(".word 0xe060f291 @ mls r0, r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe06f3291) " @ mls pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe060329f) " @ mls r0, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0603f91) " @ mls r0, r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe060f291) " @ mls r0, r1, r2, pc")
 #endif
 
-        TEST_UNSUPPORTED(".word 0xe0700090 @ undef")
-        TEST_UNSUPPORTED(".word 0xe07fff9f @ undef")
+        TEST_UNSUPPORTED(__inst_arm(0xe0700090) " @ undef")
+        TEST_UNSUPPORTED(__inst_arm(0xe07fff9f) " @ undef")
 
         TEST_RR(  "umull        r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(  "umullls      r7, r8, r",9, VAL2,", r",10, VAL1,"")
         TEST_R(   "umull        lr, r12, r",11,VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe081f392 @ umull pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe08f1392 @ umull r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe081f392) " @ umull pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe08f1392) " @ umull r1, pc, r2, r3")
         TEST_RR(  "umulls       r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(  "umulllss     r7, r8, r",9, VAL2,", r",10, VAL1,"")
         TEST_R(   "umulls       lr, r12, r",11,VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe091f392 @ umulls pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe09f1392 @ umulls r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe091f392) " @ umulls pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe09f1392) " @ umulls r1, pc, r2, r3")
 
         TEST_RRRR(  "umlal      r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "umlalle    r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "umlal      r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe0af1392 @ umlal pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0a1f392 @ umlal r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0af1392) " @ umlal pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0a1f392) " @ umlal r1, pc, r2, r3")
         TEST_RRRR(  "umlals     r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "umlalles   r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "umlals     r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe0bf1392 @ umlals pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0b1f392 @ umlals r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0bf1392) " @ umlals pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0b1f392) " @ umlals r1, pc, r2, r3")
 
         TEST_RR(  "smull        r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(  "smullls      r7, r8, r",9, VAL2,", r",10, VAL1,"")
         TEST_R(   "smull        lr, r12, r",11,VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe0c1f392 @ smull pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0cf1392 @ smull r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0c1f392) " @ smull pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0cf1392) " @ smull r1, pc, r2, r3")
         TEST_RR(  "smulls       r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(  "smulllss     r7, r8, r",9, VAL2,", r",10, VAL1,"")
         TEST_R(   "smulls       lr, r12, r",11,VAL3,", r13")
-        TEST_UNSUPPORTED(".word 0xe0d1f392 @ smulls pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0df1392 @ smulls r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0d1f392) " @ smulls pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0df1392) " @ smulls r1, pc, r2, r3")
 
         TEST_RRRR(  "smlal      r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlalle    r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlal      r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe0ef1392 @ smlal pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0e1f392 @ smlal r1, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0ef1392) " @ smlal pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0e1f392) " @ smlal r1, pc, r2, r3")
         TEST_RRRR(  "smlals     r",0, VAL1,", r",1, VAL2,", r",2, VAL3,", r",3, VAL4)
         TEST_RRRR(  "smlalles   r",8, VAL4,", r",9, VAL1,", r",10,VAL2,", r",11,VAL3)
         TEST_RRR(   "smlals     r",14,VAL3,", r",7, VAL4,", r",5, VAL1,", r13")
-        TEST_UNSUPPORTED(".word 0xe0ff1392 @ smlals pc, r1, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0f0f392 @ smlals r0, pc, r2, r3")
-        TEST_UNSUPPORTED(".word 0xe0f0139f @ smlals r0, r1, pc, r3")
-        TEST_UNSUPPORTED(".word 0xe0f01f92 @ smlals r0, r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe0ff1392) " @ smlals pc, r1, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0f0f392) " @ smlals r0, pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0f0139f) " @ smlals r0, r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_arm(0xe0f01f92) " @ smlals r0, r1, r2, pc")
 
         TEST_GROUP("Synchronization primitives")
 
@@ -435,28 +436,28 @@ void kprobe_arm_test_cases(void)
         TEST_R( "swpvs  r0, r",1,VAL1,", [sp]")
         TEST_RP("swp    sp, r",14,VAL2,", [r",12,13*4,"]")
 #else
-        TEST_UNSUPPORTED(".word 0xe108e097 @ swp        lr, r7, [r8]")
-        TEST_UNSUPPORTED(".word 0x610d0091 @ swpvs      r0, r1, [sp]")
-        TEST_UNSUPPORTED(".word 0xe10cd09e @ swp        sp, r14 [r12]")
+        TEST_UNSUPPORTED(__inst_arm(0xe108e097) " @ swp lr, r7, [r8]")
+        TEST_UNSUPPORTED(__inst_arm(0x610d0091) " @ swpvs       r0, r1, [sp]")
+        TEST_UNSUPPORTED(__inst_arm(0xe10cd09e) " @ swp sp, r14 [r12]")
 #endif
-        TEST_UNSUPPORTED(".word 0xe102f091 @ swp pc, r1, [r2]")
-        TEST_UNSUPPORTED(".word 0xe102009f @ swp r0, pc, [r2]")
-        TEST_UNSUPPORTED(".word 0xe10f0091 @ swp r0, r1, [pc]")
+        TEST_UNSUPPORTED(__inst_arm(0xe102f091) " @ swp pc, r1, [r2]")
+        TEST_UNSUPPORTED(__inst_arm(0xe102009f) " @ swp r0, pc, [r2]")
+        TEST_UNSUPPORTED(__inst_arm(0xe10f0091) " @ swp r0, r1, [pc]")
 #if __LINUX_ARM_ARCH__ < 6
         TEST_RP("swpb   lr, r",7,VAL2,", [r",8,0,"]")
         TEST_R( "swpvsb r0, r",1,VAL1,", [sp]")
 #else
-        TEST_UNSUPPORTED(".word 0xe148e097 @ swpb       lr, r7, [r8]")
-        TEST_UNSUPPORTED(".word 0x614d0091 @ swpvsb     r0, r1, [sp]")
+        TEST_UNSUPPORTED(__inst_arm(0xe148e097) " @ swpb        lr, r7, [r8]")
+        TEST_UNSUPPORTED(__inst_arm(0x614d0091) " @ swpvsb      r0, r1, [sp]")
 #endif
-        TEST_UNSUPPORTED(".word 0xe142f091 @ swpb pc, r1, [r2]")
-
-        TEST_UNSUPPORTED(".word 0xe1100090") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe1200090") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe1300090") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe1500090") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe1600090") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe142f091) " @ swpb pc, r1, [r2]")
+
+        TEST_UNSUPPORTED(__inst_arm(0xe1100090)) /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe1200090)) /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe1300090)) /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe1500090)) /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe1600090)) /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe1700090)) /* Unallocated space */
 #if __LINUX_ARM_ARCH__ >= 6
         TEST_UNSUPPORTED("ldrex r2, [sp]")
 #endif
@@ -476,9 +477,9 @@ void kprobe_arm_test_cases(void)
         TEST_RPR(  "strneh      r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
         TEST_RPR(  "strh        r",2, VAL1,", [r",3, 24,"], r",4, 48,"")
         TEST_RPR(  "strh        r",10,VAL2,", [r",9, 48,"], -r",11,24,"")
-        TEST_UNSUPPORTED(".word 0xe1afc0ba      @ strh r12, [pc, r10]!")
-        TEST_UNSUPPORTED(".word 0xe089f0bb      @ strh pc, [r9], r11")
-        TEST_UNSUPPORTED(".word 0xe089a0bf      @ strh r10, [r9], pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe1afc0ba) "       @ strh r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe089f0bb) "       @ strh pc, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe089a0bf) "       @ strh r10, [r9], pc")
 
         TEST_PR(   "ldrh        r0, [r",0,  48,", -r",2, 24,"]")
         TEST_PR(   "ldrcsh      r14, [r",13,0, ", r",12, 48,"]")
@@ -486,9 +487,9 @@ void kprobe_arm_test_cases(void)
         TEST_PR(   "ldrcch      r12, [r",11,48,", -r",10,24,"]!")
         TEST_PR(   "ldrh        r2, [r",3,  24,"], r",4, 48,"")
         TEST_PR(   "ldrh        r10, [r",9, 48,"], -r",11,24,"")
-        TEST_UNSUPPORTED(".word 0xe1bfc0ba      @ ldrh r12, [pc, r10]!")
-        TEST_UNSUPPORTED(".word 0xe099f0bb      @ ldrh pc, [r9], r11")
-        TEST_UNSUPPORTED(".word 0xe099a0bf      @ ldrh r10, [r9], pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe1bfc0ba) "       @ ldrh r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe099f0bb) "       @ ldrh pc, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe099a0bf) "       @ ldrh r10, [r9], pc")
 
         TEST_RP(   "strh        r",0, VAL1,", [r",1, 24,", #-2]")
         TEST_RP(   "strmih      r",14,VAL2,", [r",13,0, ", #2]")
@@ -496,8 +497,8 @@ void kprobe_arm_test_cases(void)
         TEST_RP(   "strplh      r",12,VAL2,", [r",11,24,", #-4]!")
         TEST_RP(   "strh        r",2, VAL1,", [r",3, 24,"], #48")
         TEST_RP(   "strh        r",10,VAL2,", [r",9, 64,"], #-48")
-        TEST_UNSUPPORTED(".word 0xe1efc3b0      @ strh r12, [pc, #48]!")
-        TEST_UNSUPPORTED(".word 0xe0c9f3b0      @ strh pc, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe1efc3b0) "       @ strh r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe0c9f3b0) "       @ strh pc, [r9], #48")
 
         TEST_P(    "ldrh        r0, [r",0,  24,", #-2]")
         TEST_P(    "ldrvsh      r14, [r",13,0, ", #2]")
@@ -506,8 +507,8 @@ void kprobe_arm_test_cases(void)
         TEST_P(    "ldrh        r2, [r",3,  24,"], #48")
         TEST_P(    "ldrh        r10, [r",9, 64,"], #-48")
         TEST(      "ldrh        r0, [pc, #0]")
-        TEST_UNSUPPORTED(".word 0xe1ffc3b0      @ ldrh r12, [pc, #48]!")
-        TEST_UNSUPPORTED(".word 0xe0d9f3b0      @ ldrh pc, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe1ffc3b0) "       @ ldrh r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe0d9f3b0) "       @ ldrh pc, [r9], #48")
 
         TEST_PR(   "ldrsb       r0, [r",0,  48,", -r",2, 24,"]")
         TEST_PR(   "ldrhisb     r14, [r",13,0,", r",12,  48,"]")
@@ -515,8 +516,8 @@ void kprobe_arm_test_cases(void)
         TEST_PR(   "ldrlssb     r12, [r",11,48,", -r",10,24,"]!")
         TEST_PR(   "ldrsb       r2, [r",3,  24,"], r",4, 48,"")
         TEST_PR(   "ldrsb       r10, [r",9, 48,"], -r",11,24,"")
-        TEST_UNSUPPORTED(".word 0xe1bfc0da      @ ldrsb r12, [pc, r10]!")
-        TEST_UNSUPPORTED(".word 0xe099f0db      @ ldrsb pc, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe1bfc0da) "       @ ldrsb r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe099f0db) "       @ ldrsb pc, [r9], r11")
 
         TEST_P(    "ldrsb       r0, [r",0,  24,", #-1]")
         TEST_P(    "ldrgesb     r14, [r",13,0, ", #1]")
@@ -525,8 +526,8 @@ void kprobe_arm_test_cases(void)
         TEST_P(    "ldrsb       r2, [r",3,  24,"], #48")
         TEST_P(    "ldrsb       r10, [r",9, 64,"], #-48")
         TEST(      "ldrsb       r0, [pc, #0]")
-        TEST_UNSUPPORTED(".word 0xe1ffc3d0      @ ldrsb r12, [pc, #48]!")
-        TEST_UNSUPPORTED(".word 0xe0d9f3d0      @ ldrsb pc, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe1ffc3d0) "       @ ldrsb r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe0d9f3d0) "       @ ldrsb pc, [r9], #48")
 
         TEST_PR(   "ldrsh       r0, [r",0,  48,", -r",2, 24,"]")
         TEST_PR(   "ldrgtsh     r14, [r",13,0, ", r",12, 48,"]")
@@ -534,8 +535,8 @@ void kprobe_arm_test_cases(void)
         TEST_PR(   "ldrlesh     r12, [r",11,48,", -r",10,24,"]!")
         TEST_PR(   "ldrsh       r2, [r",3,  24,"], r",4, 48,"")
         TEST_PR(   "ldrsh       r10, [r",9, 48,"], -r",11,24,"")
-        TEST_UNSUPPORTED(".word 0xe1bfc0fa      @ ldrsh r12, [pc, r10]!")
-        TEST_UNSUPPORTED(".word 0xe099f0fb      @ ldrsh pc, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe1bfc0fa) "       @ ldrsh r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe099f0fb) "       @ ldrsh pc, [r9], r11")
 
         TEST_P(    "ldrsh       r0, [r",0,  24,", #-1]")
         TEST_P(    "ldreqsh     r14, [r",13,0 ,", #1]")
@@ -544,8 +545,8 @@ void kprobe_arm_test_cases(void)
         TEST_P(    "ldrsh       r2, [r",3,  24,"], #48")
         TEST_P(    "ldrsh       r10, [r",9, 64,"], #-48")
         TEST(      "ldrsh       r0, [pc, #0]")
-        TEST_UNSUPPORTED(".word 0xe1ffc3f0      @ ldrsh r12, [pc, #48]!")
-        TEST_UNSUPPORTED(".word 0xe0d9f3f0      @ ldrsh pc, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe1ffc3f0) "       @ ldrsh r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe0d9f3f0) "       @ ldrsh pc, [r9], #48")
 
 #if __LINUX_ARM_ARCH__ >= 7
         TEST_UNSUPPORTED("strht r1, [r2], r3")
@@ -564,7 +565,7 @@ void kprobe_arm_test_cases(void)
         TEST_RPR(  "strcsd      r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
         TEST_RPR(  "strd        r",2, VAL1,", [r",5, 24,"], r",4,48,"")
         TEST_RPR(  "strd        r",10,VAL2,", [r",9, 48,"], -r",7,24,"")
-        TEST_UNSUPPORTED(".word 0xe1afc0fa      @ strd r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe1afc0fa) "       @ strd r12, [pc, r10]!")
 
         TEST_PR(   "ldrd        r0, [r",0, 48,", -r",2,24,"]")
         TEST_PR(   "ldrmid      r8, [r",13,0, ", r",12,48,"]")
@@ -572,10 +573,10 @@ void kprobe_arm_test_cases(void)
         TEST_PR(   "ldrpld      r6, [r",11,48,", -r",10,24,"]!")
         TEST_PR(   "ldrd        r2, [r",5, 24,"], r",4,48,"")
         TEST_PR(   "ldrd        r10, [r",9,48,"], -r",7,24,"")
-        TEST_UNSUPPORTED(".word 0xe1afc0da      @ ldrd r12, [pc, r10]!")
-        TEST_UNSUPPORTED(".word 0xe089f0db      @ ldrd pc, [r9], r11")
-        TEST_UNSUPPORTED(".word 0xe089e0db      @ ldrd lr, [r9], r11")
-        TEST_UNSUPPORTED(".word 0xe089c0df      @ ldrd r12, [r9], pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe1afc0da) "       @ ldrd r12, [pc, r10]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe089f0db) "       @ ldrd pc, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe089e0db) "       @ ldrd lr, [r9], r11")
+        TEST_UNSUPPORTED(__inst_arm(0xe089c0df) "       @ ldrd r12, [r9], pc")
 
         TEST_RP(   "strd        r",0, VAL1,", [r",1, 24,", #-8]")
         TEST_RP(   "strvsd      r",8, VAL2,", [r",13,0, ", #8]")
@@ -583,7 +584,7 @@ void kprobe_arm_test_cases(void)
         TEST_RP(   "strvcd      r",12,VAL2,", [r",11,24,", #-16]!")
         TEST_RP(   "strd        r",2, VAL1,", [r",4, 24,"], #48")
         TEST_RP(   "strd        r",10,VAL2,", [r",9, 64,"], #-48")
-        TEST_UNSUPPORTED(".word 0xe1efc3f0      @ strd r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe1efc3f0) "       @ strd r12, [pc, #48]!")
 
         TEST_P(    "ldrd        r0, [r",0, 24,", #-8]")
         TEST_P(    "ldrhid      r8, [r",13,0, ", #8]")
@@ -591,9 +592,9 @@ void kprobe_arm_test_cases(void)
         TEST_P(    "ldrlsd      r6, [r",11,24,", #-16]!")
         TEST_P(    "ldrd        r2, [r",5, 24,"], #48")
         TEST_P(    "ldrd        r10, [r",9,6,"], #-48")
-        TEST_UNSUPPORTED(".word 0xe1efc3d0      @ ldrd r12, [pc, #48]!")
-        TEST_UNSUPPORTED(".word 0xe0c9f3d0      @ ldrd pc, [r9], #48")
-        TEST_UNSUPPORTED(".word 0xe0c9e3d0      @ ldrd lr, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe1efc3d0) "       @ ldrd r12, [pc, #48]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe0c9f3d0) "       @ ldrd pc, [r9], #48")
+        TEST_UNSUPPORTED(__inst_arm(0xe0c9e3d0) "       @ ldrd lr, [r9], #48")
 
         TEST_GROUP("Miscellaneous")
 
@@ -601,11 +602,11 @@ void kprobe_arm_test_cases(void)
         TEST("movw      r0, #0")
         TEST("movw      r0, #0xffff")
         TEST("movw      lr, #0xffff")
-        TEST_UNSUPPORTED(".word 0xe300f000      @ movw pc, #0")
+        TEST_UNSUPPORTED(__inst_arm(0xe300f000) "       @ movw pc, #0")
         TEST_R("movt    r",0, VAL1,", #0")
         TEST_R("movt    r",0, VAL2,", #0xffff")
         TEST_R("movt    r",14,VAL1,", #0xffff")
-        TEST_UNSUPPORTED(".word 0xe340f000      @ movt pc, #0")
+        TEST_UNSUPPORTED(__inst_arm(0xe340f000) "       @ movt pc, #0")
 #endif
 
         TEST_UNSUPPORTED("msr   cpsr, 0x13")
@@ -673,20 +674,20 @@ void kprobe_arm_test_cases(void)
 #ifdef CONFIG_THUMB2_KERNEL
         TEST_ARM_TO_THUMB_INTERWORK_P("ldr      pc, [r",0,0,", #15*4]")
 #endif
-        TEST_UNSUPPORTED(".word 0xe5af6008      @ str r6, [pc, #8]!")
-        TEST_UNSUPPORTED(".word 0xe7af6008      @ str r6, [pc, r8]!")
-        TEST_UNSUPPORTED(".word 0xe5bf6008      @ ldr r6, [pc, #8]!")
-        TEST_UNSUPPORTED(".word 0xe7bf6008      @ ldr r6, [pc, r8]!")
-        TEST_UNSUPPORTED(".word 0xe788600f      @ str r6, [r8, pc]")
-        TEST_UNSUPPORTED(".word 0xe798600f      @ ldr r6, [r8, pc]")
+        TEST_UNSUPPORTED(__inst_arm(0xe5af6008) "       @ str r6, [pc, #8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe7af6008) "       @ str r6, [pc, r8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe5bf6008) "       @ ldr r6, [pc, #8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe7bf6008) "       @ ldr r6, [pc, r8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe788600f) "       @ str r6, [r8, pc]")
+        TEST_UNSUPPORTED(__inst_arm(0xe798600f) "       @ ldr r6, [r8, pc]")
 
         LOAD_STORE("b")
-        TEST_UNSUPPORTED(".word 0xe5f7f008      @ ldrb pc, [r7, #8]!")
-        TEST_UNSUPPORTED(".word 0xe7f7f008      @ ldrb pc, [r7, r8]!")
-        TEST_UNSUPPORTED(".word 0xe5ef6008      @ strb r6, [pc, #8]!")
-        TEST_UNSUPPORTED(".word 0xe7ef6008      @ strb r6, [pc, r3]!")
-        TEST_UNSUPPORTED(".word 0xe5ff6008      @ ldrb r6, [pc, #8]!")
-        TEST_UNSUPPORTED(".word 0xe7ff6008      @ ldrb r6, [pc, r3]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe5f7f008) "       @ ldrb pc, [r7, #8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe7f7f008) "       @ ldrb pc, [r7, r8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe5ef6008) "       @ strb r6, [pc, #8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe7ef6008) "       @ strb r6, [pc, r3]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe5ff6008) "       @ ldrb r6, [pc, #8]!")
+        TEST_UNSUPPORTED(__inst_arm(0xe7ff6008) "       @ ldrb r6, [pc, r3]!")
 
         TEST_UNSUPPORTED("ldrt  r0, [r1], #4")
         TEST_UNSUPPORTED("ldrt  r1, [r2], r3")
@@ -700,153 +701,153 @@ void kprobe_arm_test_cases(void)
 #if __LINUX_ARM_ARCH__ >= 7
         TEST_GROUP("Parallel addition and subtraction, signed")
 
-        TEST_UNSUPPORTED(".word 0xe6000010") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe60fffff") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe6000010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe60fffff) "") /* Unallocated space */
 
         TEST_RR(    "sadd16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sadd16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cff1a      @ sadd16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61cff1a) "       @ sadd16        pc, r12, r10")
         TEST_RR(    "sasx       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sasx       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cff3a      @ sasx  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61cff3a) "       @ sasx  pc, r12, r10")
         TEST_RR(    "ssax       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "ssax       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cff5a      @ ssax  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61cff5a) "       @ ssax  pc, r12, r10")
         TEST_RR(    "ssub16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "ssub16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cff7a      @ ssub16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61cff7a) "       @ ssub16        pc, r12, r10")
         TEST_RR(    "sadd8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sadd8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cff9a      @ sadd8 pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe61000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe61fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe61000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe61fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe61cff9a) "       @ sadd8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe61fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe61000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe61fffdf) "") /* Unallocated space */
         TEST_RR(    "ssub8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "ssub8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe61cfffa      @ ssub8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe61cfffa) "       @ ssub8 pc, r12, r10")
 
         TEST_RR(    "qadd16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qadd16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cff1a      @ qadd16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62cff1a) "       @ qadd16        pc, r12, r10")
         TEST_RR(    "qasx       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qasx       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cff3a      @ qasx  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62cff3a) "       @ qasx  pc, r12, r10")
         TEST_RR(    "qsax       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qsax       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cff5a      @ qsax  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62cff5a) "       @ qsax  pc, r12, r10")
         TEST_RR(    "qsub16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qsub16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cff7a      @ qsub16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62cff7a) "       @ qsub16        pc, r12, r10")
         TEST_RR(    "qadd8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qadd8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cff9a      @ qadd8 pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe62000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe62fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe62000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe62fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe62cff9a) "       @ qadd8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe62fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe62000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe62fffdf) "") /* Unallocated space */
         TEST_RR(    "qsub8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "qsub8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe62cfffa      @ qsub8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe62cfffa) "       @ qsub8 pc, r12, r10")
 
         TEST_RR(    "shadd16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shadd16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cff1a      @ shadd16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63cff1a) "       @ shadd16       pc, r12, r10")
         TEST_RR(    "shasx      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shasx      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cff3a      @ shasx pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63cff3a) "       @ shasx pc, r12, r10")
         TEST_RR(    "shsax      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shsax      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cff5a      @ shsax pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63cff5a) "       @ shsax pc, r12, r10")
         TEST_RR(    "shsub16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shsub16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cff7a      @ shsub16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63cff7a) "       @ shsub16       pc, r12, r10")
         TEST_RR(    "shadd8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shadd8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cff9a      @ shadd8        pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe63000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe63fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe63000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe63fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe63cff9a) "       @ shadd8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe63fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe63000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe63fffdf) "") /* Unallocated space */
         TEST_RR(    "shsub8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "shsub8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe63cfffa      @ shsub8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe63cfffa) "       @ shsub8        pc, r12, r10")
 
         TEST_GROUP("Parallel addition and subtraction, unsigned")
 
-        TEST_UNSUPPORTED(".word 0xe6400010") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe64fffff") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe6400010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe64fffff) "") /* Unallocated space */
 
         TEST_RR(    "uadd16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uadd16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cff1a      @ uadd16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65cff1a) "       @ uadd16        pc, r12, r10")
         TEST_RR(    "uasx       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uasx       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cff3a      @ uasx  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65cff3a) "       @ uasx  pc, r12, r10")
         TEST_RR(    "usax       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "usax       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cff5a      @ usax  pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65cff5a) "       @ usax  pc, r12, r10")
         TEST_RR(    "usub16     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "usub16     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cff7a      @ usub16        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65cff7a) "       @ usub16        pc, r12, r10")
         TEST_RR(    "uadd8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uadd8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cff9a      @ uadd8 pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe65000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe65fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe65000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe65fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe65cff9a) "       @ uadd8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe65fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe65000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe65fffdf) "") /* Unallocated space */
         TEST_RR(    "usub8      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "usub8      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe65cfffa      @ usub8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe65cfffa) "       @ usub8 pc, r12, r10")
 
         TEST_RR(    "uqadd16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqadd16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cff1a      @ uqadd16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66cff1a) "       @ uqadd16       pc, r12, r10")
         TEST_RR(    "uqasx      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqasx      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cff3a      @ uqasx pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66cff3a) "       @ uqasx pc, r12, r10")
         TEST_RR(    "uqsax      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqsax      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cff5a      @ uqsax pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66cff5a) "       @ uqsax pc, r12, r10")
         TEST_RR(    "uqsub16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqsub16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cff7a      @ uqsub16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66cff7a) "       @ uqsub16       pc, r12, r10")
         TEST_RR(    "uqadd8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqadd8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cff9a      @ uqadd8        pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe66000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe66fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe66000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe66fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe66cff9a) "       @ uqadd8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe66fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe66000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe66fffdf) "") /* Unallocated space */
         TEST_RR(    "uqsub8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uqsub8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe66cfffa      @ uqsub8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe66cfffa) "       @ uqsub8        pc, r12, r10")
 
         TEST_RR(    "uhadd16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhadd16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cff1a      @ uhadd16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cff1a) "       @ uhadd16       pc, r12, r10")
         TEST_RR(    "uhasx      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhasx      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cff3a      @ uhasx pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cff3a) "       @ uhasx pc, r12, r10")
         TEST_RR(    "uhsax      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhsax      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cff5a      @ uhsax pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cff5a) "       @ uhsax pc, r12, r10")
         TEST_RR(    "uhsub16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhsub16    r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cff7a      @ uhsub16       pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cff7a) "       @ uhsub16       pc, r12, r10")
         TEST_RR(    "uhadd8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhadd8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cff9a      @ uhadd8        pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe67000b0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe67fffbf") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe67000d0") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe67fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe67cff9a) "       @ uhadd8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67000b0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe67fffbf) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe67000d0) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe67fffdf) "") /* Unallocated space */
         TEST_RR(    "uhsub8     r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uhsub8     r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe67cfffa      @ uhsub8        pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe67feffa      @ uhsub8        r14, pc, r10")
-        TEST_UNSUPPORTED(".word 0xe67cefff      @ uhsub8        r14, r12, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cfffa) "       @ uhsub8        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67feffa) "       @ uhsub8        r14, pc, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe67cefff) "       @ uhsub8        r14, r12, pc")
 #endif /* __LINUX_ARM_ARCH__ >= 7 */
 
 #if __LINUX_ARM_ARCH__ >= 6
@@ -854,99 +855,99 @@ void kprobe_arm_test_cases(void)
 
         TEST_RR(    "pkhbt      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "pkhbt      r14,r",12, HH1,", r",10,HH2,", lsl #2")
-        TEST_UNSUPPORTED(".word 0xe68cf11a      @ pkhbt pc, r12, r10, lsl #2")
+        TEST_UNSUPPORTED(__inst_arm(0xe68cf11a) "       @ pkhbt pc, r12, r10, lsl #2")
         TEST_RR(    "pkhtb      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "pkhtb      r14,r",12, HH1,", r",10,HH2,", asr #2")
-        TEST_UNSUPPORTED(".word 0xe68cf15a      @ pkhtb pc, r12, r10, asr #2")
-        TEST_UNSUPPORTED(".word 0xe68fe15a      @ pkhtb r14, pc, r10, asr #2")
-        TEST_UNSUPPORTED(".word 0xe68ce15f      @ pkhtb r14, r12, pc, asr #2")
-        TEST_UNSUPPORTED(".word 0xe6900010") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe69fffdf") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe68cf15a) "       @ pkhtb pc, r12, r10, asr #2")
+        TEST_UNSUPPORTED(__inst_arm(0xe68fe15a) "       @ pkhtb r14, pc, r10, asr #2")
+        TEST_UNSUPPORTED(__inst_arm(0xe68ce15f) "       @ pkhtb r14, r12, pc, asr #2")
+        TEST_UNSUPPORTED(__inst_arm(0xe6900010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe69fffdf) "") /* Unallocated space */
 
         TEST_R(     "ssat       r0, #24, r",0,   VAL1,"")
         TEST_R(     "ssat       r14, #24, r",12, VAL2,"")
         TEST_R(     "ssat       r0, #24, r",0,   VAL1,", lsl #8")
         TEST_R(     "ssat       r14, #24, r",12, VAL2,", asr #8")
-        TEST_UNSUPPORTED(".word 0xe6b7f01c      @ ssat  pc, #24, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6b7f01c) "       @ ssat  pc, #24, r12")
 
         TEST_R(     "usat       r0, #24, r",0,   VAL1,"")
         TEST_R(     "usat       r14, #24, r",12, VAL2,"")
         TEST_R(     "usat       r0, #24, r",0,   VAL1,", lsl #8")
         TEST_R(     "usat       r14, #24, r",12, VAL2,", asr #8")
-        TEST_UNSUPPORTED(".word 0xe6f7f01c      @ usat  pc, #24, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6f7f01c) "       @ usat  pc, #24, r12")
 
         TEST_RR(    "sxtab16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sxtab16    r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "sxtb16     r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe68cf47a      @ sxtab16       pc,r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe68cf47a) "       @ sxtab16       pc,r12, r10, ror #8")
 
         TEST_RR(    "sel        r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR(    "sel        r14, r",12,VAL1,", r",10, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe68cffba      @ sel   pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe68fefba      @ sel   r14, pc, r10")
-        TEST_UNSUPPORTED(".word 0xe68cefbf      @ sel   r14, r12, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe68cffba) "       @ sel   pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe68fefba) "       @ sel   r14, pc, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe68cefbf) "       @ sel   r14, r12, pc")
 
         TEST_R(     "ssat16     r0, #12, r",0,   HH1,"")
         TEST_R(     "ssat16     r14, #12, r",12, HH2,"")
-        TEST_UNSUPPORTED(".word 0xe6abff3c      @ ssat16        pc, #12, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6abff3c) "       @ ssat16        pc, #12, r12")
 
         TEST_RR(    "sxtab      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sxtab      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "sxtb       r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe6acf47a      @ sxtab pc,r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6acf47a) "       @ sxtab pc,r12, r10, ror #8")
 
         TEST_R(     "rev        r0, r",0,   VAL1,"")
         TEST_R(     "rev        r14, r",12, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe6bfff3c      @ rev   pc, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6bfff3c) "       @ rev   pc, r12")
 
         TEST_RR(    "sxtah      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sxtah      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "sxth       r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe6bcf47a      @ sxtah pc,r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6bcf47a) "       @ sxtah pc,r12, r10, ror #8")
 
         TEST_R(     "rev16      r0, r",0,   VAL1,"")
         TEST_R(     "rev16      r14, r",12, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe6bfffbc      @ rev16 pc, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6bfffbc) "       @ rev16 pc, r12")
 
         TEST_RR(    "uxtab16    r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uxtab16    r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "uxtb16     r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe6ccf47a      @ uxtab16       pc,r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ccf47a) "       @ uxtab16       pc,r12, r10, ror #8")
 
         TEST_R(     "usat16     r0, #12, r",0,   HH1,"")
         TEST_R(     "usat16     r14, #12, r",12, HH2,"")
-        TEST_UNSUPPORTED(".word 0xe6ecff3c      @ usat16        pc, #12, r12")
-        TEST_UNSUPPORTED(".word 0xe6ecef3f      @ usat16        r14, #12, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ecff3c) "       @ usat16        pc, #12, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ecef3f) "       @ usat16        r14, #12, pc")
 
         TEST_RR(    "uxtab      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uxtab      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "uxtb       r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe6ecf47a      @ uxtab pc,r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ecf47a) "       @ uxtab pc,r12, r10, ror #8")
 
 #if __LINUX_ARM_ARCH__ >= 7
         TEST_R(     "rbit       r0, r",0,   VAL1,"")
         TEST_R(     "rbit       r14, r",12, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe6ffff3c      @ rbit  pc, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ffff3c) "       @ rbit  pc, r12")
 #endif
 
         TEST_RR(    "uxtah      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uxtah      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "uxth       r8, r",7,  HH1,"")
-        TEST_UNSUPPORTED(".word 0xe6fff077      @ uxth  pc, r7")
-        TEST_UNSUPPORTED(".word 0xe6ff807f      @ uxth  r8, pc")
-        TEST_UNSUPPORTED(".word 0xe6fcf47a      @ uxtah pc, r12, r10, ror #8")
-        TEST_UNSUPPORTED(".word 0xe6fce47f      @ uxtah r14, r12, pc, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6fff077) "       @ uxth  pc, r7")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ff807f) "       @ uxth  r8, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe6fcf47a) "       @ uxtah pc, r12, r10, ror #8")
+        TEST_UNSUPPORTED(__inst_arm(0xe6fce47f) "       @ uxtah r14, r12, pc, ror #8")
 
         TEST_R(     "revsh      r0, r",0,   VAL1,"")
         TEST_R(     "revsh      r14, r",12, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe6ffff3c      @ revsh pc, r12")
-        TEST_UNSUPPORTED(".word 0xe6ffef3f      @ revsh r14, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ffff3c) "       @ revsh pc, r12")
+        TEST_UNSUPPORTED(__inst_arm(0xe6ffef3f) "       @ revsh r14, pc")
 
-        TEST_UNSUPPORTED(".word 0xe6900070") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe69fff7f") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe6900070) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe69fff7f) "") /* Unallocated space */
 
-        TEST_UNSUPPORTED(".word 0xe6d00070") /* Unallocated space */
-        TEST_UNSUPPORTED(".word 0xe6dfff7f") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe6d00070) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_arm(0xe6dfff7f) "") /* Unallocated space */
 #endif /* __LINUX_ARM_ARCH__ >= 6 */
 
 #if __LINUX_ARM_ARCH__ >= 6
@@ -954,79 +955,79 @@ void kprobe_arm_test_cases(void)
 
         TEST_RRR(   "smlad      r0, r",0,  HH1,", r",1, HH2,", r",2, VAL1,"")
         TEST_RRR(   "smlad      r14, r",12,HH2,", r",10,HH1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe70f8a1c      @ smlad pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe70f8a1c) "       @ smlad pc, r12, r10, r8")
         TEST_RRR(   "smladx     r0, r",0,  HH1,", r",1, HH2,", r",2, VAL1,"")
         TEST_RRR(   "smladx     r14, r",12,HH2,", r",10,HH1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe70f8a3c      @ smladx        pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe70f8a3c) "       @ smladx        pc, r12, r10, r8")
 
         TEST_RR(   "smuad       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(   "smuad       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe70ffa1c      @ smuad pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe70ffa1c) "       @ smuad pc, r12, r10")
         TEST_RR(   "smuadx      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(   "smuadx      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe70ffa3c      @ smuadx        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe70ffa3c) "       @ smuadx        pc, r12, r10")
 
         TEST_RRR(   "smlsd      r0, r",0,  HH1,", r",1, HH2,", r",2, VAL1,"")
         TEST_RRR(   "smlsd      r14, r",12,HH2,", r",10,HH1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe70f8a5c      @ smlsd pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe70f8a5c) "       @ smlsd pc, r12, r10, r8")
         TEST_RRR(   "smlsdx     r0, r",0,  HH1,", r",1, HH2,", r",2, VAL1,"")
         TEST_RRR(   "smlsdx     r14, r",12,HH2,", r",10,HH1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe70f8a7c      @ smlsdx        pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe70f8a7c) "       @ smlsdx        pc, r12, r10, r8")
 
         TEST_RR(   "smusd       r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(   "smusd       r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe70ffa5c      @ smusd pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe70ffa5c) "       @ smusd pc, r12, r10")
         TEST_RR(   "smusdx      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(   "smusdx      r14, r",12,HH2,", r",10,HH1,"")
-        TEST_UNSUPPORTED(".word 0xe70ffa7c      @ smusdx        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe70ffa7c) "       @ smusdx        pc, r12, r10")
 
         TEST_RRRR( "smlald      r",0, VAL1,", r",1, VAL2, ", r",0, HH1,", r",1, HH2)
         TEST_RRRR( "smlald      r",11,VAL2,", r",10,VAL1, ", r",9, HH2,", r",8, HH1)
-        TEST_UNSUPPORTED(".word 0xe74af819      @ smlald        pc, r10, r9, r8")
-        TEST_UNSUPPORTED(".word 0xe74fb819      @ smlald        r11, pc, r9, r8")
-        TEST_UNSUPPORTED(".word 0xe74ab81f      @ smlald        r11, r10, pc, r8")
-        TEST_UNSUPPORTED(".word 0xe74abf19      @ smlald        r11, r10, r9, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe74af819) "       @ smlald        pc, r10, r9, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe74fb819) "       @ smlald        r11, pc, r9, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe74ab81f) "       @ smlald        r11, r10, pc, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe74abf19) "       @ smlald        r11, r10, r9, pc")
 
         TEST_RRRR( "smlaldx     r",0, VAL1,", r",1, VAL2, ", r",0, HH1,", r",1, HH2)
         TEST_RRRR( "smlaldx     r",11,VAL2,", r",10,VAL1, ", r",9, HH2,", r",8, HH1)
-        TEST_UNSUPPORTED(".word 0xe74af839      @ smlaldx       pc, r10, r9, r8")
-        TEST_UNSUPPORTED(".word 0xe74fb839      @ smlaldx       r11, pc, r9, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe74af839) "       @ smlaldx       pc, r10, r9, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe74fb839) "       @ smlaldx       r11, pc, r9, r8")
 
         TEST_RRR(  "smmla       r0, r",0,  VAL1,", r",1, VAL2,", r",2, VAL1,"")
         TEST_RRR(  "smmla       r14, r",12,VAL2,", r",10,VAL1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe75f8a1c      @ smmla pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75f8a1c) "       @ smmla pc, r12, r10, r8")
         TEST_RRR(  "smmlar      r0, r",0,  VAL1,", r",1, VAL2,", r",2, VAL1,"")
         TEST_RRR(  "smmlar      r14, r",12,VAL2,", r",10,VAL1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe75f8a3c      @ smmlar        pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75f8a3c) "       @ smmlar        pc, r12, r10, r8")
 
         TEST_RR(   "smmul       r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR(   "smmul       r14, r",12,VAL2,", r",10,VAL1,"")
-        TEST_UNSUPPORTED(".word 0xe75ffa1c      @ smmul pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe75ffa1c) "       @ smmul pc, r12, r10")
         TEST_RR(   "smmulr      r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR(   "smmulr      r14, r",12,VAL2,", r",10,VAL1,"")
-        TEST_UNSUPPORTED(".word 0xe75ffa3c      @ smmulr        pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe75ffa3c) "       @ smmulr        pc, r12, r10")
 
         TEST_RRR(  "smmls       r0, r",0,  VAL1,", r",1, VAL2,", r",2, VAL1,"")
         TEST_RRR(  "smmls       r14, r",12,VAL2,", r",10,VAL1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe75f8adc      @ smmls pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75f8adc) "       @ smmls pc, r12, r10, r8")
         TEST_RRR(  "smmlsr      r0, r",0,  VAL1,", r",1, VAL2,", r",2, VAL1,"")
         TEST_RRR(  "smmlsr      r14, r",12,VAL2,", r",10,VAL1,", r",8, VAL2,"")
-        TEST_UNSUPPORTED(".word 0xe75f8afc      @ smmlsr        pc, r12, r10, r8")
-        TEST_UNSUPPORTED(".word 0xe75e8aff      @ smmlsr        r14, pc, r10, r8")
-        TEST_UNSUPPORTED(".word 0xe75e8ffc      @ smmlsr        r14, r12, pc, r8")
-        TEST_UNSUPPORTED(".word 0xe75efafc      @ smmlsr        r14, r12, r10, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe75f8afc) "       @ smmlsr        pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75e8aff) "       @ smmlsr        r14, pc, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75e8ffc) "       @ smmlsr        r14, r12, pc, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe75efafc) "       @ smmlsr        r14, r12, r10, pc")
 
         TEST_RR(   "usad8       r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR(   "usad8       r14, r",12,VAL2,", r",10,VAL1,"")
-        TEST_UNSUPPORTED(".word 0xe75ffa1c      @ usad8 pc, r12, r10")
-        TEST_UNSUPPORTED(".word 0xe75efa1f      @ usad8 r14, pc, r10")
-        TEST_UNSUPPORTED(".word 0xe75eff1c      @ usad8 r14, r12, pc")
+        TEST_UNSUPPORTED(__inst_arm(0xe75ffa1c) "       @ usad8 pc, r12, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe75efa1f) "       @ usad8 r14, pc, r10")
+        TEST_UNSUPPORTED(__inst_arm(0xe75eff1c) "       @ usad8 r14, r12, pc")
 
         TEST_RRR(  "usada8      r0, r",0,  VAL1,", r",1, VAL2,", r",2, VAL3,"")
         TEST_RRR(  "usada8      r14, r",12,VAL2,", r",10,VAL1,", r",8, VAL3,"")
-        TEST_UNSUPPORTED(".word 0xe78f8a1c      @ usada8        pc, r12, r10, r8")
-        TEST_UNSUPPORTED(".word 0xe78e8a1f      @ usada8        r14, pc, r10, r8")
-        TEST_UNSUPPORTED(".word 0xe78e8f1c      @ usada8        r14, r12, pc, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe78f8a1c) "       @ usada8        pc, r12, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe78e8a1f) "       @ usada8        r14, pc, r10, r8")
+        TEST_UNSUPPORTED(__inst_arm(0xe78e8f1c) "       @ usada8        r14, r12, pc, r8")
 #endif /* __LINUX_ARM_ARCH__ >= 6 */
 
 #if __LINUX_ARM_ARCH__ >= 7
@@ -1035,26 +1036,26 @@ void kprobe_arm_test_cases(void)
         TEST_R(     "sbfx       r0, r",0  , VAL1,", #0, #31")
         TEST_R(     "sbfxeq     r14, r",12, VAL2,", #8, #16")
         TEST_R(     "sbfx       r4, r",10,  VAL1,", #16, #15")
-        TEST_UNSUPPORTED(".word 0xe7aff45c      @ sbfx  pc, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_arm(0xe7aff45c) "       @ sbfx  pc, r12, #8, #16")
 
         TEST_R(     "ubfx       r0, r",0  , VAL1,", #0, #31")
         TEST_R(     "ubfxcs     r14, r",12, VAL2,", #8, #16")
         TEST_R(     "ubfx       r4, r",10,  VAL1,", #16, #15")
-        TEST_UNSUPPORTED(".word 0xe7eff45c      @ ubfx  pc, r12, #8, #16")
-        TEST_UNSUPPORTED(".word 0xe7efc45f      @ ubfx  r12, pc, #8, #16")
+        TEST_UNSUPPORTED(__inst_arm(0xe7eff45c) "       @ ubfx  pc, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_arm(0xe7efc45f) "       @ ubfx  r12, pc, #8, #16")
 
         TEST_R(     "bfc        r",0, VAL1,", #4, #20")
         TEST_R(     "bfcvs      r",14,VAL2,", #4, #20")
         TEST_R(     "bfc        r",7, VAL1,", #0, #31")
         TEST_R(     "bfc        r",8, VAL2,", #0, #31")
-        TEST_UNSUPPORTED(".word 0xe7def01f      @ bfc   pc, #0, #31");
+        TEST_UNSUPPORTED(__inst_arm(0xe7def01f) "       @ bfc   pc, #0, #31");
 
         TEST_RR(    "bfi        r",0, VAL1,", r",0  , VAL2,", #0, #31")
         TEST_RR(    "bfipl      r",12,VAL1,", r",14 , VAL2,", #4, #20")
-        TEST_UNSUPPORTED(".word 0xe7d7f21e      @ bfi   pc, r14, #4, #20")
+        TEST_UNSUPPORTED(__inst_arm(0xe7d7f21e) "       @ bfi   pc, r14, #4, #20")
 
-        TEST_UNSUPPORTED(".word 0x07f000f0")  /* Permanently UNDEFINED */
-        TEST_UNSUPPORTED(".word 0x07ffffff")  /* Permanently UNDEFINED */
+        TEST_UNSUPPORTED(__inst_arm(0x07f000f0) "")  /* Permanently UNDEFINED */
+        TEST_UNSUPPORTED(__inst_arm(0x07ffffff) "")  /* Permanently UNDEFINED */
 #endif /* __LINUX_ARM_ARCH__ >= 6 */
 
         TEST_GROUP("Branch, branch with link, and block data transfer")
@@ -1181,43 +1182,43 @@ void kprobe_arm_test_cases(void)
                                                                                 \
         TEST_COPROCESSOR( "stc"two"     0, cr0, [r15, #4]")                     \
         TEST_COPROCESSOR( "stc"two"     0, cr0, [r15, #-4]")                    \
-        TEST_UNSUPPORTED(".word 0x"cc"daf0001   @ stc"two"      0, cr0, [r15, #4]!")    \
-        TEST_UNSUPPORTED(".word 0x"cc"d2f0001   @ stc"two"      0, cr0, [r15, #-4]!")   \
-        TEST_UNSUPPORTED(".word 0x"cc"caf0001   @ stc"two"      0, cr0, [r15], #4")     \
-        TEST_UNSUPPORTED(".word 0x"cc"c2f0001   @ stc"two"      0, cr0, [r15], #-4")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##daf0001) "  @ stc"two"      0, cr0, [r15, #4]!")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##d2f0001) "  @ stc"two"      0, cr0, [r15, #-4]!")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##caf0001) "  @ stc"two"      0, cr0, [r15], #4")     \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c2f0001) "  @ stc"two"      0, cr0, [r15], #-4")    \
         TEST_COPROCESSOR( "stc"two"     0, cr0, [r15], {1}")                    \
         TEST_COPROCESSOR( "stc"two"l    0, cr0, [r15, #4]")                     \
         TEST_COPROCESSOR( "stc"two"l    0, cr0, [r15, #-4]")                    \
-        TEST_UNSUPPORTED(".word 0x"cc"def0001   @ stc"two"l     0, cr0, [r15, #4]!")    \
-        TEST_UNSUPPORTED(".word 0x"cc"d6f0001   @ stc"two"l     0, cr0, [r15, #-4]!")   \
-        TEST_UNSUPPORTED(".word 0x"cc"cef0001   @ stc"two"l     0, cr0, [r15], #4")     \
-        TEST_UNSUPPORTED(".word 0x"cc"c6f0001   @ stc"two"l     0, cr0, [r15], #-4")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##def0001) "  @ stc"two"l     0, cr0, [r15, #4]!")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##d6f0001) "  @ stc"two"l     0, cr0, [r15, #-4]!")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##cef0001) "  @ stc"two"l     0, cr0, [r15], #4")     \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c6f0001) "  @ stc"two"l     0, cr0, [r15], #-4")    \
         TEST_COPROCESSOR( "stc"two"l    0, cr0, [r15], {1}")                    \
         TEST_COPROCESSOR( "ldc"two"     0, cr0, [r15, #4]")                     \
         TEST_COPROCESSOR( "ldc"two"     0, cr0, [r15, #-4]")                    \
-        TEST_UNSUPPORTED(".word 0x"cc"dbf0001   @ ldc"two"      0, cr0, [r15, #4]!")    \
-        TEST_UNSUPPORTED(".word 0x"cc"d3f0001   @ ldc"two"      0, cr0, [r15, #-4]!")   \
-        TEST_UNSUPPORTED(".word 0x"cc"cbf0001   @ ldc"two"      0, cr0, [r15], #4")     \
-        TEST_UNSUPPORTED(".word 0x"cc"c3f0001   @ ldc"two"      0, cr0, [r15], #-4")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##dbf0001) "  @ ldc"two"      0, cr0, [r15, #4]!")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##d3f0001) "  @ ldc"two"      0, cr0, [r15, #-4]!")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##cbf0001) "  @ ldc"two"      0, cr0, [r15], #4")     \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c3f0001) "  @ ldc"two"      0, cr0, [r15], #-4")    \
         TEST_COPROCESSOR( "ldc"two"     0, cr0, [r15], {1}")                    \
         TEST_COPROCESSOR( "ldc"two"l    0, cr0, [r15, #4]")                     \
         TEST_COPROCESSOR( "ldc"two"l    0, cr0, [r15, #-4]")                    \
-        TEST_UNSUPPORTED(".word 0x"cc"dff0001   @ ldc"two"l     0, cr0, [r15, #4]!")    \
-        TEST_UNSUPPORTED(".word 0x"cc"d7f0001   @ ldc"two"l     0, cr0, [r15, #-4]!")   \
-        TEST_UNSUPPORTED(".word 0x"cc"cff0001   @ ldc"two"l     0, cr0, [r15], #4")     \
-        TEST_UNSUPPORTED(".word 0x"cc"c7f0001   @ ldc"two"l     0, cr0, [r15], #-4")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##dff0001) "  @ ldc"two"l     0, cr0, [r15, #4]!")    \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##d7f0001) "  @ ldc"two"l     0, cr0, [r15, #-4]!")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##cff0001) "  @ ldc"two"l     0, cr0, [r15], #4")     \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c7f0001) "  @ ldc"two"l     0, cr0, [r15], #-4")    \
         TEST_COPROCESSOR( "ldc"two"l    0, cr0, [r15], {1}")
 
 #define COPROCESSOR_INSTRUCTIONS_MC_MR(two,cc)                                  \
                                                                                 \
         TEST_COPROCESSOR( "mcrr"two"    0, 15, r0, r14, cr0")                   \
         TEST_COPROCESSOR( "mcrr"two"    15, 0, r14, r0, cr15")                  \
-        TEST_UNSUPPORTED(".word 0x"cc"c4f00f0   @ mcrr"two"     0, 15, r0, r15, cr0")   \
-        TEST_UNSUPPORTED(".word 0x"cc"c40ff0f   @ mcrr"two"     15, 0, r15, r0, cr15")  \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c4f00f0) "  @ mcrr"two"     0, 15, r0, r15, cr0")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c40ff0f) "  @ mcrr"two"     15, 0, r15, r0, cr15")  \
         TEST_COPROCESSOR( "mrrc"two"    0, 15, r0, r14, cr0")                   \
         TEST_COPROCESSOR( "mrrc"two"    15, 0, r14, r0, cr15")                  \
-        TEST_UNSUPPORTED(".word 0x"cc"c5f00f0   @ mrrc"two"     0, 15, r0, r15, cr0")   \
-        TEST_UNSUPPORTED(".word 0x"cc"c50ff0f   @ mrrc"two"     15, 0, r15, r0, cr15")  \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c5f00f0) "  @ mrrc"two"     0, 15, r0, r15, cr0")   \
+        TEST_UNSUPPORTED(__inst_arm(0x##cc##c50ff0f) "  @ mrrc"two"     15, 0, r15, r0, cr15")  \
         TEST_COPROCESSOR( "cdp"two"     15, 15, cr15, cr15, cr15, 7")           \
         TEST_COPROCESSOR( "cdp"two"     0, 0, cr0, cr0, cr0, 0")                \
         TEST_COPROCESSOR( "mcr"two"     15, 7, r15, cr15, cr15, 7")             \
@@ -1225,8 +1226,8 @@ void kprobe_arm_test_cases(void)
         TEST_COPROCESSOR( "mrc"two"     15, 7, r15, cr15, cr15, 7")             \
         TEST_COPROCESSOR( "mrc"two"     0, 0, r0, cr0, cr0, 0")
 
-        COPROCESSOR_INSTRUCTIONS_ST_LD("","e")
-        COPROCESSOR_INSTRUCTIONS_MC_MR("","e")
+        COPROCESSOR_INSTRUCTIONS_ST_LD("",e)
+        COPROCESSOR_INSTRUCTIONS_MC_MR("",e)
         TEST_UNSUPPORTED("svc   0")
         TEST_UNSUPPORTED("svc   0xffffff")
 
@@ -1252,14 +1253,14 @@ void kprobe_arm_test_cases(void)
         TEST_UNSUPPORTED("rfedb sp!")
         TEST_UNSUPPORTED("rfeia sp!")
         TEST_UNSUPPORTED("rfeib sp!")
-        TEST_UNSUPPORTED(".word 0xf81d0a00      @ rfeda pc")
-        TEST_UNSUPPORTED(".word 0xf91d0a00      @ rfedb pc")
-        TEST_UNSUPPORTED(".word 0xf89d0a00      @ rfeia pc")
-        TEST_UNSUPPORTED(".word 0xf99d0a00      @ rfeib pc")
-        TEST_UNSUPPORTED(".word 0xf83d0a00      @ rfeda pc!")
-        TEST_UNSUPPORTED(".word 0xf93d0a00      @ rfedb pc!")
-        TEST_UNSUPPORTED(".word 0xf8bd0a00      @ rfeia pc!")
-        TEST_UNSUPPORTED(".word 0xf9bd0a00      @ rfeib pc!")
+        TEST_UNSUPPORTED(__inst_arm(0xf81d0a00) "       @ rfeda pc")
+        TEST_UNSUPPORTED(__inst_arm(0xf91d0a00) "       @ rfedb pc")
+        TEST_UNSUPPORTED(__inst_arm(0xf89d0a00) "       @ rfeia pc")
+        TEST_UNSUPPORTED(__inst_arm(0xf99d0a00) "       @ rfeib pc")
+        TEST_UNSUPPORTED(__inst_arm(0xf83d0a00) "       @ rfeda pc!")
+        TEST_UNSUPPORTED(__inst_arm(0xf93d0a00) "       @ rfedb pc!")
+        TEST_UNSUPPORTED(__inst_arm(0xf8bd0a00) "       @ rfeia pc!")
+        TEST_UNSUPPORTED(__inst_arm(0xf9bd0a00) "       @ rfeib pc!")
 #endif /* __LINUX_ARM_ARCH__ >= 6 */
 
 #if __LINUX_ARM_ARCH__ >= 6
@@ -1286,9 +1287,9 @@ void kprobe_arm_test_cases(void)
         TEST(   "blx    __dummy_thumb_subroutine_odd")
 #endif /* __LINUX_ARM_ARCH__ >= 6 */
 
-        COPROCESSOR_INSTRUCTIONS_ST_LD("2","f")
+        COPROCESSOR_INSTRUCTIONS_ST_LD("2",f)
 #if __LINUX_ARM_ARCH__ >= 6
-        COPROCESSOR_INSTRUCTIONS_MC_MR("2","f")
+        COPROCESSOR_INSTRUCTIONS_MC_MR("2",f)
 #endif
 
         TEST_GROUP("Miscellaneous instructions, memory hints, and Advanced SIMD instructions")
@@ -1318,9 +1319,9 @@ void kprobe_arm_test_cases(void)
 #endif
 
 #if __LINUX_ARM_ARCH__ >= 7
-        TEST_SUPPORTED(  ".word 0xf590f000      @ pldw [r0, #0]")
-        TEST_SUPPORTED(  ".word 0xf797f000      @ pldw  [r7, r0]")
-        TEST_SUPPORTED(  ".word 0xf798f18c      @ pldw  [r8, r12, lsl #3]");
+        TEST_SUPPORTED(  __inst_arm(0xf590f000) "       @ pldw [r0, #0]")
+        TEST_SUPPORTED(  __inst_arm(0xf797f000) "       @ pldw  [r7, r0]")
+        TEST_SUPPORTED(  __inst_arm(0xf798f18c) "       @ pldw  [r8, r12, lsl #3]");
 #endif
 
 #if __LINUX_ARM_ARCH__ >= 7
diff --git a/arch/arm/kernel/kprobes-test-thumb.c b/arch/arm/kernel/kprobes-test-thumb.c
index 5d8b85792222..844dd10d8593 100644
--- a/arch/arm/kernel/kprobes-test-thumb.c
+++ b/arch/arm/kernel/kprobes-test-thumb.c
@@ -10,6 +10,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <asm/opcodes.h>
 
 #include "kprobes-test.h"
 
@@ -119,7 +120,7 @@ void kprobe_thumb16_test_cases(void)
         TEST_R(   "add  sp"        ", r",8,-8,  "")
         TEST_R(   "add  r",14,VAL1,", pc")
         TEST_BF_R("add  pc"        ", r",0,2f-1f-8,"")
-        TEST_UNSUPPORTED(".short 0x44ff @ add pc, pc")
+        TEST_UNSUPPORTED(__inst_thumb16(0x44ff) "       @ add pc, pc")
 
         TEST_RR(  "cmp  r",3,VAL1,", r",8,VAL2,"")
         TEST_RR(  "cmp  r",8,VAL2,", r",0,VAL1,"")
@@ -150,7 +151,7 @@ void kprobe_thumb16_test_cases(void)
 
         TEST_BF_R("blx  r",0, 2f+1,"")
         TEST_BB_R("blx  r",14,2f+1,"")
-        TEST_UNSUPPORTED(".short 0x47f8 @ blx pc")
+        TEST_UNSUPPORTED(__inst_thumb16(0x47f8) "       @ blx pc")
 
         TEST_GROUP("Load from Literal Pool")
 
@@ -237,8 +238,8 @@ DONT_TEST_IN_ITBLOCK(
         TEST_R("rev     r7, r",0, VAL2,"")
         TEST_R("rev16   r0, r",7, VAL1,"")
         TEST_R("rev16   r7, r",0, VAL2,"")
-        TEST_UNSUPPORTED(".short 0xba80")
-        TEST_UNSUPPORTED(".short 0xbabf")
+        TEST_UNSUPPORTED(__inst_thumb16(0xba80) "")
+        TEST_UNSUPPORTED(__inst_thumb16(0xbabf) "")
         TEST_R("revsh   r0, r",7, VAL1,"")
         TEST_R("revsh   r7, r",0, VAL2,"")
 
@@ -272,8 +273,8 @@ DONT_TEST_IN_ITBLOCK(
         TEST("nop")
         TEST("wfi")
         TEST_SUPPORTED("wfe")
-        TEST_UNSUPPORTED(".short 0xbf50") /* Unassigned hints */
-        TEST_UNSUPPORTED(".short 0xbff0") /* Unassigned hints */
+        TEST_UNSUPPORTED(__inst_thumb16(0xbf50) "") /* Unassigned hints */
+        TEST_UNSUPPORTED(__inst_thumb16(0xbff0) "") /* Unassigned hints */
 
 #define TEST_IT(code, code2)                    \
         TESTCASE_START(code)                    \
@@ -310,8 +311,8 @@ CONDITION_INSTRUCTIONS(8,
         TEST_BF("bgt    2f")
         TEST_BB("blt    2b")
 )
-        TEST_UNSUPPORTED(".short 0xde00")
-        TEST_UNSUPPORTED(".short 0xdeff")
+        TEST_UNSUPPORTED(__inst_thumb16(0xde00) "")
+        TEST_UNSUPPORTED(__inst_thumb16(0xdeff) "")
         TEST_UNSUPPORTED("svc   #0x00")
         TEST_UNSUPPORTED("svc   #0xff")
 
@@ -380,13 +381,13 @@ void kprobe_thumb32_test_cases(void)
         TEST_THUMB_TO_ARM_INTERWORK_P("ldmia    r",0,14*4,", {r12,pc}")
         TEST_THUMB_TO_ARM_INTERWORK_P("ldmia    r",13,2*4,", {r0-r12,pc}")
 
-        TEST_UNSUPPORTED(".short 0xe88f,0x0101  @ stmia pc, {r0,r8}")
-        TEST_UNSUPPORTED(".short 0xe92f,0x5f00  @ stmdb pc!, {r8-r12,r14}")
-        TEST_UNSUPPORTED(".short 0xe8bd,0xc000  @ ldmia r13!, {r14,pc}")
-        TEST_UNSUPPORTED(".short 0xe93e,0xc000  @ ldmdb r14!, {r14,pc}")
-        TEST_UNSUPPORTED(".short 0xe8a7,0x3f00  @ stmia r7!, {r8-r12,sp}")
-        TEST_UNSUPPORTED(".short 0xe8a7,0x9f00  @ stmia r7!, {r8-r12,pc}")
-        TEST_UNSUPPORTED(".short 0xe93e,0x2010  @ ldmdb r14!, {r4,sp}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe88f0101) "   @ stmia pc, {r0,r8}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe92f5f00) "   @ stmdb pc!, {r8-r12,r14}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8bdc000) "   @ ldmia r13!, {r14,pc}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe93ec000) "   @ ldmdb r14!, {r14,pc}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8a73f00) "   @ stmia r7!, {r8-r12,sp}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8a79f00) "   @ stmia r7!, {r8-r12,pc}")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe93e2010) "   @ ldmdb r14!, {r4,sp}")
 
         TEST_GROUP("Load/store double or exclusive, table branch")
 
@@ -402,12 +403,12 @@ void kprobe_thumb32_test_cases(void)
                 "3:     .word   "__stringify(VAL1)"     \n\t"
                 "       .word   "__stringify(VAL2))
 
-        TEST_UNSUPPORTED(".short 0xe9ff,0xec04  @ ldrd  r14, r12, [pc, #16]!")
-        TEST_UNSUPPORTED(".short 0xe8ff,0xec04  @ ldrd  r14, r12, [pc], #16")
-        TEST_UNSUPPORTED(".short 0xe9d4,0xd800  @ ldrd  sp, r8, [r4]")
-        TEST_UNSUPPORTED(".short 0xe9d4,0xf800  @ ldrd  pc, r8, [r4]")
-        TEST_UNSUPPORTED(".short 0xe9d4,0x7d00  @ ldrd  r7, sp, [r4]")
-        TEST_UNSUPPORTED(".short 0xe9d4,0x7f00  @ ldrd  r7, pc, [r4]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9ffec04) "   @ ldrd  r14, r12, [pc, #16]!")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8ffec04) "   @ ldrd  r14, r12, [pc], #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9d4d800) "   @ ldrd  sp, r8, [r4]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9d4f800) "   @ ldrd  pc, r8, [r4]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9d47d00) "   @ ldrd  r7, sp, [r4]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9d47f00) "   @ ldrd  r7, pc, [r4]")
 
         TEST_RRP("strd  r",0, VAL1,", r",1, VAL2,", [r",1, 24,", #-16]")
         TEST_RR( "strd  r",12,VAL2,", r",14,VAL1,", [sp, #16]")
@@ -415,8 +416,8 @@ void kprobe_thumb32_test_cases(void)
         TEST_RR( "strd  r",14,VAL2,", r",12,VAL1,", [sp, #16]!")
         TEST_RRP("strd  r",1, VAL1,", r",0, VAL2,", [r",7, 24,"], #16")
         TEST_RR( "strd  r",7, VAL2,", r",8, VAL1,", [sp], #-16")
-        TEST_UNSUPPORTED(".short 0xe9ef,0xec04  @ strd  r14, r12, [pc, #16]!")
-        TEST_UNSUPPORTED(".short 0xe8ef,0xec04  @ strd  r14, r12, [pc], #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe9efec04) "   @ strd  r14, r12, [pc, #16]!")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8efec04) "   @ strd  r14, r12, [pc], #16")
 
         TEST_RX("tbb    [pc, r",0, (9f-(1f+4)),"]",
                 "9:                     \n\t"
@@ -460,9 +461,9 @@ void kprobe_thumb32_test_cases(void)
                 "3:     mvn     r0, r0  \n\t"
                 "2:     nop             \n\t")
 
-        TEST_UNSUPPORTED(".short 0xe8d1,0xf01f  @ tbh [r1, pc]")
-        TEST_UNSUPPORTED(".short 0xe8d1,0xf01d  @ tbh [r1, sp]")
-        TEST_UNSUPPORTED(".short 0xe8dd,0xf012  @ tbh [sp, r2]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8d1f01f) "   @ tbh [r1, pc]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8d1f01d) "   @ tbh [r1, sp]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xe8ddf012) "   @ tbh [sp, r2]")
 
         TEST_UNSUPPORTED("strexb        r0, r1, [r2]")
         TEST_UNSUPPORTED("strexh        r0, r1, [r2]")
@@ -540,40 +541,40 @@ void kprobe_thumb32_test_cases(void)
         TEST_RR("pkhtb  r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR("pkhtb  r14,r",12, HH1,", r",10,HH2,", asr #2")
 
-        TEST_UNSUPPORTED(".short 0xea17,0x0f0d  @ tst.w r7, sp")
-        TEST_UNSUPPORTED(".short 0xea17,0x0f0f  @ tst.w r7, pc")
-        TEST_UNSUPPORTED(".short 0xea1d,0x0f07  @ tst.w sp, r7")
-        TEST_UNSUPPORTED(".short 0xea1f,0x0f07  @ tst.w pc, r7")
-        TEST_UNSUPPORTED(".short 0xf01d,0x1f08  @ tst sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf01f,0x1f08  @ tst pc, #0x00080008")
-
-        TEST_UNSUPPORTED(".short 0xea97,0x0f0d  @ teq.w r7, sp")
-        TEST_UNSUPPORTED(".short 0xea97,0x0f0f  @ teq.w r7, pc")
-        TEST_UNSUPPORTED(".short 0xea9d,0x0f07  @ teq.w sp, r7")
-        TEST_UNSUPPORTED(".short 0xea9f,0x0f07  @ teq.w pc, r7")
-        TEST_UNSUPPORTED(".short 0xf09d,0x1f08  @ tst sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf09f,0x1f08  @ tst pc, #0x00080008")
-
-        TEST_UNSUPPORTED(".short 0xeb17,0x0f0d  @ cmn.w r7, sp")
-        TEST_UNSUPPORTED(".short 0xeb17,0x0f0f  @ cmn.w r7, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea170f0d) "   @ tst.w r7, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea170f0f) "   @ tst.w r7, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea1d0f07) "   @ tst.w sp, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea1f0f07) "   @ tst.w pc, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf01d1f08) "   @ tst sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf01f1f08) "   @ tst pc, #0x00080008")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xea970f0d) "   @ teq.w r7, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea970f0f) "   @ teq.w r7, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea9d0f07) "   @ teq.w sp, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea9f0f07) "   @ teq.w pc, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf09d1f08) "   @ tst sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf09f1f08) "   @ tst pc, #0x00080008")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb170f0d) "   @ cmn.w r7, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb170f0f) "   @ cmn.w r7, pc")
         TEST_P("cmn.w   sp, r",7,0,"")
-        TEST_UNSUPPORTED(".short 0xeb1f,0x0f07  @ cmn.w pc, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb1f0f07) "   @ cmn.w pc, r7")
         TEST(  "cmn     sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf11f,0x1f08  @ cmn pc, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf11f1f08) "   @ cmn pc, #0x00080008")
 
-        TEST_UNSUPPORTED(".short 0xebb7,0x0f0d  @ cmp.w r7, sp")
-        TEST_UNSUPPORTED(".short 0xebb7,0x0f0f  @ cmp.w r7, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebb70f0d) "   @ cmp.w r7, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebb70f0f) "   @ cmp.w r7, pc")
         TEST_P("cmp.w   sp, r",7,0,"")
-        TEST_UNSUPPORTED(".short 0xebbf,0x0f07  @ cmp.w pc, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebbf0f07) "   @ cmp.w pc, r7")
         TEST(  "cmp     sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf1bf,0x1f08  @ cmp pc, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1bf1f08) "   @ cmp pc, #0x00080008")
 
-        TEST_UNSUPPORTED(".short 0xea5f,0x070d  @ movs.w r7, sp")
-        TEST_UNSUPPORTED(".short 0xea5f,0x070f  @ movs.w r7, pc")
-        TEST_UNSUPPORTED(".short 0xea5f,0x0d07  @ movs.w sp, r7")
-        TEST_UNSUPPORTED(".short 0xea4f,0x0f07  @ mov.w  pc, r7")
-        TEST_UNSUPPORTED(".short 0xf04f,0x1d08  @ mov sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf04f,0x1f08  @ mov pc, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea5f070d) "   @ movs.w r7, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea5f070f) "   @ movs.w r7, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea5f0d07) "   @ movs.w sp, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea4f0f07) "   @ mov.w  pc, r7")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf04f1d08) "   @ mov sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf04f1f08) "   @ mov pc, #0x00080008")
 
         TEST_R("add.w   r0, sp, r",1, 4,"")
         TEST_R("adds    r0, sp, r",1, 4,", asl #3")
@@ -581,15 +582,15 @@ void kprobe_thumb32_test_cases(void)
         TEST_R("add     r0, sp, r",1, 16,", ror #1")
         TEST_R("add.w   sp, sp, r",1, 4,"")
         TEST_R("add     sp, sp, r",1, 4,", asl #3")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x1d01  @ add sp, sp, r1, asl #4")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x0d71  @ add sp, sp, r1, ror #1")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d1d01) "   @ add sp, sp, r1, asl #4")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d0d71) "   @ add sp, sp, r1, ror #1")
         TEST(  "add.w   r0, sp, #24")
         TEST(  "add.w   sp, sp, #24")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x0f01  @ add pc, sp, r1")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x000f  @ add r0, sp, pc")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x000d  @ add r0, sp, sp")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x0d0f  @ add sp, sp, pc")
-        TEST_UNSUPPORTED(".short 0xeb0d,0x0d0d  @ add sp, sp, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d0f01) "   @ add pc, sp, r1")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d000f) "   @ add r0, sp, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d000d) "   @ add r0, sp, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d0d0f) "   @ add sp, sp, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0d0d0d) "   @ add sp, sp, sp")
 
         TEST_R("sub.w   r0, sp, r",1, 4,"")
         TEST_R("subs    r0, sp, r",1, 4,", asl #3")
@@ -597,54 +598,54 @@ void kprobe_thumb32_test_cases(void)
         TEST_R("sub     r0, sp, r",1, 16,", ror #1")
         TEST_R("sub.w   sp, sp, r",1, 4,"")
         TEST_R("sub     sp, sp, r",1, 4,", asl #3")
-        TEST_UNSUPPORTED(".short 0xebad,0x1d01  @ sub sp, sp, r1, asl #4")
-        TEST_UNSUPPORTED(".short 0xebad,0x0d71  @ sub sp, sp, r1, ror #1")
-        TEST_UNSUPPORTED(".short 0xebad,0x0f01  @ sub pc, sp, r1")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebad1d01) "   @ sub sp, sp, r1, asl #4")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebad0d71) "   @ sub sp, sp, r1, ror #1")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebad0f01) "   @ sub pc, sp, r1")
         TEST(  "sub.w   r0, sp, #24")
         TEST(  "sub.w   sp, sp, #24")
 
-        TEST_UNSUPPORTED(".short 0xea02,0x010f  @ and r1, r2, pc")
-        TEST_UNSUPPORTED(".short 0xea0f,0x0103  @ and r1, pc, r3")
-        TEST_UNSUPPORTED(".short 0xea02,0x0f03  @ and pc, r2, r3")
-        TEST_UNSUPPORTED(".short 0xea02,0x010d  @ and r1, r2, sp")
-        TEST_UNSUPPORTED(".short 0xea0d,0x0103  @ and r1, sp, r3")
-        TEST_UNSUPPORTED(".short 0xea02,0x0d03  @ and sp, r2, r3")
-        TEST_UNSUPPORTED(".short 0xf00d,0x1108  @ and r1, sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf00f,0x1108  @ and r1, pc, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf002,0x1d08  @ and sp, r8, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf002,0x1f08  @ and pc, r8, #0x00080008")
-
-        TEST_UNSUPPORTED(".short 0xeb02,0x010f  @ add r1, r2, pc")
-        TEST_UNSUPPORTED(".short 0xeb0f,0x0103  @ add r1, pc, r3")
-        TEST_UNSUPPORTED(".short 0xeb02,0x0f03  @ add pc, r2, r3")
-        TEST_UNSUPPORTED(".short 0xeb02,0x010d  @ add r1, r2, sp")
-        TEST_SUPPORTED(  ".short 0xeb0d,0x0103  @ add r1, sp, r3")
-        TEST_UNSUPPORTED(".short 0xeb02,0x0d03  @ add sp, r2, r3")
-        TEST_SUPPORTED(  ".short 0xf10d,0x1108  @ add r1, sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf10d,0x1f08  @ add pc, sp, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf10f,0x1108  @ add r1, pc, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf102,0x1d08  @ add sp, r8, #0x00080008")
-        TEST_UNSUPPORTED(".short 0xf102,0x1f08  @ add pc, r8, #0x00080008")
-
-        TEST_UNSUPPORTED(".short 0xeaa0,0x0000")
-        TEST_UNSUPPORTED(".short 0xeaf0,0x0000")
-        TEST_UNSUPPORTED(".short 0xeb20,0x0000")
-        TEST_UNSUPPORTED(".short 0xeb80,0x0000")
-        TEST_UNSUPPORTED(".short 0xebe0,0x0000")
-
-        TEST_UNSUPPORTED(".short 0xf0a0,0x0000")
-        TEST_UNSUPPORTED(".short 0xf0c0,0x0000")
-        TEST_UNSUPPORTED(".short 0xf0f0,0x0000")
-        TEST_UNSUPPORTED(".short 0xf120,0x0000")
-        TEST_UNSUPPORTED(".short 0xf180,0x0000")
-        TEST_UNSUPPORTED(".short 0xf1e0,0x0000")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea02010f) "   @ and r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea0f0103) "   @ and r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea020f03) "   @ and pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea02010d) "   @ and r1, r2, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea0d0103) "   @ and r1, sp, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xea020d03) "   @ and sp, r2, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf00d1108) "   @ and r1, sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf00f1108) "   @ and r1, pc, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf0021d08) "   @ and sp, r8, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf0021f08) "   @ and pc, r8, #0x00080008")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb02010f) "   @ add r1, r2, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb0f0103) "   @ add r1, pc, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb020f03) "   @ add pc, r2, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb02010d) "   @ add r1, r2, sp")
+        TEST_SUPPORTED(  __inst_thumb32(0xeb0d0103) "   @ add r1, sp, r3")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb020d03) "   @ add sp, r2, r3")
+        TEST_SUPPORTED(  __inst_thumb32(0xf10d1108) "   @ add r1, sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf10d1f08) "   @ add pc, sp, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf10f1108) "   @ add r1, pc, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1021d08) "   @ add sp, r8, #0x00080008")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1021f08) "   @ add pc, r8, #0x00080008")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xeaa00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeaf00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb200000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeb800000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xebe00000) "")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xf0a00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf0c00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf0f00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1200000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1800000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf1e00000) "")
 
         TEST_GROUP("Coprocessor instructions")
 
-        TEST_UNSUPPORTED(".short 0xec00,0x0000")
-        TEST_UNSUPPORTED(".short 0xeff0,0x0000")
-        TEST_UNSUPPORTED(".short 0xfc00,0x0000")
-        TEST_UNSUPPORTED(".short 0xfff0,0x0000")
+        TEST_UNSUPPORTED(__inst_thumb32(0xec000000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xeff00000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfc000000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfff00000) "")
 
         TEST_GROUP("Data-processing (plain binary immediate)")
 
@@ -652,92 +653,92 @@ void kprobe_thumb32_test_cases(void)
         TEST(  "addw    r14, sp, #0xf5a")
         TEST(  "addw    sp, sp, #0x20")
         TEST(  "addw    r7,  pc, #0x888")
-        TEST_UNSUPPORTED(".short 0xf20f,0x1f20  @ addw pc, pc, #0x120")
-        TEST_UNSUPPORTED(".short 0xf20d,0x1f20  @ addw pc, sp, #0x120")
-        TEST_UNSUPPORTED(".short 0xf20f,0x1d20  @ addw sp, pc, #0x120")
-        TEST_UNSUPPORTED(".short 0xf200,0x1d20  @ addw sp, r0, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf20f1f20) "   @ addw pc, pc, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf20d1f20) "   @ addw pc, sp, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf20f1d20) "   @ addw sp, pc, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2001d20) "   @ addw sp, r0, #0x120")
 
         TEST_R("subw    r0,  r",1, VAL1,", #0x123")
         TEST(  "subw    r14, sp, #0xf5a")
         TEST(  "subw    sp, sp, #0x20")
         TEST(  "subw    r7,  pc, #0x888")
-        TEST_UNSUPPORTED(".short 0xf2af,0x1f20  @ subw pc, pc, #0x120")
-        TEST_UNSUPPORTED(".short 0xf2ad,0x1f20  @ subw pc, sp, #0x120")
-        TEST_UNSUPPORTED(".short 0xf2af,0x1d20  @ subw sp, pc, #0x120")
-        TEST_UNSUPPORTED(".short 0xf2a0,0x1d20  @ subw sp, r0, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2af1f20) "   @ subw pc, pc, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2ad1f20) "   @ subw pc, sp, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2af1d20) "   @ subw sp, pc, #0x120")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2a01d20) "   @ subw sp, r0, #0x120")
 
         TEST("movw      r0, #0")
         TEST("movw      r0, #0xffff")
         TEST("movw      lr, #0xffff")
-        TEST_UNSUPPORTED(".short 0xf240,0x0d00  @ movw sp, #0")
-        TEST_UNSUPPORTED(".short 0xf240,0x0f00  @ movw pc, #0")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2400d00) "   @ movw sp, #0")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2400f00) "   @ movw pc, #0")
 
         TEST_R("movt    r",0, VAL1,", #0")
         TEST_R("movt    r",0, VAL2,", #0xffff")
         TEST_R("movt    r",14,VAL1,", #0xffff")
-        TEST_UNSUPPORTED(".short 0xf2c0,0x0d00  @ movt sp, #0")
-        TEST_UNSUPPORTED(".short 0xf2c0,0x0f00  @ movt pc, #0")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2c00d00) "   @ movt sp, #0")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf2c00f00) "   @ movt pc, #0")
 
         TEST_R(     "ssat       r0, #24, r",0,   VAL1,"")
         TEST_R(     "ssat       r14, #24, r",12, VAL2,"")
         TEST_R(     "ssat       r0, #24, r",0,   VAL1,", lsl #8")
         TEST_R(     "ssat       r14, #24, r",12, VAL2,", asr #8")
-        TEST_UNSUPPORTED(".short 0xf30c,0x0d17  @ ssat  sp, #24, r12")
-        TEST_UNSUPPORTED(".short 0xf30c,0x0f17  @ ssat  pc, #24, r12")
-        TEST_UNSUPPORTED(".short 0xf30d,0x0c17  @ ssat  r12, #24, sp")
-        TEST_UNSUPPORTED(".short 0xf30f,0x0c17  @ ssat  r12, #24, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf30c0d17) "   @ ssat  sp, #24, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf30c0f17) "   @ ssat  pc, #24, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf30d0c17) "   @ ssat  r12, #24, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf30f0c17) "   @ ssat  r12, #24, pc")
 
         TEST_R(     "usat       r0, #24, r",0,   VAL1,"")
         TEST_R(     "usat       r14, #24, r",12, VAL2,"")
         TEST_R(     "usat       r0, #24, r",0,   VAL1,", lsl #8")
         TEST_R(     "usat       r14, #24, r",12, VAL2,", asr #8")
-        TEST_UNSUPPORTED(".short 0xf38c,0x0d17  @ usat  sp, #24, r12")
-        TEST_UNSUPPORTED(".short 0xf38c,0x0f17  @ usat  pc, #24, r12")
-        TEST_UNSUPPORTED(".short 0xf38d,0x0c17  @ usat  r12, #24, sp")
-        TEST_UNSUPPORTED(".short 0xf38f,0x0c17  @ usat  r12, #24, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf38c0d17) "   @ usat  sp, #24, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf38c0f17) "   @ usat  pc, #24, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf38d0c17) "   @ usat  r12, #24, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf38f0c17) "   @ usat  r12, #24, pc")
 
         TEST_R(     "ssat16     r0, #12, r",0,   HH1,"")
         TEST_R(     "ssat16     r14, #12, r",12, HH2,"")
-        TEST_UNSUPPORTED(".short 0xf32c,0x0d0b  @ ssat16        sp, #12, r12")
-        TEST_UNSUPPORTED(".short 0xf32c,0x0f0b  @ ssat16        pc, #12, r12")
-        TEST_UNSUPPORTED(".short 0xf32d,0x0c0b  @ ssat16        r12, #12, sp")
-        TEST_UNSUPPORTED(".short 0xf32f,0x0c0b  @ ssat16        r12, #12, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf32c0d0b) "   @ ssat16        sp, #12, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf32c0f0b) "   @ ssat16        pc, #12, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf32d0c0b) "   @ ssat16        r12, #12, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf32f0c0b) "   @ ssat16        r12, #12, pc")
 
         TEST_R(     "usat16     r0, #12, r",0,   HH1,"")
         TEST_R(     "usat16     r14, #12, r",12, HH2,"")
-        TEST_UNSUPPORTED(".short 0xf3ac,0x0d0b  @ usat16        sp, #12, r12")
-        TEST_UNSUPPORTED(".short 0xf3ac,0x0f0b  @ usat16        pc, #12, r12")
-        TEST_UNSUPPORTED(".short 0xf3ad,0x0c0b  @ usat16        r12, #12, sp")
-        TEST_UNSUPPORTED(".short 0xf3af,0x0c0b  @ usat16        r12, #12, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3ac0d0b) "   @ usat16        sp, #12, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3ac0f0b) "   @ usat16        pc, #12, r12")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3ad0c0b) "   @ usat16        r12, #12, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3af0c0b) "   @ usat16        r12, #12, pc")
 
         TEST_R(     "sbfx       r0, r",0  , VAL1,", #0, #31")
         TEST_R(     "sbfx       r14, r",12, VAL2,", #8, #16")
         TEST_R(     "sbfx       r4, r",10,  VAL1,", #16, #15")
-        TEST_UNSUPPORTED(".short 0xf34c,0x2d0f  @ sbfx  sp, r12, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf34c,0x2f0f  @ sbfx  pc, r12, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf34d,0x2c0f  @ sbfx  r12, sp, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf34f,0x2c0f  @ sbfx  r12, pc, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf34c2d0f) "   @ sbfx  sp, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf34c2f0f) "   @ sbfx  pc, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf34d2c0f) "   @ sbfx  r12, sp, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf34f2c0f) "   @ sbfx  r12, pc, #8, #16")
 
         TEST_R(     "ubfx       r0, r",0  , VAL1,", #0, #31")
         TEST_R(     "ubfx       r14, r",12, VAL2,", #8, #16")
         TEST_R(     "ubfx       r4, r",10,  VAL1,", #16, #15")
-        TEST_UNSUPPORTED(".short 0xf3cc,0x2d0f  @ ubfx  sp, r12, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf3cc,0x2f0f  @ ubfx  pc, r12, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf3cd,0x2c0f  @ ubfx  r12, sp, #8, #16")
-        TEST_UNSUPPORTED(".short 0xf3cf,0x2c0f  @ ubfx  r12, pc, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3cc2d0f) "   @ ubfx  sp, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3cc2f0f) "   @ ubfx  pc, r12, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3cd2c0f) "   @ ubfx  r12, sp, #8, #16")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3cf2c0f) "   @ ubfx  r12, pc, #8, #16")
 
         TEST_R(     "bfc        r",0, VAL1,", #4, #20")
         TEST_R(     "bfc        r",14,VAL2,", #4, #20")
         TEST_R(     "bfc        r",7, VAL1,", #0, #31")
         TEST_R(     "bfc        r",8, VAL2,", #0, #31")
-        TEST_UNSUPPORTED(".short 0xf36f,0x0d1e  @ bfc   sp, #0, #31")
-        TEST_UNSUPPORTED(".short 0xf36f,0x0f1e  @ bfc   pc, #0, #31")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf36f0d1e) "   @ bfc   sp, #0, #31")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf36f0f1e) "   @ bfc   pc, #0, #31")
 
         TEST_RR(    "bfi        r",0, VAL1,", r",0  , VAL2,", #0, #31")
         TEST_RR(    "bfi        r",12,VAL1,", r",14 , VAL2,", #4, #20")
-        TEST_UNSUPPORTED(".short 0xf36e,0x1d17  @ bfi   sp, r14, #4, #20")
-        TEST_UNSUPPORTED(".short 0xf36e,0x1f17  @ bfi   pc, r14, #4, #20")
-        TEST_UNSUPPORTED(".short 0xf36d,0x1e17  @ bfi   r14, sp, #4, #20")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf36e1d17) "   @ bfi   sp, r14, #4, #20")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf36e1f17) "   @ bfi   pc, r14, #4, #20")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf36d1e17) "   @ bfi   r14, sp, #4, #20")
 
         TEST_GROUP("Branches and miscellaneous control")
 
@@ -775,14 +776,14 @@ CONDITION_INSTRUCTIONS(22,
 
         TEST("mrs       r0, cpsr")
         TEST("mrs       r14, cpsr")
-        TEST_UNSUPPORTED(".short 0xf3ef,0x8d00  @ mrs   sp, spsr")
-        TEST_UNSUPPORTED(".short 0xf3ef,0x8f00  @ mrs   pc, spsr")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3ef8d00) "   @ mrs   sp, spsr")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf3ef8f00) "   @ mrs   pc, spsr")
         TEST_UNSUPPORTED("mrs   r0, spsr")
         TEST_UNSUPPORTED("mrs   lr, spsr")
 
-        TEST_UNSUPPORTED(".short 0xf7f0,0x8000 @ smc #0")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf7f08000) " @ smc #0")
 
-        TEST_UNSUPPORTED(".short 0xf7f0,0xa000 @ undefeined")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf7f0a000) " @ undefeined")
 
         TEST_BF(  "b.w  2f")
         TEST_BB(  "b.w  2b")
@@ -829,15 +830,15 @@ CONDITION_INSTRUCTIONS(22,
         SINGLE_STORE("")
 
         TEST("str       sp, [sp]")
-        TEST_UNSUPPORTED(".short 0xf8cf,0xe000  @ str   r14, [pc]")
-        TEST_UNSUPPORTED(".short 0xf8ce,0xf000  @ str   pc, [r14]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf8cfe000) "   @ str   r14, [pc]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf8cef000) "   @ str   pc, [r14]")
 
         TEST_GROUP("Advanced SIMD element or structure load/store instructions")
 
-        TEST_UNSUPPORTED(".short 0xf900,0x0000")
-        TEST_UNSUPPORTED(".short 0xf92f,0xffff")
-        TEST_UNSUPPORTED(".short 0xf980,0x0000")
-        TEST_UNSUPPORTED(".short 0xf9ef,0xffff")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf9000000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf92fffff) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf9800000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf9efffff) "")
 
         TEST_GROUP("Load single data item and memory hints")
 
@@ -881,20 +882,20 @@ CONDITION_INSTRUCTIONS(22,
         TEST_SUPPORTED("ldr     sp, 99f")
         TEST_SUPPORTED("ldr     pc, 99f")
 
-        TEST_UNSUPPORTED(".short 0xf854,0x700d  @ ldr   r7, [r4, sp]")
-        TEST_UNSUPPORTED(".short 0xf854,0x700f  @ ldr   r7, [r4, pc]")
-        TEST_UNSUPPORTED(".short 0xf814,0x700d  @ ldrb  r7, [r4, sp]")
-        TEST_UNSUPPORTED(".short 0xf814,0x700f  @ ldrb  r7, [r4, pc]")
-        TEST_UNSUPPORTED(".short 0xf89f,0xd004  @ ldrb  sp, 99f")
-        TEST_UNSUPPORTED(".short 0xf814,0xd008  @ ldrb  sp, [r4, r8]")
-        TEST_UNSUPPORTED(".short 0xf894,0xd000  @ ldrb  sp, [r4]")
-
-        TEST_UNSUPPORTED(".short 0xf860,0x0000") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xf9ff,0xffff") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xf950,0x0000") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xf95f,0xffff") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xf800,0x0800") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xf97f,0xfaff") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf854700d) "   @ ldr   r7, [r4, sp]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf854700f) "   @ ldr   r7, [r4, pc]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf814700d) "   @ ldrb  r7, [r4, sp]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf814700f) "   @ ldrb  r7, [r4, pc]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf89fd004) "   @ ldrb  sp, 99f")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf814d008) "   @ ldrb  sp, [r4, r8]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf894d000) "   @ ldrb  sp, [r4]")
+
+        TEST_UNSUPPORTED(__inst_thumb32(0xf8600000) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf9ffffff) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf9500000) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf95fffff) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf8000800) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xf97ffaff) "") /* Unallocated space */
 
         TEST(   "pli    [pc, #4]")
         TEST(   "pli    [pc, #-4]")
@@ -902,22 +903,22 @@ CONDITION_INSTRUCTIONS(22,
         TEST(   "pld    [pc, #-4]")
 
         TEST_P( "pld    [r",0,-1024,", #1024]")
-        TEST(   ".short 0xf8b0,0xf400   @ pldw  [r0, #1024]")
+        TEST(   __inst_thumb32(0xf8b0f400) "    @ pldw  [r0, #1024]")
         TEST_P( "pli    [r",4, 0b,", #1024]")
         TEST_P( "pld    [r",7, 120,", #-120]")
-        TEST(   ".short 0xf837,0xfc78   @ pldw  [r7, #-120]")
+        TEST(   __inst_thumb32(0xf837fc78) "    @ pldw  [r7, #-120]")
         TEST_P( "pli    [r",11,120,", #-120]")
         TEST(   "pld    [sp, #0]")
 
         TEST_PR("pld    [r",7, 24, ", r",0, 16,"]")
         TEST_PR("pld    [r",8, 24, ", r",12,16,", lsl #3]")
-        TEST_SUPPORTED(".short 0xf837,0xf000    @ pldw  [r7, r0]")
-        TEST_SUPPORTED(".short 0xf838,0xf03c    @ pldw  [r8, r12, lsl #3]");
+        TEST_SUPPORTED(__inst_thumb32(0xf837f000) "     @ pldw  [r7, r0]")
+        TEST_SUPPORTED(__inst_thumb32(0xf838f03c) "     @ pldw  [r8, r12, lsl #3]");
         TEST_RR("pli    [r",12,0b,", r",0, 16,"]")
         TEST_RR("pli    [r",0, 0b,", r",12,16,", lsl #3]")
         TEST_R( "pld    [sp, r",1, 16,"]")
-        TEST_UNSUPPORTED(".short 0xf817,0xf00d  @pld    [r7, sp]")
-        TEST_UNSUPPORTED(".short 0xf817,0xf00f  @pld    [r7, pc]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf817f00d) "  @pld     [r7, sp]")
+        TEST_UNSUPPORTED(__inst_thumb32(0xf817f00f) "  @pld     [r7, pc]")
 
         TEST_GROUP("Data-processing (register)")
 
@@ -934,21 +935,21 @@ CONDITION_INSTRUCTIONS(22,
         SHIFTS32("ror")
         SHIFTS32("rors")
 
-        TEST_UNSUPPORTED(".short 0xfa01,0xff02  @ lsl   pc, r1, r2")
-        TEST_UNSUPPORTED(".short 0xfa01,0xfd02  @ lsl   sp, r1, r2")
-        TEST_UNSUPPORTED(".short 0xfa0f,0xf002  @ lsl   r0, pc, r2")
-        TEST_UNSUPPORTED(".short 0xfa0d,0xf002  @ lsl   r0, sp, r2")
-        TEST_UNSUPPORTED(".short 0xfa01,0xf00f  @ lsl   r0, r1, pc")
-        TEST_UNSUPPORTED(".short 0xfa01,0xf00d  @ lsl   r0, r1, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa01ff02) "   @ lsl   pc, r1, r2")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa01fd02) "   @ lsl   sp, r1, r2")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0ff002) "   @ lsl   r0, pc, r2")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0df002) "   @ lsl   r0, sp, r2")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa01f00f) "   @ lsl   r0, r1, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa01f00d) "   @ lsl   r0, r1, sp")
 
         TEST_RR(    "sxtah      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "sxtah      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "sxth       r8, r",7,  HH1,"")
 
-        TEST_UNSUPPORTED(".short 0xfa0f,0xff87  @ sxth  pc, r7");
-        TEST_UNSUPPORTED(".short 0xfa0f,0xfd87  @ sxth  sp, r7");
-        TEST_UNSUPPORTED(".short 0xfa0f,0xf88f  @ sxth  r8, pc");
-        TEST_UNSUPPORTED(".short 0xfa0f,0xf88d  @ sxth  r8, sp");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0fff87) "   @ sxth  pc, r7");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0ffd87) "   @ sxth  sp, r7");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0ff88f) "   @ sxth  r8, pc");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa0ff88d) "   @ sxth  r8, sp");
 
         TEST_RR(    "uxtah      r0, r",0,  HH1,", r",1, HH2,"")
         TEST_RR(    "uxtah      r14,r",12, HH2,", r",10,HH1,", ror #8")
@@ -970,8 +971,8 @@ CONDITION_INSTRUCTIONS(22,
         TEST_RR(    "uxtab      r14,r",12, HH2,", r",10,HH1,", ror #8")
         TEST_R(     "uxtb       r8, r",7,  HH1,"")
 
-        TEST_UNSUPPORTED(".short 0xfa60,0x00f0")
-        TEST_UNSUPPORTED(".short 0xfa7f,0xffff")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa6000f0) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa7fffff) "")
 
 #define PARALLEL_ADD_SUB(op)                                    \
         TEST_RR(  op"add16      r0, r",0,  HH1,", r",1, HH2,"") \
@@ -1019,10 +1020,10 @@ CONDITION_INSTRUCTIONS(22,
         TEST_R("revsh.w r0, r",0,   VAL1,"")
         TEST_R("revsh   r14, r",12, VAL2,"")
 
-        TEST_UNSUPPORTED(".short 0xfa9c,0xff8c  @ rev   pc, r12");
-        TEST_UNSUPPORTED(".short 0xfa9c,0xfd8c  @ rev   sp, r12");
-        TEST_UNSUPPORTED(".short 0xfa9f,0xfe8f  @ rev   r14, pc");
-        TEST_UNSUPPORTED(".short 0xfa9d,0xfe8d  @ rev   r14, sp");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa9cff8c) "   @ rev   pc, r12");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa9cfd8c) "   @ rev   sp, r12");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa9ffe8f) "   @ rev   r14, pc");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa9dfe8d) "   @ rev   r14, sp");
 
         TEST_RR("sel    r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR("sel    r14, r",12,VAL1,", r",10, VAL2,"")
@@ -1031,31 +1032,31 @@ CONDITION_INSTRUCTIONS(22,
         TEST_R("clz     r7, r",14,0x1,"")
         TEST_R("clz     lr, r",7, 0xffffffff,"")
 
-        TEST_UNSUPPORTED(".short 0xfa80,0xf030") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfaff,0xff7f") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfab0,0xf000") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfaff,0xff7f") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfa80f030) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfaffff7f) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfab0f000) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfaffff7f) "") /* Unallocated space */
 
         TEST_GROUP("Multiply, multiply accumulate, and absolute difference operations")
 
         TEST_RR(    "mul        r0, r",1, VAL1,", r",2, VAL2,"")
         TEST_RR(    "mul        r7, r",8, VAL2,", r",9, VAL2,"")
-        TEST_UNSUPPORTED(".short 0xfb08,0xff09  @ mul   pc, r8, r9")
-        TEST_UNSUPPORTED(".short 0xfb08,0xfd09  @ mul   sp, r8, r9")
-        TEST_UNSUPPORTED(".short 0xfb0f,0xf709  @ mul   r7, pc, r9")
-        TEST_UNSUPPORTED(".short 0xfb0d,0xf709  @ mul   r7, sp, r9")
-        TEST_UNSUPPORTED(".short 0xfb08,0xf70f  @ mul   r7, r8, pc")
-        TEST_UNSUPPORTED(".short 0xfb08,0xf70d  @ mul   r7, r8, sp")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08ff09) "   @ mul   pc, r8, r9")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08fd09) "   @ mul   sp, r8, r9")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb0ff709) "   @ mul   r7, pc, r9")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb0df709) "   @ mul   r7, sp, r9")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08f70f) "   @ mul   r7, r8, pc")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08f70d) "   @ mul   r7, r8, sp")
 
         TEST_RRR(   "mla        r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(   "mla        r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
-        TEST_UNSUPPORTED(".short 0xfb08,0xaf09  @ mla   pc, r8, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb08,0xad09  @ mla   sp, r8, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb0f,0xa709  @ mla   r7, pc, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb0d,0xa709  @ mla   r7, sp, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb08,0xa70f  @ mla   r7, r8, pc, r10");
-        TEST_UNSUPPORTED(".short 0xfb08,0xa70d  @ mla   r7, r8, sp, r10");
-        TEST_UNSUPPORTED(".short 0xfb08,0xd709  @ mla   r7, r8, r9, sp");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08af09) "   @ mla   pc, r8, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08ad09) "   @ mla   sp, r8, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb0fa709) "   @ mla   r7, pc, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb0da709) "   @ mla   r7, sp, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08a70f) "   @ mla   r7, r8, pc, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08a70d) "   @ mla   r7, r8, sp, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb08d709) "   @ mla   r7, r8, r9, sp");
 
         TEST_RRR(   "mls        r0, r",1, VAL1,", r",2, VAL2,", r",3,  VAL3,"")
         TEST_RRR(   "mls        r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
@@ -1123,25 +1124,25 @@ CONDITION_INSTRUCTIONS(22,
         TEST_RR(    "usad8      r0, r",0,  VAL1,", r",1, VAL2,"")
         TEST_RR(    "usad8      r14, r",12,VAL2,", r",10,VAL1,"")
 
-        TEST_UNSUPPORTED(".short 0xfb00,0xf010") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfb0f,0xff1f") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfb70,0xf010") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfb7f,0xff1f") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfb70,0x0010") /* Unallocated space */
-        TEST_UNSUPPORTED(".short 0xfb7f,0xff1f") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb00f010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb0fff1f) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb70f010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb7fff1f) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb700010) "") /* Unallocated space */
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb7fff1f) "") /* Unallocated space */
 
         TEST_GROUP("Long multiply, long multiply accumulate, and divide")
 
         TEST_RR(   "smull       r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(   "smull       r7, r8, r",9, VAL2,", r",10, VAL1,"")
-        TEST_UNSUPPORTED(".short 0xfb89,0xf80a  @ smull pc, r8, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb89,0xd80a  @ smull sp, r8, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb89,0x7f0a  @ smull r7, pc, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb89,0x7d0a  @ smull r7, sp, r9, r10");
-        TEST_UNSUPPORTED(".short 0xfb8f,0x780a  @ smull r7, r8, pc, r10");
-        TEST_UNSUPPORTED(".short 0xfb8d,0x780a  @ smull r7, r8, sp, r10");
-        TEST_UNSUPPORTED(".short 0xfb89,0x780f  @ smull r7, r8, r9, pc");
-        TEST_UNSUPPORTED(".short 0xfb89,0x780d  @ smull r7, r8, r9, sp");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb89f80a) "   @ smull pc, r8, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb89d80a) "   @ smull sp, r8, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb897f0a) "   @ smull r7, pc, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb897d0a) "   @ smull r7, sp, r9, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb8f780a) "   @ smull r7, r8, pc, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb8d780a) "   @ smull r7, r8, sp, r10");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb89780f) "   @ smull r7, r8, r9, pc");
+        TEST_UNSUPPORTED(__inst_thumb32(0xfb89780d) "   @ smull r7, r8, r9, sp");
 
         TEST_RR(   "umull       r0, r1, r",2, VAL1,", r",3, VAL2,"")
         TEST_RR(   "umull       r7, r8, r",9, VAL2,", r",10, VAL1,"")
@@ -1175,8 +1176,8 @@ CONDITION_INSTRUCTIONS(22,
 
         TEST_GROUP("Coprocessor instructions")
 
-        TEST_UNSUPPORTED(".short 0xfc00,0x0000")
-        TEST_UNSUPPORTED(".short 0xffff,0xffff")
+        TEST_UNSUPPORTED(__inst_thumb32(0xfc000000) "")
+        TEST_UNSUPPORTED(__inst_thumb32(0xffffffff) "")
 
         TEST_GROUP("Testing instructions in IT blocks")
 
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c
index c2fd06b4c389..379639998d5a 100644
--- a/arch/arm/kernel/kprobes-test.c
+++ b/arch/arm/kernel/kprobes-test.c
@@ -113,7 +113,7 @@
  *      @ start of inline data...
  *      .ascii "mov r0, r7"     @ text title for test case
  *      .byte   0
- *      .align  2
+ *      .align  2, 0
  *
  *      @ TEST_ARG_REG
  *      .byte   ARG_TYPE_REG
@@ -1333,7 +1333,8 @@ static void test_case_failed(const char *message)
 static unsigned long next_instruction(unsigned long pc)
 {
 #ifdef CONFIG_THUMB2_KERNEL
-        if ((pc & 1) && !is_wide_instruction(*(u16 *)(pc - 1)))
+        if ((pc & 1) &&
+            !is_wide_instruction(__mem_to_opcode_thumb16(*(u16 *)(pc - 1))))
                 return pc + 2;
         else
 #endif
@@ -1378,13 +1379,13 @@ static uintptr_t __used kprobes_test_case_start(const char *title, void *stack)
 
         if (test_case_is_thumb) {
                 u16 *p = (u16 *)(test_code & ~1);
-                current_instruction = p[0];
+                current_instruction = __mem_to_opcode_thumb16(p[0]);
                 if (is_wide_instruction(current_instruction)) {
-                        current_instruction <<= 16;
-                        current_instruction |= p[1];
+                        u16 instr2 = __mem_to_opcode_thumb16(p[1]);
+                        current_instruction = __opcode_thumb32_compose(current_instruction, instr2);
                 }
         } else {
-                current_instruction = *(u32 *)test_code;
+                current_instruction = __mem_to_opcode_arm(*(u32 *)test_code);
         }
 
         if (current_title[0] == '.')
diff --git a/arch/arm/kernel/kprobes-test.h b/arch/arm/kernel/kprobes-test.h
index e28a869b1ae4..eecc90a0fd91 100644
--- a/arch/arm/kernel/kprobes-test.h
+++ b/arch/arm/kernel/kprobes-test.h
@@ -115,7 +115,7 @@ struct test_arg_end {
         /* multiple strings to be concatenated.  */             \
         ".ascii "#title"                                \n\t"   \
         ".byte  0                                       \n\t"   \
-        ".align 2                                       \n\t"
+        ".align 2, 0                                    \n\t"
 
 #define TEST_ARG_REG(reg, val)                                  \
         ".byte  "__stringify(ARG_TYPE_REG)"             \n\t"   \
diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c
index 6619188619ae..9495d7f3516f 100644
--- a/arch/arm/kernel/kprobes-thumb.c
+++ b/arch/arm/kernel/kprobes-thumb.c
@@ -149,9 +149,9 @@ t32_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi,
         enum probes_insn ret = kprobe_decode_ldmstm(insn, asi, d);
 
         /* Fixup modified instruction to have halfwords in correct order...*/
-        insn = asi->insn[0];
-        ((u16 *)asi->insn)[0] = insn >> 16;
-        ((u16 *)asi->insn)[1] = insn & 0xffff;
+        insn = __mem_to_opcode_arm(asi->insn[0]);
+        ((u16 *)asi->insn)[0] = __opcode_to_mem_thumb16(insn >> 16);
+        ((u16 *)asi->insn)[1] = __opcode_to_mem_thumb16(insn & 0xffff);
 
         return ret;
 }
@@ -516,7 +516,7 @@ t16_decode_hiregs(probes_opcode_t insn, struct arch_probes_insn *asi,
 {
         insn &= ~0x00ff;
         insn |= 0x001; /* Set Rdn = R1 and Rm = R0 */
-        ((u16 *)asi->insn)[0] = insn;
+        ((u16 *)asi->insn)[0] = __opcode_to_mem_thumb16(insn);
         asi->insn_handler = t16_emulate_hiregs;
         return INSN_GOOD;
 }
@@ -547,8 +547,10 @@ t16_decode_push(probes_opcode_t insn, struct arch_probes_insn *asi,
          * and call it with R9=SP and LR in the register list represented
          * by R8.
          */
-        ((u16 *)asi->insn)[0] = 0xe929;         /* 1st half STMDB R9!,{} */
-        ((u16 *)asi->insn)[1] = insn & 0x1ff;   /* 2nd half (register list) */
+        /* 1st half STMDB R9!,{} */
+        ((u16 *)asi->insn)[0] = __opcode_to_mem_thumb16(0xe929);
+        /* 2nd half (register list) */
+        ((u16 *)asi->insn)[1] = __opcode_to_mem_thumb16(insn & 0x1ff);
         asi->insn_handler = t16_emulate_push;
         return INSN_GOOD;
 }
@@ -600,8 +602,10 @@ t16_decode_pop(probes_opcode_t insn, struct arch_probes_insn *asi,
          * and call it with R9=SP and PC in the register list represented
          * by R8.
          */
-        ((u16 *)asi->insn)[0] = 0xe8b9;         /* 1st half LDMIA R9!,{} */
-        ((u16 *)asi->insn)[1] = insn & 0x1ff;   /* 2nd half (register list) */
+        /* 1st half LDMIA R9!,{} */
+        ((u16 *)asi->insn)[0] = __opcode_to_mem_thumb16(0xe8b9);
+        /* 2nd half (register list) */
+        ((u16 *)asi->insn)[1] = __opcode_to_mem_thumb16(insn & 0x1ff);
         asi->insn_handler = insn & 0x100 ? t16_emulate_pop_pc
                                          : t16_emulate_pop_nopc;
         return INSN_GOOD;
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c
index 8795f9f819d5..6d644202c8dc 100644
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
@@ -26,6 +26,7 @@
 #include <linux/stop_machine.h>
 #include <linux/stringify.h>
 #include <asm/traps.h>
+#include <asm/opcodes.h>
 #include <asm/cacheflush.h>
 #include <linux/percpu.h>
 #include <linux/bug.h>
@@ -67,10 +68,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 #ifdef CONFIG_THUMB2_KERNEL
         thumb = true;
         addr &= ~1; /* Bit 0 would normally be set to indicate Thumb code */
-        insn = ((u16 *)addr)[0];
+        insn = __mem_to_opcode_thumb16(((u16 *)addr)[0]);
         if (is_wide_instruction(insn)) {
-                insn <<= 16;
-                insn |= ((u16 *)addr)[1];
+                u16 inst2 = __mem_to_opcode_thumb16(((u16 *)addr)[1]);
+                insn = __opcode_thumb32_compose(insn, inst2);
                 decode_insn = thumb32_probes_decode_insn;
                 actions = kprobes_t32_actions;
         } else {
@@ -81,7 +82,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         thumb = false;
         if (addr & 0x3)
                 return -EINVAL;
-        insn = *p->addr;
+        insn = __mem_to_opcode_arm(*p->addr);
         decode_insn = arm_probes_decode_insn;
         actions = kprobes_arm_actions;
 #endif
diff --git a/arch/arm/kernel/pj4-cp0.c b/arch/arm/kernel/pj4-cp0.c
index 679cf4d18c08..fc7208636284 100644
--- a/arch/arm/kernel/pj4-cp0.c
+++ b/arch/arm/kernel/pj4-cp0.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <asm/thread_notify.h>
+#include <asm/cputype.h>
 
 static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)
 {
@@ -80,6 +81,9 @@ static int __init pj4_cp0_init(void)
 {
         u32 cp_access;
 
+        if (!cpu_is_pj4())
+                return 0;
+
         cp_access = pj4_cp_access_read() & ~0xf;
         pj4_cp_access_write(cp_access);
 
diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c
index b41873f33e69..a8ab540d7e73 100644
--- a/arch/arm/kernel/probes.c
+++ b/arch/arm/kernel/probes.c
@@ -202,13 +202,14 @@ prepare_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
 #ifdef CONFIG_THUMB2_KERNEL
         if (thumb) {
                 u16 *thumb_insn = (u16 *)asi->insn;
-                thumb_insn[1] = 0x4770; /* Thumb bx lr */
-                thumb_insn[2] = 0x4770; /* Thumb bx lr */
+                /* Thumb bx lr */
+                thumb_insn[1] = __opcode_to_mem_thumb16(0x4770);
+                thumb_insn[2] = __opcode_to_mem_thumb16(0x4770);
                 return insn;
         }
-        asi->insn[1] = 0xe12fff1e; /* ARM bx lr */
+        asi->insn[1] = __opcode_to_mem_arm(0xe12fff1e); /* ARM bx lr */
 #else
-        asi->insn[1] = 0xe1a0f00e; /* mov pc, lr */
+        asi->insn[1] = __opcode_to_mem_arm(0xe1a0f00e); /* mov pc, lr */
 #endif
         /* Make an ARM instruction unconditional */
         if (insn < 0xe0000000)
@@ -228,12 +229,12 @@ set_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
         if (thumb) {
                 u16 *ip = (u16 *)asi->insn;
                 if (is_wide_instruction(insn))
-                        *ip++ = insn >> 16;
-                *ip++ = insn;
+                        *ip++ = __opcode_to_mem_thumb16(insn >> 16);
+                *ip++ = __opcode_to_mem_thumb16(insn);
                 return;
         }
 #endif
-        asi->insn[0] = insn;
+        asi->insn[0] = __opcode_to_mem_arm(insn);
 }
 
 /*
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 806d287e3e53..81ef686a91ca 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -38,6 +38,7 @@
 #include <asm/processor.h>
 #include <asm/thread_notify.h>
 #include <asm/stacktrace.h>
+#include <asm/system_misc.h>
 #include <asm/mach/time.h>
 #include <asm/tls.h>
 
@@ -99,7 +100,7 @@ void soft_restart(unsigned long addr)
         u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack);
 
         /* Disable interrupts first */
-        local_irq_disable();
+        raw_local_irq_disable();
         local_fiq_disable();
 
         /* Disable the L2 if we're the last man standing. */
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 172ee18ff124..abd2fc067736 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -445,6 +445,7 @@ die_sig:
         if (user_debug & UDBG_UNDEFINED) {
                 printk(KERN_INFO "%s (%d): undefined instruction: pc=%p\n",
                         current->comm, task_pid_nr(current), pc);
+                __show_regs(regs);
                 dump_instr(KERN_INFO, regs);
         }
 #endif
diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c
index 14d499688736..788495d35cf9 100644
--- a/arch/arm/mach-vexpress/dcscb.c
+++ b/arch/arm/mach-vexpress/dcscb.c
@@ -137,11 +137,16 @@ static void dcscb_power_down(void)
                 v7_exit_coherency_flush(all);
 
                 /*
-                 * This is a harmless no-op.  On platforms with a real
-                 * outer cache this might either be needed or not,
-                 * depending on where the outer cache sits.
+                 * A full outer cache flush could be needed at this point
+                 * on platforms with such a cache, depending on where the
+                 * outer cache sits. In some cases the notion of a "last
+                 * cluster standing" would need to be implemented if the
+                 * outer cache is shared across clusters. In any case, when
+                 * the outer cache needs flushing, there is no concurrent
+                 * access to the cache controller to worry about and no
+                 * special locking besides what is already provided by the
+                 * MCPM state machinery is needed.
                  */
-                outer_flush_all();
 
                 /*
                  * Disable cluster-level coherency by masking
diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c
index ef69152f9b52..c508f41a43bc 100644
--- a/arch/arm/mm/dump.c
+++ b/arch/arm/mm/dump.c
@@ -120,34 +120,51 @@ static const struct prot_bits pte_bits[] = {
 };
 
 static const struct prot_bits section_bits[] = {
-#ifndef CONFIG_ARM_LPAE
-        /* These are approximate */
+#ifdef CONFIG_ARM_LPAE
+        {
+                .mask   = PMD_SECT_USER,
+                .val    = PMD_SECT_USER,
+                .set    = "USR",
+        }, {
+                .mask   = PMD_SECT_RDONLY,
+                .val    = PMD_SECT_RDONLY,
+                .set    = "ro",
+                .clear  = "RW",
+#elif __LINUX_ARM_ARCH__ >= 6
         {
-                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
-                .val    = 0,
+                .mask   = PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .val    = PMD_SECT_APX | PMD_SECT_AP_WRITE,
                 .set    = "    ro",
         }, {
-                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .mask   = PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
                 .val    = PMD_SECT_AP_WRITE,
                 .set    = "    RW",
         }, {
-                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .mask   = PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
                 .val    = PMD_SECT_AP_READ,
                 .set    = "USR ro",
         }, {
-                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .mask   = PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
                 .val    = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
                 .set    = "USR RW",
-#else
+#else /* ARMv4/ARMv5  */
+        /* These are approximate */
         {
-                .mask   = PMD_SECT_USER,
-                .val    = PMD_SECT_USER,
-                .set    = "USR",
+                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .val    = 0,
+                .set    = "    ro",
         }, {
-                .mask   = PMD_SECT_RDONLY,
-                .val    = PMD_SECT_RDONLY,
-                .set    = "ro",
-                .clear  = "RW",
+                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .val    = PMD_SECT_AP_WRITE,
+                .set    = "    RW",
+        }, {
+                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .val    = PMD_SECT_AP_READ,
+                .set    = "USR ro",
+        }, {
+                .mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .val    = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
+                .set    = "USR RW",
 #endif
         }, {
                 .mask   = PMD_SECT_XN,
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 46e17492fd1f..f0759e70fb86 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -8,9 +8,12 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
-#include "../kernel/entry-header.S"
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
 
 @ VFP entry point.
 @
@@ -22,11 +25,7 @@
 @  IRQs disabled.
 @
 ENTRY(do_vfp)
-#ifdef CONFIG_PREEMPT_COUNT
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        add     r11, r4, #1             @ increment it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        inc_preempt_count r10, r4
         enable_irq
         ldr     r4, .LCvfp
         ldr     r11, [r10, #TI_CPU]     @ CPU number
@@ -35,12 +34,7 @@ ENTRY(do_vfp)
 ENDPROC(do_vfp)
 
 ENTRY(vfp_null_entry)
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         mov     pc, lr
 ENDPROC(vfp_null_entry)
 
@@ -53,12 +47,7 @@ ENDPROC(vfp_null_entry)
 
         __INIT
 ENTRY(vfp_testing_entry)
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         ldr     r0, VFP_arch_address
         str     r0, [r0]                @ set to non-zero value
         mov     pc, r9                  @ we have handled the fault
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index 3e5d3115a2a6..be807625ed8c 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -14,10 +14,13 @@
  * r10 points at the start of the private FP workspace in the thread structure
  * sp points to a struct pt_regs (as defined in include/asm/proc/ptrace.h)
  */
+#include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
 #include <linux/kern_levels.h>
-#include "../kernel/entry-header.S"
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
 
         .macro  DBGSTR, str
 #ifdef DEBUG
@@ -179,12 +182,7 @@ vfp_hw_state_valid:
                                         @ else it's one 32-bit instruction, so
                                         @ always subtract 4 from the following
                                         @ instruction address.
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         mov     pc, r9                  @ we think we have handled things
 
 
@@ -203,12 +201,7 @@ look_for_VFP_exceptions:
         @ not recognised by VFP
 
         DBGSTR  "not VFP"
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         mov     pc, lr
 
 process_exception:
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 9ceccef9c649..f81e7b989fff 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -34,6 +34,7 @@ config BLACKFIN
         select ARCH_WANT_IPC_PARSE_VERSION
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_PROBE
+        select GENERIC_IRQ_SHOW
         select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
         select GENERIC_SMP_IDLE_THREAD
         select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
@@ -51,9 +52,6 @@ config GENERIC_BUG
 config ZONE_DMA
         def_bool y
 
-config GENERIC_GPIO
-        def_bool y
-
 config FORCE_MAX_ZONEORDER
         int
         default "14"
@@ -870,14 +868,6 @@ config SYS_BFIN_SPINLOCK_L1
           If enabled, sys_bfin_spinlock function is linked
           into L1 instruction memory. (less latency)
 
-config IP_CHECKSUM_L1
-        bool "Locate IP Checksum function in L1 Memory"
-        default n
-        depends on !SMP
-        help
-          If enabled, the IP Checksum function is linked
-          into L1 instruction memory. (less latency)
-
 config CACHELINE_ALIGNED_L1
         bool "Locate cacheline_aligned data to L1 Data Memory"
         default y if !BF54x
diff --git a/arch/blackfin/include/asm/bfin_crc.h b/arch/blackfin/include/asm/bfin_crc.h
deleted file mode 100644
index 75cef4dc85a1..000000000000
--- a/arch/blackfin/include/asm/bfin_crc.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * bfin_crc.h - interface to Blackfin CRC controllers
- *
- * Copyright 2012 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef __BFIN_CRC_H__
-#define __BFIN_CRC_H__
-
-/* Function driver which use hardware crc must initialize the structure */
-struct crc_info {
-        /* Input data address */
-        unsigned char *in_addr;
-        /* Output data address */
-        unsigned char *out_addr;
-        /* Input or output bytes */
-        unsigned long datasize;
-        union {
-        /* CRC to compare with that of input buffer */
-        unsigned long crc_compare;
-        /* Value to compare with input data */
-        unsigned long val_verify;
-        /* Value to fill */
-        unsigned long val_fill;
-        };
-        /* Value to program the 32b CRC Polynomial */
-        unsigned long crc_poly;
-        union {
-        /* CRC calculated from the input data */
-        unsigned long crc_result;
-        /* First failed position to verify input data */
-        unsigned long pos_verify;
-        };
-        /* CRC mirror flags */
-        unsigned int bitmirr:1;
-        unsigned int bytmirr:1;
-        unsigned int w16swp:1;
-        unsigned int fdsel:1;
-        unsigned int rsltmirr:1;
-        unsigned int polymirr:1;
-        unsigned int cmpmirr:1;
-};
-
-/* Userspace interface */
-#define CRC_IOC_MAGIC           'C'
-#define CRC_IOC_CALC_CRC        _IOWR('C', 0x01, unsigned int)
-#define CRC_IOC_MEMCPY_CRC      _IOWR('C', 0x02, unsigned int)
-#define CRC_IOC_VERIFY_VAL      _IOWR('C', 0x03, unsigned int)
-#define CRC_IOC_FILL_VAL        _IOWR('C', 0x04, unsigned int)
-
-
-#ifdef __KERNEL__
-
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/miscdevice.h>
-
-struct crc_register {
-        u32 control;
-        u32 datacnt;
-        u32 datacntrld;
-        u32 __pad_1[2];
-        u32 compare;
-        u32 fillval;
-        u32 datafifo;
-        u32 intren;
-        u32 intrenset;
-        u32 intrenclr;
-        u32 poly;
-        u32 __pad_2[4];
-        u32 status;
-        u32 datacntcap;
-        u32 __pad_3;
-        u32 result;
-        u32 curresult;
-        u32 __pad_4[3];
-        u32 revid;
-};
-
-/* CRC_STATUS Masks */
-#define CMPERR                  0x00000002      /* Compare error */
-#define DCNTEXP                 0x00000010      /* datacnt register expired */
-#define IBR                     0x00010000      /* Input buffer ready */
-#define OBR                     0x00020000      /* Output buffer ready */
-#define IRR                     0x00040000      /* Immediate result readt */
-#define LUTDONE                 0x00080000      /* Look-up table generation done */
-#define FSTAT                   0x00700000      /* FIFO status */
-#define MAX_FIFO                4               /* Max fifo size */
-
-/* CRC_CONTROL Masks */
-#define BLKEN                   0x00000001      /* Block enable */
-#define OPMODE                  0x000000F0      /* Operation mode */
-#define OPMODE_OFFSET           4               /* Operation mode mask offset*/
-#define MODE_DMACPY_CRC         1               /* MTM CRC compute and compare */
-#define MODE_DATA_FILL          2               /* MTM data fill */
-#define MODE_CALC_CRC           3               /* MSM CRC compute and compare */
-#define MODE_DATA_VERIFY        4               /* MSM data verify */
-#define AUTOCLRZ                0x00000100      /* Auto clear to zero */
-#define AUTOCLRF                0x00000200      /* Auto clear to one */
-#define OBRSTALL                0x00001000      /* Stall on output buffer ready */
-#define IRRSTALL                0x00002000      /* Stall on immediate result ready */
-#define BITMIRR                 0x00010000      /* Mirror bits within each byte of 32-bit input data */
-#define BITMIRR_OFFSET          16              /* Mirror bits offset */
-#define BYTMIRR                 0x00020000      /* Mirror bytes of 32-bit input data */
-#define BYTMIRR_OFFSET          17              /* Mirror bytes offset */
-#define W16SWP                  0x00040000      /* Mirror uppper and lower 16-bit word of 32-bit input data */
-#define W16SWP_OFFSET           18              /* Mirror 16-bit word offset */
-#define FDSEL                   0x00080000      /* FIFO is written after input data is mirrored */
-#define FDSEL_OFFSET            19              /* Mirror FIFO offset */
-#define RSLTMIRR                0x00100000      /* CRC result registers are mirrored. */
-#define RSLTMIRR_OFFSET         20              /* Mirror CRC result offset. */
-#define POLYMIRR                0x00200000      /* CRC poly register is mirrored. */
-#define POLYMIRR_OFFSET         21              /* Mirror CRC poly offset. */
-#define CMPMIRR                 0x00400000      /* CRC compare register is mirrored. */
-#define CMPMIRR_OFFSET          22              /* Mirror CRC compare offset. */
-
-/* CRC_INTREN Masks */
-#define CMPERRI                 0x02            /* CRC_ERROR_INTR */
-#define DCNTEXPI                0x10            /* CRC_STATUS_INTR */
-
-#endif
-
-#endif
diff --git a/arch/blackfin/include/asm/bfin_twi.h b/arch/blackfin/include/asm/bfin_twi.h
index 90c3c006557d..aaa0834d34aa 100644
--- a/arch/blackfin/include/asm/bfin_twi.h
+++ b/arch/blackfin/include/asm/bfin_twi.h
@@ -9,60 +9,7 @@
 #ifndef __ASM_BFIN_TWI_H__
 #define __ASM_BFIN_TWI_H__
 
-#include <linux/types.h>
-#include <linux/i2c.h>
-
-/*
- * All Blackfin system MMRs are padded to 32bits even if the register
- * itself is only 16bits.  So use a helper macro to streamline this.
- */
-#define __BFP(m) u16 m; u16 __pad_##m
-
-/*
- * bfin twi registers layout
- */
-struct bfin_twi_regs {
-        __BFP(clkdiv);
-        __BFP(control);
-        __BFP(slave_ctl);
-        __BFP(slave_stat);
-        __BFP(slave_addr);
-        __BFP(master_ctl);
-        __BFP(master_stat);
-        __BFP(master_addr);
-        __BFP(int_stat);
-        __BFP(int_mask);
-        __BFP(fifo_ctl);
-        __BFP(fifo_stat);
-        u32 __pad[20];
-        __BFP(xmt_data8);
-        __BFP(xmt_data16);
-        __BFP(rcv_data8);
-        __BFP(rcv_data16);
-};
-
-#undef __BFP
-
-struct bfin_twi_iface {
-        int                     irq;
-        spinlock_t              lock;
-        char                    read_write;
-        u8                      command;
-        u8                      *transPtr;
-        int                     readNum;
-        int                     writeNum;
-        int                     cur_mode;
-        int                     manual_stop;
-        int                     result;
-        struct i2c_adapter      adap;
-        struct completion       complete;
-        struct i2c_msg          *pmsg;
-        int                     msg_num;
-        int                     cur_msg;
-        u16                     saved_clkdiv;
-        u16                     saved_control;
-        struct bfin_twi_regs __iomem *regs_base;
-};
+#include <asm/blackfin.h>
 
 #define DEFINE_TWI_REG(reg_name, reg) \
 static inline u16 read_##reg_name(struct bfin_twi_iface *iface) \
@@ -71,7 +18,6 @@ static inline void write_##reg_name(struct bfin_twi_iface *iface, u16 v) \
         { bfin_write16(&iface->regs_base->reg, v); }
 
 DEFINE_TWI_REG(CLKDIV, clkdiv)
-DEFINE_TWI_REG(CONTROL, control)
 DEFINE_TWI_REG(SLAVE_CTL, slave_ctl)
 DEFINE_TWI_REG(SLAVE_STAT, slave_stat)
 DEFINE_TWI_REG(SLAVE_ADDR, slave_addr)
@@ -80,7 +26,6 @@ DEFINE_TWI_REG(MASTER_STAT, master_stat)
 DEFINE_TWI_REG(MASTER_ADDR, master_addr)
 DEFINE_TWI_REG(INT_STAT, int_stat)
 DEFINE_TWI_REG(INT_MASK, int_mask)
-DEFINE_TWI_REG(FIFO_CTL, fifo_ctl)
 DEFINE_TWI_REG(FIFO_STAT, fifo_stat)
 DEFINE_TWI_REG(XMT_DATA8, xmt_data8)
 DEFINE_TWI_REG(XMT_DATA16, xmt_data16)
@@ -113,75 +58,25 @@ static inline u16 read_RCV_DATA16(struct bfin_twi_iface *iface)
 }
 #endif
 
+static inline u16 read_FIFO_CTL(struct bfin_twi_iface *iface)
+{
+        return bfin_read16(&iface->regs_base->fifo_ctl);
+}
 
-/*  ********************  TWO-WIRE INTERFACE (TWI) MASKS  ***********************/
-/* TWI_CLKDIV Macros (Use: *pTWI_CLKDIV = CLKLOW(x)|CLKHI(y);  )                                */
-#define CLKLOW(x)       ((x) & 0xFF)    /* Periods Clock Is Held Low                    */
-#define CLKHI(y)        (((y)&0xFF)<<0x8)       /* Periods Before New Clock Low                 */
-
-/* TWI_PRESCALE Masks                                                                                                                   */
-#define PRESCALE        0x007F  /* SCLKs Per Internal Time Reference (10MHz)    */
-#define TWI_ENA         0x0080  /* TWI Enable                                                                   */
-#define SCCB            0x0200  /* SCCB Compatibility Enable                                    */
-
-/* TWI_SLAVE_CTL Masks                                                                                                                  */
-#define SEN                     0x0001  /* Slave Enable                                                                 */
-#define SADD_LEN        0x0002  /* Slave Address Length                                                 */
-#define STDVAL          0x0004  /* Slave Transmit Data Valid                                    */
-#define NAK                     0x0008  /* NAK/ACK* Generated At Conclusion Of Transfer */
-#define GEN                     0x0010  /* General Call Address Matching Enabled                */
-
-/* TWI_SLAVE_STAT Masks                                                                                                                 */
-#define SDIR            0x0001  /* Slave Transfer Direction (Transmit/Receive*) */
-#define GCALL           0x0002  /* General Call Indicator                                               */
-
-/* TWI_MASTER_CTL Masks                                                                                                 */
-#define MEN                     0x0001  /* Master Mode Enable                                           */
-#define MADD_LEN        0x0002  /* Master Address Length                                        */
-#define MDIR            0x0004  /* Master Transmit Direction (RX/TX*)           */
-#define FAST            0x0008  /* Use Fast Mode Timing Specs                           */
-#define STOP            0x0010  /* Issue Stop Condition                                         */
-#define RSTART          0x0020  /* Repeat Start or Stop* At End Of Transfer     */
-#define DCNT            0x3FC0  /* Data Bytes To Transfer                                       */
-#define SDAOVR          0x4000  /* Serial Data Override                                         */
-#define SCLOVR          0x8000  /* Serial Clock Override                                        */
-
-/* TWI_MASTER_STAT Masks                                                                                                                */
-#define MPROG           0x0001  /* Master Transfer In Progress                                  */
-#define LOSTARB         0x0002  /* Lost Arbitration Indicator (Xfer Aborted)    */
-#define ANAK            0x0004  /* Address Not Acknowledged                                             */
-#define DNAK            0x0008  /* Data Not Acknowledged                                                */
-#define BUFRDERR        0x0010  /* Buffer Read Error                                                    */
-#define BUFWRERR        0x0020  /* Buffer Write Error                                                   */
-#define SDASEN          0x0040  /* Serial Data Sense                                                    */
-#define SCLSEN          0x0080  /* Serial Clock Sense                                                   */
-#define BUSBUSY         0x0100  /* Bus Busy Indicator                                                   */
-
-/* TWI_INT_SRC and TWI_INT_ENABLE Masks                                         */
-#define SINIT           0x0001  /* Slave Transfer Initiated     */
-#define SCOMP           0x0002  /* Slave Transfer Complete      */
-#define SERR            0x0004  /* Slave Transfer Error         */
-#define SOVF            0x0008  /* Slave Overflow                       */
-#define MCOMP           0x0010  /* Master Transfer Complete     */
-#define MERR            0x0020  /* Master Transfer Error        */
-#define XMTSERV         0x0040  /* Transmit FIFO Service        */
-#define RCVSERV         0x0080  /* Receive FIFO Service         */
-
-/* TWI_FIFO_CTRL Masks                                                                                          */
-#define XMTFLUSH        0x0001  /* Transmit Buffer Flush                        */
-#define RCVFLUSH        0x0002  /* Receive Buffer Flush                         */
-#define XMTINTLEN       0x0004  /* Transmit Buffer Interrupt Length     */
-#define RCVINTLEN       0x0008  /* Receive Buffer Interrupt Length      */
-
-/* TWI_FIFO_STAT Masks                                                                                                                  */
-#define XMTSTAT         0x0003  /* Transmit FIFO Status                                                 */
-#define XMT_EMPTY       0x0000  /*              Transmit FIFO Empty                                             */
-#define XMT_HALF        0x0001  /*              Transmit FIFO Has 1 Byte To Write               */
-#define XMT_FULL        0x0003  /*              Transmit FIFO Full (2 Bytes To Write)   */
+static inline void write_FIFO_CTL(struct bfin_twi_iface *iface, u16 v)
+{
+        bfin_write16(&iface->regs_base->fifo_ctl, v);
+        SSYNC();
+}
 
-#define RCVSTAT         0x000C  /* Receive FIFO Status                                                  */
-#define RCV_EMPTY       0x0000  /*              Receive FIFO Empty                                              */
-#define RCV_HALF        0x0004  /*              Receive FIFO Has 1 Byte To Read                 */
-#define RCV_FULL        0x000C  /*              Receive FIFO Full (2 Bytes To Read)             */
+static inline u16 read_CONTROL(struct bfin_twi_iface *iface)
+{
+        return bfin_read16(&iface->regs_base->control);
+}
 
+static inline void write_CONTROL(struct bfin_twi_iface *iface, u16 v)
+{
+        SSYNC();
+        bfin_write16(&iface->regs_base->control, v);
+}
 #endif
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h
index 40e9c2bbc6e3..8d1e4c2d2c36 100644
--- a/arch/blackfin/include/asm/dma.h
+++ b/arch/blackfin/include/asm/dma.h
@@ -316,8 +316,6 @@ static inline void disable_dma(unsigned int channel)
 }
 static inline void enable_dma(unsigned int channel)
 {
-        dma_ch[channel].regs->curr_x_count = 0;
-        dma_ch[channel].regs->curr_y_count = 0;
         dma_ch[channel].regs->cfg |= DMAEN;
 }
 int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data);
diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h
index 7aa20436e799..c8f0939419be 100644
--- a/arch/blackfin/include/asm/portmux.h
+++ b/arch/blackfin/include/asm/portmux.h
@@ -18,16 +18,14 @@
 #define P_DONTCARE      0x1000
 
 #ifdef CONFIG_PINCTRL
-#include <asm/irq_handler.h>
+int bfin_internal_set_wake(unsigned int irq, unsigned int state);
 
 #define gpio_pint_regs bfin_pint_regs
 #define adi_internal_set_wake bfin_internal_set_wake
 
-#define peripheral_request(per, label) 0
+#define peripheral_request(per, label) (0)
 #define peripheral_free(per)
-#define peripheral_request_list(per, label) \
-        (pdev ? (IS_ERR(devm_pinctrl_get_select_default(&pdev->dev)) \
-        ? -EINVAL : 0) : 0)
+#define peripheral_request_list(per, label) (0)
 #define peripheral_free_list(per)
 #else
 int peripheral_request(unsigned short per, const char *label);
@@ -39,7 +37,7 @@ void peripheral_free_list(const unsigned short per[]);
 #include <linux/err.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <mach/portmux.h>
-#include <linux/gpio.h>
+#include <mach/gpio.h>
 
 #ifndef P_SPORT2_TFS
 #define P_SPORT2_TFS P_UNDEF
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index 01232a13470d..947ad0832338 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -10,6 +10,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/i2c/bfin_twi.h>
 
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index ff3d747154ac..0ba25764b8c0 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -11,6 +11,7 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/seq_file.h>
 #include <asm/irq_handler.h>
 #include <asm/trace.h>
 #include <asm/pda.h>
@@ -33,37 +34,15 @@ static struct irq_desc bad_irq_desc = {
 #endif
 
 #ifdef CONFIG_PROC_FS
-int show_interrupts(struct seq_file *p, void *v)
+int arch_show_interrupts(struct seq_file *p, int prec)
 {
-        int i = *(loff_t *) v, j;
-        struct irqaction *action;
-        unsigned long flags;
-
-        if (i < NR_IRQS) {
-                struct irq_desc *desc = irq_to_desc(i);
-
-                raw_spin_lock_irqsave(&desc->lock, flags);
-                action = desc->action;
-                if (!action)
-                        goto skip;
-                seq_printf(p, "%3d: ", i);
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-                seq_printf(p, " %8s", irq_desc_get_chip(desc)->name);
-                seq_printf(p, "  %s", action->name);
-                for (action = action->next; action; action = action->next)
-                        seq_printf(p, "  %s", action->name);
-
-                seq_putc(p, '\n');
- skip:
-                raw_spin_unlock_irqrestore(&desc->lock, flags);
-        } else if (i == NR_IRQS) {
-                seq_printf(p, "NMI: ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
-                seq_printf(p, "     CORE  Non Maskable Interrupt\n");
-                seq_printf(p, "Err: %10u\n",  atomic_read(&irq_err_count));
-        }
+        int j;
+
+        seq_printf(p, "%*s: ", prec, "NMI");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
+        seq_printf(p, "  CORE  Non Maskable Interrupt\n");
+        seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
         return 0;
 }
 #endif
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index f8047ca3b339..d022112927c2 100644
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -36,7 +36,7 @@ const char bfin_board_name[] = "ADI BF518F-EZBRD";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezbrd_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = {
 
 static struct resource ezbrd_flash_resource = {
         .start = 0x20000000,
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         .end   = 0x202fffff,
 #else
         .end   = 0x203fffff,
@@ -80,14 +80,14 @@ static struct platform_device ezbrd_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = {
         P_MII0_ETxD0,
@@ -105,7 +105,7 @@ static const unsigned short bfin_mac_peripherals[] = {
 
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
         {
-#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
                 .addr = 3,
 #else
                 .addr = 1,
@@ -119,7 +119,7 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = {
         .phydev_data = bfin_phydev_data,
         .phy_mode = PHY_INTERFACE_MODE_MII,
         .mac_peripherals = bfin_mac_peripherals,
-#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
         .phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */
 #endif
         .vlan1_mask = 1,
@@ -140,7 +140,7 @@ static struct platform_device bfin_mac_device = {
         }
 };
 
-#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
 static struct dsa_chip_data ksz8893m_switch_chip_data = {
         .mii_bus = &bfin_mii_bus.dev,
         .port_names = {
@@ -165,8 +165,7 @@ static struct platform_device ksz8893m_switch_device = {
 #endif
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -193,13 +192,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -216,8 +215,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -230,9 +228,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-#if defined(CONFIG_NET_DSA_KSZ8893M) \
-        || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
+#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
         {
                 .modalias = "ksz8893m",
                 .max_speed_hz = 5000000,
@@ -244,7 +241,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
@@ -254,7 +251,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -264,7 +261,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 2,
         },
 #endif
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
+#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
         {
                 .modalias       = "wm8731",
@@ -274,7 +271,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -282,7 +279,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -294,7 +291,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 };
 
 /* SPI controller data */
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 6,
@@ -366,7 +363,7 @@ static struct platform_device bfin_spi1_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -465,7 +462,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -520,7 +517,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -528,7 +525,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -556,25 +553,25 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PF8,
         },
 #endif
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -645,7 +642,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -667,7 +664,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 
 static struct bfin_sd_host bfin_sdh_data = {
         .dma_chan = CH_RSI,
@@ -710,24 +707,24 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
-#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
         &ksz8893m_switch_device,
 #endif
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
         &bfin_spi1_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -736,7 +733,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -745,15 +742,15 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -762,15 +759,15 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
         &bf51x_sdh_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezbrd_flash_device,
 #endif
 };
@@ -784,7 +781,7 @@ static int __init ezbrd_init(void)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
         /* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */
         peripheral_request(P_AMS2, "ParaFlash");
-#if !defined(CONFIG_SPI_BFIN5XX) && !defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if !IS_ENABLED(CONFIG_SPI_BFIN5XX)
         peripheral_request(P_AMS3, "ParaFlash");
 #endif
         return 0;
diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
index 0bedc737566b..240d5cb1f02c 100644
--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@ -36,7 +36,7 @@ const char bfin_board_name[] = "Bluetechnix TCM-BF518";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition tcm_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -73,14 +73,14 @@ static struct platform_device tcm_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -113,8 +113,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -141,13 +140,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -164,8 +163,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -178,7 +176,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -188,7 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -198,7 +196,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 2,
         },
 #endif
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
+#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
         {
                 .modalias       = "wm8731",
@@ -208,7 +206,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -216,7 +214,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -228,7 +226,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 };
 
 /* SPI controller data */
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 6,
@@ -300,7 +298,7 @@ static struct platform_device bfin_spi1_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -399,7 +397,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -454,7 +452,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -482,12 +480,12 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PF8,
@@ -495,7 +493,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -566,7 +564,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -588,7 +586,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 
 static struct bfin_sd_host bfin_sdh_data = {
         .dma_chan = CH_RSI,
@@ -631,21 +629,21 @@ static struct platform_device *tcm_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
         &bfin_spi1_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -654,7 +652,7 @@ static struct platform_device *tcm_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -663,11 +661,11 @@ static struct platform_device *tcm_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -676,15 +674,15 @@ static struct platform_device *tcm_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
         &bf51x_sdh_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &tcm_flash_device,
 #endif
 };
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index 1e7be62fccb6..9501bd8d9cd1 100644
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -37,7 +37,7 @@ const char bfin_board_name[] = "ADI BF527-AD7160EVAL";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xffc03800,
@@ -97,7 +97,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BFIN_RA158Z) || defined(CONFIG_FB_BFIN_RA158Z_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_RA158Z)
 static struct resource bf52x_ra158z_resources[] = {
         {
                 .start = IRQ_PPI_ERROR,
@@ -114,7 +114,7 @@ static struct platform_device bf52x_ra158z_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ad7160eval_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -154,7 +154,7 @@ static struct platform_device ad7160eval_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "linux kernel(nand)",
@@ -200,14 +200,14 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -241,8 +241,7 @@ static struct platform_device bfin_mac_device = {
 #endif
 
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -269,13 +268,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -284,8 +283,7 @@ static struct platform_device bfin_i2s = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -297,8 +295,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -306,7 +303,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 4,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 30000000,     /* max spi clock (SCK) speed in HZ */
@@ -316,7 +313,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -326,7 +323,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
@@ -364,7 +361,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -475,7 +472,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -530,7 +527,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7160) || defined(CONFIG_TOUCHSCREEN_AD7160_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7160)
 #include <linux/input/ad7160.h>
 static const struct ad7160_platform_data bfin_ad7160_ts_info = {
         .sensor_x_res = 854,
@@ -560,7 +557,7 @@ static const struct ad7160_platform_data bfin_ad7160_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -588,7 +585,7 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_TOUCHSCREEN_AD7160) || defined(CONFIG_TOUCHSCREEN_AD7160_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7160)
         {
                 I2C_BOARD_INFO("ad7160", 0x33),
                 .irq = IRQ_PH1,
@@ -597,7 +594,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -668,7 +665,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <asm/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -725,28 +722,28 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -755,11 +752,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_FB_BFIN_RA158Z) || defined(CONFIG_FB_BFIN_RA158Z_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_RA158Z)
         &bf52x_ra158z_device,
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -768,11 +765,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -781,15 +778,15 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
         &bfin_rotary_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ad7160eval_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 };
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 413d0132b66f..b1004b35db36 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -37,7 +37,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF527";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -72,7 +72,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xffc03800,
@@ -134,7 +134,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "linux kernel(nand)",
@@ -180,7 +180,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
                 .start = 0x20310000, /* IO PORT */
@@ -209,14 +209,14 @@ static struct platform_device bfin_pcmcia_cf_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -249,7 +249,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
 static struct resource dm9000_resources[] = {
         [0] = {
                 .start  = 0x203FB800,
@@ -276,7 +276,7 @@ static struct platform_device dm9000_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -309,7 +309,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -330,8 +330,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -358,13 +357,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -381,8 +380,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -395,8 +393,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -404,7 +401,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 4,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -414,7 +411,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -424,7 +421,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 2,
         },
 #endif
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
+#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
         {
                 .modalias       = "wm8731",
@@ -434,7 +431,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -444,7 +441,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
@@ -482,7 +479,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
 static struct mtd_partition cm_partitions[] = {
         {
                 .name   = "bootloader(nor)",
@@ -531,7 +528,7 @@ static struct platform_device cm_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -642,7 +639,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -697,7 +694,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -725,25 +722,25 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PF8,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -814,7 +811,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -861,48 +858,48 @@ static struct platform_device *cmbf527_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
         &bfin_pcmcia_cf_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
         &dm9000_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -911,7 +908,7 @@ static struct platform_device *cmbf527_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -920,11 +917,11 @@ static struct platform_device *cmbf527_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -933,11 +930,11 @@ static struct platform_device *cmbf527_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
         &cm_flash_device,
 #endif
 };
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 50bda79194e5..a3a572352769 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -36,7 +36,7 @@ const char bfin_board_name[] = "ADI BF526-EZBRD";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xffc03800,
@@ -98,7 +98,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezbrd_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -138,7 +138,7 @@ static struct platform_device ezbrd_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "bootloader(nand)",
@@ -188,7 +188,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
@@ -196,7 +196,7 @@ static struct platform_device rtc_device = {
 #endif
 
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -229,8 +229,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -257,13 +256,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -279,7 +278,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 #include <linux/spi/ad7879.h>
 static const struct ad7879_platform_data bfin_ad7879_ts_info = {
         .model                  = 7879, /* Model = AD7879 */
@@ -297,8 +296,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -311,7 +309,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
@@ -321,7 +319,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -331,7 +329,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 2,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
         {
                 .modalias = "ad7879",
                 .platform_data = &bfin_ad7879_ts_info,
@@ -342,7 +340,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
+#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
         {
                 .modalias       = "wm8731",
@@ -352,7 +350,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -360,7 +358,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -371,7 +369,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
@@ -409,7 +407,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -520,7 +518,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -575,7 +573,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -603,12 +601,12 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PF8,
@@ -616,7 +614,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -687,7 +685,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -731,7 +729,7 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
 #include <asm/bfin-lq035q1.h>
 
 static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
@@ -764,28 +762,28 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -794,11 +792,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         &bfin_lq035q1_device,
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -807,11 +805,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -820,11 +818,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezbrd_flash_device,
 #endif
 };
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index d0a0c5e527cd..d64f565dc2a0 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -42,7 +42,7 @@ const char bfin_board_name[] = "ADI BF527-EZKIT";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -77,7 +77,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xffc03800,
@@ -139,7 +139,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BFIN_T350MCQB) || defined(CONFIG_FB_BFIN_T350MCQB_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_T350MCQB)
 
 static struct resource bf52x_t350mcqb_resources[] = {
         {
@@ -157,7 +157,7 @@ static struct platform_device bf52x_t350mcqb_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
 #include <asm/bfin-lq035q1.h>
 
 static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
@@ -184,7 +184,7 @@ static struct platform_device bfin_lq035q1_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -224,7 +224,7 @@ static struct platform_device ezkit_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "bootloader(nand)",
@@ -274,7 +274,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
                 .start = 0x20310000, /* IO PORT */
@@ -303,14 +303,14 @@ static struct platform_device bfin_pcmcia_cf_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -343,7 +343,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
 static struct resource dm9000_resources[] = {
         [0] = {
                 .start  = 0x203FB800,
@@ -370,7 +370,7 @@ static struct platform_device dm9000_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -403,7 +403,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -427,8 +427,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -455,13 +454,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -477,7 +476,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 #include <linux/spi/ad7879.h>
 static const struct ad7879_platform_data bfin_ad7879_ts_info = {
         .model                  = 7879, /* Model = AD7879 */
@@ -493,7 +492,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 
 static const u16 bfin_snd_pin[][7] = {
         {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
@@ -541,21 +540,21 @@ static struct resource bfin_snd_resources[][4] = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
         .name = "bfin-i2s-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97_pcm = {
         .name = "bfin-ac97-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -567,8 +566,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
 static const char * const ad1836_link[] = {
         "bfin-i2s.0",
         "spi0.4",
@@ -583,8 +581,7 @@ static struct platform_device bfin_ad1836_machine = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -597,8 +594,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -608,7 +604,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -619,7 +615,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -629,7 +625,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 2,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
         {
                 .modalias = "ad7879",
                 .platform_data = &bfin_ad7879_ts_info,
@@ -640,7 +636,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -648,7 +644,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -659,7 +655,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
@@ -697,7 +693,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -808,7 +804,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -863,7 +859,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -890,7 +886,7 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+#if IS_ENABLED(CONFIG_PMIC_ADP5520)
 #include <linux/mfd/adp5520.h>
 
         /*
@@ -956,54 +952,54 @@ static struct adp5520_platform_data adp5520_pdev_data = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PF8,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_I2C)
         {
                 I2C_BOARD_INFO("ad7879", 0x2C),
                 .irq = IRQ_PF8,
                 .platform_data = (void *)&bfin_ad7879_ts_info,
         },
 #endif
-#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+#if IS_ENABLED(CONFIG_PMIC_ADP5520)
         {
                 I2C_BOARD_INFO("pmic-adp5520", 0x32),
                 .irq = IRQ_PF9,
                 .platform_data = (void *)&adp5520_pdev_data,
         },
 #endif
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("ad5252", 0x2f),
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1373) || defined(CONFIG_SND_SOC_ADAU1373_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1373)
         {
                 I2C_BOARD_INFO("adau1373", 0x1A),
         },
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -1074,7 +1070,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -1095,7 +1091,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <asm/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -1153,56 +1149,56 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
         &bfin_pcmcia_cf_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
         &dm9000_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_FB_BFIN_T350MCQB) || defined(CONFIG_FB_BFIN_T350MCQB_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_T350MCQB)
         &bf52x_t350mcqb_device,
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         &bfin_lq035q1_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -1211,7 +1207,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -1220,11 +1216,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -1233,32 +1229,31 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
         &bfin_rotary_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         &bfin_ad1836_machine,
 #endif
 };
diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index 1509c5a8a3ff..a0f5856a5ff8 100644
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -28,8 +28,7 @@
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) \
-        || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 #include <linux/spi/ad7879.h>
 #define LCD_BACKLIGHT_GPIO 0x40
 /* TLL6527M uses TLL7UIQ35 / ADI LCD EZ Extender. AD7879 AUX GPIO is used for
@@ -45,7 +44,7 @@ const char bfin_board_name[] = "TLL6527M";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xffc03800,
@@ -104,7 +103,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
 #include <asm/bfin-lq035q1.h>
 
 static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
@@ -133,7 +132,7 @@ static struct platform_device bfin_lq035q1_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
 static struct mtd_partition tll6527m_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -182,7 +181,7 @@ static struct platform_device tll6527m_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_GPIO_DECODER) || defined(CONFIG_GPIO_DECODER_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_DECODER)
 /* An SN74LVC138A 3:8 decoder chip has been used to generate 7 augmented
  * outputs used as SPI CS lines for all SPI SLAVE devices on TLL6527v1-0.
  * EXP_GPIO_SPISEL_BASE is the base number for the expanded outputs being
@@ -215,7 +214,7 @@ static struct platform_device spi_decoded_gpio = {
 
 #endif
 
-#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X)
 #include <linux/input/adxl34x.h>
 static const struct adxl34x_platform_data adxl345_info = {
         .x_axis_offset = 0,
@@ -250,14 +249,14 @@ static const struct adxl34x_platform_data adxl345_info = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -290,8 +289,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -318,14 +316,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) \
-        || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 static const struct ad7879_platform_data bfin_ad7879_ts_info = {
         .model                  = 7879, /* Model = AD7879 */
         .x_plate_ohms           = 620,  /* 620 Ohm from the touch datasheet */
@@ -343,7 +340,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -351,7 +348,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_GPIO_MCP23S08) || defined(CONFIG_GPIO_MCP23S08_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_MCP23S08)
 #include <linux/spi/mcp23s08.h>
 static const struct mcp23s08_platform_data bfin_mcp23s08_sys_gpio_info = {
         .chip[0].is_present = true,
@@ -364,8 +361,7 @@ static const struct mcp23s08_platform_data bfin_mcp23s08_usr_gpio_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -381,7 +377,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
 /*
@@ -396,8 +392,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) \
-        || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
         {
                 .modalias = "ad7879",
                 .platform_data = &bfin_ad7879_ts_info,
@@ -409,7 +404,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 10000000,
@@ -419,7 +414,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,
@@ -428,7 +423,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_GPIO_MCP23S08) || defined(CONFIG_GPIO_MCP23S08_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_MCP23S08)
         {
                 .modalias = "mcp23s08",
                 .platform_data = &bfin_mcp23s08_sys_gpio_info,
@@ -448,7 +443,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = EXP_GPIO_SPISEL_BASE + 8 + MAX_CTRL_CS,
@@ -487,7 +482,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -600,7 +595,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -655,7 +650,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -683,26 +678,25 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
 
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) \
-        || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_I2C)
         {
                 I2C_BOARD_INFO("ad7879", 0x2C),
                 .irq = IRQ_PH14,
                 .platform_data = (void *)&bfin_ad7879_ts_info,
         },
 #endif
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
@@ -714,8 +708,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
         {
                 I2C_BOARD_INFO("ltc3576", 0x09),
         },
-#if defined(CONFIG_INPUT_ADXL34X_I2C) \
-        || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_I2C)
         {
                 I2C_BOARD_INFO("adxl34x", 0x53),
                 .irq = IRQ_PH13,
@@ -724,8 +717,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #endif
 };
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) \
-        || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -823,28 +815,28 @@ static struct platform_device *tll6527m_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         &bfin_lq035q1_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -853,7 +845,7 @@ static struct platform_device *tll6527m_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -862,12 +854,11 @@ static struct platform_device *tll6527m_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) \
-        || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -876,15 +867,15 @@ static struct platform_device *tll6527m_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
         &tll6527m_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_GPIO_DECODER) || defined(CONFIG_GPIO_DECODER_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_DECODER)
         &spi_decoded_gpio,
 #endif
 };
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 6cb7b3ed9b3d..01300f40db15 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -14,7 +14,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/irq.h>
@@ -29,7 +29,7 @@
  */
 const char bfin_board_name[] = "HV Sistemas H8606";
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
@@ -39,7 +39,7 @@ static struct platform_device rtc_device = {
 /*
 *  Driver needs to know address, irq and flag pin.
  */
- #if    defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
 static struct resource dm9000_resources[] = {
         [0] = {
                 .start  = 0x20300000,
@@ -67,7 +67,7 @@ static struct platform_device dm9000_device = {
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -104,7 +104,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -125,10 +125,10 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader (spi)",
@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 /* Notice: for blackfin, the speed_hz is the value of register
  * SPI_BAUD, not the real baudrate */
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -180,7 +180,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 16,
@@ -229,7 +229,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -280,7 +280,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -309,7 +309,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_8250)
 
 #include <linux/serial_8250.h>
 #include <linux/serial.h>
@@ -353,7 +353,7 @@ static struct platform_device serial8250_device = {
 
 #endif
 
-#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_OPENCORES)
 
 /*
  * Configuration for one OpenCores keyboard controller in FPGA at address 0x20200030,
@@ -382,43 +382,43 @@ static struct platform_device opencores_kbd_device = {
 #endif
 
 static struct platform_device *h8606_devices[] __initdata = {
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if     defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
         &dm9000_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_8250)
         &serial8250_device,
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_OPENCORES)
         &opencores_kbd_device,
 #endif
 };
@@ -428,7 +428,7 @@ static int __init H8606_init(void)
         printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n");
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
         return 0;
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c
index de44a3765e59..63b0e4fe760c 100644
--- a/arch/blackfin/mach-bf533/boards/blackstamp.c
+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c
@@ -31,7 +31,7 @@
  */
 const char bfin_board_name[] = "BlackStamp";
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
@@ -41,7 +41,7 @@ static struct platform_device rtc_device = {
 /*
  *  Driver needs to know address, irq and flag pin.
  */
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -74,7 +74,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -105,14 +105,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -125,7 +125,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -136,7 +136,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -184,7 +184,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -235,7 +235,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -264,7 +264,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -335,7 +335,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -358,7 +358,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
 #include <linux/i2c-gpio.h>
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
@@ -413,32 +413,32 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -447,11 +447,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
         &i2c_gpio_device,
 #endif
 };
@@ -469,7 +469,7 @@ static int __init blackstamp_init(void)
         if (ret < 0)
                 return ret;
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         /*
          * setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC.
          * the bfin-async-map driver takes care of flipping between
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index fe47e048c4e6..4ef2fb0e48d5 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -15,7 +15,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/mmc_spi.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/irq.h>
@@ -29,9 +29,9 @@
  */
 const char bfin_board_name[] = "Bluetechnix CM BF533";
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -62,14 +62,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80",       /* Name of spi_driver for this device */
@@ -82,7 +82,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -91,7 +91,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -140,14 +140,14 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -178,7 +178,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 
 static struct resource smsc911x_resources[] = {
@@ -212,7 +212,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -263,7 +263,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -292,7 +292,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -363,7 +363,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20308000,
@@ -403,7 +403,7 @@ static struct platform_device isp1362_hcd_device = {
 #endif
 
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -426,7 +426,7 @@ static struct platform_device net2272_bfin_device = {
 
 
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition para_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -495,19 +495,19 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -516,31 +516,31 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
         &smsc911x_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &para_flash_device,
 #endif
 };
@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
         return 0;
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 90fb0d14b147..3625e9eaa8a8 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -14,7 +14,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/irq.h>
@@ -29,7 +29,7 @@
  */
 const char bfin_board_name[] = "ADI BF533-EZKIT";
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
@@ -40,7 +40,7 @@ static struct platform_device rtc_device = {
  *  USB-LAN EzExtender board
  *  Driver needs to know address, irq and flag pin.
  */
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -72,7 +72,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions_a[] = {
         {
                 .name       = "bootloader(nor a)",
@@ -138,7 +138,7 @@ static struct platform_device ezkit_flash_device_b = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PLATRAM)
 static struct platdata_mtd_ram sram_data_a = {
         .mapname   = "Flash A SRAM",
         .bankwidth = 2,
@@ -182,7 +182,7 @@ static struct platform_device sram_device_b = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -214,7 +214,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -227,7 +227,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -235,7 +235,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 4,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -245,7 +245,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -283,7 +283,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -334,7 +334,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -363,7 +363,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -387,7 +387,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
 #include <linux/i2c-gpio.h>
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
@@ -435,14 +435,14 @@ static struct platform_device bfin_dpmc = {
 };
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -450,7 +450,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -462,53 +462,53 @@ static struct platform_device *ezkit_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device_a,
         &ezkit_flash_device_b,
 #endif
 
-#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PLATRAM)
         &sram_device_a,
         &sram_device_b,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
         &i2c_gpio_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97,
 #endif
 };
diff --git a/arch/blackfin/mach-bf533/boards/ip0x.c b/arch/blackfin/mach-bf533/boards/ip0x.c
index e303dae4e2d9..39c8e8547b82 100644
--- a/arch/blackfin/mach-bf533/boards/ip0x.c
+++ b/arch/blackfin/mach-bf533/boards/ip0x.c
@@ -15,7 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <asm/irq.h>
@@ -32,7 +32,7 @@ const char bfin_board_name[] = "IP04/IP08";
  *  Driver needs to know address, irq and flag pin.
  */
 #if defined(CONFIG_BFIN532_IP0X)
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
 
 #include <linux/dm9000.h>
 
@@ -104,10 +104,10 @@ static struct platform_device dm9000_device2 = {
 #endif
 
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,                /* if 1 - block!!! */
 };
@@ -116,7 +116,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
 /* Notice: for blackfin, the speed_hz is the value of register
  * SPI_BAUD, not the real baudrate */
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 2,
@@ -142,7 +142,7 @@ static struct platform_device spi_bfin_master_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -193,7 +193,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -222,7 +222,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20300000,
@@ -264,29 +264,29 @@ static struct platform_device isp1362_hcd_device = {
 
 static struct platform_device *ip0x_devices[] __initdata = {
 #if defined(CONFIG_BFIN532_IP0X)
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
         &dm9000_device1,
         &dm9000_device2,
 #endif
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &spi_bfin_master_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 };
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 4da70c47cc05..d0989290f54c 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -14,7 +14,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/mmc_spi.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/irq.h>
@@ -30,7 +30,7 @@
  */
 const char bfin_board_name[] = "ADI BF533-STAMP";
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
@@ -40,7 +40,7 @@ static struct platform_device rtc_device = {
 /*
  *  Driver needs to know address, irq and flag pin.
  */
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -73,7 +73,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -97,7 +97,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE)
+#if IS_ENABLED(CONFIG_MTD_BFIN_ASYNC)
 static struct mtd_partition stamp_partitions[] = {
         {
                 .name   = "bootloader(nor)",
@@ -147,7 +147,7 @@ static struct platform_device stamp_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -178,7 +178,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 #define MMC_SPI_CARD_DETECT_INT IRQ_PF5
 static int bfin_mmc_spi_init(struct device *dev,
         irqreturn_t (*detect_int)(int, void *), void *data)
@@ -206,7 +206,7 @@ static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -219,8 +219,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         {
                 .modalias = "ad1836",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -231,7 +230,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -239,7 +238,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -252,7 +251,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -290,7 +289,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -341,7 +340,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -370,8 +369,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || \
-        defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -442,7 +440,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SPORT)
 static struct resource bfin_sport0_resources[] = {
         {
                 .start = SPORT0_TCR1,
@@ -486,7 +484,7 @@ static struct platform_device bfin_sport0_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -509,7 +507,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
 #include <linux/i2c-gpio.h>
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
@@ -530,29 +528,29 @@ static struct platform_device i2c_gpio_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)
+#if IS_ENABLED(CONFIG_JOYSTICK_AD7142)
         {
                 I2C_BOARD_INFO("ad7142_joystick", 0x2C),
                 .irq = 39,
         },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = 39,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("ad5252", 0x2f),
         },
@@ -586,9 +584,8 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
-        defined(CONFIG_SND_BF5XX_AC97) || \
-        defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S) || \
+        IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 
 #include <asm/bfin_sport.h>
 
@@ -640,22 +637,21 @@ static struct resource bfin_snd_resources[][4] = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
         .name = "bfin-i2s-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97_pcm = {
         .name = "bfin-ac97-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
 static const char * const ad1836_link[] = {
         "bfin-i2s.0",
         "spi0.4",
@@ -669,8 +665,7 @@ static struct platform_device bfin_ad1836_machine = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
 static const unsigned ad73311_gpio[] = {
         GPIO_PF4,
 };
@@ -684,22 +679,21 @@ static struct platform_device bfin_ad73311_machine = {
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD73311)
 static struct platform_device bfin_ad73311_codec_device = {
         .name = "ad73311",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_AD74111) || defined(CONFIG_SND_SOC_AD74111_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD74111)
 static struct platform_device bfin_ad74111_codec_device = {
         .name = "ad74111",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || \
-        defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -712,8 +706,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \
-        defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -730,36 +723,35 @@ static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || \
-        defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -768,58 +760,54 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
         &i2c_gpio_device,
 #endif
 
-#if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE)
+#if IS_ENABLED(CONFIG_MTD_BFIN_ASYNC)
         &stamp_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         &bfin_ad1836_machine,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
         &bfin_ad73311_machine,
 #endif
 
-#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD73311)
         &bfin_ad73311_codec_device,
 #endif
 
-#if defined(CONFIG_SND_SOC_AD74111) || defined(CONFIG_SND_SOC_AD74111_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD74111)
         &bfin_ad74111_codec_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || \
-        defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \
-        defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
         &bfin_ac97,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         /* Set PF0 to 0, PF1 to 1 make /AMS3 work properly */
@@ -865,7 +853,7 @@ static int __init stamp_init(void)
         if (ret < 0)
                 return ret;
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         /*
          * setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC.
          * the bfin-async-map driver takes care of flipping between
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 85e4fc9f9c22..c65c6dbda3da 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -16,7 +16,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/ata_platform.h>
@@ -32,10 +32,10 @@
  */
 const char bfin_board_name[] = "Bluetechnix CM BF537E";
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -144,7 +144,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
 
 /* SPORT SPI controller data */
 static struct bfin5xx_spi_master bfin_sport_spi0_info = {
@@ -209,20 +209,20 @@ static struct platform_device bfin_sport_spi1_device = {
 
 #endif  /* sport spi master and devices */
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
 static struct platform_device hitachi_fb_device = {
         .name = "hitachi-tx09",
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -254,7 +254,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20308000,
@@ -293,7 +293,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -314,7 +314,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
 static struct mtd_partition cm_partitions[] = {
         {
                 .name   = "bootloader(nor)",
@@ -363,7 +363,7 @@ static struct platform_device cm_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -498,7 +498,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -551,7 +551,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -578,14 +578,14 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) \
-|| defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) \
+|| IS_ENABLED(CONFIG_BFIN_SPORT)
 unsigned short bfin_sport0_peripherals[] = {
         P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
         P_SPORT0_DRPRI, P_SPORT0_RSCLK, P_SPORT0_DRSEC, P_SPORT0_DTSEC, 0
 };
 #endif
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -650,7 +650,7 @@ static struct platform_device bfin_sport1_uart_device = {
 };
 #endif
 #endif
-#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SPORT)
 static struct resource bfin_sport0_resources[] = {
         {
                 .start = SPORT0_TCR1,
@@ -694,7 +694,7 @@ static struct platform_device bfin_sport0_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -727,7 +727,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
 #define PATA_INT        IRQ_PF14
 
 static struct pata_platform_info bfin_pata_platform_data = {
@@ -795,19 +795,19 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SPORT)
         &bfin_sport0_device,
 #endif
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
         &hitachi_fb_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -816,7 +816,7 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -825,11 +825,11 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -838,44 +838,44 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
         &bfin_sport_spi0_device,
         &bfin_sport_spi1_device,
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         &bfin_pata_device,
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
         &cm_flash_device,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PG14, "net2272");
@@ -895,11 +895,11 @@ static int __init cm_bf537e_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf537e_devices, ARRAY_SIZE(cm_bf537e_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
 #endif
 
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index 0143d8bef909..af58454b4bff 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -16,7 +16,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/ata_platform.h>
@@ -32,10 +32,10 @@
  */
 const char bfin_board_name[] = "Bluetechnix CM BF537U";
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
 static struct platform_device hitachi_fb_device = {
         .name = "hitachi-tx09",
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20308000,
@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20200000,
@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
 static struct mtd_partition cm_partitions[] = {
         {
                 .name   = "bootloader(nor)",
@@ -298,7 +298,7 @@ static struct platform_device cm_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -397,7 +397,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -450,7 +450,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -477,7 +477,7 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -548,7 +548,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -581,7 +581,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
 #define PATA_INT        IRQ_PF14
 
 static struct pata_platform_info bfin_pata_platform_data = {
@@ -649,15 +649,15 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
         &hitachi_fb_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -666,7 +666,7 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -675,11 +675,11 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -688,39 +688,39 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         &bfin_pata_device,
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
         &cm_flash_device,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PH15, driver_name);
@@ -752,11 +752,11 @@ static int __init cm_bf537u_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf537u_devices, ARRAY_SIZE(cm_bf537u_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
 #endif
 
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index 8bbf0a23fd49..e79b3b810c39 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -41,14 +41,14 @@ const char bfin_board_name[] = "DNP/5370";
 #define FLASH_MAC               0x202f0000
 #define CONFIG_MTD_PHYSMAP_LEN  0x300000
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -81,7 +81,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition asmb_flash_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -125,9 +125,9 @@ static struct platform_device asmb_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma    = 0,      /* use no dma transfer with this chip*/
@@ -135,7 +135,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
 
 #endif
 
-#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
 /* This mapping is for at45db642 it has 1056 page size,
  * partition size and offset should be page aligned
  */
@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_dataflash_chip_info = {
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
 /* SD/MMC card reader at SPI bus */
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias        = "mmc_spi",
                 .max_speed_hz    = 20000000,
@@ -178,7 +178,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 
 /* 8 Megabyte Atmel NOR flash chip at SPI bus */
-#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
         {
         .modalias        = "mtd_dataflash",
         .max_speed_hz    = 16700000,
@@ -228,7 +228,7 @@ static struct platform_device spi_bfin_master_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -328,7 +328,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -357,7 +357,7 @@ static struct platform_device i2c_bfin_twi_device = {
 
 static struct platform_device *dnp5370_devices[] __initdata = {
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -366,24 +366,24 @@ static struct platform_device *dnp5370_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &asmb_flash_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &spi_bfin_master_device,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index a10f90e444bc..dd7bda07bf90 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -13,7 +13,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/ata_platform.h>
@@ -31,7 +31,7 @@
  */
 const char bfin_board_name[] = "CamSig Minotaur BF537";
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
                 .start = 0x20310000, /* IO PORT */
@@ -60,14 +60,14 @@ static struct platform_device bfin_pcmcia_cf_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -100,7 +100,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -121,11 +121,10 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 
 /* Partition sizes */
 #define FLASH_SIZE       0x00400000
@@ -162,15 +161,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -183,7 +181,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 5000000,     /* max spi clock (SCK) speed in HZ */
@@ -231,7 +229,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -330,7 +328,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -385,7 +383,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -412,7 +410,7 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -484,28 +482,28 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 
 static struct platform_device *minotaur_devices[] __initdata = {
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
         &bfin_pcmcia_cf_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -514,7 +512,7 @@ static struct platform_device *minotaur_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -523,11 +521,11 @@ static struct platform_device *minotaur_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -542,7 +540,7 @@ static int __init minotaur_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info,
                                 ARRAY_SIZE(bfin_spi_board_info));
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 6b395510405b..06a50ddb54c0 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -30,7 +30,7 @@ const char bfin_board_name[] = "ADI PNAV-1.0";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
                 .start = 0x20310000, /* IO PORT */
@@ -59,14 +59,14 @@ static struct platform_device bfin_pcmcia_cf_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -99,7 +99,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 
@@ -132,7 +132,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -153,11 +153,10 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -188,13 +187,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -211,8 +210,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -225,8 +223,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -234,7 +231,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 4,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
@@ -244,7 +241,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 {
         .modalias               = "ad7877",
         .platform_data          = &bfin_ad7877_ts_info,
@@ -294,13 +291,13 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF537_LQ035)
 static struct platform_device bfin_fb_device = {
         .name = "bf537-lq035",
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -399,7 +396,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -455,36 +452,36 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 static struct platform_device *stamp_devices[] __initdata = {
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
         &bfin_pcmcia_cf_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF537_LQ035)
         &bfin_fb_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -493,7 +490,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -507,7 +504,7 @@ static int __init pnav_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info,
                                 ARRAY_SIZE(bfin_spi_board_info));
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 44fd1d4682ac..de19b8a56007 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -18,7 +18,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/i2c.h>
@@ -53,7 +53,7 @@ const char bfin_board_name[] = "ADI BF537-STAMP";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -88,7 +88,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -111,7 +111,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
                 .start = 0x20310000, /* IO PORT */
@@ -140,14 +140,14 @@ static struct platform_device bfin_pcmcia_cf_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -180,7 +180,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
 static struct resource dm9000_resources[] = {
         [0] = {
                 .start  = 0x203FB800,
@@ -207,7 +207,7 @@ static struct platform_device dm9000_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_SL811_HCD)
 static struct resource sl811_hcd_resources[] = {
         {
                 .start = 0x20340000,
@@ -251,7 +251,7 @@ static struct platform_device sl811_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20360000,
@@ -290,7 +290,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 static unsigned short bfin_can_peripherals[] = {
         P_CAN0_RX, P_CAN0_TX, 0
 };
@@ -328,7 +328,7 @@ static struct platform_device bfin_can_device = {
 };
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -361,7 +361,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -385,7 +385,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_PLATFORM)
 const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -461,7 +461,7 @@ static void bfin_plat_nand_init(void)
 static void bfin_plat_nand_init(void) {}
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition stamp_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -509,8 +509,7 @@ static struct platform_device stamp_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -541,7 +540,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_AD714X_SPI) || defined(CONFIG_INPUT_AD714X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_AD714X_SPI)
 #include <linux/input/ad714x.h>
 
 static struct ad714x_slider_plat ad7147_spi_slider_plat[] = {
@@ -602,7 +601,7 @@ static struct ad714x_platform_data ad7147_spi_platform_data = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_AD714X_I2C) || defined(CONFIG_INPUT_AD714X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_AD714X_I2C)
 #include <linux/input/ad714x.h>
 static struct ad714x_button_plat ad7142_i2c_button_plat[] = {
         {
@@ -649,24 +648,24 @@ static struct ad714x_platform_data ad7142_i2c_platform_data = {
 };
 #endif
 
-#if defined(CONFIG_AD2S90) || defined(CONFIG_AD2S90_MODULE)
+#if IS_ENABLED(CONFIG_AD2S90)
 static struct bfin5xx_spi_chip ad2s90_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
-static unsigned short ad2s120x_platform_data[] = {
+#if IS_ENABLED(CONFIG_AD2S1200)
+static unsigned short ad2s1200_platform_data[] = {
         /* used as SAMPLE and RDVEL */
         GPIO_PF5, GPIO_PF6, 0
 };
 
-static struct bfin5xx_spi_chip ad2s120x_spi_chip_info = {
+static struct bfin5xx_spi_chip ad2s1200_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_AD2S1210) || defined(CONFIG_AD2S1210_MODULE)
+#if IS_ENABLED(CONFIG_AD2S1210)
 static unsigned short ad2s1210_platform_data[] = {
         /* use as SAMPLE, A0, A1 */
         GPIO_PF7, GPIO_PF8, GPIO_PF9,
@@ -682,13 +681,13 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
 static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
-#if defined(CONFIG_AD7816) || defined(CONFIG_AD7816_MODULE)
+#if IS_ENABLED(CONFIG_AD7816)
 static unsigned short ad7816_platform_data[] = {
         GPIO_PF4, /* rdwr_pin */
         GPIO_PF5, /* convert_pin */
@@ -701,7 +700,7 @@ static struct bfin5xx_spi_chip ad7816_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if IS_ENABLED(CONFIG_ADT7310)
 static unsigned long adt7310_platform_data[3] = {
 /* INT bound temperature alarm event. line 1 */
         IRQ_PG4, IRQF_TRIGGER_LOW,
@@ -714,14 +713,14 @@ static struct bfin5xx_spi_chip adt7310_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_AD7298) || defined(CONFIG_AD7298_MODULE)
+#if IS_ENABLED(CONFIG_AD7298)
 static unsigned short ad7298_platform_data[] = {
         GPIO_PF7, /* busy_pin */
         0,
 };
 #endif
 
-#if defined(CONFIG_ADT7316_SPI) || defined(CONFIG_ADT7316_SPI_MODULE)
+#if IS_ENABLED(CONFIG_ADT7316_SPI)
 static unsigned long adt7316_spi_data[2] = {
         IRQF_TRIGGER_LOW, /* interrupt flags */
         GPIO_PF7, /* ldac_pin, 0 means DAC/LDAC registers control DAC update */
@@ -732,7 +731,7 @@ static struct bfin5xx_spi_chip adt7316_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 #define MMC_SPI_CARD_DETECT_INT IRQ_PF5
 
 static int bfin_mmc_spi_init(struct device *dev,
@@ -759,7 +758,7 @@ static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 #include <linux/spi/ad7877.h>
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
@@ -776,7 +775,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 #include <linux/spi/ad7879.h>
 static const struct ad7879_platform_data bfin_ad7879_ts_info = {
         .model                  = 7879, /* Model = AD7879 */
@@ -793,7 +792,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X)
 #include <linux/input/adxl34x.h>
 static const struct adxl34x_platform_data adxl34x_info = {
         .x_axis_offset = 0,
@@ -832,13 +831,13 @@ static const struct adxl34x_platform_data adxl34x_info = {
 };
 #endif
 
-#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+#if IS_ENABLED(CONFIG_ENC28J60)
 static struct bfin5xx_spi_chip enc28j60_spi_chip_info = {
         .enable_dma     = 1,
 };
 #endif
 
-#if defined(CONFIG_ADF702X) || defined(CONFIG_ADF702X_MODULE)
+#if IS_ENABLED(CONFIG_ADF702X)
 #include <linux/spi/adf702x.h>
 #define TXREG 0x0160A470
 static const u32 adf7021_regs[] = {
@@ -880,7 +879,7 @@ static inline void adf702x_mac_init(void)
 static inline void adf702x_mac_init(void) {}
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_ADS7846)
 #include <linux/spi/ads7846.h>
 static int ads7873_get_pendown_state(void)
 {
@@ -899,8 +898,7 @@ static struct ads7846_platform_data __initdata ad7873_pdata = {
 };
 #endif
 
-#if defined(CONFIG_MTD_DATAFLASH) \
-        || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
 
 static struct mtd_partition bfin_spi_dataflash_partitions[] = {
         {
@@ -931,15 +929,14 @@ static struct bfin5xx_spi_chip data_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_AD7476) || defined(CONFIG_AD7476_MODULE)
+#if IS_ENABLED(CONFIG_AD7476)
 static struct bfin5xx_spi_chip spi_ad7476_chip_info = {
         .enable_dma = 0,         /* use dma transfer with this chip*/
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -951,8 +948,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_MTD_DATAFLASH) \
-        || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
         {       /* DataFlash chip */
                 .modalias = "mtd_dataflash",
                 .max_speed_hz = 33250000,     /* max spi clock (SCK) speed in HZ */
@@ -964,8 +960,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         {
                 .modalias = "ad1836",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -986,7 +981,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_SOC_ADAV80X) || defined(CONFIG_SND_SOC_ADV80X_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAV80X)
         {
                 .modalias = "adav801",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -996,7 +991,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_INPUT_AD714X_SPI) || defined(CONFIG_INPUT_AD714X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_AD714X_SPI)
         {
                 .modalias = "ad714x_captouch",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1008,7 +1003,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_AD2S90) || defined(CONFIG_AD2S90_MODULE)
+#if IS_ENABLED(CONFIG_AD2S90)
         {
                 .modalias = "ad2s90",
                 .bus_num = 0,
@@ -1019,17 +1014,17 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
+#if IS_ENABLED(CONFIG_AD2S1200)
         {
-                .modalias = "ad2s120x",
+                .modalias = "ad2s1200",
                 .bus_num = 0,
                 .chip_select = 4,            /* CS, change it for your board */
-                .platform_data = ad2s120x_platform_data,
-                .controller_data = &ad2s120x_spi_chip_info,
+                .platform_data = ad2s1200_platform_data,
+                .controller_data = &ad2s1200_spi_chip_info,
         },
 #endif
 
-#if defined(CONFIG_AD2S1210) || defined(CONFIG_AD2S1210_MODULE)
+#if IS_ENABLED(CONFIG_AD2S1210)
         {
                 .modalias = "ad2s1210",
                 .max_speed_hz = 8192000,
@@ -1040,7 +1035,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
         {
                 .modalias = "ad7314",
                 .max_speed_hz = 1000000,
@@ -1051,7 +1046,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_AD7816) || defined(CONFIG_AD7816_MODULE)
+#if IS_ENABLED(CONFIG_AD7816)
         {
                 .modalias = "ad7818",
                 .max_speed_hz = 1000000,
@@ -1063,7 +1058,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if IS_ENABLED(CONFIG_ADT7310)
         {
                 .modalias = "adt7310",
                 .max_speed_hz = 1000000,
@@ -1076,7 +1071,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_AD7298) || defined(CONFIG_AD7298_MODULE)
+#if IS_ENABLED(CONFIG_AD7298)
         {
                 .modalias = "ad7298",
                 .max_speed_hz = 1000000,
@@ -1087,7 +1082,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_ADT7316_SPI) || defined(CONFIG_ADT7316_SPI_MODULE)
+#if IS_ENABLED(CONFIG_ADT7316_SPI)
         {
                 .modalias = "adt7316",
                 .max_speed_hz = 1000000,
@@ -1100,7 +1095,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -1111,7 +1106,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -1121,7 +1116,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select  = 1,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
         {
                 .modalias = "ad7879",
                 .platform_data = &bfin_ad7879_ts_info,
@@ -1132,7 +1127,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1140,7 +1135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 1,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -1149,7 +1144,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif
-#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+#if IS_ENABLED(CONFIG_ENC28J60)
         {
                 .modalias = "enc28j60",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -1160,7 +1155,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_SPI)
         {
                 .modalias       = "adxl34x",
                 .platform_data  = &adxl34x_info,
@@ -1171,7 +1166,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_ADF702X) || defined(CONFIG_ADF702X_MODULE)
+#if IS_ENABLED(CONFIG_ADF702X)
         {
                 .modalias = "adf702x",
                 .max_speed_hz = 16000000,     /* max spi clock (SCK) speed in HZ */
@@ -1181,7 +1176,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_ADS7846)
         {
                 .modalias = "ads7846",
                 .max_speed_hz = 2000000,     /* max spi clock (SCK) speed in HZ */
@@ -1192,8 +1187,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_0,
         },
 #endif
-#if defined(CONFIG_AD7476) \
-        || defined(CONFIG_AD7476_MODULE)
+#if IS_ENABLED(CONFIG_AD7476)
         {
                 .modalias = "ad7476", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
@@ -1204,8 +1198,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_ADE7753) \
-        || defined(CONFIG_ADE7753_MODULE)
+#if IS_ENABLED(CONFIG_ADE7753)
         {
                 .modalias = "ade7753",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1215,8 +1208,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_1,
         },
 #endif
-#if defined(CONFIG_ADE7754) \
-        || defined(CONFIG_ADE7754_MODULE)
+#if IS_ENABLED(CONFIG_ADE7754)
         {
                 .modalias = "ade7754",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1226,8 +1218,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_1,
         },
 #endif
-#if defined(CONFIG_ADE7758) \
-        || defined(CONFIG_ADE7758_MODULE)
+#if IS_ENABLED(CONFIG_ADE7758)
         {
                 .modalias = "ade7758",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1237,8 +1228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_1,
         },
 #endif
-#if defined(CONFIG_ADE7759) \
-        || defined(CONFIG_ADE7759_MODULE)
+#if IS_ENABLED(CONFIG_ADE7759)
         {
                 .modalias = "ade7759",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1248,8 +1238,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_1,
         },
 #endif
-#if defined(CONFIG_ADE7854_SPI) \
-        || defined(CONFIG_ADE7854_SPI_MODULE)
+#if IS_ENABLED(CONFIG_ADE7854_SPI)
         {
                 .modalias = "ade7854",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1259,8 +1248,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_ADIS16060) \
-        || defined(CONFIG_ADIS16060_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16060)
         {
                 .modalias = "adis16060_r",
                 .max_speed_hz = 2900000,     /* max spi clock (SCK) speed in HZ */
@@ -1278,8 +1266,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_1,
         },
 #endif
-#if defined(CONFIG_ADIS16130) \
-        || defined(CONFIG_ADIS16130_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16130)
         {
                 .modalias = "adis16130",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1289,8 +1276,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_ADIS16201) \
-        || defined(CONFIG_ADIS16201_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16201)
         {
                 .modalias = "adis16201",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1301,8 +1287,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16203) \
-        || defined(CONFIG_ADIS16203_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16203)
         {
                 .modalias = "adis16203",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1313,8 +1298,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16204) \
-        || defined(CONFIG_ADIS16204_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16204)
         {
                 .modalias = "adis16204",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1325,8 +1309,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16209) \
-        || defined(CONFIG_ADIS16209_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16209)
         {
                 .modalias = "adis16209",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1337,8 +1320,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16220) \
-        || defined(CONFIG_ADIS16220_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16220)
         {
                 .modalias = "adis16220",
                 .max_speed_hz = 2000000,     /* max spi clock (SCK) speed in HZ */
@@ -1349,8 +1331,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16240) \
-        || defined(CONFIG_ADIS16240_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16240)
         {
                 .modalias = "adis16240",
                 .max_speed_hz = 1500000,     /* max spi clock (SCK) speed in HZ */
@@ -1361,8 +1342,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16260) \
-        || defined(CONFIG_ADIS16260_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16260)
         {
                 .modalias = "adis16260",
                 .max_speed_hz = 1500000,     /* max spi clock (SCK) speed in HZ */
@@ -1373,8 +1353,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16261) \
-        || defined(CONFIG_ADIS16261_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16261)
         {
                 .modalias = "adis16261",
                 .max_speed_hz = 2500000,     /* max spi clock (SCK) speed in HZ */
@@ -1384,8 +1363,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_ADIS16300) \
-        || defined(CONFIG_ADIS16300_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16300)
         {
                 .modalias = "adis16300",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1396,8 +1374,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16350) \
-        || defined(CONFIG_ADIS16350_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16350)
         {
                 .modalias = "adis16364",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1408,8 +1385,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .irq = IRQ_PF4,
         },
 #endif
-#if defined(CONFIG_ADIS16400) \
-        || defined(CONFIG_ADIS16400_MODULE)
+#if IS_ENABLED(CONFIG_ADIS16400)
         {
                 .modalias = "adis16400",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
@@ -1421,7 +1397,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI controller data */
 static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
@@ -1459,7 +1435,7 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
 
 /* SPORT SPI controller data */
 static struct bfin5xx_spi_master bfin_sport_spi0_info = {
@@ -1524,13 +1500,13 @@ static struct platform_device bfin_sport_spi1_device = {
 
 #endif  /* sport spi master and devices */
 
-#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF537_LQ035)
 static struct platform_device bfin_fb_device = {
         .name = "bf537_lq035",
 };
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
 #include <asm/bfin-lq035q1.h>
 
 static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
@@ -1559,8 +1535,7 @@ static struct platform_device bfin_lq035q1_device = {
 };
 #endif
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_capture.h>
 #include <media/blackfin/ppi.h>
@@ -1580,8 +1555,7 @@ static const struct ppi_info ppi_info = {
         .pin_req = ppi_req,
 };
 
-#if defined(CONFIG_VIDEO_VS6624) \
-        || defined(CONFIG_VIDEO_VS6624_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_VS6624)
 static struct v4l2_input vs6624_inputs[] = {
         {
                 .index = 0,
@@ -1624,7 +1598,7 @@ static struct platform_device bfin_capture_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -1735,7 +1709,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -1790,7 +1764,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -1817,7 +1791,7 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_ADP5588)
 static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = {
         [0]      = KEY_GRAVE,
         [1]      = KEY_1,
@@ -1902,7 +1876,7 @@ static struct adp5588_kpad_platform_data adp5588_kpad_data = {
 };
 #endif
 
-#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+#if IS_ENABLED(CONFIG_PMIC_ADP5520)
 #include <linux/mfd/adp5520.h>
 
         /*
@@ -2013,14 +1987,14 @@ static struct adp5520_platform_data adp5520_pdev_data = {
 
 #endif
 
-#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_ADP5588)
 static struct adp5588_gpio_platform_data adp5588_gpio_data = {
         .gpio_start = 50,
         .pullup_dis_mask = 0,
 };
 #endif
 
-#if defined(CONFIG_BACKLIGHT_ADP8870) || defined(CONFIG_BACKLIGHT_ADP8870_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_ADP8870)
 #include <linux/i2c/adp8870.h>
 static struct led_info adp8870_leds[] = {
         {
@@ -2072,7 +2046,7 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
 };
 #endif
 
-#if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860)
 #include <linux/i2c/adp8860.h>
 static struct led_info adp8860_leds[] = {
         {
@@ -2114,7 +2088,7 @@ static struct adp8860_backlight_platform_data adp8860_pdata = {
 };
 #endif
 
-#if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_AD5398)
 static struct regulator_consumer_supply ad5398_consumer = {
         .supply = "current",
 };
@@ -2129,8 +2103,7 @@ static struct regulator_init_data ad5398_regulator_data = {
         .consumer_supplies     = &ad5398_consumer,
 };
 
-#if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \
-        defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_VIRTUAL_CONSUMER)
 static struct platform_device ad5398_virt_consumer_device = {
         .name = "reg-virt-consumer",
         .id = 0,
@@ -2139,8 +2112,7 @@ static struct platform_device ad5398_virt_consumer_device = {
         },
 };
 #endif
-#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \
-        defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_USERSPACE_CONSUMER)
 static struct regulator_bulk_data ad5398_bulk_data = {
         .supply = "current",
 };
@@ -2161,14 +2133,14 @@ static struct platform_device ad5398_userspace_consumer_device = {
 #endif
 #endif
 
-#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
+#if IS_ENABLED(CONFIG_ADT7410)
 /* INT bound temperature alarm event. line 1 */
 static unsigned long adt7410_platform_data[2] = {
         IRQ_PG4, IRQF_TRIGGER_LOW,
 };
 #endif
 
-#if defined(CONFIG_ADT7316_I2C) || defined(CONFIG_ADT7316_I2C_MODULE)
+#if IS_ENABLED(CONFIG_ADT7316_I2C)
 /* INT bound temperature alarm event. line 1 */
 static unsigned long adt7316_i2c_data[2] = {
         IRQF_TRIGGER_LOW, /* interrupt flags */
@@ -2183,13 +2155,13 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
         },
 #endif
 
-#if defined(CONFIG_SND_SOC_ADAV80X) || defined(CONFIG_SND_SOC_ADAV80X_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAV80X)
         {
                 I2C_BOARD_INFO("adav803", 0x10),
         },
 #endif
 
-#if defined(CONFIG_INPUT_AD714X_I2C) || defined(CONFIG_INPUT_AD714X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_AD714X_I2C)
         {
                 I2C_BOARD_INFO("ad7142_captouch", 0x2C),
                 .irq = IRQ_PG5,
@@ -2197,39 +2169,39 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
         },
 #endif
 
-#if defined(CONFIG_AD7150) || defined(CONFIG_AD7150_MODULE)
+#if IS_ENABLED(CONFIG_AD7150)
         {
                 I2C_BOARD_INFO("ad7150", 0x48),
                 .irq = IRQ_PG5, /* fixme: use real interrupt number */
         },
 #endif
 
-#if defined(CONFIG_AD7152) || defined(CONFIG_AD7152_MODULE)
+#if IS_ENABLED(CONFIG_AD7152)
         {
                 I2C_BOARD_INFO("ad7152", 0x48),
         },
 #endif
 
-#if defined(CONFIG_AD774X) || defined(CONFIG_AD774X_MODULE)
+#if IS_ENABLED(CONFIG_AD774X)
         {
                 I2C_BOARD_INFO("ad774x", 0x48),
         },
 #endif
 
-#if defined(CONFIG_ADE7854_I2C) || defined(CONFIG_ADE7854_I2C_MODULE)
+#if IS_ENABLED(CONFIG_ADE7854_I2C)
         {
                 I2C_BOARD_INFO("ade7854", 0x38),
         },
 #endif
 
-#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_LM75)
         {
                 I2C_BOARD_INFO("adt75", 0x9),
                 .irq = IRQ_PG5,
         },
 #endif
 
-#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
+#if IS_ENABLED(CONFIG_ADT7410)
         {
                 I2C_BOARD_INFO("adt7410", 0x48),
                 /* CT critical temperature event. line 0 */
@@ -2238,14 +2210,14 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
         },
 #endif
 
-#if defined(CONFIG_AD7291) || defined(CONFIG_AD7291_MODULE)
+#if IS_ENABLED(CONFIG_AD7291)
         {
                 I2C_BOARD_INFO("ad7291", 0x20),
                 .irq = IRQ_PG5,
         },
 #endif
 
-#if defined(CONFIG_ADT7316_I2C) || defined(CONFIG_ADT7316_I2C_MODULE)
+#if IS_ENABLED(CONFIG_ADT7316_I2C)
         {
                 I2C_BOARD_INFO("adt7316", 0x48),
                 .irq = IRQ_PG6,
@@ -2253,128 +2225,128 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
         },
 #endif
 
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = IRQ_PG6,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_I2C)
         {
                 I2C_BOARD_INFO("ad7879", 0x2F),
                 .irq = IRQ_PG5,
                 .platform_data = (void *)&bfin_ad7879_ts_info,
         },
 #endif
-#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_ADP5588)
         {
                 I2C_BOARD_INFO("adp5588-keys", 0x34),
                 .irq = IRQ_PG0,
                 .platform_data = (void *)&adp5588_kpad_data,
         },
 #endif
-#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+#if IS_ENABLED(CONFIG_PMIC_ADP5520)
         {
                 I2C_BOARD_INFO("pmic-adp5520", 0x32),
                 .irq = IRQ_PG0,
                 .platform_data = (void *)&adp5520_pdev_data,
         },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_I2C) || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_I2C)
         {
                 I2C_BOARD_INFO("adxl34x", 0x53),
                 .irq = IRQ_PG3,
                 .platform_data = (void *)&adxl34x_info,
         },
 #endif
-#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
+#if IS_ENABLED(CONFIG_GPIO_ADP5588)
         {
                 I2C_BOARD_INFO("adp5588-gpio", 0x34),
                 .platform_data = (void *)&adp5588_gpio_data,
         },
 #endif
-#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_7393)
         {
                 I2C_BOARD_INFO("bfin-adv7393", 0x2B),
         },
 #endif
-#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF537_LQ035)
         {
                 I2C_BOARD_INFO("bf537-lq035-ad5280", 0x2F),
         },
 #endif
-#if defined(CONFIG_BACKLIGHT_ADP8870) || defined(CONFIG_BACKLIGHT_ADP8870_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_ADP8870)
         {
                 I2C_BOARD_INFO("adp8870", 0x2B),
                 .platform_data = (void *)&adp8870_pdata,
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1371) || defined(CONFIG_SND_SOC_ADAU1371_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1371)
         {
                 I2C_BOARD_INFO("adau1371", 0x1A),
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1761) || defined(CONFIG_SND_SOC_ADAU1761_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1761)
         {
                 I2C_BOARD_INFO("adau1761", 0x38),
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1361) || defined(CONFIG_SND_SOC_ADAU1361_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1361)
         {
                 I2C_BOARD_INFO("adau1361", 0x38),
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1701) || defined(CONFIG_SND_SOC_ADAU1701_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1701)
         {
                 I2C_BOARD_INFO("adau1701", 0x34),
         },
 #endif
-#if defined(CONFIG_AD525X_DPOT) || defined(CONFIG_AD525X_DPOT_MODULE)
+#if IS_ENABLED(CONFIG_AD525X_DPOT)
         {
                 I2C_BOARD_INFO("ad5258", 0x18),
         },
 #endif
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
 #endif
-#if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_AD5398)
         {
                 I2C_BOARD_INFO("ad5398", 0xC),
                 .platform_data = (void *)&ad5398_regulator_data,
         },
 #endif
-#if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
+#if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860)
         {
                 I2C_BOARD_INFO("adp8860", 0x2A),
                 .platform_data = (void *)&adp8860_pdata,
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1373) || defined(CONFIG_SND_SOC_ADAU1373_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1373)
         {
                 I2C_BOARD_INFO("adau1373", 0x1A),
         },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("ad5252", 0x2e),
         },
 #endif
 };
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) \
-|| defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT) \
+|| IS_ENABLED(CONFIG_BFIN_SPORT)
 unsigned short bfin_sport0_peripherals[] = {
         P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
         P_SPORT0_DRPRI, P_SPORT0_RSCLK, P_SPORT0_DRSEC, P_SPORT0_DTSEC, 0
 };
 #endif
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -2439,7 +2411,7 @@ static struct platform_device bfin_sport1_uart_device = {
 };
 #endif
 #endif
-#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SPORT)
 static struct resource bfin_sport0_resources[] = {
         {
                 .start = SPORT0_TCR1,
@@ -2482,7 +2454,7 @@ static struct platform_device bfin_sport0_device = {
         },
 };
 #endif
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
 #define CF_IDE_NAND_CARD_USE_HDD_INTERFACE
 /* #define CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE */
 
@@ -2569,8 +2541,8 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
-        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S) || \
+        IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 
 #define SPORT_REQ(x) \
         [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
@@ -2620,22 +2592,21 @@ static struct resource bfin_snd_resources[][4] = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
         .name = "bfin-i2s-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97_pcm = {
         .name = "bfin-ac97-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
 static const char * const ad1836_link[] = {
         "bfin-i2s.0",
         "spi0.4",
@@ -2649,8 +2620,7 @@ static struct platform_device bfin_ad1836_machine = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
-                                defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
 static const unsigned ad73311_gpio[] = {
         GPIO_PF4,
 };
@@ -2664,22 +2634,21 @@ static struct platform_device bfin_ad73311_machine = {
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD73311)
 static struct platform_device bfin_ad73311_codec_device = {
         .name = "ad73311",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X)
 static struct platform_device bfin_eval_adav801_device = {
         .name = "bfin-eval-adav801",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -2691,7 +2660,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -2703,7 +2672,7 @@ static struct platform_device bfin_ac97 = {
 };
 #endif
 
-#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_FIXED_VOLTAGE)
 #define REGULATOR_ADP122        "adp122"
 #define REGULATOR_ADP122_UV     2500000
 
@@ -2741,8 +2710,7 @@ static struct platform_device adp_switch_device = {
         },
 };
 
-#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \
-        defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_USERSPACE_CONSUMER)
 static struct regulator_bulk_data adp122_bulk_data = {
         .supply = REGULATOR_ADP122,
 };
@@ -2763,8 +2731,7 @@ static struct platform_device adp122_userspace_consumer_device = {
 #endif
 #endif
 
-#if defined(CONFIG_IIO_GPIO_TRIGGER) || \
-        defined(CONFIG_IIO_GPIO_TRIGGER_MODULE)
+#if IS_ENABLED(CONFIG_IIO_GPIO_TRIGGER)
 
 static struct resource iio_gpio_trigger_resources[] = {
         [0] = {
@@ -2781,15 +2748,13 @@ static struct platform_device iio_gpio_trigger = {
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373)
 static struct platform_device bf5xx_adau1373_device = {
         .name = "bfin-eval-adau1373",
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701)
 static struct platform_device bf5xx_adau1701_device = {
         .name = "bfin-eval-adau1701",
 };
@@ -2798,73 +2763,72 @@ static struct platform_device bf5xx_adau1701_device = {
 static struct platform_device *stamp_devices[] __initdata = {
 
         &bfin_dpmc,
-#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SPORT)
         &bfin_sport0_device,
 #endif
-#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
         &bfin_pcmcia_cf_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_SL811_HCD)
         &sl811_hcd_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+#if IS_ENABLED(CONFIG_DM9000)
         &dm9000_device,
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
         &bfin_can_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
         &bfin_sport_spi0_device,
         &bfin_sport_spi1_device,
 #endif
 
-#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF537_LQ035)
         &bfin_fb_device,
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         &bfin_lq035q1_device,
 #endif
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
         &bfin_capture_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -2873,7 +2837,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -2882,11 +2846,11 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -2895,95 +2859,86 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         &bfin_pata_device,
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_PLATFORM)
         &bfin_async_nand_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &stamp_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         &bfin_ad1836_machine,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
-                defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
         &bfin_ad73311_machine,
 #endif
 
-#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_AD73311)
         &bfin_ad73311_codec_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
         &bfin_ac97,
 #endif
 
-#if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)
-#if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \
-        defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_AD5398)
+#if IS_ENABLED(CONFIG_REGULATOR_VIRTUAL_CONSUMER)
         &ad5398_virt_consumer_device,
 #endif
-#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \
-        defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_USERSPACE_CONSUMER)
         &ad5398_userspace_consumer_device,
 #endif
 #endif
 
-#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_FIXED_VOLTAGE)
         &adp_switch_device,
-#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \
-        defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)
+#if IS_ENABLED(CONFIG_REGULATOR_USERSPACE_CONSUMER)
         &adp122_userspace_consumer_device,
 #endif
 #endif
 
-#if defined(CONFIG_IIO_GPIO_TRIGGER) || \
-        defined(CONFIG_IIO_GPIO_TRIGGER_MODULE)
+#if IS_ENABLED(CONFIG_IIO_GPIO_TRIGGER)
         &iio_gpio_trigger,
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373)
         &bf5xx_adau1373_device,
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701)
         &bf5xx_adau1701_device,
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X)
         &bfin_eval_adav801_device,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PF6, "net2272");
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index e285c3675286..a0211225748d 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -16,7 +16,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/ata_platform.h>
@@ -32,10 +32,10 @@
  */
 const char bfin_board_name[] = "Bluetechnix TCM BF537";
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
 static struct bfin5xx_spi_chip mmc_spi_chip_info = {
         .enable_dma = 0,
 };
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
 static struct platform_device hitachi_fb_device = {
         .name = "hitachi-tx09",
 };
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x20308000,
@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x20300000,
@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
 static struct mtd_partition cm_partitions[] = {
         {
                 .name   = "bootloader(nor)",
@@ -298,7 +298,7 @@ static struct platform_device cm_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -397,7 +397,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -452,7 +452,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -479,7 +479,7 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -550,7 +550,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
 #include <linux/bfin_mac.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 
@@ -583,7 +583,7 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
 #define PATA_INT        IRQ_PF14
 
 static struct pata_platform_info bfin_pata_platform_data = {
@@ -651,15 +651,15 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
         &hitachi_fb_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -668,7 +668,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -677,11 +677,11 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -690,39 +690,39 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_MAC)
         &bfin_mii_bus,
         &bfin_mac_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         &bfin_pata_device,
 #endif
 
-#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE)
+#if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
         &cm_flash_device,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PG14, "net2272");
@@ -742,11 +742,11 @@ static int __init tcm_bf537_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
 #endif
 
diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c
index 755f0dc12010..ae2fcbb00119 100644
--- a/arch/blackfin/mach-bf538/boards/ezkit.c
+++ b/arch/blackfin/mach-bf538/boards/ezkit.c
@@ -33,14 +33,14 @@ const char bfin_board_name[] = "ADI BF538-EZKIT";
  */
 
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif  /* CONFIG_RTC_DRV_BFIN */
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -199,7 +199,7 @@ static struct platform_device bfin_uart2_device = {
 #endif  /* CONFIG_SERIAL_BFIN_UART2 */
 #endif  /* CONFIG_SERIAL_BFIN */
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -277,7 +277,7 @@ static struct platform_device bfin_sir2_device = {
 #endif  /* CONFIG_BFIN_SIR2 */
 #endif  /* CONFIG_BFIN_SIR */
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -416,7 +416,7 @@ static struct platform_device bfin_sport3_uart_device = {
 #endif  /* CONFIG_SERIAL_BFIN_SPORT3_UART */
 #endif  /* CONFIG_SERIAL_BFIN_SPORT */
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 static unsigned short bfin_can_peripherals[] = {
         P_CAN0_RX, P_CAN0_TX, 0
 };
@@ -458,7 +458,7 @@ static struct platform_device bfin_can_device = {
  *  USB-LAN EzExtender board
  *  Driver needs to know address, irq and flag pin.
  */
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -490,10 +490,9 @@ static struct platform_device smc91x_device = {
 };
 #endif  /* CONFIG_SMC91X */
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 /* SPI flash chip (m25p16) */
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
@@ -521,7 +520,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 #endif  /* CONFIG_MTD_M25P80 */
 #endif  /* CONFIG_SPI_BFIN5XX */
 
-#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
 #include <linux/spi/ad7879.h>
 static const struct ad7879_platform_data bfin_ad7879_ts_info = {
         .model                  = 7879, /* Model = AD7879 */
@@ -538,7 +537,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 };
 #endif  /* CONFIG_TOUCHSCREEN_AD7879 */
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
 #include <asm/bfin-lq035q1.h>
 
 static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
@@ -568,8 +567,7 @@ static struct platform_device bfin_lq035q1_device = {
 #endif  /* CONFIG_FB_BFIN_LQ035Q1 */
 
 static struct spi_board_info bf538_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -581,7 +579,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif  /* CONFIG_MTD_M25P80 */
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
         {
                 .modalias = "ad7879",
                 .platform_data = &bfin_ad7879_ts_info,
@@ -592,7 +590,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif  /* CONFIG_TOUCHSCREEN_AD7879_SPI */
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         {
                 .modalias = "bfin-lq035q1-spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -601,7 +599,7 @@ static struct spi_board_info bf538_spi_board_info[] __initdata = {
                 .mode = SPI_CPHA | SPI_CPOL,
         },
 #endif  /* CONFIG_FB_BFIN_LQ035Q1 */
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -717,7 +715,7 @@ static struct platform_device bf538_spi_master2 = {
                 },
 };
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -766,7 +764,7 @@ static struct platform_device i2c_bfin_twi1_device = {
 };
 #endif  /* CONFIG_I2C_BLACKFIN_TWI */
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -814,7 +812,7 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -839,7 +837,7 @@ static struct physmap_flash_data ezkit_flash_data = {
 
 static struct resource ezkit_flash_resource = {
         .start = 0x20000000,
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         .end   = 0x202fffff,
 #else
         .end   = 0x203fffff,
@@ -862,11 +860,11 @@ static struct platform_device *cm_bf538_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -878,18 +876,18 @@ static struct platform_device *cm_bf538_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bf538_spi_master0,
         &bf538_spi_master1,
         &bf538_spi_master2,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi0_device,
         &i2c_bfin_twi1_device,
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -901,7 +899,7 @@ static struct platform_device *cm_bf538_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -916,23 +914,23 @@ static struct platform_device *cm_bf538_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
         &bfin_can_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
+#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
         &bfin_lq035q1_device,
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device,
 #endif
 };
@@ -942,7 +940,7 @@ static int __init ezkit_init(void)
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf538_devices, ARRAY_SIZE(cm_bf538_devices));
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bf538_spi_board_info,
                         ARRAY_SIZE(bf538_spi_board_info));
 #endif
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index e92543362f35..6d5ffdead067 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -37,7 +37,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
 
 #include <mach/bf54x-lq043.h>
 
@@ -69,7 +69,7 @@ static struct platform_device bf54x_lq043_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
 static unsigned int bf548_keymap[] = {
         KEYVAL(0, 0, KEY_ENTER),
         KEYVAL(0, 1, KEY_HELP),
@@ -119,14 +119,14 @@ static struct platform_device bf54x_kpad_device = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -353,7 +353,7 @@ static struct platform_device bfin_uart3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -456,7 +456,7 @@ static struct platform_device bfin_sir3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 
 static struct resource smsc911x_resources[] = {
@@ -491,7 +491,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xFFC03C00,
@@ -553,7 +553,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -692,7 +692,7 @@ static struct platform_device bfin_sport3_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
 static struct resource bfin_atapi_resources[] = {
         {
                 .start = 0xFFC03800,
@@ -714,7 +714,7 @@ static struct platform_device bfin_atapi_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "linux kernel(nand)",
@@ -760,7 +760,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 static struct bfin_sd_host bfin_sdh_data = {
         .dma_chan = CH_SDH,
         .irq_int0 = IRQ_SDH_MASK0,
@@ -776,7 +776,7 @@ static struct platform_device bf54x_sdh_device = {
 };
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 static unsigned short bfin_can_peripherals[] = {
         P_CAN0_RX, P_CAN0_TX, 0
 };
@@ -814,7 +814,7 @@ static struct platform_device bfin_can_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition para_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -854,10 +854,9 @@ static struct platform_device para_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 /* SPI flash chip (m25p16) */
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
@@ -884,7 +883,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -901,8 +900,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 #endif
 
 static struct spi_board_info bf54x_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -914,7 +912,7 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 {
         .modalias               = "ad7877",
         .platform_data          = &bfin_ad7877_ts_info,
@@ -924,7 +922,7 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = {
         .chip_select            = 2,
 },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1006,7 +1004,7 @@ static struct platform_device bf54x_spi_master1 = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -1060,7 +1058,7 @@ static struct platform_device i2c_bfin_twi1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -1112,11 +1110,11 @@ static struct platform_device *cm_bf548_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -1131,7 +1129,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -1146,19 +1144,19 @@ static struct platform_device *cm_bf548_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
         &bf54x_lq043_device,
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
         &smsc911x_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -1173,43 +1171,43 @@ static struct platform_device *cm_bf548_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
         &bfin_atapi_device,
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
         &bf54x_sdh_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bf54x_spi_master0,
         &bf54x_spi_master1,
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
         &bf54x_kpad_device,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi0_device,
 #if !defined(CONFIG_BF542)
         &i2c_bfin_twi1_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &para_flash_device,
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
         &bfin_can_device,
 #endif
 
@@ -1220,7 +1218,7 @@ static int __init cm_bf548_init(void)
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices));
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bf54x_spi_board_info,
                         ARRAY_SIZE(bf54x_spi_board_info));
 #endif
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index d495000b81a0..90138e6112c1 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -41,7 +41,7 @@ const char bfin_board_name[] = "ADI BF548-EZKIT";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -76,7 +76,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
 
 #include <mach/bf54x-lq043.h>
 
@@ -108,7 +108,7 @@ static struct platform_device bf54x_lq043_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
 static const unsigned int bf548_keymap[] = {
         KEYVAL(0, 0, KEY_ENTER),
         KEYVAL(0, 1, KEY_HELP),
@@ -158,7 +158,7 @@ static struct platform_device bf54x_kpad_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <asm/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -190,7 +190,7 @@ static struct platform_device bfin_rotary_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X)
 #include <linux/input/adxl34x.h>
 static const struct adxl34x_platform_data adxl34x_info = {
         .x_axis_offset = 0,
@@ -229,14 +229,14 @@ static const struct adxl34x_platform_data adxl34x_info = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -491,7 +491,7 @@ static struct platform_device bfin_uart3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -594,7 +594,7 @@ static struct platform_device bfin_sir3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 
 static struct resource smsc911x_resources[] = {
@@ -629,7 +629,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xFFC03C00,
@@ -691,7 +691,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -830,7 +830,7 @@ static struct platform_device bfin_sport3_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 
 static unsigned short bfin_can0_peripherals[] = {
         P_CAN0_RX, P_CAN0_TX, 0
@@ -908,7 +908,7 @@ static struct platform_device bfin_can1_device = {
 
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
 static struct resource bfin_atapi_resources[] = {
         {
                 .start = 0xFFC03800,
@@ -930,7 +930,7 @@ static struct platform_device bfin_atapi_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "bootloader(nand)",
@@ -980,7 +980,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 
 static struct bfin_sd_host bfin_sdh_data = {
         .dma_chan = CH_SDH,
@@ -997,7 +997,7 @@ static struct platform_device bf54x_sdh_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -1045,8 +1045,7 @@ static struct platform_device ezkit_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 /* SPI flash chip (m25p16) */
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
@@ -1073,7 +1072,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -1495,8 +1494,7 @@ static struct platform_device bfin_gpj_device = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -1508,8 +1506,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1517,7 +1514,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = MAX_CTRL_CS + GPIO_PG6, /* SPI_SSEL2 */
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -1527,7 +1524,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select            = MAX_CTRL_CS + GPIO_PE5, /* SPI_SSEL2 */
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1535,7 +1532,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = MAX_CTRL_CS + GPIO_PE4, /* SPI_SSEL1 */
         },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_SPI)
         {
                 .modalias               = "adxl34x",
                 .platform_data          = &adxl34x_info,
@@ -1547,7 +1544,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 };
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -1620,8 +1617,7 @@ static struct platform_device bf54x_spi_master1 = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_capture.h>
 #include <media/blackfin/ppi.h>
@@ -1641,8 +1637,7 @@ static const struct ppi_info ppi_info = {
         .pin_req = ppi_req,
 };
 
-#if defined(CONFIG_VIDEO_VS6624) \
-        || defined(CONFIG_VIDEO_VS6624_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_VS6624)
 static struct v4l2_input vs6624_inputs[] = {
         {
                 .index = 0,
@@ -1687,7 +1682,7 @@ static struct platform_device bfin_capture_device = {
 };
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -1742,7 +1737,7 @@ static struct platform_device i2c_bfin_twi1_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
@@ -1751,25 +1746,25 @@ static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
 
 #if !defined(CONFIG_BF542)      /* The BF542 only has 1 TWI */
 static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
         },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                 .irq = 212,
         },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_I2C) || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_I2C)
         {
                 I2C_BOARD_INFO("adxl34x", 0x53),
                 .irq = IRQ_PC5,
                 .platform_data = (void *)&adxl34x_info,
         },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
         {
                 I2C_BOARD_INFO("ad5252", 0x2f),
         },
@@ -1777,7 +1772,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -1828,8 +1823,8 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
-        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S) || \
+        IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 
 #define SPORT_REQ(x) \
         [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
@@ -1889,35 +1884,35 @@ static struct resource bfin_snd_resources[][4] = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
         .name = "bfin-i2s-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97_pcm = {
         .name = "bfin-ac97-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
 static struct platform_device bfin_ad73311_codec_device = {
         .name = "ad73311",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1980)
 static struct platform_device bfin_ad1980_codec_device = {
         .name = "ad1980",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -1929,7 +1924,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -1962,11 +1957,11 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &bfin_gpj_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -1981,7 +1976,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -1996,23 +1991,23 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
         &bf54x_lq043_device,
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
         &smsc911x_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -2027,72 +2022,71 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
         &bfin_can0_device,
         &bfin_can1_device,
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
         &bfin_atapi_device,
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
         &bf54x_sdh_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bf54x_spi_master0,
         &bf54x_spi_master1,
 #endif
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
         &bfin_capture_device,
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
         &bf54x_kpad_device,
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
         &bfin_rotary_device,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi0_device,
 #if !defined(CONFIG_BF542)
         &i2c_bfin_twi1_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1980)
         &bfin_ad1980_codec_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97,
 #endif
 };
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h
index 329b2c58228b..018ebfc27f5a 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF544.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h
@@ -601,36 +601,6 @@
 #define                  GU_TRANS  0xff00     /* Transparent Color - G/U Component */
 #define                  BV_TRANS  0xff0000   /* Transparent Color - B/V Component */
 
-/* Bit masks for HOST_CONTROL */
-
-#define                   HOST_EN  0x1        /* Host Enable */
-#define                  HOST_END  0x2        /* Host Endianess */
-#define                 DATA_SIZE  0x4        /* Data Size */
-#define                  HOST_RST  0x8        /* Host Reset */
-#define                  HRDY_OVR  0x20       /* Host Ready Override */
-#define                  INT_MODE  0x40       /* Interrupt Mode */
-#define                     BT_EN  0x80       /* Bus Timeout Enable */
-#define                       EHW  0x100      /* Enable Host Write */
-#define                       EHR  0x200      /* Enable Host Read */
-#define                       BDR  0x400      /* Burst DMA Requests */
-
-/* Bit masks for HOST_STATUS */
-
-#define                 DMA_READY  0x1        /* DMA Ready */
-#define                  FIFOFULL  0x2        /* FIFO Full */
-#define                 FIFOEMPTY  0x4        /* FIFO Empty */
-#define              DMA_COMPLETE  0x8        /* DMA Complete */
-#define                      HSHK  0x10       /* Host Handshake */
-#define                 HSTIMEOUT  0x20       /* Host Timeout */
-#define                      HIRQ  0x40       /* Host Interrupt Request */
-#define                ALLOW_CNFG  0x80       /* Allow New Configuration */
-#define                   DMA_DIR  0x100      /* DMA Direction */
-#define                       BTE  0x200      /* Bus Timeout Enabled */
-
-/* Bit masks for HOST_TIMEOUT */
-
-#define             COUNT_TIMEOUT  0x7ff      /* Host Timeout count */
-
 /* Bit masks for TIMER_ENABLE1 */
 
 #define                    TIMEN8  0x1        /* Timer 8 Enable */
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h
index e18de212ba1a..d55dcc0f5324 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF547.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h
@@ -581,36 +581,6 @@
 #define                  GU_TRANS  0xff00     /* Transparent Color - G/U Component */
 #define                  BV_TRANS  0xff0000   /* Transparent Color - B/V Component */
 
-/* Bit masks for HOST_CONTROL */
-
-#define                   HOST_EN  0x1        /* Host Enable */
-#define                  HOST_END  0x2        /* Host Endianess */
-#define                 DATA_SIZE  0x4        /* Data Size */
-#define                  HOST_RST  0x8        /* Host Reset */
-#define                  HRDY_OVR  0x20       /* Host Ready Override */
-#define                  INT_MODE  0x40       /* Interrupt Mode */
-#define                     BT_EN  0x80       /* Bus Timeout Enable */
-#define                       EHW  0x100      /* Enable Host Write */
-#define                       EHR  0x200      /* Enable Host Read */
-#define                       BDR  0x400      /* Burst DMA Requests */
-
-/* Bit masks for HOST_STATUS */
-
-#define                 DMA_READY  0x1        /* DMA Ready */
-#define                  FIFOFULL  0x2        /* FIFO Full */
-#define                 FIFOEMPTY  0x4        /* FIFO Empty */
-#define              DMA_COMPLETE  0x8        /* DMA Complete */
-#define                      HSHK  0x10       /* Host Handshake */
-#define                 HSTIMEOUT  0x20       /* Host Timeout */
-#define                      HIRQ  0x40       /* Host Interrupt Request */
-#define                ALLOW_CNFG  0x80       /* Allow New Configuration */
-#define                   DMA_DIR  0x100      /* DMA Direction */
-#define                       BTE  0x200      /* Bus Timeout Enabled */
-
-/* Bit masks for HOST_TIMEOUT */
-
-#define             COUNT_TIMEOUT  0x7ff      /* Host Timeout count */
-
 /* Bit masks for KPAD_CTL */
 
 #define                   KPAD_EN  0x1        /* Keypad Enable */
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 0b74218fdd3a..430b16d5ccb1 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -60,7 +60,7 @@
  */
 const char bfin_board_name[] = "Acvilon board";
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -137,7 +137,7 @@ static struct i2c_board_info acvilon_i2c_devs[] __initdata = {
          },
 };
 
-#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PLATRAM)
 static struct platdata_mtd_ram mtd_ram_data = {
         .mapname = "rootfs(RAM)",
         .bankwidth = 4,
@@ -160,7 +160,7 @@ static struct platform_device mtd_ram_device = {
 };
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 static struct resource smsc911x_resources[] = {
         {
@@ -194,7 +194,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -246,7 +246,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_PLATFORM)
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
         {
@@ -323,7 +323,7 @@ static void bfin_plat_nand_init(void)
 }
 #endif
 
-#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
 static struct mtd_partition bfin_spi_dataflash_partitions[] = {
         {
          .name = "bootloader",
@@ -369,7 +369,7 @@ static struct bfin5xx_spi_chip data_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -408,7 +408,7 @@ static struct platform_device bfin_spi0_device = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
          .modalias = "spidev",
          .max_speed_hz = 3125000,       /* max spi clock (SCK) speed in HZ */
@@ -416,7 +416,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
          .chip_select = 3,
          },
 #endif
-#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE)
+#if IS_ENABLED(CONFIG_MTD_DATAFLASH)
         {                       /* DataFlash chip */
          .modalias = "mtd_dataflash",
          .max_speed_hz = 33250000,      /* max spi clock (SCK) speed in HZ */
@@ -472,11 +472,11 @@ static struct platform_device bfin_dpmc = {
 static struct platform_device *acvilon_devices[] __initdata = {
         &bfin_dpmc,
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -484,17 +484,17 @@ static struct platform_device *acvilon_devices[] __initdata = {
 
         &bfin_gpios_device,
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
         &smsc911x_device,
 #endif
 
         &bfin_i2c_pca_device,
 
-#if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_PLATFORM)
         &bfin_async_nand_device,
 #endif
 
-#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PLATRAM)
         &mtd_ram_device,
 #endif
 
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index d81450f635df..9f777df4cacc 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -13,7 +13,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 #endif
 #include <linux/ata_platform.h>
@@ -29,10 +29,10 @@
  */
 const char bfin_board_name[] = "Bluetechnix CM BF561";
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader(spi)",
@@ -64,7 +64,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -77,7 +77,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         },
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -85,7 +85,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select = 4,
         },
 #endif
-#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
+#if IS_ENABLED(CONFIG_MMC_SPI)
         {
                 .modalias = "mmc_spi",
                 .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
@@ -134,14 +134,14 @@ static struct platform_device bfin_spi0_device = {
 #endif  /* spi master and devices */
 
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
 static struct platform_device hitachi_fb_device = {
         .name = "hitachi-tx09",
 };
 #endif
 
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -173,7 +173,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 
 static struct resource smsc911x_resources[] = {
@@ -208,7 +208,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x24000000,
@@ -229,7 +229,7 @@ static struct platform_device net2272_bfin_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 static struct resource isp1362_hcd_resources[] = {
         {
                 .start = 0x24008000,
@@ -268,7 +268,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -319,7 +319,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -348,7 +348,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
 #define PATA_INT        IRQ_PF46
 
 static struct pata_platform_info bfin_pata_platform_data = {
@@ -385,7 +385,7 @@ static struct platform_device bfin_pata_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition para_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -456,54 +456,54 @@ static struct platform_device *cm_bf561_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
+#if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
         &hitachi_fb_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
         &smsc911x_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         &bfin_pata_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &para_flash_device,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PF46, "net2272");
@@ -523,11 +523,11 @@ static int __init cm_bf561_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __func__);
         platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices));
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_PATA_PLATFORM)
         irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
 #endif
 
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 92938e79b9e3..88dee43e7abe 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -25,7 +25,7 @@
  */
 const char bfin_board_name[] = "ADI BF561-EZKIT";
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -60,7 +60,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
 #include <linux/usb/isp1362.h>
 
 static struct resource isp1362_hcd_resources[] = {
@@ -101,7 +101,7 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
 static struct resource net2272_bfin_resources[] = {
         {
                 .start = 0x2C000000,
@@ -129,7 +129,7 @@ static struct platform_device net2272_bfin_device = {
  *  USB-LAN EzExtender board
  *  Driver needs to know address, irq and flag pin.
  */
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
 #include <linux/smc91x.h>
 
 static struct smc91x_platdata smc91x_info = {
@@ -163,7 +163,7 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -214,7 +214,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -243,7 +243,7 @@ static struct platform_device bfin_sir0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -291,7 +291,7 @@ static struct platform_device ezkit_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
         [0] = {
@@ -330,8 +330,7 @@ static struct platform_device bfin_spi0_device = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         {
                 .modalias = "ad183x",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -341,7 +340,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -351,7 +350,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -375,7 +374,7 @@ static struct platform_device bfin_device_gpiokeys = {
 };
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
 #include <linux/i2c-gpio.h>
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
@@ -422,8 +421,7 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_capture.h>
 #include <media/blackfin/ppi.h>
@@ -443,8 +441,7 @@ static const struct ppi_info ppi_info = {
         .pin_req = ppi_req,
 };
 
-#if defined(CONFIG_VIDEO_ADV7183) \
-        || defined(CONFIG_VIDEO_ADV7183_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_ADV7183)
 #include <media/adv7183.h>
 static struct v4l2_input adv7183_inputs[] = {
         {
@@ -515,7 +512,7 @@ static struct platform_device bfin_capture_device = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -523,7 +520,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -531,8 +528,7 @@ static struct platform_device bfin_ac97 = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
 static const char * const ad1836_link[] = {
         "bfin-i2s.0",
         "spi0.4",
@@ -550,72 +546,70 @@ static struct platform_device *ezkit_devices[] __initdata = {
 
         &bfin_dpmc,
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         &smc91x_device,
 #endif
 
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         &net2272_bfin_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
         &bfin_spi0_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_I2C_GPIO)
         &i2c_gpio_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
         &isp1362_hcd_device,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device,
 #endif
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
         &bfin_capture_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
         &bfin_ac97,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         &bfin_ad1836_machine,
 #endif
 };
 
 static int __init net2272_init(void)
 {
-#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+#if IS_ENABLED(CONFIG_USB_NET2272)
         int ret;
 
         ret = gpio_request(GPIO_PF11, "net2272");
@@ -641,12 +635,12 @@ static int __init ezkit_init(void)
         if (ret < 0)
                 return ret;
 
-#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#if IS_ENABLED(CONFIG_SMC91X)
         bfin_write_FIO0_DIR(bfin_read_FIO0_DIR() | (1 << 12));
         SSYNC();
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
         bfin_write_FIO0_DIR(bfin_read_FIO0_DIR() | (1 << 15));
         bfin_write_FIO0_FLAG_S(1 << 15);
         SSYNC();
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c
index 1a57bc986aad..f87b8cc0cd4c 100644
--- a/arch/blackfin/mach-bf561/boards/tepla.c
+++ b/arch/blackfin/mach-bf561/boards/tepla.c
@@ -42,7 +42,7 @@ static struct platform_device smc91x_device = {
         .resource      = smc91x_resources,
 };
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -93,7 +93,7 @@ static struct platform_device bfin_uart0_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -125,13 +125,13 @@ static struct platform_device bfin_sir0_device = {
 static struct platform_device *tepla_devices[] __initdata = {
         &smc91x_device,
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 8de8bc690b36..943f7e95ec15 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -39,7 +39,7 @@ const char bfin_board_name[] = "ADI BF609-EZKIT";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
         [0] = {
@@ -74,7 +74,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
 #include <asm/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
@@ -105,7 +105,7 @@ static struct platform_device bfin_rotary_device = {
 };
 #endif
 
-#if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE)
+#if IS_ENABLED(CONFIG_STMMAC_ETH)
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 
@@ -159,7 +159,7 @@ static struct platform_device bfin_eth_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X)
 #include <linux/input/adxl34x.h>
 static const struct adxl34x_platform_data adxl34x_info = {
         .x_axis_offset = 0,
@@ -198,14 +198,14 @@ static const struct adxl34x_platform_data adxl34x_info = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
         .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
         {
@@ -355,7 +355,7 @@ static struct platform_device bfin_uart1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
         {
@@ -408,7 +408,7 @@ static struct platform_device bfin_sir1_device = {
 #endif
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
         [0] = {
                 .start  = 0xFFCC1000,
@@ -464,7 +464,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
         {
@@ -569,7 +569,7 @@ static struct platform_device bfin_sport2_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 
 static unsigned short bfin_can0_peripherals[] = {
         P_CAN0_RX, P_CAN0_TX, 0
@@ -610,7 +610,7 @@ static struct platform_device bfin_can0_device = {
 
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
         {
                 .name = "bootloader(nand)",
@@ -660,7 +660,7 @@ static struct platform_device bfin_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 
 static struct bfin_sd_host bfin_sdh_data = {
         .dma_chan = CH_RSI,
@@ -677,7 +677,7 @@ static struct platform_device bfin_sdh_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "bootloader(nor)",
@@ -741,8 +741,7 @@ static struct platform_device ezkit_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 /* SPI flash chip (w25q32) */
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
@@ -773,21 +772,20 @@ static struct bfin_spi3_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
 static struct bfin_spi3_chip spidev_chip_info = {
         .enable_dma = true,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
         .name = "bfin-i2s-pcm-audio",
         .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF6XX_SOC_I2S) || \
-        defined(CONFIG_SND_BF6XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF6XX_SOC_I2S)
 #include <asm/bfin_sport3.h>
 static struct resource bfin_snd_resources[] = {
         {
@@ -841,8 +839,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
-                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
 static const char * const ad1836_link[] = {
         "bfin-i2s.0",
         "spi0.76",
@@ -856,14 +853,13 @@ static struct platform_device bfin_ad1836_machine = {
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61)
 static struct platform_device adau1761_device = {
         .name = "bfin-eval-adau1x61",
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_ADAU1761) || defined(CONFIG_SND_SOC_ADAU1761_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1761)
 #include <sound/adau17x1.h>
 static struct adau1761_platform_data adau1761_info = {
         .lineout_mode = ADAU1761_OUTPUT_MODE_LINE,
@@ -871,8 +867,7 @@ static struct adau1761_platform_data adau1761_info = {
 };
 #endif
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_capture.h>
 #include <media/blackfin/ppi.h>
@@ -882,7 +877,7 @@ static const unsigned short ppi_req[] = {
         P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7,
         P_PPI0_D8, P_PPI0_D9, P_PPI0_D10, P_PPI0_D11,
         P_PPI0_D12, P_PPI0_D13, P_PPI0_D14, P_PPI0_D15,
-#if !defined(CONFIG_VIDEO_VS6624) && !defined(CONFIG_VIDEO_VS6624_MODULE)
+#if !IS_ENABLED(CONFIG_VIDEO_VS6624)
         P_PPI0_D16, P_PPI0_D17, P_PPI0_D18, P_PPI0_D19,
         P_PPI0_D20, P_PPI0_D21, P_PPI0_D22, P_PPI0_D23,
 #endif
@@ -898,8 +893,7 @@ static const struct ppi_info ppi_info = {
         .pin_req = ppi_req,
 };
 
-#if defined(CONFIG_VIDEO_VS6624) \
-        || defined(CONFIG_VIDEO_VS6624_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_VS6624)
 static struct v4l2_input vs6624_inputs[] = {
         {
                 .index = 0,
@@ -936,8 +930,7 @@ static struct bfin_capture_config bfin_capture_data = {
 };
 #endif
 
-#if defined(CONFIG_VIDEO_ADV7842) \
-        || defined(CONFIG_VIDEO_ADV7842_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_ADV7842)
 #include <media/adv7842.h>
 
 static struct v4l2_input adv7842_inputs[] = {
@@ -1067,8 +1060,7 @@ static struct platform_device bfin_capture_device = {
 };
 #endif
 
-#if defined(CONFIG_VIDEO_BLACKFIN_DISPLAY) \
-        || defined(CONFIG_VIDEO_BLACKFIN_DISPLAY_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_DISPLAY)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_display.h>
 #include <media/blackfin/ppi.h>
@@ -1090,8 +1082,7 @@ static const struct ppi_info ppi_info = {
         .pin_req = ppi_req_disp,
 };
 
-#if defined(CONFIG_VIDEO_ADV7511) \
-        || defined(CONFIG_VIDEO_ADV7511_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_ADV7511)
 #include <media/adv7511.h>
 
 static struct v4l2_output adv7511_outputs[] = {
@@ -1313,7 +1304,7 @@ static struct platform_device bfin_crypto_crc_device = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
         .model                  = 7877,
         .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -1679,7 +1670,7 @@ static struct platform_device bfin_gpg_device = {
 
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
@@ -1702,8 +1693,7 @@ static struct platform_device bfin_device_gpiokeys = {
 #endif
 
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-        || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
@@ -1715,7 +1705,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
         {
                 .modalias               = "ad7877",
                 .platform_data          = &bfin_ad7877_ts_info,
@@ -1725,7 +1715,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .chip_select            = MAX_CTRL_CS + GPIO_PC15, /* SPI_SSEL4 */
         },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
         {
                 .modalias = "spidev",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -1734,7 +1724,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .controller_data = &spidev_chip_info,
         },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_SPI)
         {
                 .modalias               = "adxl34x",
                 .platform_data          = &adxl34x_info,
@@ -1818,7 +1808,7 @@ static struct platform_device bf60x_spi_master1 = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -1871,20 +1861,20 @@ static struct platform_device i2c_bfin_twi1_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
-#if defined(CONFIG_INPUT_ADXL34X_I2C) || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_I2C)
         {
                 I2C_BOARD_INFO("adxl34x", 0x53),
                 .irq = IRQ_PC5,
                 .platform_data = (void *)&adxl34x_info,
         },
 #endif
-#if defined(CONFIG_SND_SOC_ADAU1761) || defined(CONFIG_SND_SOC_ADAU1761_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_ADAU1761)
         {
                 I2C_BOARD_INFO("adau1761", 0x38),
                 .platform_data = (void *)&adau1761_info
         },
 #endif
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
         {
                 I2C_BOARD_INFO("ssm2602", 0x1b),
         },
@@ -1942,11 +1932,11 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &bfin_gpg_device,
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
         &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
         &bfin_uart0_device,
 #endif
@@ -1955,7 +1945,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
         &bfin_sir0_device,
 #endif
@@ -1964,19 +1954,19 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE)
+#if IS_ENABLED(CONFIG_STMMAC_ETH)
         &bfin_eth_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
         &musb_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
         &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
         &bfin_sport0_uart_device,
 #endif
@@ -1988,15 +1978,15 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
         &bfin_can0_device,
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
         &bfin_nand_device,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
         &bfin_sdh_device,
 #endif
 
@@ -2005,11 +1995,11 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &bf60x_spi_master1,
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
         &bfin_rotary_device,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
         &i2c_bfin_twi0_device,
 #if !defined(CONFIG_BF542)
         &i2c_bfin_twi1_device,
@@ -2024,34 +2014,29 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &bfin_crypto_crc_device,
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
         &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
         &ezkit_flash_device,
 #endif
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
         &bfin_i2s_pcm,
 #endif
-#if defined(CONFIG_SND_BF6XX_SOC_I2S) || \
-        defined(CONFIG_SND_BF6XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF6XX_SOC_I2S)
         &bfin_i2s,
 #endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
-        defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1836)
         &bfin_ad1836_machine,
 #endif
-#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61) || \
-        defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61)
         &adau1761_device,
 #endif
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-        || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
         &bfin_capture_device,
 #endif
-#if defined(CONFIG_VIDEO_BLACKFIN_DISPLAY) \
-        || defined(CONFIG_VIDEO_BLACKFIN_DISPLAY_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_DISPLAY)
         &bfin_display_device,
 #endif
 
@@ -2075,9 +2060,9 @@ static struct pinctrl_map __initdata bfin_pinmux_map[] = {
         PIN_MAP_MUX_GROUP_DEFAULT("physmap-flash.0",  "pinctrl-adi2.0", NULL, "smc0"),
         PIN_MAP_MUX_GROUP_DEFAULT("bf609_nl8048.2",  "pinctrl-adi2.0", NULL, "ppi2_16b"),
         PIN_MAP_MUX_GROUP_DEFAULT("bfin_display.0",  "pinctrl-adi2.0", NULL, "ppi0_16b"),
-#if defined(CONFIG_VIDEO_MT9M114) || defined(CONFIG_VIDEO_MT9M114_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_MT9M114)
         PIN_MAP_MUX_GROUP_DEFAULT("bfin_capture.0",  "pinctrl-adi2.0", NULL, "ppi0_8b"),
-#elif defined(CONFIG_VIDEO_VS6624) || defined(CONFIG_VIDEO_VS6624_MODULE)
+#elif IS_ENABLED(CONFIG_VIDEO_VS6624)
         PIN_MAP_MUX_GROUP_DEFAULT("bfin_capture.0",  "pinctrl-adi2.0", NULL, "ppi0_16b"),
 #else
         PIN_MAP_MUX_GROUP_DEFAULT("bfin_capture.0",  "pinctrl-adi2.0", NULL, "ppi0_24b"),
diff --git a/arch/blackfin/mach-bf609/clock.c b/arch/blackfin/mach-bf609/clock.c
index 13644ed25489..56200f37cfc8 100644
--- a/arch/blackfin/mach-bf609/clock.c
+++ b/arch/blackfin/mach-bf609/clock.c
@@ -73,24 +73,6 @@ static void clk_reg_write_mask(u32 reg, uint32_t val, uint32_t mask)
         bfin_write32(reg, val2);
 }
 
-static void clk_reg_set_bits(u32 reg, uint32_t mask)
-{
-        u32 val;
-
-        val = bfin_read32(reg);
-        val |= mask;
-        bfin_write32(reg, val);
-}
-
-static void clk_reg_clear_bits(u32 reg, uint32_t mask)
-{
-        u32 val;
-
-        val = bfin_read32(reg);
-        val &= ~mask;
-        bfin_write32(reg, val);
-}
-
 int wait_for_pll_align(void)
 {
         int i = 10000;
diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c
index ad505d9db4a8..0cdd6955c7be 100644
--- a/arch/blackfin/mach-bf609/pm.c
+++ b/arch/blackfin/mach-bf609/pm.c
@@ -210,7 +210,7 @@ void bf609_cpu_pm_enter(suspend_state_t state)
 
 #ifdef CONFIG_PM_BFIN_WAKE_PB15
         wakeup |= PB15WE;
-# if CONFIG_PM_BFIN_WAKE_PA15_POL
+# if CONFIG_PM_BFIN_WAKE_PB15_POL
         wakeup_pol |= PB15WE;
 # endif
 #endif
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 1325c3bc58e1..12c3afee0f6f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -45,6 +45,7 @@ config IA64
         select HAVE_MOD_ARCH_SPECIFIC
         select MODULES_USE_ELF_RELA
         select ARCH_USE_CMPXCHG_LOCKREF
+        select HAVE_ARCH_AUDITSYSCALL
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 79b9bcdfe498..9ae08541e30d 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -1,38 +1,38 @@
 config MICROBLAZE
         def_bool y
         select ARCH_MIGHT_HAVE_PC_PARPORT
-        select HAVE_MEMBLOCK
-        select HAVE_MEMBLOCK_NODE_MAP
-        select HAVE_FUNCTION_TRACER
-        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-        select HAVE_FUNCTION_GRAPH_TRACER
-        select HAVE_DYNAMIC_FTRACE
-        select HAVE_FTRACE_MCOUNT_RECORD
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select HAVE_OPROFILE
-        select HAVE_ARCH_KGDB
-        select HAVE_DMA_ATTRS
-        select HAVE_DMA_API_DEBUG
-        select TRACING_SUPPORT
-        select OF
-        select OF_EARLY_FLATTREE
         select ARCH_WANT_IPC_PARSE_VERSION
-        select HAVE_DEBUG_KMEMLEAK
-        select IRQ_DOMAIN
-        select VIRT_TO_BUS
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select BUILDTIME_EXTABLE_SORT
+        select CLKSRC_OF
+        select CLONE_BACKWARDS3
+        select COMMON_CLK
+        select GENERIC_ATOMIC64
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_CPU_DEVICES
+        select GENERIC_IDLE_POLL_SETUP
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
-        select GENERIC_CPU_DEVICES
-        select GENERIC_ATOMIC64
-        select GENERIC_CLOCKEVENTS
-        select COMMON_CLK
         select GENERIC_SCHED_CLOCK
-        select GENERIC_IDLE_POLL_SETUP
+        select HAVE_ARCH_KGDB
+        select HAVE_DEBUG_KMEMLEAK
+        select HAVE_DMA_API_DEBUG
+        select HAVE_DMA_ATTRS
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_FUNCTION_GRAPH_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_FUNCTION_TRACER
+        select HAVE_MEMBLOCK
+        select HAVE_MEMBLOCK_NODE_MAP
+        select HAVE_OPROFILE
+        select IRQ_DOMAIN
         select MODULES_USE_ELF_RELA
-        select CLONE_BACKWARDS3
-        select CLKSRC_OF
-        select BUILDTIME_EXTABLE_SORT
+        select OF
+        select OF_EARLY_FLATTREE
+        select TRACING_SUPPORT
+        select VIRT_TO_BUS
 
 config SWAP
         def_bool n
@@ -74,7 +74,7 @@ source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
 
-source "arch/microblaze/platform/Kconfig.platform"
+source "arch/microblaze/Kconfig.platform"
 
 menu "Processor type and features"
 
diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/Kconfig.platform
index db1aa5c22cea..1b3d8c849101 100644
--- a/arch/microblaze/platform/Kconfig.platform
+++ b/arch/microblaze/Kconfig.platform
@@ -5,18 +5,6 @@
 #
 
 menu "Platform options"
-choice
-        prompt "Platform"
-        default PLATFORM_MICROBLAZE_AUTO
-        help
-          Choose which hardware board/platform you are targeting.
-
-config PLATFORM_GENERIC
-        bool "Generic"
-        help
-          Choose this option for the Generic platform.
-
-endchoice
 
 config OPT_LIB_FUNCTION
         bool "Optimalized lib function"
@@ -37,8 +25,45 @@ config OPT_LIB_ASM
           Allows turn on optimalized library function (memcpy and memmove).
           Function are written in asm code.
 
-if PLATFORM_GENERIC=y
-        source "arch/microblaze/platform/generic/Kconfig.auto"
-endif
+# Definitions for MICROBLAZE0
+comment "Definitions for MICROBLAZE0"
+
+config KERNEL_BASE_ADDR
+        hex "Physical address where Linux Kernel is"
+        default "0x90000000"
+        help
+          BASE Address for kernel
+
+config XILINX_MICROBLAZE0_FAMILY
+        string "Targeted FPGA family"
+        default "virtex5"
+
+config XILINX_MICROBLAZE0_USE_MSR_INSTR
+        int "USE_MSR_INSTR range (0:1)"
+        default 0
+
+config XILINX_MICROBLAZE0_USE_PCMP_INSTR
+        int "USE_PCMP_INSTR range (0:1)"
+        default 0
+
+config XILINX_MICROBLAZE0_USE_BARREL
+        int "USE_BARREL range (0:1)"
+        default 0
+
+config XILINX_MICROBLAZE0_USE_DIV
+        int "USE_DIV range (0:1)"
+        default 0
+
+config XILINX_MICROBLAZE0_USE_HW_MUL
+        int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
+        default 0
+
+config XILINX_MICROBLAZE0_USE_FPU
+        int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
+        default 0
+
+config XILINX_MICROBLAZE0_HW_VER
+        string "Core version number"
+        default 7.10.d
 
 endmenu
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index a69eaf2ab130..740f2b82a182 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -48,7 +48,6 @@ head-y := arch/microblaze/kernel/head.o
 libs-y += arch/microblaze/lib/
 core-y += arch/microblaze/kernel/
 core-y += arch/microblaze/mm/
-core-y += arch/microblaze/platform/
 core-$(CONFIG_PCI) += arch/microblaze/pci/
 
 drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/
diff --git a/arch/microblaze/boot/dts/system.dts b/arch/microblaze/boot/dts/system.dts
index 7cb657892f21..b620da23febb 120000..100644
--- a/arch/microblaze/boot/dts/system.dts
+++ b/arch/microblaze/boot/dts/system.dts
@@ -1 +1,366 @@
-../../platform/generic/system.dts
\ No newline at end of file
+/*
+ * Device Tree Generator version: 1.1
+ *
+ * (C) Copyright 2007-2008 Xilinx, Inc.
+ * (C) Copyright 2007-2009 Michal Simek
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * CAUTION: This file is automatically generated by libgen.
+ * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
+ *
+ * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
+ */
+
+/dts-v1/;
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "xlnx,microblaze";
+        hard-reset-gpios = <&LEDs_8Bit 2 1>;
+        model = "testing";
+        DDR2_SDRAM: memory@90000000 {
+                device_type = "memory";
+                reg = < 0x90000000 0x10000000 >;
+        } ;
+        aliases {
+                ethernet0 = &Hard_Ethernet_MAC;
+                serial0 = &RS232_Uart_1;
+        } ;
+        chosen {
+                bootargs = "console=ttyUL0,115200 highres=on";
+                linux,stdout-path = "/plb@0/serial@84000000";
+        } ;
+        cpus {
+                #address-cells = <1>;
+                #cpus = <0x1>;
+                #size-cells = <0>;
+                microblaze_0: cpu@0 {
+                        clock-frequency = <125000000>;
+                        compatible = "xlnx,microblaze-7.10.d";
+                        d-cache-baseaddr = <0x90000000>;
+                        d-cache-highaddr = <0x9fffffff>;
+                        d-cache-line-size = <0x10>;
+                        d-cache-size = <0x2000>;
+                        device_type = "cpu";
+                        i-cache-baseaddr = <0x90000000>;
+                        i-cache-highaddr = <0x9fffffff>;
+                        i-cache-line-size = <0x10>;
+                        i-cache-size = <0x2000>;
+                        model = "microblaze,7.10.d";
+                        reg = <0>;
+                        timebase-frequency = <125000000>;
+                        xlnx,addr-tag-bits = <0xf>;
+                        xlnx,allow-dcache-wr = <0x1>;
+                        xlnx,allow-icache-wr = <0x1>;
+                        xlnx,area-optimized = <0x0>;
+                        xlnx,cache-byte-size = <0x2000>;
+                        xlnx,d-lmb = <0x1>;
+                        xlnx,d-opb = <0x0>;
+                        xlnx,d-plb = <0x1>;
+                        xlnx,data-size = <0x20>;
+                        xlnx,dcache-addr-tag = <0xf>;
+                        xlnx,dcache-always-used = <0x1>;
+                        xlnx,dcache-byte-size = <0x2000>;
+                        xlnx,dcache-line-len = <0x4>;
+                        xlnx,dcache-use-fsl = <0x1>;
+                        xlnx,debug-enabled = <0x1>;
+                        xlnx,div-zero-exception = <0x1>;
+                        xlnx,dopb-bus-exception = <0x0>;
+                        xlnx,dynamic-bus-sizing = <0x1>;
+                        xlnx,edge-is-positive = <0x1>;
+                        xlnx,family = "virtex5";
+                        xlnx,endianness = <0x1>;
+                        xlnx,fpu-exception = <0x1>;
+                        xlnx,fsl-data-size = <0x20>;
+                        xlnx,fsl-exception = <0x0>;
+                        xlnx,fsl-links = <0x0>;
+                        xlnx,i-lmb = <0x1>;
+                        xlnx,i-opb = <0x0>;
+                        xlnx,i-plb = <0x1>;
+                        xlnx,icache-always-used = <0x1>;
+                        xlnx,icache-line-len = <0x4>;
+                        xlnx,icache-use-fsl = <0x1>;
+                        xlnx,ill-opcode-exception = <0x1>;
+                        xlnx,instance = "microblaze_0";
+                        xlnx,interconnect = <0x1>;
+                        xlnx,interrupt-is-edge = <0x0>;
+                        xlnx,iopb-bus-exception = <0x0>;
+                        xlnx,mmu-dtlb-size = <0x4>;
+                        xlnx,mmu-itlb-size = <0x2>;
+                        xlnx,mmu-tlb-access = <0x3>;
+                        xlnx,mmu-zones = <0x10>;
+                        xlnx,number-of-pc-brk = <0x1>;
+                        xlnx,number-of-rd-addr-brk = <0x0>;
+                        xlnx,number-of-wr-addr-brk = <0x0>;
+                        xlnx,opcode-0x0-illegal = <0x1>;
+                        xlnx,pvr = <0x2>;
+                        xlnx,pvr-user1 = <0x0>;
+                        xlnx,pvr-user2 = <0x0>;
+                        xlnx,reset-msr = <0x0>;
+                        xlnx,sco = <0x0>;
+                        xlnx,unaligned-exceptions = <0x1>;
+                        xlnx,use-barrel = <0x1>;
+                        xlnx,use-dcache = <0x1>;
+                        xlnx,use-div = <0x1>;
+                        xlnx,use-ext-brk = <0x1>;
+                        xlnx,use-ext-nm-brk = <0x1>;
+                        xlnx,use-extended-fsl-instr = <0x0>;
+                        xlnx,use-fpu = <0x2>;
+                        xlnx,use-hw-mul = <0x2>;
+                        xlnx,use-icache = <0x1>;
+                        xlnx,use-interrupt = <0x1>;
+                        xlnx,use-mmu = <0x3>;
+                        xlnx,use-msr-instr = <0x1>;
+                        xlnx,use-pcmp-instr = <0x1>;
+                } ;
+        } ;
+        mb_plb: plb@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
+                ranges ;
+                FLASH: flash@a0000000 {
+                        bank-width = <2>;
+                        compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
+                        reg = < 0xa0000000 0x2000000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,include-datawidth-matching-0 = <0x1>;
+                        xlnx,include-datawidth-matching-1 = <0x0>;
+                        xlnx,include-datawidth-matching-2 = <0x0>;
+                        xlnx,include-datawidth-matching-3 = <0x0>;
+                        xlnx,include-negedge-ioregs = <0x0>;
+                        xlnx,include-plb-ipif = <0x1>;
+                        xlnx,include-wrbuf = <0x1>;
+                        xlnx,max-mem-width = <0x10>;
+                        xlnx,mch-native-dwidth = <0x20>;
+                        xlnx,mch-plb-clk-period-ps = <0x1f40>;
+                        xlnx,mch-splb-awidth = <0x20>;
+                        xlnx,mch0-accessbuf-depth = <0x10>;
+                        xlnx,mch0-protocol = <0x0>;
+                        xlnx,mch0-rddatabuf-depth = <0x10>;
+                        xlnx,mch1-accessbuf-depth = <0x10>;
+                        xlnx,mch1-protocol = <0x0>;
+                        xlnx,mch1-rddatabuf-depth = <0x10>;
+                        xlnx,mch2-accessbuf-depth = <0x10>;
+                        xlnx,mch2-protocol = <0x0>;
+                        xlnx,mch2-rddatabuf-depth = <0x10>;
+                        xlnx,mch3-accessbuf-depth = <0x10>;
+                        xlnx,mch3-protocol = <0x0>;
+                        xlnx,mch3-rddatabuf-depth = <0x10>;
+                        xlnx,mem0-width = <0x10>;
+                        xlnx,mem1-width = <0x20>;
+                        xlnx,mem2-width = <0x20>;
+                        xlnx,mem3-width = <0x20>;
+                        xlnx,num-banks-mem = <0x1>;
+                        xlnx,num-channels = <0x0>;
+                        xlnx,priority-mode = <0x0>;
+                        xlnx,synch-mem-0 = <0x0>;
+                        xlnx,synch-mem-1 = <0x0>;
+                        xlnx,synch-mem-2 = <0x0>;
+                        xlnx,synch-mem-3 = <0x0>;
+                        xlnx,synch-pipedelay-0 = <0x2>;
+                        xlnx,synch-pipedelay-1 = <0x2>;
+                        xlnx,synch-pipedelay-2 = <0x2>;
+                        xlnx,synch-pipedelay-3 = <0x2>;
+                        xlnx,tavdv-ps-mem-0 = <0x1adb0>;
+                        xlnx,tavdv-ps-mem-1 = <0x3a98>;
+                        xlnx,tavdv-ps-mem-2 = <0x3a98>;
+                        xlnx,tavdv-ps-mem-3 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-0 = <0x1adb0>;
+                        xlnx,tcedv-ps-mem-1 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-2 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-3 = <0x3a98>;
+                        xlnx,thzce-ps-mem-0 = <0x88b8>;
+                        xlnx,thzce-ps-mem-1 = <0x1b58>;
+                        xlnx,thzce-ps-mem-2 = <0x1b58>;
+                        xlnx,thzce-ps-mem-3 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-0 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-1 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-2 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-3 = <0x1b58>;
+                        xlnx,tlzwe-ps-mem-0 = <0x88b8>;
+                        xlnx,tlzwe-ps-mem-1 = <0x0>;
+                        xlnx,tlzwe-ps-mem-2 = <0x0>;
+                        xlnx,tlzwe-ps-mem-3 = <0x0>;
+                        xlnx,twc-ps-mem-0 = <0x2af8>;
+                        xlnx,twc-ps-mem-1 = <0x3a98>;
+                        xlnx,twc-ps-mem-2 = <0x3a98>;
+                        xlnx,twc-ps-mem-3 = <0x3a98>;
+                        xlnx,twp-ps-mem-0 = <0x11170>;
+                        xlnx,twp-ps-mem-1 = <0x2ee0>;
+                        xlnx,twp-ps-mem-2 = <0x2ee0>;
+                        xlnx,twp-ps-mem-3 = <0x2ee0>;
+                        xlnx,xcl0-linesize = <0x4>;
+                        xlnx,xcl0-writexfer = <0x1>;
+                        xlnx,xcl1-linesize = <0x4>;
+                        xlnx,xcl1-writexfer = <0x1>;
+                        xlnx,xcl2-linesize = <0x4>;
+                        xlnx,xcl2-writexfer = <0x1>;
+                        xlnx,xcl3-linesize = <0x4>;
+                        xlnx,xcl3-writexfer = <0x1>;
+                } ;
+                Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "xlnx,compound";
+                        ranges ;
+                        ethernet@81c00000 {
+                                compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
+                                interrupt-parent = <&xps_intc_0>;
+                                interrupts = < 5 2 >;
+                                llink-connected = <&PIM3>;
+                                local-mac-address = [ 00 0a 35 00 00 00 ];
+                                reg = < 0x81c00000 0x40 >;
+                                xlnx,bus2core-clk-ratio = <0x1>;
+                                xlnx,phy-type = <0x1>;
+                                xlnx,phyaddr = <0x1>;
+                                xlnx,rxcsum = <0x0>;
+                                xlnx,rxfifo = <0x1000>;
+                                xlnx,temac-type = <0x0>;
+                                xlnx,txcsum = <0x0>;
+                                xlnx,txfifo = <0x1000>;
+                        } ;
+                } ;
+                IIC_EEPROM: i2c@81600000 {
+                        compatible = "xlnx,xps-iic-2.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 6 2 >;
+                        reg = < 0x81600000 0x10000 >;
+                        xlnx,clk-freq = <0x7735940>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpo-width = <0x1>;
+                        xlnx,iic-freq = <0x186a0>;
+                        xlnx,scl-inertial-delay = <0x0>;
+                        xlnx,sda-inertial-delay = <0x0>;
+                        xlnx,ten-bit-adr = <0x0>;
+                } ;
+                LEDs_8Bit: gpio@81400000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 7 2 >;
+                        reg = < 0x81400000 0x10000 >;
+                        xlnx,all-inputs = <0x0>;
+                        xlnx,all-inputs-2 = <0x0>;
+                        xlnx,dout-default = <0x0>;
+                        xlnx,dout-default-2 = <0x0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <0x8>;
+                        xlnx,interrupt-present = <0x1>;
+                        xlnx,is-bidir = <0x1>;
+                        xlnx,is-bidir-2 = <0x1>;
+                        xlnx,is-dual = <0x0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                } ;
+
+                gpio-leds {
+                        compatible = "gpio-leds";
+
+                        heartbeat {
+                                label = "Heartbeat";
+                                gpios = <&LEDs_8Bit 4 1>;
+                                linux,default-trigger = "heartbeat";
+                        };
+
+                        yellow {
+                                label = "Yellow";
+                                gpios = <&LEDs_8Bit 5 1>;
+                        };
+
+                        red {
+                                label = "Red";
+                                gpios = <&LEDs_8Bit 6 1>;
+                        };
+
+                        green {
+                                label = "Green";
+                                gpios = <&LEDs_8Bit 7 1>;
+                        };
+                } ;
+                RS232_Uart_1: serial@84000000 {
+                        clock-frequency = <125000000>;
+                        compatible = "xlnx,xps-uartlite-1.00.a";
+                        current-speed = <115200>;
+                        device_type = "serial";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 8 0 >;
+                        port-number = <0>;
+                        reg = < 0x84000000 0x10000 >;
+                        xlnx,baudrate = <0x1c200>;
+                        xlnx,data-bits = <0x8>;
+                        xlnx,family = "virtex5";
+                        xlnx,odd-parity = <0x0>;
+                        xlnx,use-parity = <0x0>;
+                } ;
+                SysACE_CompactFlash: sysace@83600000 {
+                        compatible = "xlnx,xps-sysace-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 4 2 >;
+                        reg = < 0x83600000 0x10000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,mem-width = <0x10>;
+                } ;
+                debug_module: debug@84400000 {
+                        compatible = "xlnx,mdm-1.00.d";
+                        reg = < 0x84400000 0x10000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,interconnect = <0x1>;
+                        xlnx,jtag-chain = <0x2>;
+                        xlnx,mb-dbg-ports = <0x1>;
+                        xlnx,uart-width = <0x8>;
+                        xlnx,use-uart = <0x1>;
+                        xlnx,write-fsl-ports = <0x0>;
+                } ;
+                mpmc@90000000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "xlnx,mpmc-4.02.a";
+                        ranges ;
+                        PIM3: sdma@84600180 {
+                                compatible = "xlnx,ll-dma-1.00.a";
+                                interrupt-parent = <&xps_intc_0>;
+                                interrupts = < 2 2 1 2 >;
+                                reg = < 0x84600180 0x80 >;
+                        } ;
+                } ;
+                xps_intc_0: interrupt-controller@81800000 {
+                        #interrupt-cells = <0x2>;
+                        compatible = "xlnx,xps-intc-1.00.a";
+                        interrupt-controller ;
+                        reg = < 0x81800000 0x10000 >;
+                        xlnx,kind-of-intr = <0x100>;
+                        xlnx,num-intr-inputs = <0x9>;
+                } ;
+                xps_timer_1: timer@83c00000 {
+                        compatible = "xlnx,xps-timer-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 3 2 >;
+                        reg = < 0x83c00000 0x10000 >;
+                        xlnx,count-width = <0x20>;
+                        xlnx,family = "virtex5";
+                        xlnx,gen0-assert = <0x1>;
+                        xlnx,gen1-assert = <0x1>;
+                        xlnx,one-timer-only = <0x0>;
+                        xlnx,trig0-assert = <0x1>;
+                        xlnx,trig1-assert = <0x1>;
+                } ;
+        } ;
+}  ;
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 3fbb7f1db3bc..1e4c3329f62e 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -15,7 +15,6 @@
 #include <asm/page.h>
 #include <linux/types.h>
 #include <linux/mm.h>          /* Get struct page {...} */
-#include <asm-generic/iomap.h>
 
 #ifndef CONFIG_PCI
 #define _IO_BASE        0
@@ -25,211 +24,32 @@
 #define _IO_BASE        isa_io_base
 #define _ISA_MEM_BASE   isa_mem_base
 #define PCI_DRAM_OFFSET pci_dram_offset
-#endif
+struct pci_dev;
+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+#define pci_iounmap pci_iounmap
 
 extern unsigned long isa_io_base;
-extern unsigned long pci_io_base;
 extern unsigned long pci_dram_offset;
-
 extern resource_size_t isa_mem_base;
+#endif
 
+#define PCI_IOBASE      ((void __iomem *)_IO_BASE)
 #define IO_SPACE_LIMIT (0xFFFFFFFF)
 
-/* the following is needed to support PCI with some drivers */
-
-#define mmiowb()
-
-static inline unsigned char __raw_readb(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned char __force *)addr;
-}
-static inline unsigned short __raw_readw(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned short __force *)addr;
-}
-static inline unsigned int __raw_readl(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned int __force *)addr;
-}
-static inline unsigned long __raw_readq(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned long __force *)addr;
-}
-static inline void __raw_writeb(unsigned char v, volatile void __iomem *addr)
-{
-        *(volatile unsigned char __force *)addr = v;
-}
-static inline void __raw_writew(unsigned short v, volatile void __iomem *addr)
-{
-        *(volatile unsigned short __force *)addr = v;
-}
-static inline void __raw_writel(unsigned int v, volatile void __iomem *addr)
-{
-        *(volatile unsigned int __force *)addr = v;
-}
-static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
-{
-        *(volatile unsigned long __force *)addr = v;
-}
-
-/*
- * read (readb, readw, readl, readq) and write (writeb, writew,
- * writel, writeq) accessors are for PCI and thus little endian.
- * Linux 2.4 for Microblaze had this wrong.
- */
-static inline unsigned char readb(const volatile void __iomem *addr)
-{
-        return *(volatile unsigned char __force *)addr;
-}
-static inline unsigned short readw(const volatile void __iomem *addr)
-{
-        return le16_to_cpu(*(volatile unsigned short __force *)addr);
-}
-static inline unsigned int readl(const volatile void __iomem *addr)
-{
-        return le32_to_cpu(*(volatile unsigned int __force *)addr);
-}
-#define readq readq
-static inline u64 readq(const volatile void __iomem *addr)
-{
-        return le64_to_cpu(__raw_readq(addr));
-}
-static inline void writeb(unsigned char v, volatile void __iomem *addr)
-{
-        *(volatile unsigned char __force *)addr = v;
-}
-static inline void writew(unsigned short v, volatile void __iomem *addr)
-{
-        *(volatile unsigned short __force *)addr = cpu_to_le16(v);
-}
-static inline void writel(unsigned int v, volatile void __iomem *addr)
-{
-        *(volatile unsigned int __force *)addr = cpu_to_le32(v);
-}
-#define writeq(b, addr) __raw_writeq(cpu_to_le64(b), addr)
-
-/* ioread and iowrite variants. thease are for now same as __raw_
- * variants of accessors. we might check for endianess in the feature
- */
-#define ioread8(addr)           __raw_readb((u8 *)(addr))
-#define ioread16(addr)          __raw_readw((u16 *)(addr))
-#define ioread32(addr)          __raw_readl((u32 *)(addr))
-#define iowrite8(v, addr)       __raw_writeb((u8)(v), (u8 *)(addr))
-#define iowrite16(v, addr)      __raw_writew((u16)(v), (u16 *)(addr))
-#define iowrite32(v, addr)      __raw_writel((u32)(v), (u32 *)(addr))
-
-#define ioread16be(addr)        __raw_readw((u16 *)(addr))
-#define ioread32be(addr)        __raw_readl((u32 *)(addr))
-#define iowrite16be(v, addr)    __raw_writew((u16)(v), (u16 *)(addr))
-#define iowrite32be(v, addr)    __raw_writel((u32)(v), (u32 *)(addr))
-
-/* These are the definitions for the x86 IO instructions
- * inb/inw/inl/outb/outw/outl, the "string" versions
- * insb/insw/insl/outsb/outsw/outsl, and the "pausing" versions
- * inb_p/inw_p/...
- * The macros don't do byte-swapping.
- */
-#define inb(port)               readb((u8 *)((unsigned long)(port)))
-#define outb(val, port)         writeb((val), (u8 *)((unsigned long)(port)))
-#define inw(port)               readw((u16 *)((unsigned long)(port)))
-#define outw(val, port)         writew((val), (u16 *)((unsigned long)(port)))
-#define inl(port)               readl((u32 *)((unsigned long)(port)))
-#define outl(val, port)         writel((val), (u32 *)((unsigned long)(port)))
-
-#define inb_p(port)             inb((port))
-#define outb_p(val, port)       outb((val), (port))
-#define inw_p(port)             inw((port))
-#define outw_p(val, port)       outw((val), (port))
-#define inl_p(port)             inl((port))
-#define outl_p(val, port)       outl((val), (port))
-
-#define memset_io(a, b, c)      memset((void *)(a), (b), (c))
-#define memcpy_fromio(a, b, c)  memcpy((a), (void *)(b), (c))
-#define memcpy_toio(a, b, c)    memcpy((void *)(a), (b), (c))
-
 #ifdef CONFIG_MMU
-
-#define phys_to_virt(addr)      ((void *)__phys_to_virt(addr))
-#define virt_to_phys(addr)      ((unsigned long)__virt_to_phys(addr))
-#define virt_to_bus(addr)       ((unsigned long)__virt_to_phys(addr))
-
 #define page_to_bus(page)       (page_to_phys(page))
-#define bus_to_virt(addr)       (phys_to_virt(addr))
 
 extern void iounmap(void __iomem *addr);
-/*extern void *__ioremap(phys_addr_t address, unsigned long size,
-                unsigned long flags);*/
-extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
-#define ioremap_writethrough(addr, size) ioremap((addr), (size))
-#define ioremap_nocache(addr, size)      ioremap((addr), (size))
-#define ioremap_fullcache(addr, size)    ioremap((addr), (size))
-
-#else /* CONFIG_MMU */
-
-/**
- *      virt_to_phys - map virtual addresses to physical
- *      @address: address to remap
- *
- *      The returned physical address is the physical (CPU) mapping for
- *      the memory address given. It is only valid to use this function on
- *      addresses directly mapped or allocated via kmalloc.
- *
- *      This function does not give bus mappings for DMA transfers. In
- *      almost all conceivable cases a device driver should not be using
- *      this function
- */
-static inline unsigned long __iomem virt_to_phys(volatile void *address)
-{
-        return __pa((unsigned long)address);
-}
-
-#define virt_to_bus virt_to_phys
-
-/**
- *      phys_to_virt - map physical address to virtual
- *      @address: address to remap
- *
- *      The returned virtual address is a current CPU mapping for
- *      the memory address given. It is only valid to use this function on
- *      addresses that have a kernel mapping
- *
- *      This function does not handle bus mappings for DMA transfers. In
- *      almost all conceivable cases a device driver should not be using
- *      this function
- */
-static inline void *phys_to_virt(unsigned long address)
-{
-        return (void *)__va(address);
-}
 
-#define bus_to_virt(a) phys_to_virt(a)
-
-static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,
-                        unsigned long flags)
-{
-        return (void *)address;
-}
-
-#define ioremap(physaddr, size) ((void __iomem *)(unsigned long)(physaddr))
-#define iounmap(addr)           ((void)0)
-#define ioremap_nocache(physaddr, size) ioremap(physaddr, size)
+extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
+#define ioremap_writethrough(addr, size)        ioremap((addr), (size))
+#define ioremap_nocache(addr, size)             ioremap((addr), (size))
+#define ioremap_fullcache(addr, size)           ioremap((addr), (size))
+#define ioremap_wc(addr, size)                  ioremap((addr), (size))
 
 #endif /* CONFIG_MMU */
 
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-/*
- * Big Endian
- */
+/* Big Endian */
 #define out_be32(a, v) __raw_writel((v), (void __iomem __force *)(a))
 #define out_be16(a, v) __raw_writew((v), (a))
 
@@ -239,10 +59,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,
 #define writel_be(v, a) out_be32((__force unsigned *)a, v)
 #define readl_be(a)     in_be32((__force unsigned *)a)
 
-/*
- * Little endian
- */
-
+/* Little endian */
 #define out_le32(a, v) __raw_writel(__cpu_to_le32(v), (a))
 #define out_le16(a, v) __raw_writew(__cpu_to_le16(v), (a))
 
@@ -253,100 +70,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,
 #define out_8(a, v) __raw_writeb((v), (a))
 #define in_8(a) __raw_readb(a)
 
-#define mmiowb()
-
-#define ioport_map(port, nr)    ((void __iomem *)(port))
-#define ioport_unmap(addr)
-
-/* from asm-generic/io.h */
-#ifndef insb
-static inline void insb(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u8 *buf = buffer;
-                do {
-                        u8 x = inb(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-#endif
-
-#ifndef insw
-static inline void insw(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u16 *buf = buffer;
-                do {
-                        u16 x = inw(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-#endif
-
-#ifndef insl
-static inline void insl(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u32 *buf = buffer;
-                do {
-                        u32 x = inl(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-#endif
-
-#ifndef outsb
-static inline void outsb(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u8 *buf = buffer;
-                do {
-                        outb(*buf++, addr);
-                } while (--count);
-        }
-}
-#endif
-
-#ifndef outsw
-static inline void outsw(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u16 *buf = buffer;
-                do {
-                        outw(*buf++, addr);
-                } while (--count);
-        }
-}
-#endif
-
-#ifndef outsl
-static inline void outsl(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u32 *buf = buffer;
-                do {
-                        outl(*buf++, addr);
-                } while (--count);
-        }
-}
-#endif
-
-#define ioread8_rep(p, dst, count) \
-        insb((unsigned long) (p), (dst), (count))
-#define ioread16_rep(p, dst, count) \
-        insw((unsigned long) (p), (dst), (count))
-#define ioread32_rep(p, dst, count) \
-        insl((unsigned long) (p), (dst), (count))
-
-#define iowrite8_rep(p, src, count) \
-        outsb((unsigned long) (p), (src), (count))
-#define iowrite16_rep(p, src, count) \
-        outsw((unsigned long) (p), (src), (count))
-#define iowrite32_rep(p, src, count) \
-        outsl((unsigned long) (p), (src), (count))
+#include <asm-generic/io.h>
 
 #define readb_relaxed   readb
 #define readw_relaxed   readw
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index d6e0ffea28b6..9d31b057c355 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -122,7 +122,7 @@ struct thread_struct {
 }
 
 /* Free all resources held by a thread. */
-extern inline void release_thread(struct task_struct *dead_task)
+static inline void release_thread(struct task_struct *dead_task)
 {
 }
 
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
index f05df5630c84..be84a4d3917f 100644
--- a/arch/microblaze/include/asm/setup.h
+++ b/arch/microblaze/include/asm/setup.h
@@ -19,14 +19,12 @@ extern char cmd_line[COMMAND_LINE_SIZE];
 
 extern char *klimit;
 
-void early_printk(const char *fmt, ...);
-
 int setup_early_printk(char *opt);
 void remap_early_printk(void);
 void disable_early_printk(void);
 
-void heartbeat(void);
-void setup_heartbeat(void);
+void microblaze_heartbeat(void);
+void microblaze_setup_heartbeat(void);
 
 #   ifdef CONFIG_MMU
 extern void mmu_reset(void);
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h
index 20043b67d158..8d0791b49b31 100644
--- a/arch/microblaze/include/uapi/asm/unistd.h
+++ b/arch/microblaze/include/uapi/asm/unistd.h
@@ -93,7 +93,7 @@
 #define __NR_settimeofday       79 /* ok */
 #define __NR_getgroups          80 /* ok */
 #define __NR_setgroups          81 /* ok */
-#define __NR_select             82 /* obsolete -> sys_pselect7 */
+#define __NR_select             82 /* obsolete -> sys_pselect6 */
 #define __NR_symlink            83 /* symlinkat */
 #define __NR_oldlstat           84 /* remove */
 #define __NR_readlink           85 /* obsolete -> sys_readlinkat */
@@ -320,7 +320,7 @@
 #define __NR_readlinkat         305 /* ok */
 #define __NR_fchmodat           306 /* ok */
 #define __NR_faccessat          307 /* ok */
-#define __NR_pselect6           308 /* obsolete -> sys_pselect7 */
+#define __NR_pselect6           308 /* ok */
 #define __NR_ppoll              309 /* ok */
 #define __NR_unshare            310 /* ok */
 #define __NR_set_robust_list    311 /* ok */
@@ -396,5 +396,7 @@
 #define __NR_process_vm_writev  378
 #define __NR_kcmp               379
 #define __NR_finit_module       380
+#define __NR_sched_setattr      381
+#define __NR_sched_getattr      382
 
 #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile
index 5b0e512c78e5..08d50cc55e7d 100644
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@ -16,7 +16,7 @@ extra-y := head.o vmlinux.lds
 
 obj-y += dma.o exceptions.o \
         hw_exception_handler.o intc.o irq.o \
-        process.o prom.o prom_parse.o ptrace.o \
+        platform.o process.o prom.o prom_parse.o ptrace.o \
         reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
 
 obj-y += cpu/
diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c
index 1879a0527776..4643e3ab9414 100644
--- a/arch/microblaze/kernel/heartbeat.c
+++ b/arch/microblaze/kernel/heartbeat.c
@@ -17,7 +17,7 @@
 
 static unsigned int base_addr;
 
-void heartbeat(void)
+void microblaze_heartbeat(void)
 {
         static unsigned int cnt, period, dist;
 
@@ -42,7 +42,7 @@ void heartbeat(void)
         }
 }
 
-void setup_heartbeat(void)
+void microblaze_setup_heartbeat(void)
 {
         struct device_node *gpio = NULL;
         int *prop;
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 581451ad4687..15c7c12ea0e7 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -32,6 +32,29 @@ static void __iomem *intc_baseaddr;
 #define MER_ME (1<<0)
 #define MER_HIE (1<<1)
 
+static unsigned int (*read_fn)(void __iomem *);
+static void (*write_fn)(u32, void __iomem *);
+
+static void intc_write32(u32 val, void __iomem *addr)
+{
+        iowrite32(val, addr);
+}
+
+static unsigned int intc_read32(void __iomem *addr)
+{
+        return ioread32(addr);
+}
+
+static void intc_write32_be(u32 val, void __iomem *addr)
+{
+        iowrite32be(val, addr);
+}
+
+static unsigned int intc_read32_be(void __iomem *addr)
+{
+        return ioread32be(addr);
+}
+
 static void intc_enable_or_unmask(struct irq_data *d)
 {
         unsigned long mask = 1 << d->hwirq;
@@ -43,21 +66,21 @@ static void intc_enable_or_unmask(struct irq_data *d)
          * acks the irq before calling the interrupt handler
          */
         if (irqd_is_level_type(d))
-                out_be32(intc_baseaddr + IAR, mask);
+                write_fn(mask, intc_baseaddr + IAR);
 
-        out_be32(intc_baseaddr + SIE, mask);
+        write_fn(mask, intc_baseaddr + SIE);
 }
 
 static void intc_disable_or_mask(struct irq_data *d)
 {
         pr_debug("disable: %ld\n", d->hwirq);
-        out_be32(intc_baseaddr + CIE, 1 << d->hwirq);
+        write_fn(1 << d->hwirq, intc_baseaddr + CIE);
 }
 
 static void intc_ack(struct irq_data *d)
 {
         pr_debug("ack: %ld\n", d->hwirq);
-        out_be32(intc_baseaddr + IAR, 1 << d->hwirq);
+        write_fn(1 << d->hwirq, intc_baseaddr + IAR);
 }
 
 static void intc_mask_ack(struct irq_data *d)
@@ -65,8 +88,8 @@ static void intc_mask_ack(struct irq_data *d)
         unsigned long mask = 1 << d->hwirq;
 
         pr_debug("disable_and_ack: %ld\n", d->hwirq);
-        out_be32(intc_baseaddr + CIE, mask);
-        out_be32(intc_baseaddr + IAR, mask);
+        write_fn(mask, intc_baseaddr + CIE);
+        write_fn(mask, intc_baseaddr + IAR);
 }
 
 static struct irq_chip intc_dev = {
@@ -83,7 +106,7 @@ unsigned int get_irq(void)
 {
         unsigned int hwirq, irq = -1;
 
-        hwirq = in_be32(intc_baseaddr + IVR);
+        hwirq = read_fn(intc_baseaddr + IVR);
         if (hwirq != -1U)
                 irq = irq_find_mapping(root_domain, hwirq);
 
@@ -140,17 +163,25 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
         pr_info("%s: num_irq=%d, edge=0x%x\n",
                 intc->full_name, nr_irq, intr_mask);
 
+        write_fn = intc_write32;
+        read_fn = intc_read32;
+
         /*
          * Disable all external interrupts until they are
          * explicity requested.
          */
-        out_be32(intc_baseaddr + IER, 0);
+        write_fn(0, intc_baseaddr + IER);
 
         /* Acknowledge any pending interrupts just in case. */
-        out_be32(intc_baseaddr + IAR, 0xffffffff);
+        write_fn(0xffffffff, intc_baseaddr + IAR);
 
         /* Turn on the Master Enable. */
-        out_be32(intc_baseaddr + MER, MER_HIE | MER_ME);
+        write_fn(MER_HIE | MER_ME, intc_baseaddr + MER);
+        if (!(read_fn(intc_baseaddr + MER) & (MER_HIE | MER_ME))) {
+                write_fn = intc_write32_be;
+                read_fn = intc_read32_be;
+                write_fn(MER_HIE | MER_ME, intc_baseaddr + MER);
+        }
 
         /* Yeah, okay, casting the intr_mask to a void* is butt-ugly, but I'm
          * lazy and Michal can clean it up to something nicer when he tests
diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/kernel/platform.c
index b9529caa507a..b9529caa507a 100644
--- a/arch/microblaze/platform/platform.c
+++ b/arch/microblaze/kernel/platform.c
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 7d1a9c8b1f3d..b2dd37196b3b 100644
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -8,6 +8,7 @@
  * for more details.
  */
 
+#include <linux/cpu.h>
 #include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index d26d7e7a6913..49a07a4d76d0 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -216,7 +216,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 /* MS: I need add offset in page */
                 address += ((unsigned long)frame->tramp) & ~PAGE_MASK;
                 /* MS address is virtual */
-                address = virt_to_phys(address);
+                address = __virt_to_phys(address);
                 invalidate_icache_range(address, address + 8);
                 flush_dcache_range(address, address + 8);
         }
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index b882ad50535b..329dfbad810b 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -308,7 +308,7 @@ ENTRY(sys_call_table)
         .long sys_readlinkat            /* 305 */
         .long sys_fchmodat
         .long sys_faccessat
-        .long sys_ni_syscall /* pselect6 */
+        .long sys_pselect6
         .long sys_ppoll
         .long sys_unshare               /* 310 */
         .long sys_set_robust_list
@@ -363,8 +363,8 @@ ENTRY(sys_call_table)
         .long sys_sendmsg               /* 360 */
         .long sys_recvmsg
         .long sys_accept4
-        .long sys_ni_syscall
-        .long sys_ni_syscall
+        .long sys_preadv
+        .long sys_pwritev
         .long sys_rt_tgsigqueueinfo     /* 365 */
         .long sys_perf_event_open
         .long sys_recvmmsg
@@ -381,3 +381,5 @@ ENTRY(sys_call_table)
         .long sys_process_vm_writev
         .long sys_kcmp
         .long sys_finit_module
+        .long sys_sched_setattr
+        .long sys_sched_getattr
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index fb0c61443f19..dd96f0e4bfa2 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -43,10 +43,33 @@ static unsigned int timer_clock_freq;
 #define TCSR_PWMA       (1<<9)
 #define TCSR_ENALL      (1<<10)
 
+static unsigned int (*read_fn)(void __iomem *);
+static void (*write_fn)(u32, void __iomem *);
+
+static void timer_write32(u32 val, void __iomem *addr)
+{
+        iowrite32(val, addr);
+}
+
+static unsigned int timer_read32(void __iomem *addr)
+{
+        return ioread32(addr);
+}
+
+static void timer_write32_be(u32 val, void __iomem *addr)
+{
+        iowrite32be(val, addr);
+}
+
+static unsigned int timer_read32_be(void __iomem *addr)
+{
+        return ioread32be(addr);
+}
+
 static inline void xilinx_timer0_stop(void)
 {
-        out_be32(timer_baseaddr + TCSR0,
-                 in_be32(timer_baseaddr + TCSR0) & ~TCSR_ENT);
+        write_fn(read_fn(timer_baseaddr + TCSR0) & ~TCSR_ENT,
+                 timer_baseaddr + TCSR0);
 }
 
 static inline void xilinx_timer0_start_periodic(unsigned long load_val)
@@ -54,10 +77,10 @@ static inline void xilinx_timer0_start_periodic(unsigned long load_val)
         if (!load_val)
                 load_val = 1;
         /* loading value to timer reg */
-        out_be32(timer_baseaddr + TLR0, load_val);
+        write_fn(load_val, timer_baseaddr + TLR0);
 
         /* load the initial value */
-        out_be32(timer_baseaddr + TCSR0, TCSR_LOAD);
+        write_fn(TCSR_LOAD, timer_baseaddr + TCSR0);
 
         /* see timer data sheet for detail
          * !ENALL - don't enable 'em all
@@ -72,8 +95,8 @@ static inline void xilinx_timer0_start_periodic(unsigned long load_val)
          * UDT - set the timer as down counter
          * !MDT0 - generate mode
          */
-        out_be32(timer_baseaddr + TCSR0,
-                        TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT);
+        write_fn(TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT,
+                 timer_baseaddr + TCSR0);
 }
 
 static inline void xilinx_timer0_start_oneshot(unsigned long load_val)
@@ -81,13 +104,13 @@ static inline void xilinx_timer0_start_oneshot(unsigned long load_val)
         if (!load_val)
                 load_val = 1;
         /* loading value to timer reg */
-        out_be32(timer_baseaddr + TLR0, load_val);
+        write_fn(load_val, timer_baseaddr + TLR0);
 
         /* load the initial value */
-        out_be32(timer_baseaddr + TCSR0, TCSR_LOAD);
+        write_fn(TCSR_LOAD, timer_baseaddr + TCSR0);
 
-        out_be32(timer_baseaddr + TCSR0,
-                        TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT);
+        write_fn(TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT,
+                 timer_baseaddr + TCSR0);
 }
 
 static int xilinx_timer_set_next_event(unsigned long delta,
@@ -133,14 +156,14 @@ static struct clock_event_device clockevent_xilinx_timer = {
 
 static inline void timer_ack(void)
 {
-        out_be32(timer_baseaddr + TCSR0, in_be32(timer_baseaddr + TCSR0));
+        write_fn(read_fn(timer_baseaddr + TCSR0), timer_baseaddr + TCSR0);
 }
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *evt = &clockevent_xilinx_timer;
 #ifdef CONFIG_HEART_BEAT
-        heartbeat();
+        microblaze_heartbeat();
 #endif
         timer_ack();
         evt->event_handler(evt);
@@ -169,7 +192,7 @@ static __init void xilinx_clockevent_init(void)
 
 static u64 xilinx_clock_read(void)
 {
-        return in_be32(timer_baseaddr + TCR1);
+        return read_fn(timer_baseaddr + TCR1);
 }
 
 static cycle_t xilinx_read(struct clocksource *cs)
@@ -217,10 +240,10 @@ static int __init xilinx_clocksource_init(void)
                 panic("failed to register clocksource");
 
         /* stop timer1 */
-        out_be32(timer_baseaddr + TCSR1,
-                 in_be32(timer_baseaddr + TCSR1) & ~TCSR_ENT);
+        write_fn(read_fn(timer_baseaddr + TCSR1) & ~TCSR_ENT,
+                 timer_baseaddr + TCSR1);
         /* start timer1 - up counting without interrupt */
-        out_be32(timer_baseaddr + TCSR1, TCSR_TINT|TCSR_ENT|TCSR_ARHT);
+        write_fn(TCSR_TINT|TCSR_ENT|TCSR_ARHT, timer_baseaddr + TCSR1);
 
         /* register timecounter - for ftrace support */
         init_xilinx_timecounter();
@@ -245,6 +268,15 @@ static void __init xilinx_timer_init(struct device_node *timer)
                 BUG();
         }
 
+        write_fn = timer_write32;
+        read_fn = timer_read32;
+
+        write_fn(TCSR_MDT, timer_baseaddr + TCSR0);
+        if (!(read_fn(timer_baseaddr + TCSR0) & TCSR_MDT)) {
+                write_fn = timer_write32_be;
+                read_fn = timer_read32_be;
+        }
+
         irq = irq_of_parse_and_map(timer, 0);
 
         of_property_read_u32(timer, "xlnx,one-timer-only", &timer_num);
@@ -274,7 +306,7 @@ static void __init xilinx_timer_init(struct device_node *timer)
 
         setup_irq(irq, &timer_irqaction);
 #ifdef CONFIG_HEART_BEAT
-        setup_heartbeat();
+        microblaze_setup_heartbeat();
 #endif
         xilinx_clocksource_init();
         xilinx_clockevent_init();
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c
index dbbf2246a260..e10ad930895e 100644
--- a/arch/microblaze/mm/consistent.c
+++ b/arch/microblaze/mm/consistent.c
@@ -117,7 +117,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle)
         ret = (void *)va;
 
         /* This gives us the real physical address of the first page. */
-        *dma_handle = pa = virt_to_bus((void *)vaddr);
+        *dma_handle = pa = __virt_to_phys(vaddr);
 #endif
 
         /*
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 89077d346714..77bc7c7e6522 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -369,7 +369,7 @@ asmlinkage void __init mmu_init(void)
         if (initrd_start) {
                 unsigned long size;
                 size = initrd_end - initrd_start;
-                memblock_reserve(virt_to_phys(initrd_start), size);
+                memblock_reserve(__virt_to_phys(initrd_start), size);
         }
 #endif /* CONFIG_BLK_DEV_INITRD */
 
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c
index 10b3bd0a980d..4f4520e779a5 100644
--- a/arch/microblaze/mm/pgtable.c
+++ b/arch/microblaze/mm/pgtable.c
@@ -69,10 +69,11 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,
          *
          * However, allow remap of rootfs: TBD
          */
+
         if (mem_init_done &&
                 p >= memory_start && p < virt_to_phys(high_memory) &&
-                !(p >= virt_to_phys((unsigned long)&__bss_stop) &&
-                p < virt_to_phys((unsigned long)__bss_stop))) {
+                !(p >= __virt_to_phys((phys_addr_t)__bss_stop) &&
+                p < __virt_to_phys((phys_addr_t)__bss_stop))) {
                 pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",
                         (unsigned long)p, __builtin_return_address(0));
                 return NULL;
diff --git a/arch/microblaze/platform/Makefile b/arch/microblaze/platform/Makefile
deleted file mode 100644
index ea1b75cc5775..000000000000
--- a/arch/microblaze/platform/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for arch/microblaze/platform directory
-#
-#obj-$(CONFIG_PLATFORM_GENERIC) += generic/
-
-obj-y   += platform.o
diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto
deleted file mode 100644
index 25a6f019e94d..000000000000
--- a/arch/microblaze/platform/generic/Kconfig.auto
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# (C) Copyright 2007 Michal Simek
-#
-# Michal SIMEK <monstr@monstr.eu>
-#
-# 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-# Definitions for MICROBLAZE0
-comment "Definitions for MICROBLAZE0"
-
-config KERNEL_BASE_ADDR
-        hex "Physical address where Linux Kernel is"
-        default "0x90000000"
-        help
-          BASE Address for kernel
-
-config XILINX_MICROBLAZE0_FAMILY
-        string "Targeted FPGA family"
-        default "virtex5"
-
-config XILINX_MICROBLAZE0_USE_MSR_INSTR
-        int "USE_MSR_INSTR range (0:1)"
-        default 0
-
-config XILINX_MICROBLAZE0_USE_PCMP_INSTR
-        int "USE_PCMP_INSTR range (0:1)"
-        default 0
-
-config XILINX_MICROBLAZE0_USE_BARREL
-        int "USE_BARREL range (0:1)"
-        default 0
-
-config XILINX_MICROBLAZE0_USE_DIV
-        int "USE_DIV range (0:1)"
-        default 0
-
-config XILINX_MICROBLAZE0_USE_HW_MUL
-        int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
-        default 0
-
-config XILINX_MICROBLAZE0_USE_FPU
-        int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
-        default 0
-
-config XILINX_MICROBLAZE0_HW_VER
-        string "Core version number"
-        default 7.10.d
diff --git a/arch/microblaze/platform/generic/Makefile b/arch/microblaze/platform/generic/Makefile
deleted file mode 100644
index 9a8b1bd3fa6d..000000000000
--- a/arch/microblaze/platform/generic/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Empty Makefile to keep make clean happy
-#
diff --git a/arch/microblaze/platform/generic/system.dts b/arch/microblaze/platform/generic/system.dts
deleted file mode 100644
index b620da23febb..000000000000
--- a/arch/microblaze/platform/generic/system.dts
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Device Tree Generator version: 1.1
- *
- * (C) Copyright 2007-2008 Xilinx, Inc.
- * (C) Copyright 2007-2009 Michal Simek
- *
- * Michal SIMEK <monstr@monstr.eu>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * CAUTION: This file is automatically generated by libgen.
- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
- *
- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
- */
-
-/dts-v1/;
-/ {
-        #address-cells = <1>;
-        #size-cells = <1>;
-        compatible = "xlnx,microblaze";
-        hard-reset-gpios = <&LEDs_8Bit 2 1>;
-        model = "testing";
-        DDR2_SDRAM: memory@90000000 {
-                device_type = "memory";
-                reg = < 0x90000000 0x10000000 >;
-        } ;
-        aliases {
-                ethernet0 = &Hard_Ethernet_MAC;
-                serial0 = &RS232_Uart_1;
-        } ;
-        chosen {
-                bootargs = "console=ttyUL0,115200 highres=on";
-                linux,stdout-path = "/plb@0/serial@84000000";
-        } ;
-        cpus {
-                #address-cells = <1>;
-                #cpus = <0x1>;
-                #size-cells = <0>;
-                microblaze_0: cpu@0 {
-                        clock-frequency = <125000000>;
-                        compatible = "xlnx,microblaze-7.10.d";
-                        d-cache-baseaddr = <0x90000000>;
-                        d-cache-highaddr = <0x9fffffff>;
-                        d-cache-line-size = <0x10>;
-                        d-cache-size = <0x2000>;
-                        device_type = "cpu";
-                        i-cache-baseaddr = <0x90000000>;
-                        i-cache-highaddr = <0x9fffffff>;
-                        i-cache-line-size = <0x10>;
-                        i-cache-size = <0x2000>;
-                        model = "microblaze,7.10.d";
-                        reg = <0>;
-                        timebase-frequency = <125000000>;
-                        xlnx,addr-tag-bits = <0xf>;
-                        xlnx,allow-dcache-wr = <0x1>;
-                        xlnx,allow-icache-wr = <0x1>;
-                        xlnx,area-optimized = <0x0>;
-                        xlnx,cache-byte-size = <0x2000>;
-                        xlnx,d-lmb = <0x1>;
-                        xlnx,d-opb = <0x0>;
-                        xlnx,d-plb = <0x1>;
-                        xlnx,data-size = <0x20>;
-                        xlnx,dcache-addr-tag = <0xf>;
-                        xlnx,dcache-always-used = <0x1>;
-                        xlnx,dcache-byte-size = <0x2000>;
-                        xlnx,dcache-line-len = <0x4>;
-                        xlnx,dcache-use-fsl = <0x1>;
-                        xlnx,debug-enabled = <0x1>;
-                        xlnx,div-zero-exception = <0x1>;
-                        xlnx,dopb-bus-exception = <0x0>;
-                        xlnx,dynamic-bus-sizing = <0x1>;
-                        xlnx,edge-is-positive = <0x1>;
-                        xlnx,family = "virtex5";
-                        xlnx,endianness = <0x1>;
-                        xlnx,fpu-exception = <0x1>;
-                        xlnx,fsl-data-size = <0x20>;
-                        xlnx,fsl-exception = <0x0>;
-                        xlnx,fsl-links = <0x0>;
-                        xlnx,i-lmb = <0x1>;
-                        xlnx,i-opb = <0x0>;
-                        xlnx,i-plb = <0x1>;
-                        xlnx,icache-always-used = <0x1>;
-                        xlnx,icache-line-len = <0x4>;
-                        xlnx,icache-use-fsl = <0x1>;
-                        xlnx,ill-opcode-exception = <0x1>;
-                        xlnx,instance = "microblaze_0";
-                        xlnx,interconnect = <0x1>;
-                        xlnx,interrupt-is-edge = <0x0>;
-                        xlnx,iopb-bus-exception = <0x0>;
-                        xlnx,mmu-dtlb-size = <0x4>;
-                        xlnx,mmu-itlb-size = <0x2>;
-                        xlnx,mmu-tlb-access = <0x3>;
-                        xlnx,mmu-zones = <0x10>;
-                        xlnx,number-of-pc-brk = <0x1>;
-                        xlnx,number-of-rd-addr-brk = <0x0>;
-                        xlnx,number-of-wr-addr-brk = <0x0>;
-                        xlnx,opcode-0x0-illegal = <0x1>;
-                        xlnx,pvr = <0x2>;
-                        xlnx,pvr-user1 = <0x0>;
-                        xlnx,pvr-user2 = <0x0>;
-                        xlnx,reset-msr = <0x0>;
-                        xlnx,sco = <0x0>;
-                        xlnx,unaligned-exceptions = <0x1>;
-                        xlnx,use-barrel = <0x1>;
-                        xlnx,use-dcache = <0x1>;
-                        xlnx,use-div = <0x1>;
-                        xlnx,use-ext-brk = <0x1>;
-                        xlnx,use-ext-nm-brk = <0x1>;
-                        xlnx,use-extended-fsl-instr = <0x0>;
-                        xlnx,use-fpu = <0x2>;
-                        xlnx,use-hw-mul = <0x2>;
-                        xlnx,use-icache = <0x1>;
-                        xlnx,use-interrupt = <0x1>;
-                        xlnx,use-mmu = <0x3>;
-                        xlnx,use-msr-instr = <0x1>;
-                        xlnx,use-pcmp-instr = <0x1>;
-                } ;
-        } ;
-        mb_plb: plb@0 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
-                ranges ;
-                FLASH: flash@a0000000 {
-                        bank-width = <2>;
-                        compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
-                        reg = < 0xa0000000 0x2000000 >;
-                        xlnx,family = "virtex5";
-                        xlnx,include-datawidth-matching-0 = <0x1>;
-                        xlnx,include-datawidth-matching-1 = <0x0>;
-                        xlnx,include-datawidth-matching-2 = <0x0>;
-                        xlnx,include-datawidth-matching-3 = <0x0>;
-                        xlnx,include-negedge-ioregs = <0x0>;
-                        xlnx,include-plb-ipif = <0x1>;
-                        xlnx,include-wrbuf = <0x1>;
-                        xlnx,max-mem-width = <0x10>;
-                        xlnx,mch-native-dwidth = <0x20>;
-                        xlnx,mch-plb-clk-period-ps = <0x1f40>;
-                        xlnx,mch-splb-awidth = <0x20>;
-                        xlnx,mch0-accessbuf-depth = <0x10>;
-                        xlnx,mch0-protocol = <0x0>;
-                        xlnx,mch0-rddatabuf-depth = <0x10>;
-                        xlnx,mch1-accessbuf-depth = <0x10>;
-                        xlnx,mch1-protocol = <0x0>;
-                        xlnx,mch1-rddatabuf-depth = <0x10>;
-                        xlnx,mch2-accessbuf-depth = <0x10>;
-                        xlnx,mch2-protocol = <0x0>;
-                        xlnx,mch2-rddatabuf-depth = <0x10>;
-                        xlnx,mch3-accessbuf-depth = <0x10>;
-                        xlnx,mch3-protocol = <0x0>;
-                        xlnx,mch3-rddatabuf-depth = <0x10>;
-                        xlnx,mem0-width = <0x10>;
-                        xlnx,mem1-width = <0x20>;
-                        xlnx,mem2-width = <0x20>;
-                        xlnx,mem3-width = <0x20>;
-                        xlnx,num-banks-mem = <0x1>;
-                        xlnx,num-channels = <0x0>;
-                        xlnx,priority-mode = <0x0>;
-                        xlnx,synch-mem-0 = <0x0>;
-                        xlnx,synch-mem-1 = <0x0>;
-                        xlnx,synch-mem-2 = <0x0>;
-                        xlnx,synch-mem-3 = <0x0>;
-                        xlnx,synch-pipedelay-0 = <0x2>;
-                        xlnx,synch-pipedelay-1 = <0x2>;
-                        xlnx,synch-pipedelay-2 = <0x2>;
-                        xlnx,synch-pipedelay-3 = <0x2>;
-                        xlnx,tavdv-ps-mem-0 = <0x1adb0>;
-                        xlnx,tavdv-ps-mem-1 = <0x3a98>;
-                        xlnx,tavdv-ps-mem-2 = <0x3a98>;
-                        xlnx,tavdv-ps-mem-3 = <0x3a98>;
-                        xlnx,tcedv-ps-mem-0 = <0x1adb0>;
-                        xlnx,tcedv-ps-mem-1 = <0x3a98>;
-                        xlnx,tcedv-ps-mem-2 = <0x3a98>;
-                        xlnx,tcedv-ps-mem-3 = <0x3a98>;
-                        xlnx,thzce-ps-mem-0 = <0x88b8>;
-                        xlnx,thzce-ps-mem-1 = <0x1b58>;
-                        xlnx,thzce-ps-mem-2 = <0x1b58>;
-                        xlnx,thzce-ps-mem-3 = <0x1b58>;
-                        xlnx,thzoe-ps-mem-0 = <0x1b58>;
-                        xlnx,thzoe-ps-mem-1 = <0x1b58>;
-                        xlnx,thzoe-ps-mem-2 = <0x1b58>;
-                        xlnx,thzoe-ps-mem-3 = <0x1b58>;
-                        xlnx,tlzwe-ps-mem-0 = <0x88b8>;
-                        xlnx,tlzwe-ps-mem-1 = <0x0>;
-                        xlnx,tlzwe-ps-mem-2 = <0x0>;
-                        xlnx,tlzwe-ps-mem-3 = <0x0>;
-                        xlnx,twc-ps-mem-0 = <0x2af8>;
-                        xlnx,twc-ps-mem-1 = <0x3a98>;
-                        xlnx,twc-ps-mem-2 = <0x3a98>;
-                        xlnx,twc-ps-mem-3 = <0x3a98>;
-                        xlnx,twp-ps-mem-0 = <0x11170>;
-                        xlnx,twp-ps-mem-1 = <0x2ee0>;
-                        xlnx,twp-ps-mem-2 = <0x2ee0>;
-                        xlnx,twp-ps-mem-3 = <0x2ee0>;
-                        xlnx,xcl0-linesize = <0x4>;
-                        xlnx,xcl0-writexfer = <0x1>;
-                        xlnx,xcl1-linesize = <0x4>;
-                        xlnx,xcl1-writexfer = <0x1>;
-                        xlnx,xcl2-linesize = <0x4>;
-                        xlnx,xcl2-writexfer = <0x1>;
-                        xlnx,xcl3-linesize = <0x4>;
-                        xlnx,xcl3-writexfer = <0x1>;
-                } ;
-                Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "xlnx,compound";
-                        ranges ;
-                        ethernet@81c00000 {
-                                compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
-                                interrupt-parent = <&xps_intc_0>;
-                                interrupts = < 5 2 >;
-                                llink-connected = <&PIM3>;
-                                local-mac-address = [ 00 0a 35 00 00 00 ];
-                                reg = < 0x81c00000 0x40 >;
-                                xlnx,bus2core-clk-ratio = <0x1>;
-                                xlnx,phy-type = <0x1>;
-                                xlnx,phyaddr = <0x1>;
-                                xlnx,rxcsum = <0x0>;
-                                xlnx,rxfifo = <0x1000>;
-                                xlnx,temac-type = <0x0>;
-                                xlnx,txcsum = <0x0>;
-                                xlnx,txfifo = <0x1000>;
-                        } ;
-                } ;
-                IIC_EEPROM: i2c@81600000 {
-                        compatible = "xlnx,xps-iic-2.00.a";
-                        interrupt-parent = <&xps_intc_0>;
-                        interrupts = < 6 2 >;
-                        reg = < 0x81600000 0x10000 >;
-                        xlnx,clk-freq = <0x7735940>;
-                        xlnx,family = "virtex5";
-                        xlnx,gpo-width = <0x1>;
-                        xlnx,iic-freq = <0x186a0>;
-                        xlnx,scl-inertial-delay = <0x0>;
-                        xlnx,sda-inertial-delay = <0x0>;
-                        xlnx,ten-bit-adr = <0x0>;
-                } ;
-                LEDs_8Bit: gpio@81400000 {
-                        compatible = "xlnx,xps-gpio-1.00.a";
-                        interrupt-parent = <&xps_intc_0>;
-                        interrupts = < 7 2 >;
-                        reg = < 0x81400000 0x10000 >;
-                        xlnx,all-inputs = <0x0>;
-                        xlnx,all-inputs-2 = <0x0>;
-                        xlnx,dout-default = <0x0>;
-                        xlnx,dout-default-2 = <0x0>;
-                        xlnx,family = "virtex5";
-                        xlnx,gpio-width = <0x8>;
-                        xlnx,interrupt-present = <0x1>;
-                        xlnx,is-bidir = <0x1>;
-                        xlnx,is-bidir-2 = <0x1>;
-                        xlnx,is-dual = <0x0>;
-                        xlnx,tri-default = <0xffffffff>;
-                        xlnx,tri-default-2 = <0xffffffff>;
-                        #gpio-cells = <2>;
-                        gpio-controller;
-                } ;
-
-                gpio-leds {
-                        compatible = "gpio-leds";
-
-                        heartbeat {
-                                label = "Heartbeat";
-                                gpios = <&LEDs_8Bit 4 1>;
-                                linux,default-trigger = "heartbeat";
-                        };
-
-                        yellow {
-                                label = "Yellow";
-                                gpios = <&LEDs_8Bit 5 1>;
-                        };
-
-                        red {
-                                label = "Red";
-                                gpios = <&LEDs_8Bit 6 1>;
-                        };
-
-                        green {
-                                label = "Green";
-                                gpios = <&LEDs_8Bit 7 1>;
-                        };
-                } ;
-                RS232_Uart_1: serial@84000000 {
-                        clock-frequency = <125000000>;
-                        compatible = "xlnx,xps-uartlite-1.00.a";
-                        current-speed = <115200>;
-                        device_type = "serial";
-                        interrupt-parent = <&xps_intc_0>;
-                        interrupts = < 8 0 >;
-                        port-number = <0>;
-                        reg = < 0x84000000 0x10000 >;
-                        xlnx,baudrate = <0x1c200>;
-                        xlnx,data-bits = <0x8>;
-                        xlnx,family = "virtex5";
-                        xlnx,odd-parity = <0x0>;
-                        xlnx,use-parity = <0x0>;
-                } ;
-                SysACE_CompactFlash: sysace@83600000 {
-                        compatible = "xlnx,xps-sysace-1.00.a";
-                        interrupt-parent = <&xps_intc_0>;
-                        interrupts = < 4 2 >;
-                        reg = < 0x83600000 0x10000 >;
-                        xlnx,family = "virtex5";
-                        xlnx,mem-width = <0x10>;
-                } ;
-                debug_module: debug@84400000 {
-                        compatible = "xlnx,mdm-1.00.d";
-                        reg = < 0x84400000 0x10000 >;
-                        xlnx,family = "virtex5";
-                        xlnx,interconnect = <0x1>;
-                        xlnx,jtag-chain = <0x2>;
-                        xlnx,mb-dbg-ports = <0x1>;
-                        xlnx,uart-width = <0x8>;
-                        xlnx,use-uart = <0x1>;
-                        xlnx,write-fsl-ports = <0x0>;
-                } ;
-                mpmc@90000000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "xlnx,mpmc-4.02.a";
-                        ranges ;
-                        PIM3: sdma@84600180 {
-                                compatible = "xlnx,ll-dma-1.00.a";
-                                interrupt-parent = <&xps_intc_0>;
-                                interrupts = < 2 2 1 2 >;
-                                reg = < 0x84600180 0x80 >;
-                        } ;
-                } ;
-                xps_intc_0: interrupt-controller@81800000 {
-                        #interrupt-cells = <0x2>;
-                        compatible = "xlnx,xps-intc-1.00.a";
-                        interrupt-controller ;
-                        reg = < 0x81800000 0x10000 >;
-                        xlnx,kind-of-intr = <0x100>;
-                        xlnx,num-intr-inputs = <0x9>;
-                } ;
-                xps_timer_1: timer@83c00000 {
-                        compatible = "xlnx,xps-timer-1.00.a";
-                        interrupt-parent = <&xps_intc_0>;
-                        interrupts = < 3 2 >;
-                        reg = < 0x83c00000 0x10000 >;
-                        xlnx,count-width = <0x20>;
-                        xlnx,family = "virtex5";
-                        xlnx,gen0-assert = <0x1>;
-                        xlnx,gen1-assert = <0x1>;
-                        xlnx,one-timer-only = <0x0>;
-                        xlnx,trig0-assert = <0x1>;
-                        xlnx,trig1-assert = <0x1>;
-                } ;
-        } ;
-}  ;
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index 6c488c85d791..c6e9cd2bca8d 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -14,7 +14,7 @@
 #define __ASM_MIPS_SYSCALL_H
 
 #include <linux/compiler.h>
-#include <linux/audit.h>
+#include <uapi/linux/audit.h>
 #include <linux/elf-em.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -127,12 +127,11 @@ extern const unsigned long sys_call_table[];
 extern const unsigned long sys32_call_table[];
 extern const unsigned long sysn32_call_table[];
 
-static inline int syscall_get_arch(struct task_struct *task,
-                                   struct pt_regs *regs)
+static inline int syscall_get_arch(void)
 {
         int arch = EM_MIPS;
 #ifdef CONFIG_64BIT
-        if (!test_tsk_thread_flag(task, TIF_32BIT_REGS))
+        if (!test_thread_flag(TIF_32BIT_REGS))
                 arch |= __AUDIT_ARCH_64BIT;
 #endif
 #if defined(__LITTLE_ENDIAN)
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 7271e5a83081..71f85f427034 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -649,7 +649,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
         if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                 trace_sys_enter(regs, regs->regs[2]);
 
-        audit_syscall_entry(syscall_get_arch(current, regs),
+        audit_syscall_entry(syscall_get_arch(),
                             syscall,
                             regs->regs[4], regs->regs[5],
                             regs->regs[6], regs->regs[7]);
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index aed32b88576c..e1f427f4f5f3 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -28,16 +28,16 @@ enum {
 };
 
 struct cpufreq_frequency_table loongson2_clockmod_table[] = {
-        {DC_RESV, CPUFREQ_ENTRY_INVALID},
-        {DC_ZERO, CPUFREQ_ENTRY_INVALID},
-        {DC_25PT, 0},
-        {DC_37PT, 0},
-        {DC_50PT, 0},
-        {DC_62PT, 0},
-        {DC_75PT, 0},
-        {DC_87PT, 0},
-        {DC_DISABLE, 0},
-        {DC_RESV, CPUFREQ_TABLE_END},
+        {0, DC_RESV, CPUFREQ_ENTRY_INVALID},
+        {0, DC_ZERO, CPUFREQ_ENTRY_INVALID},
+        {0, DC_25PT, 0},
+        {0, DC_37PT, 0},
+        {0, DC_50PT, 0},
+        {0, DC_62PT, 0},
+        {0, DC_75PT, 0},
+        {0, DC_87PT, 0},
+        {0, DC_DISABLE, 0},
+        {0, DC_RESV, CPUFREQ_TABLE_END},
 };
 EXPORT_SYMBOL_GPL(loongson2_clockmod_table);
 
diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h
index 7c137cd8aa37..2fbbe4d920aa 100644
--- a/arch/mn10300/include/asm/highmem.h
+++ b/arch/mn10300/include/asm/highmem.h
@@ -70,7 +70,7 @@ static inline void kunmap(struct page *page)
  * be used in IRQ contexts, so in some (very limited) cases we need
  * it.
  */
-static inline unsigned long kmap_atomic(struct page *page)
+static inline void *kmap_atomic(struct page *page)
 {
         unsigned long vaddr;
         int idx, type;
@@ -89,7 +89,7 @@ static inline unsigned long kmap_atomic(struct page *page)
         set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));
         local_flush_tlb_one(vaddr);
 
-        return vaddr;
+        return (void *)vaddr;
 }
 
 static inline void __kunmap_atomic(unsigned long vaddr)
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index bb2a8ec440e7..1faefed32749 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -28,6 +28,7 @@ config PARISC
         select CLONE_BACKWARDS
         select TTY # Needed for pdc_cons.c
         select HAVE_DEBUG_STACKOVERFLOW
+        select HAVE_ARCH_AUDITSYSCALL
 
         help
           The PA-RISC microprocessor is designed by Hewlett-Packard and used
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6c03a94991ad..e0998997943b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -144,6 +144,7 @@ config PPC
         select HAVE_DEBUG_STACKOVERFLOW
         select HAVE_IRQ_EXIT_ON_IRQ_STACK
         select ARCH_USE_CMPXCHG_LOCKREF if PPC64
+        select HAVE_ARCH_AUDITSYSCALL
 
 config GENERIC_CSUM
         def_bool CPU_LITTLE_ENDIAN
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 0f4344e6fbca..4c0cedf4e2c7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -74,6 +74,7 @@ override CROSS32AS += -mlittle-endian
 LDEMULATION     := lppc
 GNUTARGET       := powerpcle
 MULTIPLEWORD    := -mno-multiple
+KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-save-toc-indirect)
 else
 ifeq ($(call cc-option-yn,-mbig-endian),y)
 override CC     += -mbig-endian
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index c2353bf059fd..175a8b99c196 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1244,7 +1244,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_HIGHMEM=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_SG=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 139a8308070c..fdee37fab81c 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -174,7 +174,6 @@ CONFIG_DETECT_HUNG_TASK=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 9ea8342bd219..a905063281cc 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -306,3 +306,4 @@ CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index 3c84f9d87980..58e3dbf43ca4 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -301,3 +301,4 @@ CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h
index 4358e3002f35..f00e10e2a335 100644
--- a/arch/powerpc/include/asm/emulated_ops.h
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -54,6 +54,7 @@ extern struct ppc_emulated {
 #ifdef CONFIG_PPC64
         struct ppc_emulated_entry mfdscr;
         struct ppc_emulated_entry mtdscr;
+        struct ppc_emulated_entry lq_stq;
 #endif
 } ppc_emulated;
 
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index fe2aa0b48d2b..a2efdaa020b0 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -87,6 +87,7 @@ extern int opal_enter_rtas(struct rtas_args *args,
 #define OPAL_ASYNC_COMPLETION   -15
 
 /* API Tokens (in r0) */
+#define OPAL_INVALID_CALL                       -1
 #define OPAL_CONSOLE_WRITE                      1
 #define OPAL_CONSOLE_READ                       2
 #define OPAL_RTC_READ                           3
@@ -177,6 +178,8 @@ extern int opal_enter_rtas(struct rtas_args *args,
 
 #ifndef __ASSEMBLY__
 
+#include <linux/notifier.h>
+
 /* Other enums */
 enum OpalVendorApiTokens {
         OPAL_START_VENDOR_API_RANGE = 1000, OPAL_END_VENDOR_API_RANGE = 1999
@@ -422,9 +425,9 @@ enum OpalSysparamPerm {
 };
 
 struct opal_msg {
-        uint32_t msg_type;
-        uint32_t reserved;
-        uint64_t params[8];
+        __be32 msg_type;
+        __be32 reserved;
+        __be64 params[8];
 };
 
 struct opal_machine_check_event {
@@ -730,7 +733,11 @@ typedef struct oppanel_line {
 /* /sys/firmware/opal */
 extern struct kobject *opal_kobj;
 
+/* /ibm,opal */
+extern struct device_node *opal_node;
+
 /* API functions */
+int64_t opal_invalid_call(void);
 int64_t opal_console_write(int64_t term_number, __be64 *length,
                            const uint8_t *buffer);
 int64_t opal_console_read(int64_t term_number, __be64 *length,
@@ -874,8 +881,7 @@ int64_t opal_get_param(uint64_t token, uint32_t param_id, uint64_t buffer,
                 size_t length);
 int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer,
                 size_t length);
-int64_t opal_sensor_read(uint32_t sensor_hndl, int token,
-                uint32_t *sensor_data);
+int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data);
 
 /* Internal functions */
 extern int early_init_dt_scan_opal(unsigned long node, const char *uname, int depth, void *data);
@@ -892,6 +898,8 @@ extern int early_init_dt_scan_opal(unsigned long node, const char *uname,
                                    int depth, void *data);
 
 extern int opal_notifier_register(struct notifier_block *nb);
+extern int opal_notifier_unregister(struct notifier_block *nb);
+
 extern int opal_message_notifier_register(enum OpalMessageType msg_type,
                                                 struct notifier_block *nb);
 extern void opal_notifier_enable(void);
@@ -919,6 +927,7 @@ extern void opal_flash_init(void);
 extern int opal_elog_init(void);
 extern void opal_platform_dump_init(void);
 extern void opal_sys_param_init(void);
+extern void opal_msglog_init(void);
 
 extern int opal_machine_check(struct pt_regs *regs);
 extern bool opal_mce_check_early_recovery(struct pt_regs *regs);
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 0dcc48af25a3..e5d2e0bc7e03 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -272,6 +272,10 @@
 #define SPRN_HSRR1      0x13B   /* Hypervisor Save/Restore 1 */
 #define SPRN_IC         0x350   /* Virtual Instruction Count */
 #define SPRN_VTB        0x351   /* Virtual Time Base */
+#define SPRN_PMICR      0x354   /* Power Management Idle Control Reg */
+#define SPRN_PMSR       0x355   /* Power Management Status Reg */
+#define SPRN_PMCR       0x374   /* Power Management Control Register */
+
 /* HFSCR and FSCR bit numbers are the same */
 #define FSCR_TAR_LG     8       /* Enable Target Address Register */
 #define FSCR_EBB_LG     7       /* Enable Event Based Branching */
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index a0e1add01ef5..b390f55b0df1 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -150,19 +150,53 @@ struct rtas_suspend_me_data {
 #define RTAS_VECTOR_EXTERNAL_INTERRUPT  0x500
 
 struct rtas_error_log {
-        unsigned long version:8;                /* Architectural version */
-        unsigned long severity:3;               /* Severity level of error */
-        unsigned long disposition:2;            /* Degree of recovery */
-        unsigned long extended:1;               /* extended log present? */
-        unsigned long /* reserved */ :2;        /* Reserved for future use */
-        unsigned long initiator:4;              /* Initiator of event */
-        unsigned long target:4;                 /* Target of failed operation */
-        unsigned long type:8;                   /* General event or error*/
-        unsigned long extended_log_length:32;   /* length in bytes */
-        unsigned char buffer[1];                /* Start of extended log */
+        /* Byte 0 */
+        uint8_t         byte0;                  /* Architectural version */
+
+        /* Byte 1 */
+        uint8_t         byte1;
+        /* XXXXXXXX
+         * XXX          3: Severity level of error
+         *    XX        2: Degree of recovery
+         *      X       1: Extended log present?
+         *       XX     2: Reserved
+         */
+
+        /* Byte 2 */
+        uint8_t         byte2;
+        /* XXXXXXXX
+         * XXXX         4: Initiator of event
+         *     XXXX     4: Target of failed operation
+         */
+        uint8_t         byte3;                  /* General event or error*/
+        __be32          extended_log_length;    /* length in bytes */
+        unsigned char   buffer[1];              /* Start of extended log */
                                                 /* Variable length.      */
 };
 
+static inline uint8_t rtas_error_severity(const struct rtas_error_log *elog)
+{
+        return (elog->byte1 & 0xE0) >> 5;
+}
+
+static inline uint8_t rtas_error_disposition(const struct rtas_error_log *elog)
+{
+        return (elog->byte1 & 0x18) >> 3;
+}
+
+static inline uint8_t rtas_error_extended(const struct rtas_error_log *elog)
+{
+        return (elog->byte1 & 0x04) >> 2;
+}
+
+#define rtas_error_type(x)      ((x)->byte3)
+
+static inline
+uint32_t rtas_error_extended_log_length(const struct rtas_error_log *elog)
+{
+        return be32_to_cpu(elog->extended_log_length);
+}
+
 #define RTAS_V6EXT_LOG_FORMAT_EVENT_LOG 14
 
 #define RTAS_V6EXT_COMPANY_ID_IBM       (('I' << 24) | ('B' << 16) | ('M' << 8))
@@ -172,32 +206,35 @@ struct rtas_error_log {
  */
 struct rtas_ext_event_log_v6 {
         /* Byte 0 */
-        uint32_t log_valid:1;           /* 1:Log valid */
-        uint32_t unrecoverable_error:1; /* 1:Unrecoverable error */
-        uint32_t recoverable_error:1;   /* 1:recoverable (correctable   */
-                                        /*   or successfully retried)   */
-        uint32_t degraded_operation:1;  /* 1:Unrecoverable err, bypassed*/
-                                        /*   - degraded operation (e.g. */
-                                        /*   CPU or mem taken off-line) */
-        uint32_t predictive_error:1;
-        uint32_t new_log:1;             /* 1:"New" log (Always 1 for    */
-                                        /*   data returned from RTAS    */
-        uint32_t big_endian:1;          /* 1: Big endian */
-        uint32_t :1;                    /* reserved */
+        uint8_t byte0;
+        /* XXXXXXXX
+         * X            1: Log valid
+         *  X           1: Unrecoverable error
+         *   X          1: Recoverable (correctable or successfully retried)
+         *    X         1: Bypassed unrecoverable error (degraded operation)
+         *     X        1: Predictive error
+         *      X       1: "New" log (always 1 for data returned from RTAS)
+         *       X      1: Big Endian
+         *        X     1: Reserved
+         */
+
         /* Byte 1 */
-        uint32_t :8;                    /* reserved */
+        uint8_t byte1;                  /* reserved */
+
         /* Byte 2 */
-        uint32_t powerpc_format:1;      /* Set to 1 (indicating log is  */
-                                        /* in PowerPC format            */
-        uint32_t :3;                    /* reserved */
-        uint32_t log_format:4;          /* Log format indicator. Define */
-                                        /* format used for byte 12-2047 */
+        uint8_t byte2;
+        /* XXXXXXXX
+         * X            1: Set to 1 (indicating log is in PowerPC format)
+         *  XXX         3: Reserved
+         *     XXXX     4: Log format used for bytes 12-2047
+         */
+
         /* Byte 3 */
-        uint32_t :8;                    /* reserved */
+        uint8_t byte3;                  /* reserved */
         /* Byte 4-11 */
         uint8_t reserved[8];            /* reserved */
         /* Byte 12-15 */
-        uint32_t company_id;            /* Company ID of the company    */
+        __be32  company_id;             /* Company ID of the company    */
                                         /* that defines the format for  */
                                         /* the vendor specific log type */
         /* Byte 16-end of log */
@@ -205,6 +242,18 @@ struct rtas_ext_event_log_v6 {
                                         /* Variable length.             */
 };
 
+static
+inline uint8_t rtas_ext_event_log_format(struct rtas_ext_event_log_v6 *ext_log)
+{
+        return ext_log->byte2 & 0x0F;
+}
+
+static
+inline uint32_t rtas_ext_event_company_id(struct rtas_ext_event_log_v6 *ext_log)
+{
+        return be32_to_cpu(ext_log->company_id);
+}
+
 /* pSeries event log format */
 
 /* Two bytes ASCII section IDs */
@@ -227,14 +276,26 @@ struct rtas_ext_event_log_v6 {
 
 /* Vendor specific Platform Event Log Format, Version 6, section header */
 struct pseries_errorlog {
-        uint16_t id;                    /* 0x00 2-byte ASCII section ID */
-        uint16_t length;                /* 0x02 Section length in bytes */
+        __be16 id;                      /* 0x00 2-byte ASCII section ID */
+        __be16 length;                  /* 0x02 Section length in bytes */
         uint8_t version;                /* 0x04 Section version         */
         uint8_t subtype;                /* 0x05 Section subtype         */
-        uint16_t creator_component;     /* 0x06 Creator component ID    */
+        __be16 creator_component;       /* 0x06 Creator component ID    */
         uint8_t data[];                 /* 0x08 Start of section data   */
 };
 
+static
+inline uint16_t pseries_errorlog_id(struct pseries_errorlog *sect)
+{
+        return be16_to_cpu(sect->id);
+}
+
+static
+inline uint16_t pseries_errorlog_length(struct pseries_errorlog *sect)
+{
+        return be16_to_cpu(sect->length);
+}
+
 struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
                                               uint16_t section_id);
 
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index de91f3ae631e..94908af308d8 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -73,7 +73,7 @@ static struct aligninfo aligninfo[128] = {
         { 8, LD+F },            /* 00 0 1001: lfd */
         { 4, ST+F+S },          /* 00 0 1010: stfs */
         { 8, ST+F },            /* 00 0 1011: stfd */
-        INVALID,                /* 00 0 1100 */
+        { 16, LD },             /* 00 0 1100: lq */
         { 8, LD },              /* 00 0 1101: ld/ldu/lwa */
         INVALID,                /* 00 0 1110 */
         { 8, ST },              /* 00 0 1111: std/stdu */
@@ -140,7 +140,7 @@ static struct aligninfo aligninfo[128] = {
         { 2, LD+SW },           /* 10 0 1100: lhbrx */
         { 4, LD+SE },           /* 10 0 1101  lwa */
         { 2, ST+SW },           /* 10 0 1110: sthbrx */
-        INVALID,                /* 10 0 1111 */
+        { 16, ST },             /* 10 0 1111: stq */
         INVALID,                /* 10 1 0000 */
         INVALID,                /* 10 1 0001 */
         INVALID,                /* 10 1 0010 */
@@ -385,8 +385,6 @@ static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg,
         char *ptr1 = (char *) &current->thread.TS_FPR(reg+1);
         int i, ret, sw = 0;
 
-        if (!(flags & F))
-                return 0;
         if (reg & 1)
                 return 0;       /* invalid form: FRS/FRT must be even */
         if (flags & SW)
@@ -406,6 +404,34 @@ static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg,
         return 1;       /* exception handled and fixed up */
 }
 
+#ifdef CONFIG_PPC64
+static int emulate_lq_stq(struct pt_regs *regs, unsigned char __user *addr,
+                          unsigned int reg, unsigned int flags)
+{
+        char *ptr0 = (char *)&regs->gpr[reg];
+        char *ptr1 = (char *)&regs->gpr[reg+1];
+        int i, ret, sw = 0;
+
+        if (reg & 1)
+                return 0;       /* invalid form: GPR must be even */
+        if (flags & SW)
+                sw = 7;
+        ret = 0;
+        for (i = 0; i < 8; ++i) {
+                if (!(flags & ST)) {
+                        ret |= __get_user(ptr0[i^sw], addr + i);
+                        ret |= __get_user(ptr1[i^sw], addr + i + 8);
+                } else {
+                        ret |= __put_user(ptr0[i^sw], addr + i);
+                        ret |= __put_user(ptr1[i^sw], addr + i + 8);
+                }
+        }
+        if (ret)
+                return -EFAULT;
+        return 1;       /* exception handled and fixed up */
+}
+#endif /* CONFIG_PPC64 */
+
 #ifdef CONFIG_SPE
 
 static struct aligninfo spe_aligninfo[32] = {
@@ -914,10 +940,20 @@ int fix_alignment(struct pt_regs *regs)
                 flush_fp_to_thread(current);
         }
 
-        /* Special case for 16-byte FP loads and stores */
-        if (nb == 16) {
-                PPC_WARN_ALIGNMENT(fp_pair, regs);
-                return emulate_fp_pair(addr, reg, flags);
+        if ((nb == 16)) {
+                if (flags & F) {
+                        /* Special case for 16-byte FP loads and stores */
+                        PPC_WARN_ALIGNMENT(fp_pair, regs);
+                        return emulate_fp_pair(addr, reg, flags);
+                } else {
+#ifdef CONFIG_PPC64
+                        /* Special case for 16-byte loads and stores */
+                        PPC_WARN_ALIGNMENT(lq_stq, regs);
+                        return emulate_lq_stq(regs, addr, reg, flags);
+#else
+                        return 0;
+#endif
+                }
         }
 
         PPC_WARN_ALIGNMENT(unaligned, regs);
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 37d1bb002aa9..1557e7c2c7e1 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -56,7 +56,6 @@ _GLOBAL(__setup_cpu_power8)
         li      r0,0
         mtspr   SPRN_LPID,r0
         mfspr   r3,SPRN_LPCR
-        oris    r3, r3, LPCR_AIL_3@h
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power8
@@ -75,7 +74,6 @@ _GLOBAL(__restore_cpu_power8)
         li      r0,0
         mtspr   SPRN_LPID,r0
         mfspr   r3,SPRN_LPCR
-        oris    r3, r3, LPCR_AIL_3@h
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power8
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index d9c650ec7dac..3afd3915921a 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -54,14 +54,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)				\
         xori    r12,r12,MSR_LE ;                                \
         mtspr   SPRN_SRR1,r12 ;                                 \
         rfid ;          /* return to userspace */               \
-        b       . ;                                             \
-2:      mfspr   r12,SPRN_SRR1 ;                                 \
-        andi.   r12,r12,MSR_PR ;                                \
-        bne     0b ;                                            \
-        mtspr   SPRN_SRR0,r3 ;                                  \
-        mtspr   SPRN_SRR1,r4 ;                                  \
-        mtspr   SPRN_SDR1,r5 ;                                  \
-        rfid ;                                                  \
         b       . ;     /* prevent speculative execution */
 
 #if defined(CONFIG_RELOCATABLE)
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index bf0aada02fe4..ad302f845e5d 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -152,7 +152,8 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu)
         new_paca->paca_index = cpu;
         new_paca->kernel_toc = kernel_toc;
         new_paca->kernelbase = (unsigned long) _stext;
-        new_paca->kernel_msr = MSR_KERNEL;
+        /* Only set MSR:IR/DR when MMU is initialized */
+        new_paca->kernel_msr = MSR_KERNEL & ~(MSR_IR | MSR_DR);
         new_paca->hw_cpu_id = 0xffff;
         new_paca->kexec_state = KEXEC_STATE_NONE;
         new_paca->__current = &init_task;
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index af064d28b365..31d021506d21 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -610,6 +610,31 @@ out_and_saveregs:
         tm_save_sprs(thr);
 }
 
+extern void __tm_recheckpoint(struct thread_struct *thread,
+                              unsigned long orig_msr);
+
+void tm_recheckpoint(struct thread_struct *thread,
+                     unsigned long orig_msr)
+{
+        unsigned long flags;
+
+        /* We really can't be interrupted here as the TEXASR registers can't
+         * change and later in the trecheckpoint code, we have a userspace R1.
+         * So let's hard disable over this region.
+         */
+        local_irq_save(flags);
+        hard_irq_disable();
+
+        /* The TM SPRs are restored here, so that TEXASR.FS can be set
+         * before the trecheckpoint and no explosion occurs.
+         */
+        tm_restore_sprs(thread);
+
+        __tm_recheckpoint(thread, orig_msr);
+
+        local_irq_restore(flags);
+}
+
 static inline void tm_recheckpoint_new_task(struct task_struct *new)
 {
         unsigned long msr;
@@ -628,13 +653,10 @@ static inline void tm_recheckpoint_new_task(struct task_struct *new)
         if (!new->thread.regs)
                 return;
 
-        /* The TM SPRs are restored here, so that TEXASR.FS can be set
-         * before the trecheckpoint and no explosion occurs.
-         */
-        tm_restore_sprs(&new->thread);
-
-        if (!MSR_TM_ACTIVE(new->thread.regs->msr))
+        if (!MSR_TM_ACTIVE(new->thread.regs->msr)){
+                tm_restore_sprs(&new->thread);
                 return;
+        }
         msr = new->thread.tm_orig_msr;
         /* Recheckpoint to restore original checkpointed register state. */
         TM_DEBUG("*** tm_recheckpoint of pid %d "
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index dd72bebd708a..668aa4791fd7 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -347,45 +347,45 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 #endif
         }
 
-        if (found >= 0) {
-                DBG("boot cpu: logical %d physical %d\n", found,
-                        be32_to_cpu(intserv[found_thread]));
-                boot_cpuid = found;
-                set_hard_smp_processor_id(found,
-                        be32_to_cpu(intserv[found_thread]));
+        /* Not the boot CPU */
+        if (found < 0)
+                return 0;
 
-                /*
-                 * PAPR defines "logical" PVR values for cpus that
-                 * meet various levels of the architecture:
-                 * 0x0f000001   Architecture version 2.04
-                 * 0x0f000002   Architecture version 2.05
-                 * If the cpu-version property in the cpu node contains
-                 * such a value, we call identify_cpu again with the
-                 * logical PVR value in order to use the cpu feature
-                 * bits appropriate for the architecture level.
-                 *
-                 * A POWER6 partition in "POWER6 architected" mode
-                 * uses the 0x0f000002 PVR value; in POWER5+ mode
-                 * it uses 0x0f000001.
-                 */
-                prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
-                if (prop && (be32_to_cpup(prop) & 0xff000000) == 0x0f000000)
-                        identify_cpu(0, be32_to_cpup(prop));
+        DBG("boot cpu: logical %d physical %d\n", found,
+            be32_to_cpu(intserv[found_thread]));
+        boot_cpuid = found;
+        set_hard_smp_processor_id(found, be32_to_cpu(intserv[found_thread]));
 
-                identical_pvr_fixup(node);
-        }
+        /*
+         * PAPR defines "logical" PVR values for cpus that
+         * meet various levels of the architecture:
+         * 0x0f000001   Architecture version 2.04
+         * 0x0f000002   Architecture version 2.05
+         * If the cpu-version property in the cpu node contains
+         * such a value, we call identify_cpu again with the
+         * logical PVR value in order to use the cpu feature
+         * bits appropriate for the architecture level.
+         *
+         * A POWER6 partition in "POWER6 architected" mode
+         * uses the 0x0f000002 PVR value; in POWER5+ mode
+         * it uses 0x0f000001.
+         */
+        prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
+        if (prop && (be32_to_cpup(prop) & 0xff000000) == 0x0f000000)
+                identify_cpu(0, be32_to_cpup(prop));
+
+        identical_pvr_fixup(node);
 
         check_cpu_feature_properties(node);
         check_cpu_pa_features(node);
         check_cpu_slb_size(node);
 
-#ifdef CONFIG_PPC_PSERIES
+#ifdef CONFIG_PPC64
         if (nthreads > 1)
                 cur_cpu_spec->cpu_features |= CPU_FTR_SMT;
         else
                 cur_cpu_spec->cpu_features &= ~CPU_FTR_SMT;
 #endif
-
         return 0;
 }
 
@@ -747,6 +747,10 @@ void __init early_init_devtree(void *params)
          * (altivec support, boot CPU ID, ...)
          */
         of_scan_flat_dt(early_init_dt_scan_cpus, NULL);
+        if (boot_cpuid < 0) {
+                printk("Failed to indentify boot CPU !\n");
+                BUG();
+        }
 
 #if defined(CONFIG_SMP) && defined(CONFIG_PPC64)
         /* We'll later wait for secondaries to check in; there are
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index f386296ff378..8cd5ed049b5d 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -993,21 +993,24 @@ struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
                 (struct rtas_ext_event_log_v6 *)log->buffer;
         struct pseries_errorlog *sect;
         unsigned char *p, *log_end;
+        uint32_t ext_log_length = rtas_error_extended_log_length(log);
+        uint8_t log_format = rtas_ext_event_log_format(ext_log);
+        uint32_t company_id = rtas_ext_event_company_id(ext_log);
 
         /* Check that we understand the format */
-        if (log->extended_log_length < sizeof(struct rtas_ext_event_log_v6) ||
-            ext_log->log_format != RTAS_V6EXT_LOG_FORMAT_EVENT_LOG ||
-            ext_log->company_id != RTAS_V6EXT_COMPANY_ID_IBM)
+        if (ext_log_length < sizeof(struct rtas_ext_event_log_v6) ||
+            log_format != RTAS_V6EXT_LOG_FORMAT_EVENT_LOG ||
+            company_id != RTAS_V6EXT_COMPANY_ID_IBM)
                 return NULL;
 
-        log_end = log->buffer + log->extended_log_length;
+        log_end = log->buffer + ext_log_length;
         p = ext_log->vendor_log;
 
         while (p < log_end) {
                 sect = (struct pseries_errorlog *)p;
-                if (sect->id == section_id)
+                if (pseries_errorlog_id(sect) == section_id)
                         return sect;
-                p += sect->length;
+                p += pseries_errorlog_length(sect);
         }
 
         return NULL;
diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 1130c53ad652..e736387fee6a 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -150,8 +150,8 @@ static void printk_log_rtas(char *buf, int len)
                 struct rtas_error_log *errlog = (struct rtas_error_log *)buf;
 
                 printk(RTAS_DEBUG "event: %d, Type: %s, Severity: %d\n",
-                       error_log_cnt, rtas_event_type(errlog->type),
-                       errlog->severity);
+                       error_log_cnt, rtas_event_type(rtas_error_type(errlog)),
+                       rtas_error_severity(errlog));
         }
 }
 
@@ -159,14 +159,16 @@ static int log_rtas_len(char * buf)
 {
         int len;
         struct rtas_error_log *err;
+        uint32_t extended_log_length;
 
         /* rtas fixed header */
         len = 8;
         err = (struct rtas_error_log *)buf;
-        if (err->extended && err->extended_log_length) {
+        extended_log_length = rtas_error_extended_log_length(err);
+        if (rtas_error_extended(err) && extended_log_length) {
 
                 /* extended header */
-                len += err->extended_log_length;
+                len += extended_log_length;
         }
 
         if (rtas_error_log_max == 0)
@@ -293,15 +295,13 @@ void prrn_schedule_update(u32 scope)
 
 static void handle_rtas_event(const struct rtas_error_log *log)
 {
-        if (log->type == RTAS_TYPE_PRRN) {
-                /* For PRRN Events the extended log length is used to denote
-                 * the scope for calling rtas update-nodes.
-                 */
-                if (prrn_is_enabled())
-                        prrn_schedule_update(log->extended_log_length);
-        }
+        if (rtas_error_type(log) != RTAS_TYPE_PRRN || !prrn_is_enabled())
+                return;
 
-        return;
+        /* For PRRN Events the extended log length is used to denote
+         * the scope for calling rtas update-nodes.
+         */
+        prrn_schedule_update(rtas_error_extended_log_length(log));
 }
 
 #else
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index bc76cc6b419c..79b7612ac6fa 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -76,6 +76,9 @@ EXPORT_SYMBOL(ppc_md);
 struct machdep_calls *machine_id;
 EXPORT_SYMBOL(machine_id);
 
+int boot_cpuid = -1;
+EXPORT_SYMBOL_GPL(boot_cpuid);
+
 unsigned long klimit = (unsigned long) _end;
 
 char cmd_line[COMMAND_LINE_SIZE];
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 04cc4fcca78b..ea4fda60e57b 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -44,8 +44,6 @@
 
 extern void bootx_init(unsigned long r4, unsigned long phys);
 
-int boot_cpuid = -1;
-EXPORT_SYMBOL_GPL(boot_cpuid);
 int boot_cpuid_phys;
 EXPORT_SYMBOL_GPL(boot_cpuid_phys);
 
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 4933909cc5c0..fbe24377eda3 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -74,7 +74,6 @@
 #define DBG(fmt...)
 #endif
 
-int boot_cpuid = 0;
 int spinning_secondaries;
 u64 ppc64_pft_size;
 
@@ -196,6 +195,19 @@ static void fixup_boot_paca(void)
         get_paca()->data_offset = 0;
 }
 
+static void cpu_ready_for_interrupts(void)
+{
+        /* Set IR and DR in PACA MSR */
+        get_paca()->kernel_msr = MSR_KERNEL;
+
+        /* Enable AIL if supported */
+        if (cpu_has_feature(CPU_FTR_HVMODE) &&
+            cpu_has_feature(CPU_FTR_ARCH_207S)) {
+                unsigned long lpcr = mfspr(SPRN_LPCR);
+                mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);
+        }
+}
+
 /*
  * Early initialization entry point. This is called by head.S
  * with MMU translation disabled. We rely on the "feature" of
@@ -262,6 +274,14 @@ void __init early_setup(unsigned long dt_ptr)
         /* Initialize the hash table or TLB handling */
         early_init_mmu();
 
+        /*
+         * At this point, we can let interrupts switch to virtual mode
+         * (the MMU has been setup), so adjust the MSR in the PACA to
+         * have IR and DR set and enable AIL if it exists
+         */
+        cpu_ready_for_interrupts();
+
+        /* Reserve large chunks of memory for use by CMA for KVM */
         kvm_cma_reserve();
 
         /*
@@ -294,6 +314,13 @@ void early_setup_secondary(void)
 
         /* Initialize the hash table or TLB handling */
         early_init_mmu_secondary();
+
+        /*
+         * At this point, we can let interrupts switch to virtual mode
+         * (the MMU has been setup), so adjust the MSR in the PACA to
+         * have IR and DR set.
+         */
+        cpu_ready_for_interrupts();
 }
 
 #endif /* CONFIG_SMP */
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index a67e00aa3caa..4e47db686b5d 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -881,6 +881,8 @@ static long restore_tm_user_regs(struct pt_regs *regs,
          * transactional versions should be loaded.
          */
         tm_enable();
+        /* Make sure the transaction is marked as failed */
+        current->thread.tm_texasr |= TEXASR_FS;
         /* This loads the checkpointed FP/VEC state, if used */
         tm_recheckpoint(&current->thread, msr);
         /* Get the top half of the MSR */
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 8d253c29649b..d501dc4dc3e6 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -527,6 +527,8 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
         }
 #endif
         tm_enable();
+        /* Make sure the transaction is marked as failed */
+        current->thread.tm_texasr |= TEXASR_FS;
         /* This loads the checkpointed FP/VEC state, if used */
         tm_recheckpoint(&current->thread, msr);
 
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index ef47bcbd4352..03567c05950a 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -307,7 +307,7 @@ dont_backup_fp:
          *      Call with IRQs off, stacks get all out of sync for
          *      some periods in here!
          */
-_GLOBAL(tm_recheckpoint)
+_GLOBAL(__tm_recheckpoint)
         mfcr    r5
         mflr    r0
         stw     r5, 8(r1)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index df86f0ce2d36..1bd7ca298fa1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1868,6 +1868,7 @@ struct ppc_emulated ppc_emulated = {
 #ifdef CONFIG_PPC64
         WARN_EMULATED_SETUP(mfdscr),
         WARN_EMULATED_SETUP(mtdscr),
+        WARN_EMULATED_SETUP(lq_stq),
 #endif
 };
 
diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c
index dbce92e4f046..44b0fc8214f4 100644
--- a/arch/powerpc/math-emu/mtfsf.c
+++ b/arch/powerpc/math-emu/mtfsf.c
@@ -11,48 +11,36 @@ mtfsf(unsigned int FM, u32 *frB)
         u32 mask;
         u32 fpscr;
 
-        if (FM == 0)
-                return 0;
-
-        if (FM == 0xff)
-                mask = 0x9fffffff;
+        if (likely(FM == 1))
+                mask = 0x0f;
+        else if (likely(FM == 0xff))
+                mask = ~0;
         else {
-                mask = 0;
-                if (FM & (1 << 0))
-                        mask |= 0x90000000;
-                if (FM & (1 << 1))
-                        mask |= 0x0f000000;
-                if (FM & (1 << 2))
-                        mask |= 0x00f00000;
-                if (FM & (1 << 3))
-                        mask |= 0x000f0000;
-                if (FM & (1 << 4))
-                        mask |= 0x0000f000;
-                if (FM & (1 << 5))
-                        mask |= 0x00000f00;
-                if (FM & (1 << 6))
-                        mask |= 0x000000f0;
-                if (FM & (1 << 7))
-                        mask |= 0x0000000f;
+                mask = ((FM & 1) |
+                                ((FM << 3) & 0x10) |
+                                ((FM << 6) & 0x100) |
+                                ((FM << 9) & 0x1000) |
+                                ((FM << 12) & 0x10000) |
+                                ((FM << 15) & 0x100000) |
+                                ((FM << 18) & 0x1000000) |
+                                ((FM << 21) & 0x10000000)) * 15;
         }
 
-        __FPU_FPSCR &= ~(mask);
-        __FPU_FPSCR |= (frB[1] & mask);
+        fpscr = ((__FPU_FPSCR & ~mask) | (frB[1] & mask)) &
+                ~(FPSCR_VX | FPSCR_FEX | 0x800);
 
-        __FPU_FPSCR &= ~(FPSCR_VX);
-        if (__FPU_FPSCR & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
+        if (fpscr & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
                      FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
                      FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
-                __FPU_FPSCR |= FPSCR_VX;
-
-        fpscr = __FPU_FPSCR;
-        fpscr &= ~(FPSCR_FEX);
-        if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
-            ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
-            ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
-            ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
-            ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
+                fpscr |= FPSCR_VX;
+
+        /* The bit order of exception enables and exception status
+         * is the same. Simply shift and mask to check for enabled
+         * exceptions.
+         */
+        if (fpscr & (fpscr >> 22) &  0xf8)
                 fpscr |= FPSCR_FEX;
+
         __FPU_FPSCR = fpscr;
 
 #ifdef DEBUG
diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c
index c5f734e20b0f..d8746684f606 100644
--- a/arch/powerpc/mm/gup.c
+++ b/arch/powerpc/mm/gup.c
@@ -36,6 +36,11 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,
         do {
                 pte_t pte = ACCESS_ONCE(*ptep);
                 struct page *page;
+                /*
+                 * Similar to the PMD case, NUMA hinting must take slow path
+                 */
+                if (pte_numa(pte))
+                        return 0;
 
                 if ((pte_val(pte) & mask) != result)
                         return 0;
@@ -75,6 +80,14 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,
                 if (pmd_none(pmd) || pmd_trans_splitting(pmd))
                         return 0;
                 if (pmd_huge(pmd) || pmd_large(pmd)) {
+                        /*
+                         * NUMA hinting faults need to be handled in the GUP
+                         * slowpath for accounting purposes and so that they
+                         * can be serialised against THP migration.
+                         */
+                        if (pmd_numa(pmd))
+                                return 0;
+
                         if (!gup_hugepte((pte_t *)pmdp, PMD_SIZE, addr, next,
                                          write, pages, nr))
                                 return 0;
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 30a42e24bf14..4ebbb9e99286 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1591,6 +1591,20 @@ int arch_update_cpu_topology(void)
                 cpu = cpu_last_thread_sibling(cpu);
         }
 
+        /*
+         * In cases where we have nothing to update (because the updates list
+         * is too short or because the new topology is same as the old one),
+         * skip invoking update_cpu_topology() via stop-machine(). This is
+         * necessary (and not just a fast-path optimization) since stop-machine
+         * can end up electing a random CPU to run update_cpu_topology(), and
+         * thus trick us into setting up incorrect cpu-node mappings (since
+         * 'updates' is kzalloc()'ed).
+         *
+         * And for the similar reason, we will skip all the following updating.
+         */
+        if (!cpumask_weight(&updated_cpus))
+                goto out;
+
         stop_machine(update_cpu_topology, &updates[0], &updated_cpus);
 
         /*
@@ -1612,6 +1626,7 @@ int arch_update_cpu_topology(void)
                 changed = 1;
         }
 
+out:
         kfree(updates);
         return changed;
 }
diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
index 3844f1397fc3..38e0a1a5cec3 100644
--- a/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -170,7 +170,7 @@ EXPORT_SYMBOL_GPL(register_spu_syscalls);
 void unregister_spu_syscalls(struct spufs_calls *calls)
 {
         BUG_ON(spufs_calls->owner != calls->owner);
-        rcu_assign_pointer(spufs_calls, NULL);
+        RCU_INIT_POINTER(spufs_calls, NULL);
         synchronize_rcu();
 }
 EXPORT_SYMBOL_GPL(unregister_spu_syscalls);
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index 895e8a20a3fc..c252ee95bddf 100644
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
@@ -11,6 +11,12 @@ config PPC_POWERNV
         select PPC_UDBG_16550
         select PPC_SCOM
         select ARCH_RANDOM
+        select CPU_FREQ
+        select CPU_FREQ_GOV_PERFORMANCE
+        select CPU_FREQ_GOV_POWERSAVE
+        select CPU_FREQ_GOV_USERSPACE
+        select CPU_FREQ_GOV_ONDEMAND
+        select CPU_FREQ_GOV_CONSERVATIVE
         default y
 
 config PPC_POWERNV_RTAS
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index f324ea099503..63cebb9b4d45 100644
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,6 +1,7 @@
 obj-y                   += setup.o opal-takeover.o opal-wrappers.o opal.o opal-async.o
 obj-y                   += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
 obj-y                   += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
+obj-y                   += opal-msglog.o
 
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_PCI)       += pci.o pci-p5ioc2.o pci-ioda.o
diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c
index cd0c1354d404..32e2adfa5320 100644
--- a/arch/powerpc/platforms/powernv/opal-async.c
+++ b/arch/powerpc/platforms/powernv/opal-async.c
@@ -125,14 +125,15 @@ static int opal_async_comp_event(struct notifier_block *nb,
 {
         struct opal_msg *comp_msg = msg;
         unsigned long flags;
+        uint64_t token;
 
         if (msg_type != OPAL_MSG_ASYNC_COMP)
                 return 0;
 
-        memcpy(&opal_async_responses[comp_msg->params[0]], comp_msg,
-                        sizeof(*comp_msg));
+        token = be64_to_cpu(comp_msg->params[0]);
+        memcpy(&opal_async_responses[token], comp_msg, sizeof(*comp_msg));
         spin_lock_irqsave(&opal_async_comp_lock, flags);
-        __set_bit(comp_msg->params[0], opal_async_complete_map);
+        __set_bit(token, opal_async_complete_map);
         spin_unlock_irqrestore(&opal_async_comp_lock, flags);
 
         wake_up(&opal_async_wait);
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
index 0c767c561dc9..b9827b0d87e4 100644
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -86,19 +86,14 @@ static int64_t dump_send_ack(uint32_t dump_id)
         return rc;
 }
 
-static void delay_release_kobj(void *kobj)
-{
-        kobject_put((struct kobject *)kobj);
-}
-
 static ssize_t dump_ack_store(struct dump_obj *dump_obj,
                               struct dump_attribute *attr,
                               const char *buf,
                               size_t count)
 {
         dump_send_ack(dump_obj->id);
-        sysfs_schedule_callback(&dump_obj->kobj, delay_release_kobj,
-                                &dump_obj->kobj, THIS_MODULE);
+        sysfs_remove_file_self(&dump_obj->kobj, &attr->attr);
+        kobject_put(&dump_obj->kobj);
         return count;
 }
 
diff --git a/arch/powerpc/platforms/powernv/opal-elog.c b/arch/powerpc/platforms/powernv/opal-elog.c
index 1d7355bc9db0..ef7bc2a97862 100644
--- a/arch/powerpc/platforms/powernv/opal-elog.c
+++ b/arch/powerpc/platforms/powernv/opal-elog.c
@@ -70,19 +70,14 @@ static ssize_t elog_ack_show(struct elog_obj *elog_obj,
         return sprintf(buf, "ack - acknowledge log message\n");
 }
 
-static void delay_release_kobj(void *kobj)
-{
-        kobject_put((struct kobject *)kobj);
-}
-
 static ssize_t elog_ack_store(struct elog_obj *elog_obj,
                               struct elog_attribute *attr,
                               const char *buf,
                               size_t count)
 {
         opal_send_ack_elog(elog_obj->id);
-        sysfs_schedule_callback(&elog_obj->kobj, delay_release_kobj,
-                                &elog_obj->kobj, THIS_MODULE);
+        sysfs_remove_file_self(&elog_obj->kobj, &attr->attr);
+        kobject_put(&elog_obj->kobj);
         return count;
 }
 
diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/platforms/powernv/opal-msglog.c
new file mode 100644
index 000000000000..1bb25b952504
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-msglog.c
@@ -0,0 +1,120 @@
+/*
+ * PowerNV OPAL in-memory console interface
+ *
+ * Copyright 2014 IBM Corp.
+ *
+ * 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 <asm/io.h>
+#include <asm/opal.h>
+#include <linux/debugfs.h>
+#include <linux/of.h>
+#include <linux/types.h>
+#include <asm/barrier.h>
+
+/* OPAL in-memory console. Defined in OPAL source at core/console.c */
+struct memcons {
+        __be64 magic;
+#define MEMCONS_MAGIC   0x6630696567726173L
+        __be64 obuf_phys;
+        __be64 ibuf_phys;
+        __be32 obuf_size;
+        __be32 ibuf_size;
+        __be32 out_pos;
+#define MEMCONS_OUT_POS_WRAP    0x80000000u
+#define MEMCONS_OUT_POS_MASK    0x00ffffffu
+        __be32 in_prod;
+        __be32 in_cons;
+};
+
+static ssize_t opal_msglog_read(struct file *file, struct kobject *kobj,
+                                struct bin_attribute *bin_attr, char *to,
+                                loff_t pos, size_t count)
+{
+        struct memcons *mc = bin_attr->private;
+        const char *conbuf;
+        size_t ret, first_read = 0;
+        uint32_t out_pos, avail;
+
+        if (!mc)
+                return -ENODEV;
+
+        out_pos = be32_to_cpu(ACCESS_ONCE(mc->out_pos));
+
+        /* Now we've read out_pos, put a barrier in before reading the new
+         * data it points to in conbuf. */
+        smp_rmb();
+
+        conbuf = phys_to_virt(be64_to_cpu(mc->obuf_phys));
+
+        /* When the buffer has wrapped, read from the out_pos marker to the end
+         * of the buffer, and then read the remaining data as in the un-wrapped
+         * case. */
+        if (out_pos & MEMCONS_OUT_POS_WRAP) {
+
+                out_pos &= MEMCONS_OUT_POS_MASK;
+                avail = be32_to_cpu(mc->obuf_size) - out_pos;
+
+                ret = memory_read_from_buffer(to, count, &pos,
+                                conbuf + out_pos, avail);
+
+                if (ret < 0)
+                        goto out;
+
+                first_read = ret;
+                to += first_read;
+                count -= first_read;
+                pos -= avail;
+        }
+
+        /* Sanity check. The firmware should not do this to us. */
+        if (out_pos > be32_to_cpu(mc->obuf_size)) {
+                pr_err("OPAL: memory console corruption. Aborting read.\n");
+                return -EINVAL;
+        }
+
+        ret = memory_read_from_buffer(to, count, &pos, conbuf, out_pos);
+
+        if (ret < 0)
+                goto out;
+
+        ret += first_read;
+out:
+        return ret;
+}
+
+static struct bin_attribute opal_msglog_attr = {
+        .attr = {.name = "msglog", .mode = 0444},
+        .read = opal_msglog_read
+};
+
+void __init opal_msglog_init(void)
+{
+        u64 mcaddr;
+        struct memcons *mc;
+
+        if (of_property_read_u64(opal_node, "ibm,opal-memcons", &mcaddr)) {
+                pr_warn("OPAL: Property ibm,opal-memcons not found, no message log\n");
+                return;
+        }
+
+        mc = phys_to_virt(mcaddr);
+        if (!mc) {
+                pr_warn("OPAL: memory console address is invalid\n");
+                return;
+        }
+
+        if (be64_to_cpu(mc->magic) != MEMCONS_MAGIC) {
+                pr_warn("OPAL: memory console version is invalid\n");
+                return;
+        }
+
+        opal_msglog_attr.private = mc;
+
+        if (sysfs_create_bin_file(opal_kobj, &opal_msglog_attr) != 0)
+                pr_warn("OPAL: sysfs file creation failed\n");
+}
diff --git a/arch/powerpc/platforms/powernv/opal-sensor.c b/arch/powerpc/platforms/powernv/opal-sensor.c
index 663cc9c65613..10271ad1fac4 100644
--- a/arch/powerpc/platforms/powernv/opal-sensor.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor.c
@@ -33,6 +33,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
 {
         int ret, token;
         struct opal_msg msg;
+        __be32 data;
 
         token = opal_async_get_token_interruptible();
         if (token < 0) {
@@ -42,7 +43,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
         }
 
         mutex_lock(&opal_sensor_mutex);
-        ret = opal_sensor_read(sensor_hndl, token, sensor_data);
+        ret = opal_sensor_read(sensor_hndl, token, &data);
         if (ret != OPAL_ASYNC_COMPLETION)
                 goto out_token;
 
@@ -53,7 +54,8 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
                 goto out_token;
         }
 
-        ret = msg.params[1];
+        *sensor_data = be32_to_cpu(data);
+        ret = be64_to_cpu(msg.params[1]);
 
 out_token:
         mutex_unlock(&opal_sensor_mutex);
diff --git a/arch/powerpc/platforms/powernv/opal-sysparam.c b/arch/powerpc/platforms/powernv/opal-sysparam.c
index 0bd249a26f30..6b614726baf2 100644
--- a/arch/powerpc/platforms/powernv/opal-sysparam.c
+++ b/arch/powerpc/platforms/powernv/opal-sysparam.c
@@ -64,7 +64,7 @@ static int opal_get_sys_param(u32 param_id, u32 length, void *buffer)
                 goto out_token;
         }
 
-        ret = msg.params[1];
+        ret = be64_to_cpu(msg.params[1]);
 
 out_token:
         opal_async_release_token(token);
@@ -98,7 +98,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer)
                 goto out_token;
         }
 
-        ret = msg.params[1];
+        ret = be64_to_cpu(msg.params[1]);
 
 out_token:
         opal_async_release_token(token);
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index bb90f9a4e027..f531ffe35b3e 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -61,6 +61,7 @@ _STATIC(opal_return)
         mtcr    r4;
         rfid
 
+OPAL_CALL(opal_invalid_call,                    OPAL_INVALID_CALL);
 OPAL_CALL(opal_console_write,                   OPAL_CONSOLE_WRITE);
 OPAL_CALL(opal_console_read,                    OPAL_CONSOLE_READ);
 OPAL_CALL(opal_console_write_buffer_space,      OPAL_CONSOLE_WRITE_BUFFER_SPACE);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index e92f2f67640f..49d2f00019e5 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -46,7 +46,7 @@ struct mcheck_recoverable_range {
 static struct mcheck_recoverable_range *mc_recoverable_range;
 static int mc_recoverable_range_len;
 
-static struct device_node *opal_node;
+struct device_node *opal_node;
 static DEFINE_SPINLOCK(opal_write_lock);
 extern u64 opal_mc_secondary_handler[];
 static unsigned int *opal_irqs;
@@ -102,13 +102,13 @@ int __init early_init_dt_scan_opal(unsigned long node,
 int __init early_init_dt_scan_recoverable_ranges(unsigned long node,
                                    const char *uname, int depth, void *data)
 {
-        unsigned long i, size;
+        unsigned long i, psize, size;
         const __be32 *prop;
 
         if (depth != 1 || strcmp(uname, "ibm,opal") != 0)
                 return 0;
 
-        prop = of_get_flat_dt_prop(node, "mcheck-recoverable-ranges", &size);
+        prop = of_get_flat_dt_prop(node, "mcheck-recoverable-ranges", &psize);
 
         if (!prop)
                 return 1;
@@ -116,6 +116,23 @@ int __init early_init_dt_scan_recoverable_ranges(unsigned long node,
         pr_debug("Found machine check recoverable ranges.\n");
 
         /*
+         * Calculate number of available entries.
+         *
+         * Each recoverable address range entry is (start address, len,
+         * recovery address), 2 cells each for start and recovery address,
+         * 1 cell for len, totalling 5 cells per entry.
+         */
+        mc_recoverable_range_len = psize / (sizeof(*prop) * 5);
+
+        /* Sanity check */
+        if (!mc_recoverable_range_len)
+                return 1;
+
+        /* Size required to hold all the entries. */
+        size = mc_recoverable_range_len *
+                        sizeof(struct mcheck_recoverable_range);
+
+        /*
          * Allocate a buffer to hold the MC recoverable ranges. We would be
          * accessing them in real mode, hence it needs to be within
          * RMO region.
@@ -124,11 +141,7 @@ int __init early_init_dt_scan_recoverable_ranges(unsigned long node,
                                                         ppc64_rma_size));
         memset(mc_recoverable_range, 0, size);
 
-        /*
-         * Each recoverable address entry is an (start address,len,
-         * recover address) pair, * 2 cells each, totalling 4 cells per entry.
-         */
-        for (i = 0; i < size / (sizeof(*prop) * 5); i++) {
+        for (i = 0; i < mc_recoverable_range_len; i++) {
                 mc_recoverable_range[i].start_addr =
                                         of_read_number(prop + (i * 5) + 0, 2);
                 mc_recoverable_range[i].end_addr =
@@ -142,7 +155,6 @@ int __init early_init_dt_scan_recoverable_ranges(unsigned long node,
                                 mc_recoverable_range[i].end_addr,
                                 mc_recoverable_range[i].recover_addr);
         }
-        mc_recoverable_range_len = i;
         return 1;
 }
 
@@ -180,6 +192,20 @@ int opal_notifier_register(struct notifier_block *nb)
         atomic_notifier_chain_register(&opal_notifier_head, nb);
         return 0;
 }
+EXPORT_SYMBOL_GPL(opal_notifier_register);
+
+int opal_notifier_unregister(struct notifier_block *nb)
+{
+        if (!nb) {
+                pr_warning("%s: Invalid argument (%p)\n",
+                           __func__, nb);
+                return -EINVAL;
+        }
+
+        atomic_notifier_chain_unregister(&opal_notifier_head, nb);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(opal_notifier_unregister);
 
 static void opal_do_notifier(uint64_t events)
 {
@@ -267,6 +293,7 @@ static void opal_handle_message(void)
          * value in /proc/device-tree.
          */
         static struct opal_msg msg;
+        u32 type;
 
         ret = opal_get_msg(__pa(&msg), sizeof(msg));
         /* No opal message pending. */
@@ -280,13 +307,14 @@ static void opal_handle_message(void)
                 return;
         }
 
+        type = be32_to_cpu(msg.msg_type);
+
         /* Sanity check */
-        if (msg.msg_type > OPAL_MSG_TYPE_MAX) {
-                pr_warning("%s: Unknown message type: %u\n",
-                                __func__, msg.msg_type);
+        if (type > OPAL_MSG_TYPE_MAX) {
+                pr_warning("%s: Unknown message type: %u\n", __func__, type);
                 return;
         }
-        opal_message_do_notify(msg.msg_type, (void *)&msg);
+        opal_message_do_notify(type, (void *)&msg);
 }
 
 static int opal_message_notify(struct notifier_block *nb,
@@ -574,6 +602,8 @@ static int __init opal_init(void)
                 opal_platform_dump_init();
                 /* Setup system parameters interface */
                 opal_sys_param_init();
+                /* Setup message log interface. */
+                opal_msglog_init();
         }
 
         return 0;
@@ -605,3 +635,6 @@ void opal_shutdown(void)
                         mdelay(10);
         }
 }
+
+/* Export this so that test modules can use it */
+EXPORT_SYMBOL_GPL(opal_invalid_call);
diff --git a/arch/powerpc/platforms/pseries/io_event_irq.c b/arch/powerpc/platforms/pseries/io_event_irq.c
index 5ea88d1541f7..0240c4ff878a 100644
--- a/arch/powerpc/platforms/pseries/io_event_irq.c
+++ b/arch/powerpc/platforms/pseries/io_event_irq.c
@@ -82,9 +82,9 @@ static struct pseries_io_event * ioei_find_event(struct rtas_error_log *elog)
          * RTAS_TYPE_IO only exists in extended event log version 6 or later.
          * No need to check event log version.
          */
-        if (unlikely(elog->type != RTAS_TYPE_IO)) {
-                printk_once(KERN_WARNING "io_event_irq: Unexpected event type %d",
-                            elog->type);
+        if (unlikely(rtas_error_type(elog) != RTAS_TYPE_IO)) {
+                printk_once(KERN_WARNING"io_event_irq: Unexpected event type %d",
+                            rtas_error_type(elog));
                 return NULL;
         }
 
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index d7096f2f7751..0cc240b7f694 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -298,13 +298,13 @@ int nvram_write_os_partition(struct nvram_os_partition *part, char * buff,
 
         rc = ppc_md.nvram_write((char *)&info, sizeof(struct err_log_info), &tmp_index);
         if (rc <= 0) {
-                pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+                pr_err("%s: Failed nvram_write (%d)\n", __func__, rc);
                 return rc;
         }
 
         rc = ppc_md.nvram_write(buff, length, &tmp_index);
         if (rc <= 0) {
-                pr_err("%s: Failed nvram_write (%d)\n", __FUNCTION__, rc);
+                pr_err("%s: Failed nvram_write (%d)\n", __func__, rc);
                 return rc;
         }
         
@@ -351,15 +351,14 @@ int nvram_read_partition(struct nvram_os_partition *part, char *buff,
                                         sizeof(struct err_log_info),
                                         &tmp_index);
                 if (rc <= 0) {
-                        pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__,
-                                                                        rc);
+                        pr_err("%s: Failed nvram_read (%d)\n", __func__, rc);
                         return rc;
                 }
         }
 
         rc = ppc_md.nvram_read(buff, length, &tmp_index);
         if (rc <= 0) {
-                pr_err("%s: Failed nvram_read (%d)\n", __FUNCTION__, rc);
+                pr_err("%s: Failed nvram_read (%d)\n", __func__, rc);
                 return rc;
         }
 
@@ -869,7 +868,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
                 break;
         default:
                 pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
-                                                __FUNCTION__, (int) reason);
+                       __func__, (int) reason);
                 return;
         }
 
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 721c0586b284..9c5778e6ed4b 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -236,7 +236,8 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
 
         rtas_elog = (struct rtas_error_log *)ras_log_buf;
 
-        if ((status == 0) && (rtas_elog->severity >= RTAS_SEVERITY_ERROR_SYNC))
+        if (status == 0 &&
+            rtas_error_severity(rtas_elog) >= RTAS_SEVERITY_ERROR_SYNC)
                 fatal = 1;
         else
                 fatal = 0;
@@ -300,13 +301,14 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs)
 
         /* If it isn't an extended log we can use the per cpu 64bit buffer */
         h = (struct rtas_error_log *)&savep[1];
-        if (!h->extended) {
+        if (!rtas_error_extended(h)) {
                 memcpy(&__get_cpu_var(mce_data_buf), h, sizeof(__u64));
                 errhdr = (struct rtas_error_log *)&__get_cpu_var(mce_data_buf);
         } else {
-                int len;
+                int len, error_log_length;
 
-                len = max_t(int, 8+h->extended_log_length, RTAS_ERROR_LOG_MAX);
+                error_log_length = 8 + rtas_error_extended_log_length(h);
+                len = max_t(int, error_log_length, RTAS_ERROR_LOG_MAX);
                 memset(global_mce_data_buf, 0, RTAS_ERROR_LOG_MAX);
                 memcpy(global_mce_data_buf, h, len);
                 errhdr = (struct rtas_error_log *)global_mce_data_buf;
@@ -350,23 +352,24 @@ int pSeries_system_reset_exception(struct pt_regs *regs)
 static int recover_mce(struct pt_regs *regs, struct rtas_error_log *err)
 {
         int recovered = 0;
+        int disposition = rtas_error_disposition(err);
 
         if (!(regs->msr & MSR_RI)) {
                 /* If MSR_RI isn't set, we cannot recover */
                 recovered = 0;
 
-        } else if (err->disposition == RTAS_DISP_FULLY_RECOVERED) {
+        } else if (disposition == RTAS_DISP_FULLY_RECOVERED) {
                 /* Platform corrected itself */
                 recovered = 1;
 
-        } else if (err->disposition == RTAS_DISP_LIMITED_RECOVERY) {
+        } else if (disposition == RTAS_DISP_LIMITED_RECOVERY) {
                 /* Platform corrected itself but could be degraded */
                 printk(KERN_ERR "MCE: limited recovery, system may "
                        "be degraded\n");
                 recovered = 1;
 
         } else if (user_mode(regs) && !is_global_init(current) &&
-                   err->severity == RTAS_SEVERITY_ERROR_SYNC) {
+                   rtas_error_severity(err) == RTAS_SEVERITY_ERROR_SYNC) {
 
                 /*
                  * If we received a synchronous error when in userspace
diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c
index 8ba60424be95..2ff630267e9e 100644
--- a/arch/powerpc/sysdev/msi_bitmap.c
+++ b/arch/powerpc/sysdev/msi_bitmap.c
@@ -202,7 +202,7 @@ void __init test_of_node(void)
 
         /* There should really be a struct device_node allocator */
         memset(&of_node, 0, sizeof(of_node));
-        kref_init(&of_node.kobj.kref);
+        of_node_init(&of_node);
         of_node.full_name = node_name;
 
         check(0 == msi_bitmap_alloc(&bmp, size, &of_node));
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 346d21678ffd..d68fe34799b0 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -103,6 +103,7 @@ config S390
         select GENERIC_SMP_IDLE_THREAD
         select GENERIC_TIME_VSYSCALL
         select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+        select HAVE_ARCH_AUDITSYSCALL
         select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_ARCH_TRACEHOOK
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index ddaae2f5c913..8df022c43af7 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -581,7 +581,6 @@ CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index cd29d2f4e4f3..777687055e7b 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -12,7 +12,7 @@
 #ifndef _ASM_SYSCALL_H
 #define _ASM_SYSCALL_H  1
 
-#include <linux/audit.h>
+#include <uapi/linux/audit.h>
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <asm/ptrace.h>
@@ -89,11 +89,10 @@ static inline void syscall_set_arguments(struct task_struct *task,
                 regs->orig_gpr2 = args[0];
 }
 
-static inline int syscall_get_arch(struct task_struct *task,
-                                   struct pt_regs *regs)
+static inline int syscall_get_arch(void)
 {
 #ifdef CONFIG_COMPAT
-        if (test_tsk_thread_flag(task, TIF_31BIT))
+        if (test_tsk_thread_flag(current, TIF_31BIT))
                 return AUDIT_ARCH_S390;
 #endif
         return sizeof(long) == 8 ? AUDIT_ARCH_S390X : AUDIT_ARCH_S390;
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index ba55e939a820..834b67c4db5a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -42,6 +42,7 @@ config SUPERH
         select MODULES_USE_ELF_RELA
         select OLD_SIGSUSPEND
         select OLD_SIGACTION
+        select HAVE_ARCH_AUDITSYSCALL
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 4e5229b0c5bb..47236573db83 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_defconfig
@@ -128,7 +128,6 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_SG=y
 CONFIG_FRAME_POINTER=y
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 7d8b7e94b93b..29f2e988c56a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -77,6 +77,7 @@ config SPARC64
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select HAVE_C_RECORDMCOUNT
         select NO_BOOTMEM
+        select HAVE_ARCH_AUDITSYSCALL
 
 config ARCH_DEFCONFIG
         string
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 21ca44c4f6d5..6915d28cf118 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -1,6 +1,7 @@
 config UML
         bool
         default y
+        select HAVE_ARCH_AUDITSYSCALL
         select HAVE_UID16
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5b8ec0f53b57..25d2c6f7325e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -129,6 +129,7 @@ config X86
         select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
         select HAVE_CC_STACKPROTECTOR
         select GENERIC_CPU_AUTOPROBE
+        select HAVE_ARCH_AUDITSYSCALL
 
 config INSTRUCTION_DECODER
         def_bool y
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 3b9348a0c1a4..602f57e590b5 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -108,7 +108,7 @@ else
 
         # this works around some issues with generating unwind tables in older gccs
         # newer gccs do it by default
-        KBUILD_CFLAGS += -maccumulate-outgoing-args
+        KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
 endif
 
 # Make sure compiler does not have buggy stack-protector support.
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 1e6146137f8e..4703a6c4b8e3 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -112,7 +112,7 @@ __file_size64(void *__fh, efi_char16_t *filename_16,
         efi_file_info_t *info;
         efi_status_t status;
         efi_guid_t info_guid = EFI_FILE_INFO_ID;
-        u32 info_sz;
+        u64 info_sz;
 
         status = efi_early->call((unsigned long)fh->open, fh, &h, filename_16,
                                  EFI_FILE_MODE_READ, (u64)0);
@@ -167,31 +167,31 @@ efi_file_size(efi_system_table_t *sys_table, void *__fh,
 }
 
 static inline efi_status_t
-efi_file_read(void *__fh, void *handle, unsigned long *size, void *addr)
+efi_file_read(void *handle, unsigned long *size, void *addr)
 {
         unsigned long func;
 
         if (efi_early->is64) {
-                efi_file_handle_64_t *fh = __fh;
+                efi_file_handle_64_t *fh = handle;
 
                 func = (unsigned long)fh->read;
                 return efi_early->call(func, handle, size, addr);
         } else {
-                efi_file_handle_32_t *fh = __fh;
+                efi_file_handle_32_t *fh = handle;
 
                 func = (unsigned long)fh->read;
                 return efi_early->call(func, handle, size, addr);
         }
 }
 
-static inline efi_status_t efi_file_close(void *__fh, void *handle)
+static inline efi_status_t efi_file_close(void *handle)
 {
         if (efi_early->is64) {
-                efi_file_handle_64_t *fh = __fh;
+                efi_file_handle_64_t *fh = handle;
 
                 return efi_early->call((unsigned long)fh->close, handle);
         } else {
-                efi_file_handle_32_t *fh = __fh;
+                efi_file_handle_32_t *fh = handle;
 
                 return efi_early->call((unsigned long)fh->close, handle);
         }
@@ -1016,6 +1016,9 @@ void setup_graphics(struct boot_params *boot_params)
  * Because the x86 boot code expects to be passed a boot_params we
  * need to create one ourselves (usually the bootloader would create
  * one for us).
+ *
+ * The caller is responsible for filling out ->code32_start in the
+ * returned boot_params.
  */
 struct boot_params *make_boot_params(struct efi_config *c)
 {
@@ -1081,8 +1084,6 @@ struct boot_params *make_boot_params(struct efi_config *c)
         hdr->vid_mode = 0xffff;
         hdr->boot_flag = 0xAA55;
 
-        hdr->code32_start = (__u64)(unsigned long)image->image_base;
-
         hdr->type_of_loader = 0x21;
 
         /* Convert unicode cmdline to ascii */
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index de9d4200d305..cbed1407a5cd 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -59,6 +59,7 @@ ENTRY(efi_pe_entry)
         call    make_boot_params
         cmpl    $0, %eax
         je      fail
+        movl    %esi, BP_code32_start(%eax)
         popl    %ecx
         pushl   %eax
         pushl   %ecx
@@ -90,12 +91,7 @@ fail:
         hlt
         jmp     fail
 2:
-        call    3f
-3:
-        popl    %eax
-        subl    $3b, %eax
-        subl    BP_pref_address(%esi), %eax
-        add     BP_code32_start(%esi), %eax
+        movl    BP_code32_start(%esi), %eax
         leal    preferred_addr(%eax), %eax
         jmp     *%eax
 
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 57e58a5fa210..0d558ee899ae 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -261,6 +261,8 @@ ENTRY(efi_pe_entry)
         cmpq    $0,%rax
         je      fail
         mov     %rax, %rsi
+        leaq    startup_32(%rip), %rax
+        movl    %eax, BP_code32_start(%rsi)
         jmp     2f              /* Skip the relocation */
 
 handover_entry:
@@ -284,12 +286,7 @@ fail:
         hlt
         jmp     fail
 2:
-        call    3f
-3:
-        popq    %rax
-        subq    $3b, %rax
-        subq    BP_pref_address(%rsi), %rax
-        add     BP_code32_start(%esi), %eax
+        movl    BP_code32_start(%esi), %eax
         leaq    preferred_addr(%rax), %rax
         jmp     *%rax
 
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index aea284b41312..d6a756ae04c8 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -13,7 +13,7 @@
 #ifndef _ASM_X86_SYSCALL_H
 #define _ASM_X86_SYSCALL_H
 
-#include <linux/audit.h>
+#include <uapi/linux/audit.h>
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <asm/asm-offsets.h>    /* For NR_syscalls */
@@ -91,8 +91,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
         memcpy(&regs->bx + i, args, n * sizeof(args[0]));
 }
 
-static inline int syscall_get_arch(struct task_struct *task,
-                                   struct pt_regs *regs)
+static inline int syscall_get_arch(void)
 {
         return AUDIT_ARCH_I386;
 }
@@ -221,8 +220,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
                 }
 }
 
-static inline int syscall_get_arch(struct task_struct *task,
-                                   struct pt_regs *regs)
+static inline int syscall_get_arch(void)
 {
 #ifdef CONFIG_IA32_EMULATION
         /*
@@ -234,7 +232,7 @@ static inline int syscall_get_arch(struct task_struct *task,
          *
          * x32 tasks should be considered AUDIT_ARCH_X86_64.
          */
-        if (task_thread_info(task)->status & TS_COMPAT)
+        if (task_thread_info(current)->status & TS_COMPAT)
                 return AUDIT_ARCH_I386;
 #endif
         /* Both x32 and x86_64 are considered "64-bit". */
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index e69182fd01cf..4b28159e0421 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -87,7 +87,9 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)
         num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK;
 
         retval = 0;
-        if (num_cstate_subtype < (cx->address & MWAIT_SUBSTATE_MASK)) {
+        /* If the HW does not support any sub-states in this C-state */
+        if (num_cstate_subtype == 0) {
+                pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx->address, edx_part);
                 retval = -1;
                 goto out;
         }
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 481ae38f6a44..ad28db7e6bde 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1996,7 +1996,8 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
         };
 
         /* First tickle the hardware, only then report what went on. -- REW */
-        apic_write(APIC_ESR, 0);
+        if (lapic_get_maxlvt() > 3)     /* Due to the Pentium erratum 3AP. */
+                apic_write(APIC_ESR, 0);
         v = apic_read(APIC_ESR);
         ack_APIC_irq();
         atomic_inc(&irq_err_count);
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 9b7734b1f975..eeee23ff75ef 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -89,6 +89,9 @@ static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait);
 static DEFINE_PER_CPU(struct mce, mces_seen);
 static int                      cpu_missing;
 
+/* CMCI storm detection filter */
+static DEFINE_PER_CPU(unsigned long, mce_polled_error);
+
 /*
  * MCA banks polled by the period polling timer for corrected events.
  * With Intel CMCI, this only has MCA banks which do not support CMCI (if any).
@@ -595,6 +598,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
 {
         struct mce m;
         int i;
+        unsigned long *v;
 
         this_cpu_inc(mce_poll_count);
 
@@ -614,6 +618,8 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
                 if (!(m.status & MCI_STATUS_VAL))
                         continue;
 
+                v = &get_cpu_var(mce_polled_error);
+                set_bit(0, v);
                 /*
                  * Uncorrected or signalled events are handled by the exception
                  * handler when it is enabled, so don't process those here.
@@ -1278,10 +1284,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
 static unsigned long (*mce_adjust_timer)(unsigned long interval) =
         mce_adjust_timer_default;
 
+static int cmc_error_seen(void)
+{
+        unsigned long *v = &__get_cpu_var(mce_polled_error);
+
+        return test_and_clear_bit(0, v);
+}
+
 static void mce_timer_fn(unsigned long data)
 {
         struct timer_list *t = &__get_cpu_var(mce_timer);
         unsigned long iv;
+        int notify;
 
         WARN_ON(smp_processor_id() != data);
 
@@ -1296,7 +1310,9 @@ static void mce_timer_fn(unsigned long data)
          * polling interval, otherwise increase the polling interval.
          */
         iv = __this_cpu_read(mce_next_interval);
-        if (mce_notify_irq()) {
+        notify = mce_notify_irq();
+        notify |= cmc_error_seen();
+        if (notify) {
                 iv = max(iv / 2, (unsigned long) HZ/100);
         } else {
                 iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index fb6156fee6f7..3bdb95ae8c43 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/sched.h>
+#include <linux/cpumask.h>
 #include <asm/apic.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
@@ -137,6 +138,22 @@ unsigned long mce_intel_adjust_timer(unsigned long interval)
         }
 }
 
+static void cmci_storm_disable_banks(void)
+{
+        unsigned long flags, *owned;
+        int bank;
+        u64 val;
+
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
+        owned = __get_cpu_var(mce_banks_owned);
+        for_each_set_bit(bank, owned, MAX_NR_BANKS) {
+                rdmsrl(MSR_IA32_MCx_CTL2(bank), val);
+                val &= ~MCI_CTL2_CMCI_EN;
+                wrmsrl(MSR_IA32_MCx_CTL2(bank), val);
+        }
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
+}
+
 static bool cmci_storm_detect(void)
 {
         unsigned int cnt = __this_cpu_read(cmci_storm_cnt);
@@ -158,7 +175,7 @@ static bool cmci_storm_detect(void)
         if (cnt <= CMCI_STORM_THRESHOLD)
                 return false;
 
-        cmci_clear();
+        cmci_storm_disable_banks();
         __this_cpu_write(cmci_storm_state, CMCI_STORM_ACTIVE);
         r = atomic_add_return(1, &cmci_storm_on_cpus);
         mce_timer_kick(CMCI_POLL_INTERVAL);
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 6d7d5a1260a6..b0cc3809723d 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -225,7 +225,7 @@ static void __init intel_remapping_check(int num, int slot, int func)
  *
  * And yes, so far on current devices the base addr is always under 4G.
  */
-static u32 __init intel_stolen_base(int num, int slot, int func)
+static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_size)
 {
         u32 base;
 
@@ -244,6 +244,114 @@ static u32 __init intel_stolen_base(int num, int slot, int func)
 #define MB(x)   (KB (KB (x)))
 #define GB(x)   (MB (KB (x)))
 
+static size_t __init i830_tseg_size(void)
+{
+        u8 tmp = read_pci_config_byte(0, 0, 0, I830_ESMRAMC);
+
+        if (!(tmp & TSEG_ENABLE))
+                return 0;
+
+        if (tmp & I830_TSEG_SIZE_1M)
+                return MB(1);
+        else
+                return KB(512);
+}
+
+static size_t __init i845_tseg_size(void)
+{
+        u8 tmp = read_pci_config_byte(0, 0, 0, I845_ESMRAMC);
+
+        if (!(tmp & TSEG_ENABLE))
+                return 0;
+
+        switch (tmp & I845_TSEG_SIZE_MASK) {
+        case I845_TSEG_SIZE_512K:
+                return KB(512);
+        case I845_TSEG_SIZE_1M:
+                return MB(1);
+        default:
+                WARN_ON(1);
+                return 0;
+        }
+}
+
+static size_t __init i85x_tseg_size(void)
+{
+        u8 tmp = read_pci_config_byte(0, 0, 0, I85X_ESMRAMC);
+
+        if (!(tmp & TSEG_ENABLE))
+                return 0;
+
+        return MB(1);
+}
+
+static size_t __init i830_mem_size(void)
+{
+        return read_pci_config_byte(0, 0, 0, I830_DRB3) * MB(32);
+}
+
+static size_t __init i85x_mem_size(void)
+{
+        return read_pci_config_byte(0, 0, 1, I85X_DRB3) * MB(32);
+}
+
+/*
+ * On 830/845/85x the stolen memory base isn't available in any
+ * register. We need to calculate it as TOM-TSEG_SIZE-stolen_size.
+ */
+static u32 __init i830_stolen_base(int num, int slot, int func, size_t stolen_size)
+{
+        return i830_mem_size() - i830_tseg_size() - stolen_size;
+}
+
+static u32 __init i845_stolen_base(int num, int slot, int func, size_t stolen_size)
+{
+        return i830_mem_size() - i845_tseg_size() - stolen_size;
+}
+
+static u32 __init i85x_stolen_base(int num, int slot, int func, size_t stolen_size)
+{
+        return i85x_mem_size() - i85x_tseg_size() - stolen_size;
+}
+
+static u32 __init i865_stolen_base(int num, int slot, int func, size_t stolen_size)
+{
+        /*
+         * FIXME is the graphics stolen memory region
+         * always at TOUD? Ie. is it always the last
+         * one to be allocated by the BIOS?
+         */
+        return read_pci_config_16(0, 0, 0, I865_TOUD) << 16;
+}
+
+static size_t __init i830_stolen_size(int num, int slot, int func)
+{
+        size_t stolen_size;
+        u16 gmch_ctrl;
+
+        gmch_ctrl = read_pci_config_16(0, 0, 0, I830_GMCH_CTRL);
+
+        switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+        case I830_GMCH_GMS_STOLEN_512:
+                stolen_size = KB(512);
+                break;
+        case I830_GMCH_GMS_STOLEN_1024:
+                stolen_size = MB(1);
+                break;
+        case I830_GMCH_GMS_STOLEN_8192:
+                stolen_size = MB(8);
+                break;
+        case I830_GMCH_GMS_LOCAL:
+                /* local memory isn't part of the normal address space */
+                stolen_size = 0;
+                break;
+        default:
+                return 0;
+        }
+
+        return stolen_size;
+}
+
 static size_t __init gen3_stolen_size(int num, int slot, int func)
 {
         size_t stolen_size;
@@ -310,7 +418,7 @@ static size_t __init gen6_stolen_size(int num, int slot, int func)
         return gmch_ctrl << 25; /* 32 MB units */
 }
 
-static inline size_t gen8_stolen_size(int num, int slot, int func)
+static size_t gen8_stolen_size(int num, int slot, int func)
 {
         u16 gmch_ctrl;
 
@@ -320,31 +428,74 @@ static inline size_t gen8_stolen_size(int num, int slot, int func)
         return gmch_ctrl << 25; /* 32 MB units */
 }
 
-typedef size_t (*stolen_size_fn)(int num, int slot, int func);
+
+struct intel_stolen_funcs {
+        size_t (*size)(int num, int slot, int func);
+        u32 (*base)(int num, int slot, int func, size_t size);
+};
+
+static const struct intel_stolen_funcs i830_stolen_funcs = {
+        .base = i830_stolen_base,
+        .size = i830_stolen_size,
+};
+
+static const struct intel_stolen_funcs i845_stolen_funcs = {
+        .base = i845_stolen_base,
+        .size = i830_stolen_size,
+};
+
+static const struct intel_stolen_funcs i85x_stolen_funcs = {
+        .base = i85x_stolen_base,
+        .size = gen3_stolen_size,
+};
+
+static const struct intel_stolen_funcs i865_stolen_funcs = {
+        .base = i865_stolen_base,
+        .size = gen3_stolen_size,
+};
+
+static const struct intel_stolen_funcs gen3_stolen_funcs = {
+        .base = intel_stolen_base,
+        .size = gen3_stolen_size,
+};
+
+static const struct intel_stolen_funcs gen6_stolen_funcs = {
+        .base = intel_stolen_base,
+        .size = gen6_stolen_size,
+};
+
+static const struct intel_stolen_funcs gen8_stolen_funcs = {
+        .base = intel_stolen_base,
+        .size = gen8_stolen_size,
+};
 
 static struct pci_device_id intel_stolen_ids[] __initdata = {
-        INTEL_I915G_IDS(gen3_stolen_size),
-        INTEL_I915GM_IDS(gen3_stolen_size),
-        INTEL_I945G_IDS(gen3_stolen_size),
-        INTEL_I945GM_IDS(gen3_stolen_size),
-        INTEL_VLV_M_IDS(gen6_stolen_size),
-        INTEL_VLV_D_IDS(gen6_stolen_size),
-        INTEL_PINEVIEW_IDS(gen3_stolen_size),
-        INTEL_I965G_IDS(gen3_stolen_size),
-        INTEL_G33_IDS(gen3_stolen_size),
-        INTEL_I965GM_IDS(gen3_stolen_size),
-        INTEL_GM45_IDS(gen3_stolen_size),
-        INTEL_G45_IDS(gen3_stolen_size),
-        INTEL_IRONLAKE_D_IDS(gen3_stolen_size),
-        INTEL_IRONLAKE_M_IDS(gen3_stolen_size),
-        INTEL_SNB_D_IDS(gen6_stolen_size),
-        INTEL_SNB_M_IDS(gen6_stolen_size),
-        INTEL_IVB_M_IDS(gen6_stolen_size),
-        INTEL_IVB_D_IDS(gen6_stolen_size),
-        INTEL_HSW_D_IDS(gen6_stolen_size),
-        INTEL_HSW_M_IDS(gen6_stolen_size),
-        INTEL_BDW_M_IDS(gen8_stolen_size),
-        INTEL_BDW_D_IDS(gen8_stolen_size)
+        INTEL_I830_IDS(&i830_stolen_funcs),
+        INTEL_I845G_IDS(&i845_stolen_funcs),
+        INTEL_I85X_IDS(&i85x_stolen_funcs),
+        INTEL_I865G_IDS(&i865_stolen_funcs),
+        INTEL_I915G_IDS(&gen3_stolen_funcs),
+        INTEL_I915GM_IDS(&gen3_stolen_funcs),
+        INTEL_I945G_IDS(&gen3_stolen_funcs),
+        INTEL_I945GM_IDS(&gen3_stolen_funcs),
+        INTEL_VLV_M_IDS(&gen6_stolen_funcs),
+        INTEL_VLV_D_IDS(&gen6_stolen_funcs),
+        INTEL_PINEVIEW_IDS(&gen3_stolen_funcs),
+        INTEL_I965G_IDS(&gen3_stolen_funcs),
+        INTEL_G33_IDS(&gen3_stolen_funcs),
+        INTEL_I965GM_IDS(&gen3_stolen_funcs),
+        INTEL_GM45_IDS(&gen3_stolen_funcs),
+        INTEL_G45_IDS(&gen3_stolen_funcs),
+        INTEL_IRONLAKE_D_IDS(&gen3_stolen_funcs),
+        INTEL_IRONLAKE_M_IDS(&gen3_stolen_funcs),
+        INTEL_SNB_D_IDS(&gen6_stolen_funcs),
+        INTEL_SNB_M_IDS(&gen6_stolen_funcs),
+        INTEL_IVB_M_IDS(&gen6_stolen_funcs),
+        INTEL_IVB_D_IDS(&gen6_stolen_funcs),
+        INTEL_HSW_D_IDS(&gen6_stolen_funcs),
+        INTEL_HSW_M_IDS(&gen6_stolen_funcs),
+        INTEL_BDW_M_IDS(&gen8_stolen_funcs),
+        INTEL_BDW_D_IDS(&gen8_stolen_funcs)
 };
 
 static void __init intel_graphics_stolen(int num, int slot, int func)
@@ -361,11 +512,13 @@ static void __init intel_graphics_stolen(int num, int slot, int func)
 
         for (i = 0; i < ARRAY_SIZE(intel_stolen_ids); i++) {
                 if (intel_stolen_ids[i].device == device) {
-                        stolen_size_fn stolen_size =
-                                (stolen_size_fn)intel_stolen_ids[i].driver_data;
-                        size = stolen_size(num, slot, func);
-                        start = intel_stolen_base(num, slot, func);
+                        const struct intel_stolen_funcs *stolen_funcs =
+                                (const struct intel_stolen_funcs *)intel_stolen_ids[i].driver_data;
+                        size = stolen_funcs->size(num, slot, func);
+                        start = stolen_funcs->base(num, slot, func, size);
                         if (size && start) {
+                                printk(KERN_INFO "Reserving Intel graphics stolen memory at 0x%x-0x%x\n",
+                                       start, start + (u32)size - 1);
                                 /* Mark this space as reserved */
                                 e820_add_region(start, size, E820_RESERVED);
                                 sanitize_e820_map(e820.map,
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 42805fac0092..283a76a9cc40 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -125,7 +125,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
                 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
         seq_printf(p, "  Machine check polls\n");
 #endif
-#if defined(CONFIG_HYPERV) || defined(CONFIG_XEN)
+#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)
         seq_printf(p, "%*s: ", prec, "THR");
         for_each_online_cpu(j)
                 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
index ebc987398923..af1d14a9ebda 100644
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
@@ -229,6 +229,17 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
                 }
         }
 
+        /*
+         * On x86-64 we do not support 16-bit segments due to
+         * IRET leaking the high bits of the kernel stack address.
+         */
+#ifdef CONFIG_X86_64
+        if (!ldt_info.seg_32bit) {
+                error = -EINVAL;
+                goto out_unlock;
+        }
+#endif
+
         fill_ldt(&ldt, &ldt_info);
         if (oldmode)
                 ldt.avl = 0;
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 299d49302e7d..0497f719977d 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1207,23 +1207,31 @@ error:
         return ret;
 }
 
-static inline int __init determine_tce_table_size(u64 ram)
+static inline int __init determine_tce_table_size(void)
 {
         int ret;
 
         if (specified_table_size != TCE_TABLE_SIZE_UNSPECIFIED)
                 return specified_table_size;
 
-        /*
-         * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to
-         * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each
-         * larger table size has twice as many entries, so shift the
-         * max ram address by 13 to divide by 8K and then look at the
-         * order of the result to choose between 0-7.
-         */
-        ret = get_order(ram >> 13);
-        if (ret > TCE_TABLE_SIZE_8M)
+        if (is_kdump_kernel() && saved_max_pfn) {
+                /*
+                 * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to
+                 * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each
+                 * larger table size has twice as many entries, so shift the
+                 * max ram address by 13 to divide by 8K and then look at the
+                 * order of the result to choose between 0-7.
+                 */
+                ret = get_order((saved_max_pfn * PAGE_SIZE) >> 13);
+                if (ret > TCE_TABLE_SIZE_8M)
+                        ret = TCE_TABLE_SIZE_8M;
+        } else {
+                /*
+                 * Use 8M by default (suggested by Muli) if it's not
+                 * kdump kernel and saved_max_pfn isn't set.
+                 */
                 ret = TCE_TABLE_SIZE_8M;
+        }
 
         return ret;
 }
@@ -1418,8 +1426,7 @@ int __init detect_calgary(void)
                 return -ENOMEM;
         }
 
-        specified_table_size = determine_tce_table_size((is_kdump_kernel() ?
-                                        saved_max_pfn : max_pfn) * PAGE_SIZE);
+        specified_table_size = determine_tce_table_size();
 
         for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
                 struct calgary_bus_info *info = &bus_info[bus];
diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
index d87dd6d042d6..dd89a13f1051 100644
--- a/arch/x86/mm/kmemcheck/kmemcheck.c
+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
@@ -78,10 +78,16 @@ early_initcall(kmemcheck_init);
  */
 static int __init param_kmemcheck(char *str)
 {
+        int val;
+        int ret;
+
         if (!str)
                 return -EINVAL;
 
-        sscanf(str, "%d", &kmemcheck_enabled);
+        ret = kstrtoint(str, 0, &val);
+        if (ret)
+                return ret;
+        kmemcheck_enabled = val;
         return 0;
 }
 
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index d57d917ff240..1493c68352d1 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -627,7 +627,6 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index 583c2b0974ca..12a492ab6d17 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -569,7 +569,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_DEBUG_NOMMU_REGIONS=y
-# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
diff --git a/block/blk-core.c b/block/blk-core.c
index 34d7c196338b..a0e3096c4bb5 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1307,7 +1307,7 @@ void __blk_put_request(struct request_queue *q, struct request *req)
                 struct request_list *rl = blk_rq_rl(req);
 
                 BUG_ON(!list_empty(&req->queuelist));
-                BUG_ON(!hlist_unhashed(&req->hash));
+                BUG_ON(ELV_ON_HASH(req));
 
                 blk_free_request(rl, req);
                 freed_request(rl, flags);
diff --git a/block/blk-map.c b/block/blk-map.c
index cca6356d216d..f7b22bc21518 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -188,7 +188,7 @@ EXPORT_SYMBOL(blk_rq_map_user);
  *    unmapping.
  */
 int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
-                        struct rq_map_data *map_data, struct sg_iovec *iov,
+                        struct rq_map_data *map_data, const struct sg_iovec *iov,
                         int iov_count, unsigned int len, gfp_t gfp_mask)
 {
         struct bio *bio;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b1bcc619d0ea..1d2a9bdbee57 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -956,6 +956,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
                                unsigned int cpu)
 {
         struct blk_mq_hw_ctx *hctx = data;
+        struct request_queue *q = hctx->queue;
         struct blk_mq_ctx *ctx;
         LIST_HEAD(tmp);
 
@@ -965,7 +966,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
         /*
          * Move ctx entries to new CPU, if this one is going away.
          */
-        ctx = __blk_mq_get_ctx(hctx->queue, cpu);
+        ctx = __blk_mq_get_ctx(q, cpu);
 
         spin_lock(&ctx->lock);
         if (!list_empty(&ctx->rq_list)) {
@@ -977,7 +978,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
         if (list_empty(&tmp))
                 return;
 
-        ctx = blk_mq_get_ctx(hctx->queue);
+        ctx = blk_mq_get_ctx(q);
         spin_lock(&ctx->lock);
 
         while (!list_empty(&tmp)) {
@@ -988,10 +989,13 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
                 list_move_tail(&rq->queuelist, &ctx->rq_list);
         }
 
+        hctx = q->mq_ops->map_queue(q, ctx->cpu);
         blk_mq_hctx_mark_pending(hctx, ctx);
 
         spin_unlock(&ctx->lock);
         blk_mq_put_ctx(ctx);
+
+        blk_mq_run_hw_queue(hctx, true);
 }
 
 static int blk_mq_init_hw_commands(struct blk_mq_hw_ctx *hctx,
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ebd6b6f1bdeb..53b1737e978d 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -30,8 +30,8 @@ static void blk_done_softirq(struct softirq_action *h)
         while (!list_empty(&local_list)) {
                 struct request *rq;
 
-                rq = list_entry(local_list.next, struct request, queuelist);
-                list_del_init(&rq->queuelist);
+                rq = list_entry(local_list.next, struct request, ipi_list);
+                list_del_init(&rq->ipi_list);
                 rq->q->softirq_done_fn(rq);
         }
 }
@@ -45,14 +45,9 @@ static void trigger_softirq(void *data)
 
         local_irq_save(flags);
         list = this_cpu_ptr(&blk_cpu_done);
-        /*
-         * We reuse queuelist for a list of requests to process. Since the
-         * queuelist is used by the block layer only for requests waiting to be
-         * submitted to the device it is unused now.
-         */
-        list_add_tail(&rq->queuelist, list);
+        list_add_tail(&rq->ipi_list, list);
 
-        if (list->next == &rq->queuelist)
+        if (list->next == &rq->ipi_list)
                 raise_softirq_irqoff(BLOCK_SOFTIRQ);
 
         local_irq_restore(flags);
@@ -141,7 +136,7 @@ void __blk_complete_request(struct request *req)
                 struct list_head *list;
 do_local:
                 list = this_cpu_ptr(&blk_cpu_done);
-                list_add_tail(&req->queuelist, list);
+                list_add_tail(&req->ipi_list, list);
 
                 /*
                  * if the list only contains our just added request,
@@ -149,7 +144,7 @@ do_local:
                  * entries there, someone already raised the irq but it
                  * hasn't run yet.
                  */
-                if (list->next == &req->queuelist)
+                if (list->next == &req->ipi_list)
                         raise_softirq_irqoff(BLOCK_SOFTIRQ);
         } else if (raise_blk_irq(ccpu, req))
                 goto do_local;
diff --git a/block/blk.h b/block/blk.h
index d23b415b8a28..1d880f1f957f 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -78,7 +78,7 @@ static inline void blk_clear_rq_complete(struct request *rq)
 /*
  * Internal elevator interface
  */
-#define ELV_ON_HASH(rq) hash_hashed(&(rq)->hash)
+#define ELV_ON_HASH(rq) ((rq)->cmd_flags & REQ_HASHED)
 
 void blk_insert_flush(struct request *rq);
 void blk_abort_flushes(struct request_queue *q);
diff --git a/block/elevator.c b/block/elevator.c
index 42c45a7d6714..1e01b66a0b92 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -247,6 +247,7 @@ EXPORT_SYMBOL(elevator_exit);
 static inline void __elv_rqhash_del(struct request *rq)
 {
         hash_del(&rq->hash);
+        rq->cmd_flags &= ~REQ_HASHED;
 }
 
 static void elv_rqhash_del(struct request_queue *q, struct request *rq)
@@ -261,6 +262,7 @@ static void elv_rqhash_add(struct request_queue *q, struct request *rq)
 
         BUG_ON(ELV_ON_HASH(rq));
         hash_add(e->hash, &rq->hash, rq_hash_key(rq));
+        rq->cmd_flags |= REQ_HASHED;
 }
 
 static void elv_rqhash_reposition(struct request_queue *q, struct request *rq)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c205653e9644..ab686b310100 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -31,10 +31,14 @@ menuconfig ACPI
           ACPI CA, see:
           <http://acpica.org/>
 
-          ACPI is an open industry specification co-developed by
-          Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba.
+          ACPI is an open industry specification originally co-developed by
+          Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
+          it is developed by the ACPI Specification Working Group (ASWG) under
+          the UEFI Forum and any UEFI member can join the ASWG and contribute
+          to the ACPI specification.
           The specification is available at:
           <http://www.acpi.info>
+          <http://www.uefi.org/acpi/specs>
 
 if ACPI
 
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f0fc6260266b..d9339b442a4e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -51,12 +51,6 @@ MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "
         " the driver to wait for userspace to write the undock sysfs file "
         " before undocking");
 
-static const struct acpi_device_id dock_device_ids[] = {
-        {"LNXDOCK", 0},
-        {"", 0},
-};
-MODULE_DEVICE_TABLE(acpi, dock_device_ids);
-
 struct dock_station {
         acpi_handle handle;
         unsigned long last_dock_time;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index f7fd72ac69cf..6776c599816f 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1219,10 +1219,9 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
 {
         struct semaphore *sem = NULL;
 
-        sem = acpi_os_allocate(sizeof(struct semaphore));
+        sem = acpi_os_allocate_zeroed(sizeof(struct semaphore));
         if (!sem)
                 return AE_NO_MEMORY;
-        memset(sem, 0, sizeof(struct semaphore));
 
         sema_init(sem, initial_units);
 
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 964068553334..c1e31a41f949 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -344,7 +344,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                         tz->trips.hot.flags.valid = 1;
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                         "Found hot threshold [%lu]\n",
-                                        tz->trips.critical.temperature));
+                                        tz->trips.hot.temperature));
                 }
         }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 0f5f78fa6545..bba526148583 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -164,11 +164,10 @@ acpi_extract_package(union acpi_object *package,
          * Validate output buffer.
          */
         if (buffer->length == ACPI_ALLOCATE_BUFFER) {
-                buffer->pointer = ACPI_ALLOCATE(size_required);
+                buffer->pointer = ACPI_ALLOCATE_ZEROED(size_required);
                 if (!buffer->pointer)
                         return AE_NO_MEMORY;
                 buffer->length = size_required;
-                memset(buffer->pointer, 0, size_required);
         } else {
                 if (buffer->length < size_required) {
                         buffer->length = size_required;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 48c7e8af9c96..8b6990e417ec 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -488,6 +488,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 },
         },
         {
+        .callback = video_set_use_native_backlight,
+        .ident = "Thinkpad Helix",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix"),
+                },
+        },
+        {
          .callback = video_set_use_native_backlight,
          .ident = "Dell Inspiron 7520",
          .matches = {
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 6f54962aae1d..ae098a261fcd 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -705,6 +705,14 @@ static int pm_genpd_runtime_resume(struct device *dev)
         return 0;
 }
 
+static bool pd_ignore_unused;
+static int __init pd_ignore_unused_setup(char *__unused)
+{
+        pd_ignore_unused = true;
+        return 1;
+}
+__setup("pd_ignore_unused", pd_ignore_unused_setup);
+
 /**
  * pm_genpd_poweroff_unused - Power off all PM domains with no devices in use.
  */
@@ -712,6 +720,11 @@ void pm_genpd_poweroff_unused(void)
 {
         struct generic_pm_domain *genpd;
 
+        if (pd_ignore_unused) {
+                pr_warn("genpd: Not disabling unused power domains\n");
+                return;
+        }
+
         mutex_lock(&gpd_list_lock);
 
         list_for_each_entry(genpd, &gpd_list, gpd_list_node)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index d0a072463a04..63e30ef096e2 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -761,10 +761,11 @@ skip_format_initialization:
         if (ret != 0)
                 goto err_range;
 
-        if (dev)
+        if (dev) {
                 ret = regmap_attach_dev(dev, map, config);
                 if (ret != 0)
                         goto err_regcache;
+        }
 
         return map;
 
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 18c76e84d540..68e3992e8838 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -469,24 +469,14 @@ static void drbd_wait_ee_list_empty(struct drbd_device *device,
 
 static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flags)
 {
-        mm_segment_t oldfs;
         struct kvec iov = {
                 .iov_base = buf,
                 .iov_len = size,
         };
         struct msghdr msg = {
-                .msg_iovlen = 1,
-                .msg_iov = (struct iovec *)&iov,
                 .msg_flags = (flags ? flags : MSG_WAITALL | MSG_NOSIGNAL)
         };
-        int rv;
-
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        rv = sock_recvmsg(sock, &msg, size, msg.msg_flags);
-        set_fs(oldfs);
-
-        return rv;
+        return kernel_recvmsg(sock, &msg, &iov, 1, size, msg.msg_flags);
 }
 
 static int drbd_recv(struct drbd_connection *connection, void *buf, size_t size)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 66e8c3b94ef3..f70a230a2945 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -237,7 +237,7 @@ static int __do_lo_send_write(struct file *file,
         file_end_write(file);
         if (likely(bw == len))
                 return 0;
-        printk(KERN_ERR "loop: Write error at byte offset %llu, length %i.\n",
+        printk_ratelimited(KERN_ERR "loop: Write error at byte offset %llu, length %i.\n",
                         (unsigned long long)pos, len);
         if (bw >= 0)
                 bw = -EIO;
@@ -277,7 +277,7 @@ static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec,
                 return __do_lo_send_write(lo->lo_backing_file,
                                 page_address(page), bvec->bv_len,
                                 pos);
-        printk(KERN_ERR "loop: Transfer error at byte offset %llu, "
+        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;
@@ -316,7 +316,7 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos)
 out:
         return ret;
 fail:
-        printk(KERN_ERR "loop: Failed to allocate temporary page for write.\n");
+        printk_ratelimited(KERN_ERR "loop: Failed to allocate temporary page for write.\n");
         ret = -ENOMEM;
         goto out;
 }
@@ -345,7 +345,7 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                 size = p->bsize;
 
         if (lo_do_transfer(lo, READ, page, buf->offset, p->page, p->offset, size, IV)) {
-                printk(KERN_ERR "loop: transfer error block %ld\n",
+                printk_ratelimited(KERN_ERR "loop: transfer error block %ld\n",
                        page->index);
                 size = -EINVAL;
         }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 55298db36b2d..3a70ea2f7cd6 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -630,37 +630,29 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
         }
  
         case NBD_CLEAR_SOCK: {
-                struct file *file;
-
+                struct socket *sock = nbd->sock;
                 nbd->sock = NULL;
-                file = nbd->file;
-                nbd->file = NULL;
                 nbd_clear_que(nbd);
                 BUG_ON(!list_empty(&nbd->queue_head));
                 BUG_ON(!list_empty(&nbd->waiting_queue));
                 kill_bdev(bdev);
-                if (file)
-                        fput(file);
+                if (sock)
+                        sockfd_put(sock);
                 return 0;
         }
 
         case NBD_SET_SOCK: {
-                struct file *file;
-                if (nbd->file)
+                struct socket *sock;
+                int err;
+                if (nbd->sock)
                         return -EBUSY;
-                file = fget(arg);
-                if (file) {
-                        struct inode *inode = file_inode(file);
-                        if (S_ISSOCK(inode->i_mode)) {
-                                nbd->file = file;
-                                nbd->sock = SOCKET_I(inode);
-                                if (max_part > 0)
-                                        bdev->bd_invalidated = 1;
-                                nbd->disconnect = 0; /* we're connected now */
-                                return 0;
-                        } else {
-                                fput(file);
-                        }
+                sock = sockfd_lookup(arg, &err);
+                if (sock) {
+                        nbd->sock = sock;
+                        if (max_part > 0)
+                                bdev->bd_invalidated = 1;
+                        nbd->disconnect = 0; /* we're connected now */
+                        return 0;
                 }
                 return -EINVAL;
         }
@@ -697,12 +689,12 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
 
         case NBD_DO_IT: {
                 struct task_struct *thread;
-                struct file *file;
+                struct socket *sock;
                 int error;
 
                 if (nbd->pid)
                         return -EBUSY;
-                if (!nbd->file)
+                if (!nbd->sock)
                         return -EINVAL;
 
                 mutex_unlock(&nbd->tx_lock);
@@ -731,15 +723,15 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                 if (error)
                         return error;
                 sock_shutdown(nbd, 0);
-                file = nbd->file;
-                nbd->file = NULL;
+                sock = nbd->sock;
+                nbd->sock = NULL;
                 nbd_clear_que(nbd);
                 dev_warn(disk_to_dev(nbd->disk), "queue cleared\n");
                 kill_bdev(bdev);
                 queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
                 set_device_ro(bdev, false);
-                if (file)
-                        fput(file);
+                if (sock)
+                        sockfd_put(sock);
                 nbd->flags = 0;
                 nbd->bytesize = 0;
                 bdev->bd_inode->i_size = 0;
@@ -875,9 +867,7 @@ static int __init nbd_init(void)
 
         for (i = 0; i < nbds_max; i++) {
                 struct gendisk *disk = nbd_dev[i].disk;
-                nbd_dev[i].file = NULL;
                 nbd_dev[i].magic = NBD_MAGIC;
-                nbd_dev[i].flags = 0;
                 INIT_LIST_HEAD(&nbd_dev[i].waiting_queue);
                 spin_lock_init(&nbd_dev[i].queue_lock);
                 INIT_LIST_HEAD(&nbd_dev[i].queue_head);
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index da085ff10d25..7c64fa756cce 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1,6 +1,6 @@
 /*
  * NVM Express device driver
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011-2014, Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -20,10 +20,12 @@
 #include <linux/bio.h>
 #include <linux/bitops.h>
 #include <linux/blkdev.h>
+#include <linux/cpu.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/genhd.h>
+#include <linux/hdreg.h>
 #include <linux/idr.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -35,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/percpu.h>
 #include <linux/poison.h>
 #include <linux/ptrace.h>
 #include <linux/sched.h>
@@ -47,6 +50,11 @@
 #define SQ_SIZE(depth)          (depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)          (depth * sizeof(struct nvme_completion))
 #define ADMIN_TIMEOUT   (60 * HZ)
+#define IOD_TIMEOUT     (4 * NVME_IO_TIMEOUT)
+
+unsigned char io_timeout = 30;
+module_param(io_timeout, byte, 0644);
+MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
 
 static int nvme_major;
 module_param(nvme_major, int, 0);
@@ -58,6 +66,7 @@ static DEFINE_SPINLOCK(dev_list_lock);
 static LIST_HEAD(dev_list);
 static struct task_struct *nvme_thread;
 static struct workqueue_struct *nvme_workq;
+static wait_queue_head_t nvme_kthread_wait;
 
 static void nvme_reset_failed_dev(struct work_struct *ws);
 
@@ -74,6 +83,7 @@ struct async_cmd_info {
  * commands and one for I/O commands).
  */
 struct nvme_queue {
+        struct rcu_head r_head;
         struct device *q_dmadev;
         struct nvme_dev *dev;
         char irqname[24];       /* nvme4294967295-65535\0 */
@@ -85,6 +95,7 @@ struct nvme_queue {
         wait_queue_head_t sq_full;
         wait_queue_t sq_cong_wait;
         struct bio_list sq_cong;
+        struct list_head iod_bio;
         u32 __iomem *q_db;
         u16 q_depth;
         u16 cq_vector;
@@ -95,6 +106,7 @@ struct nvme_queue {
         u8 cq_phase;
         u8 cqe_seen;
         u8 q_suspended;
+        cpumask_var_t cpu_mask;
         struct async_cmd_info cmdinfo;
         unsigned long cmdid_data[];
 };
@@ -118,7 +130,7 @@ static inline void _nvme_check_size(void)
         BUILD_BUG_ON(sizeof(struct nvme_smart_log) != 512);
 }
 
-typedef void (*nvme_completion_fn)(struct nvme_dev *, void *,
+typedef void (*nvme_completion_fn)(struct nvme_queue *, void *,
                                                 struct nvme_completion *);
 
 struct nvme_cmd_info {
@@ -190,7 +202,7 @@ static int alloc_cmdid_killable(struct nvme_queue *nvmeq, void *ctx,
 #define CMD_CTX_FLUSH           (0x318 + CMD_CTX_BASE)
 #define CMD_CTX_ABORT           (0x31C + CMD_CTX_BASE)
 
-static void special_completion(struct nvme_dev *dev, void *ctx,
+static void special_completion(struct nvme_queue *nvmeq, void *ctx,
                                                 struct nvme_completion *cqe)
 {
         if (ctx == CMD_CTX_CANCELLED)
@@ -198,26 +210,26 @@ static void special_completion(struct nvme_dev *dev, void *ctx,
         if (ctx == CMD_CTX_FLUSH)
                 return;
         if (ctx == CMD_CTX_ABORT) {
-                ++dev->abort_limit;
+                ++nvmeq->dev->abort_limit;
                 return;
         }
         if (ctx == CMD_CTX_COMPLETED) {
-                dev_warn(&dev->pci_dev->dev,
+                dev_warn(nvmeq->q_dmadev,
                                 "completed id %d twice on queue %d\n",
                                 cqe->command_id, le16_to_cpup(&cqe->sq_id));
                 return;
         }
         if (ctx == CMD_CTX_INVALID) {
-                dev_warn(&dev->pci_dev->dev,
+                dev_warn(nvmeq->q_dmadev,
                                 "invalid id %d completed on queue %d\n",
                                 cqe->command_id, le16_to_cpup(&cqe->sq_id));
                 return;
         }
 
-        dev_warn(&dev->pci_dev->dev, "Unknown special completion %p\n", ctx);
+        dev_warn(nvmeq->q_dmadev, "Unknown special completion %p\n", ctx);
 }
 
-static void async_completion(struct nvme_dev *dev, void *ctx,
+static void async_completion(struct nvme_queue *nvmeq, void *ctx,
                                                 struct nvme_completion *cqe)
 {
         struct async_cmd_info *cmdinfo = ctx;
@@ -262,14 +274,34 @@ static void *cancel_cmdid(struct nvme_queue *nvmeq, int cmdid,
         return ctx;
 }
 
-struct nvme_queue *get_nvmeq(struct nvme_dev *dev)
+static struct nvme_queue *raw_nvmeq(struct nvme_dev *dev, int qid)
+{
+        return rcu_dereference_raw(dev->queues[qid]);
+}
+
+static struct nvme_queue *get_nvmeq(struct nvme_dev *dev) __acquires(RCU)
+{
+        unsigned queue_id = get_cpu_var(*dev->io_queue);
+        rcu_read_lock();
+        return rcu_dereference(dev->queues[queue_id]);
+}
+
+static void put_nvmeq(struct nvme_queue *nvmeq) __releases(RCU)
 {
-        return dev->queues[get_cpu() + 1];
+        rcu_read_unlock();
+        put_cpu_var(nvmeq->dev->io_queue);
 }
 
-void put_nvmeq(struct nvme_queue *nvmeq)
+static struct nvme_queue *lock_nvmeq(struct nvme_dev *dev, int q_idx)
+                                                        __acquires(RCU)
 {
-        put_cpu();
+        rcu_read_lock();
+        return rcu_dereference(dev->queues[q_idx]);
+}
+
+static void unlock_nvmeq(struct nvme_queue *nvmeq) __releases(RCU)
+{
+        rcu_read_unlock();
 }
 
 /**
@@ -284,6 +316,10 @@ static int nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)
         unsigned long flags;
         u16 tail;
         spin_lock_irqsave(&nvmeq->q_lock, flags);
+        if (nvmeq->q_suspended) {
+                spin_unlock_irqrestore(&nvmeq->q_lock, flags);
+                return -EBUSY;
+        }
         tail = nvmeq->sq_tail;
         memcpy(&nvmeq->sq_cmds[tail], cmd, sizeof(*cmd));
         if (++tail == nvmeq->q_depth)
@@ -323,6 +359,7 @@ nvme_alloc_iod(unsigned nseg, unsigned nbytes, gfp_t gfp)
                 iod->npages = -1;
                 iod->length = nbytes;
                 iod->nents = 0;
+                iod->first_dma = 0ULL;
                 iod->start_time = jiffies;
         }
 
@@ -371,19 +408,31 @@ static void nvme_end_io_acct(struct bio *bio, unsigned long start_time)
         part_stat_unlock();
 }
 
-static void bio_completion(struct nvme_dev *dev, void *ctx,
+static void bio_completion(struct nvme_queue *nvmeq, void *ctx,
                                                 struct nvme_completion *cqe)
 {
         struct nvme_iod *iod = ctx;
         struct bio *bio = iod->private;
         u16 status = le16_to_cpup(&cqe->status) >> 1;
 
+        if (unlikely(status)) {
+                if (!(status & NVME_SC_DNR ||
+                                bio->bi_rw & REQ_FAILFAST_MASK) &&
+                                (jiffies - iod->start_time) < IOD_TIMEOUT) {
+                        if (!waitqueue_active(&nvmeq->sq_full))
+                                add_wait_queue(&nvmeq->sq_full,
+                                                        &nvmeq->sq_cong_wait);
+                        list_add_tail(&iod->node, &nvmeq->iod_bio);
+                        wake_up(&nvmeq->sq_full);
+                        return;
+                }
+        }
         if (iod->nents) {
-                dma_unmap_sg(&dev->pci_dev->dev, iod->sg, iod->nents,
+                dma_unmap_sg(nvmeq->q_dmadev, iod->sg, iod->nents,
                         bio_data_dir(bio) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
                 nvme_end_io_acct(bio, iod->start_time);
         }
-        nvme_free_iod(dev, iod);
+        nvme_free_iod(nvmeq->dev, iod);
         if (status)
                 bio_endio(bio, -EIO);
         else
@@ -391,8 +440,8 @@ static void bio_completion(struct nvme_dev *dev, void *ctx,
 }
 
 /* length is in bytes.  gfp flags indicates whether we may sleep. */
-int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,
-                        struct nvme_iod *iod, int total_len, gfp_t gfp)
+int nvme_setup_prps(struct nvme_dev *dev, struct nvme_iod *iod, int total_len,
+                                                                gfp_t gfp)
 {
         struct dma_pool *pool;
         int length = total_len;
@@ -405,7 +454,6 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,
         dma_addr_t prp_dma;
         int nprps, i;
 
-        cmd->prp1 = cpu_to_le64(dma_addr);
         length -= (PAGE_SIZE - offset);
         if (length <= 0)
                 return total_len;
@@ -420,7 +468,7 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,
         }
 
         if (length <= PAGE_SIZE) {
-                cmd->prp2 = cpu_to_le64(dma_addr);
+                iod->first_dma = dma_addr;
                 return total_len;
         }
 
@@ -435,13 +483,12 @@ int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,
 
         prp_list = dma_pool_alloc(pool, gfp, &prp_dma);
         if (!prp_list) {
-                cmd->prp2 = cpu_to_le64(dma_addr);
+                iod->first_dma = dma_addr;
                 iod->npages = -1;
                 return (total_len - length) + PAGE_SIZE;
         }
         list[0] = prp_list;
         iod->first_dma = prp_dma;
-        cmd->prp2 = cpu_to_le64(prp_dma);
         i = 0;
         for (;;) {
                 if (i == PAGE_SIZE / 8) {
@@ -480,10 +527,11 @@ static int nvme_split_and_submit(struct bio *bio, struct nvme_queue *nvmeq,
 
         bio_chain(split, bio);
 
-        if (bio_list_empty(&nvmeq->sq_cong))
+        if (!waitqueue_active(&nvmeq->sq_full))
                 add_wait_queue(&nvmeq->sq_full, &nvmeq->sq_cong_wait);
         bio_list_add(&nvmeq->sq_cong, split);
         bio_list_add(&nvmeq->sq_cong, bio);
+        wake_up(&nvmeq->sq_full);
 
         return 0;
 }
@@ -536,25 +584,13 @@ static int nvme_map_bio(struct nvme_queue *nvmeq, struct nvme_iod *iod,
         return length;
 }
 
-/*
- * We reuse the small pool to allocate the 16-byte range here as it is not
- * worth having a special pool for these or additional cases to handle freeing
- * the iod.
- */
 static int nvme_submit_discard(struct nvme_queue *nvmeq, struct nvme_ns *ns,
                 struct bio *bio, struct nvme_iod *iod, int cmdid)
 {
-        struct nvme_dsm_range *range;
+        struct nvme_dsm_range *range =
+                                (struct nvme_dsm_range *)iod_list(iod)[0];
         struct nvme_command *cmnd = &nvmeq->sq_cmds[nvmeq->sq_tail];
 
-        range = dma_pool_alloc(nvmeq->dev->prp_small_pool, GFP_ATOMIC,
-                                                        &iod->first_dma);
-        if (!range)
-                return -ENOMEM;
-
-        iod_list(iod)[0] = (__le64 *)range;
-        iod->npages = 0;
-
         range->cattr = cpu_to_le32(0);
         range->nlb = cpu_to_le32(bio->bi_iter.bi_size >> ns->lba_shift);
         range->slba = cpu_to_le64(nvme_block_nr(ns, bio->bi_iter.bi_sector));
@@ -601,44 +637,22 @@ int nvme_submit_flush_data(struct nvme_queue *nvmeq, struct nvme_ns *ns)
         return nvme_submit_flush(nvmeq, ns, cmdid);
 }
 
-/*
- * Called with local interrupts disabled and the q_lock held.  May not sleep.
- */
-static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
-                                                                struct bio *bio)
+static int nvme_submit_iod(struct nvme_queue *nvmeq, struct nvme_iod *iod)
 {
+        struct bio *bio = iod->private;
+        struct nvme_ns *ns = bio->bi_bdev->bd_disk->private_data;
         struct nvme_command *cmnd;
-        struct nvme_iod *iod;
-        enum dma_data_direction dma_dir;
-        int cmdid, length, result;
+        int cmdid;
         u16 control;
         u32 dsmgmt;
-        int psegs = bio_phys_segments(ns->queue, bio);
-
-        if ((bio->bi_rw & REQ_FLUSH) && psegs) {
-                result = nvme_submit_flush_data(nvmeq, ns);
-                if (result)
-                        return result;
-        }
 
-        result = -ENOMEM;
-        iod = nvme_alloc_iod(psegs, bio->bi_iter.bi_size, GFP_ATOMIC);
-        if (!iod)
-                goto nomem;
-        iod->private = bio;
-
-        result = -EBUSY;
         cmdid = alloc_cmdid(nvmeq, iod, bio_completion, NVME_IO_TIMEOUT);
         if (unlikely(cmdid < 0))
-                goto free_iod;
+                return cmdid;
 
-        if (bio->bi_rw & REQ_DISCARD) {
-                result = nvme_submit_discard(nvmeq, ns, bio, iod, cmdid);
-                if (result)
-                        goto free_cmdid;
-                return result;
-        }
-        if ((bio->bi_rw & REQ_FLUSH) && !psegs)
+        if (bio->bi_rw & REQ_DISCARD)
+                return nvme_submit_discard(nvmeq, ns, bio, iod, cmdid);
+        if ((bio->bi_rw & REQ_FLUSH) && !iod->nents)
                 return nvme_submit_flush(nvmeq, ns, cmdid);
 
         control = 0;
@@ -652,42 +666,85 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
                 dsmgmt |= NVME_RW_DSM_FREQ_PREFETCH;
 
         cmnd = &nvmeq->sq_cmds[nvmeq->sq_tail];
-
         memset(cmnd, 0, sizeof(*cmnd));
-        if (bio_data_dir(bio)) {
-                cmnd->rw.opcode = nvme_cmd_write;
-                dma_dir = DMA_TO_DEVICE;
-        } else {
-                cmnd->rw.opcode = nvme_cmd_read;
-                dma_dir = DMA_FROM_DEVICE;
-        }
-
-        result = nvme_map_bio(nvmeq, iod, bio, dma_dir, psegs);
-        if (result <= 0)
-                goto free_cmdid;
-        length = result;
 
+        cmnd->rw.opcode = bio_data_dir(bio) ? nvme_cmd_write : nvme_cmd_read;
         cmnd->rw.command_id = cmdid;
         cmnd->rw.nsid = cpu_to_le32(ns->ns_id);
-        length = nvme_setup_prps(nvmeq->dev, &cmnd->common, iod, length,
-                                                                GFP_ATOMIC);
+        cmnd->rw.prp1 = cpu_to_le64(sg_dma_address(iod->sg));
+        cmnd->rw.prp2 = cpu_to_le64(iod->first_dma);
         cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, bio->bi_iter.bi_sector));
-        cmnd->rw.length = cpu_to_le16((length >> ns->lba_shift) - 1);
+        cmnd->rw.length =
+                cpu_to_le16((bio->bi_iter.bi_size >> ns->lba_shift) - 1);
         cmnd->rw.control = cpu_to_le16(control);
         cmnd->rw.dsmgmt = cpu_to_le32(dsmgmt);
 
-        nvme_start_io_acct(bio);
         if (++nvmeq->sq_tail == nvmeq->q_depth)
                 nvmeq->sq_tail = 0;
         writel(nvmeq->sq_tail, nvmeq->q_db);
 
         return 0;
+}
+
+/*
+ * Called with local interrupts disabled and the q_lock held.  May not sleep.
+ */
+static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
+                                                                struct bio *bio)
+{
+        struct nvme_iod *iod;
+        int psegs = bio_phys_segments(ns->queue, bio);
+        int result;
+
+        if ((bio->bi_rw & REQ_FLUSH) && psegs) {
+                result = nvme_submit_flush_data(nvmeq, ns);
+                if (result)
+                        return result;
+        }
+
+        iod = nvme_alloc_iod(psegs, bio->bi_iter.bi_size, GFP_ATOMIC);
+        if (!iod)
+                return -ENOMEM;
+
+        iod->private = bio;
+        if (bio->bi_rw & REQ_DISCARD) {
+                void *range;
+                /*
+                 * We reuse the small pool to allocate the 16-byte range here
+                 * as it is not worth having a special pool for these or
+                 * additional cases to handle freeing the iod.
+                 */
+                range = dma_pool_alloc(nvmeq->dev->prp_small_pool,
+                                                GFP_ATOMIC,
+                                                &iod->first_dma);
+                if (!range) {
+                        result = -ENOMEM;
+                        goto free_iod;
+                }
+                iod_list(iod)[0] = (__le64 *)range;
+                iod->npages = 0;
+        } else if (psegs) {
+                result = nvme_map_bio(nvmeq, iod, bio,
+                        bio_data_dir(bio) ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
+                        psegs);
+                if (result <= 0)
+                        goto free_iod;
+                if (nvme_setup_prps(nvmeq->dev, iod, result, GFP_ATOMIC) !=
+                                                                result) {
+                        result = -ENOMEM;
+                        goto free_iod;
+                }
+                nvme_start_io_acct(bio);
+        }
+        if (unlikely(nvme_submit_iod(nvmeq, iod))) {
+                if (!waitqueue_active(&nvmeq->sq_full))
+                        add_wait_queue(&nvmeq->sq_full, &nvmeq->sq_cong_wait);
+                list_add_tail(&iod->node, &nvmeq->iod_bio);
+        }
+        return 0;
 
- free_cmdid:
-        free_cmdid(nvmeq, cmdid, NULL);
  free_iod:
         nvme_free_iod(nvmeq->dev, iod);
- nomem:
         return result;
 }
 
@@ -711,7 +768,7 @@ static int nvme_process_cq(struct nvme_queue *nvmeq)
                 }
 
                 ctx = free_cmdid(nvmeq, cqe.command_id, &fn);
-                fn(nvmeq->dev, ctx, &cqe);
+                fn(nvmeq, ctx, &cqe);
         }
 
         /* If the controller ignores the cq head doorbell and continuously
@@ -747,7 +804,7 @@ static void nvme_make_request(struct request_queue *q, struct bio *bio)
         if (!nvmeq->q_suspended && bio_list_empty(&nvmeq->sq_cong))
                 result = nvme_submit_bio_queue(nvmeq, ns, bio);
         if (unlikely(result)) {
-                if (bio_list_empty(&nvmeq->sq_cong))
+                if (!waitqueue_active(&nvmeq->sq_full))
                         add_wait_queue(&nvmeq->sq_full, &nvmeq->sq_cong_wait);
                 bio_list_add(&nvmeq->sq_cong, bio);
         }
@@ -791,7 +848,7 @@ struct sync_cmd_info {
         int status;
 };
 
-static void sync_completion(struct nvme_dev *dev, void *ctx,
+static void sync_completion(struct nvme_queue *nvmeq, void *ctx,
                                                 struct nvme_completion *cqe)
 {
         struct sync_cmd_info *cmdinfo = ctx;
@@ -804,27 +861,46 @@ static void sync_completion(struct nvme_dev *dev, void *ctx,
  * Returns 0 on success.  If the result is negative, it's a Linux error code;
  * if the result is positive, it's an NVM Express status code
  */
-int nvme_submit_sync_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd,
+static int nvme_submit_sync_cmd(struct nvme_dev *dev, int q_idx,
+                                                struct nvme_command *cmd,
                                                 u32 *result, unsigned timeout)
 {
-        int cmdid;
+        int cmdid, ret;
         struct sync_cmd_info cmdinfo;
+        struct nvme_queue *nvmeq;
+
+        nvmeq = lock_nvmeq(dev, q_idx);
+        if (!nvmeq) {
+                unlock_nvmeq(nvmeq);
+                return -ENODEV;
+        }
 
         cmdinfo.task = current;
         cmdinfo.status = -EINTR;
 
-        cmdid = alloc_cmdid_killable(nvmeq, &cmdinfo, sync_completion,
-                                                                timeout);
-        if (cmdid < 0)
+        cmdid = alloc_cmdid(nvmeq, &cmdinfo, sync_completion, timeout);
+        if (cmdid < 0) {
+                unlock_nvmeq(nvmeq);
                 return cmdid;
+        }
         cmd->common.command_id = cmdid;
 
         set_current_state(TASK_KILLABLE);
-        nvme_submit_cmd(nvmeq, cmd);
+        ret = nvme_submit_cmd(nvmeq, cmd);
+        if (ret) {
+                free_cmdid(nvmeq, cmdid, NULL);
+                unlock_nvmeq(nvmeq);
+                set_current_state(TASK_RUNNING);
+                return ret;
+        }
+        unlock_nvmeq(nvmeq);
         schedule_timeout(timeout);
 
         if (cmdinfo.status == -EINTR) {
-                nvme_abort_command(nvmeq, cmdid);
+                nvmeq = lock_nvmeq(dev, q_idx);
+                if (nvmeq)
+                        nvme_abort_command(nvmeq, cmdid);
+                unlock_nvmeq(nvmeq);
                 return -EINTR;
         }
 
@@ -845,20 +921,26 @@ static int nvme_submit_async_cmd(struct nvme_queue *nvmeq,
                 return cmdid;
         cmdinfo->status = -EINTR;
         cmd->common.command_id = cmdid;
-        nvme_submit_cmd(nvmeq, cmd);
-        return 0;
+        return nvme_submit_cmd(nvmeq, cmd);
 }
 
 int nvme_submit_admin_cmd(struct nvme_dev *dev, struct nvme_command *cmd,
                                                                 u32 *result)
 {
-        return nvme_submit_sync_cmd(dev->queues[0], cmd, result, ADMIN_TIMEOUT);
+        return nvme_submit_sync_cmd(dev, 0, cmd, result, ADMIN_TIMEOUT);
+}
+
+int nvme_submit_io_cmd(struct nvme_dev *dev, struct nvme_command *cmd,
+                                                                u32 *result)
+{
+        return nvme_submit_sync_cmd(dev, smp_processor_id() + 1, cmd, result,
+                                                        NVME_IO_TIMEOUT);
 }
 
 static int nvme_submit_admin_cmd_async(struct nvme_dev *dev,
                 struct nvme_command *cmd, struct async_cmd_info *cmdinfo)
 {
-        return nvme_submit_async_cmd(dev->queues[0], cmd, cmdinfo,
+        return nvme_submit_async_cmd(raw_nvmeq(dev, 0), cmd, cmdinfo,
                                                                 ADMIN_TIMEOUT);
 }
 
@@ -985,6 +1067,7 @@ static void nvme_abort_cmd(int cmdid, struct nvme_queue *nvmeq)
         struct nvme_command cmd;
         struct nvme_dev *dev = nvmeq->dev;
         struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);
+        struct nvme_queue *adminq;
 
         if (!nvmeq->qid || info[cmdid].aborted) {
                 if (work_busy(&dev->reset_work))
@@ -1001,7 +1084,8 @@ static void nvme_abort_cmd(int cmdid, struct nvme_queue *nvmeq)
         if (!dev->abort_limit)
                 return;
 
-        a_cmdid = alloc_cmdid(dev->queues[0], CMD_CTX_ABORT, special_completion,
+        adminq = rcu_dereference(dev->queues[0]);
+        a_cmdid = alloc_cmdid(adminq, CMD_CTX_ABORT, special_completion,
                                                                 ADMIN_TIMEOUT);
         if (a_cmdid < 0)
                 return;
@@ -1018,7 +1102,7 @@ static void nvme_abort_cmd(int cmdid, struct nvme_queue *nvmeq)
 
         dev_warn(nvmeq->q_dmadev, "Aborting I/O %d QID %d\n", cmdid,
                                                         nvmeq->qid);
-        nvme_submit_cmd(dev->queues[0], &cmd);
+        nvme_submit_cmd(adminq, &cmd);
 }
 
 /**
@@ -1051,23 +1135,38 @@ static void nvme_cancel_ios(struct nvme_queue *nvmeq, bool timeout)
                 dev_warn(nvmeq->q_dmadev, "Cancelling I/O %d QID %d\n", cmdid,
                                                                 nvmeq->qid);
                 ctx = cancel_cmdid(nvmeq, cmdid, &fn);
-                fn(nvmeq->dev, ctx, &cqe);
+                fn(nvmeq, ctx, &cqe);
         }
 }
 
-static void nvme_free_queue(struct nvme_queue *nvmeq)
+static void nvme_free_queue(struct rcu_head *r)
 {
+        struct nvme_queue *nvmeq = container_of(r, struct nvme_queue, r_head);
+
         spin_lock_irq(&nvmeq->q_lock);
         while (bio_list_peek(&nvmeq->sq_cong)) {
                 struct bio *bio = bio_list_pop(&nvmeq->sq_cong);
                 bio_endio(bio, -EIO);
         }
+        while (!list_empty(&nvmeq->iod_bio)) {
+                static struct nvme_completion cqe = {
+                        .status = cpu_to_le16(
+                                (NVME_SC_ABORT_REQ | NVME_SC_DNR) << 1),
+                };
+                struct nvme_iod *iod = list_first_entry(&nvmeq->iod_bio,
+                                                        struct nvme_iod,
+                                                        node);
+                list_del(&iod->node);
+                bio_completion(nvmeq, iod, &cqe);
+        }
         spin_unlock_irq(&nvmeq->q_lock);
 
         dma_free_coherent(nvmeq->q_dmadev, CQ_SIZE(nvmeq->q_depth),
                                 (void *)nvmeq->cqes, nvmeq->cq_dma_addr);
         dma_free_coherent(nvmeq->q_dmadev, SQ_SIZE(nvmeq->q_depth),
                                         nvmeq->sq_cmds, nvmeq->sq_dma_addr);
+        if (nvmeq->qid)
+                free_cpumask_var(nvmeq->cpu_mask);
         kfree(nvmeq);
 }
 
@@ -1076,9 +1175,10 @@ static void nvme_free_queues(struct nvme_dev *dev, int lowest)
         int i;
 
         for (i = dev->queue_count - 1; i >= lowest; i--) {
-                nvme_free_queue(dev->queues[i]);
+                struct nvme_queue *nvmeq = raw_nvmeq(dev, i);
+                rcu_assign_pointer(dev->queues[i], NULL);
+                call_rcu(&nvmeq->r_head, nvme_free_queue);
                 dev->queue_count--;
-                dev->queues[i] = NULL;
         }
 }
 
@@ -1098,6 +1198,7 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)
                 return 1;
         }
         nvmeq->q_suspended = 1;
+        nvmeq->dev->online_queues--;
         spin_unlock_irq(&nvmeq->q_lock);
 
         irq_set_affinity_hint(vector, NULL);
@@ -1116,7 +1217,7 @@ static void nvme_clear_queue(struct nvme_queue *nvmeq)
 
 static void nvme_disable_queue(struct nvme_dev *dev, int qid)
 {
-        struct nvme_queue *nvmeq = dev->queues[qid];
+        struct nvme_queue *nvmeq = raw_nvmeq(dev, qid);
 
         if (!nvmeq)
                 return;
@@ -1152,6 +1253,9 @@ static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid,
         if (!nvmeq->sq_cmds)
                 goto free_cqdma;
 
+        if (qid && !zalloc_cpumask_var(&nvmeq->cpu_mask, GFP_KERNEL))
+                goto free_sqdma;
+
         nvmeq->q_dmadev = dmadev;
         nvmeq->dev = dev;
         snprintf(nvmeq->irqname, sizeof(nvmeq->irqname), "nvme%dq%d",
@@ -1162,15 +1266,20 @@ static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid,
         init_waitqueue_head(&nvmeq->sq_full);
         init_waitqueue_entry(&nvmeq->sq_cong_wait, nvme_thread);
         bio_list_init(&nvmeq->sq_cong);
+        INIT_LIST_HEAD(&nvmeq->iod_bio);
         nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];
         nvmeq->q_depth = depth;
         nvmeq->cq_vector = vector;
         nvmeq->qid = qid;
         nvmeq->q_suspended = 1;
         dev->queue_count++;
+        rcu_assign_pointer(dev->queues[qid], nvmeq);
 
         return nvmeq;
 
+ free_sqdma:
+        dma_free_coherent(dmadev, SQ_SIZE(depth), (void *)nvmeq->sq_cmds,
+                                                        nvmeq->sq_dma_addr);
  free_cqdma:
         dma_free_coherent(dmadev, CQ_SIZE(depth), (void *)nvmeq->cqes,
                                                         nvmeq->cq_dma_addr);
@@ -1203,6 +1312,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid)
         memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth));
         nvme_cancel_ios(nvmeq, false);
         nvmeq->q_suspended = 0;
+        dev->online_queues++;
 }
 
 static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
@@ -1311,12 +1421,11 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
         if (result < 0)
                 return result;
 
-        nvmeq = dev->queues[0];
+        nvmeq = raw_nvmeq(dev, 0);
         if (!nvmeq) {
                 nvmeq = nvme_alloc_queue(dev, 0, 64, 0);
                 if (!nvmeq)
                         return -ENOMEM;
-                dev->queues[0] = nvmeq;
         }
 
         aqa = nvmeq->q_depth - 1;
@@ -1418,7 +1527,6 @@ void nvme_unmap_user_pages(struct nvme_dev *dev, int write,
 static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
 {
         struct nvme_dev *dev = ns->dev;
-        struct nvme_queue *nvmeq;
         struct nvme_user_io io;
         struct nvme_command c;
         unsigned length, meta_len;
@@ -1492,22 +1600,14 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
                 c.rw.metadata = cpu_to_le64(meta_dma_addr);
         }
 
-        length = nvme_setup_prps(dev, &c.common, iod, length, GFP_KERNEL);
+        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);
 
-        nvmeq = get_nvmeq(dev);
-        /*
-         * Since nvme_submit_sync_cmd sleeps, we can't keep preemption
-         * disabled.  We may be preempted at any point, and be rescheduled
-         * to a different CPU.  That will cause cacheline bouncing, but no
-         * additional races since q_lock already protects against other CPUs.
-         */
-        put_nvmeq(nvmeq);
         if (length != (io.nblocks + 1) << ns->lba_shift)
                 status = -ENOMEM;
-        else if (!nvmeq || nvmeq->q_suspended)
-                status = -EBUSY;
         else
-                status = nvme_submit_sync_cmd(nvmeq, &c, NULL, NVME_IO_TIMEOUT);
+                status = nvme_submit_io_cmd(dev, &c, NULL);
 
         if (meta_len) {
                 if (status == NVME_SC_SUCCESS && !(io.opcode & 1)) {
@@ -1572,8 +1672,9 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev,
                                                                 length);
                 if (IS_ERR(iod))
                         return PTR_ERR(iod);
-                length = nvme_setup_prps(dev, &c.common, iod, length,
-                                                                GFP_KERNEL);
+                length = nvme_setup_prps(dev, iod, length, GFP_KERNEL);
+                c.common.prp1 = cpu_to_le64(sg_dma_address(iod->sg));
+                c.common.prp2 = cpu_to_le64(iod->first_dma);
         }
 
         timeout = cmd.timeout_ms ? msecs_to_jiffies(cmd.timeout_ms) :
@@ -1581,8 +1682,7 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev,
         if (length != cmd.data_len)
                 status = -ENOMEM;
         else
-                status = nvme_submit_sync_cmd(dev->queues[0], &c, &cmd.result,
-                                                                timeout);
+                status = nvme_submit_sync_cmd(dev, 0, &c, &cmd.result, timeout);
 
         if (cmd.data_len) {
                 nvme_unmap_user_pages(dev, cmd.opcode & 1, iod);
@@ -1653,25 +1753,51 @@ static void nvme_release(struct gendisk *disk, fmode_t mode)
         kref_put(&dev->kref, nvme_free_dev);
 }
 
+static int nvme_getgeo(struct block_device *bd, struct hd_geometry *geo)
+{
+        /* some standard values */
+        geo->heads = 1 << 6;
+        geo->sectors = 1 << 5;
+        geo->cylinders = get_capacity(bd->bd_disk) >> 11;
+        return 0;
+}
+
 static const struct block_device_operations nvme_fops = {
         .owner          = THIS_MODULE,
         .ioctl          = nvme_ioctl,
         .compat_ioctl   = nvme_compat_ioctl,
         .open           = nvme_open,
         .release        = nvme_release,
+        .getgeo         = nvme_getgeo,
 };
 
+static void nvme_resubmit_iods(struct nvme_queue *nvmeq)
+{
+        struct nvme_iod *iod, *next;
+
+        list_for_each_entry_safe(iod, next, &nvmeq->iod_bio, node) {
+                if (unlikely(nvme_submit_iod(nvmeq, iod)))
+                        break;
+                list_del(&iod->node);
+                if (bio_list_empty(&nvmeq->sq_cong) &&
+                                                list_empty(&nvmeq->iod_bio))
+                        remove_wait_queue(&nvmeq->sq_full,
+                                                &nvmeq->sq_cong_wait);
+        }
+}
+
 static void nvme_resubmit_bios(struct nvme_queue *nvmeq)
 {
         while (bio_list_peek(&nvmeq->sq_cong)) {
                 struct bio *bio = bio_list_pop(&nvmeq->sq_cong);
                 struct nvme_ns *ns = bio->bi_bdev->bd_disk->private_data;
 
-                if (bio_list_empty(&nvmeq->sq_cong))
+                if (bio_list_empty(&nvmeq->sq_cong) &&
+                                                list_empty(&nvmeq->iod_bio))
                         remove_wait_queue(&nvmeq->sq_full,
                                                         &nvmeq->sq_cong_wait);
                 if (nvme_submit_bio_queue(nvmeq, ns, bio)) {
-                        if (bio_list_empty(&nvmeq->sq_cong))
+                        if (!waitqueue_active(&nvmeq->sq_full))
                                 add_wait_queue(&nvmeq->sq_full,
                                                         &nvmeq->sq_cong_wait);
                         bio_list_add_head(&nvmeq->sq_cong, bio);
@@ -1700,8 +1826,10 @@ static int nvme_kthread(void *data)
                                 queue_work(nvme_workq, &dev->reset_work);
                                 continue;
                         }
+                        rcu_read_lock();
                         for (i = 0; i < dev->queue_count; i++) {
-                                struct nvme_queue *nvmeq = dev->queues[i];
+                                struct nvme_queue *nvmeq =
+                                                rcu_dereference(dev->queues[i]);
                                 if (!nvmeq)
                                         continue;
                                 spin_lock_irq(&nvmeq->q_lock);
@@ -1710,9 +1838,11 @@ static int nvme_kthread(void *data)
                                 nvme_process_cq(nvmeq);
                                 nvme_cancel_ios(nvmeq, true);
                                 nvme_resubmit_bios(nvmeq);
+                                nvme_resubmit_iods(nvmeq);
  unlock:
                                 spin_unlock_irq(&nvmeq->q_lock);
                         }
+                        rcu_read_unlock();
                 }
                 spin_unlock(&dev_list_lock);
                 schedule_timeout(round_jiffies_relative(HZ));
@@ -1787,6 +1917,143 @@ static struct nvme_ns *nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid,
         return NULL;
 }
 
+static int nvme_find_closest_node(int node)
+{
+        int n, val, min_val = INT_MAX, best_node = node;
+
+        for_each_online_node(n) {
+                if (n == node)
+                        continue;
+                val = node_distance(node, n);
+                if (val < min_val) {
+                        min_val = val;
+                        best_node = n;
+                }
+        }
+        return best_node;
+}
+
+static void nvme_set_queue_cpus(cpumask_t *qmask, struct nvme_queue *nvmeq,
+                                                                int count)
+{
+        int cpu;
+        for_each_cpu(cpu, qmask) {
+                if (cpumask_weight(nvmeq->cpu_mask) >= count)
+                        break;
+                if (!cpumask_test_and_set_cpu(cpu, nvmeq->cpu_mask))
+                        *per_cpu_ptr(nvmeq->dev->io_queue, cpu) = nvmeq->qid;
+        }
+}
+
+static void nvme_add_cpus(cpumask_t *mask, const cpumask_t *unassigned_cpus,
+        const cpumask_t *new_mask, struct nvme_queue *nvmeq, int cpus_per_queue)
+{
+        int next_cpu;
+        for_each_cpu(next_cpu, new_mask) {
+                cpumask_or(mask, mask, get_cpu_mask(next_cpu));
+                cpumask_or(mask, mask, topology_thread_cpumask(next_cpu));
+                cpumask_and(mask, mask, unassigned_cpus);
+                nvme_set_queue_cpus(mask, nvmeq, cpus_per_queue);
+        }
+}
+
+static void nvme_create_io_queues(struct nvme_dev *dev)
+{
+        unsigned i, max;
+
+        max = min(dev->max_qid, num_online_cpus());
+        for (i = dev->queue_count; i <= max; i++)
+                if (!nvme_alloc_queue(dev, i, dev->q_depth, i - 1))
+                        break;
+
+        max = min(dev->queue_count - 1, num_online_cpus());
+        for (i = dev->online_queues; i <= max; i++)
+                if (nvme_create_queue(raw_nvmeq(dev, i), i))
+                        break;
+}
+
+/*
+ * If there are fewer queues than online cpus, this will try to optimally
+ * assign a queue to multiple cpus by grouping cpus that are "close" together:
+ * thread siblings, core, socket, closest node, then whatever else is
+ * available.
+ */
+static void nvme_assign_io_queues(struct nvme_dev *dev)
+{
+        unsigned cpu, cpus_per_queue, queues, remainder, i;
+        cpumask_var_t unassigned_cpus;
+
+        nvme_create_io_queues(dev);
+
+        queues = min(dev->online_queues - 1, num_online_cpus());
+        if (!queues)
+                return;
+
+        cpus_per_queue = num_online_cpus() / queues;
+        remainder = queues - (num_online_cpus() - queues * cpus_per_queue);
+
+        if (!alloc_cpumask_var(&unassigned_cpus, GFP_KERNEL))
+                return;
+
+        cpumask_copy(unassigned_cpus, cpu_online_mask);
+        cpu = cpumask_first(unassigned_cpus);
+        for (i = 1; i <= queues; i++) {
+                struct nvme_queue *nvmeq = lock_nvmeq(dev, i);
+                cpumask_t mask;
+
+                cpumask_clear(nvmeq->cpu_mask);
+                if (!cpumask_weight(unassigned_cpus)) {
+                        unlock_nvmeq(nvmeq);
+                        break;
+                }
+
+                mask = *get_cpu_mask(cpu);
+                nvme_set_queue_cpus(&mask, nvmeq, cpus_per_queue);
+                if (cpus_weight(mask) < cpus_per_queue)
+                        nvme_add_cpus(&mask, unassigned_cpus,
+                                topology_thread_cpumask(cpu),
+                                nvmeq, cpus_per_queue);
+                if (cpus_weight(mask) < cpus_per_queue)
+                        nvme_add_cpus(&mask, unassigned_cpus,
+                                topology_core_cpumask(cpu),
+                                nvmeq, cpus_per_queue);
+                if (cpus_weight(mask) < cpus_per_queue)
+                        nvme_add_cpus(&mask, unassigned_cpus,
+                                cpumask_of_node(cpu_to_node(cpu)),
+                                nvmeq, cpus_per_queue);
+                if (cpus_weight(mask) < cpus_per_queue)
+                        nvme_add_cpus(&mask, unassigned_cpus,
+                                cpumask_of_node(
+                                        nvme_find_closest_node(
+                                                cpu_to_node(cpu))),
+                                nvmeq, cpus_per_queue);
+                if (cpus_weight(mask) < cpus_per_queue)
+                        nvme_add_cpus(&mask, unassigned_cpus,
+                                unassigned_cpus,
+                                nvmeq, cpus_per_queue);
+
+                WARN(cpumask_weight(nvmeq->cpu_mask) != cpus_per_queue,
+                        "nvme%d qid:%d mis-matched queue-to-cpu assignment\n",
+                        dev->instance, i);
+
+                irq_set_affinity_hint(dev->entry[nvmeq->cq_vector].vector,
+                                                        nvmeq->cpu_mask);
+                cpumask_andnot(unassigned_cpus, unassigned_cpus,
+                                                nvmeq->cpu_mask);
+                cpu = cpumask_next(cpu, unassigned_cpus);
+                if (remainder && !--remainder)
+                        cpus_per_queue++;
+                unlock_nvmeq(nvmeq);
+        }
+        WARN(cpumask_weight(unassigned_cpus), "nvme%d unassigned online cpus\n",
+                                                                dev->instance);
+        i = 0;
+        cpumask_andnot(unassigned_cpus, cpu_possible_mask, cpu_online_mask);
+        for_each_cpu(cpu, unassigned_cpus)
+                *per_cpu_ptr(dev->io_queue, cpu) = (i++ % queues) + 1;
+        free_cpumask_var(unassigned_cpus);
+}
+
 static int set_queue_count(struct nvme_dev *dev, int count)
 {
         int status;
@@ -1805,13 +2072,26 @@ static size_t db_bar_size(struct nvme_dev *dev, unsigned nr_io_queues)
         return 4096 + ((nr_io_queues + 1) * 8 * dev->db_stride);
 }
 
+static int nvme_cpu_notify(struct notifier_block *self,
+                                unsigned long action, void *hcpu)
+{
+        struct nvme_dev *dev = container_of(self, struct nvme_dev, nb);
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_DEAD:
+                nvme_assign_io_queues(dev);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
 static int nvme_setup_io_queues(struct nvme_dev *dev)
 {
-        struct nvme_queue *adminq = dev->queues[0];
+        struct nvme_queue *adminq = raw_nvmeq(dev, 0);
         struct pci_dev *pdev = dev->pci_dev;
-        int result, cpu, i, vecs, nr_io_queues, size, q_depth;
+        int result, i, vecs, nr_io_queues, size;
 
-        nr_io_queues = num_online_cpus();
+        nr_io_queues = num_possible_cpus();
         result = set_queue_count(dev, nr_io_queues);
         if (result < 0)
                 return result;
@@ -1830,7 +2110,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
                         size = db_bar_size(dev, nr_io_queues);
                 } while (1);
                 dev->dbs = ((void __iomem *)dev->bar) + 4096;
-                dev->queues[0]->q_db = dev->dbs;
+                adminq->q_db = dev->dbs;
         }
 
         /* Deregister the admin queue's interrupt */
@@ -1856,6 +2136,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
          * number of interrupts.
          */
         nr_io_queues = vecs;
+        dev->max_qid = nr_io_queues;
 
         result = queue_request_irq(dev, adminq, adminq->irqname);
         if (result) {
@@ -1864,49 +2145,13 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
         }
 
         /* Free previously allocated queues that are no longer usable */
-        spin_lock(&dev_list_lock);
-        for (i = dev->queue_count - 1; i > nr_io_queues; i--) {
-                struct nvme_queue *nvmeq = dev->queues[i];
-
-                spin_lock_irq(&nvmeq->q_lock);
-                nvme_cancel_ios(nvmeq, false);
-                spin_unlock_irq(&nvmeq->q_lock);
-
-                nvme_free_queue(nvmeq);
-                dev->queue_count--;
-                dev->queues[i] = NULL;
-        }
-        spin_unlock(&dev_list_lock);
-
-        cpu = cpumask_first(cpu_online_mask);
-        for (i = 0; i < nr_io_queues; i++) {
-                irq_set_affinity_hint(dev->entry[i].vector, get_cpu_mask(cpu));
-                cpu = cpumask_next(cpu, cpu_online_mask);
-        }
-
-        q_depth = min_t(int, NVME_CAP_MQES(readq(&dev->bar->cap)) + 1,
-                                                                NVME_Q_DEPTH);
-        for (i = dev->queue_count - 1; i < nr_io_queues; i++) {
-                dev->queues[i + 1] = nvme_alloc_queue(dev, i + 1, q_depth, i);
-                if (!dev->queues[i + 1]) {
-                        result = -ENOMEM;
-                        goto free_queues;
-                }
-        }
-
-        for (; i < num_possible_cpus(); i++) {
-                int target = i % rounddown_pow_of_two(dev->queue_count - 1);
-                dev->queues[i + 1] = dev->queues[target + 1];
-        }
+        nvme_free_queues(dev, nr_io_queues + 1);
+        nvme_assign_io_queues(dev);
 
-        for (i = 1; i < dev->queue_count; i++) {
-                result = nvme_create_queue(dev->queues[i], i);
-                if (result) {
-                        for (--i; i > 0; i--)
-                                nvme_disable_queue(dev, i);
-                        goto free_queues;
-                }
-        }
+        dev->nb.notifier_call = &nvme_cpu_notify;
+        result = register_hotcpu_notifier(&dev->nb);
+        if (result)
+                goto free_queues;
 
         return 0;
 
@@ -1985,6 +2230,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
 
 static int nvme_dev_map(struct nvme_dev *dev)
 {
+        u64 cap;
         int bars, result = -ENOMEM;
         struct pci_dev *pdev = dev->pci_dev;
 
@@ -2008,7 +2254,9 @@ static int nvme_dev_map(struct nvme_dev *dev)
                 result = -ENODEV;
                 goto unmap;
         }
-        dev->db_stride = 1 << NVME_CAP_STRIDE(readq(&dev->bar->cap));
+        cap = readq(&dev->bar->cap);
+        dev->q_depth = min_t(int, NVME_CAP_MQES(cap) + 1, NVME_Q_DEPTH);
+        dev->db_stride = 1 << NVME_CAP_STRIDE(cap);
         dev->dbs = ((void __iomem *)dev->bar) + 4096;
 
         return 0;
@@ -2164,7 +2412,7 @@ static void nvme_disable_io_queues(struct nvme_dev *dev)
         atomic_set(&dq.refcount, 0);
         dq.worker = &worker;
         for (i = dev->queue_count - 1; i > 0; i--) {
-                struct nvme_queue *nvmeq = dev->queues[i];
+                struct nvme_queue *nvmeq = raw_nvmeq(dev, i);
 
                 if (nvme_suspend_queue(nvmeq))
                         continue;
@@ -2177,19 +2425,38 @@ static void nvme_disable_io_queues(struct nvme_dev *dev)
         kthread_stop(kworker_task);
 }
 
+/*
+* Remove the node from the device list and check
+* for whether or not we need to stop the nvme_thread.
+*/
+static void nvme_dev_list_remove(struct nvme_dev *dev)
+{
+        struct task_struct *tmp = NULL;
+
+        spin_lock(&dev_list_lock);
+        list_del_init(&dev->node);
+        if (list_empty(&dev_list) && !IS_ERR_OR_NULL(nvme_thread)) {
+                tmp = nvme_thread;
+                nvme_thread = NULL;
+        }
+        spin_unlock(&dev_list_lock);
+
+        if (tmp)
+                kthread_stop(tmp);
+}
+
 static void nvme_dev_shutdown(struct nvme_dev *dev)
 {
         int i;
 
         dev->initialized = 0;
+        unregister_hotcpu_notifier(&dev->nb);
 
-        spin_lock(&dev_list_lock);
-        list_del_init(&dev->node);
-        spin_unlock(&dev_list_lock);
+        nvme_dev_list_remove(dev);
 
         if (!dev->bar || (dev->bar && readl(&dev->bar->csts) == -1)) {
                 for (i = dev->queue_count - 1; i >= 0; i--) {
-                        struct nvme_queue *nvmeq = dev->queues[i];
+                        struct nvme_queue *nvmeq = raw_nvmeq(dev, i);
                         nvme_suspend_queue(nvmeq);
                         nvme_clear_queue(nvmeq);
                 }
@@ -2282,6 +2549,7 @@ static void nvme_free_dev(struct kref *kref)
         struct nvme_dev *dev = container_of(kref, struct nvme_dev, kref);
 
         nvme_free_namespaces(dev);
+        free_percpu(dev->io_queue);
         kfree(dev->queues);
         kfree(dev->entry);
         kfree(dev);
@@ -2325,6 +2593,7 @@ static const struct file_operations nvme_dev_fops = {
 static int nvme_dev_start(struct nvme_dev *dev)
 {
         int result;
+        bool start_thread = false;
 
         result = nvme_dev_map(dev);
         if (result)
@@ -2335,9 +2604,24 @@ static int nvme_dev_start(struct nvme_dev *dev)
                 goto unmap;
 
         spin_lock(&dev_list_lock);
+        if (list_empty(&dev_list) && IS_ERR_OR_NULL(nvme_thread)) {
+                start_thread = true;
+                nvme_thread = NULL;
+        }
         list_add(&dev->node, &dev_list);
         spin_unlock(&dev_list_lock);
 
+        if (start_thread) {
+                nvme_thread = kthread_run(nvme_kthread, NULL, "nvme");
+                wake_up(&nvme_kthread_wait);
+        } else
+                wait_event_killable(nvme_kthread_wait, nvme_thread);
+
+        if (IS_ERR_OR_NULL(nvme_thread)) {
+                result = nvme_thread ? PTR_ERR(nvme_thread) : -EINTR;
+                goto disable;
+        }
+
         result = nvme_setup_io_queues(dev);
         if (result && result != -EBUSY)
                 goto disable;
@@ -2346,9 +2630,7 @@ static int nvme_dev_start(struct nvme_dev *dev)
 
  disable:
         nvme_disable_queue(dev, 0);
-        spin_lock(&dev_list_lock);
-        list_del_init(&dev->node);
-        spin_unlock(&dev_list_lock);
+        nvme_dev_list_remove(dev);
  unmap:
         nvme_dev_unmap(dev);
         return result;
@@ -2367,18 +2649,10 @@ static int nvme_remove_dead_ctrl(void *arg)
 
 static void nvme_remove_disks(struct work_struct *ws)
 {
-        int i;
         struct nvme_dev *dev = container_of(ws, struct nvme_dev, reset_work);
 
         nvme_dev_remove(dev);
-        spin_lock(&dev_list_lock);
-        for (i = dev->queue_count - 1; i > 0; i--) {
-                BUG_ON(!dev->queues[i] || !dev->queues[i]->q_suspended);
-                nvme_free_queue(dev->queues[i]);
-                dev->queue_count--;
-                dev->queues[i] = NULL;
-        }
-        spin_unlock(&dev_list_lock);
+        nvme_free_queues(dev, 1);
 }
 
 static int nvme_dev_resume(struct nvme_dev *dev)
@@ -2441,6 +2715,9 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                                                                 GFP_KERNEL);
         if (!dev->queues)
                 goto free;
+        dev->io_queue = alloc_percpu(unsigned short);
+        if (!dev->io_queue)
+                goto free;
 
         INIT_LIST_HEAD(&dev->namespaces);
         dev->reset_workfn = nvme_reset_failed_dev;
@@ -2455,6 +2732,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (result)
                 goto release;
 
+        kref_init(&dev->kref);
         result = nvme_dev_start(dev);
         if (result) {
                 if (result == -EBUSY)
@@ -2462,7 +2740,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto release_pools;
         }
 
-        kref_init(&dev->kref);
         result = nvme_dev_add(dev);
         if (result)
                 goto shutdown;
@@ -2491,6 +2768,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  release:
         nvme_release_instance(dev);
  free:
+        free_percpu(dev->io_queue);
         kfree(dev->queues);
         kfree(dev->entry);
         kfree(dev);
@@ -2517,6 +2795,7 @@ static void nvme_remove(struct pci_dev *pdev)
         nvme_dev_remove(dev);
         nvme_dev_shutdown(dev);
         nvme_free_queues(dev, 0);
+        rcu_barrier();
         nvme_release_instance(dev);
         nvme_release_prp_pools(dev);
         kref_put(&dev->kref, nvme_free_dev);
@@ -2529,6 +2808,7 @@ static void nvme_remove(struct pci_dev *pdev)
 #define nvme_slot_reset NULL
 #define nvme_error_resume NULL
 
+#ifdef CONFIG_PM_SLEEP
 static int nvme_suspend(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
@@ -2549,6 +2829,7 @@ static int nvme_resume(struct device *dev)
         }
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume);
 
@@ -2563,7 +2844,7 @@ static const struct pci_error_handlers nvme_err_handler = {
 /* Move to pci_ids.h later */
 #define PCI_CLASS_STORAGE_EXPRESS       0x010802
 
-static DEFINE_PCI_DEVICE_TABLE(nvme_id_table) = {
+static const struct pci_device_id nvme_id_table[] = {
         { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
         { 0, }
 };
@@ -2585,14 +2866,11 @@ static int __init nvme_init(void)
 {
         int result;
 
-        nvme_thread = kthread_run(nvme_kthread, NULL, "nvme");
-        if (IS_ERR(nvme_thread))
-                return PTR_ERR(nvme_thread);
+        init_waitqueue_head(&nvme_kthread_wait);
 
-        result = -ENOMEM;
         nvme_workq = create_singlethread_workqueue("nvme");
         if (!nvme_workq)
-                goto kill_kthread;
+                return -ENOMEM;
 
         result = register_blkdev(nvme_major, "nvme");
         if (result < 0)
@@ -2609,8 +2887,6 @@ static int __init nvme_init(void)
         unregister_blkdev(nvme_major, "nvme");
  kill_workq:
         destroy_workqueue(nvme_workq);
- kill_kthread:
-        kthread_stop(nvme_thread);
         return result;
 }
 
@@ -2619,11 +2895,11 @@ static void __exit nvme_exit(void)
         pci_unregister_driver(&nvme_driver);
         unregister_blkdev(nvme_major, "nvme");
         destroy_workqueue(nvme_workq);
-        kthread_stop(nvme_thread);
+        BUG_ON(nvme_thread && !IS_ERR(nvme_thread));
 }
 
 MODULE_AUTHOR("Matthew Wilcox <willy@linux.intel.com>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0.8");
+MODULE_VERSION("0.9");
 module_init(nvme_init);
 module_exit(nvme_exit);
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index 4a0ceb64e269..2c3f5be06da1 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -1562,13 +1562,14 @@ static int nvme_trans_send_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                         res = PTR_ERR(iod);
                         goto out;
                 }
-                length = nvme_setup_prps(dev, &c.common, iod, tot_len,
-                                                                GFP_KERNEL);
+                length = nvme_setup_prps(dev, iod, tot_len, GFP_KERNEL);
                 if (length != tot_len) {
                         res = -ENOMEM;
                         goto out_unmap;
                 }
 
+                c.dlfw.prp1 = cpu_to_le64(sg_dma_address(iod->sg));
+                c.dlfw.prp2 = cpu_to_le64(iod->first_dma);
                 c.dlfw.numd = cpu_to_le32((tot_len/BYTES_TO_DWORDS) - 1);
                 c.dlfw.offset = cpu_to_le32(offset/BYTES_TO_DWORDS);
         } else if (opcode == nvme_admin_activate_fw) {
@@ -2033,7 +2034,6 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr,
         int res = SNTI_TRANSLATION_SUCCESS;
         int nvme_sc;
         struct nvme_dev *dev = ns->dev;
-        struct nvme_queue *nvmeq;
         u32 num_cmds;
         struct nvme_iod *iod;
         u64 unit_len;
@@ -2045,7 +2045,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr,
         struct nvme_command c;
         u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read);
         u16 control;
-        u32 max_blocks = nvme_block_nr(ns, dev->max_hw_sectors);
+        u32 max_blocks = queue_max_hw_sectors(ns->queue);
 
         num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);
 
@@ -2093,8 +2093,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                         res = PTR_ERR(iod);
                         goto out;
                 }
-                retcode = nvme_setup_prps(dev, &c.common, iod, unit_len,
-                                                        GFP_KERNEL);
+                retcode = nvme_setup_prps(dev, iod, unit_len, GFP_KERNEL);
                 if (retcode != unit_len) {
                         nvme_unmap_user_pages(dev,
                                 (is_write) ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
@@ -2103,21 +2102,12 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                         res = -ENOMEM;
                         goto out;
                 }
+                c.rw.prp1 = cpu_to_le64(sg_dma_address(iod->sg));
+                c.rw.prp2 = cpu_to_le64(iod->first_dma);
 
                 nvme_offset += unit_num_blocks;
 
-                nvmeq = get_nvmeq(dev);
-                /*
-                 * Since nvme_submit_sync_cmd sleeps, we can't keep
-                 * preemption disabled.  We may be preempted at any
-                 * point, and be rescheduled to a different CPU.  That
-                 * will cause cacheline bouncing, but no additional
-                 * races since q_lock already protects against other
-                 * CPUs.
-                 */
-                put_nvmeq(nvmeq);
-                nvme_sc = nvme_submit_sync_cmd(nvmeq, &c, NULL,
-                                                NVME_IO_TIMEOUT);
+                nvme_sc = nvme_submit_io_cmd(dev, &c, NULL);
                 if (nvme_sc != NVME_SC_SUCCESS) {
                         nvme_unmap_user_pages(dev,
                                 (is_write) ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
@@ -2644,7 +2634,6 @@ static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 {
         int res = SNTI_TRANSLATION_SUCCESS;
         int nvme_sc;
-        struct nvme_queue *nvmeq;
         struct nvme_command c;
         u8 immed, pcmod, pc, no_flush, start;
 
@@ -2671,10 +2660,7 @@ static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                         c.common.opcode = nvme_cmd_flush;
                         c.common.nsid = cpu_to_le32(ns->ns_id);
 
-                        nvmeq = get_nvmeq(ns->dev);
-                        put_nvmeq(nvmeq);
-                        nvme_sc = nvme_submit_sync_cmd(nvmeq, &c, NULL, NVME_IO_TIMEOUT);
-
+                        nvme_sc = nvme_submit_io_cmd(ns->dev, &c, NULL);
                         res = nvme_trans_status_code(hdr, nvme_sc);
                         if (res)
                                 goto out;
@@ -2697,15 +2683,12 @@ static int nvme_trans_synchronize_cache(struct nvme_ns *ns,
         int res = SNTI_TRANSLATION_SUCCESS;
         int nvme_sc;
         struct nvme_command c;
-        struct nvme_queue *nvmeq;
 
         memset(&c, 0, sizeof(c));
         c.common.opcode = nvme_cmd_flush;
         c.common.nsid = cpu_to_le32(ns->ns_id);
 
-        nvmeq = get_nvmeq(ns->dev);
-        put_nvmeq(nvmeq);
-        nvme_sc = nvme_submit_sync_cmd(nvmeq, &c, NULL, NVME_IO_TIMEOUT);
+        nvme_sc = nvme_submit_io_cmd(ns->dev, &c, NULL);
 
         res = nvme_trans_status_code(hdr, nvme_sc);
         if (res)
@@ -2872,7 +2855,6 @@ static int nvme_trans_unmap(struct nvme_ns *ns, struct sg_io_hdr *hdr,
         struct nvme_dev *dev = ns->dev;
         struct scsi_unmap_parm_list *plist;
         struct nvme_dsm_range *range;
-        struct nvme_queue *nvmeq;
         struct nvme_command c;
         int i, nvme_sc, res = -ENOMEM;
         u16 ndesc, list_len;
@@ -2914,10 +2896,7 @@ static int nvme_trans_unmap(struct nvme_ns *ns, struct sg_io_hdr *hdr,
         c.dsm.nr = cpu_to_le32(ndesc - 1);
         c.dsm.attributes = cpu_to_le32(NVME_DSMGMT_AD);
 
-        nvmeq = get_nvmeq(dev);
-        put_nvmeq(nvmeq);
-
-        nvme_sc = nvme_submit_sync_cmd(nvmeq, &c, NULL, NVME_IO_TIMEOUT);
+        nvme_sc = nvme_submit_io_cmd(dev, &c, NULL);
         res = nvme_trans_status_code(hdr, nvme_sc);
 
         dma_free_coherent(&dev->pci_dev->dev, ndesc * sizeof(*range),
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 1386749b48ff..fbae63e3d304 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -408,7 +408,7 @@ config APPLICOM
 
 config SONYPI
         tristate "Sony Vaio Programmable I/O Control Device support"
-        depends on X86 && PCI && INPUT && !64BIT
+        depends on X86_32 && PCI && INPUT
         ---help---
           This driver enables access to the Sony Programmable I/O Control
           Device which can be found in many (all ?) Sony Vaio laptops.
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 6928d094451d..60aafb8a1f2e 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -901,9 +901,9 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                 if (len + offset > PAGE_SIZE)
                         len = PAGE_SIZE - offset;
 
-                src = buf->ops->map(pipe, buf, 1);
+                src = kmap_atomic(buf->page);
                 memcpy(page_address(page) + offset, src + buf->offset, len);
-                buf->ops->unmap(pipe, buf, src);
+                kunmap_atomic(src);
 
                 sg_set_page(&(sgl->sg[sgl->n]), page, len, offset);
         }
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 1e2b9db563ec..0e9cce82844b 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -30,7 +30,7 @@ config ARM_EXYNOS_CPUFREQ
 
 config ARM_EXYNOS4210_CPUFREQ
         bool "SAMSUNG EXYNOS4210"
-        depends on CPU_EXYNOS4210
+        depends on CPU_EXYNOS4210 && !ARCH_MULTIPLATFORM
         default y
         select ARM_EXYNOS_CPUFREQ
         help
@@ -41,7 +41,7 @@ config ARM_EXYNOS4210_CPUFREQ
 
 config ARM_EXYNOS4X12_CPUFREQ
         bool "SAMSUNG EXYNOS4x12"
-        depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+        depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
         default y
         select ARM_EXYNOS_CPUFREQ
         help
@@ -52,7 +52,7 @@ config ARM_EXYNOS4X12_CPUFREQ
 
 config ARM_EXYNOS5250_CPUFREQ
         bool "SAMSUNG EXYNOS5250"
-        depends on SOC_EXYNOS5250
+        depends on SOC_EXYNOS5250 && !ARCH_MULTIPLATFORM
         default y
         select ARM_EXYNOS_CPUFREQ
         help
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index ca0021a96e19..72564b701b4a 100644
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -54,3 +54,11 @@ config PPC_PASEMI_CPUFREQ
         help
           This adds the support for frequency switching on PA Semi
           PWRficient processors.
+
+config POWERNV_CPUFREQ
+       tristate "CPU frequency scaling for IBM POWERNV platform"
+       depends on PPC_POWERNV
+       default y
+       help
+         This adds support for CPU frequency switching on IBM POWERNV
+         platform
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 74945652dd7a..0dbb963c1aef 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -86,6 +86,7 @@ obj-$(CONFIG_PPC_CORENET_CPUFREQ)   += ppc-corenet-cpufreq.o
 obj-$(CONFIG_CPU_FREQ_PMAC)             += pmac32-cpufreq.o
 obj-$(CONFIG_CPU_FREQ_PMAC64)           += pmac64-cpufreq.o
 obj-$(CONFIG_PPC_PASEMI_CPUFREQ)        += pasemi-cpufreq.o
+obj-$(CONFIG_POWERNV_CPUFREQ)           += powernv-cpufreq.o
 
 ##################################################################################
 # Other platform drivers
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index d5eaedbe464f..000e4e0afd7e 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -754,7 +754,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 goto err_unreg;
         }
 
-        data->freq_table = kmalloc(sizeof(*data->freq_table) *
+        data->freq_table = kzalloc(sizeof(*data->freq_table) *
                     (perf->state_count+1), GFP_KERNEL);
         if (!data->freq_table) {
                 result = -ENOMEM;
diff --git a/drivers/cpufreq/at32ap-cpufreq.c b/drivers/cpufreq/at32ap-cpufreq.c
index a1c79f549edb..7b612c8bb09e 100644
--- a/drivers/cpufreq/at32ap-cpufreq.c
+++ b/drivers/cpufreq/at32ap-cpufreq.c
@@ -52,7 +52,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
 static int at32_cpufreq_driver_init(struct cpufreq_policy *policy)
 {
         unsigned int frequency, rate, min_freq;
-        static struct clk *cpuclk;
+        struct clk *cpuclk;
         int retval, steps, i;
 
         if (policy->cpu != 0)
diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
index d4573032cbbc..601b88c490cf 100644
--- a/drivers/cpufreq/cris-artpec3-cpufreq.c
+++ b/drivers/cpufreq/cris-artpec3-cpufreq.c
@@ -15,9 +15,9 @@ static struct notifier_block cris_sdram_freq_notifier_block = {
 };
 
 static struct cpufreq_frequency_table cris_freq_table[] = {
-        {0x01,  6000},
-        {0x02,  200000},
-        {0,     CPUFREQ_TABLE_END},
+        {0, 0x01, 6000},
+        {0, 0x02, 200000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
diff --git a/drivers/cpufreq/cris-etraxfs-cpufreq.c b/drivers/cpufreq/cris-etraxfs-cpufreq.c
index 13c3361437f7..22b2cdde74d9 100644
--- a/drivers/cpufreq/cris-etraxfs-cpufreq.c
+++ b/drivers/cpufreq/cris-etraxfs-cpufreq.c
@@ -15,9 +15,9 @@ static struct notifier_block cris_sdram_freq_notifier_block = {
 };
 
 static struct cpufreq_frequency_table cris_freq_table[] = {
-        {0x01, 6000},
-        {0x02, 200000},
-        {0, CPUFREQ_TABLE_END},
+        {0, 0x01, 6000},
+        {0, 0x02, 200000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index c987e94708f5..7f5d2a68c353 100644
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -56,15 +56,15 @@ static struct s_elan_multiplier elan_multiplier[] = {
 };
 
 static struct cpufreq_frequency_table elanfreq_table[] = {
-        {0,     1000},
-        {1,     2000},
-        {2,     4000},
-        {3,     8000},
-        {4,     16000},
-        {5,     33000},
-        {6,     66000},
-        {7,     99000},
-        {0,     CPUFREQ_TABLE_END},
+        {0, 0,  1000},
+        {0, 1,  2000},
+        {0, 2,  4000},
+        {0, 3,  8000},
+        {0, 4,  16000},
+        {0, 5,  33000},
+        {0, 6,  66000},
+        {0, 7,  99000},
+        {0, 0,  CPUFREQ_TABLE_END},
 };
 
 
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c
index 40d84c43d8f4..6384e5b9a347 100644
--- a/drivers/cpufreq/exynos4210-cpufreq.c
+++ b/drivers/cpufreq/exynos4210-cpufreq.c
@@ -29,12 +29,12 @@ static unsigned int exynos4210_volt_table[] = {
 };
 
 static struct cpufreq_frequency_table exynos4210_freq_table[] = {
-        {L0, 1200 * 1000},
-        {L1, 1000 * 1000},
-        {L2,  800 * 1000},
-        {L3,  500 * 1000},
-        {L4,  200 * 1000},
-        {0, CPUFREQ_TABLE_END},
+        {0, L0, 1200 * 1000},
+        {0, L1, 1000 * 1000},
+        {0, L2,  800 * 1000},
+        {0, L3,  500 * 1000},
+        {0, L4,  200 * 1000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static struct apll_freq apll_freq_4210[] = {
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c
index 7c11ace3b3fc..466c76ad335b 100644
--- a/drivers/cpufreq/exynos4x12-cpufreq.c
+++ b/drivers/cpufreq/exynos4x12-cpufreq.c
@@ -30,21 +30,21 @@ static unsigned int exynos4x12_volt_table[] = {
 };
 
 static struct cpufreq_frequency_table exynos4x12_freq_table[] = {
-        {CPUFREQ_BOOST_FREQ, 1500 * 1000},
-        {L1, 1400 * 1000},
-        {L2, 1300 * 1000},
-        {L3, 1200 * 1000},
-        {L4, 1100 * 1000},
-        {L5, 1000 * 1000},
-        {L6,  900 * 1000},
-        {L7,  800 * 1000},
-        {L8,  700 * 1000},
-        {L9,  600 * 1000},
-        {L10, 500 * 1000},
-        {L11, 400 * 1000},
-        {L12, 300 * 1000},
-        {L13, 200 * 1000},
-        {0, CPUFREQ_TABLE_END},
+        {CPUFREQ_BOOST_FREQ, L0, 1500 * 1000},
+        {0, L1, 1400 * 1000},
+        {0, L2, 1300 * 1000},
+        {0, L3, 1200 * 1000},
+        {0, L4, 1100 * 1000},
+        {0, L5, 1000 * 1000},
+        {0, L6,  900 * 1000},
+        {0, L7,  800 * 1000},
+        {0, L8,  700 * 1000},
+        {0, L9,  600 * 1000},
+        {0, L10, 500 * 1000},
+        {0, L11, 400 * 1000},
+        {0, L12, 300 * 1000},
+        {0, L13, 200 * 1000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static struct apll_freq *apll_freq_4x12;
diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c
index 5f90b82a4082..363a0b3fe1b1 100644
--- a/drivers/cpufreq/exynos5250-cpufreq.c
+++ b/drivers/cpufreq/exynos5250-cpufreq.c
@@ -34,23 +34,23 @@ static unsigned int exynos5250_volt_table[] = {
 };
 
 static struct cpufreq_frequency_table exynos5250_freq_table[] = {
-        {L0, 1700 * 1000},
-        {L1, 1600 * 1000},
-        {L2, 1500 * 1000},
-        {L3, 1400 * 1000},
-        {L4, 1300 * 1000},
-        {L5, 1200 * 1000},
-        {L6, 1100 * 1000},
-        {L7, 1000 * 1000},
-        {L8,  900 * 1000},
-        {L9,  800 * 1000},
-        {L10, 700 * 1000},
-        {L11, 600 * 1000},
-        {L12, 500 * 1000},
-        {L13, 400 * 1000},
-        {L14, 300 * 1000},
-        {L15, 200 * 1000},
-        {0, CPUFREQ_TABLE_END},
+        {0, L0, 1700 * 1000},
+        {0, L1, 1600 * 1000},
+        {0, L2, 1500 * 1000},
+        {0, L3, 1400 * 1000},
+        {0, L4, 1300 * 1000},
+        {0, L5, 1200 * 1000},
+        {0, L6, 1100 * 1000},
+        {0, L7, 1000 * 1000},
+        {0, L8,  900 * 1000},
+        {0, L9,  800 * 1000},
+        {0, L10, 700 * 1000},
+        {0, L11, 600 * 1000},
+        {0, L12, 500 * 1000},
+        {0, L13, 400 * 1000},
+        {0, L14, 300 * 1000},
+        {0, L15, 200 * 1000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static struct apll_freq apll_freq_5250[] = {
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 65a477075b3f..08e7bbcf6d73 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -33,11 +33,10 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
                         continue;
                 }
                 if (!cpufreq_boost_enabled()
-                    && table[i].driver_data == CPUFREQ_BOOST_FREQ)
+                    && (table[i].flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
-                pr_debug("table entry %u: %u kHz, %u driver_data\n",
-                                        i, freq, table[i].driver_data);
+                pr_debug("table entry %u: %u kHz\n", i, freq);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -175,8 +174,8 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
         } else
                 *index = optimal.driver_data;
 
-        pr_debug("target is %u (%u kHz, %u)\n", *index, table[*index].frequency,
-                table[*index].driver_data);
+        pr_debug("target index is %u, freq is:%u kHz\n", *index,
+                 table[*index].frequency);
 
         return 0;
 }
@@ -230,7 +229,7 @@ static ssize_t show_available_freqs(struct cpufreq_policy *policy, char *buf,
                  * show_boost = false and driver_data != BOOST freq
                  * display NON BOOST freqs
                  */
-                if (show_boost ^ (table[i].driver_data == CPUFREQ_BOOST_FREQ))
+                if (show_boost ^ (table[i].flags & CPUFREQ_BOOST_FREQ))
                         continue;
 
                 count += sprintf(&buf[count], "%d ", table[i].frequency);
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c
index a22b5d182e0e..c30aaa6a54e8 100644
--- a/drivers/cpufreq/ia64-acpi-cpufreq.c
+++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
@@ -254,7 +254,7 @@ acpi_cpufreq_cpu_init (
         }
 
         /* alloc freq_table */
-        data->freq_table = kmalloc(sizeof(*data->freq_table) *
+        data->freq_table = kzalloc(sizeof(*data->freq_table) *
                                    (data->acpi_data.state_count + 1),
                                    GFP_KERNEL);
         if (!data->freq_table) {
@@ -275,7 +275,6 @@ acpi_cpufreq_cpu_init (
         /* table init */
         for (i = 0; i <= data->acpi_data.state_count; i++)
         {
-                data->freq_table[i].driver_data = i;
                 if (i < data->acpi_data.state_count) {
                         data->freq_table[i].frequency =
                               data->acpi_data.states[i].core_frequency * 1000;
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 3d114bc5a97a..37a480680cd0 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -43,9 +43,9 @@ static struct priv
  * table.
  */
 static struct cpufreq_frequency_table kirkwood_freq_table[] = {
-        {STATE_CPU_FREQ,        0}, /* CPU uses cpuclk */
-        {STATE_DDR_FREQ,        0}, /* CPU uses ddrclk */
-        {0,                     CPUFREQ_TABLE_END},
+        {0, STATE_CPU_FREQ,     0}, /* CPU uses cpuclk */
+        {0, STATE_DDR_FREQ,     0}, /* CPU uses ddrclk */
+        {0, 0,                  CPUFREQ_TABLE_END},
 };
 
 static unsigned int kirkwood_cpufreq_get_cpu_frequency(unsigned int cpu)
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 5c440f87ba8a..d00e5d1abd25 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -475,7 +475,7 @@ static int longhaul_get_ranges(void)
                 return -EINVAL;
         }
 
-        longhaul_table = kmalloc((numscales + 1) * sizeof(*longhaul_table),
+        longhaul_table = kzalloc((numscales + 1) * sizeof(*longhaul_table),
                         GFP_KERNEL);
         if (!longhaul_table)
                 return -ENOMEM;
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index a3588d61d933..f0bc31f5db27 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -69,7 +69,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
 
 static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        static struct clk *cpuclk;
+        struct clk *cpuclk;
         int i;
         unsigned long rate;
         int ret;
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index c4dfa42a75ac..cc3408fc073f 100644
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -59,9 +59,9 @@
 #define CPUFREQ_LOW                   1
 
 static struct cpufreq_frequency_table maple_cpu_freqs[] = {
-        {CPUFREQ_HIGH,          0},
-        {CPUFREQ_LOW,           0},
-        {0,                     CPUFREQ_TABLE_END},
+        {0, CPUFREQ_HIGH,               0},
+        {0, CPUFREQ_LOW,                0},
+        {0, 0,                          CPUFREQ_TABLE_END},
 };
 
 /* Power mode data is an array of the 32 bits PCR values to use for
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index 74f593e70e19..529cfd92158f 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -92,16 +92,16 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)
 
 
 static struct cpufreq_frequency_table p4clockmod_table[] = {
-        {DC_RESV, CPUFREQ_ENTRY_INVALID},
-        {DC_DFLT, 0},
-        {DC_25PT, 0},
-        {DC_38PT, 0},
-        {DC_50PT, 0},
-        {DC_64PT, 0},
-        {DC_75PT, 0},
-        {DC_88PT, 0},
-        {DC_DISABLE, 0},
-        {DC_RESV, CPUFREQ_TABLE_END},
+        {0, DC_RESV, CPUFREQ_ENTRY_INVALID},
+        {0, DC_DFLT, 0},
+        {0, DC_25PT, 0},
+        {0, DC_38PT, 0},
+        {0, DC_50PT, 0},
+        {0, DC_64PT, 0},
+        {0, DC_75PT, 0},
+        {0, DC_88PT, 0},
+        {0, DC_DISABLE, 0},
+        {0, DC_RESV, CPUFREQ_TABLE_END},
 };
 
 
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 6a2b7d3e85a7..84c84b5f0f3a 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -60,12 +60,12 @@ static int current_astate;
 
 /* We support 5(A0-A4) power states excluding turbo(A5-A6) modes */
 static struct cpufreq_frequency_table pas_freqs[] = {
-        {0,     0},
-        {1,     0},
-        {2,     0},
-        {3,     0},
-        {4,     0},
-        {0,     CPUFREQ_TABLE_END},
+        {0, 0,  0},
+        {0, 1,  0},
+        {0, 2,  0},
+        {0, 3,  0},
+        {0, 4,  0},
+        {0, 0,  CPUFREQ_TABLE_END},
 };
 
 /*
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index cf55d202f332..7615180d7ee3 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -81,9 +81,9 @@ static int is_pmu_based;
 #define CPUFREQ_LOW                   1
 
 static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
-        {CPUFREQ_HIGH,          0},
-        {CPUFREQ_LOW,           0},
-        {0,                     CPUFREQ_TABLE_END},
+        {0, CPUFREQ_HIGH,       0},
+        {0, CPUFREQ_LOW,        0},
+        {0, 0,                  CPUFREQ_TABLE_END},
 };
 
 static inline void local_delay(unsigned long ms)
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 6a338f8c3860..8bc422977b5b 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -65,9 +65,9 @@
 #define CPUFREQ_LOW                   1
 
 static struct cpufreq_frequency_table g5_cpu_freqs[] = {
-        {CPUFREQ_HIGH,          0},
-        {CPUFREQ_LOW,           0},
-        {0,                     CPUFREQ_TABLE_END},
+        {0, CPUFREQ_HIGH,       0},
+        {0, CPUFREQ_LOW,        0},
+        {0, 0,                  CPUFREQ_TABLE_END},
 };
 
 /* Power mode data is an array of the 32 bits PCR values to use for
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index 62c6f2e5afce..49f120e1bc7b 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -37,15 +37,15 @@ MODULE_PARM_DESC(bus_frequency, "Bus frequency in kHz");
 
 /* Clock ratio multiplied by 10 - see table 27 in AMD#23446 */
 static struct cpufreq_frequency_table clock_ratio[] = {
-        {60,  /* 110 -> 6.0x */ 0},
-        {55,  /* 011 -> 5.5x */ 0},
-        {50,  /* 001 -> 5.0x */ 0},
-        {45,  /* 000 -> 4.5x */ 0},
-        {40,  /* 010 -> 4.0x */ 0},
-        {35,  /* 111 -> 3.5x */ 0},
-        {30,  /* 101 -> 3.0x */ 0},
-        {20,  /* 100 -> 2.0x */ 0},
-        {0, CPUFREQ_TABLE_END}
+        {0, 60,  /* 110 -> 6.0x */ 0},
+        {0, 55,  /* 011 -> 5.5x */ 0},
+        {0, 50,  /* 001 -> 5.0x */ 0},
+        {0, 45,  /* 000 -> 4.5x */ 0},
+        {0, 40,  /* 010 -> 4.0x */ 0},
+        {0, 35,  /* 111 -> 3.5x */ 0},
+        {0, 30,  /* 101 -> 3.0x */ 0},
+        {0, 20,  /* 100 -> 2.0x */ 0},
+        {0, 0, CPUFREQ_TABLE_END}
 };
 
 static const u8 index_to_register[8] = { 6, 3, 1, 0, 2, 7, 5, 4 };
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 770a9e1b3468..1b6ae6b57c11 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -623,7 +623,7 @@ static int fill_powernow_table(struct powernow_k8_data *data,
         if (check_pst_table(data, pst, maxvid))
                 return -EINVAL;
 
-        powernow_table = kmalloc((sizeof(*powernow_table)
+        powernow_table = kzalloc((sizeof(*powernow_table)
                 * (data->numps + 1)), GFP_KERNEL);
         if (!powernow_table) {
                 printk(KERN_ERR PFX "powernow_table memory alloc failure\n");
@@ -793,7 +793,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
         }
 
         /* fill in data->powernow_table */
-        powernow_table = kmalloc((sizeof(*powernow_table)
+        powernow_table = kzalloc((sizeof(*powernow_table)
                 * (data->acpi_data.state_count + 1)), GFP_KERNEL);
         if (!powernow_table) {
                 pr_debug("powernow_table memory alloc failure\n");
@@ -810,7 +810,6 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
 
         powernow_table[data->acpi_data.state_count].frequency =
                 CPUFREQ_TABLE_END;
-        powernow_table[data->acpi_data.state_count].driver_data = 0;
         data->powernow_table = powernow_table;
 
         if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
new file mode 100644
index 000000000000..9edccc63245d
--- /dev/null
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -0,0 +1,341 @@
+/*
+ * POWERNV cpufreq driver for the IBM POWER processors
+ *
+ * (C) Copyright IBM 2014
+ *
+ * Author: Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * 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.
+ *
+ */
+
+#define pr_fmt(fmt)     "powernv-cpufreq: " fmt
+
+#include <linux/kernel.h>
+#include <linux/sysfs.h>
+#include <linux/cpumask.h>
+#include <linux/module.h>
+#include <linux/cpufreq.h>
+#include <linux/smp.h>
+#include <linux/of.h>
+
+#include <asm/cputhreads.h>
+#include <asm/reg.h>
+
+#define POWERNV_MAX_PSTATES     256
+
+static struct cpufreq_frequency_table powernv_freqs[POWERNV_MAX_PSTATES+1];
+
+/*
+ * Note: The set of pstates consists of contiguous integers, the
+ * smallest of which is indicated by powernv_pstate_info.min, the
+ * largest of which is indicated by powernv_pstate_info.max.
+ *
+ * The nominal pstate is the highest non-turbo pstate in this
+ * platform. This is indicated by powernv_pstate_info.nominal.
+ */
+static struct powernv_pstate_info {
+        int min;
+        int max;
+        int nominal;
+        int nr_pstates;
+} powernv_pstate_info;
+
+/*
+ * Initialize the freq table based on data obtained
+ * from the firmware passed via device-tree
+ */
+static int init_powernv_pstates(void)
+{
+        struct device_node *power_mgt;
+        int i, pstate_min, pstate_max, pstate_nominal, nr_pstates = 0;
+        const __be32 *pstate_ids, *pstate_freqs;
+        u32 len_ids, len_freqs;
+
+        power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
+        if (!power_mgt) {
+                pr_warn("power-mgt node not found\n");
+                return -ENODEV;
+        }
+
+        if (of_property_read_u32(power_mgt, "ibm,pstate-min", &pstate_min)) {
+                pr_warn("ibm,pstate-min node not found\n");
+                return -ENODEV;
+        }
+
+        if (of_property_read_u32(power_mgt, "ibm,pstate-max", &pstate_max)) {
+                pr_warn("ibm,pstate-max node not found\n");
+                return -ENODEV;
+        }
+
+        if (of_property_read_u32(power_mgt, "ibm,pstate-nominal",
+                                 &pstate_nominal)) {
+                pr_warn("ibm,pstate-nominal not found\n");
+                return -ENODEV;
+        }
+        pr_info("cpufreq pstate min %d nominal %d max %d\n", pstate_min,
+                pstate_nominal, pstate_max);
+
+        pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids);
+        if (!pstate_ids) {
+                pr_warn("ibm,pstate-ids not found\n");
+                return -ENODEV;
+        }
+
+        pstate_freqs = of_get_property(power_mgt, "ibm,pstate-frequencies-mhz",
+                                      &len_freqs);
+        if (!pstate_freqs) {
+                pr_warn("ibm,pstate-frequencies-mhz not found\n");
+                return -ENODEV;
+        }
+
+        WARN_ON(len_ids != len_freqs);
+        nr_pstates = min(len_ids, len_freqs) / sizeof(u32);
+        if (!nr_pstates) {
+                pr_warn("No PStates found\n");
+                return -ENODEV;
+        }
+
+        pr_debug("NR PStates %d\n", nr_pstates);
+        for (i = 0; i < nr_pstates; i++) {
+                u32 id = be32_to_cpu(pstate_ids[i]);
+                u32 freq = be32_to_cpu(pstate_freqs[i]);
+
+                pr_debug("PState id %d freq %d MHz\n", id, freq);
+                powernv_freqs[i].frequency = freq * 1000; /* kHz */
+                powernv_freqs[i].driver_data = id;
+        }
+        /* End of list marker entry */
+        powernv_freqs[i].frequency = CPUFREQ_TABLE_END;
+
+        powernv_pstate_info.min = pstate_min;
+        powernv_pstate_info.max = pstate_max;
+        powernv_pstate_info.nominal = pstate_nominal;
+        powernv_pstate_info.nr_pstates = nr_pstates;
+
+        return 0;
+}
+
+/* Returns the CPU frequency corresponding to the pstate_id. */
+static unsigned int pstate_id_to_freq(int pstate_id)
+{
+        int i;
+
+        i = powernv_pstate_info.max - pstate_id;
+        BUG_ON(i >= powernv_pstate_info.nr_pstates || i < 0);
+
+        return powernv_freqs[i].frequency;
+}
+
+/*
+ * cpuinfo_nominal_freq_show - Show the nominal CPU frequency as indicated by
+ * the firmware
+ */
+static ssize_t cpuinfo_nominal_freq_show(struct cpufreq_policy *policy,
+                                        char *buf)
+{
+        return sprintf(buf, "%u\n",
+                pstate_id_to_freq(powernv_pstate_info.nominal));
+}
+
+struct freq_attr cpufreq_freq_attr_cpuinfo_nominal_freq =
+        __ATTR_RO(cpuinfo_nominal_freq);
+
+static struct freq_attr *powernv_cpu_freq_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        &cpufreq_freq_attr_cpuinfo_nominal_freq,
+        NULL,
+};
+
+/* Helper routines */
+
+/* Access helpers to power mgt SPR */
+
+static inline unsigned long get_pmspr(unsigned long sprn)
+{
+        switch (sprn) {
+        case SPRN_PMCR:
+                return mfspr(SPRN_PMCR);
+
+        case SPRN_PMICR:
+                return mfspr(SPRN_PMICR);
+
+        case SPRN_PMSR:
+                return mfspr(SPRN_PMSR);
+        }
+        BUG();
+}
+
+static inline void set_pmspr(unsigned long sprn, unsigned long val)
+{
+        switch (sprn) {
+        case SPRN_PMCR:
+                mtspr(SPRN_PMCR, val);
+                return;
+
+        case SPRN_PMICR:
+                mtspr(SPRN_PMICR, val);
+                return;
+        }
+        BUG();
+}
+
+/*
+ * Use objects of this type to query/update
+ * pstates on a remote CPU via smp_call_function.
+ */
+struct powernv_smp_call_data {
+        unsigned int freq;
+        int pstate_id;
+};
+
+/*
+ * powernv_read_cpu_freq: Reads the current frequency on this CPU.
+ *
+ * Called via smp_call_function.
+ *
+ * Note: The caller of the smp_call_function should pass an argument of
+ * the type 'struct powernv_smp_call_data *' along with this function.
+ *
+ * The current frequency on this CPU will be returned via
+ * ((struct powernv_smp_call_data *)arg)->freq;
+ */
+static void powernv_read_cpu_freq(void *arg)
+{
+        unsigned long pmspr_val;
+        s8 local_pstate_id;
+        struct powernv_smp_call_data *freq_data = arg;
+
+        pmspr_val = get_pmspr(SPRN_PMSR);
+
+        /*
+         * The local pstate id corresponds bits 48..55 in the PMSR.
+         * Note: Watch out for the sign!
+         */
+        local_pstate_id = (pmspr_val >> 48) & 0xFF;
+        freq_data->pstate_id = local_pstate_id;
+        freq_data->freq = pstate_id_to_freq(freq_data->pstate_id);
+
+        pr_debug("cpu %d pmsr %016lX pstate_id %d frequency %d kHz\n",
+                raw_smp_processor_id(), pmspr_val, freq_data->pstate_id,
+                freq_data->freq);
+}
+
+/*
+ * powernv_cpufreq_get: Returns the CPU frequency as reported by the
+ * firmware for CPU 'cpu'. This value is reported through the sysfs
+ * file cpuinfo_cur_freq.
+ */
+unsigned int powernv_cpufreq_get(unsigned int cpu)
+{
+        struct powernv_smp_call_data freq_data;
+
+        smp_call_function_any(cpu_sibling_mask(cpu), powernv_read_cpu_freq,
+                        &freq_data, 1);
+
+        return freq_data.freq;
+}
+
+/*
+ * set_pstate: Sets the pstate on this CPU.
+ *
+ * This is called via an smp_call_function.
+ *
+ * The caller must ensure that freq_data is of the type
+ * (struct powernv_smp_call_data *) and the pstate_id which needs to be set
+ * on this CPU should be present in freq_data->pstate_id.
+ */
+static void set_pstate(void *freq_data)
+{
+        unsigned long val;
+        unsigned long pstate_ul =
+                ((struct powernv_smp_call_data *) freq_data)->pstate_id;
+
+        val = get_pmspr(SPRN_PMCR);
+        val = val & 0x0000FFFFFFFFFFFFULL;
+
+        pstate_ul = pstate_ul & 0xFF;
+
+        /* Set both global(bits 56..63) and local(bits 48..55) PStates */
+        val = val | (pstate_ul << 56) | (pstate_ul << 48);
+
+        pr_debug("Setting cpu %d pmcr to %016lX\n",
+                        raw_smp_processor_id(), val);
+        set_pmspr(SPRN_PMCR, val);
+}
+
+/*
+ * powernv_cpufreq_target_index: Sets the frequency corresponding to
+ * the cpufreq table entry indexed by new_index on the cpus in the
+ * mask policy->cpus
+ */
+static int powernv_cpufreq_target_index(struct cpufreq_policy *policy,
+                                        unsigned int new_index)
+{
+        struct powernv_smp_call_data freq_data;
+
+        freq_data.pstate_id = powernv_freqs[new_index].driver_data;
+
+        /*
+         * Use smp_call_function to send IPI and execute the
+         * mtspr on target CPU.  We could do that without IPI
+         * if current CPU is within policy->cpus (core)
+         */
+        smp_call_function_any(policy->cpus, set_pstate, &freq_data, 1);
+
+        return 0;
+}
+
+static int powernv_cpufreq_cpu_init(struct cpufreq_policy *policy)
+{
+        int base, i;
+
+        base = cpu_first_thread_sibling(policy->cpu);
+
+        for (i = 0; i < threads_per_core; i++)
+                cpumask_set_cpu(base + i, policy->cpus);
+
+        return cpufreq_table_validate_and_show(policy, powernv_freqs);
+}
+
+static struct cpufreq_driver powernv_cpufreq_driver = {
+        .name           = "powernv-cpufreq",
+        .flags          = CPUFREQ_CONST_LOOPS,
+        .init           = powernv_cpufreq_cpu_init,
+        .verify         = cpufreq_generic_frequency_table_verify,
+        .target_index   = powernv_cpufreq_target_index,
+        .get            = powernv_cpufreq_get,
+        .attr           = powernv_cpu_freq_attr,
+};
+
+static int __init powernv_cpufreq_init(void)
+{
+        int rc = 0;
+
+        /* Discover pstates from device tree and init */
+        rc = init_powernv_pstates();
+        if (rc) {
+                pr_info("powernv-cpufreq disabled. System does not support PState control\n");
+                return rc;
+        }
+
+        return cpufreq_register_driver(&powernv_cpufreq_driver);
+}
+module_init(powernv_cpufreq_init);
+
+static void __exit powernv_cpufreq_exit(void)
+{
+        cpufreq_unregister_driver(&powernv_cpufreq_driver);
+}
+module_exit(powernv_cpufreq_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>");
diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c b/drivers/cpufreq/ppc-corenet-cpufreq.c
index 3bd9123e7026..b7e677be1df0 100644
--- a/drivers/cpufreq/ppc-corenet-cpufreq.c
+++ b/drivers/cpufreq/ppc-corenet-cpufreq.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
 #include <linux/errno.h>
-#include <sysdev/fsl_soc.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index af7b1cabd1e7..5be8a48dba74 100644
--- a/drivers/cpufreq/ppc_cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -32,15 +32,15 @@
 
 /* the CBE supports an 8 step frequency scaling */
 static struct cpufreq_frequency_table cbe_freqs[] = {
-        {1,     0},
-        {2,     0},
-        {3,     0},
-        {4,     0},
-        {5,     0},
-        {6,     0},
-        {8,     0},
-        {10,    0},
-        {0,     CPUFREQ_TABLE_END},
+        {0, 1,  0},
+        {0, 2,  0},
+        {0, 3,  0},
+        {0, 4,  0},
+        {0, 5,  0},
+        {0, 6,  0},
+        {0, 8,  0},
+        {0, 10, 0},
+        {0, 0,  CPUFREQ_TABLE_END},
 };
 
 /*
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 826b8be23099..4626f90559b5 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -72,19 +72,19 @@ static struct s3c2416_dvfs s3c2416_dvfs_table[] = {
 #endif
 
 static struct cpufreq_frequency_table s3c2416_freq_table[] = {
-        { SOURCE_HCLK, FREQ_DVS },
-        { SOURCE_ARMDIV, 133333 },
-        { SOURCE_ARMDIV, 266666 },
-        { SOURCE_ARMDIV, 400000 },
-        { 0, CPUFREQ_TABLE_END },
+        { 0, SOURCE_HCLK, FREQ_DVS },
+        { 0, SOURCE_ARMDIV, 133333 },
+        { 0, SOURCE_ARMDIV, 266666 },
+        { 0, SOURCE_ARMDIV, 400000 },
+        { 0, 0, CPUFREQ_TABLE_END },
 };
 
 static struct cpufreq_frequency_table s3c2450_freq_table[] = {
-        { SOURCE_HCLK, FREQ_DVS },
-        { SOURCE_ARMDIV, 133500 },
-        { SOURCE_ARMDIV, 267000 },
-        { SOURCE_ARMDIV, 534000 },
-        { 0, CPUFREQ_TABLE_END },
+        { 0, SOURCE_HCLK, FREQ_DVS },
+        { 0, SOURCE_ARMDIV, 133500 },
+        { 0, SOURCE_ARMDIV, 267000 },
+        { 0, SOURCE_ARMDIV, 534000 },
+        { 0, 0, CPUFREQ_TABLE_END },
 };
 
 static unsigned int s3c2416_cpufreq_get_speed(unsigned int cpu)
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index a3dc192d21f9..be1b2b5c9753 100644
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -586,7 +586,7 @@ static int s3c_cpufreq_build_freq(void)
         size = cpu_cur.info->calc_freqtable(&cpu_cur, NULL, 0);
         size++;
 
-        ftab = kmalloc(sizeof(*ftab) * size, GFP_KERNEL);
+        ftab = kzalloc(sizeof(*ftab) * size, GFP_KERNEL);
         if (!ftab) {
                 printk(KERN_ERR "%s: no memory for tables\n", __func__);
                 return -ENOMEM;
@@ -664,7 +664,7 @@ int __init s3c_plltab_register(struct cpufreq_frequency_table *plls,
 
         size = sizeof(*vals) * (plls_no + 1);
 
-        vals = kmalloc(size, GFP_KERNEL);
+        vals = kzalloc(size, GFP_KERNEL);
         if (vals) {
                 memcpy(vals, plls, size);
                 pll_reg = vals;
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index c4226de079ab..ff7d3ecb85f0 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -37,19 +37,19 @@ static struct s3c64xx_dvfs s3c64xx_dvfs_table[] = {
 };
 
 static struct cpufreq_frequency_table s3c64xx_freq_table[] = {
-        { 0,  66000 },
-        { 0, 100000 },
-        { 0, 133000 },
-        { 1, 200000 },
-        { 1, 222000 },
-        { 1, 266000 },
-        { 2, 333000 },
-        { 2, 400000 },
-        { 2, 532000 },
-        { 2, 533000 },
-        { 3, 667000 },
-        { 4, 800000 },
-        { 0, CPUFREQ_TABLE_END },
+        { 0, 0,  66000 },
+        { 0, 0, 100000 },
+        { 0, 0, 133000 },
+        { 0, 1, 200000 },
+        { 0, 1, 222000 },
+        { 0, 1, 266000 },
+        { 0, 2, 333000 },
+        { 0, 2, 400000 },
+        { 0, 2, 532000 },
+        { 0, 2, 533000 },
+        { 0, 3, 667000 },
+        { 0, 4, 800000 },
+        { 0, 0, CPUFREQ_TABLE_END },
 };
 #endif
 
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 72421534fff5..ab2c1a40d437 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -64,12 +64,12 @@ enum s5pv210_dmc_port {
 };
 
 static struct cpufreq_frequency_table s5pv210_freq_table[] = {
-        {L0, 1000*1000},
-        {L1, 800*1000},
-        {L2, 400*1000},
-        {L3, 200*1000},
-        {L4, 100*1000},
-        {0, CPUFREQ_TABLE_END},
+        {0, L0, 1000*1000},
+        {0, L1, 800*1000},
+        {0, L2, 400*1000},
+        {0, L3, 200*1000},
+        {0, L4, 100*1000},
+        {0, 0, CPUFREQ_TABLE_END},
 };
 
 static struct regulator *arm_regulator;
diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c
index 69371bf0886d..ac84e4818014 100644
--- a/drivers/cpufreq/sc520_freq.c
+++ b/drivers/cpufreq/sc520_freq.c
@@ -33,9 +33,9 @@ static __u8 __iomem *cpuctl;
 #define PFX "sc520_freq: "
 
 static struct cpufreq_frequency_table sc520_freq_table[] = {
-        {0x01,  100000},
-        {0x02,  133000},
-        {0,     CPUFREQ_TABLE_END},
+        {0, 0x01,       100000},
+        {0, 0x02,       133000},
+        {0, 0,  CPUFREQ_TABLE_END},
 };
 
 static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu)
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 4cfdcff8a310..38678396636d 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -195,18 +195,15 @@ static int spear_cpufreq_probe(struct platform_device *pdev)
         cnt = prop->length / sizeof(u32);
         val = prop->value;
 
-        freq_tbl = kmalloc(sizeof(*freq_tbl) * (cnt + 1), GFP_KERNEL);
+        freq_tbl = kzalloc(sizeof(*freq_tbl) * (cnt + 1), GFP_KERNEL);
         if (!freq_tbl) {
                 ret = -ENOMEM;
                 goto out_put_node;
         }
 
-        for (i = 0; i < cnt; i++) {
-                freq_tbl[i].driver_data = i;
+        for (i = 0; i < cnt; i++)
                 freq_tbl[i].frequency = be32_to_cpup(val++);
-        }
 
-        freq_tbl[i].driver_data = i;
         freq_tbl[i].frequency = CPUFREQ_TABLE_END;
 
         spear_cpufreq.freq_tbl = freq_tbl;
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 394ac159312a..1a07b5904ed5 100644
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -49,9 +49,9 @@ static u32 pmbase;
  * are in kHz for the time being.
  */
 static struct cpufreq_frequency_table speedstep_freqs[] = {
-        {SPEEDSTEP_HIGH,        0},
-        {SPEEDSTEP_LOW,         0},
-        {0,                     CPUFREQ_TABLE_END},
+        {0, SPEEDSTEP_HIGH,     0},
+        {0, SPEEDSTEP_LOW,      0},
+        {0, 0,                  CPUFREQ_TABLE_END},
 };
 
 
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index db5d274dc13a..8635eec96da5 100644
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -42,9 +42,9 @@ static enum speedstep_processor speedstep_processor;
  * are in kHz for the time being.
  */
 static struct cpufreq_frequency_table speedstep_freqs[] = {
-        {SPEEDSTEP_HIGH,        0},
-        {SPEEDSTEP_LOW,         0},
-        {0,                     CPUFREQ_TABLE_END},
+        {0, SPEEDSTEP_HIGH,     0},
+        {0, SPEEDSTEP_LOW,      0},
+        {0, 0,                  CPUFREQ_TABLE_END},
 };
 
 #define GET_SPEEDSTEP_OWNER 0
diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c
index 13be802b6170..8d045afa7fb4 100644
--- a/drivers/cpufreq/unicore2-cpufreq.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -45,7 +45,7 @@ static int ucv2_target(struct cpufreq_policy *policy,
         freqs.new = target_freq;
 
         cpufreq_freq_transition_begin(policy, &freqs);
-        ret = clk_set_rate(policy->mclk, target_freq * 1000);
+        ret = clk_set_rate(policy->clk, target_freq * 1000);
         cpufreq_freq_transition_end(policy, &freqs, ret);
 
         return ret;
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index e918b6d0caf7..efe2f175168f 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -293,6 +293,7 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, \
 }
 
 define_show_state_function(exit_latency)
+define_show_state_function(target_residency)
 define_show_state_function(power_usage)
 define_show_state_ull_function(usage)
 define_show_state_ull_function(time)
@@ -304,6 +305,7 @@ define_store_state_ull_function(disable)
 define_one_state_ro(name, show_state_name);
 define_one_state_ro(desc, show_state_desc);
 define_one_state_ro(latency, show_state_exit_latency);
+define_one_state_ro(residency, show_state_target_residency);
 define_one_state_ro(power, show_state_power_usage);
 define_one_state_ro(usage, show_state_usage);
 define_one_state_ro(time, show_state_time);
@@ -313,6 +315,7 @@ static struct attribute *cpuidle_state_default_attrs[] = {
         &attr_name.attr,
         &attr_desc.attr,
         &attr_latency.attr,
+        &attr_residency.attr,
         &attr_power.attr,
         &attr_usage.attr,
         &attr_time.attr,
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 605b016bcea4..ba06d1d2f99e 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -308,7 +308,7 @@ config DMA_OMAP
 
 config DMA_BCM2835
         tristate "BCM2835 DMA engine support"
-        depends on (ARCH_BCM2835 || MACH_BCM2708)
+        depends on ARCH_BCM2835
         select DMA_ENGINE
         select DMA_VIRTUAL_CHANNELS
 
@@ -350,6 +350,16 @@ config MOXART_DMA
         select DMA_VIRTUAL_CHANNELS
         help
           Enable support for the MOXA ART SoC DMA controller.
+ 
+config FSL_EDMA
+        tristate "Freescale eDMA engine support"
+        depends on OF
+        select DMA_ENGINE
+        select DMA_VIRTUAL_CHANNELS
+        help
+          Support the Freescale eDMA engine with programmable channel
+          multiplexing capability for DMA request sources(slot).
+          This module can be found on Freescale Vybrid and LS-1 SoCs.
 
 config DMA_ENGINE
         bool
@@ -401,4 +411,13 @@ config DMATEST
 config DMA_ENGINE_RAID
         bool
 
+config QCOM_BAM_DMA
+        tristate "QCOM BAM DMA support"
+        depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
+        select DMA_ENGINE
+        select DMA_VIRTUAL_CHANNELS
+        ---help---
+          Enable support for the QCOM BAM DMA controller.  This controller
+          provides DMA capabilities for a variety of on-chip devices.
+
 endif
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index a029d0f4a1be..5150c82c9caf 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -44,3 +44,5 @@ obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o
 obj-$(CONFIG_TI_CPPI41) += cppi41.o
 obj-$(CONFIG_K3_DMA) += k3dma.o
 obj-$(CONFIG_MOXART_DMA) += moxart-dma.o
+obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
+obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
index 1e506afa33f5..de361a156b34 100644
--- a/drivers/dma/acpi-dma.c
+++ b/drivers/dma/acpi-dma.c
@@ -13,6 +13,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
@@ -265,7 +266,7 @@ EXPORT_SYMBOL_GPL(devm_acpi_dma_controller_register);
  */
 void devm_acpi_dma_controller_free(struct device *dev)
 {
-        WARN_ON(devres_destroy(dev, devm_acpi_dma_release, NULL, NULL));
+        WARN_ON(devres_release(dev, devm_acpi_dma_release, NULL, NULL));
 }
 EXPORT_SYMBOL_GPL(devm_acpi_dma_controller_free);
 
@@ -343,7 +344,7 @@ static int acpi_dma_parse_fixed_dma(struct acpi_resource *res, void *data)
  * @index:      index of FixedDMA descriptor for @dev
  *
  * Return:
- * Pointer to appropriate dma channel on success or NULL on error.
+ * Pointer to appropriate dma channel on success or an error pointer.
  */
 struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,
                 size_t index)
@@ -358,10 +359,10 @@ struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,
 
         /* Check if the device was enumerated by ACPI */
         if (!dev || !ACPI_HANDLE(dev))
-                return NULL;
+                return ERR_PTR(-ENODEV);
 
         if (acpi_bus_get_device(ACPI_HANDLE(dev), &adev))
-                return NULL;
+                return ERR_PTR(-ENODEV);
 
         memset(&pdata, 0, sizeof(pdata));
         pdata.index = index;
@@ -376,7 +377,7 @@ struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,
         acpi_dev_free_resource_list(&resource_list);
 
         if (dma_spec->slave_id < 0 || dma_spec->chan_id < 0)
-                return NULL;
+                return ERR_PTR(-ENODEV);
 
         mutex_lock(&acpi_dma_lock);
 
@@ -399,7 +400,7 @@ struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,
         }
 
         mutex_unlock(&acpi_dma_lock);
-        return chan;
+        return chan ? chan : ERR_PTR(-EPROBE_DEFER);
 }
 EXPORT_SYMBOL_GPL(acpi_dma_request_slave_chan_by_index);
 
@@ -413,7 +414,7 @@ EXPORT_SYMBOL_GPL(acpi_dma_request_slave_chan_by_index);
  * the first FixedDMA descriptor is TX and second is RX.
  *
  * Return:
- * Pointer to appropriate dma channel on success or NULL on error.
+ * Pointer to appropriate dma channel on success or an error pointer.
  */
 struct dma_chan *acpi_dma_request_slave_chan_by_name(struct device *dev,
                 const char *name)
@@ -425,7 +426,7 @@ struct dma_chan *acpi_dma_request_slave_chan_by_name(struct device *dev,
         else if (!strcmp(name, "rx"))
                 index = 1;
         else
-                return NULL;
+                return ERR_PTR(-ENODEV);
 
         return acpi_dma_request_slave_chan_by_index(dev, index);
 }
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index e2c04dc81e2a..c13a3bb0f594 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1569,7 +1569,6 @@ static int at_dma_remove(struct platform_device *pdev)
 
                 /* Disable interrupts */
                 atc_disable_chan_irq(atdma, chan->chan_id);
-                tasklet_disable(&atchan->tasklet);
 
                 tasklet_kill(&atchan->tasklet);
                 list_del(&chan->device_node);
diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c
index c18aebf7d5aa..d028f36ae655 100644
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@ -620,12 +620,15 @@ static int cppi41_stop_chan(struct dma_chan *chan)
         u32 desc_phys;
         int ret;
 
+        desc_phys = lower_32_bits(c->desc_phys);
+        desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc);
+        if (!cdd->chan_busy[desc_num])
+                return 0;
+
         ret = cppi41_tear_down_chan(c);
         if (ret)
                 return ret;
 
-        desc_phys = lower_32_bits(c->desc_phys);
-        desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc);
         WARN_ON(!cdd->chan_busy[desc_num]);
         cdd->chan_busy[desc_num] = NULL;
 
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index ed610b497518..a886713937fd 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -627,18 +627,13 @@ EXPORT_SYMBOL_GPL(__dma_request_channel);
 struct dma_chan *dma_request_slave_channel_reason(struct device *dev,
                                                   const char *name)
 {
-        struct dma_chan *chan;
-
         /* If device-tree is present get slave info from here */
         if (dev->of_node)
                 return of_dma_request_slave_channel(dev->of_node, name);
 
         /* If device was enumerated by ACPI get slave info from here */
-        if (ACPI_HANDLE(dev)) {
-                chan = acpi_dma_request_slave_chan_by_name(dev, name);
-                if (chan)
-                        return chan;
-        }
+        if (ACPI_HANDLE(dev))
+                return acpi_dma_request_slave_chan_by_name(dev, name);
 
         return ERR_PTR(-ENODEV);
 }
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 05b6dea770a4..e27cec25c59e 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -340,7 +340,7 @@ static unsigned int min_odd(unsigned int x, unsigned int y)
 static void result(const char *err, unsigned int n, unsigned int src_off,
                    unsigned int dst_off, unsigned int len, unsigned long data)
 {
-        pr_info("%s: result #%u: '%s' with src_off=0x%x dst_off=0x%x len=0x%x (%lu)",
+        pr_info("%s: result #%u: '%s' with src_off=0x%x dst_off=0x%x len=0x%x (%lu)\n",
                 current->comm, n, err, src_off, dst_off, len, data);
 }
 
@@ -348,7 +348,7 @@ static void dbg_result(const char *err, unsigned int n, unsigned int src_off,
                        unsigned int dst_off, unsigned int len,
                        unsigned long data)
 {
-        pr_debug("%s: result #%u: '%s' with src_off=0x%x dst_off=0x%x len=0x%x (%lu)",
+        pr_debug("%s: result #%u: '%s' with src_off=0x%x dst_off=0x%x len=0x%x (%lu)\n",
                    current->comm, n, err, src_off, dst_off, len, data);
 }
 
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 13ac3f240e79..cfdbb92aae1d 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -33,8 +33,8 @@
  * of which use ARM any more).  See the "Databook" from Synopsys for
  * information beyond what licensees probably provide.
  *
- * The driver has currently been tested only with the Atmel AT32AP7000,
- * which does not support descriptor writeback.
+ * The driver has been tested with the Atmel AT32AP7000, which does not
+ * support descriptor writeback.
  */
 
 static inline bool is_request_line_unset(struct dw_dma_chan *dwc)
@@ -1479,7 +1479,6 @@ static void dw_dma_off(struct dw_dma *dw)
 int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
 {
         struct dw_dma           *dw;
-        size_t                  size;
         bool                    autocfg;
         unsigned int            dw_params;
         unsigned int            nr_channels;
@@ -1487,6 +1486,13 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
         int                     err;
         int                     i;
 
+        dw = devm_kzalloc(chip->dev, sizeof(*dw), GFP_KERNEL);
+        if (!dw)
+                return -ENOMEM;
+
+        dw->regs = chip->regs;
+        chip->dw = dw;
+
         dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);
         autocfg = dw_params >> DW_PARAMS_EN & 0x1;
 
@@ -1509,9 +1515,9 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
         else
                 nr_channels = pdata->nr_channels;
 
-        size = sizeof(struct dw_dma) + nr_channels * sizeof(struct dw_dma_chan);
-        dw = devm_kzalloc(chip->dev, size, GFP_KERNEL);
-        if (!dw)
+        dw->chan = devm_kcalloc(chip->dev, nr_channels, sizeof(*dw->chan),
+                                GFP_KERNEL);
+        if (!dw->chan)
                 return -ENOMEM;
 
         dw->clk = devm_clk_get(chip->dev, "hclk");
@@ -1519,9 +1525,6 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
                 return PTR_ERR(dw->clk);
         clk_prepare_enable(dw->clk);
 
-        dw->regs = chip->regs;
-        chip->dw = dw;
-
         /* Get hardware configuration parameters */
         if (autocfg) {
                 max_blk_size = dma_readl(dw, MAX_BLK_SIZE);
diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index e89fc24b8293..fec59f1a77bb 100644
--- a/drivers/dma/dw/pci.c
+++ b/drivers/dma/dw/pci.c
@@ -75,6 +75,36 @@ static void dw_pci_remove(struct pci_dev *pdev)
                 dev_warn(&pdev->dev, "can't remove device properly: %d\n", ret);
 }
 
+#ifdef CONFIG_PM_SLEEP
+
+static int dw_pci_suspend_late(struct device *dev)
+{
+        struct pci_dev *pci = to_pci_dev(dev);
+        struct dw_dma_chip *chip = pci_get_drvdata(pci);
+
+        return dw_dma_suspend(chip);
+};
+
+static int dw_pci_resume_early(struct device *dev)
+{
+        struct pci_dev *pci = to_pci_dev(dev);
+        struct dw_dma_chip *chip = pci_get_drvdata(pci);
+
+        return dw_dma_resume(chip);
+};
+
+#else /* !CONFIG_PM_SLEEP */
+
+#define dw_pci_suspend_late     NULL
+#define dw_pci_resume_early     NULL
+
+#endif /* !CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops dw_pci_dev_pm_ops = {
+        .suspend_late = dw_pci_suspend_late,
+        .resume_early = dw_pci_resume_early,
+};
+
 static DEFINE_PCI_DEVICE_TABLE(dw_pci_id_table) = {
         /* Medfield */
         { PCI_VDEVICE(INTEL, 0x0827), (kernel_ulong_t)&dw_pci_pdata },
@@ -83,6 +113,9 @@ static DEFINE_PCI_DEVICE_TABLE(dw_pci_id_table) = {
         /* BayTrail */
         { PCI_VDEVICE(INTEL, 0x0f06), (kernel_ulong_t)&dw_pci_pdata },
         { PCI_VDEVICE(INTEL, 0x0f40), (kernel_ulong_t)&dw_pci_pdata },
+
+        /* Haswell */
+        { PCI_VDEVICE(INTEL, 0x9c60), (kernel_ulong_t)&dw_pci_pdata },
         { }
 };
 MODULE_DEVICE_TABLE(pci, dw_pci_id_table);
@@ -92,6 +125,9 @@ static struct pci_driver dw_pci_driver = {
         .id_table       = dw_pci_id_table,
         .probe          = dw_pci_probe,
         .remove         = dw_pci_remove,
+        .driver = {
+                .pm     = &dw_pci_dev_pm_ops,
+        },
 };
 
 module_pci_driver(dw_pci_driver);
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index deb4274f80f4..bb98d3e91e8b 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -252,13 +252,13 @@ struct dw_dma {
         struct tasklet_struct   tasklet;
         struct clk              *clk;
 
+        /* channels */
+        struct dw_dma_chan      *chan;
         u8                      all_chan_mask;
 
         /* hardware configuration */
         unsigned char           nr_masters;
         unsigned char           data_width[4];
-
-        struct dw_dma_chan      chan[0];
 };
 
 static inline struct dw_dma_regs __iomem *__dw_regs(struct dw_dma *dw)
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index cd8da451d199..cd04eb7b182e 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -539,6 +539,7 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
                                 edma_alloc_slot(EDMA_CTLR(echan->ch_num),
                                                 EDMA_SLOT_ANY);
                         if (echan->slot[i] < 0) {
+                                kfree(edesc);
                                 dev_err(dev, "Failed to allocate slot\n");
                                 return NULL;
                         }
@@ -553,8 +554,10 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
                 ret = edma_config_pset(chan, &edesc->pset[i], src_addr,
                                        dst_addr, burst, dev_width, period_len,
                                        direction);
-                if (ret < 0)
+                if (ret < 0) {
+                        kfree(edesc);
                         return NULL;
+                }
 
                 if (direction == DMA_DEV_TO_MEM)
                         dst_addr += period_len;
diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
new file mode 100644
index 000000000000..381e793184ba
--- /dev/null
+++ b/drivers/dma/fsl-edma.c
@@ -0,0 +1,975 @@
+/*
+ * drivers/dma/fsl-edma.c
+ *
+ * Copyright 2013-2014 Freescale Semiconductor, Inc.
+ *
+ * Driver for the Freescale eDMA engine with flexible channel multiplexing
+ * capability for DMA request sources. The eDMA block can be found on some
+ * Vybrid and Layerscape SoCs.
+ *
+ * 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/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/dmapool.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_dma.h>
+
+#include "virt-dma.h"
+
+#define EDMA_CR                 0x00
+#define EDMA_ES                 0x04
+#define EDMA_ERQ                0x0C
+#define EDMA_EEI                0x14
+#define EDMA_SERQ               0x1B
+#define EDMA_CERQ               0x1A
+#define EDMA_SEEI               0x19
+#define EDMA_CEEI               0x18
+#define EDMA_CINT               0x1F
+#define EDMA_CERR               0x1E
+#define EDMA_SSRT               0x1D
+#define EDMA_CDNE               0x1C
+#define EDMA_INTR               0x24
+#define EDMA_ERR                0x2C
+
+#define EDMA_TCD_SADDR(x)       (0x1000 + 32 * (x))
+#define EDMA_TCD_SOFF(x)        (0x1004 + 32 * (x))
+#define EDMA_TCD_ATTR(x)        (0x1006 + 32 * (x))
+#define EDMA_TCD_NBYTES(x)      (0x1008 + 32 * (x))
+#define EDMA_TCD_SLAST(x)       (0x100C + 32 * (x))
+#define EDMA_TCD_DADDR(x)       (0x1010 + 32 * (x))
+#define EDMA_TCD_DOFF(x)        (0x1014 + 32 * (x))
+#define EDMA_TCD_CITER_ELINK(x) (0x1016 + 32 * (x))
+#define EDMA_TCD_CITER(x)       (0x1016 + 32 * (x))
+#define EDMA_TCD_DLAST_SGA(x)   (0x1018 + 32 * (x))
+#define EDMA_TCD_CSR(x)         (0x101C + 32 * (x))
+#define EDMA_TCD_BITER_ELINK(x) (0x101E + 32 * (x))
+#define EDMA_TCD_BITER(x)       (0x101E + 32 * (x))
+
+#define EDMA_CR_EDBG            BIT(1)
+#define EDMA_CR_ERCA            BIT(2)
+#define EDMA_CR_ERGA            BIT(3)
+#define EDMA_CR_HOE             BIT(4)
+#define EDMA_CR_HALT            BIT(5)
+#define EDMA_CR_CLM             BIT(6)
+#define EDMA_CR_EMLM            BIT(7)
+#define EDMA_CR_ECX             BIT(16)
+#define EDMA_CR_CX              BIT(17)
+
+#define EDMA_SEEI_SEEI(x)       ((x) & 0x1F)
+#define EDMA_CEEI_CEEI(x)       ((x) & 0x1F)
+#define EDMA_CINT_CINT(x)       ((x) & 0x1F)
+#define EDMA_CERR_CERR(x)       ((x) & 0x1F)
+
+#define EDMA_TCD_ATTR_DSIZE(x)          (((x) & 0x0007))
+#define EDMA_TCD_ATTR_DMOD(x)           (((x) & 0x001F) << 3)
+#define EDMA_TCD_ATTR_SSIZE(x)          (((x) & 0x0007) << 8)
+#define EDMA_TCD_ATTR_SMOD(x)           (((x) & 0x001F) << 11)
+#define EDMA_TCD_ATTR_SSIZE_8BIT        (0x0000)
+#define EDMA_TCD_ATTR_SSIZE_16BIT       (0x0100)
+#define EDMA_TCD_ATTR_SSIZE_32BIT       (0x0200)
+#define EDMA_TCD_ATTR_SSIZE_64BIT       (0x0300)
+#define EDMA_TCD_ATTR_SSIZE_32BYTE      (0x0500)
+#define EDMA_TCD_ATTR_DSIZE_8BIT        (0x0000)
+#define EDMA_TCD_ATTR_DSIZE_16BIT       (0x0001)
+#define EDMA_TCD_ATTR_DSIZE_32BIT       (0x0002)
+#define EDMA_TCD_ATTR_DSIZE_64BIT       (0x0003)
+#define EDMA_TCD_ATTR_DSIZE_32BYTE      (0x0005)
+
+#define EDMA_TCD_SOFF_SOFF(x)           (x)
+#define EDMA_TCD_NBYTES_NBYTES(x)       (x)
+#define EDMA_TCD_SLAST_SLAST(x)         (x)
+#define EDMA_TCD_DADDR_DADDR(x)         (x)
+#define EDMA_TCD_CITER_CITER(x)         ((x) & 0x7FFF)
+#define EDMA_TCD_DOFF_DOFF(x)           (x)
+#define EDMA_TCD_DLAST_SGA_DLAST_SGA(x) (x)
+#define EDMA_TCD_BITER_BITER(x)         ((x) & 0x7FFF)
+
+#define EDMA_TCD_CSR_START              BIT(0)
+#define EDMA_TCD_CSR_INT_MAJOR          BIT(1)
+#define EDMA_TCD_CSR_INT_HALF           BIT(2)
+#define EDMA_TCD_CSR_D_REQ              BIT(3)
+#define EDMA_TCD_CSR_E_SG               BIT(4)
+#define EDMA_TCD_CSR_E_LINK             BIT(5)
+#define EDMA_TCD_CSR_ACTIVE             BIT(6)
+#define EDMA_TCD_CSR_DONE               BIT(7)
+
+#define EDMAMUX_CHCFG_DIS               0x0
+#define EDMAMUX_CHCFG_ENBL              0x80
+#define EDMAMUX_CHCFG_SOURCE(n)         ((n) & 0x3F)
+
+#define DMAMUX_NR       2
+
+#define FSL_EDMA_BUSWIDTHS      BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
+                                BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
+                                BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \
+                                BIT(DMA_SLAVE_BUSWIDTH_8_BYTES)
+
+struct fsl_edma_hw_tcd {
+        u32     saddr;
+        u16     soff;
+        u16     attr;
+        u32     nbytes;
+        u32     slast;
+        u32     daddr;
+        u16     doff;
+        u16     citer;
+        u32     dlast_sga;
+        u16     csr;
+        u16     biter;
+};
+
+struct fsl_edma_sw_tcd {
+        dma_addr_t                      ptcd;
+        struct fsl_edma_hw_tcd          *vtcd;
+};
+
+struct fsl_edma_slave_config {
+        enum dma_transfer_direction     dir;
+        enum dma_slave_buswidth         addr_width;
+        u32                             dev_addr;
+        u32                             burst;
+        u32                             attr;
+};
+
+struct fsl_edma_chan {
+        struct virt_dma_chan            vchan;
+        enum dma_status                 status;
+        struct fsl_edma_engine          *edma;
+        struct fsl_edma_desc            *edesc;
+        struct fsl_edma_slave_config    fsc;
+        struct dma_pool                 *tcd_pool;
+};
+
+struct fsl_edma_desc {
+        struct virt_dma_desc            vdesc;
+        struct fsl_edma_chan            *echan;
+        bool                            iscyclic;
+        unsigned int                    n_tcds;
+        struct fsl_edma_sw_tcd          tcd[];
+};
+
+struct fsl_edma_engine {
+        struct dma_device       dma_dev;
+        void __iomem            *membase;
+        void __iomem            *muxbase[DMAMUX_NR];
+        struct clk              *muxclk[DMAMUX_NR];
+        struct mutex            fsl_edma_mutex;
+        u32                     n_chans;
+        int                     txirq;
+        int                     errirq;
+        bool                    big_endian;
+        struct fsl_edma_chan    chans[];
+};
+
+/*
+ * R/W functions for big- or little-endian registers
+ * the eDMA controller's endian is independent of the CPU core's endian.
+ */
+
+static u16 edma_readw(struct fsl_edma_engine *edma, void __iomem *addr)
+{
+        if (edma->big_endian)
+                return ioread16be(addr);
+        else
+                return ioread16(addr);
+}
+
+static u32 edma_readl(struct fsl_edma_engine *edma, void __iomem *addr)
+{
+        if (edma->big_endian)
+                return ioread32be(addr);
+        else
+                return ioread32(addr);
+}
+
+static void edma_writeb(struct fsl_edma_engine *edma, u8 val, void __iomem *addr)
+{
+        iowrite8(val, addr);
+}
+
+static void edma_writew(struct fsl_edma_engine *edma, u16 val, void __iomem *addr)
+{
+        if (edma->big_endian)
+                iowrite16be(val, addr);
+        else
+                iowrite16(val, addr);
+}
+
+static void edma_writel(struct fsl_edma_engine *edma, u32 val, void __iomem *addr)
+{
+        if (edma->big_endian)
+                iowrite32be(val, addr);
+        else
+                iowrite32(val, addr);
+}
+
+static struct fsl_edma_chan *to_fsl_edma_chan(struct dma_chan *chan)
+{
+        return container_of(chan, struct fsl_edma_chan, vchan.chan);
+}
+
+static struct fsl_edma_desc *to_fsl_edma_desc(struct virt_dma_desc *vd)
+{
+        return container_of(vd, struct fsl_edma_desc, vdesc);
+}
+
+static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan)
+{
+        void __iomem *addr = fsl_chan->edma->membase;
+        u32 ch = fsl_chan->vchan.chan.chan_id;
+
+        edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), addr + EDMA_SEEI);
+        edma_writeb(fsl_chan->edma, ch, addr + EDMA_SERQ);
+}
+
+static void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
+{
+        void __iomem *addr = fsl_chan->edma->membase;
+        u32 ch = fsl_chan->vchan.chan.chan_id;
+
+        edma_writeb(fsl_chan->edma, ch, addr + EDMA_CERQ);
+        edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), addr + EDMA_CEEI);
+}
+
+static void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
+                        unsigned int slot, bool enable)
+{
+        u32 ch = fsl_chan->vchan.chan.chan_id;
+        void __iomem *muxaddr = fsl_chan->edma->muxbase[ch / DMAMUX_NR];
+        unsigned chans_per_mux, ch_off;
+
+        chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR;
+        ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux;
+
+        if (enable)
+                edma_writeb(fsl_chan->edma,
+                                EDMAMUX_CHCFG_ENBL | EDMAMUX_CHCFG_SOURCE(slot),
+                                muxaddr + ch_off);
+        else
+                edma_writeb(fsl_chan->edma, EDMAMUX_CHCFG_DIS, muxaddr + ch_off);
+}
+
+static unsigned int fsl_edma_get_tcd_attr(enum dma_slave_buswidth addr_width)
+{
+        switch (addr_width) {
+        case 1:
+                return EDMA_TCD_ATTR_SSIZE_8BIT | EDMA_TCD_ATTR_DSIZE_8BIT;
+        case 2:
+                return EDMA_TCD_ATTR_SSIZE_16BIT | EDMA_TCD_ATTR_DSIZE_16BIT;
+        case 4:
+                return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT;
+        case 8:
+                return EDMA_TCD_ATTR_SSIZE_64BIT | EDMA_TCD_ATTR_DSIZE_64BIT;
+        default:
+                return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT;
+        }
+}
+
+static void fsl_edma_free_desc(struct virt_dma_desc *vdesc)
+{
+        struct fsl_edma_desc *fsl_desc;
+        int i;
+
+        fsl_desc = to_fsl_edma_desc(vdesc);
+        for (i = 0; i < fsl_desc->n_tcds; i++)
+                        dma_pool_free(fsl_desc->echan->tcd_pool,
+                                        fsl_desc->tcd[i].vtcd,
+                                        fsl_desc->tcd[i].ptcd);
+        kfree(fsl_desc);
+}
+
+static int fsl_edma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+                unsigned long arg)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        struct dma_slave_config *cfg = (void *)arg;
+        unsigned long flags;
+        LIST_HEAD(head);
+
+        switch (cmd) {
+        case DMA_TERMINATE_ALL:
+                spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+                fsl_edma_disable_request(fsl_chan);
+                fsl_chan->edesc = NULL;
+                vchan_get_all_descriptors(&fsl_chan->vchan, &head);
+                spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+                vchan_dma_desc_free_list(&fsl_chan->vchan, &head);
+                return 0;
+
+        case DMA_SLAVE_CONFIG:
+                fsl_chan->fsc.dir = cfg->direction;
+                if (cfg->direction == DMA_DEV_TO_MEM) {
+                        fsl_chan->fsc.dev_addr = cfg->src_addr;
+                        fsl_chan->fsc.addr_width = cfg->src_addr_width;
+                        fsl_chan->fsc.burst = cfg->src_maxburst;
+                        fsl_chan->fsc.attr = fsl_edma_get_tcd_attr(cfg->src_addr_width);
+                } else if (cfg->direction == DMA_MEM_TO_DEV) {
+                        fsl_chan->fsc.dev_addr = cfg->dst_addr;
+                        fsl_chan->fsc.addr_width = cfg->dst_addr_width;
+                        fsl_chan->fsc.burst = cfg->dst_maxburst;
+                        fsl_chan->fsc.attr = fsl_edma_get_tcd_attr(cfg->dst_addr_width);
+                } else {
+                        return -EINVAL;
+                }
+                return 0;
+
+        case DMA_PAUSE:
+                spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+                if (fsl_chan->edesc) {
+                        fsl_edma_disable_request(fsl_chan);
+                        fsl_chan->status = DMA_PAUSED;
+                }
+                spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+                return 0;
+
+        case DMA_RESUME:
+                spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+                if (fsl_chan->edesc) {
+                        fsl_edma_enable_request(fsl_chan);
+                        fsl_chan->status = DMA_IN_PROGRESS;
+                }
+                spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+                return 0;
+
+        default:
+                return -ENXIO;
+        }
+}
+
+static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan,
+                struct virt_dma_desc *vdesc, bool in_progress)
+{
+        struct fsl_edma_desc *edesc = fsl_chan->edesc;
+        void __iomem *addr = fsl_chan->edma->membase;
+        u32 ch = fsl_chan->vchan.chan.chan_id;
+        enum dma_transfer_direction dir = fsl_chan->fsc.dir;
+        dma_addr_t cur_addr, dma_addr;
+        size_t len, size;
+        int i;
+
+        /* calculate the total size in this desc */
+        for (len = i = 0; i < fsl_chan->edesc->n_tcds; i++)
+                len += edma_readl(fsl_chan->edma, &(edesc->tcd[i].vtcd->nbytes))
+                        * edma_readw(fsl_chan->edma, &(edesc->tcd[i].vtcd->biter));
+
+        if (!in_progress)
+                return len;
+
+        if (dir == DMA_MEM_TO_DEV)
+                cur_addr = edma_readl(fsl_chan->edma, addr + EDMA_TCD_SADDR(ch));
+        else
+                cur_addr = edma_readl(fsl_chan->edma, addr + EDMA_TCD_DADDR(ch));
+
+        /* figure out the finished and calculate the residue */
+        for (i = 0; i < fsl_chan->edesc->n_tcds; i++) {
+                size = edma_readl(fsl_chan->edma, &(edesc->tcd[i].vtcd->nbytes))
+                        * edma_readw(fsl_chan->edma, &(edesc->tcd[i].vtcd->biter));
+                if (dir == DMA_MEM_TO_DEV)
+                        dma_addr = edma_readl(fsl_chan->edma,
+                                        &(edesc->tcd[i].vtcd->saddr));
+                else
+                        dma_addr = edma_readl(fsl_chan->edma,
+                                        &(edesc->tcd[i].vtcd->daddr));
+
+                len -= size;
+                if (cur_addr > dma_addr && cur_addr < dma_addr + size) {
+                        len += dma_addr + size - cur_addr;
+                        break;
+                }
+        }
+
+        return len;
+}
+
+static enum dma_status fsl_edma_tx_status(struct dma_chan *chan,
+                dma_cookie_t cookie, struct dma_tx_state *txstate)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        struct virt_dma_desc *vdesc;
+        enum dma_status status;
+        unsigned long flags;
+
+        status = dma_cookie_status(chan, cookie, txstate);
+        if (status == DMA_COMPLETE)
+                return status;
+
+        if (!txstate)
+                return fsl_chan->status;
+
+        spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+        vdesc = vchan_find_desc(&fsl_chan->vchan, cookie);
+        if (fsl_chan->edesc && cookie == fsl_chan->edesc->vdesc.tx.cookie)
+                txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, true);
+        else if (vdesc)
+                txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, false);
+        else
+                txstate->residue = 0;
+
+        spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+
+        return fsl_chan->status;
+}
+
+static void fsl_edma_set_tcd_params(struct fsl_edma_chan *fsl_chan,
+                u32 src, u32 dst, u16 attr, u16 soff, u32 nbytes,
+                u32 slast, u16 citer, u16 biter, u32 doff, u32 dlast_sga,
+                u16 csr)
+{
+        void __iomem *addr = fsl_chan->edma->membase;
+        u32 ch = fsl_chan->vchan.chan.chan_id;
+
+        /*
+         * TCD parameters have been swapped in fill_tcd_params(),
+         * so just write them to registers in the cpu endian here
+         */
+        writew(0, addr + EDMA_TCD_CSR(ch));
+        writel(src, addr + EDMA_TCD_SADDR(ch));
+        writel(dst, addr + EDMA_TCD_DADDR(ch));
+        writew(attr, addr + EDMA_TCD_ATTR(ch));
+        writew(soff, addr + EDMA_TCD_SOFF(ch));
+        writel(nbytes, addr + EDMA_TCD_NBYTES(ch));
+        writel(slast, addr + EDMA_TCD_SLAST(ch));
+        writew(citer, addr + EDMA_TCD_CITER(ch));
+        writew(biter, addr + EDMA_TCD_BITER(ch));
+        writew(doff, addr + EDMA_TCD_DOFF(ch));
+        writel(dlast_sga, addr + EDMA_TCD_DLAST_SGA(ch));
+        writew(csr, addr + EDMA_TCD_CSR(ch));
+}
+
+static void fill_tcd_params(struct fsl_edma_engine *edma,
+                struct fsl_edma_hw_tcd *tcd, u32 src, u32 dst,
+                u16 attr, u16 soff, u32 nbytes, u32 slast, u16 citer,
+                u16 biter, u16 doff, u32 dlast_sga, bool major_int,
+                bool disable_req, bool enable_sg)
+{
+        u16 csr = 0;
+
+        /*
+         * eDMA hardware SGs require the TCD parameters stored in memory
+         * the same endian as the eDMA module so that they can be loaded
+         * automatically by the engine
+         */
+        edma_writel(edma, src, &(tcd->saddr));
+        edma_writel(edma, dst, &(tcd->daddr));
+        edma_writew(edma, attr, &(tcd->attr));
+        edma_writew(edma, EDMA_TCD_SOFF_SOFF(soff), &(tcd->soff));
+        edma_writel(edma, EDMA_TCD_NBYTES_NBYTES(nbytes), &(tcd->nbytes));
+        edma_writel(edma, EDMA_TCD_SLAST_SLAST(slast), &(tcd->slast));
+        edma_writew(edma, EDMA_TCD_CITER_CITER(citer), &(tcd->citer));
+        edma_writew(edma, EDMA_TCD_DOFF_DOFF(doff), &(tcd->doff));
+        edma_writel(edma, EDMA_TCD_DLAST_SGA_DLAST_SGA(dlast_sga), &(tcd->dlast_sga));
+        edma_writew(edma, EDMA_TCD_BITER_BITER(biter), &(tcd->biter));
+        if (major_int)
+                csr |= EDMA_TCD_CSR_INT_MAJOR;
+
+        if (disable_req)
+                csr |= EDMA_TCD_CSR_D_REQ;
+
+        if (enable_sg)
+                csr |= EDMA_TCD_CSR_E_SG;
+
+        edma_writew(edma, csr, &(tcd->csr));
+}
+
+static struct fsl_edma_desc *fsl_edma_alloc_desc(struct fsl_edma_chan *fsl_chan,
+                int sg_len)
+{
+        struct fsl_edma_desc *fsl_desc;
+        int i;
+
+        fsl_desc = kzalloc(sizeof(*fsl_desc) + sizeof(struct fsl_edma_sw_tcd) * sg_len,
+                                GFP_NOWAIT);
+        if (!fsl_desc)
+                return NULL;
+
+        fsl_desc->echan = fsl_chan;
+        fsl_desc->n_tcds = sg_len;
+        for (i = 0; i < sg_len; i++) {
+                fsl_desc->tcd[i].vtcd = dma_pool_alloc(fsl_chan->tcd_pool,
+                                        GFP_NOWAIT, &fsl_desc->tcd[i].ptcd);
+                if (!fsl_desc->tcd[i].vtcd)
+                        goto err;
+        }
+        return fsl_desc;
+
+err:
+        while (--i >= 0)
+                dma_pool_free(fsl_chan->tcd_pool, fsl_desc->tcd[i].vtcd,
+                                fsl_desc->tcd[i].ptcd);
+        kfree(fsl_desc);
+        return NULL;
+}
+
+static struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
+                struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
+                size_t period_len, enum dma_transfer_direction direction,
+                unsigned long flags, void *context)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        struct fsl_edma_desc *fsl_desc;
+        dma_addr_t dma_buf_next;
+        int sg_len, i;
+        u32 src_addr, dst_addr, last_sg, nbytes;
+        u16 soff, doff, iter;
+
+        if (!is_slave_direction(fsl_chan->fsc.dir))
+                return NULL;
+
+        sg_len = buf_len / period_len;
+        fsl_desc = fsl_edma_alloc_desc(fsl_chan, sg_len);
+        if (!fsl_desc)
+                return NULL;
+        fsl_desc->iscyclic = true;
+
+        dma_buf_next = dma_addr;
+        nbytes = fsl_chan->fsc.addr_width * fsl_chan->fsc.burst;
+        iter = period_len / nbytes;
+
+        for (i = 0; i < sg_len; i++) {
+                if (dma_buf_next >= dma_addr + buf_len)
+                        dma_buf_next = dma_addr;
+
+                /* get next sg's physical address */
+                last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;
+
+                if (fsl_chan->fsc.dir == DMA_MEM_TO_DEV) {
+                        src_addr = dma_buf_next;
+                        dst_addr = fsl_chan->fsc.dev_addr;
+                        soff = fsl_chan->fsc.addr_width;
+                        doff = 0;
+                } else {
+                        src_addr = fsl_chan->fsc.dev_addr;
+                        dst_addr = dma_buf_next;
+                        soff = 0;
+                        doff = fsl_chan->fsc.addr_width;
+                }
+
+                fill_tcd_params(fsl_chan->edma, fsl_desc->tcd[i].vtcd, src_addr,
+                                dst_addr, fsl_chan->fsc.attr, soff, nbytes, 0,
+                                iter, iter, doff, last_sg, true, false, true);
+                dma_buf_next += period_len;
+        }
+
+        return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);
+}
+
+static struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
+                struct dma_chan *chan, struct scatterlist *sgl,
+                unsigned int sg_len, enum dma_transfer_direction direction,
+                unsigned long flags, void *context)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        struct fsl_edma_desc *fsl_desc;
+        struct scatterlist *sg;
+        u32 src_addr, dst_addr, last_sg, nbytes;
+        u16 soff, doff, iter;
+        int i;
+
+        if (!is_slave_direction(fsl_chan->fsc.dir))
+                return NULL;
+
+        fsl_desc = fsl_edma_alloc_desc(fsl_chan, sg_len);
+        if (!fsl_desc)
+                return NULL;
+        fsl_desc->iscyclic = false;
+
+        nbytes = fsl_chan->fsc.addr_width * fsl_chan->fsc.burst;
+        for_each_sg(sgl, sg, sg_len, i) {
+                /* get next sg's physical address */
+                last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;
+
+                if (fsl_chan->fsc.dir == DMA_MEM_TO_DEV) {
+                        src_addr = sg_dma_address(sg);
+                        dst_addr = fsl_chan->fsc.dev_addr;
+                        soff = fsl_chan->fsc.addr_width;
+                        doff = 0;
+                } else {
+                        src_addr = fsl_chan->fsc.dev_addr;
+                        dst_addr = sg_dma_address(sg);
+                        soff = 0;
+                        doff = fsl_chan->fsc.addr_width;
+                }
+
+                iter = sg_dma_len(sg) / nbytes;
+                if (i < sg_len - 1) {
+                        last_sg = fsl_desc->tcd[(i + 1)].ptcd;
+                        fill_tcd_params(fsl_chan->edma, fsl_desc->tcd[i].vtcd,
+                                        src_addr, dst_addr, fsl_chan->fsc.attr,
+                                        soff, nbytes, 0, iter, iter, doff, last_sg,
+                                        false, false, true);
+                } else {
+                        last_sg = 0;
+                        fill_tcd_params(fsl_chan->edma, fsl_desc->tcd[i].vtcd,
+                                        src_addr, dst_addr, fsl_chan->fsc.attr,
+                                        soff, nbytes, 0, iter, iter, doff, last_sg,
+                                        true, true, false);
+                }
+        }
+
+        return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);
+}
+
+static void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan)
+{
+        struct fsl_edma_hw_tcd *tcd;
+        struct virt_dma_desc *vdesc;
+
+        vdesc = vchan_next_desc(&fsl_chan->vchan);
+        if (!vdesc)
+                return;
+        fsl_chan->edesc = to_fsl_edma_desc(vdesc);
+        tcd = fsl_chan->edesc->tcd[0].vtcd;
+        fsl_edma_set_tcd_params(fsl_chan, tcd->saddr, tcd->daddr, tcd->attr,
+                        tcd->soff, tcd->nbytes, tcd->slast, tcd->citer,
+                        tcd->biter, tcd->doff, tcd->dlast_sga, tcd->csr);
+        fsl_edma_enable_request(fsl_chan);
+        fsl_chan->status = DMA_IN_PROGRESS;
+}
+
+static irqreturn_t fsl_edma_tx_handler(int irq, void *dev_id)
+{
+        struct fsl_edma_engine *fsl_edma = dev_id;
+        unsigned int intr, ch;
+        void __iomem *base_addr;
+        struct fsl_edma_chan *fsl_chan;
+
+        base_addr = fsl_edma->membase;
+
+        intr = edma_readl(fsl_edma, base_addr + EDMA_INTR);
+        if (!intr)
+                return IRQ_NONE;
+
+        for (ch = 0; ch < fsl_edma->n_chans; ch++) {
+                if (intr & (0x1 << ch)) {
+                        edma_writeb(fsl_edma, EDMA_CINT_CINT(ch),
+                                base_addr + EDMA_CINT);
+
+                        fsl_chan = &fsl_edma->chans[ch];
+
+                        spin_lock(&fsl_chan->vchan.lock);
+                        if (!fsl_chan->edesc->iscyclic) {
+                                list_del(&fsl_chan->edesc->vdesc.node);
+                                vchan_cookie_complete(&fsl_chan->edesc->vdesc);
+                                fsl_chan->edesc = NULL;
+                                fsl_chan->status = DMA_COMPLETE;
+                        } else {
+                                vchan_cyclic_callback(&fsl_chan->edesc->vdesc);
+                        }
+
+                        if (!fsl_chan->edesc)
+                                fsl_edma_xfer_desc(fsl_chan);
+
+                        spin_unlock(&fsl_chan->vchan.lock);
+                }
+        }
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fsl_edma_err_handler(int irq, void *dev_id)
+{
+        struct fsl_edma_engine *fsl_edma = dev_id;
+        unsigned int err, ch;
+
+        err = edma_readl(fsl_edma, fsl_edma->membase + EDMA_ERR);
+        if (!err)
+                return IRQ_NONE;
+
+        for (ch = 0; ch < fsl_edma->n_chans; ch++) {
+                if (err & (0x1 << ch)) {
+                        fsl_edma_disable_request(&fsl_edma->chans[ch]);
+                        edma_writeb(fsl_edma, EDMA_CERR_CERR(ch),
+                                fsl_edma->membase + EDMA_CERR);
+                        fsl_edma->chans[ch].status = DMA_ERROR;
+                }
+        }
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t fsl_edma_irq_handler(int irq, void *dev_id)
+{
+        if (fsl_edma_tx_handler(irq, dev_id) == IRQ_HANDLED)
+                return IRQ_HANDLED;
+
+        return fsl_edma_err_handler(irq, dev_id);
+}
+
+static void fsl_edma_issue_pending(struct dma_chan *chan)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        unsigned long flags;
+
+        spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+
+        if (vchan_issue_pending(&fsl_chan->vchan) && !fsl_chan->edesc)
+                fsl_edma_xfer_desc(fsl_chan);
+
+        spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+}
+
+static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
+                struct of_dma *ofdma)
+{
+        struct fsl_edma_engine *fsl_edma = ofdma->of_dma_data;
+        struct dma_chan *chan, *_chan;
+
+        if (dma_spec->args_count != 2)
+                return NULL;
+
+        mutex_lock(&fsl_edma->fsl_edma_mutex);
+        list_for_each_entry_safe(chan, _chan, &fsl_edma->dma_dev.channels, device_node) {
+                if (chan->client_count)
+                        continue;
+                if ((chan->chan_id / DMAMUX_NR) == dma_spec->args[0]) {
+                        chan = dma_get_slave_channel(chan);
+                        if (chan) {
+                                chan->device->privatecnt++;
+                                fsl_edma_chan_mux(to_fsl_edma_chan(chan),
+                                        dma_spec->args[1], true);
+                                mutex_unlock(&fsl_edma->fsl_edma_mutex);
+                                return chan;
+                        }
+                }
+        }
+        mutex_unlock(&fsl_edma->fsl_edma_mutex);
+        return NULL;
+}
+
+static int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+
+        fsl_chan->tcd_pool = dma_pool_create("tcd_pool", chan->device->dev,
+                                sizeof(struct fsl_edma_hw_tcd),
+                                32, 0);
+        return 0;
+}
+
+static void fsl_edma_free_chan_resources(struct dma_chan *chan)
+{
+        struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+        unsigned long flags;
+        LIST_HEAD(head);
+
+        spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
+        fsl_edma_disable_request(fsl_chan);
+        fsl_edma_chan_mux(fsl_chan, 0, false);
+        fsl_chan->edesc = NULL;
+        vchan_get_all_descriptors(&fsl_chan->vchan, &head);
+        spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
+
+        vchan_dma_desc_free_list(&fsl_chan->vchan, &head);
+        dma_pool_destroy(fsl_chan->tcd_pool);
+        fsl_chan->tcd_pool = NULL;
+}
+
+static int fsl_dma_device_slave_caps(struct dma_chan *dchan,
+                struct dma_slave_caps *caps)
+{
+        caps->src_addr_widths = FSL_EDMA_BUSWIDTHS;
+        caps->dstn_addr_widths = FSL_EDMA_BUSWIDTHS;
+        caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+        caps->cmd_pause = true;
+        caps->cmd_terminate = true;
+
+        return 0;
+}
+
+static int
+fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
+{
+        int ret;
+
+        fsl_edma->txirq = platform_get_irq_byname(pdev, "edma-tx");
+        if (fsl_edma->txirq < 0) {
+                dev_err(&pdev->dev, "Can't get edma-tx irq.\n");
+                return fsl_edma->txirq;
+        }
+
+        fsl_edma->errirq = platform_get_irq_byname(pdev, "edma-err");
+        if (fsl_edma->errirq < 0) {
+                dev_err(&pdev->dev, "Can't get edma-err irq.\n");
+                return fsl_edma->errirq;
+        }
+
+        if (fsl_edma->txirq == fsl_edma->errirq) {
+                ret = devm_request_irq(&pdev->dev, fsl_edma->txirq,
+                                fsl_edma_irq_handler, 0, "eDMA", fsl_edma);
+                if (ret) {
+                        dev_err(&pdev->dev, "Can't register eDMA IRQ.\n");
+                         return  ret;
+                }
+        } else {
+                ret = devm_request_irq(&pdev->dev, fsl_edma->txirq,
+                                fsl_edma_tx_handler, 0, "eDMA tx", fsl_edma);
+                if (ret) {
+                        dev_err(&pdev->dev, "Can't register eDMA tx IRQ.\n");
+                        return  ret;
+                }
+
+                ret = devm_request_irq(&pdev->dev, fsl_edma->errirq,
+                                fsl_edma_err_handler, 0, "eDMA err", fsl_edma);
+                if (ret) {
+                        dev_err(&pdev->dev, "Can't register eDMA err IRQ.\n");
+                        return  ret;
+                }
+        }
+
+        return 0;
+}
+
+static int fsl_edma_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct fsl_edma_engine *fsl_edma;
+        struct fsl_edma_chan *fsl_chan;
+        struct resource *res;
+        int len, chans;
+        int ret, i;
+
+        ret = of_property_read_u32(np, "dma-channels", &chans);
+        if (ret) {
+                dev_err(&pdev->dev, "Can't get dma-channels.\n");
+                return ret;
+        }
+
+        len = sizeof(*fsl_edma) + sizeof(*fsl_chan) * chans;
+        fsl_edma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL);
+        if (!fsl_edma)
+                return -ENOMEM;
+
+        fsl_edma->n_chans = chans;
+        mutex_init(&fsl_edma->fsl_edma_mutex);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        fsl_edma->membase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(fsl_edma->membase))
+                return PTR_ERR(fsl_edma->membase);
+
+        for (i = 0; i < DMAMUX_NR; i++) {
+                char clkname[32];
+
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 1 + i);
+                fsl_edma->muxbase[i] = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(fsl_edma->muxbase[i]))
+                        return PTR_ERR(fsl_edma->muxbase[i]);
+
+                sprintf(clkname, "dmamux%d", i);
+                fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname);
+                if (IS_ERR(fsl_edma->muxclk[i])) {
+                        dev_err(&pdev->dev, "Missing DMAMUX block clock.\n");
+                        return PTR_ERR(fsl_edma->muxclk[i]);
+                }
+
+                ret = clk_prepare_enable(fsl_edma->muxclk[i]);
+                if (ret) {
+                        dev_err(&pdev->dev, "DMAMUX clk block failed.\n");
+                        return ret;
+                }
+
+        }
+
+        ret = fsl_edma_irq_init(pdev, fsl_edma);
+        if (ret)
+                return ret;
+
+        fsl_edma->big_endian = of_property_read_bool(np, "big-endian");
+
+        INIT_LIST_HEAD(&fsl_edma->dma_dev.channels);
+        for (i = 0; i < fsl_edma->n_chans; i++) {
+                struct fsl_edma_chan *fsl_chan = &fsl_edma->chans[i];
+
+                fsl_chan->edma = fsl_edma;
+
+                fsl_chan->vchan.desc_free = fsl_edma_free_desc;
+                vchan_init(&fsl_chan->vchan, &fsl_edma->dma_dev);
+
+                edma_writew(fsl_edma, 0x0, fsl_edma->membase + EDMA_TCD_CSR(i));
+                fsl_edma_chan_mux(fsl_chan, 0, false);
+        }
+
+        dma_cap_set(DMA_PRIVATE, fsl_edma->dma_dev.cap_mask);
+        dma_cap_set(DMA_SLAVE, fsl_edma->dma_dev.cap_mask);
+        dma_cap_set(DMA_CYCLIC, fsl_edma->dma_dev.cap_mask);
+
+        fsl_edma->dma_dev.dev = &pdev->dev;
+        fsl_edma->dma_dev.device_alloc_chan_resources
+                = fsl_edma_alloc_chan_resources;
+        fsl_edma->dma_dev.device_free_chan_resources
+                = fsl_edma_free_chan_resources;
+        fsl_edma->dma_dev.device_tx_status = fsl_edma_tx_status;
+        fsl_edma->dma_dev.device_prep_slave_sg = fsl_edma_prep_slave_sg;
+        fsl_edma->dma_dev.device_prep_dma_cyclic = fsl_edma_prep_dma_cyclic;
+        fsl_edma->dma_dev.device_control = fsl_edma_control;
+        fsl_edma->dma_dev.device_issue_pending = fsl_edma_issue_pending;
+        fsl_edma->dma_dev.device_slave_caps = fsl_dma_device_slave_caps;
+
+        platform_set_drvdata(pdev, fsl_edma);
+
+        ret = dma_async_device_register(&fsl_edma->dma_dev);
+        if (ret) {
+                dev_err(&pdev->dev, "Can't register Freescale eDMA engine.\n");
+                return ret;
+        }
+
+        ret = of_dma_controller_register(np, fsl_edma_xlate, fsl_edma);
+        if (ret) {
+                dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma.\n");
+                dma_async_device_unregister(&fsl_edma->dma_dev);
+                return ret;
+        }
+
+        /* enable round robin arbitration */
+        edma_writel(fsl_edma, EDMA_CR_ERGA | EDMA_CR_ERCA, fsl_edma->membase + EDMA_CR);
+
+        return 0;
+}
+
+static int fsl_edma_remove(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct fsl_edma_engine *fsl_edma = platform_get_drvdata(pdev);
+        int i;
+
+        of_dma_controller_free(np);
+        dma_async_device_unregister(&fsl_edma->dma_dev);
+
+        for (i = 0; i < DMAMUX_NR; i++)
+                clk_disable_unprepare(fsl_edma->muxclk[i]);
+
+        return 0;
+}
+
+static const struct of_device_id fsl_edma_dt_ids[] = {
+        { .compatible = "fsl,vf610-edma", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids);
+
+static struct platform_driver fsl_edma_driver = {
+        .driver         = {
+                .name   = "fsl-edma",
+                .owner  = THIS_MODULE,
+                .of_match_table = fsl_edma_dt_ids,
+        },
+        .probe          = fsl_edma_probe,
+        .remove         = fsl_edma_remove,
+};
+
+module_platform_driver(fsl_edma_driver);
+
+MODULE_ALIAS("platform:fsl-edma");
+MODULE_DESCRIPTION("Freescale eDMA engine driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 6f9ac2022abd..286660a12cc6 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -422,12 +422,12 @@ static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
                 /* Tasklet error handler */
                 tasklet_schedule(&imxdma->channel[i].dma_tasklet);
 
-                printk(KERN_WARNING
-                       "DMA timeout on channel %d -%s%s%s%s\n", i,
-                       errcode & IMX_DMA_ERR_BURST ?    " burst" : "",
-                       errcode & IMX_DMA_ERR_REQUEST ?  " request" : "",
-                       errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "",
-                       errcode & IMX_DMA_ERR_BUFFER ?   " buffer" : "");
+                dev_warn(imxdma->dev,
+                         "DMA timeout on channel %d -%s%s%s%s\n", i,
+                         errcode & IMX_DMA_ERR_BURST ?    " burst" : "",
+                         errcode & IMX_DMA_ERR_REQUEST ?  " request" : "",
+                         errcode & IMX_DMA_ERR_TRANSFER ? " transfer" : "",
+                         errcode & IMX_DMA_ERR_BUFFER ?   " buffer" : "");
         }
         return IRQ_HANDLED;
 }
@@ -1236,6 +1236,7 @@ static int imxdma_remove(struct platform_device *pdev)
 static struct platform_driver imxdma_driver = {
         .driver         = {
                 .name   = "imx-dma",
+                .owner  = THIS_MODULE,
                 .of_match_table = imx_dma_of_dev_id,
         },
         .id_table       = imx_dma_devtype,
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index b439679f4126..bf02e7beb51a 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -867,8 +867,8 @@ static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev, int idx, int irq)
         phy->base = pdev->base;
 
         if (irq) {
-                ret = devm_request_irq(pdev->dev, irq, mmp_pdma_chan_handler, 0,
-                                       "pdma", phy);
+                ret = devm_request_irq(pdev->dev, irq, mmp_pdma_chan_handler,
+                                       IRQF_SHARED, "pdma", phy);
                 if (ret) {
                         dev_err(pdev->dev, "channel request irq fail!\n");
                         return ret;
@@ -957,8 +957,8 @@ static int mmp_pdma_probe(struct platform_device *op)
         if (irq_num != dma_channels) {
                 /* all chan share one irq, demux inside */
                 irq = platform_get_irq(op, 0);
-                ret = devm_request_irq(pdev->dev, irq, mmp_pdma_int_handler, 0,
-                                       "pdma", pdev);
+                ret = devm_request_irq(pdev->dev, irq, mmp_pdma_int_handler,
+                                       IRQF_SHARED, "pdma", pdev);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 33f96aaa80c7..724f7f4c9720 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -22,6 +22,7 @@
 #include <mach/regs-icu.h>
 #include <linux/platform_data/dma-mmp_tdma.h>
 #include <linux/of_device.h>
+#include <linux/of_dma.h>
 
 #include "dmaengine.h"
 
@@ -541,6 +542,45 @@ static int mmp_tdma_chan_init(struct mmp_tdma_device *tdev,
         return 0;
 }
 
+struct mmp_tdma_filter_param {
+        struct device_node *of_node;
+        unsigned int chan_id;
+};
+
+static bool mmp_tdma_filter_fn(struct dma_chan *chan, void *fn_param)
+{
+        struct mmp_tdma_filter_param *param = fn_param;
+        struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
+        struct dma_device *pdma_device = tdmac->chan.device;
+
+        if (pdma_device->dev->of_node != param->of_node)
+                return false;
+
+        if (chan->chan_id != param->chan_id)
+                return false;
+
+        return true;
+}
+
+struct dma_chan *mmp_tdma_xlate(struct of_phandle_args *dma_spec,
+                               struct of_dma *ofdma)
+{
+        struct mmp_tdma_device *tdev = ofdma->of_dma_data;
+        dma_cap_mask_t mask = tdev->device.cap_mask;
+        struct mmp_tdma_filter_param param;
+
+        if (dma_spec->args_count != 1)
+                return NULL;
+
+        param.of_node = ofdma->of_node;
+        param.chan_id = dma_spec->args[0];
+
+        if (param.chan_id >= TDMA_CHANNEL_NUM)
+                return NULL;
+
+        return dma_request_channel(mask, mmp_tdma_filter_fn, &param);
+}
+
 static struct of_device_id mmp_tdma_dt_ids[] = {
         { .compatible = "marvell,adma-1.0", .data = (void *)MMP_AUD_TDMA},
         { .compatible = "marvell,pxa910-squ", .data = (void *)PXA910_SQU},
@@ -631,6 +671,16 @@ static int mmp_tdma_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        if (pdev->dev.of_node) {
+                ret = of_dma_controller_register(pdev->dev.of_node,
+                                                        mmp_tdma_xlate, tdev);
+                if (ret) {
+                        dev_err(tdev->device.dev,
+                                "failed to register controller\n");
+                        dma_async_device_unregister(&tdev->device);
+                }
+        }
+
         dev_info(tdev->device.dev, "initialized\n");
         return 0;
 }
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 64ceca2920b8..b19f04f4390b 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -1088,6 +1088,23 @@ static void omap_dma_free(struct omap_dmadev *od)
         }
 }
 
+#define OMAP_DMA_BUSWIDTHS      (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
+                                 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
+                                 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
+
+static int omap_dma_device_slave_caps(struct dma_chan *dchan,
+                                      struct dma_slave_caps *caps)
+{
+        caps->src_addr_widths = OMAP_DMA_BUSWIDTHS;
+        caps->dstn_addr_widths = OMAP_DMA_BUSWIDTHS;
+        caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+        caps->cmd_pause = true;
+        caps->cmd_terminate = true;
+        caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
+
+        return 0;
+}
+
 static int omap_dma_probe(struct platform_device *pdev)
 {
         struct omap_dmadev *od;
@@ -1118,6 +1135,7 @@ static int omap_dma_probe(struct platform_device *pdev)
         od->ddev.device_prep_slave_sg = omap_dma_prep_slave_sg;
         od->ddev.device_prep_dma_cyclic = omap_dma_prep_dma_cyclic;
         od->ddev.device_control = omap_dma_control;
+        od->ddev.device_slave_caps = omap_dma_device_slave_caps;
         od->ddev.dev = &pdev->dev;
         INIT_LIST_HEAD(&od->ddev.channels);
         INIT_LIST_HEAD(&od->pending);
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 61fdc54a3c88..05fa548bd659 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -964,16 +964,16 @@ static void pch_dma_remove(struct pci_dev *pdev)
         if (pd) {
                 dma_async_device_unregister(&pd->dma);
 
+                free_irq(pdev->irq, pd);
+
                 list_for_each_entry_safe(chan, _c, &pd->dma.channels,
                                          device_node) {
                         pd_chan = to_pd_chan(chan);
 
-                        tasklet_disable(&pd_chan->tasklet);
                         tasklet_kill(&pd_chan->tasklet);
                 }
 
                 pci_pool_destroy(pd->pool);
-                free_irq(pdev->irq, pd);
                 pci_iounmap(pdev, pd->membase);
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c
new file mode 100644
index 000000000000..82c923146e49
--- /dev/null
+++ b/drivers/dma/qcom_bam_dma.c
@@ -0,0 +1,1111 @@
+/*
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+/*
+ * QCOM BAM DMA engine driver
+ *
+ * QCOM BAM DMA blocks are distributed amongst a number of the on-chip
+ * peripherals on the MSM 8x74.  The configuration of the channels are dependent
+ * on the way they are hard wired to that specific peripheral.  The peripheral
+ * device tree entries specify the configuration of each channel.
+ *
+ * The DMA controller requires the use of external memory for storage of the
+ * hardware descriptors for each channel.  The descriptor FIFO is accessed as a
+ * circular buffer and operations are managed according to the offset within the
+ * FIFO.  After pipe/channel reset, all of the pipe registers and internal state
+ * are back to defaults.
+ *
+ * During DMA operations, we write descriptors to the FIFO, being careful to
+ * handle wrapping and then write the last FIFO offset to that channel's
+ * P_EVNT_REG register to kick off the transaction.  The P_SW_OFSTS register
+ * indicates the current FIFO offset that is being processed, so there is some
+ * indication of where the hardware is currently working.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_dma.h>
+#include <linux/clk.h>
+#include <linux/dmaengine.h>
+
+#include "dmaengine.h"
+#include "virt-dma.h"
+
+struct bam_desc_hw {
+        u32 addr;               /* Buffer physical address */
+        u16 size;               /* Buffer size in bytes */
+        u16 flags;
+};
+
+#define DESC_FLAG_INT BIT(15)
+#define DESC_FLAG_EOT BIT(14)
+#define DESC_FLAG_EOB BIT(13)
+
+struct bam_async_desc {
+        struct virt_dma_desc vd;
+
+        u32 num_desc;
+        u32 xfer_len;
+        struct bam_desc_hw *curr_desc;
+
+        enum dma_transfer_direction dir;
+        size_t length;
+        struct bam_desc_hw desc[0];
+};
+
+#define BAM_CTRL                        0x0000
+#define BAM_REVISION                    0x0004
+#define BAM_SW_REVISION                 0x0080
+#define BAM_NUM_PIPES                   0x003C
+#define BAM_TIMER                       0x0040
+#define BAM_TIMER_CTRL                  0x0044
+#define BAM_DESC_CNT_TRSHLD             0x0008
+#define BAM_IRQ_SRCS                    0x000C
+#define BAM_IRQ_SRCS_MSK                0x0010
+#define BAM_IRQ_SRCS_UNMASKED           0x0030
+#define BAM_IRQ_STTS                    0x0014
+#define BAM_IRQ_CLR                     0x0018
+#define BAM_IRQ_EN                      0x001C
+#define BAM_CNFG_BITS                   0x007C
+#define BAM_IRQ_SRCS_EE(ee)             (0x0800 + ((ee) * 0x80))
+#define BAM_IRQ_SRCS_MSK_EE(ee)         (0x0804 + ((ee) * 0x80))
+#define BAM_P_CTRL(pipe)                (0x1000 + ((pipe) * 0x1000))
+#define BAM_P_RST(pipe)                 (0x1004 + ((pipe) * 0x1000))
+#define BAM_P_HALT(pipe)                (0x1008 + ((pipe) * 0x1000))
+#define BAM_P_IRQ_STTS(pipe)            (0x1010 + ((pipe) * 0x1000))
+#define BAM_P_IRQ_CLR(pipe)             (0x1014 + ((pipe) * 0x1000))
+#define BAM_P_IRQ_EN(pipe)              (0x1018 + ((pipe) * 0x1000))
+#define BAM_P_EVNT_DEST_ADDR(pipe)      (0x182C + ((pipe) * 0x1000))
+#define BAM_P_EVNT_REG(pipe)            (0x1818 + ((pipe) * 0x1000))
+#define BAM_P_SW_OFSTS(pipe)            (0x1800 + ((pipe) * 0x1000))
+#define BAM_P_DATA_FIFO_ADDR(pipe)      (0x1824 + ((pipe) * 0x1000))
+#define BAM_P_DESC_FIFO_ADDR(pipe)      (0x181C + ((pipe) * 0x1000))
+#define BAM_P_EVNT_TRSHLD(pipe)         (0x1828 + ((pipe) * 0x1000))
+#define BAM_P_FIFO_SIZES(pipe)          (0x1820 + ((pipe) * 0x1000))
+
+/* BAM CTRL */
+#define BAM_SW_RST                      BIT(0)
+#define BAM_EN                          BIT(1)
+#define BAM_EN_ACCUM                    BIT(4)
+#define BAM_TESTBUS_SEL_SHIFT           5
+#define BAM_TESTBUS_SEL_MASK            0x3F
+#define BAM_DESC_CACHE_SEL_SHIFT        13
+#define BAM_DESC_CACHE_SEL_MASK         0x3
+#define BAM_CACHED_DESC_STORE           BIT(15)
+#define IBC_DISABLE                     BIT(16)
+
+/* BAM REVISION */
+#define REVISION_SHIFT          0
+#define REVISION_MASK           0xFF
+#define NUM_EES_SHIFT           8
+#define NUM_EES_MASK            0xF
+#define CE_BUFFER_SIZE          BIT(13)
+#define AXI_ACTIVE              BIT(14)
+#define USE_VMIDMT              BIT(15)
+#define SECURED                 BIT(16)
+#define BAM_HAS_NO_BYPASS       BIT(17)
+#define HIGH_FREQUENCY_BAM      BIT(18)
+#define INACTIV_TMRS_EXST       BIT(19)
+#define NUM_INACTIV_TMRS        BIT(20)
+#define DESC_CACHE_DEPTH_SHIFT  21
+#define DESC_CACHE_DEPTH_1      (0 << DESC_CACHE_DEPTH_SHIFT)
+#define DESC_CACHE_DEPTH_2      (1 << DESC_CACHE_DEPTH_SHIFT)
+#define DESC_CACHE_DEPTH_3      (2 << DESC_CACHE_DEPTH_SHIFT)
+#define DESC_CACHE_DEPTH_4      (3 << DESC_CACHE_DEPTH_SHIFT)
+#define CMD_DESC_EN             BIT(23)
+#define INACTIV_TMR_BASE_SHIFT  24
+#define INACTIV_TMR_BASE_MASK   0xFF
+
+/* BAM NUM PIPES */
+#define BAM_NUM_PIPES_SHIFT             0
+#define BAM_NUM_PIPES_MASK              0xFF
+#define PERIPH_NON_PIPE_GRP_SHIFT       16
+#define PERIPH_NON_PIP_GRP_MASK         0xFF
+#define BAM_NON_PIPE_GRP_SHIFT          24
+#define BAM_NON_PIPE_GRP_MASK           0xFF
+
+/* BAM CNFG BITS */
+#define BAM_PIPE_CNFG           BIT(2)
+#define BAM_FULL_PIPE           BIT(11)
+#define BAM_NO_EXT_P_RST        BIT(12)
+#define BAM_IBC_DISABLE         BIT(13)
+#define BAM_SB_CLK_REQ          BIT(14)
+#define BAM_PSM_CSW_REQ         BIT(15)
+#define BAM_PSM_P_RES           BIT(16)
+#define BAM_AU_P_RES            BIT(17)
+#define BAM_SI_P_RES            BIT(18)
+#define BAM_WB_P_RES            BIT(19)
+#define BAM_WB_BLK_CSW          BIT(20)
+#define BAM_WB_CSW_ACK_IDL      BIT(21)
+#define BAM_WB_RETR_SVPNT       BIT(22)
+#define BAM_WB_DSC_AVL_P_RST    BIT(23)
+#define BAM_REG_P_EN            BIT(24)
+#define BAM_PSM_P_HD_DATA       BIT(25)
+#define BAM_AU_ACCUMED          BIT(26)
+#define BAM_CMD_ENABLE          BIT(27)
+
+#define BAM_CNFG_BITS_DEFAULT   (BAM_PIPE_CNFG |        \
+                                 BAM_NO_EXT_P_RST |     \
+                                 BAM_IBC_DISABLE |      \
+                                 BAM_SB_CLK_REQ |       \
+                                 BAM_PSM_CSW_REQ |      \
+                                 BAM_PSM_P_RES |        \
+                                 BAM_AU_P_RES |         \
+                                 BAM_SI_P_RES |         \
+                                 BAM_WB_P_RES |         \
+                                 BAM_WB_BLK_CSW |       \
+                                 BAM_WB_CSW_ACK_IDL |   \
+                                 BAM_WB_RETR_SVPNT |    \
+                                 BAM_WB_DSC_AVL_P_RST | \
+                                 BAM_REG_P_EN |         \
+                                 BAM_PSM_P_HD_DATA |    \
+                                 BAM_AU_ACCUMED |       \
+                                 BAM_CMD_ENABLE)
+
+/* PIPE CTRL */
+#define P_EN                    BIT(1)
+#define P_DIRECTION             BIT(3)
+#define P_SYS_STRM              BIT(4)
+#define P_SYS_MODE              BIT(5)
+#define P_AUTO_EOB              BIT(6)
+#define P_AUTO_EOB_SEL_SHIFT    7
+#define P_AUTO_EOB_SEL_512      (0 << P_AUTO_EOB_SEL_SHIFT)
+#define P_AUTO_EOB_SEL_256      (1 << P_AUTO_EOB_SEL_SHIFT)
+#define P_AUTO_EOB_SEL_128      (2 << P_AUTO_EOB_SEL_SHIFT)
+#define P_AUTO_EOB_SEL_64       (3 << P_AUTO_EOB_SEL_SHIFT)
+#define P_PREFETCH_LIMIT_SHIFT  9
+#define P_PREFETCH_LIMIT_32     (0 << P_PREFETCH_LIMIT_SHIFT)
+#define P_PREFETCH_LIMIT_16     (1 << P_PREFETCH_LIMIT_SHIFT)
+#define P_PREFETCH_LIMIT_4      (2 << P_PREFETCH_LIMIT_SHIFT)
+#define P_WRITE_NWD             BIT(11)
+#define P_LOCK_GROUP_SHIFT      16
+#define P_LOCK_GROUP_MASK       0x1F
+
+/* BAM_DESC_CNT_TRSHLD */
+#define CNT_TRSHLD              0xffff
+#define DEFAULT_CNT_THRSHLD     0x4
+
+/* BAM_IRQ_SRCS */
+#define BAM_IRQ                 BIT(31)
+#define P_IRQ                   0x7fffffff
+
+/* BAM_IRQ_SRCS_MSK */
+#define BAM_IRQ_MSK             BAM_IRQ
+#define P_IRQ_MSK               P_IRQ
+
+/* BAM_IRQ_STTS */
+#define BAM_TIMER_IRQ           BIT(4)
+#define BAM_EMPTY_IRQ           BIT(3)
+#define BAM_ERROR_IRQ           BIT(2)
+#define BAM_HRESP_ERR_IRQ       BIT(1)
+
+/* BAM_IRQ_CLR */
+#define BAM_TIMER_CLR           BIT(4)
+#define BAM_EMPTY_CLR           BIT(3)
+#define BAM_ERROR_CLR           BIT(2)
+#define BAM_HRESP_ERR_CLR       BIT(1)
+
+/* BAM_IRQ_EN */
+#define BAM_TIMER_EN            BIT(4)
+#define BAM_EMPTY_EN            BIT(3)
+#define BAM_ERROR_EN            BIT(2)
+#define BAM_HRESP_ERR_EN        BIT(1)
+
+/* BAM_P_IRQ_EN */
+#define P_PRCSD_DESC_EN         BIT(0)
+#define P_TIMER_EN              BIT(1)
+#define P_WAKE_EN               BIT(2)
+#define P_OUT_OF_DESC_EN        BIT(3)
+#define P_ERR_EN                BIT(4)
+#define P_TRNSFR_END_EN         BIT(5)
+#define P_DEFAULT_IRQS_EN       (P_PRCSD_DESC_EN | P_ERR_EN | P_TRNSFR_END_EN)
+
+/* BAM_P_SW_OFSTS */
+#define P_SW_OFSTS_MASK         0xffff
+
+#define BAM_DESC_FIFO_SIZE      SZ_32K
+#define MAX_DESCRIPTORS (BAM_DESC_FIFO_SIZE / sizeof(struct bam_desc_hw) - 1)
+#define BAM_MAX_DATA_SIZE       (SZ_32K - 8)
+
+struct bam_chan {
+        struct virt_dma_chan vc;
+
+        struct bam_device *bdev;
+
+        /* configuration from device tree */
+        u32 id;
+
+        struct bam_async_desc *curr_txd;        /* current running dma */
+
+        /* runtime configuration */
+        struct dma_slave_config slave;
+
+        /* fifo storage */
+        struct bam_desc_hw *fifo_virt;
+        dma_addr_t fifo_phys;
+
+        /* fifo markers */
+        unsigned short head;            /* start of active descriptor entries */
+        unsigned short tail;            /* end of active descriptor entries */
+
+        unsigned int initialized;       /* is the channel hw initialized? */
+        unsigned int paused;            /* is the channel paused? */
+        unsigned int reconfigure;       /* new slave config? */
+
+        struct list_head node;
+};
+
+static inline struct bam_chan *to_bam_chan(struct dma_chan *common)
+{
+        return container_of(common, struct bam_chan, vc.chan);
+}
+
+struct bam_device {
+        void __iomem *regs;
+        struct device *dev;
+        struct dma_device common;
+        struct device_dma_parameters dma_parms;
+        struct bam_chan *channels;
+        u32 num_channels;
+
+        /* execution environment ID, from DT */
+        u32 ee;
+
+        struct clk *bamclk;
+        int irq;
+
+        /* dma start transaction tasklet */
+        struct tasklet_struct task;
+};
+
+/**
+ * bam_reset_channel - Reset individual BAM DMA channel
+ * @bchan: bam channel
+ *
+ * This function resets a specific BAM channel
+ */
+static void bam_reset_channel(struct bam_chan *bchan)
+{
+        struct bam_device *bdev = bchan->bdev;
+
+        lockdep_assert_held(&bchan->vc.lock);
+
+        /* reset channel */
+        writel_relaxed(1, bdev->regs + BAM_P_RST(bchan->id));
+        writel_relaxed(0, bdev->regs + BAM_P_RST(bchan->id));
+
+        /* don't allow cpu to reorder BAM register accesses done after this */
+        wmb();
+
+        /* make sure hw is initialized when channel is used the first time  */
+        bchan->initialized = 0;
+}
+
+/**
+ * bam_chan_init_hw - Initialize channel hardware
+ * @bchan: bam channel
+ *
+ * This function resets and initializes the BAM channel
+ */
+static void bam_chan_init_hw(struct bam_chan *bchan,
+        enum dma_transfer_direction dir)
+{
+        struct bam_device *bdev = bchan->bdev;
+        u32 val;
+
+        /* Reset the channel to clear internal state of the FIFO */
+        bam_reset_channel(bchan);
+
+        /*
+         * write out 8 byte aligned address.  We have enough space for this
+         * because we allocated 1 more descriptor (8 bytes) than we can use
+         */
+        writel_relaxed(ALIGN(bchan->fifo_phys, sizeof(struct bam_desc_hw)),
+                        bdev->regs + BAM_P_DESC_FIFO_ADDR(bchan->id));
+        writel_relaxed(BAM_DESC_FIFO_SIZE, bdev->regs +
+                        BAM_P_FIFO_SIZES(bchan->id));
+
+        /* enable the per pipe interrupts, enable EOT, ERR, and INT irqs */
+        writel_relaxed(P_DEFAULT_IRQS_EN, bdev->regs + BAM_P_IRQ_EN(bchan->id));
+
+        /* unmask the specific pipe and EE combo */
+        val = readl_relaxed(bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+        val |= BIT(bchan->id);
+        writel_relaxed(val, bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+
+        /* don't allow cpu to reorder the channel enable done below */
+        wmb();
+
+        /* set fixed direction and mode, then enable channel */
+        val = P_EN | P_SYS_MODE;
+        if (dir == DMA_DEV_TO_MEM)
+                val |= P_DIRECTION;
+
+        writel_relaxed(val, bdev->regs + BAM_P_CTRL(bchan->id));
+
+        bchan->initialized = 1;
+
+        /* init FIFO pointers */
+        bchan->head = 0;
+        bchan->tail = 0;
+}
+
+/**
+ * bam_alloc_chan - Allocate channel resources for DMA channel.
+ * @chan: specified channel
+ *
+ * This function allocates the FIFO descriptor memory
+ */
+static int bam_alloc_chan(struct dma_chan *chan)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        struct bam_device *bdev = bchan->bdev;
+
+        if (bchan->fifo_virt)
+                return 0;
+
+        /* allocate FIFO descriptor space, but only if necessary */
+        bchan->fifo_virt = dma_alloc_writecombine(bdev->dev, BAM_DESC_FIFO_SIZE,
+                                &bchan->fifo_phys, GFP_KERNEL);
+
+        if (!bchan->fifo_virt) {
+                dev_err(bdev->dev, "Failed to allocate desc fifo\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+/**
+ * bam_free_chan - Frees dma resources associated with specific channel
+ * @chan: specified channel
+ *
+ * Free the allocated fifo descriptor memory and channel resources
+ *
+ */
+static void bam_free_chan(struct dma_chan *chan)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        struct bam_device *bdev = bchan->bdev;
+        u32 val;
+        unsigned long flags;
+
+        vchan_free_chan_resources(to_virt_chan(chan));
+
+        if (bchan->curr_txd) {
+                dev_err(bchan->bdev->dev, "Cannot free busy channel\n");
+                return;
+        }
+
+        spin_lock_irqsave(&bchan->vc.lock, flags);
+        bam_reset_channel(bchan);
+        spin_unlock_irqrestore(&bchan->vc.lock, flags);
+
+        dma_free_writecombine(bdev->dev, BAM_DESC_FIFO_SIZE, bchan->fifo_virt,
+                                bchan->fifo_phys);
+        bchan->fifo_virt = NULL;
+
+        /* mask irq for pipe/channel */
+        val = readl_relaxed(bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+        val &= ~BIT(bchan->id);
+        writel_relaxed(val, bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+
+        /* disable irq */
+        writel_relaxed(0, bdev->regs + BAM_P_IRQ_EN(bchan->id));
+}
+
+/**
+ * bam_slave_config - set slave configuration for channel
+ * @chan: dma channel
+ * @cfg: slave configuration
+ *
+ * Sets slave configuration for channel
+ *
+ */
+static void bam_slave_config(struct bam_chan *bchan,
+                struct dma_slave_config *cfg)
+{
+        memcpy(&bchan->slave, cfg, sizeof(*cfg));
+        bchan->reconfigure = 1;
+}
+
+/**
+ * bam_prep_slave_sg - Prep slave sg transaction
+ *
+ * @chan: dma channel
+ * @sgl: scatter gather list
+ * @sg_len: length of sg
+ * @direction: DMA transfer direction
+ * @flags: DMA flags
+ * @context: transfer context (unused)
+ */
+static struct dma_async_tx_descriptor *bam_prep_slave_sg(struct dma_chan *chan,
+        struct scatterlist *sgl, unsigned int sg_len,
+        enum dma_transfer_direction direction, unsigned long flags,
+        void *context)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        struct bam_device *bdev = bchan->bdev;
+        struct bam_async_desc *async_desc;
+        struct scatterlist *sg;
+        u32 i;
+        struct bam_desc_hw *desc;
+        unsigned int num_alloc = 0;
+
+
+        if (!is_slave_direction(direction)) {
+                dev_err(bdev->dev, "invalid dma direction\n");
+                return NULL;
+        }
+
+        /* calculate number of required entries */
+        for_each_sg(sgl, sg, sg_len, i)
+                num_alloc += DIV_ROUND_UP(sg_dma_len(sg), BAM_MAX_DATA_SIZE);
+
+        /* allocate enough room to accomodate the number of entries */
+        async_desc = kzalloc(sizeof(*async_desc) +
+                        (num_alloc * sizeof(struct bam_desc_hw)), GFP_NOWAIT);
+
+        if (!async_desc)
+                goto err_out;
+
+        async_desc->num_desc = num_alloc;
+        async_desc->curr_desc = async_desc->desc;
+        async_desc->dir = direction;
+
+        /* fill in temporary descriptors */
+        desc = async_desc->desc;
+        for_each_sg(sgl, sg, sg_len, i) {
+                unsigned int remainder = sg_dma_len(sg);
+                unsigned int curr_offset = 0;
+
+                do {
+                        desc->addr = sg_dma_address(sg) + curr_offset;
+
+                        if (remainder > BAM_MAX_DATA_SIZE) {
+                                desc->size = BAM_MAX_DATA_SIZE;
+                                remainder -= BAM_MAX_DATA_SIZE;
+                                curr_offset += BAM_MAX_DATA_SIZE;
+                        } else {
+                                desc->size = remainder;
+                                remainder = 0;
+                        }
+
+                        async_desc->length += desc->size;
+                        desc++;
+                } while (remainder > 0);
+        }
+
+        return vchan_tx_prep(&bchan->vc, &async_desc->vd, flags);
+
+err_out:
+        kfree(async_desc);
+        return NULL;
+}
+
+/**
+ * bam_dma_terminate_all - terminate all transactions on a channel
+ * @bchan: bam dma channel
+ *
+ * Dequeues and frees all transactions
+ * No callbacks are done
+ *
+ */
+static void bam_dma_terminate_all(struct bam_chan *bchan)
+{
+        unsigned long flag;
+        LIST_HEAD(head);
+
+        /* remove all transactions, including active transaction */
+        spin_lock_irqsave(&bchan->vc.lock, flag);
+        if (bchan->curr_txd) {
+                list_add(&bchan->curr_txd->vd.node, &bchan->vc.desc_issued);
+                bchan->curr_txd = NULL;
+        }
+
+        vchan_get_all_descriptors(&bchan->vc, &head);
+        spin_unlock_irqrestore(&bchan->vc.lock, flag);
+
+        vchan_dma_desc_free_list(&bchan->vc, &head);
+}
+
+/**
+ * bam_control - DMA device control
+ * @chan: dma channel
+ * @cmd: control cmd
+ * @arg: cmd argument
+ *
+ * Perform DMA control command
+ *
+ */
+static int bam_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+        unsigned long arg)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        struct bam_device *bdev = bchan->bdev;
+        int ret = 0;
+        unsigned long flag;
+
+        switch (cmd) {
+        case DMA_PAUSE:
+                spin_lock_irqsave(&bchan->vc.lock, flag);
+                writel_relaxed(1, bdev->regs + BAM_P_HALT(bchan->id));
+                bchan->paused = 1;
+                spin_unlock_irqrestore(&bchan->vc.lock, flag);
+                break;
+
+        case DMA_RESUME:
+                spin_lock_irqsave(&bchan->vc.lock, flag);
+                writel_relaxed(0, bdev->regs + BAM_P_HALT(bchan->id));
+                bchan->paused = 0;
+                spin_unlock_irqrestore(&bchan->vc.lock, flag);
+                break;
+
+        case DMA_TERMINATE_ALL:
+                bam_dma_terminate_all(bchan);
+                break;
+
+        case DMA_SLAVE_CONFIG:
+                spin_lock_irqsave(&bchan->vc.lock, flag);
+                bam_slave_config(bchan, (struct dma_slave_config *)arg);
+                spin_unlock_irqrestore(&bchan->vc.lock, flag);
+                break;
+
+        default:
+                ret = -ENXIO;
+                break;
+        }
+
+        return ret;
+}
+
+/**
+ * process_channel_irqs - processes the channel interrupts
+ * @bdev: bam controller
+ *
+ * This function processes the channel interrupts
+ *
+ */
+static u32 process_channel_irqs(struct bam_device *bdev)
+{
+        u32 i, srcs, pipe_stts;
+        unsigned long flags;
+        struct bam_async_desc *async_desc;
+
+        srcs = readl_relaxed(bdev->regs + BAM_IRQ_SRCS_EE(bdev->ee));
+
+        /* return early if no pipe/channel interrupts are present */
+        if (!(srcs & P_IRQ))
+                return srcs;
+
+        for (i = 0; i < bdev->num_channels; i++) {
+                struct bam_chan *bchan = &bdev->channels[i];
+
+                if (!(srcs & BIT(i)))
+                        continue;
+
+                /* clear pipe irq */
+                pipe_stts = readl_relaxed(bdev->regs +
+                        BAM_P_IRQ_STTS(i));
+
+                writel_relaxed(pipe_stts, bdev->regs +
+                                BAM_P_IRQ_CLR(i));
+
+                spin_lock_irqsave(&bchan->vc.lock, flags);
+                async_desc = bchan->curr_txd;
+
+                if (async_desc) {
+                        async_desc->num_desc -= async_desc->xfer_len;
+                        async_desc->curr_desc += async_desc->xfer_len;
+                        bchan->curr_txd = NULL;
+
+                        /* manage FIFO */
+                        bchan->head += async_desc->xfer_len;
+                        bchan->head %= MAX_DESCRIPTORS;
+
+                        /*
+                         * if complete, process cookie.  Otherwise
+                         * push back to front of desc_issued so that
+                         * it gets restarted by the tasklet
+                         */
+                        if (!async_desc->num_desc)
+                                vchan_cookie_complete(&async_desc->vd);
+                        else
+                                list_add(&async_desc->vd.node,
+                                        &bchan->vc.desc_issued);
+                }
+
+                spin_unlock_irqrestore(&bchan->vc.lock, flags);
+        }
+
+        return srcs;
+}
+
+/**
+ * bam_dma_irq - irq handler for bam controller
+ * @irq: IRQ of interrupt
+ * @data: callback data
+ *
+ * IRQ handler for the bam controller
+ */
+static irqreturn_t bam_dma_irq(int irq, void *data)
+{
+        struct bam_device *bdev = data;
+        u32 clr_mask = 0, srcs = 0;
+
+        srcs |= process_channel_irqs(bdev);
+
+        /* kick off tasklet to start next dma transfer */
+        if (srcs & P_IRQ)
+                tasklet_schedule(&bdev->task);
+
+        if (srcs & BAM_IRQ)
+                clr_mask = readl_relaxed(bdev->regs + BAM_IRQ_STTS);
+
+        /* don't allow reorder of the various accesses to the BAM registers */
+        mb();
+
+        writel_relaxed(clr_mask, bdev->regs + BAM_IRQ_CLR);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * bam_tx_status - returns status of transaction
+ * @chan: dma channel
+ * @cookie: transaction cookie
+ * @txstate: DMA transaction state
+ *
+ * Return status of dma transaction
+ */
+static enum dma_status bam_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
+                struct dma_tx_state *txstate)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        struct virt_dma_desc *vd;
+        int ret;
+        size_t residue = 0;
+        unsigned int i;
+        unsigned long flags;
+
+        ret = dma_cookie_status(chan, cookie, txstate);
+        if (ret == DMA_COMPLETE)
+                return ret;
+
+        if (!txstate)
+                return bchan->paused ? DMA_PAUSED : ret;
+
+        spin_lock_irqsave(&bchan->vc.lock, flags);
+        vd = vchan_find_desc(&bchan->vc, cookie);
+        if (vd)
+                residue = container_of(vd, struct bam_async_desc, vd)->length;
+        else if (bchan->curr_txd && bchan->curr_txd->vd.tx.cookie == cookie)
+                for (i = 0; i < bchan->curr_txd->num_desc; i++)
+                        residue += bchan->curr_txd->curr_desc[i].size;
+
+        spin_unlock_irqrestore(&bchan->vc.lock, flags);
+
+        dma_set_residue(txstate, residue);
+
+        if (ret == DMA_IN_PROGRESS && bchan->paused)
+                ret = DMA_PAUSED;
+
+        return ret;
+}
+
+/**
+ * bam_apply_new_config
+ * @bchan: bam dma channel
+ * @dir: DMA direction
+ */
+static void bam_apply_new_config(struct bam_chan *bchan,
+        enum dma_transfer_direction dir)
+{
+        struct bam_device *bdev = bchan->bdev;
+        u32 maxburst;
+
+        if (dir == DMA_DEV_TO_MEM)
+                maxburst = bchan->slave.src_maxburst;
+        else
+                maxburst = bchan->slave.dst_maxburst;
+
+        writel_relaxed(maxburst, bdev->regs + BAM_DESC_CNT_TRSHLD);
+
+        bchan->reconfigure = 0;
+}
+
+/**
+ * bam_start_dma - start next transaction
+ * @bchan - bam dma channel
+ */
+static void bam_start_dma(struct bam_chan *bchan)
+{
+        struct virt_dma_desc *vd = vchan_next_desc(&bchan->vc);
+        struct bam_device *bdev = bchan->bdev;
+        struct bam_async_desc *async_desc;
+        struct bam_desc_hw *desc;
+        struct bam_desc_hw *fifo = PTR_ALIGN(bchan->fifo_virt,
+                                        sizeof(struct bam_desc_hw));
+
+        lockdep_assert_held(&bchan->vc.lock);
+
+        if (!vd)
+                return;
+
+        list_del(&vd->node);
+
+        async_desc = container_of(vd, struct bam_async_desc, vd);
+        bchan->curr_txd = async_desc;
+
+        /* on first use, initialize the channel hardware */
+        if (!bchan->initialized)
+                bam_chan_init_hw(bchan, async_desc->dir);
+
+        /* apply new slave config changes, if necessary */
+        if (bchan->reconfigure)
+                bam_apply_new_config(bchan, async_desc->dir);
+
+        desc = bchan->curr_txd->curr_desc;
+
+        if (async_desc->num_desc > MAX_DESCRIPTORS)
+                async_desc->xfer_len = MAX_DESCRIPTORS;
+        else
+                async_desc->xfer_len = async_desc->num_desc;
+
+        /* set INT on last descriptor */
+        desc[async_desc->xfer_len - 1].flags |= DESC_FLAG_INT;
+
+        if (bchan->tail + async_desc->xfer_len > MAX_DESCRIPTORS) {
+                u32 partial = MAX_DESCRIPTORS - bchan->tail;
+
+                memcpy(&fifo[bchan->tail], desc,
+                                partial * sizeof(struct bam_desc_hw));
+                memcpy(fifo, &desc[partial], (async_desc->xfer_len - partial) *
+                                sizeof(struct bam_desc_hw));
+        } else {
+                memcpy(&fifo[bchan->tail], desc,
+                        async_desc->xfer_len * sizeof(struct bam_desc_hw));
+        }
+
+        bchan->tail += async_desc->xfer_len;
+        bchan->tail %= MAX_DESCRIPTORS;
+
+        /* ensure descriptor writes and dma start not reordered */
+        wmb();
+        writel_relaxed(bchan->tail * sizeof(struct bam_desc_hw),
+                        bdev->regs + BAM_P_EVNT_REG(bchan->id));
+}
+
+/**
+ * dma_tasklet - DMA IRQ tasklet
+ * @data: tasklet argument (bam controller structure)
+ *
+ * Sets up next DMA operation and then processes all completed transactions
+ */
+static void dma_tasklet(unsigned long data)
+{
+        struct bam_device *bdev = (struct bam_device *)data;
+        struct bam_chan *bchan;
+        unsigned long flags;
+        unsigned int i;
+
+        /* go through the channels and kick off transactions */
+        for (i = 0; i < bdev->num_channels; i++) {
+                bchan = &bdev->channels[i];
+                spin_lock_irqsave(&bchan->vc.lock, flags);
+
+                if (!list_empty(&bchan->vc.desc_issued) && !bchan->curr_txd)
+                        bam_start_dma(bchan);
+                spin_unlock_irqrestore(&bchan->vc.lock, flags);
+        }
+}
+
+/**
+ * bam_issue_pending - starts pending transactions
+ * @chan: dma channel
+ *
+ * Calls tasklet directly which in turn starts any pending transactions
+ */
+static void bam_issue_pending(struct dma_chan *chan)
+{
+        struct bam_chan *bchan = to_bam_chan(chan);
+        unsigned long flags;
+
+        spin_lock_irqsave(&bchan->vc.lock, flags);
+
+        /* if work pending and idle, start a transaction */
+        if (vchan_issue_pending(&bchan->vc) && !bchan->curr_txd)
+                bam_start_dma(bchan);
+
+        spin_unlock_irqrestore(&bchan->vc.lock, flags);
+}
+
+/**
+ * bam_dma_free_desc - free descriptor memory
+ * @vd: virtual descriptor
+ *
+ */
+static void bam_dma_free_desc(struct virt_dma_desc *vd)
+{
+        struct bam_async_desc *async_desc = container_of(vd,
+                        struct bam_async_desc, vd);
+
+        kfree(async_desc);
+}
+
+static struct dma_chan *bam_dma_xlate(struct of_phandle_args *dma_spec,
+                struct of_dma *of)
+{
+        struct bam_device *bdev = container_of(of->of_dma_data,
+                                        struct bam_device, common);
+        unsigned int request;
+
+        if (dma_spec->args_count != 1)
+                return NULL;
+
+        request = dma_spec->args[0];
+        if (request >= bdev->num_channels)
+                return NULL;
+
+        return dma_get_slave_channel(&(bdev->channels[request].vc.chan));
+}
+
+/**
+ * bam_init
+ * @bdev: bam device
+ *
+ * Initialization helper for global bam registers
+ */
+static int bam_init(struct bam_device *bdev)
+{
+        u32 val;
+
+        /* read revision and configuration information */
+        val = readl_relaxed(bdev->regs + BAM_REVISION) >> NUM_EES_SHIFT;
+        val &= NUM_EES_MASK;
+
+        /* check that configured EE is within range */
+        if (bdev->ee >= val)
+                return -EINVAL;
+
+        val = readl_relaxed(bdev->regs + BAM_NUM_PIPES);
+        bdev->num_channels = val & BAM_NUM_PIPES_MASK;
+
+        /* s/w reset bam */
+        /* after reset all pipes are disabled and idle */
+        val = readl_relaxed(bdev->regs + BAM_CTRL);
+        val |= BAM_SW_RST;
+        writel_relaxed(val, bdev->regs + BAM_CTRL);
+        val &= ~BAM_SW_RST;
+        writel_relaxed(val, bdev->regs + BAM_CTRL);
+
+        /* make sure previous stores are visible before enabling BAM */
+        wmb();
+
+        /* enable bam */
+        val |= BAM_EN;
+        writel_relaxed(val, bdev->regs + BAM_CTRL);
+
+        /* set descriptor threshhold, start with 4 bytes */
+        writel_relaxed(DEFAULT_CNT_THRSHLD, bdev->regs + BAM_DESC_CNT_TRSHLD);
+
+        /* Enable default set of h/w workarounds, ie all except BAM_FULL_PIPE */
+        writel_relaxed(BAM_CNFG_BITS_DEFAULT, bdev->regs + BAM_CNFG_BITS);
+
+        /* enable irqs for errors */
+        writel_relaxed(BAM_ERROR_EN | BAM_HRESP_ERR_EN,
+                                bdev->regs + BAM_IRQ_EN);
+
+        /* unmask global bam interrupt */
+        writel_relaxed(BAM_IRQ_MSK, bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+
+        return 0;
+}
+
+static void bam_channel_init(struct bam_device *bdev, struct bam_chan *bchan,
+        u32 index)
+{
+        bchan->id = index;
+        bchan->bdev = bdev;
+
+        vchan_init(&bchan->vc, &bdev->common);
+        bchan->vc.desc_free = bam_dma_free_desc;
+}
+
+static int bam_dma_probe(struct platform_device *pdev)
+{
+        struct bam_device *bdev;
+        struct resource *iores;
+        int ret, i;
+
+        bdev = devm_kzalloc(&pdev->dev, sizeof(*bdev), GFP_KERNEL);
+        if (!bdev)
+                return -ENOMEM;
+
+        bdev->dev = &pdev->dev;
+
+        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        bdev->regs = devm_ioremap_resource(&pdev->dev, iores);
+        if (IS_ERR(bdev->regs))
+                return PTR_ERR(bdev->regs);
+
+        bdev->irq = platform_get_irq(pdev, 0);
+        if (bdev->irq < 0)
+                return bdev->irq;
+
+        ret = of_property_read_u32(pdev->dev.of_node, "qcom,ee", &bdev->ee);
+        if (ret) {
+                dev_err(bdev->dev, "Execution environment unspecified\n");
+                return ret;
+        }
+
+        bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk");
+        if (IS_ERR(bdev->bamclk))
+                return PTR_ERR(bdev->bamclk);
+
+        ret = clk_prepare_enable(bdev->bamclk);
+        if (ret) {
+                dev_err(bdev->dev, "failed to prepare/enable clock\n");
+                return ret;
+        }
+
+        ret = bam_init(bdev);
+        if (ret)
+                goto err_disable_clk;
+
+        tasklet_init(&bdev->task, dma_tasklet, (unsigned long)bdev);
+
+        bdev->channels = devm_kcalloc(bdev->dev, bdev->num_channels,
+                                sizeof(*bdev->channels), GFP_KERNEL);
+
+        if (!bdev->channels) {
+                ret = -ENOMEM;
+                goto err_disable_clk;
+        }
+
+        /* allocate and initialize channels */
+        INIT_LIST_HEAD(&bdev->common.channels);
+
+        for (i = 0; i < bdev->num_channels; i++)
+                bam_channel_init(bdev, &bdev->channels[i], i);
+
+        ret = devm_request_irq(bdev->dev, bdev->irq, bam_dma_irq,
+                        IRQF_TRIGGER_HIGH, "bam_dma", bdev);
+        if (ret)
+                goto err_disable_clk;
+
+        /* set max dma segment size */
+        bdev->common.dev = bdev->dev;
+        bdev->common.dev->dma_parms = &bdev->dma_parms;
+        ret = dma_set_max_seg_size(bdev->common.dev, BAM_MAX_DATA_SIZE);
+        if (ret) {
+                dev_err(bdev->dev, "cannot set maximum segment size\n");
+                goto err_disable_clk;
+        }
+
+        platform_set_drvdata(pdev, bdev);
+
+        /* set capabilities */
+        dma_cap_zero(bdev->common.cap_mask);
+        dma_cap_set(DMA_SLAVE, bdev->common.cap_mask);
+
+        /* initialize dmaengine apis */
+        bdev->common.device_alloc_chan_resources = bam_alloc_chan;
+        bdev->common.device_free_chan_resources = bam_free_chan;
+        bdev->common.device_prep_slave_sg = bam_prep_slave_sg;
+        bdev->common.device_control = bam_control;
+        bdev->common.device_issue_pending = bam_issue_pending;
+        bdev->common.device_tx_status = bam_tx_status;
+        bdev->common.dev = bdev->dev;
+
+        ret = dma_async_device_register(&bdev->common);
+        if (ret) {
+                dev_err(bdev->dev, "failed to register dma async device\n");
+                goto err_disable_clk;
+        }
+
+        ret = of_dma_controller_register(pdev->dev.of_node, bam_dma_xlate,
+                                        &bdev->common);
+        if (ret)
+                goto err_unregister_dma;
+
+        return 0;
+
+err_unregister_dma:
+        dma_async_device_unregister(&bdev->common);
+err_disable_clk:
+        clk_disable_unprepare(bdev->bamclk);
+        return ret;
+}
+
+static int bam_dma_remove(struct platform_device *pdev)
+{
+        struct bam_device *bdev = platform_get_drvdata(pdev);
+        u32 i;
+
+        of_dma_controller_free(pdev->dev.of_node);
+        dma_async_device_unregister(&bdev->common);
+
+        /* mask all interrupts for this execution environment */
+        writel_relaxed(0, bdev->regs + BAM_IRQ_SRCS_MSK_EE(bdev->ee));
+
+        devm_free_irq(bdev->dev, bdev->irq, bdev);
+
+        for (i = 0; i < bdev->num_channels; i++) {
+                bam_dma_terminate_all(&bdev->channels[i]);
+                tasklet_kill(&bdev->channels[i].vc.task);
+
+                dma_free_writecombine(bdev->dev, BAM_DESC_FIFO_SIZE,
+                        bdev->channels[i].fifo_virt,
+                        bdev->channels[i].fifo_phys);
+        }
+
+        tasklet_kill(&bdev->task);
+
+        clk_disable_unprepare(bdev->bamclk);
+
+        return 0;
+}
+
+static const struct of_device_id bam_of_match[] = {
+        { .compatible = "qcom,bam-v1.4.0", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, bam_of_match);
+
+static struct platform_driver bam_dma_driver = {
+        .probe = bam_dma_probe,
+        .remove = bam_dma_remove,
+        .driver = {
+                .name = "bam-dma-engine",
+                .owner = THIS_MODULE,
+                .of_match_table = bam_of_match,
+        },
+};
+
+module_platform_driver(bam_dma_driver);
+
+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
+MODULE_DESCRIPTION("QCOM BAM DMA engine driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 4eddedb6eb7d..b209a0f17344 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -192,7 +192,7 @@ struct s3c24xx_dma_phy {
         unsigned int                    id;
         bool                            valid;
         void __iomem                    *base;
-        unsigned int                    irq;
+        int                             irq;
         struct clk                      *clk;
         spinlock_t                      lock;
         struct s3c24xx_dma_chan         *serving;
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig
index dadd9e010c0b..b4c813831006 100644
--- a/drivers/dma/sh/Kconfig
+++ b/drivers/dma/sh/Kconfig
@@ -29,6 +29,12 @@ config RCAR_HPB_DMAE
         help
           Enable support for the Renesas R-Car series DMA controllers.
 
+config RCAR_AUDMAC_PP
+        tristate "Renesas R-Car Audio DMAC Peripheral Peripheral support"
+        depends on SH_DMAE_BASE
+        help
+          Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers.
+
 config SHDMA_R8A73A4
         def_bool y
         depends on ARCH_R8A73A4 && SH_DMAE != n
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile
index e856af23b789..1ce88b28cfc6 100644
--- a/drivers/dma/sh/Makefile
+++ b/drivers/dma/sh/Makefile
@@ -7,3 +7,4 @@ endif
 shdma-objs := $(shdma-y)
 obj-$(CONFIG_SUDMAC) += sudmac.o
 obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o
+obj-$(CONFIG_RCAR_AUDMAC_PP) += rcar-audmapp.o
diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
new file mode 100644
index 000000000000..2de77289a2e9
--- /dev/null
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -0,0 +1,320 @@
+/*
+ * This is for Renesas R-Car Audio-DMAC-peri-peri.
+ *
+ * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright (C) 2014 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * based on the drivers/dma/sh/shdma.c
+ *
+ * Copyright (C) 2011-2012 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
+ * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * This 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/delay.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/dmaengine.h>
+#include <linux/platform_data/dma-rcar-audmapp.h>
+#include <linux/platform_device.h>
+#include <linux/shdma-base.h>
+
+/*
+ * DMA register
+ */
+#define PDMASAR         0x00
+#define PDMADAR         0x04
+#define PDMACHCR        0x0c
+
+/* PDMACHCR */
+#define PDMACHCR_DE             (1 << 0)
+
+#define AUDMAPP_MAX_CHANNELS    29
+
+/* Default MEMCPY transfer size = 2^2 = 4 bytes */
+#define LOG2_DEFAULT_XFER_SIZE  2
+#define AUDMAPP_SLAVE_NUMBER    256
+#define AUDMAPP_LEN_MAX         (16 * 1024 * 1024)
+
+struct audmapp_chan {
+        struct shdma_chan shdma_chan;
+        struct audmapp_slave_config *config;
+        void __iomem *base;
+};
+
+struct audmapp_device {
+        struct shdma_dev shdma_dev;
+        struct audmapp_pdata *pdata;
+        struct device *dev;
+        void __iomem *chan_reg;
+};
+
+#define to_chan(chan) container_of(chan, struct audmapp_chan, shdma_chan)
+#define to_dev(chan) container_of(chan->shdma_chan.dma_chan.device,     \
+                                  struct audmapp_device, shdma_dev.dma_dev)
+
+static void audmapp_write(struct audmapp_chan *auchan, u32 data, u32 reg)
+{
+        struct audmapp_device *audev = to_dev(auchan);
+        struct device *dev = audev->dev;
+
+        dev_dbg(dev, "w %p : %08x\n", auchan->base + reg, data);
+
+        iowrite32(data, auchan->base + reg);
+}
+
+static u32 audmapp_read(struct audmapp_chan *auchan, u32 reg)
+{
+        return ioread32(auchan->base + reg);
+}
+
+static void audmapp_halt(struct shdma_chan *schan)
+{
+        struct audmapp_chan *auchan = to_chan(schan);
+        int i;
+
+        audmapp_write(auchan, 0, PDMACHCR);
+
+        for (i = 0; i < 1024; i++) {
+                if (0 == audmapp_read(auchan, PDMACHCR))
+                        return;
+                udelay(1);
+        }
+}
+
+static void audmapp_start_xfer(struct shdma_chan *schan,
+                               struct shdma_desc *sdecs)
+{
+        struct audmapp_chan *auchan = to_chan(schan);
+        struct audmapp_device *audev = to_dev(auchan);
+        struct audmapp_slave_config *cfg = auchan->config;
+        struct device *dev = audev->dev;
+        u32 chcr = cfg->chcr | PDMACHCR_DE;
+
+        dev_dbg(dev, "src/dst/chcr = %pad/%pad/%x\n",
+                &cfg->src, &cfg->dst, cfg->chcr);
+
+        audmapp_write(auchan, cfg->src, PDMASAR);
+        audmapp_write(auchan, cfg->dst, PDMADAR);
+        audmapp_write(auchan, chcr,     PDMACHCR);
+}
+
+static struct audmapp_slave_config *
+audmapp_find_slave(struct audmapp_chan *auchan, int slave_id)
+{
+        struct audmapp_device *audev = to_dev(auchan);
+        struct audmapp_pdata *pdata = audev->pdata;
+        struct audmapp_slave_config *cfg;
+        int i;
+
+        if (slave_id >= AUDMAPP_SLAVE_NUMBER)
+                return NULL;
+
+        for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)
+                if (cfg->slave_id == slave_id)
+                        return cfg;
+
+        return NULL;
+}
+
+static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
+                             dma_addr_t slave_addr, bool try)
+{
+        struct audmapp_chan *auchan = to_chan(schan);
+        struct audmapp_slave_config *cfg =
+                audmapp_find_slave(auchan, slave_id);
+
+        if (!cfg)
+                return -ENODEV;
+        if (try)
+                return 0;
+
+        auchan->config  = cfg;
+
+        return 0;
+}
+
+static int audmapp_desc_setup(struct shdma_chan *schan,
+                              struct shdma_desc *sdecs,
+                              dma_addr_t src, dma_addr_t dst, size_t *len)
+{
+        struct audmapp_chan *auchan = to_chan(schan);
+        struct audmapp_slave_config *cfg = auchan->config;
+
+        if (!cfg)
+                return -ENODEV;
+
+        if (*len > (size_t)AUDMAPP_LEN_MAX)
+                *len = (size_t)AUDMAPP_LEN_MAX;
+
+        return 0;
+}
+
+static void audmapp_setup_xfer(struct shdma_chan *schan,
+                               int slave_id)
+{
+}
+
+static dma_addr_t audmapp_slave_addr(struct shdma_chan *schan)
+{
+        return 0; /* always fixed address */
+}
+
+static bool audmapp_channel_busy(struct shdma_chan *schan)
+{
+        struct audmapp_chan *auchan = to_chan(schan);
+        u32 chcr = audmapp_read(auchan, PDMACHCR);
+
+        return chcr & ~PDMACHCR_DE;
+}
+
+static bool audmapp_desc_completed(struct shdma_chan *schan,
+                                   struct shdma_desc *sdesc)
+{
+        return true;
+}
+
+static struct shdma_desc *audmapp_embedded_desc(void *buf, int i)
+{
+        return &((struct shdma_desc *)buf)[i];
+}
+
+static const struct shdma_ops audmapp_shdma_ops = {
+        .halt_channel   = audmapp_halt,
+        .desc_setup     = audmapp_desc_setup,
+        .set_slave      = audmapp_set_slave,
+        .start_xfer     = audmapp_start_xfer,
+        .embedded_desc  = audmapp_embedded_desc,
+        .setup_xfer     = audmapp_setup_xfer,
+        .slave_addr     = audmapp_slave_addr,
+        .channel_busy   = audmapp_channel_busy,
+        .desc_completed = audmapp_desc_completed,
+};
+
+static int audmapp_chan_probe(struct platform_device *pdev,
+                              struct audmapp_device *audev, int id)
+{
+        struct shdma_dev *sdev = &audev->shdma_dev;
+        struct audmapp_chan *auchan;
+        struct shdma_chan *schan;
+        struct device *dev = audev->dev;
+
+        auchan = devm_kzalloc(dev, sizeof(*auchan), GFP_KERNEL);
+        if (!auchan)
+                return -ENOMEM;
+
+        schan = &auchan->shdma_chan;
+        schan->max_xfer_len = AUDMAPP_LEN_MAX;
+
+        shdma_chan_probe(sdev, schan, id);
+
+        auchan->base = audev->chan_reg + 0x20 + (0x10 * id);
+        dev_dbg(dev, "%02d : %p / %p", id, auchan->base, audev->chan_reg);
+
+        return 0;
+}
+
+static void audmapp_chan_remove(struct audmapp_device *audev)
+{
+        struct dma_device *dma_dev = &audev->shdma_dev.dma_dev;
+        struct shdma_chan *schan;
+        int i;
+
+        shdma_for_each_chan(schan, &audev->shdma_dev, i) {
+                BUG_ON(!schan);
+                shdma_chan_remove(schan);
+        }
+        dma_dev->chancnt = 0;
+}
+
+static int audmapp_probe(struct platform_device *pdev)
+{
+        struct audmapp_pdata *pdata = pdev->dev.platform_data;
+        struct audmapp_device *audev;
+        struct shdma_dev *sdev;
+        struct dma_device *dma_dev;
+        struct resource *res;
+        int err, i;
+
+        if (!pdata)
+                return -ENODEV;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        audev = devm_kzalloc(&pdev->dev, sizeof(*audev), GFP_KERNEL);
+        if (!audev)
+                return -ENOMEM;
+
+        audev->dev      = &pdev->dev;
+        audev->pdata    = pdata;
+        audev->chan_reg = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(audev->chan_reg))
+                return PTR_ERR(audev->chan_reg);
+
+        sdev            = &audev->shdma_dev;
+        sdev->ops       = &audmapp_shdma_ops;
+        sdev->desc_size = sizeof(struct shdma_desc);
+
+        dma_dev                 = &sdev->dma_dev;
+        dma_dev->copy_align     = LOG2_DEFAULT_XFER_SIZE;
+        dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);
+
+        err = shdma_init(&pdev->dev, sdev, AUDMAPP_MAX_CHANNELS);
+        if (err < 0)
+                return err;
+
+        platform_set_drvdata(pdev, audev);
+
+        /* Create DMA Channel */
+        for (i = 0; i < AUDMAPP_MAX_CHANNELS; i++) {
+                err = audmapp_chan_probe(pdev, audev, i);
+                if (err)
+                        goto chan_probe_err;
+        }
+
+        err = dma_async_device_register(dma_dev);
+        if (err < 0)
+                goto chan_probe_err;
+
+        return err;
+
+chan_probe_err:
+        audmapp_chan_remove(audev);
+        shdma_cleanup(sdev);
+
+        return err;
+}
+
+static int audmapp_remove(struct platform_device *pdev)
+{
+        struct audmapp_device *audev = platform_get_drvdata(pdev);
+        struct dma_device *dma_dev = &audev->shdma_dev.dma_dev;
+
+        dma_async_device_unregister(dma_dev);
+
+        audmapp_chan_remove(audev);
+        shdma_cleanup(&audev->shdma_dev);
+
+        return 0;
+}
+
+static struct platform_driver audmapp_driver = {
+        .probe          = audmapp_probe,
+        .remove         = audmapp_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "rcar-audmapp-engine",
+        },
+};
+module_platform_driver(audmapp_driver);
+
+MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
+MODULE_DESCRIPTION("Renesas R-Car Audio DMAC peri-peri driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index 2e7b394def80..52396771acbe 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -227,7 +227,7 @@ bool shdma_chan_filter(struct dma_chan *chan, void *arg)
         struct shdma_chan *schan = to_shdma_chan(chan);
         struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device);
         const struct shdma_ops *ops = sdev->ops;
-        int match = (int)arg;
+        int match = (long)arg;
         int ret;
 
         if (match < 0)
@@ -491,8 +491,8 @@ static struct shdma_desc *shdma_add_desc(struct shdma_chan *schan,
         }
 
         dev_dbg(schan->dev,
-                "chaining (%u/%u)@%x -> %x with %p, cookie %d\n",
-                copy_size, *len, *src, *dst, &new->async_tx,
+                "chaining (%zu/%zu)@%pad -> %pad with %p, cookie %d\n",
+                copy_size, *len, src, dst, &new->async_tx,
                 new->async_tx.cookie);
 
         new->mark = DESC_PREPARED;
@@ -555,8 +555,8 @@ static struct dma_async_tx_descriptor *shdma_prep_sg(struct shdma_chan *schan,
                         goto err_get_desc;
 
                 do {
-                        dev_dbg(schan->dev, "Add SG #%d@%p[%d], dma %llx\n",
-                                i, sg, len, (unsigned long long)sg_addr);
+                        dev_dbg(schan->dev, "Add SG #%d@%p[%zu], dma %pad\n",
+                                i, sg, len, &sg_addr);
 
                         if (direction == DMA_DEV_TO_MEM)
                                 new = shdma_add_desc(schan, flags,
diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c
index 06473a05fe4e..b4ff9d3e56d1 100644
--- a/drivers/dma/sh/shdma-of.c
+++ b/drivers/dma/sh/shdma-of.c
@@ -33,7 +33,8 @@ static struct dma_chan *shdma_of_xlate(struct of_phandle_args *dma_spec,
         /* Only slave DMA channels can be allocated via DT */
         dma_cap_set(DMA_SLAVE, mask);
 
-        chan = dma_request_channel(mask, shdma_chan_filter, (void *)id);
+        chan = dma_request_channel(mask, shdma_chan_filter,
+                                   (void *)(uintptr_t)id);
         if (chan)
                 to_shdma_chan(chan)->hw_req = id;
 
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 0d765c0e21ec..dda7e7563f5d 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -443,6 +443,7 @@ static bool sh_dmae_reset(struct sh_dmae_device *shdev)
         return ret;
 }
 
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARM)
 static irqreturn_t sh_dmae_err(int irq, void *data)
 {
         struct sh_dmae_device *shdev = data;
@@ -453,6 +454,7 @@ static irqreturn_t sh_dmae_err(int irq, void *data)
         sh_dmae_reset(shdev);
         return IRQ_HANDLED;
 }
+#endif
 
 static bool sh_dmae_desc_completed(struct shdma_chan *schan,
                                    struct shdma_desc *sdesc)
@@ -637,7 +639,7 @@ static int sh_dmae_resume(struct device *dev)
 #define sh_dmae_resume NULL
 #endif
 
-const struct dev_pm_ops sh_dmae_pm = {
+static const struct dev_pm_ops sh_dmae_pm = {
         .suspend                = sh_dmae_suspend,
         .resume                 = sh_dmae_resume,
         .runtime_suspend        = sh_dmae_runtime_suspend,
@@ -685,9 +687,12 @@ MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
 static int sh_dmae_probe(struct platform_device *pdev)
 {
         const struct sh_dmae_pdata *pdata;
-        unsigned long irqflags = 0,
-                chan_flag[SH_DMAE_MAX_CHANNELS] = {};
-        int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
+        unsigned long chan_flag[SH_DMAE_MAX_CHANNELS] = {};
+        int chan_irq[SH_DMAE_MAX_CHANNELS];
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARM)
+        unsigned long irqflags = 0;
+        int errirq;
+#endif
         int err, i, irq_cnt = 0, irqres = 0, irq_cap = 0;
         struct sh_dmae_device *shdev;
         struct dma_device *dma_dev;
diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
index c7e9cdff0708..4e7df43b50d6 100644
--- a/drivers/dma/sh/sudmac.c
+++ b/drivers/dma/sh/sudmac.c
@@ -178,8 +178,8 @@ static int sudmac_desc_setup(struct shdma_chan *schan,
         struct sudmac_chan *sc = to_chan(schan);
         struct sudmac_desc *sd = to_desc(sdesc);
 
-        dev_dbg(sc->shdma_chan.dev, "%s: src=%x, dst=%x, len=%d\n",
-                __func__, src, dst, *len);
+        dev_dbg(sc->shdma_chan.dev, "%s: src=%pad, dst=%pad, len=%zu\n",
+                __func__, &src, &dst, *len);
 
         if (*len > schan->max_xfer_len)
                 *len = schan->max_xfer_len;
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index d4d3a3109b16..a1bd8298d55f 100644
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -18,6 +18,7 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/clk.h>
+#include <linux/of_dma.h>
 #include <linux/sirfsoc_dma.h>
 
 #include "dmaengine.h"
@@ -659,6 +660,18 @@ static int sirfsoc_dma_device_slave_caps(struct dma_chan *dchan,
         return 0;
 }
 
+static struct dma_chan *of_dma_sirfsoc_xlate(struct of_phandle_args *dma_spec,
+        struct of_dma *ofdma)
+{
+        struct sirfsoc_dma *sdma = ofdma->of_dma_data;
+        unsigned int request = dma_spec->args[0];
+
+        if (request > SIRFSOC_DMA_CHANNELS)
+                return NULL;
+
+        return dma_get_slave_channel(&sdma->channels[request].chan);
+}
+
 static int sirfsoc_dma_probe(struct platform_device *op)
 {
         struct device_node *dn = op->dev.of_node;
@@ -764,11 +777,20 @@ static int sirfsoc_dma_probe(struct platform_device *op)
         if (ret)
                 goto free_irq;
 
+        /* Device-tree DMA controller registration */
+        ret = of_dma_controller_register(dn, of_dma_sirfsoc_xlate, sdma);
+        if (ret) {
+                dev_err(dev, "failed to register DMA controller\n");
+                goto unreg_dma_dev;
+        }
+
         pm_runtime_enable(&op->dev);
         dev_info(dev, "initialized SIRFSOC DMAC driver\n");
 
         return 0;
 
+unreg_dma_dev:
+        dma_async_device_unregister(dma);
 free_irq:
         free_irq(sdma->irq, sdma);
 irq_dispose:
@@ -781,6 +803,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)
         struct device *dev = &op->dev;
         struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
 
+        of_dma_controller_free(op->dev.of_node);
         dma_async_device_unregister(&sdma->dma);
         free_irq(sdma->irq, sdma);
         irq_dispose_mapping(sdma->irq);
diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
index ff50aeebf0d9..2c41eaece2c1 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -397,7 +397,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                                 else
                                         chunksize = size;
 
-                                status = efi_file_read(fh, files[j].handle,
+                                status = efi_file_read(files[j].handle,
                                                        &chunksize,
                                                        (void *)addr);
                                 if (status != EFI_SUCCESS) {
@@ -408,7 +408,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                                 size -= chunksize;
                         }
 
-                        efi_file_close(fh, files[j].handle);
+                        efi_file_close(files[j].handle);
                 }
 
         }
@@ -425,7 +425,7 @@ free_file_total:
 
 close_handles:
         for (k = j; k < i; k++)
-                efi_file_close(fh, files[k].handle);
+                efi_file_close(files[k].handle);
 free_files:
         efi_call_early(free_pool, files);
 fail:
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b13172cfbeef..bc196f49ec53 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -554,14 +554,6 @@ config SENSORS_IBMPEX
           This driver can also be built as a module.  If so, the module
           will be called ibmpex.
 
-config SENSORS_IBMPOWERNV
-        tristate "IBM PowerNv Platform temperature/power/fan sensor"
-        depends on PPC_POWERNV
-        default y
-        help
-          If you say yes here you get support for the temperature/fan/power
-          sensors on your platform.
-
 config SENSORS_IIO_HWMON
         tristate "Hwmon driver that uses channels specified via iio maps"
         depends on IIO
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 199c401bf8d9..c48f9873ac73 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -71,7 +71,6 @@ obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o
 obj-$(CONFIG_SENSORS_I5K_AMB)   += i5k_amb.o
 obj-$(CONFIG_SENSORS_IBMAEM)    += ibmaem.o
 obj-$(CONFIG_SENSORS_IBMPEX)    += ibmpex.o
-obj-$(CONFIG_SENSORS_IBMPOWERNV)+= ibmpowernv.o
 obj-$(CONFIG_SENSORS_IIO_HWMON) += iio_hwmon.o
 obj-$(CONFIG_SENSORS_INA209)    += ina209.o
 obj-$(CONFIG_SENSORS_INA2XX)    += ina2xx.o
diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
deleted file mode 100644
index b7b1297a9b02..000000000000
--- a/drivers/hwmon/ibmpowernv.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * hwmon driver for temperature/power/fan on IBM PowerNV platform
- * Copyright (C) 2013 IBM
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/hwmon.h>
-#include <linux/hwmon-sysfs.h>
-#include <linux/of.h>
-#include <linux/slab.h>
-
-#include <linux/jiffies.h>
-#include <linux/platform_device.h>
-#include <asm/opal.h>
-#include <linux/err.h>
-
-MODULE_DESCRIPTION("IBM PowerNV Platform power/temp/fan sensor hwmon module");
-MODULE_LICENSE("GPL");
-
-#define MAX_ATTR_LENGTH         32
-
-/* Device tree sensor name prefixes. The device tree has the names in the
- * format "cooling-fan#2-faulted" where the "cooling-fan" is the sensor type,
- * 2 is the sensor count, and "faulted" is the sensor data attribute type.
- */
-#define DT_FAULT_ATTR_SUFFIX            "faulted"
-#define DT_DATA_ATTR_SUFFIX             "data"
-#define DT_THRESHOLD_ATTR_SUFFIX        "thrs"
-
-enum sensors {
-        FAN,
-        TEMPERATURE,
-        POWERSUPPLY,
-        POWER,
-        MAX_SENSOR_TYPE,
-};
-
-enum attributes {
-        INPUT,
-        MINIMUM,
-        MAXIMUM,
-        FAULT,
-        MAX_ATTR_TYPES
-};
-
-static struct sensor_name {
-        char *name;
-        char *compaible;
-} sensor_names[] = {
-                {"fan-sensor", "ibm,opal-sensor-cooling-fan"},
-                {"amb-temp-sensor", "ibm,opal-sensor-amb-temp"},
-                {"power-sensor", "ibm,opal-sensor-power-supply"},
-                {"power", "ibm,opal-sensor-power"}
-};
-
-static const char * const attribute_type_table[] = {
-        "input",
-        "min",
-        "max",
-        "fault",
-        NULL
-};
-
-struct pdev_entry {
-        struct list_head list;
-        struct platform_device *pdev;
-        enum sensors type;
-};
-
-static LIST_HEAD(pdev_list);
-
-/* The sensors are categorised on type.
- *
- * The sensors of same type are categorised under a common platform device.
- * So, The pdev is shared by all sensors of same type.
- * Ex : temp1_input, temp1_max, temp2_input,temp2_max all share same platform
- * device.
- *
- * "sensor_data" is the Platform device specific data.
- * There is one hwmon_device instance for all the sensors of same type.
- * This also holds the list of all sensors with same type but different
- * attribute and index.
- */
-struct sensor_specific_data {
-        u32 sensor_id; /* The hex value as in the device tree */
-        u32 sensor_index; /* The sensor instance index */
-        struct sensor_device_attribute sd_attr;
-        enum attributes attr_type;
-        char attr_name[64];
-};
-
-struct sensor_data {
-        struct device *hwmon_dev;
-        struct list_head sensor_list;
-        struct device_attribute name_attr;
-};
-
-struct  sensor_entry {
-        struct list_head list;
-        struct sensor_specific_data *sensor_data;
-};
-
-static struct platform_device *powernv_sensor_get_pdev(enum sensors type)
-{
-        struct pdev_entry *p;
-        list_for_each_entry(p, &pdev_list, list)
-                if (p->type == type)
-                        return p->pdev;
-
-        return NULL;
-}
-
-static struct sensor_specific_data *powernv_sensor_get_sensor_data(
-                                        struct sensor_data *pdata,
-                                        int index, enum attributes attr_type)
-{
-        struct sensor_entry *p;
-        list_for_each_entry(p, &pdata->sensor_list, list)
-                if ((p->sensor_data->sensor_index == index) &&
-                    (attr_type == p->sensor_data->attr_type))
-                        return p->sensor_data;
-
-        return NULL;
-}
-
-static ssize_t show_name(struct device *dev,
-                                struct device_attribute *devattr, char *buf)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-
-        return sprintf(buf, "%s\n", pdev->name);
-}
-
-/* Note: Data from the sensors for each sensor type needs to be converted to
- * the dimension appropriate.
- */
-static ssize_t show_sensor(struct device *dev,
-                                struct device_attribute *devattr, char *buf)
-{
-        struct sensor_device_attribute *sd_attr = to_sensor_dev_attr(devattr);
-        struct platform_device *pdev = to_platform_device(dev);
-        struct sensor_data *pdata = platform_get_drvdata(pdev);
-        struct sensor_specific_data *tdata = NULL;
-        enum sensors sensor_type = pdev->id;
-        u32 x = -1;
-        int ret;
-
-        if (sd_attr && sd_attr->dev_attr.attr.name) {
-                char *pos = strchr(sd_attr->dev_attr.attr.name, '_');
-                int i;
-
-                for (i = 0; i < MAX_ATTR_TYPES; i++) {
-                        if (strcmp(pos+1, attribute_type_table[i]) == 0) {
-                                tdata = powernv_sensor_get_sensor_data(pdata,
-                                                sd_attr->index, i);
-                                break;
-                        }
-                }
-        }
-
-        if (tdata) {
-                ret = opal_get_sensor_data(tdata->sensor_id, &x);
-                if (ret)
-                        x = -1;
-        }
-
-        if (sensor_type == TEMPERATURE && x > 0) {
-                /* Temperature comes in Degrees and convert it to
-                 * milli-degrees.
-                 */
-                x = x*1000;
-        } else if (sensor_type == POWER && x > 0) {
-                /* Power value comes in watts, convert to micro-watts */
-                x = x * 1000000;
-        }
-
-        return sprintf(buf, "%d\n", x);
-}
-
-static u32 get_sensor_index_from_name(const char *name)
-{
-        char *hash_position = strchr(name, '#');
-        u32 index = 0, copy_length;
-        char newbuf[8];
-
-        if (hash_position) {
-                copy_length = strchr(hash_position, '-') - hash_position - 1;
-                if (copy_length < sizeof(newbuf)) {
-                        strncpy(newbuf, hash_position + 1, copy_length);
-                        sscanf(newbuf, "%d", &index);
-                }
-        }
-
-        return index;
-}
-
-static inline void get_sensor_suffix_from_name(const char *name, char *suffix)
-{
-        char *dash_position = strrchr(name, '-');
-        if (dash_position)
-                strncpy(suffix, dash_position+1, MAX_ATTR_LENGTH);
-        else
-                strcpy(suffix,"");
-}
-
-static int get_sensor_attr_properties(const char *sensor_name,
-                enum sensors sensor_type, enum attributes *attr_type,
-                u32 *sensor_index)
-{
-        char suffix[MAX_ATTR_LENGTH];
-
-        *attr_type = MAX_ATTR_TYPES;
-        *sensor_index = get_sensor_index_from_name(sensor_name);
-        if (*sensor_index == 0)
-                return -EINVAL;
-
-        get_sensor_suffix_from_name(sensor_name, suffix);
-        if (strcmp(suffix, "") == 0)
-                return -EINVAL;
-
-        if (strcmp(suffix, DT_FAULT_ATTR_SUFFIX) == 0)
-                *attr_type = FAULT;
-        else if (strcmp(suffix, DT_DATA_ATTR_SUFFIX) == 0)
-                *attr_type = INPUT;
-        else if ((sensor_type == TEMPERATURE) &&
-                        (strcmp(suffix, DT_THRESHOLD_ATTR_SUFFIX) == 0))
-                *attr_type = MAXIMUM;
-        else if ((sensor_type == FAN) &&
-                        (strcmp(suffix, DT_THRESHOLD_ATTR_SUFFIX) == 0))
-                *attr_type = MINIMUM;
-        else
-                return -ENOENT;
-
-        if (((sensor_type == FAN) && ((*attr_type == INPUT) ||
-                                    (*attr_type == MINIMUM)))
-            || ((sensor_type == TEMPERATURE) && ((*attr_type == INPUT) ||
-                                                 (*attr_type == MAXIMUM)))
-            || ((sensor_type == POWER) && ((*attr_type == INPUT))))
-                return 0;
-
-        return -ENOENT;
-}
-
-static int create_sensor_attr(struct sensor_specific_data *tdata,
-                struct device *dev, enum sensors sensor_type,
-                enum attributes attr_type)
-{
-        int err = 0;
-        char temp_file_prefix[50];
-        static const char *const file_name_format = "%s%d_%s";
-
-        tdata->attr_type = attr_type;
-
-        if (sensor_type == FAN)
-                strcpy(temp_file_prefix, "fan");
-        else if (sensor_type == TEMPERATURE)
-                strcpy(temp_file_prefix, "temp");
-        else if (sensor_type == POWERSUPPLY)
-                strcpy(temp_file_prefix, "powersupply");
-        else if (sensor_type == POWER)
-                strcpy(temp_file_prefix, "power");
-
-        snprintf(tdata->attr_name, sizeof(tdata->attr_name), file_name_format,
-                 temp_file_prefix, tdata->sensor_index,
-                 attribute_type_table[tdata->attr_type]);
-
-        sysfs_attr_init(&tdata->sd_attr.dev_attr.attr);
-        tdata->sd_attr.dev_attr.attr.name = tdata->attr_name;
-        tdata->sd_attr.dev_attr.attr.mode = S_IRUGO;
-        tdata->sd_attr.dev_attr.show = show_sensor;
-
-        tdata->sd_attr.index = tdata->sensor_index;
-        err = device_create_file(dev, &tdata->sd_attr.dev_attr);
-
-        return err;
-}
-
-static int create_name_attr(struct sensor_data *pdata,
-                                struct device *dev)
-{
-        sysfs_attr_init(&pdata->name_attr.attr);
-        pdata->name_attr.attr.name = "name";
-        pdata->name_attr.attr.mode = S_IRUGO;
-        pdata->name_attr.show = show_name;
-        return device_create_file(dev, &pdata->name_attr);
-}
-
-static int create_platform_device(enum sensors sensor_type,
-                                        struct platform_device **pdev)
-{
-        struct pdev_entry *pdev_entry = NULL;
-        int err;
-
-        *pdev = platform_device_alloc(sensor_names[sensor_type].name,
-                        sensor_type);
-        if (!*pdev) {
-                pr_err("Device allocation failed\n");
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
-        if (!pdev_entry) {
-                pr_err("Device allocation failed\n");
-                err = -ENOMEM;
-                goto exit_device_put;
-        }
-
-        err = platform_device_add(*pdev);
-        if (err) {
-                pr_err("Device addition failed (%d)\n", err);
-                goto exit_device_free;
-        }
-
-        pdev_entry->pdev = *pdev;
-        pdev_entry->type = (*pdev)->id;
-
-        list_add_tail(&pdev_entry->list, &pdev_list);
-
-        return 0;
-exit_device_free:
-        kfree(pdev_entry);
-exit_device_put:
-        platform_device_put(*pdev);
-exit:
-        return err;
-}
-
-static int create_sensor_data(struct platform_device *pdev)
-{
-        struct sensor_data *pdata = NULL;
-        int err = 0;
-
-        pdata = kzalloc(sizeof(struct sensor_data), GFP_KERNEL);
-        if (!pdata) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        err = create_name_attr(pdata, &pdev->dev);
-        if (err)
-                goto exit_free;
-
-        pdata->hwmon_dev = hwmon_device_register(&pdev->dev);
-        if (IS_ERR(pdata->hwmon_dev)) {
-                err = PTR_ERR(pdata->hwmon_dev);
-                dev_err(&pdev->dev, "Class registration failed (%d)\n",
-                        err);
-                goto exit_name;
-        }
-
-        INIT_LIST_HEAD(&pdata->sensor_list);
-        platform_set_drvdata(pdev, pdata);
-
-        return 0;
-
-exit_name:
-        device_remove_file(&pdev->dev, &pdata->name_attr);
-exit_free:
-        kfree(pdata);
-exit:
-        return err;
-}
-
-static void delete_sensor_attr(struct sensor_data *pdata)
-{
-        struct sensor_entry *s, *l;
-
-        list_for_each_entry_safe(s, l, &pdata->sensor_list, list) {
-                struct sensor_specific_data *tdata = s->sensor_data;
-                        kfree(tdata);
-                        list_del(&s->list);
-                        kfree(s);
-                }
-}
-
-static int powernv_sensor_init(u32 sensor_id, const struct device_node *np,
-                enum sensors sensor_type, enum attributes attr_type,
-                u32 sensor_index)
-{
-        struct platform_device *pdev = powernv_sensor_get_pdev(sensor_type);
-        struct sensor_specific_data *tdata;
-        struct sensor_entry *sensor_entry;
-        struct sensor_data *pdata;
-        int err = 0;
-
-        if (!pdev) {
-                err = create_platform_device(sensor_type, &pdev);
-                if (err)
-                        goto exit;
-
-                err = create_sensor_data(pdev);
-                if (err)
-                        goto exit;
-        }
-
-        pdata = platform_get_drvdata(pdev);
-        if (!pdata) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        tdata = kzalloc(sizeof(struct sensor_specific_data), GFP_KERNEL);
-        if (!tdata) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        tdata->sensor_id = sensor_id;
-        tdata->sensor_index = sensor_index;
-
-        err = create_sensor_attr(tdata, &pdev->dev, sensor_type, attr_type);
-        if (err)
-                goto exit_free;
-
-        sensor_entry = kzalloc(sizeof(struct sensor_entry), GFP_KERNEL);
-        if (!sensor_entry) {
-                err = -ENOMEM;
-                goto exit_attr;
-        }
-
-        sensor_entry->sensor_data = tdata;
-
-        list_add_tail(&sensor_entry->list, &pdata->sensor_list);
-
-        return 0;
-exit_attr:
-        device_remove_file(&pdev->dev, &tdata->sd_attr.dev_attr);
-exit_free:
-        kfree(tdata);
-exit:
-        return err;
-}
-
-static void delete_unregister_sensors(void)
-{
-        struct pdev_entry *p, *n;
-
-        list_for_each_entry_safe(p, n, &pdev_list, list) {
-                struct sensor_data *pdata = platform_get_drvdata(p->pdev);
-                        if (pdata) {
-                                delete_sensor_attr(pdata);
-
-                                hwmon_device_unregister(pdata->hwmon_dev);
-                                kfree(pdata);
-                        }
-                platform_device_unregister(p->pdev);
-                list_del(&p->list);
-                kfree(p);
-        }
-}
-
-static int __init powernv_hwmon_init(void)
-{
-        struct device_node *opal, *np = NULL;
-        enum attributes attr_type;
-        enum sensors type;
-        const u32 *sensor_id;
-        u32 sensor_index;
-        int err;
-
-        opal = of_find_node_by_path("/ibm,opal/sensors");
-        if (!opal) {
-                pr_err("%s: Opal 'sensors' node not found\n", __func__);
-                return -ENXIO;
-        }
-
-        for_each_child_of_node(opal, np) {
-                if (np->name == NULL)
-                        continue;
-
-                for (type = 0; type < MAX_SENSOR_TYPE; type++)
-                        if (of_device_is_compatible(np,
-                                        sensor_names[type].compaible))
-                                break;
-
-                if (type == MAX_SENSOR_TYPE)
-                        continue;
-
-                if (get_sensor_attr_properties(np->name, type, &attr_type,
-                                &sensor_index))
-                        continue;
-
-                sensor_id = of_get_property(np, "sensor-id", NULL);
-                if (!sensor_id) {
-                        pr_info("%s: %s doesn't have sensor-id\n", __func__,
-                                        np->name);
-                        continue;
-                }
-
-                err = powernv_sensor_init(*sensor_id, np, type, attr_type,
-                                sensor_index);
-                if (err) {
-                        of_node_put(opal);
-                        goto exit;
-                }
-        }
-        of_node_put(opal);
-
-        return 0;
-exit:
-        delete_unregister_sensors();
-        return err;
-
-}
-
-static void powernv_hwmon_exit(void)
-{
-        delete_unregister_sensors();
-}
-
-module_init(powernv_hwmon_init);
-module_exit(powernv_hwmon_exit);
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 014afab1d551..c94db1c5e353 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -110,6 +110,7 @@ config I2C_I801
             Wellsburg (PCH)
             Coleto Creek (PCH)
             Wildcat Point-LP (PCH)
+            BayTrail (SOC)
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-i801.
@@ -375,6 +376,13 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
         help
           The unit of the TWI clock is kHz.
 
+config I2C_CADENCE
+        tristate "Cadence I2C Controller"
+        depends on ARCH_ZYNQ
+        help
+          Say yes here to select Cadence I2C Host Controller. This controller is
+          e.g. used by Xilinx Zynq.
+
 config I2C_CBUS_GPIO
         tristate "CBUS I2C driver"
         depends on GPIOLIB
@@ -432,6 +440,13 @@ config I2C_DESIGNWARE_PCI
           This driver can also be built as a module.  If so, the module
           will be called i2c-designware-pci.
 
+config I2C_EFM32
+        tristate "EFM32 I2C controller"
+        depends on ARCH_EFM32 || COMPILE_TEST
+        help
+          This driver supports the i2c block found in Energy Micro's EFM32
+          SoCs.
+
 config I2C_EG20T
         tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C"
         depends on PCI
@@ -527,7 +542,7 @@ config I2C_MPC
 
 config I2C_MV64XXX
         tristate "Marvell mv64xxx I2C Controller"
-        depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
+        depends on MV64X60 || PLAT_ORION || ARCH_SUNXI
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Marvell 64xxx line of host bridges.
@@ -648,6 +663,16 @@ config I2C_PXA_SLAVE
           is necessary for systems where the PXA may be a target on the
           I2C bus.
 
+config I2C_QUP
+        tristate "Qualcomm QUP based I2C controller"
+        depends on ARCH_QCOM
+        help
+          If you say yes to this option, support will be included for the
+          built-in I2C interface on the Qualcomm SoCs.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-qup.
+
 config I2C_RIIC
         tristate "Renesas RIIC adapter"
         depends on ARCH_SHMOBILE || COMPILE_TEST
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index a08931fe73e1..18d18ff9db93 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_I2C_AT91)		+= i2c-at91.o
 obj-$(CONFIG_I2C_AU1550)        += i2c-au1550.o
 obj-$(CONFIG_I2C_BCM2835)       += i2c-bcm2835.o
 obj-$(CONFIG_I2C_BLACKFIN_TWI)  += i2c-bfin-twi.o
+obj-$(CONFIG_I2C_CADENCE)       += i2c-cadence.o
 obj-$(CONFIG_I2C_CBUS_GPIO)     += i2c-cbus-gpio.o
 obj-$(CONFIG_I2C_CPM)           += i2c-cpm.o
 obj-$(CONFIG_I2C_DAVINCI)       += i2c-davinci.o
@@ -41,6 +42,7 @@ obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM)	+= i2c-designware-platform.o
 i2c-designware-platform-objs := i2c-designware-platdrv.o
 obj-$(CONFIG_I2C_DESIGNWARE_PCI)        += i2c-designware-pci.o
 i2c-designware-pci-objs := i2c-designware-pcidrv.o
+obj-$(CONFIG_I2C_EFM32)         += i2c-efm32.o
 obj-$(CONFIG_I2C_EG20T)         += i2c-eg20t.o
 obj-$(CONFIG_I2C_EXYNOS5)       += i2c-exynos5.o
 obj-$(CONFIG_I2C_GPIO)          += i2c-gpio.o
@@ -63,6 +65,7 @@ obj-$(CONFIG_I2C_PNX)		+= i2c-pnx.o
 obj-$(CONFIG_I2C_PUV3)          += i2c-puv3.o
 obj-$(CONFIG_I2C_PXA)           += i2c-pxa.o
 obj-$(CONFIG_I2C_PXA_PCI)       += i2c-pxa-pci.o
+obj-$(CONFIG_I2C_QUP)           += i2c-qup.o
 obj-$(CONFIG_I2C_RIIC)          += i2c-riic.o
 obj-$(CONFIG_I2C_S3C2410)       += i2c-s3c2410.o
 obj-$(CONFIG_I2C_S6000)         += i2c-s6000.o
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 7d60d3a1f621..451e305f7971 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -494,7 +494,7 @@ static struct i2c_adapter ali1535_adapter = {
         .algo           = &smbus_algorithm,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
+static const struct pci_device_id ali1535_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
         { },
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 4611e4754a67..98a1c97739ba 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -416,7 +416,7 @@ static void ali1563_remove(struct pci_dev *dev)
         ali1563_shutdown(dev);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ali1563_id_table) = {
+static const struct pci_device_id ali1563_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) },
         {},
 };
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 4823206a4870..2fa21ce9682b 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -476,7 +476,7 @@ static struct i2c_adapter ali15x3_adapter = {
         .algo           = &smbus_algorithm,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = {
+static const struct pci_device_id ali15x3_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 819d3c1062a7..a16f72891358 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -307,7 +307,7 @@ static const char* chipname[] = {
         "nVidia nForce", "AMD8111",
 };
 
-static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = {
+static const struct pci_device_id amd756_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_740B),
           .driver_data = AMD756 },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7413),
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index f3d4d79855b5..95a80a8f81b5 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -414,7 +414,7 @@ static const struct i2c_algorithm smbus_algorithm = {
 };
 
 
-static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = {
+static const struct pci_device_id amd8111_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS2) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 843d01268ae9..e95f9ba96790 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -32,7 +32,7 @@
 #include <linux/slab.h>
 #include <linux/platform_data/dma-atmel.h>
 
-#define TWI_CLK_HZ              100000                  /* max 400 Kbits/s */
+#define DEFAULT_TWI_CLK_HZ              100000          /* max 400 Kbits/s */
 #define AT91_I2C_TIMEOUT        msecs_to_jiffies(100)   /* transfer timeout */
 #define AT91_I2C_DMA_THRESHOLD  8                       /* enable DMA if transfer size is bigger than this threshold */
 
@@ -711,6 +711,7 @@ static int at91_twi_probe(struct platform_device *pdev)
         struct resource *mem;
         int rc;
         u32 phy_addr;
+        u32 bus_clk_rate;
 
         dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
         if (!dev)
@@ -756,13 +757,18 @@ static int at91_twi_probe(struct platform_device *pdev)
                         dev->use_dma = true;
         }
 
-        at91_calc_twi_clock(dev, TWI_CLK_HZ);
+        rc = of_property_read_u32(dev->dev->of_node, "clock-frequency",
+                        &bus_clk_rate);
+        if (rc)
+                bus_clk_rate = DEFAULT_TWI_CLK_HZ;
+
+        at91_calc_twi_clock(dev, bus_clk_rate);
         at91_init_twi_bus(dev);
 
         snprintf(dev->adapter.name, sizeof(dev->adapter.name), "AT91");
         i2c_set_adapdata(&dev->adapter, dev);
         dev->adapter.owner = THIS_MODULE;
-        dev->adapter.class = I2C_CLASS_HWMON;
+        dev->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         dev->adapter.algo = &at91_twi_algorithm;
         dev->adapter.dev.parent = dev->dev;
         dev->adapter.nr = pdev->id;
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 77df97b932af..c60719577fc3 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -219,7 +219,7 @@ static const struct i2c_algorithm bcm2835_i2c_algo = {
 static int bcm2835_i2c_probe(struct platform_device *pdev)
 {
         struct bcm2835_i2c_dev *i2c_dev;
-        struct resource *mem, *requested, *irq;
+        struct resource *mem, *irq;
         u32 bus_clk_rate, divider;
         int ret;
         struct i2c_adapter *adap;
@@ -234,25 +234,9 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
         init_completion(&i2c_dev->completion);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem) {
-                dev_err(&pdev->dev, "No mem resource\n");
-                return -ENODEV;
-        }
-
-        requested = devm_request_mem_region(&pdev->dev, mem->start,
-                                            resource_size(mem),
-                                            dev_name(&pdev->dev));
-        if (!requested) {
-                dev_err(&pdev->dev, "Could not claim register region\n");
-                return -EBUSY;
-        }
-
-        i2c_dev->regs = devm_ioremap(&pdev->dev, mem->start,
-                                     resource_size(mem));
-        if (!i2c_dev->regs) {
-                dev_err(&pdev->dev, "Could not map registers\n");
-                return -ENOMEM;
-        }
+        i2c_dev->regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(i2c_dev->regs))
+                return PTR_ERR(i2c_dev->regs);
 
         i2c_dev->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(i2c_dev->clk)) {
@@ -295,7 +279,7 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
         adap = &i2c_dev->adapter;
         i2c_set_adapdata(adap, i2c_dev);
         adap->owner = THIS_MODULE;
-        adap->class = I2C_CLASS_HWMON;
+        adap->class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         strlcpy(adap->name, "bcm2835 I2C adapter", sizeof(adap->name));
         adap->algo = &bcm2835_i2c_algo;
         adap->dev.parent = &pdev->dev;
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 3b9bd9a3f2b0..e6d5162b6379 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -21,10 +21,10 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/i2c/bfin_twi.h>
 
-#include <asm/blackfin.h>
-#include <asm/portmux.h>
 #include <asm/irq.h>
+#include <asm/portmux.h>
 #include <asm/bfin_twi.h>
 
 /* SMBus mode*/
@@ -65,7 +65,6 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface,
                 /* Transmit next data */
                 while (iface->writeNum > 0 &&
                         (read_FIFO_STAT(iface) & XMTSTAT) != XMT_FULL) {
-                        SSYNC();
                         write_XMT_DATA8(iface, *(iface->transPtr++));
                         iface->writeNum--;
                 }
@@ -248,7 +247,6 @@ static irqreturn_t bfin_twi_interrupt_entry(int irq, void *dev_id)
                 /* Clear interrupt status */
                 write_INT_STAT(iface, twi_int_status);
                 bfin_twi_handle_interrupt(iface, twi_int_status);
-                SSYNC();
         }
         spin_unlock_irqrestore(&iface->lock, flags);
         return IRQ_HANDLED;
@@ -294,9 +292,7 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap,
          *  discarded before start a new operation.
          */
         write_FIFO_CTL(iface, 0x3);
-        SSYNC();
         write_FIFO_CTL(iface, 0);
-        SSYNC();
 
         if (pmsg->flags & I2C_M_RD)
                 iface->read_write = I2C_SMBUS_READ;
@@ -306,7 +302,6 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap,
                 if (iface->writeNum > 0) {
                         write_XMT_DATA8(iface, *(iface->transPtr++));
                         iface->writeNum--;
-                        SSYNC();
                 }
         }
 
@@ -315,7 +310,6 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap,
 
         /* Interrupt mask . Enable XMT, RCV interrupt */
         write_INT_MASK(iface, MCOMP | MERR | RCVSERV | XMTSERV);
-        SSYNC();
 
         if (pmsg->len <= 255)
                 write_MASTER_CTL(iface, pmsg->len << 6);
@@ -329,7 +323,6 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap,
                 (iface->msg_num > 1 ? RSTART : 0) |
                 ((iface->read_write == I2C_SMBUS_READ) ? MDIR : 0) |
                 ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ > 100) ? FAST : 0));
-        SSYNC();
 
         while (!iface->result) {
                 if (!wait_for_completion_timeout(&iface->complete,
@@ -453,7 +446,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
          * start a new operation.
          */
         write_FIFO_CTL(iface, 0x3);
-        SSYNC();
         write_FIFO_CTL(iface, 0);
 
         /* clear int stat */
@@ -461,7 +453,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
 
         /* Set Transmit device address */
         write_MASTER_ADDR(iface, addr);
-        SSYNC();
 
         switch (iface->cur_mode) {
         case TWI_I2C_MODE_STANDARDSUB:
@@ -469,7 +460,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
                 write_INT_MASK(iface, MCOMP | MERR |
                         ((iface->read_write == I2C_SMBUS_READ) ?
                         RCVSERV : XMTSERV));
-                SSYNC();
 
                 if (iface->writeNum + 1 <= 255)
                         write_MASTER_CTL(iface, (iface->writeNum + 1) << 6);
@@ -484,7 +474,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
         case TWI_I2C_MODE_COMBINED:
                 write_XMT_DATA8(iface, iface->command);
                 write_INT_MASK(iface, MCOMP | MERR | RCVSERV | XMTSERV);
-                SSYNC();
 
                 if (iface->writeNum > 0)
                         write_MASTER_CTL(iface, (iface->writeNum + 1) << 6);
@@ -531,7 +520,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
                 write_INT_MASK(iface, MCOMP | MERR |
                         ((iface->read_write == I2C_SMBUS_READ) ?
                         RCVSERV : XMTSERV));
-                SSYNC();
 
                 /* Master enable */
                 write_MASTER_CTL(iface, read_MASTER_CTL(iface) | MEN |
@@ -539,7 +527,6 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr,
                         ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ > 100) ? FAST : 0));
                 break;
         }
-        SSYNC();
 
         while (!iface->result) {
                 if (!wait_for_completion_timeout(&iface->complete,
@@ -669,7 +656,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
         strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));
         p_adap->algo = &bfin_twi_algorithm;
         p_adap->algo_data = iface;
-        p_adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+        p_adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED;
         p_adap->dev.parent = &pdev->dev;
         p_adap->timeout = 5 * HZ;
         p_adap->retries = 3;
@@ -704,7 +691,6 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 
         /* Enable TWI */
         write_CONTROL(iface, read_CONTROL(iface) | TWI_ENA);
-        SSYNC();
 
         rc = i2c_add_numbered_adapter(p_adap);
         if (rc < 0) {
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
new file mode 100644
index 000000000000..63f3f03ecc9b
--- /dev/null
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -0,0 +1,905 @@
+/*
+ * I2C bus driver for the Cadence I2C controller.
+ *
+ * Copyright (C) 2009 - 2014 Xilinx, Inc.
+ *
+ * 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/clk.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+/* Register offsets for the I2C device. */
+#define CDNS_I2C_CR_OFFSET              0x00 /* Control Register, RW */
+#define CDNS_I2C_SR_OFFSET              0x04 /* Status Register, RO */
+#define CDNS_I2C_ADDR_OFFSET            0x08 /* I2C Address Register, RW */
+#define CDNS_I2C_DATA_OFFSET            0x0C /* I2C Data Register, RW */
+#define CDNS_I2C_ISR_OFFSET             0x10 /* IRQ Status Register, RW */
+#define CDNS_I2C_XFER_SIZE_OFFSET       0x14 /* Transfer Size Register, RW */
+#define CDNS_I2C_TIME_OUT_OFFSET        0x1C /* Time Out Register, RW */
+#define CDNS_I2C_IER_OFFSET             0x24 /* IRQ Enable Register, WO */
+#define CDNS_I2C_IDR_OFFSET             0x28 /* IRQ Disable Register, WO */
+
+/* Control Register Bit mask definitions */
+#define CDNS_I2C_CR_HOLD                BIT(4) /* Hold Bus bit */
+#define CDNS_I2C_CR_ACK_EN              BIT(3)
+#define CDNS_I2C_CR_NEA                 BIT(2)
+#define CDNS_I2C_CR_MS                  BIT(1)
+/* Read or Write Master transfer 0 = Transmitter, 1 = Receiver */
+#define CDNS_I2C_CR_RW                  BIT(0)
+/* 1 = Auto init FIFO to zeroes */
+#define CDNS_I2C_CR_CLR_FIFO            BIT(6)
+#define CDNS_I2C_CR_DIVA_SHIFT          14
+#define CDNS_I2C_CR_DIVA_MASK           (3 << CDNS_I2C_CR_DIVA_SHIFT)
+#define CDNS_I2C_CR_DIVB_SHIFT          8
+#define CDNS_I2C_CR_DIVB_MASK           (0x3f << CDNS_I2C_CR_DIVB_SHIFT)
+
+/* Status Register Bit mask definitions */
+#define CDNS_I2C_SR_BA          BIT(8)
+#define CDNS_I2C_SR_RXDV        BIT(5)
+
+/*
+ * I2C Address Register Bit mask definitions
+ * Normal addressing mode uses [6:0] bits. Extended addressing mode uses [9:0]
+ * bits. A write access to this register always initiates a transfer if the I2C
+ * is in master mode.
+ */
+#define CDNS_I2C_ADDR_MASK      0x000003FF /* I2C Address Mask */
+
+/*
+ * I2C Interrupt Registers Bit mask definitions
+ * All the four interrupt registers (Status/Mask/Enable/Disable) have the same
+ * bit definitions.
+ */
+#define CDNS_I2C_IXR_ARB_LOST           BIT(9)
+#define CDNS_I2C_IXR_RX_UNF             BIT(7)
+#define CDNS_I2C_IXR_TX_OVF             BIT(6)
+#define CDNS_I2C_IXR_RX_OVF             BIT(5)
+#define CDNS_I2C_IXR_SLV_RDY            BIT(4)
+#define CDNS_I2C_IXR_TO                 BIT(3)
+#define CDNS_I2C_IXR_NACK               BIT(2)
+#define CDNS_I2C_IXR_DATA               BIT(1)
+#define CDNS_I2C_IXR_COMP               BIT(0)
+
+#define CDNS_I2C_IXR_ALL_INTR_MASK      (CDNS_I2C_IXR_ARB_LOST | \
+                                         CDNS_I2C_IXR_RX_UNF | \
+                                         CDNS_I2C_IXR_TX_OVF | \
+                                         CDNS_I2C_IXR_RX_OVF | \
+                                         CDNS_I2C_IXR_SLV_RDY | \
+                                         CDNS_I2C_IXR_TO | \
+                                         CDNS_I2C_IXR_NACK | \
+                                         CDNS_I2C_IXR_DATA | \
+                                         CDNS_I2C_IXR_COMP)
+
+#define CDNS_I2C_IXR_ERR_INTR_MASK      (CDNS_I2C_IXR_ARB_LOST | \
+                                         CDNS_I2C_IXR_RX_UNF | \
+                                         CDNS_I2C_IXR_TX_OVF | \
+                                         CDNS_I2C_IXR_RX_OVF | \
+                                         CDNS_I2C_IXR_NACK)
+
+#define CDNS_I2C_ENABLED_INTR_MASK      (CDNS_I2C_IXR_ARB_LOST | \
+                                         CDNS_I2C_IXR_RX_UNF | \
+                                         CDNS_I2C_IXR_TX_OVF | \
+                                         CDNS_I2C_IXR_RX_OVF | \
+                                         CDNS_I2C_IXR_NACK | \
+                                         CDNS_I2C_IXR_DATA | \
+                                         CDNS_I2C_IXR_COMP)
+
+#define CDNS_I2C_TIMEOUT                msecs_to_jiffies(1000)
+
+#define CDNS_I2C_FIFO_DEPTH             16
+/* FIFO depth at which the DATA interrupt occurs */
+#define CDNS_I2C_DATA_INTR_DEPTH        (CDNS_I2C_FIFO_DEPTH - 2)
+#define CDNS_I2C_MAX_TRANSFER_SIZE      255
+/* Transfer size in multiples of data interrupt depth */
+#define CDNS_I2C_TRANSFER_SIZE  (CDNS_I2C_MAX_TRANSFER_SIZE - 3)
+
+#define DRIVER_NAME             "cdns-i2c"
+
+#define CDNS_I2C_SPEED_MAX      400000
+#define CDNS_I2C_SPEED_DEFAULT  100000
+
+#define CDNS_I2C_DIVA_MAX       4
+#define CDNS_I2C_DIVB_MAX       64
+
+#define cdns_i2c_readreg(offset)       readl_relaxed(id->membase + offset)
+#define cdns_i2c_writereg(val, offset) writel_relaxed(val, id->membase + offset)
+
+/**
+ * struct cdns_i2c - I2C device private data structure
+ * @membase:            Base address of the I2C device
+ * @adap:               I2C adapter instance
+ * @p_msg:              Message pointer
+ * @err_status:         Error status in Interrupt Status Register
+ * @xfer_done:          Transfer complete status
+ * @p_send_buf:         Pointer to transmit buffer
+ * @p_recv_buf:         Pointer to receive buffer
+ * @suspended:          Flag holding the device's PM status
+ * @send_count:         Number of bytes still expected to send
+ * @recv_count:         Number of bytes still expected to receive
+ * @irq:                IRQ number
+ * @input_clk:          Input clock to I2C controller
+ * @i2c_clk:            Maximum I2C clock speed
+ * @bus_hold_flag:      Flag used in repeated start for clearing HOLD bit
+ * @clk:                Pointer to struct clk
+ * @clk_rate_change_nb: Notifier block for clock rate changes
+ */
+struct cdns_i2c {
+        void __iomem *membase;
+        struct i2c_adapter adap;
+        struct i2c_msg *p_msg;
+        int err_status;
+        struct completion xfer_done;
+        unsigned char *p_send_buf;
+        unsigned char *p_recv_buf;
+        u8 suspended;
+        unsigned int send_count;
+        unsigned int recv_count;
+        int irq;
+        unsigned long input_clk;
+        unsigned int i2c_clk;
+        unsigned int bus_hold_flag;
+        struct clk *clk;
+        struct notifier_block clk_rate_change_nb;
+};
+
+#define to_cdns_i2c(_nb)        container_of(_nb, struct cdns_i2c, \
+                                             clk_rate_change_nb)
+
+/**
+ * cdns_i2c_clear_bus_hold() - Clear bus hold bit
+ * @id: Pointer to driver data struct
+ *
+ * Helper to clear the controller's bus hold bit.
+ */
+static void cdns_i2c_clear_bus_hold(struct cdns_i2c *id)
+{
+        u32 reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        if (reg & CDNS_I2C_CR_HOLD)
+                cdns_i2c_writereg(reg & ~CDNS_I2C_CR_HOLD, CDNS_I2C_CR_OFFSET);
+}
+
+/**
+ * cdns_i2c_isr - Interrupt handler for the I2C device
+ * @irq:        irq number for the I2C device
+ * @ptr:        void pointer to cdns_i2c structure
+ *
+ * This function handles the data interrupt, transfer complete interrupt and
+ * the error interrupts of the I2C device.
+ *
+ * Return: IRQ_HANDLED always
+ */
+static irqreturn_t cdns_i2c_isr(int irq, void *ptr)
+{
+        unsigned int isr_status, avail_bytes;
+        unsigned int bytes_to_recv, bytes_to_send;
+        struct cdns_i2c *id = ptr;
+        /* Signal completion only after everything is updated */
+        int done_flag = 0;
+        irqreturn_t status = IRQ_NONE;
+
+        isr_status = cdns_i2c_readreg(CDNS_I2C_ISR_OFFSET);
+
+        /* Handling nack and arbitration lost interrupt */
+        if (isr_status & (CDNS_I2C_IXR_NACK | CDNS_I2C_IXR_ARB_LOST)) {
+                done_flag = 1;
+                status = IRQ_HANDLED;
+        }
+
+        /* Handling Data interrupt */
+        if ((isr_status & CDNS_I2C_IXR_DATA) &&
+                        (id->recv_count >= CDNS_I2C_DATA_INTR_DEPTH)) {
+                /* Always read data interrupt threshold bytes */
+                bytes_to_recv = CDNS_I2C_DATA_INTR_DEPTH;
+                id->recv_count -= CDNS_I2C_DATA_INTR_DEPTH;
+                avail_bytes = cdns_i2c_readreg(CDNS_I2C_XFER_SIZE_OFFSET);
+
+                /*
+                 * if the tranfer size register value is zero, then
+                 * check for the remaining bytes and update the
+                 * transfer size register.
+                 */
+                if (!avail_bytes) {
+                        if (id->recv_count > CDNS_I2C_TRANSFER_SIZE)
+                                cdns_i2c_writereg(CDNS_I2C_TRANSFER_SIZE,
+                                                CDNS_I2C_XFER_SIZE_OFFSET);
+                        else
+                                cdns_i2c_writereg(id->recv_count,
+                                                CDNS_I2C_XFER_SIZE_OFFSET);
+                }
+
+                /* Process the data received */
+                while (bytes_to_recv--)
+                        *(id->p_recv_buf)++ =
+                                cdns_i2c_readreg(CDNS_I2C_DATA_OFFSET);
+
+                if (!id->bus_hold_flag &&
+                                (id->recv_count <= CDNS_I2C_FIFO_DEPTH))
+                        cdns_i2c_clear_bus_hold(id);
+
+                status = IRQ_HANDLED;
+        }
+
+        /* Handling Transfer Complete interrupt */
+        if (isr_status & CDNS_I2C_IXR_COMP) {
+                if (!id->p_recv_buf) {
+                        /*
+                         * If the device is sending data If there is further
+                         * data to be sent. Calculate the available space
+                         * in FIFO and fill the FIFO with that many bytes.
+                         */
+                        if (id->send_count) {
+                                avail_bytes = CDNS_I2C_FIFO_DEPTH -
+                                    cdns_i2c_readreg(CDNS_I2C_XFER_SIZE_OFFSET);
+                                if (id->send_count > avail_bytes)
+                                        bytes_to_send = avail_bytes;
+                                else
+                                        bytes_to_send = id->send_count;
+
+                                while (bytes_to_send--) {
+                                        cdns_i2c_writereg(
+                                                (*(id->p_send_buf)++),
+                                                 CDNS_I2C_DATA_OFFSET);
+                                        id->send_count--;
+                                }
+                        } else {
+                                /*
+                                 * Signal the completion of transaction and
+                                 * clear the hold bus bit if there are no
+                                 * further messages to be processed.
+                                 */
+                                done_flag = 1;
+                        }
+                        if (!id->send_count && !id->bus_hold_flag)
+                                cdns_i2c_clear_bus_hold(id);
+                } else {
+                        if (!id->bus_hold_flag)
+                                cdns_i2c_clear_bus_hold(id);
+                        /*
+                         * If the device is receiving data, then signal
+                         * the completion of transaction and read the data
+                         * present in the FIFO. Signal the completion of
+                         * transaction.
+                         */
+                        while (cdns_i2c_readreg(CDNS_I2C_SR_OFFSET) &
+                                        CDNS_I2C_SR_RXDV) {
+                                *(id->p_recv_buf)++ =
+                                        cdns_i2c_readreg(CDNS_I2C_DATA_OFFSET);
+                                id->recv_count--;
+                        }
+                        done_flag = 1;
+                }
+
+                status = IRQ_HANDLED;
+        }
+
+        /* Update the status for errors */
+        id->err_status = isr_status & CDNS_I2C_IXR_ERR_INTR_MASK;
+        if (id->err_status)
+                status = IRQ_HANDLED;
+
+        cdns_i2c_writereg(isr_status, CDNS_I2C_ISR_OFFSET);
+
+        if (done_flag)
+                complete(&id->xfer_done);
+
+        return status;
+}
+
+/**
+ * cdns_i2c_mrecv - Prepare and start a master receive operation
+ * @id:         pointer to the i2c device structure
+ */
+static void cdns_i2c_mrecv(struct cdns_i2c *id)
+{
+        unsigned int ctrl_reg;
+        unsigned int isr_status;
+
+        id->p_recv_buf = id->p_msg->buf;
+        id->recv_count = id->p_msg->len;
+
+        /* Put the controller in master receive mode and clear the FIFO */
+        ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        ctrl_reg |= CDNS_I2C_CR_RW | CDNS_I2C_CR_CLR_FIFO;
+
+        if (id->p_msg->flags & I2C_M_RECV_LEN)
+                id->recv_count = I2C_SMBUS_BLOCK_MAX + 1;
+
+        /*
+         * Check for the message size against FIFO depth and set the
+         * 'hold bus' bit if it is greater than FIFO depth.
+         */
+        if (id->recv_count > CDNS_I2C_FIFO_DEPTH)
+                ctrl_reg |= CDNS_I2C_CR_HOLD;
+
+        cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+        /* Clear the interrupts in interrupt status register */
+        isr_status = cdns_i2c_readreg(CDNS_I2C_ISR_OFFSET);
+        cdns_i2c_writereg(isr_status, CDNS_I2C_ISR_OFFSET);
+
+        /*
+         * The no. of bytes to receive is checked against the limit of
+         * max transfer size. Set transfer size register with no of bytes
+         * receive if it is less than transfer size and transfer size if
+         * it is more. Enable the interrupts.
+         */
+        if (id->recv_count > CDNS_I2C_TRANSFER_SIZE)
+                cdns_i2c_writereg(CDNS_I2C_TRANSFER_SIZE,
+                                  CDNS_I2C_XFER_SIZE_OFFSET);
+        else
+                cdns_i2c_writereg(id->recv_count, CDNS_I2C_XFER_SIZE_OFFSET);
+        /* Clear the bus hold flag if bytes to receive is less than FIFO size */
+        if (!id->bus_hold_flag &&
+                ((id->p_msg->flags & I2C_M_RECV_LEN) != I2C_M_RECV_LEN) &&
+                (id->recv_count <= CDNS_I2C_FIFO_DEPTH))
+                        cdns_i2c_clear_bus_hold(id);
+        /* Set the slave address in address register - triggers operation */
+        cdns_i2c_writereg(id->p_msg->addr & CDNS_I2C_ADDR_MASK,
+                                                CDNS_I2C_ADDR_OFFSET);
+        cdns_i2c_writereg(CDNS_I2C_ENABLED_INTR_MASK, CDNS_I2C_IER_OFFSET);
+}
+
+/**
+ * cdns_i2c_msend - Prepare and start a master send operation
+ * @id:         pointer to the i2c device
+ */
+static void cdns_i2c_msend(struct cdns_i2c *id)
+{
+        unsigned int avail_bytes;
+        unsigned int bytes_to_send;
+        unsigned int ctrl_reg;
+        unsigned int isr_status;
+
+        id->p_recv_buf = NULL;
+        id->p_send_buf = id->p_msg->buf;
+        id->send_count = id->p_msg->len;
+
+        /* Set the controller in Master transmit mode and clear the FIFO. */
+        ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        ctrl_reg &= ~CDNS_I2C_CR_RW;
+        ctrl_reg |= CDNS_I2C_CR_CLR_FIFO;
+
+        /*
+         * Check for the message size against FIFO depth and set the
+         * 'hold bus' bit if it is greater than FIFO depth.
+         */
+        if (id->send_count > CDNS_I2C_FIFO_DEPTH)
+                ctrl_reg |= CDNS_I2C_CR_HOLD;
+        cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+        /* Clear the interrupts in interrupt status register. */
+        isr_status = cdns_i2c_readreg(CDNS_I2C_ISR_OFFSET);
+        cdns_i2c_writereg(isr_status, CDNS_I2C_ISR_OFFSET);
+
+        /*
+         * Calculate the space available in FIFO. Check the message length
+         * against the space available, and fill the FIFO accordingly.
+         * Enable the interrupts.
+         */
+        avail_bytes = CDNS_I2C_FIFO_DEPTH -
+                                cdns_i2c_readreg(CDNS_I2C_XFER_SIZE_OFFSET);
+
+        if (id->send_count > avail_bytes)
+                bytes_to_send = avail_bytes;
+        else
+                bytes_to_send = id->send_count;
+
+        while (bytes_to_send--) {
+                cdns_i2c_writereg((*(id->p_send_buf)++), CDNS_I2C_DATA_OFFSET);
+                id->send_count--;
+        }
+
+        /*
+         * Clear the bus hold flag if there is no more data
+         * and if it is the last message.
+         */
+        if (!id->bus_hold_flag && !id->send_count)
+                cdns_i2c_clear_bus_hold(id);
+        /* Set the slave address in address register - triggers operation. */
+        cdns_i2c_writereg(id->p_msg->addr & CDNS_I2C_ADDR_MASK,
+                                                CDNS_I2C_ADDR_OFFSET);
+
+        cdns_i2c_writereg(CDNS_I2C_ENABLED_INTR_MASK, CDNS_I2C_IER_OFFSET);
+}
+
+/**
+ * cdns_i2c_master_reset - Reset the interface
+ * @adap:       pointer to the i2c adapter driver instance
+ *
+ * This function cleanup the fifos, clear the hold bit and status
+ * and disable the interrupts.
+ */
+static void cdns_i2c_master_reset(struct i2c_adapter *adap)
+{
+        struct cdns_i2c *id = adap->algo_data;
+        u32 regval;
+
+        /* Disable the interrupts */
+        cdns_i2c_writereg(CDNS_I2C_IXR_ALL_INTR_MASK, CDNS_I2C_IDR_OFFSET);
+        /* Clear the hold bit and fifos */
+        regval = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        regval &= ~CDNS_I2C_CR_HOLD;
+        regval |= CDNS_I2C_CR_CLR_FIFO;
+        cdns_i2c_writereg(regval, CDNS_I2C_CR_OFFSET);
+        /* Update the transfercount register to zero */
+        cdns_i2c_writereg(0, CDNS_I2C_XFER_SIZE_OFFSET);
+        /* Clear the interupt status register */
+        regval = cdns_i2c_readreg(CDNS_I2C_ISR_OFFSET);
+        cdns_i2c_writereg(regval, CDNS_I2C_ISR_OFFSET);
+        /* Clear the status register */
+        regval = cdns_i2c_readreg(CDNS_I2C_SR_OFFSET);
+        cdns_i2c_writereg(regval, CDNS_I2C_SR_OFFSET);
+}
+
+static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,
+                struct i2c_adapter *adap)
+{
+        int ret;
+        u32 reg;
+
+        id->p_msg = msg;
+        id->err_status = 0;
+        reinit_completion(&id->xfer_done);
+
+        /* Check for the TEN Bit mode on each msg */
+        reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        if (msg->flags & I2C_M_TEN) {
+                if (reg & CDNS_I2C_CR_NEA)
+                        cdns_i2c_writereg(reg & ~CDNS_I2C_CR_NEA,
+                                        CDNS_I2C_CR_OFFSET);
+        } else {
+                if (!(reg & CDNS_I2C_CR_NEA))
+                        cdns_i2c_writereg(reg | CDNS_I2C_CR_NEA,
+                                        CDNS_I2C_CR_OFFSET);
+        }
+
+        /* Check for the R/W flag on each msg */
+        if (msg->flags & I2C_M_RD)
+                cdns_i2c_mrecv(id);
+        else
+                cdns_i2c_msend(id);
+
+        /* Wait for the signal of completion */
+        ret = wait_for_completion_timeout(&id->xfer_done, adap->timeout);
+        if (!ret) {
+                cdns_i2c_master_reset(adap);
+                dev_err(id->adap.dev.parent,
+                                "timeout waiting on completion\n");
+                return -ETIMEDOUT;
+        }
+
+        cdns_i2c_writereg(CDNS_I2C_IXR_ALL_INTR_MASK,
+                          CDNS_I2C_IDR_OFFSET);
+
+        /* If it is bus arbitration error, try again */
+        if (id->err_status & CDNS_I2C_IXR_ARB_LOST)
+                return -EAGAIN;
+
+        return 0;
+}
+
+/**
+ * cdns_i2c_master_xfer - The main i2c transfer function
+ * @adap:       pointer to the i2c adapter driver instance
+ * @msgs:       pointer to the i2c message structure
+ * @num:        the number of messages to transfer
+ *
+ * Initiates the send/recv activity based on the transfer message received.
+ *
+ * Return: number of msgs processed on success, negative error otherwise
+ */
+static int cdns_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
+                                int num)
+{
+        int ret, count;
+        u32 reg;
+        struct cdns_i2c *id = adap->algo_data;
+
+        /* Check if the bus is free */
+        if (cdns_i2c_readreg(CDNS_I2C_SR_OFFSET) & CDNS_I2C_SR_BA)
+                return -EAGAIN;
+
+        /*
+         * Set the flag to one when multiple messages are to be
+         * processed with a repeated start.
+         */
+        if (num > 1) {
+                id->bus_hold_flag = 1;
+                reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+                reg |= CDNS_I2C_CR_HOLD;
+                cdns_i2c_writereg(reg, CDNS_I2C_CR_OFFSET);
+        } else {
+                id->bus_hold_flag = 0;
+        }
+
+        /* Process the msg one by one */
+        for (count = 0; count < num; count++, msgs++) {
+                if (count == (num - 1))
+                        id->bus_hold_flag = 0;
+
+                ret = cdns_i2c_process_msg(id, msgs, adap);
+                if (ret)
+                        return ret;
+
+                /* Report the other error interrupts to application */
+                if (id->err_status) {
+                        cdns_i2c_master_reset(adap);
+
+                        if (id->err_status & CDNS_I2C_IXR_NACK)
+                                return -ENXIO;
+
+                        return -EIO;
+                }
+        }
+
+        return num;
+}
+
+/**
+ * cdns_i2c_func - Returns the supported features of the I2C driver
+ * @adap:       pointer to the i2c adapter structure
+ *
+ * Return: 32 bit value, each bit corresponding to a feature
+ */
+static u32 cdns_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_10BIT_ADDR |
+                (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK) |
+                I2C_FUNC_SMBUS_BLOCK_DATA;
+}
+
+static const struct i2c_algorithm cdns_i2c_algo = {
+        .master_xfer    = cdns_i2c_master_xfer,
+        .functionality  = cdns_i2c_func,
+};
+
+/**
+ * cdns_i2c_calc_divs - Calculate clock dividers
+ * @f:          I2C clock frequency
+ * @input_clk:  Input clock frequency
+ * @a:          First divider (return value)
+ * @b:          Second divider (return value)
+ *
+ * f is used as input and output variable. As input it is used as target I2C
+ * frequency. On function exit f holds the actually resulting I2C frequency.
+ *
+ * Return: 0 on success, negative errno otherwise.
+ */
+static int cdns_i2c_calc_divs(unsigned long *f, unsigned long input_clk,
+                unsigned int *a, unsigned int *b)
+{
+        unsigned long fscl = *f, best_fscl = *f, actual_fscl, temp;
+        unsigned int div_a, div_b, calc_div_a = 0, calc_div_b = 0;
+        unsigned int last_error, current_error;
+
+        /* calculate (divisor_a+1) x (divisor_b+1) */
+        temp = input_clk / (22 * fscl);
+
+        /*
+         * If the calculated value is negative or 0, the fscl input is out of
+         * range. Return error.
+         */
+        if (!temp || (temp > (CDNS_I2C_DIVA_MAX * CDNS_I2C_DIVB_MAX)))
+                return -EINVAL;
+
+        last_error = -1;
+        for (div_a = 0; div_a < CDNS_I2C_DIVA_MAX; div_a++) {
+                div_b = DIV_ROUND_UP(input_clk, 22 * fscl * (div_a + 1));
+
+                if ((div_b < 1) || (div_b > CDNS_I2C_DIVB_MAX))
+                        continue;
+                div_b--;
+
+                actual_fscl = input_clk / (22 * (div_a + 1) * (div_b + 1));
+
+                if (actual_fscl > fscl)
+                        continue;
+
+                current_error = ((actual_fscl > fscl) ? (actual_fscl - fscl) :
+                                                        (fscl - actual_fscl));
+
+                if (last_error > current_error) {
+                        calc_div_a = div_a;
+                        calc_div_b = div_b;
+                        best_fscl = actual_fscl;
+                        last_error = current_error;
+                }
+        }
+
+        *a = calc_div_a;
+        *b = calc_div_b;
+        *f = best_fscl;
+
+        return 0;
+}
+
+/**
+ * cdns_i2c_setclk - This function sets the serial clock rate for the I2C device
+ * @clk_in:     I2C clock input frequency in Hz
+ * @id:         Pointer to the I2C device structure
+ *
+ * The device must be idle rather than busy transferring data before setting
+ * these device options.
+ * The data rate is set by values in the control register.
+ * The formula for determining the correct register values is
+ *      Fscl = Fpclk/(22 x (divisor_a+1) x (divisor_b+1))
+ * See the hardware data sheet for a full explanation of setting the serial
+ * clock rate. The clock can not be faster than the input clock divide by 22.
+ * The two most common clock rates are 100KHz and 400KHz.
+ *
+ * Return: 0 on success, negative error otherwise
+ */
+static int cdns_i2c_setclk(unsigned long clk_in, struct cdns_i2c *id)
+{
+        unsigned int div_a, div_b;
+        unsigned int ctrl_reg;
+        int ret = 0;
+        unsigned long fscl = id->i2c_clk;
+
+        ret = cdns_i2c_calc_divs(&fscl, clk_in, &div_a, &div_b);
+        if (ret)
+                return ret;
+
+        ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
+        ctrl_reg &= ~(CDNS_I2C_CR_DIVA_MASK | CDNS_I2C_CR_DIVB_MASK);
+        ctrl_reg |= ((div_a << CDNS_I2C_CR_DIVA_SHIFT) |
+                        (div_b << CDNS_I2C_CR_DIVB_SHIFT));
+        cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+        return 0;
+}
+
+/**
+ * cdns_i2c_clk_notifier_cb - Clock rate change callback
+ * @nb:         Pointer to notifier block
+ * @event:      Notification reason
+ * @data:       Pointer to notification data object
+ *
+ * This function is called when the cdns_i2c input clock frequency changes.
+ * The callback checks whether a valid bus frequency can be generated after the
+ * change. If so, the change is acknowledged, otherwise the change is aborted.
+ * New dividers are written to the HW in the pre- or post change notification
+ * depending on the scaling direction.
+ *
+ * Return:      NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK
+ *              to acknowedge the change, NOTIFY_DONE if the notification is
+ *              considered irrelevant.
+ */
+static int cdns_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long
+                event, void *data)
+{
+        struct clk_notifier_data *ndata = data;
+        struct cdns_i2c *id = to_cdns_i2c(nb);
+
+        if (id->suspended)
+                return NOTIFY_OK;
+
+        switch (event) {
+        case PRE_RATE_CHANGE:
+        {
+                unsigned long input_clk = ndata->new_rate;
+                unsigned long fscl = id->i2c_clk;
+                unsigned int div_a, div_b;
+                int ret;
+
+                ret = cdns_i2c_calc_divs(&fscl, input_clk, &div_a, &div_b);
+                if (ret) {
+                        dev_warn(id->adap.dev.parent,
+                                        "clock rate change rejected\n");
+                        return NOTIFY_STOP;
+                }
+
+                /* scale up */
+                if (ndata->new_rate > ndata->old_rate)
+                        cdns_i2c_setclk(ndata->new_rate, id);
+
+                return NOTIFY_OK;
+        }
+        case POST_RATE_CHANGE:
+                id->input_clk = ndata->new_rate;
+                /* scale down */
+                if (ndata->new_rate < ndata->old_rate)
+                        cdns_i2c_setclk(ndata->new_rate, id);
+                return NOTIFY_OK;
+        case ABORT_RATE_CHANGE:
+                /* scale up */
+                if (ndata->new_rate > ndata->old_rate)
+                        cdns_i2c_setclk(ndata->old_rate, id);
+                return NOTIFY_OK;
+        default:
+                return NOTIFY_DONE;
+        }
+}
+
+/**
+ * cdns_i2c_suspend - Suspend method for the driver
+ * @_dev:       Address of the platform_device structure
+ *
+ * Put the driver into low power mode.
+ *
+ * Return: 0 always
+ */
+static int __maybe_unused cdns_i2c_suspend(struct device *_dev)
+{
+        struct platform_device *pdev = container_of(_dev,
+                        struct platform_device, dev);
+        struct cdns_i2c *xi2c = platform_get_drvdata(pdev);
+
+        clk_disable(xi2c->clk);
+        xi2c->suspended = 1;
+
+        return 0;
+}
+
+/**
+ * cdns_i2c_resume - Resume from suspend
+ * @_dev:       Address of the platform_device structure
+ *
+ * Resume operation after suspend.
+ *
+ * Return: 0 on success and error value on error
+ */
+static int __maybe_unused cdns_i2c_resume(struct device *_dev)
+{
+        struct platform_device *pdev = container_of(_dev,
+                        struct platform_device, dev);
+        struct cdns_i2c *xi2c = platform_get_drvdata(pdev);
+        int ret;
+
+        ret = clk_enable(xi2c->clk);
+        if (ret) {
+                dev_err(_dev, "Cannot enable clock.\n");
+                return ret;
+        }
+
+        xi2c->suspended = 0;
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(cdns_i2c_dev_pm_ops, cdns_i2c_suspend,
+                         cdns_i2c_resume);
+
+/**
+ * cdns_i2c_probe - Platform registration call
+ * @pdev:       Handle to the platform device structure
+ *
+ * This function does all the memory allocation and registration for the i2c
+ * device. User can modify the address mode to 10 bit address mode using the
+ * ioctl call with option I2C_TENBIT.
+ *
+ * Return: 0 on success, negative error otherwise
+ */
+static int cdns_i2c_probe(struct platform_device *pdev)
+{
+        struct resource *r_mem;
+        struct cdns_i2c *id;
+        int ret;
+
+        id = devm_kzalloc(&pdev->dev, sizeof(*id), GFP_KERNEL);
+        if (!id)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, id);
+
+        r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        id->membase = devm_ioremap_resource(&pdev->dev, r_mem);
+        if (IS_ERR(id->membase))
+                return PTR_ERR(id->membase);
+
+        id->irq = platform_get_irq(pdev, 0);
+
+        id->adap.dev.of_node = pdev->dev.of_node;
+        id->adap.algo = &cdns_i2c_algo;
+        id->adap.timeout = CDNS_I2C_TIMEOUT;
+        id->adap.retries = 3;           /* Default retry value. */
+        id->adap.algo_data = id;
+        id->adap.dev.parent = &pdev->dev;
+        init_completion(&id->xfer_done);
+        snprintf(id->adap.name, sizeof(id->adap.name),
+                 "Cadence I2C at %08lx", (unsigned long)r_mem->start);
+
+        id->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(id->clk)) {
+                dev_err(&pdev->dev, "input clock not found.\n");
+                return PTR_ERR(id->clk);
+        }
+        ret = clk_prepare_enable(id->clk);
+        if (ret) {
+                dev_err(&pdev->dev, "Unable to enable clock.\n");
+                return ret;
+        }
+        id->clk_rate_change_nb.notifier_call = cdns_i2c_clk_notifier_cb;
+        if (clk_notifier_register(id->clk, &id->clk_rate_change_nb))
+                dev_warn(&pdev->dev, "Unable to register clock notifier.\n");
+        id->input_clk = clk_get_rate(id->clk);
+
+        ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
+                        &id->i2c_clk);
+        if (ret || (id->i2c_clk > CDNS_I2C_SPEED_MAX))
+                id->i2c_clk = CDNS_I2C_SPEED_DEFAULT;
+
+        cdns_i2c_writereg(CDNS_I2C_CR_ACK_EN | CDNS_I2C_CR_NEA | CDNS_I2C_CR_MS,
+                          CDNS_I2C_CR_OFFSET);
+
+        ret = cdns_i2c_setclk(id->input_clk, id);
+        if (ret) {
+                dev_err(&pdev->dev, "invalid SCL clock: %u Hz\n", id->i2c_clk);
+                ret = -EINVAL;
+                goto err_clk_dis;
+        }
+
+        ret = devm_request_irq(&pdev->dev, id->irq, cdns_i2c_isr, 0,
+                                 DRIVER_NAME, id);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot get irq %d\n", id->irq);
+                goto err_clk_dis;
+        }
+
+        ret = i2c_add_adapter(&id->adap);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "reg adap failed: %d\n", ret);
+                goto err_clk_dis;
+        }
+
+        dev_info(&pdev->dev, "%u kHz mmio %08lx irq %d\n",
+                 id->i2c_clk / 1000, (unsigned long)r_mem->start, id->irq);
+
+        return 0;
+
+err_clk_dis:
+        clk_disable_unprepare(id->clk);
+        return ret;
+}
+
+/**
+ * cdns_i2c_remove - Unregister the device after releasing the resources
+ * @pdev:       Handle to the platform device structure
+ *
+ * This function frees all the resources allocated to the device.
+ *
+ * Return: 0 always
+ */
+static int cdns_i2c_remove(struct platform_device *pdev)
+{
+        struct cdns_i2c *id = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&id->adap);
+        clk_notifier_unregister(id->clk, &id->clk_rate_change_nb);
+        clk_disable_unprepare(id->clk);
+
+        return 0;
+}
+
+static const struct of_device_id cdns_i2c_of_match[] = {
+        { .compatible = "cdns,i2c-r1p10", },
+        { /* end of table */ }
+};
+MODULE_DEVICE_TABLE(of, cdns_i2c_of_match);
+
+static struct platform_driver cdns_i2c_drv = {
+        .driver = {
+                .name  = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = cdns_i2c_of_match,
+                .pm = &cdns_i2c_dev_pm_ops,
+        },
+        .probe  = cdns_i2c_probe,
+        .remove = cdns_i2c_remove,
+};
+
+module_platform_driver(cdns_i2c_drv);
+
+MODULE_AUTHOR("Xilinx Inc.");
+MODULE_DESCRIPTION("Cadence I2C bus driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index af0b5830303d..389bc68c55ad 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -712,7 +712,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
         adap = &dev->adapter;
         i2c_set_adapdata(adap, dev);
         adap->owner = THIS_MODULE;
-        adap->class = I2C_CLASS_HWMON;
+        adap->class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         strlcpy(adap->name, "DaVinci I2C adapter", sizeof(adap->name));
         adap->algo = &i2c_davinci_algo;
         adap->dev.parent = &pdev->dev;
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 14c4b30d4ccc..22e92c3d3d07 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -218,7 +218,7 @@ i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset)
                  *
                  * If your hardware is free from tHD;STA issue, try this one.
                  */
-                return (ic_clk * tSYMBOL + 5000) / 10000 - 8 + offset;
+                return (ic_clk * tSYMBOL + 500000) / 1000000 - 8 + offset;
         else
                 /*
                  * Conditional expression:
@@ -234,7 +234,8 @@ i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset)
                  * The reason why we need to take into account "tf" here,
                  * is the same as described in i2c_dw_scl_lcnt().
                  */
-                return (ic_clk * (tSYMBOL + tf) + 5000) / 10000 - 3 + offset;
+                return (ic_clk * (tSYMBOL + tf) + 500000) / 1000000
+                        - 3 + offset;
 }
 
 static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
@@ -250,7 +251,7 @@ static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
          * account the fall time of SCL signal (tf).  Default tf value
          * should be 0.3 us, for safety.
          */
-        return ((ic_clk * (tLOW + tf) + 5000) / 10000) - 1 + offset;
+        return ((ic_clk * (tLOW + tf) + 500000) / 1000000) - 1 + offset;
 }
 
 static void __i2c_dw_enable(struct dw_i2c_dev *dev, bool enable)
@@ -287,6 +288,7 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
         u32 input_clock_khz;
         u32 hcnt, lcnt;
         u32 reg;
+        u32 sda_falling_time, scl_falling_time;
 
         input_clock_khz = dev->get_clk_rate_khz(dev);
 
@@ -308,15 +310,18 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
 
         /* set standard and fast speed deviders for high/low periods */
 
+        sda_falling_time = dev->sda_falling_time ?: 300; /* ns */
+        scl_falling_time = dev->scl_falling_time ?: 300; /* ns */
+
         /* Standard-mode */
         hcnt = i2c_dw_scl_hcnt(input_clock_khz,
-                                40,     /* tHD;STA = tHIGH = 4.0 us */
-                                3,      /* tf = 0.3 us */
+                                4000,   /* tHD;STA = tHIGH = 4.0 us */
+                                sda_falling_time,
                                 0,      /* 0: DW default, 1: Ideal */
                                 0);     /* No offset */
         lcnt = i2c_dw_scl_lcnt(input_clock_khz,
-                                47,     /* tLOW = 4.7 us */
-                                3,      /* tf = 0.3 us */
+                                4700,   /* tLOW = 4.7 us */
+                                scl_falling_time,
                                 0);     /* No offset */
 
         /* Allow platforms to specify the ideal HCNT and LCNT values */
@@ -330,13 +335,13 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
 
         /* Fast-mode */
         hcnt = i2c_dw_scl_hcnt(input_clock_khz,
-                                6,      /* tHD;STA = tHIGH = 0.6 us */
-                                3,      /* tf = 0.3 us */
+                                600,    /* tHD;STA = tHIGH = 0.6 us */
+                                sda_falling_time,
                                 0,      /* 0: DW default, 1: Ideal */
                                 0);     /* No offset */
         lcnt = i2c_dw_scl_lcnt(input_clock_khz,
-                                13,     /* tLOW = 1.3 us */
-                                3,      /* tf = 0.3 us */
+                                1300,   /* tLOW = 1.3 us */
+                                scl_falling_time,
                                 0);     /* No offset */
 
         if (dev->fs_hcnt && dev->fs_lcnt) {
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index e8a756537ed0..d66b6cbc9edc 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -99,6 +99,8 @@ struct dw_i2c_dev {
         unsigned int            rx_fifo_depth;
         int                     rx_outstanding;
         u32                     sda_hold_time;
+        u32                     sda_falling_time;
+        u32                     scl_falling_time;
         u16                     ss_hcnt;
         u16                     ss_lcnt;
         u16                     fs_hcnt;
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index f6ed06c966ee..85056c22d21e 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -54,6 +54,16 @@ enum dw_pci_ctl_id_t {
         medfield_3,
         medfield_4,
         medfield_5,
+
+        baytrail,
+};
+
+struct dw_scl_sda_cfg {
+        u32 ss_hcnt;
+        u32 fs_hcnt;
+        u32 ss_lcnt;
+        u32 fs_lcnt;
+        u32 sda_hold;
 };
 
 struct dw_pci_controller {
@@ -62,12 +72,29 @@ struct dw_pci_controller {
         u32 tx_fifo_depth;
         u32 rx_fifo_depth;
         u32 clk_khz;
+        u32 functionality;
+        struct dw_scl_sda_cfg *scl_sda_cfg;
 };
 
 #define INTEL_MID_STD_CFG  (DW_IC_CON_MASTER |                  \
                                 DW_IC_CON_SLAVE_DISABLE |       \
                                 DW_IC_CON_RESTART_EN)
 
+#define DW_DEFAULT_FUNCTIONALITY (I2C_FUNC_I2C |                        \
+                                        I2C_FUNC_SMBUS_BYTE |           \
+                                        I2C_FUNC_SMBUS_BYTE_DATA |      \
+                                        I2C_FUNC_SMBUS_WORD_DATA |      \
+                                        I2C_FUNC_SMBUS_I2C_BLOCK)
+
+/* BayTrail HCNT/LCNT/SDA hold time */
+static struct dw_scl_sda_cfg byt_config = {
+        .ss_hcnt = 0x200,
+        .fs_hcnt = 0x55,
+        .ss_lcnt = 0x200,
+        .fs_lcnt = 0x99,
+        .sda_hold = 0x6,
+};
+
 static struct  dw_pci_controller  dw_pci_controllers[] = {
         [moorestown_0] = {
                 .bus_num     = 0,
@@ -132,75 +159,40 @@ static struct  dw_pci_controller  dw_pci_controllers[] = {
                 .rx_fifo_depth = 32,
                 .clk_khz      = 25000,
         },
+        [baytrail] = {
+                .bus_num = -1,
+                .bus_cfg = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
+                .tx_fifo_depth = 32,
+                .rx_fifo_depth = 32,
+                .clk_khz = 100000,
+                .functionality = I2C_FUNC_10BIT_ADDR,
+                .scl_sda_cfg = &byt_config,
+        },
 };
 static struct i2c_algorithm i2c_dw_algo = {
         .master_xfer    = i2c_dw_xfer,
         .functionality  = i2c_dw_func,
 };
 
+#ifdef CONFIG_PM
 static int i2c_dw_pci_suspend(struct device *dev)
 {
         struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
-        struct dw_i2c_dev *i2c = pci_get_drvdata(pdev);
-        int err;
-
-
-        i2c_dw_disable(i2c);
-
-        err = pci_save_state(pdev);
-        if (err) {
-                dev_err(&pdev->dev, "pci_save_state failed\n");
-                return err;
-        }
-
-        err = pci_set_power_state(pdev, PCI_D3hot);
-        if (err) {
-                dev_err(&pdev->dev, "pci_set_power_state failed\n");
-                return err;
-        }
 
+        i2c_dw_disable(pci_get_drvdata(pdev));
         return 0;
 }
 
 static int i2c_dw_pci_resume(struct device *dev)
 {
         struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
-        struct dw_i2c_dev *i2c = pci_get_drvdata(pdev);
-        int err;
-        u32 enabled;
-
-        enabled = i2c_dw_is_enabled(i2c);
-        if (enabled)
-                return 0;
-
-        err = pci_set_power_state(pdev, PCI_D0);
-        if (err) {
-                dev_err(&pdev->dev, "pci_set_power_state() failed\n");
-                return err;
-        }
-
-        pci_restore_state(pdev);
-
-        i2c_dw_init(i2c);
-        return 0;
-}
 
-static int i2c_dw_pci_runtime_idle(struct device *dev)
-{
-        int err = pm_schedule_suspend(dev, 500);
-        dev_dbg(dev, "runtime_idle called\n");
-
-        if (err != 0)
-                return 0;
-        return -EBUSY;
+        return i2c_dw_init(pci_get_drvdata(pdev));
 }
+#endif
 
-static const struct dev_pm_ops i2c_dw_pm_ops = {
-        .resume         = i2c_dw_pci_resume,
-        .suspend        = i2c_dw_pci_suspend,
-        SET_RUNTIME_PM_OPS(i2c_dw_pci_suspend, i2c_dw_pci_resume,
-                           i2c_dw_pci_runtime_idle)
-};
+static UNIVERSAL_DEV_PM_OPS(i2c_dw_pm_ops, i2c_dw_pci_suspend,
+                            i2c_dw_pci_resume, NULL);
 
 static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
 {
@@ -214,6 +206,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
         struct i2c_adapter *adap;
         int r;
         struct  dw_pci_controller *controller;
+        struct dw_scl_sda_cfg *cfg;
 
         if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) {
                 dev_err(&pdev->dev, "%s: invalid driver data %ld\n", __func__,
@@ -247,13 +240,18 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
         dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
         dev->base = pcim_iomap_table(pdev)[0];
         dev->dev = &pdev->dev;
-        dev->functionality =
-                I2C_FUNC_I2C |
-                I2C_FUNC_SMBUS_BYTE |
-                I2C_FUNC_SMBUS_BYTE_DATA |
-                I2C_FUNC_SMBUS_WORD_DATA |
-                I2C_FUNC_SMBUS_I2C_BLOCK;
+        dev->functionality = controller->functionality |
+                                DW_DEFAULT_FUNCTIONALITY;
+
         dev->master_cfg =  controller->bus_cfg;
+        if (controller->scl_sda_cfg) {
+                cfg = controller->scl_sda_cfg;
+                dev->ss_hcnt = cfg->ss_hcnt;
+                dev->fs_hcnt = cfg->fs_hcnt;
+                dev->ss_lcnt = cfg->ss_lcnt;
+                dev->fs_lcnt = cfg->fs_lcnt;
+                dev->sda_hold_time = cfg->sda_hold;
+        }
 
         pci_set_drvdata(pdev, dev);
 
@@ -270,8 +268,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
         adap->algo = &i2c_dw_algo;
         adap->dev.parent = &pdev->dev;
         adap->nr = controller->bus_num;
-        snprintf(adap->name, sizeof(adap->name), "i2c-designware-pci-%d",
-                adap->nr);
+
+        snprintf(adap->name, sizeof(adap->name), "i2c-designware-pci");
 
         r = devm_request_irq(&pdev->dev, pdev->irq, i2c_dw_isr, IRQF_SHARED,
                         adap->name, dev);
@@ -290,6 +288,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
 
         pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
         pm_runtime_use_autosuspend(&pdev->dev);
+        pm_runtime_put_autosuspend(&pdev->dev);
         pm_runtime_allow(&pdev->dev);
 
         return 0;
@@ -309,7 +308,7 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)
 /* work with hotplug and coldplug */
 MODULE_ALIAS("i2c_designware-pci");
 
-static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = {
+static const struct pci_device_id i2_designware_pci_ids[] = {
         /* Moorestown */
         { PCI_VDEVICE(INTEL, 0x0802), moorestown_0 },
         { PCI_VDEVICE(INTEL, 0x0803), moorestown_1 },
@@ -321,6 +320,14 @@ static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = {
         { PCI_VDEVICE(INTEL, 0x082C), medfield_0 },
         { PCI_VDEVICE(INTEL, 0x082D), medfield_1 },
         { PCI_VDEVICE(INTEL, 0x082E), medfield_2 },
+        /* Baytrail */
+        { PCI_VDEVICE(INTEL, 0x0F41), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F42), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F43), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F44), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F45), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F46), baytrail },
+        { PCI_VDEVICE(INTEL, 0x0F47), baytrail },
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index d0bdac0498ce..9c7802614342 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -159,6 +159,13 @@ static int dw_i2c_probe(struct platform_device *pdev)
                                         "i2c-sda-hold-time-ns", &ht);
                 dev->sda_hold_time = div_u64((u64)ic_clk * ht + 500000,
                                              1000000);
+
+                of_property_read_u32(pdev->dev.of_node,
+                                     "i2c-sda-falling-time-ns",
+                                     &dev->sda_falling_time);
+                of_property_read_u32(pdev->dev.of_node,
+                                     "i2c-scl-falling-time-ns",
+                                     &dev->scl_falling_time);
         }
 
         dev->functionality =
@@ -195,7 +202,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
         adap = &dev->adapter;
         i2c_set_adapdata(adap, dev);
         adap->owner = THIS_MODULE;
-        adap->class = I2C_CLASS_HWMON;
+        adap->class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         strlcpy(adap->name, "Synopsys DesignWare I2C adapter",
                         sizeof(adap->name));
         adap->algo = &i2c_dw_algo;
diff --git a/drivers/i2c/busses/i2c-efm32.c b/drivers/i2c/busses/i2c-efm32.c
new file mode 100644
index 000000000000..777ed409a24a
--- /dev/null
+++ b/drivers/i2c/busses/i2c-efm32.c
@@ -0,0 +1,481 @@
+/*
+ * Copyright (C) 2014 Uwe Kleine-Koenig for Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+
+#define DRIVER_NAME "efm32-i2c"
+
+#define MASK_VAL(mask, val)             ((val << __ffs(mask)) & mask)
+
+#define REG_CTRL                0x00
+#define REG_CTRL_EN                     0x00001
+#define REG_CTRL_SLAVE                  0x00002
+#define REG_CTRL_AUTOACK                0x00004
+#define REG_CTRL_AUTOSE                 0x00008
+#define REG_CTRL_AUTOSN                 0x00010
+#define REG_CTRL_ARBDIS                 0x00020
+#define REG_CTRL_GCAMEN                 0x00040
+#define REG_CTRL_CLHR__MASK             0x00300
+#define REG_CTRL_BITO__MASK             0x03000
+#define REG_CTRL_BITO_OFF               0x00000
+#define REG_CTRL_BITO_40PCC             0x01000
+#define REG_CTRL_BITO_80PCC             0x02000
+#define REG_CTRL_BITO_160PCC            0x03000
+#define REG_CTRL_GIBITO                 0x08000
+#define REG_CTRL_CLTO__MASK             0x70000
+#define REG_CTRL_CLTO_OFF               0x00000
+
+#define REG_CMD                 0x04
+#define REG_CMD_START                   0x00001
+#define REG_CMD_STOP                    0x00002
+#define REG_CMD_ACK                     0x00004
+#define REG_CMD_NACK                    0x00008
+#define REG_CMD_CONT                    0x00010
+#define REG_CMD_ABORT                   0x00020
+#define REG_CMD_CLEARTX                 0x00040
+#define REG_CMD_CLEARPC                 0x00080
+
+#define REG_STATE               0x08
+#define REG_STATE_BUSY                  0x00001
+#define REG_STATE_MASTER                0x00002
+#define REG_STATE_TRANSMITTER           0x00004
+#define REG_STATE_NACKED                0x00008
+#define REG_STATE_BUSHOLD               0x00010
+#define REG_STATE_STATE__MASK           0x000e0
+#define REG_STATE_STATE_IDLE            0x00000
+#define REG_STATE_STATE_WAIT            0x00020
+#define REG_STATE_STATE_START           0x00040
+#define REG_STATE_STATE_ADDR            0x00060
+#define REG_STATE_STATE_ADDRACK         0x00080
+#define REG_STATE_STATE_DATA            0x000a0
+#define REG_STATE_STATE_DATAACK         0x000c0
+
+#define REG_STATUS              0x0c
+#define REG_STATUS_PSTART               0x00001
+#define REG_STATUS_PSTOP                0x00002
+#define REG_STATUS_PACK                 0x00004
+#define REG_STATUS_PNACK                0x00008
+#define REG_STATUS_PCONT                0x00010
+#define REG_STATUS_PABORT               0x00020
+#define REG_STATUS_TXC                  0x00040
+#define REG_STATUS_TXBL                 0x00080
+#define REG_STATUS_RXDATAV              0x00100
+
+#define REG_CLKDIV              0x10
+#define REG_CLKDIV_DIV__MASK            0x001ff
+#define REG_CLKDIV_DIV(div)             MASK_VAL(REG_CLKDIV_DIV__MASK, (div))
+
+#define REG_SADDR               0x14
+#define REG_SADDRMASK           0x18
+#define REG_RXDATA              0x1c
+#define REG_RXDATAP             0x20
+#define REG_TXDATA              0x24
+#define REG_IF                  0x28
+#define REG_IF_START                    0x00001
+#define REG_IF_RSTART                   0x00002
+#define REG_IF_ADDR                     0x00004
+#define REG_IF_TXC                      0x00008
+#define REG_IF_TXBL                     0x00010
+#define REG_IF_RXDATAV                  0x00020
+#define REG_IF_ACK                      0x00040
+#define REG_IF_NACK                     0x00080
+#define REG_IF_MSTOP                    0x00100
+#define REG_IF_ARBLOST                  0x00200
+#define REG_IF_BUSERR                   0x00400
+#define REG_IF_BUSHOLD                  0x00800
+#define REG_IF_TXOF                     0x01000
+#define REG_IF_RXUF                     0x02000
+#define REG_IF_BITO                     0x04000
+#define REG_IF_CLTO                     0x08000
+#define REG_IF_SSTOP                    0x10000
+
+#define REG_IFS                 0x2c
+#define REG_IFC                 0x30
+#define REG_IFC__MASK                   0x1ffcf
+
+#define REG_IEN                 0x34
+
+#define REG_ROUTE               0x38
+#define REG_ROUTE_SDAPEN                0x00001
+#define REG_ROUTE_SCLPEN                0x00002
+#define REG_ROUTE_LOCATION__MASK        0x00700
+#define REG_ROUTE_LOCATION(n)           MASK_VAL(REG_ROUTE_LOCATION__MASK, (n))
+
+struct efm32_i2c_ddata {
+        struct i2c_adapter adapter;
+
+        struct clk *clk;
+        void __iomem *base;
+        unsigned int irq;
+        u8 location;
+        unsigned long frequency;
+
+        /* transfer data */
+        struct completion done;
+        struct i2c_msg *msgs;
+        size_t num_msgs;
+        size_t current_word, current_msg;
+        int retval;
+};
+
+static u32 efm32_i2c_read32(struct efm32_i2c_ddata *ddata, unsigned offset)
+{
+        return readl(ddata->base + offset);
+}
+
+static void efm32_i2c_write32(struct efm32_i2c_ddata *ddata,
+                unsigned offset, u32 value)
+{
+        writel(value, ddata->base + offset);
+}
+
+static void efm32_i2c_send_next_msg(struct efm32_i2c_ddata *ddata)
+{
+        struct i2c_msg *cur_msg = &ddata->msgs[ddata->current_msg];
+
+        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_START);
+        efm32_i2c_write32(ddata, REG_TXDATA, cur_msg->addr << 1 |
+                        (cur_msg->flags & I2C_M_RD ? 1 : 0));
+}
+
+static void efm32_i2c_send_next_byte(struct efm32_i2c_ddata *ddata)
+{
+        struct i2c_msg *cur_msg = &ddata->msgs[ddata->current_msg];
+
+        if (ddata->current_word >= cur_msg->len) {
+                /* cur_msg completely transferred */
+                ddata->current_word = 0;
+                ddata->current_msg += 1;
+
+                if (ddata->current_msg >= ddata->num_msgs) {
+                        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_STOP);
+                        complete(&ddata->done);
+                } else {
+                        efm32_i2c_send_next_msg(ddata);
+                }
+        } else {
+                efm32_i2c_write32(ddata, REG_TXDATA,
+                                cur_msg->buf[ddata->current_word++]);
+        }
+}
+
+static void efm32_i2c_recv_next_byte(struct efm32_i2c_ddata *ddata)
+{
+        struct i2c_msg *cur_msg = &ddata->msgs[ddata->current_msg];
+
+        cur_msg->buf[ddata->current_word] = efm32_i2c_read32(ddata, REG_RXDATA);
+        ddata->current_word += 1;
+        if (ddata->current_word >= cur_msg->len) {
+                /* cur_msg completely transferred */
+                ddata->current_word = 0;
+                ddata->current_msg += 1;
+
+                efm32_i2c_write32(ddata, REG_CMD, REG_CMD_NACK);
+
+                if (ddata->current_msg >= ddata->num_msgs) {
+                        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_STOP);
+                        complete(&ddata->done);
+                } else {
+                        efm32_i2c_send_next_msg(ddata);
+                }
+        } else {
+                efm32_i2c_write32(ddata, REG_CMD, REG_CMD_ACK);
+        }
+}
+
+static irqreturn_t efm32_i2c_irq(int irq, void *dev_id)
+{
+        struct efm32_i2c_ddata *ddata = dev_id;
+        struct i2c_msg *cur_msg = &ddata->msgs[ddata->current_msg];
+        u32 irqflag = efm32_i2c_read32(ddata, REG_IF);
+        u32 state = efm32_i2c_read32(ddata, REG_STATE);
+
+        efm32_i2c_write32(ddata, REG_IFC, irqflag & REG_IFC__MASK);
+
+        switch (state & REG_STATE_STATE__MASK) {
+        case REG_STATE_STATE_IDLE:
+                /* arbitration lost? */
+                ddata->retval = -EAGAIN;
+                complete(&ddata->done);
+                break;
+        case REG_STATE_STATE_WAIT:
+                /*
+                 * huh, this shouldn't happen.
+                 * Reset hardware state and get out
+                 */
+                ddata->retval = -EIO;
+                efm32_i2c_write32(ddata, REG_CMD,
+                                REG_CMD_STOP | REG_CMD_ABORT |
+                                REG_CMD_CLEARTX | REG_CMD_CLEARPC);
+                complete(&ddata->done);
+                break;
+        case REG_STATE_STATE_START:
+                /* "caller" is expected to send an address */
+                break;
+        case REG_STATE_STATE_ADDR:
+                /* wait for Ack or NAck of slave */
+                break;
+        case REG_STATE_STATE_ADDRACK:
+                if (state & REG_STATE_NACKED) {
+                        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_STOP);
+                        ddata->retval = -ENXIO;
+                        complete(&ddata->done);
+                } else if (cur_msg->flags & I2C_M_RD) {
+                        /* wait for slave to send first data byte */
+                } else {
+                        efm32_i2c_send_next_byte(ddata);
+                }
+                break;
+        case REG_STATE_STATE_DATA:
+                if (cur_msg->flags & I2C_M_RD) {
+                        efm32_i2c_recv_next_byte(ddata);
+                } else {
+                        /* wait for Ack or Nack of slave */
+                }
+                break;
+        case REG_STATE_STATE_DATAACK:
+                if (state & REG_STATE_NACKED) {
+                        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_STOP);
+                        complete(&ddata->done);
+                } else {
+                        efm32_i2c_send_next_byte(ddata);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int efm32_i2c_master_xfer(struct i2c_adapter *adap,
+                struct i2c_msg *msgs, int num)
+{
+        struct efm32_i2c_ddata *ddata = i2c_get_adapdata(adap);
+        int ret;
+
+        if (ddata->msgs)
+                return -EBUSY;
+
+        ddata->msgs = msgs;
+        ddata->num_msgs = num;
+        ddata->current_word = 0;
+        ddata->current_msg = 0;
+        ddata->retval = -EIO;
+
+        reinit_completion(&ddata->done);
+
+        dev_dbg(&ddata->adapter.dev, "state: %08x, status: %08x\n",
+                        efm32_i2c_read32(ddata, REG_STATE),
+                        efm32_i2c_read32(ddata, REG_STATUS));
+
+        efm32_i2c_send_next_msg(ddata);
+
+        wait_for_completion(&ddata->done);
+
+        if (ddata->current_msg >= ddata->num_msgs)
+                ret = ddata->num_msgs;
+        else
+                ret = ddata->retval;
+
+        return ret;
+}
+
+static u32 efm32_i2c_functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+}
+
+static const struct i2c_algorithm efm32_i2c_algo = {
+        .master_xfer = efm32_i2c_master_xfer,
+        .functionality = efm32_i2c_functionality,
+};
+
+static u32 efm32_i2c_get_configured_location(struct efm32_i2c_ddata *ddata)
+{
+        u32 reg = efm32_i2c_read32(ddata, REG_ROUTE);
+
+        return (reg & REG_ROUTE_LOCATION__MASK) >>
+                __ffs(REG_ROUTE_LOCATION__MASK);
+}
+
+static int efm32_i2c_probe(struct platform_device *pdev)
+{
+        struct efm32_i2c_ddata *ddata;
+        struct resource *res;
+        unsigned long rate;
+        struct device_node *np = pdev->dev.of_node;
+        u32 location, frequency;
+        int ret;
+        u32 clkdiv;
+
+        if (!np)
+                return -EINVAL;
+
+        ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
+        if (!ddata) {
+                dev_dbg(&pdev->dev, "failed to allocate private data\n");
+                return -ENOMEM;
+        }
+        platform_set_drvdata(pdev, ddata);
+
+        init_completion(&ddata->done);
+        strlcpy(ddata->adapter.name, pdev->name, sizeof(ddata->adapter.name));
+        ddata->adapter.owner = THIS_MODULE;
+        ddata->adapter.algo = &efm32_i2c_algo;
+        ddata->adapter.dev.parent = &pdev->dev;
+        ddata->adapter.dev.of_node = pdev->dev.of_node;
+        i2c_set_adapdata(&ddata->adapter, ddata);
+
+        ddata->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(ddata->clk)) {
+                ret = PTR_ERR(ddata->clk);
+                dev_err(&pdev->dev, "failed to get clock: %d\n", ret);
+                return ret;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to determine base address\n");
+                return -ENODEV;
+        }
+
+        if (resource_size(res) < 0x42) {
+                dev_err(&pdev->dev, "memory resource too small\n");
+                return -EINVAL;
+        }
+
+        ddata->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ddata->base))
+                return PTR_ERR(ddata->base);
+
+        ret = platform_get_irq(pdev, 0);
+        if (ret <= 0) {
+                dev_err(&pdev->dev, "failed to get irq (%d)\n", ret);
+                if (!ret)
+                        ret = -EINVAL;
+                return ret;
+        }
+
+        ddata->irq = ret;
+
+        ret = clk_prepare_enable(ddata->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to enable clock (%d)\n", ret);
+                return ret;
+        }
+
+        ret = of_property_read_u32(np, "efm32,location", &location);
+        if (!ret) {
+                dev_dbg(&pdev->dev, "using location %u\n", location);
+        } else {
+                /* default to location configured in hardware */
+                location = efm32_i2c_get_configured_location(ddata);
+
+                dev_info(&pdev->dev, "fall back to location %u\n", location);
+        }
+
+        ddata->location = location;
+
+        ret = of_property_read_u32(np, "clock-frequency", &frequency);
+        if (!ret) {
+                dev_dbg(&pdev->dev, "using frequency %u\n", frequency);
+        } else {
+                frequency = 100000;
+                dev_info(&pdev->dev, "defaulting to 100 kHz\n");
+        }
+        ddata->frequency = frequency;
+
+        rate = clk_get_rate(ddata->clk);
+        if (!rate) {
+                dev_err(&pdev->dev, "there is no input clock available\n");
+                ret = -EINVAL;
+                goto err_disable_clk;
+        }
+        clkdiv = DIV_ROUND_UP(rate, 8 * ddata->frequency) - 1;
+        if (clkdiv >= 0x200) {
+                dev_err(&pdev->dev,
+                                "input clock too fast (%lu) to divide down to bus freq (%lu)",
+                                rate, ddata->frequency);
+                ret = -EINVAL;
+                goto err_disable_clk;
+        }
+
+        dev_dbg(&pdev->dev, "input clock = %lu, bus freq = %lu, clkdiv = %lu\n",
+                        rate, ddata->frequency, (unsigned long)clkdiv);
+        efm32_i2c_write32(ddata, REG_CLKDIV, REG_CLKDIV_DIV(clkdiv));
+
+        efm32_i2c_write32(ddata, REG_ROUTE, REG_ROUTE_SDAPEN |
+                        REG_ROUTE_SCLPEN |
+                        REG_ROUTE_LOCATION(ddata->location));
+
+        efm32_i2c_write32(ddata, REG_CTRL, REG_CTRL_EN |
+                        REG_CTRL_BITO_160PCC | 0 * REG_CTRL_GIBITO);
+
+        efm32_i2c_write32(ddata, REG_IFC, REG_IFC__MASK);
+        efm32_i2c_write32(ddata, REG_IEN, REG_IF_TXC | REG_IF_ACK | REG_IF_NACK
+                        | REG_IF_ARBLOST | REG_IF_BUSERR | REG_IF_RXDATAV);
+
+        /* to make bus idle */
+        efm32_i2c_write32(ddata, REG_CMD, REG_CMD_ABORT);
+
+        ret = request_irq(ddata->irq, efm32_i2c_irq, 0, DRIVER_NAME, ddata);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to request irq (%d)\n", ret);
+                return ret;
+        }
+
+        ret = i2c_add_adapter(&ddata->adapter);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to add i2c adapter (%d)\n", ret);
+                free_irq(ddata->irq, ddata);
+
+err_disable_clk:
+                clk_disable_unprepare(ddata->clk);
+        }
+        return ret;
+}
+
+static int efm32_i2c_remove(struct platform_device *pdev)
+{
+        struct efm32_i2c_ddata *ddata = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&ddata->adapter);
+        free_irq(ddata->irq, ddata);
+        clk_disable_unprepare(ddata->clk);
+
+        return 0;
+}
+
+static const struct of_device_id efm32_i2c_dt_ids[] = {
+        {
+                .compatible = "energymicro,efm32-i2c",
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, efm32_i2c_dt_ids);
+
+static struct platform_driver efm32_i2c_driver = {
+        .probe = efm32_i2c_probe,
+        .remove = efm32_i2c_remove,
+
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = efm32_i2c_dt_ids,
+        },
+};
+module_platform_driver(efm32_i2c_driver);
+
+MODULE_AUTHOR("Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>");
+MODULE_DESCRIPTION("EFM32 i2c driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index e08e458bab02..ff775ac29e49 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -186,7 +186,7 @@ static DEFINE_MUTEX(pch_mutex);
 #define PCI_DEVICE_ID_ML7223_I2C        0x8010
 #define PCI_DEVICE_ID_ML7831_I2C        0x8817
 
-static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = {
+static const struct pci_device_id pch_pcidev_id[] = {
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C),   1, },
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, },
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 9fd711c03dd2..00af0a0a3361 100644
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -566,7 +566,7 @@ static int exynos5_i2c_xfer_msg(struct exynos5_i2c *i2c,
 static int exynos5_i2c_xfer(struct i2c_adapter *adap,
                         struct i2c_msg *msgs, int num)
 {
-        struct exynos5_i2c *i2c = (struct exynos5_i2c *)adap->algo_data;
+        struct exynos5_i2c *i2c = adap->algo_data;
         int i = 0, ret = 0, stop = 0;
 
         if (i2c->suspended) {
@@ -715,6 +715,7 @@ static int exynos5_i2c_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int exynos5_i2c_suspend_noirq(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -745,6 +746,7 @@ static int exynos5_i2c_resume_noirq(struct device *dev)
 
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_suspend_noirq,
                          exynos5_i2c_resume_noirq);
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index d9f7e186a4c7..02d2d4abb9dd 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -94,6 +94,9 @@ static int of_i2c_gpio_get_pins(struct device_node *np,
         *sda_pin = of_get_gpio(np, 0);
         *scl_pin = of_get_gpio(np, 1);
 
+        if (*sda_pin == -EPROBE_DEFER || *scl_pin == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+
         if (!gpio_is_valid(*sda_pin) || !gpio_is_valid(*scl_pin)) {
                 pr_err("%s: invalid GPIO pins, sda=%d/scl=%d\n",
                        np->full_name, *sda_pin, *scl_pin);
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index e248257fe517..14d2b76de25f 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -104,7 +104,7 @@ static struct i2c_adapter hydra_adap = {
         .algo_data      = &hydra_bit_data,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = {
+static const struct pci_device_id hydra_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 349c2d35e792..6777cd6f8776 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -60,6 +60,7 @@
   Wellsburg (PCH) MS    0x8d7f     32     hard     yes     yes     yes
   Coleto Creek (PCH)    0x23b0     32     hard     yes     yes     yes
   Wildcat Point-LP (PCH)   0x9ca2     32     hard     yes     yes     yes
+  BayTrail (SOC)        0x0f12     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no
@@ -161,6 +162,7 @@
                                  STATUS_ERROR_FLAGS)
 
 /* Older devices have their ID defined in <linux/pci_ids.h> */
+#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS      0x0f12
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS   0x1c22
 #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS      0x1d22
 /* Patsburg also has three 'Integrated Device Function' SMBus controllers */
@@ -789,7 +791,7 @@ static const struct i2c_algorithm smbus_algorithm = {
         .functionality  = i801_func,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
+static const struct pci_device_id i801_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },
@@ -822,6 +824,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS) },
         { 0, }
 };
 
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index 8ce4f517fc56..984492553e95 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -182,7 +182,7 @@ struct ismt_priv {
 /**
  * ismt_ids - PCI device IDs supported by this driver
  */
-static DEFINE_PCI_DEVICE_TABLE(ismt_ids) = {
+static const struct pci_device_id ismt_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index d52d84937ad3..540ea692bf79 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/mv643xx_i2c.h>
 #include <linux/platform_device.h>
+#include <linux/reset.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -97,7 +98,6 @@ enum {
 enum {
         MV64XXX_I2C_ACTION_INVALID,
         MV64XXX_I2C_ACTION_CONTINUE,
-        MV64XXX_I2C_ACTION_SEND_START,
         MV64XXX_I2C_ACTION_SEND_RESTART,
         MV64XXX_I2C_ACTION_OFFLOAD_RESTART,
         MV64XXX_I2C_ACTION_SEND_ADDR_1,
@@ -148,6 +148,8 @@ struct mv64xxx_i2c_data {
         bool                    offload_enabled;
 /* 5us delay in order to avoid repeated start timing violation */
         bool                    errata_delay;
+        struct reset_control    *rstc;
+        bool                    irq_clear_inverted;
 };
 
 static struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
@@ -176,11 +178,6 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
 {
         u32     dir = 0;
 
-        drv_data->msg = msg;
-        drv_data->byte_posn = 0;
-        drv_data->bytes_left = msg->len;
-        drv_data->aborting = 0;
-        drv_data->rc = 0;
         drv_data->cntl_bits = MV64XXX_I2C_REG_CONTROL_ACK |
                 MV64XXX_I2C_REG_CONTROL_INTEN | MV64XXX_I2C_REG_CONTROL_TWSIEN;
 
@@ -206,11 +203,6 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data)
         if (!drv_data->offload_enabled)
                 return -EOPNOTSUPP;
 
-        drv_data->msg = msg;
-        drv_data->byte_posn = 0;
-        drv_data->bytes_left = msg->len;
-        drv_data->aborting = 0;
-        drv_data->rc = 0;
         /* Only regular transactions can be offloaded */
         if ((msg->flags & ~(I2C_M_TEN | I2C_M_RD)) != 0)
                 return -EINVAL;
@@ -419,6 +411,23 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
         }
 }
 
+static void mv64xxx_i2c_send_start(struct mv64xxx_i2c_data *drv_data)
+{
+        drv_data->msg = drv_data->msgs;
+        drv_data->byte_posn = 0;
+        drv_data->bytes_left = drv_data->msg->len;
+        drv_data->aborting = 0;
+        drv_data->rc = 0;
+
+        /* Can we offload this msg ? */
+        if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
+                /* No, switch to standard path */
+                mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
+                writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
+                        drv_data->reg_base + drv_data->reg_offsets.control);
+        }
+}
+
 static void
 mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
 {
@@ -435,14 +444,8 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
 
                 drv_data->msgs++;
                 drv_data->num_msgs--;
-                if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
-                        drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_START;
-                        writel(drv_data->cntl_bits,
-                        drv_data->reg_base + drv_data->reg_offsets.control);
+                mv64xxx_i2c_send_start(drv_data);
 
-                        /* Setup for the next message */
-                        mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
-                }
                 if (drv_data->errata_delay)
                         udelay(5);
 
@@ -459,16 +462,6 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
                         drv_data->reg_base + drv_data->reg_offsets.control);
                 break;
 
-        case MV64XXX_I2C_ACTION_SEND_START:
-                /* Can we offload this msg ? */
-                if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
-                        /* No, switch to standard path */
-                        mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
-                        writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
-                                drv_data->reg_base + drv_data->reg_offsets.control);
-                }
-                break;
-
         case MV64XXX_I2C_ACTION_SEND_ADDR_1:
                 writel(drv_data->addr1,
                         drv_data->reg_base + drv_data->reg_offsets.data);
@@ -566,6 +559,11 @@ mv64xxx_i2c_intr(int irq, void *dev_id)
                 status = readl(drv_data->reg_base + drv_data->reg_offsets.status);
                 mv64xxx_i2c_fsm(drv_data, status);
                 mv64xxx_i2c_do_action(drv_data);
+
+                if (drv_data->irq_clear_inverted)
+                        writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_IFLG,
+                               drv_data->reg_base + drv_data->reg_offsets.control);
+
                 rc = IRQ_HANDLED;
         }
         spin_unlock_irqrestore(&drv_data->lock, flags);
@@ -626,12 +624,11 @@ mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg,
 
         spin_lock_irqsave(&drv_data->lock, flags);
 
-        drv_data->action = MV64XXX_I2C_ACTION_SEND_START;
         drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_START_COND;
 
         drv_data->send_stop = is_last;
         drv_data->block = 1;
-        mv64xxx_i2c_do_action(drv_data);
+        mv64xxx_i2c_send_start(drv_data);
         spin_unlock_irqrestore(&drv_data->lock, flags);
 
         mv64xxx_i2c_wait_for_completion(drv_data);
@@ -685,6 +682,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
  */
 static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
         { .compatible = "allwinner,sun4i-i2c", .data = &mv64xxx_i2c_regs_sun4i},
+        { .compatible = "allwinner,sun6i-a31-i2c", .data = &mv64xxx_i2c_regs_sun4i},
         { .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
         { .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
         { .compatible = "marvell,mv78230-a0-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
@@ -759,6 +757,16 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
         }
         drv_data->irq = irq_of_parse_and_map(np, 0);
 
+        drv_data->rstc = devm_reset_control_get_optional(dev, NULL);
+        if (IS_ERR(drv_data->rstc)) {
+                if (PTR_ERR(drv_data->rstc) == -EPROBE_DEFER) {
+                        rc = -EPROBE_DEFER;
+                        goto out;
+                }
+        } else {
+                reset_control_deassert(drv_data->rstc);
+        }
+
         /* Its not yet defined how timeouts will be specified in device tree.
          * So hard code the value to 1 second.
          */
@@ -783,6 +791,10 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
                 drv_data->offload_enabled = false;
                 drv_data->errata_delay = true;
         }
+
+        if (of_device_is_compatible(np, "allwinner,sun6i-a31-i2c"))
+                drv_data->irq_clear_inverted = true;
+
 out:
         return rc;
 #endif
@@ -845,13 +857,13 @@ mv64xxx_i2c_probe(struct platform_device *pd)
         }
         if (drv_data->irq < 0) {
                 rc = -ENXIO;
-                goto exit_clk;
+                goto exit_reset;
         }
 
         drv_data->adapter.dev.parent = &pd->dev;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
-        drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+        drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED;
         drv_data->adapter.nr = pd->id;
         drv_data->adapter.dev.of_node = pd->dev.of_node;
         platform_set_drvdata(pd, drv_data);
@@ -865,7 +877,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
                 dev_err(&drv_data->adapter.dev,
                         "mv64xxx: Can't register intr handler irq%d: %d\n",
                         drv_data->irq, rc);
-                goto exit_clk;
+                goto exit_reset;
         } else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) {
                 dev_err(&drv_data->adapter.dev,
                         "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
@@ -876,6 +888,9 @@ mv64xxx_i2c_probe(struct platform_device *pd)
 
 exit_free_irq:
         free_irq(drv_data->irq, drv_data);
+exit_reset:
+        if (!IS_ERR_OR_NULL(drv_data->rstc))
+                reset_control_assert(drv_data->rstc);
 exit_clk:
 #if defined(CONFIG_HAVE_CLK)
         /* Not all platforms have a clk */
@@ -894,6 +909,8 @@ mv64xxx_i2c_remove(struct platform_device *dev)
 
         i2c_del_adapter(&drv_data->adapter);
         free_irq(drv_data->irq, drv_data);
+        if (!IS_ERR_OR_NULL(drv_data->rstc))
+                reset_control_assert(drv_data->rstc);
 #if defined(CONFIG_HAVE_CLK)
         /* Not all platforms have a clk */
         if (!IS_ERR(drv_data->clk)) {
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index 0cde4e6ab2b2..7170fc892829 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -806,7 +806,6 @@ static int mxs_i2c_probe(struct platform_device *pdev)
         struct mxs_i2c_dev *i2c;
         struct i2c_adapter *adap;
         struct resource *res;
-        resource_size_t res_size;
         int err, irq;
 
         i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);
@@ -819,18 +818,13 @@ static int mxs_i2c_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        irq = platform_get_irq(pdev, 0);
-
-        if (!res || irq < 0)
-                return -ENOENT;
+        i2c->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(i2c->regs))
+                return PTR_ERR(i2c->regs);
 
-        res_size = resource_size(res);
-        if (!devm_request_mem_region(dev, res->start, res_size, res->name))
-                return -EBUSY;
-
-        i2c->regs = devm_ioremap_nocache(dev, res->start, res_size);
-        if (!i2c->regs)
-                return -EBUSY;
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
 
         err = devm_request_irq(dev, irq, mxs_i2c_isr, 0, dev_name(dev), i2c);
         if (err)
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 0038c451095c..ee3a76c7ae97 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -306,7 +306,7 @@ static struct i2c_algorithm smbus_algorithm = {
 };
 
 
-static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
+static const struct pci_device_id nforce2_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS) },
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS) },
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) },
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 4443613514ee..28cbe1b2a2ec 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -111,22 +111,6 @@ enum i2c_freq_mode {
 };
 
 /**
- * struct nmk_i2c_controller - client specific controller configuration
- * @clk_freq:   clock frequency for the operation mode
- * @tft:        Tx FIFO Threshold in bytes
- * @rft:        Rx FIFO Threshold in bytes
- * @timeout     Slave response timeout(ms)
- * @sm:         speed mode
- */
-struct nmk_i2c_controller {
-        u32             clk_freq;
-        unsigned char   tft;
-        unsigned char   rft;
-        int timeout;
-        enum i2c_freq_mode      sm;
-};
-
-/**
  * struct i2c_vendor_data - per-vendor variations
  * @has_mtdws: variant has the MTDWS bit
  * @fifodepth: variant FIFO depth
@@ -174,12 +158,15 @@ struct i2c_nmk_client {
  * @irq: interrupt line for the controller.
  * @virtbase: virtual io memory area.
  * @clk: hardware i2c block clock.
- * @cfg: machine provided controller configuration.
  * @cli: holder of client specific data.
+ * @clk_freq: clock frequency for the operation mode
+ * @tft: Tx FIFO Threshold in bytes
+ * @rft: Rx FIFO Threshold in bytes
+ * @timeout Slave response timeout (ms)
+ * @sm: speed mode
  * @stop: stop condition.
  * @xfer_complete: acknowledge completion for a I2C message.
  * @result: controller propogated result.
- * @busy: Busy doing transfer.
  */
 struct nmk_i2c_dev {
         struct i2c_vendor_data          *vendor;
@@ -188,12 +175,15 @@ struct nmk_i2c_dev {
         int                             irq;
         void __iomem                    *virtbase;
         struct clk                      *clk;
-        struct nmk_i2c_controller       cfg;
         struct i2c_nmk_client           cli;
+        u32                             clk_freq;
+        unsigned char                   tft;
+        unsigned char                   rft;
+        int                             timeout;
+        enum i2c_freq_mode              sm;
         int                             stop;
         struct completion               xfer_complete;
         int                             result;
-        bool                            busy;
 };
 
 /* controller's abort causes */
@@ -386,7 +376,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
          * slsu = cycles / (1000000000 / f) + 1
          */
         ns = DIV_ROUND_UP_ULL(1000000000ULL, i2c_clk);
-        switch (dev->cfg.sm) {
+        switch (dev->sm) {
         case I2C_FREQ_MODE_FAST:
         case I2C_FREQ_MODE_FAST_PLUS:
                 slsu = DIV_ROUND_UP(100, ns); /* Fast */
@@ -409,7 +399,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
          * 2 whereas it is 3 for fast and fastplus mode of
          * operation. TODO - high speed support.
          */
-        div = (dev->cfg.clk_freq > 100000) ? 3 : 2;
+        div = (dev->clk_freq > 100000) ? 3 : 2;
 
         /*
          * generate the mask for baud rate counters. The controller
@@ -419,7 +409,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
          * so set brcr1 to 0.
          */
         brcr1 = 0 << 16;
-        brcr2 = (i2c_clk/(dev->cfg.clk_freq * div)) & 0xffff;
+        brcr2 = (i2c_clk/(dev->clk_freq * div)) & 0xffff;
 
         /* set the baud rate counter register */
         writel((brcr1 | brcr2), dev->virtbase + I2C_BRCR);
@@ -430,7 +420,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
          * TODO - support for fast mode plus (up to 1Mb/s)
          * and high speed (up to 3.4 Mb/s)
          */
-        if (dev->cfg.sm > I2C_FREQ_MODE_FAST) {
+        if (dev->sm > I2C_FREQ_MODE_FAST) {
                 dev_err(&dev->adev->dev,
                         "do not support this mode defaulting to std. mode\n");
                 brcr2 = i2c_clk/(100000 * 2) & 0xffff;
@@ -438,11 +428,11 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
                 writel(I2C_FREQ_MODE_STANDARD << 4,
                                 dev->virtbase + I2C_CR);
         }
-        writel(dev->cfg.sm << 4, dev->virtbase + I2C_CR);
+        writel(dev->sm << 4, dev->virtbase + I2C_CR);
 
         /* set the Tx and Rx FIFO threshold */
-        writel(dev->cfg.tft, dev->virtbase + I2C_TFTR);
-        writel(dev->cfg.rft, dev->virtbase + I2C_RFTR);
+        writel(dev->tft, dev->virtbase + I2C_TFTR);
+        writel(dev->rft, dev->virtbase + I2C_RFTR);
 }
 
 /**
@@ -674,28 +664,13 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags)
 static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
                 struct i2c_msg msgs[], int num_msgs)
 {
-        int status;
+        int status = 0;
         int i;
         struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap);
         int j;
 
-        dev->busy = true;
-
         pm_runtime_get_sync(&dev->adev->dev);
 
-        status = clk_prepare_enable(dev->clk);
-        if (status) {
-                dev_err(&dev->adev->dev, "can't prepare_enable clock\n");
-                goto out_clk;
-        }
-
-        /* Optionaly enable pins to be muxed in and configured */
-        pinctrl_pm_select_default_state(&dev->adev->dev);
-
-        status = init_hw(dev);
-        if (status)
-                goto out;
-
         /* Attempt three times to send the message queue */
         for (j = 0; j < 3; j++) {
                 /* setup the i2c controller */
@@ -716,16 +691,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
                         break;
         }
 
-out:
-        clk_disable_unprepare(dev->clk);
-out_clk:
-        /* Optionally let pins go into idle state */
-        pinctrl_pm_select_idle_state(&dev->adev->dev);
-
         pm_runtime_put_sync(&dev->adev->dev);
 
-        dev->busy = false;
-
         /* return the no. messages processed */
         if (status)
                 return status;
@@ -909,22 +876,15 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
         return IRQ_HANDLED;
 }
 
-
-#ifdef CONFIG_PM
-static int nmk_i2c_suspend(struct device *dev)
+#ifdef CONFIG_PM_SLEEP
+static int nmk_i2c_suspend_late(struct device *dev)
 {
-        struct amba_device *adev = to_amba_device(dev);
-        struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev);
-
-        if (nmk_i2c->busy)
-                return -EBUSY;
-
         pinctrl_pm_select_sleep_state(dev);
 
         return 0;
 }
 
-static int nmk_i2c_resume(struct device *dev)
+static int nmk_i2c_resume_early(struct device *dev)
 {
         /* First go to the default state */
         pinctrl_pm_select_default_state(dev);
@@ -933,19 +893,48 @@ static int nmk_i2c_resume(struct device *dev)
 
         return 0;
 }
-#else
-#define nmk_i2c_suspend NULL
-#define nmk_i2c_resume  NULL
 #endif
 
-/*
- * We use noirq so that we suspend late and resume before the wakeup interrupt
- * to ensure that we do the !pm_runtime_suspended() check in resume before
- * there has been a regular pm runtime resume (via pm_runtime_get_sync()).
- */
+#ifdef CONFIG_PM
+static int nmk_i2c_runtime_suspend(struct device *dev)
+{
+        struct amba_device *adev = to_amba_device(dev);
+        struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev);
+
+        clk_disable_unprepare(nmk_i2c->clk);
+        pinctrl_pm_select_idle_state(dev);
+        return 0;
+}
+
+static int nmk_i2c_runtime_resume(struct device *dev)
+{
+        struct amba_device *adev = to_amba_device(dev);
+        struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev);
+        int ret;
+
+        ret = clk_prepare_enable(nmk_i2c->clk);
+        if (ret) {
+                dev_err(dev, "can't prepare_enable clock\n");
+                return ret;
+        }
+
+        pinctrl_pm_select_default_state(dev);
+
+        ret = init_hw(nmk_i2c);
+        if (ret) {
+                clk_disable_unprepare(nmk_i2c->clk);
+                pinctrl_pm_select_idle_state(dev);
+        }
+
+        return ret;
+}
+#endif
+
 static const struct dev_pm_ops nmk_i2c_pm = {
-        .suspend_noirq  = nmk_i2c_suspend,
-        .resume_noirq   = nmk_i2c_resume,
+        SET_LATE_SYSTEM_SLEEP_PM_OPS(nmk_i2c_suspend_late, nmk_i2c_resume_early)
+        SET_PM_RUNTIME_PM_OPS(nmk_i2c_runtime_suspend,
+                        nmk_i2c_runtime_resume,
+                        NULL)
 };
 
 static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap)
@@ -958,118 +947,98 @@ static const struct i2c_algorithm nmk_i2c_algo = {
         .functionality  = nmk_i2c_functionality
 };
 
-static struct nmk_i2c_controller u8500_i2c = {
-        .tft            = 1,      /* Tx FIFO threshold */
-        .rft            = 8,      /* Rx FIFO threshold */
-        .clk_freq       = 400000, /* fast mode operation */
-        .timeout        = 200,    /* Slave response timeout(ms) */
-        .sm             = I2C_FREQ_MODE_FAST,
-};
-
 static void nmk_i2c_of_probe(struct device_node *np,
-                        struct nmk_i2c_controller *pdata)
+                             struct nmk_i2c_dev *nmk)
 {
-        of_property_read_u32(np, "clock-frequency", &pdata->clk_freq);
+        /* Default to 100 kHz if no frequency is given in the node */
+        if (of_property_read_u32(np, "clock-frequency", &nmk->clk_freq))
+                nmk->clk_freq = 100000;
 
         /* This driver only supports 'standard' and 'fast' modes of operation. */
-        if (pdata->clk_freq <= 100000)
-                pdata->sm = I2C_FREQ_MODE_STANDARD;
+        if (nmk->clk_freq <= 100000)
+                nmk->sm = I2C_FREQ_MODE_STANDARD;
         else
-                pdata->sm = I2C_FREQ_MODE_FAST;
+                nmk->sm = I2C_FREQ_MODE_FAST;
+        nmk->tft = 1; /* Tx FIFO threshold */
+        nmk->rft = 8; /* Rx FIFO threshold */
+        nmk->timeout = 200; /* Slave response timeout(ms) */
 }
 
 static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 {
         int ret = 0;
-        struct nmk_i2c_controller *pdata = dev_get_platdata(&adev->dev);
         struct device_node *np = adev->dev.of_node;
         struct nmk_i2c_dev      *dev;
         struct i2c_adapter *adap;
         struct i2c_vendor_data *vendor = id->data;
         u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
 
-        if (!pdata) {
-                if (np) {
-                        pdata = devm_kzalloc(&adev->dev, sizeof(*pdata), GFP_KERNEL);
-                        if (!pdata) {
-                                ret = -ENOMEM;
-                                goto err_no_mem;
-                        }
-                        /* Provide the default configuration as a base. */
-                        memcpy(pdata, &u8500_i2c, sizeof(struct nmk_i2c_controller));
-                        nmk_i2c_of_probe(np, pdata);
-                } else
-                        /* No i2c configuration found, using the default. */
-                        pdata = &u8500_i2c;
+        dev = devm_kzalloc(&adev->dev, sizeof(struct nmk_i2c_dev), GFP_KERNEL);
+        if (!dev) {
+                dev_err(&adev->dev, "cannot allocate memory\n");
+                ret = -ENOMEM;
+                goto err_no_mem;
         }
+        dev->vendor = vendor;
+        dev->adev = adev;
+        nmk_i2c_of_probe(np, dev);
 
-        if (pdata->tft > max_fifo_threshold) {
+        if (dev->tft > max_fifo_threshold) {
                 dev_warn(&adev->dev, "requested TX FIFO threshold %u, adjusted down to %u\n",
-                        pdata->tft, max_fifo_threshold);
-                pdata->tft = max_fifo_threshold;
+                         dev->tft, max_fifo_threshold);
+                dev->tft = max_fifo_threshold;
         }
 
-        if (pdata->rft > max_fifo_threshold) {
+        if (dev->rft > max_fifo_threshold) {
                 dev_warn(&adev->dev, "requested RX FIFO threshold %u, adjusted down to %u\n",
-                        pdata->rft, max_fifo_threshold);
-                pdata->rft = max_fifo_threshold;
+                        dev->rft, max_fifo_threshold);
+                dev->rft = max_fifo_threshold;
         }
 
-        dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
-        if (!dev) {
-                dev_err(&adev->dev, "cannot allocate memory\n");
-                ret = -ENOMEM;
-                goto err_no_mem;
-        }
-        dev->vendor = vendor;
-        dev->busy = false;
-        dev->adev = adev;
         amba_set_drvdata(adev, dev);
 
-        /* Select default pin state */
-        pinctrl_pm_select_default_state(&adev->dev);
-        /* If possible, let's go to idle until the first transfer */
-        pinctrl_pm_select_idle_state(&adev->dev);
-
-        dev->virtbase = ioremap(adev->res.start, resource_size(&adev->res));
-        if (!dev->virtbase) {
+        dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
+                                resource_size(&adev->res));
+        if (IS_ERR(dev->virtbase)) {
                 ret = -ENOMEM;
-                goto err_no_ioremap;
+                goto err_no_mem;
         }
 
         dev->irq = adev->irq[0];
-        ret = request_irq(dev->irq, i2c_irq_handler, 0,
+        ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
                                 DRIVER_NAME, dev);
         if (ret) {
                 dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
-                goto err_irq;
+                goto err_no_mem;
         }
 
         pm_suspend_ignore_children(&adev->dev, true);
 
-        dev->clk = clk_get(&adev->dev, NULL);
+        dev->clk = devm_clk_get(&adev->dev, NULL);
         if (IS_ERR(dev->clk)) {
                 dev_err(&adev->dev, "could not get i2c clock\n");
                 ret = PTR_ERR(dev->clk);
-                goto err_no_clk;
+                goto err_no_mem;
+        }
+
+        ret = clk_prepare_enable(dev->clk);
+        if (ret) {
+                dev_err(&adev->dev, "can't prepare_enable clock\n");
+                goto err_no_mem;
         }
 
+        init_hw(dev);
+
         adap = &dev->adap;
         adap->dev.of_node = np;
         adap->dev.parent = &adev->dev;
         adap->owner     = THIS_MODULE;
-        adap->class     = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+        adap->class     = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED;
         adap->algo      = &nmk_i2c_algo;
-        adap->timeout   = msecs_to_jiffies(pdata->timeout);
+        adap->timeout   = msecs_to_jiffies(dev->timeout);
         snprintf(adap->name, sizeof(adap->name),
                  "Nomadik I2C at %pR", &adev->res);
 
-        /* fetch the controller configuration from machine */
-        dev->cfg.clk_freq = pdata->clk_freq;
-        dev->cfg.tft    = pdata->tft;
-        dev->cfg.rft    = pdata->rft;
-        dev->cfg.sm     = pdata->sm;
-
         i2c_set_adapdata(adap, dev);
 
         dev_info(&adev->dev,
@@ -1079,21 +1048,15 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
         ret = i2c_add_adapter(adap);
         if (ret) {
                 dev_err(&adev->dev, "failed to add adapter\n");
-                goto err_add_adap;
+                goto err_no_adap;
         }
 
         pm_runtime_put(&adev->dev);
 
         return 0;
 
- err_add_adap:
-        clk_put(dev->clk);
- err_no_clk:
-        free_irq(dev->irq, dev);
- err_irq:
-        iounmap(dev->virtbase);
- err_no_ioremap:
-        kfree(dev);
+ err_no_adap:
+        clk_disable_unprepare(dev->clk);
  err_no_mem:
 
         return ret;
@@ -1110,13 +1073,9 @@ static int nmk_i2c_remove(struct amba_device *adev)
         clear_all_interrupts(dev);
         /* disable the controller */
         i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
-        free_irq(dev->irq, dev);
-        iounmap(dev->virtbase);
+        clk_disable_unprepare(dev->clk);
         if (res)
                 release_mem_region(res->start, resource_size(res));
-        clk_put(dev->clk);
-        pm_runtime_disable(&adev->dev);
-        kfree(dev);
 
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 80e06fa45720..1f6369f14fb6 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -246,7 +246,7 @@ static const struct i2c_algorithm ocores_algorithm = {
 static struct i2c_adapter ocores_adapter = {
         .owner          = THIS_MODULE,
         .name           = "i2c-ocores",
-        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
+        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED,
         .algo           = &ocores_algorithm,
 };
 
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 90dcc2eaac5f..85f8eac9ba18 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -636,7 +636,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         int r;
 
         r = pm_runtime_get_sync(dev->dev);
-        if (IS_ERR_VALUE(r))
+        if (r < 0)
                 goto out;
 
         r = omap_i2c_wait_for_bb(dev);
@@ -1155,7 +1155,7 @@ omap_i2c_probe(struct platform_device *pdev)
         pm_runtime_use_autosuspend(dev->dev);
 
         r = pm_runtime_get_sync(dev->dev);
-        if (IS_ERR_VALUE(r))
+        if (r < 0)
                 goto err_free_mem;
 
         /*
@@ -1238,7 +1238,7 @@ omap_i2c_probe(struct platform_device *pdev)
         adap = &dev->adapter;
         i2c_set_adapdata(adap, dev);
         adap->owner = THIS_MODULE;
-        adap->class = I2C_CLASS_HWMON;
+        adap->class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         strlcpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
         adap->algo = &omap_i2c_algo;
         adap->dev.parent = &pdev->dev;
@@ -1276,7 +1276,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
 
         i2c_del_adapter(&dev->adapter);
         ret = pm_runtime_get_sync(&pdev->dev);
-        if (IS_ERR_VALUE(ret))
+        if (ret < 0)
                 return ret;
 
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
index 615f632c846f..7a9dce43e115 100644
--- a/drivers/i2c/busses/i2c-pasemi.c
+++ b/drivers/i2c/busses/i2c-pasemi.c
@@ -401,7 +401,7 @@ static void pasemi_smb_remove(struct pci_dev *dev)
         kfree(smbus);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(pasemi_smb_ids) = {
+static const struct pci_device_id pasemi_smb_ids[] = {
         { PCI_DEVICE(0x1959, 0xa003) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 39dd8ec60dfd..a6f54ba27e2a 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -540,7 +540,7 @@ static const struct i2c_algorithm smbus_algorithm = {
         .functionality  = piix4_func,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = {
+static const struct pci_device_id piix4_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) },
         { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index 9639be86e53f..417464e9ea2a 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -148,7 +148,7 @@ static void ce4100_i2c_remove(struct pci_dev *dev)
         kfree(sds);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = {
+static const struct pci_device_id ce4100_i2c_devices[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)},
         { },
 };
diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
new file mode 100644
index 000000000000..1b4cf14f1106
--- /dev/null
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -0,0 +1,768 @@
+/*
+ * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, Sony Mobile Communications AB.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+
+/* QUP Registers */
+#define QUP_CONFIG              0x000
+#define QUP_STATE               0x004
+#define QUP_IO_MODE             0x008
+#define QUP_SW_RESET            0x00c
+#define QUP_OPERATIONAL         0x018
+#define QUP_ERROR_FLAGS         0x01c
+#define QUP_ERROR_FLAGS_EN      0x020
+#define QUP_HW_VERSION          0x030
+#define QUP_MX_OUTPUT_CNT       0x100
+#define QUP_OUT_FIFO_BASE       0x110
+#define QUP_MX_WRITE_CNT        0x150
+#define QUP_MX_INPUT_CNT        0x200
+#define QUP_MX_READ_CNT         0x208
+#define QUP_IN_FIFO_BASE        0x218
+#define QUP_I2C_CLK_CTL         0x400
+#define QUP_I2C_STATUS          0x404
+
+/* QUP States and reset values */
+#define QUP_RESET_STATE         0
+#define QUP_RUN_STATE           1
+#define QUP_PAUSE_STATE         3
+#define QUP_STATE_MASK          3
+
+#define QUP_STATE_VALID         BIT(2)
+#define QUP_I2C_MAST_GEN        BIT(4)
+
+#define QUP_OPERATIONAL_RESET   0x000ff0
+#define QUP_I2C_STATUS_RESET    0xfffffc
+
+/* QUP OPERATIONAL FLAGS */
+#define QUP_I2C_NACK_FLAG       BIT(3)
+#define QUP_OUT_NOT_EMPTY       BIT(4)
+#define QUP_IN_NOT_EMPTY        BIT(5)
+#define QUP_OUT_FULL            BIT(6)
+#define QUP_OUT_SVC_FLAG        BIT(8)
+#define QUP_IN_SVC_FLAG         BIT(9)
+#define QUP_MX_OUTPUT_DONE      BIT(10)
+#define QUP_MX_INPUT_DONE       BIT(11)
+
+/* I2C mini core related values */
+#define QUP_CLOCK_AUTO_GATE     BIT(13)
+#define I2C_MINI_CORE           (2 << 8)
+#define I2C_N_VAL               15
+/* Most significant word offset in FIFO port */
+#define QUP_MSW_SHIFT           (I2C_N_VAL + 1)
+
+/* Packing/Unpacking words in FIFOs, and IO modes */
+#define QUP_OUTPUT_BLK_MODE     (1 << 10)
+#define QUP_INPUT_BLK_MODE      (1 << 12)
+#define QUP_UNPACK_EN           BIT(14)
+#define QUP_PACK_EN             BIT(15)
+
+#define QUP_REPACK_EN           (QUP_UNPACK_EN | QUP_PACK_EN)
+
+#define QUP_OUTPUT_BLOCK_SIZE(x)(((x) >> 0) & 0x03)
+#define QUP_OUTPUT_FIFO_SIZE(x) (((x) >> 2) & 0x07)
+#define QUP_INPUT_BLOCK_SIZE(x) (((x) >> 5) & 0x03)
+#define QUP_INPUT_FIFO_SIZE(x)  (((x) >> 7) & 0x07)
+
+/* QUP tags */
+#define QUP_TAG_START           (1 << 8)
+#define QUP_TAG_DATA            (2 << 8)
+#define QUP_TAG_STOP            (3 << 8)
+#define QUP_TAG_REC             (4 << 8)
+
+/* Status, Error flags */
+#define I2C_STATUS_WR_BUFFER_FULL       BIT(0)
+#define I2C_STATUS_BUS_ACTIVE           BIT(8)
+#define I2C_STATUS_ERROR_MASK           0x38000fc
+#define QUP_STATUS_ERROR_FLAGS          0x7c
+
+#define QUP_READ_LIMIT                  256
+
+struct qup_i2c_dev {
+        struct device           *dev;
+        void __iomem            *base;
+        int                     irq;
+        struct clk              *clk;
+        struct clk              *pclk;
+        struct i2c_adapter      adap;
+
+        int                     clk_ctl;
+        int                     out_fifo_sz;
+        int                     in_fifo_sz;
+        int                     out_blk_sz;
+        int                     in_blk_sz;
+
+        unsigned long           one_byte_t;
+
+        struct i2c_msg          *msg;
+        /* Current posion in user message buffer */
+        int                     pos;
+        /* I2C protocol errors */
+        u32                     bus_err;
+        /* QUP core errors */
+        u32                     qup_err;
+
+        struct completion       xfer;
+};
+
+static irqreturn_t qup_i2c_interrupt(int irq, void *dev)
+{
+        struct qup_i2c_dev *qup = dev;
+        u32 bus_err;
+        u32 qup_err;
+        u32 opflags;
+
+        bus_err = readl(qup->base + QUP_I2C_STATUS);
+        qup_err = readl(qup->base + QUP_ERROR_FLAGS);
+        opflags = readl(qup->base + QUP_OPERATIONAL);
+
+        if (!qup->msg) {
+                /* Clear Error interrupt */
+                writel(QUP_RESET_STATE, qup->base + QUP_STATE);
+                return IRQ_HANDLED;
+        }
+
+        bus_err &= I2C_STATUS_ERROR_MASK;
+        qup_err &= QUP_STATUS_ERROR_FLAGS;
+
+        if (qup_err) {
+                /* Clear Error interrupt */
+                writel(qup_err, qup->base + QUP_ERROR_FLAGS);
+                goto done;
+        }
+
+        if (bus_err) {
+                /* Clear Error interrupt */
+                writel(QUP_RESET_STATE, qup->base + QUP_STATE);
+                goto done;
+        }
+
+        if (opflags & QUP_IN_SVC_FLAG)
+                writel(QUP_IN_SVC_FLAG, qup->base + QUP_OPERATIONAL);
+
+        if (opflags & QUP_OUT_SVC_FLAG)
+                writel(QUP_OUT_SVC_FLAG, qup->base + QUP_OPERATIONAL);
+
+done:
+        qup->qup_err = qup_err;
+        qup->bus_err = bus_err;
+        complete(&qup->xfer);
+        return IRQ_HANDLED;
+}
+
+static int qup_i2c_poll_state_mask(struct qup_i2c_dev *qup,
+                                   u32 req_state, u32 req_mask)
+{
+        int retries = 1;
+        u32 state;
+
+        /*
+         * State transition takes 3 AHB clocks cycles + 3 I2C master clock
+         * cycles. So retry once after a 1uS delay.
+         */
+        do {
+                state = readl(qup->base + QUP_STATE);
+
+                if (state & QUP_STATE_VALID &&
+                    (state & req_mask) == req_state)
+                        return 0;
+
+                udelay(1);
+        } while (retries--);
+
+        return -ETIMEDOUT;
+}
+
+static int qup_i2c_poll_state(struct qup_i2c_dev *qup, u32 req_state)
+{
+        return qup_i2c_poll_state_mask(qup, req_state, QUP_STATE_MASK);
+}
+
+static int qup_i2c_poll_state_valid(struct qup_i2c_dev *qup)
+{
+        return qup_i2c_poll_state_mask(qup, 0, 0);
+}
+
+static int qup_i2c_poll_state_i2c_master(struct qup_i2c_dev *qup)
+{
+        return qup_i2c_poll_state_mask(qup, QUP_I2C_MAST_GEN, QUP_I2C_MAST_GEN);
+}
+
+static int qup_i2c_change_state(struct qup_i2c_dev *qup, u32 state)
+{
+        if (qup_i2c_poll_state_valid(qup) != 0)
+                return -EIO;
+
+        writel(state, qup->base + QUP_STATE);
+
+        if (qup_i2c_poll_state(qup, state) != 0)
+                return -EIO;
+        return 0;
+}
+
+static int qup_i2c_wait_writeready(struct qup_i2c_dev *qup)
+{
+        unsigned long timeout;
+        u32 opflags;
+        u32 status;
+
+        timeout = jiffies + HZ;
+
+        for (;;) {
+                opflags = readl(qup->base + QUP_OPERATIONAL);
+                status = readl(qup->base + QUP_I2C_STATUS);
+
+                if (!(opflags & QUP_OUT_NOT_EMPTY) &&
+                    !(status & I2C_STATUS_BUS_ACTIVE))
+                        return 0;
+
+                if (time_after(jiffies, timeout))
+                        return -ETIMEDOUT;
+
+                usleep_range(qup->one_byte_t, qup->one_byte_t * 2);
+        }
+}
+
+static void qup_i2c_set_write_mode(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        /* Number of entries to shift out, including the start */
+        int total = msg->len + 1;
+
+        if (total < qup->out_fifo_sz) {
+                /* FIFO mode */
+                writel(QUP_REPACK_EN, qup->base + QUP_IO_MODE);
+                writel(total, qup->base + QUP_MX_WRITE_CNT);
+        } else {
+                /* BLOCK mode (transfer data on chunks) */
+                writel(QUP_OUTPUT_BLK_MODE | QUP_REPACK_EN,
+                       qup->base + QUP_IO_MODE);
+                writel(total, qup->base + QUP_MX_OUTPUT_CNT);
+        }
+}
+
+static void qup_i2c_issue_write(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        u32 addr = msg->addr << 1;
+        u32 qup_tag;
+        u32 opflags;
+        int idx;
+        u32 val;
+
+        if (qup->pos == 0) {
+                val = QUP_TAG_START | addr;
+                idx = 1;
+        } else {
+                val = 0;
+                idx = 0;
+        }
+
+        while (qup->pos < msg->len) {
+                /* Check that there's space in the FIFO for our pair */
+                opflags = readl(qup->base + QUP_OPERATIONAL);
+                if (opflags & QUP_OUT_FULL)
+                        break;
+
+                if (qup->pos == msg->len - 1)
+                        qup_tag = QUP_TAG_STOP;
+                else
+                        qup_tag = QUP_TAG_DATA;
+
+                if (idx & 1)
+                        val |= (qup_tag | msg->buf[qup->pos]) << QUP_MSW_SHIFT;
+                else
+                        val = qup_tag | msg->buf[qup->pos];
+
+                /* Write out the pair and the last odd value */
+                if (idx & 1 || qup->pos == msg->len - 1)
+                        writel(val, qup->base + QUP_OUT_FIFO_BASE);
+
+                qup->pos++;
+                idx++;
+        }
+}
+
+static int qup_i2c_write_one(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        unsigned long left;
+        int ret;
+
+        qup->msg = msg;
+        qup->pos = 0;
+
+        enable_irq(qup->irq);
+
+        qup_i2c_set_write_mode(qup, msg);
+
+        ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
+        if (ret)
+                goto err;
+
+        writel(qup->clk_ctl, qup->base + QUP_I2C_CLK_CTL);
+
+        do {
+                ret = qup_i2c_change_state(qup, QUP_PAUSE_STATE);
+                if (ret)
+                        goto err;
+
+                qup_i2c_issue_write(qup, msg);
+
+                ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
+                if (ret)
+                        goto err;
+
+                left = wait_for_completion_timeout(&qup->xfer, HZ);
+                if (!left) {
+                        writel(1, qup->base + QUP_SW_RESET);
+                        ret = -ETIMEDOUT;
+                        goto err;
+                }
+
+                if (qup->bus_err || qup->qup_err) {
+                        if (qup->bus_err & QUP_I2C_NACK_FLAG)
+                                dev_err(qup->dev, "NACK from %x\n", msg->addr);
+                        ret = -EIO;
+                        goto err;
+                }
+        } while (qup->pos < msg->len);
+
+        /* Wait for the outstanding data in the fifo to drain */
+        ret = qup_i2c_wait_writeready(qup);
+
+err:
+        disable_irq(qup->irq);
+        qup->msg = NULL;
+
+        return ret;
+}
+
+static void qup_i2c_set_read_mode(struct qup_i2c_dev *qup, int len)
+{
+        if (len < qup->in_fifo_sz) {
+                /* FIFO mode */
+                writel(QUP_REPACK_EN, qup->base + QUP_IO_MODE);
+                writel(len, qup->base + QUP_MX_READ_CNT);
+        } else {
+                /* BLOCK mode (transfer data on chunks) */
+                writel(QUP_INPUT_BLK_MODE | QUP_REPACK_EN,
+                       qup->base + QUP_IO_MODE);
+                writel(len, qup->base + QUP_MX_INPUT_CNT);
+        }
+}
+
+static void qup_i2c_issue_read(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        u32 addr, len, val;
+
+        addr = (msg->addr << 1) | 1;
+
+        /* 0 is used to specify a length 256 (QUP_READ_LIMIT) */
+        len = (msg->len == QUP_READ_LIMIT) ? 0 : msg->len;
+
+        val = ((QUP_TAG_REC | len) << QUP_MSW_SHIFT) | QUP_TAG_START | addr;
+        writel(val, qup->base + QUP_OUT_FIFO_BASE);
+}
+
+
+static void qup_i2c_read_fifo(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        u32 opflags;
+        u32 val = 0;
+        int idx;
+
+        for (idx = 0; qup->pos < msg->len; idx++) {
+                if ((idx & 1) == 0) {
+                        /* Check that FIFO have data */
+                        opflags = readl(qup->base + QUP_OPERATIONAL);
+                        if (!(opflags & QUP_IN_NOT_EMPTY))
+                                break;
+
+                        /* Reading 2 words at time */
+                        val = readl(qup->base + QUP_IN_FIFO_BASE);
+
+                        msg->buf[qup->pos++] = val & 0xFF;
+                } else {
+                        msg->buf[qup->pos++] = val >> QUP_MSW_SHIFT;
+                }
+        }
+}
+
+static int qup_i2c_read_one(struct qup_i2c_dev *qup, struct i2c_msg *msg)
+{
+        unsigned long left;
+        int ret;
+
+        /*
+         * The QUP block will issue a NACK and STOP on the bus when reaching
+         * the end of the read, the length of the read is specified as one byte
+         * which limits the possible read to 256 (QUP_READ_LIMIT) bytes.
+         */
+        if (msg->len > QUP_READ_LIMIT) {
+                dev_err(qup->dev, "HW not capable of reads over %d bytes\n",
+                        QUP_READ_LIMIT);
+                return -EINVAL;
+        }
+
+        qup->msg = msg;
+        qup->pos  = 0;
+
+        enable_irq(qup->irq);
+
+        qup_i2c_set_read_mode(qup, msg->len);
+
+        ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
+        if (ret)
+                goto err;
+
+        writel(qup->clk_ctl, qup->base + QUP_I2C_CLK_CTL);
+
+        ret = qup_i2c_change_state(qup, QUP_PAUSE_STATE);
+        if (ret)
+                goto err;
+
+        qup_i2c_issue_read(qup, msg);
+
+        ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
+        if (ret)
+                goto err;
+
+        do {
+                left = wait_for_completion_timeout(&qup->xfer, HZ);
+                if (!left) {
+                        writel(1, qup->base + QUP_SW_RESET);
+                        ret = -ETIMEDOUT;
+                        goto err;
+                }
+
+                if (qup->bus_err || qup->qup_err) {
+                        if (qup->bus_err & QUP_I2C_NACK_FLAG)
+                                dev_err(qup->dev, "NACK from %x\n", msg->addr);
+                        ret = -EIO;
+                        goto err;
+                }
+
+                qup_i2c_read_fifo(qup, msg);
+        } while (qup->pos < msg->len);
+
+err:
+        disable_irq(qup->irq);
+        qup->msg = NULL;
+
+        return ret;
+}
+
+static int qup_i2c_xfer(struct i2c_adapter *adap,
+                        struct i2c_msg msgs[],
+                        int num)
+{
+        struct qup_i2c_dev *qup = i2c_get_adapdata(adap);
+        int ret, idx;
+
+        ret = pm_runtime_get_sync(qup->dev);
+        if (ret)
+                goto out;
+
+        writel(1, qup->base + QUP_SW_RESET);
+        ret = qup_i2c_poll_state(qup, QUP_RESET_STATE);
+        if (ret)
+                goto out;
+
+        /* Configure QUP as I2C mini core */
+        writel(I2C_MINI_CORE | I2C_N_VAL, qup->base + QUP_CONFIG);
+
+        for (idx = 0; idx < num; idx++) {
+                if (msgs[idx].len == 0) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (qup_i2c_poll_state_i2c_master(qup)) {
+                        ret = -EIO;
+                        goto out;
+                }
+
+                if (msgs[idx].flags & I2C_M_RD)
+                        ret = qup_i2c_read_one(qup, &msgs[idx]);
+                else
+                        ret = qup_i2c_write_one(qup, &msgs[idx]);
+
+                if (ret)
+                        break;
+
+                ret = qup_i2c_change_state(qup, QUP_RESET_STATE);
+                if (ret)
+                        break;
+        }
+
+        if (ret == 0)
+                ret = num;
+out:
+
+        pm_runtime_mark_last_busy(qup->dev);
+        pm_runtime_put_autosuspend(qup->dev);
+
+        return ret;
+}
+
+static u32 qup_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
+}
+
+static const struct i2c_algorithm qup_i2c_algo = {
+        .master_xfer    = qup_i2c_xfer,
+        .functionality  = qup_i2c_func,
+};
+
+static void qup_i2c_enable_clocks(struct qup_i2c_dev *qup)
+{
+        clk_prepare_enable(qup->clk);
+        clk_prepare_enable(qup->pclk);
+}
+
+static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup)
+{
+        u32 config;
+
+        qup_i2c_change_state(qup, QUP_RESET_STATE);
+        clk_disable_unprepare(qup->clk);
+        config = readl(qup->base + QUP_CONFIG);
+        config |= QUP_CLOCK_AUTO_GATE;
+        writel(config, qup->base + QUP_CONFIG);
+        clk_disable_unprepare(qup->pclk);
+}
+
+static int qup_i2c_probe(struct platform_device *pdev)
+{
+        static const int blk_sizes[] = {4, 16, 32};
+        struct device_node *node = pdev->dev.of_node;
+        struct qup_i2c_dev *qup;
+        unsigned long one_bit_t;
+        struct resource *res;
+        u32 io_mode, hw_ver, size;
+        int ret, fs_div, hs_div;
+        int src_clk_freq;
+        u32 clk_freq = 100000;
+
+        qup = devm_kzalloc(&pdev->dev, sizeof(*qup), GFP_KERNEL);
+        if (!qup)
+                return -ENOMEM;
+
+        qup->dev = &pdev->dev;
+        init_completion(&qup->xfer);
+        platform_set_drvdata(pdev, qup);
+
+        of_property_read_u32(node, "clock-frequency", &clk_freq);
+
+        /* We support frequencies up to FAST Mode (400KHz) */
+        if (!clk_freq || clk_freq > 400000) {
+                dev_err(qup->dev, "clock frequency not supported %d\n",
+                        clk_freq);
+                return -EINVAL;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        qup->base = devm_ioremap_resource(qup->dev, res);
+        if (IS_ERR(qup->base))
+                return PTR_ERR(qup->base);
+
+        qup->irq = platform_get_irq(pdev, 0);
+        if (qup->irq < 0) {
+                dev_err(qup->dev, "No IRQ defined\n");
+                return qup->irq;
+        }
+
+        qup->clk = devm_clk_get(qup->dev, "core");
+        if (IS_ERR(qup->clk)) {
+                dev_err(qup->dev, "Could not get core clock\n");
+                return PTR_ERR(qup->clk);
+        }
+
+        qup->pclk = devm_clk_get(qup->dev, "iface");
+        if (IS_ERR(qup->pclk)) {
+                dev_err(qup->dev, "Could not get iface clock\n");
+                return PTR_ERR(qup->pclk);
+        }
+
+        qup_i2c_enable_clocks(qup);
+
+        /*
+         * Bootloaders might leave a pending interrupt on certain QUP's,
+         * so we reset the core before registering for interrupts.
+         */
+        writel(1, qup->base + QUP_SW_RESET);
+        ret = qup_i2c_poll_state_valid(qup);
+        if (ret)
+                goto fail;
+
+        ret = devm_request_irq(qup->dev, qup->irq, qup_i2c_interrupt,
+                               IRQF_TRIGGER_HIGH, "i2c_qup", qup);
+        if (ret) {
+                dev_err(qup->dev, "Request %d IRQ failed\n", qup->irq);
+                goto fail;
+        }
+        disable_irq(qup->irq);
+
+        hw_ver = readl(qup->base + QUP_HW_VERSION);
+        dev_dbg(qup->dev, "Revision %x\n", hw_ver);
+
+        io_mode = readl(qup->base + QUP_IO_MODE);
+
+        /*
+         * The block/fifo size w.r.t. 'actual data' is 1/2 due to 'tag'
+         * associated with each byte written/received
+         */
+        size = QUP_OUTPUT_BLOCK_SIZE(io_mode);
+        if (size >= ARRAY_SIZE(blk_sizes))
+                return -EIO;
+        qup->out_blk_sz = blk_sizes[size] / 2;
+
+        size = QUP_INPUT_BLOCK_SIZE(io_mode);
+        if (size >= ARRAY_SIZE(blk_sizes))
+                return -EIO;
+        qup->in_blk_sz = blk_sizes[size] / 2;
+
+        size = QUP_OUTPUT_FIFO_SIZE(io_mode);
+        qup->out_fifo_sz = qup->out_blk_sz * (2 << size);
+
+        size = QUP_INPUT_FIFO_SIZE(io_mode);
+        qup->in_fifo_sz = qup->in_blk_sz * (2 << size);
+
+        src_clk_freq = clk_get_rate(qup->clk);
+        fs_div = ((src_clk_freq / clk_freq) / 2) - 3;
+        hs_div = 3;
+        qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff);
+
+        /*
+         * Time it takes for a byte to be clocked out on the bus.
+         * Each byte takes 9 clock cycles (8 bits + 1 ack).
+         */
+        one_bit_t = (USEC_PER_SEC / clk_freq) + 1;
+        qup->one_byte_t = one_bit_t * 9;
+
+        dev_dbg(qup->dev, "IN:block:%d, fifo:%d, OUT:block:%d, fifo:%d\n",
+                qup->in_blk_sz, qup->in_fifo_sz,
+                qup->out_blk_sz, qup->out_fifo_sz);
+
+        i2c_set_adapdata(&qup->adap, qup);
+        qup->adap.algo = &qup_i2c_algo;
+        qup->adap.dev.parent = qup->dev;
+        qup->adap.dev.of_node = pdev->dev.of_node;
+        strlcpy(qup->adap.name, "QUP I2C adapter", sizeof(qup->adap.name));
+
+        ret = i2c_add_adapter(&qup->adap);
+        if (ret)
+                goto fail;
+
+        pm_runtime_set_autosuspend_delay(qup->dev, MSEC_PER_SEC);
+        pm_runtime_use_autosuspend(qup->dev);
+        pm_runtime_set_active(qup->dev);
+        pm_runtime_enable(qup->dev);
+        return 0;
+
+fail:
+        qup_i2c_disable_clocks(qup);
+        return ret;
+}
+
+static int qup_i2c_remove(struct platform_device *pdev)
+{
+        struct qup_i2c_dev *qup = platform_get_drvdata(pdev);
+
+        disable_irq(qup->irq);
+        qup_i2c_disable_clocks(qup);
+        i2c_del_adapter(&qup->adap);
+        pm_runtime_disable(qup->dev);
+        pm_runtime_set_suspended(qup->dev);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int qup_i2c_pm_suspend_runtime(struct device *device)
+{
+        struct qup_i2c_dev *qup = dev_get_drvdata(device);
+
+        dev_dbg(device, "pm_runtime: suspending...\n");
+        qup_i2c_disable_clocks(qup);
+        return 0;
+}
+
+static int qup_i2c_pm_resume_runtime(struct device *device)
+{
+        struct qup_i2c_dev *qup = dev_get_drvdata(device);
+
+        dev_dbg(device, "pm_runtime: resuming...\n");
+        qup_i2c_enable_clocks(qup);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_PM_SLEEP
+static int qup_i2c_suspend(struct device *device)
+{
+        qup_i2c_pm_suspend_runtime(device);
+        return 0;
+}
+
+static int qup_i2c_resume(struct device *device)
+{
+        qup_i2c_pm_resume_runtime(device);
+        pm_runtime_mark_last_busy(device);
+        pm_request_autosuspend(device);
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops qup_i2c_qup_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(
+                qup_i2c_suspend,
+                qup_i2c_resume)
+        SET_RUNTIME_PM_OPS(
+                qup_i2c_pm_suspend_runtime,
+                qup_i2c_pm_resume_runtime,
+                NULL)
+};
+
+static const struct of_device_id qup_i2c_dt_match[] = {
+        { .compatible = "qcom,i2c-qup-v1.1.1" },
+        { .compatible = "qcom,i2c-qup-v2.1.1" },
+        { .compatible = "qcom,i2c-qup-v2.2.1" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, qup_i2c_dt_match);
+
+static struct platform_driver qup_i2c_driver = {
+        .probe  = qup_i2c_probe,
+        .remove = qup_i2c_remove,
+        .driver = {
+                .name = "i2c_qup",
+                .owner = THIS_MODULE,
+                .pm = &qup_i2c_qup_pm_ops,
+                .of_match_table = qup_i2c_dt_match,
+        },
+};
+
+module_platform_driver(qup_i2c_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:i2c_qup");
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 0282d4d42805..d4fa8eba6e9d 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -638,6 +638,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = {
         { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 },
         { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 },
         { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 },
+        { .compatible = "renesas,i2c-r8a7791", .data = (void *)I2C_RCAR_GEN2 },
         {},
 };
 MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
@@ -691,7 +692,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)
         adap                    = &priv->adap;
         adap->nr                = pdev->id;
         adap->algo              = &rcar_i2c_algo;
-        adap->class             = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+        adap->class             = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED;
         adap->retries           = 3;
         adap->dev.parent        = dev;
         adap->dev.of_node       = dev->of_node;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 684d21e71e4a..ae4491062e41 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -601,6 +601,31 @@ static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id)
         return IRQ_HANDLED;
 }
 
+/*
+ * Disable the bus so that we won't get any interrupts from now on, or try
+ * to drive any lines. This is the default state when we don't have
+ * anything to send/receive.
+ *
+ * If there is an event on the bus, or we have a pre-existing event at
+ * kernel boot time, we may not notice the event and the I2C controller
+ * will lock the bus with the I2C clock line low indefinitely.
+ */
+static inline void s3c24xx_i2c_disable_bus(struct s3c24xx_i2c *i2c)
+{
+        unsigned long tmp;
+
+        /* Stop driving the I2C pins */
+        tmp = readl(i2c->regs + S3C2410_IICSTAT);
+        tmp &= ~S3C2410_IICSTAT_TXRXEN;
+        writel(tmp, i2c->regs + S3C2410_IICSTAT);
+
+        /* We don't expect any interrupts now, and don't want send acks */
+        tmp = readl(i2c->regs + S3C2410_IICCON);
+        tmp &= ~(S3C2410_IICCON_IRQEN | S3C2410_IICCON_IRQPEND |
+                S3C2410_IICCON_ACKEN);
+        writel(tmp, i2c->regs + S3C2410_IICCON);
+}
+
 
 /* s3c24xx_i2c_set_master
  *
@@ -735,7 +760,11 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
 
         s3c24xx_i2c_wait_idle(i2c);
 
+        s3c24xx_i2c_disable_bus(i2c);
+
  out:
+        i2c->state = STATE_IDLE;
+
         return ret;
 }
 
@@ -1004,7 +1033,6 @@ static void s3c24xx_i2c_dt_gpio_free(struct s3c24xx_i2c *i2c)
 
 static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 {
-        unsigned long iicon = S3C2410_IICCON_IRQEN | S3C2410_IICCON_ACKEN;
         struct s3c2410_platform_i2c *pdata;
         unsigned int freq;
 
@@ -1018,12 +1046,12 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
 
-        writel(iicon, i2c->regs + S3C2410_IICCON);
+        writel(0, i2c->regs + S3C2410_IICCON);
+        writel(0, i2c->regs + S3C2410_IICSTAT);
 
         /* we need to work out the divisors for the clock... */
 
         if (s3c24xx_i2c_clockrate(i2c, &freq) != 0) {
-                writel(0, i2c->regs + S3C2410_IICCON);
                 dev_err(i2c->dev, "cannot meet bus frequency required\n");
                 return -EINVAL;
         }
@@ -1031,7 +1059,8 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
         /* todo - check that the i2c lines aren't being dragged anywhere */
 
         dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
-        dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
+        dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02x\n",
+                readl(i2c->regs + S3C2410_IICCON));
 
         return 0;
 }
@@ -1106,7 +1135,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         i2c->adap.owner   = THIS_MODULE;
         i2c->adap.algo    = &s3c24xx_i2c_algorithm;
         i2c->adap.retries = 2;
-        i2c->adap.class   = I2C_CLASS_HWMON | I2C_CLASS_SPD;
+        i2c->adap.class   = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED;
         i2c->tx_setup     = 50;
 
         init_waitqueue_head(&i2c->wait);
diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index 6784f7f527a4..8e3be7ed0586 100644
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -312,7 +312,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
                 goto out;
         }
         adap = &siic->adapter;
-        adap->class = I2C_CLASS_HWMON;
+        adap->class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
 
         mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         siic->base = devm_ioremap_resource(&pdev->dev, mem_res);
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 79fd96a04386..ac9bc33acef4 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -369,7 +369,7 @@ static struct i2c_adapter sis5595_adapter = {
         .algo           = &smbus_algorithm,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = {
+static const struct pci_device_id sis5595_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 19b8505d0cdd..c6366733008d 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -510,7 +510,7 @@ static struct i2c_adapter sis630_adapter = {
         .retries        = 3
 };
 
-static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {
+static const struct pci_device_id sis630_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) },
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_964) },
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index f8aa0c29f02b..8dc2fc5f74ff 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -244,7 +244,7 @@ static struct i2c_adapter sis96x_adapter = {
         .algo           = &smbus_algorithm,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = {
+static const struct pci_device_id sis96x_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
index 9cf715d69551..872016196ef3 100644
--- a/drivers/i2c/busses/i2c-st.c
+++ b/drivers/i2c/busses/i2c-st.c
@@ -574,7 +574,7 @@ static irqreturn_t st_i2c_isr_thread(int irq, void *data)
                 writel_relaxed(it, i2c_dev->base + SSC_IEN);
 
                 st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STOPG);
-                c->result = -EIO;
+                c->result = -EAGAIN;
                 break;
 
         default:
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 5b80ef310841..29b1fb778943 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -911,7 +911,7 @@ static int stu300_probe(struct platform_device *pdev)
         adap = &dev->adapter;
         adap->owner = THIS_MODULE;
         /* DDC class but actually often used for more generic I2C */
-        adap->class = I2C_CLASS_DDC;
+        adap->class = I2C_CLASS_DDC | I2C_CLASS_DEPRECATED;
         strlcpy(adap->name, "ST Microelectronics DDC I2C adapter",
                 sizeof(adap->name));
         adap->nr = bus_nr;
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 9704537aee3c..00f04cb5b4eb 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -794,7 +794,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
 
         i2c_set_adapdata(&i2c_dev->adapter, i2c_dev);
         i2c_dev->adapter.owner = THIS_MODULE;
-        i2c_dev->adapter.class = I2C_CLASS_HWMON;
+        i2c_dev->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_DEPRECATED;
         strlcpy(i2c_dev->adapter.name, "Tegra I2C adapter",
                 sizeof(i2c_dev->adapter.name));
         i2c_dev->adapter.algo = &tegra_i2c_algo;
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 49d7f14b9d27..f4a1ed757612 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -88,7 +88,7 @@ static struct i2c_adapter vt586b_adapter = {
 };
 
 
-static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = {
+static const struct pci_device_id vt586b_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3) },
         { 0, }
 };
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 40d36df678de..6841200b6e50 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -442,7 +442,7 @@ release_region:
         return error;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = {
+static const struct pci_device_id vt596_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596_3),
           .driver_data = SMBBA1 },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596B_3),
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 28107502517f..7731f1795869 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -684,7 +684,7 @@ static const struct i2c_algorithm xiic_algorithm = {
 static struct i2c_adapter xiic_adapter = {
         .owner          = THIS_MODULE,
         .name           = DRIVER_NAME,
-        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
+        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD | I2C_CLASS_DEPRECATED,
         .algo           = &xiic_algorithm,
 };
 
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 2d1d2c5653fb..cb66f9586f76 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -556,7 +556,7 @@ static struct platform_driver scx200_pci_driver = {
         .remove = scx200_remove,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = {
+static const struct pci_device_id scx200_isa[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
         { 0, }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5fb80b8962a2..7c7f4b856bad 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -48,10 +48,13 @@
 #include <linux/rwsem.h>
 #include <linux/pm_runtime.h>
 #include <linux/acpi.h>
+#include <linux/jump_label.h>
 #include <asm/uaccess.h>
 
 #include "i2c-core.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/i2c.h>
 
 /* core_lock protects i2c_adapter_idr, and guarantees
    that device detection, deletion of detected devices, and attach_adapter
@@ -62,6 +65,18 @@ static DEFINE_IDR(i2c_adapter_idr);
 static struct device_type i2c_client_type;
 static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
 
+static struct static_key i2c_trace_msg = STATIC_KEY_INIT_FALSE;
+
+void i2c_transfer_trace_reg(void)
+{
+        static_key_slow_inc(&i2c_trace_msg);
+}
+
+void i2c_transfer_trace_unreg(void)
+{
+        static_key_slow_dec(&i2c_trace_msg);
+}
+
 /* ------------------------------------------------------------------------- */
 
 static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
@@ -1686,6 +1701,7 @@ static void __exit i2c_exit(void)
         class_compat_unregister(i2c_adapter_compat_class);
 #endif
         bus_unregister(&i2c_bus_type);
+        tracepoint_synchronize_unregister();
 }
 
 /* We must initialize early, because some subsystems register i2c drivers
@@ -1716,6 +1732,19 @@ int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
         unsigned long orig_jiffies;
         int ret, try;
 
+        /* i2c_trace_msg gets enabled when tracepoint i2c_transfer gets
+         * enabled.  This is an efficient way of keeping the for-loop from
+         * being executed when not needed.
+         */
+        if (static_key_false(&i2c_trace_msg)) {
+                int i;
+                for (i = 0; i < num; i++)
+                        if (msgs[i].flags & I2C_M_RD)
+                                trace_i2c_read(adap, &msgs[i], i);
+                        else
+                                trace_i2c_write(adap, &msgs[i], i);
+        }
+
         /* Retry automatically on arbitration loss */
         orig_jiffies = jiffies;
         for (ret = 0, try = 0; try <= adap->retries; try++) {
@@ -1726,6 +1755,14 @@ int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                         break;
         }
 
+        if (static_key_false(&i2c_trace_msg)) {
+                int i;
+                for (i = 0; i < ret; i++)
+                        if (msgs[i].flags & I2C_M_RD)
+                                trace_i2c_reply(adap, &msgs[i], i);
+                trace_i2c_result(adap, i, ret);
+        }
+
         return ret;
 }
 EXPORT_SYMBOL(__i2c_transfer);
@@ -1941,6 +1978,13 @@ static int i2c_detect_address(struct i2c_client *temp_client,
                 struct i2c_client *client;
 
                 /* Detection succeeded, instantiate the device */
+                if (adapter->class & I2C_CLASS_DEPRECATED)
+                        dev_warn(&adapter->dev,
+                                "This adapter will soon drop class based instantiation of devices. "
+                                "Please make sure client 0x%02x gets instantiated by other means. "
+                                "Check 'Documentation/i2c/instantiating-devices' for details.\n",
+                                info.addr);
+
                 dev_dbg(&adapter->dev, "Creating %s at 0x%02x\n",
                         info.type, info.addr);
                 client = i2c_new_device(adapter, &info);
@@ -2521,6 +2565,14 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
         int try;
         s32 res;
 
+        /* If enabled, the following two tracepoints are conditional on
+         * read_write and protocol.
+         */
+        trace_smbus_write(adapter, addr, flags, read_write,
+                          command, protocol, data);
+        trace_smbus_read(adapter, addr, flags, read_write,
+                         command, protocol);
+
         flags &= I2C_M_TEN | I2C_CLIENT_PEC | I2C_CLIENT_SCCB;
 
         if (adapter->algo->smbus_xfer) {
@@ -2541,15 +2593,24 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
                 i2c_unlock_adapter(adapter);
 
                 if (res != -EOPNOTSUPP || !adapter->algo->master_xfer)
-                        return res;
+                        goto trace;
                 /*
                  * Fall back to i2c_smbus_xfer_emulated if the adapter doesn't
                  * implement native support for the SMBus operation.
                  */
         }
 
-        return i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
-                                       command, protocol, data);
+        res = i2c_smbus_xfer_emulated(adapter, addr, flags, read_write,
+                                      command, protocol, data);
+
+trace:
+        /* If enabled, the reply tracepoint is conditional on read_write. */
+        trace_smbus_reply(adapter, addr, flags, read_write,
+                          command, protocol, data);
+        trace_smbus_result(adapter, addr, flags, read_write,
+                           command, protocol, res);
+
+        return res;
 }
 EXPORT_SYMBOL(i2c_smbus_xfer);
 
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 51493ed4643b..a43220c2e3d9 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -196,6 +196,53 @@ static struct cpuidle_state snb_cstates[] = {
                 .enter = NULL }
 };
 
+static struct cpuidle_state byt_cstates[] = {
+        {
+                .name = "C1-BYT",
+                .desc = "MWAIT 0x00",
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 1,
+                .target_residency = 1,
+                .enter = &intel_idle },
+        {
+                .name = "C1E-BYT",
+                .desc = "MWAIT 0x01",
+                .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 15,
+                .target_residency = 30,
+                .enter = &intel_idle },
+        {
+                .name = "C6N-BYT",
+                .desc = "MWAIT 0x58",
+                .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 40,
+                .target_residency = 275,
+                .enter = &intel_idle },
+        {
+                .name = "C6S-BYT",
+                .desc = "MWAIT 0x52",
+                .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 140,
+                .target_residency = 560,
+                .enter = &intel_idle },
+        {
+                .name = "C7-BYT",
+                .desc = "MWAIT 0x60",
+                .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 1200,
+                .target_residency = 1500,
+                .enter = &intel_idle },
+        {
+                .name = "C7S-BYT",
+                .desc = "MWAIT 0x64",
+                .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 10000,
+                .target_residency = 20000,
+                .enter = &intel_idle },
+        {
+                .enter = NULL }
+};
+
 static struct cpuidle_state ivb_cstates[] = {
         {
                 .name = "C1-IVB",
@@ -236,6 +283,105 @@ static struct cpuidle_state ivb_cstates[] = {
                 .enter = NULL }
 };
 
+static struct cpuidle_state ivt_cstates[] = {
+        {
+                .name = "C1-IVT",
+                .desc = "MWAIT 0x00",
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 1,
+                .target_residency = 1,
+                .enter = &intel_idle },
+        {
+                .name = "C1E-IVT",
+                .desc = "MWAIT 0x01",
+                .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 10,
+                .target_residency = 80,
+                .enter = &intel_idle },
+        {
+                .name = "C3-IVT",
+                .desc = "MWAIT 0x10",
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 59,
+                .target_residency = 156,
+                .enter = &intel_idle },
+        {
+                .name = "C6-IVT",
+                .desc = "MWAIT 0x20",
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 82,
+                .target_residency = 300,
+                .enter = &intel_idle },
+        {
+                .enter = NULL }
+};
+
+static struct cpuidle_state ivt_cstates_4s[] = {
+        {
+                .name = "C1-IVT-4S",
+                .desc = "MWAIT 0x00",
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 1,
+                .target_residency = 1,
+                .enter = &intel_idle },
+        {
+                .name = "C1E-IVT-4S",
+                .desc = "MWAIT 0x01",
+                .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 10,
+                .target_residency = 250,
+                .enter = &intel_idle },
+        {
+                .name = "C3-IVT-4S",
+                .desc = "MWAIT 0x10",
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 59,
+                .target_residency = 300,
+                .enter = &intel_idle },
+        {
+                .name = "C6-IVT-4S",
+                .desc = "MWAIT 0x20",
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 84,
+                .target_residency = 400,
+                .enter = &intel_idle },
+        {
+                .enter = NULL }
+};
+
+static struct cpuidle_state ivt_cstates_8s[] = {
+        {
+                .name = "C1-IVT-8S",
+                .desc = "MWAIT 0x00",
+                .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 1,
+                .target_residency = 1,
+                .enter = &intel_idle },
+        {
+                .name = "C1E-IVT-8S",
+                .desc = "MWAIT 0x01",
+                .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+                .exit_latency = 10,
+                .target_residency = 500,
+                .enter = &intel_idle },
+        {
+                .name = "C3-IVT-8S",
+                .desc = "MWAIT 0x10",
+                .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 59,
+                .target_residency = 600,
+                .enter = &intel_idle },
+        {
+                .name = "C6-IVT-8S",
+                .desc = "MWAIT 0x20",
+                .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+                .exit_latency = 88,
+                .target_residency = 700,
+                .enter = &intel_idle },
+        {
+                .enter = NULL }
+};
+
 static struct cpuidle_state hsw_cstates[] = {
         {
                 .name = "C1-HSW",
@@ -464,11 +610,21 @@ static const struct idle_cpu idle_cpu_snb = {
         .disable_promotion_to_c1e = true,
 };
 
+static const struct idle_cpu idle_cpu_byt = {
+        .state_table = byt_cstates,
+        .disable_promotion_to_c1e = true,
+};
+
 static const struct idle_cpu idle_cpu_ivb = {
         .state_table = ivb_cstates,
         .disable_promotion_to_c1e = true,
 };
 
+static const struct idle_cpu idle_cpu_ivt = {
+        .state_table = ivt_cstates,
+        .disable_promotion_to_c1e = true,
+};
+
 static const struct idle_cpu idle_cpu_hsw = {
         .state_table = hsw_cstates,
         .disable_promotion_to_c1e = true,
@@ -494,8 +650,10 @@ static const struct x86_cpu_id intel_idle_ids[] = {
         ICPU(0x2f, idle_cpu_nehalem),
         ICPU(0x2a, idle_cpu_snb),
         ICPU(0x2d, idle_cpu_snb),
+        ICPU(0x36, idle_cpu_atom),
+        ICPU(0x37, idle_cpu_byt),
         ICPU(0x3a, idle_cpu_ivb),
-        ICPU(0x3e, idle_cpu_ivb),
+        ICPU(0x3e, idle_cpu_ivt),
         ICPU(0x3c, idle_cpu_hsw),
         ICPU(0x3f, idle_cpu_hsw),
         ICPU(0x45, idle_cpu_hsw),
@@ -572,6 +730,39 @@ static void intel_idle_cpuidle_devices_uninit(void)
         free_percpu(intel_idle_cpuidle_devices);
         return;
 }
+
+/*
+ * intel_idle_state_table_update()
+ *
+ * Update the default state_table for this CPU-id
+ *
+ * Currently used to access tuned IVT multi-socket targets
+ * Assumption: num_sockets == (max_package_num + 1)
+ */
+void intel_idle_state_table_update(void)
+{
+        /* IVT uses a different table for 1-2, 3-4, and > 4 sockets */
+        if (boot_cpu_data.x86_model == 0x3e) { /* IVT */
+                int cpu, package_num, num_sockets = 1;
+
+                for_each_online_cpu(cpu) {
+                        package_num = topology_physical_package_id(cpu);
+                        if (package_num + 1 > num_sockets) {
+                                num_sockets = package_num + 1;
+
+                                if (num_sockets > 4)
+                                        cpuidle_state_table = ivt_cstates_8s;
+                                        return;
+                        }
+                }
+
+                if (num_sockets > 2)
+                        cpuidle_state_table = ivt_cstates_4s;
+                /* else, 1 and 2 socket systems use default ivt_cstates */
+        }
+        return;
+}
+
 /*
  * intel_idle_cpuidle_driver_init()
  * allocate, initialize cpuidle_states
@@ -581,10 +772,12 @@ static int __init intel_idle_cpuidle_driver_init(void)
         int cstate;
         struct cpuidle_driver *drv = &intel_idle_driver;
 
+        intel_idle_state_table_update();
+
         drv->state_count = 1;
 
         for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {
-                int num_substates, mwait_hint, mwait_cstate, mwait_substate;
+                int num_substates, mwait_hint, mwait_cstate;
 
                 if (cpuidle_state_table[cstate].enter == NULL)
                         break;
@@ -597,14 +790,13 @@ static int __init intel_idle_cpuidle_driver_init(void)
 
                 mwait_hint = flg2MWAIT(cpuidle_state_table[cstate].flags);
                 mwait_cstate = MWAIT_HINT2CSTATE(mwait_hint);
-                mwait_substate = MWAIT_HINT2SUBSTATE(mwait_hint);
 
-                /* does the state exist in CPUID.MWAIT? */
+                /* number of sub-states for this state in CPUID.MWAIT */
                 num_substates = (mwait_substates >> ((mwait_cstate + 1) * 4))
                                         & MWAIT_SUBSTATE_MASK;
 
-                /* if sub-state in table is not enumerated by CPUID */
-                if ((mwait_substate + 1) > num_substates)
+                /* if NO sub-states for this state in CPUID, skip it */
+                if (num_substates == 0)
                         continue;
 
                 if (((mwait_cstate + 1) > 2) &&
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 8ee228e9ab5a..c98fdb185931 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -51,6 +51,8 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn);
 static int
 isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                struct isert_rdma_wr *wr);
+static int
+isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd);
 
 static void
 isert_qp_event_callback(struct ib_event *e, void *context)
@@ -87,7 +89,8 @@ isert_query_device(struct ib_device *ib_dev, struct ib_device_attr *devattr)
 }
 
 static int
-isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id)
+isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id,
+                    u8 protection)
 {
         struct isert_device *device = isert_conn->conn_device;
         struct ib_qp_init_attr attr;
@@ -119,6 +122,8 @@ isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id)
         attr.cap.max_recv_sge = 1;
         attr.sq_sig_type = IB_SIGNAL_REQ_WR;
         attr.qp_type = IB_QPT_RC;
+        if (protection)
+                attr.create_flags |= IB_QP_CREATE_SIGNATURE_EN;
 
         pr_debug("isert_conn_setup_qp cma_id->device: %p\n",
                  cma_id->device);
@@ -226,7 +231,8 @@ isert_create_device_ib_res(struct isert_device *device)
                 return ret;
 
         /* asign function handlers */
-        if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
+        if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS &&
+            dev_attr->device_cap_flags & IB_DEVICE_SIGNATURE_HANDOVER) {
                 device->use_fastreg = 1;
                 device->reg_rdma_mem = isert_reg_rdma;
                 device->unreg_rdma_mem = isert_unreg_rdma;
@@ -236,13 +242,18 @@ isert_create_device_ib_res(struct isert_device *device)
                 device->unreg_rdma_mem = isert_unmap_cmd;
         }
 
+        /* Check signature cap */
+        device->pi_capable = dev_attr->device_cap_flags &
+                             IB_DEVICE_SIGNATURE_HANDOVER ? true : false;
+
         device->cqs_used = min_t(int, num_online_cpus(),
                                  device->ib_device->num_comp_vectors);
         device->cqs_used = min(ISERT_MAX_CQ, device->cqs_used);
         pr_debug("Using %d CQs, device %s supports %d vectors support "
-                 "Fast registration %d\n",
+                 "Fast registration %d pi_capable %d\n",
                  device->cqs_used, device->ib_device->name,
-                 device->ib_device->num_comp_vectors, device->use_fastreg);
+                 device->ib_device->num_comp_vectors, device->use_fastreg,
+                 device->pi_capable);
         device->cq_desc = kzalloc(sizeof(struct isert_cq_desc) *
                                 device->cqs_used, GFP_KERNEL);
         if (!device->cq_desc) {
@@ -395,6 +406,12 @@ isert_conn_free_fastreg_pool(struct isert_conn *isert_conn)
                 list_del(&fr_desc->list);
                 ib_free_fast_reg_page_list(fr_desc->data_frpl);
                 ib_dereg_mr(fr_desc->data_mr);
+                if (fr_desc->pi_ctx) {
+                        ib_free_fast_reg_page_list(fr_desc->pi_ctx->prot_frpl);
+                        ib_dereg_mr(fr_desc->pi_ctx->prot_mr);
+                        ib_destroy_mr(fr_desc->pi_ctx->sig_mr);
+                        kfree(fr_desc->pi_ctx);
+                }
                 kfree(fr_desc);
                 ++i;
         }
@@ -406,8 +423,10 @@ isert_conn_free_fastreg_pool(struct isert_conn *isert_conn)
 
 static int
 isert_create_fr_desc(struct ib_device *ib_device, struct ib_pd *pd,
-                     struct fast_reg_descriptor *fr_desc)
+                     struct fast_reg_descriptor *fr_desc, u8 protection)
 {
+        int ret;
+
         fr_desc->data_frpl = ib_alloc_fast_reg_page_list(ib_device,
                                                          ISCSI_ISER_SG_TABLESIZE);
         if (IS_ERR(fr_desc->data_frpl)) {
@@ -420,27 +439,88 @@ isert_create_fr_desc(struct ib_device *ib_device, struct ib_pd *pd,
         if (IS_ERR(fr_desc->data_mr)) {
                 pr_err("Failed to allocate data frmr err=%ld\n",
                        PTR_ERR(fr_desc->data_mr));
-                ib_free_fast_reg_page_list(fr_desc->data_frpl);
-                return PTR_ERR(fr_desc->data_mr);
+                ret = PTR_ERR(fr_desc->data_mr);
+                goto err_data_frpl;
         }
         pr_debug("Create fr_desc %p page_list %p\n",
                  fr_desc, fr_desc->data_frpl->page_list);
+        fr_desc->ind |= ISERT_DATA_KEY_VALID;
+
+        if (protection) {
+                struct ib_mr_init_attr mr_init_attr = {0};
+                struct pi_context *pi_ctx;
+
+                fr_desc->pi_ctx = kzalloc(sizeof(*fr_desc->pi_ctx), GFP_KERNEL);
+                if (!fr_desc->pi_ctx) {
+                        pr_err("Failed to allocate pi context\n");
+                        ret = -ENOMEM;
+                        goto err_data_mr;
+                }
+                pi_ctx = fr_desc->pi_ctx;
+
+                pi_ctx->prot_frpl = ib_alloc_fast_reg_page_list(ib_device,
+                                                    ISCSI_ISER_SG_TABLESIZE);
+                if (IS_ERR(pi_ctx->prot_frpl)) {
+                        pr_err("Failed to allocate prot frpl err=%ld\n",
+                               PTR_ERR(pi_ctx->prot_frpl));
+                        ret = PTR_ERR(pi_ctx->prot_frpl);
+                        goto err_pi_ctx;
+                }
 
-        fr_desc->valid = true;
+                pi_ctx->prot_mr = ib_alloc_fast_reg_mr(pd, ISCSI_ISER_SG_TABLESIZE);
+                if (IS_ERR(pi_ctx->prot_mr)) {
+                        pr_err("Failed to allocate prot frmr err=%ld\n",
+                               PTR_ERR(pi_ctx->prot_mr));
+                        ret = PTR_ERR(pi_ctx->prot_mr);
+                        goto err_prot_frpl;
+                }
+                fr_desc->ind |= ISERT_PROT_KEY_VALID;
+
+                mr_init_attr.max_reg_descriptors = 2;
+                mr_init_attr.flags |= IB_MR_SIGNATURE_EN;
+                pi_ctx->sig_mr = ib_create_mr(pd, &mr_init_attr);
+                if (IS_ERR(pi_ctx->sig_mr)) {
+                        pr_err("Failed to allocate signature enabled mr err=%ld\n",
+                               PTR_ERR(pi_ctx->sig_mr));
+                        ret = PTR_ERR(pi_ctx->sig_mr);
+                        goto err_prot_mr;
+                }
+                fr_desc->ind |= ISERT_SIG_KEY_VALID;
+        }
+        fr_desc->ind &= ~ISERT_PROTECTED;
 
         return 0;
+err_prot_mr:
+        ib_dereg_mr(fr_desc->pi_ctx->prot_mr);
+err_prot_frpl:
+        ib_free_fast_reg_page_list(fr_desc->pi_ctx->prot_frpl);
+err_pi_ctx:
+        kfree(fr_desc->pi_ctx);
+err_data_mr:
+        ib_dereg_mr(fr_desc->data_mr);
+err_data_frpl:
+        ib_free_fast_reg_page_list(fr_desc->data_frpl);
+
+        return ret;
 }
 
 static int
-isert_conn_create_fastreg_pool(struct isert_conn *isert_conn)
+isert_conn_create_fastreg_pool(struct isert_conn *isert_conn, u8 pi_support)
 {
         struct fast_reg_descriptor *fr_desc;
         struct isert_device *device = isert_conn->conn_device;
-        int i, ret;
+        struct se_session *se_sess = isert_conn->conn->sess->se_sess;
+        struct se_node_acl *se_nacl = se_sess->se_node_acl;
+        int i, ret, tag_num;
+        /*
+         * Setup the number of FRMRs based upon the number of tags
+         * available to session in iscsi_target_locate_portal().
+         */
+        tag_num = max_t(u32, ISCSIT_MIN_TAGS, se_nacl->queue_depth);
+        tag_num = (tag_num * 2) + ISCSIT_EXTRA_TAGS;
 
-        INIT_LIST_HEAD(&isert_conn->conn_fr_pool);
         isert_conn->conn_fr_pool_size = 0;
-        for (i = 0; i < ISCSI_DEF_XMIT_CMDS_MAX; i++) {
+        for (i = 0; i < tag_num; i++) {
                 fr_desc = kzalloc(sizeof(*fr_desc), GFP_KERNEL);
                 if (!fr_desc) {
                         pr_err("Failed to allocate fast_reg descriptor\n");
@@ -449,7 +529,8 @@ isert_conn_create_fastreg_pool(struct isert_conn *isert_conn)
                 }
 
                 ret = isert_create_fr_desc(device->ib_device,
-                                           isert_conn->conn_pd, fr_desc);
+                                           isert_conn->conn_pd, fr_desc,
+                                           pi_support);
                 if (ret) {
                         pr_err("Failed to create fastreg descriptor err=%d\n",
                                ret);
@@ -480,6 +561,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         struct isert_device *device;
         struct ib_device *ib_dev = cma_id->device;
         int ret = 0;
+        u8 pi_support = np->tpg_np->tpg->tpg_attrib.t10_pi;
 
         pr_debug("Entering isert_connect_request cma_id: %p, context: %p\n",
                  cma_id, cma_id->context);
@@ -498,6 +580,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         kref_get(&isert_conn->conn_kref);
         mutex_init(&isert_conn->conn_mutex);
         spin_lock_init(&isert_conn->conn_lock);
+        INIT_LIST_HEAD(&isert_conn->conn_fr_pool);
 
         cma_id->context = isert_conn;
         isert_conn->conn_cm_id = cma_id;
@@ -569,16 +652,13 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
                 goto out_mr;
         }
 
-        if (device->use_fastreg) {
-                ret = isert_conn_create_fastreg_pool(isert_conn);
-                if (ret) {
-                        pr_err("Conn: %p failed to create fastreg pool\n",
-                               isert_conn);
-                        goto out_fastreg;
-                }
+        if (pi_support && !device->pi_capable) {
+                pr_err("Protection information requested but not supported\n");
+                ret = -EINVAL;
+                goto out_mr;
         }
 
-        ret = isert_conn_setup_qp(isert_conn, cma_id);
+        ret = isert_conn_setup_qp(isert_conn, cma_id, pi_support);
         if (ret)
                 goto out_conn_dev;
 
@@ -591,9 +671,6 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         return 0;
 
 out_conn_dev:
-        if (device->use_fastreg)
-                isert_conn_free_fastreg_pool(isert_conn);
-out_fastreg:
         ib_dereg_mr(isert_conn->conn_mr);
 out_mr:
         ib_dealloc_pd(isert_conn->conn_pd);
@@ -967,6 +1044,18 @@ isert_put_login_tx(struct iscsi_conn *conn, struct iscsi_login *login,
         }
         if (!login->login_failed) {
                 if (login->login_complete) {
+                        if (isert_conn->conn_device->use_fastreg) {
+                                u8 pi_support = login->np->tpg_np->tpg->tpg_attrib.t10_pi;
+
+                                ret = isert_conn_create_fastreg_pool(isert_conn,
+                                                                     pi_support);
+                                if (ret) {
+                                        pr_err("Conn: %p failed to create"
+                                               " fastreg pool\n", isert_conn);
+                                        return ret;
+                                }
+                        }
+
                         ret = isert_alloc_rx_descriptors(isert_conn);
                         if (ret)
                                 return ret;
@@ -1392,19 +1481,60 @@ isert_rx_completion(struct iser_rx_desc *desc, struct isert_conn *isert_conn,
         }
 }
 
+static int
+isert_map_data_buf(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
+                   struct scatterlist *sg, u32 nents, u32 length, u32 offset,
+                   enum iser_ib_op_code op, struct isert_data_buf *data)
+{
+        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+
+        data->dma_dir = op == ISER_IB_RDMA_WRITE ?
+                              DMA_TO_DEVICE : DMA_FROM_DEVICE;
+
+        data->len = length - offset;
+        data->offset = offset;
+        data->sg_off = data->offset / PAGE_SIZE;
+
+        data->sg = &sg[data->sg_off];
+        data->nents = min_t(unsigned int, nents - data->sg_off,
+                                          ISCSI_ISER_SG_TABLESIZE);
+        data->len = min_t(unsigned int, data->len, ISCSI_ISER_SG_TABLESIZE *
+                                        PAGE_SIZE);
+
+        data->dma_nents = ib_dma_map_sg(ib_dev, data->sg, data->nents,
+                                        data->dma_dir);
+        if (unlikely(!data->dma_nents)) {
+                pr_err("Cmd: unable to dma map SGs %p\n", sg);
+                return -EINVAL;
+        }
+
+        pr_debug("Mapped cmd: %p count: %u sg: %p sg_nents: %u rdma_len %d\n",
+                 isert_cmd, data->dma_nents, data->sg, data->nents, data->len);
+
+        return 0;
+}
+
+static void
+isert_unmap_data_buf(struct isert_conn *isert_conn, struct isert_data_buf *data)
+{
+        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+
+        ib_dma_unmap_sg(ib_dev, data->sg, data->nents, data->dma_dir);
+        memset(data, 0, sizeof(*data));
+}
+
+
+
 static void
 isert_unmap_cmd(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
 {
         struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
 
         pr_debug("isert_unmap_cmd: %p\n", isert_cmd);
-        if (wr->sge) {
+
+        if (wr->data.sg) {
                 pr_debug("isert_unmap_cmd: %p unmap_sg op\n", isert_cmd);
-                ib_dma_unmap_sg(ib_dev, wr->sge, wr->num_sge,
-                                (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                                DMA_TO_DEVICE : DMA_FROM_DEVICE);
-                wr->sge = NULL;
+                isert_unmap_data_buf(isert_conn, &wr->data);
         }
 
         if (wr->send_wr) {
@@ -1424,7 +1554,6 @@ static void
 isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
 {
         struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
         LIST_HEAD(unmap_list);
 
         pr_debug("unreg_fastreg_cmd: %p\n", isert_cmd);
@@ -1432,18 +1561,19 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
         if (wr->fr_desc) {
                 pr_debug("unreg_fastreg_cmd: %p free fr_desc %p\n",
                          isert_cmd, wr->fr_desc);
+                if (wr->fr_desc->ind & ISERT_PROTECTED) {
+                        isert_unmap_data_buf(isert_conn, &wr->prot);
+                        wr->fr_desc->ind &= ~ISERT_PROTECTED;
+                }
                 spin_lock_bh(&isert_conn->conn_lock);
                 list_add_tail(&wr->fr_desc->list, &isert_conn->conn_fr_pool);
                 spin_unlock_bh(&isert_conn->conn_lock);
                 wr->fr_desc = NULL;
         }
 
-        if (wr->sge) {
+        if (wr->data.sg) {
                 pr_debug("unreg_fastreg_cmd: %p unmap_sg op\n", isert_cmd);
-                ib_dma_unmap_sg(ib_dev, wr->sge, wr->num_sge,
-                                (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                                DMA_TO_DEVICE : DMA_FROM_DEVICE);
-                wr->sge = NULL;
+                isert_unmap_data_buf(isert_conn, &wr->data);
         }
 
         wr->ib_sge = NULL;
@@ -1451,7 +1581,7 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
 }
 
 static void
-isert_put_cmd(struct isert_cmd *isert_cmd)
+isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)
 {
         struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
         struct isert_conn *isert_conn = isert_cmd->conn;
@@ -1467,8 +1597,21 @@ isert_put_cmd(struct isert_cmd *isert_cmd)
                         list_del_init(&cmd->i_conn_node);
                 spin_unlock_bh(&conn->cmd_lock);
 
-                if (cmd->data_direction == DMA_TO_DEVICE)
+                if (cmd->data_direction == DMA_TO_DEVICE) {
                         iscsit_stop_dataout_timer(cmd);
+                        /*
+                         * Check for special case during comp_err where
+                         * WRITE_PENDING has been handed off from core,
+                         * but requires an extra target_put_sess_cmd()
+                         * before transport_generic_free_cmd() below.
+                         */
+                        if (comp_err &&
+                            cmd->se_cmd.t_state == TRANSPORT_WRITE_PENDING) {
+                                struct se_cmd *se_cmd = &cmd->se_cmd;
+
+                                target_put_sess_cmd(se_cmd->se_sess, se_cmd);
+                        }
+                }
 
                 device->unreg_rdma_mem(isert_cmd, isert_conn);
                 transport_generic_free_cmd(&cmd->se_cmd, 0);
@@ -1523,7 +1666,7 @@ isert_unmap_tx_desc(struct iser_tx_desc *tx_desc, struct ib_device *ib_dev)
 
 static void
 isert_completion_put(struct iser_tx_desc *tx_desc, struct isert_cmd *isert_cmd,
-                     struct ib_device *ib_dev)
+                     struct ib_device *ib_dev, bool comp_err)
 {
         if (isert_cmd->pdu_buf_dma != 0) {
                 pr_debug("Calling ib_dma_unmap_single for isert_cmd->pdu_buf_dma\n");
@@ -1533,7 +1676,77 @@ isert_completion_put(struct iser_tx_desc *tx_desc, struct isert_cmd *isert_cmd,
         }
 
         isert_unmap_tx_desc(tx_desc, ib_dev);
-        isert_put_cmd(isert_cmd);
+        isert_put_cmd(isert_cmd, comp_err);
+}
+
+static int
+isert_check_pi_status(struct se_cmd *se_cmd, struct ib_mr *sig_mr)
+{
+        struct ib_mr_status mr_status;
+        int ret;
+
+        ret = ib_check_mr_status(sig_mr, IB_MR_CHECK_SIG_STATUS, &mr_status);
+        if (ret) {
+                pr_err("ib_check_mr_status failed, ret %d\n", ret);
+                goto fail_mr_status;
+        }
+
+        if (mr_status.fail_status & IB_MR_CHECK_SIG_STATUS) {
+                u64 sec_offset_err;
+                u32 block_size = se_cmd->se_dev->dev_attrib.block_size + 8;
+
+                switch (mr_status.sig_err.err_type) {
+                case IB_SIG_BAD_GUARD:
+                        se_cmd->pi_err = TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED;
+                        break;
+                case IB_SIG_BAD_REFTAG:
+                        se_cmd->pi_err = TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED;
+                        break;
+                case IB_SIG_BAD_APPTAG:
+                        se_cmd->pi_err = TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED;
+                        break;
+                }
+                sec_offset_err = mr_status.sig_err.sig_err_offset;
+                do_div(sec_offset_err, block_size);
+                se_cmd->bad_sector = sec_offset_err + se_cmd->t_task_lba;
+
+                pr_err("isert: PI error found type %d at sector 0x%llx "
+                       "expected 0x%x vs actual 0x%x\n",
+                       mr_status.sig_err.err_type,
+                       (unsigned long long)se_cmd->bad_sector,
+                       mr_status.sig_err.expected,
+                       mr_status.sig_err.actual);
+                ret = 1;
+        }
+
+fail_mr_status:
+        return ret;
+}
+
+static void
+isert_completion_rdma_write(struct iser_tx_desc *tx_desc,
+                            struct isert_cmd *isert_cmd)
+{
+        struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
+        struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
+        struct se_cmd *se_cmd = &cmd->se_cmd;
+        struct isert_conn *isert_conn = isert_cmd->conn;
+        struct isert_device *device = isert_conn->conn_device;
+        int ret = 0;
+
+        if (wr->fr_desc && wr->fr_desc->ind & ISERT_PROTECTED) {
+                ret = isert_check_pi_status(se_cmd,
+                                            wr->fr_desc->pi_ctx->sig_mr);
+                wr->fr_desc->ind &= ~ISERT_PROTECTED;
+        }
+
+        device->unreg_rdma_mem(isert_cmd, isert_conn);
+        wr->send_wr_num = 0;
+        if (ret)
+                transport_send_check_condition_and_sense(se_cmd,
+                                                         se_cmd->pi_err, 0);
+        else
+                isert_put_response(isert_conn->conn, cmd);
 }
 
 static void
@@ -1545,10 +1758,17 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
         struct se_cmd *se_cmd = &cmd->se_cmd;
         struct isert_conn *isert_conn = isert_cmd->conn;
         struct isert_device *device = isert_conn->conn_device;
+        int ret = 0;
+
+        if (wr->fr_desc && wr->fr_desc->ind & ISERT_PROTECTED) {
+                ret = isert_check_pi_status(se_cmd,
+                                            wr->fr_desc->pi_ctx->sig_mr);
+                wr->fr_desc->ind &= ~ISERT_PROTECTED;
+        }
 
         iscsit_stop_dataout_timer(cmd);
         device->unreg_rdma_mem(isert_cmd, isert_conn);
-        cmd->write_data_done = wr->cur_rdma_length;
+        cmd->write_data_done = wr->data.len;
         wr->send_wr_num = 0;
 
         pr_debug("Cmd: %p RDMA_READ comp calling execute_cmd\n", isert_cmd);
@@ -1557,7 +1777,11 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
         cmd->i_state = ISTATE_RECEIVED_LAST_DATAOUT;
         spin_unlock_bh(&cmd->istate_lock);
 
-        target_execute_cmd(se_cmd);
+        if (ret)
+                transport_send_check_condition_and_sense(se_cmd,
+                                                         se_cmd->pi_err, 0);
+        else
+                target_execute_cmd(se_cmd);
 }
 
 static void
@@ -1577,14 +1801,14 @@ isert_do_control_comp(struct work_struct *work)
                 iscsit_tmr_post_handler(cmd, cmd->conn);
 
                 cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev);
+                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
                 break;
         case ISTATE_SEND_REJECT:
                 pr_debug("Got isert_do_control_comp ISTATE_SEND_REJECT: >>>\n");
                 atomic_dec(&isert_conn->post_send_buf_count);
 
                 cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev);
+                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
                 break;
         case ISTATE_SEND_LOGOUTRSP:
                 pr_debug("Calling iscsit_logout_post_handler >>>>>>>>>>>>>>\n");
@@ -1598,7 +1822,7 @@ isert_do_control_comp(struct work_struct *work)
         case ISTATE_SEND_TEXTRSP:
                 atomic_dec(&isert_conn->post_send_buf_count);
                 cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev);
+                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
                 break;
         default:
                 pr_err("Unknown do_control_comp i_state %d\n", cmd->i_state);
@@ -1626,10 +1850,21 @@ isert_response_completion(struct iser_tx_desc *tx_desc,
                 queue_work(isert_comp_wq, &isert_cmd->comp_work);
                 return;
         }
-        atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
+
+        /**
+         * If send_wr_num is 0 this means that we got
+         * RDMA completion and we cleared it and we should
+         * simply decrement the response post. else the
+         * response is incorporated in send_wr_num, just
+         * sub it.
+         **/
+        if (wr->send_wr_num)
+                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
+        else
+                atomic_dec(&isert_conn->post_send_buf_count);
 
         cmd->i_state = ISTATE_SENT_STATUS;
-        isert_completion_put(tx_desc, isert_cmd, ib_dev);
+        isert_completion_put(tx_desc, isert_cmd, ib_dev, false);
 }
 
 static void
@@ -1658,8 +1893,9 @@ __isert_send_completion(struct iser_tx_desc *tx_desc,
                                           isert_conn, ib_dev);
                 break;
         case ISER_IB_RDMA_WRITE:
-                pr_err("isert_send_completion: Got ISER_IB_RDMA_WRITE\n");
-                dump_stack();
+                pr_debug("isert_send_completion: Got ISER_IB_RDMA_WRITE\n");
+                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
+                isert_completion_rdma_write(tx_desc, isert_cmd);
                 break;
         case ISER_IB_RDMA_READ:
                 pr_debug("isert_send_completion: Got ISER_IB_RDMA_READ:\n");
@@ -1709,8 +1945,20 @@ isert_cq_drain_comp_llist(struct isert_conn *isert_conn, struct ib_device *ib_de
                 llnode = llist_next(llnode);
                 wr = &t->isert_cmd->rdma_wr;
 
-                atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
-                isert_completion_put(t, t->isert_cmd, ib_dev);
+                /**
+                 * If send_wr_num is 0 this means that we got
+                 * RDMA completion and we cleared it and we should
+                 * simply decrement the response post. else the
+                 * response is incorporated in send_wr_num, just
+                 * sub it.
+                 **/
+                if (wr->send_wr_num)
+                        atomic_sub(wr->send_wr_num,
+                                   &isert_conn->post_send_buf_count);
+                else
+                        atomic_dec(&isert_conn->post_send_buf_count);
+
+                isert_completion_put(t, t->isert_cmd, ib_dev, true);
         }
 }
 
@@ -1728,15 +1976,27 @@ isert_cq_tx_comp_err(struct iser_tx_desc *tx_desc, struct isert_conn *isert_conn
                 llnode = llist_next(llnode);
                 wr = &t->isert_cmd->rdma_wr;
 
-                atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
-                isert_completion_put(t, t->isert_cmd, ib_dev);
+                /**
+                 * If send_wr_num is 0 this means that we got
+                 * RDMA completion and we cleared it and we should
+                 * simply decrement the response post. else the
+                 * response is incorporated in send_wr_num, just
+                 * sub it.
+                 **/
+                if (wr->send_wr_num)
+                        atomic_sub(wr->send_wr_num,
+                                   &isert_conn->post_send_buf_count);
+                else
+                        atomic_dec(&isert_conn->post_send_buf_count);
+
+                isert_completion_put(t, t->isert_cmd, ib_dev, true);
         }
         tx_desc->comp_llnode_batch = NULL;
 
         if (!isert_cmd)
                 isert_unmap_tx_desc(tx_desc, ib_dev);
         else
-                isert_completion_put(tx_desc, isert_cmd, ib_dev);
+                isert_completion_put(tx_desc, isert_cmd, ib_dev, true);
 }
 
 static void
@@ -1918,6 +2178,36 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
         return isert_post_response(isert_conn, isert_cmd);
 }
 
+static void
+isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
+{
+        struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
+        struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
+        struct isert_device *device = isert_conn->conn_device;
+
+        spin_lock_bh(&conn->cmd_lock);
+        if (!list_empty(&cmd->i_conn_node))
+                list_del_init(&cmd->i_conn_node);
+        spin_unlock_bh(&conn->cmd_lock);
+
+        if (cmd->data_direction == DMA_TO_DEVICE)
+                iscsit_stop_dataout_timer(cmd);
+
+        device->unreg_rdma_mem(isert_cmd, isert_conn);
+}
+
+static enum target_prot_op
+isert_get_sup_prot_ops(struct iscsi_conn *conn)
+{
+        struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
+        struct isert_device *device = isert_conn->conn_device;
+
+        if (device->pi_capable)
+                return TARGET_PROT_ALL;
+
+        return TARGET_PROT_NORMAL;
+}
+
 static int
 isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn,
                 bool nopout_response)
@@ -2099,54 +2389,39 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         struct se_cmd *se_cmd = &cmd->se_cmd;
         struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
         struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+        struct isert_data_buf *data = &wr->data;
         struct ib_send_wr *send_wr;
         struct ib_sge *ib_sge;
-        struct scatterlist *sg_start;
-        u32 sg_off = 0, sg_nents;
-        u32 offset = 0, data_len, data_left, rdma_write_max, va_offset = 0;
-        int ret = 0, count, i, ib_sge_cnt;
+        u32 offset, data_len, data_left, rdma_write_max, va_offset = 0;
+        int ret = 0, i, ib_sge_cnt;
 
-        if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
-                data_left = se_cmd->data_length;
-        } else {
-                sg_off = cmd->write_data_done / PAGE_SIZE;
-                data_left = se_cmd->data_length - cmd->write_data_done;
-                offset = cmd->write_data_done;
-                isert_cmd->tx_desc.isert_cmd = isert_cmd;
-        }
+        isert_cmd->tx_desc.isert_cmd = isert_cmd;
 
-        sg_start = &cmd->se_cmd.t_data_sg[sg_off];
-        sg_nents = se_cmd->t_data_nents - sg_off;
+        offset = wr->iser_ib_op == ISER_IB_RDMA_READ ? cmd->write_data_done : 0;
+        ret = isert_map_data_buf(isert_conn, isert_cmd, se_cmd->t_data_sg,
+                                 se_cmd->t_data_nents, se_cmd->data_length,
+                                 offset, wr->iser_ib_op, &wr->data);
+        if (ret)
+                return ret;
 
-        count = ib_dma_map_sg(ib_dev, sg_start, sg_nents,
-                              (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                              DMA_TO_DEVICE : DMA_FROM_DEVICE);
-        if (unlikely(!count)) {
-                pr_err("Cmd: %p unrable to map SGs\n", isert_cmd);
-                return -EINVAL;
-        }
-        wr->sge = sg_start;
-        wr->num_sge = sg_nents;
-        wr->cur_rdma_length = data_left;
-        pr_debug("Mapped cmd: %p count: %u sg: %p sg_nents: %u rdma_len %d\n",
-                 isert_cmd, count, sg_start, sg_nents, data_left);
+        data_left = data->len;
+        offset = data->offset;
 
-        ib_sge = kzalloc(sizeof(struct ib_sge) * sg_nents, GFP_KERNEL);
+        ib_sge = kzalloc(sizeof(struct ib_sge) * data->nents, GFP_KERNEL);
         if (!ib_sge) {
                 pr_warn("Unable to allocate ib_sge\n");
                 ret = -ENOMEM;
-                goto unmap_sg;
+                goto unmap_cmd;
         }
         wr->ib_sge = ib_sge;
 
-        wr->send_wr_num = DIV_ROUND_UP(sg_nents, isert_conn->max_sge);
+        wr->send_wr_num = DIV_ROUND_UP(data->nents, isert_conn->max_sge);
         wr->send_wr = kzalloc(sizeof(struct ib_send_wr) * wr->send_wr_num,
                                 GFP_KERNEL);
         if (!wr->send_wr) {
                 pr_debug("Unable to allocate wr->send_wr\n");
                 ret = -ENOMEM;
-                goto unmap_sg;
+                goto unmap_cmd;
         }
 
         wr->isert_cmd = isert_cmd;
@@ -2185,10 +2460,9 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         }
 
         return 0;
-unmap_sg:
-        ib_dma_unmap_sg(ib_dev, sg_start, sg_nents,
-                        (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                        DMA_TO_DEVICE : DMA_FROM_DEVICE);
+unmap_cmd:
+        isert_unmap_data_buf(isert_conn, data);
+
         return ret;
 }
 
@@ -2232,49 +2506,70 @@ isert_map_fr_pagelist(struct ib_device *ib_dev,
 }
 
 static int
-isert_fast_reg_mr(struct fast_reg_descriptor *fr_desc,
-                  struct isert_conn *isert_conn, struct scatterlist *sg_start,
-                  struct ib_sge *ib_sge, u32 sg_nents, u32 offset,
-                  unsigned int data_len)
+isert_fast_reg_mr(struct isert_conn *isert_conn,
+                  struct fast_reg_descriptor *fr_desc,
+                  struct isert_data_buf *mem,
+                  enum isert_indicator ind,
+                  struct ib_sge *sge)
 {
         struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+        struct ib_mr *mr;
+        struct ib_fast_reg_page_list *frpl;
         struct ib_send_wr fr_wr, inv_wr;
         struct ib_send_wr *bad_wr, *wr = NULL;
         int ret, pagelist_len;
         u32 page_off;
         u8 key;
 
-        sg_nents = min_t(unsigned int, sg_nents, ISCSI_ISER_SG_TABLESIZE);
-        page_off = offset % PAGE_SIZE;
+        if (mem->dma_nents == 1) {
+                sge->lkey = isert_conn->conn_mr->lkey;
+                sge->addr = ib_sg_dma_address(ib_dev, &mem->sg[0]);
+                sge->length = ib_sg_dma_len(ib_dev, &mem->sg[0]);
+                pr_debug("%s:%d sge: addr: 0x%llx  length: %u lkey: %x\n",
+                         __func__, __LINE__, sge->addr, sge->length,
+                         sge->lkey);
+                return 0;
+        }
+
+        if (ind == ISERT_DATA_KEY_VALID) {
+                /* Registering data buffer */
+                mr = fr_desc->data_mr;
+                frpl = fr_desc->data_frpl;
+        } else {
+                /* Registering protection buffer */
+                mr = fr_desc->pi_ctx->prot_mr;
+                frpl = fr_desc->pi_ctx->prot_frpl;
+        }
+
+        page_off = mem->offset % PAGE_SIZE;
 
         pr_debug("Use fr_desc %p sg_nents %d offset %u\n",
-                 fr_desc, sg_nents, offset);
+                 fr_desc, mem->nents, mem->offset);
 
-        pagelist_len = isert_map_fr_pagelist(ib_dev, sg_start, sg_nents,
-                                             &fr_desc->data_frpl->page_list[0]);
+        pagelist_len = isert_map_fr_pagelist(ib_dev, mem->sg, mem->nents,
+                                             &frpl->page_list[0]);
 
-        if (!fr_desc->valid) {
+        if (!(fr_desc->ind & ISERT_DATA_KEY_VALID)) {
                 memset(&inv_wr, 0, sizeof(inv_wr));
                 inv_wr.wr_id = ISER_FASTREG_LI_WRID;
                 inv_wr.opcode = IB_WR_LOCAL_INV;
-                inv_wr.ex.invalidate_rkey = fr_desc->data_mr->rkey;
+                inv_wr.ex.invalidate_rkey = mr->rkey;
                 wr = &inv_wr;
                 /* Bump the key */
-                key = (u8)(fr_desc->data_mr->rkey & 0x000000FF);
-                ib_update_fast_reg_key(fr_desc->data_mr, ++key);
+                key = (u8)(mr->rkey & 0x000000FF);
+                ib_update_fast_reg_key(mr, ++key);
         }
 
         /* Prepare FASTREG WR */
         memset(&fr_wr, 0, sizeof(fr_wr));
         fr_wr.wr_id = ISER_FASTREG_LI_WRID;
         fr_wr.opcode = IB_WR_FAST_REG_MR;
-        fr_wr.wr.fast_reg.iova_start =
-                fr_desc->data_frpl->page_list[0] + page_off;
-        fr_wr.wr.fast_reg.page_list = fr_desc->data_frpl;
+        fr_wr.wr.fast_reg.iova_start = frpl->page_list[0] + page_off;
+        fr_wr.wr.fast_reg.page_list = frpl;
         fr_wr.wr.fast_reg.page_list_len = pagelist_len;
         fr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
-        fr_wr.wr.fast_reg.length = data_len;
-        fr_wr.wr.fast_reg.rkey = fr_desc->data_mr->rkey;
+        fr_wr.wr.fast_reg.length = mem->len;
+        fr_wr.wr.fast_reg.rkey = mr->rkey;
         fr_wr.wr.fast_reg.access_flags = IB_ACCESS_LOCAL_WRITE;
 
         if (!wr)
@@ -2287,15 +2582,157 @@ isert_fast_reg_mr(struct fast_reg_descriptor *fr_desc,
                 pr_err("fast registration failed, ret:%d\n", ret);
                 return ret;
         }
-        fr_desc->valid = false;
+        fr_desc->ind &= ~ind;
+
+        sge->lkey = mr->lkey;
+        sge->addr = frpl->page_list[0] + page_off;
+        sge->length = mem->len;
+
+        pr_debug("%s:%d sge: addr: 0x%llx  length: %u lkey: %x\n",
+                 __func__, __LINE__, sge->addr, sge->length,
+                 sge->lkey);
+
+        return ret;
+}
+
+static inline enum ib_t10_dif_type
+se2ib_prot_type(enum target_prot_type prot_type)
+{
+        switch (prot_type) {
+        case TARGET_DIF_TYPE0_PROT:
+                return IB_T10DIF_NONE;
+        case TARGET_DIF_TYPE1_PROT:
+                return IB_T10DIF_TYPE1;
+        case TARGET_DIF_TYPE2_PROT:
+                return IB_T10DIF_TYPE2;
+        case TARGET_DIF_TYPE3_PROT:
+                return IB_T10DIF_TYPE3;
+        default:
+                return IB_T10DIF_NONE;
+        }
+}
 
-        ib_sge->lkey = fr_desc->data_mr->lkey;
-        ib_sge->addr = fr_desc->data_frpl->page_list[0] + page_off;
-        ib_sge->length = data_len;
+static int
+isert_set_sig_attrs(struct se_cmd *se_cmd, struct ib_sig_attrs *sig_attrs)
+{
+        enum ib_t10_dif_type ib_prot_type = se2ib_prot_type(se_cmd->prot_type);
+
+        sig_attrs->mem.sig_type = IB_SIG_TYPE_T10_DIF;
+        sig_attrs->wire.sig_type = IB_SIG_TYPE_T10_DIF;
+        sig_attrs->mem.sig.dif.pi_interval =
+                                se_cmd->se_dev->dev_attrib.block_size;
+        sig_attrs->wire.sig.dif.pi_interval =
+                                se_cmd->se_dev->dev_attrib.block_size;
+
+        switch (se_cmd->prot_op) {
+        case TARGET_PROT_DIN_INSERT:
+        case TARGET_PROT_DOUT_STRIP:
+                sig_attrs->mem.sig.dif.type = IB_T10DIF_NONE;
+                sig_attrs->wire.sig.dif.type = ib_prot_type;
+                sig_attrs->wire.sig.dif.bg_type = IB_T10DIF_CRC;
+                sig_attrs->wire.sig.dif.ref_tag = se_cmd->reftag_seed;
+                break;
+        case TARGET_PROT_DOUT_INSERT:
+        case TARGET_PROT_DIN_STRIP:
+                sig_attrs->mem.sig.dif.type = ib_prot_type;
+                sig_attrs->mem.sig.dif.bg_type = IB_T10DIF_CRC;
+                sig_attrs->mem.sig.dif.ref_tag = se_cmd->reftag_seed;
+                sig_attrs->wire.sig.dif.type = IB_T10DIF_NONE;
+                break;
+        case TARGET_PROT_DIN_PASS:
+        case TARGET_PROT_DOUT_PASS:
+                sig_attrs->mem.sig.dif.type = ib_prot_type;
+                sig_attrs->mem.sig.dif.bg_type = IB_T10DIF_CRC;
+                sig_attrs->mem.sig.dif.ref_tag = se_cmd->reftag_seed;
+                sig_attrs->wire.sig.dif.type = ib_prot_type;
+                sig_attrs->wire.sig.dif.bg_type = IB_T10DIF_CRC;
+                sig_attrs->wire.sig.dif.ref_tag = se_cmd->reftag_seed;
+                break;
+        default:
+                pr_err("Unsupported PI operation %d\n", se_cmd->prot_op);
+                return -EINVAL;
+        }
 
-        pr_debug("RDMA ib_sge: addr: 0x%16llx  length: %u lkey: %08x\n",
-                 ib_sge->addr, ib_sge->length, ib_sge->lkey);
+        return 0;
+}
+
+static inline u8
+isert_set_prot_checks(u8 prot_checks)
+{
+        return (prot_checks & TARGET_DIF_CHECK_GUARD  ? 0xc0 : 0) |
+               (prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x30 : 0) |
+               (prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x0f : 0);
+}
+
+static int
+isert_reg_sig_mr(struct isert_conn *isert_conn, struct se_cmd *se_cmd,
+                 struct fast_reg_descriptor *fr_desc,
+                 struct ib_sge *data_sge, struct ib_sge *prot_sge,
+                 struct ib_sge *sig_sge)
+{
+        struct ib_send_wr sig_wr, inv_wr;
+        struct ib_send_wr *bad_wr, *wr = NULL;
+        struct pi_context *pi_ctx = fr_desc->pi_ctx;
+        struct ib_sig_attrs sig_attrs;
+        int ret;
+        u32 key;
+
+        memset(&sig_attrs, 0, sizeof(sig_attrs));
+        ret = isert_set_sig_attrs(se_cmd, &sig_attrs);
+        if (ret)
+                goto err;
+
+        sig_attrs.check_mask = isert_set_prot_checks(se_cmd->prot_checks);
+
+        if (!(fr_desc->ind & ISERT_SIG_KEY_VALID)) {
+                memset(&inv_wr, 0, sizeof(inv_wr));
+                inv_wr.opcode = IB_WR_LOCAL_INV;
+                inv_wr.wr_id = ISER_FASTREG_LI_WRID;
+                inv_wr.ex.invalidate_rkey = pi_ctx->sig_mr->rkey;
+                wr = &inv_wr;
+                /* Bump the key */
+                key = (u8)(pi_ctx->sig_mr->rkey & 0x000000FF);
+                ib_update_fast_reg_key(pi_ctx->sig_mr, ++key);
+        }
+
+        memset(&sig_wr, 0, sizeof(sig_wr));
+        sig_wr.opcode = IB_WR_REG_SIG_MR;
+        sig_wr.wr_id = ISER_FASTREG_LI_WRID;
+        sig_wr.sg_list = data_sge;
+        sig_wr.num_sge = 1;
+        sig_wr.wr.sig_handover.access_flags = IB_ACCESS_LOCAL_WRITE;
+        sig_wr.wr.sig_handover.sig_attrs = &sig_attrs;
+        sig_wr.wr.sig_handover.sig_mr = pi_ctx->sig_mr;
+        if (se_cmd->t_prot_sg)
+                sig_wr.wr.sig_handover.prot = prot_sge;
+
+        if (!wr)
+                wr = &sig_wr;
+        else
+                wr->next = &sig_wr;
+
+        ret = ib_post_send(isert_conn->conn_qp, wr, &bad_wr);
+        if (ret) {
+                pr_err("fast registration failed, ret:%d\n", ret);
+                goto err;
+        }
+        fr_desc->ind &= ~ISERT_SIG_KEY_VALID;
+
+        sig_sge->lkey = pi_ctx->sig_mr->lkey;
+        sig_sge->addr = 0;
+        sig_sge->length = se_cmd->data_length;
+        if (se_cmd->prot_op != TARGET_PROT_DIN_STRIP &&
+            se_cmd->prot_op != TARGET_PROT_DOUT_INSERT)
+                /*
+                 * We have protection guards on the wire
+                 * so we need to set a larget transfer
+                 */
+                sig_sge->length += se_cmd->prot_length;
 
+        pr_debug("sig_sge: addr: 0x%llx  length: %u lkey: %x\n",
+                 sig_sge->addr, sig_sge->length,
+                 sig_sge->lkey);
+err:
         return ret;
 }
 
@@ -2305,62 +2742,82 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
 {
         struct se_cmd *se_cmd = &cmd->se_cmd;
         struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
-        struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+        struct isert_conn *isert_conn = conn->context;
+        struct ib_sge data_sge;
         struct ib_send_wr *send_wr;
-        struct ib_sge *ib_sge;
-        struct scatterlist *sg_start;
-        struct fast_reg_descriptor *fr_desc;
-        u32 sg_off = 0, sg_nents;
-        u32 offset = 0, data_len, data_left, rdma_write_max;
-        int ret = 0, count;
+        struct fast_reg_descriptor *fr_desc = NULL;
+        u32 offset;
+        int ret = 0;
         unsigned long flags;
 
-        if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
-                data_left = se_cmd->data_length;
-        } else {
-                offset = cmd->write_data_done;
-                sg_off = offset / PAGE_SIZE;
-                data_left = se_cmd->data_length - cmd->write_data_done;
-                isert_cmd->tx_desc.isert_cmd = isert_cmd;
-        }
+        isert_cmd->tx_desc.isert_cmd = isert_cmd;
 
-        sg_start = &cmd->se_cmd.t_data_sg[sg_off];
-        sg_nents = se_cmd->t_data_nents - sg_off;
+        offset = wr->iser_ib_op == ISER_IB_RDMA_READ ? cmd->write_data_done : 0;
+        ret = isert_map_data_buf(isert_conn, isert_cmd, se_cmd->t_data_sg,
+                                 se_cmd->t_data_nents, se_cmd->data_length,
+                                 offset, wr->iser_ib_op, &wr->data);
+        if (ret)
+                return ret;
 
-        count = ib_dma_map_sg(ib_dev, sg_start, sg_nents,
-                              (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                              DMA_TO_DEVICE : DMA_FROM_DEVICE);
-        if (unlikely(!count)) {
-                pr_err("Cmd: %p unrable to map SGs\n", isert_cmd);
-                return -EINVAL;
+        if (wr->data.dma_nents != 1 ||
+            se_cmd->prot_op != TARGET_PROT_NORMAL) {
+                spin_lock_irqsave(&isert_conn->conn_lock, flags);
+                fr_desc = list_first_entry(&isert_conn->conn_fr_pool,
+                                           struct fast_reg_descriptor, list);
+                list_del(&fr_desc->list);
+                spin_unlock_irqrestore(&isert_conn->conn_lock, flags);
+                wr->fr_desc = fr_desc;
         }
-        wr->sge = sg_start;
-        wr->num_sge = sg_nents;
-        pr_debug("Mapped cmd: %p count: %u sg: %p sg_nents: %u rdma_len %d\n",
-                 isert_cmd, count, sg_start, sg_nents, data_left);
 
-        memset(&wr->s_ib_sge, 0, sizeof(*ib_sge));
-        ib_sge = &wr->s_ib_sge;
-        wr->ib_sge = ib_sge;
+        ret = isert_fast_reg_mr(isert_conn, fr_desc, &wr->data,
+                                ISERT_DATA_KEY_VALID, &data_sge);
+        if (ret)
+                goto unmap_cmd;
+
+        if (se_cmd->prot_op != TARGET_PROT_NORMAL) {
+                struct ib_sge prot_sge, sig_sge;
+
+                if (se_cmd->t_prot_sg) {
+                        ret = isert_map_data_buf(isert_conn, isert_cmd,
+                                                 se_cmd->t_prot_sg,
+                                                 se_cmd->t_prot_nents,
+                                                 se_cmd->prot_length,
+                                                 0, wr->iser_ib_op, &wr->prot);
+                        if (ret)
+                                goto unmap_cmd;
+
+                        ret = isert_fast_reg_mr(isert_conn, fr_desc, &wr->prot,
+                                                ISERT_PROT_KEY_VALID, &prot_sge);
+                        if (ret)
+                                goto unmap_prot_cmd;
+                }
+
+                ret = isert_reg_sig_mr(isert_conn, se_cmd, fr_desc,
+                                       &data_sge, &prot_sge, &sig_sge);
+                if (ret)
+                        goto unmap_prot_cmd;
 
+                fr_desc->ind |= ISERT_PROTECTED;
+                memcpy(&wr->s_ib_sge, &sig_sge, sizeof(sig_sge));
+        } else
+                memcpy(&wr->s_ib_sge, &data_sge, sizeof(data_sge));
+
+        wr->ib_sge = &wr->s_ib_sge;
         wr->send_wr_num = 1;
         memset(&wr->s_send_wr, 0, sizeof(*send_wr));
         wr->send_wr = &wr->s_send_wr;
-
         wr->isert_cmd = isert_cmd;
-        rdma_write_max = ISCSI_ISER_SG_TABLESIZE * PAGE_SIZE;
 
         send_wr = &isert_cmd->rdma_wr.s_send_wr;
-        send_wr->sg_list = ib_sge;
+        send_wr->sg_list = &wr->s_ib_sge;
         send_wr->num_sge = 1;
         send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc;
         if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
                 send_wr->opcode = IB_WR_RDMA_WRITE;
                 send_wr->wr.rdma.remote_addr = isert_cmd->read_va;
                 send_wr->wr.rdma.rkey = isert_cmd->read_stag;
-                send_wr->send_flags = 0;
-                send_wr->next = &isert_cmd->tx_desc.send_wr;
+                send_wr->send_flags = se_cmd->prot_op == TARGET_PROT_NORMAL ?
+                                      0 : IB_SEND_SIGNALED;
         } else {
                 send_wr->opcode = IB_WR_RDMA_READ;
                 send_wr->wr.rdma.remote_addr = isert_cmd->write_va;
@@ -2368,37 +2825,18 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                 send_wr->send_flags = IB_SEND_SIGNALED;
         }
 
-        data_len = min(data_left, rdma_write_max);
-        wr->cur_rdma_length = data_len;
-
-        /* if there is a single dma entry, dma mr is sufficient */
-        if (count == 1) {
-                ib_sge->addr = ib_sg_dma_address(ib_dev, &sg_start[0]);
-                ib_sge->length = ib_sg_dma_len(ib_dev, &sg_start[0]);
-                ib_sge->lkey = isert_conn->conn_mr->lkey;
-                wr->fr_desc = NULL;
-        } else {
+        return 0;
+unmap_prot_cmd:
+        if (se_cmd->t_prot_sg)
+                isert_unmap_data_buf(isert_conn, &wr->prot);
+unmap_cmd:
+        if (fr_desc) {
                 spin_lock_irqsave(&isert_conn->conn_lock, flags);
-                fr_desc = list_first_entry(&isert_conn->conn_fr_pool,
-                                           struct fast_reg_descriptor, list);
-                list_del(&fr_desc->list);
+                list_add_tail(&fr_desc->list, &isert_conn->conn_fr_pool);
                 spin_unlock_irqrestore(&isert_conn->conn_lock, flags);
-                wr->fr_desc = fr_desc;
-
-                ret = isert_fast_reg_mr(fr_desc, isert_conn, sg_start,
-                                        ib_sge, sg_nents, offset, data_len);
-                if (ret) {
-                        list_add_tail(&fr_desc->list, &isert_conn->conn_fr_pool);
-                        goto unmap_sg;
-                }
         }
+        isert_unmap_data_buf(isert_conn, &wr->data);
 
-        return 0;
-
-unmap_sg:
-        ib_dma_unmap_sg(ib_dev, sg_start, sg_nents,
-                        (wr->iser_ib_op == ISER_IB_RDMA_WRITE) ?
-                        DMA_TO_DEVICE : DMA_FROM_DEVICE);
         return ret;
 }
 
@@ -2422,25 +2860,35 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
                 return rc;
         }
 
-        /*
-         * Build isert_conn->tx_desc for iSCSI response PDU and attach
-         */
-        isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc);
-        iscsit_build_rsp_pdu(cmd, conn, true, (struct iscsi_scsi_rsp *)
-                             &isert_cmd->tx_desc.iscsi_header);
-        isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
-        isert_init_send_wr(isert_conn, isert_cmd,
-                           &isert_cmd->tx_desc.send_wr, true);
+        if (se_cmd->prot_op == TARGET_PROT_NORMAL) {
+                /*
+                 * Build isert_conn->tx_desc for iSCSI response PDU and attach
+                 */
+                isert_create_send_desc(isert_conn, isert_cmd,
+                                       &isert_cmd->tx_desc);
+                iscsit_build_rsp_pdu(cmd, conn, true, (struct iscsi_scsi_rsp *)
+                                     &isert_cmd->tx_desc.iscsi_header);
+                isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
+                isert_init_send_wr(isert_conn, isert_cmd,
+                                   &isert_cmd->tx_desc.send_wr, true);
+                isert_cmd->rdma_wr.s_send_wr.next = &isert_cmd->tx_desc.send_wr;
+                wr->send_wr_num += 1;
+        }
 
-        atomic_add(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
+        atomic_add(wr->send_wr_num, &isert_conn->post_send_buf_count);
 
         rc = ib_post_send(isert_conn->conn_qp, wr->send_wr, &wr_failed);
         if (rc) {
                 pr_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
-                atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
+                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
         }
-        pr_debug("Cmd: %p posted RDMA_WRITE + Response for iSER Data READ\n",
-                 isert_cmd);
+
+        if (se_cmd->prot_op == TARGET_PROT_NORMAL)
+                pr_debug("Cmd: %p posted RDMA_WRITE + Response for iSER Data "
+                         "READ\n", isert_cmd);
+        else
+                pr_debug("Cmd: %p posted RDMA_WRITE for iSER Data READ\n",
+                         isert_cmd);
 
         return 1;
 }
@@ -2815,6 +3263,8 @@ static struct iscsit_transport iser_target_transport = {
         .iscsit_get_dataout     = isert_get_dataout,
         .iscsit_queue_data_in   = isert_put_datain,
         .iscsit_queue_status    = isert_put_response,
+        .iscsit_aborted_task    = isert_aborted_task,
+        .iscsit_get_sup_prot_ops = isert_get_sup_prot_ops,
 };
 
 static int __init isert_init(void)
diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index f6ae7f5dd408..4c072ae34c01 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -50,11 +50,35 @@ struct iser_tx_desc {
         struct ib_send_wr send_wr;
 } __packed;
 
+enum isert_indicator {
+        ISERT_PROTECTED         = 1 << 0,
+        ISERT_DATA_KEY_VALID    = 1 << 1,
+        ISERT_PROT_KEY_VALID    = 1 << 2,
+        ISERT_SIG_KEY_VALID     = 1 << 3,
+};
+
+struct pi_context {
+        struct ib_mr                   *prot_mr;
+        struct ib_fast_reg_page_list   *prot_frpl;
+        struct ib_mr                   *sig_mr;
+};
+
 struct fast_reg_descriptor {
-        struct list_head        list;
-        struct ib_mr            *data_mr;
-        struct ib_fast_reg_page_list    *data_frpl;
-        bool                    valid;
+        struct list_head                list;
+        struct ib_mr                   *data_mr;
+        struct ib_fast_reg_page_list   *data_frpl;
+        u8                              ind;
+        struct pi_context              *pi_ctx;
+};
+
+struct isert_data_buf {
+        struct scatterlist     *sg;
+        int                     nents;
+        u32                     sg_off;
+        u32                     len; /* cur_rdma_length */
+        u32                     offset;
+        unsigned int            dma_nents;
+        enum dma_data_direction dma_dir;
 };
 
 struct isert_rdma_wr {
@@ -63,12 +87,11 @@ struct isert_rdma_wr {
         enum iser_ib_op_code    iser_ib_op;
         struct ib_sge           *ib_sge;
         struct ib_sge           s_ib_sge;
-        int                     num_sge;
-        struct scatterlist      *sge;
         int                     send_wr_num;
         struct ib_send_wr       *send_wr;
         struct ib_send_wr       s_send_wr;
-        u32                     cur_rdma_length;
+        struct isert_data_buf   data;
+        struct isert_data_buf   prot;
         struct fast_reg_descriptor *fr_desc;
 };
 
@@ -141,6 +164,7 @@ struct isert_cq_desc {
 
 struct isert_device {
         int                     use_fastreg;
+        bool                    pi_capable;
         int                     cqs_used;
         int                     refcount;
         int                     cq_active_qps[ISERT_MAX_CQ];
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 0e537d8d0e47..fe09f2788b15 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1078,6 +1078,7 @@ static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,
 static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
                                  struct srpt_send_ioctx *ioctx)
 {
+        struct ib_device *dev = ch->sport->sdev->device;
         struct se_cmd *cmd;
         struct scatterlist *sg, *sg_orig;
         int sg_cnt;
@@ -1124,7 +1125,7 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
 
         db = ioctx->rbufs;
         tsize = cmd->data_length;
-        dma_len = sg_dma_len(&sg[0]);
+        dma_len = ib_sg_dma_len(dev, &sg[0]);
         riu = ioctx->rdma_ius;
 
         /*
@@ -1155,7 +1156,8 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
                                         ++j;
                                         if (j < count) {
                                                 sg = sg_next(sg);
-                                                dma_len = sg_dma_len(sg);
+                                                dma_len = ib_sg_dma_len(
+                                                                dev, sg);
                                         }
                                 }
                         } else {
@@ -1192,8 +1194,8 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
         tsize = cmd->data_length;
         riu = ioctx->rdma_ius;
         sg = sg_orig;
-        dma_len = sg_dma_len(&sg[0]);
-        dma_addr = sg_dma_address(&sg[0]);
+        dma_len = ib_sg_dma_len(dev, &sg[0]);
+        dma_addr = ib_sg_dma_address(dev, &sg[0]);
 
         /* this second loop is really mapped sg_addres to rdma_iu->ib_sge */
         for (i = 0, j = 0;
@@ -1216,8 +1218,10 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
                                         ++j;
                                         if (j < count) {
                                                 sg = sg_next(sg);
-                                                dma_len = sg_dma_len(sg);
-                                                dma_addr = sg_dma_address(sg);
+                                                dma_len = ib_sg_dma_len(
+                                                                dev, sg);
+                                                dma_addr = ib_sg_dma_address(
+                                                                dev, sg);
                                         }
                                 }
                         } else {
@@ -2580,7 +2584,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
                 goto destroy_ib;
         }
 
-        ch->sess = transport_init_session();
+        ch->sess = transport_init_session(TARGET_PROT_NORMAL);
         if (IS_ERR(ch->sess)) {
                 rej->reason = __constant_cpu_to_be32(
                                 SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
@@ -3081,6 +3085,14 @@ static void srpt_queue_tm_rsp(struct se_cmd *cmd)
         srpt_queue_response(cmd);
 }
 
+static void srpt_aborted_task(struct se_cmd *cmd)
+{
+        struct srpt_send_ioctx *ioctx = container_of(cmd,
+                                struct srpt_send_ioctx, cmd);
+
+        srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);
+}
+
 static int srpt_queue_status(struct se_cmd *cmd)
 {
         struct srpt_send_ioctx *ioctx;
@@ -3928,6 +3940,7 @@ static struct target_core_fabric_ops srpt_template = {
         .queue_data_in                  = srpt_queue_data_in,
         .queue_status                   = srpt_queue_status,
         .queue_tm_rsp                   = srpt_queue_tm_rsp,
+        .aborted_task                   = srpt_aborted_task,
         /*
          * Setup function pointers for generic logic in
          * target_core_fabric_configfs.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 44c358ecf5a1..6de9dfbf61c1 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -416,7 +416,7 @@ config LEDS_MC13783
         depends on MFD_MC13XXX
         help
           This option enable support for on-chip LED drivers found
-          on Freescale Semiconductor MC13783/MC13892 PMIC.
+          on Freescale Semiconductor MC13783/MC13892/MC34708 PMIC.
 
 config LEDS_NS2
         tristate "LED support for Network Space v2 GPIO LEDs"
@@ -474,7 +474,7 @@ config LEDS_LM355x
 
 config LEDS_OT200
         tristate "LED support for the Bachmann OT200"
-        depends on LEDS_CLASS && HAS_IOMEM
+        depends on LEDS_CLASS && HAS_IOMEM && (X86_32 || COMPILE_TEST)
         help
           This option enables support for the LEDs on the Bachmann OT200.
           Say Y to enable LEDs on the Bachmann OT200.
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index ce8921a753a3..71b40d3bf776 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -39,9 +39,11 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
         led_cdev->blink_delay_on = delay_on;
         led_cdev->blink_delay_off = delay_off;
 
-        /* never on - don't blink */
-        if (!delay_on)
+        /* never on - just set to off */
+        if (!delay_on) {
+                __led_set_brightness(led_cdev, LED_OFF);
                 return;
+        }
 
         /* never off - just set to brightness */
         if (!delay_off) {
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index e387f41a9cb7..c3734f10fdd5 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -13,7 +13,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
@@ -220,9 +219,12 @@ void led_trigger_unregister(struct led_trigger *trig)
 {
         struct led_classdev *led_cdev;
 
+        if (list_empty_careful(&trig->next_trig))
+                return;
+
         /* Remove from the list of led triggers */
         down_write(&triggers_list_lock);
-        list_del(&trig->next_trig);
+        list_del_init(&trig->next_trig);
         up_write(&triggers_list_lock);
 
         /* Remove anyone actively using this trigger */
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 5f588c0a376e..d1e1bca90d11 100644
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index 7e311a120b11..86b5bdb0c773 100644
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -15,7 +15,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 6de216a89a0c..70c74a7f0dfe 100644
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/slab.h>
diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index 66d0a57db221..d0452b099aee 100644
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
@@ -444,7 +443,7 @@ static void led_work(struct work_struct *work)
 {
         int ret;
         struct blinkm_led *led;
-        struct blinkm_data *data ;
+        struct blinkm_data *data;
         struct blinkm_work *blm_work = work_to_blmwork(work);
 
         led = blm_work->blinkm_led;
diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
index d93e2455da5c..f58a354428e3 100644
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -19,7 +19,7 @@ MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
 MODULE_DESCRIPTION("Clevo mail LED driver");
 MODULE_LICENSE("GPL");
 
-static bool __initdata nodetect;
+static bool nodetect;
 module_param_named(nodetect, nodetect, bool, 0);
 MODULE_PARM_DESC(nodetect, "Skip DMI hardware detection");
 
@@ -153,7 +153,7 @@ static struct led_classdev clevo_mail_led = {
         .flags                  = LED_CORE_SUSPENDRESUME,
 };
 
-static int clevo_mail_led_probe(struct platform_device *pdev)
+static int __init clevo_mail_led_probe(struct platform_device *pdev)
 {
         return led_classdev_register(&pdev->dev, &clevo_mail_led);
 }
@@ -165,7 +165,6 @@ static int clevo_mail_led_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver clevo_mail_led_driver = {
-        .probe          = clevo_mail_led_probe,
         .remove         = clevo_mail_led_remove,
         .driver         = {
                 .name           = KBUILD_MODNAME,
diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index 8abcb66db01c..910339d86edf 100644
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -3,7 +3,6 @@
  *
  * Control the Cobalt Qube/RaQ front LED
  */
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/leds.h>
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 2a4b87f8091a..35dffb100388 100644
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -14,7 +14,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
index 865d4faf874a..01486adc7f8b 100644
--- a/drivers/leds/leds-da9052.c
+++ b/drivers/leds/leds-da9052.c
@@ -14,7 +14,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
index b4d5a44cc41b..2b4dc738dcd6 100644
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/module.h>
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 78b0e273a903..57ff20fecf57 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -11,7 +11,6 @@
  *
  */
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
@@ -204,6 +203,9 @@ static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
                                 led.default_state = LEDS_GPIO_DEFSTATE_OFF;
                 }
 
+                if (of_get_property(child, "retain-state-suspended", NULL))
+                        led.retain_state_suspended = 1;
+
                 ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
                                       &pdev->dev, NULL);
                 if (ret < 0) {
@@ -224,6 +226,8 @@ static const struct of_device_id of_gpio_leds_match[] = {
         { .compatible = "gpio-leds", },
         {},
 };
+
+MODULE_DEVICE_TABLE(of, of_gpio_leds_match);
 #else /* CONFIG_OF_GPIO */
 static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
 {
diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
index 366b6055e330..d61a98896c71 100644
--- a/drivers/leds/leds-hp6xx.c
+++ b/drivers/leds/leds-hp6xx.c
@@ -12,7 +12,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <asm/hd64461.h>
diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index 027ede73b80d..e2c642c1169b 100644
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/leds.h>
 #include <linux/mfd/core.h>
 #include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 2ec34cfcedce..8ca197af2864 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/init.h>
 #include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 4ade66a2d9d4..cb5ed82994ba 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/init.h>
 #include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index bf006f4e44a0..ca85724ab138 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -13,7 +13,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/init.h>
 #include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
@@ -347,9 +346,9 @@ static void lp5562_write_program_memory(struct lp55xx_chip *chip,
 /* check the size of program count */
 static inline bool _is_pc_overflow(struct lp55xx_predef_pattern *ptn)
 {
-        return (ptn->size_r >= LP5562_PROGRAM_LENGTH ||
-                ptn->size_g >= LP5562_PROGRAM_LENGTH ||
-                ptn->size_b >= LP5562_PROGRAM_LENGTH);
+        return ptn->size_r >= LP5562_PROGRAM_LENGTH ||
+               ptn->size_g >= LP5562_PROGRAM_LENGTH ||
+               ptn->size_b >= LP5562_PROGRAM_LENGTH;
 }
 
 static int lp5562_run_predef_led_pattern(struct lp55xx_chip *chip, int mode)
diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index 3417e5be7b57..059f5b1f3553 100644
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index ca87a1b4a0db..f1db88e25138 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -1,5 +1,5 @@
 /*
- * LEDs driver for Freescale MC13783/MC13892
+ * LEDs driver for Freescale MC13783/MC13892/MC34708
  *
  * Copyright (C) 2010 Philippe Rétornaz
  *
@@ -17,57 +17,56 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/of.h>
 #include <linux/workqueue.h>
 #include <linux/mfd/mc13xxx.h>
 
-#define MC13XXX_REG_LED_CONTROL(x)      (51 + (x))
-
 struct mc13xxx_led_devtype {
         int     led_min;
         int     led_max;
         int     num_regs;
+        u32     ledctrl_base;
 };
 
 struct mc13xxx_led {
         struct led_classdev     cdev;
         struct work_struct      work;
-        struct mc13xxx          *master;
         enum led_brightness     new_brightness;
         int                     id;
+        struct mc13xxx_leds     *leds;
 };
 
 struct mc13xxx_leds {
+        struct mc13xxx                  *master;
         struct mc13xxx_led_devtype      *devtype;
         int                             num_leds;
-        struct mc13xxx_led              led[0];
+        struct mc13xxx_led              *led;
 };
 
+static unsigned int mc13xxx_max_brightness(int id)
+{
+        if (id >= MC13783_LED_MD && id <= MC13783_LED_KP)
+                return 0x0f;
+        else if (id >= MC13783_LED_R1 && id <= MC13783_LED_B3)
+                return 0x1f;
+
+        return 0x3f;
+}
+
 static void mc13xxx_led_work(struct work_struct *work)
 {
         struct mc13xxx_led *led = container_of(work, struct mc13xxx_led, work);
-        int reg, mask, value, bank, off, shift;
+        struct mc13xxx_leds *leds = led->leds;
+        unsigned int reg, bank, off, shift;
 
         switch (led->id) {
         case MC13783_LED_MD:
-                reg = MC13XXX_REG_LED_CONTROL(2);
-                shift = 9;
-                mask = 0x0f;
-                value = led->new_brightness >> 4;
-                break;
         case MC13783_LED_AD:
-                reg = MC13XXX_REG_LED_CONTROL(2);
-                shift = 13;
-                mask = 0x0f;
-                value = led->new_brightness >> 4;
-                break;
         case MC13783_LED_KP:
-                reg = MC13XXX_REG_LED_CONTROL(2);
-                shift = 17;
-                mask = 0x0f;
-                value = led->new_brightness >> 4;
+                reg = 2;
+                shift = 9 + (led->id - MC13783_LED_MD) * 4;
                 break;
         case MC13783_LED_R1:
         case MC13783_LED_G1:
@@ -80,44 +79,35 @@ static void mc13xxx_led_work(struct work_struct *work)
         case MC13783_LED_B3:
                 off = led->id - MC13783_LED_R1;
                 bank = off / 3;
-                reg = MC13XXX_REG_LED_CONTROL(3) + bank;
+                reg = 3 + bank;
                 shift = (off - bank * 3) * 5 + 6;
-                value = led->new_brightness >> 3;
-                mask = 0x1f;
                 break;
         case MC13892_LED_MD:
-                reg = MC13XXX_REG_LED_CONTROL(0);
-                shift = 3;
-                mask = 0x3f;
-                value = led->new_brightness >> 2;
-                break;
         case MC13892_LED_AD:
-                reg = MC13XXX_REG_LED_CONTROL(0);
-                shift = 15;
-                mask = 0x3f;
-                value = led->new_brightness >> 2;
-                break;
         case MC13892_LED_KP:
-                reg = MC13XXX_REG_LED_CONTROL(1);
-                shift = 3;
-                mask = 0x3f;
-                value = led->new_brightness >> 2;
+                reg = (led->id - MC13892_LED_MD) / 2;
+                shift = 3 + (led->id - MC13892_LED_MD) * 12;
                 break;
         case MC13892_LED_R:
         case MC13892_LED_G:
         case MC13892_LED_B:
                 off = led->id - MC13892_LED_R;
                 bank = off / 2;
-                reg = MC13XXX_REG_LED_CONTROL(2) + bank;
+                reg = 2 + bank;
                 shift = (off - bank * 2) * 12 + 3;
-                value = led->new_brightness >> 2;
-                mask = 0x3f;
+                break;
+        case MC34708_LED_R:
+        case MC34708_LED_G:
+                reg = 0;
+                shift = 3 + (led->id - MC34708_LED_R) * 12;
                 break;
         default:
                 BUG();
         }
 
-        mc13xxx_reg_rmw(led->master, reg, mask << shift, value << shift);
+        mc13xxx_reg_rmw(leds->master, leds->devtype->ledctrl_base + reg,
+                        mc13xxx_max_brightness(led->id) << shift,
+                        led->new_brightness << shift);
 }
 
 static void mc13xxx_led_set(struct led_classdev *led_cdev,
@@ -130,47 +120,121 @@ static void mc13xxx_led_set(struct led_classdev *led_cdev,
         schedule_work(&led->work);
 }
 
-static int __init mc13xxx_led_probe(struct platform_device *pdev)
+#ifdef CONFIG_OF
+static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
+        struct platform_device *pdev)
 {
-        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-        struct mc13xxx *mcdev = dev_get_drvdata(pdev->dev.parent);
-        struct mc13xxx_led_devtype *devtype =
-                (struct mc13xxx_led_devtype *)pdev->id_entry->driver_data;
-        struct mc13xxx_leds *leds;
-        int i, id, num_leds, ret = -ENODATA;
-        u32 reg, init_led = 0;
+        struct mc13xxx_leds *leds = platform_get_drvdata(pdev);
+        struct mc13xxx_leds_platform_data *pdata;
+        struct device_node *parent, *child;
+        struct device *dev = &pdev->dev;
+        int i = 0, ret = -ENODATA;
+
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return ERR_PTR(-ENOMEM);
+
+        of_node_get(dev->parent->of_node);
+
+        parent = of_find_node_by_name(dev->parent->of_node, "leds");
+        if (!parent)
+                goto out_node_put;
 
-        if (!pdata) {
-                dev_err(&pdev->dev, "Missing platform data\n");
-                return -ENODEV;
+        ret = of_property_read_u32_array(parent, "led-control",
+                                         pdata->led_control,
+                                         leds->devtype->num_regs);
+        if (ret)
+                goto out_node_put;
+
+        pdata->num_leds = of_get_child_count(parent);
+
+        pdata->led = devm_kzalloc(dev, pdata->num_leds * sizeof(*pdata->led),
+                                  GFP_KERNEL);
+        if (!pdata->led) {
+                ret = -ENOMEM;
+                goto out_node_put;
         }
 
-        num_leds = pdata->num_leds;
+        for_each_child_of_node(parent, child) {
+                const char *str;
+                u32 tmp;
 
-        if ((num_leds < 1) ||
-            (num_leds > (devtype->led_max - devtype->led_min + 1))) {
-                dev_err(&pdev->dev, "Invalid LED count %d\n", num_leds);
-                return -EINVAL;
+                if (of_property_read_u32(child, "reg", &tmp))
+                        continue;
+                pdata->led[i].id = leds->devtype->led_min + tmp;
+
+                if (!of_property_read_string(child, "label", &str))
+                        pdata->led[i].name = str;
+                if (!of_property_read_string(child, "linux,default-trigger",
+                                             &str))
+                        pdata->led[i].default_trigger = str;
+
+                i++;
         }
 
-        leds = devm_kzalloc(&pdev->dev, num_leds * sizeof(struct mc13xxx_led) +
-                            sizeof(struct mc13xxx_leds), GFP_KERNEL);
+        pdata->num_leds = i;
+        ret = i > 0 ? 0 : -ENODATA;
+
+out_node_put:
+        of_node_put(parent);
+
+        return ret ? ERR_PTR(ret) : pdata;
+}
+#else
+static inline struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
+        struct platform_device *pdev)
+{
+        return ERR_PTR(-ENOSYS);
+}
+#endif
+
+static int __init mc13xxx_led_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(dev);
+        struct mc13xxx *mcdev = dev_get_drvdata(dev->parent);
+        struct mc13xxx_led_devtype *devtype =
+                (struct mc13xxx_led_devtype *)pdev->id_entry->driver_data;
+        struct mc13xxx_leds *leds;
+        int i, id, ret = -ENODATA;
+        u32 init_led = 0;
+
+        leds = devm_kzalloc(dev, sizeof(*leds), GFP_KERNEL);
         if (!leds)
                 return -ENOMEM;
 
         leds->devtype = devtype;
-        leds->num_leds = num_leds;
+        leds->master = mcdev;
         platform_set_drvdata(pdev, leds);
 
+        if (dev->parent->of_node) {
+                pdata = mc13xxx_led_probe_dt(pdev);
+                if (IS_ERR(pdata))
+                        return PTR_ERR(pdata);
+        } else if (!pdata)
+                return -ENODATA;
+
+        leds->num_leds = pdata->num_leds;
+
+        if ((leds->num_leds < 1) ||
+            (leds->num_leds > (devtype->led_max - devtype->led_min + 1))) {
+                dev_err(dev, "Invalid LED count %d\n", leds->num_leds);
+                return -EINVAL;
+        }
+
+        leds->led = devm_kzalloc(dev, leds->num_leds * sizeof(*leds->led),
+                                 GFP_KERNEL);
+        if (!leds->led)
+                return -ENOMEM;
+
         for (i = 0; i < devtype->num_regs; i++) {
-                reg = pdata->led_control[i];
-                WARN_ON(reg >= (1 << 24));
-                ret = mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), reg);
+                ret = mc13xxx_reg_write(mcdev, leds->devtype->ledctrl_base + i,
+                                        pdata->led_control[i]);
                 if (ret)
                         return ret;
         }
 
-        for (i = 0; i < num_leds; i++) {
+        for (i = 0; i < leds->num_leds; i++) {
                 const char *name, *trig;
 
                 ret = -EINVAL;
@@ -180,30 +244,29 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
                 trig = pdata->led[i].default_trigger;
 
                 if ((id > devtype->led_max) || (id < devtype->led_min)) {
-                        dev_err(&pdev->dev, "Invalid ID %i\n", id);
+                        dev_err(dev, "Invalid ID %i\n", id);
                         break;
                 }
 
                 if (init_led & (1 << id)) {
-                        dev_warn(&pdev->dev,
-                                 "LED %i already initialized\n", id);
+                        dev_warn(dev, "LED %i already initialized\n", id);
                         break;
                 }
 
                 init_led |= 1 << id;
                 leds->led[i].id = id;
-                leds->led[i].master = mcdev;
+                leds->led[i].leds = leds;
                 leds->led[i].cdev.name = name;
                 leds->led[i].cdev.default_trigger = trig;
+                leds->led[i].cdev.flags = LED_CORE_SUSPENDRESUME;
                 leds->led[i].cdev.brightness_set = mc13xxx_led_set;
-                leds->led[i].cdev.brightness = LED_OFF;
+                leds->led[i].cdev.max_brightness = mc13xxx_max_brightness(id);
 
                 INIT_WORK(&leds->led[i].work, mc13xxx_led_work);
 
-                ret = led_classdev_register(pdev->dev.parent,
-                                            &leds->led[i].cdev);
+                ret = led_classdev_register(dev->parent, &leds->led[i].cdev);
                 if (ret) {
-                        dev_err(&pdev->dev, "Failed to register LED %i\n", id);
+                        dev_err(dev, "Failed to register LED %i\n", id);
                         break;
                 }
         }
@@ -219,7 +282,6 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
 
 static int mc13xxx_led_remove(struct platform_device *pdev)
 {
-        struct mc13xxx *mcdev = dev_get_drvdata(pdev->dev.parent);
         struct mc13xxx_leds *leds = platform_get_drvdata(pdev);
         int i;
 
@@ -228,9 +290,6 @@ static int mc13xxx_led_remove(struct platform_device *pdev)
                 cancel_work_sync(&leds->led[i].work);
         }
 
-        for (i = 0; i < leds->devtype->num_regs; i++)
-                mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), 0);
-
         return 0;
 }
 
@@ -238,17 +297,27 @@ static const struct mc13xxx_led_devtype mc13783_led_devtype = {
         .led_min        = MC13783_LED_MD,
         .led_max        = MC13783_LED_B3,
         .num_regs       = 6,
+        .ledctrl_base   = 51,
 };
 
 static const struct mc13xxx_led_devtype mc13892_led_devtype = {
         .led_min        = MC13892_LED_MD,
         .led_max        = MC13892_LED_B,
         .num_regs       = 4,
+        .ledctrl_base   = 51,
+};
+
+static const struct mc13xxx_led_devtype mc34708_led_devtype = {
+        .led_min        = MC34708_LED_R,
+        .led_max        = MC34708_LED_G,
+        .num_regs       = 1,
+        .ledctrl_base   = 54,
 };
 
 static const struct platform_device_id mc13xxx_led_id_table[] = {
         { "mc13783-led", (kernel_ulong_t)&mc13783_led_devtype, },
         { "mc13892-led", (kernel_ulong_t)&mc13892_led_devtype, },
+        { "mc34708-led", (kernel_ulong_t)&mc34708_led_devtype, },
         { }
 };
 MODULE_DEVICE_TABLE(platform, mc13xxx_led_id_table);
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 2f9f141084ba..e97f443a6e07 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -21,7 +21,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index c7a4230233ea..efa625883c83 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -23,7 +23,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
index 98cae529373f..c9d906098466 100644
--- a/drivers/leds/leds-ot200.c
+++ b/drivers/leds/leds-ot200.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index 605047428b5a..7d0aaed1e23a 100644
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -14,7 +14,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/fb.h>
@@ -84,6 +83,15 @@ static inline size_t sizeof_pwm_leds_priv(int num_leds)
                       (sizeof(struct led_pwm_data) * num_leds);
 }
 
+static void led_pwm_cleanup(struct led_pwm_priv *priv)
+{
+        while (priv->num_leds--) {
+                led_classdev_unregister(&priv->leds[priv->num_leds].cdev);
+                if (priv->leds[priv->num_leds].can_sleep)
+                        cancel_work_sync(&priv->leds[priv->num_leds].work);
+        }
+}
+
 static int led_pwm_create_of(struct platform_device *pdev,
                              struct led_pwm_priv *priv)
 {
@@ -131,8 +139,7 @@ static int led_pwm_create_of(struct platform_device *pdev,
 
         return 0;
 err:
-        while (priv->num_leds--)
-                led_classdev_unregister(&priv->leds[priv->num_leds].cdev);
+        led_pwm_cleanup(priv);
 
         return ret;
 }
@@ -200,8 +207,8 @@ static int led_pwm_probe(struct platform_device *pdev)
         return 0;
 
 err:
-        while (i--)
-                led_classdev_unregister(&priv->leds[i].cdev);
+        priv->num_leds = i;
+        led_pwm_cleanup(priv);
 
         return ret;
 }
@@ -209,13 +216,8 @@ err:
 static int led_pwm_remove(struct platform_device *pdev)
 {
         struct led_pwm_priv *priv = platform_get_drvdata(pdev);
-        int i;
 
-        for (i = 0; i < priv->num_leds; i++) {
-                led_classdev_unregister(&priv->leds[i].cdev);
-                if (priv->leds[i].can_sleep)
-                        cancel_work_sync(&priv->leds[i].work);
-        }
+        led_pwm_cleanup(priv);
 
         return 0;
 }
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 98174e7240ee..28988b7b4fab 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -12,7 +12,6 @@
 */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/gpio.h>
diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index 5b8f938a8d73..2eb3ef62962b 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -63,7 +63,7 @@ MODULE_LICENSE("GPL");
 /*
  * PCI ID of the Intel ICH7 LPC Device within which the GPIO block lives.
  */
-static DEFINE_PCI_DEVICE_TABLE(ich7_lpc_pci_id) = {
+static const struct pci_device_id ich7_lpc_pci_id[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_30) },
@@ -78,7 +78,7 @@ static int __init ss4200_led_dmi_callback(const struct dmi_system_id *id)
         return 1;
 }
 
-static bool __initdata nodetect;
+static bool nodetect;
 module_param_named(nodetect, nodetect, bool, 0);
 MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
 
diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index 0a1a13f3a6a5..e72c974142d0 100644
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index 3f75fd22fd49..4133ffe29015 100644
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/err.h>
diff --git a/drivers/leds/trigger/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c
index 118335eccc56..1c3ee9fcaf34 100644
--- a/drivers/leds/trigger/ledtrig-cpu.c
+++ b/drivers/leds/trigger/ledtrig-cpu.c
@@ -26,6 +26,7 @@
 #include <linux/percpu.h>
 #include <linux/syscore_ops.h>
 #include <linux/rwsem.h>
+#include <linux/cpu.h>
 #include "../leds.h"
 
 #define MAX_NAME_LEN    8
@@ -92,6 +93,26 @@ static struct syscore_ops ledtrig_cpu_syscore_ops = {
         .resume         = ledtrig_cpu_syscore_resume,
 };
 
+static int ledtrig_cpu_notify(struct notifier_block *self,
+                                           unsigned long action, void *hcpu)
+{
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_STARTING:
+                ledtrig_cpu(CPU_LED_START);
+                break;
+        case CPU_DYING:
+                ledtrig_cpu(CPU_LED_STOP);
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+
+static struct notifier_block ledtrig_cpu_nb = {
+        .notifier_call = ledtrig_cpu_notify,
+};
+
 static int __init ledtrig_cpu_init(void)
 {
         int cpu;
@@ -113,6 +134,7 @@ static int __init ledtrig_cpu_init(void)
         }
 
         register_syscore_ops(&ledtrig_cpu_syscore_ops);
+        register_cpu_notifier(&ledtrig_cpu_nb);
 
         pr_info("ledtrig-cpu: registered to indicate activity on CPUs\n");
 
@@ -124,6 +146,8 @@ static void __exit ledtrig_cpu_exit(void)
 {
         int cpu;
 
+        unregister_cpu_notifier(&ledtrig_cpu_nb);
+
         for_each_possible_cpu(cpu) {
                 struct led_trigger_cpu *trig = &per_cpu(cpu_trig, cpu);
 
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 4195a01b1535..9a8e66ae04f5 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1988,7 +1988,6 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
                 if (mddev->bitmap_info.file) {
                         struct file *f = mddev->bitmap_info.file;
                         mddev->bitmap_info.file = NULL;
-                        restore_bitmap_write_access(f);
                         fput(f);
                 }
         } else {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4ad5cc4e63e8..8fda38d23e38 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5181,32 +5181,6 @@ static int restart_array(struct mddev *mddev)
         return 0;
 }
 
-/* similar to deny_write_access, but accounts for our holding a reference
- * to the file ourselves */
-static int deny_bitmap_write_access(struct file * file)
-{
-        struct inode *inode = file->f_mapping->host;
-
-        spin_lock(&inode->i_lock);
-        if (atomic_read(&inode->i_writecount) > 1) {
-                spin_unlock(&inode->i_lock);
-                return -ETXTBSY;
-        }
-        atomic_set(&inode->i_writecount, -1);
-        spin_unlock(&inode->i_lock);
-
-        return 0;
-}
-
-void restore_bitmap_write_access(struct file *file)
-{
-        struct inode *inode = file->f_mapping->host;
-
-        spin_lock(&inode->i_lock);
-        atomic_set(&inode->i_writecount, 1);
-        spin_unlock(&inode->i_lock);
-}
-
 static void md_clean(struct mddev *mddev)
 {
         mddev->array_sectors = 0;
@@ -5427,7 +5401,6 @@ static int do_md_stop(struct mddev * mddev, int mode,
 
                 bitmap_destroy(mddev);
                 if (mddev->bitmap_info.file) {
-                        restore_bitmap_write_access(mddev->bitmap_info.file);
                         fput(mddev->bitmap_info.file);
                         mddev->bitmap_info.file = NULL;
                 }
@@ -5979,7 +5952,7 @@ abort_export:
 
 static int set_bitmap_file(struct mddev *mddev, int fd)
 {
-        int err;
+        int err = 0;
 
         if (mddev->pers) {
                 if (!mddev->pers->quiesce)
@@ -5991,6 +5964,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
 
 
         if (fd >= 0) {
+                struct inode *inode;
                 if (mddev->bitmap)
                         return -EEXIST; /* cannot add when bitmap is present */
                 mddev->bitmap_info.file = fget(fd);
@@ -6001,10 +5975,21 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                         return -EBADF;
                 }
 
-                err = deny_bitmap_write_access(mddev->bitmap_info.file);
-                if (err) {
+                inode = mddev->bitmap_info.file->f_mapping->host;
+                if (!S_ISREG(inode->i_mode)) {
+                        printk(KERN_ERR "%s: error: bitmap file must be a regular file\n",
+                               mdname(mddev));
+                        err = -EBADF;
+                } else if (!(mddev->bitmap_info.file->f_mode & FMODE_WRITE)) {
+                        printk(KERN_ERR "%s: error: bitmap file must open for write\n",
+                               mdname(mddev));
+                        err = -EBADF;
+                } else if (atomic_read(&inode->i_writecount) != 1) {
                         printk(KERN_ERR "%s: error: bitmap file is already in use\n",
                                mdname(mddev));
+                        err = -EBUSY;
+                }
+                if (err) {
                         fput(mddev->bitmap_info.file);
                         mddev->bitmap_info.file = NULL;
                         return err;
@@ -6027,10 +6012,8 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                 mddev->pers->quiesce(mddev, 0);
         }
         if (fd < 0) {
-                if (mddev->bitmap_info.file) {
-                        restore_bitmap_write_access(mddev->bitmap_info.file);
+                if (mddev->bitmap_info.file)
                         fput(mddev->bitmap_info.file);
-                }
                 mddev->bitmap_info.file = NULL;
         }
 
@@ -7182,11 +7165,14 @@ static int md_seq_open(struct inode *inode, struct file *file)
         return error;
 }
 
+static int md_unloading;
 static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
 {
         struct seq_file *seq = filp->private_data;
         int mask;
 
+        if (md_unloading)
+                return POLLIN|POLLRDNORM|POLLERR|POLLPRI;;
         poll_wait(filp, &md_event_waiters, wait);
 
         /* always allow read */
@@ -8672,6 +8658,7 @@ static __exit void md_exit(void)
 {
         struct mddev *mddev;
         struct list_head *tmp;
+        int delay = 1;
 
         blk_unregister_region(MKDEV(MD_MAJOR,0), 1U << MINORBITS);
         blk_unregister_region(MKDEV(mdp_major,0), 1U << MINORBITS);
@@ -8680,7 +8667,19 @@ static __exit void md_exit(void)
         unregister_blkdev(mdp_major, "mdp");
         unregister_reboot_notifier(&md_notifier);
         unregister_sysctl_table(raid_table_header);
+
+        /* We cannot unload the modules while some process is
+         * waiting for us in select() or poll() - wake them up
+         */
+        md_unloading = 1;
+        while (waitqueue_active(&md_event_waiters)) {
+                /* not safe to leave yet */
+                wake_up(&md_event_waiters);
+                msleep(delay);
+                delay += delay;
+        }
         remove_proc_entry("mdstat", NULL);
+
         for_each_mddev(mddev, tmp) {
                 export_array(mddev);
                 mddev->hold_active = 0;
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 07bba96de260..a49d991f3fe1 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -605,7 +605,6 @@ extern int md_check_no_bitmap(struct mddev *mddev);
 extern int md_integrity_register(struct mddev *mddev);
 extern void md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev);
 extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
-extern void restore_bitmap_write_access(struct file *file);
 
 extern void mddev_init(struct mddev *mddev);
 extern int md_run(struct mddev *mddev);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4a6ca1cb2e78..56e24c072b62 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -97,6 +97,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
         struct pool_info *pi = data;
         struct r1bio *r1_bio;
         struct bio *bio;
+        int need_pages;
         int i, j;
 
         r1_bio = r1bio_pool_alloc(gfp_flags, pi);
@@ -119,15 +120,15 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
          * RESYNC_PAGES for each bio.
          */
         if (test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery))
-                j = pi->raid_disks;
+                need_pages = pi->raid_disks;
         else
-                j = 1;
-        while(j--) {
+                need_pages = 1;
+        for (j = 0; j < need_pages; j++) {
                 bio = r1_bio->bios[j];
                 bio->bi_vcnt = RESYNC_PAGES;
 
                 if (bio_alloc_pages(bio, gfp_flags))
-                        goto out_free_bio;
+                        goto out_free_pages;
         }
         /* If not user-requests, copy the page pointers to all bios */
         if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {
@@ -141,6 +142,14 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
 
         return r1_bio;
 
+out_free_pages:
+        while (--j >= 0) {
+                struct bio_vec *bv;
+
+                bio_for_each_segment_all(bv, r1_bio->bios[j], i)
+                        __free_page(bv->bv_page);
+        }
+
 out_free_bio:
         while (++j < pi->raid_disks)
                 bio_put(r1_bio->bios[j]);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 16f5c21963db..25247a852912 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -679,14 +679,9 @@ get_active_stripe(struct r5conf *conf, sector_t sector,
                                 init_stripe(sh, sector, previous);
                                 atomic_inc(&sh->count);
                         }
-                } else {
+                } else if (!atomic_inc_not_zero(&sh->count)) {
                         spin_lock(&conf->device_lock);
-                        if (atomic_read(&sh->count)) {
-                                BUG_ON(!list_empty(&sh->lru)
-                                    && !test_bit(STRIPE_EXPANDING, &sh->state)
-                                    && !test_bit(STRIPE_ON_UNPLUG_LIST, &sh->state)
-                                        );
-                        } else {
+                        if (!atomic_read(&sh->count)) {
                                 if (!test_bit(STRIPE_HANDLE, &sh->state))
                                         atomic_inc(&conf->active_stripes);
                                 BUG_ON(list_empty(&sh->lru) &&
@@ -4552,6 +4547,8 @@ static void make_request(struct mddev *mddev, struct bio * bi)
         struct stripe_head *sh;
         const int rw = bio_data_dir(bi);
         int remaining;
+        DEFINE_WAIT(w);
+        bool do_prepare;
 
         if (unlikely(bi->bi_rw & REQ_FLUSH)) {
                 md_flush_request(mddev, bi);
@@ -4575,15 +4572,18 @@ static void make_request(struct mddev *mddev, struct bio * bi)
         bi->bi_next = NULL;
         bi->bi_phys_segments = 1;       /* over-loaded to count active stripes */
 
+        prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
         for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
-                DEFINE_WAIT(w);
                 int previous;
                 int seq;
 
+                do_prepare = false;
         retry:
                 seq = read_seqcount_begin(&conf->gen_lock);
                 previous = 0;
-                prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
+                if (do_prepare)
+                        prepare_to_wait(&conf->wait_for_overlap, &w,
+                                TASK_UNINTERRUPTIBLE);
                 if (unlikely(conf->reshape_progress != MaxSector)) {
                         /* spinlock is needed as reshape_progress may be
                          * 64bit on a 32bit platform, and so it might be
@@ -4604,6 +4604,7 @@ static void make_request(struct mddev *mddev, struct bio * bi)
                                     : logical_sector >= conf->reshape_safe) {
                                         spin_unlock_irq(&conf->device_lock);
                                         schedule();
+                                        do_prepare = true;
                                         goto retry;
                                 }
                         }
@@ -4640,6 +4641,7 @@ static void make_request(struct mddev *mddev, struct bio * bi)
                                 if (must_retry) {
                                         release_stripe(sh);
                                         schedule();
+                                        do_prepare = true;
                                         goto retry;
                                 }
                         }
@@ -4663,8 +4665,10 @@ static void make_request(struct mddev *mddev, struct bio * bi)
                                 prepare_to_wait(&conf->wait_for_overlap,
                                                 &w, TASK_INTERRUPTIBLE);
                                 if (logical_sector >= mddev->suspend_lo &&
-                                    logical_sector < mddev->suspend_hi)
+                                    logical_sector < mddev->suspend_hi) {
                                         schedule();
+                                        do_prepare = true;
+                                }
                                 goto retry;
                         }
 
@@ -4677,9 +4681,9 @@ static void make_request(struct mddev *mddev, struct bio * bi)
                                 md_wakeup_thread(mddev->thread);
                                 release_stripe(sh);
                                 schedule();
+                                do_prepare = true;
                                 goto retry;
                         }
-                        finish_wait(&conf->wait_for_overlap, &w);
                         set_bit(STRIPE_HANDLE, &sh->state);
                         clear_bit(STRIPE_DELAYED, &sh->state);
                         if ((bi->bi_rw & REQ_SYNC) &&
@@ -4689,10 +4693,10 @@ static void make_request(struct mddev *mddev, struct bio * bi)
                 } else {
                         /* cannot get stripe for read-ahead, just give-up */
                         clear_bit(BIO_UPTODATE, &bi->bi_flags);
-                        finish_wait(&conf->wait_for_overlap, &w);
                         break;
                 }
         }
+        finish_wait(&conf->wait_for_overlap, &w);
 
         remaining = raid5_dec_bi_active_stripes(bi);
         if (remaining == 0) {
diff --git a/drivers/media/dvb-frontends/drx39xyj/Kconfig b/drivers/media/dvb-frontends/drx39xyj/Kconfig
index 15628eb5cf0c..6c2ccb6a506b 100644
--- a/drivers/media/dvb-frontends/drx39xyj/Kconfig
+++ b/drivers/media/dvb-frontends/drx39xyj/Kconfig
@@ -1,7 +1,7 @@
 config DVB_DRX39XYJ
         tristate "Micronas DRX-J demodulator"
         depends on DVB_CORE && I2C
-        default m if DVB_FE_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
           to support this frontend.
diff --git a/drivers/media/dvb-frontends/lgdt3305.c b/drivers/media/dvb-frontends/lgdt3305.c
index 1d2c47378cf8..92c891a571ab 100644
--- a/drivers/media/dvb-frontends/lgdt3305.c
+++ b/drivers/media/dvb-frontends/lgdt3305.c
@@ -1176,6 +1176,7 @@ static struct dvb_frontend_ops lgdt3304_ops = {
         },
         .i2c_gate_ctrl        = lgdt3305_i2c_gate_ctrl,
         .init                 = lgdt3305_init,
+        .sleep                = lgdt3305_sleep,
         .set_frontend         = lgdt3304_set_parameters,
         .get_frontend         = lgdt3305_get_frontend,
         .get_tune_settings    = lgdt3305_get_tune_settings,
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 32cffca14d0b..d63bc9c13dce 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -297,7 +297,7 @@ struct inittab {
         u8 val;
 };
 
-struct inittab m88rs2000_setup[] = {
+static struct inittab m88rs2000_setup[] = {
         {DEMOD_WRITE, 0x9a, 0x30},
         {DEMOD_WRITE, 0x00, 0x01},
         {WRITE_DELAY, 0x19, 0x00},
@@ -315,7 +315,7 @@ struct inittab m88rs2000_setup[] = {
         {0xff, 0xaa, 0xff}
 };
 
-struct inittab m88rs2000_shutdown[] = {
+static struct inittab m88rs2000_shutdown[] = {
         {DEMOD_WRITE, 0x9a, 0x30},
         {DEMOD_WRITE, 0xb0, 0x00},
         {DEMOD_WRITE, 0xf1, 0x89},
@@ -325,7 +325,7 @@ struct inittab m88rs2000_shutdown[] = {
         {0xff, 0xaa, 0xff}
 };
 
-struct inittab fe_reset[] = {
+static struct inittab fe_reset[] = {
         {DEMOD_WRITE, 0x00, 0x01},
         {DEMOD_WRITE, 0x20, 0x81},
         {DEMOD_WRITE, 0x21, 0x80},
@@ -363,7 +363,7 @@ struct inittab fe_reset[] = {
         {0xff, 0xaa, 0xff}
 };
 
-struct inittab fe_trigger[] = {
+static struct inittab fe_trigger[] = {
         {DEMOD_WRITE, 0x97, 0x04},
         {DEMOD_WRITE, 0x99, 0x77},
         {DEMOD_WRITE, 0x9b, 0x64},
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 7a77a5b7a075..5c421886d97c 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -49,8 +49,8 @@
 #define VPE_MODULE_NAME "vpe"
 
 /* minimum and maximum frame sizes */
-#define MIN_W           128
-#define MIN_H           128
+#define MIN_W           32
+#define MIN_H           32
 #define MAX_W           1920
 #define MAX_H           1080
 
@@ -887,6 +887,9 @@ static int job_ready(void *priv)
         if (v4l2_m2m_num_src_bufs_ready(ctx->m2m_ctx) < needed)
                 return 0;
 
+        if (v4l2_m2m_num_dst_bufs_ready(ctx->m2m_ctx) < needed)
+                return 0;
+
         return 1;
 }
 
@@ -1277,18 +1280,17 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
         s_buf = &s_vb->v4l2_buf;
         d_buf = &d_vb->v4l2_buf;
 
+        d_buf->flags = s_buf->flags;
+
         d_buf->timestamp = s_buf->timestamp;
-        d_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        d_buf->flags |= s_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE) {
-                d_buf->flags |= V4L2_BUF_FLAG_TIMECODE;
+        if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE)
                 d_buf->timecode = s_buf->timecode;
-        }
+
         d_buf->sequence = ctx->sequence;
-        d_buf->field = ctx->field;
 
         d_q_data = &ctx->q_data[Q_DATA_DST];
         if (d_q_data->flags & Q_DATA_INTERLACED) {
+                d_buf->field = ctx->field;
                 if (ctx->field == V4L2_FIELD_BOTTOM) {
                         ctx->sequence++;
                         ctx->field = V4L2_FIELD_TOP;
@@ -1297,6 +1299,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
                         ctx->field = V4L2_FIELD_BOTTOM;
                 }
         } else {
+                d_buf->field = V4L2_FIELD_NONE;
                 ctx->sequence++;
         }
 
@@ -1335,8 +1338,9 @@ static int vpe_querycap(struct file *file, void *priv,
 {
         strncpy(cap->driver, VPE_MODULE_NAME, sizeof(cap->driver) - 1);
         strncpy(cap->card, VPE_MODULE_NAME, sizeof(cap->card) - 1);
-        strlcpy(cap->bus_info, VPE_MODULE_NAME, sizeof(cap->bus_info));
-        cap->device_caps  = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
+                VPE_MODULE_NAME);
+        cap->device_caps  = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
@@ -1476,6 +1480,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
                 }
         }
 
+        memset(pix->reserved, 0, sizeof(pix->reserved));
         for (i = 0; i < pix->num_planes; i++) {
                 plane_fmt = &pix->plane_fmt[i];
                 depth = fmt->vpdma_fmt[i]->depth;
@@ -1487,6 +1492,8 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
 
                 plane_fmt->sizeimage =
                                 (pix->height * pix->width * depth) >> 3;
+
+                memset(plane_fmt->reserved, 0, sizeof(plane_fmt->reserved));
         }
 
         return 0;
@@ -1717,6 +1724,16 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
         q_data = get_q_data(ctx, vb->vb2_queue->type);
         num_planes = q_data->fmt->coplanar ? 2 : 1;
 
+        if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+                if (!(q_data->flags & Q_DATA_INTERLACED)) {
+                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                } else {
+                        if (vb->v4l2_buf.field != V4L2_FIELD_TOP &&
+                                        vb->v4l2_buf.field != V4L2_FIELD_BOTTOM)
+                                return -EINVAL;
+                }
+        }
+
         for (i = 0; i < num_planes; i++) {
                 if (vb2_plane_size(vb, i) < q_data->sizeimage[i]) {
                         vpe_err(ctx->dev,
@@ -1866,9 +1883,11 @@ static int vpe_open(struct file *file)
         s_q_data->fmt = &vpe_formats[2];
         s_q_data->width = 1920;
         s_q_data->height = 1080;
-        s_q_data->sizeimage[VPE_LUMA] = (s_q_data->width * s_q_data->height *
+        s_q_data->bytesperline[VPE_LUMA] = (s_q_data->width *
                         s_q_data->fmt->vpdma_fmt[VPE_LUMA]->depth) >> 3;
-        s_q_data->colorspace = V4L2_COLORSPACE_SMPTE170M;
+        s_q_data->sizeimage[VPE_LUMA] = (s_q_data->bytesperline[VPE_LUMA] *
+                        s_q_data->height);
+        s_q_data->colorspace = V4L2_COLORSPACE_REC709;
         s_q_data->field = V4L2_FIELD_NONE;
         s_q_data->c_rect.left = 0;
         s_q_data->c_rect.top = 0;
@@ -2002,7 +2021,7 @@ static struct video_device vpe_videodev = {
         .fops           = &vpe_fops,
         .ioctl_ops      = &vpe_ioctl_ops,
         .minor          = -1,
-        .release        = video_device_release,
+        .release        = video_device_release_empty,
         .vfl_dir        = VFL_DIR_M2M,
 };
 
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c
index 579a52b3edce..0127dd257a57 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.c
+++ b/drivers/media/rc/img-ir/img-ir-hw.c
@@ -504,6 +504,18 @@ unlock:
         return ret;
 }
 
+static int img_ir_set_normal_filter(struct rc_dev *dev,
+                                    struct rc_scancode_filter *sc_filter)
+{
+        return img_ir_set_filter(dev, RC_FILTER_NORMAL, sc_filter); 
+}
+
+static int img_ir_set_wakeup_filter(struct rc_dev *dev,
+                                    struct rc_scancode_filter *sc_filter)
+{
+        return img_ir_set_filter(dev, RC_FILTER_WAKEUP, sc_filter);
+}
+
 /**
  * img_ir_set_decoder() - Set the current decoder.
  * @priv:       IR private data.
@@ -986,7 +998,8 @@ int img_ir_probe_hw(struct img_ir_priv *priv)
         rdev->map_name = RC_MAP_EMPTY;
         rc_set_allowed_protocols(rdev, img_ir_allowed_protos(priv));
         rdev->input_name = "IMG Infrared Decoder";
-        rdev->s_filter = img_ir_set_filter;
+        rdev->s_filter = img_ir_set_normal_filter;
+        rdev->s_wakeup_filter = img_ir_set_wakeup_filter;
 
         /* Register hardware decoder */
         error = rc_register_device(rdev);
diff --git a/drivers/media/rc/img-ir/img-ir-nec.c b/drivers/media/rc/img-ir/img-ir-nec.c
index e7a731bc3a9b..751d9d945269 100644
--- a/drivers/media/rc/img-ir/img-ir-nec.c
+++ b/drivers/media/rc/img-ir/img-ir-nec.c
@@ -5,6 +5,7 @@
  */
 
 #include "img-ir-hw.h"
+#include <linux/bitrev.h>
 
 /* Convert NEC data to a scancode */
 static int img_ir_nec_scancode(int len, u64 raw, int *scancode, u64 protocols)
@@ -22,11 +23,11 @@ static int img_ir_nec_scancode(int len, u64 raw, int *scancode, u64 protocols)
         data_inv = (raw >> 24) & 0xff;
         if ((data_inv ^ data) != 0xff) {
                 /* 32-bit NEC (used by Apple and TiVo remotes) */
-                /* scan encoding: aaAAddDD */
-                *scancode = addr_inv << 24 |
-                            addr     << 16 |
-                            data_inv <<  8 |
-                            data;
+                /* scan encoding: as transmitted, MSBit = first received bit */
+                *scancode = bitrev8(addr)     << 24 |
+                            bitrev8(addr_inv) << 16 |
+                            bitrev8(data)     <<  8 |
+                            bitrev8(data_inv);
         } else if ((addr_inv ^ addr) != 0xff) {
                 /* Extended NEC */
                 /* scan encoding: AAaaDD */
@@ -54,13 +55,15 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
 
         if ((in->data | in->mask) & 0xff000000) {
                 /* 32-bit NEC (used by Apple and TiVo remotes) */
-                /* scan encoding: aaAAddDD */
-                addr_inv   = (in->data >> 24) & 0xff;
-                addr_inv_m = (in->mask >> 24) & 0xff;
-                addr       = (in->data >> 16) & 0xff;
-                addr_m     = (in->mask >> 16) & 0xff;
-                data_inv   = (in->data >>  8) & 0xff;
-                data_inv_m = (in->mask >>  8) & 0xff;
+                /* scan encoding: as transmitted, MSBit = first received bit */
+                addr       = bitrev8(in->data >> 24);
+                addr_m     = bitrev8(in->mask >> 24);
+                addr_inv   = bitrev8(in->data >> 16);
+                addr_inv_m = bitrev8(in->mask >> 16);
+                data       = bitrev8(in->data >>  8);
+                data_m     = bitrev8(in->mask >>  8);
+                data_inv   = bitrev8(in->data >>  0);
+                data_inv_m = bitrev8(in->mask >>  0);
         } else if ((in->data | in->mask) & 0x00ff0000) {
                 /* Extended NEC */
                 /* scan encoding AAaaDD */
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 9de1791d2494..35c42e5e270b 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -172,10 +172,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 if (send_32bits) {
                         /* NEC transport, but modified protocol, used by at
                          * least Apple and TiVo remotes */
-                        scancode = not_address << 24 |
-                                   address     << 16 |
-                                   not_command <<  8 |
-                                   command;
+                        scancode = data->bits;
                         IR_dprintk(1, "NEC (modified) scancode 0x%08x\n", scancode);
                 } else if ((address ^ not_address) != 0xff) {
                         /* Extended NEC */
diff --git a/drivers/media/rc/keymaps/rc-tivo.c b/drivers/media/rc/keymaps/rc-tivo.c
index 5cc1b456e329..454e06295692 100644
--- a/drivers/media/rc/keymaps/rc-tivo.c
+++ b/drivers/media/rc/keymaps/rc-tivo.c
@@ -15,62 +15,62 @@
  * Initial mapping is for the TiVo remote included in the Nero LiquidTV bundle,
  * which also ships with a TiVo-branded IR transceiver, supported by the mceusb
  * driver. Note that the remote uses an NEC-ish protocol, but instead of having
- * a command/not_command pair, it has a vendor ID of 0x3085, but some keys, the
+ * a command/not_command pair, it has a vendor ID of 0xa10c, but some keys, the
  * NEC extended checksums do pass, so the table presently has the intended
  * values and the checksum-passed versions for those keys.
  */
 static struct rc_map_table tivo[] = {
-        { 0x3085f009, KEY_MEDIA },      /* TiVo Button */
-        { 0x3085e010, KEY_POWER2 },     /* TV Power */
-        { 0x3085e011, KEY_TV },         /* Live TV/Swap */
-        { 0x3085c034, KEY_VIDEO_NEXT }, /* TV Input */
-        { 0x3085e013, KEY_INFO },
-        { 0x3085a05f, KEY_CYCLEWINDOWS }, /* Window */
+        { 0xa10c900f, KEY_MEDIA },      /* TiVo Button */
+        { 0xa10c0807, KEY_POWER2 },     /* TV Power */
+        { 0xa10c8807, KEY_TV },         /* Live TV/Swap */
+        { 0xa10c2c03, KEY_VIDEO_NEXT }, /* TV Input */
+        { 0xa10cc807, KEY_INFO },
+        { 0xa10cfa05, KEY_CYCLEWINDOWS }, /* Window */
         { 0x0085305f, KEY_CYCLEWINDOWS },
-        { 0x3085c036, KEY_EPG },        /* Guide */
+        { 0xa10c6c03, KEY_EPG },        /* Guide */
 
-        { 0x3085e014, KEY_UP },
-        { 0x3085e016, KEY_DOWN },
-        { 0x3085e017, KEY_LEFT },
-        { 0x3085e015, KEY_RIGHT },
+        { 0xa10c2807, KEY_UP },
+        { 0xa10c6807, KEY_DOWN },
+        { 0xa10ce807, KEY_LEFT },
+        { 0xa10ca807, KEY_RIGHT },
 
-        { 0x3085e018, KEY_SCROLLDOWN }, /* Red Thumbs Down */
-        { 0x3085e019, KEY_SELECT },
-        { 0x3085e01a, KEY_SCROLLUP },   /* Green Thumbs Up */
+        { 0xa10c1807, KEY_SCROLLDOWN }, /* Red Thumbs Down */
+        { 0xa10c9807, KEY_SELECT },
+        { 0xa10c5807, KEY_SCROLLUP },   /* Green Thumbs Up */
 
-        { 0x3085e01c, KEY_VOLUMEUP },
-        { 0x3085e01d, KEY_VOLUMEDOWN },
-        { 0x3085e01b, KEY_MUTE },
-        { 0x3085d020, KEY_RECORD },
-        { 0x3085e01e, KEY_CHANNELUP },
-        { 0x3085e01f, KEY_CHANNELDOWN },
+        { 0xa10c3807, KEY_VOLUMEUP },
+        { 0xa10cb807, KEY_VOLUMEDOWN },
+        { 0xa10cd807, KEY_MUTE },
+        { 0xa10c040b, KEY_RECORD },
+        { 0xa10c7807, KEY_CHANNELUP },
+        { 0xa10cf807, KEY_CHANNELDOWN },
         { 0x0085301f, KEY_CHANNELDOWN },
 
-        { 0x3085d021, KEY_PLAY },
-        { 0x3085d023, KEY_PAUSE },
-        { 0x3085d025, KEY_SLOW },
-        { 0x3085d022, KEY_REWIND },
-        { 0x3085d024, KEY_FASTFORWARD },
-        { 0x3085d026, KEY_PREVIOUS },
-        { 0x3085d027, KEY_NEXT },       /* ->| */
+        { 0xa10c840b, KEY_PLAY },
+        { 0xa10cc40b, KEY_PAUSE },
+        { 0xa10ca40b, KEY_SLOW },
+        { 0xa10c440b, KEY_REWIND },
+        { 0xa10c240b, KEY_FASTFORWARD },
+        { 0xa10c640b, KEY_PREVIOUS },
+        { 0xa10ce40b, KEY_NEXT },       /* ->| */
 
-        { 0x3085b044, KEY_ZOOM },       /* Aspect */
-        { 0x3085b048, KEY_STOP },
-        { 0x3085b04a, KEY_DVD },        /* DVD Menu */
+        { 0xa10c220d, KEY_ZOOM },       /* Aspect */
+        { 0xa10c120d, KEY_STOP },
+        { 0xa10c520d, KEY_DVD },        /* DVD Menu */
 
-        { 0x3085d028, KEY_NUMERIC_1 },
-        { 0x3085d029, KEY_NUMERIC_2 },
-        { 0x3085d02a, KEY_NUMERIC_3 },
-        { 0x3085d02b, KEY_NUMERIC_4 },
-        { 0x3085d02c, KEY_NUMERIC_5 },
-        { 0x3085d02d, KEY_NUMERIC_6 },
-        { 0x3085d02e, KEY_NUMERIC_7 },
-        { 0x3085d02f, KEY_NUMERIC_8 },
+        { 0xa10c140b, KEY_NUMERIC_1 },
+        { 0xa10c940b, KEY_NUMERIC_2 },
+        { 0xa10c540b, KEY_NUMERIC_3 },
+        { 0xa10cd40b, KEY_NUMERIC_4 },
+        { 0xa10c340b, KEY_NUMERIC_5 },
+        { 0xa10cb40b, KEY_NUMERIC_6 },
+        { 0xa10c740b, KEY_NUMERIC_7 },
+        { 0xa10cf40b, KEY_NUMERIC_8 },
         { 0x0085302f, KEY_NUMERIC_8 },
-        { 0x3085c030, KEY_NUMERIC_9 },
-        { 0x3085c031, KEY_NUMERIC_0 },
-        { 0x3085c033, KEY_ENTER },
-        { 0x3085c032, KEY_CLEAR },
+        { 0xa10c0c03, KEY_NUMERIC_9 },
+        { 0xa10c8c03, KEY_NUMERIC_0 },
+        { 0xa10ccc03, KEY_ENTER },
+        { 0xa10c4c03, KEY_CLEAR },
 };
 
 static struct rc_map_list tivo_map = {
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 99697aae92ff..970b93d6f399 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -633,19 +633,13 @@ EXPORT_SYMBOL_GPL(rc_repeat);
 static void ir_do_keydown(struct rc_dev *dev, int scancode,
                           u32 keycode, u8 toggle)
 {
-        struct rc_scancode_filter *filter;
-        bool new_event = !dev->keypressed ||
-                         dev->last_scancode != scancode ||
-                         dev->last_toggle != toggle;
+        bool new_event = (!dev->keypressed               ||
+                          dev->last_scancode != scancode ||
+                          dev->last_toggle != toggle);
 
         if (new_event && dev->keypressed)
                 ir_do_keyup(dev, false);
 
-        /* Generic scancode filtering */
-        filter = &dev->scancode_filters[RC_FILTER_NORMAL];
-        if (filter->mask && ((scancode ^ filter->data) & filter->mask))
-                return;
-
         input_event(dev->input_dev, EV_MSC, MSC_SCAN, scancode);
 
         if (new_event && keycode != KEY_RESERVED) {
@@ -923,6 +917,7 @@ static ssize_t store_protocols(struct device *device,
         int rc, i, count = 0;
         ssize_t ret;
         int (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
+        int (*set_filter)(struct rc_dev *dev, struct rc_scancode_filter *filter);
         struct rc_scancode_filter local_filter, *filter;
 
         /* Device is being removed */
@@ -1007,24 +1002,23 @@ static ssize_t store_protocols(struct device *device,
          * Fall back to clearing the filter.
          */
         filter = &dev->scancode_filters[fattr->type];
-        if (old_type != type && filter->mask) {
+        set_filter = (fattr->type == RC_FILTER_NORMAL)
+                ? dev->s_filter : dev->s_wakeup_filter;
+
+        if (set_filter && old_type != type && filter->mask) {
                 local_filter = *filter;
                 if (!type) {
                         /* no protocol => clear filter */
                         ret = -1;
-                } else if (!dev->s_filter) {
-                        /* generic filtering => accept any filter */
-                        ret = 0;
                 } else {
                         /* hardware filtering => try setting, otherwise clear */
-                        ret = dev->s_filter(dev, fattr->type, &local_filter);
+                        ret = set_filter(dev, &local_filter);
                 }
                 if (ret < 0) {
                         /* clear the filter */
                         local_filter.data = 0;
                         local_filter.mask = 0;
-                        if (dev->s_filter)
-                                dev->s_filter(dev, fattr->type, &local_filter);
+                        set_filter(dev, &local_filter);
                 }
 
                 /* commit the new filter */
@@ -1068,7 +1062,10 @@ static ssize_t show_filter(struct device *device,
                 return -EINVAL;
 
         mutex_lock(&dev->lock);
-        if (fattr->mask)
+        if ((fattr->type == RC_FILTER_NORMAL && !dev->s_filter) ||
+            (fattr->type == RC_FILTER_WAKEUP && !dev->s_wakeup_filter))
+                val = 0;
+        else if (fattr->mask)
                 val = dev->scancode_filters[fattr->type].mask;
         else
                 val = dev->scancode_filters[fattr->type].data;
@@ -1106,6 +1103,7 @@ static ssize_t store_filter(struct device *device,
         struct rc_scancode_filter local_filter, *filter;
         int ret;
         unsigned long val;
+        int (*set_filter)(struct rc_dev *dev, struct rc_scancode_filter *filter);
 
         /* Device is being removed */
         if (!dev)
@@ -1115,9 +1113,11 @@ static ssize_t store_filter(struct device *device,
         if (ret < 0)
                 return ret;
 
-        /* Scancode filter not supported (but still accept 0) */
-        if (!dev->s_filter && fattr->type != RC_FILTER_NORMAL)
-                return val ? -EINVAL : count;
+        /* Can the scancode filter be set? */
+        set_filter = (fattr->type == RC_FILTER_NORMAL) ? dev->s_filter :
+                                                         dev->s_wakeup_filter;
+        if (!set_filter)
+                return -EINVAL;
 
         mutex_lock(&dev->lock);
 
@@ -1128,16 +1128,16 @@ static ssize_t store_filter(struct device *device,
                 local_filter.mask = val;
         else
                 local_filter.data = val;
+
         if (!dev->enabled_protocols[fattr->type] && local_filter.mask) {
                 /* refuse to set a filter unless a protocol is enabled */
                 ret = -EINVAL;
                 goto unlock;
         }
-        if (dev->s_filter) {
-                ret = dev->s_filter(dev, fattr->type, &local_filter);
-                if (ret < 0)
-                        goto unlock;
-        }
+
+        ret = set_filter(dev, &local_filter);
+        if (ret < 0)
+                goto unlock;
 
         /* Success, commit the new filter */
         *filter = local_filter;
@@ -1189,27 +1189,45 @@ static RC_FILTER_ATTR(wakeup_filter, S_IRUGO|S_IWUSR,
 static RC_FILTER_ATTR(wakeup_filter_mask, S_IRUGO|S_IWUSR,
                       show_filter, store_filter, RC_FILTER_WAKEUP, true);
 
-static struct attribute *rc_dev_attrs[] = {
+static struct attribute *rc_dev_protocol_attrs[] = {
         &dev_attr_protocols.attr.attr,
+        NULL,
+};
+
+static struct attribute_group rc_dev_protocol_attr_grp = {
+        .attrs  = rc_dev_protocol_attrs,
+};
+
+static struct attribute *rc_dev_wakeup_protocol_attrs[] = {
         &dev_attr_wakeup_protocols.attr.attr,
+        NULL,
+};
+
+static struct attribute_group rc_dev_wakeup_protocol_attr_grp = {
+        .attrs  = rc_dev_wakeup_protocol_attrs,
+};
+
+static struct attribute *rc_dev_filter_attrs[] = {
         &dev_attr_filter.attr.attr,
         &dev_attr_filter_mask.attr.attr,
-        &dev_attr_wakeup_filter.attr.attr,
-        &dev_attr_wakeup_filter_mask.attr.attr,
         NULL,
 };
 
-static struct attribute_group rc_dev_attr_grp = {
-        .attrs  = rc_dev_attrs,
+static struct attribute_group rc_dev_filter_attr_grp = {
+        .attrs  = rc_dev_filter_attrs,
 };
 
-static const struct attribute_group *rc_dev_attr_groups[] = {
-        &rc_dev_attr_grp,
-        NULL
+static struct attribute *rc_dev_wakeup_filter_attrs[] = {
+        &dev_attr_wakeup_filter.attr.attr,
+        &dev_attr_wakeup_filter_mask.attr.attr,
+        NULL,
+};
+
+static struct attribute_group rc_dev_wakeup_filter_attr_grp = {
+        .attrs  = rc_dev_wakeup_filter_attrs,
 };
 
 static struct device_type rc_dev_type = {
-        .groups         = rc_dev_attr_groups,
         .release        = rc_dev_release,
         .uevent         = rc_dev_uevent,
 };
@@ -1266,7 +1284,7 @@ int rc_register_device(struct rc_dev *dev)
         static bool raw_init = false; /* raw decoders loaded? */
         struct rc_map *rc_map;
         const char *path;
-        int rc, devno;
+        int rc, devno, attr = 0;
 
         if (!dev || !dev->map_name)
                 return -EINVAL;
@@ -1294,6 +1312,16 @@ int rc_register_device(struct rc_dev *dev)
                         return -ENOMEM;
         } while (test_and_set_bit(devno, ir_core_dev_number));
 
+        dev->dev.groups = dev->sysfs_groups;
+        dev->sysfs_groups[attr++] = &rc_dev_protocol_attr_grp;
+        if (dev->s_filter)
+                dev->sysfs_groups[attr++] = &rc_dev_filter_attr_grp;    
+        if (dev->s_wakeup_filter)
+                dev->sysfs_groups[attr++] = &rc_dev_wakeup_filter_attr_grp;
+        if (dev->change_wakeup_protocol)
+                dev->sysfs_groups[attr++] = &rc_dev_wakeup_protocol_attr_grp;
+        dev->sysfs_groups[attr++] = NULL;
+
         /*
          * Take the lock here, as the device sysfs node will appear
          * when device_add() is called, which may trigger an ir-keytable udev
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index 319adc4f0561..96ccfebce7ca 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -1468,7 +1468,8 @@ static int r820t_imr_prepare(struct r820t_priv *priv)
 static int r820t_multi_read(struct r820t_priv *priv)
 {
         int rc, i;
-        u8 data[2], min = 0, max = 255, sum = 0;
+        u16 sum = 0;
+        u8 data[2], min = 255, max = 0;
 
         usleep_range(5000, 6000);
 
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 76a816511f2f..6ef93ee1fdcb 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -1107,6 +1107,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
                                 offset += 200000;
                 }
 #endif
+                break;
         default:
                 tuner_err("Unsupported tuner type %d.\n", new_type);
                 break;
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index c83c16cece01..61d196e8b3ab 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1503,8 +1503,6 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
         /* RTL2832P devices: */
         { DVB_USB_DEVICE(USB_VID_HANFTEK, 0x0131,
                 &rtl2832u_props, "Astrometa DVB-T2", NULL) },
-        { DVB_USB_DEVICE(USB_VID_KYE, 0x707f,
-                &rtl2832u_props, "Genius TVGo DVB-T03", NULL) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
diff --git a/drivers/media/usb/gspca/jpeg.h b/drivers/media/usb/gspca/jpeg.h
index ab54910418b4..0aa2b671faa4 100644
--- a/drivers/media/usb/gspca/jpeg.h
+++ b/drivers/media/usb/gspca/jpeg.h
@@ -154,7 +154,9 @@ static void jpeg_set_qual(u8 *jpeg_hdr,
 {
         int i, sc;
 
-        if (quality < 50)
+        if (quality <= 0)
+                sc = 5000;
+        else if (quality < 50)
                 sc = 5000 / quality;
         else
                 sc = 200 - quality * 2;
diff --git a/drivers/media/usb/stk1160/stk1160-ac97.c b/drivers/media/usb/stk1160/stk1160-ac97.c
index c46c8be89602..2dd308f9541f 100644
--- a/drivers/media/usb/stk1160/stk1160-ac97.c
+++ b/drivers/media/usb/stk1160/stk1160-ac97.c
@@ -108,7 +108,7 @@ int stk1160_ac97_register(struct stk1160 *dev)
                  "stk1160-mixer");
         snprintf(card->longname, sizeof(card->longname),
                  "stk1160 ac97 codec mixer control");
-        strncpy(card->driver, dev->dev->driver->name, sizeof(card->driver));
+        strlcpy(card->driver, dev->dev->driver->name, sizeof(card->driver));
 
         rc = snd_ac97_bus(card, 0, &stk1160_ac97_ops, NULL, &ac97_bus);
         if (rc)
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 1d15735f9ef9..c9de3d598ea5 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -338,58 +338,28 @@ int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist *sglist,
                 int num_sg, bool read, int timeout)
 {
         struct completion trans_done;
-        u8 dir;
-        int err = 0, i, count;
+        int err = 0, count;
         long timeleft;
         unsigned long flags;
-        struct scatterlist *sg;
-        enum dma_data_direction dma_dir;
-        u32 val;
-        dma_addr_t addr;
-        unsigned int len;
-
-        dev_dbg(&(pcr->pci->dev), "--> %s: num_sg = %d\n", __func__, num_sg);
-
-        /* don't transfer data during abort processing */
-        if (pcr->remove_pci)
-                return -EINVAL;
-
-        if ((sglist == NULL) || (num_sg <= 0))
-                return -EINVAL;
 
-        if (read) {
-                dir = DEVICE_TO_HOST;
-                dma_dir = DMA_FROM_DEVICE;
-        } else {
-                dir = HOST_TO_DEVICE;
-                dma_dir = DMA_TO_DEVICE;
-        }
-
-        count = dma_map_sg(&(pcr->pci->dev), sglist, num_sg, dma_dir);
+        count = rtsx_pci_dma_map_sg(pcr, sglist, num_sg, read);
         if (count < 1) {
                 dev_err(&(pcr->pci->dev), "scatterlist map failed\n");
                 return -EINVAL;
         }
         dev_dbg(&(pcr->pci->dev), "DMA mapping count: %d\n", count);
 
-        val = ((u32)(dir & 0x01) << 29) | TRIG_DMA | ADMA_MODE;
-        pcr->sgi = 0;
-        for_each_sg(sglist, sg, count, i) {
-                addr = sg_dma_address(sg);
-                len = sg_dma_len(sg);
-                rtsx_pci_add_sg_tbl(pcr, addr, len, i == count - 1);
-        }
 
         spin_lock_irqsave(&pcr->lock, flags);
 
         pcr->done = &trans_done;
         pcr->trans_result = TRANS_NOT_READY;
         init_completion(&trans_done);
-        rtsx_pci_writel(pcr, RTSX_HDBAR, pcr->host_sg_tbl_addr);
-        rtsx_pci_writel(pcr, RTSX_HDBCTLR, val);
 
         spin_unlock_irqrestore(&pcr->lock, flags);
 
+        rtsx_pci_dma_transfer(pcr, sglist, count, read);
+
         timeleft = wait_for_completion_interruptible_timeout(
                         &trans_done, msecs_to_jiffies(timeout));
         if (timeleft <= 0) {
@@ -413,7 +383,7 @@ out:
         pcr->done = NULL;
         spin_unlock_irqrestore(&pcr->lock, flags);
 
-        dma_unmap_sg(&(pcr->pci->dev), sglist, num_sg, dma_dir);
+        rtsx_pci_dma_unmap_sg(pcr, sglist, num_sg, read);
 
         if ((err < 0) && (err != -ENODEV))
                 rtsx_pci_stop_cmd(pcr);
@@ -425,6 +395,73 @@ out:
 }
 EXPORT_SYMBOL_GPL(rtsx_pci_transfer_data);
 
+int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int num_sg, bool read)
+{
+        enum dma_data_direction dir = read ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+
+        if (pcr->remove_pci)
+                return -EINVAL;
+
+        if ((sglist == NULL) || num_sg < 1)
+                return -EINVAL;
+
+        return dma_map_sg(&(pcr->pci->dev), sglist, num_sg, dir);
+}
+EXPORT_SYMBOL_GPL(rtsx_pci_dma_map_sg);
+
+int rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int num_sg, bool read)
+{
+        enum dma_data_direction dir = read ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+
+        if (pcr->remove_pci)
+                return -EINVAL;
+
+        if (sglist == NULL || num_sg < 1)
+                return -EINVAL;
+
+        dma_unmap_sg(&(pcr->pci->dev), sglist, num_sg, dir);
+        return num_sg;
+}
+EXPORT_SYMBOL_GPL(rtsx_pci_dma_unmap_sg);
+
+int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int sg_count, bool read)
+{
+        struct scatterlist *sg;
+        dma_addr_t addr;
+        unsigned int len;
+        int i;
+        u32 val;
+        u8 dir = read ? DEVICE_TO_HOST : HOST_TO_DEVICE;
+        unsigned long flags;
+
+        if (pcr->remove_pci)
+                return -EINVAL;
+
+        if ((sglist == NULL) || (sg_count < 1))
+                return -EINVAL;
+
+        val = ((u32)(dir & 0x01) << 29) | TRIG_DMA | ADMA_MODE;
+        pcr->sgi = 0;
+        for_each_sg(sglist, sg, sg_count, i) {
+                addr = sg_dma_address(sg);
+                len = sg_dma_len(sg);
+                rtsx_pci_add_sg_tbl(pcr, addr, len, i == sg_count - 1);
+        }
+
+        spin_lock_irqsave(&pcr->lock, flags);
+
+        rtsx_pci_writel(pcr, RTSX_HDBAR, pcr->host_sg_tbl_addr);
+        rtsx_pci_writel(pcr, RTSX_HDBCTLR, val);
+
+        spin_unlock_irqrestore(&pcr->lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rtsx_pci_dma_transfer);
+
 int rtsx_pci_read_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len)
 {
         int err;
@@ -836,6 +873,8 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
         int_reg = rtsx_pci_readl(pcr, RTSX_BIPR);
         /* Clear interrupt flag */
         rtsx_pci_writel(pcr, RTSX_BIPR, int_reg);
+        dev_dbg(&pcr->pci->dev, "=========== BIPR 0x%8x ==========\n", int_reg);
+
         if ((int_reg & pcr->bier) == 0) {
                 spin_unlock(&pcr->lock);
                 return IRQ_NONE;
@@ -866,17 +905,28 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
         }
 
         if (int_reg & (NEED_COMPLETE_INT | DELINK_INT)) {
-                if (int_reg & (TRANS_FAIL_INT | DELINK_INT)) {
+                if (int_reg & (TRANS_FAIL_INT | DELINK_INT))
                         pcr->trans_result = TRANS_RESULT_FAIL;
-                        if (pcr->done)
-                                complete(pcr->done);
-                } else if (int_reg & TRANS_OK_INT) {
+                else if (int_reg & TRANS_OK_INT)
                         pcr->trans_result = TRANS_RESULT_OK;
-                        if (pcr->done)
-                                complete(pcr->done);
+
+                if (pcr->done)
+                        complete(pcr->done);
+
+                if (int_reg & SD_EXIST) {
+                        struct rtsx_slot *slot = &pcr->slots[RTSX_SD_CARD];
+                        if (slot && slot->done_transfer)
+                                slot->done_transfer(slot->p_dev);
+                }
+
+                if (int_reg & MS_EXIST) {
+                        struct rtsx_slot *slot = &pcr->slots[RTSX_SD_CARD];
+                        if (slot && slot->done_transfer)
+                                slot->done_transfer(slot->p_dev);
                 }
         }
 
+
         if (pcr->card_inserted || pcr->card_removed)
                 schedule_delayed_work(&pcr->carddet_work,
                                 msecs_to_jiffies(200));
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 7b5424f398ac..452782bffebc 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -415,8 +415,7 @@ static int ioctl_do_sanitize(struct mmc_card *card)
 {
         int err;
 
-        if (!(mmc_can_sanitize(card) &&
-              (card->host->caps2 & MMC_CAP2_SANITIZE))) {
+        if (!mmc_can_sanitize(card)) {
                         pr_warn("%s: %s - SANITIZE is not supported\n",
                                 mmc_hostname(card->host), __func__);
                         err = -EOPNOTSUPP;
@@ -722,19 +721,6 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
         return result;
 }
 
-static int send_stop(struct mmc_card *card, u32 *status)
-{
-        struct mmc_command cmd = {0};
-        int err;
-
-        cmd.opcode = MMC_STOP_TRANSMISSION;
-        cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
-        err = mmc_wait_for_cmd(card->host, &cmd, 5);
-        if (err == 0)
-                *status = cmd.resp[0];
-        return err;
-}
-
 static int get_card_status(struct mmc_card *card, u32 *status, int retries)
 {
         struct mmc_command cmd = {0};
@@ -750,6 +736,99 @@ static int get_card_status(struct mmc_card *card, u32 *status, int retries)
         return err;
 }
 
+static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
+                bool hw_busy_detect, struct request *req, int *gen_err)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
+        int err = 0;
+        u32 status;
+
+        do {
+                err = get_card_status(card, &status, 5);
+                if (err) {
+                        pr_err("%s: error %d requesting status\n",
+                               req->rq_disk->disk_name, err);
+                        return err;
+                }
+
+                if (status & R1_ERROR) {
+                        pr_err("%s: %s: error sending status cmd, status %#x\n",
+                                req->rq_disk->disk_name, __func__, status);
+                        *gen_err = 1;
+                }
+
+                /* We may rely on the host hw to handle busy detection.*/
+                if ((card->host->caps & MMC_CAP_WAIT_WHILE_BUSY) &&
+                        hw_busy_detect)
+                        break;
+
+                /*
+                 * Timeout if the device never becomes ready for data and never
+                 * leaves the program state.
+                 */
+                if (time_after(jiffies, timeout)) {
+                        pr_err("%s: Card stuck in programming state! %s %s\n",
+                                mmc_hostname(card->host),
+                                req->rq_disk->disk_name, __func__);
+                        return -ETIMEDOUT;
+                }
+
+                /*
+                 * Some cards mishandle the status bits,
+                 * so make sure to check both the busy
+                 * indication and the card state.
+                 */
+        } while (!(status & R1_READY_FOR_DATA) ||
+                 (R1_CURRENT_STATE(status) == R1_STATE_PRG));
+
+        return err;
+}
+
+static int send_stop(struct mmc_card *card, unsigned int timeout_ms,
+                struct request *req, int *gen_err, u32 *stop_status)
+{
+        struct mmc_host *host = card->host;
+        struct mmc_command cmd = {0};
+        int err;
+        bool use_r1b_resp = rq_data_dir(req) == WRITE;
+
+        /*
+         * Normally we use R1B responses for WRITE, but in cases where the host
+         * has specified a max_busy_timeout we need to validate it. A failure
+         * means we need to prevent the host from doing hw busy detection, which
+         * is done by converting to a R1 response instead.
+         */
+        if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout))
+                use_r1b_resp = false;
+
+        cmd.opcode = MMC_STOP_TRANSMISSION;
+        if (use_r1b_resp) {
+                cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
+                cmd.busy_timeout = timeout_ms;
+        } else {
+                cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+        }
+
+        err = mmc_wait_for_cmd(host, &cmd, 5);
+        if (err)
+                return err;
+
+        *stop_status = cmd.resp[0];
+
+        /* No need to check card status in case of READ. */
+        if (rq_data_dir(req) == READ)
+                return 0;
+
+        if (!mmc_host_is_spi(host) &&
+                (*stop_status & R1_ERROR)) {
+                pr_err("%s: %s: general error sending stop command, resp %#x\n",
+                        req->rq_disk->disk_name, __func__, *stop_status);
+                *gen_err = 1;
+        }
+
+        return card_busy_detect(card, timeout_ms, use_r1b_resp, req, gen_err);
+}
+
 #define ERR_NOMEDIUM    3
 #define ERR_RETRY       2
 #define ERR_ABORT       1
@@ -866,26 +945,21 @@ static int mmc_blk_cmd_recovery(struct mmc_card *card, struct request *req,
          */
         if (R1_CURRENT_STATE(status) == R1_STATE_DATA ||
             R1_CURRENT_STATE(status) == R1_STATE_RCV) {
-                err = send_stop(card, &stop_status);
-                if (err)
+                err = send_stop(card,
+                        DIV_ROUND_UP(brq->data.timeout_ns, 1000000),
+                        req, gen_err, &stop_status);
+                if (err) {
                         pr_err("%s: error %d sending stop command\n",
                                req->rq_disk->disk_name, err);
-
-                /*
-                 * If the stop cmd also timed out, the card is probably
-                 * not present, so abort.  Other errors are bad news too.
-                 */
-                if (err)
+                        /*
+                         * If the stop cmd also timed out, the card is probably
+                         * not present, so abort. Other errors are bad news too.
+                         */
                         return ERR_ABORT;
+                }
+
                 if (stop_status & R1_CARD_ECC_FAILED)
                         *ecc_err = 1;
-                if (!mmc_host_is_spi(card->host) && rq_data_dir(req) != READ)
-                        if (stop_status & R1_ERROR) {
-                                pr_err("%s: %s: general error sending stop command, stop cmd response %#x\n",
-                                       req->rq_disk->disk_name, __func__,
-                                       stop_status);
-                                *gen_err = 1;
-                        }
         }
 
         /* Check for set block count errors */
@@ -1157,8 +1231,7 @@ static int mmc_blk_err_check(struct mmc_card *card,
          * program mode, which we have to wait for it to complete.
          */
         if (!mmc_host_is_spi(card->host) && rq_data_dir(req) != READ) {
-                u32 status;
-                unsigned long timeout;
+                int err;
 
                 /* Check stop command response */
                 if (brq->stop.resp[0] & R1_ERROR) {
@@ -1168,39 +1241,10 @@ static int mmc_blk_err_check(struct mmc_card *card,
                         gen_err = 1;
                 }
 
-                timeout = jiffies + msecs_to_jiffies(MMC_BLK_TIMEOUT_MS);
-                do {
-                        int err = get_card_status(card, &status, 5);
-                        if (err) {
-                                pr_err("%s: error %d requesting status\n",
-                                       req->rq_disk->disk_name, err);
-                                return MMC_BLK_CMD_ERR;
-                        }
-
-                        if (status & R1_ERROR) {
-                                pr_err("%s: %s: general error sending status command, card status %#x\n",
-                                       req->rq_disk->disk_name, __func__,
-                                       status);
-                                gen_err = 1;
-                        }
-
-                        /* Timeout if the device never becomes ready for data
-                         * and never leaves the program state.
-                         */
-                        if (time_after(jiffies, timeout)) {
-                                pr_err("%s: Card stuck in programming state!"\
-                                        " %s %s\n", mmc_hostname(card->host),
-                                        req->rq_disk->disk_name, __func__);
-
-                                return MMC_BLK_CMD_ERR;
-                        }
-                        /*
-                         * Some cards mishandle the status bits,
-                         * so make sure to check both the busy
-                         * indication and the card state.
-                         */
-                } while (!(status & R1_READY_FOR_DATA) ||
-                         (R1_CURRENT_STATE(status) == R1_STATE_PRG));
+                err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, false, req,
+                                        &gen_err);
+                if (err)
+                        return MMC_BLK_CMD_ERR;
         }
 
         /* if general error occurs, retry the write operation. */
@@ -1335,7 +1379,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
         brq->data.blksz = 512;
         brq->stop.opcode = MMC_STOP_TRANSMISSION;
         brq->stop.arg = 0;
-        brq->stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
         brq->data.blocks = blk_rq_sectors(req);
 
         /*
@@ -1378,9 +1421,15 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
         if (rq_data_dir(req) == READ) {
                 brq->cmd.opcode = readcmd;
                 brq->data.flags |= MMC_DATA_READ;
+                if (brq->mrq.stop)
+                        brq->stop.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 |
+                                        MMC_CMD_AC;
         } else {
                 brq->cmd.opcode = writecmd;
                 brq->data.flags |= MMC_DATA_WRITE;
+                if (brq->mrq.stop)
+                        brq->stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B |
+                                        MMC_CMD_AC;
         }
 
         if (do_rel_wr)
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index 269d072ef55e..9ebee72d9c3f 100644
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -2,21 +2,6 @@
 # MMC core configuration
 #
 
-config MMC_UNSAFE_RESUME
-        bool "Assume MMC/SD cards are non-removable (DANGEROUS)"
-        help
-          If you say Y here, the MMC layer will assume that all cards
-          stayed in their respective slots during the suspend. The
-          normal behaviour is to remove them at suspend and
-          redetecting them at resume. Breaking this assumption will
-          in most cases result in data corruption.
-
-          This option is usually just for embedded systems which use
-          a MMC/SD card for rootfs. Most people should say N here.
-
-          This option sets a default which can be overridden by the
-          module parameter "removable=0" or "removable=1".
-
 config MMC_CLKGATE
         bool "MMC host clock gating"
         help
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 64145a32b917..824644875d41 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -185,24 +185,16 @@ static int mmc_runtime_suspend(struct device *dev)
 {
         struct mmc_card *card = mmc_dev_to_card(dev);
         struct mmc_host *host = card->host;
-        int ret = 0;
 
-        if (host->bus_ops->runtime_suspend)
-                ret = host->bus_ops->runtime_suspend(host);
-
-        return ret;
+        return host->bus_ops->runtime_suspend(host);
 }
 
 static int mmc_runtime_resume(struct device *dev)
 {
         struct mmc_card *card = mmc_dev_to_card(dev);
         struct mmc_host *host = card->host;
-        int ret = 0;
 
-        if (host->bus_ops->runtime_resume)
-                ret = host->bus_ops->runtime_resume(host);
-
-        return ret;
+        return host->bus_ops->runtime_resume(host);
 }
 
 static int mmc_runtime_idle(struct device *dev)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 098374b1ab2b..acbc3f2aaaf9 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -34,6 +34,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/sd.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include "core.h"
 #include "bus.h"
@@ -65,23 +66,6 @@ bool use_spi_crc = 1;
 module_param(use_spi_crc, bool, 0);
 
 /*
- * We normally treat cards as removed during suspend if they are not
- * known to be on a non-removable bus, to avoid the risk of writing
- * back data to a different card after resume.  Allow this to be
- * overridden if necessary.
- */
-#ifdef CONFIG_MMC_UNSAFE_RESUME
-bool mmc_assume_removable;
-#else
-bool mmc_assume_removable = 1;
-#endif
-EXPORT_SYMBOL(mmc_assume_removable);
-module_param_named(removable, mmc_assume_removable, bool, 0644);
-MODULE_PARM_DESC(
-        removable,
-        "MMC/SD cards are removable and may be removed during suspend");
-
-/*
  * Internal function. Schedule delayed work in the MMC work queue.
  */
 static int mmc_schedule_delayed_work(struct delayed_work *work,
@@ -302,7 +286,8 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
         }
 
         err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                        EXT_CSD_BKOPS_START, 1, timeout, use_busy_signal, true);
+                        EXT_CSD_BKOPS_START, 1, timeout,
+                        use_busy_signal, true, false);
         if (err) {
                 pr_warn("%s: Error %d starting bkops\n",
                         mmc_hostname(card->host), err);
@@ -1950,7 +1935,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
         cmd.opcode = MMC_ERASE;
         cmd.arg = arg;
         cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
-        cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
+        cmd.busy_timeout = mmc_erase_timeout(card, arg, qty);
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
         if (err) {
                 pr_err("mmc_erase: erase error %d, status %#x\n",
@@ -2137,7 +2122,7 @@ static unsigned int mmc_do_calc_max_discard(struct mmc_card *card,
                 y = 0;
                 for (x = 1; x && x <= max_qty && max_qty - x >= qty; x <<= 1) {
                         timeout = mmc_erase_timeout(card, arg, qty + x);
-                        if (timeout > host->max_discard_to)
+                        if (timeout > host->max_busy_timeout)
                                 break;
                         if (timeout < last_timeout)
                                 break;
@@ -2169,7 +2154,7 @@ unsigned int mmc_calc_max_discard(struct mmc_card *card)
         struct mmc_host *host = card->host;
         unsigned int max_discard, max_trim;
 
-        if (!host->max_discard_to)
+        if (!host->max_busy_timeout)
                 return UINT_MAX;
 
         /*
@@ -2189,7 +2174,7 @@ unsigned int mmc_calc_max_discard(struct mmc_card *card)
                 max_discard = 0;
         }
         pr_debug("%s: calculated max. discard sectors %u for timeout %u ms\n",
-                 mmc_hostname(host), max_discard, host->max_discard_to);
+                 mmc_hostname(host), max_discard, host->max_busy_timeout);
         return max_discard;
 }
 EXPORT_SYMBOL(mmc_calc_max_discard);
@@ -2248,9 +2233,6 @@ static int mmc_do_hw_reset(struct mmc_host *host, int check)
 {
         struct mmc_card *card = host->card;
 
-        if (!host->bus_ops->power_restore)
-                return -EOPNOTSUPP;
-
         if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
                 return -EOPNOTSUPP;
 
@@ -2352,7 +2334,7 @@ int _mmc_detect_card_removed(struct mmc_host *host)
 {
         int ret;
 
-        if ((host->caps & MMC_CAP_NONREMOVABLE) || !host->bus_ops->alive)
+        if (host->caps & MMC_CAP_NONREMOVABLE)
                 return 0;
 
         if (!host->card || mmc_card_removed(host->card))
@@ -2435,7 +2417,7 @@ void mmc_rescan(struct work_struct *work)
          * if there is a _removable_ card registered, check whether it is
          * still present
          */
-        if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
+        if (host->bus_ops && !host->bus_dead
             && !(host->caps & MMC_CAP_NONREMOVABLE))
                 host->bus_ops->detect(host);
 
@@ -2490,6 +2472,7 @@ void mmc_start_host(struct mmc_host *host)
                 mmc_power_off(host);
         else
                 mmc_power_up(host, host->ocr_avail);
+        mmc_gpiod_request_cd_irq(host);
         _mmc_detect_change(host, 0, false);
 }
 
@@ -2501,6 +2484,8 @@ void mmc_stop_host(struct mmc_host *host)
         host->removed = 1;
         spin_unlock_irqrestore(&host->lock, flags);
 #endif
+        if (host->slot.cd_irq >= 0)
+                disable_irq(host->slot.cd_irq);
 
         host->rescan_disable = 1;
         cancel_delayed_work_sync(&host->detect);
@@ -2537,7 +2522,7 @@ int mmc_power_save_host(struct mmc_host *host)
 
         mmc_bus_get(host);
 
-        if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+        if (!host->bus_ops || host->bus_dead) {
                 mmc_bus_put(host);
                 return -EINVAL;
         }
@@ -2563,7 +2548,7 @@ int mmc_power_restore_host(struct mmc_host *host)
 
         mmc_bus_get(host);
 
-        if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
+        if (!host->bus_ops || host->bus_dead) {
                 mmc_bus_put(host);
                 return -EINVAL;
         }
@@ -2582,12 +2567,8 @@ EXPORT_SYMBOL(mmc_power_restore_host);
  */
 int mmc_flush_cache(struct mmc_card *card)
 {
-        struct mmc_host *host = card->host;
         int err = 0;
 
-        if (!(host->caps2 & MMC_CAP2_CACHE_CTRL))
-                return err;
-
         if (mmc_card_mmc(card) &&
                         (card->ext_csd.cache_size > 0) &&
                         (card->ext_csd.cache_ctrl & 1)) {
@@ -2602,44 +2583,6 @@ int mmc_flush_cache(struct mmc_card *card)
 }
 EXPORT_SYMBOL(mmc_flush_cache);
 
-/*
- * Turn the cache ON/OFF.
- * Turning the cache OFF shall trigger flushing of the data
- * to the non-volatile storage.
- * This function should be called with host claimed
- */
-int mmc_cache_ctrl(struct mmc_host *host, u8 enable)
-{
-        struct mmc_card *card = host->card;
-        unsigned int timeout;
-        int err = 0;
-
-        if (!(host->caps2 & MMC_CAP2_CACHE_CTRL) ||
-                        mmc_card_is_removable(host))
-                return err;
-
-        if (card && mmc_card_mmc(card) &&
-                        (card->ext_csd.cache_size > 0)) {
-                enable = !!enable;
-
-                if (card->ext_csd.cache_ctrl ^ enable) {
-                        timeout = enable ? card->ext_csd.generic_cmd6_time : 0;
-                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                        EXT_CSD_CACHE_CTRL, enable, timeout);
-                        if (err)
-                                pr_err("%s: cache %s error %d\n",
-                                                mmc_hostname(card->host),
-                                                enable ? "on" : "off",
-                                                err);
-                        else
-                                card->ext_csd.cache_ctrl = enable;
-                }
-        }
-
-        return err;
-}
-EXPORT_SYMBOL(mmc_cache_ctrl);
-
 #ifdef CONFIG_PM
 
 /* Do the card removal on suspend if card is assumed removeable
@@ -2668,7 +2611,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
                 /* Validate prerequisites for suspend */
                 if (host->bus_ops->pre_suspend)
                         err = host->bus_ops->pre_suspend(host);
-                if (!err && host->bus_ops->suspend)
+                if (!err)
                         break;
 
                 /* Calling bus_ops->remove() with a claimed host can deadlock */
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 114f6bdfbef3..fdea825dbb24 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -419,6 +419,16 @@ int mmc_of_parse(struct mmc_host *host)
                 host->caps |= MMC_CAP_SD_HIGHSPEED;
         if (of_find_property(np, "cap-mmc-highspeed", &len))
                 host->caps |= MMC_CAP_MMC_HIGHSPEED;
+        if (of_find_property(np, "sd-uhs-sdr12", &len))
+                host->caps |= MMC_CAP_UHS_SDR12;
+        if (of_find_property(np, "sd-uhs-sdr25", &len))
+                host->caps |= MMC_CAP_UHS_SDR25;
+        if (of_find_property(np, "sd-uhs-sdr50", &len))
+                host->caps |= MMC_CAP_UHS_SDR50;
+        if (of_find_property(np, "sd-uhs-sdr104", &len))
+                host->caps |= MMC_CAP_UHS_SDR104;
+        if (of_find_property(np, "sd-uhs-ddr50", &len))
+                host->caps |= MMC_CAP_UHS_DDR50;
         if (of_find_property(np, "cap-power-off-card", &len))
                 host->caps |= MMC_CAP_POWER_OFF_CARD;
         if (of_find_property(np, "cap-sdio-irq", &len))
@@ -429,6 +439,14 @@ int mmc_of_parse(struct mmc_host *host)
                 host->pm_caps |= MMC_PM_KEEP_POWER;
         if (of_find_property(np, "enable-sdio-wakeup", &len))
                 host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+        if (of_find_property(np, "mmc-ddr-1_8v", &len))
+                host->caps |= MMC_CAP_1_8V_DDR;
+        if (of_find_property(np, "mmc-ddr-1_2v", &len))
+                host->caps |= MMC_CAP_1_2V_DDR;
+        if (of_find_property(np, "mmc-hs200-1_8v", &len))
+                host->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
+        if (of_find_property(np, "mmc-hs200-1_2v", &len))
+                host->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
 
         return 0;
 
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 98e9eb0f6643..1ab5f3a0af5b 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -856,8 +856,10 @@ static int mmc_select_hs200(struct mmc_card *card)
 
         /* switch to HS200 mode if bus width set successfully */
         if (!err)
-                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                 EXT_CSD_HS_TIMING, 2, 0);
+                err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_HS_TIMING, 2,
+                                card->ext_csd.generic_cmd6_time,
+                                true, true, true);
 err:
         return err;
 }
@@ -1074,9 +1076,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                     host->caps2 & MMC_CAP2_HS200)
                         err = mmc_select_hs200(card);
                 else if (host->caps & MMC_CAP_MMC_HIGHSPEED)
-                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                         EXT_CSD_HS_TIMING, 1,
-                                         card->ext_csd.generic_cmd6_time);
+                        err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                                        EXT_CSD_HS_TIMING, 1,
+                                        card->ext_csd.generic_cmd6_time,
+                                        true, true, true);
 
                 if (err && err != -EBADMSG)
                         goto free_card;
@@ -1287,8 +1290,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
          * If cache size is higher than 0, this indicates
          * the existence of cache and it can be turned on.
          */
-        if ((host->caps2 & MMC_CAP2_CACHE_CTRL) &&
-                        card->ext_csd.cache_size > 0) {
+        if (card->ext_csd.cache_size > 0) {
                 err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                 EXT_CSD_CACHE_CTRL, 1,
                                 card->ext_csd.generic_cmd6_time);
@@ -1356,11 +1358,9 @@ static int mmc_sleep(struct mmc_host *host)
 {
         struct mmc_command cmd = {0};
         struct mmc_card *card = host->card;
+        unsigned int timeout_ms = DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000);
         int err;
 
-        if (host->caps2 & MMC_CAP2_NO_SLEEP_CMD)
-                return 0;
-
         err = mmc_deselect_cards(host);
         if (err)
                 return err;
@@ -1369,7 +1369,19 @@ static int mmc_sleep(struct mmc_host *host)
         cmd.arg = card->rca << 16;
         cmd.arg |= 1 << 15;
 
-        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+        /*
+         * If the max_busy_timeout of the host is specified, validate it against
+         * the sleep cmd timeout. A failure means we need to prevent the host
+         * from doing hw busy detection, which is done by converting to a R1
+         * response instead of a R1B.
+         */
+        if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout)) {
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        } else {
+                cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+                cmd.busy_timeout = timeout_ms;
+        }
+
         err = mmc_wait_for_cmd(host, &cmd, 0);
         if (err)
                 return err;
@@ -1380,8 +1392,8 @@ static int mmc_sleep(struct mmc_host *host)
          * SEND_STATUS command to poll the status because that command (and most
          * others) is invalid while the card sleeps.
          */
-        if (!(host->caps & MMC_CAP_WAIT_WHILE_BUSY))
-                mmc_delay(DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000));
+        if (!cmd.busy_timeout || !(host->caps & MMC_CAP_WAIT_WHILE_BUSY))
+                mmc_delay(timeout_ms);
 
         return err;
 }
@@ -1404,7 +1416,7 @@ static int mmc_poweroff_notify(struct mmc_card *card, unsigned int notify_type)
 
         err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                         EXT_CSD_POWER_OFF_NOTIFICATION,
-                        notify_type, timeout, true, false);
+                        notify_type, timeout, true, false, false);
         if (err)
                 pr_err("%s: Power Off Notification timed out, %u\n",
                        mmc_hostname(card->host), timeout);
@@ -1484,7 +1496,7 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
                         goto out;
         }
 
-        err = mmc_cache_ctrl(host, 0);
+        err = mmc_flush_cache(host->card);
         if (err)
                 goto out;
 
@@ -1636,16 +1648,6 @@ static int mmc_power_restore(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_ops = {
         .remove = mmc_remove,
         .detect = mmc_detect,
-        .suspend = NULL,
-        .resume = NULL,
-        .power_restore = mmc_power_restore,
-        .alive = mmc_alive,
-        .shutdown = mmc_shutdown,
-};
-
-static const struct mmc_bus_ops mmc_ops_unsafe = {
-        .remove = mmc_remove,
-        .detect = mmc_detect,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
         .runtime_suspend = mmc_runtime_suspend,
@@ -1655,17 +1657,6 @@ static const struct mmc_bus_ops mmc_ops_unsafe = {
         .shutdown = mmc_shutdown,
 };
 
-static void mmc_attach_bus_ops(struct mmc_host *host)
-{
-        const struct mmc_bus_ops *bus_ops;
-
-        if (!mmc_card_is_removable(host))
-                bus_ops = &mmc_ops_unsafe;
-        else
-                bus_ops = &mmc_ops;
-        mmc_attach_bus(host, bus_ops);
-}
-
 /*
  * Starting point for MMC card init.
  */
@@ -1685,7 +1676,7 @@ int mmc_attach_mmc(struct mmc_host *host)
         if (err)
                 return err;
 
-        mmc_attach_bus_ops(host);
+        mmc_attach_bus(host, &mmc_ops);
         if (host->ocr_avail_mmc)
                 host->ocr_avail = host->ocr_avail_mmc;
 
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index e5b5eeb548d1..f51b5ba3bbea 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -405,20 +405,30 @@ int mmc_spi_set_crc(struct mmc_host *host, int use_crc)
  *                   timeout of zero implies maximum possible timeout
  *      @use_busy_signal: use the busy signal as response type
  *      @send_status: send status cmd to poll for busy
+ *      @ignore_crc: ignore CRC errors when sending status cmd to poll for busy
  *
  *      Modifies the EXT_CSD register for selected card.
  */
 int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
-                unsigned int timeout_ms, bool use_busy_signal, bool send_status)
+                unsigned int timeout_ms, bool use_busy_signal, bool send_status,
+                bool ignore_crc)
 {
+        struct mmc_host *host = card->host;
         int err;
         struct mmc_command cmd = {0};
         unsigned long timeout;
         u32 status = 0;
-        bool ignore_crc = false;
+        bool use_r1b_resp = use_busy_signal;
 
-        BUG_ON(!card);
-        BUG_ON(!card->host);
+        /*
+         * If the cmd timeout and the max_busy_timeout of the host are both
+         * specified, let's validate them. A failure means we need to prevent
+         * the host from doing hw busy detection, which is done by converting
+         * to a R1 response instead of a R1B.
+         */
+        if (timeout_ms && host->max_busy_timeout &&
+                (timeout_ms > host->max_busy_timeout))
+                use_r1b_resp = false;
 
         cmd.opcode = MMC_SWITCH;
         cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
@@ -426,17 +436,21 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                   (value << 8) |
                   set;
         cmd.flags = MMC_CMD_AC;
-        if (use_busy_signal)
+        if (use_r1b_resp) {
                 cmd.flags |= MMC_RSP_SPI_R1B | MMC_RSP_R1B;
-        else
+                /*
+                 * A busy_timeout of zero means the host can decide to use
+                 * whatever value it finds suitable.
+                 */
+                cmd.busy_timeout = timeout_ms;
+        } else {
                 cmd.flags |= MMC_RSP_SPI_R1 | MMC_RSP_R1;
+        }
 
-
-        cmd.cmd_timeout_ms = timeout_ms;
         if (index == EXT_CSD_SANITIZE_START)
                 cmd.sanitize_busy = true;
 
-        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
         if (err)
                 return err;
 
@@ -445,24 +459,27 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                 return 0;
 
         /*
-         * Must check status to be sure of no errors
-         * If CMD13 is to check the busy completion of the timing change,
-         * disable the check of CRC error.
+         * CRC errors shall only be ignored in cases were CMD13 is used to poll
+         * to detect busy completion.
          */
-        if (index == EXT_CSD_HS_TIMING &&
-            !(card->host->caps & MMC_CAP_WAIT_WHILE_BUSY))
-                ignore_crc = true;
+        if ((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp)
+                ignore_crc = false;
+
+        /* We have an unspecified cmd timeout, use the fallback value. */
+        if (!timeout_ms)
+                timeout_ms = MMC_OPS_TIMEOUT_MS;
 
-        timeout = jiffies + msecs_to_jiffies(MMC_OPS_TIMEOUT_MS);
+        /* Must check status to be sure of no errors. */
+        timeout = jiffies + msecs_to_jiffies(timeout_ms);
         do {
                 if (send_status) {
                         err = __mmc_send_status(card, &status, ignore_crc);
                         if (err)
                                 return err;
                 }
-                if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
+                if ((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp)
                         break;
-                if (mmc_host_is_spi(card->host))
+                if (mmc_host_is_spi(host))
                         break;
 
                 /*
@@ -478,18 +495,18 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                 /* Timeout if the device never leaves the program state. */
                 if (time_after(jiffies, timeout)) {
                         pr_err("%s: Card stuck in programming state! %s\n",
-                                mmc_hostname(card->host), __func__);
+                                mmc_hostname(host), __func__);
                         return -ETIMEDOUT;
                 }
         } while (R1_CURRENT_STATE(status) == R1_STATE_PRG);
 
-        if (mmc_host_is_spi(card->host)) {
+        if (mmc_host_is_spi(host)) {
                 if (status & R1_SPI_ILLEGAL_COMMAND)
                         return -EBADMSG;
         } else {
                 if (status & 0xFDFFA000)
-                        pr_warning("%s: unexpected status %#x after "
-                               "switch", mmc_hostname(card->host), status);
+                        pr_warn("%s: unexpected status %#x after switch\n",
+                                mmc_hostname(host), status);
                 if (status & R1_SWITCH_ERROR)
                         return -EBADMSG;
         }
@@ -501,7 +518,8 @@ EXPORT_SYMBOL_GPL(__mmc_switch);
 int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                 unsigned int timeout_ms)
 {
-        return __mmc_switch(card, set, index, value, timeout_ms, true, true);
+        return __mmc_switch(card, set, index, value, timeout_ms, true, true,
+                                false);
 }
 EXPORT_SYMBOL_GPL(mmc_switch);
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 692fdb177294..2dd359d2242f 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1209,16 +1209,6 @@ static int mmc_sd_power_restore(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_sd_ops = {
         .remove = mmc_sd_remove,
         .detect = mmc_sd_detect,
-        .suspend = NULL,
-        .resume = NULL,
-        .power_restore = mmc_sd_power_restore,
-        .alive = mmc_sd_alive,
-        .shutdown = mmc_sd_suspend,
-};
-
-static const struct mmc_bus_ops mmc_sd_ops_unsafe = {
-        .remove = mmc_sd_remove,
-        .detect = mmc_sd_detect,
         .runtime_suspend = mmc_sd_runtime_suspend,
         .runtime_resume = mmc_sd_runtime_resume,
         .suspend = mmc_sd_suspend,
@@ -1228,17 +1218,6 @@ static const struct mmc_bus_ops mmc_sd_ops_unsafe = {
         .shutdown = mmc_sd_suspend,
 };
 
-static void mmc_sd_attach_bus_ops(struct mmc_host *host)
-{
-        const struct mmc_bus_ops *bus_ops;
-
-        if (!mmc_card_is_removable(host))
-                bus_ops = &mmc_sd_ops_unsafe;
-        else
-                bus_ops = &mmc_sd_ops;
-        mmc_attach_bus(host, bus_ops);
-}
-
 /*
  * Starting point for SD card init.
  */
@@ -1254,7 +1233,7 @@ int mmc_attach_sd(struct mmc_host *host)
         if (err)
                 return err;
 
-        mmc_sd_attach_bus_ops(host);
+        mmc_attach_bus(host, &mmc_sd_ops);
         if (host->ocr_avail_sd)
                 host->ocr_avail = host->ocr_avail_sd;
 
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 46596b71a32f..f7650b899e3d 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -10,6 +10,7 @@
 
 #include <linux/err.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/mmc/host.h>
@@ -18,8 +19,10 @@
 #include <linux/slab.h>
 
 struct mmc_gpio {
-        int ro_gpio;
-        int cd_gpio;
+        struct gpio_desc *ro_gpio;
+        struct gpio_desc *cd_gpio;
+        bool override_ro_active_level;
+        bool override_cd_active_level;
         char *ro_label;
         char cd_label[0];
 };
@@ -57,8 +60,6 @@ static int mmc_gpio_alloc(struct mmc_host *host)
                         ctx->ro_label = ctx->cd_label + len;
                         snprintf(ctx->cd_label, len, "%s cd", dev_name(host->parent));
                         snprintf(ctx->ro_label, len, "%s ro", dev_name(host->parent));
-                        ctx->cd_gpio = -EINVAL;
-                        ctx->ro_gpio = -EINVAL;
                         host->slot.handler_priv = ctx;
                 }
         }
@@ -72,11 +73,14 @@ int mmc_gpio_get_ro(struct mmc_host *host)
 {
         struct mmc_gpio *ctx = host->slot.handler_priv;
 
-        if (!ctx || !gpio_is_valid(ctx->ro_gpio))
+        if (!ctx || !ctx->ro_gpio)
                 return -ENOSYS;
 
-        return !gpio_get_value_cansleep(ctx->ro_gpio) ^
-                !!(host->caps2 & MMC_CAP2_RO_ACTIVE_HIGH);
+        if (ctx->override_ro_active_level)
+                return !gpiod_get_raw_value_cansleep(ctx->ro_gpio) ^
+                        !!(host->caps2 & MMC_CAP2_RO_ACTIVE_HIGH);
+
+        return gpiod_get_value_cansleep(ctx->ro_gpio);
 }
 EXPORT_SYMBOL(mmc_gpio_get_ro);
 
@@ -84,11 +88,14 @@ int mmc_gpio_get_cd(struct mmc_host *host)
 {
         struct mmc_gpio *ctx = host->slot.handler_priv;
 
-        if (!ctx || !gpio_is_valid(ctx->cd_gpio))
+        if (!ctx || !ctx->cd_gpio)
                 return -ENOSYS;
 
-        return !gpio_get_value_cansleep(ctx->cd_gpio) ^
-                !!(host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH);
+        if (ctx->override_cd_active_level)
+                return !gpiod_get_raw_value_cansleep(ctx->cd_gpio) ^
+                        !!(host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH);
+
+        return gpiod_get_value_cansleep(ctx->cd_gpio);
 }
 EXPORT_SYMBOL(mmc_gpio_get_cd);
 
@@ -125,12 +132,47 @@ int mmc_gpio_request_ro(struct mmc_host *host, unsigned int gpio)
         if (ret < 0)
                 return ret;
 
-        ctx->ro_gpio = gpio;
+        ctx->override_ro_active_level = true;
+        ctx->ro_gpio = gpio_to_desc(gpio);
 
         return 0;
 }
 EXPORT_SYMBOL(mmc_gpio_request_ro);
 
+void mmc_gpiod_request_cd_irq(struct mmc_host *host)
+{
+        struct mmc_gpio *ctx = host->slot.handler_priv;
+        int ret, irq;
+
+        if (host->slot.cd_irq >= 0 || !ctx || !ctx->cd_gpio)
+                return;
+
+        irq = gpiod_to_irq(ctx->cd_gpio);
+
+        /*
+         * Even if gpiod_to_irq() returns a valid IRQ number, the platform might
+         * still prefer to poll, e.g., because that IRQ number is already used
+         * by another unit and cannot be shared.
+         */
+        if (irq >= 0 && host->caps & MMC_CAP_NEEDS_POLL)
+                irq = -EINVAL;
+
+        if (irq >= 0) {
+                ret = devm_request_threaded_irq(&host->class_dev, irq,
+                        NULL, mmc_gpio_cd_irqt,
+                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                        ctx->cd_label, host);
+                if (ret < 0)
+                        irq = ret;
+        }
+
+        host->slot.cd_irq = irq;
+
+        if (irq < 0)
+                host->caps |= MMC_CAP_NEEDS_POLL;
+}
+EXPORT_SYMBOL(mmc_gpiod_request_cd_irq);
+
 /**
  * mmc_gpio_request_cd - request a gpio for card-detection
  * @host: mmc host
@@ -154,7 +196,6 @@ int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio,
                         unsigned int debounce)
 {
         struct mmc_gpio *ctx;
-        int irq = gpio_to_irq(gpio);
         int ret;
 
         ret = mmc_gpio_alloc(host);
@@ -179,29 +220,10 @@ int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio,
                         return ret;
         }
 
-        /*
-         * Even if gpio_to_irq() returns a valid IRQ number, the platform might
-         * still prefer to poll, e.g., because that IRQ number is already used
-         * by another unit and cannot be shared.
-         */
-        if (irq >= 0 && host->caps & MMC_CAP_NEEDS_POLL)
-                irq = -EINVAL;
-
-        if (irq >= 0) {
-                ret = devm_request_threaded_irq(&host->class_dev, irq,
-                        NULL, mmc_gpio_cd_irqt,
-                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                        ctx->cd_label, host);
-                if (ret < 0)
-                        irq = ret;
-        }
-
-        host->slot.cd_irq = irq;
-
-        if (irq < 0)
-                host->caps |= MMC_CAP_NEEDS_POLL;
+        ctx->override_cd_active_level = true;
+        ctx->cd_gpio = gpio_to_desc(gpio);
 
-        ctx->cd_gpio = gpio;
+        mmc_gpiod_request_cd_irq(host);
 
         return 0;
 }
@@ -219,11 +241,11 @@ void mmc_gpio_free_ro(struct mmc_host *host)
         struct mmc_gpio *ctx = host->slot.handler_priv;
         int gpio;
 
-        if (!ctx || !gpio_is_valid(ctx->ro_gpio))
+        if (!ctx || !ctx->ro_gpio)
                 return;
 
-        gpio = ctx->ro_gpio;
-        ctx->ro_gpio = -EINVAL;
+        gpio = desc_to_gpio(ctx->ro_gpio);
+        ctx->ro_gpio = NULL;
 
         devm_gpio_free(&host->class_dev, gpio);
 }
@@ -241,7 +263,7 @@ void mmc_gpio_free_cd(struct mmc_host *host)
         struct mmc_gpio *ctx = host->slot.handler_priv;
         int gpio;
 
-        if (!ctx || !gpio_is_valid(ctx->cd_gpio))
+        if (!ctx || !ctx->cd_gpio)
                 return;
 
         if (host->slot.cd_irq >= 0) {
@@ -249,9 +271,87 @@ void mmc_gpio_free_cd(struct mmc_host *host)
                 host->slot.cd_irq = -EINVAL;
         }
 
-        gpio = ctx->cd_gpio;
-        ctx->cd_gpio = -EINVAL;
+        gpio = desc_to_gpio(ctx->cd_gpio);
+        ctx->cd_gpio = NULL;
 
         devm_gpio_free(&host->class_dev, gpio);
 }
 EXPORT_SYMBOL(mmc_gpio_free_cd);
+
+/**
+ * mmc_gpiod_request_cd - request a gpio descriptor for card-detection
+ * @host: mmc host
+ * @con_id: function within the GPIO consumer
+ * @idx: index of the GPIO to obtain in the consumer
+ * @override_active_level: ignore %GPIO_ACTIVE_LOW flag
+ * @debounce: debounce time in microseconds
+ *
+ * Use this function in place of mmc_gpio_request_cd() to use the GPIO
+ * descriptor API.  Note that it is paired with mmc_gpiod_free_cd() not
+ * mmc_gpio_free_cd().  Note also that it must be called prior to mmc_add_host()
+ * otherwise the caller must also call mmc_gpiod_request_cd_irq().
+ *
+ * Returns zero on success, else an error.
+ */
+int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
+                         unsigned int idx, bool override_active_level,
+                         unsigned int debounce)
+{
+        struct mmc_gpio *ctx;
+        struct gpio_desc *desc;
+        int ret;
+
+        ret = mmc_gpio_alloc(host);
+        if (ret < 0)
+                return ret;
+
+        ctx = host->slot.handler_priv;
+
+        if (!con_id)
+                con_id = ctx->cd_label;
+
+        desc = devm_gpiod_get_index(host->parent, con_id, idx);
+        if (IS_ERR(desc))
+                return PTR_ERR(desc);
+
+        ret = gpiod_direction_input(desc);
+        if (ret < 0)
+                return ret;
+
+        if (debounce) {
+                ret = gpiod_set_debounce(desc, debounce);
+                if (ret < 0)
+                        return ret;
+        }
+
+        ctx->override_cd_active_level = override_active_level;
+        ctx->cd_gpio = desc;
+
+        return 0;
+}
+EXPORT_SYMBOL(mmc_gpiod_request_cd);
+
+/**
+ * mmc_gpiod_free_cd - free the card-detection gpio descriptor
+ * @host: mmc host
+ *
+ * It's provided only for cases that client drivers need to manually free
+ * up the card-detection gpio requested by mmc_gpiod_request_cd().
+ */
+void mmc_gpiod_free_cd(struct mmc_host *host)
+{
+        struct mmc_gpio *ctx = host->slot.handler_priv;
+
+        if (!ctx || !ctx->cd_gpio)
+                return;
+
+        if (host->slot.cd_irq >= 0) {
+                devm_free_irq(&host->class_dev, host->slot.cd_irq, host);
+                host->slot.cd_irq = -EINVAL;
+        }
+
+        devm_gpiod_put(&host->class_dev, ctx->cd_gpio);
+
+        ctx->cd_gpio = NULL;
+}
+EXPORT_SYMBOL(mmc_gpiod_free_cd);
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 1384f67abe21..8aaf8c1f3f63 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -263,7 +263,7 @@ config MMC_SDHCI_S3C_DMA
 
 config MMC_SDHCI_BCM_KONA
         tristate "SDHCI support on Broadcom KONA platform"
-        depends on ARCH_BCM
+        depends on ARCH_BCM_MOBILE
         select MMC_SDHCI_PLTFM
         help
           This selects the Broadcom Kona Secure Digital Host Controller
@@ -334,6 +334,19 @@ config MMC_ATMELMCI
 
           If unsure, say N.
 
+config MMC_SDHCI_MSM
+        tristate "Qualcomm SDHCI Controller Support"
+        depends on ARCH_QCOM
+        depends on MMC_SDHCI_PLTFM
+        help
+          This selects the Secure Digital Host Controller Interface (SDHCI)
+          support present in Qualcomm SOCs. The controller supports
+          SD/MMC/SDIO devices.
+
+          If you have a controller with this interface, say Y or M here.
+
+          If unsure, say N.
+
 config MMC_MSM
         tristate "Qualcomm SDCC Controller Support"
         depends on MMC && (ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50)
@@ -580,14 +593,6 @@ config MMC_DW_EXYNOS
           Synopsys DesignWare Memory Card Interface driver. Select this option
           for platforms based on Exynos4 and Exynos5 SoC's.
 
-config MMC_DW_SOCFPGA
-        tristate "SOCFPGA specific extensions for Synopsys DW Memory Card Interface"
-        depends on MMC_DW && MFD_SYSCON
-        select MMC_DW_PLTFM
-        help
-          This selects support for Altera SoCFPGA specific extensions to the
-          Synopsys DesignWare Memory Card Interface driver.
-
 config MMC_DW_K3
         tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
         depends on MMC_DW
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 3483b6b6b880..0c8aa5e1e304 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -43,7 +43,6 @@ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
 obj-$(CONFIG_MMC_DW)            += dw_mmc.o
 obj-$(CONFIG_MMC_DW_PLTFM)      += dw_mmc-pltfm.o
 obj-$(CONFIG_MMC_DW_EXYNOS)     += dw_mmc-exynos.o
-obj-$(CONFIG_MMC_DW_SOCFPGA)    += dw_mmc-socfpga.o
 obj-$(CONFIG_MMC_DW_K3)         += dw_mmc-k3.o
 obj-$(CONFIG_MMC_DW_PCI)        += dw_mmc-pci.o
 obj-$(CONFIG_MMC_SH_MMCIF)      += sh_mmcif.o
@@ -64,6 +63,7 @@ obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)	+= sdhci-of-esdhc.o
 obj-$(CONFIG_MMC_SDHCI_OF_HLWD)         += sdhci-of-hlwd.o
 obj-$(CONFIG_MMC_SDHCI_BCM_KONA)        += sdhci-bcm-kona.o
 obj-$(CONFIG_MMC_SDHCI_BCM2835)         += sdhci-bcm2835.o
+obj-$(CONFIG_MMC_SDHCI_MSM)             += sdhci-msm.o
 
 ifeq ($(CONFIG_CB710_DEBUG),y)
         CFLAGS-cb710-mmc        += -DDEBUG
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index d6153740b77f..5d4c5e0fba2f 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1192,7 +1192,7 @@ static struct davinci_mmc_config
         struct device_node *np;
         struct davinci_mmc_config *pdata = pdev->dev.platform_data;
         const struct of_device_id *match =
-                of_match_device(of_match_ptr(davinci_mmc_dt_ids), &pdev->dev);
+                of_match_device(davinci_mmc_dt_ids, &pdev->dev);
         u32 data;
 
         np = pdev->dev.of_node;
@@ -1468,7 +1468,7 @@ static struct platform_driver davinci_mmcsd_driver = {
                 .name   = "davinci_mmc",
                 .owner  = THIS_MODULE,
                 .pm     = davinci_mmcsd_pm_ops,
-                .of_match_table = of_match_ptr(davinci_mmc_dt_ids),
+                .of_match_table = davinci_mmc_dt_ids,
         },
         .remove         = __exit_p(davinci_mmcsd_remove),
         .id_table       = davinci_mmc_devtype,
diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
index f567c219cff4..650f9cc3f7a6 100644
--- a/drivers/mmc/host/dw_mmc-k3.c
+++ b/drivers/mmc/host/dw_mmc-k3.c
@@ -50,6 +50,7 @@ static int dw_mci_k3_probe(struct platform_device *pdev)
         return dw_mci_pltfm_register(pdev, drv_data);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int dw_mci_k3_suspend(struct device *dev)
 {
         struct dw_mci *host = dev_get_drvdata(dev);
@@ -75,6 +76,7 @@ static int dw_mci_k3_resume(struct device *dev)
 
         return dw_mci_resume(host);
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(dw_mci_k3_pmops, dw_mci_k3_suspend, dw_mci_k3_resume);
 
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 5c4965655297..d4a47a9f5584 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -25,13 +25,17 @@
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
-static void dw_mci_rockchip_prepare_command(struct dw_mci *host, u32 *cmdr)
+static void dw_mci_pltfm_prepare_command(struct dw_mci *host, u32 *cmdr)
 {
         *cmdr |= SDMMC_CMD_USE_HOLD_REG;
 }
 
 static const struct dw_mci_drv_data rockchip_drv_data = {
-        .prepare_command        = dw_mci_rockchip_prepare_command,
+        .prepare_command        = dw_mci_pltfm_prepare_command,
+};
+
+static const struct dw_mci_drv_data socfpga_drv_data = {
+        .prepare_command        = dw_mci_pltfm_prepare_command,
 };
 
 int dw_mci_pltfm_register(struct platform_device *pdev,
@@ -92,6 +96,8 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
         { .compatible = "snps,dw-mshc", },
         { .compatible = "rockchip,rk2928-dw-mshc",
                 .data = &rockchip_drv_data },
+        { .compatible = "altr,socfpga-dw-mshc",
+                .data = &socfpga_drv_data },
         {},
 };
 MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
@@ -123,7 +129,7 @@ static struct platform_driver dw_mci_pltfm_driver = {
         .remove         = dw_mci_pltfm_remove,
         .driver         = {
                 .name           = "dw_mmc",
-                .of_match_table = of_match_ptr(dw_mci_pltfm_match),
+                .of_match_table = dw_mci_pltfm_match,
                 .pm             = &dw_mci_pltfm_pmops,
         },
 };
diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
deleted file mode 100644
index 3e8e53ae3302..000000000000
--- a/drivers/mmc/host/dw_mmc-socfpga.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Altera SoCFPGA Specific Extensions for Synopsys DW Multimedia Card Interface
- * driver
- *
- *  Copyright (C) 2012, Samsung Electronics Co., Ltd.
- *  Copyright (C) 2013 Altera Corporation
- *
- * 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.
- *
- * Taken from dw_mmc-exynos.c
- */
-#include <linux/clk.h>
-#include <linux/mfd/syscon.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/dw_mmc.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/regmap.h>
-
-#include "dw_mmc.h"
-#include "dw_mmc-pltfm.h"
-
-#define SYSMGR_SDMMCGRP_CTRL_OFFSET             0x108
-#define DRV_CLK_PHASE_SHIFT_SEL_MASK    0x7
-#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel)          \
-        ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0))
-
-/* SOCFPGA implementation specific driver private data */
-struct dw_mci_socfpga_priv_data {
-        u8      ciu_div; /* card interface unit divisor */
-        u32     hs_timing; /* bitmask for CIU clock phase shift */
-        struct regmap   *sysreg; /* regmap for system manager register */
-};
-
-static int dw_mci_socfpga_priv_init(struct dw_mci *host)
-{
-        return 0;
-}
-
-static int dw_mci_socfpga_setup_clock(struct dw_mci *host)
-{
-        struct dw_mci_socfpga_priv_data *priv = host->priv;
-
-        clk_disable_unprepare(host->ciu_clk);
-        regmap_write(priv->sysreg, SYSMGR_SDMMCGRP_CTRL_OFFSET,
-                priv->hs_timing);
-        clk_prepare_enable(host->ciu_clk);
-
-        host->bus_hz /= (priv->ciu_div + 1);
-        return 0;
-}
-
-static void dw_mci_socfpga_prepare_command(struct dw_mci *host, u32 *cmdr)
-{
-        struct dw_mci_socfpga_priv_data *priv = host->priv;
-
-        if (priv->hs_timing & DRV_CLK_PHASE_SHIFT_SEL_MASK)
-                *cmdr |= SDMMC_CMD_USE_HOLD_REG;
-}
-
-static int dw_mci_socfpga_parse_dt(struct dw_mci *host)
-{
-        struct dw_mci_socfpga_priv_data *priv;
-        struct device_node *np = host->dev->of_node;
-        u32 timing[2];
-        u32 div = 0;
-        int ret;
-
-        priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                dev_err(host->dev, "mem alloc failed for private data\n");
-                return -ENOMEM;
-        }
-
-        priv->sysreg = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
-        if (IS_ERR(priv->sysreg)) {
-                dev_err(host->dev, "regmap for altr,sys-mgr lookup failed.\n");
-                return PTR_ERR(priv->sysreg);
-        }
-
-        ret = of_property_read_u32(np, "altr,dw-mshc-ciu-div", &div);
-        if (ret)
-                dev_info(host->dev, "No dw-mshc-ciu-div specified, assuming 1");
-        priv->ciu_div = div;
-
-        ret = of_property_read_u32_array(np,
-                        "altr,dw-mshc-sdr-timing", timing, 2);
-        if (ret)
-                return ret;
-
-        priv->hs_timing = SYSMGR_SDMMC_CTRL_SET(timing[0], timing[1]);
-        host->priv = priv;
-        return 0;
-}
-
-static const struct dw_mci_drv_data socfpga_drv_data = {
-        .init                   = dw_mci_socfpga_priv_init,
-        .setup_clock            = dw_mci_socfpga_setup_clock,
-        .prepare_command        = dw_mci_socfpga_prepare_command,
-        .parse_dt               = dw_mci_socfpga_parse_dt,
-};
-
-static const struct of_device_id dw_mci_socfpga_match[] = {
-        { .compatible = "altr,socfpga-dw-mshc",
-                        .data = &socfpga_drv_data, },
-        {},
-};
-MODULE_DEVICE_TABLE(of, dw_mci_socfpga_match);
-
-static int dw_mci_socfpga_probe(struct platform_device *pdev)
-{
-        const struct dw_mci_drv_data *drv_data;
-        const struct of_device_id *match;
-
-        match = of_match_node(dw_mci_socfpga_match, pdev->dev.of_node);
-        drv_data = match->data;
-        return dw_mci_pltfm_register(pdev, drv_data);
-}
-
-static struct platform_driver dw_mci_socfpga_pltfm_driver = {
-        .probe          = dw_mci_socfpga_probe,
-        .remove         = __exit_p(dw_mci_pltfm_remove),
-        .driver         = {
-                .name           = "dwmmc_socfpga",
-                .of_match_table = dw_mci_socfpga_match,
-                .pm             = &dw_mci_pltfm_pmops,
-        },
-};
-
-module_platform_driver(dw_mci_socfpga_pltfm_driver);
-
-MODULE_DESCRIPTION("Altera SOCFPGA Specific DW-MSHC Driver Extension");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:dwmmc-socfpga");
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index c204b7d1532c..cced599d5aeb 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1345,7 +1345,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
 
                         if (!err) {
                                 if (!data->stop || mrq->sbc) {
-                                        if (mrq->sbc)
+                                        if (mrq->sbc && data->stop)
                                                 data->stop->error = 0;
                                         dw_mci_request_end(host, mrq);
                                         goto unlock;
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index 6bf24ab917e6..68349779c396 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -185,7 +185,7 @@
 
 extern int dw_mci_probe(struct dw_mci *host);
 extern void dw_mci_remove(struct dw_mci *host);
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 extern int dw_mci_suspend(struct dw_mci *host);
 extern int dw_mci_resume(struct dw_mci *host);
 #endif
@@ -244,6 +244,7 @@ struct dw_mci_tuning_data {
  * @prepare_command: handle CMD register extensions.
  * @set_ios: handle bus specific extensions.
  * @parse_dt: parse implementation specific device tree properties.
+ * @execute_tuning: implementation specific tuning procedure.
  *
  * Provide controller implementation specific extensions. The usage of this
  * data structure is fully optional and usage of each member in this structure
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index b93122636531..771c60ab4a32 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -921,6 +921,29 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
 {
         void __iomem *base = host->base;
         bool sbc = (cmd == host->mrq->sbc);
+        bool busy_resp = host->variant->busy_detect &&
+                        (cmd->flags & MMC_RSP_BUSY);
+
+        /* Check if we need to wait for busy completion. */
+        if (host->busy_status && (status & MCI_ST_CARDBUSY))
+                return;
+
+        /* Enable busy completion if needed and supported. */
+        if (!host->busy_status && busy_resp &&
+                !(status & (MCI_CMDCRCFAIL|MCI_CMDTIMEOUT)) &&
+                (readl(base + MMCISTATUS) & MCI_ST_CARDBUSY)) {
+                writel(readl(base + MMCIMASK0) | MCI_ST_BUSYEND,
+                        base + MMCIMASK0);
+                host->busy_status = status & (MCI_CMDSENT|MCI_CMDRESPEND);
+                return;
+        }
+
+        /* At busy completion, mask the IRQ and complete the request. */
+        if (host->busy_status) {
+                writel(readl(base + MMCIMASK0) & ~MCI_ST_BUSYEND,
+                        base + MMCIMASK0);
+                host->busy_status = 0;
+        }
 
         host->cmd = NULL;
 
@@ -1139,20 +1162,30 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
                         status &= ~MCI_IRQ1MASK;
                 }
 
+                /*
+                 * We intentionally clear the MCI_ST_CARDBUSY IRQ here (if it's
+                 * enabled) since the HW seems to be triggering the IRQ on both
+                 * edges while monitoring DAT0 for busy completion.
+                 */
                 status &= readl(host->base + MMCIMASK0);
                 writel(status, host->base + MMCICLEAR);
 
                 dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status);
 
+                cmd = host->cmd;
+                if ((status|host->busy_status) & (MCI_CMDCRCFAIL|MCI_CMDTIMEOUT|
+                        MCI_CMDSENT|MCI_CMDRESPEND) && cmd)
+                        mmci_cmd_irq(host, cmd, status);
+
                 data = host->data;
                 if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
                               MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_DATAEND|
                               MCI_DATABLOCKEND) && data)
                         mmci_data_irq(host, data, status);
 
-                cmd = host->cmd;
-                if (status & (MCI_CMDCRCFAIL|MCI_CMDTIMEOUT|MCI_CMDSENT|MCI_CMDRESPEND) && cmd)
-                        mmci_cmd_irq(host, cmd, status);
+                /* Don't poll for busy completion in irq context. */
+                if (host->busy_status)
+                        status &= ~MCI_ST_CARDBUSY;
 
                 ret = 1;
         } while (status);
@@ -1503,12 +1536,6 @@ static int mmci_probe(struct amba_device *dev,
                 goto clk_disable;
         }
 
-        if (variant->busy_detect) {
-                mmci_ops.card_busy = mmci_card_busy;
-                mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
-        }
-
-        mmc->ops = &mmci_ops;
         /*
          * The ARM and ST versions of the block have slightly different
          * clock divider equations which means that the minimum divider
@@ -1542,6 +1569,15 @@ static int mmci_probe(struct amba_device *dev,
         mmc->caps = plat->capabilities;
         mmc->caps2 = plat->capabilities2;
 
+        if (variant->busy_detect) {
+                mmci_ops.card_busy = mmci_card_busy;
+                mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
+                mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+                mmc->max_busy_timeout = 0;
+        }
+
+        mmc->ops = &mmci_ops;
+
         /* We support these PM capabilities. */
         mmc->pm_caps = MMC_PM_KEEP_POWER;
 
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 84c0e59b792a..58b1b8896bf2 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -140,6 +140,7 @@
 /* Extended status bits for the ST Micro variants */
 #define MCI_ST_SDIOITMASK       (1 << 22)
 #define MCI_ST_CEATAENDMASK     (1 << 23)
+#define MCI_ST_BUSYEND          (1 << 24)
 
 #define MMCIMASK1               0x040
 #define MMCIFIFOCNT             0x048
@@ -187,6 +188,7 @@ struct mmci_host {
         u32                     pwr_reg;
         u32                     clk_reg;
         u32                     datactrl_reg;
+        u32                     busy_status;
         bool                    vqmmc_enabled;
         struct mmci_platform_data *plat;
         struct variant_data     *variant;
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 98b6b6ef7e5c..5c2e58b29305 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -26,6 +26,7 @@
 #include <linux/omap-dma.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
 #include <linux/clk.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
@@ -130,7 +131,6 @@ struct mmc_omap_host {
         u32                     dma_rx_burst;
         struct dma_chan         *dma_tx;
         u32                     dma_tx_burst;
-        struct resource         *mem_res;
         void __iomem            *virt_base;
         unsigned int            phys_base;
         int                     irq;
@@ -153,7 +153,6 @@ struct mmc_omap_host {
         u32                     total_bytes_left;
 
         unsigned                features;
-        unsigned                use_dma:1;
         unsigned                brs_received:1, dma_done:1;
         unsigned                dma_in_use:1;
         spinlock_t              dma_lock;
@@ -338,6 +337,7 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
         u32 cmdreg;
         u32 resptype;
         u32 cmdtype;
+        u16 irq_mask;
 
         host->cmd = cmd;
 
@@ -390,12 +390,14 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
         OMAP_MMC_WRITE(host, CTO, 200);
         OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
         OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
-        OMAP_MMC_WRITE(host, IE,
-                       OMAP_MMC_STAT_A_EMPTY    | OMAP_MMC_STAT_A_FULL    |
-                       OMAP_MMC_STAT_CMD_CRC    | OMAP_MMC_STAT_CMD_TOUT  |
-                       OMAP_MMC_STAT_DATA_CRC   | OMAP_MMC_STAT_DATA_TOUT |
-                       OMAP_MMC_STAT_END_OF_CMD | OMAP_MMC_STAT_CARD_ERR  |
-                       OMAP_MMC_STAT_END_OF_DATA);
+        irq_mask = OMAP_MMC_STAT_A_EMPTY    | OMAP_MMC_STAT_A_FULL    |
+                   OMAP_MMC_STAT_CMD_CRC    | OMAP_MMC_STAT_CMD_TOUT  |
+                   OMAP_MMC_STAT_DATA_CRC   | OMAP_MMC_STAT_DATA_TOUT |
+                   OMAP_MMC_STAT_END_OF_CMD | OMAP_MMC_STAT_CARD_ERR  |
+                   OMAP_MMC_STAT_END_OF_DATA;
+        if (cmd->opcode == MMC_ERASE)
+                irq_mask &= ~OMAP_MMC_STAT_DATA_TOUT;
+        OMAP_MMC_WRITE(host, IE, irq_mask);
         OMAP_MMC_WRITE(host, CMD, cmdreg);
 }
 
@@ -945,7 +947,7 @@ static void
 mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
 {
         struct mmc_data *data = req->data;
-        int i, use_dma, block_size;
+        int i, use_dma = 1, block_size;
         unsigned sg_len;
 
         host->data = data;
@@ -970,13 +972,10 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
         sg_len = (data->blocks == 1) ? 1 : data->sg_len;
 
         /* Only do DMA for entire blocks */
-        use_dma = host->use_dma;
-        if (use_dma) {
-                for (i = 0; i < sg_len; i++) {
-                        if ((data->sg[i].length % block_size) != 0) {
-                                use_dma = 0;
-                                break;
-                        }
+        for (i = 0; i < sg_len; i++) {
+                if ((data->sg[i].length % block_size) != 0) {
+                        use_dma = 0;
+                        break;
                 }
         }
 
@@ -1239,7 +1238,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
 
         mmc->caps = 0;
         if (host->pdata->slots[id].wires >= 4)
-                mmc->caps |= MMC_CAP_4_BIT_DATA;
+                mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_ERASE;
 
         mmc->ops = &mmc_omap_ops;
         mmc->f_min = 400000;
@@ -1262,6 +1261,13 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
         mmc->max_seg_size = mmc->max_req_size;
 
+        if (slot->pdata->get_cover_state != NULL) {
+                setup_timer(&slot->cover_timer, mmc_omap_cover_timer,
+                            (unsigned long)slot);
+                tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler,
+                             (unsigned long)slot);
+        }
+
         r = mmc_add_host(mmc);
         if (r < 0)
                 goto err_remove_host;
@@ -1278,11 +1284,6 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
                                         &dev_attr_cover_switch);
                 if (r < 0)
                         goto err_remove_slot_name;
-
-                setup_timer(&slot->cover_timer, mmc_omap_cover_timer,
-                            (unsigned long)slot);
-                tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler,
-                             (unsigned long)slot);
                 tasklet_schedule(&slot->cover_tasklet);
         }
 
@@ -1333,21 +1334,19 @@ static int mmc_omap_probe(struct platform_device *pdev)
                 return -EPROBE_DEFER;
         }
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        host = devm_kzalloc(&pdev->dev, sizeof(struct mmc_omap_host),
+                            GFP_KERNEL);
+        if (host == NULL)
+                return -ENOMEM;
+
         irq = platform_get_irq(pdev, 0);
-        if (res == NULL || irq < 0)
+        if (irq < 0)
                 return -ENXIO;
 
-        res = request_mem_region(res->start, resource_size(res),
-                                 pdev->name);
-        if (res == NULL)
-                return -EBUSY;
-
-        host = kzalloc(sizeof(struct mmc_omap_host), GFP_KERNEL);
-        if (host == NULL) {
-                ret = -ENOMEM;
-                goto err_free_mem_region;
-        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        host->virt_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->virt_base))
+                return PTR_ERR(host->virt_base);
 
         INIT_WORK(&host->slot_release_work, mmc_omap_slot_release_work);
         INIT_WORK(&host->send_stop_work, mmc_omap_send_stop_work);
@@ -1369,20 +1368,11 @@ static int mmc_omap_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, host);
 
         host->id = pdev->id;
-        host->mem_res = res;
-        host->irq = irq;
-        host->use_dma = 1;
         host->irq = irq;
-        host->phys_base = host->mem_res->start;
-        host->virt_base = ioremap(res->start, resource_size(res));
-        if (!host->virt_base)
-                goto err_ioremap;
-
+        host->phys_base = res->start;
         host->iclk = clk_get(&pdev->dev, "ick");
-        if (IS_ERR(host->iclk)) {
-                ret = PTR_ERR(host->iclk);
-                goto err_free_mmc_host;
-        }
+        if (IS_ERR(host->iclk))
+                return PTR_ERR(host->iclk);
         clk_enable(host->iclk);
 
         host->fclk = clk_get(&pdev->dev, "fck");
@@ -1460,12 +1450,6 @@ err_free_dma:
 err_free_iclk:
         clk_disable(host->iclk);
         clk_put(host->iclk);
-err_free_mmc_host:
-        iounmap(host->virt_base);
-err_ioremap:
-        kfree(host);
-err_free_mem_region:
-        release_mem_region(res->start, resource_size(res));
         return ret;
 }
 
@@ -1493,13 +1477,8 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->dma_rx)
                 dma_release_channel(host->dma_rx);
 
-        iounmap(host->virt_base);
-        release_mem_region(pdev->resource[0].start,
-                           pdev->resource[0].end - pdev->resource[0].start + 1);
         destroy_workqueue(host->mmc_omap_wq);
 
-        kfree(host);
-
         return 0;
 }
 
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index dbd32ad3b749..e91ee21549d0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -45,6 +45,7 @@
 /* OMAP HSMMC Host Controller Registers */
 #define OMAP_HSMMC_SYSSTATUS    0x0014
 #define OMAP_HSMMC_CON          0x002C
+#define OMAP_HSMMC_SDMASA       0x0100
 #define OMAP_HSMMC_BLK          0x0104
 #define OMAP_HSMMC_ARG          0x0108
 #define OMAP_HSMMC_CMD          0x010C
@@ -58,6 +59,7 @@
 #define OMAP_HSMMC_STAT         0x0130
 #define OMAP_HSMMC_IE           0x0134
 #define OMAP_HSMMC_ISE          0x0138
+#define OMAP_HSMMC_AC12         0x013C
 #define OMAP_HSMMC_CAPA         0x0140
 
 #define VS18                    (1 << 26)
@@ -81,6 +83,7 @@
 #define DTO_MASK                0x000F0000
 #define DTO_SHIFT               16
 #define INIT_STREAM             (1 << 1)
+#define ACEN_ACMD23             (2 << 2)
 #define DP_SELECT               (1 << 21)
 #define DDIR                    (1 << 4)
 #define DMAE                    0x1
@@ -97,7 +100,6 @@
 #define SRC                     (1 << 25)
 #define SRD                     (1 << 26)
 #define SOFTRESET               (1 << 1)
-#define RESETDONE               (1 << 0)
 
 /* Interrupt masks for IE and ISE register */
 #define CC_EN                   (1 << 0)
@@ -112,13 +114,21 @@
 #define DTO_EN                  (1 << 20)
 #define DCRC_EN                 (1 << 21)
 #define DEB_EN                  (1 << 22)
+#define ACE_EN                  (1 << 24)
 #define CERR_EN                 (1 << 28)
 #define BADA_EN                 (1 << 29)
 
-#define INT_EN_MASK             (BADA_EN | CERR_EN | DEB_EN | DCRC_EN |\
+#define INT_EN_MASK (BADA_EN | CERR_EN | ACE_EN | DEB_EN | DCRC_EN |\
                 DTO_EN | CIE_EN | CEB_EN | CCRC_EN | CTO_EN | \
                 BRR_EN | BWR_EN | TC_EN | CC_EN)
 
+#define CNI     (1 << 7)
+#define ACIE    (1 << 4)
+#define ACEB    (1 << 3)
+#define ACCE    (1 << 2)
+#define ACTO    (1 << 1)
+#define ACNE    (1 << 0)
+
 #define MMC_AUTOSUSPEND_DELAY   100
 #define MMC_TIMEOUT_MS          20              /* 20 mSec */
 #define MMC_TIMEOUT_US          20000           /* 20000 micro Sec */
@@ -126,6 +136,11 @@
 #define OMAP_MMC_MAX_CLOCK      52000000
 #define DRIVER_NAME             "omap_hsmmc"
 
+#define VDD_1V8                 1800000         /* 180000 uV */
+#define VDD_3V0                 3000000         /* 300000 uV */
+#define VDD_165_195             (ffs(MMC_VDD_165_195) - 1)
+
+#define AUTO_CMD23              (1 << 1)        /* Auto CMD23 support */
 /*
  * One controller can have multiple slots, like on some omap boards using
  * omap.c controller driver. Luckily this is not currently done on any known
@@ -164,7 +179,8 @@ struct omap_hsmmc_host {
          */
         struct  regulator       *vcc;
         struct  regulator       *vcc_aux;
-        int                     pbias_disable;
+        struct  regulator       *pbias;
+        bool                    pbias_enabled;
         void    __iomem         *base;
         resource_size_t         mapbase;
         spinlock_t              irq_lock; /* Prevent races with irq handler */
@@ -188,10 +204,19 @@ struct omap_hsmmc_host {
         int                     reqs_blocked;
         int                     use_reg;
         int                     req_in_progress;
+        unsigned long           clk_rate;
+        unsigned int            flags;
         struct omap_hsmmc_next  next_data;
         struct  omap_mmc_platform_data  *pdata;
 };
 
+struct omap_mmc_of_data {
+        u32 reg_offset;
+        u8 controller_flags;
+};
+
+static void omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host);
+
 static int omap_hsmmc_card_detect(struct device *dev, int slot)
 {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -261,17 +286,19 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
          */
         if (!host->vcc)
                 return 0;
-        /*
-         * With DT, never turn OFF the regulator for MMC1. This is because
-         * the pbias cell programming support is still missing when
-         * booting with Device tree
-         */
-        if (host->pbias_disable && !vdd)
-                return 0;
 
         if (mmc_slot(host).before_set_reg)
                 mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
 
+        if (host->pbias) {
+                if (host->pbias_enabled == 1) {
+                        ret = regulator_disable(host->pbias);
+                        if (!ret)
+                                host->pbias_enabled = 0;
+                }
+                regulator_set_voltage(host->pbias, VDD_3V0, VDD_3V0);
+        }
+
         /*
          * Assume Vcc regulator is used only to power the card ... OMAP
          * VDDS is used to power the pins, optionally with a transceiver to
@@ -286,11 +313,12 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
          * chips/cards need an interface voltage rail too.
          */
         if (power_on) {
-                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
+                if (host->vcc)
+                        ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
                 /* Enable interface voltage rail, if needed */
                 if (ret == 0 && host->vcc_aux) {
                         ret = regulator_enable(host->vcc_aux);
-                        if (ret < 0)
+                        if (ret < 0 && host->vcc)
                                 ret = mmc_regulator_set_ocr(host->mmc,
                                                         host->vcc, 0);
                 }
@@ -298,16 +326,34 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
                 /* Shut down the rail */
                 if (host->vcc_aux)
                         ret = regulator_disable(host->vcc_aux);
-                if (!ret) {
+                if (host->vcc) {
                         /* Then proceed to shut down the local regulator */
                         ret = mmc_regulator_set_ocr(host->mmc,
                                                 host->vcc, 0);
                 }
         }
 
+        if (host->pbias) {
+                if (vdd <= VDD_165_195)
+                        ret = regulator_set_voltage(host->pbias, VDD_1V8,
+                                                                VDD_1V8);
+                else
+                        ret = regulator_set_voltage(host->pbias, VDD_3V0,
+                                                                VDD_3V0);
+                if (ret < 0)
+                        goto error_set_power;
+
+                if (host->pbias_enabled == 0) {
+                        ret = regulator_enable(host->pbias);
+                        if (!ret)
+                                host->pbias_enabled = 1;
+                }
+        }
+
         if (mmc_slot(host).after_set_reg)
                 mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);
 
+error_set_power:
         return ret;
 }
 
@@ -316,12 +362,12 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
         struct regulator *reg;
         int ocr_value = 0;
 
-        reg = regulator_get(host->dev, "vmmc");
+        reg = devm_regulator_get(host->dev, "vmmc");
         if (IS_ERR(reg)) {
-                dev_err(host->dev, "vmmc regulator missing\n");
+                dev_err(host->dev, "unable to get vmmc regulator %ld\n",
+                        PTR_ERR(reg));
                 return PTR_ERR(reg);
         } else {
-                mmc_slot(host).set_power = omap_hsmmc_set_power;
                 host->vcc = reg;
                 ocr_value = mmc_regulator_get_ocrmask(reg);
                 if (!mmc_slot(host).ocr_mask) {
@@ -334,31 +380,29 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
                                 return -EINVAL;
                         }
                 }
+        }
+        mmc_slot(host).set_power = omap_hsmmc_set_power;
 
-                /* Allow an aux regulator */
-                reg = regulator_get(host->dev, "vmmc_aux");
-                host->vcc_aux = IS_ERR(reg) ? NULL : reg;
+        /* Allow an aux regulator */
+        reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
+        host->vcc_aux = IS_ERR(reg) ? NULL : reg;
 
-                /* For eMMC do not power off when not in sleep state */
-                if (mmc_slot(host).no_regulator_off_init)
-                        return 0;
-                /*
-                * UGLY HACK:  workaround regulator framework bugs.
-                * When the bootloader leaves a supply active, it's
-                * initialized with zero usecount ... and we can't
-                * disable it without first enabling it.  Until the
-                * framework is fixed, we need a workaround like this
-                * (which is safe for MMC, but not in general).
-                */
-                if (regulator_is_enabled(host->vcc) > 0 ||
-                    (host->vcc_aux && regulator_is_enabled(host->vcc_aux))) {
-                        int vdd = ffs(mmc_slot(host).ocr_mask) - 1;
+        reg = devm_regulator_get_optional(host->dev, "pbias");
+        host->pbias = IS_ERR(reg) ? NULL : reg;
 
-                        mmc_slot(host).set_power(host->dev, host->slot_id,
-                                                 1, vdd);
-                        mmc_slot(host).set_power(host->dev, host->slot_id,
-                                                 0, 0);
-                }
+        /* For eMMC do not power off when not in sleep state */
+        if (mmc_slot(host).no_regulator_off_init)
+                return 0;
+        /*
+         * To disable boot_on regulator, enable regulator
+         * to increase usecount and then disable it.
+         */
+        if ((host->vcc && regulator_is_enabled(host->vcc) > 0) ||
+            (host->vcc_aux && regulator_is_enabled(host->vcc_aux))) {
+                int vdd = ffs(mmc_slot(host).ocr_mask) - 1;
+
+                mmc_slot(host).set_power(host->dev, host->slot_id, 1, vdd);
+                mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
         }
 
         return 0;
@@ -366,8 +410,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 
 static void omap_hsmmc_reg_put(struct omap_hsmmc_host *host)
 {
-        regulator_put(host->vcc);
-        regulator_put(host->vcc_aux);
         mmc_slot(host).set_power = NULL;
 }
 
@@ -605,9 +647,6 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
         u32 hctl, capa;
         unsigned long timeout;
 
-        if (!OMAP_HSMMC_READ(host->base, SYSSTATUS) & RESETDONE)
-                return 1;
-
         if (host->con == OMAP_HSMMC_READ(host->base, CON) &&
             host->hctl == OMAP_HSMMC_READ(host->base, HCTL) &&
             host->sysctl == OMAP_HSMMC_READ(host->base, SYSCTL) &&
@@ -787,6 +826,11 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd,
 
         cmdreg = (cmd->opcode << 24) | (resptype << 16) | (cmdtype << 22);
 
+        if ((host->flags & AUTO_CMD23) && mmc_op_multi(cmd->opcode) &&
+            host->mrq->sbc) {
+                cmdreg |= ACEN_ACMD23;
+                OMAP_HSMMC_WRITE(host->base, SDMASA, host->mrq->sbc->arg);
+        }
         if (data) {
                 cmdreg |= DP_SELECT | MSBS | BCE;
                 if (data->flags & MMC_DATA_READ)
@@ -864,11 +908,10 @@ omap_hsmmc_xfer_done(struct omap_hsmmc_host *host, struct mmc_data *data)
         else
                 data->bytes_xfered = 0;
 
-        if (!data->stop) {
+        if (data->stop && (data->error || !host->mrq->sbc))
+                omap_hsmmc_start_command(host, data->stop, NULL);
+        else
                 omap_hsmmc_request_done(host, data->mrq);
-                return;
-        }
-        omap_hsmmc_start_command(host, data->stop, NULL);
 }
 
 /*
@@ -879,6 +922,14 @@ omap_hsmmc_cmd_done(struct omap_hsmmc_host *host, struct mmc_command *cmd)
 {
         host->cmd = NULL;
 
+        if (host->mrq->sbc && (host->cmd == host->mrq->sbc) &&
+            !host->mrq->sbc->error && !(host->flags & AUTO_CMD23)) {
+                omap_hsmmc_start_dma_transfer(host);
+                omap_hsmmc_start_command(host, host->mrq->cmd,
+                                                host->mrq->data);
+                return;
+        }
+
         if (cmd->flags & MMC_RSP_PRESENT) {
                 if (cmd->flags & MMC_RSP_136) {
                         /* response type 2 */
@@ -892,7 +943,7 @@ omap_hsmmc_cmd_done(struct omap_hsmmc_host *host, struct mmc_command *cmd)
                 }
         }
         if ((host->data == NULL && !host->response_busy) || cmd->error)
-                omap_hsmmc_request_done(host, cmd->mrq);
+                omap_hsmmc_request_done(host, host->mrq);
 }
 
 /*
@@ -1015,6 +1066,7 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
 {
         struct mmc_data *data;
         int end_cmd = 0, end_trans = 0;
+        int error = 0;
 
         data = host->data;
         dev_vdbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);
@@ -1029,6 +1081,20 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
                 else if (status & (CCRC_EN | DCRC_EN))
                         hsmmc_command_incomplete(host, -EILSEQ, end_cmd);
 
+                if (status & ACE_EN) {
+                        u32 ac12;
+                        ac12 = OMAP_HSMMC_READ(host->base, AC12);
+                        if (!(ac12 & ACNE) && host->mrq->sbc) {
+                                end_cmd = 1;
+                                if (ac12 & ACTO)
+                                        error =  -ETIMEDOUT;
+                                else if (ac12 & (ACCE | ACEB | ACIE))
+                                        error = -EILSEQ;
+                                host->mrq->sbc->error = error;
+                                hsmmc_command_incomplete(host, error, end_cmd);
+                        }
+                        dev_dbg(mmc_dev(host->mmc), "AC12 err: 0x%x\n", ac12);
+                }
                 if (host->data || host->response_busy) {
                         end_trans = !end_cmd;
                         host->response_busy = 0;
@@ -1236,8 +1302,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
         }
 
         /* Check if next job is already prepared */
-        if (next ||
-            (!next && data->host_cookie != host->next_data.cookie)) {
+        if (next || data->host_cookie != host->next_data.cookie) {
                 dma_len = dma_map_sg(chan->device->dev, data->sg, data->sg_len,
                                      omap_hsmmc_get_dma_dir(host, data));
 
@@ -1262,7 +1327,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
 /*
  * Routine to configure and start DMA for the MMC card
  */
-static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host,
+static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host,
                                         struct mmc_request *req)
 {
         struct dma_slave_config cfg;
@@ -1321,8 +1386,6 @@ static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host,
 
         host->dma_ch = 1;
 
-        dma_async_issue_pending(chan);
-
         return 0;
 }
 
@@ -1338,7 +1401,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
         if (clkd == 0)
                 clkd = 1;
 
-        cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd);
+        cycle_ns = 1000000000 / (host->clk_rate / clkd);
         timeout = timeout_ns / cycle_ns;
         timeout += timeout_clks;
         if (timeout) {
@@ -1363,6 +1426,21 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
         OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
 }
 
+static void omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host)
+{
+        struct mmc_request *req = host->mrq;
+        struct dma_chan *chan;
+
+        if (!req->data)
+                return;
+        OMAP_HSMMC_WRITE(host->base, BLK, (req->data->blksz)
+                                | (req->data->blocks << 16));
+        set_data_timeout(host, req->data->timeout_ns,
+                                req->data->timeout_clks);
+        chan = omap_hsmmc_get_dma_chan(host, req->data);
+        dma_async_issue_pending(chan);
+}
+
 /*
  * Configure block length for MMC/SD cards and initiate the transfer.
  */
@@ -1383,12 +1461,8 @@ omap_hsmmc_prepare_data(struct omap_hsmmc_host *host, struct mmc_request *req)
                 return 0;
         }
 
-        OMAP_HSMMC_WRITE(host->base, BLK, (req->data->blksz)
-                                        | (req->data->blocks << 16));
-        set_data_timeout(host, req->data->timeout_ns, req->data->timeout_clks);
-
         if (host->use_dma) {
-                ret = omap_hsmmc_start_dma_transfer(host, req);
+                ret = omap_hsmmc_setup_dma_transfer(host, req);
                 if (ret != 0) {
                         dev_err(mmc_dev(host->mmc), "MMC start dma failure\n");
                         return ret;
@@ -1462,6 +1536,7 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
                 host->reqs_blocked = 0;
         WARN_ON(host->mrq != NULL);
         host->mrq = req;
+        host->clk_rate = clk_get_rate(host->fclk);
         err = omap_hsmmc_prepare_data(host, req);
         if (err) {
                 req->cmd->error = err;
@@ -1471,7 +1546,12 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
                 mmc_request_done(mmc, req);
                 return;
         }
+        if (req->sbc && !(host->flags & AUTO_CMD23)) {
+                omap_hsmmc_start_command(host, req->sbc, NULL);
+                return;
+        }
 
+        omap_hsmmc_start_dma_transfer(host);
         omap_hsmmc_start_command(host, req->cmd, req->data);
 }
 
@@ -1509,13 +1589,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                  * of external transceiver; but they all handle 1.8V.
                  */
                 if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) &&
-                        (ios->vdd == DUAL_VOLT_OCR_BIT) &&
-                        /*
-                         * With pbias cell programming missing, this
-                         * can't be allowed on MMC1 when booting with device
-                         * tree.
-                         */
-                        !host->pbias_disable) {
+                        (ios->vdd == DUAL_VOLT_OCR_BIT)) {
                                 /*
                                  * The mmc_select_voltage fn of the core does
                                  * not seem to set the power_mode to
@@ -1678,18 +1752,29 @@ static void omap_hsmmc_debugfs(struct mmc_host *mmc)
 #endif
 
 #ifdef CONFIG_OF
-static u16 omap4_reg_offset = 0x100;
+static const struct omap_mmc_of_data omap3_pre_es3_mmc_of_data = {
+        /* See 35xx errata 2.1.1.128 in SPRZ278F */
+        .controller_flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,
+};
+
+static const struct omap_mmc_of_data omap4_mmc_of_data = {
+        .reg_offset = 0x100,
+};
 
 static const struct of_device_id omap_mmc_of_match[] = {
         {
                 .compatible = "ti,omap2-hsmmc",
         },
         {
+                .compatible = "ti,omap3-pre-es3-hsmmc",
+                .data = &omap3_pre_es3_mmc_of_data,
+        },
+        {
                 .compatible = "ti,omap3-hsmmc",
         },
         {
                 .compatible = "ti,omap4-hsmmc",
-                .data = &omap4_reg_offset,
+                .data = &omap4_mmc_of_data,
         },
         {},
 };
@@ -1709,7 +1794,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
 
         pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
-                return NULL; /* out of memory */
+                return ERR_PTR(-ENOMEM); /* out of memory */
 
         if (of_find_property(np, "ti,dual-volt", NULL))
                 pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
@@ -1738,13 +1823,19 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
         if (of_find_property(np, "ti,needs-special-hs-handling", NULL))
                 pdata->slots[0].features |= HSMMC_HAS_HSPE_SUPPORT;
 
+        if (of_find_property(np, "keep-power-in-suspend", NULL))
+                pdata->slots[0].pm_caps |= MMC_PM_KEEP_POWER;
+
+        if (of_find_property(np, "enable-sdio-wakeup", NULL))
+                pdata->slots[0].pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+
         return pdata;
 }
 #else
 static inline struct omap_mmc_platform_data
                         *of_get_hsmmc_pdata(struct device *dev)
 {
-        return NULL;
+        return ERR_PTR(-EINVAL);
 }
 #endif
 
@@ -1759,6 +1850,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         dma_cap_mask_t mask;
         unsigned tx_req, rx_req;
         struct pinctrl *pinctrl;
+        const struct omap_mmc_of_data *data;
 
         match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
         if (match) {
@@ -1768,8 +1860,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                         return PTR_ERR(pdata);
 
                 if (match->data) {
-                        const u16 *offsetp = match->data;
-                        pdata->reg_offset = *offsetp;
+                        data = match->data;
+                        pdata->reg_offset = data->reg_offset;
+                        pdata->controller_flags |= data->controller_flags;
                 }
         }
 
@@ -1814,6 +1907,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         host->base      = ioremap(host->mapbase, SZ_4K);
         host->power_mode = MMC_POWER_OFF;
         host->next_data.cookie = 1;
+        host->pbias_enabled = 0;
 
         platform_set_drvdata(pdev, host);
 
@@ -1847,10 +1941,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
         omap_hsmmc_context_save(host);
 
-        /* This can be removed once we support PBIAS with DT */
-        if (host->dev->of_node && res->start == 0x4809c000)
-                host->pbias_disable = 1;
-
         host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
         /*
          * MMC can still work without debounce clock.
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index c46feda07d56..5fb994f9a653 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -31,14 +31,9 @@
 #include <linux/mfd/rtsx_pci.h>
 #include <asm/unaligned.h>
 
-/* SD Tuning Data Structure
- * Record continuous timing phase path
- */
-struct timing_phase_path {
-        int start;
-        int end;
-        int mid;
-        int len;
+struct realtek_next {
+        unsigned int    sg_count;
+        s32             cookie;
 };
 
 struct realtek_pci_sdmmc {
@@ -46,9 +41,18 @@ struct realtek_pci_sdmmc {
         struct rtsx_pcr         *pcr;
         struct mmc_host         *mmc;
         struct mmc_request      *mrq;
-
-        struct mutex            host_mutex;
-
+        struct mmc_command      *cmd;
+        struct mmc_data         *data;
+
+        spinlock_t              lock;
+        struct timer_list       timer;
+        struct tasklet_struct   cmd_tasklet;
+        struct tasklet_struct   data_tasklet;
+        struct tasklet_struct   finish_tasklet;
+
+        u8                      rsp_type;
+        u8                      rsp_len;
+        int                     sg_count;
         u8                      ssc_depth;
         unsigned int            clock;
         bool                    vpclk;
@@ -58,8 +62,13 @@ struct realtek_pci_sdmmc {
         int                     power_state;
 #define SDMMC_POWER_ON          1
 #define SDMMC_POWER_OFF         0
+
+        struct realtek_next     next_data;
 };
 
+static int sd_start_multi_rw(struct realtek_pci_sdmmc *host,
+                struct mmc_request *mrq);
+
 static inline struct device *sdmmc_dev(struct realtek_pci_sdmmc *host)
 {
         return &(host->pdev->dev);
@@ -96,6 +105,95 @@ static void sd_print_debug_regs(struct realtek_pci_sdmmc *host)
 #define sd_print_debug_regs(host)
 #endif /* DEBUG */
 
+static void sd_isr_done_transfer(struct platform_device *pdev)
+{
+        struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
+
+        spin_lock(&host->lock);
+        if (host->cmd)
+                tasklet_schedule(&host->cmd_tasklet);
+        if (host->data)
+                tasklet_schedule(&host->data_tasklet);
+        spin_unlock(&host->lock);
+}
+
+static void sd_request_timeout(unsigned long host_addr)
+{
+        struct realtek_pci_sdmmc *host = (struct realtek_pci_sdmmc *)host_addr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        if (!host->mrq) {
+                dev_err(sdmmc_dev(host), "error: no request exist\n");
+                goto out;
+        }
+
+        if (host->cmd)
+                host->cmd->error = -ETIMEDOUT;
+        if (host->data)
+                host->data->error = -ETIMEDOUT;
+
+        dev_dbg(sdmmc_dev(host), "timeout for request\n");
+
+out:
+        tasklet_schedule(&host->finish_tasklet);
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static void sd_finish_request(unsigned long host_addr)
+{
+        struct realtek_pci_sdmmc *host = (struct realtek_pci_sdmmc *)host_addr;
+        struct rtsx_pcr *pcr = host->pcr;
+        struct mmc_request *mrq;
+        struct mmc_command *cmd;
+        struct mmc_data *data;
+        unsigned long flags;
+        bool any_error;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        del_timer(&host->timer);
+        mrq = host->mrq;
+        if (!mrq) {
+                dev_err(sdmmc_dev(host), "error: no request need finish\n");
+                goto out;
+        }
+
+        cmd = mrq->cmd;
+        data = mrq->data;
+
+        any_error = (mrq->sbc && mrq->sbc->error) ||
+                (mrq->stop && mrq->stop->error) ||
+                (cmd && cmd->error) || (data && data->error);
+
+        if (any_error) {
+                rtsx_pci_stop_cmd(pcr);
+                sd_clear_error(host);
+        }
+
+        if (data) {
+                if (any_error)
+                        data->bytes_xfered = 0;
+                else
+                        data->bytes_xfered = data->blocks * data->blksz;
+
+                if (!data->host_cookie)
+                        rtsx_pci_dma_unmap_sg(pcr, data->sg, data->sg_len,
+                                        data->flags & MMC_DATA_READ);
+
+        }
+
+        host->mrq = NULL;
+        host->cmd = NULL;
+        host->data = NULL;
+
+out:
+        spin_unlock_irqrestore(&host->lock, flags);
+        mutex_unlock(&pcr->pcr_mutex);
+        mmc_request_done(host->mmc, mrq);
+}
+
 static int sd_read_data(struct realtek_pci_sdmmc *host, u8 *cmd, u16 byte_cnt,
                 u8 *buf, int buf_len, int timeout)
 {
@@ -213,8 +311,7 @@ static int sd_write_data(struct realtek_pci_sdmmc *host, u8 *cmd, u16 byte_cnt,
         return 0;
 }
 
-static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
-                struct mmc_command *cmd)
+static void sd_send_cmd(struct realtek_pci_sdmmc *host, struct mmc_command *cmd)
 {
         struct rtsx_pcr *pcr = host->pcr;
         u8 cmd_idx = (u8)cmd->opcode;
@@ -222,11 +319,14 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
         int err = 0;
         int timeout = 100;
         int i;
-        u8 *ptr;
-        int stat_idx = 0;
         u8 rsp_type;
         int rsp_len = 5;
-        bool clock_toggled = false;
+        unsigned long flags;
+
+        if (host->cmd)
+                dev_err(sdmmc_dev(host), "error: cmd already exist\n");
+
+        host->cmd = cmd;
 
         dev_dbg(sdmmc_dev(host), "%s: SD/MMC CMD %d, arg = 0x%08x\n",
                         __func__, cmd_idx, arg);
@@ -261,6 +361,8 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
                 err = -EINVAL;
                 goto out;
         }
+        host->rsp_type = rsp_type;
+        host->rsp_len = rsp_len;
 
         if (rsp_type == SD_RSP_TYPE_R1b)
                 timeout = 3000;
@@ -270,8 +372,6 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
                                 0xFF, SD_CLK_TOGGLE_EN);
                 if (err < 0)
                         goto out;
-
-                clock_toggled = true;
         }
 
         rtsx_pci_init_cmd(pcr);
@@ -295,25 +395,60 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
                 /* Read data from ping-pong buffer */
                 for (i = PPBUF_BASE2; i < PPBUF_BASE2 + 16; i++)
                         rtsx_pci_add_cmd(pcr, READ_REG_CMD, (u16)i, 0, 0);
-                stat_idx = 16;
         } else if (rsp_type != SD_RSP_TYPE_R0) {
                 /* Read data from SD_CMDx registers */
                 for (i = SD_CMD0; i <= SD_CMD4; i++)
                         rtsx_pci_add_cmd(pcr, READ_REG_CMD, (u16)i, 0, 0);
-                stat_idx = 5;
         }
 
         rtsx_pci_add_cmd(pcr, READ_REG_CMD, SD_STAT1, 0, 0);
 
-        err = rtsx_pci_send_cmd(pcr, timeout);
-        if (err < 0) {
-                sd_print_debug_regs(host);
-                sd_clear_error(host);
-                dev_dbg(sdmmc_dev(host),
-                        "rtsx_pci_send_cmd error (err = %d)\n", err);
+        mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout));
+
+        spin_lock_irqsave(&pcr->lock, flags);
+        pcr->trans_result = TRANS_NOT_READY;
+        rtsx_pci_send_cmd_no_wait(pcr);
+        spin_unlock_irqrestore(&pcr->lock, flags);
+
+        return;
+
+out:
+        cmd->error = err;
+        tasklet_schedule(&host->finish_tasklet);
+}
+
+static void sd_get_rsp(unsigned long host_addr)
+{
+        struct realtek_pci_sdmmc *host = (struct realtek_pci_sdmmc *)host_addr;
+        struct rtsx_pcr *pcr = host->pcr;
+        struct mmc_command *cmd;
+        int i, err = 0, stat_idx;
+        u8 *ptr, rsp_type;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        cmd = host->cmd;
+        host->cmd = NULL;
+
+        if (!cmd) {
+                dev_err(sdmmc_dev(host), "error: cmd not exist\n");
                 goto out;
         }
 
+        spin_lock(&pcr->lock);
+        if (pcr->trans_result == TRANS_NO_DEVICE)
+                err = -ENODEV;
+        else if (pcr->trans_result != TRANS_RESULT_OK)
+                err = -EINVAL;
+        spin_unlock(&pcr->lock);
+
+        if (err < 0)
+                goto out;
+
+        rsp_type = host->rsp_type;
+        stat_idx = host->rsp_len;
+
         if (rsp_type == SD_RSP_TYPE_R0) {
                 err = 0;
                 goto out;
@@ -350,26 +485,106 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host,
                                 cmd->resp[0]);
         }
 
+        if (cmd == host->mrq->sbc) {
+                sd_send_cmd(host, host->mrq->cmd);
+                spin_unlock_irqrestore(&host->lock, flags);
+                return;
+        }
+
+        if (cmd == host->mrq->stop)
+                goto out;
+
+        if (cmd->data) {
+                sd_start_multi_rw(host, host->mrq);
+                spin_unlock_irqrestore(&host->lock, flags);
+                return;
+        }
+
 out:
         cmd->error = err;
 
-        if (err && clock_toggled)
-                rtsx_pci_write_register(pcr, SD_BUS_STAT,
-                                SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
+        tasklet_schedule(&host->finish_tasklet);
+        spin_unlock_irqrestore(&host->lock, flags);
 }
 
-static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq)
+static int sd_pre_dma_transfer(struct realtek_pci_sdmmc *host,
+                        struct mmc_data *data, struct realtek_next *next)
+{
+        struct rtsx_pcr *pcr = host->pcr;
+        int read = data->flags & MMC_DATA_READ;
+        int sg_count = 0;
+
+        if (!next && data->host_cookie &&
+                data->host_cookie != host->next_data.cookie) {
+                dev_err(sdmmc_dev(host),
+                        "error: invalid cookie data[%d] host[%d]\n",
+                        data->host_cookie, host->next_data.cookie);
+                data->host_cookie = 0;
+        }
+
+        if (next || (!next && data->host_cookie != host->next_data.cookie))
+                sg_count = rtsx_pci_dma_map_sg(pcr,
+                                data->sg, data->sg_len, read);
+        else
+                sg_count = host->next_data.sg_count;
+
+        if (next) {
+                next->sg_count = sg_count;
+                if (++next->cookie < 0)
+                        next->cookie = 1;
+                data->host_cookie = next->cookie;
+        }
+
+        return sg_count;
+}
+
+static void sdmmc_pre_req(struct mmc_host *mmc, struct mmc_request *mrq,
+                bool is_first_req)
+{
+        struct realtek_pci_sdmmc *host = mmc_priv(mmc);
+        struct mmc_data *data = mrq->data;
+
+        if (data->host_cookie) {
+                dev_err(sdmmc_dev(host),
+                        "error: descard already cookie data[%d]\n",
+                        data->host_cookie);
+                data->host_cookie = 0;
+        }
+
+        dev_dbg(sdmmc_dev(host), "dma sg prepared: %d\n",
+                sd_pre_dma_transfer(host, data, &host->next_data));
+}
+
+static void sdmmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq,
+                int err)
+{
+        struct realtek_pci_sdmmc *host = mmc_priv(mmc);
+        struct rtsx_pcr *pcr = host->pcr;
+        struct mmc_data *data = mrq->data;
+        int read = data->flags & MMC_DATA_READ;
+
+        rtsx_pci_dma_unmap_sg(pcr, data->sg, data->sg_len, read);
+        data->host_cookie = 0;
+}
+
+static int sd_start_multi_rw(struct realtek_pci_sdmmc *host,
+                struct mmc_request *mrq)
 {
         struct rtsx_pcr *pcr = host->pcr;
         struct mmc_host *mmc = host->mmc;
         struct mmc_card *card = mmc->card;
         struct mmc_data *data = mrq->data;
         int uhs = mmc_card_uhs(card);
-        int read = (data->flags & MMC_DATA_READ) ? 1 : 0;
+        int read = data->flags & MMC_DATA_READ;
         u8 cfg2, trans_mode;
         int err;
         size_t data_len = data->blksz * data->blocks;
 
+        if (host->data)
+                dev_err(sdmmc_dev(host), "error: data already exist\n");
+
+        host->data = data;
+
         if (read) {
                 cfg2 = SD_CALCULATE_CRC7 | SD_CHECK_CRC16 |
                         SD_NO_WAIT_BUSY_END | SD_CHECK_CRC7 | SD_RSP_LEN_0;
@@ -420,17 +635,56 @@ static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq)
         rtsx_pci_add_cmd(pcr, CHECK_REG_CMD, SD_TRANSFER,
                         SD_TRANSFER_END, SD_TRANSFER_END);
 
+        mod_timer(&host->timer, jiffies + 10 * HZ);
         rtsx_pci_send_cmd_no_wait(pcr);
 
-        err = rtsx_pci_transfer_data(pcr, data->sg, data->sg_len, read, 10000);
+        err = rtsx_pci_dma_transfer(pcr, data->sg, host->sg_count, read);
         if (err < 0) {
-                sd_clear_error(host);
-                return err;
+                data->error = err;
+                tasklet_schedule(&host->finish_tasklet);
         }
-
         return 0;
 }
 
+static void sd_finish_multi_rw(unsigned long host_addr)
+{
+        struct realtek_pci_sdmmc *host = (struct realtek_pci_sdmmc *)host_addr;
+        struct rtsx_pcr *pcr = host->pcr;
+        struct mmc_data *data;
+        int err = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        if (!host->data) {
+                dev_err(sdmmc_dev(host), "error: no data exist\n");
+                goto out;
+        }
+
+        data = host->data;
+        host->data = NULL;
+
+        if (pcr->trans_result == TRANS_NO_DEVICE)
+                err = -ENODEV;
+        else if (pcr->trans_result != TRANS_RESULT_OK)
+                err = -EINVAL;
+
+        if (err < 0) {
+                data->error = err;
+                goto out;
+        }
+
+        if (!host->mrq->sbc && data->stop) {
+                sd_send_cmd(host, data->stop);
+                spin_unlock_irqrestore(&host->lock, flags);
+                return;
+        }
+
+out:
+        tasklet_schedule(&host->finish_tasklet);
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
 static inline void sd_enable_initial_mode(struct realtek_pci_sdmmc *host)
 {
         rtsx_pci_write_register(host->pcr, SD_CFG1,
@@ -511,85 +765,47 @@ static int sd_change_phase(struct realtek_pci_sdmmc *host,
         return 0;
 }
 
-static u8 sd_search_final_phase(struct realtek_pci_sdmmc *host, u32 phase_map)
+static inline u32 test_phase_bit(u32 phase_map, unsigned int bit)
 {
-        struct timing_phase_path path[MAX_PHASE + 1];
-        int i, j, cont_path_cnt;
-        int new_block, max_len, final_path_idx;
-        u8 final_phase = 0xFF;
+        bit %= RTSX_PHASE_MAX;
+        return phase_map & (1 << bit);
+}
 
-        /* Parse phase_map, take it as a bit-ring */
-        cont_path_cnt = 0;
-        new_block = 1;
-        j = 0;
-        for (i = 0; i < MAX_PHASE + 1; i++) {
-                if (phase_map & (1 << i)) {
-                        if (new_block) {
-                                new_block = 0;
-                                j = cont_path_cnt++;
-                                path[j].start = i;
-                                path[j].end = i;
-                        } else {
-                                path[j].end = i;
-                        }
-                } else {
-                        new_block = 1;
-                        if (cont_path_cnt) {
-                                /* Calculate path length and middle point */
-                                int idx = cont_path_cnt - 1;
-                                path[idx].len =
-                                        path[idx].end - path[idx].start + 1;
-                                path[idx].mid =
-                                        path[idx].start + path[idx].len / 2;
-                        }
-                }
-        }
+static int sd_get_phase_len(u32 phase_map, unsigned int start_bit)
+{
+        int i;
 
-        if (cont_path_cnt == 0) {
-                dev_dbg(sdmmc_dev(host), "No continuous phase path\n");
-                goto finish;
-        } else {
-                /* Calculate last continuous path length and middle point */
-                int idx = cont_path_cnt - 1;
-                path[idx].len = path[idx].end - path[idx].start + 1;
-                path[idx].mid = path[idx].start + path[idx].len / 2;
+        for (i = 0; i < RTSX_PHASE_MAX; i++) {
+                if (test_phase_bit(phase_map, start_bit + i) == 0)
+                        return i;
         }
+        return RTSX_PHASE_MAX;
+}
+
+static u8 sd_search_final_phase(struct realtek_pci_sdmmc *host, u32 phase_map)
+{
+        int start = 0, len = 0;
+        int start_final = 0, len_final = 0;
+        u8 final_phase = 0xFF;
 
-        /* Connect the first and last continuous paths if they are adjacent */
-        if (!path[0].start && (path[cont_path_cnt - 1].end == MAX_PHASE)) {
-                /* Using negative index */
-                path[0].start = path[cont_path_cnt - 1].start - MAX_PHASE - 1;
-                path[0].len += path[cont_path_cnt - 1].len;
-                path[0].mid = path[0].start + path[0].len / 2;
-                /* Convert negative middle point index to positive one */
-                if (path[0].mid < 0)
-                        path[0].mid += MAX_PHASE + 1;
-                cont_path_cnt--;
+        if (phase_map == 0) {
+                dev_err(sdmmc_dev(host), "phase error: [map:%x]\n", phase_map);
+                return final_phase;
         }
 
-        /* Choose the longest continuous phase path */
-        max_len = 0;
-        final_phase = 0;
-        final_path_idx = 0;
-        for (i = 0; i < cont_path_cnt; i++) {
-                if (path[i].len > max_len) {
-                        max_len = path[i].len;
-                        final_phase = (u8)path[i].mid;
-                        final_path_idx = i;
+        while (start < RTSX_PHASE_MAX) {
+                len = sd_get_phase_len(phase_map, start);
+                if (len_final < len) {
+                        start_final = start;
+                        len_final = len;
                 }
-
-                dev_dbg(sdmmc_dev(host), "path[%d].start = %d\n",
-                                i, path[i].start);
-                dev_dbg(sdmmc_dev(host), "path[%d].end = %d\n",
-                                i, path[i].end);
-                dev_dbg(sdmmc_dev(host), "path[%d].len = %d\n",
-                                i, path[i].len);
-                dev_dbg(sdmmc_dev(host), "path[%d].mid = %d\n",
-                                i, path[i].mid);
+                start += len ? len : 1;
         }
 
-finish:
-        dev_dbg(sdmmc_dev(host), "Final chosen phase: %d\n", final_phase);
+        final_phase = (start_final + len_final / 2) % RTSX_PHASE_MAX;
+        dev_dbg(sdmmc_dev(host), "phase: [map:%x] [maxlen:%d] [final:%d]\n",
+                phase_map, len_final, final_phase);
+
         return final_phase;
 }
 
@@ -635,7 +851,7 @@ static int sd_tuning_phase(struct realtek_pci_sdmmc *host,
         int err, i;
         u32 raw_phase_map = 0;
 
-        for (i = MAX_PHASE; i >= 0; i--) {
+        for (i = 0; i < RTSX_PHASE_MAX; i++) {
                 err = sd_tuning_rx_cmd(host, opcode, (u8)i);
                 if (err == 0)
                         raw_phase_map |= 1 << i;
@@ -685,6 +901,13 @@ static int sd_tuning_rx(struct realtek_pci_sdmmc *host, u8 opcode)
         return 0;
 }
 
+static inline bool sd_use_muti_rw(struct mmc_command *cmd)
+{
+        return mmc_op_multi(cmd->opcode) ||
+                (cmd->opcode == MMC_READ_SINGLE_BLOCK) ||
+                (cmd->opcode == MMC_WRITE_BLOCK);
+}
+
 static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
         struct realtek_pci_sdmmc *host = mmc_priv(mmc);
@@ -693,6 +916,14 @@ static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
         struct mmc_data *data = mrq->data;
         unsigned int data_size = 0;
         int err;
+        unsigned long flags;
+
+        mutex_lock(&pcr->pcr_mutex);
+        spin_lock_irqsave(&host->lock, flags);
+
+        if (host->mrq)
+                dev_err(sdmmc_dev(host), "error: request already exist\n");
+        host->mrq = mrq;
 
         if (host->eject) {
                 cmd->error = -ENOMEDIUM;
@@ -705,8 +936,6 @@ static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 goto finish;
         }
 
-        mutex_lock(&pcr->pcr_mutex);
-
         rtsx_pci_start_run(pcr);
 
         rtsx_pci_switch_clock(pcr, host->clock, host->ssc_depth,
@@ -715,46 +944,28 @@ static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
         rtsx_pci_write_register(pcr, CARD_SHARE_MODE,
                         CARD_SHARE_MASK, CARD_SHARE_48_SD);
 
-        mutex_lock(&host->host_mutex);
-        host->mrq = mrq;
-        mutex_unlock(&host->host_mutex);
-
         if (mrq->data)
                 data_size = data->blocks * data->blksz;
 
-        if (!data_size || mmc_op_multi(cmd->opcode) ||
-                        (cmd->opcode == MMC_READ_SINGLE_BLOCK) ||
-                        (cmd->opcode == MMC_WRITE_BLOCK)) {
-                sd_send_cmd_get_rsp(host, cmd);
-
-                if (!cmd->error && data_size) {
-                        sd_rw_multi(host, mrq);
+        if (sd_use_muti_rw(cmd))
+                host->sg_count = sd_pre_dma_transfer(host, data, NULL);
 
-                        if (mmc_op_multi(cmd->opcode) && mrq->stop)
-                                sd_send_cmd_get_rsp(host, mrq->stop);
-                }
+        if (!data_size || sd_use_muti_rw(cmd)) {
+                if (mrq->sbc)
+                        sd_send_cmd(host, mrq->sbc);
+                else
+                        sd_send_cmd(host, cmd);
+                spin_unlock_irqrestore(&host->lock, flags);
         } else {
+                spin_unlock_irqrestore(&host->lock, flags);
                 sd_normal_rw(host, mrq);
+                tasklet_schedule(&host->finish_tasklet);
         }
-
-        if (mrq->data) {
-                if (cmd->error || data->error)
-                        data->bytes_xfered = 0;
-                else
-                        data->bytes_xfered = data->blocks * data->blksz;
-        }
-
-        mutex_unlock(&pcr->pcr_mutex);
+        return;
 
 finish:
-        if (cmd->error)
-                dev_dbg(sdmmc_dev(host), "cmd->error = %d\n", cmd->error);
-
-        mutex_lock(&host->host_mutex);
-        host->mrq = NULL;
-        mutex_unlock(&host->host_mutex);
-
-        mmc_request_done(mmc, mrq);
+        tasklet_schedule(&host->finish_tasklet);
+        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 static int sd_set_bus_width(struct realtek_pci_sdmmc *host,
@@ -1189,6 +1400,8 @@ out:
 }
 
 static const struct mmc_host_ops realtek_pci_sdmmc_ops = {
+        .pre_req = sdmmc_pre_req,
+        .post_req = sdmmc_post_req,
         .request = sdmmc_request,
         .set_ios = sdmmc_set_ios,
         .get_ro = sdmmc_get_ro,
@@ -1252,6 +1465,7 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)
         struct realtek_pci_sdmmc *host;
         struct rtsx_pcr *pcr;
         struct pcr_handle *handle = pdev->dev.platform_data;
+        unsigned long host_addr;
 
         if (!handle)
                 return -ENXIO;
@@ -1275,8 +1489,15 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev)
         pcr->slots[RTSX_SD_CARD].p_dev = pdev;
         pcr->slots[RTSX_SD_CARD].card_event = rtsx_pci_sdmmc_card_event;
 
-        mutex_init(&host->host_mutex);
+        host_addr = (unsigned long)host;
+        host->next_data.cookie = 1;
+        setup_timer(&host->timer, sd_request_timeout, host_addr);
+        tasklet_init(&host->cmd_tasklet, sd_get_rsp, host_addr);
+        tasklet_init(&host->data_tasklet, sd_finish_multi_rw, host_addr);
+        tasklet_init(&host->finish_tasklet, sd_finish_request, host_addr);
+        spin_lock_init(&host->lock);
 
+        pcr->slots[RTSX_SD_CARD].done_transfer = sd_isr_done_transfer;
         realtek_init_host(host);
 
         mmc_add_host(mmc);
@@ -1289,6 +1510,8 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)
         struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
         struct rtsx_pcr *pcr;
         struct mmc_host *mmc;
+        struct mmc_request *mrq;
+        unsigned long flags;
 
         if (!host)
                 return 0;
@@ -1296,25 +1519,37 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)
         pcr = host->pcr;
         pcr->slots[RTSX_SD_CARD].p_dev = NULL;
         pcr->slots[RTSX_SD_CARD].card_event = NULL;
+        pcr->slots[RTSX_SD_CARD].done_transfer = NULL;
         mmc = host->mmc;
-        host->eject = true;
+        mrq = host->mrq;
 
-        mutex_lock(&host->host_mutex);
+        spin_lock_irqsave(&host->lock, flags);
         if (host->mrq) {
                 dev_dbg(&(pdev->dev),
                         "%s: Controller removed during transfer\n",
                         mmc_hostname(mmc));
 
-                rtsx_pci_complete_unfinished_transfer(pcr);
+                if (mrq->sbc)
+                        mrq->sbc->error = -ENOMEDIUM;
+                if (mrq->cmd)
+                        mrq->cmd->error = -ENOMEDIUM;
+                if (mrq->stop)
+                        mrq->stop->error = -ENOMEDIUM;
+                if (mrq->data)
+                        mrq->data->error = -ENOMEDIUM;
 
-                host->mrq->cmd->error = -ENOMEDIUM;
-                if (host->mrq->stop)
-                        host->mrq->stop->error = -ENOMEDIUM;
-                mmc_request_done(mmc, host->mrq);
+                tasklet_schedule(&host->finish_tasklet);
         }
-        mutex_unlock(&host->host_mutex);
+        spin_unlock_irqrestore(&host->lock, flags);
+
+        del_timer_sync(&host->timer);
+        tasklet_kill(&host->cmd_tasklet);
+        tasklet_kill(&host->data_tasklet);
+        tasklet_kill(&host->finish_tasklet);
 
         mmc_remove_host(mmc);
+        host->eject = true;
+
         mmc_free_host(mmc);
 
         dev_dbg(&(pdev->dev),
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 9ce17f6e4014..ebb3f392b589 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -31,7 +31,6 @@
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/err.h>
-#include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/acpi.h>
 #include <linux/pm.h>
@@ -40,13 +39,15 @@
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/pm.h>
+#include <linux/mmc/slot-gpio.h>
 #include <linux/mmc/sdhci.h>
 
 #include "sdhci.h"
 
 enum {
-        SDHCI_ACPI_SD_CD        = BIT(0),
-        SDHCI_ACPI_RUNTIME_PM   = BIT(1),
+        SDHCI_ACPI_SD_CD                = BIT(0),
+        SDHCI_ACPI_RUNTIME_PM           = BIT(1),
+        SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL = BIT(2),
 };
 
 struct sdhci_acpi_chip {
@@ -121,6 +122,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = {
 };
 
 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
+        .quirks  = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
         .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
         .caps    = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
         .flags   = SDHCI_ACPI_RUNTIME_PM,
@@ -128,7 +130,8 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
 };
 
 static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = {
-        .flags   = SDHCI_ACPI_SD_CD | SDHCI_ACPI_RUNTIME_PM,
+        .flags   = SDHCI_ACPI_SD_CD | SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL |
+                   SDHCI_ACPI_RUNTIME_PM,
         .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON,
 };
 
@@ -141,6 +144,7 @@ struct sdhci_acpi_uid_slot {
 static const struct sdhci_acpi_uid_slot sdhci_acpi_uids[] = {
         { "80860F14" , "1" , &sdhci_acpi_slot_int_emmc },
         { "80860F14" , "3" , &sdhci_acpi_slot_int_sd   },
+        { "80860F16" , NULL, &sdhci_acpi_slot_int_sd   },
         { "INT33BB"  , "2" , &sdhci_acpi_slot_int_sdio },
         { "INT33C6"  , NULL, &sdhci_acpi_slot_int_sdio },
         { "INT3436"  , NULL, &sdhci_acpi_slot_int_sdio },
@@ -150,6 +154,7 @@ static const struct sdhci_acpi_uid_slot sdhci_acpi_uids[] = {
 
 static const struct acpi_device_id sdhci_acpi_ids[] = {
         { "80860F14" },
+        { "80860F16" },
         { "INT33BB"  },
         { "INT33C6"  },
         { "INT3436"  },
@@ -192,59 +197,6 @@ static const struct sdhci_acpi_slot *sdhci_acpi_get_slot(acpi_handle handle,
         return slot;
 }
 
-#ifdef CONFIG_PM_RUNTIME
-
-static irqreturn_t sdhci_acpi_sd_cd(int irq, void *dev_id)
-{
-        mmc_detect_change(dev_id, msecs_to_jiffies(200));
-        return IRQ_HANDLED;
-}
-
-static int sdhci_acpi_add_own_cd(struct device *dev, struct mmc_host *mmc)
-{
-        struct gpio_desc *desc;
-        unsigned long flags;
-        int err, irq;
-
-        desc = devm_gpiod_get_index(dev, "sd_cd", 0);
-        if (IS_ERR(desc)) {
-                err = PTR_ERR(desc);
-                goto out;
-        }
-
-        err = gpiod_direction_input(desc);
-        if (err)
-                goto out_free;
-
-        irq = gpiod_to_irq(desc);
-        if (irq < 0) {
-                err = irq;
-                goto out_free;
-        }
-
-        flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
-        err = devm_request_irq(dev, irq, sdhci_acpi_sd_cd, flags, "sd_cd", mmc);
-        if (err)
-                goto out_free;
-
-        return 0;
-
-out_free:
-        devm_gpiod_put(dev, desc);
-out:
-        dev_warn(dev, "failed to setup card detect wake up\n");
-        return err;
-}
-
-#else
-
-static int sdhci_acpi_add_own_cd(struct device *dev, struct mmc_host *mmc)
-{
-        return 0;
-}
-
-#endif
-
 static int sdhci_acpi_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -332,15 +284,19 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
 
         host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;
 
-        err = sdhci_add_host(host);
-        if (err)
-                goto err_free;
-
         if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {
-                if (sdhci_acpi_add_own_cd(dev, host->mmc))
+                bool v = sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL);
+
+                if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0)) {
+                        dev_warn(dev, "failed to setup card detect gpio\n");
                         c->use_runtime_pm = false;
+                }
         }
 
+        err = sdhci_add_host(host);
+        if (err)
+                goto err_free;
+
         if (c->use_runtime_pm) {
                 pm_runtime_set_active(dev);
                 pm_suspend_ignore_children(dev, 1);
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 7a190fe4dff1..6f166e63b817 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -54,6 +54,7 @@
 
 struct sdhci_bcm_kona_dev {
         struct mutex    write_lock; /* protect back to back writes */
+        struct clk      *external_clk;
 };
 
 
@@ -257,6 +258,24 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
                 goto err_pltfm_free;
         }
 
+        /* Get and enable the external clock */
+        kona_dev->external_clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(kona_dev->external_clk)) {
+                dev_err(dev, "Failed to get external clock\n");
+                ret = PTR_ERR(kona_dev->external_clk);
+                goto err_pltfm_free;
+        }
+
+        if (clk_set_rate(kona_dev->external_clk, host->mmc->f_max) != 0) {
+                dev_err(dev, "Failed to set rate external clock\n");
+                goto err_pltfm_free;
+        }
+
+        if (clk_prepare_enable(kona_dev->external_clk) != 0) {
+                dev_err(dev, "Failed to enable external clock\n");
+                goto err_pltfm_free;
+        }
+
         dev_dbg(dev, "non-removable=%c\n",
                 (host->mmc->caps & MMC_CAP_NONREMOVABLE) ? 'Y' : 'N');
         dev_dbg(dev, "cd_gpio %c, wp_gpio %c\n",
@@ -271,7 +290,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
 
         ret = sdhci_bcm_kona_sd_reset(host);
         if (ret)
-                goto err_pltfm_free;
+                goto err_clk_disable;
 
         sdhci_bcm_kona_sd_init(host);
 
@@ -307,6 +326,9 @@ err_remove_host:
 err_reset:
         sdhci_bcm_kona_sd_reset(host);
 
+err_clk_disable:
+        clk_disable_unprepare(kona_dev->external_clk);
+
 err_pltfm_free:
         sdhci_pltfm_free(pdev);
 
@@ -314,9 +336,20 @@ err_pltfm_free:
         return ret;
 }
 
-static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev)
+static int sdhci_bcm_kona_remove(struct platform_device *pdev)
 {
-        return sdhci_pltfm_unregister(pdev);
+        struct sdhci_host *host = platform_get_drvdata(pdev);
+        struct sdhci_pltfm_host *pltfm_priv = sdhci_priv(host);
+        struct sdhci_bcm_kona_dev *kona_dev = sdhci_pltfm_priv(pltfm_priv);
+        int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
+
+        sdhci_remove_host(host, dead);
+
+        clk_disable_unprepare(kona_dev->external_clk);
+
+        sdhci_pltfm_free(pdev);
+
+        return 0;
 }
 
 static struct platform_driver sdhci_bcm_kona_driver = {
diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 8424839660f8..736d7a2eb7ec 100644
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -208,7 +208,7 @@ static struct platform_driver sdhci_dove_driver = {
                 .name   = "sdhci-dove",
                 .owner  = THIS_MODULE,
                 .pm     = SDHCI_PLTFM_PMOPS,
-                .of_match_table = of_match_ptr(sdhci_dove_of_match_table),
+                .of_match_table = sdhci_dove_of_match_table,
         },
         .probe          = sdhci_dove_probe,
         .remove         = sdhci_dove_remove,
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
new file mode 100644
index 000000000000..acb0e9eb55f1
--- /dev/null
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -0,0 +1,618 @@
+/*
+ * drivers/mmc/host/sdhci-msm.c - Qualcomm SDHCI Platform driver
+ *
+ * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
+#include <linux/mmc/mmc.h>
+#include <linux/slab.h>
+
+#include "sdhci-pltfm.h"
+
+#define CORE_HC_MODE            0x78
+#define HC_MODE_EN              0x1
+#define CORE_POWER              0x0
+#define CORE_SW_RST             BIT(7)
+
+#define MAX_PHASES              16
+#define CORE_DLL_LOCK           BIT(7)
+#define CORE_DLL_EN             BIT(16)
+#define CORE_CDR_EN             BIT(17)
+#define CORE_CK_OUT_EN          BIT(18)
+#define CORE_CDR_EXT_EN         BIT(19)
+#define CORE_DLL_PDN            BIT(29)
+#define CORE_DLL_RST            BIT(30)
+#define CORE_DLL_CONFIG         0x100
+#define CORE_DLL_STATUS         0x108
+
+#define CORE_VENDOR_SPEC        0x10c
+#define CORE_CLK_PWRSAVE        BIT(1)
+
+#define CDR_SELEXT_SHIFT        20
+#define CDR_SELEXT_MASK         (0xf << CDR_SELEXT_SHIFT)
+#define CMUX_SHIFT_PHASE_SHIFT  24
+#define CMUX_SHIFT_PHASE_MASK   (7 << CMUX_SHIFT_PHASE_SHIFT)
+
+static const u32 tuning_block_64[] = {
+        0x00ff0fff, 0xccc3ccff, 0xffcc3cc3, 0xeffefffe,
+        0xddffdfff, 0xfbfffbff, 0xff7fffbf, 0xefbdf777,
+        0xf0fff0ff, 0x3cccfc0f, 0xcfcc33cc, 0xeeffefff,
+        0xfdfffdff, 0xffbfffdf, 0xfff7ffbb, 0xde7b7ff7
+};
+
+static const u32 tuning_block_128[] = {
+        0xff00ffff, 0x0000ffff, 0xccccffff, 0xcccc33cc,
+        0xcc3333cc, 0xffffcccc, 0xffffeeff, 0xffeeeeff,
+        0xffddffff, 0xddddffff, 0xbbffffff, 0xbbffffff,
+        0xffffffbb, 0xffffff77, 0x77ff7777, 0xffeeddbb,
+        0x00ffffff, 0x00ffffff, 0xccffff00, 0xcc33cccc,
+        0x3333cccc, 0xffcccccc, 0xffeeffff, 0xeeeeffff,
+        0xddffffff, 0xddffffff, 0xffffffdd, 0xffffffbb,
+        0xffffbbbb, 0xffff77ff, 0xff7777ff, 0xeeddbb77
+};
+
+struct sdhci_msm_host {
+        struct platform_device *pdev;
+        void __iomem *core_mem; /* MSM SDCC mapped address */
+        struct clk *clk;        /* main SD/MMC bus clock */
+        struct clk *pclk;       /* SDHC peripheral bus clock */
+        struct clk *bus_clk;    /* SDHC bus voter clock */
+        struct mmc_host *mmc;
+        struct sdhci_pltfm_data sdhci_msm_pdata;
+};
+
+/* Platform specific tuning */
+static inline int msm_dll_poll_ck_out_en(struct sdhci_host *host, u8 poll)
+{
+        u32 wait_cnt = 50;
+        u8 ck_out_en;
+        struct mmc_host *mmc = host->mmc;
+
+        /* Poll for CK_OUT_EN bit.  max. poll time = 50us */
+        ck_out_en = !!(readl_relaxed(host->ioaddr + CORE_DLL_CONFIG) &
+                        CORE_CK_OUT_EN);
+
+        while (ck_out_en != poll) {
+                if (--wait_cnt == 0) {
+                        dev_err(mmc_dev(mmc), "%s: CK_OUT_EN bit is not %d\n",
+                               mmc_hostname(mmc), poll);
+                        return -ETIMEDOUT;
+                }
+                udelay(1);
+
+                ck_out_en = !!(readl_relaxed(host->ioaddr + CORE_DLL_CONFIG) &
+                                CORE_CK_OUT_EN);
+        }
+
+        return 0;
+}
+
+static int msm_config_cm_dll_phase(struct sdhci_host *host, u8 phase)
+{
+        int rc;
+        static const u8 grey_coded_phase_table[] = {
+                0x0, 0x1, 0x3, 0x2, 0x6, 0x7, 0x5, 0x4,
+                0xc, 0xd, 0xf, 0xe, 0xa, 0xb, 0x9, 0x8
+        };
+        unsigned long flags;
+        u32 config;
+        struct mmc_host *mmc = host->mmc;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        config = readl_relaxed(host->ioaddr + CORE_DLL_CONFIG);
+        config &= ~(CORE_CDR_EN | CORE_CK_OUT_EN);
+        config |= (CORE_CDR_EXT_EN | CORE_DLL_EN);
+        writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Wait until CK_OUT_EN bit of DLL_CONFIG register becomes '0' */
+        rc = msm_dll_poll_ck_out_en(host, 0);
+        if (rc)
+                goto err_out;
+
+        /*
+         * Write the selected DLL clock output phase (0 ... 15)
+         * to CDR_SELEXT bit field of DLL_CONFIG register.
+         */
+        config = readl_relaxed(host->ioaddr + CORE_DLL_CONFIG);
+        config &= ~CDR_SELEXT_MASK;
+        config |= grey_coded_phase_table[phase] << CDR_SELEXT_SHIFT;
+        writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Set CK_OUT_EN bit of DLL_CONFIG register to 1. */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        | CORE_CK_OUT_EN), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Wait until CK_OUT_EN bit of DLL_CONFIG register becomes '1' */
+        rc = msm_dll_poll_ck_out_en(host, 1);
+        if (rc)
+                goto err_out;
+
+        config = readl_relaxed(host->ioaddr + CORE_DLL_CONFIG);
+        config |= CORE_CDR_EN;
+        config &= ~CORE_CDR_EXT_EN;
+        writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+        goto out;
+
+err_out:
+        dev_err(mmc_dev(mmc), "%s: Failed to set DLL phase: %d\n",
+               mmc_hostname(mmc), phase);
+out:
+        spin_unlock_irqrestore(&host->lock, flags);
+        return rc;
+}
+
+/*
+ * Find out the greatest range of consecuitive selected
+ * DLL clock output phases that can be used as sampling
+ * setting for SD3.0 UHS-I card read operation (in SDR104
+ * timing mode) or for eMMC4.5 card read operation (in HS200
+ * timing mode).
+ * Select the 3/4 of the range and configure the DLL with the
+ * selected DLL clock output phase.
+ */
+
+static int msm_find_most_appropriate_phase(struct sdhci_host *host,
+                                           u8 *phase_table, u8 total_phases)
+{
+        int ret;
+        u8 ranges[MAX_PHASES][MAX_PHASES] = { {0}, {0} };
+        u8 phases_per_row[MAX_PHASES] = { 0 };
+        int row_index = 0, col_index = 0, selected_row_index = 0, curr_max = 0;
+        int i, cnt, phase_0_raw_index = 0, phase_15_raw_index = 0;
+        bool phase_0_found = false, phase_15_found = false;
+        struct mmc_host *mmc = host->mmc;
+
+        if (!total_phases || (total_phases > MAX_PHASES)) {
+                dev_err(mmc_dev(mmc), "%s: Invalid argument: total_phases=%d\n",
+                       mmc_hostname(mmc), total_phases);
+                return -EINVAL;
+        }
+
+        for (cnt = 0; cnt < total_phases; cnt++) {
+                ranges[row_index][col_index] = phase_table[cnt];
+                phases_per_row[row_index] += 1;
+                col_index++;
+
+                if ((cnt + 1) == total_phases) {
+                        continue;
+                /* check if next phase in phase_table is consecutive or not */
+                } else if ((phase_table[cnt] + 1) != phase_table[cnt + 1]) {
+                        row_index++;
+                        col_index = 0;
+                }
+        }
+
+        if (row_index >= MAX_PHASES)
+                return -EINVAL;
+
+        /* Check if phase-0 is present in first valid window? */
+        if (!ranges[0][0]) {
+                phase_0_found = true;
+                phase_0_raw_index = 0;
+                /* Check if cycle exist between 2 valid windows */
+                for (cnt = 1; cnt <= row_index; cnt++) {
+                        if (phases_per_row[cnt]) {
+                                for (i = 0; i < phases_per_row[cnt]; i++) {
+                                        if (ranges[cnt][i] == 15) {
+                                                phase_15_found = true;
+                                                phase_15_raw_index = cnt;
+                                                break;
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /* If 2 valid windows form cycle then merge them as single window */
+        if (phase_0_found && phase_15_found) {
+                /* number of phases in raw where phase 0 is present */
+                u8 phases_0 = phases_per_row[phase_0_raw_index];
+                /* number of phases in raw where phase 15 is present */
+                u8 phases_15 = phases_per_row[phase_15_raw_index];
+
+                if (phases_0 + phases_15 >= MAX_PHASES)
+                        /*
+                         * If there are more than 1 phase windows then total
+                         * number of phases in both the windows should not be
+                         * more than or equal to MAX_PHASES.
+                         */
+                        return -EINVAL;
+
+                /* Merge 2 cyclic windows */
+                i = phases_15;
+                for (cnt = 0; cnt < phases_0; cnt++) {
+                        ranges[phase_15_raw_index][i] =
+                            ranges[phase_0_raw_index][cnt];
+                        if (++i >= MAX_PHASES)
+                                break;
+                }
+
+                phases_per_row[phase_0_raw_index] = 0;
+                phases_per_row[phase_15_raw_index] = phases_15 + phases_0;
+        }
+
+        for (cnt = 0; cnt <= row_index; cnt++) {
+                if (phases_per_row[cnt] > curr_max) {
+                        curr_max = phases_per_row[cnt];
+                        selected_row_index = cnt;
+                }
+        }
+
+        i = (curr_max * 3) / 4;
+        if (i)
+                i--;
+
+        ret = ranges[selected_row_index][i];
+
+        if (ret >= MAX_PHASES) {
+                ret = -EINVAL;
+                dev_err(mmc_dev(mmc), "%s: Invalid phase selected=%d\n",
+                       mmc_hostname(mmc), ret);
+        }
+
+        return ret;
+}
+
+static inline void msm_cm_dll_set_freq(struct sdhci_host *host)
+{
+        u32 mclk_freq = 0, config;
+
+        /* Program the MCLK value to MCLK_FREQ bit field */
+        if (host->clock <= 112000000)
+                mclk_freq = 0;
+        else if (host->clock <= 125000000)
+                mclk_freq = 1;
+        else if (host->clock <= 137000000)
+                mclk_freq = 2;
+        else if (host->clock <= 150000000)
+                mclk_freq = 3;
+        else if (host->clock <= 162000000)
+                mclk_freq = 4;
+        else if (host->clock <= 175000000)
+                mclk_freq = 5;
+        else if (host->clock <= 187000000)
+                mclk_freq = 6;
+        else if (host->clock <= 200000000)
+                mclk_freq = 7;
+
+        config = readl_relaxed(host->ioaddr + CORE_DLL_CONFIG);
+        config &= ~CMUX_SHIFT_PHASE_MASK;
+        config |= mclk_freq << CMUX_SHIFT_PHASE_SHIFT;
+        writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+}
+
+/* Initialize the DLL (Programmable Delay Line) */
+static int msm_init_cm_dll(struct sdhci_host *host)
+{
+        struct mmc_host *mmc = host->mmc;
+        int wait_cnt = 50;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        /*
+         * Make sure that clock is always enabled when DLL
+         * tuning is in progress. Keeping PWRSAVE ON may
+         * turn off the clock.
+         */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_VENDOR_SPEC)
+                        & ~CORE_CLK_PWRSAVE), host->ioaddr + CORE_VENDOR_SPEC);
+
+        /* Write 1 to DLL_RST bit of DLL_CONFIG register */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        | CORE_DLL_RST), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Write 1 to DLL_PDN bit of DLL_CONFIG register */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        | CORE_DLL_PDN), host->ioaddr + CORE_DLL_CONFIG);
+        msm_cm_dll_set_freq(host);
+
+        /* Write 0 to DLL_RST bit of DLL_CONFIG register */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        & ~CORE_DLL_RST), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Write 0 to DLL_PDN bit of DLL_CONFIG register */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        & ~CORE_DLL_PDN), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Set DLL_EN bit to 1. */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        | CORE_DLL_EN), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Set CK_OUT_EN bit to 1. */
+        writel_relaxed((readl_relaxed(host->ioaddr + CORE_DLL_CONFIG)
+                        | CORE_CK_OUT_EN), host->ioaddr + CORE_DLL_CONFIG);
+
+        /* Wait until DLL_LOCK bit of DLL_STATUS register becomes '1' */
+        while (!(readl_relaxed(host->ioaddr + CORE_DLL_STATUS) &
+                 CORE_DLL_LOCK)) {
+                /* max. wait for 50us sec for LOCK bit to be set */
+                if (--wait_cnt == 0) {
+                        dev_err(mmc_dev(mmc), "%s: DLL failed to LOCK\n",
+                               mmc_hostname(mmc));
+                        spin_unlock_irqrestore(&host->lock, flags);
+                        return -ETIMEDOUT;
+                }
+                udelay(1);
+        }
+
+        spin_unlock_irqrestore(&host->lock, flags);
+        return 0;
+}
+
+static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
+{
+        int tuning_seq_cnt = 3;
+        u8 phase, *data_buf, tuned_phases[16], tuned_phase_cnt = 0;
+        const u32 *tuning_block_pattern = tuning_block_64;
+        int size = sizeof(tuning_block_64);     /* Pattern size in bytes */
+        int rc;
+        struct mmc_host *mmc = host->mmc;
+        struct mmc_ios ios = host->mmc->ios;
+
+        /*
+         * Tuning is required for SDR104, HS200 and HS400 cards and
+         * if clock frequency is greater than 100MHz in these modes.
+         */
+        if (host->clock <= 100 * 1000 * 1000 ||
+            !((ios.timing == MMC_TIMING_MMC_HS200) ||
+              (ios.timing == MMC_TIMING_UHS_SDR104)))
+                return 0;
+
+        if ((opcode == MMC_SEND_TUNING_BLOCK_HS200) &&
+            (mmc->ios.bus_width == MMC_BUS_WIDTH_8)) {
+                tuning_block_pattern = tuning_block_128;
+                size = sizeof(tuning_block_128);
+        }
+
+        data_buf = kmalloc(size, GFP_KERNEL);
+        if (!data_buf)
+                return -ENOMEM;
+
+retry:
+        /* First of all reset the tuning block */
+        rc = msm_init_cm_dll(host);
+        if (rc)
+                goto out;
+
+        phase = 0;
+        do {
+                struct mmc_command cmd = { 0 };
+                struct mmc_data data = { 0 };
+                struct mmc_request mrq = {
+                        .cmd = &cmd,
+                        .data = &data
+                };
+                struct scatterlist sg;
+
+                /* Set the phase in delay line hw block */
+                rc = msm_config_cm_dll_phase(host, phase);
+                if (rc)
+                        goto out;
+
+                cmd.opcode = opcode;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+                data.blksz = size;
+                data.blocks = 1;
+                data.flags = MMC_DATA_READ;
+                data.timeout_ns = NSEC_PER_SEC; /* 1 second */
+
+                data.sg = &sg;
+                data.sg_len = 1;
+                sg_init_one(&sg, data_buf, size);
+                memset(data_buf, 0, size);
+                mmc_wait_for_req(mmc, &mrq);
+
+                if (!cmd.error && !data.error &&
+                    !memcmp(data_buf, tuning_block_pattern, size)) {
+                        /* Tuning is successful at this tuning point */
+                        tuned_phases[tuned_phase_cnt++] = phase;
+                        dev_dbg(mmc_dev(mmc), "%s: Found good phase = %d\n",
+                                 mmc_hostname(mmc), phase);
+                }
+        } while (++phase < ARRAY_SIZE(tuned_phases));
+
+        if (tuned_phase_cnt) {
+                rc = msm_find_most_appropriate_phase(host, tuned_phases,
+                                                     tuned_phase_cnt);
+                if (rc < 0)
+                        goto out;
+                else
+                        phase = rc;
+
+                /*
+                 * Finally set the selected phase in delay
+                 * line hw block.
+                 */
+                rc = msm_config_cm_dll_phase(host, phase);
+                if (rc)
+                        goto out;
+                dev_dbg(mmc_dev(mmc), "%s: Setting the tuning phase to %d\n",
+                         mmc_hostname(mmc), phase);
+        } else {
+                if (--tuning_seq_cnt)
+                        goto retry;
+                /* Tuning failed */
+                dev_dbg(mmc_dev(mmc), "%s: No tuning point found\n",
+                       mmc_hostname(mmc));
+                rc = -EIO;
+        }
+
+out:
+        kfree(data_buf);
+        return rc;
+}
+
+static const struct of_device_id sdhci_msm_dt_match[] = {
+        { .compatible = "qcom,sdhci-msm-v4" },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
+
+static struct sdhci_ops sdhci_msm_ops = {
+        .platform_execute_tuning = sdhci_msm_execute_tuning,
+};
+
+static int sdhci_msm_probe(struct platform_device *pdev)
+{
+        struct sdhci_host *host;
+        struct sdhci_pltfm_host *pltfm_host;
+        struct sdhci_msm_host *msm_host;
+        struct resource *core_memres;
+        int ret;
+        u16 host_version;
+
+        msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
+        if (!msm_host)
+                return -ENOMEM;
+
+        msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
+        host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata, 0);
+        if (IS_ERR(host))
+                return PTR_ERR(host);
+
+        pltfm_host = sdhci_priv(host);
+        pltfm_host->priv = msm_host;
+        msm_host->mmc = host->mmc;
+        msm_host->pdev = pdev;
+
+        ret = mmc_of_parse(host->mmc);
+        if (ret)
+                goto pltfm_free;
+
+        sdhci_get_of_property(pdev);
+
+        /* Setup SDCC bus voter clock. */
+        msm_host->bus_clk = devm_clk_get(&pdev->dev, "bus");
+        if (!IS_ERR(msm_host->bus_clk)) {
+                /* Vote for max. clk rate for max. performance */
+                ret = clk_set_rate(msm_host->bus_clk, INT_MAX);
+                if (ret)
+                        goto pltfm_free;
+                ret = clk_prepare_enable(msm_host->bus_clk);
+                if (ret)
+                        goto pltfm_free;
+        }
+
+        /* Setup main peripheral bus clock */
+        msm_host->pclk = devm_clk_get(&pdev->dev, "iface");
+        if (IS_ERR(msm_host->pclk)) {
+                ret = PTR_ERR(msm_host->pclk);
+                dev_err(&pdev->dev, "Perpheral clk setup failed (%d)\n", ret);
+                goto bus_clk_disable;
+        }
+
+        ret = clk_prepare_enable(msm_host->pclk);
+        if (ret)
+                goto bus_clk_disable;
+
+        /* Setup SDC MMC clock */
+        msm_host->clk = devm_clk_get(&pdev->dev, "core");
+        if (IS_ERR(msm_host->clk)) {
+                ret = PTR_ERR(msm_host->clk);
+                dev_err(&pdev->dev, "SDC MMC clk setup failed (%d)\n", ret);
+                goto pclk_disable;
+        }
+
+        ret = clk_prepare_enable(msm_host->clk);
+        if (ret)
+                goto pclk_disable;
+
+        core_memres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        msm_host->core_mem = devm_ioremap_resource(&pdev->dev, core_memres);
+
+        if (IS_ERR(msm_host->core_mem)) {
+                dev_err(&pdev->dev, "Failed to remap registers\n");
+                ret = PTR_ERR(msm_host->core_mem);
+                goto clk_disable;
+        }
+
+        /* Reset the core and Enable SDHC mode */
+        writel_relaxed(readl_relaxed(msm_host->core_mem + CORE_POWER) |
+                       CORE_SW_RST, msm_host->core_mem + CORE_POWER);
+
+        /* SW reset can take upto 10HCLK + 15MCLK cycles. (min 40us) */
+        usleep_range(1000, 5000);
+        if (readl(msm_host->core_mem + CORE_POWER) & CORE_SW_RST) {
+                dev_err(&pdev->dev, "Stuck in reset\n");
+                ret = -ETIMEDOUT;
+                goto clk_disable;
+        }
+
+        /* Set HC_MODE_EN bit in HC_MODE register */
+        writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE));
+
+        host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+        host->quirks |= SDHCI_QUIRK_SINGLE_POWER_WRITE;
+
+        host_version = readw_relaxed((host->ioaddr + SDHCI_HOST_VERSION));
+        dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n",
+                host_version, ((host_version & SDHCI_VENDOR_VER_MASK) >>
+                               SDHCI_VENDOR_VER_SHIFT));
+
+        ret = sdhci_add_host(host);
+        if (ret)
+                goto clk_disable;
+
+        return 0;
+
+clk_disable:
+        clk_disable_unprepare(msm_host->clk);
+pclk_disable:
+        clk_disable_unprepare(msm_host->pclk);
+bus_clk_disable:
+        if (!IS_ERR(msm_host->bus_clk))
+                clk_disable_unprepare(msm_host->bus_clk);
+pltfm_free:
+        sdhci_pltfm_free(pdev);
+        return ret;
+}
+
+static int sdhci_msm_remove(struct platform_device *pdev)
+{
+        struct sdhci_host *host = platform_get_drvdata(pdev);
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+        struct sdhci_msm_host *msm_host = pltfm_host->priv;
+        int dead = (readl_relaxed(host->ioaddr + SDHCI_INT_STATUS) ==
+                    0xffffffff);
+
+        sdhci_remove_host(host, dead);
+        sdhci_pltfm_free(pdev);
+        clk_disable_unprepare(msm_host->clk);
+        clk_disable_unprepare(msm_host->pclk);
+        if (!IS_ERR(msm_host->bus_clk))
+                clk_disable_unprepare(msm_host->bus_clk);
+        return 0;
+}
+
+static struct platform_driver sdhci_msm_driver = {
+        .probe = sdhci_msm_probe,
+        .remove = sdhci_msm_remove,
+        .driver = {
+                   .name = "sdhci_msm",
+                   .owner = THIS_MODULE,
+                   .of_match_table = sdhci_msm_dt_match,
+        },
+};
+
+module_platform_driver(sdhci_msm_driver);
+
+MODULE_DESCRIPTION("Qualcomm Secure Digital Host Controller Interface driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 0955777b6c7e..fdc612120362 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -610,6 +610,18 @@ static const struct sdhci_pci_fixes sdhci_via = {
         .probe          = via_probe,
 };
 
+static int rtsx_probe_slot(struct sdhci_pci_slot *slot)
+{
+        slot->host->mmc->caps2 |= MMC_CAP2_HS200;
+        return 0;
+}
+
+static const struct sdhci_pci_fixes sdhci_rtsx = {
+        .quirks2        = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+                        SDHCI_QUIRK2_BROKEN_DDR50,
+        .probe_slot     = rtsx_probe_slot,
+};
+
 static const struct pci_device_id pci_ids[] = {
         {
                 .vendor         = PCI_VENDOR_ID_RICOH,
@@ -732,6 +744,14 @@ static const struct pci_device_id pci_ids[] = {
         },
 
         {
+                .vendor         = PCI_VENDOR_ID_REALTEK,
+                .device         = 0x5250,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_rtsx,
+        },
+
+        {
                 .vendor         = PCI_VENDOR_ID_INTEL,
                 .device         = PCI_DEVICE_ID_INTEL_MRST_SD0,
                 .subvendor      = PCI_ANY_ID,
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 793dacd3b841..2fd73b38c303 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -34,6 +34,7 @@
 #include <linux/of_gpio.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
+#include <linux/mbus.h>
 
 #include "sdhci.h"
 #include "sdhci-pltfm.h"
@@ -57,6 +58,60 @@
 #define SDCE_MISC_INT           (1<<2)
 #define SDCE_MISC_INT_EN        (1<<1)
 
+/*
+ * These registers are relative to the second register region, for the
+ * MBus bridge.
+ */
+#define SDHCI_WINDOW_CTRL(i)    (0x80 + ((i) << 3))
+#define SDHCI_WINDOW_BASE(i)    (0x84 + ((i) << 3))
+#define SDHCI_MAX_WIN_NUM       8
+
+static int mv_conf_mbus_windows(struct platform_device *pdev,
+                                const struct mbus_dram_target_info *dram)
+{
+        int i;
+        void __iomem *regs;
+        struct resource *res;
+
+        if (!dram) {
+                dev_err(&pdev->dev, "no mbus dram info\n");
+                return -EINVAL;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res) {
+                dev_err(&pdev->dev, "cannot get mbus registers\n");
+                return -EINVAL;
+        }
+
+        regs = ioremap(res->start, resource_size(res));
+        if (!regs) {
+                dev_err(&pdev->dev, "cannot map mbus registers\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < SDHCI_MAX_WIN_NUM; i++) {
+                writel(0, regs + SDHCI_WINDOW_CTRL(i));
+                writel(0, regs + SDHCI_WINDOW_BASE(i));
+        }
+
+        for (i = 0; i < dram->num_cs; i++) {
+                const struct mbus_dram_window *cs = dram->cs + i;
+
+                /* Write size, attributes and target id to control register */
+                writel(((cs->size - 1) & 0xffff0000) |
+                        (cs->mbus_attr << 8) |
+                        (dram->mbus_dram_target_id << 4) | 1,
+                        regs + SDHCI_WINDOW_CTRL(i));
+                /* Write base address to base register */
+                writel(cs->base, regs + SDHCI_WINDOW_BASE(i));
+        }
+
+        iounmap(regs);
+
+        return 0;
+}
+
 static void pxav3_set_private_registers(struct sdhci_host *host, u8 mask)
 {
         struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
@@ -187,6 +242,9 @@ static const struct of_device_id sdhci_pxav3_of_match[] = {
         {
                 .compatible = "mrvl,pxav3-mmc",
         },
+        {
+                .compatible = "marvell,armada-380-sdhci",
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, sdhci_pxav3_of_match);
@@ -219,6 +277,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
         struct sdhci_pltfm_host *pltfm_host;
         struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
         struct device *dev = &pdev->dev;
+        struct device_node *np = pdev->dev.of_node;
         struct sdhci_host *host = NULL;
         struct sdhci_pxa *pxa = NULL;
         const struct of_device_id *match;
@@ -235,6 +294,14 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
                 kfree(pxa);
                 return PTR_ERR(host);
         }
+
+        if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) {
+                ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
+                if (ret < 0)
+                        goto err_mbus_win;
+        }
+
+
         pltfm_host = sdhci_priv(host);
         pltfm_host->priv = pxa;
 
@@ -321,6 +388,7 @@ err_add_host:
         clk_disable_unprepare(clk);
         clk_put(clk);
 err_clk_get:
+err_mbus_win:
         sdhci_pltfm_free(pdev);
         kfree(pxa);
         return ret;
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 6debda952155..d61eb5a70833 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -51,12 +51,13 @@ struct sdhci_s3c {
         struct platform_device  *pdev;
         struct resource         *ioarea;
         struct s3c_sdhci_platdata *pdata;
-        unsigned int            cur_clk;
+        int                     cur_clk;
         int                     ext_cd_irq;
         int                     ext_cd_gpio;
 
         struct clk              *clk_io;
         struct clk              *clk_bus[MAX_BUS_CLK];
+        unsigned long           clk_rates[MAX_BUS_CLK];
 };
 
 /**
@@ -77,32 +78,6 @@ static inline struct sdhci_s3c *to_s3c(struct sdhci_host *host)
 }
 
 /**
- * get_curclk - convert ctrl2 register to clock source number
- * @ctrl2: Control2 register value.
- */
-static u32 get_curclk(u32 ctrl2)
-{
-        ctrl2 &= S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-        ctrl2 >>= S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-
-        return ctrl2;
-}
-
-static void sdhci_s3c_check_sclk(struct sdhci_host *host)
-{
-        struct sdhci_s3c *ourhost = to_s3c(host);
-        u32 tmp = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
-
-        if (get_curclk(tmp) != ourhost->cur_clk) {
-                dev_dbg(&ourhost->pdev->dev, "restored ctrl2 clock setting\n");
-
-                tmp &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-                tmp |= ourhost->cur_clk << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-                writel(tmp, host->ioaddr + S3C_SDHCI_CONTROL2);
-        }
-}
-
-/**
  * sdhci_s3c_get_max_clk - callback to get maximum clock frequency.
  * @host: The SDHCI host instance.
  *
@@ -111,20 +86,11 @@ static void sdhci_s3c_check_sclk(struct sdhci_host *host)
 static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)
 {
         struct sdhci_s3c *ourhost = to_s3c(host);
-        struct clk *busclk;
-        unsigned int rate, max;
-        int clk;
-
-        /* note, a reset will reset the clock source */
-
-        sdhci_s3c_check_sclk(host);
-
-        for (max = 0, clk = 0; clk < MAX_BUS_CLK; clk++) {
-                busclk = ourhost->clk_bus[clk];
-                if (!busclk)
-                        continue;
+        unsigned long rate, max = 0;
+        int src;
 
-                rate = clk_get_rate(busclk);
+        for (src = 0; src < MAX_BUS_CLK; src++) {
+                rate = ourhost->clk_rates[src];
                 if (rate > max)
                         max = rate;
         }
@@ -144,9 +110,9 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
 {
         unsigned long rate;
         struct clk *clksrc = ourhost->clk_bus[src];
-        int div;
+        int shift;
 
-        if (!clksrc)
+        if (IS_ERR(clksrc))
                 return UINT_MAX;
 
         /*
@@ -158,17 +124,24 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
                 return wanted - rate;
         }
 
-        rate = clk_get_rate(clksrc);
+        rate = ourhost->clk_rates[src];
 
-        for (div = 1; div < 256; div *= 2) {
-                if ((rate / div) <= wanted)
+        for (shift = 0; shift <= 8; ++shift) {
+                if ((rate >> shift) <= wanted)
                         break;
         }
 
+        if (shift > 8) {
+                dev_dbg(&ourhost->pdev->dev,
+                        "clk %d: rate %ld, min rate %lu > wanted %u\n",
+                        src, rate, rate / 256, wanted);
+                return UINT_MAX;
+        }
+
         dev_dbg(&ourhost->pdev->dev, "clk %d: rate %ld, want %d, got %ld\n",
-                src, rate, wanted, rate / div);
+                src, rate, wanted, rate >> shift);
 
-        return wanted - (rate / div);
+        return wanted - (rate >> shift);
 }
 
 /**
@@ -209,20 +182,22 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
                 struct clk *clk = ourhost->clk_bus[best_src];
 
                 clk_prepare_enable(clk);
-                clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]);
-
-                /* turn clock off to card before changing clock source */
-                writew(0, host->ioaddr + SDHCI_CLOCK_CONTROL);
+                if (ourhost->cur_clk >= 0)
+                        clk_disable_unprepare(
+                                        ourhost->clk_bus[ourhost->cur_clk]);
 
                 ourhost->cur_clk = best_src;
-                host->max_clk = clk_get_rate(clk);
-
-                ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
-                ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
-                ctrl |= best_src << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
-                writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);
+                host->max_clk = ourhost->clk_rates[best_src];
         }
 
+        /* turn clock off to card before changing clock source */
+        writew(0, host->ioaddr + SDHCI_CLOCK_CONTROL);
+
+        ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
+        ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
+        ctrl |= best_src << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;
+        writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);
+
         /* reprogram default hardware configuration */
         writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA,
                 host->ioaddr + S3C64XX_SDHCI_CONTROL4);
@@ -254,17 +229,17 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
 static unsigned int sdhci_s3c_get_min_clock(struct sdhci_host *host)
 {
         struct sdhci_s3c *ourhost = to_s3c(host);
-        unsigned int delta, min = UINT_MAX;
+        unsigned long rate, min = ULONG_MAX;
         int src;
 
         for (src = 0; src < MAX_BUS_CLK; src++) {
-                delta = sdhci_s3c_consider_clock(ourhost, src, 0);
-                if (delta == UINT_MAX)
+                rate = ourhost->clk_rates[src] / 256;
+                if (!rate)
                         continue;
-                /* delta is a negative value in this case */
-                if (-delta < min)
-                        min = -delta;
+                if (rate < min)
+                        min = rate;
         }
+
         return min;
 }
 
@@ -272,20 +247,44 @@ static unsigned int sdhci_s3c_get_min_clock(struct sdhci_host *host)
 static unsigned int sdhci_cmu_get_max_clock(struct sdhci_host *host)
 {
         struct sdhci_s3c *ourhost = to_s3c(host);
+        unsigned long rate, max = 0;
+        int src;
 
-        return clk_round_rate(ourhost->clk_bus[ourhost->cur_clk], UINT_MAX);
+        for (src = 0; src < MAX_BUS_CLK; src++) {
+                struct clk *clk;
+
+                clk = ourhost->clk_bus[src];
+                if (IS_ERR(clk))
+                        continue;
+
+                rate = clk_round_rate(clk, ULONG_MAX);
+                if (rate > max)
+                        max = rate;
+        }
+
+        return max;
 }
 
 /* sdhci_cmu_get_min_clock - callback to get minimal supported clock value. */
 static unsigned int sdhci_cmu_get_min_clock(struct sdhci_host *host)
 {
         struct sdhci_s3c *ourhost = to_s3c(host);
+        unsigned long rate, min = ULONG_MAX;
+        int src;
 
-        /*
-         * initial clock can be in the frequency range of
-         * 100KHz-400KHz, so we set it as max value.
-         */
-        return clk_round_rate(ourhost->clk_bus[ourhost->cur_clk], 400000);
+        for (src = 0; src < MAX_BUS_CLK; src++) {
+                struct clk *clk;
+
+                clk = ourhost->clk_bus[src];
+                if (IS_ERR(clk))
+                        continue;
+
+                rate = clk_round_rate(clk, 0);
+                if (rate < min)
+                        min = rate;
+        }
+
+        return min;
 }
 
 /* sdhci_cmu_set_clock - callback on clock change.*/
@@ -552,6 +551,7 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
         sc->host = host;
         sc->pdev = pdev;
         sc->pdata = pdata;
+        sc->cur_clk = -1;
 
         platform_set_drvdata(pdev, host);
 
@@ -566,25 +566,18 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
         clk_prepare_enable(sc->clk_io);
 
         for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
-                struct clk *clk;
                 char name[14];
 
                 snprintf(name, 14, "mmc_busclk.%d", ptr);
-                clk = devm_clk_get(dev, name);
-                if (IS_ERR(clk))
+                sc->clk_bus[ptr] = devm_clk_get(dev, name);
+                if (IS_ERR(sc->clk_bus[ptr]))
                         continue;
 
                 clks++;
-                sc->clk_bus[ptr] = clk;
-
-                /*
-                 * save current clock index to know which clock bus
-                 * is used later in overriding functions.
-                 */
-                sc->cur_clk = ptr;
+                sc->clk_rates[ptr] = clk_get_rate(sc->clk_bus[ptr]);
 
                 dev_info(dev, "clock source %d: %s (%ld Hz)\n",
-                         ptr, name, clk_get_rate(clk));
+                                ptr, name, sc->clk_rates[ptr]);
         }
 
         if (clks == 0) {
@@ -593,10 +586,6 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
                 goto err_no_busclks;
         }
 
-#ifndef CONFIG_PM_RUNTIME
-        clk_prepare_enable(sc->clk_bus[sc->cur_clk]);
-#endif
-
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         host->ioaddr = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(host->ioaddr)) {
@@ -709,10 +698,6 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
         return 0;
 
  err_req_regs:
-#ifndef CONFIG_PM_RUNTIME
-        clk_disable_unprepare(sc->clk_bus[sc->cur_clk]);
-#endif
-
  err_no_busclks:
         clk_disable_unprepare(sc->clk_io);
 
@@ -743,9 +728,6 @@ static int sdhci_s3c_remove(struct platform_device *pdev)
         pm_runtime_dont_use_autosuspend(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
-#ifndef CONFIG_PM_RUNTIME
-        clk_disable_unprepare(sc->clk_bus[sc->cur_clk]);
-#endif
         clk_disable_unprepare(sc->clk_io);
 
         sdhci_free_host(host);
@@ -779,7 +761,8 @@ static int sdhci_s3c_runtime_suspend(struct device *dev)
 
         ret = sdhci_runtime_suspend_host(host);
 
-        clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]);
+        if (ourhost->cur_clk >= 0)
+                clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]);
         clk_disable_unprepare(busclk);
         return ret;
 }
@@ -792,7 +775,8 @@ static int sdhci_s3c_runtime_resume(struct device *dev)
         int ret;
 
         clk_prepare_enable(busclk);
-        clk_prepare_enable(ourhost->clk_bus[ourhost->cur_clk]);
+        if (ourhost->cur_clk >= 0)
+                clk_prepare_enable(ourhost->clk_bus[ourhost->cur_clk]);
         ret = sdhci_runtime_resume_host(host);
         return ret;
 }
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 2dba9f8d1760..0316dec3f006 100644
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sdhci-spear.h>
+#include <linux/mmc/slot-gpio.h>
 #include <linux/io.h>
 #include "sdhci.h"
 
@@ -40,36 +41,6 @@ static const struct sdhci_ops sdhci_pltfm_ops = {
         /* Nothing to do for now. */
 };
 
-/* gpio card detection interrupt handler */
-static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id)
-{
-        struct platform_device *pdev = dev_id;
-        struct sdhci_host *host = platform_get_drvdata(pdev);
-        struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
-        unsigned long gpio_irq_type;
-        int val;
-
-        val = gpio_get_value(sdhci->data->card_int_gpio);
-
-        /* val == 1 -> card removed, val == 0 -> card inserted */
-        /* if card removed - set irq for low level, else vice versa */
-        gpio_irq_type = val ? IRQF_TRIGGER_LOW : IRQF_TRIGGER_HIGH;
-        irq_set_irq_type(irq, gpio_irq_type);
-
-        if (sdhci->data->card_power_gpio >= 0) {
-                if (!sdhci->data->power_always_enb) {
-                        /* if card inserted, give power, otherwise remove it */
-                        val = sdhci->data->power_active_high ? !val : val ;
-                        gpio_set_value(sdhci->data->card_power_gpio, val);
-                }
-        }
-
-        /* inform sdhci driver about card insertion/removal */
-        tasklet_schedule(&host->card_tasklet);
-
-        return IRQ_HANDLED;
-}
-
 #ifdef CONFIG_OF
 static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev)
 {
@@ -84,14 +55,12 @@ static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pde
         /* If pdata is required */
         if (cd_gpio != -1) {
                 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-                if (!pdata) {
+                if (!pdata)
                         dev_err(&pdev->dev, "DT: kzalloc failed\n");
-                        return ERR_PTR(-ENOMEM);
-                }
+                else
+                        pdata->card_int_gpio = cd_gpio;
         }
 
-        pdata->card_int_gpio = cd_gpio;
-
         return pdata;
 }
 #else
@@ -107,41 +76,44 @@ static int sdhci_probe(struct platform_device *pdev)
         struct sdhci_host *host;
         struct resource *iomem;
         struct spear_sdhci *sdhci;
+        struct device *dev;
         int ret;
 
-        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!iomem) {
-                ret = -ENOMEM;
-                dev_dbg(&pdev->dev, "memory resource not defined\n");
+        dev = pdev->dev.parent ? pdev->dev.parent : &pdev->dev;
+        host = sdhci_alloc_host(dev, sizeof(*sdhci));
+        if (IS_ERR(host)) {
+                ret = PTR_ERR(host);
+                dev_dbg(&pdev->dev, "cannot allocate memory for sdhci\n");
                 goto err;
         }
 
-        if (!devm_request_mem_region(&pdev->dev, iomem->start,
-                                resource_size(iomem), "spear-sdhci")) {
-                ret = -EBUSY;
-                dev_dbg(&pdev->dev, "cannot request region\n");
-                goto err;
+        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        host->ioaddr = devm_ioremap_resource(&pdev->dev, iomem);
+        if (IS_ERR(host->ioaddr)) {
+                ret = PTR_ERR(host->ioaddr);
+                dev_dbg(&pdev->dev, "unable to map iomem: %d\n", ret);
+                goto err_host;
         }
 
-        sdhci = devm_kzalloc(&pdev->dev, sizeof(*sdhci), GFP_KERNEL);
-        if (!sdhci) {
-                ret = -ENOMEM;
-                dev_dbg(&pdev->dev, "cannot allocate memory for sdhci\n");
-                goto err;
-        }
+        host->hw_name = "sdhci";
+        host->ops = &sdhci_pltfm_ops;
+        host->irq = platform_get_irq(pdev, 0);
+        host->quirks = SDHCI_QUIRK_BROKEN_ADMA;
+
+        sdhci = sdhci_priv(host);
 
         /* clk enable */
-        sdhci->clk = clk_get(&pdev->dev, NULL);
+        sdhci->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(sdhci->clk)) {
                 ret = PTR_ERR(sdhci->clk);
                 dev_dbg(&pdev->dev, "Error getting clock\n");
-                goto err;
+                goto err_host;
         }
 
         ret = clk_prepare_enable(sdhci->clk);
         if (ret) {
                 dev_dbg(&pdev->dev, "Error enabling clock\n");
-                goto put_clk;
+                goto err_host;
         }
 
         ret = clk_set_rate(sdhci->clk, 50000000);
@@ -153,118 +125,42 @@ static int sdhci_probe(struct platform_device *pdev)
                 sdhci->data = sdhci_probe_config_dt(pdev);
                 if (IS_ERR(sdhci->data)) {
                         dev_err(&pdev->dev, "DT: Failed to get pdata\n");
-                        return -ENODEV;
+                        goto disable_clk;
                 }
         } else {
                 sdhci->data = dev_get_platdata(&pdev->dev);
         }
 
-        pdev->dev.platform_data = sdhci;
-
-        if (pdev->dev.parent)
-                host = sdhci_alloc_host(pdev->dev.parent, 0);
-        else
-                host = sdhci_alloc_host(&pdev->dev, 0);
-
-        if (IS_ERR(host)) {
-                ret = PTR_ERR(host);
-                dev_dbg(&pdev->dev, "error allocating host\n");
-                goto disable_clk;
-        }
-
-        host->hw_name = "sdhci";
-        host->ops = &sdhci_pltfm_ops;
-        host->irq = platform_get_irq(pdev, 0);
-        host->quirks = SDHCI_QUIRK_BROKEN_ADMA;
-
-        host->ioaddr = devm_ioremap(&pdev->dev, iomem->start,
-                        resource_size(iomem));
-        if (!host->ioaddr) {
-                ret = -ENOMEM;
-                dev_dbg(&pdev->dev, "failed to remap registers\n");
-                goto free_host;
+        /*
+         * It is optional to use GPIOs for sdhci card detection. If
+         * sdhci->data is NULL, then use original sdhci lines otherwise
+         * GPIO lines. We use the built-in GPIO support for this.
+         */
+        if (sdhci->data && sdhci->data->card_int_gpio >= 0) {
+                ret = mmc_gpio_request_cd(host->mmc,
+                                          sdhci->data->card_int_gpio, 0);
+                if (ret < 0) {
+                        dev_dbg(&pdev->dev,
+                                "failed to request card-detect gpio%d\n",
+                                sdhci->data->card_int_gpio);
+                        goto disable_clk;
+                }
         }
 
         ret = sdhci_add_host(host);
         if (ret) {
                 dev_dbg(&pdev->dev, "error adding host\n");
-                goto free_host;
+                goto disable_clk;
         }
 
         platform_set_drvdata(pdev, host);
 
-        /*
-         * It is optional to use GPIOs for sdhci Power control & sdhci card
-         * interrupt detection. If sdhci->data is NULL, then use original sdhci
-         * lines otherwise GPIO lines.
-         * If GPIO is selected for power control, then power should be disabled
-         * after card removal and should be enabled when card insertion
-         * interrupt occurs
-         */
-        if (!sdhci->data)
-                return 0;
-
-        if (sdhci->data->card_power_gpio >= 0) {
-                int val = 0;
-
-                ret = devm_gpio_request(&pdev->dev,
-                                sdhci->data->card_power_gpio, "sdhci");
-                if (ret < 0) {
-                        dev_dbg(&pdev->dev, "gpio request fail: %d\n",
-                                        sdhci->data->card_power_gpio);
-                        goto set_drvdata;
-                }
-
-                if (sdhci->data->power_always_enb)
-                        val = sdhci->data->power_active_high;
-                else
-                        val = !sdhci->data->power_active_high;
-
-                ret = gpio_direction_output(sdhci->data->card_power_gpio, val);
-                if (ret) {
-                        dev_dbg(&pdev->dev, "gpio set direction fail: %d\n",
-                                        sdhci->data->card_power_gpio);
-                        goto set_drvdata;
-                }
-        }
-
-        if (sdhci->data->card_int_gpio >= 0) {
-                ret = devm_gpio_request(&pdev->dev, sdhci->data->card_int_gpio,
-                                "sdhci");
-                if (ret < 0) {
-                        dev_dbg(&pdev->dev, "gpio request fail: %d\n",
-                                        sdhci->data->card_int_gpio);
-                        goto set_drvdata;
-                }
-
-                ret = gpio_direction_input(sdhci->data->card_int_gpio);
-                if (ret) {
-                        dev_dbg(&pdev->dev, "gpio set direction fail: %d\n",
-                                        sdhci->data->card_int_gpio);
-                        goto set_drvdata;
-                }
-                ret = devm_request_irq(&pdev->dev,
-                                gpio_to_irq(sdhci->data->card_int_gpio),
-                                sdhci_gpio_irq, IRQF_TRIGGER_LOW,
-                                mmc_hostname(host->mmc), pdev);
-                if (ret) {
-                        dev_dbg(&pdev->dev, "gpio request irq fail: %d\n",
-                                        sdhci->data->card_int_gpio);
-                        goto set_drvdata;
-                }
-
-        }
-
         return 0;
 
-set_drvdata:
-        sdhci_remove_host(host, 1);
-free_host:
-        sdhci_free_host(host);
 disable_clk:
         clk_disable_unprepare(sdhci->clk);
-put_clk:
-        clk_put(sdhci->clk);
+err_host:
+        sdhci_free_host(host);
 err:
         dev_err(&pdev->dev, "spear-sdhci probe failed: %d\n", ret);
         return ret;
@@ -273,7 +169,7 @@ err:
 static int sdhci_remove(struct platform_device *pdev)
 {
         struct sdhci_host *host = platform_get_drvdata(pdev);
-        struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
+        struct spear_sdhci *sdhci = sdhci_priv(host);
         int dead = 0;
         u32 scratch;
 
@@ -282,9 +178,8 @@ static int sdhci_remove(struct platform_device *pdev)
                 dead = 1;
 
         sdhci_remove_host(host, dead);
-        sdhci_free_host(host);
         clk_disable_unprepare(sdhci->clk);
-        clk_put(sdhci->clk);
+        sdhci_free_host(host);
 
         return 0;
 }
@@ -293,7 +188,7 @@ static int sdhci_remove(struct platform_device *pdev)
 static int sdhci_suspend(struct device *dev)
 {
         struct sdhci_host *host = dev_get_drvdata(dev);
-        struct spear_sdhci *sdhci = dev_get_platdata(dev);
+        struct spear_sdhci *sdhci = sdhci_priv(host);
         int ret;
 
         ret = sdhci_suspend_host(host);
@@ -306,7 +201,7 @@ static int sdhci_suspend(struct device *dev)
 static int sdhci_resume(struct device *dev)
 {
         struct sdhci_host *host = dev_get_drvdata(dev);
-        struct spear_sdhci *sdhci = dev_get_platdata(dev);
+        struct spear_sdhci *sdhci = sdhci_priv(host);
         int ret;
 
         ret = clk_enable(sdhci->clk);
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 9ddef4763541..9a79fc4b60ca 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -675,12 +675,12 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
                 return 0xE;
 
         /* Unspecified timeout, assume max */
-        if (!data && !cmd->cmd_timeout_ms)
+        if (!data && !cmd->busy_timeout)
                 return 0xE;
 
         /* timeout in us */
         if (!data)
-                target_timeout = cmd->cmd_timeout_ms * 1000;
+                target_timeout = cmd->busy_timeout * 1000;
         else {
                 target_timeout = data->timeout_ns / 1000;
                 if (host->clock)
@@ -1019,8 +1019,8 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
         }
 
         timeout = jiffies;
-        if (!cmd->data && cmd->cmd_timeout_ms > 9000)
-                timeout += DIV_ROUND_UP(cmd->cmd_timeout_ms, 1000) * HZ + HZ;
+        if (!cmd->data && cmd->busy_timeout > 9000)
+                timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ;
         else
                 timeout += 10 * HZ;
         mod_timer(&host->timer, timeout);
@@ -2026,12 +2026,11 @@ out:
                         host->tuning_count * HZ);
                 /* Tuning mode 1 limits the maximum data length to 4MB */
                 mmc->max_blk_count = (4 * 1024 * 1024) / mmc->max_blk_size;
-        } else {
+        } else if (host->flags & SDHCI_USING_RETUNING_TIMER) {
                 host->flags &= ~SDHCI_NEEDS_RETUNING;
                 /* Reload the new initial value for timer */
-                if (host->tuning_mode == SDHCI_TUNING_MODE_1)
-                        mod_timer(&host->tuning_timer, jiffies +
-                                host->tuning_count * HZ);
+                mod_timer(&host->tuning_timer, jiffies +
+                          host->tuning_count * HZ);
         }
 
         /*
@@ -2434,9 +2433,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
 
         if (host->runtime_suspended) {
                 spin_unlock(&host->lock);
-                pr_warning("%s: got irq while runtime suspended\n",
-                       mmc_hostname(host->mmc));
-                return IRQ_HANDLED;
+                return IRQ_NONE;
         }
 
         intmask = sdhci_readl(host, SDHCI_INT_STATUS);
@@ -2941,7 +2938,7 @@ int sdhci_add_host(struct sdhci_host *host)
         if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
                 host->timeout_clk = mmc->f_max / 1000;
 
-        mmc->max_discard_to = (1 << 27) / host->timeout_clk;
+        mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
 
         mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
 
@@ -3020,7 +3017,8 @@ int sdhci_add_host(struct sdhci_host *host)
         } else if (caps[1] & SDHCI_SUPPORT_SDR50)
                 mmc->caps |= MMC_CAP_UHS_SDR50;
 
-        if (caps[1] & SDHCI_SUPPORT_DDR50)
+        if ((caps[1] & SDHCI_SUPPORT_DDR50) &&
+                !(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
                 mmc->caps |= MMC_CAP_UHS_DDR50;
 
         /* Does the host need tuning for SDR50? */
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 2d6ce257a273..91058dabd11a 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -37,6 +37,8 @@
 
 struct sh_mobile_sdhi_of_data {
         unsigned long tmio_flags;
+        unsigned long capabilities;
+        unsigned long capabilities2;
 };
 
 static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
@@ -45,6 +47,31 @@ static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
         },
 };
 
+static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = {
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
+        .capabilities   = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
+};
+
+static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = {
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
+        .capabilities   = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
+        .capabilities2  = MMC_CAP2_NO_MULTI_READ,
+};
+
+static const struct of_device_id sh_mobile_sdhi_of_match[] = {
+        { .compatible = "renesas,sdhi-shmobile" },
+        { .compatible = "renesas,sdhi-sh7372" },
+        { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], },
+        { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], },
+        { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], },
+        { .compatible = "renesas,sdhi-r8a7778", .data = &of_rcar_gen1_compatible, },
+        { .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, },
+        { .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, },
+        { .compatible = "renesas,sdhi-r8a7791", .data = &of_rcar_gen2_compatible, },
+        {},
+};
+MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
+
 struct sh_mobile_sdhi {
         struct clk *clk;
         struct tmio_mmc_data mmc_data;
@@ -114,19 +141,6 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = {
         .cd_wakeup = sh_mobile_sdhi_cd_wakeup,
 };
 
-static const struct of_device_id sh_mobile_sdhi_of_match[] = {
-        { .compatible = "renesas,sdhi-shmobile" },
-        { .compatible = "renesas,sdhi-sh7372" },
-        { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], },
-        { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], },
-        { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], },
-        { .compatible = "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], },
-        { .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], },
-        { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], },
-        {},
-};
-MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
-
 static int sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
@@ -212,6 +226,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
         if (of_id && of_id->data) {
                 const struct sh_mobile_sdhi_of_data *of_data = of_id->data;
                 mmc_data->flags |= of_data->tmio_flags;
+                mmc_data->capabilities |= of_data->capabilities;
+                mmc_data->capabilities2 |= of_data->capabilities2;
         }
 
         /* SD control register space size is 0x100, 0x200 for bus_shift=1 */
@@ -316,10 +332,10 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
 }
 
 static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
-        .suspend = tmio_mmc_host_suspend,
-        .resume = tmio_mmc_host_resume,
-        .runtime_suspend = tmio_mmc_host_runtime_suspend,
-        .runtime_resume = tmio_mmc_host_runtime_resume,
+        SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_host_suspend, tmio_mmc_host_resume)
+        SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
+                        tmio_mmc_host_runtime_resume,
+                        NULL)
 };
 
 static struct platform_driver sh_mobile_sdhi_driver = {
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 1900abb04236..cfad844730d8 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -23,38 +23,37 @@
 
 #include "tmio_mmc.h"
 
-#ifdef CONFIG_PM
-static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int tmio_mmc_suspend(struct device *dev)
 {
-        const struct mfd_cell *cell = mfd_get_cell(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
         int ret;
 
-        ret = tmio_mmc_host_suspend(&dev->dev);
+        ret = tmio_mmc_host_suspend(dev);
 
         /* Tell MFD core it can disable us now.*/
         if (!ret && cell->disable)
-                cell->disable(dev);
+                cell->disable(pdev);
 
         return ret;
 }
 
-static int tmio_mmc_resume(struct platform_device *dev)
+static int tmio_mmc_resume(struct device *dev)
 {
-        const struct mfd_cell *cell = mfd_get_cell(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
         int ret = 0;
 
         /* Tell the MFD core we are ready to be enabled */
         if (cell->resume)
-                ret = cell->resume(dev);
+                ret = cell->resume(pdev);
 
         if (!ret)
-                ret = tmio_mmc_host_resume(&dev->dev);
+                ret = tmio_mmc_host_resume(dev);
 
         return ret;
 }
-#else
-#define tmio_mmc_suspend NULL
-#define tmio_mmc_resume NULL
 #endif
 
 static int tmio_mmc_probe(struct platform_device *pdev)
@@ -134,15 +133,18 @@ static int tmio_mmc_remove(struct platform_device *pdev)
 
 /* ------------------- device registration ----------------------- */
 
+static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_suspend, tmio_mmc_resume)
+};
+
 static struct platform_driver tmio_mmc_driver = {
         .driver = {
                 .name = "tmio-mmc",
                 .owner = THIS_MODULE,
+                .pm = &tmio_mmc_dev_pm_ops,
         },
         .probe = tmio_mmc_probe,
         .remove = tmio_mmc_remove,
-        .suspend = tmio_mmc_suspend,
-        .resume = tmio_mmc_resume,
 };
 
 module_platform_driver(tmio_mmc_driver);
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index aaa9c7e9e730..100ffe0b2faf 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -162,16 +162,15 @@ static inline void tmio_mmc_abort_dma(struct tmio_mmc_host *host)
 }
 #endif
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 int tmio_mmc_host_suspend(struct device *dev);
 int tmio_mmc_host_resume(struct device *dev);
-#else
-#define tmio_mmc_host_suspend NULL
-#define tmio_mmc_host_resume NULL
 #endif
 
+#ifdef CONFIG_PM_RUNTIME
 int tmio_mmc_host_runtime_suspend(struct device *dev);
 int tmio_mmc_host_runtime_resume(struct device *dev);
+#endif
 
 static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
 {
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 8d8abf23a611..faf0924e71cb 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1142,7 +1142,7 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
 }
 EXPORT_SYMBOL(tmio_mmc_host_remove);
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 int tmio_mmc_host_suspend(struct device *dev)
 {
         struct mmc_host *mmc = dev_get_drvdata(dev);
@@ -1165,9 +1165,9 @@ int tmio_mmc_host_resume(struct device *dev)
         return 0;
 }
 EXPORT_SYMBOL(tmio_mmc_host_resume);
+#endif
 
-#endif  /* CONFIG_PM */
-
+#ifdef CONFIG_PM_RUNTIME
 int tmio_mmc_host_runtime_suspend(struct device *dev)
 {
         return 0;
@@ -1184,5 +1184,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
         return 0;
 }
 EXPORT_SYMBOL(tmio_mmc_host_runtime_resume);
+#endif
 
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
index c0105a2e269a..d2c386f09d69 100644
--- a/drivers/mmc/host/ushc.c
+++ b/drivers/mmc/host/ushc.c
@@ -504,7 +504,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
                 ret = -ENOMEM;
                 goto err;
         }
-        ushc->csw = kzalloc(sizeof(struct ushc_cbw), GFP_KERNEL);
+        ushc->csw = kzalloc(sizeof(struct ushc_csw), GFP_KERNEL);
         if (ushc->csw == NULL) {
                 ret = -ENOMEM;
                 goto err;
diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
index e902ed7846b0..498d1f799085 100644
--- a/drivers/mmc/host/wmt-sdmmc.c
+++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -757,7 +757,7 @@ static int wmt_mci_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *of_id =
                 of_match_device(wmt_mci_dt_ids, &pdev->dev);
-        const struct wmt_mci_caps *wmt_caps = of_id->data;
+        const struct wmt_mci_caps *wmt_caps;
         int ret;
         int regular_irq, dma_irq;
 
@@ -766,6 +766,8 @@ static int wmt_mci_probe(struct platform_device *pdev)
                 return -EFAULT;
         }
 
+        wmt_caps = of_id->data;
+
         if (!np) {
                 dev_err(&pdev->dev, "Missing SDMMC description in devicetree\n");
                 return -EFAULT;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d9f85464b362..69aff72c8957 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4492,6 +4492,7 @@ static int __init bonding_init(void)
 out:
         return res;
 err:
+        bond_destroy_debugfs();
         bond_netlink_fini();
 err_link:
         unregister_pernet_subsys(&bond_net_ops);
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 30104b60da85..c56ac9ebc08f 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -560,9 +560,7 @@ static struct net_device *apne_dev;
 static int __init apne_module_init(void)
 {
         apne_dev = apne_probe(-1);
-        if (IS_ERR(apne_dev))
-                return PTR_ERR(apne_dev);
-        return 0;
+        return PTR_ERR_OR_ZERO(apne_dev);
 }
 
 static void __exit apne_module_exit(void)
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index fcaeeb8a4929..28460676b8ca 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -268,15 +268,6 @@ static unsigned int emac_setup(struct net_device *ndev)
         writel(reg_val | EMAC_TX_MODE_ABORTED_FRAME_EN,
                 db->membase + EMAC_TX_MODE_REG);
 
-        /* set up RX */
-        reg_val = readl(db->membase + EMAC_RX_CTL_REG);
-
-        writel(reg_val | EMAC_RX_CTL_PASS_LEN_OOR_EN |
-                EMAC_RX_CTL_ACCEPT_UNICAST_EN | EMAC_RX_CTL_DA_FILTER_EN |
-                EMAC_RX_CTL_ACCEPT_MULTICAST_EN |
-                EMAC_RX_CTL_ACCEPT_BROADCAST_EN,
-                db->membase + EMAC_RX_CTL_REG);
-
         /* set MAC */
         /* set MAC CTL0 */
         reg_val = readl(db->membase + EMAC_MAC_CTL0_REG);
@@ -309,6 +300,26 @@ static unsigned int emac_setup(struct net_device *ndev)
         return 0;
 }
 
+static void emac_set_rx_mode(struct net_device *ndev)
+{
+        struct emac_board_info *db = netdev_priv(ndev);
+        unsigned int reg_val;
+
+        /* set up RX */
+        reg_val = readl(db->membase + EMAC_RX_CTL_REG);
+
+        if (ndev->flags & IFF_PROMISC)
+                reg_val |= EMAC_RX_CTL_PASS_ALL_EN;
+        else
+                reg_val &= ~EMAC_RX_CTL_PASS_ALL_EN;
+
+        writel(reg_val | EMAC_RX_CTL_PASS_LEN_OOR_EN |
+                EMAC_RX_CTL_ACCEPT_UNICAST_EN | EMAC_RX_CTL_DA_FILTER_EN |
+                EMAC_RX_CTL_ACCEPT_MULTICAST_EN |
+                EMAC_RX_CTL_ACCEPT_BROADCAST_EN,
+                db->membase + EMAC_RX_CTL_REG);
+}
+
 static unsigned int emac_powerup(struct net_device *ndev)
 {
         struct emac_board_info *db = netdev_priv(ndev);
@@ -782,6 +793,7 @@ static const struct net_device_ops emac_netdev_ops = {
         .ndo_stop               = emac_stop,
         .ndo_start_xmit         = emac_start_xmit,
         .ndo_tx_timeout         = emac_timeout,
+        .ndo_set_rx_mode        = emac_set_rx_mode,
         .ndo_do_ioctl           = emac_ioctl,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index 2879b9631e15..c1d3fdb296a0 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -115,8 +115,6 @@ static DEFINE_SPINLOCK(e1000_phy_lock);
  */
 static s32 e1000_set_phy_type(struct e1000_hw *hw)
 {
-        e_dbg("e1000_set_phy_type");
-
         if (hw->mac_type == e1000_undefined)
                 return -E1000_ERR_PHY_TYPE;
 
@@ -159,8 +157,6 @@ static void e1000_phy_init_script(struct e1000_hw *hw)
         u32 ret_val;
         u16 phy_saved_data;
 
-        e_dbg("e1000_phy_init_script");
-
         if (hw->phy_init_script) {
                 msleep(20);
 
@@ -253,8 +249,6 @@ static void e1000_phy_init_script(struct e1000_hw *hw)
  */
 s32 e1000_set_mac_type(struct e1000_hw *hw)
 {
-        e_dbg("e1000_set_mac_type");
-
         switch (hw->device_id) {
         case E1000_DEV_ID_82542:
                 switch (hw->revision_id) {
@@ -365,8 +359,6 @@ void e1000_set_media_type(struct e1000_hw *hw)
 {
         u32 status;
 
-        e_dbg("e1000_set_media_type");
-
         if (hw->mac_type != e1000_82543) {
                 /* tbi_compatibility is only valid on 82543 */
                 hw->tbi_compatibility_en = false;
@@ -415,8 +407,6 @@ s32 e1000_reset_hw(struct e1000_hw *hw)
         u32 led_ctrl;
         s32 ret_val;
 
-        e_dbg("e1000_reset_hw");
-
         /* For 82542 (rev 2.0), disable MWI before issuing a device reset */
         if (hw->mac_type == e1000_82542_rev2_0) {
                 e_dbg("Disabling MWI on 82542 rev 2.0\n");
@@ -566,8 +556,6 @@ s32 e1000_init_hw(struct e1000_hw *hw)
         u32 mta_size;
         u32 ctrl_ext;
 
-        e_dbg("e1000_init_hw");
-
         /* Initialize Identification LED */
         ret_val = e1000_id_led_init(hw);
         if (ret_val) {
@@ -683,8 +671,6 @@ static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
         u16 eeprom_data;
         s32 ret_val;
 
-        e_dbg("e1000_adjust_serdes_amplitude");
-
         if (hw->media_type != e1000_media_type_internal_serdes)
                 return E1000_SUCCESS;
 
@@ -730,8 +716,6 @@ s32 e1000_setup_link(struct e1000_hw *hw)
         s32 ret_val;
         u16 eeprom_data;
 
-        e_dbg("e1000_setup_link");
-
         /* Read and store word 0x0F of the EEPROM. This word contains bits
          * that determine the hardware's default PAUSE (flow control) mode,
          * a bit that determines whether the HW defaults to enabling or
@@ -848,8 +832,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
         u32 signal = 0;
         s32 ret_val;
 
-        e_dbg("e1000_setup_fiber_serdes_link");
-
         /* On adapters with a MAC newer than 82544, SWDP 1 will be
          * set when the optics detect a signal. On older adapters, it will be
          * cleared when there is a signal.  This applies to fiber media only.
@@ -1051,8 +1033,6 @@ static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_preconfig");
-
         ctrl = er32(CTRL);
         /* With 82543, we need to force speed and duplex on the MAC equal to
          * what the PHY speed and duplex configuration is. In addition, we need
@@ -1112,8 +1092,6 @@ static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_igp_setup");
-
         if (hw->phy_reset_disable)
                 return E1000_SUCCESS;
 
@@ -1254,8 +1232,6 @@ static s32 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_mgp_setup");
-
         if (hw->phy_reset_disable)
                 return E1000_SUCCESS;
 
@@ -1362,8 +1338,6 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_copper_link_autoneg");
-
         /* Perform some bounds checking on the hw->autoneg_advertised
          * parameter.  If this variable is zero, then set it to the default.
          */
@@ -1432,7 +1406,6 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
 static s32 e1000_copper_link_postconfig(struct e1000_hw *hw)
 {
         s32 ret_val;
-        e_dbg("e1000_copper_link_postconfig");
 
         if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100)) {
                 e1000_config_collision_dist(hw);
@@ -1473,8 +1446,6 @@ static s32 e1000_setup_copper_link(struct e1000_hw *hw)
         u16 i;
         u16 phy_data;
 
-        e_dbg("e1000_setup_copper_link");
-
         /* Check if it is a valid PHY and set PHY mode if necessary. */
         ret_val = e1000_copper_link_preconfig(hw);
         if (ret_val)
@@ -1554,8 +1525,6 @@ s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
         u16 mii_autoneg_adv_reg;
         u16 mii_1000t_ctrl_reg;
 
-        e_dbg("e1000_phy_setup_autoneg");
-
         /* Read the MII Auto-Neg Advertisement Register (Address 4). */
         ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
         if (ret_val)
@@ -1707,8 +1676,6 @@ static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
         u16 phy_data;
         u16 i;
 
-        e_dbg("e1000_phy_force_speed_duplex");
-
         /* Turn off Flow control if we are forcing speed and duplex. */
         hw->fc = E1000_FC_NONE;
 
@@ -1939,8 +1906,6 @@ void e1000_config_collision_dist(struct e1000_hw *hw)
 {
         u32 tctl, coll_dist;
 
-        e_dbg("e1000_config_collision_dist");
-
         if (hw->mac_type < e1000_82543)
                 coll_dist = E1000_COLLISION_DISTANCE_82542;
         else
@@ -1970,8 +1935,6 @@ static s32 e1000_config_mac_to_phy(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_config_mac_to_phy");
-
         /* 82544 or newer MAC, Auto Speed Detection takes care of
          * MAC speed/duplex configuration.
          */
@@ -2049,8 +2012,6 @@ s32 e1000_force_mac_fc(struct e1000_hw *hw)
 {
         u32 ctrl;
 
-        e_dbg("e1000_force_mac_fc");
-
         /* Get the current configuration of the Device Control Register */
         ctrl = er32(CTRL);
 
@@ -2120,8 +2081,6 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)
         u16 speed;
         u16 duplex;
 
-        e_dbg("e1000_config_fc_after_link_up");
-
         /* Check for the case where we have fiber media and auto-neg failed
          * so we had to force link.  In this case, we need to force the
          * configuration of the MAC to match the "fc" parameter.
@@ -2337,8 +2296,6 @@ static s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw)
         u32 status;
         s32 ret_val = E1000_SUCCESS;
 
-        e_dbg("e1000_check_for_serdes_link_generic");
-
         ctrl = er32(CTRL);
         status = er32(STATUS);
         rxcw = er32(RXCW);
@@ -2449,8 +2406,6 @@ s32 e1000_check_for_link(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_check_for_link");
-
         ctrl = er32(CTRL);
         status = er32(STATUS);
 
@@ -2632,8 +2587,6 @@ s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_get_speed_and_duplex");
-
         if (hw->mac_type >= e1000_82543) {
                 status = er32(STATUS);
                 if (status & E1000_STATUS_SPEED_1000) {
@@ -2699,7 +2652,6 @@ static s32 e1000_wait_autoneg(struct e1000_hw *hw)
         u16 i;
         u16 phy_data;
 
-        e_dbg("e1000_wait_autoneg");
         e_dbg("Waiting for Auto-Neg to complete.\n");
 
         /* We will wait for autoneg to complete or 4.5 seconds to expire. */
@@ -2866,8 +2818,6 @@ s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data)
         u32 ret_val;
         unsigned long flags;
 
-        e_dbg("e1000_read_phy_reg");
-
         spin_lock_irqsave(&e1000_phy_lock, flags);
 
         if ((hw->phy_type == e1000_phy_igp) &&
@@ -2894,8 +2844,6 @@ static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
         u32 mdic = 0;
         const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
 
-        e_dbg("e1000_read_phy_reg_ex");
-
         if (reg_addr > MAX_PHY_REG_ADDRESS) {
                 e_dbg("PHY Address %d is out of range\n", reg_addr);
                 return -E1000_ERR_PARAM;
@@ -3008,8 +2956,6 @@ s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data)
         u32 ret_val;
         unsigned long flags;
 
-        e_dbg("e1000_write_phy_reg");
-
         spin_lock_irqsave(&e1000_phy_lock, flags);
 
         if ((hw->phy_type == e1000_phy_igp) &&
@@ -3036,8 +2982,6 @@ static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
         u32 mdic = 0;
         const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
 
-        e_dbg("e1000_write_phy_reg_ex");
-
         if (reg_addr > MAX_PHY_REG_ADDRESS) {
                 e_dbg("PHY Address %d is out of range\n", reg_addr);
                 return -E1000_ERR_PARAM;
@@ -3129,8 +3073,6 @@ s32 e1000_phy_hw_reset(struct e1000_hw *hw)
         u32 ctrl, ctrl_ext;
         u32 led_ctrl;
 
-        e_dbg("e1000_phy_hw_reset");
-
         e_dbg("Resetting Phy...\n");
 
         if (hw->mac_type > e1000_82543) {
@@ -3189,8 +3131,6 @@ s32 e1000_phy_reset(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_phy_reset");
-
         switch (hw->phy_type) {
         case e1000_phy_igp:
                 ret_val = e1000_phy_hw_reset(hw);
@@ -3229,8 +3169,6 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
         u16 phy_id_high, phy_id_low;
         bool match = false;
 
-        e_dbg("e1000_detect_gig_phy");
-
         if (hw->phy_id != 0)
                 return E1000_SUCCESS;
 
@@ -3301,7 +3239,6 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
 static s32 e1000_phy_reset_dsp(struct e1000_hw *hw)
 {
         s32 ret_val;
-        e_dbg("e1000_phy_reset_dsp");
 
         do {
                 ret_val = e1000_write_phy_reg(hw, 29, 0x001d);
@@ -3333,8 +3270,6 @@ static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
         u16 phy_data, min_length, max_length, average;
         e1000_rev_polarity polarity;
 
-        e_dbg("e1000_phy_igp_get_info");
-
         /* The downshift status is checked only once, after link is established,
          * and it stored in the hw->speed_downgraded parameter.
          */
@@ -3414,8 +3349,6 @@ static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
         u16 phy_data;
         e1000_rev_polarity polarity;
 
-        e_dbg("e1000_phy_m88_get_info");
-
         /* The downshift status is checked only once, after link is established,
          * and it stored in the hw->speed_downgraded parameter.
          */
@@ -3487,8 +3420,6 @@ s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_phy_get_info");
-
         phy_info->cable_length = e1000_cable_length_undefined;
         phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_undefined;
         phy_info->cable_polarity = e1000_rev_polarity_undefined;
@@ -3527,8 +3458,6 @@ s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)
 
 s32 e1000_validate_mdi_setting(struct e1000_hw *hw)
 {
-        e_dbg("e1000_validate_mdi_settings");
-
         if (!hw->autoneg && (hw->mdix == 0 || hw->mdix == 3)) {
                 e_dbg("Invalid MDI setting detected\n");
                 hw->mdix = 1;
@@ -3551,8 +3480,6 @@ s32 e1000_init_eeprom_params(struct e1000_hw *hw)
         s32 ret_val = E1000_SUCCESS;
         u16 eeprom_size;
 
-        e_dbg("e1000_init_eeprom_params");
-
         switch (hw->mac_type) {
         case e1000_82542_rev2_0:
         case e1000_82542_rev2_1:
@@ -3770,8 +3697,6 @@ static s32 e1000_acquire_eeprom(struct e1000_hw *hw)
         struct e1000_eeprom_info *eeprom = &hw->eeprom;
         u32 eecd, i = 0;
 
-        e_dbg("e1000_acquire_eeprom");
-
         eecd = er32(EECD);
 
         /* Request EEPROM Access */
@@ -3871,8 +3796,6 @@ static void e1000_release_eeprom(struct e1000_hw *hw)
 {
         u32 eecd;
 
-        e_dbg("e1000_release_eeprom");
-
         eecd = er32(EECD);
 
         if (hw->eeprom.type == e1000_eeprom_spi) {
@@ -3920,8 +3843,6 @@ static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)
         u16 retry_count = 0;
         u8 spi_stat_reg;
 
-        e_dbg("e1000_spi_eeprom_ready");
-
         /* Read "Status Register" repeatedly until the LSB is cleared.  The
          * EEPROM will signal that the command has been completed by clearing
          * bit 0 of the internal status register.  If it's not cleared within
@@ -3974,8 +3895,6 @@ static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
         struct e1000_eeprom_info *eeprom = &hw->eeprom;
         u32 i = 0;
 
-        e_dbg("e1000_read_eeprom");
-
         if (hw->mac_type == e1000_ce4100) {
                 GBE_CONFIG_FLASH_READ(GBE_CONFIG_BASE_VIRT, offset, words,
                                       data);
@@ -4076,8 +3995,6 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
         u16 checksum = 0;
         u16 i, eeprom_data;
 
-        e_dbg("e1000_validate_eeprom_checksum");
-
         for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
                 if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
                         e_dbg("EEPROM Read Error\n");
@@ -4112,8 +4029,6 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
         u16 checksum = 0;
         u16 i, eeprom_data;
 
-        e_dbg("e1000_update_eeprom_checksum");
-
         for (i = 0; i < EEPROM_CHECKSUM_REG; i++) {
                 if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
                         e_dbg("EEPROM Read Error\n");
@@ -4154,8 +4069,6 @@ static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
         struct e1000_eeprom_info *eeprom = &hw->eeprom;
         s32 status = 0;
 
-        e_dbg("e1000_write_eeprom");
-
         if (hw->mac_type == e1000_ce4100) {
                 GBE_CONFIG_FLASH_WRITE(GBE_CONFIG_BASE_VIRT, offset, words,
                                        data);
@@ -4205,8 +4118,6 @@ static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset, u16 words,
         struct e1000_eeprom_info *eeprom = &hw->eeprom;
         u16 widx = 0;
 
-        e_dbg("e1000_write_eeprom_spi");
-
         while (widx < words) {
                 u8 write_opcode = EEPROM_WRITE_OPCODE_SPI;
 
@@ -4274,8 +4185,6 @@ static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
         u16 words_written = 0;
         u16 i = 0;
 
-        e_dbg("e1000_write_eeprom_microwire");
-
         /* Send the write enable command to the EEPROM (3-bit opcode plus
          * 6/8-bit dummy address beginning with 11).  It's less work to include
          * the 11 of the dummy address as part of the opcode than it is to shift
@@ -4354,8 +4263,6 @@ s32 e1000_read_mac_addr(struct e1000_hw *hw)
         u16 offset;
         u16 eeprom_data, i;
 
-        e_dbg("e1000_read_mac_addr");
-
         for (i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
                 offset = i >> 1;
                 if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
@@ -4394,8 +4301,6 @@ static void e1000_init_rx_addrs(struct e1000_hw *hw)
         u32 i;
         u32 rar_num;
 
-        e_dbg("e1000_init_rx_addrs");
-
         /* Setup the receive address. */
         e_dbg("Programming MAC Address into RAR[0]\n");
 
@@ -4553,8 +4458,6 @@ static s32 e1000_id_led_init(struct e1000_hw *hw)
         u16 eeprom_data, i, temp;
         const u16 led_mask = 0x0F;
 
-        e_dbg("e1000_id_led_init");
-
         if (hw->mac_type < e1000_82540) {
                 /* Nothing to do */
                 return E1000_SUCCESS;
@@ -4626,8 +4529,6 @@ s32 e1000_setup_led(struct e1000_hw *hw)
         u32 ledctl;
         s32 ret_val = E1000_SUCCESS;
 
-        e_dbg("e1000_setup_led");
-
         switch (hw->mac_type) {
         case e1000_82542_rev2_0:
         case e1000_82542_rev2_1:
@@ -4678,8 +4579,6 @@ s32 e1000_cleanup_led(struct e1000_hw *hw)
 {
         s32 ret_val = E1000_SUCCESS;
 
-        e_dbg("e1000_cleanup_led");
-
         switch (hw->mac_type) {
         case e1000_82542_rev2_0:
         case e1000_82542_rev2_1:
@@ -4714,8 +4613,6 @@ s32 e1000_led_on(struct e1000_hw *hw)
 {
         u32 ctrl = er32(CTRL);
 
-        e_dbg("e1000_led_on");
-
         switch (hw->mac_type) {
         case e1000_82542_rev2_0:
         case e1000_82542_rev2_1:
@@ -4760,8 +4657,6 @@ s32 e1000_led_off(struct e1000_hw *hw)
 {
         u32 ctrl = er32(CTRL);
 
-        e_dbg("e1000_led_off");
-
         switch (hw->mac_type) {
         case e1000_82542_rev2_0:
         case e1000_82542_rev2_1:
@@ -4889,8 +4784,6 @@ static void e1000_clear_hw_cntrs(struct e1000_hw *hw)
  */
 void e1000_reset_adaptive(struct e1000_hw *hw)
 {
-        e_dbg("e1000_reset_adaptive");
-
         if (hw->adaptive_ifs) {
                 if (!hw->ifs_params_forced) {
                         hw->current_ifs_val = 0;
@@ -4917,8 +4810,6 @@ void e1000_reset_adaptive(struct e1000_hw *hw)
  */
 void e1000_update_adaptive(struct e1000_hw *hw)
 {
-        e_dbg("e1000_update_adaptive");
-
         if (hw->adaptive_ifs) {
                 if ((hw->collision_delta *hw->ifs_ratio) > hw->tx_packet_delta) {
                         if (hw->tx_packet_delta > MIN_NUM_XMITS) {
@@ -5114,8 +5005,6 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
         u16 i, phy_data;
         u16 cable_length;
 
-        e_dbg("e1000_get_cable_length");
-
         *min_length = *max_length = 0;
 
         /* Use old method for Phy older than IGP */
@@ -5231,8 +5120,6 @@ static s32 e1000_check_polarity(struct e1000_hw *hw,
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_check_polarity");
-
         if (hw->phy_type == e1000_phy_m88) {
                 /* return the Polarity bit in the Status register. */
                 ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
@@ -5299,8 +5186,6 @@ static s32 e1000_check_downshift(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        e_dbg("e1000_check_downshift");
-
         if (hw->phy_type == e1000_phy_igp) {
                 ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_LINK_HEALTH,
                                              &phy_data);
@@ -5411,8 +5296,6 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up)
         s32 ret_val;
         u16 phy_data, phy_saved_data, speed, duplex, i;
 
-        e_dbg("e1000_config_dsp_after_link_change");
-
         if (hw->phy_type != e1000_phy_igp)
                 return E1000_SUCCESS;
 
@@ -5546,8 +5429,6 @@ static s32 e1000_set_phy_mode(struct e1000_hw *hw)
         s32 ret_val;
         u16 eeprom_data;
 
-        e_dbg("e1000_set_phy_mode");
-
         if ((hw->mac_type == e1000_82545_rev_3) &&
             (hw->media_type == e1000_media_type_copper)) {
                 ret_val =
@@ -5594,7 +5475,6 @@ static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active)
 {
         s32 ret_val;
         u16 phy_data;
-        e_dbg("e1000_set_d3_lplu_state");
 
         if (hw->phy_type != e1000_phy_igp)
                 return E1000_SUCCESS;
@@ -5699,8 +5579,6 @@ static s32 e1000_set_vco_speed(struct e1000_hw *hw)
         u16 default_page = 0;
         u16 phy_data;
 
-        e_dbg("e1000_set_vco_speed");
-
         switch (hw->mac_type) {
         case e1000_82545_rev_3:
         case e1000_82546_rev_3:
@@ -5872,7 +5750,6 @@ static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw)
  */
 static s32 e1000_get_auto_rd_done(struct e1000_hw *hw)
 {
-        e_dbg("e1000_get_auto_rd_done");
         msleep(5);
         return E1000_SUCCESS;
 }
@@ -5887,7 +5764,6 @@ static s32 e1000_get_auto_rd_done(struct e1000_hw *hw)
  */
 static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
 {
-        e_dbg("e1000_get_phy_cfg_done");
         msleep(10);
         return E1000_SUCCESS;
 }
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 46e6544ed1b7..27058dfe418b 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -2682,14 +2682,13 @@ static int e1000_tso(struct e1000_adapter *adapter,
         u32 cmd_length = 0;
         u16 ipcse = 0, tucse, mss;
         u8 ipcss, ipcso, tucss, tucso, hdr_len;
-        int err;
 
         if (skb_is_gso(skb)) {
-                if (skb_header_cloned(skb)) {
-                        err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                        if (err)
-                                return err;
-                }
+                int err;
+
+                err = skb_cow_head(skb, 0);
+                if (err < 0)
+                        return err;
 
                 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
                 mss = skb_shinfo(skb)->gso_size;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index dce377b59b2c..d50c91e50528 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5100,16 +5100,14 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         u32 cmd_length = 0;
         u16 ipcse = 0, mss;
         u8 ipcss, ipcso, tucss, tucso, hdr_len;
+        int err;
 
         if (!skb_is_gso(skb))
                 return 0;
 
-        if (skb_header_cloned(skb)) {
-                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-
-                if (err)
-                        return err;
-        }
+        err = skb_cow_head(skb, 0);
+        if (err < 0)
+                return err;
 
         hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
         mss = skb_shinfo(skb)->gso_size;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 53be5f44d015..b9f50f40abe1 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1114,20 +1114,18 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
                     u64 *cd_type_cmd_tso_mss, u32 *cd_tunneling)
 {
         u32 cd_cmd, cd_tso_len, cd_mss;
+        struct ipv6hdr *ipv6h;
         struct tcphdr *tcph;
         struct iphdr *iph;
         u32 l4len;
         int err;
-        struct ipv6hdr *ipv6h;
 
         if (!skb_is_gso(skb))
                 return 0;
 
-        if (skb_header_cloned(skb)) {
-                err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                if (err)
-                        return err;
-        }
+        err = skb_cow_head(skb, 0);
+        if (err < 0)
+                return err;
 
         if (protocol == htons(ETH_P_IP)) {
                 iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index e35e66ffa782..2797548fde0d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1412,6 +1412,14 @@ restart_watchdog:
         schedule_work(&adapter->adminq_task);
 }
 
+/**
+ * i40evf_configure_rss - increment to next available tx queue
+ * @adapter: board private structure
+ * @j: queue counter
+ *
+ * Helper function for RSS programming to increment through available
+ * queus. Returns the next queue value.
+ **/
 static int next_queue(struct i40evf_adapter *adapter, int j)
 {
         j += 1;
@@ -1451,10 +1459,14 @@ static void i40evf_configure_rss(struct i40evf_adapter *adapter)
         /* Populate the LUT with max no. of queues in round robin fashion */
         j = adapter->vsi_res->num_queue_pairs;
         for (i = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++) {
-                lut = next_queue(adapter, j);
-                lut |= next_queue(adapter, j) << 8;
-                lut |= next_queue(adapter, j) << 16;
-                lut |= next_queue(adapter, j) << 24;
+                j = next_queue(adapter, j);
+                lut = j;
+                j = next_queue(adapter, j);
+                lut |= j << 8;
+                j = next_queue(adapter, j);
+                lut |= j << 16;
+                j = next_queue(adapter, j);
+                lut |= j << 24;
                 wr32(hw, I40E_VFQF_HLUT(i), lut);
         }
         i40e_flush(hw);
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 7fbe1e925143..27130065d92a 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -241,7 +241,6 @@ struct igb_ring {
                 struct igb_tx_buffer *tx_buffer_info;
                 struct igb_rx_buffer *rx_buffer_info;
         };
-        unsigned long last_rx_timestamp;
         void *desc;                     /* descriptor ring memory */
         unsigned long flags;            /* ring specific flags */
         void __iomem *tail;             /* pointer to ring tail register */
@@ -437,6 +436,7 @@ struct igb_adapter {
         struct hwtstamp_config tstamp_config;
         unsigned long ptp_tx_start;
         unsigned long last_rx_ptp_check;
+        unsigned long last_rx_timestamp;
         spinlock_t tmreg_lock;
         struct cyclecounter cc;
         struct timecounter tc;
@@ -533,20 +533,6 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter);
 void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);
 void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va,
                          struct sk_buff *skb);
-static inline void igb_ptp_rx_hwtstamp(struct igb_ring *rx_ring,
-                                       union e1000_adv_rx_desc *rx_desc,
-                                       struct sk_buff *skb)
-{
-        if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TS) &&
-            !igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP))
-                igb_ptp_rx_rgtstamp(rx_ring->q_vector, skb);
-
-        /* Update the last_rx_timestamp timer in order to enable watchdog check
-         * for error case of latched timestamp on a dropped packet.
-         */
-        rx_ring->last_rx_timestamp = jiffies;
-}
-
 int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);
 int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);
 #ifdef CONFIG_IGB_HWMON
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 30198185d19a..fb98d4602f9d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4605,6 +4605,7 @@ static int igb_tso(struct igb_ring *tx_ring,
         struct sk_buff *skb = first->skb;
         u32 vlan_macip_lens, type_tucmd;
         u32 mss_l4len_idx, l4len;
+        int err;
 
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return 0;
@@ -4612,11 +4613,9 @@ static int igb_tso(struct igb_ring *tx_ring,
         if (!skb_is_gso(skb))
                 return 0;
 
-        if (skb_header_cloned(skb)) {
-                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                if (err)
-                        return err;
-        }
+        err = skb_cow_head(skb, 0);
+        if (err < 0)
+                return err;
 
         /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
         type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP;
@@ -6955,7 +6954,9 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,
 
         igb_rx_checksum(rx_ring, rx_desc, skb);
 
-        igb_ptp_rx_hwtstamp(rx_ring, rx_desc, skb);
+        if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TS) &&
+            !igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP))
+                igb_ptp_rx_rgtstamp(rx_ring->q_vector, skb);
 
         if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
             igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index 2cca8fd5e574..9209d652e1c9 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -427,10 +427,8 @@ static void igb_ptp_overflow_check(struct work_struct *work)
 void igb_ptp_rx_hang(struct igb_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
-        struct igb_ring *rx_ring;
         u32 tsyncrxctl = rd32(E1000_TSYNCRXCTL);
         unsigned long rx_event;
-        int n;
 
         if (hw->mac.type != e1000_82576)
                 return;
@@ -445,11 +443,8 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter)
 
         /* Determine the most recent watchdog or rx_timestamp event */
         rx_event = adapter->last_rx_ptp_check;
-        for (n = 0; n < adapter->num_rx_queues; n++) {
-                rx_ring = adapter->rx_ring[n];
-                if (time_after(rx_ring->last_rx_timestamp, rx_event))
-                        rx_event = rx_ring->last_rx_timestamp;
-        }
+        if (time_after(adapter->last_rx_timestamp, rx_event))
+                rx_event = adapter->last_rx_timestamp;
 
         /* Only need to read the high RXSTMP register to clear the lock */
         if (time_is_before_jiffies(rx_event + 5 * HZ)) {
@@ -540,6 +535,11 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
         regval |= (u64)rd32(E1000_RXSTMPH) << 32;
 
         igb_ptp_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), regval);
+
+        /* Update the last_rx_timestamp timer in order to enable watchdog check
+         * for error case of latched timestamp on a dropped packet.
+         */
+        adapter->last_rx_timestamp = jiffies;
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index b7ab03a2f28f..d608599e123a 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1910,20 +1910,18 @@ static int igbvf_tso(struct igbvf_adapter *adapter,
                      struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
 {
         struct e1000_adv_tx_context_desc *context_desc;
-        unsigned int i;
-        int err;
         struct igbvf_buffer *buffer_info;
         u32 info = 0, tu_cmd = 0;
         u32 mss_l4len_idx, l4len;
+        unsigned int i;
+        int err;
+
         *hdr_len = 0;
 
-        if (skb_header_cloned(skb)) {
-                err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                if (err) {
-                        dev_err(&adapter->pdev->dev,
-                                "igbvf_tso returning an error\n");
-                        return err;
-                }
+        err = skb_cow_head(skb, 0);
+        if (err < 0) {
+                dev_err(&adapter->pdev->dev, "igbvf_tso returning an error\n");
+                return err;
         }
 
         l4len = tcp_hdrlen(skb);
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index f42c201f727f..60801273915c 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1220,17 +1220,15 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         unsigned int i;
         u8 ipcss, ipcso, tucss, tucso, hdr_len;
         u16 ipcse, tucse, mss;
-        int err;
 
         if (likely(skb_is_gso(skb))) {
                 struct ixgb_buffer *buffer_info;
                 struct iphdr *iph;
+                int err;
 
-                if (skb_header_cloned(skb)) {
-                        err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                        if (err)
-                                return err;
-                }
+                err = skb_cow_head(skb, 0);
+                if (err < 0)
+                        return err;
 
                 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
                 mss = skb_shinfo(skb)->gso_size;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 55c53a1cbb62..1a12c1dd7a27 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -811,6 +811,7 @@ enum ixgbe_state_t {
         __IXGBE_DISABLED,
         __IXGBE_REMOVING,
         __IXGBE_SERVICE_SCHED,
+        __IXGBE_SERVICE_INITED,
         __IXGBE_IN_SFP_INIT,
         __IXGBE_PTP_RUNNING,
         __IXGBE_PTP_TX_IN_PROGRESS,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 8436c651b735..c4c526b7f99f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -297,7 +297,8 @@ static void ixgbe_remove_adapter(struct ixgbe_hw *hw)
                 return;
         hw->hw_addr = NULL;
         e_dev_err("Adapter removed\n");
-        ixgbe_service_event_schedule(adapter);
+        if (test_bit(__IXGBE_SERVICE_INITED, &adapter->state))
+                ixgbe_service_event_schedule(adapter);
 }
 
 void ixgbe_check_remove(struct ixgbe_hw *hw, u32 reg)
@@ -6509,6 +6510,7 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
         struct sk_buff *skb = first->skb;
         u32 vlan_macip_lens, type_tucmd;
         u32 mss_l4len_idx, l4len;
+        int err;
 
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return 0;
@@ -6516,11 +6518,9 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
         if (!skb_is_gso(skb))
                 return 0;
 
-        if (skb_header_cloned(skb)) {
-                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                if (err)
-                        return err;
-        }
+        err = skb_cow_head(skb, 0);
+        if (err < 0)
+                return err;
 
         /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
         type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
@@ -7077,8 +7077,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                                         IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT;
                 if (tx_flags & IXGBE_TX_FLAGS_SW_VLAN) {
                         struct vlan_ethhdr *vhdr;
-                        if (skb_header_cloned(skb) &&
-                            pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+
+                        if (skb_cow_head(skb, 0))
                                 goto out_drop;
                         vhdr = (struct vlan_ethhdr *)skb->data;
                         vhdr->h_vlan_TCI = htons(tx_flags >>
@@ -8023,6 +8023,10 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* EEPROM */
         memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
         eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+        if (ixgbe_removed(hw->hw_addr)) {
+                err = -EIO;
+                goto err_ioremap;
+        }
         /* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */
         if (!(eec & (1 << 8)))
                 hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
@@ -8185,7 +8189,12 @@ skip_sriov:
         setup_timer(&adapter->service_timer, &ixgbe_service_timer,
                     (unsigned long) adapter);
 
+        if (ixgbe_removed(hw->hw_addr)) {
+                err = -EIO;
+                goto err_sw_init;
+        }
         INIT_WORK(&adapter->service_task, ixgbe_service_task);
+        set_bit(__IXGBE_SERVICE_INITED, &adapter->state);
         clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
 
         err = ixgbe_init_interrupt_scheme(adapter);
@@ -8494,6 +8503,9 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
 
 skip_bad_vf_detection:
 #endif /* CONFIG_PCI_IOV */
+        if (!test_bit(__IXGBE_SERVICE_INITED, &adapter->state))
+                return PCI_ERS_RESULT_DISCONNECT;
+
         rtnl_lock();
         netif_device_detach(netdev);
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index e7e7d695816b..a0a1de9ce238 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -421,6 +421,7 @@ enum ixbgevf_state_t {
         __IXGBEVF_DOWN,
         __IXGBEVF_DISABLED,
         __IXGBEVF_REMOVING,
+        __IXGBEVF_WORK_INIT,
 };
 
 struct ixgbevf_cb {
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 4ba139b2d25a..d0799e8e31e4 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -107,7 +107,8 @@ static void ixgbevf_remove_adapter(struct ixgbe_hw *hw)
                 return;
         hw->hw_addr = NULL;
         dev_err(&adapter->pdev->dev, "Adapter removed\n");
-        schedule_work(&adapter->watchdog_task);
+        if (test_bit(__IXGBEVF_WORK_INIT, &adapter->state))
+                schedule_work(&adapter->watchdog_task);
 }
 
 static void ixgbevf_check_remove(struct ixgbe_hw *hw, u32 reg)
@@ -2838,6 +2839,7 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
         struct sk_buff *skb = first->skb;
         u32 vlan_macip_lens, type_tucmd;
         u32 mss_l4len_idx, l4len;
+        int err;
 
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return 0;
@@ -2845,11 +2847,9 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
         if (!skb_is_gso(skb))
                 return 0;
 
-        if (skb_header_cloned(skb)) {
-                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                if (err)
-                        return err;
-        }
+        err = skb_cow_head(skb, 0);
+        if (err < 0)
+                return err;
 
         /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
         type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
@@ -3573,8 +3573,13 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->watchdog_timer.function = ixgbevf_watchdog;
         adapter->watchdog_timer.data = (unsigned long)adapter;
 
+        if (IXGBE_REMOVED(hw->hw_addr)) {
+                err = -EIO;
+                goto err_sw_init;
+        }
         INIT_WORK(&adapter->reset_task, ixgbevf_reset_task);
         INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task);
+        set_bit(__IXGBEVF_WORK_INIT, &adapter->state);
 
         err = ixgbevf_init_interrupt_scheme(adapter);
         if (err)
@@ -3667,6 +3672,9 @@ static pci_ers_result_t ixgbevf_io_error_detected(struct pci_dev *pdev,
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
 
+        if (!test_bit(__IXGBEVF_WORK_INIT, &adapter->state))
+                return PCI_ERS_RESULT_DISCONNECT;
+
         rtnl_lock();
         netif_device_detach(netdev);
 
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 5d5fec6c4eb0..36aa109416c4 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -687,7 +687,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
 
         cpsw_dual_emac_src_port_detect(status, priv, ndev, skb);
 
-        if (unlikely(status < 0)) {
+        if (unlikely(status < 0) || unlikely(!netif_running(ndev))) {
                 /* the interface is going down, skbs are purged */
                 dev_kfree_skb_any(skb);
                 return;
@@ -1201,8 +1201,7 @@ static int cpsw_ndo_open(struct net_device *ndev)
         for_each_slave(priv, cpsw_slave_open, priv);
 
         /* Add default VLAN */
-        if (!priv->data.dual_emac)
-                cpsw_add_default_vlan(priv);
+        cpsw_add_default_vlan(priv);
 
         if (!cpsw_common_res_usage_state(priv)) {
                 /* setup tx dma to fixed prio and zero offset */
@@ -1253,6 +1252,12 @@ static int cpsw_ndo_open(struct net_device *ndev)
                 cpsw_set_coalesce(ndev, &coal);
         }
 
+        napi_enable(&priv->napi);
+        cpdma_ctlr_start(priv->dma);
+        cpsw_intr_enable(priv);
+        cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
+        cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX);
+
         prim_cpsw = cpsw_get_slave_priv(priv, 0);
         if (prim_cpsw->irq_enabled == false) {
                 if ((priv == prim_cpsw) || !netif_running(prim_cpsw->ndev)) {
@@ -1261,12 +1266,6 @@ static int cpsw_ndo_open(struct net_device *ndev)
                 }
         }
 
-        napi_enable(&priv->napi);
-        cpdma_ctlr_start(priv->dma);
-        cpsw_intr_enable(priv);
-        cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
-        cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX);
-
         if (priv->data.dual_emac)
                 priv->slaves[priv->emac_port].open_stat = true;
         return 0;
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 13010b4dae5b..d18f711d0b0c 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -747,6 +747,7 @@ struct ndis_oject_header {
 #define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV4        0
 #define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV6        1
 
+#define VERSION_4_OFFLOAD_SIZE                  22
 /*
  * New offload OIDs for NDIS 6
  */
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index daddea2654ce..f7629ecefa84 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -344,7 +344,7 @@ static int netvsc_connect_vsp(struct hv_device *device)
         memset(init_packet, 0, sizeof(struct nvsp_message));
 
         if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_4)
-                ndis_version = 0x00050001;
+                ndis_version = 0x00060001;
         else
                 ndis_version = 0x0006001e;
 
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 4e4cf9e0c8d7..31e55fba7cad 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -319,7 +319,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         packet = kzalloc(sizeof(struct hv_netvsc_packet) +
                          (num_data_pgs * sizeof(struct hv_page_buffer)) +
                          sizeof(struct rndis_message) +
-                         NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
+                         NDIS_VLAN_PPI_SIZE +
+                         NDIS_CSUM_PPI_SIZE +
+                         NDIS_LSO_PPI_SIZE, GFP_ATOMIC);
         if (!packet) {
                 /* out of memory, drop packet */
                 netdev_err(net, "unable to allocate hv_netvsc_packet\n");
@@ -396,7 +398,30 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                 csum_info->transmit.tcp_checksum = 1;
                 csum_info->transmit.tcp_header_offset = hdr_offset;
         } else if (net_trans_info & INFO_UDP) {
-                csum_info->transmit.udp_checksum = 1;
+                /* UDP checksum offload is not supported on ws2008r2.
+                 * Furthermore, on ws2012 and ws2012r2, there are some
+                 * issues with udp checksum offload from Linux guests.
+                 * (these are host issues).
+                 * For now compute the checksum here.
+                 */
+                struct udphdr *uh;
+                u16 udp_len;
+
+                ret = skb_cow_head(skb, 0);
+                if (ret)
+                        goto drop;
+
+                uh = udp_hdr(skb);
+                udp_len = ntohs(uh->len);
+                uh->check = 0;
+                uh->check = csum_tcpudp_magic(ip_hdr(skb)->saddr,
+                                              ip_hdr(skb)->daddr,
+                                              udp_len, IPPROTO_UDP,
+                                              csum_partial(uh, udp_len, 0));
+                if (uh->check == 0)
+                        uh->check = CSUM_MANGLED_0;
+
+                csum_info->transmit.udp_checksum = 0;
         }
         goto do_send;
 
@@ -436,6 +461,7 @@ do_send:
 
         ret = netvsc_send(net_device_ctx->device_ctx, packet);
 
+drop:
         if (ret == 0) {
                 net->stats.tx_bytes += skb->len;
                 net->stats.tx_packets++;
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 4a37e3db9e32..143a98caf618 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -641,6 +641,16 @@ int rndis_filter_set_offload_params(struct hv_device *hdev,
         struct rndis_set_complete *set_complete;
         u32 extlen = sizeof(struct ndis_offload_params);
         int ret, t;
+        u32 vsp_version = nvdev->nvsp_version;
+
+        if (vsp_version <= NVSP_PROTOCOL_VERSION_4) {
+                extlen = VERSION_4_OFFLOAD_SIZE;
+                /* On NVSP_PROTOCOL_VERSION_4 and below, we do not support
+                 * UDP checksum offload.
+                 */
+                req_offloads->udp_ip_v4_csum = 0;
+                req_offloads->udp_ip_v6_csum = 0;
+        }
 
         request = get_rndis_request(rdev, RNDIS_MSG_SET,
                 RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
@@ -674,7 +684,7 @@ int rndis_filter_set_offload_params(struct hv_device *hdev,
         } else {
                 set_complete = &request->response_msg.msg.set_complete;
                 if (set_complete->status != RNDIS_STATUS_SUCCESS) {
-                        netdev_err(ndev, "Fail to set MAC on host side:0x%x\n",
+                        netdev_err(ndev, "Fail to set offload on host side:0x%x\n",
                                    set_complete->status);
                         ret = -EINVAL;
                 }
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index f3cdf64997d6..63aa9d9e34c5 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -78,11 +78,19 @@ static void ntb_netdev_event_handler(void *data, int status)
         netdev_dbg(ndev, "Event %x, Link %x\n", status,
                    ntb_transport_link_query(dev->qp));
 
-        /* Currently, only link status event is supported */
-        if (status)
-                netif_carrier_on(ndev);
-        else
+        switch (status) {
+        case NTB_LINK_DOWN:
                 netif_carrier_off(ndev);
+                break;
+        case NTB_LINK_UP:
+                if (!ntb_transport_link_query(dev->qp))
+                        return;
+
+                netif_carrier_on(ndev);
+                break;
+        default:
+                netdev_warn(ndev, "Unsupported event type %d\n", status);
+        }
 }
 
 static void ntb_netdev_rx_handler(struct ntb_transport_qp *qp, void *qp_data,
@@ -182,8 +190,10 @@ static int ntb_netdev_open(struct net_device *ndev)
 
                 rc = ntb_transport_rx_enqueue(dev->qp, skb, skb->data,
                                               ndev->mtu + ETH_HLEN);
-                if (rc == -EINVAL)
+                if (rc == -EINVAL) {
+                        dev_kfree_skb(skb);
                         goto err;
+                }
         }
 
         netif_carrier_off(ndev);
@@ -367,12 +377,15 @@ static void ntb_netdev_remove(struct pci_dev *pdev)
 {
         struct net_device *ndev;
         struct ntb_netdev *dev;
+        bool found = false;
 
         list_for_each_entry(dev, &dev_list, list) {
-                if (dev->pdev == pdev)
+                if (dev->pdev == pdev) {
+                        found = true;
                         break;
+                }
         }
-        if (dev == NULL)
+        if (!found)
                 return;
 
         list_del(&dev->list);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1d788f19135b..1b6d09aef427 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -756,12 +756,8 @@ void phy_state_machine(struct work_struct *work)
                         netif_carrier_on(phydev->attached_dev);
                         phydev->adjust_link(phydev->attached_dev);
 
-                } else if (0 == phydev->link_timeout--) {
+                } else if (0 == phydev->link_timeout--)
                         needs_aneg = 1;
-                        /* If we have the magic_aneg bit, we try again */
-                        if (phydev->drv->flags & PHY_HAS_MAGICANEG)
-                                break;
-                }
                 break;
         case PHY_NOLINK:
                 err = phy_read_status(phydev);
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 18e12a3f7fc3..3fbfb0869030 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -929,6 +929,9 @@ static int read_mii_word(struct net_device *netdev, int phy_id, int reg)
         struct r8152 *tp = netdev_priv(netdev);
         int ret;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return -ENODEV;
+
         if (phy_id != R8152_PHY_ID)
                 return -EINVAL;
 
@@ -949,6 +952,9 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val)
 {
         struct r8152 *tp = netdev_priv(netdev);
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         if (phy_id != R8152_PHY_ID)
                 return;
 
@@ -1962,6 +1968,9 @@ static int rtl_enable(struct r8152 *tp)
 
 static int rtl8152_enable(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return -ENODEV;
+
         set_tx_qlen(tp);
         rtl_set_eee_plus(tp);
 
@@ -1994,6 +2003,9 @@ static void r8153_set_rx_agg(struct r8152 *tp)
 
 static int rtl8153_enable(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return -ENODEV;
+
         set_tx_qlen(tp);
         rtl_set_eee_plus(tp);
         r8153_set_rx_agg(tp);
@@ -2006,6 +2018,11 @@ static void rtl8152_disable(struct r8152 *tp)
         u32 ocp_data;
         int i;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
+                rtl_drop_queued_tx(tp);
+                return;
+        }
+
         ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
         ocp_data &= ~RCR_ACPT_ALL;
         ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
@@ -2232,6 +2249,9 @@ static void r8152b_exit_oob(struct r8152 *tp)
         u32 ocp_data;
         int i;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
         ocp_data &= ~RCR_ACPT_ALL;
         ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
@@ -2460,6 +2480,9 @@ static void r8153_first_init(struct r8152 *tp)
         u32 ocp_data;
         int i;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         rxdy_gated_en(tp, true);
         r8153_teredo_off(tp);
 
@@ -2687,6 +2710,11 @@ out:
 
 static void rtl8152_down(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
+                rtl_drop_queued_tx(tp);
+                return;
+        }
+
         r8152_power_cut_en(tp, false);
         r8152b_disable_aldps(tp);
         r8152b_enter_oob(tp);
@@ -2695,6 +2723,11 @@ static void rtl8152_down(struct r8152 *tp)
 
 static void rtl8153_down(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
+                rtl_drop_queued_tx(tp);
+                return;
+        }
+
         r8153_u1u2en(tp, false);
         r8153_power_cut_en(tp, false);
         r8153_disable_aldps(tp);
@@ -2904,6 +2937,9 @@ static void r8152b_init(struct r8152 *tp)
 {
         u32 ocp_data;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         if (tp->version == RTL_VER_01) {
                 ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
                 ocp_data &= ~LED_MODE_MASK;
@@ -2939,6 +2975,9 @@ static void r8153_init(struct r8152 *tp)
         u32 ocp_data;
         int i;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         r8153_u1u2en(tp, false);
 
         for (i = 0; i < 500; i++) {
@@ -3213,6 +3252,9 @@ static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
         struct mii_ioctl_data *data = if_mii(rq);
         int res;
 
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return -ENODEV;
+
         res = usb_autopm_get_interface(tp->intf);
         if (res < 0)
                 goto out;
@@ -3293,12 +3335,18 @@ static void r8152b_get_version(struct r8152 *tp)
 
 static void rtl8152_unload(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         if (tp->version != RTL_VER_01)
                 r8152_power_cut_en(tp, true);
 }
 
 static void rtl8153_unload(struct r8152 *tp)
 {
+        if (test_bit(RTL8152_UNPLUG, &tp->flags))
+                return;
+
         r8153_power_cut_en(tp, true);
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 3b3e91057a4c..00fb8badbacc 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -1004,11 +1004,9 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
         case ATH9K_ANI_FIRSTEP_LEVEL:{
                 u32 level = param;
 
-                value = level * 2;
+                value = level;
                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
                               AR_PHY_FIND_SIG_FIRSTEP, value);
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
-                              AR_PHY_FIND_SIG_FIRSTEP_LOW, value);
 
                 if (level != aniState->firstepLevel) {
                         ath_dbg(common, ANI,
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 471e0f624e81..bd9e634879e6 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *data, u8 *mac, struct ieee80211_vif *vif)
 
 void ath9k_csa_update(struct ath_softc *sc)
 {
-        ieee80211_iterate_active_interfaces(sc->hw,
-                                            IEEE80211_IFACE_ITER_NORMAL,
-                                            ath9k_csa_update_vif,
-                                            sc);
+        ieee80211_iterate_active_interfaces_atomic(sc->hw,
+                                                   IEEE80211_IFACE_ITER_NORMAL,
+                                                   ath9k_csa_update_vif, sc);
 }
 
 void ath9k_beacon_tasklet(unsigned long data)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index e8149e3dbdd5..289f3d8924b5 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -471,8 +471,11 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv,
         if (!txok || !vif || !txs)
                 goto send_mac80211;
 
-        if (txs->ts_flags & ATH9K_HTC_TXSTAT_ACK)
+        if (txs->ts_flags & ATH9K_HTC_TXSTAT_ACK) {
                 tx_info->flags |= IEEE80211_TX_STAT_ACK;
+                if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
+                        tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
+        }
 
         if (txs->ts_flags & ATH9K_HTC_TXSTAT_FILT)
                 tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index c0a4e866edca..cbbb02a6b13b 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -670,6 +670,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
                 .num_different_channels = 1,
                 .beacon_int_infra_match = true,
         },
+#ifdef CONFIG_ATH9K_DFS_CERTIFIED
         {
                 .limits = if_dfs_limits,
                 .n_limits = ARRAY_SIZE(if_dfs_limits),
@@ -679,6 +680,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
                 .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
                                         BIT(NL80211_CHAN_WIDTH_20),
         }
+#endif
 };
 
 static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 05ee7f10cc8f..24ccbe96e0c8 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -5176,22 +5176,22 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,
         int ch = new_channel->hw_value;
 
         u16 old_band_5ghz;
-        u32 tmp32;
+        u16 tmp16;
 
         old_band_5ghz =
                 b43_phy_read(dev, B43_NPHY_BANDCTL) & B43_NPHY_BANDCTL_5GHZ;
         if (new_channel->band == IEEE80211_BAND_5GHZ && !old_band_5ghz) {
-                tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR);
-                b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4);
+                tmp16 = b43_read16(dev, B43_MMIO_PSM_PHY_HDR);
+                b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16 | 4);
                 b43_phy_set(dev, B43_PHY_B_BBCFG, 0xC000);
-                b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32);
+                b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16);
                 b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ);
         } else if (new_channel->band == IEEE80211_BAND_2GHZ && old_band_5ghz) {
                 b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);
-                tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR);
-                b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4);
+                tmp16 = b43_read16(dev, B43_MMIO_PSM_PHY_HDR);
+                b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16 | 4);
                 b43_phy_mask(dev, B43_PHY_B_BBCFG, 0x3FFF);
-                b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32);
+                b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16);
         }
 
         b43_chantab_phy_upload(dev, e);
diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c
index e89535e86caf..1a8d32138593 100644
--- a/drivers/net/wireless/rsi/rsi_91x_core.c
+++ b/drivers/net/wireless/rsi/rsi_91x_core.c
@@ -102,10 +102,10 @@ static u8 rsi_core_determine_hal_queue(struct rsi_common *common)
         }
 
 get_queue_num:
-        q_num = 0;
         recontend_queue = false;
 
         q_num = rsi_determine_min_weight_queue(common);
+
         q_len = skb_queue_len(&common->tx_queue[ii]);
         ii = q_num;
 
@@ -118,7 +118,9 @@ get_queue_num:
                 }
         }
 
-        common->tx_qinfo[q_num].pkt_contended = 0;
+        if (q_num < NUM_EDCA_QUEUES)
+                common->tx_qinfo[q_num].pkt_contended = 0;
+
         /* Adjust the back off values for all queues again */
         recontend_queue = rsi_recalculate_weights(common);
 
diff --git a/drivers/net/wireless/rsi/rsi_91x_debugfs.c b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
index 7e4ef4554411..c466246a323f 100644
--- a/drivers/net/wireless/rsi/rsi_91x_debugfs.c
+++ b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
@@ -289,32 +289,29 @@ int rsi_init_dbgfs(struct rsi_hw *adapter)
         const struct rsi_dbg_files *files;
 
         dev_dbgfs = kzalloc(sizeof(*dev_dbgfs), GFP_KERNEL);
+        if (!dev_dbgfs)
+                return -ENOMEM;
+
         adapter->dfsentry = dev_dbgfs;
 
         snprintf(devdir, sizeof(devdir), "%s",
                  wiphy_name(adapter->hw->wiphy));
-        dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL);
 
-        if (IS_ERR(dev_dbgfs->subdir)) {
-                if (dev_dbgfs->subdir == ERR_PTR(-ENODEV))
-                        rsi_dbg(ERR_ZONE,
-                                "%s:Debugfs has not been mounted\n", __func__);
-                else
-                        rsi_dbg(ERR_ZONE, "debugfs:%s not created\n", devdir);
+        dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL);
 
-                adapter->dfsentry = NULL;
+        if (!dev_dbgfs->subdir) {
                 kfree(dev_dbgfs);
-                return (int)PTR_ERR(dev_dbgfs->subdir);
-        } else {
-                for (ii = 0; ii < adapter->num_debugfs_entries; ii++) {
-                        files = &dev_debugfs_files[ii];
-                        dev_dbgfs->rsi_files[ii] =
-                        debugfs_create_file(files->name,
-                                            files->perms,
-                                            dev_dbgfs->subdir,
-                                            common,
-                                            &files->fops);
-                }
+                return -ENOMEM;
+        }
+
+        for (ii = 0; ii < adapter->num_debugfs_entries; ii++) {
+                files = &dev_debugfs_files[ii];
+                dev_dbgfs->rsi_files[ii] =
+                debugfs_create_file(files->name,
+                                    files->perms,
+                                    dev_dbgfs->subdir,
+                                    common,
+                                    &files->fops);
         }
         return 0;
 }
diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
index 2361a6849ad7..73694295648f 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
@@ -738,7 +738,7 @@ int rsi_hal_load_key(struct rsi_common *common,
  *
  * Return: 0 on success, corresponding error code on failure.
  */
-static u8 rsi_load_bootup_params(struct rsi_common *common)
+static int rsi_load_bootup_params(struct rsi_common *common)
 {
         struct sk_buff *skb;
         struct rsi_boot_params *boot_params;
@@ -1272,6 +1272,7 @@ int rsi_mgmt_pkt_recv(struct rsi_common *common, u8 *msg)
 {
         s32 msg_len = (le16_to_cpu(*(__le16 *)&msg[0]) & 0x0fff);
         u16 msg_type = (msg[2]);
+        int ret;
 
         rsi_dbg(FSM_ZONE, "%s: Msg Len: %d, Msg Type: %4x\n",
                 __func__, msg_len, msg_type);
@@ -1284,8 +1285,9 @@ int rsi_mgmt_pkt_recv(struct rsi_common *common, u8 *msg)
                 if (common->fsm_state == FSM_CARD_NOT_READY) {
                         rsi_set_default_parameters(common);
 
-                        if (rsi_load_bootup_params(common))
-                                return -ENOMEM;
+                        ret = rsi_load_bootup_params(common);
+                        if (ret)
+                                return ret;
                         else
                                 common->fsm_state = FSM_BOOT_PARAMS_SENT;
                 } else {
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 852453f386e2..2e39d38d6a9e 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -756,12 +756,13 @@ fail:
 static void rsi_disconnect(struct sdio_func *pfunction)
 {
         struct rsi_hw *adapter = sdio_get_drvdata(pfunction);
-        struct rsi_91x_sdiodev *dev =
-                (struct rsi_91x_sdiodev *)adapter->rsi_dev;
+        struct rsi_91x_sdiodev *dev;
 
         if (!adapter)
                 return;
 
+        dev = (struct rsi_91x_sdiodev *)adapter->rsi_dev;
+
         dev->write_fail = 2;
         rsi_mac80211_detach(adapter);
 
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
index f1cb99cafed8..20d11ccfffe3 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
@@ -247,7 +247,7 @@ static int rsi_process_pkt(struct rsi_common *common)
         if (!common->rx_data_pkt) {
                 rsi_dbg(ERR_ZONE, "%s: Failed in memory allocation\n",
                         __func__);
-                return -1;
+                return -ENOMEM;
         }
 
         status = rsi_sdio_host_intf_read_pkt(adapter,
@@ -260,12 +260,10 @@ static int rsi_process_pkt(struct rsi_common *common)
         }
 
         status = rsi_read_pkt(common, rcv_pkt_len);
-        kfree(common->rx_data_pkt);
-        return status;
 
 fail:
         kfree(common->rx_data_pkt);
-        return -1;
+        return status;
 }
 
 /**
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index bb1bf96670eb..4c46e5631e2f 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -154,24 +154,30 @@ static int rsi_usb_reg_read(struct usb_device *usbdev,
                             u16 *value,
                             u16 len)
 {
-        u8 temp_buf[4];
-        int status = 0;
+        u8 *buf;
+        int status = -ENOMEM;
+
+        buf  = kmalloc(0x04, GFP_KERNEL);
+        if (!buf)
+                return status;
 
         status = usb_control_msg(usbdev,
                                  usb_rcvctrlpipe(usbdev, 0),
                                  USB_VENDOR_REGISTER_READ,
                                  USB_TYPE_VENDOR,
                                  ((reg & 0xffff0000) >> 16), (reg & 0xffff),
-                                 (void *)temp_buf,
+                                 (void *)buf,
                                  len,
                                  HZ * 5);
 
-        *value = (temp_buf[0] | (temp_buf[1] << 8));
+        *value = (buf[0] | (buf[1] << 8));
         if (status < 0) {
                 rsi_dbg(ERR_ZONE,
                         "%s: Reg read failed with error code :%d\n",
                         __func__, status);
         }
+        kfree(buf);
+
         return status;
 }
 
@@ -190,8 +196,12 @@ static int rsi_usb_reg_write(struct usb_device *usbdev,
                              u16 value,
                              u16 len)
 {
-        u8 usb_reg_buf[4];
-        int status = 0;
+        u8 *usb_reg_buf;
+        int status = -ENOMEM;
+
+        usb_reg_buf  = kmalloc(0x04, GFP_KERNEL);
+        if (!usb_reg_buf)
+                return status;
 
         usb_reg_buf[0] = (value & 0x00ff);
         usb_reg_buf[1] = (value & 0xff00) >> 8;
@@ -212,6 +222,8 @@ static int rsi_usb_reg_write(struct usb_device *usbdev,
                         "%s: Reg write failed with error code :%d\n",
                         __func__, status);
         }
+        kfree(usb_reg_buf);
+
         return status;
 }
 
@@ -286,7 +298,7 @@ int rsi_usb_write_register_multiple(struct rsi_hw *adapter,
                 return -ENOMEM;
 
         while (count) {
-                transfer = min_t(int, count, 4096);
+                transfer = (u8)(min_t(u32, count, 4096));
                 memcpy(buf, data, transfer);
                 status = usb_control_msg(dev->usbdev,
                                          usb_sndctrlpipe(dev->usbdev, 0),
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index b6722de64a31..33da3dfcfa4f 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -625,17 +625,7 @@ bool exhalbtc_initlize_variables(struct rtl_priv *adapter)
         else
                 btcoexist->binded = true;
 
-#if (defined(CONFIG_PCI_HCI))
-        btcoexist->chip_interface = BTC_INTF_PCI;
-#elif (defined(CONFIG_USB_HCI))
-        btcoexist->chip_interface = BTC_INTF_USB;
-#elif (defined(CONFIG_SDIO_HCI))
-        btcoexist->chip_interface = BTC_INTF_SDIO;
-#elif (defined(CONFIG_GSPI_HCI))
-        btcoexist->chip_interface = BTC_INTF_GSPI;
-#else
         btcoexist->chip_interface = BTC_INTF_UNKNOWN;
-#endif
 
         if (NULL == btcoexist->adapter)
                 btcoexist->adapter = adapter;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 057b05700f8b..158b5e639fc7 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1291,13 +1291,13 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         for (i = 0; i < NET_TX_RING_SIZE; i++) {
                 skb_entry_set_link(&np->tx_skbs[i], i+1);
                 np->grant_tx_ref[i] = GRANT_INVALID_REF;
+                np->grant_tx_page[i] = NULL;
         }
 
         /* Clear out rx_skbs */
         for (i = 0; i < NET_RX_RING_SIZE; i++) {
                 np->rx_skbs[i] = NULL;
                 np->grant_rx_ref[i] = GRANT_INVALID_REF;
-                np->grant_tx_page[i] = NULL;
         }
 
         /* A grant for every tx ring slot */
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index 170e8e60cdb7..372e08c4ffef 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -91,7 +91,7 @@ static struct dentry *debugfs_dir;
 /* Translate memory window 0,1 to BAR 2,4 */
 #define MW_TO_BAR(mw)   (mw * NTB_MAX_NUM_MW + 2)
 
-static DEFINE_PCI_DEVICE_TABLE(ntb_pci_tbl) = {
+static const struct pci_device_id ntb_pci_tbl[] = {
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_BWD)},
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},
@@ -120,7 +120,8 @@ MODULE_DEVICE_TABLE(pci, ntb_pci_tbl);
  * RETURNS: An appropriate -ERRNO error value on error, or zero for success.
  */
 int ntb_register_event_callback(struct ntb_device *ndev,
-                            void (*func)(void *handle, enum ntb_hw_event event))
+                                void (*func)(void *handle,
+                                             enum ntb_hw_event event))
 {
         if (ndev->event_cb)
                 return -EINVAL;
@@ -715,9 +716,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
                                SNB_PBAR4LMT_OFFSET);
                         /* HW errata on the Limit registers.  They can only be
                          * written when the base register is 4GB aligned and
-                         * < 32bit.  This should already be the case based on the
-                         * driver defaults, but write the Limit registers first
-                         * just in case.
+                         * < 32bit.  This should already be the case based on
+                         * the driver defaults, but write the Limit registers
+                         * first just in case.
                          */
                 } else {
                         ndev->limits.max_mw = SNB_MAX_MW;
@@ -739,9 +740,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
                         writeq(0, ndev->reg_base + SNB_PBAR4LMT_OFFSET);
                         /* HW errata on the Limit registers.  They can only be
                          * written when the base register is 4GB aligned and
-                         * < 32bit.  This should already be the case based on the
-                         * driver defaults, but write the Limit registers first
-                         * just in case.
+                         * < 32bit.  This should already be the case based on
+                         * the driver defaults, but write the Limit registers
+                         * first just in case.
                          */
                 }
 
@@ -785,7 +786,7 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
                                 /* B2B_XLAT_OFFSET is a 64bit register, but can
                                  * only take 32bit writes
                                  */
-                                writel(SNB_MBAR01_DSD_ADDR & 0xffffffff,
+                                writel(SNB_MBAR01_USD_ADDR & 0xffffffff,
                                        ndev->reg_base + SNB_B2B_XLAT_OFFSETL);
                                 writel(SNB_MBAR01_USD_ADDR >> 32,
                                        ndev->reg_base + SNB_B2B_XLAT_OFFSETU);
@@ -803,7 +804,7 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
                 ndev->conn_type = NTB_CONN_RP;
 
                 if (xeon_errata_workaround) {
-                        dev_err(&ndev->pdev->dev, 
+                        dev_err(&ndev->pdev->dev,
                                 "NTB-RP disabled due to hardware errata.  To disregard this warning and potentially lock-up the system, add the parameter 'xeon_errata_workaround=0'.\n");
                         return -EINVAL;
                 }
@@ -1079,111 +1080,131 @@ static irqreturn_t ntb_interrupt(int irq, void *dev)
         return IRQ_HANDLED;
 }
 
-static int ntb_setup_msix(struct ntb_device *ndev)
+static int ntb_setup_snb_msix(struct ntb_device *ndev, int msix_entries)
 {
         struct pci_dev *pdev = ndev->pdev;
         struct msix_entry *msix;
-        int msix_entries;
         int rc, i;
-        u16 val;
 
-        if (!pdev->msix_cap) {
-                rc = -EIO;
-                goto err;
-        }
+        if (msix_entries < ndev->limits.msix_cnt)
+                return -ENOSPC;
 
-        rc = pci_read_config_word(pdev, pdev->msix_cap + PCI_MSIX_FLAGS, &val);
-        if (rc)
-                goto err;
+        rc = pci_enable_msix_exact(pdev, ndev->msix_entries, msix_entries);
+        if (rc < 0)
+                return rc;
 
-        msix_entries = msix_table_size(val);
-        if (msix_entries > ndev->limits.msix_cnt) {
-                rc = -EINVAL;
-                goto err;
+        for (i = 0; i < msix_entries; i++) {
+                msix = &ndev->msix_entries[i];
+                WARN_ON(!msix->vector);
+
+                if (i == msix_entries - 1) {
+                        rc = request_irq(msix->vector,
+                                         xeon_event_msix_irq, 0,
+                                         "ntb-event-msix", ndev);
+                        if (rc)
+                                goto err;
+                } else {
+                        rc = request_irq(msix->vector,
+                                         xeon_callback_msix_irq, 0,
+                                         "ntb-callback-msix",
+                                         &ndev->db_cb[i]);
+                        if (rc)
+                                goto err;
+                }
         }
 
-        ndev->msix_entries = kmalloc(sizeof(struct msix_entry) * msix_entries,
-                                     GFP_KERNEL);
-        if (!ndev->msix_entries) {
-                rc = -ENOMEM;
-                goto err;
+        ndev->num_msix = msix_entries;
+        ndev->max_cbs = msix_entries - 1;
+
+        return 0;
+
+err:
+        while (--i >= 0) {
+                /* Code never reaches here for entry nr 'ndev->num_msix - 1' */
+                msix = &ndev->msix_entries[i];
+                free_irq(msix->vector, &ndev->db_cb[i]);
         }
 
-        for (i = 0; i < msix_entries; i++)
-                ndev->msix_entries[i].entry = i;
+        pci_disable_msix(pdev);
+        ndev->num_msix = 0;
 
-        rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries);
-        if (rc < 0)
-                goto err1;
-        if (rc > 0) {
-                /* On SNB, the link interrupt is always tied to 4th vector.  If
-                 * we can't get all 4, then we can't use MSI-X.
-                 */
-                if (ndev->hw_type != BWD_HW) {
-                        rc = -EIO;
-                        goto err1;
-                }
+        return rc;
+}
 
-                dev_warn(&pdev->dev,
-                         "Only %d MSI-X vectors.  Limiting the number of queues to that number.\n",
-                         rc);
-                msix_entries = rc;
+static int ntb_setup_bwd_msix(struct ntb_device *ndev, int msix_entries)
+{
+        struct pci_dev *pdev = ndev->pdev;
+        struct msix_entry *msix;
+        int rc, i;
 
-                rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries);
-                if (rc)
-                        goto err1;
-        }
+        msix_entries = pci_enable_msix_range(pdev, ndev->msix_entries,
+                                             1, msix_entries);
+        if (msix_entries < 0)
+                return msix_entries;
 
         for (i = 0; i < msix_entries; i++) {
                 msix = &ndev->msix_entries[i];
                 WARN_ON(!msix->vector);
 
-                /* Use the last MSI-X vector for Link status */
-                if (ndev->hw_type == BWD_HW) {
-                        rc = request_irq(msix->vector, bwd_callback_msix_irq, 0,
-                                         "ntb-callback-msix", &ndev->db_cb[i]);
-                        if (rc)
-                                goto err2;
-                } else {
-                        if (i == msix_entries - 1) {
-                                rc = request_irq(msix->vector,
-                                                 xeon_event_msix_irq, 0,
-                                                 "ntb-event-msix", ndev);
-                                if (rc)
-                                        goto err2;
-                        } else {
-                                rc = request_irq(msix->vector,
-                                                 xeon_callback_msix_irq, 0,
-                                                 "ntb-callback-msix",
-                                                 &ndev->db_cb[i]);
-                                if (rc)
-                                        goto err2;
-                        }
-                }
+                rc = request_irq(msix->vector, bwd_callback_msix_irq, 0,
+                                 "ntb-callback-msix", &ndev->db_cb[i]);
+                if (rc)
+                        goto err;
         }
 
         ndev->num_msix = msix_entries;
+        ndev->max_cbs = msix_entries;
+
+        return 0;
+
+err:
+        while (--i >= 0)
+                free_irq(msix->vector, &ndev->db_cb[i]);
+
+        pci_disable_msix(pdev);
+        ndev->num_msix = 0;
+
+        return rc;
+}
+
+static int ntb_setup_msix(struct ntb_device *ndev)
+{
+        struct pci_dev *pdev = ndev->pdev;
+        int msix_entries;
+        int rc, i;
+
+        msix_entries = pci_msix_vec_count(pdev);
+        if (msix_entries < 0) {
+                rc = msix_entries;
+                goto err;
+        } else if (msix_entries > ndev->limits.msix_cnt) {
+                rc = -EINVAL;
+                goto err;
+        }
+
+        ndev->msix_entries = kmalloc(sizeof(struct msix_entry) * msix_entries,
+                                     GFP_KERNEL);
+        if (!ndev->msix_entries) {
+                rc = -ENOMEM;
+                goto err;
+        }
+
+        for (i = 0; i < msix_entries; i++)
+                ndev->msix_entries[i].entry = i;
+
         if (ndev->hw_type == BWD_HW)
-                ndev->max_cbs = msix_entries;
+                rc = ntb_setup_bwd_msix(ndev, msix_entries);
         else
-                ndev->max_cbs = msix_entries - 1;
+                rc = ntb_setup_snb_msix(ndev, msix_entries);
+        if (rc)
+                goto err1;
 
         return 0;
 
-err2:
-        while (--i >= 0) {
-                msix = &ndev->msix_entries[i];
-                if (ndev->hw_type != BWD_HW && i == ndev->num_msix - 1)
-                        free_irq(msix->vector, ndev);
-                else
-                        free_irq(msix->vector, &ndev->db_cb[i]);
-        }
-        pci_disable_msix(pdev);
 err1:
         kfree(ndev->msix_entries);
-        dev_err(&pdev->dev, "Error allocating MSI-X interrupt\n");
 err:
-        ndev->num_msix = 0;
+        dev_err(&pdev->dev, "Error allocating MSI-X interrupt\n");
         return rc;
 }
 
@@ -1281,6 +1302,7 @@ static void ntb_free_interrupts(struct ntb_device *ndev)
                                 free_irq(msix->vector, &ndev->db_cb[i]);
                 }
                 pci_disable_msix(pdev);
+                kfree(ndev->msix_entries);
         } else {
                 free_irq(pdev->irq, ndev);
 
diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h
index bbdb7edca10c..465517b7393e 100644
--- a/drivers/ntb/ntb_hw.h
+++ b/drivers/ntb/ntb_hw.h
@@ -45,6 +45,7 @@
  * Contact Information:
  * Jon Mason <jon.mason@intel.com>
  */
+#include <linux/ntb.h>
 
 #define PCI_DEVICE_ID_INTEL_NTB_B2B_JSF         0x3725
 #define PCI_DEVICE_ID_INTEL_NTB_PS_JSF          0x3726
@@ -60,8 +61,6 @@
 #define PCI_DEVICE_ID_INTEL_NTB_SS_HSX          0x2F0F
 #define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD         0x0C4E
 
-#define msix_table_size(control)        ((control & PCI_MSIX_FLAGS_QSIZE)+1)
-
 #ifndef readq
 static inline u64 readq(void __iomem *addr)
 {
@@ -83,9 +82,6 @@ static inline void writeq(u64 val, void __iomem *addr)
 #define NTB_BAR_MASK            ((1 << NTB_BAR_MMIO) | (1 << NTB_BAR_23) |\
                                  (1 << NTB_BAR_45))
 
-#define NTB_LINK_DOWN           0
-#define NTB_LINK_UP             1
-
 #define NTB_HB_TIMEOUT          msecs_to_jiffies(1000)
 
 #define NTB_MAX_NUM_MW          2
@@ -233,7 +229,7 @@ int ntb_register_db_callback(struct ntb_device *ndev, unsigned int idx,
                                                            int db_num));
 void ntb_unregister_db_callback(struct ntb_device *ndev, unsigned int idx);
 int ntb_register_event_callback(struct ntb_device *ndev,
-                                void (*event_cb_func) (void *handle,
+                                void (*event_cb_func)(void *handle,
                                                       enum ntb_hw_event event));
 void ntb_unregister_event_callback(struct ntb_device *ndev);
 int ntb_get_max_spads(struct ntb_device *ndev);
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 3217f394d45b..9dd63b822025 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -56,7 +56,6 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/ntb.h>
 #include "ntb_hw.h"
 
 #define NTB_TRANSPORT_VERSION   3
@@ -107,8 +106,8 @@ struct ntb_transport_qp {
         struct ntb_rx_info __iomem *rx_info;
         struct ntb_rx_info *remote_rx_info;
 
-        void (*tx_handler) (struct ntb_transport_qp *qp, void *qp_data,
-                            void *data, int len);
+        void (*tx_handler)(struct ntb_transport_qp *qp, void *qp_data,
+                           void *data, int len);
         struct list_head tx_free_q;
         spinlock_t ntb_tx_free_q_lock;
         void __iomem *tx_mw;
@@ -117,8 +116,8 @@ struct ntb_transport_qp {
         unsigned int tx_max_entry;
         unsigned int tx_max_frame;
 
-        void (*rx_handler) (struct ntb_transport_qp *qp, void *qp_data,
-                            void *data, int len);
+        void (*rx_handler)(struct ntb_transport_qp *qp, void *qp_data,
+                           void *data, int len);
         struct list_head rx_pend_q;
         struct list_head rx_free_q;
         spinlock_t ntb_rx_pend_q_lock;
@@ -129,7 +128,7 @@ struct ntb_transport_qp {
         unsigned int rx_max_frame;
         dma_cookie_t last_cookie;
 
-        void (*event_handler) (void *data, int status);
+        void (*event_handler)(void *data, int status);
         struct delayed_work link_work;
         struct work_struct link_cleanup;
 
@@ -480,7 +479,7 @@ static void ntb_list_add(spinlock_t *lock, struct list_head *entry,
 }
 
 static struct ntb_queue_entry *ntb_list_rm(spinlock_t *lock,
-                                                struct list_head *list)
+                                           struct list_head *list)
 {
         struct ntb_queue_entry *entry;
         unsigned long flags;
@@ -839,7 +838,7 @@ static void ntb_qp_link_work(struct work_struct *work)
 }
 
 static int ntb_transport_init_queue(struct ntb_transport *nt,
-                                     unsigned int qp_num)
+                                    unsigned int qp_num)
 {
         struct ntb_transport_qp *qp;
         unsigned int num_qps_mw, tx_size;
@@ -1055,7 +1054,7 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset,
         if (!chan)
                 goto err;
 
-        if (len < copy_bytes) 
+        if (len < copy_bytes)
                 goto err_wait;
 
         device = chan->device;
@@ -1190,8 +1189,7 @@ out:
         return 0;
 
 err:
-        ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry,
-                     &qp->rx_pend_q);
+        ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry, &qp->rx_pend_q);
         /* Ensure that the data is fully copied out before clearing the flag */
         wmb();
         hdr->flags = 0;
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5f67843c7fb7..27df2c533b09 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -53,6 +53,18 @@ config ACERHDF
           If you have an Acer Aspire One netbook, say Y or M
           here.
 
+config ALIENWARE_WMI
+        tristate "Alienware Special feature control"
+        depends on ACPI
+        depends on LEDS_CLASS
+        depends on NEW_LEDS
+        depends on ACPI_WMI
+        ---help---
+         This is a driver for controlling Alienware BIOS driven
+         features.  It exposes an interface for controlling the AlienFX
+         zones on Alienware machines that don't contain a dedicated AlienFX
+         USB MCU such as the X51 and X51-R2.
+
 config ASUS_LAPTOP
         tristate "Asus Laptop Extras"
         depends on ACPI
@@ -196,7 +208,7 @@ config HP_ACCEL
           be called hp_accel.
 
 config HP_WIRELESS
-        tristate "HP WIRELESS"
+        tristate "HP wireless button"
         depends on ACPI
         depends on INPUT
         help
@@ -817,12 +829,4 @@ config PVPANIC
           a paravirtualized device provided by QEMU; it lets a virtual machine
           (guest) communicate panic events to the host.
 
-config INTEL_BAYTRAIL_MBI
-        tristate
-        depends on PCI
-        ---help---
-          Needed on Baytrail platforms for access to the IOSF Sideband Mailbox
-          Interface. This is a requirement for systems that need to configure
-          the PUNIT for power management features such as RAPL.
-
 endif # X86_PLATFORM_DEVICES
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 9b87cfc42b84..1a2eafc9d48e 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -55,4 +55,4 @@ obj-$(CONFIG_INTEL_RST)		+= intel-rst.o
 obj-$(CONFIG_INTEL_SMARTCONNECT)        += intel-smartconnect.o
 
 obj-$(CONFIG_PVPANIC)           += pvpanic.o
-obj-$(CONFIG_INTEL_BAYTRAIL_MBI)        += intel_baytrail.o
+obj-$(CONFIG_ALIENWARE_WMI)     += alienware-wmi.o
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
new file mode 100644
index 000000000000..541f9514f76f
--- /dev/null
+++ b/drivers/platform/x86/alienware-wmi.c
@@ -0,0 +1,565 @@
+/*
+ * Alienware AlienFX control
+ *
+ * Copyright (C) 2014 Dell Inc <mario_limonciello@dell.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.
+ *
+ *  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.
+ *
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dmi.h>
+#include <linux/acpi.h>
+#include <linux/leds.h>
+
+#define LEGACY_CONTROL_GUID             "A90597CE-A997-11DA-B012-B622A1EF5492"
+#define LEGACY_POWER_CONTROL_GUID       "A80593CE-A997-11DA-B012-B622A1EF5492"
+#define WMAX_CONTROL_GUID               "A70591CE-A997-11DA-B012-B622A1EF5492"
+
+#define WMAX_METHOD_HDMI_SOURCE         0x1
+#define WMAX_METHOD_HDMI_STATUS         0x2
+#define WMAX_METHOD_BRIGHTNESS          0x3
+#define WMAX_METHOD_ZONE_CONTROL        0x4
+
+MODULE_AUTHOR("Mario Limonciello <mario_limonciello@dell.com>");
+MODULE_DESCRIPTION("Alienware special feature control");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("wmi:" LEGACY_CONTROL_GUID);
+MODULE_ALIAS("wmi:" WMAX_CONTROL_GUID);
+
+enum INTERFACE_FLAGS {
+        LEGACY,
+        WMAX,
+};
+
+enum LEGACY_CONTROL_STATES {
+        LEGACY_RUNNING = 1,
+        LEGACY_BOOTING = 0,
+        LEGACY_SUSPEND = 3,
+};
+
+enum WMAX_CONTROL_STATES {
+        WMAX_RUNNING = 0xFF,
+        WMAX_BOOTING = 0,
+        WMAX_SUSPEND = 3,
+};
+
+struct quirk_entry {
+        u8 num_zones;
+};
+
+static struct quirk_entry *quirks;
+
+static struct quirk_entry quirk_unknown = {
+        .num_zones = 2,
+};
+
+static struct quirk_entry quirk_x51_family = {
+        .num_zones = 3,
+};
+
+static int dmi_matched(const struct dmi_system_id *dmi)
+{
+        quirks = dmi->driver_data;
+        return 1;
+}
+
+static struct dmi_system_id alienware_quirks[] = {
+        {
+         .callback = dmi_matched,
+         .ident = "Alienware X51 R1",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"),
+                     },
+         .driver_data = &quirk_x51_family,
+         },
+        {
+         .callback = dmi_matched,
+         .ident = "Alienware X51 R2",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"),
+                     },
+         .driver_data = &quirk_x51_family,
+         },
+        {}
+};
+
+struct color_platform {
+        u8 blue;
+        u8 green;
+        u8 red;
+} __packed;
+
+struct platform_zone {
+        u8 location;
+        struct device_attribute *attr;
+        struct color_platform colors;
+};
+
+struct wmax_brightness_args {
+        u32 led_mask;
+        u32 percentage;
+};
+
+struct hdmi_args {
+        u8 arg;
+};
+
+struct legacy_led_args {
+        struct color_platform colors;
+        u8 brightness;
+        u8 state;
+} __packed;
+
+struct wmax_led_args {
+        u32 led_mask;
+        struct color_platform colors;
+        u8 state;
+} __packed;
+
+static struct platform_device *platform_device;
+static struct device_attribute *zone_dev_attrs;
+static struct attribute **zone_attrs;
+static struct platform_zone *zone_data;
+
+static struct platform_driver platform_driver = {
+        .driver = {
+                   .name = "alienware-wmi",
+                   .owner = THIS_MODULE,
+                   }
+};
+
+static struct attribute_group zone_attribute_group = {
+        .name = "rgb_zones",
+};
+
+static u8 interface;
+static u8 lighting_control_state;
+static u8 global_brightness;
+
+/*
+ * Helpers used for zone control
+*/
+static int parse_rgb(const char *buf, struct platform_zone *zone)
+{
+        long unsigned int rgb;
+        int ret;
+        union color_union {
+                struct color_platform cp;
+                int package;
+        } repackager;
+
+        ret = kstrtoul(buf, 16, &rgb);
+        if (ret)
+                return ret;
+
+        /* RGB triplet notation is 24-bit hexadecimal */
+        if (rgb > 0xFFFFFF)
+                return -EINVAL;
+
+        repackager.package = rgb & 0x0f0f0f0f;
+        pr_debug("alienware-wmi: r: %d g:%d b: %d\n",
+                 repackager.cp.red, repackager.cp.green, repackager.cp.blue);
+        zone->colors = repackager.cp;
+        return 0;
+}
+
+static struct platform_zone *match_zone(struct device_attribute *attr)
+{
+        int i;
+        for (i = 0; i < quirks->num_zones; i++) {
+                if ((struct device_attribute *)zone_data[i].attr == attr) {
+                        pr_debug("alienware-wmi: matched zone location: %d\n",
+                                 zone_data[i].location);
+                        return &zone_data[i];
+                }
+        }
+        return NULL;
+}
+
+/*
+ * Individual RGB zone control
+*/
+static int alienware_update_led(struct platform_zone *zone)
+{
+        int method_id;
+        acpi_status status;
+        char *guid;
+        struct acpi_buffer input;
+        struct legacy_led_args legacy_args;
+        struct wmax_led_args wmax_args;
+        if (interface == WMAX) {
+                wmax_args.led_mask = 1 << zone->location;
+                wmax_args.colors = zone->colors;
+                wmax_args.state = lighting_control_state;
+                guid = WMAX_CONTROL_GUID;
+                method_id = WMAX_METHOD_ZONE_CONTROL;
+
+                input.length = (acpi_size) sizeof(wmax_args);
+                input.pointer = &wmax_args;
+        } else {
+                legacy_args.colors = zone->colors;
+                legacy_args.brightness = global_brightness;
+                legacy_args.state = 0;
+                if (lighting_control_state == LEGACY_BOOTING ||
+                    lighting_control_state == LEGACY_SUSPEND) {
+                        guid = LEGACY_POWER_CONTROL_GUID;
+                        legacy_args.state = lighting_control_state;
+                } else
+                        guid = LEGACY_CONTROL_GUID;
+                method_id = zone->location + 1;
+
+                input.length = (acpi_size) sizeof(legacy_args);
+                input.pointer = &legacy_args;
+        }
+        pr_debug("alienware-wmi: guid %s method %d\n", guid, method_id);
+
+        status = wmi_evaluate_method(guid, 1, method_id, &input, NULL);
+        if (ACPI_FAILURE(status))
+                pr_err("alienware-wmi: zone set failure: %u\n", status);
+        return ACPI_FAILURE(status);
+}
+
+static ssize_t zone_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct platform_zone *target_zone;
+        target_zone = match_zone(attr);
+        if (target_zone == NULL)
+                return sprintf(buf, "red: -1, green: -1, blue: -1\n");
+        return sprintf(buf, "red: %d, green: %d, blue: %d\n",
+                       target_zone->colors.red,
+                       target_zone->colors.green, target_zone->colors.blue);
+
+}
+
+static ssize_t zone_set(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct platform_zone *target_zone;
+        int ret;
+        target_zone = match_zone(attr);
+        if (target_zone == NULL) {
+                pr_err("alienware-wmi: invalid target zone\n");
+                return 1;
+        }
+        ret = parse_rgb(buf, target_zone);
+        if (ret)
+                return ret;
+        ret = alienware_update_led(target_zone);
+        return ret ? ret : count;
+}
+
+/*
+ * LED Brightness (Global)
+*/
+static int wmax_brightness(int brightness)
+{
+        acpi_status status;
+        struct acpi_buffer input;
+        struct wmax_brightness_args args = {
+                .led_mask = 0xFF,
+                .percentage = brightness,
+        };
+        input.length = (acpi_size) sizeof(args);
+        input.pointer = &args;
+        status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
+                                     WMAX_METHOD_BRIGHTNESS, &input, NULL);
+        if (ACPI_FAILURE(status))
+                pr_err("alienware-wmi: brightness set failure: %u\n", status);
+        return ACPI_FAILURE(status);
+}
+
+static void global_led_set(struct led_classdev *led_cdev,
+                           enum led_brightness brightness)
+{
+        int ret;
+        global_brightness = brightness;
+        if (interface == WMAX)
+                ret = wmax_brightness(brightness);
+        else
+                ret = alienware_update_led(&zone_data[0]);
+        if (ret)
+                pr_err("LED brightness update failed\n");
+}
+
+static enum led_brightness global_led_get(struct led_classdev *led_cdev)
+{
+        return global_brightness;
+}
+
+static struct led_classdev global_led = {
+        .brightness_set = global_led_set,
+        .brightness_get = global_led_get,
+        .name = "alienware::global_brightness",
+};
+
+/*
+ * Lighting control state device attribute (Global)
+*/
+static ssize_t show_control_state(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+        if (lighting_control_state == LEGACY_BOOTING)
+                return scnprintf(buf, PAGE_SIZE, "[booting] running suspend\n");
+        else if (lighting_control_state == LEGACY_SUSPEND)
+                return scnprintf(buf, PAGE_SIZE, "booting running [suspend]\n");
+        return scnprintf(buf, PAGE_SIZE, "booting [running] suspend\n");
+}
+
+static ssize_t store_control_state(struct device *dev,
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
+{
+        long unsigned int val;
+        if (strcmp(buf, "booting\n") == 0)
+                val = LEGACY_BOOTING;
+        else if (strcmp(buf, "suspend\n") == 0)
+                val = LEGACY_SUSPEND;
+        else if (interface == LEGACY)
+                val = LEGACY_RUNNING;
+        else
+                val = WMAX_RUNNING;
+        lighting_control_state = val;
+        pr_debug("alienware-wmi: updated control state to %d\n",
+                 lighting_control_state);
+        return count;
+}
+
+static DEVICE_ATTR(lighting_control_state, 0644, show_control_state,
+                   store_control_state);
+
+static int alienware_zone_init(struct platform_device *dev)
+{
+        int i;
+        char buffer[10];
+        char *name;
+
+        if (interface == WMAX) {
+                global_led.max_brightness = 100;
+                lighting_control_state = WMAX_RUNNING;
+        } else if (interface == LEGACY) {
+                global_led.max_brightness = 0x0F;
+                lighting_control_state = LEGACY_RUNNING;
+        }
+        global_brightness = global_led.max_brightness;
+
+        /*
+         *      - zone_dev_attrs num_zones + 1 is for individual zones and then
+         *        null terminated
+         *      - zone_attrs num_zones + 2 is for all attrs in zone_dev_attrs +
+         *        the lighting control + null terminated
+         *      - zone_data num_zones is for the distinct zones
+         */
+        zone_dev_attrs =
+            kzalloc(sizeof(struct device_attribute) * (quirks->num_zones + 1),
+                    GFP_KERNEL);
+        if (!zone_dev_attrs)
+                return -ENOMEM;
+
+        zone_attrs =
+            kzalloc(sizeof(struct attribute *) * (quirks->num_zones + 2),
+                    GFP_KERNEL);
+        if (!zone_attrs)
+                return -ENOMEM;
+
+        zone_data =
+            kzalloc(sizeof(struct platform_zone) * (quirks->num_zones),
+                    GFP_KERNEL);
+        if (!zone_data)
+                return -ENOMEM;
+
+        for (i = 0; i < quirks->num_zones; i++) {
+                sprintf(buffer, "zone%02X", i);
+                name = kstrdup(buffer, GFP_KERNEL);
+                if (name == NULL)
+                        return 1;
+                sysfs_attr_init(&zone_dev_attrs[i].attr);
+                zone_dev_attrs[i].attr.name = name;
+                zone_dev_attrs[i].attr.mode = 0644;
+                zone_dev_attrs[i].show = zone_show;
+                zone_dev_attrs[i].store = zone_set;
+                zone_data[i].location = i;
+                zone_attrs[i] = &zone_dev_attrs[i].attr;
+                zone_data[i].attr = &zone_dev_attrs[i];
+        }
+        zone_attrs[quirks->num_zones] = &dev_attr_lighting_control_state.attr;
+        zone_attribute_group.attrs = zone_attrs;
+
+        led_classdev_register(&dev->dev, &global_led);
+
+        return sysfs_create_group(&dev->dev.kobj, &zone_attribute_group);
+}
+
+static void alienware_zone_exit(struct platform_device *dev)
+{
+        sysfs_remove_group(&dev->dev.kobj, &zone_attribute_group);
+        led_classdev_unregister(&global_led);
+        if (zone_dev_attrs) {
+                int i;
+                for (i = 0; i < quirks->num_zones; i++)
+                        kfree(zone_dev_attrs[i].attr.name);
+        }
+        kfree(zone_dev_attrs);
+        kfree(zone_data);
+        kfree(zone_attrs);
+}
+
+/*
+        The HDMI mux sysfs node indicates the status of the HDMI input mux.
+        It can toggle between standard system GPU output and HDMI input.
+*/
+static ssize_t show_hdmi(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        acpi_status status;
+        struct acpi_buffer input;
+        union acpi_object *obj;
+        u32 tmp = 0;
+        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct hdmi_args in_args = {
+                .arg = 0,
+        };
+        input.length = (acpi_size) sizeof(in_args);
+        input.pointer = &in_args;
+        status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
+                                     WMAX_METHOD_HDMI_STATUS, &input, &output);
+
+        if (ACPI_SUCCESS(status)) {
+                obj = (union acpi_object *)output.pointer;
+                if (obj && obj->type == ACPI_TYPE_INTEGER)
+                        tmp = (u32) obj->integer.value;
+                if (tmp == 1)
+                        return scnprintf(buf, PAGE_SIZE,
+                                         "[input] gpu unknown\n");
+                else if (tmp == 2)
+                        return scnprintf(buf, PAGE_SIZE,
+                                         "input [gpu] unknown\n");
+        }
+        pr_err("alienware-wmi: unknown HDMI status: %d\n", status);
+        return scnprintf(buf, PAGE_SIZE, "input gpu [unknown]\n");
+}
+
+static ssize_t toggle_hdmi(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        struct acpi_buffer input;
+        acpi_status status;
+        struct hdmi_args args;
+        if (strcmp(buf, "gpu\n") == 0)
+                args.arg = 1;
+        else if (strcmp(buf, "input\n") == 0)
+                args.arg = 2;
+        else
+                args.arg = 3;
+        pr_debug("alienware-wmi: setting hdmi to %d : %s", args.arg, buf);
+        input.length = (acpi_size) sizeof(args);
+        input.pointer = &args;
+        status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
+                                     WMAX_METHOD_HDMI_SOURCE, &input, NULL);
+        if (ACPI_FAILURE(status))
+                pr_err("alienware-wmi: HDMI toggle failed: results: %u\n",
+                       status);
+        return count;
+}
+
+static DEVICE_ATTR(hdmi, S_IRUGO | S_IWUSR, show_hdmi, toggle_hdmi);
+
+static void remove_hdmi(struct platform_device *device)
+{
+        device_remove_file(&device->dev, &dev_attr_hdmi);
+}
+
+static int create_hdmi(void)
+{
+        int ret = -ENOMEM;
+        ret = device_create_file(&platform_device->dev, &dev_attr_hdmi);
+        if (ret)
+                goto error_create_hdmi;
+        return 0;
+
+error_create_hdmi:
+        remove_hdmi(platform_device);
+        return ret;
+}
+
+static int __init alienware_wmi_init(void)
+{
+        int ret;
+
+        if (wmi_has_guid(LEGACY_CONTROL_GUID))
+                interface = LEGACY;
+        else if (wmi_has_guid(WMAX_CONTROL_GUID))
+                interface = WMAX;
+        else {
+                pr_warn("alienware-wmi: No known WMI GUID found\n");
+                return -ENODEV;
+        }
+
+        dmi_check_system(alienware_quirks);
+        if (quirks == NULL)
+                quirks = &quirk_unknown;
+
+        ret = platform_driver_register(&platform_driver);
+        if (ret)
+                goto fail_platform_driver;
+        platform_device = platform_device_alloc("alienware-wmi", -1);
+        if (!platform_device) {
+                ret = -ENOMEM;
+                goto fail_platform_device1;
+        }
+        ret = platform_device_add(platform_device);
+        if (ret)
+                goto fail_platform_device2;
+
+        if (interface == WMAX) {
+                ret = create_hdmi();
+                if (ret)
+                        goto fail_prep_hdmi;
+        }
+
+        ret = alienware_zone_init(platform_device);
+        if (ret)
+                goto fail_prep_zones;
+
+        return 0;
+
+fail_prep_zones:
+        alienware_zone_exit(platform_device);
+fail_prep_hdmi:
+        platform_device_del(platform_device);
+fail_platform_device2:
+        platform_device_put(platform_device);
+fail_platform_device1:
+        platform_driver_unregister(&platform_driver);
+fail_platform_driver:
+        return ret;
+}
+
+module_init(alienware_wmi_init);
+
+static void __exit alienware_wmi_exit(void)
+{
+        if (platform_device) {
+                alienware_zone_exit(platform_device);
+                remove_hdmi(platform_device);
+                platform_device_unregister(platform_device);
+                platform_driver_unregister(&platform_driver);
+        }
+}
+
+module_exit(alienware_wmi_exit);
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
index 570926c10014..c3784baceae3 100644
--- a/drivers/platform/x86/fujitsu-tablet.c
+++ b/drivers/platform/x86/fujitsu-tablet.c
@@ -71,6 +71,44 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = {
         KEY_LEFTALT
 };
 
+static unsigned short keymap_Lifebook_T901[KEYMAP_LEN] __initdata = {
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_SCROLLDOWN,
+        KEY_SCROLLUP,
+        KEY_CYCLEWINDOWS,
+        KEY_LEFTCTRL,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_LEFTMETA
+};
+
+static unsigned short keymap_Lifebook_T902[KEYMAP_LEN] __initdata = {
+        KEY_RESERVED,
+        KEY_VOLUMEDOWN,
+        KEY_VOLUMEUP,
+        KEY_CYCLEWINDOWS,
+        KEY_PROG1,
+        KEY_PROG2,
+        KEY_LEFTMETA,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+};
+
 static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = {
         KEY_RESERVED,
         KEY_RESERVED,
@@ -302,6 +340,33 @@ static int fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
 static const struct dmi_system_id dmi_ids[] __initconst = {
         {
                 .callback = fujitsu_dmi_lifebook,
+                .ident = "Fujitsu Lifebook T901",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook T901")
+                },
+                .driver_data = keymap_Lifebook_T901
+        },
+        {
+                .callback = fujitsu_dmi_lifebook,
+                .ident = "Fujitsu Lifebook T901",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T901")
+                },
+                .driver_data = keymap_Lifebook_T901
+        },
+        {
+                .callback = fujitsu_dmi_lifebook,
+                .ident = "Fujitsu Lifebook T902",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T902")
+                },
+                .driver_data = keymap_Lifebook_T902
+        },
+        {
+                .callback = fujitsu_dmi_lifebook,
                 .ident = "Fujitsu Siemens P/T Series",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
diff --git a/drivers/platform/x86/intel_baytrail.c b/drivers/platform/x86/intel_baytrail.c
deleted file mode 100644
index f96626b17260..000000000000
--- a/drivers/platform/x86/intel_baytrail.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Baytrail IOSF-SB MailBox Interface Driver
- * Copyright (c) 2013, Intel Corporation.
- *
- * 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.
- *
- * This program is distributed in the hope 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.
- *
- *
- * The IOSF-SB is a fabric bus available on Atom based SOC's that uses a
- * mailbox interface (MBI) to communicate with mutiple devices. This
- * driver implements BayTrail-specific access to this interface.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/pci.h>
-
-#include "intel_baytrail.h"
-
-static DEFINE_SPINLOCK(iosf_mbi_lock);
-
-static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset)
-{
-        return (op << 24) | (port << 16) | (offset << 8) | BT_MBI_ENABLE;
-}
-
-static struct pci_dev *mbi_pdev;        /* one mbi device */
-
-/* Hold lock before calling */
-static int iosf_mbi_pci_read_mdr(u32 mcrx, u32 mcr, u32 *mdr)
-{
-        int result;
-
-        if (!mbi_pdev)
-                return -ENODEV;
-
-        if (mcrx) {
-                result = pci_write_config_dword(mbi_pdev,
-                                                BT_MBI_MCRX_OFFSET, mcrx);
-                if (result < 0)
-                        goto iosf_mbi_read_err;
-        }
-
-        result = pci_write_config_dword(mbi_pdev,
-                                        BT_MBI_MCR_OFFSET, mcr);
-        if (result < 0)
-                goto iosf_mbi_read_err;
-
-        result = pci_read_config_dword(mbi_pdev,
-                                       BT_MBI_MDR_OFFSET, mdr);
-        if (result < 0)
-                goto iosf_mbi_read_err;
-
-        return 0;
-
-iosf_mbi_read_err:
-        dev_err(&mbi_pdev->dev, "error: PCI config operation returned %d\n",
-                result);
-        return result;
-}
-
-/* Hold lock before calling */
-static int iosf_mbi_pci_write_mdr(u32 mcrx, u32 mcr, u32 mdr)
-{
-        int result;
-
-        if (!mbi_pdev)
-                return -ENODEV;
-
-        result = pci_write_config_dword(mbi_pdev,
-                                        BT_MBI_MDR_OFFSET, mdr);
-        if (result < 0)
-                goto iosf_mbi_write_err;
-
-        if (mcrx) {
-                result = pci_write_config_dword(mbi_pdev,
-                         BT_MBI_MCRX_OFFSET, mcrx);
-                if (result < 0)
-                        goto iosf_mbi_write_err;
-        }
-
-        result = pci_write_config_dword(mbi_pdev,
-                                        BT_MBI_MCR_OFFSET, mcr);
-        if (result < 0)
-                goto iosf_mbi_write_err;
-
-        return 0;
-
-iosf_mbi_write_err:
-        dev_err(&mbi_pdev->dev, "error: PCI config operation returned %d\n",
-                result);
-        return result;
-}
-
-int bt_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr)
-{
-        u32 mcr, mcrx;
-        unsigned long flags;
-        int ret;
-
-        /*Access to the GFX unit is handled by GPU code */
-        BUG_ON(port == BT_MBI_UNIT_GFX);
-
-        mcr = iosf_mbi_form_mcr(opcode, port, offset & BT_MBI_MASK_LO);
-        mcrx = offset & BT_MBI_MASK_HI;
-
-        spin_lock_irqsave(&iosf_mbi_lock, flags);
-        ret = iosf_mbi_pci_read_mdr(mcrx, mcr, mdr);
-        spin_unlock_irqrestore(&iosf_mbi_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(bt_mbi_read);
-
-int bt_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr)
-{
-        u32 mcr, mcrx;
-        unsigned long flags;
-        int ret;
-
-        /*Access to the GFX unit is handled by GPU code */
-        BUG_ON(port == BT_MBI_UNIT_GFX);
-
-        mcr = iosf_mbi_form_mcr(opcode, port, offset & BT_MBI_MASK_LO);
-        mcrx = offset & BT_MBI_MASK_HI;
-
-        spin_lock_irqsave(&iosf_mbi_lock, flags);
-        ret = iosf_mbi_pci_write_mdr(mcrx, mcr, mdr);
-        spin_unlock_irqrestore(&iosf_mbi_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(bt_mbi_write);
-
-int bt_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask)
-{
-        u32 mcr, mcrx;
-        u32 value;
-        unsigned long flags;
-        int ret;
-
-        /*Access to the GFX unit is handled by GPU code */
-        BUG_ON(port == BT_MBI_UNIT_GFX);
-
-        mcr = iosf_mbi_form_mcr(opcode, port, offset & BT_MBI_MASK_LO);
-        mcrx = offset & BT_MBI_MASK_HI;
-
-        spin_lock_irqsave(&iosf_mbi_lock, flags);
-
-        /* Read current mdr value */
-        ret = iosf_mbi_pci_read_mdr(mcrx, mcr & BT_MBI_RD_MASK, &value);
-        if (ret < 0) {
-                spin_unlock_irqrestore(&iosf_mbi_lock, flags);
-                return ret;
-        }
-
-        /* Apply mask */
-        value &= ~mask;
-        mdr &= mask;
-        value |= mdr;
-
-        /* Write back */
-        ret = iosf_mbi_pci_write_mdr(mcrx, mcr | BT_MBI_WR_MASK, value);
-
-        spin_unlock_irqrestore(&iosf_mbi_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(bt_mbi_modify);
-
-static int iosf_mbi_probe(struct pci_dev *pdev,
-                          const struct pci_device_id *unused)
-{
-        int ret;
-
-        ret = pci_enable_device(pdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "error: could not enable device\n");
-                return ret;
-        }
-
-        mbi_pdev = pci_dev_get(pdev);
-        return 0;
-}
-
-static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0F00) },
-        { 0, },
-};
-MODULE_DEVICE_TABLE(pci, iosf_mbi_pci_ids);
-
-static struct pci_driver iosf_mbi_pci_driver = {
-        .name           = "iosf_mbi_pci",
-        .probe          = iosf_mbi_probe,
-        .id_table       = iosf_mbi_pci_ids,
-};
-
-static int __init bt_mbi_init(void)
-{
-        return pci_register_driver(&iosf_mbi_pci_driver);
-}
-
-static void __exit bt_mbi_exit(void)
-{
-        pci_unregister_driver(&iosf_mbi_pci_driver);
-        if (mbi_pdev) {
-                pci_dev_put(mbi_pdev);
-                mbi_pdev = NULL;
-        }
-}
-
-module_init(bt_mbi_init);
-module_exit(bt_mbi_exit);
-
-MODULE_AUTHOR("David E. Box <david.e.box@linux.intel.com>");
-MODULE_DESCRIPTION("BayTrail Mailbox Interface accessor");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/platform/x86/intel_baytrail.h b/drivers/platform/x86/intel_baytrail.h
deleted file mode 100644
index 8bcc311262e9..000000000000
--- a/drivers/platform/x86/intel_baytrail.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * intel_baytrail.h: MailBox access support for Intel BayTrail platforms
- */
-
-#ifndef INTEL_BAYTRAIL_MBI_SYMS_H
-#define INTEL_BAYTRAIL_MBI_SYMS_H
-
-#define BT_MBI_MCR_OFFSET       0xD0
-#define BT_MBI_MDR_OFFSET       0xD4
-#define BT_MBI_MCRX_OFFSET      0xD8
-
-#define BT_MBI_RD_MASK          0xFEFFFFFF
-#define BT_MBI_WR_MASK          0X01000000
-
-#define BT_MBI_MASK_HI          0xFFFFFF00
-#define BT_MBI_MASK_LO          0x000000FF
-#define BT_MBI_ENABLE           0xF0
-
-/* BT-SB unit access methods */
-#define BT_MBI_UNIT_AUNIT       0x00
-#define BT_MBI_UNIT_SMC         0x01
-#define BT_MBI_UNIT_CPU         0x02
-#define BT_MBI_UNIT_BUNIT       0x03
-#define BT_MBI_UNIT_PMC         0x04
-#define BT_MBI_UNIT_GFX         0x06
-#define BT_MBI_UNIT_SMI         0x0C
-#define BT_MBI_UNIT_USB         0x43
-#define BT_MBI_UNIT_SATA        0xA3
-#define BT_MBI_UNIT_PCIE        0xA6
-
-/* Read/write opcodes */
-#define BT_MBI_AUNIT_READ       0x10
-#define BT_MBI_AUNIT_WRITE      0x11
-#define BT_MBI_SMC_READ         0x10
-#define BT_MBI_SMC_WRITE        0x11
-#define BT_MBI_CPU_READ         0x10
-#define BT_MBI_CPU_WRITE        0x11
-#define BT_MBI_BUNIT_READ       0x10
-#define BT_MBI_BUNIT_WRITE      0x11
-#define BT_MBI_PMC_READ         0x06
-#define BT_MBI_PMC_WRITE        0x07
-#define BT_MBI_GFX_READ         0x00
-#define BT_MBI_GFX_WRITE        0x01
-#define BT_MBI_SMIO_READ        0x06
-#define BT_MBI_SMIO_WRITE       0x07
-#define BT_MBI_USB_READ         0x06
-#define BT_MBI_USB_WRITE        0x07
-#define BT_MBI_SATA_READ        0x00
-#define BT_MBI_SATA_WRITE       0x01
-#define BT_MBI_PCIE_READ        0x00
-#define BT_MBI_PCIE_WRITE       0x01
-
-/**
- * bt_mbi_read() - MailBox Interface read command
- * @port:       port indicating subunit being accessed
- * @opcode:     port specific read or write opcode
- * @offset:     register address offset
- * @mdr:        register data to be read
- *
- * Locking is handled by spinlock - cannot sleep.
- * Return: Nonzero on error
- */
-int bt_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr);
-
-/**
- * bt_mbi_write() - MailBox unmasked write command
- * @port:       port indicating subunit being accessed
- * @opcode:     port specific read or write opcode
- * @offset:     register address offset
- * @mdr:        register data to be written
- *
- * Locking is handled by spinlock - cannot sleep.
- * Return: Nonzero on error
- */
-int bt_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr);
-
-/**
- * bt_mbi_modify() - MailBox masked write command
- * @port:       port indicating subunit being accessed
- * @opcode:     port specific read or write opcode
- * @offset:     register address offset
- * @mdr:        register data being modified
- * @mask:       mask indicating bits in mdr to be modified
- *
- * Locking is handled by spinlock - cannot sleep.
- * Return: Nonzero on error
- */
-int bt_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask);
-
-#endif /* INTEL_BAYTRAIL_MBI_SYMS_H */
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 609d38779b26..3f870972247c 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -449,6 +449,7 @@ static struct attribute_group pcc_attr_group = {
 
 /* hotkey input device driver */
 
+static int sleep_keydown_seen;
 static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
 {
         struct input_dev *hotk_input_dev = pcc->input_dev;
@@ -462,6 +463,16 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
                                  "error getting hotkey status\n"));
                 return;
         }
+
+        /* hack: some firmware sends no key down for sleep / hibernate */
+        if ((result & 0xf) == 0x7 || (result & 0xf) == 0xa) {
+                if (result & 0x80)
+                        sleep_keydown_seen = 1;
+                if (!sleep_keydown_seen)
+                        sparse_keymap_report_event(hotk_input_dev,
+                                        result & 0xf, 0x80, false);
+        }
+
         if (!sparse_keymap_report_event(hotk_input_dev,
                                         result & 0xf, result & 0x80, false))
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 8f8551a63cc0..9c5a07417b2b 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -76,8 +76,6 @@ do {						\
                 pr_warn(fmt, ##__VA_ARGS__);    \
 } while (0)
 
-#define SONY_LAPTOP_DRIVER_VERSION      "0.6"
-
 #define SONY_NC_CLASS           "sony-nc"
 #define SONY_NC_HID             "SNY5001"
 #define SONY_NC_DRIVER_NAME     "Sony Notebook Control Driver"
@@ -89,7 +87,6 @@ do {						\
 MODULE_AUTHOR("Stelian Pop, Mattia Dongili");
 MODULE_DESCRIPTION("Sony laptop extras driver (SPIC and SNC ACPI device)");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(SONY_LAPTOP_DRIVER_VERSION);
 
 static int debug;
 module_param(debug, int, 0);
@@ -129,7 +126,8 @@ static int kbd_backlight = -1;
 module_param(kbd_backlight, int, 0444);
 MODULE_PARM_DESC(kbd_backlight,
                  "set this to 0 to disable keyboard backlight, "
-                 "1 to enable it (default: no change from current value)");
+                 "1 to enable it with automatic control and 2 to have it always "
+                 "on (default: no change from current value)");
 
 static int kbd_backlight_timeout = -1;
 module_param(kbd_backlight_timeout, int, 0444);
@@ -152,7 +150,8 @@ static void sony_nc_battery_care_cleanup(struct platform_device *pd);
 static int sony_nc_thermal_setup(struct platform_device *pd);
 static void sony_nc_thermal_cleanup(struct platform_device *pd);
 
-static int sony_nc_lid_resume_setup(struct platform_device *pd);
+static int sony_nc_lid_resume_setup(struct platform_device *pd,
+                                    unsigned int handle);
 static void sony_nc_lid_resume_cleanup(struct platform_device *pd);
 
 static int sony_nc_gfx_switch_setup(struct platform_device *pd,
@@ -163,6 +162,21 @@ static int __sony_nc_gfx_switch_status_get(void);
 static int sony_nc_highspeed_charging_setup(struct platform_device *pd);
 static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd);
 
+static int sony_nc_lowbatt_setup(struct platform_device *pd);
+static void sony_nc_lowbatt_cleanup(struct platform_device *pd);
+
+static int sony_nc_fanspeed_setup(struct platform_device *pd);
+static void sony_nc_fanspeed_cleanup(struct platform_device *pd);
+
+static int sony_nc_usb_charge_setup(struct platform_device *pd);
+static void sony_nc_usb_charge_cleanup(struct platform_device *pd);
+
+static int sony_nc_panelid_setup(struct platform_device *pd);
+static void sony_nc_panelid_cleanup(struct platform_device *pd);
+
+static int sony_nc_smart_conn_setup(struct platform_device *pd);
+static void sony_nc_smart_conn_cleanup(struct platform_device *pd);
+
 static int sony_nc_touchpad_setup(struct platform_device *pd,
                                   unsigned int handle);
 static void sony_nc_touchpad_cleanup(struct platform_device *pd);
@@ -1122,6 +1136,8 @@ static struct sony_nc_event sony_100_events[] = {
         { 0x25, SONYPI_EVENT_ANYBUTTON_RELEASED },
         { 0xa6, SONYPI_EVENT_HELP_PRESSED },
         { 0x26, SONYPI_EVENT_ANYBUTTON_RELEASED },
+        { 0xa8, SONYPI_EVENT_FNKEY_1 },
+        { 0x28, SONYPI_EVENT_ANYBUTTON_RELEASED },
         { 0, 0 },
 };
 
@@ -1339,7 +1355,8 @@ static void sony_nc_function_setup(struct acpi_device *device,
                                                 result);
                         break;
                 case 0x0119:
-                        result = sony_nc_lid_resume_setup(pf_device);
+                case 0x015D:
+                        result = sony_nc_lid_resume_setup(pf_device, handle);
                         if (result)
                                 pr_err("couldn't set up lid resume function (%d)\n",
                                                 result);
@@ -1381,6 +1398,36 @@ static void sony_nc_function_setup(struct acpi_device *device,
                                 pr_err("couldn't set up keyboard backlight function (%d)\n",
                                                 result);
                         break;
+                case 0x0121:
+                        result = sony_nc_lowbatt_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up low battery function (%d)\n",
+                                       result);
+                        break;
+                case 0x0149:
+                        result = sony_nc_fanspeed_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up fan speed function (%d)\n",
+                                       result);
+                        break;
+                case 0x0155:
+                        result = sony_nc_usb_charge_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up USB charge support (%d)\n",
+                                                result);
+                        break;
+                case 0x011D:
+                        result = sony_nc_panelid_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up panel ID function (%d)\n",
+                                       result);
+                        break;
+                case 0x0168:
+                        result = sony_nc_smart_conn_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up smart connect support (%d)\n",
+                                                result);
+                        break;
                 default:
                         continue;
                 }
@@ -1420,6 +1467,7 @@ static void sony_nc_function_cleanup(struct platform_device *pd)
                         sony_nc_battery_care_cleanup(pd);
                         break;
                 case 0x0119:
+                case 0x015D:
                         sony_nc_lid_resume_cleanup(pd);
                         break;
                 case 0x0122:
@@ -1444,6 +1492,21 @@ static void sony_nc_function_cleanup(struct platform_device *pd)
                 case 0x0163:
                         sony_nc_kbd_backlight_cleanup(pd, handle);
                         break;
+                case 0x0121:
+                        sony_nc_lowbatt_cleanup(pd);
+                        break;
+                case 0x0149:
+                        sony_nc_fanspeed_cleanup(pd);
+                        break;
+                case 0x0155:
+                        sony_nc_usb_charge_cleanup(pd);
+                        break;
+                case 0x011D:
+                        sony_nc_panelid_cleanup(pd);
+                        break;
+                case 0x0168:
+                        sony_nc_smart_conn_cleanup(pd);
+                        break;
                 default:
                         continue;
                 }
@@ -1719,7 +1782,7 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
 {
         int result;
 
-        if (value > 1)
+        if (value > 2)
                 return -EINVAL;
 
         if (sony_call_snc_handle(kbdbl_ctl->handle,
@@ -1727,8 +1790,10 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
                 return -EIO;
 
         /* Try to turn the light on/off immediately */
-        sony_call_snc_handle(kbdbl_ctl->handle,
-                        (value << 0x10) | (kbdbl_ctl->base + 0x100), &result);
+        if (value != 1)
+                sony_call_snc_handle(kbdbl_ctl->handle,
+                                (value << 0x0f) | (kbdbl_ctl->base + 0x100),
+                                &result);
 
         kbdbl_ctl->mode = value;
 
@@ -2221,9 +2286,14 @@ static void sony_nc_thermal_resume(void)
 #endif
 
 /* resume on LID open */
+#define LID_RESUME_S5   0
+#define LID_RESUME_S4   1
+#define LID_RESUME_S3   2
+#define LID_RESUME_MAX  3
 struct snc_lid_resume_control {
-        struct device_attribute attrs[3];
+        struct device_attribute attrs[LID_RESUME_MAX];
         unsigned int status;
+        int handle;
 };
 static struct snc_lid_resume_control *lid_ctl;
 
@@ -2231,8 +2301,9 @@ static ssize_t sony_nc_lid_resume_store(struct device *dev,
                                         struct device_attribute *attr,
                                         const char *buffer, size_t count)
 {
-        unsigned int result, pos;
+        unsigned int result;
         unsigned long value;
+        unsigned int pos = LID_RESUME_S5;
         if (count > 31)
                 return -EINVAL;
 
@@ -2245,21 +2316,21 @@ static ssize_t sony_nc_lid_resume_store(struct device *dev,
          * +--------------+
          *   2    1    0
          */
-        if (strcmp(attr->attr.name, "lid_resume_S3") == 0)
-                pos = 2;
-        else if (strcmp(attr->attr.name, "lid_resume_S4") == 0)
-                pos = 1;
-        else if (strcmp(attr->attr.name, "lid_resume_S5") == 0)
-                pos = 0;
-        else
-               return -EINVAL;
+        while (pos < LID_RESUME_MAX) {
+                if (&lid_ctl->attrs[pos].attr == &attr->attr)
+                        break;
+                pos++;
+        }
+        if (pos == LID_RESUME_MAX)
+                return -EINVAL;
 
         if (value)
                 value = lid_ctl->status | (1 << pos);
         else
                 value = lid_ctl->status & ~(1 << pos);
 
-        if (sony_call_snc_handle(0x0119, value << 0x10 | 0x0100, &result))
+        if (sony_call_snc_handle(lid_ctl->handle, value << 0x10 | 0x0100,
+                                &result))
                 return -EIO;
 
         lid_ctl->status = value;
@@ -2268,29 +2339,27 @@ static ssize_t sony_nc_lid_resume_store(struct device *dev,
 }
 
 static ssize_t sony_nc_lid_resume_show(struct device *dev,
-                                       struct device_attribute *attr, char *buffer)
+                                        struct device_attribute *attr,
+                                        char *buffer)
 {
-        unsigned int pos;
+        unsigned int pos = LID_RESUME_S5;
 
-        if (strcmp(attr->attr.name, "lid_resume_S3") == 0)
-                pos = 2;
-        else if (strcmp(attr->attr.name, "lid_resume_S4") == 0)
-                pos = 1;
-        else if (strcmp(attr->attr.name, "lid_resume_S5") == 0)
-                pos = 0;
-        else
-                return -EINVAL;
-               
-        return snprintf(buffer, PAGE_SIZE, "%d\n",
-                        (lid_ctl->status >> pos) & 0x01);
+        while (pos < LID_RESUME_MAX) {
+                if (&lid_ctl->attrs[pos].attr == &attr->attr)
+                        return snprintf(buffer, PAGE_SIZE, "%d\n",
+                                        (lid_ctl->status >> pos) & 0x01);
+                pos++;
+        }
+        return -EINVAL;
 }
 
-static int sony_nc_lid_resume_setup(struct platform_device *pd)
+static int sony_nc_lid_resume_setup(struct platform_device *pd,
+                                        unsigned int handle)
 {
         unsigned int result;
         int i;
 
-        if (sony_call_snc_handle(0x0119, 0x0000, &result))
+        if (sony_call_snc_handle(handle, 0x0000, &result))
                 return -EIO;
 
         lid_ctl = kzalloc(sizeof(struct snc_lid_resume_control), GFP_KERNEL);
@@ -2298,26 +2367,29 @@ static int sony_nc_lid_resume_setup(struct platform_device *pd)
                 return -ENOMEM;
 
         lid_ctl->status = result & 0x7;
+        lid_ctl->handle = handle;
 
         sysfs_attr_init(&lid_ctl->attrs[0].attr);
-        lid_ctl->attrs[0].attr.name = "lid_resume_S3";
-        lid_ctl->attrs[0].attr.mode = S_IRUGO | S_IWUSR;
-        lid_ctl->attrs[0].show = sony_nc_lid_resume_show;
-        lid_ctl->attrs[0].store = sony_nc_lid_resume_store;
-
-        sysfs_attr_init(&lid_ctl->attrs[1].attr);
-        lid_ctl->attrs[1].attr.name = "lid_resume_S4";
-        lid_ctl->attrs[1].attr.mode = S_IRUGO | S_IWUSR;
-        lid_ctl->attrs[1].show = sony_nc_lid_resume_show;
-        lid_ctl->attrs[1].store = sony_nc_lid_resume_store;
-
-        sysfs_attr_init(&lid_ctl->attrs[2].attr);
-        lid_ctl->attrs[2].attr.name = "lid_resume_S5";
-        lid_ctl->attrs[2].attr.mode = S_IRUGO | S_IWUSR;
-        lid_ctl->attrs[2].show = sony_nc_lid_resume_show;
-        lid_ctl->attrs[2].store = sony_nc_lid_resume_store;
-
-        for (i = 0; i < 3; i++) {
+        lid_ctl->attrs[LID_RESUME_S5].attr.name = "lid_resume_S5";
+        lid_ctl->attrs[LID_RESUME_S5].attr.mode = S_IRUGO | S_IWUSR;
+        lid_ctl->attrs[LID_RESUME_S5].show = sony_nc_lid_resume_show;
+        lid_ctl->attrs[LID_RESUME_S5].store = sony_nc_lid_resume_store;
+
+        if (handle == 0x0119) {
+                sysfs_attr_init(&lid_ctl->attrs[1].attr);
+                lid_ctl->attrs[LID_RESUME_S4].attr.name = "lid_resume_S4";
+                lid_ctl->attrs[LID_RESUME_S4].attr.mode = S_IRUGO | S_IWUSR;
+                lid_ctl->attrs[LID_RESUME_S4].show = sony_nc_lid_resume_show;
+                lid_ctl->attrs[LID_RESUME_S4].store = sony_nc_lid_resume_store;
+
+                sysfs_attr_init(&lid_ctl->attrs[2].attr);
+                lid_ctl->attrs[LID_RESUME_S3].attr.name = "lid_resume_S3";
+                lid_ctl->attrs[LID_RESUME_S3].attr.mode = S_IRUGO | S_IWUSR;
+                lid_ctl->attrs[LID_RESUME_S3].show = sony_nc_lid_resume_show;
+                lid_ctl->attrs[LID_RESUME_S3].store = sony_nc_lid_resume_store;
+        }
+        for (i = 0; i < LID_RESUME_MAX &&
+                        lid_ctl->attrs[LID_RESUME_S3].attr.name; i++) {
                 result = device_create_file(&pd->dev, &lid_ctl->attrs[i]);
                 if (result)
                         goto liderror;
@@ -2340,8 +2412,12 @@ static void sony_nc_lid_resume_cleanup(struct platform_device *pd)
         int i;
 
         if (lid_ctl) {
-                for (i = 0; i < 3; i++)
+                for (i = 0; i < LID_RESUME_MAX; i++) {
+                        if (!lid_ctl->attrs[i].attr.name)
+                                break;
+
                         device_remove_file(&pd->dev, &lid_ctl->attrs[i]);
+                }
 
                 kfree(lid_ctl);
                 lid_ctl = NULL;
@@ -2524,6 +2600,355 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
         }
 }
 
+/* low battery function */
+static struct device_attribute *lowbatt_handle;
+
+static ssize_t sony_nc_lowbatt_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0121, value << 8, &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_lowbatt_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0121, 0x0200, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result & 1);
+}
+
+static int sony_nc_lowbatt_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        lowbatt_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!lowbatt_handle)
+                return -ENOMEM;
+
+        sysfs_attr_init(&lowbatt_handle->attr);
+        lowbatt_handle->attr.name = "lowbatt_hibernate";
+        lowbatt_handle->attr.mode = S_IRUGO | S_IWUSR;
+        lowbatt_handle->show = sony_nc_lowbatt_show;
+        lowbatt_handle->store = sony_nc_lowbatt_store;
+
+        result = device_create_file(&pd->dev, lowbatt_handle);
+        if (result) {
+                kfree(lowbatt_handle);
+                lowbatt_handle = NULL;
+                return result;
+        }
+
+        return 0;
+}
+
+static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
+{
+        if (lowbatt_handle) {
+                device_remove_file(&pd->dev, lowbatt_handle);
+                kfree(lowbatt_handle);
+                lowbatt_handle = NULL;
+        }
+}
+
+/* fan speed function */
+static struct device_attribute *fan_handle, *hsf_handle;
+
+static ssize_t sony_nc_hsfan_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0149, value << 0x10 | 0x0200, &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_hsfan_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0149, 0x0100, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result & 0x01);
+}
+
+static ssize_t sony_nc_fanspeed_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0149, 0x0300, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result & 0xff);
+}
+
+static int sony_nc_fanspeed_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        fan_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!fan_handle)
+                return -ENOMEM;
+
+        hsf_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!hsf_handle) {
+                result = -ENOMEM;
+                goto out_hsf_handle_alloc;
+        }
+
+        sysfs_attr_init(&fan_handle->attr);
+        fan_handle->attr.name = "fanspeed";
+        fan_handle->attr.mode = S_IRUGO;
+        fan_handle->show = sony_nc_fanspeed_show;
+        fan_handle->store = NULL;
+
+        sysfs_attr_init(&hsf_handle->attr);
+        hsf_handle->attr.name = "fan_forced";
+        hsf_handle->attr.mode = S_IRUGO | S_IWUSR;
+        hsf_handle->show = sony_nc_hsfan_show;
+        hsf_handle->store = sony_nc_hsfan_store;
+
+        result = device_create_file(&pd->dev, fan_handle);
+        if (result)
+                goto out_fan_handle;
+
+        result = device_create_file(&pd->dev, hsf_handle);
+        if (result)
+                goto out_hsf_handle;
+
+        return 0;
+
+out_hsf_handle:
+        device_remove_file(&pd->dev, fan_handle);
+
+out_fan_handle:
+        kfree(hsf_handle);
+        hsf_handle = NULL;
+
+out_hsf_handle_alloc:
+        kfree(fan_handle);
+        fan_handle = NULL;
+        return result;
+}
+
+static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
+{
+        if (fan_handle) {
+                device_remove_file(&pd->dev, fan_handle);
+                kfree(fan_handle);
+                fan_handle = NULL;
+        }
+        if (hsf_handle) {
+                device_remove_file(&pd->dev, hsf_handle);
+                kfree(hsf_handle);
+                hsf_handle = NULL;
+        }
+}
+
+/* USB charge function */
+static struct device_attribute *uc_handle;
+
+static ssize_t sony_nc_usb_charge_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0155, value << 0x10 | 0x0100, &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_usb_charge_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0155, 0x0000, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result & 0x01);
+}
+
+static int sony_nc_usb_charge_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0155, 0x0000, &result) || !(result & 0x01)) {
+                /* some models advertise the handle but have no implementation
+                 * for it
+                 */
+                pr_info("No USB Charge capability found\n");
+                return 0;
+        }
+
+        uc_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!uc_handle)
+                return -ENOMEM;
+
+        sysfs_attr_init(&uc_handle->attr);
+        uc_handle->attr.name = "usb_charge";
+        uc_handle->attr.mode = S_IRUGO | S_IWUSR;
+        uc_handle->show = sony_nc_usb_charge_show;
+        uc_handle->store = sony_nc_usb_charge_store;
+
+        result = device_create_file(&pd->dev, uc_handle);
+        if (result) {
+                kfree(uc_handle);
+                uc_handle = NULL;
+                return result;
+        }
+
+        return 0;
+}
+
+static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
+{
+        if (uc_handle) {
+                device_remove_file(&pd->dev, uc_handle);
+                kfree(uc_handle);
+                uc_handle = NULL;
+        }
+}
+
+/* Panel ID function */
+static struct device_attribute *panel_handle;
+
+static ssize_t sony_nc_panelid_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x011D, 0x0000, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result);
+}
+
+static int sony_nc_panelid_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        panel_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!panel_handle)
+                return -ENOMEM;
+
+        sysfs_attr_init(&panel_handle->attr);
+        panel_handle->attr.name = "panel_id";
+        panel_handle->attr.mode = S_IRUGO;
+        panel_handle->show = sony_nc_panelid_show;
+        panel_handle->store = NULL;
+
+        result = device_create_file(&pd->dev, panel_handle);
+        if (result) {
+                kfree(panel_handle);
+                panel_handle = NULL;
+                return result;
+        }
+
+        return 0;
+}
+
+static void sony_nc_panelid_cleanup(struct platform_device *pd)
+{
+        if (panel_handle) {
+                device_remove_file(&pd->dev, panel_handle);
+                kfree(panel_handle);
+                panel_handle = NULL;
+        }
+}
+
+/* smart connect function */
+static struct device_attribute *sc_handle;
+
+static ssize_t sony_nc_smart_conn_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0168, value << 0x10, &result))
+                return -EIO;
+
+        return count;
+}
+
+static int sony_nc_smart_conn_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        sc_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!sc_handle)
+                return -ENOMEM;
+
+        sysfs_attr_init(&sc_handle->attr);
+        sc_handle->attr.name = "smart_connect";
+        sc_handle->attr.mode = S_IWUSR;
+        sc_handle->show = NULL;
+        sc_handle->store = sony_nc_smart_conn_store;
+
+        result = device_create_file(&pd->dev, sc_handle);
+        if (result) {
+                kfree(sc_handle);
+                sc_handle = NULL;
+                return result;
+        }
+
+        return 0;
+}
+
+static void sony_nc_smart_conn_cleanup(struct platform_device *pd)
+{
+        if (sc_handle) {
+                device_remove_file(&pd->dev, sc_handle);
+                kfree(sc_handle);
+                sc_handle = NULL;
+        }
+}
+
 /* Touchpad enable/disable */
 struct touchpad_control {
         struct device_attribute attr;
@@ -2726,8 +3151,6 @@ static int sony_nc_add(struct acpi_device *device)
         int result = 0;
         struct sony_nc_value *item;
 
-        pr_info("%s v%s\n", SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);
-
         sony_nc_acpi_device = device;
         strcpy(acpi_device_class(device), "sony/hotkey");
 
@@ -2821,6 +3244,7 @@ static int sony_nc_add(struct acpi_device *device)
                 }
         }
 
+        pr_info("SNC setup done.\n");
         return 0;
 
 out_sysfs:
@@ -4259,8 +4683,6 @@ static int sony_pic_add(struct acpi_device *device)
         struct sony_pic_ioport *io, *tmp_io;
         struct sony_pic_irq *irq, *tmp_irq;
 
-        pr_info("%s v%s\n", SONY_PIC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);
-
         spic_dev.acpi_dev = device;
         strcpy(acpi_device_class(device), "sony/hotkey");
         sony_pic_detect_device_type(&spic_dev);
@@ -4360,6 +4782,7 @@ static int sony_pic_add(struct acpi_device *device)
         if (result)
                 goto err_remove_pf;
 
+        pr_info("SPIC setup done.\n");
         return 0;
 
 err_remove_pf:
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 94bb6157c957..15e61c16736e 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2321,53 +2321,55 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
         }
 }
 
-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
-                                           struct tp_nvram_state *newn,
-                                           const u32 event_mask)
-{
-
 #define TPACPI_COMPARE_KEY(__scancode, __member) \
-        do { \
-                if ((event_mask & (1 << __scancode)) && \
-                    oldn->__member != newn->__member) \
-                        tpacpi_hotkey_send_key(__scancode); \
-        } while (0)
+do { \
+        if ((event_mask & (1 << __scancode)) && \
+            oldn->__member != newn->__member) \
+                tpacpi_hotkey_send_key(__scancode); \
+} while (0)
 
 #define TPACPI_MAY_SEND_KEY(__scancode) \
-        do { \
-                if (event_mask & (1 << __scancode)) \
-                        tpacpi_hotkey_send_key(__scancode); \
-        } while (0)
+do { \
+        if (event_mask & (1 << __scancode)) \
+                tpacpi_hotkey_send_key(__scancode); \
+} while (0)
 
-        void issue_volchange(const unsigned int oldvol,
-                             const unsigned int newvol)
-        {
-                unsigned int i = oldvol;
+static void issue_volchange(const unsigned int oldvol,
+                            const unsigned int newvol,
+                            const u32 event_mask)
+{
+        unsigned int i = oldvol;
 
-                while (i > newvol) {
-                        TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
-                        i--;
-                }
-                while (i < newvol) {
-                        TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
-                        i++;
-                }
+        while (i > newvol) {
+                TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
+                i--;
+        }
+        while (i < newvol) {
+                TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
+                i++;
         }
+}
 
-        void issue_brightnesschange(const unsigned int oldbrt,
-                                    const unsigned int newbrt)
-        {
-                unsigned int i = oldbrt;
+static void issue_brightnesschange(const unsigned int oldbrt,
+                                   const unsigned int newbrt,
+                                   const u32 event_mask)
+{
+        unsigned int i = oldbrt;
 
-                while (i > newbrt) {
-                        TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
-                        i--;
-                }
-                while (i < newbrt) {
-                        TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
-                        i++;
-                }
+        while (i > newbrt) {
+                TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
+                i--;
         }
+        while (i < newbrt) {
+                TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
+                i++;
+        }
+}
+
+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+                                           struct tp_nvram_state *newn,
+                                           const u32 event_mask)
+{
 
         TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
         TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
@@ -2402,7 +2404,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
                     oldn->volume_level != newn->volume_level) {
                         /* recently muted, or repeated mute keypress, or
                          * multiple presses ending in mute */
-                        issue_volchange(oldn->volume_level, newn->volume_level);
+                        issue_volchange(oldn->volume_level, newn->volume_level,
+                                event_mask);
                         TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
                 }
         } else {
@@ -2412,7 +2415,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
                         TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
                 }
                 if (oldn->volume_level != newn->volume_level) {
-                        issue_volchange(oldn->volume_level, newn->volume_level);
+                        issue_volchange(oldn->volume_level, newn->volume_level,
+                                event_mask);
                 } else if (oldn->volume_toggle != newn->volume_toggle) {
                         /* repeated vol up/down keypress at end of scale ? */
                         if (newn->volume_level == 0)
@@ -2425,7 +2429,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
         /* handle brightness */
         if (oldn->brightness_level != newn->brightness_level) {
                 issue_brightnesschange(oldn->brightness_level,
-                                       newn->brightness_level);
+                                       newn->brightness_level, event_mask);
         } else if (oldn->brightness_toggle != newn->brightness_toggle) {
                 /* repeated key presses that didn't change state */
                 if (newn->brightness_level == 0)
@@ -3437,6 +3441,106 @@ err_exit:
         return (res < 0)? res : 1;
 }
 
+/* Thinkpad X1 Carbon support 5 modes including Home mode, Web browser
+ * mode, Web conference mode, Function mode and Lay-flat mode.
+ * We support Home mode and Function mode currently.
+ *
+ * Will consider support rest of modes in future.
+ *
+ */
+enum ADAPTIVE_KEY_MODE {
+        HOME_MODE,
+        WEB_BROWSER_MODE,
+        WEB_CONFERENCE_MODE,
+        FUNCTION_MODE,
+        LAYFLAT_MODE
+};
+
+const int adaptive_keyboard_modes[] = {
+        HOME_MODE,
+/*      WEB_BROWSER_MODE = 2,
+        WEB_CONFERENCE_MODE = 3, */
+        FUNCTION_MODE
+};
+
+#define DFR_CHANGE_ROW                  0x101
+#define DFR_SHOW_QUICKVIEW_ROW          0x102
+
+/* press Fn key a while second, it will switch to Function Mode. Then
+ * release Fn key, previous mode be restored.
+ */
+static bool adaptive_keyboard_mode_is_saved;
+static int adaptive_keyboard_prev_mode;
+
+static int adaptive_keyboard_get_next_mode(int mode)
+{
+        size_t i;
+        size_t max_mode = ARRAY_SIZE(adaptive_keyboard_modes) - 1;
+
+        for (i = 0; i <= max_mode; i++) {
+                if (adaptive_keyboard_modes[i] == mode)
+                        break;
+        }
+
+        if (i >= max_mode)
+                i = 0;
+        else
+                i++;
+
+        return adaptive_keyboard_modes[i];
+}
+
+static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
+{
+        u32 current_mode = 0;
+        int new_mode = 0;
+
+        switch (scancode) {
+        case DFR_CHANGE_ROW:
+                if (adaptive_keyboard_mode_is_saved) {
+                        new_mode = adaptive_keyboard_prev_mode;
+                        adaptive_keyboard_mode_is_saved = false;
+                } else {
+                        if (!acpi_evalf(
+                                        hkey_handle, &current_mode,
+                                        "GTRW", "dd", 0)) {
+                                pr_err("Cannot read adaptive keyboard mode\n");
+                                return false;
+                        } else {
+                                new_mode = adaptive_keyboard_get_next_mode(
+                                                current_mode);
+                        }
+                }
+
+                if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd", new_mode)) {
+                        pr_err("Cannot set adaptive keyboard mode\n");
+                        return false;
+                }
+
+                return true;
+
+        case DFR_SHOW_QUICKVIEW_ROW:
+                if (!acpi_evalf(hkey_handle,
+                                &adaptive_keyboard_prev_mode,
+                                "GTRW", "dd", 0)) {
+                        pr_err("Cannot read adaptive keyboard mode\n");
+                        return false;
+                } else {
+                        adaptive_keyboard_mode_is_saved = true;
+
+                        if (!acpi_evalf(hkey_handle,
+                                        NULL, "STRW", "vd", FUNCTION_MODE)) {
+                                pr_err("Cannot set adaptive keyboard mode\n");
+                                return false;
+                        }
+                }
+                return true;
+
+        default:
+                return false;
+        }
+}
+
 static bool hotkey_notify_hotkey(const u32 hkey,
                                  bool *send_acpi_ev,
                                  bool *ignore_acpi_ev)
@@ -3456,6 +3560,8 @@ static bool hotkey_notify_hotkey(const u32 hkey,
                         *ignore_acpi_ev = true;
                 }
                 return true;
+        } else {
+                return adaptive_keyboard_hotkey_notify_hotkey(scancode);
         }
         return false;
 }
@@ -3728,13 +3834,28 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
 
 static void hotkey_suspend(void)
 {
+        int hkeyv;
+
         /* Do these on suspend, we get the events on early resume! */
         hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE;
         hotkey_autosleep_ack = 0;
+
+        /* save previous mode of adaptive keyboard of X1 Carbon */
+        if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
+                if ((hkeyv >> 8) == 2) {
+                        if (!acpi_evalf(hkey_handle,
+                                                &adaptive_keyboard_prev_mode,
+                                                "GTRW", "dd", 0)) {
+                                pr_err("Cannot read adaptive keyboard mode.\n");
+                        }
+                }
+        }
 }
 
 static void hotkey_resume(void)
 {
+        int hkeyv;
+
         tpacpi_disable_brightness_delay();
 
         if (hotkey_status_set(true) < 0 ||
@@ -3747,6 +3868,18 @@ static void hotkey_resume(void)
         hotkey_wakeup_reason_notify_change();
         hotkey_wakeup_hotunplug_complete_notify_change();
         hotkey_poll_setup_safe(false);
+
+        /* restore previous mode of adapive keyboard of X1 Carbon */
+        if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
+                if ((hkeyv >> 8) == 2) {
+                        if (!acpi_evalf(hkey_handle,
+                                                NULL,
+                                                "STRW", "vd",
+                                                adaptive_keyboard_prev_mode)) {
+                                pr_err("Cannot set adaptive keyboard mode.\n");
+                        }
+                }
+        }
 }
 
 /* procfs -------------------------------------------------------------- */
@@ -8447,9 +8580,21 @@ static void mute_led_exit(void)
                 tpacpi_led_set(i, false);
 }
 
+static void mute_led_resume(void)
+{
+        int i;
+
+        for (i = 0; i < TPACPI_LED_MAX; i++) {
+                struct tp_led_table *t = &led_tables[i];
+                if (t->state >= 0)
+                        mute_led_on_off(t, t->state);
+        }
+}
+
 static struct ibm_struct mute_led_driver_data = {
         .name = "mute_led",
         .exit = mute_led_exit,
+        .resume = mute_led_resume,
 };
 
 /****************************************************************************
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 90dd7645a9e5..46473ca7566b 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -5,6 +5,7 @@
  *  Copyright (C) 2002-2004 John Belmonte
  *  Copyright (C) 2008 Philip Langdale
  *  Copyright (C) 2010 Pierre Ducroquet
+ *  Copyright (C) 2014 Azael Avalos
  *
  *  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
@@ -37,7 +38,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#define TOSHIBA_ACPI_VERSION    "0.19"
+#define TOSHIBA_ACPI_VERSION    "0.20"
 #define PROC_INTERFACE_VERSION  1
 
 #include <linux/kernel.h>
@@ -77,6 +78,9 @@ MODULE_LICENSE("GPL");
  * However the ACPI methods seem to be incomplete in some areas (for
  * example they allow setting, but not reading, the LCD brightness value),
  * so this is still useful.
+ *
+ * SCI stands for "System Configuration Interface" which aim is to
+ * conceal differences in hardware between different models.
  */
 
 #define HCI_WORDS                       6
@@ -84,12 +88,23 @@ MODULE_LICENSE("GPL");
 /* operations */
 #define HCI_SET                         0xff00
 #define HCI_GET                         0xfe00
+#define SCI_OPEN                        0xf100
+#define SCI_CLOSE                       0xf200
+#define SCI_GET                         0xf300
+#define SCI_SET                         0xf400
 
 /* return codes */
 #define HCI_SUCCESS                     0x0000
 #define HCI_FAILURE                     0x1000
 #define HCI_NOT_SUPPORTED               0x8000
 #define HCI_EMPTY                       0x8c00
+#define HCI_DATA_NOT_AVAILABLE          0x8d20
+#define HCI_NOT_INITIALIZED             0x8d50
+#define SCI_OPEN_CLOSE_OK               0x0044
+#define SCI_ALREADY_OPEN                0x8100
+#define SCI_NOT_OPENED                  0x8200
+#define SCI_INPUT_DATA_ERROR            0x8300
+#define SCI_NOT_PRESENT                 0x8600
 
 /* registers */
 #define HCI_FAN                         0x0004
@@ -99,13 +114,22 @@ MODULE_LICENSE("GPL");
 #define HCI_HOTKEY_EVENT                0x001e
 #define HCI_LCD_BRIGHTNESS              0x002a
 #define HCI_WIRELESS                    0x0056
+#define HCI_ACCELEROMETER               0x006d
+#define HCI_KBD_ILLUMINATION            0x0095
+#define HCI_ECO_MODE                    0x0097
+#define HCI_ACCELEROMETER2              0x00a6
+#define SCI_ILLUMINATION                0x014e
+#define SCI_KBD_ILLUM_STATUS            0x015c
+#define SCI_TOUCHPAD                    0x050e
 
 /* field definitions */
+#define HCI_ACCEL_MASK                  0x7fff
 #define HCI_HOTKEY_DISABLE              0x0b
 #define HCI_HOTKEY_ENABLE               0x09
 #define HCI_LCD_BRIGHTNESS_BITS         3
 #define HCI_LCD_BRIGHTNESS_SHIFT        (16-HCI_LCD_BRIGHTNESS_BITS)
 #define HCI_LCD_BRIGHTNESS_LEVELS       (1 << HCI_LCD_BRIGHTNESS_BITS)
+#define HCI_MISC_SHIFT                  0x10
 #define HCI_VIDEO_OUT_LCD               0x1
 #define HCI_VIDEO_OUT_CRT               0x2
 #define HCI_VIDEO_OUT_TV                0x4
@@ -113,6 +137,8 @@ MODULE_LICENSE("GPL");
 #define HCI_WIRELESS_BT_PRESENT         0x0f
 #define HCI_WIRELESS_BT_ATTACH          0x40
 #define HCI_WIRELESS_BT_POWER           0x80
+#define SCI_KBD_MODE_FNZ                0x1
+#define SCI_KBD_MODE_AUTO               0x2
 
 struct toshiba_acpi_dev {
         struct acpi_device *acpi_dev;
@@ -122,10 +148,14 @@ struct toshiba_acpi_dev {
         struct work_struct hotkey_work;
         struct backlight_device *backlight_dev;
         struct led_classdev led_dev;
+        struct led_classdev kbd_led;
+        struct led_classdev eco_led;
 
         int force_fan;
         int last_key_event;
         int key_event_valid;
+        int kbd_mode;
+        int kbd_time;
 
         unsigned int illumination_supported:1;
         unsigned int video_supported:1;
@@ -134,6 +164,12 @@ struct toshiba_acpi_dev {
         unsigned int ntfy_supported:1;
         unsigned int info_supported:1;
         unsigned int tr_backlight_supported:1;
+        unsigned int kbd_illum_supported:1;
+        unsigned int kbd_led_registered:1;
+        unsigned int touchpad_supported:1;
+        unsigned int eco_supported:1;
+        unsigned int accelerometer_supported:1;
+        unsigned int sysfs_created:1;
 
         struct mutex mutex;
 };
@@ -280,21 +316,94 @@ static acpi_status hci_read2(struct toshiba_acpi_dev *dev, u32 reg,
         return status;
 }
 
+/* common sci tasks
+ */
+
+static int sci_open(struct toshiba_acpi_dev *dev)
+{
+        u32 in[HCI_WORDS] = { SCI_OPEN, 0, 0, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
+
+        status = hci_raw(dev, in, out);
+        if  (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
+                pr_err("ACPI call to open SCI failed\n");
+                return 0;
+        }
+
+        if (out[0] == SCI_OPEN_CLOSE_OK) {
+                return 1;
+        } else if (out[0] == SCI_ALREADY_OPEN) {
+                pr_info("Toshiba SCI already opened\n");
+                return 1;
+        } else if (out[0] == SCI_NOT_PRESENT) {
+                pr_info("Toshiba SCI is not present\n");
+        }
+
+        return 0;
+}
+
+static void sci_close(struct toshiba_acpi_dev *dev)
+{
+        u32 in[HCI_WORDS] = { SCI_CLOSE, 0, 0, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
+
+        status = hci_raw(dev, in, out);
+        if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
+                pr_err("ACPI call to close SCI failed\n");
+                return;
+        }
+
+        if (out[0] == SCI_OPEN_CLOSE_OK)
+                return;
+        else if (out[0] == SCI_NOT_OPENED)
+                pr_info("Toshiba SCI not opened\n");
+        else if (out[0] == SCI_NOT_PRESENT)
+                pr_info("Toshiba SCI is not present\n");
+}
+
+static acpi_status sci_read(struct toshiba_acpi_dev *dev, u32 reg,
+                            u32 *out1, u32 *result)
+{
+        u32 in[HCI_WORDS] = { SCI_GET, reg, 0, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status = hci_raw(dev, in, out);
+        *out1 = out[2];
+        *result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
+        return status;
+}
+
+static acpi_status sci_write(struct toshiba_acpi_dev *dev, u32 reg,
+                             u32 in1, u32 *result)
+{
+        u32 in[HCI_WORDS] = { SCI_SET, reg, in1, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status = hci_raw(dev, in, out);
+        *result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
+        return status;
+}
+
 /* Illumination support */
 static int toshiba_illumination_available(struct toshiba_acpi_dev *dev)
 {
-        u32 in[HCI_WORDS] = { 0, 0, 0, 0, 0, 0 };
+        u32 in[HCI_WORDS] = { SCI_GET, SCI_ILLUMINATION, 0, 0, 0, 0 };
         u32 out[HCI_WORDS];
         acpi_status status;
 
-        in[0] = 0xf100;
+        if (!sci_open(dev))
+                return 0;
+
         status = hci_raw(dev, in, out);
-        if (ACPI_FAILURE(status)) {
+        sci_close(dev);
+        if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
+                pr_err("ACPI call to query Illumination support failed\n");
+                return 0;
+        } else if (out[0] == HCI_NOT_SUPPORTED || out[1] != 1) {
                 pr_info("Illumination device not available\n");
                 return 0;
         }
-        in[0] = 0xf400;
-        status = hci_raw(dev, in, out);
+
         return 1;
 }
 
@@ -303,82 +412,270 @@ static void toshiba_illumination_set(struct led_classdev *cdev,
 {
         struct toshiba_acpi_dev *dev = container_of(cdev,
                         struct toshiba_acpi_dev, led_dev);
-        u32 in[HCI_WORDS] = { 0, 0, 0, 0, 0, 0 };
-        u32 out[HCI_WORDS];
+        u32 state, result;
         acpi_status status;
 
         /* First request : initialize communication. */
-        in[0] = 0xf100;
-        status = hci_raw(dev, in, out);
+        if (!sci_open(dev))
+                return;
+
+        /* Switch the illumination on/off */
+        state = brightness ? 1 : 0;
+        status = sci_write(dev, SCI_ILLUMINATION, state, &result);
+        sci_close(dev);
         if (ACPI_FAILURE(status)) {
-                pr_info("Illumination device not available\n");
+                pr_err("ACPI call for illumination failed\n");
+                return;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Illumination not supported\n");
                 return;
         }
+}
 
-        if (brightness) {
-                /* Switch the illumination on */
-                in[0] = 0xf400;
-                in[1] = 0x14e;
-                in[2] = 1;
-                status = hci_raw(dev, in, out);
-                if (ACPI_FAILURE(status)) {
-                        pr_info("ACPI call for illumination failed\n");
-                        return;
-                }
-        } else {
-                /* Switch the illumination off */
-                in[0] = 0xf400;
-                in[1] = 0x14e;
-                in[2] = 0;
-                status = hci_raw(dev, in, out);
-                if (ACPI_FAILURE(status)) {
-                        pr_info("ACPI call for illumination failed.\n");
-                        return;
-                }
+static enum led_brightness toshiba_illumination_get(struct led_classdev *cdev)
+{
+        struct toshiba_acpi_dev *dev = container_of(cdev,
+                        struct toshiba_acpi_dev, led_dev);
+        u32 state, result;
+        acpi_status status;
+
+        /* First request : initialize communication. */
+        if (!sci_open(dev))
+                return LED_OFF;
+
+        /* Check the illumination */
+        status = sci_read(dev, SCI_ILLUMINATION, &state, &result);
+        sci_close(dev);
+        if (ACPI_FAILURE(status) || result == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call for illumination failed\n");
+                return LED_OFF;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Illumination not supported\n");
+                return LED_OFF;
         }
 
-        /* Last request : close communication. */
-        in[0] = 0xf200;
-        in[1] = 0;
-        in[2] = 0;
-        hci_raw(dev, in, out);
+        return state ? LED_FULL : LED_OFF;
 }
 
-static enum led_brightness toshiba_illumination_get(struct led_classdev *cdev)
+/* KBD Illumination */
+static int toshiba_kbd_illum_status_set(struct toshiba_acpi_dev *dev, u32 time)
+{
+        u32 result;
+        acpi_status status;
+
+        if (!sci_open(dev))
+                return -EIO;
+
+        status = sci_write(dev, SCI_KBD_ILLUM_STATUS, time, &result);
+        sci_close(dev);
+        if (ACPI_FAILURE(status) || result == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to set KBD backlight status failed\n");
+                return -EIO;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Keyboard backlight status not supported\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int toshiba_kbd_illum_status_get(struct toshiba_acpi_dev *dev, u32 *time)
+{
+        u32 result;
+        acpi_status status;
+
+        if (!sci_open(dev))
+                return -EIO;
+
+        status = sci_read(dev, SCI_KBD_ILLUM_STATUS, time, &result);
+        sci_close(dev);
+        if (ACPI_FAILURE(status) || result == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to get KBD backlight status failed\n");
+                return -EIO;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Keyboard backlight status not supported\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static enum led_brightness toshiba_kbd_backlight_get(struct led_classdev *cdev)
 {
         struct toshiba_acpi_dev *dev = container_of(cdev,
-                        struct toshiba_acpi_dev, led_dev);
-        u32 in[HCI_WORDS] = { 0, 0, 0, 0, 0, 0 };
+                        struct toshiba_acpi_dev, kbd_led);
+        u32 state, result;
+        acpi_status status;
+
+        /* Check the keyboard backlight state */
+        status = hci_read1(dev, HCI_KBD_ILLUMINATION, &state, &result);
+        if (ACPI_FAILURE(status) || result == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to get the keyboard backlight failed\n");
+                return LED_OFF;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Keyboard backlight not supported\n");
+                return LED_OFF;
+        }
+
+        return state ? LED_FULL : LED_OFF;
+}
+
+static void toshiba_kbd_backlight_set(struct led_classdev *cdev,
+                                     enum led_brightness brightness)
+{
+        struct toshiba_acpi_dev *dev = container_of(cdev,
+                        struct toshiba_acpi_dev, kbd_led);
+        u32 state, result;
+        acpi_status status;
+
+        /* Set the keyboard backlight state */
+        state = brightness ? 1 : 0;
+        status = hci_write1(dev, HCI_KBD_ILLUMINATION, state, &result);
+        if (ACPI_FAILURE(status) || result == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to set KBD Illumination mode failed\n");
+                return;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                pr_info("Keyboard backlight not supported\n");
+                return;
+        }
+}
+
+/* TouchPad support */
+static int toshiba_touchpad_set(struct toshiba_acpi_dev *dev, u32 state)
+{
+        u32 result;
+        acpi_status status;
+
+        if (!sci_open(dev))
+                return -EIO;
+
+        status = sci_write(dev, SCI_TOUCHPAD, state, &result);
+        sci_close(dev);
+        if (ACPI_FAILURE(status)) {
+                pr_err("ACPI call to set the touchpad failed\n");
+                return -EIO;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int toshiba_touchpad_get(struct toshiba_acpi_dev *dev, u32 *state)
+{
+        u32 result;
+        acpi_status status;
+
+        if (!sci_open(dev))
+                return -EIO;
+
+        status = sci_read(dev, SCI_TOUCHPAD, state, &result);
+        sci_close(dev);
+        if (ACPI_FAILURE(status)) {
+                pr_err("ACPI call to query the touchpad failed\n");
+                return -EIO;
+        } else if (result == HCI_NOT_SUPPORTED) {
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+/* Eco Mode support */
+static int toshiba_eco_mode_available(struct toshiba_acpi_dev *dev)
+{
+        acpi_status status;
+        u32 in[HCI_WORDS] = { HCI_GET, HCI_ECO_MODE, 0, 1, 0, 0 };
+        u32 out[HCI_WORDS];
+
+        status = hci_raw(dev, in, out);
+        if (ACPI_FAILURE(status) || out[0] == SCI_INPUT_DATA_ERROR) {
+                pr_info("ACPI call to get ECO led failed\n");
+                return 0;
+        }
+
+        return 1;
+}
+
+static enum led_brightness toshiba_eco_mode_get_status(struct led_classdev *cdev)
+{
+        struct toshiba_acpi_dev *dev = container_of(cdev,
+                        struct toshiba_acpi_dev, eco_led);
+        u32 in[HCI_WORDS] = { HCI_GET, HCI_ECO_MODE, 0, 1, 0, 0 };
         u32 out[HCI_WORDS];
         acpi_status status;
-        enum led_brightness result;
 
-        /* First request : initialize communication. */
-        in[0] = 0xf100;
         status = hci_raw(dev, in, out);
-        if (ACPI_FAILURE(status)) {
-                pr_info("Illumination device not available\n");
+        if (ACPI_FAILURE(status) || out[0] == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to get ECO led failed\n");
                 return LED_OFF;
         }
 
-        /* Check the illumination */
-        in[0] = 0xf300;
-        in[1] = 0x14e;
+        return out[2] ? LED_FULL : LED_OFF;
+}
+
+static void toshiba_eco_mode_set_status(struct led_classdev *cdev,
+                                     enum led_brightness brightness)
+{
+        struct toshiba_acpi_dev *dev = container_of(cdev,
+                        struct toshiba_acpi_dev, eco_led);
+        u32 in[HCI_WORDS] = { HCI_SET, HCI_ECO_MODE, 0, 1, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
+
+        /* Switch the Eco Mode led on/off */
+        in[2] = (brightness) ? 1 : 0;
         status = hci_raw(dev, in, out);
-        if (ACPI_FAILURE(status)) {
-                pr_info("ACPI call for illumination failed.\n");
-                return LED_OFF;
+        if (ACPI_FAILURE(status) || out[0] == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to set ECO led failed\n");
+                return;
         }
+}
 
-        result = out[2] ? LED_FULL : LED_OFF;
+/* Accelerometer support */
+static int toshiba_accelerometer_supported(struct toshiba_acpi_dev *dev)
+{
+        u32 in[HCI_WORDS] = { HCI_GET, HCI_ACCELEROMETER2, 0, 0, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
+
+        /* Check if the accelerometer call exists,
+         * this call also serves as initialization
+         */
+        status = hci_raw(dev, in, out);
+        if (ACPI_FAILURE(status) || out[0] == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to query the accelerometer failed\n");
+                return -EIO;
+        } else if (out[0] == HCI_DATA_NOT_AVAILABLE ||
+                   out[0] == HCI_NOT_INITIALIZED) {
+                pr_err("Accelerometer not initialized\n");
+                return -EIO;
+        } else if (out[0] == HCI_NOT_SUPPORTED) {
+                pr_info("Accelerometer not supported\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev,
+                                      u32 *xy, u32 *z)
+{
+        u32 in[HCI_WORDS] = { HCI_GET, HCI_ACCELEROMETER, 0, 1, 0, 0 };
+        u32 out[HCI_WORDS];
+        acpi_status status;
+
+        /* Check the Accelerometer status */
+        status = hci_raw(dev, in, out);
+        if (ACPI_FAILURE(status) || out[0] == SCI_INPUT_DATA_ERROR) {
+                pr_err("ACPI call to query the accelerometer failed\n");
+                return -EIO;
+        }
 
-        /* Last request : close communication. */
-        in[0] = 0xf200;
-        in[1] = 0;
-        in[2] = 0;
-        hci_raw(dev, in, out);
+        *xy = out[2];
+        *z = out[4];
 
-        return result;
+        return 0;
 }
 
 /* Bluetooth rfkill handlers */
@@ -904,6 +1201,177 @@ static const struct backlight_ops toshiba_backlight_data = {
         .update_status  = set_lcd_status,
 };
 
+/*
+ * Sysfs files
+ */
+
+static ssize_t toshiba_kbd_bl_mode_store(struct device *dev,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        int mode = -1;
+        int time = -1;
+
+        if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1))
+                return -EINVAL;
+
+        /* Set the Keyboard Backlight Mode where:
+         * Mode - Auto (2) | FN-Z (1)
+         *      Auto - KBD backlight turns off automatically in given time
+         *      FN-Z - KBD backlight "toggles" when hotkey pressed
+         */
+        if (mode != -1 && toshiba->kbd_mode != mode) {
+                time = toshiba->kbd_time << HCI_MISC_SHIFT;
+                time = time + toshiba->kbd_mode;
+                if (toshiba_kbd_illum_status_set(toshiba, time) < 0)
+                        return -EIO;
+                toshiba->kbd_mode = mode;
+        }
+
+        return count;
+}
+
+static ssize_t toshiba_kbd_bl_mode_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        u32 time;
+
+        if (toshiba_kbd_illum_status_get(toshiba, &time) < 0)
+                return -EIO;
+
+        return sprintf(buf, "%i\n", time & 0x07);
+}
+
+static ssize_t toshiba_kbd_bl_timeout_store(struct device *dev,
+                                            struct device_attribute *attr,
+                                            const char *buf, size_t count)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        int time = -1;
+
+        if (sscanf(buf, "%i", &time) != 1 && (time < 0 || time > 60))
+                return -EINVAL;
+
+        /* Set the Keyboard Backlight Timeout: 0-60 seconds */
+        if (time != -1 && toshiba->kbd_time != time) {
+                time = time << HCI_MISC_SHIFT;
+                time = (toshiba->kbd_mode == SCI_KBD_MODE_AUTO) ?
+                                                        time + 1 : time + 2;
+                if (toshiba_kbd_illum_status_set(toshiba, time) < 0)
+                        return -EIO;
+                toshiba->kbd_time = time >> HCI_MISC_SHIFT;
+        }
+
+        return count;
+}
+
+static ssize_t toshiba_kbd_bl_timeout_show(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        u32 time;
+
+        if (toshiba_kbd_illum_status_get(toshiba, &time) < 0)
+                return -EIO;
+
+        return sprintf(buf, "%i\n", time >> HCI_MISC_SHIFT);
+}
+
+static ssize_t toshiba_touchpad_store(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        int state;
+
+        /* Set the TouchPad on/off, 0 - Disable | 1 - Enable */
+        if (sscanf(buf, "%i", &state) == 1 && (state == 0 || state == 1)) {
+                if (toshiba_touchpad_set(toshiba, state) < 0)
+                        return -EIO;
+        }
+
+        return count;
+}
+
+static ssize_t toshiba_touchpad_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        u32 state;
+        int ret;
+
+        ret = toshiba_touchpad_get(toshiba, &state);
+        if (ret < 0)
+                return ret;
+
+        return sprintf(buf, "%i\n", state);
+}
+
+static ssize_t toshiba_position_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
+        u32 xyval, zval, tmp;
+        u16 x, y, z;
+        int ret;
+
+        xyval = zval = 0;
+        ret = toshiba_accelerometer_get(toshiba, &xyval, &zval);
+        if (ret < 0)
+                return ret;
+
+        x = xyval & HCI_ACCEL_MASK;
+        tmp = xyval >> HCI_MISC_SHIFT;
+        y = tmp & HCI_ACCEL_MASK;
+        z = zval & HCI_ACCEL_MASK;
+
+        return sprintf(buf, "%d %d %d\n", x, y, z);
+}
+
+static DEVICE_ATTR(kbd_backlight_mode, S_IRUGO | S_IWUSR,
+                   toshiba_kbd_bl_mode_show, toshiba_kbd_bl_mode_store);
+static DEVICE_ATTR(kbd_backlight_timeout, S_IRUGO | S_IWUSR,
+                   toshiba_kbd_bl_timeout_show, toshiba_kbd_bl_timeout_store);
+static DEVICE_ATTR(touchpad, S_IRUGO | S_IWUSR,
+                   toshiba_touchpad_show, toshiba_touchpad_store);
+static DEVICE_ATTR(position, S_IRUGO, toshiba_position_show, NULL);
+
+static struct attribute *toshiba_attributes[] = {
+        &dev_attr_kbd_backlight_mode.attr,
+        &dev_attr_kbd_backlight_timeout.attr,
+        &dev_attr_touchpad.attr,
+        &dev_attr_position.attr,
+        NULL,
+};
+
+static umode_t toshiba_sysfs_is_visible(struct kobject *kobj,
+                                        struct attribute *attr, int idx)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct toshiba_acpi_dev *drv = dev_get_drvdata(dev);
+        bool exists = true;
+
+        if (attr == &dev_attr_kbd_backlight_mode.attr)
+                exists = (drv->kbd_illum_supported) ? true : false;
+        else if (attr == &dev_attr_kbd_backlight_timeout.attr)
+                exists = (drv->kbd_mode == SCI_KBD_MODE_AUTO) ? true : false;
+        else if (attr == &dev_attr_touchpad.attr)
+                exists = (drv->touchpad_supported) ? true : false;
+        else if (attr == &dev_attr_position.attr)
+                exists = (drv->accelerometer_supported) ? true : false;
+
+        return exists ? attr->mode : 0;
+}
+
+static struct attribute_group toshiba_attr_group = {
+        .is_visible = toshiba_sysfs_is_visible,
+        .attrs = toshiba_attributes,
+};
+
 static bool toshiba_acpi_i8042_filter(unsigned char data, unsigned char str,
                                       struct serio *port)
 {
@@ -1106,6 +1574,10 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev)
 
         remove_toshiba_proc_entries(dev);
 
+        if (dev->sysfs_created)
+                sysfs_remove_group(&dev->acpi_dev->dev.kobj,
+                                   &toshiba_attr_group);
+
         if (dev->ntfy_supported) {
                 i8042_remove_filter(toshiba_acpi_i8042_filter);
                 cancel_work_sync(&dev->hotkey_work);
@@ -1127,6 +1599,12 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev)
         if (dev->illumination_supported)
                 led_classdev_unregister(&dev->led_dev);
 
+        if (dev->kbd_led_registered)
+                led_classdev_unregister(&dev->kbd_led);
+
+        if (dev->eco_supported)
+                led_classdev_unregister(&dev->eco_led);
+
         if (toshiba_acpi)
                 toshiba_acpi = NULL;
 
@@ -1172,6 +1650,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
         dev->acpi_dev = acpi_dev;
         dev->method_hci = hci_method;
         acpi_dev->driver_data = dev;
+        dev_set_drvdata(&acpi_dev->dev, dev);
 
         if (toshiba_acpi_setup_keyboard(dev))
                 pr_info("Unable to activate hotkeys\n");
@@ -1212,6 +1691,40 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
                         dev->illumination_supported = 1;
         }
 
+        if (toshiba_eco_mode_available(dev)) {
+                dev->eco_led.name = "toshiba::eco_mode";
+                dev->eco_led.max_brightness = 1;
+                dev->eco_led.brightness_set = toshiba_eco_mode_set_status;
+                dev->eco_led.brightness_get = toshiba_eco_mode_get_status;
+                if (!led_classdev_register(&dev->acpi_dev->dev, &dev->eco_led))
+                        dev->eco_supported = 1;
+        }
+
+        ret = toshiba_kbd_illum_status_get(dev, &dummy);
+        if (!ret) {
+                dev->kbd_time = dummy >> HCI_MISC_SHIFT;
+                dev->kbd_mode = dummy & 0x07;
+        }
+        dev->kbd_illum_supported = !ret;
+        /*
+         * Only register the LED if KBD illumination is supported
+         * and the keyboard backlight operation mode is set to FN-Z
+         */
+        if (dev->kbd_illum_supported && dev->kbd_mode == SCI_KBD_MODE_FNZ) {
+                dev->kbd_led.name = "toshiba::kbd_backlight";
+                dev->kbd_led.max_brightness = 1;
+                dev->kbd_led.brightness_set = toshiba_kbd_backlight_set;
+                dev->kbd_led.brightness_get = toshiba_kbd_backlight_get;
+                if (!led_classdev_register(&dev->acpi_dev->dev, &dev->kbd_led))
+                        dev->kbd_led_registered = 1;
+        }
+
+        ret = toshiba_touchpad_get(dev, &dummy);
+        dev->touchpad_supported = !ret;
+
+        ret = toshiba_accelerometer_supported(dev);
+        dev->accelerometer_supported = !ret;
+
         /* Determine whether or not BIOS supports fan and video interfaces */
 
         ret = get_video_status(dev, &dummy);
@@ -1220,6 +1733,14 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
         ret = get_fan_status(dev, &dummy);
         dev->fan_supported = !ret;
 
+        ret = sysfs_create_group(&dev->acpi_dev->dev.kobj,
+                                 &toshiba_attr_group);
+        if (ret) {
+                dev->sysfs_created = 0;
+                goto error;
+        }
+        dev->sysfs_created = !ret;
+
         create_toshiba_proc_entries(dev);
 
         toshiba_acpi = dev;
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 1cd8584a7b88..903eb37f047a 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -392,6 +392,15 @@ config REGULATOR_PALMAS
           on the muxing. This is handled automatically in the driver by
           reading the mux info from OTP.
 
+config REGULATOR_PBIAS
+        tristate "PBIAS OMAP regulator driver"
+        depends on (ARCH_OMAP || COMPILE_TEST) && MFD_SYSCON
+        help
+         Say y here to support pbias regulator for mmc1:SD card i/o
+         on OMAP SoCs.
+         This driver provides support for OMAP pbias modelled
+         regulators.
+
 config REGULATOR_PCAP
         tristate "Motorola PCAP2 regulator driver"
         depends on EZX_PCAP
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index f0fe0c50b59c..12ef277a48b4 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
 obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
 obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
+obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
 obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
 obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
 obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
index ab08ca7cfb08..c3750c5b382b 100644
--- a/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@ -123,6 +123,7 @@ struct bcm590xx_info {
 #define BCM590XX_REG_RANGES(_name, _ranges) \
         { \
                 .name = #_name, \
+                .n_voltages = 64, \
                 .n_linear_ranges = ARRAY_SIZE(_ranges), \
                 .linear_ranges = _ranges, \
         }
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c
new file mode 100644
index 000000000000..ded3b3574209
--- /dev/null
+++ b/drivers/regulator/pbias-regulator.c
@@ -0,0 +1,255 @@
+/*
+ * pbias-regulator.c
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+ * Author: Balaji T K <balajitk@ti.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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/mfd/syscon.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+
+struct pbias_reg_info {
+        u32 enable;
+        u32 enable_mask;
+        u32 vmode;
+        unsigned int enable_time;
+        char *name;
+};
+
+struct pbias_regulator_data {
+        struct regulator_desc desc;
+        void __iomem *pbias_addr;
+        unsigned int pbias_reg;
+        struct regulator_dev *dev;
+        struct regmap *syscon;
+        const struct pbias_reg_info *info;
+        int voltage;
+};
+
+static int pbias_regulator_set_voltage(struct regulator_dev *dev,
+                        int min_uV, int max_uV, unsigned *selector)
+{
+        struct pbias_regulator_data *data = rdev_get_drvdata(dev);
+        const struct pbias_reg_info *info = data->info;
+        int ret, vmode;
+
+        if (min_uV <= 1800000)
+                vmode = 0;
+        else if (min_uV > 1800000)
+                vmode = info->vmode;
+
+        ret = regmap_update_bits(data->syscon, data->pbias_reg,
+                                                info->vmode, vmode);
+
+        return ret;
+}
+
+static int pbias_regulator_get_voltage(struct regulator_dev *rdev)
+{
+        struct pbias_regulator_data *data = rdev_get_drvdata(rdev);
+        const struct pbias_reg_info *info = data->info;
+        int value, voltage;
+
+        regmap_read(data->syscon, data->pbias_reg, &value);
+        value &= info->vmode;
+
+        voltage = value ? 3000000 : 1800000;
+
+        return voltage;
+}
+
+static int pbias_regulator_enable(struct regulator_dev *rdev)
+{
+        struct pbias_regulator_data *data = rdev_get_drvdata(rdev);
+        const struct pbias_reg_info *info = data->info;
+        int ret;
+
+        ret = regmap_update_bits(data->syscon, data->pbias_reg,
+                                        info->enable_mask, info->enable);
+
+        return ret;
+}
+
+static int pbias_regulator_disable(struct regulator_dev *rdev)
+{
+        struct pbias_regulator_data *data = rdev_get_drvdata(rdev);
+        const struct pbias_reg_info *info = data->info;
+        int ret;
+
+        ret = regmap_update_bits(data->syscon, data->pbias_reg,
+                                                info->enable_mask, 0);
+        return ret;
+}
+
+static int pbias_regulator_is_enable(struct regulator_dev *rdev)
+{
+        struct pbias_regulator_data *data = rdev_get_drvdata(rdev);
+        const struct pbias_reg_info *info = data->info;
+        int value;
+
+        regmap_read(data->syscon, data->pbias_reg, &value);
+
+        return (value & info->enable_mask) == info->enable_mask;
+}
+
+static struct regulator_ops pbias_regulator_voltage_ops = {
+        .set_voltage    = pbias_regulator_set_voltage,
+        .get_voltage    = pbias_regulator_get_voltage,
+        .enable         = pbias_regulator_enable,
+        .disable        = pbias_regulator_disable,
+        .is_enabled     = pbias_regulator_is_enable,
+};
+
+static const struct pbias_reg_info pbias_mmc_omap2430 = {
+        .enable = BIT(1),
+        .enable_mask = BIT(1),
+        .vmode = BIT(0),
+        .enable_time = 100,
+        .name = "pbias_mmc_omap2430"
+};
+
+static const struct pbias_reg_info pbias_sim_omap3 = {
+        .enable = BIT(9),
+        .enable_mask = BIT(9),
+        .vmode = BIT(8),
+        .enable_time = 100,
+        .name = "pbias_sim_omap3"
+};
+
+static const struct pbias_reg_info pbias_mmc_omap4 = {
+        .enable = BIT(26) | BIT(22),
+        .enable_mask = BIT(26) | BIT(25) | BIT(22),
+        .vmode = BIT(21),
+        .enable_time = 100,
+        .name = "pbias_mmc_omap4"
+};
+
+static const struct pbias_reg_info pbias_mmc_omap5 = {
+        .enable = BIT(27) | BIT(26),
+        .enable_mask = BIT(27) | BIT(25) | BIT(26),
+        .vmode = BIT(21),
+        .enable_time = 100,
+        .name = "pbias_mmc_omap5"
+};
+
+static struct of_regulator_match pbias_matches[] = {
+        { .name = "pbias_mmc_omap2430", .driver_data = (void *)&pbias_mmc_omap2430},
+        { .name = "pbias_sim_omap3", .driver_data = (void *)&pbias_sim_omap3},
+        { .name = "pbias_mmc_omap4", .driver_data = (void *)&pbias_mmc_omap4},
+        { .name = "pbias_mmc_omap5", .driver_data = (void *)&pbias_mmc_omap5},
+};
+#define PBIAS_NUM_REGS  ARRAY_SIZE(pbias_matches)
+
+static const struct of_device_id pbias_of_match[] = {
+        { .compatible = "ti,pbias-omap", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, pbias_of_match);
+
+static int pbias_regulator_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct pbias_regulator_data *drvdata;
+        struct resource *res;
+        struct regulator_config cfg = { };
+        struct regmap *syscon;
+        const struct pbias_reg_info *info;
+        int ret = 0;
+        int count, idx, data_idx = 0;
+
+        count = of_regulator_match(&pdev->dev, np, pbias_matches,
+                                                PBIAS_NUM_REGS);
+        if (count < 0)
+                return count;
+
+        drvdata = devm_kzalloc(&pdev->dev, sizeof(struct pbias_regulator_data)
+                               * count, GFP_KERNEL);
+        if (drvdata == NULL) {
+                dev_err(&pdev->dev, "Failed to allocate device data\n");
+                return -ENOMEM;
+        }
+
+        syscon = syscon_regmap_lookup_by_phandle(np, "syscon");
+        if (IS_ERR(syscon))
+                return PTR_ERR(syscon);
+
+        cfg.dev = &pdev->dev;
+
+        for (idx = 0; idx < PBIAS_NUM_REGS && data_idx < count; idx++) {
+                if (!pbias_matches[idx].init_data ||
+                        !pbias_matches[idx].of_node)
+                        continue;
+
+                info = pbias_matches[idx].driver_data;
+                if (!info)
+                        return -ENODEV;
+
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                if (!res)
+                        return -EINVAL;
+
+                drvdata[data_idx].pbias_reg = res->start;
+                drvdata[data_idx].syscon = syscon;
+                drvdata[data_idx].info = info;
+                drvdata[data_idx].desc.name = info->name;
+                drvdata[data_idx].desc.owner = THIS_MODULE;
+                drvdata[data_idx].desc.type = REGULATOR_VOLTAGE;
+                drvdata[data_idx].desc.ops = &pbias_regulator_voltage_ops;
+                drvdata[data_idx].desc.n_voltages = 2;
+                drvdata[data_idx].desc.enable_time = info->enable_time;
+
+                cfg.init_data = pbias_matches[idx].init_data;
+                cfg.driver_data = &drvdata[data_idx];
+                cfg.of_node = pbias_matches[idx].of_node;
+
+                drvdata[data_idx].dev = devm_regulator_register(&pdev->dev,
+                                        &drvdata[data_idx].desc, &cfg);
+                if (IS_ERR(drvdata[data_idx].dev)) {
+                        ret = PTR_ERR(drvdata[data_idx].dev);
+                        dev_err(&pdev->dev,
+                                "Failed to register regulator: %d\n", ret);
+                        goto err_regulator;
+                }
+                data_idx++;
+        }
+
+        platform_set_drvdata(pdev, drvdata);
+
+err_regulator:
+        return ret;
+}
+
+static struct platform_driver pbias_regulator_driver = {
+        .probe          = pbias_regulator_probe,
+        .driver         = {
+                .name           = "pbias-regulator",
+                .owner          = THIS_MODULE,
+                .of_match_table = of_match_ptr(pbias_of_match),
+        },
+};
+
+module_platform_driver(pbias_regulator_driver);
+
+MODULE_AUTHOR("Balaji T K <balajitk@ti.com>");
+MODULE_DESCRIPTION("pbias voltage regulator");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pbias-regulator");
diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c
index 808b3aa7a42c..f19a30f0fb42 100644
--- a/drivers/regulator/s2mpa01.c
+++ b/drivers/regulator/s2mpa01.c
@@ -192,13 +192,11 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
         if (!ramp_enable)
                 goto ramp_disable;
 
-        if (enable_shift) {
-                ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
-                                        1 << enable_shift, 1 << enable_shift);
-                if (ret) {
-                        dev_err(&rdev->dev, "failed to enable ramp rate\n");
-                        return ret;
-                }
+        ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
+                                 1 << enable_shift, 1 << enable_shift);
+        if (ret) {
+                dev_err(&rdev->dev, "failed to enable ramp rate\n");
+                return ret;
         }
 
         ramp_val = get_ramp_delay(ramp_delay);
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 68fd54702edb..e713c162fbd4 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -202,13 +202,11 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
         if (!ramp_enable)
                 goto ramp_disable;
 
-        if (enable_shift) {
-                ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
-                                        1 << enable_shift, 1 << enable_shift);
-                if (ret) {
-                        dev_err(&rdev->dev, "failed to enable ramp rate\n");
-                        return ret;
-                }
+        ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
+                                 1 << enable_shift, 1 << enable_shift);
+        if (ret) {
+                dev_err(&rdev->dev, "failed to enable ramp rate\n");
+                return ret;
         }
 
         ramp_val = get_ramp_delay(ramp_delay);
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index f05badabd69e..92f19a005dc3 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -964,6 +964,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 config.driver_data = s5m8767;
                 config.regmap = iodev->regmap_pmic;
                 config.of_node = pdata->regulators[i].reg_node;
+                config.ena_gpio = config.ena_gpio_flags = 0;
                 if (pdata->regulators[i].ext_control_gpio)
                         s5m8767_regulator_config_ext_control(s5m8767,
                                         &pdata->regulators[i], &config);
diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c
index 129f7b997866..3841b9813109 100644
--- a/drivers/remoteproc/da8xx_remoteproc.c
+++ b/drivers/remoteproc/da8xx_remoteproc.c
@@ -201,23 +201,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
         }
 
         bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!bootreg_res) {
-                dev_err(dev,
-                        "platform_get_resource(IORESOURCE_MEM, 0): NULL\n");
-                return -EADDRNOTAVAIL;
-        }
-
-        chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!chipsig_res) {
-                dev_err(dev,
-                        "platform_get_resource(IORESOURCE_MEM, 1): NULL\n");
-                return -EADDRNOTAVAIL;
-        }
-
         bootreg = devm_ioremap_resource(dev, bootreg_res);
         if (IS_ERR(bootreg))
                 return PTR_ERR(bootreg);
 
+        chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         chipsig = devm_ioremap_resource(dev, chipsig_res);
         if (IS_ERR(chipsig))
                 return PTR_ERR(chipsig);
@@ -301,8 +289,6 @@ static int da8xx_rproc_remove(struct platform_device *pdev)
          */
         disable_irq(drproc->irq);
 
-        devm_clk_put(dev, drproc->dsp_clk);
-
         rproc_del(rproc);
         rproc_put(rproc);
 
diff --git a/drivers/remoteproc/ste_modem_rproc.c b/drivers/remoteproc/ste_modem_rproc.c
index 1ec39a4c0b3e..c4ac9104dd8e 100644
--- a/drivers/remoteproc/ste_modem_rproc.c
+++ b/drivers/remoteproc/ste_modem_rproc.c
@@ -164,7 +164,7 @@ sproc_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
 }
 
 /* STE modem firmware handler operations */
-const struct rproc_fw_ops sproc_fw_ops = {
+static const struct rproc_fw_ops sproc_fw_ops = {
         .load = sproc_load_segments,
         .find_rsc_table = sproc_find_rsc_table,
         .find_loaded_rsc_table = sproc_find_loaded_rsc_table,
@@ -193,7 +193,7 @@ static void sproc_kick_callback(struct ste_modem_device *mdev, int vqid)
                 sproc_dbg(sproc, "no message was found in vqid %d\n", vqid);
 }
 
-struct ste_modem_dev_cb sproc_dev_cb = {
+static struct ste_modem_dev_cb sproc_dev_cb = {
         .kick = sproc_kick_callback,
 };
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c8bd092fc945..02832d64d918 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -263,6 +263,9 @@ config SCSI_SCAN_ASYNC
           You can override this choice by specifying "scsi_mod.scan=sync"
           or async on the kernel's command line.
 
+          Note that this setting also affects whether resuming from
+          system suspend will be performed asynchronously.
+
 menu "SCSI Transports"
         depends on SCSI
 
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index bfb6d07d87f0..11854845393b 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -125,7 +125,7 @@ static inline int iscsi_sw_sk_state_check(struct sock *sk)
         return 0;
 }
 
-static void iscsi_sw_tcp_data_ready(struct sock *sk, int flag)
+static void iscsi_sw_tcp_data_ready(struct sock *sk)
 {
         struct iscsi_conn *conn;
         struct iscsi_tcp_conn *tcp_conn;
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 666fe09378fa..f42ecb238af5 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -40,7 +40,7 @@ struct iscsi_sw_tcp_conn {
 
         struct iscsi_sw_tcp_send out;
         /* old values for socket callbacks */
-        void                    (*old_data_ready)(struct sock *, int);
+        void                    (*old_data_ready)(struct sock *);
         void                    (*old_state_change)(struct sock *);
         void                    (*old_write_space)(struct sock *);
 
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 788c4fe2b0c9..68fb66fdb757 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -684,6 +684,20 @@ static void tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd)
         qlt_xmit_tm_rsp(mcmd);
 }
 
+static void tcm_qla2xxx_aborted_task(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd = container_of(se_cmd,
+                                struct qla_tgt_cmd, se_cmd);
+        struct scsi_qla_host *vha = cmd->vha;
+        struct qla_hw_data *ha = vha->hw;
+
+        if (!cmd->sg_mapped)
+                return;
+
+        pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
+        cmd->sg_mapped = 0;
+}
+
 /* Local pointer to allocated TCM configfs fabric module */
 struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
 struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
@@ -1468,7 +1482,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
         }
         se_tpg = &tpg->se_tpg;
 
-        se_sess = transport_init_session();
+        se_sess = transport_init_session(TARGET_PROT_NORMAL);
         if (IS_ERR(se_sess)) {
                 pr_err("Unable to initialize struct se_session\n");
                 return PTR_ERR(se_sess);
@@ -1877,6 +1891,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .queue_data_in                  = tcm_qla2xxx_queue_data_in,
         .queue_status                   = tcm_qla2xxx_queue_status,
         .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
+        .aborted_task                   = tcm_qla2xxx_aborted_task,
         /*
          * Setup function pointers for generic logic in
          * target_core_fabric_configfs.c
@@ -1926,6 +1941,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .queue_data_in                  = tcm_qla2xxx_queue_data_in,
         .queue_status                   = tcm_qla2xxx_queue_status,
         .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
+        .aborted_task                   = tcm_qla2xxx_aborted_task,
         /*
          * Setup function pointers for generic logic in
          * target_core_fabric_configfs.c
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c4d632c27a3e..88d46fe6bf98 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -91,6 +91,15 @@ EXPORT_SYMBOL(scsi_logging_level);
 ASYNC_DOMAIN(scsi_sd_probe_domain);
 EXPORT_SYMBOL(scsi_sd_probe_domain);
 
+/*
+ * Separate domain (from scsi_sd_probe_domain) to maximize the benefit of
+ * asynchronous system resume operations.  It is marked 'exclusive' to avoid
+ * being included in the async_synchronize_full() that is invoked by
+ * dpm_resume()
+ */
+ASYNC_DOMAIN_EXCLUSIVE(scsi_sd_pm_domain);
+EXPORT_SYMBOL(scsi_sd_pm_domain);
+
 /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
  * You may not alter any existing entry (although adding new ones is
  * encouraged once assigned by ANSI/INCITS T10
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 5681c05ac506..65a123d9c676 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -184,7 +184,7 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
  */
 int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
                  int data_direction, void *buffer, unsigned bufflen,
-                 unsigned char *sense, int timeout, int retries, int flags,
+                 unsigned char *sense, int timeout, int retries, u64 flags,
                  int *resid)
 {
         struct request *req;
@@ -235,7 +235,7 @@ EXPORT_SYMBOL(scsi_execute);
 int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd,
                      int data_direction, void *buffer, unsigned bufflen,
                      struct scsi_sense_hdr *sshdr, int timeout, int retries,
-                     int *resid, int flags)
+                     int *resid, u64 flags)
 {
         char *sense = NULL;
         int result;
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index 001e9ceda4c3..7454498c4091 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -18,35 +18,77 @@
 
 #ifdef CONFIG_PM_SLEEP
 
-static int scsi_dev_type_suspend(struct device *dev, int (*cb)(struct device *))
+static int do_scsi_suspend(struct device *dev, const struct dev_pm_ops *pm)
 {
+        return pm && pm->suspend ? pm->suspend(dev) : 0;
+}
+
+static int do_scsi_freeze(struct device *dev, const struct dev_pm_ops *pm)
+{
+        return pm && pm->freeze ? pm->freeze(dev) : 0;
+}
+
+static int do_scsi_poweroff(struct device *dev, const struct dev_pm_ops *pm)
+{
+        return pm && pm->poweroff ? pm->poweroff(dev) : 0;
+}
+
+static int do_scsi_resume(struct device *dev, const struct dev_pm_ops *pm)
+{
+        return pm && pm->resume ? pm->resume(dev) : 0;
+}
+
+static int do_scsi_thaw(struct device *dev, const struct dev_pm_ops *pm)
+{
+        return pm && pm->thaw ? pm->thaw(dev) : 0;
+}
+
+static int do_scsi_restore(struct device *dev, const struct dev_pm_ops *pm)
+{
+        return pm && pm->restore ? pm->restore(dev) : 0;
+}
+
+static int scsi_dev_type_suspend(struct device *dev,
+                int (*cb)(struct device *, const struct dev_pm_ops *))
+{
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int err;
 
+        /* flush pending in-flight resume operations, suspend is synchronous */
+        async_synchronize_full_domain(&scsi_sd_pm_domain);
+
         err = scsi_device_quiesce(to_scsi_device(dev));
         if (err == 0) {
-                if (cb) {
-                        err = cb(dev);
-                        if (err)
-                                scsi_device_resume(to_scsi_device(dev));
-                }
+                err = cb(dev, pm);
+                if (err)
+                        scsi_device_resume(to_scsi_device(dev));
         }
         dev_dbg(dev, "scsi suspend: %d\n", err);
         return err;
 }
 
-static int scsi_dev_type_resume(struct device *dev, int (*cb)(struct device *))
+static int scsi_dev_type_resume(struct device *dev,
+                int (*cb)(struct device *, const struct dev_pm_ops *))
 {
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int err = 0;
 
-        if (cb)
-                err = cb(dev);
+        err = cb(dev, pm);
         scsi_device_resume(to_scsi_device(dev));
         dev_dbg(dev, "scsi resume: %d\n", err);
+
+        if (err == 0) {
+                pm_runtime_disable(dev);
+                pm_runtime_set_active(dev);
+                pm_runtime_enable(dev);
+        }
+
         return err;
 }
 
 static int
-scsi_bus_suspend_common(struct device *dev, int (*cb)(struct device *))
+scsi_bus_suspend_common(struct device *dev,
+                int (*cb)(struct device *, const struct dev_pm_ops *))
 {
         int err = 0;
 
@@ -66,20 +108,54 @@ scsi_bus_suspend_common(struct device *dev, int (*cb)(struct device *))
         return err;
 }
 
-static int
-scsi_bus_resume_common(struct device *dev, int (*cb)(struct device *))
+static void async_sdev_resume(void *dev, async_cookie_t cookie)
 {
-        int err = 0;
+        scsi_dev_type_resume(dev, do_scsi_resume);
+}
 
-        if (scsi_is_sdev_device(dev))
-                err = scsi_dev_type_resume(dev, cb);
+static void async_sdev_thaw(void *dev, async_cookie_t cookie)
+{
+        scsi_dev_type_resume(dev, do_scsi_thaw);
+}
 
-        if (err == 0) {
+static void async_sdev_restore(void *dev, async_cookie_t cookie)
+{
+        scsi_dev_type_resume(dev, do_scsi_restore);
+}
+
+static int scsi_bus_resume_common(struct device *dev,
+                int (*cb)(struct device *, const struct dev_pm_ops *))
+{
+        async_func_t fn;
+
+        if (!scsi_is_sdev_device(dev))
+                fn = NULL;
+        else if (cb == do_scsi_resume)
+                fn = async_sdev_resume;
+        else if (cb == do_scsi_thaw)
+                fn = async_sdev_thaw;
+        else if (cb == do_scsi_restore)
+                fn = async_sdev_restore;
+        else
+                fn = NULL;
+
+        if (fn) {
+                async_schedule_domain(fn, dev, &scsi_sd_pm_domain);
+
+                /*
+                 * If a user has disabled async probing a likely reason
+                 * is due to a storage enclosure that does not inject
+                 * staggered spin-ups.  For safety, make resume
+                 * synchronous as well in that case.
+                 */
+                if (strncmp(scsi_scan_type, "async", 5) != 0)
+                        async_synchronize_full_domain(&scsi_sd_pm_domain);
+        } else {
                 pm_runtime_disable(dev);
                 pm_runtime_set_active(dev);
                 pm_runtime_enable(dev);
         }
-        return err;
+        return 0;
 }
 
 static int scsi_bus_prepare(struct device *dev)
@@ -97,38 +173,32 @@ static int scsi_bus_prepare(struct device *dev)
 
 static int scsi_bus_suspend(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_suspend_common(dev, pm ? pm->suspend : NULL);
+        return scsi_bus_suspend_common(dev, do_scsi_suspend);
 }
 
 static int scsi_bus_resume(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_resume_common(dev, pm ? pm->resume : NULL);
+        return scsi_bus_resume_common(dev, do_scsi_resume);
 }
 
 static int scsi_bus_freeze(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_suspend_common(dev, pm ? pm->freeze : NULL);
+        return scsi_bus_suspend_common(dev, do_scsi_freeze);
 }
 
 static int scsi_bus_thaw(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_resume_common(dev, pm ? pm->thaw : NULL);
+        return scsi_bus_resume_common(dev, do_scsi_thaw);
 }
 
 static int scsi_bus_poweroff(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_suspend_common(dev, pm ? pm->poweroff : NULL);
+        return scsi_bus_suspend_common(dev, do_scsi_poweroff);
 }
 
 static int scsi_bus_restore(struct device *dev)
 {
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        return scsi_bus_resume_common(dev, pm ? pm->restore : NULL);
+        return scsi_bus_resume_common(dev, do_scsi_restore);
 }
 
 #else /* CONFIG_PM_SLEEP */
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index f079a598bed4..48e5b657e79f 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -112,6 +112,7 @@ extern void scsi_exit_procfs(void);
 #endif /* CONFIG_PROC_FS */
 
 /* scsi_scan.c */
+extern char scsi_scan_type[];
 extern int scsi_complete_async_scans(void);
 extern int scsi_scan_host_selected(struct Scsi_Host *, unsigned int,
                                    unsigned int, unsigned int, int);
@@ -166,6 +167,7 @@ static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; }
 static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}
 #endif /* CONFIG_PM_RUNTIME */
 
+extern struct async_domain scsi_sd_pm_domain;
 extern struct async_domain scsi_sd_probe_domain;
 
 /* 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 27f96d5b7680..e02b3aab56ce 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -97,7 +97,7 @@ MODULE_PARM_DESC(max_luns,
 #define SCSI_SCAN_TYPE_DEFAULT "sync"
 #endif
 
-static char scsi_scan_type[6] = SCSI_SCAN_TYPE_DEFAULT;
+char scsi_scan_type[6] = SCSI_SCAN_TYPE_DEFAULT;
 
 module_param_string(scan, scsi_scan_type, sizeof(scsi_scan_type), S_IRUGO);
 MODULE_PARM_DESC(scan, "sync, async or none");
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 89e6c04ac595..efcbcd182863 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3026,6 +3026,7 @@ static int sd_remove(struct device *dev)
         devt = disk_devt(sdkp->disk);
         scsi_autopm_get_device(sdkp->device);
 
+        async_synchronize_full_domain(&scsi_sd_pm_domain);
         async_synchronize_full_domain(&scsi_sd_probe_domain);
         blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
         blk_queue_unprep_rq(sdkp->device->request_queue, NULL);
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index d92fe4037e94..6b349e301869 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -3000,7 +3000,11 @@ sym_dequeue_from_squeue(struct sym_hcb *np, int i, int target, int lun, int task
                 if ((target == -1 || cp->target == target) &&
                     (lun    == -1 || cp->lun    == lun)    &&
                     (task   == -1 || cp->tag    == task)) {
+#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
                         sym_set_cam_status(cp->cmd, DID_SOFT_ERROR);
+#else
+                        sym_set_cam_status(cp->cmd, DID_REQUEUE);
+#endif
                         sym_remque(&cp->link_ccbq);
                         sym_insque_tail(&cp->link_ccbq, &np->comp_ccbq);
                 }
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index efe1960af2b3..60f2b41c7310 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -383,7 +383,7 @@ config SPI_RSPI
 
 config SPI_QUP
         tristate "Qualcomm SPI controller with QUP interface"
-        depends on ARCH_MSM_DT || (ARM && COMPILE_TEST)
+        depends on ARCH_QCOM || (ARM && COMPILE_TEST)
         help
           Qualcomm Universal Peripheral (QUP) core is an AHB slave that
           provides a common data path (an output FIFO and an input FIFO)
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 6fb2b75df821..e767f5831b9c 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -441,7 +441,8 @@ static void fsl_espi_do_one_msg(struct spi_message *m)
 
         m->actual_length = espi_trans.actual_length;
         m->status = espi_trans.status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 }
 
 static int fsl_espi_setup(struct spi_device *spi)
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index f35488ed62a9..b3e7775034db 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -408,7 +408,8 @@ static void fsl_spi_do_one_msg(struct spi_message *m)
         }
 
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         if (status || !cs_change) {
                 ndelay(nsecs);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 3822eef2ef9d..577d23a12763 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -300,7 +300,8 @@ static int mpc512x_psc_spi_msg_xfer(struct spi_master *master,
         }
 
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         if (status || !cs_change)
                 mpc512x_psc_spi_deactivate_cs(spi);
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 3d18d9351185..de532aa11d34 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -247,7 +247,8 @@ static void mpc52xx_psc_spi_work(struct work_struct *work)
                 }
 
                 m->status = status;
-                m->complete(m->context);
+                if (m->complete)
+                        m->complete(m->context);
 
                 if (status || !cs_change)
                         mpc52xx_psc_spi_deactivate_cs(spi);
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index aac2a5ddd964..b07db4b62d80 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -234,7 +234,8 @@ static int mpc52xx_spi_fsmstate_transfer(int irq, struct mpc52xx_spi *ms,
                 dev_err(&ms->master->dev, "mode fault\n");
                 mpc52xx_spi_chipsel(ms, 0);
                 ms->message->status = -EIO;
-                ms->message->complete(ms->message->context);
+                if (ms->message->complete)
+                        ms->message->complete(ms->message->context);
                 ms->state = mpc52xx_spi_fsmstate_idle;
                 return FSM_CONTINUE;
         }
@@ -288,7 +289,8 @@ mpc52xx_spi_fsmstate_wait(int irq, struct mpc52xx_spi *ms, u8 status, u8 data)
                 ms->msg_count++;
                 mpc52xx_spi_chipsel(ms, 0);
                 ms->message->status = 0;
-                ms->message->complete(ms->message->context);
+                if (ms->message->complete)
+                        ms->message->complete(ms->message->context);
                 ms->state = mpc52xx_spi_fsmstate_idle;
                 return FSM_CONTINUE;
         }
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 2941c5b96ebc..4dc77df38864 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1379,12 +1379,13 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
         INIT_LIST_HEAD(&mcspi->ctx.cs);
 
-        mcspi->dma_channels = kcalloc(master->num_chipselect,
-                        sizeof(struct omap2_mcspi_dma),
-                        GFP_KERNEL);
-
-        if (mcspi->dma_channels == NULL)
+        mcspi->dma_channels = devm_kcalloc(&pdev->dev, master->num_chipselect,
+                                           sizeof(struct omap2_mcspi_dma),
+                                           GFP_KERNEL);
+        if (mcspi->dma_channels == NULL) {
+                status = -ENOMEM;
                 goto free_master;
+        }
 
         for (i = 0; i < master->num_chipselect; i++) {
                 char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name;
@@ -1426,7 +1427,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         }
 
         if (status < 0)
-                goto dma_chnl_free;
+                goto free_master;
 
         pm_runtime_use_autosuspend(&pdev->dev);
         pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
@@ -1444,8 +1445,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
 disable_pm:
         pm_runtime_disable(&pdev->dev);
-dma_chnl_free:
-        kfree(mcspi->dma_channels);
 free_master:
         spi_master_put(master);
         return status;
@@ -1453,19 +1452,12 @@ free_master:
 
 static int omap2_mcspi_remove(struct platform_device *pdev)
 {
-        struct spi_master       *master;
-        struct omap2_mcspi      *mcspi;
-        struct omap2_mcspi_dma  *dma_channels;
-
-        master = platform_get_drvdata(pdev);
-        mcspi = spi_master_get_devdata(master);
-        dma_channels = mcspi->dma_channels;
+        struct spi_master *master = platform_get_drvdata(pdev);
+        struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
 
         pm_runtime_put_sync(mcspi->dev);
         pm_runtime_disable(&pdev->dev);
 
-        kfree(dma_channels);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index f6f2c7010177..03edf5ed0e9f 100644
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -322,7 +322,8 @@ static void spi_sh_work(struct work_struct *work)
                 spin_lock_irqsave(&ss->lock, flags);
 
                 mesg->status = 0;
-                mesg->complete(mesg->context);
+                if (mesg->complete)
+                        mesg->complete(mesg->context);
         }
 
         clear_fifo(ss);
@@ -340,7 +341,8 @@ static void spi_sh_work(struct work_struct *work)
 
  error:
         mesg->status = ret;
-        mesg->complete(mesg->context);
+        if (mesg->complete)
+                mesg->complete(mesg->context);
 
         spi_sh_clear_bit(ss, SPI_SH_SSA | SPI_SH_SSDB | SPI_SH_SSD,
                          SPI_SH_CR1);
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 820b499816f8..5f183baa91a9 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -262,7 +262,8 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
 
 exit:
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         /* normally deactivate chipselect ... unless no error and
          * cs_change has hinted that the next message will probably
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
index a54b506ba7ca..37758d1c8a68 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
@@ -99,16 +99,7 @@ ksocknal_lib_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
                 struct iovec   *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
                 unsigned int    niov = tx->tx_niov;
 #endif
-                struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = scratchiov,
-                        .msg_iovlen     = niov,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
-                        .msg_flags      = MSG_DONTWAIT
-                };
-                mm_segment_t oldmm = get_fs();
+                struct msghdr msg = {.msg_flags = MSG_DONTWAIT};
                 int  i;
 
                 for (nob = i = 0; i < niov; i++) {
@@ -120,9 +111,7 @@ ksocknal_lib_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
                     nob < tx->tx_resid)
                         msg.msg_flags |= MSG_MORE;
 
-                set_fs (KERNEL_DS);
-                rc = sock_sendmsg(sock, &msg, nob);
-                set_fs (oldmm);
+                rc = kernel_sendmsg(sock, &msg, (struct kvec *)scratchiov, niov, nob);
         }
         return rc;
 }
@@ -174,16 +163,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
                 struct iovec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
                 unsigned int  niov = tx->tx_nkiov;
 #endif
-                struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = scratchiov,
-                        .msg_iovlen     = niov,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
-                        .msg_flags      = MSG_DONTWAIT
-                };
-                mm_segment_t  oldmm = get_fs();
+                struct msghdr msg = {.msg_flags = MSG_DONTWAIT};
                 int        i;
 
                 for (nob = i = 0; i < niov; i++) {
@@ -196,9 +176,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
                     nob < tx->tx_resid)
                         msg.msg_flags |= MSG_MORE;
 
-                set_fs (KERNEL_DS);
-                rc = sock_sendmsg(sock, &msg, nob);
-                set_fs (oldmm);
+                rc = kernel_sendmsg(sock, &msg, (struct kvec *)scratchiov, niov, nob);
 
                 for (i = 0; i < niov; i++)
                         kunmap(kiov[i].kiov_page);
@@ -237,15 +215,8 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn)
 #endif
         struct iovec *iov = conn->ksnc_rx_iov;
         struct msghdr msg = {
-                .msg_name       = NULL,
-                .msg_namelen    = 0,
-                .msg_iov        = scratchiov,
-                .msg_iovlen     = niov,
-                .msg_control    = NULL,
-                .msg_controllen = 0,
                 .msg_flags      = 0
         };
-        mm_segment_t oldmm = get_fs();
         int       nob;
         int       i;
         int       rc;
@@ -263,10 +234,8 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn)
         }
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 
-        set_fs (KERNEL_DS);
-        rc = sock_recvmsg (conn->ksnc_sock, &msg, nob, MSG_DONTWAIT);
-        /* NB this is just a boolean..........................^ */
-        set_fs (oldmm);
+        rc = kernel_recvmsg(conn->ksnc_sock, &msg,
+                (struct kvec *)scratchiov, niov, nob, MSG_DONTWAIT);
 
         saved_csum = 0;
         if (conn->ksnc_proto == &ksocknal_protocol_v2x) {
@@ -355,14 +324,8 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
 #endif
         lnet_kiov_t   *kiov = conn->ksnc_rx_kiov;
         struct msghdr msg = {
-                .msg_name       = NULL,
-                .msg_namelen    = 0,
-                .msg_iov        = scratchiov,
-                .msg_control    = NULL,
-                .msg_controllen = 0,
                 .msg_flags      = 0
         };
-        mm_segment_t oldmm = get_fs();
         int       nob;
         int       i;
         int       rc;
@@ -370,13 +333,14 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
         void    *addr;
         int       sum;
         int       fragnob;
+        int n;
 
         /* NB we can't trust socket ops to either consume our iovs
          * or leave them alone. */
         addr = ksocknal_lib_kiov_vmap(kiov, niov, scratchiov, pages);
         if (addr != NULL) {
                 nob = scratchiov[0].iov_len;
-                msg.msg_iovlen = 1;
+                n = 1;
 
         } else {
                 for (nob = i = 0; i < niov; i++) {
@@ -384,15 +348,13 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
                         scratchiov[i].iov_base = kmap(kiov[i].kiov_page) +
                                                  kiov[i].kiov_offset;
                 }
-                msg.msg_iovlen = niov;
+                n = niov;
         }
 
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 
-        set_fs (KERNEL_DS);
-        rc = sock_recvmsg (conn->ksnc_sock, &msg, nob, MSG_DONTWAIT);
-        /* NB this is just a boolean.......................^ */
-        set_fs (oldmm);
+        rc = kernel_recvmsg(conn->ksnc_sock, &msg,
+                        (struct kvec *)scratchiov, n, nob, MSG_DONTWAIT);
 
         if (conn->ksnc_msg.ksm_csum != 0) {
                 for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {
@@ -655,7 +617,7 @@ extern void ksocknal_write_callback (ksock_conn_t *conn);
  * socket call back in Linux
  */
 static void
-ksocknal_data_ready (struct sock *sk, int n)
+ksocknal_data_ready (struct sock *sk)
 {
         ksock_conn_t  *conn;
 
@@ -666,7 +628,7 @@ ksocknal_data_ready (struct sock *sk, int n)
         conn = sk->sk_user_data;
         if (conn == NULL) {          /* raced with ksocknal_terminate_conn */
                 LASSERT (sk->sk_data_ready != &ksocknal_data_ready);
-                sk->sk_data_ready (sk, n);
+                sk->sk_data_ready (sk);
         } else
                 ksocknal_read_callback(conn);
 
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c
index e6069d78af6b..7539fe16d76f 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c
@@ -265,17 +265,11 @@ libcfs_sock_write (struct socket *sock, void *buffer, int nob, int timeout)
          * empty enough to take the whole message immediately */
 
         for (;;) {
-                struct iovec  iov = {
+                struct kvec  iov = {
                         .iov_base = buffer,
                         .iov_len  = nob
                 };
                 struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = &iov,
-                        .msg_iovlen     = 1,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
                         .msg_flags      = (timeout == 0) ? MSG_DONTWAIT : 0
                 };
 
@@ -297,11 +291,9 @@ libcfs_sock_write (struct socket *sock, void *buffer, int nob, int timeout)
                         }
                 }
 
-                set_fs (KERNEL_DS);
                 then = jiffies;
-                rc = sock_sendmsg (sock, &msg, iov.iov_len);
+                rc = kernel_sendmsg(sock, &msg, &iov, 1, nob);
                 ticks -= jiffies - then;
-                set_fs (oldmm);
 
                 if (rc == nob)
                         return 0;
@@ -338,17 +330,11 @@ libcfs_sock_read (struct socket *sock, void *buffer, int nob, int timeout)
         LASSERT (ticks > 0);
 
         for (;;) {
-                struct iovec  iov = {
+                struct kvec  iov = {
                         .iov_base = buffer,
                         .iov_len  = nob
                 };
                 struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = &iov,
-                        .msg_iovlen     = 1,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
                         .msg_flags      = 0
                 };
 
@@ -367,11 +353,9 @@ libcfs_sock_read (struct socket *sock, void *buffer, int nob, int timeout)
                         return rc;
                 }
 
-                set_fs(KERNEL_DS);
                 then = jiffies;
-                rc = sock_recvmsg(sock, &msg, iov.iov_len, 0);
+                rc = kernel_recvmsg(sock, &msg, &iov, 1, nob, 0);
                 ticks -= jiffies - then;
-                set_fs(oldmm);
 
                 if (rc < 0)
                         return rc;
diff --git a/drivers/staging/lustre/lustre/llite/symlink.c b/drivers/staging/lustre/lustre/llite/symlink.c
index ab06891f7fc7..80d48b5ae247 100644
--- a/drivers/staging/lustre/lustre/llite/symlink.c
+++ b/drivers/staging/lustre/lustre/llite/symlink.c
@@ -115,27 +115,6 @@ failed:
         return rc;
 }
 
-static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
-{
-        struct inode *inode = dentry->d_inode;
-        struct ptlrpc_request *request;
-        char *symname;
-        int rc;
-
-        CDEBUG(D_VFSTRACE, "VFS Op\n");
-
-        ll_inode_size_lock(inode);
-        rc = ll_readlink_internal(inode, &request, &symname);
-        if (rc)
-                GOTO(out, rc);
-
-        rc = vfs_readlink(dentry, buffer, buflen, symname);
- out:
-        ptlrpc_req_finished(request);
-        ll_inode_size_unlock(inode);
-        return rc;
-}
-
 static void *ll_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
         struct inode *inode = dentry->d_inode;
@@ -175,7 +154,7 @@ static void ll_put_link(struct dentry *dentry, struct nameidata *nd, void *cooki
 }
 
 struct inode_operations ll_fast_symlink_inode_operations = {
-        .readlink       = ll_readlink,
+        .readlink       = generic_readlink,
         .setattr        = ll_setattr,
         .follow_link    = ll_follow_link,
         .put_link       = ll_put_link,
diff --git a/drivers/staging/media/msi3101/msi001.c b/drivers/staging/media/msi3101/msi001.c
index ac43bae10102..bd0b93cb6c53 100644
--- a/drivers/staging/media/msi3101/msi001.c
+++ b/drivers/staging/media/msi3101/msi001.c
@@ -201,7 +201,7 @@ static int msi001_set_tuner(struct msi001 *s)
         dev_dbg(&s->spi->dev, "%s: bandwidth selected=%d\n",
                         __func__, bandwidth_lut[i].freq);
 
-        f_vco = (f_rf + f_if + f_if1) * lo_div;
+        f_vco = (u64) (f_rf + f_if + f_if1) * lo_div;
         tmp64 = f_vco;
         m = do_div(tmp64, F_REF * R_REF);
         n = (unsigned int) tmp64;
diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
index 260d1b736721..65d351f99da2 100644
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@ -913,7 +913,6 @@ static int msi3101_set_usb_adc(struct msi3101_state *s)
 
         /* set tuner, subdev, filters according to sampling rate */
         bandwidth_auto = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH_AUTO);
-        bandwidth = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH);
         if (v4l2_ctrl_g_ctrl(bandwidth_auto)) {
                 bandwidth = v4l2_ctrl_find(&s->hdl, V4L2_CID_RF_TUNER_BANDWIDTH);
                 v4l2_ctrl_s_ctrl(bandwidth, s->f_adc);
@@ -1078,6 +1077,7 @@ static int msi3101_start_streaming(struct vb2_queue *vq, unsigned int count)
 static int msi3101_stop_streaming(struct vb2_queue *vq)
 {
         struct msi3101_state *s = vb2_get_drv_priv(vq);
+        int ret;
         dev_dbg(&s->udev->dev, "%s:\n", __func__);
 
         if (mutex_lock_interruptible(&s->v4l2_lock))
@@ -1090,17 +1090,22 @@ static int msi3101_stop_streaming(struct vb2_queue *vq)
 
         /* according to tests, at least 700us delay is required  */
         msleep(20);
-        msi3101_ctrl_msg(s, CMD_STOP_STREAMING, 0);
+        ret = msi3101_ctrl_msg(s, CMD_STOP_STREAMING, 0);
+        if (ret)
+                goto err_sleep_tuner;
 
         /* sleep USB IF / ADC */
-        msi3101_ctrl_msg(s, CMD_WREG, 0x01000003);
+        ret = msi3101_ctrl_msg(s, CMD_WREG, 0x01000003);
+        if (ret)
+                goto err_sleep_tuner;
 
+err_sleep_tuner:
         /* sleep tuner */
-        v4l2_subdev_call(s->v4l2_subdev, core, s_power, 0);
+        ret = v4l2_subdev_call(s->v4l2_subdev, core, s_power, 0);
 
         mutex_unlock(&s->v4l2_lock);
 
-        return 0;
+        return ret;
 }
 
 static struct vb2_ops msi3101_vb2_ops = {
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index 773d8ca07a00..de692d7011a5 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -86,7 +86,6 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
         struct stub_device *sdev = dev_get_drvdata(dev);
         int sockfd = 0;
         struct socket *socket;
-        ssize_t err = -EINVAL;
         int rv;
 
         if (!sdev) {
@@ -99,6 +98,7 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
                 return -EINVAL;
 
         if (sockfd != -1) {
+                int err;
                 dev_info(dev, "stub up\n");
 
                 spin_lock_irq(&sdev->ud.lock);
@@ -108,7 +108,7 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
                         goto err;
                 }
 
-                socket = sockfd_to_socket(sockfd);
+                socket = sockfd_lookup(sockfd, &err);
                 if (!socket)
                         goto err;
 
@@ -141,7 +141,7 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
 
 err:
         spin_unlock_irq(&sdev->ud.lock);
-        return err;
+        return -EINVAL;
 }
 static DEVICE_ATTR(usbip_sockfd, S_IWUSR, NULL, store_sockfd);
 
@@ -211,7 +211,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)
          * not touch NULL socket.
          */
         if (ud->tcp_socket) {
-                fput(ud->tcp_socket->file);
+                sockfd_put(ud->tcp_socket);
                 ud->tcp_socket = NULL;
         }
 
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 184fa70365db..facaaf003f19 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -382,31 +382,6 @@ err:
 }
 EXPORT_SYMBOL_GPL(usbip_recv);
 
-struct socket *sockfd_to_socket(unsigned int sockfd)
-{
-        struct socket *socket;
-        struct file *file;
-        struct inode *inode;
-
-        file = fget(sockfd);
-        if (!file) {
-                pr_err("invalid sockfd\n");
-                return NULL;
-        }
-
-        inode = file_inode(file);
-
-        if (!inode || !S_ISSOCK(inode->i_mode)) {
-                fput(file);
-                return NULL;
-        }
-
-        socket = SOCKET_I(inode);
-
-        return socket;
-}
-EXPORT_SYMBOL_GPL(sockfd_to_socket);
-
 /* there may be more cases to tweak the flags. */
 static unsigned int tweak_transfer_flags(unsigned int flags)
 {
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 732fb636a1e5..f555d834f134 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -299,7 +299,6 @@ void usbip_dump_urb(struct urb *purb);
 void usbip_dump_header(struct usbip_header *pdu);
 
 int usbip_recv(struct socket *sock, void *buf, int size);
-struct socket *sockfd_to_socket(unsigned int sockfd);
 
 void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
                     int pack);
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 1e84577230ef..70e17551943d 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -788,7 +788,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)
 
         /* active connection is closed */
         if (vdev->ud.tcp_socket) {
-                fput(vdev->ud.tcp_socket->file);
+                sockfd_put(vdev->ud.tcp_socket);
                 vdev->ud.tcp_socket = NULL;
         }
         pr_info("release socket\n");
@@ -835,7 +835,7 @@ static void vhci_device_reset(struct usbip_device *ud)
         vdev->udev = NULL;
 
         if (ud->tcp_socket) {
-                fput(ud->tcp_socket->file);
+                sockfd_put(ud->tcp_socket);
                 ud->tcp_socket = NULL;
         }
         ud->status = VDEV_ST_NULL;
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c
index e0980324fb03..47bddcdde0a6 100644
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/staging/usbip/vhci_sysfs.c
@@ -176,6 +176,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
         struct socket *socket;
         int sockfd = 0;
         __u32 rhport = 0, devid = 0, speed = 0;
+        int err;
 
         /*
          * @rhport: port number of vhci_hcd
@@ -194,8 +195,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
                 return -EINVAL;
 
         /* Extract socket from fd. */
-        /* The correct way to clean this up is to fput(socket->file). */
-        socket = sockfd_to_socket(sockfd);
+        socket = sockfd_lookup(sockfd, &err);
         if (!socket)
                 return -EINVAL;
 
@@ -211,7 +211,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
                 spin_unlock(&vdev->ud.lock);
                 spin_unlock(&the_controller->lock);
 
-                fput(socket->file);
+                sockfd_put(socket);
 
                 dev_err(dev, "port %d already used\n", rhport);
                 return -EINVAL;
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index b83ec378d04f..78cab13bbb1b 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -499,6 +499,23 @@ static int iscsit_queue_rsp(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
         return 0;
 }
 
+static void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
+{
+        bool scsi_cmd = (cmd->iscsi_opcode == ISCSI_OP_SCSI_CMD);
+
+        spin_lock_bh(&conn->cmd_lock);
+        if (!list_empty(&cmd->i_conn_node))
+                list_del_init(&cmd->i_conn_node);
+        spin_unlock_bh(&conn->cmd_lock);
+
+        __iscsit_free_cmd(cmd, scsi_cmd, true);
+}
+
+static enum target_prot_op iscsit_get_sup_prot_ops(struct iscsi_conn *conn)
+{
+        return TARGET_PROT_NORMAL;
+}
+
 static struct iscsit_transport iscsi_target_transport = {
         .name                   = "iSCSI/TCP",
         .transport_type         = ISCSI_TCP,
@@ -513,6 +530,8 @@ static struct iscsit_transport iscsi_target_transport = {
         .iscsit_response_queue  = iscsit_response_queue,
         .iscsit_queue_data_in   = iscsit_queue_rsp,
         .iscsit_queue_status    = iscsit_queue_rsp,
+        .iscsit_aborted_task    = iscsit_aborted_task,
+        .iscsit_get_sup_prot_ops = iscsit_get_sup_prot_ops,
 };
 
 static int __init iscsi_target_init_module(void)
@@ -1503,6 +1522,16 @@ int iscsit_setup_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
 {
         u32 payload_length = ntoh24(hdr->dlength);
 
+        if (!(hdr->flags & ISCSI_FLAG_CMD_FINAL)) {
+                pr_err("NopOUT Flag's, Left Most Bit not set, protocol error.\n");
+                if (!cmd)
+                        return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR,
+                                                 (unsigned char *)hdr);
+                
+                return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR,
+                                         (unsigned char *)hdr);
+        }
+
         if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) {
                 pr_err("NOPOUT ITT is reserved, but Immediate Bit is"
                         " not set, protocol error.\n");
@@ -2468,6 +2497,7 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn)
 {
         struct iscsi_cmd *cmd;
         struct iscsi_conn *conn_p;
+        bool found = false;
 
         /*
          * Only send a Asynchronous Message on connections whos network
@@ -2476,11 +2506,12 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn)
         list_for_each_entry(conn_p, &conn->sess->sess_conn_list, conn_list) {
                 if (conn_p->conn_state == TARG_CONN_STATE_LOGGED_IN) {
                         iscsit_inc_conn_usage_count(conn_p);
+                        found = true;
                         break;
                 }
         }
 
-        if (!conn_p)
+        if (!found)
                 return;
 
         cmd = iscsit_allocate_cmd(conn_p, TASK_RUNNING);
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 1c0088fe9e99..ae03f3e5de1e 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1052,6 +1052,11 @@ TPG_ATTR(demo_mode_discovery, S_IRUGO | S_IWUSR);
  */
 DEF_TPG_ATTRIB(default_erl);
 TPG_ATTR(default_erl, S_IRUGO | S_IWUSR);
+/*
+ * Define iscsi_tpg_attrib_s_t10_pi
+ */
+DEF_TPG_ATTRIB(t10_pi);
+TPG_ATTR(t10_pi, S_IRUGO | S_IWUSR);
 
 static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
         &iscsi_tpg_attrib_authentication.attr,
@@ -1064,6 +1069,7 @@ static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
         &iscsi_tpg_attrib_prod_mode_write_protect.attr,
         &iscsi_tpg_attrib_demo_mode_discovery.attr,
         &iscsi_tpg_attrib_default_erl.attr,
+        &iscsi_tpg_attrib_t10_pi.attr,
         NULL,
 };
 
@@ -1815,6 +1821,13 @@ static void lio_queue_tm_rsp(struct se_cmd *se_cmd)
         iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);
 }
 
+static void lio_aborted_task(struct se_cmd *se_cmd)
+{
+        struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
+
+        cmd->conn->conn_transport->iscsit_aborted_task(cmd->conn, cmd);
+}
+
 static char *lio_tpg_get_endpoint_wwn(struct se_portal_group *se_tpg)
 {
         struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
@@ -1999,6 +2012,7 @@ int iscsi_target_register_configfs(void)
         fabric->tf_ops.queue_data_in = &lio_queue_data_in;
         fabric->tf_ops.queue_status = &lio_queue_status;
         fabric->tf_ops.queue_tm_rsp = &lio_queue_tm_rsp;
+        fabric->tf_ops.aborted_task = &lio_aborted_task;
         /*
          * Setup function pointers for generic logic in target_core_fabric_configfs.c
          */
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index 48f7b3bf4e8c..6960f22909ae 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -58,7 +58,8 @@
 #define TA_DEMO_MODE_DISCOVERY          1
 #define TA_DEFAULT_ERL                  0
 #define TA_CACHE_CORE_NPS               0
-
+/* T10 protection information disabled by default */
+#define TA_DEFAULT_T10_PI               0
 
 #define ISCSI_IOV_DATA_BUFFER           5
 
@@ -556,7 +557,7 @@ struct iscsi_conn {
         struct completion       rx_half_close_comp;
         /* socket used by this connection */
         struct socket           *sock;
-        void                    (*orig_data_ready)(struct sock *, int);
+        void                    (*orig_data_ready)(struct sock *);
         void                    (*orig_state_change)(struct sock *);
 #define LOGIN_FLAGS_READ_ACTIVE         1
 #define LOGIN_FLAGS_CLOSED              2
@@ -765,6 +766,7 @@ struct iscsi_tpg_attrib {
         u32                     prod_mode_write_protect;
         u32                     demo_mode_discovery;
         u32                     default_erl;
+        u8                      t10_pi;
         struct iscsi_portal_group *tpg;
 };
 
@@ -787,6 +789,7 @@ struct iscsi_np {
         void                    *np_context;
         struct iscsit_transport *np_transport;
         struct list_head        np_list;
+        struct iscsi_tpg_np     *tpg_np;
 } ____cacheline_aligned;
 
 struct iscsi_tpg_np {
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index e29279e6b577..8739b98f6f93 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -259,6 +259,7 @@ static int iscsi_login_zero_tsih_s1(
 {
         struct iscsi_session *sess = NULL;
         struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;
+        enum target_prot_op sup_pro_ops;
         int ret;
 
         sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);
@@ -320,8 +321,9 @@ static int iscsi_login_zero_tsih_s1(
                 kfree(sess);
                 return -ENOMEM;
         }
+        sup_pro_ops = conn->conn_transport->iscsit_get_sup_prot_ops(conn);
 
-        sess->se_sess = transport_init_session();
+        sess->se_sess = transport_init_session(sup_pro_ops);
         if (IS_ERR(sess->se_sess)) {
                 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
                                 ISCSI_LOGIN_STATUS_NO_RESOURCES);
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index 582ba84075ec..75b685960e80 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -375,7 +375,7 @@ static int iscsi_target_do_tx_login_io(struct iscsi_conn *conn, struct iscsi_log
         return 0;
 }
 
-static void iscsi_target_sk_data_ready(struct sock *sk, int count)
+static void iscsi_target_sk_data_ready(struct sock *sk)
 {
         struct iscsi_conn *conn = sk->sk_user_data;
         bool rc;
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 44a5471de00f..eb96b20dc09e 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -225,6 +225,7 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
         a->prod_mode_write_protect = TA_PROD_MODE_WRITE_PROTECT;
         a->demo_mode_discovery = TA_DEMO_MODE_DISCOVERY;
         a->default_erl = TA_DEFAULT_ERL;
+        a->t10_pi = TA_DEFAULT_T10_PI;
 }
 
 int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_group *tpg)
@@ -500,6 +501,7 @@ struct iscsi_tpg_np *iscsit_tpg_add_network_portal(
         init_completion(&tpg_np->tpg_np_comp);
         kref_init(&tpg_np->tpg_np_kref);
         tpg_np->tpg_np          = np;
+        np->tpg_np              = tpg_np;
         tpg_np->tpg             = tpg;
 
         spin_lock(&tpg->tpg_np_lock);
@@ -858,3 +860,22 @@ int iscsit_ta_default_erl(
 
         return 0;
 }
+
+int iscsit_ta_t10_pi(
+        struct iscsi_portal_group *tpg,
+        u32 flag)
+{
+        struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
+
+        if ((flag != 0) && (flag != 1)) {
+                pr_err("Illegal value %d\n", flag);
+                return -EINVAL;
+        }
+
+        a->t10_pi = flag;
+        pr_debug("iSCSI_TPG[%hu] - T10 Protection information bit:"
+                " %s\n", tpg->tpgt, (a->t10_pi) ?
+                "ON" : "OFF");
+
+        return 0;
+}
diff --git a/drivers/target/iscsi/iscsi_target_tpg.h b/drivers/target/iscsi/iscsi_target_tpg.h
index 213c0fc7fdc9..0a182f2aa8a2 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.h
+++ b/drivers/target/iscsi/iscsi_target_tpg.h
@@ -39,5 +39,6 @@ extern int iscsit_ta_demo_mode_write_protect(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_prod_mode_write_protect(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_demo_mode_discovery(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_default_erl(struct iscsi_portal_group *, u32);
+extern int iscsit_ta_t10_pi(struct iscsi_portal_group *, u32);
 
 #endif /* ISCSI_TARGET_TPG_H */
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index e655b042ed18..53e157cb8c54 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -705,8 +705,8 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd)
 }
 EXPORT_SYMBOL(iscsit_release_cmd);
 
-static void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool scsi_cmd,
-                              bool check_queues)
+void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool scsi_cmd,
+                       bool check_queues)
 {
         struct iscsi_conn *conn = cmd->conn;
 
diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h
index 561a424d1980..a68508c4fec8 100644
--- a/drivers/target/iscsi/iscsi_target_util.h
+++ b/drivers/target/iscsi/iscsi_target_util.h
@@ -30,6 +30,7 @@ extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_co
 extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *);
 extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *);
 extern void iscsit_release_cmd(struct iscsi_cmd *);
+extern void __iscsit_free_cmd(struct iscsi_cmd *, bool, bool);
 extern void iscsit_free_cmd(struct iscsi_cmd *, bool);
 extern int iscsit_check_session_usage_count(struct iscsi_session *);
 extern void iscsit_dec_session_usage_count(struct iscsi_session *);
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index fadad7c5f635..c886ad1c39fb 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -212,6 +212,10 @@ static void tcm_loop_submission_work(struct work_struct *work)
                 se_cmd->se_cmd_flags |= SCF_BIDI;
 
         }
+
+        if (!scsi_prot_sg_count(sc) && scsi_get_prot_op(sc) != SCSI_PROT_NORMAL)
+                se_cmd->prot_pto = true;
+
         rc = target_submit_cmd_map_sgls(se_cmd, tl_nexus->se_sess, sc->cmnd,
                         &tl_cmd->tl_sense_buf[0], tl_cmd->sc->device->lun,
                         scsi_bufflen(sc), tcm_loop_sam_attr(sc),
@@ -915,6 +919,11 @@ static void tcm_loop_queue_tm_rsp(struct se_cmd *se_cmd)
         wake_up(&tl_tmr->tl_tmr_wait);
 }
 
+static void tcm_loop_aborted_task(struct se_cmd *se_cmd)
+{
+        return;
+}
+
 static char *tcm_loop_dump_proto_id(struct tcm_loop_hba *tl_hba)
 {
         switch (tl_hba->tl_proto_id) {
@@ -1009,7 +1018,7 @@ static int tcm_loop_make_nexus(
         /*
          * Initialize the struct se_session pointer
          */
-        tl_nexus->se_sess = transport_init_session();
+        tl_nexus->se_sess = transport_init_session(TARGET_PROT_ALL);
         if (IS_ERR(tl_nexus->se_sess)) {
                 ret = PTR_ERR(tl_nexus->se_sess);
                 goto out;
@@ -1483,6 +1492,7 @@ static int tcm_loop_register_configfs(void)
         fabric->tf_ops.queue_data_in = &tcm_loop_queue_data_in;
         fabric->tf_ops.queue_status = &tcm_loop_queue_status;
         fabric->tf_ops.queue_tm_rsp = &tcm_loop_queue_tm_rsp;
+        fabric->tf_ops.aborted_task = &tcm_loop_aborted_task;
 
         /*
          * Setup function pointers for generic logic in target_core_fabric_configfs.c
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 24884cac19ce..e7e93727553c 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -210,7 +210,7 @@ static struct sbp_session *sbp_session_create(
                 return ERR_PTR(-ENOMEM);
         }
 
-        sess->se_sess = transport_init_session();
+        sess->se_sess = transport_init_session(TARGET_PROT_NORMAL);
         if (IS_ERR(sess->se_sess)) {
                 pr_err("failed to init se_session\n");
 
@@ -1846,6 +1846,11 @@ static void sbp_queue_tm_rsp(struct se_cmd *se_cmd)
 {
 }
 
+static void sbp_aborted_task(struct se_cmd *se_cmd)
+{
+        return;
+}
+
 static int sbp_check_stop_free(struct se_cmd *se_cmd)
 {
         struct sbp_target_request *req = container_of(se_cmd,
@@ -2526,6 +2531,7 @@ static struct target_core_fabric_ops sbp_ops = {
         .queue_data_in                  = sbp_queue_data_in,
         .queue_status                   = sbp_queue_status,
         .queue_tm_rsp                   = sbp_queue_tm_rsp,
+        .aborted_task                   = sbp_aborted_task,
         .check_stop_free                = sbp_check_stop_free,
 
         .fabric_make_wwn                = sbp_make_tport,
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index c3d9df6aaf5f..fcbe6125b73e 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -455,11 +455,26 @@ out:
         return rc;
 }
 
-static inline int core_alua_state_nonoptimized(
+static inline void set_ascq(struct se_cmd *cmd, u8 alua_ascq)
+{
+        /*
+         * Set SCSI additional sense code (ASC) to 'LUN Not Accessible';
+         * The ALUA additional sense code qualifier (ASCQ) is determined
+         * by the ALUA primary or secondary access state..
+         */
+        pr_debug("[%s]: ALUA TG Port not available, "
+                "SenseKey: NOT_READY, ASC/ASCQ: "
+                "0x04/0x%02x\n",
+                cmd->se_tfo->get_fabric_name(), alua_ascq);
+
+        cmd->scsi_asc = 0x04;
+        cmd->scsi_ascq = alua_ascq;
+}
+
+static inline void core_alua_state_nonoptimized(
         struct se_cmd *cmd,
         unsigned char *cdb,
-        int nonop_delay_msecs,
-        u8 *alua_ascq)
+        int nonop_delay_msecs)
 {
         /*
          * Set SCF_ALUA_NON_OPTIMIZED here, this value will be checked
@@ -468,13 +483,11 @@ static inline int core_alua_state_nonoptimized(
          */
         cmd->se_cmd_flags |= SCF_ALUA_NON_OPTIMIZED;
         cmd->alua_nonop_delay = nonop_delay_msecs;
-        return 0;
 }
 
 static inline int core_alua_state_lba_dependent(
         struct se_cmd *cmd,
-        struct t10_alua_tg_pt_gp *tg_pt_gp,
-        u8 *alua_ascq)
+        struct t10_alua_tg_pt_gp *tg_pt_gp)
 {
         struct se_device *dev = cmd->se_dev;
         u64 segment_size, segment_mult, sectors, lba;
@@ -520,7 +533,7 @@ static inline int core_alua_state_lba_dependent(
                 }
                 if (!cur_map) {
                         spin_unlock(&dev->t10_alua.lba_map_lock);
-                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                        set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_UNAVAILABLE);
                         return 1;
                 }
                 list_for_each_entry(map_mem, &cur_map->lba_map_mem_list,
@@ -531,11 +544,11 @@ static inline int core_alua_state_lba_dependent(
                         switch(map_mem->lba_map_mem_alua_state) {
                         case ALUA_ACCESS_STATE_STANDBY:
                                 spin_unlock(&dev->t10_alua.lba_map_lock);
-                                *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                                set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_STANDBY);
                                 return 1;
                         case ALUA_ACCESS_STATE_UNAVAILABLE:
                                 spin_unlock(&dev->t10_alua.lba_map_lock);
-                                *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                                set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_UNAVAILABLE);
                                 return 1;
                         default:
                                 break;
@@ -548,8 +561,7 @@ static inline int core_alua_state_lba_dependent(
 
 static inline int core_alua_state_standby(
         struct se_cmd *cmd,
-        unsigned char *cdb,
-        u8 *alua_ascq)
+        unsigned char *cdb)
 {
         /*
          * Allowed CDBs for ALUA_ACCESS_STATE_STANDBY as defined by
@@ -570,7 +582,7 @@ static inline int core_alua_state_standby(
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
-                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                        set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_STANDBY);
                         return 1;
                 }
         case MAINTENANCE_OUT:
@@ -578,7 +590,7 @@ static inline int core_alua_state_standby(
                 case MO_SET_TARGET_PGS:
                         return 0;
                 default:
-                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                        set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_STANDBY);
                         return 1;
                 }
         case REQUEST_SENSE:
@@ -588,7 +600,7 @@ static inline int core_alua_state_standby(
         case WRITE_BUFFER:
                 return 0;
         default:
-                *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_STANDBY);
                 return 1;
         }
 
@@ -597,8 +609,7 @@ static inline int core_alua_state_standby(
 
 static inline int core_alua_state_unavailable(
         struct se_cmd *cmd,
-        unsigned char *cdb,
-        u8 *alua_ascq)
+        unsigned char *cdb)
 {
         /*
          * Allowed CDBs for ALUA_ACCESS_STATE_UNAVAILABLE as defined by
@@ -613,7 +624,7 @@ static inline int core_alua_state_unavailable(
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
-                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                        set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_UNAVAILABLE);
                         return 1;
                 }
         case MAINTENANCE_OUT:
@@ -621,7 +632,7 @@ static inline int core_alua_state_unavailable(
                 case MO_SET_TARGET_PGS:
                         return 0;
                 default:
-                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                        set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_UNAVAILABLE);
                         return 1;
                 }
         case REQUEST_SENSE:
@@ -629,7 +640,7 @@ static inline int core_alua_state_unavailable(
         case WRITE_BUFFER:
                 return 0;
         default:
-                *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_UNAVAILABLE);
                 return 1;
         }
 
@@ -638,8 +649,7 @@ static inline int core_alua_state_unavailable(
 
 static inline int core_alua_state_transition(
         struct se_cmd *cmd,
-        unsigned char *cdb,
-        u8 *alua_ascq)
+        unsigned char *cdb)
 {
         /*
          * Allowed CDBs for ALUA_ACCESS_STATE_TRANSITION as defined by
@@ -654,7 +664,7 @@ static inline int core_alua_state_transition(
                 case MI_REPORT_TARGET_PGS:
                         return 0;
                 default:
-                        *alua_ascq = ASCQ_04H_ALUA_STATE_TRANSITION;
+                        set_ascq(cmd, ASCQ_04H_ALUA_STATE_TRANSITION);
                         return 1;
                 }
         case REQUEST_SENSE:
@@ -662,7 +672,7 @@ static inline int core_alua_state_transition(
         case WRITE_BUFFER:
                 return 0;
         default:
-                *alua_ascq = ASCQ_04H_ALUA_STATE_TRANSITION;
+                set_ascq(cmd, ASCQ_04H_ALUA_STATE_TRANSITION);
                 return 1;
         }
 
@@ -684,8 +694,6 @@ target_alua_state_check(struct se_cmd *cmd)
         struct t10_alua_tg_pt_gp *tg_pt_gp;
         struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
         int out_alua_state, nonop_delay_msecs;
-        u8 alua_ascq;
-        int ret;
 
         if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)
                 return 0;
@@ -701,9 +709,8 @@ target_alua_state_check(struct se_cmd *cmd)
         if (atomic_read(&port->sep_tg_pt_secondary_offline)) {
                 pr_debug("ALUA: Got secondary offline status for local"
                                 " target port\n");
-                alua_ascq = ASCQ_04H_ALUA_OFFLINE;
-                ret = 1;
-                goto out;
+                set_ascq(cmd, ASCQ_04H_ALUA_OFFLINE);
+                return TCM_CHECK_CONDITION_NOT_READY;
         }
          /*
          * Second, obtain the struct t10_alua_tg_pt_gp_member pointer to the
@@ -731,20 +738,23 @@ target_alua_state_check(struct se_cmd *cmd)
 
         switch (out_alua_state) {
         case ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED:
-                ret = core_alua_state_nonoptimized(cmd, cdb,
-                                        nonop_delay_msecs, &alua_ascq);
+                core_alua_state_nonoptimized(cmd, cdb, nonop_delay_msecs);
                 break;
         case ALUA_ACCESS_STATE_STANDBY:
-                ret = core_alua_state_standby(cmd, cdb, &alua_ascq);
+                if (core_alua_state_standby(cmd, cdb))
+                        return TCM_CHECK_CONDITION_NOT_READY;
                 break;
         case ALUA_ACCESS_STATE_UNAVAILABLE:
-                ret = core_alua_state_unavailable(cmd, cdb, &alua_ascq);
+                if (core_alua_state_unavailable(cmd, cdb))
+                        return TCM_CHECK_CONDITION_NOT_READY;
                 break;
         case ALUA_ACCESS_STATE_TRANSITION:
-                ret = core_alua_state_transition(cmd, cdb, &alua_ascq);
+                if (core_alua_state_transition(cmd, cdb))
+                        return TCM_CHECK_CONDITION_NOT_READY;
                 break;
         case ALUA_ACCESS_STATE_LBA_DEPENDENT:
-                ret = core_alua_state_lba_dependent(cmd, tg_pt_gp, &alua_ascq);
+                if (core_alua_state_lba_dependent(cmd, tg_pt_gp))
+                        return TCM_CHECK_CONDITION_NOT_READY;
                 break;
         /*
          * OFFLINE is a secondary ALUA target port group access state, that is
@@ -757,23 +767,6 @@ target_alua_state_check(struct se_cmd *cmd)
                 return TCM_INVALID_CDB_FIELD;
         }
 
-out:
-        if (ret > 0) {
-                /*
-                 * Set SCSI additional sense code (ASC) to 'LUN Not Accessible';
-                 * The ALUA additional sense code qualifier (ASCQ) is determined
-                 * by the ALUA primary or secondary access state..
-                 */
-                pr_debug("[%s]: ALUA TG Port not available, "
-                        "SenseKey: NOT_READY, ASC/ASCQ: "
-                        "0x04/0x%02x\n",
-                        cmd->se_tfo->get_fabric_name(), alua_ascq);
-
-                cmd->scsi_asc = 0x04;
-                cmd->scsi_ascq = alua_ascq;
-                return TCM_CHECK_CONDITION_NOT_READY;
-        }
-
         return 0;
 }
 
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index f0e85b119692..60a9ae6df763 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -457,6 +457,10 @@ static int target_fabric_tf_ops_check(
                 pr_err("Missing tfo->queue_tm_rsp()\n");
                 return -EINVAL;
         }
+        if (!tfo->aborted_task) {
+                pr_err("Missing tfo->aborted_task()\n");
+                return -EINVAL;
+        }
         /*
          * We at least require tfo->fabric_make_wwn(), tfo->fabric_drop_wwn()
          * tfo->fabric_make_tpg() and tfo->fabric_drop_tpg() in
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index cf991a91a8a9..7d6cddaec525 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -854,25 +854,6 @@ static int fd_init_prot(struct se_device *dev)
         return 0;
 }
 
-static void fd_init_format_buf(struct se_device *dev, unsigned char *buf,
-                               u32 unit_size, u32 *ref_tag, u16 app_tag,
-                               bool inc_reftag)
-{
-        unsigned char *p = buf;
-        int i;
-
-        for (i = 0; i < unit_size; i += dev->prot_length) {
-                *((u16 *)&p[0]) = 0xffff;
-                *((__be16 *)&p[2]) = cpu_to_be16(app_tag);
-                *((__be32 *)&p[4]) = cpu_to_be32(*ref_tag);
-
-                if (inc_reftag)
-                        (*ref_tag)++;
-
-                p += dev->prot_length;
-        }
-}
-
 static int fd_format_prot(struct se_device *dev)
 {
         struct fd_dev *fd_dev = FD_DEV(dev);
@@ -880,10 +861,8 @@ static int fd_format_prot(struct se_device *dev)
         sector_t prot_length, prot;
         unsigned char *buf;
         loff_t pos = 0;
-        u32 ref_tag = 0;
         int unit_size = FDBD_FORMAT_UNIT_SIZE * dev->dev_attrib.block_size;
         int rc, ret = 0, size, len;
-        bool inc_reftag = false;
 
         if (!dev->dev_attrib.pi_prot_type) {
                 pr_err("Unable to format_prot while pi_prot_type == 0\n");
@@ -894,37 +873,20 @@ static int fd_format_prot(struct se_device *dev)
                 return -ENODEV;
         }
 
-        switch (dev->dev_attrib.pi_prot_type) {
-        case TARGET_DIF_TYPE3_PROT:
-                ref_tag = 0xffffffff;
-                break;
-        case TARGET_DIF_TYPE2_PROT:
-        case TARGET_DIF_TYPE1_PROT:
-                inc_reftag = true;
-                break;
-        default:
-                break;
-        }
-
         buf = vzalloc(unit_size);
         if (!buf) {
                 pr_err("Unable to allocate FILEIO prot buf\n");
                 return -ENOMEM;
         }
-
         prot_length = (dev->transport->get_blocks(dev) + 1) * dev->prot_length;
         size = prot_length;
 
         pr_debug("Using FILEIO prot_length: %llu\n",
                  (unsigned long long)prot_length);
 
+        memset(buf, 0xff, unit_size);
         for (prot = 0; prot < prot_length; prot += unit_size) {
-
-                fd_init_format_buf(dev, buf, unit_size, &ref_tag, 0xffff,
-                                   inc_reftag);
-
                 len = min(unit_size, size);
-
                 rc = kernel_write(prot_fd, buf, len, pos);
                 if (rc != len) {
                         pr_err("vfs_write to prot file failed: %d\n", rc);
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 554d4f75a75a..9e0232cca92e 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -203,10 +203,9 @@ static void iblock_free_device(struct se_device *dev)
 
         if (ib_dev->ibd_bd != NULL)
                 blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
-        if (ib_dev->ibd_bio_set != NULL) {
-                bioset_integrity_free(ib_dev->ibd_bio_set);
+        if (ib_dev->ibd_bio_set != NULL)
                 bioset_free(ib_dev->ibd_bio_set);
-        }
+
         kfree(ib_dev);
 }
 
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 66a5aba5a0d9..b920db3388cd 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -242,7 +242,7 @@ static void rd_release_prot_space(struct rd_dev *rd_dev)
         rd_dev->sg_prot_count = 0;
 }
 
-static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length)
+static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length, int block_size)
 {
         struct rd_dev_sg_table *sg_table;
         u32 total_sg_needed, sg_tables;
@@ -252,8 +252,13 @@ static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length)
 
         if (rd_dev->rd_flags & RDF_NULLIO)
                 return 0;
-
-        total_sg_needed = rd_dev->rd_page_count / prot_length;
+        /*
+         * prot_length=8byte dif data
+         * tot sg needed = rd_page_count * (PGSZ/block_size) *
+         *                 (prot_length/block_size) + pad
+         * PGSZ canceled each other.
+         */
+        total_sg_needed = (rd_dev->rd_page_count * prot_length / block_size) + 1;
 
         sg_tables = (total_sg_needed / max_sg_per_table) + 1;
 
@@ -606,7 +611,8 @@ static int rd_init_prot(struct se_device *dev)
         if (!dev->dev_attrib.pi_prot_type)
                 return 0;
 
-        return rd_build_prot_space(rd_dev, dev->prot_length);
+        return rd_build_prot_space(rd_dev, dev->prot_length,
+                                   dev->dev_attrib.block_size);
 }
 
 static void rd_free_prot(struct se_device *dev)
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 77e6531fb0a1..e0229592ec55 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -89,6 +89,7 @@ static sense_reason_t
 sbc_emulate_readcapacity_16(struct se_cmd *cmd)
 {
         struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
         unsigned char *rbuf;
         unsigned char buf[32];
         unsigned long long blocks = dev->transport->get_blocks(dev);
@@ -109,8 +110,10 @@ sbc_emulate_readcapacity_16(struct se_cmd *cmd)
         /*
          * Set P_TYPE and PROT_EN bits for DIF support
          */
-        if (dev->dev_attrib.pi_prot_type)
-                buf[12] = (dev->dev_attrib.pi_prot_type - 1) << 1 | 0x1;
+        if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
+                if (dev->dev_attrib.pi_prot_type)
+                        buf[12] = (dev->dev_attrib.pi_prot_type - 1) << 1 | 0x1;
+        }
 
         if (dev->transport->get_lbppbe)
                 buf[13] = dev->transport->get_lbppbe(dev) & 0x0f;
@@ -425,13 +428,14 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd)
                 goto out;
         }
 
-        write_sg = kzalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
+        write_sg = kmalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
                            GFP_KERNEL);
         if (!write_sg) {
                 pr_err("Unable to allocate compare_and_write sg\n");
                 ret = TCM_OUT_OF_RESOURCES;
                 goto out;
         }
+        sg_init_table(write_sg, cmd->t_data_nents);
         /*
          * Setup verify and write data payloads from total NumberLBAs.
          */
@@ -569,30 +573,85 @@ sbc_compare_and_write(struct se_cmd *cmd)
         return TCM_NO_SENSE;
 }
 
+static int
+sbc_set_prot_op_checks(u8 protect, enum target_prot_type prot_type,
+                       bool is_write, struct se_cmd *cmd)
+{
+        if (is_write) {
+                cmd->prot_op = protect ? TARGET_PROT_DOUT_PASS :
+                                         TARGET_PROT_DOUT_INSERT;
+                switch (protect) {
+                case 0x0:
+                case 0x3:
+                        cmd->prot_checks = 0;
+                        break;
+                case 0x1:
+                case 0x5:
+                        cmd->prot_checks = TARGET_DIF_CHECK_GUARD;
+                        if (prot_type == TARGET_DIF_TYPE1_PROT)
+                                cmd->prot_checks |= TARGET_DIF_CHECK_REFTAG;
+                        break;
+                case 0x2:
+                        if (prot_type == TARGET_DIF_TYPE1_PROT)
+                                cmd->prot_checks = TARGET_DIF_CHECK_REFTAG;
+                        break;
+                case 0x4:
+                        cmd->prot_checks = TARGET_DIF_CHECK_GUARD;
+                        break;
+                default:
+                        pr_err("Unsupported protect field %d\n", protect);
+                        return -EINVAL;
+                }
+        } else {
+                cmd->prot_op = protect ? TARGET_PROT_DIN_PASS :
+                                         TARGET_PROT_DIN_STRIP;
+                switch (protect) {
+                case 0x0:
+                case 0x1:
+                case 0x5:
+                        cmd->prot_checks = TARGET_DIF_CHECK_GUARD;
+                        if (prot_type == TARGET_DIF_TYPE1_PROT)
+                                cmd->prot_checks |= TARGET_DIF_CHECK_REFTAG;
+                        break;
+                case 0x2:
+                        if (prot_type == TARGET_DIF_TYPE1_PROT)
+                                cmd->prot_checks = TARGET_DIF_CHECK_REFTAG;
+                        break;
+                case 0x3:
+                        cmd->prot_checks = 0;
+                        break;
+                case 0x4:
+                        cmd->prot_checks = TARGET_DIF_CHECK_GUARD;
+                        break;
+                default:
+                        pr_err("Unsupported protect field %d\n", protect);
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
 static bool
 sbc_check_prot(struct se_device *dev, struct se_cmd *cmd, unsigned char *cdb,
-               u32 sectors)
+               u32 sectors, bool is_write)
 {
-        if (!cmd->t_prot_sg || !cmd->t_prot_nents)
+        u8 protect = cdb[1] >> 5;
+
+        if ((!cmd->t_prot_sg || !cmd->t_prot_nents) && cmd->prot_pto)
                 return true;
 
         switch (dev->dev_attrib.pi_prot_type) {
         case TARGET_DIF_TYPE3_PROT:
-                if (!(cdb[1] & 0xe0))
-                        return true;
-
                 cmd->reftag_seed = 0xffffffff;
                 break;
         case TARGET_DIF_TYPE2_PROT:
-                if (cdb[1] & 0xe0)
+                if (protect)
                         return false;
 
                 cmd->reftag_seed = cmd->t_task_lba;
                 break;
         case TARGET_DIF_TYPE1_PROT:
-                if (!(cdb[1] & 0xe0))
-                        return true;
-
                 cmd->reftag_seed = cmd->t_task_lba;
                 break;
         case TARGET_DIF_TYPE0_PROT:
@@ -600,9 +659,15 @@ sbc_check_prot(struct se_device *dev, struct se_cmd *cmd, unsigned char *cdb,
                 return true;
         }
 
+        if (sbc_set_prot_op_checks(protect, dev->dev_attrib.pi_prot_type,
+                                   is_write, cmd))
+                return false;
+
         cmd->prot_type = dev->dev_attrib.pi_prot_type;
         cmd->prot_length = dev->prot_length * sectors;
-        cmd->prot_handover = PROT_SEPERATED;
+        pr_debug("%s: prot_type=%d, prot_length=%d prot_op=%d prot_checks=%d\n",
+                 __func__, cmd->prot_type, cmd->prot_length,
+                 cmd->prot_op, cmd->prot_checks);
 
         return true;
 }
@@ -628,7 +693,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_10(cdb);
                 cmd->t_task_lba = transport_lba_32(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, false))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 cmd->se_cmd_flags |= SCF_SCSI_DATA_CDB;
@@ -639,7 +704,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_12(cdb);
                 cmd->t_task_lba = transport_lba_32(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, false))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 cmd->se_cmd_flags |= SCF_SCSI_DATA_CDB;
@@ -650,7 +715,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_16(cdb);
                 cmd->t_task_lba = transport_lba_64(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, false))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 cmd->se_cmd_flags |= SCF_SCSI_DATA_CDB;
@@ -669,7 +734,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_10(cdb);
                 cmd->t_task_lba = transport_lba_32(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, true))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 if (cdb[1] & 0x8)
@@ -682,7 +747,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_12(cdb);
                 cmd->t_task_lba = transport_lba_32(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, true))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 if (cdb[1] & 0x8)
@@ -695,7 +760,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                 sectors = transport_get_sectors_16(cdb);
                 cmd->t_task_lba = transport_lba_64(cdb);
 
-                if (!sbc_check_prot(dev, cmd, cdb, sectors))
+                if (!sbc_check_prot(dev, cmd, cdb, sectors, true))
                         return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                 if (cdb[1] & 0x8)
@@ -1031,6 +1096,50 @@ err:
 }
 EXPORT_SYMBOL(sbc_execute_unmap);
 
+void
+sbc_dif_generate(struct se_cmd *cmd)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_dif_v1_tuple *sdt;
+        struct scatterlist *dsg, *psg = cmd->t_prot_sg;
+        sector_t sector = cmd->t_task_lba;
+        void *daddr, *paddr;
+        int i, j, offset = 0;
+
+        for_each_sg(cmd->t_data_sg, dsg, cmd->t_data_nents, i) {
+                daddr = kmap_atomic(sg_page(dsg)) + dsg->offset;
+                paddr = kmap_atomic(sg_page(psg)) + psg->offset;
+
+                for (j = 0; j < dsg->length; j += dev->dev_attrib.block_size) {
+
+                        if (offset >= psg->length) {
+                                kunmap_atomic(paddr);
+                                psg = sg_next(psg);
+                                paddr = kmap_atomic(sg_page(psg)) + psg->offset;
+                                offset = 0;
+                        }
+
+                        sdt = paddr + offset;
+                        sdt->guard_tag = cpu_to_be16(crc_t10dif(daddr + j,
+                                                dev->dev_attrib.block_size));
+                        if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE1_PROT)
+                                sdt->ref_tag = cpu_to_be32(sector & 0xffffffff);
+                        sdt->app_tag = 0;
+
+                        pr_debug("DIF WRITE INSERT sector: %llu guard_tag: 0x%04x"
+                                 " app_tag: 0x%04x ref_tag: %u\n",
+                                 (unsigned long long)sector, sdt->guard_tag,
+                                 sdt->app_tag, be32_to_cpu(sdt->ref_tag));
+
+                        sector++;
+                        offset += sizeof(struct se_dif_v1_tuple);
+                }
+
+                kunmap_atomic(paddr);
+                kunmap_atomic(daddr);
+        }
+}
+
 static sense_reason_t
 sbc_dif_v1_verify(struct se_device *dev, struct se_dif_v1_tuple *sdt,
                   const void *p, sector_t sector, unsigned int ei_lba)
@@ -1162,9 +1271,9 @@ sbc_dif_verify_write(struct se_cmd *cmd, sector_t start, unsigned int sectors,
 }
 EXPORT_SYMBOL(sbc_dif_verify_write);
 
-sense_reason_t
-sbc_dif_verify_read(struct se_cmd *cmd, sector_t start, unsigned int sectors,
-                    unsigned int ei_lba, struct scatterlist *sg, int sg_off)
+static sense_reason_t
+__sbc_dif_verify_read(struct se_cmd *cmd, sector_t start, unsigned int sectors,
+                      unsigned int ei_lba, struct scatterlist *sg, int sg_off)
 {
         struct se_device *dev = cmd->se_dev;
         struct se_dif_v1_tuple *sdt;
@@ -1217,8 +1326,31 @@ sbc_dif_verify_read(struct se_cmd *cmd, sector_t start, unsigned int sectors,
                 kunmap_atomic(paddr);
                 kunmap_atomic(daddr);
         }
-        sbc_dif_copy_prot(cmd, sectors, true, sg, sg_off);
 
         return 0;
 }
+
+sense_reason_t
+sbc_dif_read_strip(struct se_cmd *cmd)
+{
+        struct se_device *dev = cmd->se_dev;
+        u32 sectors = cmd->prot_length / dev->prot_length;
+
+        return __sbc_dif_verify_read(cmd, cmd->t_task_lba, sectors, 0,
+                                     cmd->t_prot_sg, 0);
+}
+
+sense_reason_t
+sbc_dif_verify_read(struct se_cmd *cmd, sector_t start, unsigned int sectors,
+                    unsigned int ei_lba, struct scatterlist *sg, int sg_off)
+{
+        sense_reason_t rc;
+
+        rc = __sbc_dif_verify_read(cmd, start, sectors, ei_lba, sg, sg_off);
+        if (rc)
+                return rc;
+
+        sbc_dif_copy_prot(cmd, sectors, true, sg, sg_off);
+        return 0;
+}
 EXPORT_SYMBOL(sbc_dif_verify_read);
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 3bebc71ea033..8653666612a8 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -71,6 +71,7 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf)
 {
         struct se_lun *lun = cmd->se_lun;
         struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
 
         /* Set RMB (removable media) for tape devices */
         if (dev->transport->get_device_type(dev) == TYPE_TAPE)
@@ -101,10 +102,13 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf)
         if (dev->dev_attrib.emulate_3pc)
                 buf[5] |= 0x8;
         /*
-         * Set Protection (PROTECT) bit when DIF has been enabled.
+         * Set Protection (PROTECT) bit when DIF has been enabled on the
+         * device, and the transport supports VERIFY + PASS.
          */
-        if (dev->dev_attrib.pi_prot_type)
-                buf[5] |= 0x1;
+        if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
+                if (dev->dev_attrib.pi_prot_type)
+                        buf[5] |= 0x1;
+        }
 
         buf[7] = 0x2; /* CmdQue=1 */
 
@@ -473,16 +477,19 @@ static sense_reason_t
 spc_emulate_evpd_86(struct se_cmd *cmd, unsigned char *buf)
 {
         struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
 
         buf[3] = 0x3c;
         /*
          * Set GRD_CHK + REF_CHK for TYPE1 protection, or GRD_CHK
          * only for TYPE3 protection.
          */
-        if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE1_PROT)
-                buf[4] = 0x5;
-        else if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE3_PROT)
-                buf[4] = 0x4;
+        if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
+                if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE1_PROT)
+                        buf[4] = 0x5;
+                else if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE3_PROT)
+                        buf[4] = 0x4;
+        }
 
         /* Set HEADSUP, ORDSUP, SIMPSUP */
         buf[5] = 0x07;
@@ -762,7 +769,7 @@ out:
         return ret;
 }
 
-static int spc_modesense_rwrecovery(struct se_device *dev, u8 pc, u8 *p)
+static int spc_modesense_rwrecovery(struct se_cmd *cmd, u8 pc, u8 *p)
 {
         p[0] = 0x01;
         p[1] = 0x0a;
@@ -775,8 +782,11 @@ out:
         return 12;
 }
 
-static int spc_modesense_control(struct se_device *dev, u8 pc, u8 *p)
+static int spc_modesense_control(struct se_cmd *cmd, u8 pc, u8 *p)
 {
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+
         p[0] = 0x0a;
         p[1] = 0x0a;
 
@@ -868,8 +878,10 @@ static int spc_modesense_control(struct se_device *dev, u8 pc, u8 *p)
          * type, shall not modify the contents of the LOGICAL BLOCK REFERENCE
          * TAG field.
          */
-        if (dev->dev_attrib.pi_prot_type)
-                p[5] |= 0x80;
+        if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
+                if (dev->dev_attrib.pi_prot_type)
+                        p[5] |= 0x80;
+        }
 
         p[8] = 0xff;
         p[9] = 0xff;
@@ -879,8 +891,10 @@ out:
         return 12;
 }
 
-static int spc_modesense_caching(struct se_device *dev, u8 pc, u8 *p)
+static int spc_modesense_caching(struct se_cmd *cmd, u8 pc, u8 *p)
 {
+        struct se_device *dev = cmd->se_dev;
+
         p[0] = 0x08;
         p[1] = 0x12;
 
@@ -896,7 +910,7 @@ out:
         return 20;
 }
 
-static int spc_modesense_informational_exceptions(struct se_device *dev, u8 pc, unsigned char *p)
+static int spc_modesense_informational_exceptions(struct se_cmd *cmd, u8 pc, unsigned char *p)
 {
         p[0] = 0x1c;
         p[1] = 0x0a;
@@ -912,7 +926,7 @@ out:
 static struct {
         uint8_t         page;
         uint8_t         subpage;
-        int             (*emulate)(struct se_device *, u8, unsigned char *);
+        int             (*emulate)(struct se_cmd *, u8, unsigned char *);
 } modesense_handlers[] = {
         { .page = 0x01, .subpage = 0x00, .emulate = spc_modesense_rwrecovery },
         { .page = 0x08, .subpage = 0x00, .emulate = spc_modesense_caching },
@@ -1050,7 +1064,7 @@ static sense_reason_t spc_emulate_modesense(struct se_cmd *cmd)
                          * the only two possibilities).
                          */
                         if ((modesense_handlers[i].subpage & ~subpage) == 0) {
-                                ret = modesense_handlers[i].emulate(dev, pc, &buf[length]);
+                                ret = modesense_handlers[i].emulate(cmd, pc, &buf[length]);
                                 if (!ten && length + ret >= 255)
                                         break;
                                 length += ret;
@@ -1063,7 +1077,7 @@ static sense_reason_t spc_emulate_modesense(struct se_cmd *cmd)
         for (i = 0; i < ARRAY_SIZE(modesense_handlers); ++i)
                 if (modesense_handlers[i].page == page &&
                     modesense_handlers[i].subpage == subpage) {
-                        length += modesense_handlers[i].emulate(dev, pc, &buf[length]);
+                        length += modesense_handlers[i].emulate(cmd, pc, &buf[length]);
                         goto set_length;
                 }
 
@@ -1095,7 +1109,6 @@ set_length:
 
 static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd)
 {
-        struct se_device *dev = cmd->se_dev;
         char *cdb = cmd->t_task_cdb;
         bool ten = cdb[0] == MODE_SELECT_10;
         int off = ten ? 8 : 4;
@@ -1131,7 +1144,7 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd)
                 if (modesense_handlers[i].page == page &&
                     modesense_handlers[i].subpage == subpage) {
                         memset(tbuf, 0, SE_MODE_PAGE_BUF);
-                        length = modesense_handlers[i].emulate(dev, 0, tbuf);
+                        length = modesense_handlers[i].emulate(cmd, 0, tbuf);
                         goto check_contents;
                 }
 
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 70c638f730af..f7cd95e8111a 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -87,14 +87,17 @@ static void core_tmr_handle_tas_abort(
         struct se_cmd *cmd,
         int tas)
 {
+        bool remove = true;
         /*
          * TASK ABORTED status (TAS) bit support
         */
         if ((tmr_nacl &&
-             (tmr_nacl == cmd->se_sess->se_node_acl)) || tas)
+             (tmr_nacl != cmd->se_sess->se_node_acl)) && tas) {
+                remove = false;
                 transport_send_task_abort(cmd);
+        }
 
-        transport_cmd_finish_abort(cmd, 0);
+        transport_cmd_finish_abort(cmd, remove);
 }
 
 static int target_check_cdb_and_preempt(struct list_head *list,
@@ -127,6 +130,11 @@ void core_tmr_abort_task(
 
                 if (dev != se_cmd->se_dev)
                         continue;
+
+                /* skip se_cmd associated with tmr */
+                if (tmr->task_cmd == se_cmd)
+                        continue;
+
                 ref_tag = se_cmd->se_tfo->get_task_tag(se_cmd);
                 if (tmr->ref_task_tag != ref_tag)
                         continue;
@@ -150,18 +158,9 @@ void core_tmr_abort_task(
 
                 cancel_work_sync(&se_cmd->work);
                 transport_wait_for_tasks(se_cmd);
-                /*
-                 * Now send SAM_STAT_TASK_ABORTED status for the referenced
-                 * se_cmd descriptor..
-                 */
-                transport_send_task_abort(se_cmd);
-                /*
-                 * Also deal with possible extra acknowledge reference..
-                 */
-                if (se_cmd->se_cmd_flags & SCF_ACK_KREF)
-                        target_put_sess_cmd(se_sess, se_cmd);
 
                 target_put_sess_cmd(se_sess, se_cmd);
+                transport_cmd_finish_abort(se_cmd, true);
 
                 printk("ABORT_TASK: Sending TMR_FUNCTION_COMPLETE for"
                                 " ref_tag: %d\n", ref_tag);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 2956250b7225..d4b98690a736 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -235,7 +235,7 @@ void transport_subsystem_check_init(void)
         sub_api_initialized = 1;
 }
 
-struct se_session *transport_init_session(void)
+struct se_session *transport_init_session(enum target_prot_op sup_prot_ops)
 {
         struct se_session *se_sess;
 
@@ -251,6 +251,7 @@ struct se_session *transport_init_session(void)
         INIT_LIST_HEAD(&se_sess->sess_wait_list);
         spin_lock_init(&se_sess->sess_cmd_lock);
         kref_init(&se_sess->sess_kref);
+        se_sess->sup_prot_ops = sup_prot_ops;
 
         return se_sess;
 }
@@ -288,12 +289,13 @@ int transport_alloc_session_tags(struct se_session *se_sess,
 EXPORT_SYMBOL(transport_alloc_session_tags);
 
 struct se_session *transport_init_session_tags(unsigned int tag_num,
-                                               unsigned int tag_size)
+                                               unsigned int tag_size,
+                                               enum target_prot_op sup_prot_ops)
 {
         struct se_session *se_sess;
         int rc;
 
-        se_sess = transport_init_session();
+        se_sess = transport_init_session(sup_prot_ops);
         if (IS_ERR(se_sess))
                 return se_sess;
 
@@ -603,6 +605,15 @@ static void transport_lun_remove_cmd(struct se_cmd *cmd)
 
 void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
 {
+        if (cmd->se_cmd_flags & SCF_SE_LUN_CMD)
+                transport_lun_remove_cmd(cmd);
+        /*
+         * Allow the fabric driver to unmap any resources before
+         * releasing the descriptor via TFO->release_cmd()
+         */
+        if (remove)
+                cmd->se_tfo->aborted_task(cmd);
+
         if (transport_cmd_check_stop_to_fabric(cmd))
                 return;
         if (remove)
@@ -1365,6 +1376,13 @@ int target_submit_cmd_map_sgls(struct se_cmd *se_cmd, struct se_session *se_sess
                 target_put_sess_cmd(se_sess, se_cmd);
                 return 0;
         }
+
+        rc = target_setup_cmd_from_cdb(se_cmd, cdb);
+        if (rc != 0) {
+                transport_generic_request_failure(se_cmd, rc);
+                return 0;
+        }
+
         /*
          * Save pointers for SGLs containing protection information,
          * if present.
@@ -1374,11 +1392,6 @@ int target_submit_cmd_map_sgls(struct se_cmd *se_cmd, struct se_session *se_sess
                 se_cmd->t_prot_nents = sgl_prot_count;
         }
 
-        rc = target_setup_cmd_from_cdb(se_cmd, cdb);
-        if (rc != 0) {
-                transport_generic_request_failure(se_cmd, rc);
-                return 0;
-        }
         /*
          * When a non zero sgl_count has been passed perform SGL passthrough
          * mapping for pre-allocated fabric memory instead of having target
@@ -1754,6 +1767,15 @@ void target_execute_cmd(struct se_cmd *cmd)
         cmd->t_state = TRANSPORT_PROCESSING;
         cmd->transport_state |= CMD_T_ACTIVE|CMD_T_BUSY|CMD_T_SENT;
         spin_unlock_irq(&cmd->t_state_lock);
+        /*
+         * Perform WRITE_INSERT of PI using software emulation when backend
+         * device has PI enabled, if the transport has not already generated
+         * PI using hardware WRITE_INSERT offload.
+         */
+        if (cmd->prot_op == TARGET_PROT_DOUT_INSERT) {
+                if (!(cmd->se_sess->sup_prot_ops & TARGET_PROT_DOUT_INSERT))
+                        sbc_dif_generate(cmd);
+        }
 
         if (target_handle_task_attr(cmd)) {
                 spin_lock_irq(&cmd->t_state_lock);
@@ -1883,6 +1905,21 @@ static void transport_handle_queue_full(
         schedule_work(&cmd->se_dev->qf_work_queue);
 }
 
+static bool target_check_read_strip(struct se_cmd *cmd)
+{
+        sense_reason_t rc;
+
+        if (!(cmd->se_sess->sup_prot_ops & TARGET_PROT_DIN_STRIP)) {
+                rc = sbc_dif_read_strip(cmd);
+                if (rc) {
+                        cmd->pi_err = rc;
+                        return true;
+                }
+        }
+
+        return false;
+}
+
 static void target_complete_ok_work(struct work_struct *work)
 {
         struct se_cmd *cmd = container_of(work, struct se_cmd, work);
@@ -1947,6 +1984,22 @@ static void target_complete_ok_work(struct work_struct *work)
                                         cmd->data_length;
                 }
                 spin_unlock(&cmd->se_lun->lun_sep_lock);
+                /*
+                 * Perform READ_STRIP of PI using software emulation when
+                 * backend had PI enabled, if the transport will not be
+                 * performing hardware READ_STRIP offload.
+                 */
+                if (cmd->prot_op == TARGET_PROT_DIN_STRIP &&
+                    target_check_read_strip(cmd)) {
+                        ret = transport_send_check_condition_and_sense(cmd,
+                                                cmd->pi_err, 0);
+                        if (ret == -EAGAIN || ret == -ENOMEM)
+                                goto queue_full;
+
+                        transport_lun_remove_cmd(cmd);
+                        transport_cmd_check_stop_to_fabric(cmd);
+                        return;
+                }
 
                 trace_target_cmd_complete(cmd);
                 ret = cmd->se_tfo->queue_data_in(cmd);
@@ -2039,6 +2092,10 @@ static inline void transport_free_pages(struct se_cmd *cmd)
         transport_free_sgl(cmd->t_bidi_data_sg, cmd->t_bidi_data_nents);
         cmd->t_bidi_data_sg = NULL;
         cmd->t_bidi_data_nents = 0;
+
+        transport_free_sgl(cmd->t_prot_sg, cmd->t_prot_nents);
+        cmd->t_prot_sg = NULL;
+        cmd->t_prot_nents = 0;
 }
 
 /**
@@ -2202,6 +2259,14 @@ transport_generic_new_cmd(struct se_cmd *cmd)
                                 return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                 }
 
+                if (cmd->prot_op != TARGET_PROT_NORMAL) {
+                        ret = target_alloc_sgl(&cmd->t_prot_sg,
+                                               &cmd->t_prot_nents,
+                                               cmd->prot_length, true);
+                        if (ret < 0)
+                                return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                }
+
                 ret = target_alloc_sgl(&cmd->t_data_sg, &cmd->t_data_nents,
                                        cmd->data_length, zero_flag);
                 if (ret < 0)
@@ -2770,13 +2835,17 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
         if (!(cmd->transport_state & CMD_T_ABORTED))
                 return 0;
 
-        if (!send_status || (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
+        /*
+         * If cmd has been aborted but either no status is to be sent or it has
+         * already been sent, just return
+         */
+        if (!send_status || !(cmd->se_cmd_flags & SCF_SEND_DELAYED_TAS))
                 return 1;
 
         pr_debug("Sending delayed SAM_STAT_TASK_ABORTED status for CDB: 0x%02x ITT: 0x%08x\n",
                  cmd->t_task_cdb[0], cmd->se_tfo->get_task_tag(cmd));
 
-        cmd->se_cmd_flags |= SCF_SENT_DELAYED_TAS;
+        cmd->se_cmd_flags &= ~SCF_SEND_DELAYED_TAS;
         cmd->scsi_status = SAM_STAT_TASK_ABORTED;
         trace_target_cmd_complete(cmd);
         cmd->se_tfo->queue_status(cmd);
@@ -2790,7 +2859,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
         unsigned long flags;
 
         spin_lock_irqsave(&cmd->t_state_lock, flags);
-        if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION | SCF_SENT_DELAYED_TAS)) {
+        if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION)) {
                 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
                 return;
         }
@@ -2805,6 +2874,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
         if (cmd->data_direction == DMA_TO_DEVICE) {
                 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
                         cmd->transport_state |= CMD_T_ABORTED;
+                        cmd->se_cmd_flags |= SCF_SEND_DELAYED_TAS;
                         smp_mb__after_atomic_inc();
                         return;
                 }
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 752863acecb8..a0bcfd3e7e7d 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -94,20 +94,19 @@ struct ft_lun {
  */
 struct ft_tpg {
         u32 index;
-        struct ft_lport_acl *lport_acl;
+        struct ft_lport_wwn *lport_wwn;
         struct ft_tport *tport;         /* active tport or NULL */
-        struct list_head list;          /* linkage in ft_lport_acl tpg_list */
         struct list_head lun_list;      /* head of LUNs */
         struct se_portal_group se_tpg;
         struct workqueue_struct *workqueue;
 };
 
-struct ft_lport_acl {
+struct ft_lport_wwn {
         u64 wwpn;
         char name[FT_NAMELEN];
-        struct list_head list;
-        struct list_head tpg_list;
-        struct se_wwn fc_lport_wwn;
+        struct list_head ft_wwn_node;
+        struct ft_tpg *tpg;
+        struct se_wwn se_wwn;
 };
 
 /*
@@ -128,7 +127,6 @@ struct ft_cmd {
         u32 sg_cnt;                     /* No. of item in scatterlist */
 };
 
-extern struct list_head ft_lport_list;
 extern struct mutex ft_lport_lock;
 extern struct fc4_prov ft_prov;
 extern struct target_fabric_configfs *ft_configfs;
@@ -163,6 +161,7 @@ int ft_write_pending_status(struct se_cmd *);
 u32 ft_get_task_tag(struct se_cmd *);
 int ft_get_cmd_state(struct se_cmd *);
 void ft_queue_tm_resp(struct se_cmd *);
+void ft_aborted_task(struct se_cmd *);
 
 /*
  * other internal functions.
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 8b2c1aaf81de..01cf37f212c3 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -426,6 +426,11 @@ void ft_queue_tm_resp(struct se_cmd *se_cmd)
         ft_send_resp_code(cmd, code);
 }
 
+void ft_aborted_task(struct se_cmd *se_cmd)
+{
+        return;
+}
+
 static void ft_send_work(struct work_struct *work);
 
 /*
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index e879da81ad93..efdcb9663a1a 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -50,7 +50,7 @@
 
 struct target_fabric_configfs *ft_configfs;
 
-LIST_HEAD(ft_lport_list);
+static LIST_HEAD(ft_wwn_list);
 DEFINE_MUTEX(ft_lport_lock);
 
 unsigned int ft_debug_logging;
@@ -298,7 +298,7 @@ static struct se_portal_group *ft_add_tpg(
         struct config_group *group,
         const char *name)
 {
-        struct ft_lport_acl *lacl;
+        struct ft_lport_wwn *ft_wwn;
         struct ft_tpg *tpg;
         struct workqueue_struct *wq;
         unsigned long index;
@@ -318,12 +318,17 @@ static struct se_portal_group *ft_add_tpg(
         if (index > UINT_MAX)
                 return NULL;
 
-        lacl = container_of(wwn, struct ft_lport_acl, fc_lport_wwn);
+        if ((index != 1)) {
+                pr_err("Error, a single TPG=1 is used for HW port mappings\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        ft_wwn = container_of(wwn, struct ft_lport_wwn, se_wwn);
         tpg = kzalloc(sizeof(*tpg), GFP_KERNEL);
         if (!tpg)
                 return NULL;
         tpg->index = index;
-        tpg->lport_acl = lacl;
+        tpg->lport_wwn = ft_wwn;
         INIT_LIST_HEAD(&tpg->lun_list);
 
         wq = alloc_workqueue("tcm_fc", 0, 1);
@@ -342,7 +347,7 @@ static struct se_portal_group *ft_add_tpg(
         tpg->workqueue = wq;
 
         mutex_lock(&ft_lport_lock);
-        list_add_tail(&tpg->list, &lacl->tpg_list);
+        ft_wwn->tpg = tpg;
         mutex_unlock(&ft_lport_lock);
 
         return &tpg->se_tpg;
@@ -351,6 +356,7 @@ static struct se_portal_group *ft_add_tpg(
 static void ft_del_tpg(struct se_portal_group *se_tpg)
 {
         struct ft_tpg *tpg = container_of(se_tpg, struct ft_tpg, se_tpg);
+        struct ft_lport_wwn *ft_wwn = tpg->lport_wwn;
 
         pr_debug("del tpg %s\n",
                     config_item_name(&tpg->se_tpg.tpg_group.cg_item));
@@ -361,7 +367,7 @@ static void ft_del_tpg(struct se_portal_group *se_tpg)
         synchronize_rcu();
 
         mutex_lock(&ft_lport_lock);
-        list_del(&tpg->list);
+        ft_wwn->tpg = NULL;
         if (tpg->tport) {
                 tpg->tport->tpg = NULL;
                 tpg->tport = NULL;
@@ -380,15 +386,11 @@ static void ft_del_tpg(struct se_portal_group *se_tpg)
  */
 struct ft_tpg *ft_lport_find_tpg(struct fc_lport *lport)
 {
-        struct ft_lport_acl *lacl;
-        struct ft_tpg *tpg;
+        struct ft_lport_wwn *ft_wwn;
 
-        list_for_each_entry(lacl, &ft_lport_list, list) {
-                if (lacl->wwpn == lport->wwpn) {
-                        list_for_each_entry(tpg, &lacl->tpg_list, list)
-                                return tpg; /* XXX for now return first entry */
-                        return NULL;
-                }
+        list_for_each_entry(ft_wwn, &ft_wwn_list, ft_wwn_node) {
+                if (ft_wwn->wwpn == lport->wwpn)
+                        return ft_wwn->tpg;
         }
         return NULL;
 }
@@ -401,50 +403,49 @@ struct ft_tpg *ft_lport_find_tpg(struct fc_lport *lport)
  * Add lport to allowed config.
  * The name is the WWPN in lower-case ASCII, colon-separated bytes.
  */
-static struct se_wwn *ft_add_lport(
+static struct se_wwn *ft_add_wwn(
         struct target_fabric_configfs *tf,
         struct config_group *group,
         const char *name)
 {
-        struct ft_lport_acl *lacl;
-        struct ft_lport_acl *old_lacl;
+        struct ft_lport_wwn *ft_wwn;
+        struct ft_lport_wwn *old_ft_wwn;
         u64 wwpn;
 
-        pr_debug("add lport %s\n", name);
+        pr_debug("add wwn %s\n", name);
         if (ft_parse_wwn(name, &wwpn, 1) < 0)
                 return NULL;
-        lacl = kzalloc(sizeof(*lacl), GFP_KERNEL);
-        if (!lacl)
+        ft_wwn = kzalloc(sizeof(*ft_wwn), GFP_KERNEL);
+        if (!ft_wwn)
                 return NULL;
-        lacl->wwpn = wwpn;
-        INIT_LIST_HEAD(&lacl->tpg_list);
+        ft_wwn->wwpn = wwpn;
 
         mutex_lock(&ft_lport_lock);
-        list_for_each_entry(old_lacl, &ft_lport_list, list) {
-                if (old_lacl->wwpn == wwpn) {
+        list_for_each_entry(old_ft_wwn, &ft_wwn_list, ft_wwn_node) {
+                if (old_ft_wwn->wwpn == wwpn) {
                         mutex_unlock(&ft_lport_lock);
-                        kfree(lacl);
+                        kfree(ft_wwn);
                         return NULL;
                 }
         }
-        list_add_tail(&lacl->list, &ft_lport_list);
-        ft_format_wwn(lacl->name, sizeof(lacl->name), wwpn);
+        list_add_tail(&ft_wwn->ft_wwn_node, &ft_wwn_list);
+        ft_format_wwn(ft_wwn->name, sizeof(ft_wwn->name), wwpn);
         mutex_unlock(&ft_lport_lock);
 
-        return &lacl->fc_lport_wwn;
+        return &ft_wwn->se_wwn;
 }
 
-static void ft_del_lport(struct se_wwn *wwn)
+static void ft_del_wwn(struct se_wwn *wwn)
 {
-        struct ft_lport_acl *lacl = container_of(wwn,
-                                struct ft_lport_acl, fc_lport_wwn);
+        struct ft_lport_wwn *ft_wwn = container_of(wwn,
+                                struct ft_lport_wwn, se_wwn);
 
-        pr_debug("del lport %s\n", lacl->name);
+        pr_debug("del wwn %s\n", ft_wwn->name);
         mutex_lock(&ft_lport_lock);
-        list_del(&lacl->list);
+        list_del(&ft_wwn->ft_wwn_node);
         mutex_unlock(&ft_lport_lock);
 
-        kfree(lacl);
+        kfree(ft_wwn);
 }
 
 static ssize_t ft_wwn_show_attr_version(
@@ -471,7 +472,7 @@ static char *ft_get_fabric_wwn(struct se_portal_group *se_tpg)
 {
         struct ft_tpg *tpg = se_tpg->se_tpg_fabric_ptr;
 
-        return tpg->lport_acl->name;
+        return tpg->lport_wwn->name;
 }
 
 static u16 ft_get_tag(struct se_portal_group *se_tpg)
@@ -536,12 +537,13 @@ static struct target_core_fabric_ops ft_fabric_ops = {
         .queue_data_in =                ft_queue_data_in,
         .queue_status =                 ft_queue_status,
         .queue_tm_rsp =                 ft_queue_tm_resp,
+        .aborted_task =                 ft_aborted_task,
         /*
          * Setup function pointers for generic logic in
          * target_core_fabric_configfs.c
          */
-        .fabric_make_wwn =              &ft_add_lport,
-        .fabric_drop_wwn =              &ft_del_lport,
+        .fabric_make_wwn =              &ft_add_wwn,
+        .fabric_drop_wwn =              &ft_del_wwn,
         .fabric_make_tpg =              &ft_add_tpg,
         .fabric_drop_tpg =              &ft_del_tpg,
         .fabric_post_link =             NULL,
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index ae52c08dad09..21ce50880c79 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -51,7 +51,7 @@ static void ft_sess_delete_all(struct ft_tport *);
  * Lookup or allocate target local port.
  * Caller holds ft_lport_lock.
  */
-static struct ft_tport *ft_tport_create(struct fc_lport *lport)
+static struct ft_tport *ft_tport_get(struct fc_lport *lport)
 {
         struct ft_tpg *tpg;
         struct ft_tport *tport;
@@ -68,6 +68,7 @@ static struct ft_tport *ft_tport_create(struct fc_lport *lport)
 
         if (tport) {
                 tport->tpg = tpg;
+                tpg->tport = tport;
                 return tport;
         }
 
@@ -114,7 +115,7 @@ static void ft_tport_delete(struct ft_tport *tport)
 void ft_lport_add(struct fc_lport *lport, void *arg)
 {
         mutex_lock(&ft_lport_lock);
-        ft_tport_create(lport);
+        ft_tport_get(lport);
         mutex_unlock(&ft_lport_lock);
 }
 
@@ -211,7 +212,8 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
                 return NULL;
 
         sess->se_sess = transport_init_session_tags(TCM_FC_DEFAULT_TAGS,
-                                                    sizeof(struct ft_cmd));
+                                                    sizeof(struct ft_cmd),
+                                                    TARGET_PROT_NORMAL);
         if (IS_ERR(sess->se_sess)) {
                 kfree(sess);
                 return NULL;
@@ -350,7 +352,7 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
         struct ft_node_acl *acl;
         u32 fcp_parm;
 
-        tport = ft_tport_create(rdata->local_port);
+        tport = ft_tport_get(rdata->local_port);
         if (!tport)
                 goto not_target;        /* not a target for this local port */
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 45af765a3198..a99c63152b8d 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -62,12 +62,16 @@ enum imx_thermal_trip {
 #define IMX_POLLING_DELAY               2000 /* millisecond */
 #define IMX_PASSIVE_DELAY               1000
 
+#define FACTOR0                         10000000
+#define FACTOR1                         15976
+#define FACTOR2                         4297157
+
 struct imx_thermal_data {
         struct thermal_zone_device *tz;
         struct thermal_cooling_device *cdev;
         enum thermal_device_mode mode;
         struct regmap *tempmon;
-        int c1, c2; /* See formula in imx_get_sensor_data() */
+        u32 c1, c2; /* See formula in imx_get_sensor_data() */
         unsigned long temp_passive;
         unsigned long temp_critical;
         unsigned long alarm_temp;
@@ -84,7 +88,7 @@ static void imx_set_alarm_temp(struct imx_thermal_data *data,
         int alarm_value;
 
         data->alarm_temp = alarm_temp;
-        alarm_value = (alarm_temp - data->c2) / data->c1;
+        alarm_value = (data->c2 - alarm_temp) / data->c1;
         regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_ALARM_VALUE_MASK);
         regmap_write(map, TEMPSENSE0 + REG_SET, alarm_value <<
                         TEMPSENSE0_ALARM_VALUE_SHIFT);
@@ -136,7 +140,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, unsigned long *temp)
         n_meas = (val & TEMPSENSE0_TEMP_CNT_MASK) >> TEMPSENSE0_TEMP_CNT_SHIFT;
 
         /* See imx_get_sensor_data() for formula derivation */
-        *temp = data->c2 + data->c1 * n_meas;
+        *temp = data->c2 - n_meas * data->c1;
 
         /* Update alarm value to next higher trip point */
         if (data->alarm_temp == data->temp_passive && *temp >= data->temp_passive)
@@ -305,6 +309,7 @@ static int imx_get_sensor_data(struct platform_device *pdev)
         int t1, t2, n1, n2;
         int ret;
         u32 val;
+        u64 temp64;
 
         map = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
                                               "fsl,tempmon-data");
@@ -330,6 +335,8 @@ static int imx_get_sensor_data(struct platform_device *pdev)
          *   [31:20] - sensor value @ 25C
          *    [19:8] - sensor value of hot
          *     [7:0] - hot temperature value
+         * Use universal formula now and only need sensor value @ 25C
+         * slope = 0.4297157 - (0.0015976 * 25C fuse)
          */
         n1 = val >> 20;
         n2 = (val & 0xfff00) >> 8;
@@ -337,20 +344,26 @@ static int imx_get_sensor_data(struct platform_device *pdev)
         t1 = 25; /* t1 always 25C */
 
         /*
-         * Derived from linear interpolation,
-         * Tmeas = T2 + (Nmeas - N2) * (T1 - T2) / (N1 - N2)
+         * Derived from linear interpolation:
+         * slope = 0.4297157 - (0.0015976 * 25C fuse)
+         * slope = (FACTOR2 - FACTOR1 * n1) / FACTOR0
+         * (Nmeas - n1) / (Tmeas - t1) = slope
          * We want to reduce this down to the minimum computation necessary
          * for each temperature read.  Also, we want Tmeas in millicelsius
          * and we don't want to lose precision from integer division. So...
-         * milli_Tmeas = 1000 * T2 + 1000 * (Nmeas - N2) * (T1 - T2) / (N1 - N2)
-         * Let constant c1 = 1000 * (T1 - T2) / (N1 - N2)
-         * milli_Tmeas = (1000 * T2) + c1 * (Nmeas - N2)
-         * milli_Tmeas = (1000 * T2) + (c1 * Nmeas) - (c1 * N2)
-         * Let constant c2 = (1000 * T2) - (c1 * N2)
-         * milli_Tmeas = c2 + (c1 * Nmeas)
+         * Tmeas = (Nmeas - n1) / slope + t1
+         * milli_Tmeas = 1000 * (Nmeas - n1) / slope + 1000 * t1
+         * milli_Tmeas = -1000 * (n1 - Nmeas) / slope + 1000 * t1
+         * Let constant c1 = (-1000 / slope)
+         * milli_Tmeas = (n1 - Nmeas) * c1 + 1000 * t1
+         * Let constant c2 = n1 *c1 + 1000 * t1
+         * milli_Tmeas = c2 - Nmeas * c1
          */
-        data->c1 = 1000 * (t1 - t2) / (n1 - n2);
-        data->c2 = 1000 * t2 - data->c1 * n2;
+        temp64 = FACTOR0;
+        temp64 *= 1000;
+        do_div(temp64, FACTOR1 * n1 - FACTOR2);
+        data->c1 = temp64;
+        data->c2 = n1 * data->c1 + 1000 * t1;
 
         /*
          * Set the default passive cooling trip point to 20 °C below the
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 79a09d02bbca..5a37940b02c9 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -299,12 +299,17 @@ static void _rcar_thermal_irq_ctrl(struct rcar_thermal_priv *priv, int enable)
 static void rcar_thermal_work(struct work_struct *work)
 {
         struct rcar_thermal_priv *priv;
+        unsigned long cctemp, nctemp;
 
         priv = container_of(work, struct rcar_thermal_priv, work.work);
 
+        rcar_thermal_get_temp(priv->zone, &cctemp);
         rcar_thermal_update_temp(priv);
         rcar_thermal_irq_enable(priv);
-        thermal_zone_device_update(priv->zone);
+
+        rcar_thermal_get_temp(priv->zone, &nctemp);
+        if (nctemp != cctemp)
+                thermal_zone_device_update(priv->zone);
 }
 
 static u32 rcar_thermal_had_changed(struct rcar_thermal_priv *priv, u32 status)
@@ -313,7 +318,7 @@ static u32 rcar_thermal_had_changed(struct rcar_thermal_priv *priv, u32 status)
 
         status = (status >> rcar_id_to_shift(priv)) & 0x3;
 
-        if (status & 0x3) {
+        if (status) {
                 dev_dbg(dev, "thermal%d %s%s\n",
                         priv->id,
                         (status & 0x2) ? "Rising " : "",
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 74c0e3474d6e..3ab12ee359b7 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -1500,10 +1500,8 @@ static int ti_bandgap_resume(struct device *dev)
 
         return ti_bandgap_restore_ctxt(bgp);
 }
-static const struct dev_pm_ops ti_bandgap_dev_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(ti_bandgap_suspend,
-                                ti_bandgap_resume)
-};
+static SIMPLE_DEV_PM_OPS(ti_bandgap_dev_pm_ops, ti_bandgap_suspend,
+                         ti_bandgap_resume);
 
 #define DEV_PM_OPS      (&ti_bandgap_dev_pm_ops)
 #else
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index b01659bd4f7c..a585079b4b38 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -61,6 +61,7 @@ static struct hvc_opal_priv *hvc_opal_privs[MAX_NR_HVC_CONSOLES];
 /* For early boot console */
 static struct hvc_opal_priv hvc_opal_boot_priv;
 static u32 hvc_opal_boot_termno;
+static bool hvc_opal_event_registered;
 
 static const struct hv_ops hvc_opal_raw_ops = {
         .get_chars = opal_get_chars,
@@ -161,6 +162,18 @@ static const struct hv_ops hvc_opal_hvsi_ops = {
         .tiocmset = hvc_opal_hvsi_tiocmset,
 };
 
+static int hvc_opal_console_event(struct notifier_block *nb,
+                                  unsigned long events, void *change)
+{
+        if (events & OPAL_EVENT_CONSOLE_INPUT)
+                hvc_kick();
+        return 0;
+}
+
+static struct notifier_block hvc_opal_console_nb = {
+        .notifier_call  = hvc_opal_console_event,
+};
+
 static int hvc_opal_probe(struct platform_device *dev)
 {
         const struct hv_ops *ops;
@@ -170,6 +183,7 @@ static int hvc_opal_probe(struct platform_device *dev)
         unsigned int termno, boot = 0;
         const __be32 *reg;
 
+
         if (of_device_is_compatible(dev->dev.of_node, "ibm,opal-console-raw")) {
                 proto = HV_PROTOCOL_RAW;
                 ops = &hvc_opal_raw_ops;
@@ -213,12 +227,18 @@ static int hvc_opal_probe(struct platform_device *dev)
                 dev->dev.of_node->full_name,
                 boot ? " (boot console)" : "");
 
-        /* We don't do IRQ yet */
+        /* We don't do IRQ ... */
         hp = hvc_alloc(termno, 0, ops, MAX_VIO_PUT_CHARS);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
         dev_set_drvdata(&dev->dev, hp);
 
+        /* ...  but we use OPAL event to kick the console */
+        if (!hvc_opal_event_registered) {
+                opal_notifier_register(&hvc_opal_console_nb);
+                hvc_opal_event_registered = true;
+        }
+
         return 0;
 }
 
diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index b0e540137e39..90ca082935f6 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -65,6 +65,7 @@ static void tty_audit_log(const char *description, int major, int minor,
 {
         struct audit_buffer *ab;
         struct task_struct *tsk = current;
+        pid_t pid = task_pid_nr(tsk);
         uid_t uid = from_kuid(&init_user_ns, task_uid(tsk));
         uid_t loginuid = from_kuid(&init_user_ns, audit_get_loginuid(tsk));
         unsigned int sessionid = audit_get_sessionid(tsk);
@@ -74,7 +75,7 @@ static void tty_audit_log(const char *description, int major, int minor,
                 char name[sizeof(tsk->comm)];
 
                 audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u major=%d"
-                                 " minor=%d comm=", description, tsk->pid, uid,
+                                 " minor=%d comm=", description, pid, uid,
                                  loginuid, sessionid, major, minor);
                 get_task_comm(name, tsk);
                 audit_log_untrustedstring(ab, name);
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 460c266b8e24..f058c0368d61 100644
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -1471,6 +1471,11 @@ static void usbg_queue_tm_rsp(struct se_cmd *se_cmd)
 {
 }
 
+static void usbg_aborted_task(struct se_cmd *se_cmd)
+{
+        return;
+}
+
 static const char *usbg_check_wwn(const char *name)
 {
         const char *n;
@@ -1726,7 +1731,7 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
                 pr_err("Unable to allocate struct tcm_vhost_nexus\n");
                 goto err_unlock;
         }
-        tv_nexus->tvn_se_sess = transport_init_session();
+        tv_nexus->tvn_se_sess = transport_init_session(TARGET_PROT_NORMAL);
         if (IS_ERR(tv_nexus->tvn_se_sess))
                 goto err_free;
 
@@ -1897,6 +1902,7 @@ static struct target_core_fabric_ops usbg_ops = {
         .queue_data_in                  = usbg_send_read_response,
         .queue_status                   = usbg_send_status_response,
         .queue_tm_rsp                   = usbg_queue_tm_rsp,
+        .aborted_task                   = usbg_aborted_task,
         .check_stop_free                = usbg_check_stop_free,
 
         .fabric_make_wwn                = usbg_make_tport,
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e1e22e0f01e8..be414d2b2b22 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -818,9 +818,9 @@ static int vhost_net_release(struct inode *inode, struct file *f)
         vhost_dev_cleanup(&n->dev, false);
         vhost_net_vq_reset(n);
         if (tx_sock)
-                fput(tx_sock->file);
+                sockfd_put(tx_sock);
         if (rx_sock)
-                fput(rx_sock->file);
+                sockfd_put(rx_sock);
         /* Make sure no callbacks are outstanding */
         synchronize_rcu_bh();
         /* We do an extra flush before freeing memory,
@@ -860,7 +860,7 @@ static struct socket *get_raw_socket(int fd)
         }
         return sock;
 err:
-        fput(sock->file);
+        sockfd_put(sock);
         return ERR_PTR(r);
 }
 
@@ -966,7 +966,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
 
         if (oldsock) {
                 vhost_net_flush_vq(n, index);
-                fput(oldsock->file);
+                sockfd_put(oldsock);
         }
 
         mutex_unlock(&n->dev.mutex);
@@ -978,7 +978,7 @@ err_used:
         if (ubufs)
                 vhost_net_ubuf_put_wait_and_free(ubufs);
 err_ubufs:
-        fput(sock->file);
+        sockfd_put(sock);
 err_vq:
         mutex_unlock(&vq->mutex);
 err:
@@ -1009,9 +1009,9 @@ static long vhost_net_reset_owner(struct vhost_net *n)
 done:
         mutex_unlock(&n->dev.mutex);
         if (tx_sock)
-                fput(tx_sock->file);
+                sockfd_put(tx_sock);
         if (rx_sock)
-                fput(rx_sock->file);
+                sockfd_put(rx_sock);
         return err;
 }
 
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index e48d4a672580..cf50ce93975b 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -539,6 +539,11 @@ static void tcm_vhost_queue_tm_rsp(struct se_cmd *se_cmd)
         return;
 }
 
+static void tcm_vhost_aborted_task(struct se_cmd *se_cmd)
+{
+        return;
+}
+
 static void tcm_vhost_free_evt(struct vhost_scsi *vs, struct tcm_vhost_evt *evt)
 {
         vs->vs_events_nr--;
@@ -1740,7 +1745,8 @@ static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tpg,
          */
         tv_nexus->tvn_se_sess = transport_init_session_tags(
                                         TCM_VHOST_DEFAULT_TAGS,
-                                        sizeof(struct tcm_vhost_cmd));
+                                        sizeof(struct tcm_vhost_cmd),
+                                        TARGET_PROT_NORMAL);
         if (IS_ERR(tv_nexus->tvn_se_sess)) {
                 mutex_unlock(&tpg->tv_tpg_mutex);
                 kfree(tv_nexus);
@@ -2131,6 +2137,7 @@ static struct target_core_fabric_ops tcm_vhost_ops = {
         .queue_data_in                  = tcm_vhost_queue_data_in,
         .queue_status                   = tcm_vhost_queue_status,
         .queue_tm_rsp                   = tcm_vhost_queue_tm_rsp,
+        .aborted_task                   = tcm_vhost_aborted_task,
         /*
          * Setup callers for generic logic in target_core_fabric_configfs.c
          */
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 27d3cf255e78..bd2172c2d650 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -347,7 +347,7 @@ struct backlight_device *backlight_device_register(const char *name,
 
         rc = device_register(&new_bd->dev);
         if (rc) {
-                kfree(new_bd);
+                put_device(&new_bd->dev);
                 return ERR_PTR(rc);
         }
 
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 81fb12770c2a..a2eba12e1cb7 100644
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -13,6 +13,8 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/platform_data/gpio_backlight.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -23,6 +25,7 @@ struct gpio_backlight {
 
         int gpio;
         int active;
+        int def_value;
 };
 
 static int gpio_backlight_update_status(struct backlight_device *bl)
@@ -60,6 +63,29 @@ static const struct backlight_ops gpio_backlight_ops = {
         .check_fb       = gpio_backlight_check_fb,
 };
 
+static int gpio_backlight_probe_dt(struct platform_device *pdev,
+                                   struct gpio_backlight *gbl)
+{
+        struct device_node *np = pdev->dev.of_node;
+        enum of_gpio_flags gpio_flags;
+
+        gbl->gpio = of_get_gpio_flags(np, 0, &gpio_flags);
+
+        if (!gpio_is_valid(gbl->gpio)) {
+                if (gbl->gpio != -EPROBE_DEFER) {
+                        dev_err(&pdev->dev,
+                                "Error: The gpios parameter is missing or invalid.\n");
+                }
+                return gbl->gpio;
+        }
+
+        gbl->active = (gpio_flags & OF_GPIO_ACTIVE_LOW) ? 0 : 1;
+
+        gbl->def_value = of_property_read_bool(np, "default-on");
+
+        return 0;
+}
+
 static int gpio_backlight_probe(struct platform_device *pdev)
 {
         struct gpio_backlight_platform_data *pdata =
@@ -67,10 +93,12 @@ static int gpio_backlight_probe(struct platform_device *pdev)
         struct backlight_properties props;
         struct backlight_device *bl;
         struct gpio_backlight *gbl;
+        struct device_node *np = pdev->dev.of_node;
         int ret;
 
-        if (!pdata) {
-                dev_err(&pdev->dev, "failed to find platform data\n");
+        if (!pdata && !np) {
+                dev_err(&pdev->dev,
+                        "failed to find platform data or device tree node.\n");
                 return -ENODEV;
         }
 
@@ -79,14 +107,22 @@ static int gpio_backlight_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         gbl->dev = &pdev->dev;
-        gbl->fbdev = pdata->fbdev;
-        gbl->gpio = pdata->gpio;
-        gbl->active = pdata->active_low ? 0 : 1;
+
+        if (np) {
+                ret = gpio_backlight_probe_dt(pdev, gbl);
+                if (ret)
+                        return ret;
+        } else {
+                gbl->fbdev = pdata->fbdev;
+                gbl->gpio = pdata->gpio;
+                gbl->active = pdata->active_low ? 0 : 1;
+                gbl->def_value = pdata->def_value;
+        }
 
         ret = devm_gpio_request_one(gbl->dev, gbl->gpio, GPIOF_DIR_OUT |
                                     (gbl->active ? GPIOF_INIT_LOW
                                                  : GPIOF_INIT_HIGH),
-                                    pdata->name);
+                                    pdata ? pdata->name : "backlight");
         if (ret < 0) {
                 dev_err(&pdev->dev, "unable to request GPIO\n");
                 return ret;
@@ -103,17 +139,25 @@ static int gpio_backlight_probe(struct platform_device *pdev)
                 return PTR_ERR(bl);
         }
 
-        bl->props.brightness = pdata->def_value;
+        bl->props.brightness = gbl->def_value;
         backlight_update_status(bl);
 
         platform_set_drvdata(pdev, bl);
         return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id gpio_backlight_of_match[] = {
+        { .compatible = "gpio-backlight" },
+        { /* sentinel */ }
+};
+#endif
+
 static struct platform_driver gpio_backlight_driver = {
         .driver         = {
                 .name           = "gpio-backlight",
                 .owner          = THIS_MODULE,
+                .of_match_table = of_match_ptr(gpio_backlight_of_match),
         },
         .probe          = gpio_backlight_probe,
 };
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
index 6fd60adf922e..5f36808d214f 100644
--- a/drivers/video/backlight/lm3639_bl.c
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -349,8 +349,9 @@ static int lm3639_probe(struct i2c_client *client,
         props.brightness = pdata->init_brt_led;
         props.max_brightness = pdata->max_brt_led;
         pchip->bled =
-            backlight_device_register("lm3639_bled", pchip->dev, pchip,
-                                      &lm3639_bled_ops, &props);
+            devm_backlight_device_register(pchip->dev, "lm3639_bled",
+                                           pchip->dev, pchip, &lm3639_bled_ops,
+                                           &props);
         if (IS_ERR(pchip->bled)) {
                 dev_err(&client->dev, "fail : backlight register\n");
                 ret = PTR_ERR(pchip->bled);
@@ -360,7 +361,7 @@ static int lm3639_probe(struct i2c_client *client,
         ret = device_create_file(&(pchip->bled->dev), &dev_attr_bled_mode);
         if (ret < 0) {
                 dev_err(&client->dev, "failed : add sysfs entries\n");
-                goto err_bled_mode;
+                goto err_out;
         }
 
         /* flash */
@@ -391,8 +392,6 @@ err_torch:
         led_classdev_unregister(&pchip->cdev_flash);
 err_flash:
         device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode);
-err_bled_mode:
-        backlight_device_unregister(pchip->bled);
 err_out:
         return ret;
 }
@@ -407,10 +406,8 @@ static int lm3639_remove(struct i2c_client *client)
                 led_classdev_unregister(&pchip->cdev_torch);
         if (&pchip->cdev_flash)
                 led_classdev_unregister(&pchip->cdev_flash);
-        if (pchip->bled) {
+        if (pchip->bled)
                 device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode);
-                backlight_device_unregister(pchip->bled);
-        }
         return 0;
 }
 
@@ -432,6 +429,6 @@ static struct i2c_driver lm3639_i2c_driver = {
 module_i2c_driver(lm3639_i2c_driver);
 
 MODULE_DESCRIPTION("Texas Instruments Backlight+Flash LED driver for LM3639");
-MODULE_AUTHOR("Daniel Jeong <daniel.jeong@ti.com>");
-MODULE_AUTHOR("G.Shark Jeong <gshark.jeong@gmail.com>");
+MODULE_AUTHOR("Daniel Jeong <gshark.jeong@gmail.com>");
+MODULE_AUTHOR("Ldd Mlp <ldd-mlp@list.ti.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/fs/aio.c b/fs/aio.c
index 062a5f6a1448..12a3de0ee6da 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -52,7 +52,8 @@
 struct aio_ring {
         unsigned        id;     /* kernel internal index number */
         unsigned        nr;     /* number of io_events */
-        unsigned        head;
+        unsigned        head;   /* Written to by userland or under ring_lock
+                                 * mutex by aio_read_events_ring(). */
         unsigned        tail;
 
         unsigned        magic;
@@ -243,6 +244,11 @@ static void aio_free_ring(struct kioctx *ctx)
 {
         int i;
 
+        /* Disconnect the kiotx from the ring file.  This prevents future
+         * accesses to the kioctx from page migration.
+         */
+        put_aio_ring_file(ctx);
+
         for (i = 0; i < ctx->nr_pages; i++) {
                 struct page *page;
                 pr_debug("pid(%d) [%d] page->count=%d\n", current->pid, i,
@@ -254,8 +260,6 @@ static void aio_free_ring(struct kioctx *ctx)
                 put_page(page);
         }
 
-        put_aio_ring_file(ctx);
-
         if (ctx->ring_pages && ctx->ring_pages != ctx->internal_pages) {
                 kfree(ctx->ring_pages);
                 ctx->ring_pages = NULL;
@@ -283,29 +287,38 @@ static int aio_migratepage(struct address_space *mapping, struct page *new,
 {
         struct kioctx *ctx;
         unsigned long flags;
+        pgoff_t idx;
         int rc;
 
         rc = 0;
 
-        /* Make sure the old page hasn't already been changed */
+        /* mapping->private_lock here protects against the kioctx teardown.  */
         spin_lock(&mapping->private_lock);
         ctx = mapping->private_data;
-        if (ctx) {
-                pgoff_t idx;
-                spin_lock_irqsave(&ctx->completion_lock, flags);
-                idx = old->index;
-                if (idx < (pgoff_t)ctx->nr_pages) {
-                        if (ctx->ring_pages[idx] != old)
-                                rc = -EAGAIN;
-                } else
-                        rc = -EINVAL;
-                spin_unlock_irqrestore(&ctx->completion_lock, flags);
+        if (!ctx) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        /* The ring_lock mutex.  The prevents aio_read_events() from writing
+         * to the ring's head, and prevents page migration from mucking in
+         * a partially initialized kiotx.
+         */
+        if (!mutex_trylock(&ctx->ring_lock)) {
+                rc = -EAGAIN;
+                goto out;
+        }
+
+        idx = old->index;
+        if (idx < (pgoff_t)ctx->nr_pages) {
+                /* Make sure the old page hasn't already been changed */
+                if (ctx->ring_pages[idx] != old)
+                        rc = -EAGAIN;
         } else
                 rc = -EINVAL;
-        spin_unlock(&mapping->private_lock);
 
         if (rc != 0)
-                return rc;
+                goto out_unlock;
 
         /* Writeback must be complete */
         BUG_ON(PageWriteback(old));
@@ -314,38 +327,26 @@ static int aio_migratepage(struct address_space *mapping, struct page *new,
         rc = migrate_page_move_mapping(mapping, new, old, NULL, mode, 1);
         if (rc != MIGRATEPAGE_SUCCESS) {
                 put_page(new);
-                return rc;
+                goto out_unlock;
         }
 
-        /* We can potentially race against kioctx teardown here.  Use the
-         * address_space's private data lock to protect the mapping's
-         * private_data.
+        /* Take completion_lock to prevent other writes to the ring buffer
+         * while the old page is copied to the new.  This prevents new
+         * events from being lost.
          */
-        spin_lock(&mapping->private_lock);
-        ctx = mapping->private_data;
-        if (ctx) {
-                pgoff_t idx;
-                spin_lock_irqsave(&ctx->completion_lock, flags);
-                migrate_page_copy(new, old);
-                idx = old->index;
-                if (idx < (pgoff_t)ctx->nr_pages) {
-                        /* And only do the move if things haven't changed */
-                        if (ctx->ring_pages[idx] == old)
-                                ctx->ring_pages[idx] = new;
-                        else
-                                rc = -EAGAIN;
-                } else
-                        rc = -EINVAL;
-                spin_unlock_irqrestore(&ctx->completion_lock, flags);
-        } else
-                rc = -EBUSY;
-        spin_unlock(&mapping->private_lock);
+        spin_lock_irqsave(&ctx->completion_lock, flags);
+        migrate_page_copy(new, old);
+        BUG_ON(ctx->ring_pages[idx] != old);
+        ctx->ring_pages[idx] = new;
+        spin_unlock_irqrestore(&ctx->completion_lock, flags);
 
-        if (rc == MIGRATEPAGE_SUCCESS)
-                put_page(old);
-        else
-                put_page(new);
+        /* The old page is no longer accessible. */
+        put_page(old);
 
+out_unlock:
+        mutex_unlock(&ctx->ring_lock);
+out:
+        spin_unlock(&mapping->private_lock);
         return rc;
 }
 #endif
@@ -380,7 +381,7 @@ static int aio_setup_ring(struct kioctx *ctx)
         file = aio_private_file(ctx, nr_pages);
         if (IS_ERR(file)) {
                 ctx->aio_ring_file = NULL;
-                return -EAGAIN;
+                return -ENOMEM;
         }
 
         ctx->aio_ring_file = file;
@@ -415,7 +416,7 @@ static int aio_setup_ring(struct kioctx *ctx)
 
         if (unlikely(i != nr_pages)) {
                 aio_free_ring(ctx);
-                return -EAGAIN;
+                return -ENOMEM;
         }
 
         ctx->mmap_size = nr_pages * PAGE_SIZE;
@@ -429,7 +430,7 @@ static int aio_setup_ring(struct kioctx *ctx)
         if (IS_ERR((void *)ctx->mmap_base)) {
                 ctx->mmap_size = 0;
                 aio_free_ring(ctx);
-                return -EAGAIN;
+                return -ENOMEM;
         }
 
         pr_debug("mmap address: 0x%08lx\n", ctx->mmap_base);
@@ -556,6 +557,10 @@ static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
                                         rcu_read_unlock();
                                         spin_unlock(&mm->ioctx_lock);
 
+                                        /* While kioctx setup is in progress,
+                                         * we are protected from page migration
+                                         * changes ring_pages by ->ring_lock.
+                                         */
                                         ring = kmap_atomic(ctx->ring_pages[0]);
                                         ring->id = ctx->id;
                                         kunmap_atomic(ring);
@@ -640,24 +645,28 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
 
         ctx->max_reqs = nr_events;
 
-        if (percpu_ref_init(&ctx->users, free_ioctx_users))
-                goto err;
-
-        if (percpu_ref_init(&ctx->reqs, free_ioctx_reqs))
-                goto err;
-
         spin_lock_init(&ctx->ctx_lock);
         spin_lock_init(&ctx->completion_lock);
         mutex_init(&ctx->ring_lock);
+        /* Protect against page migration throughout kiotx setup by keeping
+         * the ring_lock mutex held until setup is complete. */
+        mutex_lock(&ctx->ring_lock);
         init_waitqueue_head(&ctx->wait);
 
         INIT_LIST_HEAD(&ctx->active_reqs);
 
+        if (percpu_ref_init(&ctx->users, free_ioctx_users))
+                goto err;
+
+        if (percpu_ref_init(&ctx->reqs, free_ioctx_reqs))
+                goto err;
+
         ctx->cpu = alloc_percpu(struct kioctx_cpu);
         if (!ctx->cpu)
                 goto err;
 
-        if (aio_setup_ring(ctx) < 0)
+        err = aio_setup_ring(ctx);
+        if (err < 0)
                 goto err;
 
         atomic_set(&ctx->reqs_available, ctx->nr_events - 1);
@@ -683,6 +692,9 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
         if (err)
                 goto err_cleanup;
 
+        /* Release the ring_lock mutex now that all setup is complete. */
+        mutex_unlock(&ctx->ring_lock);
+
         pr_debug("allocated ioctx %p[%ld]: mm=%p mask=0x%x\n",
                  ctx, ctx->user_id, mm, ctx->nr_events);
         return ctx;
@@ -692,6 +704,7 @@ err_cleanup:
 err_ctx:
         aio_free_ring(ctx);
 err:
+        mutex_unlock(&ctx->ring_lock);
         free_percpu(ctx->cpu);
         free_percpu(ctx->reqs.pcpu_count);
         free_percpu(ctx->users.pcpu_count);
@@ -1024,6 +1037,7 @@ static long aio_read_events_ring(struct kioctx *ctx,
 
         mutex_lock(&ctx->ring_lock);
 
+        /* Access to ->ring_pages here is protected by ctx->ring_lock. */
         ring = kmap_atomic(ctx->ring_pages[0]);
         head = ring->head;
         tail = ring->tail;
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 3182c0e68b42..232e03d4780d 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -103,6 +103,9 @@ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *i
         if (tmp.size < sizeof(tmp))
                 return ERR_PTR(-EINVAL);
 
+        if (tmp.size > (PATH_MAX + sizeof(tmp)))
+                return ERR_PTR(-ENAMETOOLONG);
+
         return memdup_user(in, tmp.size);
 }
 
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 29696b78d1f4..1c2ce0c87711 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -182,6 +182,9 @@ static int bdev_integrity_enabled(struct block_device *bdev, int rw)
  */
 int bio_integrity_enabled(struct bio *bio)
 {
+        if (!bio_is_rw(bio))
+                return 0;
+
         /* Already protected? */
         if (bio_integrity(bio))
                 return 0;
@@ -309,10 +312,9 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
 {
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
         struct blk_integrity_exchg bix;
-        struct bio_vec bv;
-        struct bvec_iter iter;
+        struct bio_vec *bv;
         sector_t sector;
-        unsigned int sectors, ret = 0;
+        unsigned int sectors, ret = 0, i;
         void *prot_buf = bio->bi_integrity->bip_buf;
 
         if (operate)
@@ -323,16 +325,16 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
         bix.disk_name = bio->bi_bdev->bd_disk->disk_name;
         bix.sector_size = bi->sector_size;
 
-        bio_for_each_segment(bv, bio, iter) {
-                void *kaddr = kmap_atomic(bv.bv_page);
-                bix.data_buf = kaddr + bv.bv_offset;
-                bix.data_size = bv.bv_len;
+        bio_for_each_segment_all(bv, bio, i) {
+                void *kaddr = kmap_atomic(bv->bv_page);
+                bix.data_buf = kaddr + bv->bv_offset;
+                bix.data_size = bv->bv_len;
                 bix.prot_buf = prot_buf;
                 bix.sector = sector;
 
-                if (operate) {
+                if (operate)
                         bi->generate_fn(&bix);
-                } else {
+                else {
                         ret = bi->verify_fn(&bix);
                         if (ret) {
                                 kunmap_atomic(kaddr);
@@ -340,7 +342,7 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
                         }
                 }
 
-                sectors = bv.bv_len / bi->sector_size;
+                sectors = bv->bv_len / bi->sector_size;
                 sector += sectors;
                 prot_buf += sectors * bi->tuple_size;
 
diff --git a/fs/bio.c b/fs/bio.c
index b1bc722b89aa..6f0362b77806 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1002,7 +1002,7 @@ struct bio_map_data {
 };
 
 static void bio_set_map_data(struct bio_map_data *bmd, struct bio *bio,
-                             struct sg_iovec *iov, int iov_count,
+                             const struct sg_iovec *iov, int iov_count,
                              int is_our_pages)
 {
         memcpy(bmd->sgvecs, iov, sizeof(struct sg_iovec) * iov_count);
@@ -1022,7 +1022,7 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs,
                        sizeof(struct sg_iovec) * iov_count, gfp_mask);
 }
 
-static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
+static int __bio_copy_iov(struct bio *bio, const struct sg_iovec *iov, int iov_count,
                           int to_user, int from_user, int do_free_page)
 {
         int ret = 0, i;
@@ -1120,7 +1120,7 @@ EXPORT_SYMBOL(bio_uncopy_user);
  */
 struct bio *bio_copy_user_iov(struct request_queue *q,
                               struct rq_map_data *map_data,
-                              struct sg_iovec *iov, int iov_count,
+                              const struct sg_iovec *iov, int iov_count,
                               int write_to_vm, gfp_t gfp_mask)
 {
         struct bio_map_data *bmd;
@@ -1259,7 +1259,7 @@ EXPORT_SYMBOL(bio_copy_user);
 
 static struct bio *__bio_map_user_iov(struct request_queue *q,
                                       struct block_device *bdev,
-                                      struct sg_iovec *iov, int iov_count,
+                                      const struct sg_iovec *iov, int iov_count,
                                       int write_to_vm, gfp_t gfp_mask)
 {
         int i, j;
@@ -1407,7 +1407,7 @@ EXPORT_SYMBOL(bio_map_user);
  *      device. Returns an error pointer in case of error.
  */
 struct bio *bio_map_user_iov(struct request_queue *q, struct block_device *bdev,
-                             struct sg_iovec *iov, int iov_count,
+                             const struct sg_iovec *iov, int iov_count,
                              int write_to_vm, gfp_t gfp_mask)
 {
         struct bio *bio;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index ba0d2b05bb78..552a8d13bc32 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1518,7 +1518,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
         BUG_ON(iocb->ki_pos != pos);
 
         blk_start_plug(&plug);
-        ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
+        ret = __generic_file_aio_write(iocb, iov, nr_segs);
         if (ret > 0) {
                 ssize_t err;
 
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index ecb5832c0967..5a201d81049c 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -323,6 +323,8 @@ void btrfs_destroy_workqueue(struct btrfs_workqueue *wq)
 
 void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max)
 {
+        if (!wq)
+                return;
         wq->normal->max_active = max;
         if (wq->high)
                 wq->high->max_active = max;
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index aad7201ad11b..10db21fa0926 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -330,7 +330,10 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info,
                 goto out;
         }
 
-        root_level = btrfs_old_root_level(root, time_seq);
+        if (path->search_commit_root)
+                root_level = btrfs_header_level(root->commit_root);
+        else
+                root_level = btrfs_old_root_level(root, time_seq);
 
         if (root_level + 1 == level) {
                 srcu_read_unlock(&fs_info->subvol_srcu, index);
@@ -1099,9 +1102,9 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,
  *
  * returns 0 on success, < 0 on error.
  */
-int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
-                                struct btrfs_fs_info *fs_info, u64 bytenr,
-                                u64 time_seq, struct ulist **roots)
+static int __btrfs_find_all_roots(struct btrfs_trans_handle *trans,
+                                  struct btrfs_fs_info *fs_info, u64 bytenr,
+                                  u64 time_seq, struct ulist **roots)
 {
         struct ulist *tmp;
         struct ulist_node *node = NULL;
@@ -1137,6 +1140,20 @@ int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
         return 0;
 }
 
+int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
+                         struct btrfs_fs_info *fs_info, u64 bytenr,
+                         u64 time_seq, struct ulist **roots)
+{
+        int ret;
+
+        if (!trans)
+                down_read(&fs_info->commit_root_sem);
+        ret = __btrfs_find_all_roots(trans, fs_info, bytenr, time_seq, roots);
+        if (!trans)
+                up_read(&fs_info->commit_root_sem);
+        return ret;
+}
+
 /*
  * this makes the path point to (inum INODE_ITEM ioff)
  */
@@ -1516,6 +1533,8 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
                 if (IS_ERR(trans))
                         return PTR_ERR(trans);
                 btrfs_get_tree_mod_seq(fs_info, &tree_mod_seq_elem);
+        } else {
+                down_read(&fs_info->commit_root_sem);
         }
 
         ret = btrfs_find_all_leafs(trans, fs_info, extent_item_objectid,
@@ -1526,8 +1545,8 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
 
         ULIST_ITER_INIT(&ref_uiter);
         while (!ret && (ref_node = ulist_next(refs, &ref_uiter))) {
-                ret = btrfs_find_all_roots(trans, fs_info, ref_node->val,
-                                           tree_mod_seq_elem.seq, &roots);
+                ret = __btrfs_find_all_roots(trans, fs_info, ref_node->val,
+                                             tree_mod_seq_elem.seq, &roots);
                 if (ret)
                         break;
                 ULIST_ITER_INIT(&root_uiter);
@@ -1549,6 +1568,8 @@ out:
         if (!search_commit_root) {
                 btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);
                 btrfs_end_transaction(trans, fs_info->extent_root);
+        } else {
+                up_read(&fs_info->commit_root_sem);
         }
 
         return ret;
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 88d1b1eedc9c..1bcfcdb23cf4 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2769,9 +2769,13 @@ again:
                  * the commit roots are read only
                  * so we always do read locks
                  */
+                if (p->need_commit_sem)
+                        down_read(&root->fs_info->commit_root_sem);
                 b = root->commit_root;
                 extent_buffer_get(b);
                 level = btrfs_header_level(b);
+                if (p->need_commit_sem)
+                        up_read(&root->fs_info->commit_root_sem);
                 if (!p->skip_locking)
                         btrfs_tree_read_lock(b);
         } else {
@@ -5360,7 +5364,6 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
 {
         int ret;
         int cmp;
-        struct btrfs_trans_handle *trans = NULL;
         struct btrfs_path *left_path = NULL;
         struct btrfs_path *right_path = NULL;
         struct btrfs_key left_key;
@@ -5378,9 +5381,6 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
         u64 right_blockptr;
         u64 left_gen;
         u64 right_gen;
-        u64 left_start_ctransid;
-        u64 right_start_ctransid;
-        u64 ctransid;
 
         left_path = btrfs_alloc_path();
         if (!left_path) {
@@ -5404,21 +5404,6 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
         right_path->search_commit_root = 1;
         right_path->skip_locking = 1;
 
-        spin_lock(&left_root->root_item_lock);
-        left_start_ctransid = btrfs_root_ctransid(&left_root->root_item);
-        spin_unlock(&left_root->root_item_lock);
-
-        spin_lock(&right_root->root_item_lock);
-        right_start_ctransid = btrfs_root_ctransid(&right_root->root_item);
-        spin_unlock(&right_root->root_item_lock);
-
-        trans = btrfs_join_transaction(left_root);
-        if (IS_ERR(trans)) {
-                ret = PTR_ERR(trans);
-                trans = NULL;
-                goto out;
-        }
-
         /*
          * Strategy: Go to the first items of both trees. Then do
          *
@@ -5455,6 +5440,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
          *   the right if possible or go up and right.
          */
 
+        down_read(&left_root->fs_info->commit_root_sem);
         left_level = btrfs_header_level(left_root->commit_root);
         left_root_level = left_level;
         left_path->nodes[left_level] = left_root->commit_root;
@@ -5464,6 +5450,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
         right_root_level = right_level;
         right_path->nodes[right_level] = right_root->commit_root;
         extent_buffer_get(right_path->nodes[right_level]);
+        up_read(&left_root->fs_info->commit_root_sem);
 
         if (left_level == 0)
                 btrfs_item_key_to_cpu(left_path->nodes[left_level],
@@ -5482,67 +5469,6 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
         advance_left = advance_right = 0;
 
         while (1) {
-                /*
-                 * We need to make sure the transaction does not get committed
-                 * while we do anything on commit roots. This means, we need to
-                 * join and leave transactions for every item that we process.
-                 */
-                if (trans && btrfs_should_end_transaction(trans, left_root)) {
-                        btrfs_release_path(left_path);
-                        btrfs_release_path(right_path);
-
-                        ret = btrfs_end_transaction(trans, left_root);
-                        trans = NULL;
-                        if (ret < 0)
-                                goto out;
-                }
-                /* now rejoin the transaction */
-                if (!trans) {
-                        trans = btrfs_join_transaction(left_root);
-                        if (IS_ERR(trans)) {
-                                ret = PTR_ERR(trans);
-                                trans = NULL;
-                                goto out;
-                        }
-
-                        spin_lock(&left_root->root_item_lock);
-                        ctransid = btrfs_root_ctransid(&left_root->root_item);
-                        spin_unlock(&left_root->root_item_lock);
-                        if (ctransid != left_start_ctransid)
-                                left_start_ctransid = 0;
-
-                        spin_lock(&right_root->root_item_lock);
-                        ctransid = btrfs_root_ctransid(&right_root->root_item);
-                        spin_unlock(&right_root->root_item_lock);
-                        if (ctransid != right_start_ctransid)
-                                right_start_ctransid = 0;
-
-                        if (!left_start_ctransid || !right_start_ctransid) {
-                                WARN(1, KERN_WARNING
-                                        "BTRFS: btrfs_compare_tree detected "
-                                        "a change in one of the trees while "
-                                        "iterating. This is probably a "
-                                        "bug.\n");
-                                ret = -EIO;
-                                goto out;
-                        }
-
-                        /*
-                         * the commit root may have changed, so start again
-                         * where we stopped
-                         */
-                        left_path->lowest_level = left_level;
-                        right_path->lowest_level = right_level;
-                        ret = btrfs_search_slot(NULL, left_root,
-                                        &left_key, left_path, 0, 0);
-                        if (ret < 0)
-                                goto out;
-                        ret = btrfs_search_slot(NULL, right_root,
-                                        &right_key, right_path, 0, 0);
-                        if (ret < 0)
-                                goto out;
-                }
-
                 if (advance_left && !left_end_reached) {
                         ret = tree_advance(left_root, left_path, &left_level,
                                         left_root_level,
@@ -5672,14 +5598,6 @@ out:
         btrfs_free_path(left_path);
         btrfs_free_path(right_path);
         kfree(tmp_buf);
-
-        if (trans) {
-                if (!ret)
-                        ret = btrfs_end_transaction(trans, left_root);
-                else
-                        btrfs_end_transaction(trans, left_root);
-        }
-
         return ret;
 }
 
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index bc96c03dd259..4c48df572bd6 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -609,6 +609,7 @@ struct btrfs_path {
         unsigned int skip_locking:1;
         unsigned int leave_spinning:1;
         unsigned int search_commit_root:1;
+        unsigned int need_commit_sem:1;
 };
 
 /*
@@ -986,7 +987,8 @@ struct btrfs_dev_replace_item {
 #define BTRFS_BLOCK_GROUP_RAID10        (1ULL << 6)
 #define BTRFS_BLOCK_GROUP_RAID5         (1ULL << 7)
 #define BTRFS_BLOCK_GROUP_RAID6         (1ULL << 8)
-#define BTRFS_BLOCK_GROUP_RESERVED      BTRFS_AVAIL_ALLOC_BIT_SINGLE
+#define BTRFS_BLOCK_GROUP_RESERVED      (BTRFS_AVAIL_ALLOC_BIT_SINGLE | \
+                                         BTRFS_SPACE_INFO_GLOBAL_RSV)
 
 enum btrfs_raid_types {
         BTRFS_RAID_RAID10,
@@ -1018,6 +1020,12 @@ enum btrfs_raid_types {
  */
 #define BTRFS_AVAIL_ALLOC_BIT_SINGLE    (1ULL << 48)
 
+/*
+ * A fake block group type that is used to communicate global block reserve
+ * size to userspace via the SPACE_INFO ioctl.
+ */
+#define BTRFS_SPACE_INFO_GLOBAL_RSV     (1ULL << 49)
+
 #define BTRFS_EXTENDED_PROFILE_MASK     (BTRFS_BLOCK_GROUP_PROFILE_MASK | \
                                          BTRFS_AVAIL_ALLOC_BIT_SINGLE)
 
@@ -1440,7 +1448,7 @@ struct btrfs_fs_info {
          */
         struct mutex ordered_extent_flush_mutex;
 
-        struct rw_semaphore extent_commit_sem;
+        struct rw_semaphore commit_root_sem;
 
         struct rw_semaphore cleanup_work_sem;
 
@@ -1711,7 +1719,6 @@ struct btrfs_root {
         struct btrfs_block_rsv *block_rsv;
 
         /* free ino cache stuff */
-        struct mutex fs_commit_mutex;
         struct btrfs_free_space_ctl *free_ino_ctl;
         enum btrfs_caching_type cached;
         spinlock_t cache_lock;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index bd0f752b797b..029d46c2e170 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -329,6 +329,8 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
 {
         struct extent_state *cached_state = NULL;
         int ret;
+        bool need_lock = (current->journal_info ==
+                          (void *)BTRFS_SEND_TRANS_STUB);
 
         if (!parent_transid || btrfs_header_generation(eb) == parent_transid)
                 return 0;
@@ -336,6 +338,11 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
         if (atomic)
                 return -EAGAIN;
 
+        if (need_lock) {
+                btrfs_tree_read_lock(eb);
+                btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+        }
+
         lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,
                          0, &cached_state);
         if (extent_buffer_uptodate(eb) &&
@@ -347,10 +354,21 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
                        "found %llu\n",
                        eb->start, parent_transid, btrfs_header_generation(eb));
         ret = 1;
-        clear_extent_buffer_uptodate(eb);
+
+        /*
+         * Things reading via commit roots that don't have normal protection,
+         * like send, can have a really old block in cache that may point at a
+         * block that has been free'd and re-allocated.  So don't clear uptodate
+         * if we find an eb that is under IO (dirty/writeback) because we could
+         * end up reading in the stale data and then writing it back out and
+         * making everybody very sad.
+         */
+        if (!extent_buffer_under_io(eb))
+                clear_extent_buffer_uptodate(eb);
 out:
         unlock_extent_cached(io_tree, eb->start, eb->start + eb->len - 1,
                              &cached_state, GFP_NOFS);
+        btrfs_tree_read_unlock_blocking(eb);
         return ret;
 }
 
@@ -1546,7 +1564,6 @@ int btrfs_init_fs_root(struct btrfs_root *root)
         root->subv_writers = writers;
 
         btrfs_init_free_ino_ctl(root);
-        mutex_init(&root->fs_commit_mutex);
         spin_lock_init(&root->cache_lock);
         init_waitqueue_head(&root->cache_wait);
 
@@ -2324,7 +2341,7 @@ int open_ctree(struct super_block *sb,
         mutex_init(&fs_info->transaction_kthread_mutex);
         mutex_init(&fs_info->cleaner_mutex);
         mutex_init(&fs_info->volume_mutex);
-        init_rwsem(&fs_info->extent_commit_sem);
+        init_rwsem(&fs_info->commit_root_sem);
         init_rwsem(&fs_info->cleanup_work_sem);
         init_rwsem(&fs_info->subvol_sem);
         sema_init(&fs_info->uuid_tree_rescan_sem, 1);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index c6b6a6e3e735..1306487c82cf 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -419,7 +419,7 @@ static noinline void caching_thread(struct btrfs_work *work)
 again:
         mutex_lock(&caching_ctl->mutex);
         /* need to make sure the commit_root doesn't disappear */
-        down_read(&fs_info->extent_commit_sem);
+        down_read(&fs_info->commit_root_sem);
 
 next:
         ret = btrfs_search_slot(NULL, extent_root, &key, path, 0, 0);
@@ -443,10 +443,10 @@ next:
                                 break;
 
                         if (need_resched() ||
-                            rwsem_is_contended(&fs_info->extent_commit_sem)) {
+                            rwsem_is_contended(&fs_info->commit_root_sem)) {
                                 caching_ctl->progress = last;
                                 btrfs_release_path(path);
-                                up_read(&fs_info->extent_commit_sem);
+                                up_read(&fs_info->commit_root_sem);
                                 mutex_unlock(&caching_ctl->mutex);
                                 cond_resched();
                                 goto again;
@@ -513,7 +513,7 @@ next:
 
 err:
         btrfs_free_path(path);
-        up_read(&fs_info->extent_commit_sem);
+        up_read(&fs_info->commit_root_sem);
 
         free_excluded_extents(extent_root, block_group);
 
@@ -633,10 +633,10 @@ static int cache_block_group(struct btrfs_block_group_cache *cache,
                 return 0;
         }
 
-        down_write(&fs_info->extent_commit_sem);
+        down_write(&fs_info->commit_root_sem);
         atomic_inc(&caching_ctl->count);
         list_add_tail(&caching_ctl->list, &fs_info->caching_block_groups);
-        up_write(&fs_info->extent_commit_sem);
+        up_write(&fs_info->commit_root_sem);
 
         btrfs_get_block_group(cache);
 
@@ -2444,7 +2444,8 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
                         spin_unlock(&locked_ref->lock);
                         spin_lock(&delayed_refs->lock);
                         spin_lock(&locked_ref->lock);
-                        if (rb_first(&locked_ref->ref_root)) {
+                        if (rb_first(&locked_ref->ref_root) ||
+                            locked_ref->extent_op) {
                                 spin_unlock(&locked_ref->lock);
                                 spin_unlock(&delayed_refs->lock);
                                 continue;
@@ -5470,7 +5471,7 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans,
         struct btrfs_block_group_cache *cache;
         struct btrfs_space_info *space_info;
 
-        down_write(&fs_info->extent_commit_sem);
+        down_write(&fs_info->commit_root_sem);
 
         list_for_each_entry_safe(caching_ctl, next,
                                  &fs_info->caching_block_groups, list) {
@@ -5489,7 +5490,7 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans,
         else
                 fs_info->pinned_extents = &fs_info->freed_extents[0];
 
-        up_write(&fs_info->extent_commit_sem);
+        up_write(&fs_info->commit_root_sem);
 
         list_for_each_entry_rcu(space_info, &fs_info->space_info, list)
                 percpu_counter_set(&space_info->total_bytes_pinned, 0);
@@ -5744,6 +5745,8 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
                         "unable to find ref byte nr %llu parent %llu root %llu  owner %llu offset %llu",
                         bytenr, parent, root_objectid, owner_objectid,
                         owner_offset);
+                btrfs_abort_transaction(trans, extent_root, ret);
+                goto out;
         } else {
                 btrfs_abort_transaction(trans, extent_root, ret);
                 goto out;
@@ -8255,14 +8258,14 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
         struct btrfs_caching_control *caching_ctl;
         struct rb_node *n;
 
-        down_write(&info->extent_commit_sem);
+        down_write(&info->commit_root_sem);
         while (!list_empty(&info->caching_block_groups)) {
                 caching_ctl = list_entry(info->caching_block_groups.next,
                                          struct btrfs_caching_control, list);
                 list_del(&caching_ctl->list);
                 put_caching_control(caching_ctl);
         }
-        up_write(&info->extent_commit_sem);
+        up_write(&info->commit_root_sem);
 
         spin_lock(&info->block_group_cache_lock);
         while ((n = rb_last(&info->block_group_cache_tree)) != NULL) {
@@ -8336,9 +8339,15 @@ static void __link_block_group(struct btrfs_space_info *space_info,
                                struct btrfs_block_group_cache *cache)
 {
         int index = get_block_group_index(cache);
+        bool first = false;
 
         down_write(&space_info->groups_sem);
-        if (list_empty(&space_info->block_groups[index])) {
+        if (list_empty(&space_info->block_groups[index]))
+                first = true;
+        list_add_tail(&cache->list, &space_info->block_groups[index]);
+        up_write(&space_info->groups_sem);
+
+        if (first) {
                 struct kobject *kobj = &space_info->block_group_kobjs[index];
                 int ret;
 
@@ -8350,8 +8359,6 @@ static void __link_block_group(struct btrfs_space_info *space_info,
                         kobject_put(&space_info->kobj);
                 }
         }
-        list_add_tail(&cache->list, &space_info->block_groups[index]);
-        up_write(&space_info->groups_sem);
 }
 
 static struct btrfs_block_group_cache *
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index ae69a00387e7..3955e475ceec 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -749,6 +749,7 @@ again:
                  * our range starts
                  */
                 node = tree_search(tree, start);
+process_node:
                 if (!node)
                         break;
 
@@ -769,7 +770,10 @@ again:
                 if (start > end)
                         break;
 
-                cond_resched_lock(&tree->lock);
+                if (!cond_resched_lock(&tree->lock)) {
+                        node = rb_next(node);
+                        goto process_node;
+                }
         }
 out:
         spin_unlock(&tree->lock);
@@ -4306,7 +4310,7 @@ static void __free_extent_buffer(struct extent_buffer *eb)
         kmem_cache_free(extent_buffer_cache, eb);
 }
 
-static int extent_buffer_under_io(struct extent_buffer *eb)
+int extent_buffer_under_io(struct extent_buffer *eb)
 {
         return (atomic_read(&eb->io_pages) ||
                 test_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags) ||
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 58b27e5ab521..c488b45237bf 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -320,6 +320,7 @@ int set_extent_buffer_dirty(struct extent_buffer *eb);
 int set_extent_buffer_uptodate(struct extent_buffer *eb);
 int clear_extent_buffer_uptodate(struct extent_buffer *eb);
 int extent_buffer_uptodate(struct extent_buffer *eb);
+int extent_buffer_under_io(struct extent_buffer *eb);
 int map_private_extent_buffer(struct extent_buffer *eb, unsigned long offset,
                       unsigned long min_len, char **map,
                       unsigned long *map_start,
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index c660527af838..eb742c07e7a4 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -425,13 +425,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages,
                 struct page *page = prepared_pages[pg];
                 /*
                  * Copy data from userspace to the current page
-                 *
-                 * Disable pagefault to avoid recursive lock since
-                 * the pages are already locked
                  */
-                pagefault_disable();
                 copied = iov_iter_copy_from_user_atomic(page, i, offset, count);
-                pagefault_enable();
 
                 /* Flush processor's dcache for this page */
                 flush_dcache_page(page);
@@ -1665,7 +1660,7 @@ again:
 static ssize_t __btrfs_direct_write(struct kiocb *iocb,
                                     const struct iovec *iov,
                                     unsigned long nr_segs, loff_t pos,
-                                    loff_t *ppos, size_t count, size_t ocount)
+                                    size_t count, size_t ocount)
 {
         struct file *file = iocb->ki_filp;
         struct iov_iter i;
@@ -1674,7 +1669,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,
         loff_t endbyte;
         int err;
 
-        written = generic_file_direct_write(iocb, iov, &nr_segs, pos, ppos,
+        written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
                                             count, ocount);
 
         if (written < 0 || written == count)
@@ -1693,7 +1688,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,
         if (err)
                 goto out;
         written += written_buffered;
-        *ppos = pos + written_buffered;
+        iocb->ki_pos = pos + written_buffered;
         invalidate_mapping_pages(file->f_mapping, pos >> PAGE_CACHE_SHIFT,
                                  endbyte >> PAGE_CACHE_SHIFT);
 out:
@@ -1725,8 +1720,8 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
         struct btrfs_root *root = BTRFS_I(inode)->root;
-        loff_t *ppos = &iocb->ki_pos;
         u64 start_pos;
+        u64 end_pos;
         ssize_t num_written = 0;
         ssize_t err = 0;
         size_t count, ocount;
@@ -1781,7 +1776,9 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
 
         start_pos = round_down(pos, root->sectorsize);
         if (start_pos > i_size_read(inode)) {
-                err = btrfs_cont_expand(inode, i_size_read(inode), start_pos);
+                /* Expand hole size to cover write data, preventing empty gap */
+                end_pos = round_up(pos + iov->iov_len, root->sectorsize);
+                err = btrfs_cont_expand(inode, i_size_read(inode), end_pos);
                 if (err) {
                         mutex_unlock(&inode->i_mutex);
                         goto out;
@@ -1793,7 +1790,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
 
         if (unlikely(file->f_flags & O_DIRECT)) {
                 num_written = __btrfs_direct_write(iocb, iov, nr_segs,
-                                                   pos, ppos, count, ocount);
+                                                   pos, count, ocount);
         } else {
                 struct iov_iter i;
 
@@ -1801,7 +1798,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
 
                 num_written = __btrfs_buffered_write(file, &i, pos);
                 if (num_written > 0)
-                        *ppos = pos + num_written;
+                        iocb->ki_pos = pos + num_written;
         }
 
         mutex_unlock(&inode->i_mutex);
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index ab485e57b6fe..cc8ca193d830 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -55,7 +55,7 @@ static int caching_kthread(void *data)
         key.type = BTRFS_INODE_ITEM_KEY;
 again:
         /* need to make sure the commit_root doesn't disappear */
-        mutex_lock(&root->fs_commit_mutex);
+        down_read(&fs_info->commit_root_sem);
 
         ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
         if (ret < 0)
@@ -88,7 +88,7 @@ again:
                                 btrfs_item_key_to_cpu(leaf, &key, 0);
                                 btrfs_release_path(path);
                                 root->cache_progress = last;
-                                mutex_unlock(&root->fs_commit_mutex);
+                                up_read(&fs_info->commit_root_sem);
                                 schedule_timeout(1);
                                 goto again;
                         } else
@@ -127,7 +127,7 @@ next:
         btrfs_unpin_free_ino(root);
 out:
         wake_up(&root->cache_wait);
-        mutex_unlock(&root->fs_commit_mutex);
+        up_read(&fs_info->commit_root_sem);
 
         btrfs_free_path(path);
 
@@ -223,11 +223,11 @@ again:
                  * or the caching work is done.
                  */
 
-                mutex_lock(&root->fs_commit_mutex);
+                down_write(&root->fs_info->commit_root_sem);
                 spin_lock(&root->cache_lock);
                 if (root->cached == BTRFS_CACHE_FINISHED) {
                         spin_unlock(&root->cache_lock);
-                        mutex_unlock(&root->fs_commit_mutex);
+                        up_write(&root->fs_info->commit_root_sem);
                         goto again;
                 }
                 spin_unlock(&root->cache_lock);
@@ -240,7 +240,7 @@ again:
                 else
                         __btrfs_add_free_space(pinned, objectid, 1);
 
-                mutex_unlock(&root->fs_commit_mutex);
+                up_write(&root->fs_info->commit_root_sem);
         }
 }
 
@@ -250,7 +250,7 @@ again:
  * and others will just be dropped, because the commit root we were
  * searching has changed.
  *
- * Must be called with root->fs_commit_mutex held
+ * Must be called with root->fs_info->commit_root_sem held
  */
 void btrfs_unpin_free_ino(struct btrfs_root *root)
 {
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 06e9a4152b14..5f805bc944fa 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -394,6 +394,14 @@ static noinline int compress_file_range(struct inode *inode,
             (start > 0 || end + 1 < BTRFS_I(inode)->disk_i_size))
                 btrfs_add_inode_defrag(NULL, inode);
 
+        /*
+         * skip compression for a small file range(<=blocksize) that
+         * isn't an inline extent, since it dosen't save disk space at all.
+         */
+        if ((end - start + 1) <= blocksize &&
+            (start > 0 || end + 1 < BTRFS_I(inode)->disk_i_size))
+                goto cleanup_and_bail_uncompressed;
+
         actual_end = min_t(u64, isize, end + 1);
 again:
         will_compress = 0;
@@ -1271,6 +1279,15 @@ next_slot:
                         disk_bytenr += cur_offset - found_key.offset;
                         num_bytes = min(end + 1, extent_end) - cur_offset;
                         /*
+                         * if there are pending snapshots for this root,
+                         * we fall into common COW way.
+                         */
+                        if (!nolock) {
+                                err = btrfs_start_nocow_write(root);
+                                if (!err)
+                                        goto out_check;
+                        }
+                        /*
                          * force cow if csum exists in the range.
                          * this ensure that csum for a given extent are
                          * either valid or do not exist.
@@ -1289,6 +1306,8 @@ next_slot:
 out_check:
                 if (extent_end <= start) {
                         path->slots[0]++;
+                        if (!nolock && nocow)
+                                btrfs_end_nocow_write(root);
                         goto next_slot;
                 }
                 if (!nocow) {
@@ -1306,8 +1325,11 @@ out_check:
                         ret = cow_file_range(inode, locked_page,
                                              cow_start, found_key.offset - 1,
                                              page_started, nr_written, 1);
-                        if (ret)
+                        if (ret) {
+                                if (!nolock && nocow)
+                                        btrfs_end_nocow_write(root);
                                 goto error;
+                        }
                         cow_start = (u64)-1;
                 }
 
@@ -1354,8 +1376,11 @@ out_check:
                     BTRFS_DATA_RELOC_TREE_OBJECTID) {
                         ret = btrfs_reloc_clone_csums(inode, cur_offset,
                                                       num_bytes);
-                        if (ret)
+                        if (ret) {
+                                if (!nolock && nocow)
+                                        btrfs_end_nocow_write(root);
                                 goto error;
+                        }
                 }
 
                 extent_clear_unlock_delalloc(inode, cur_offset,
@@ -1363,6 +1388,8 @@ out_check:
                                              locked_page, EXTENT_LOCKED |
                                              EXTENT_DELALLOC, PAGE_UNLOCK |
                                              PAGE_SET_PRIVATE2);
+                if (!nolock && nocow)
+                        btrfs_end_nocow_write(root);
                 cur_offset = extent_end;
                 if (cur_offset > end)
                         break;
@@ -8476,19 +8503,20 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
                         else
                                 iput(inode);
                         ret = -ENOMEM;
-                        break;
+                        goto out;
                 }
                 list_add_tail(&work->list, &works);
                 btrfs_queue_work(root->fs_info->flush_workers,
                                  &work->work);
                 ret++;
                 if (nr != -1 && ret >= nr)
-                        break;
+                        goto out;
                 cond_resched();
                 spin_lock(&root->delalloc_lock);
         }
         spin_unlock(&root->delalloc_lock);
 
+out:
         list_for_each_entry_safe(work, next, &works, list) {
                 list_del_init(&work->list);
                 btrfs_wait_and_free_delalloc_work(work);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 0401397b5c92..e79ff6b90cb7 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1472,6 +1472,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
         struct btrfs_trans_handle *trans;
         struct btrfs_device *device = NULL;
         char *sizestr;
+        char *retptr;
         char *devstr = NULL;
         int ret = 0;
         int mod = 0;
@@ -1539,8 +1540,8 @@ static noinline int btrfs_ioctl_resize(struct file *file,
                         mod = 1;
                         sizestr++;
                 }
-                new_size = memparse(sizestr, NULL);
-                if (new_size == 0) {
+                new_size = memparse(sizestr, &retptr);
+                if (*retptr != '\0' || new_size == 0) {
                         ret = -EINVAL;
                         goto out_free;
                 }
@@ -3140,8 +3141,9 @@ process_slot:
                                                          new_key.offset + datal,
                                                          1);
                                 if (ret) {
-                                        btrfs_abort_transaction(trans, root,
-                                                                ret);
+                                        if (ret != -EINVAL)
+                                                btrfs_abort_transaction(trans,
+                                                        root, ret);
                                         btrfs_end_transaction(trans, root);
                                         goto out;
                                 }
@@ -3538,6 +3540,11 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
                 up_read(&info->groups_sem);
         }
 
+        /*
+         * Global block reserve, exported as a space_info
+         */
+        slot_count++;
+
         /* space_slots == 0 means they are asking for a count */
         if (space_args.space_slots == 0) {
                 space_args.total_spaces = slot_count;
@@ -3596,6 +3603,21 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
                 up_read(&info->groups_sem);
         }
 
+        /*
+         * Add global block reserve
+         */
+        if (slot_count) {
+                struct btrfs_block_rsv *block_rsv = &root->fs_info->global_block_rsv;
+
+                spin_lock(&block_rsv->lock);
+                space.total_bytes = block_rsv->size;
+                space.used_bytes = block_rsv->size - block_rsv->reserved;
+                spin_unlock(&block_rsv->lock);
+                space.flags = BTRFS_SPACE_INFO_GLOBAL_RSV;
+                memcpy(dest, &space, sizeof(space));
+                space_args.total_spaces++;
+        }
+
         user_dest = (struct btrfs_ioctl_space_info __user *)
                 (arg + sizeof(struct btrfs_ioctl_space_args));
 
@@ -4531,9 +4553,8 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file,
         }
 
         args64 = kmalloc(sizeof(*args64), GFP_NOFS);
-        if (IS_ERR(args64)) {
-                ret = PTR_ERR(args64);
-                args64 = NULL;
+        if (!args64) {
+                ret = -ENOMEM;
                 goto out;
         }
 
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index def428a25b2a..7f92ab1daa87 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2317,7 +2317,6 @@ void free_reloc_roots(struct list_head *list)
 static noinline_for_stack
 int merge_reloc_roots(struct reloc_control *rc)
 {
-        struct btrfs_trans_handle *trans;
         struct btrfs_root *root;
         struct btrfs_root *reloc_root;
         u64 last_snap;
@@ -2375,26 +2374,6 @@ again:
                                 list_add_tail(&reloc_root->root_list,
                                               &reloc_roots);
                         goto out;
-                } else if (!ret) {
-                        /*
-                         * recover the last snapshot tranid to avoid
-                         * the space balance break NOCOW.
-                         */
-                        root = read_fs_root(rc->extent_root->fs_info,
-                                            objectid);
-                        if (IS_ERR(root))
-                                continue;
-
-                        trans = btrfs_join_transaction(root);
-                        BUG_ON(IS_ERR(trans));
-
-                        /* Check if the fs/file tree was snapshoted or not. */
-                        if (btrfs_root_last_snapshot(&root->root_item) ==
-                            otransid - 1)
-                                btrfs_set_root_last_snapshot(&root->root_item,
-                                                             last_snap);
-                                
-                        btrfs_end_transaction(trans, root);
                 }
         }
 
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 93e6d7172844..0be77993378e 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -2235,6 +2235,47 @@ behind_scrub_pages:
         return 0;
 }
 
+/*
+ * Given a physical address, this will calculate it's
+ * logical offset. if this is a parity stripe, it will return
+ * the most left data stripe's logical offset.
+ *
+ * return 0 if it is a data stripe, 1 means parity stripe.
+ */
+static int get_raid56_logic_offset(u64 physical, int num,
+                                   struct map_lookup *map, u64 *offset)
+{
+        int i;
+        int j = 0;
+        u64 stripe_nr;
+        u64 last_offset;
+        int stripe_index;
+        int rot;
+
+        last_offset = (physical - map->stripes[num].physical) *
+                      nr_data_stripes(map);
+        *offset = last_offset;
+        for (i = 0; i < nr_data_stripes(map); i++) {
+                *offset = last_offset + i * map->stripe_len;
+
+                stripe_nr = *offset;
+                do_div(stripe_nr, map->stripe_len);
+                do_div(stripe_nr, nr_data_stripes(map));
+
+                /* Work out the disk rotation on this stripe-set */
+                rot = do_div(stripe_nr, map->num_stripes);
+                /* calculate which stripe this data locates */
+                rot += i;
+                stripe_index = rot % map->num_stripes;
+                if (stripe_index == num)
+                        return 0;
+                if (stripe_index < num)
+                        j++;
+        }
+        *offset = last_offset + j * map->stripe_len;
+        return 1;
+}
+
 static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
                                            struct map_lookup *map,
                                            struct btrfs_device *scrub_dev,
@@ -2256,6 +2297,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         u64 physical;
         u64 logical;
         u64 logic_end;
+        u64 physical_end;
         u64 generation;
         int mirror_num;
         struct reada_control *reada1;
@@ -2269,16 +2311,10 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         u64 extent_len;
         struct btrfs_device *extent_dev;
         int extent_mirror_num;
-        int stop_loop;
-
-        if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
-                         BTRFS_BLOCK_GROUP_RAID6)) {
-                if (num >= nr_data_stripes(map)) {
-                        return 0;
-                }
-        }
+        int stop_loop = 0;
 
         nstripes = length;
+        physical = map->stripes[num].physical;
         offset = 0;
         do_div(nstripes, map->stripe_len);
         if (map->type & BTRFS_BLOCK_GROUP_RAID0) {
@@ -2296,6 +2332,11 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         } else if (map->type & BTRFS_BLOCK_GROUP_DUP) {
                 increment = map->stripe_len;
                 mirror_num = num % map->num_stripes + 1;
+        } else if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
+                                BTRFS_BLOCK_GROUP_RAID6)) {
+                get_raid56_logic_offset(physical, num, map, &offset);
+                increment = map->stripe_len * nr_data_stripes(map);
+                mirror_num = 1;
         } else {
                 increment = map->stripe_len;
                 mirror_num = 1;
@@ -2319,7 +2360,15 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
          * to not hold off transaction commits
          */
         logical = base + offset;
-
+        physical_end = physical + nstripes * map->stripe_len;
+        if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
+                         BTRFS_BLOCK_GROUP_RAID6)) {
+                get_raid56_logic_offset(physical_end, num,
+                                        map, &logic_end);
+                logic_end += base;
+        } else {
+                logic_end = logical + increment * nstripes;
+        }
         wait_event(sctx->list_wait,
                    atomic_read(&sctx->bios_in_flight) == 0);
         scrub_blocked_if_needed(fs_info);
@@ -2328,7 +2377,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         key_start.objectid = logical;
         key_start.type = BTRFS_EXTENT_ITEM_KEY;
         key_start.offset = (u64)0;
-        key_end.objectid = base + offset + nstripes * increment;
+        key_end.objectid = logic_end;
         key_end.type = BTRFS_METADATA_ITEM_KEY;
         key_end.offset = (u64)-1;
         reada1 = btrfs_reada_add(root, &key_start, &key_end);
@@ -2338,7 +2387,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         key_start.offset = logical;
         key_end.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
         key_end.type = BTRFS_EXTENT_CSUM_KEY;
-        key_end.offset = base + offset + nstripes * increment;
+        key_end.offset = logic_end;
         reada2 = btrfs_reada_add(csum_root, &key_start, &key_end);
 
         if (!IS_ERR(reada1))
@@ -2356,11 +2405,17 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         /*
          * now find all extents for each stripe and scrub them
          */
-        logical = base + offset;
-        physical = map->stripes[num].physical;
-        logic_end = logical + increment * nstripes;
         ret = 0;
-        while (logical < logic_end) {
+        while (physical < physical_end) {
+                /* for raid56, we skip parity stripe */
+                if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
+                                BTRFS_BLOCK_GROUP_RAID6)) {
+                        ret = get_raid56_logic_offset(physical, num,
+                                        map, &logical);
+                        logical += base;
+                        if (ret)
+                                goto skip;
+                }
                 /*
                  * canceled?
                  */
@@ -2504,15 +2559,29 @@ again:
                         scrub_free_csums(sctx);
                         if (extent_logical + extent_len <
                             key.objectid + bytes) {
-                                logical += increment;
-                                physical += map->stripe_len;
-
+                                if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
+                                        BTRFS_BLOCK_GROUP_RAID6)) {
+                                        /*
+                                         * loop until we find next data stripe
+                                         * or we have finished all stripes.
+                                         */
+                                        do {
+                                                physical += map->stripe_len;
+                                                ret = get_raid56_logic_offset(
+                                                                physical, num,
+                                                                map, &logical);
+                                                logical += base;
+                                        } while (physical < physical_end && ret);
+                                } else {
+                                        physical += map->stripe_len;
+                                        logical += increment;
+                                }
                                 if (logical < key.objectid + bytes) {
                                         cond_resched();
                                         goto again;
                                 }
 
-                                if (logical >= logic_end) {
+                                if (physical >= physical_end) {
                                         stop_loop = 1;
                                         break;
                                 }
@@ -2521,6 +2590,7 @@ next:
                         path->slots[0]++;
                 }
                 btrfs_release_path(path);
+skip:
                 logical += increment;
                 physical += map->stripe_len;
                 spin_lock(&sctx->stat_lock);
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 9b6da9d55f9a..1ac3ca98c429 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -493,6 +493,7 @@ static struct btrfs_path *alloc_path_for_send(void)
                 return NULL;
         path->search_commit_root = 1;
         path->skip_locking = 1;
+        path->need_commit_sem = 1;
         return path;
 }
 
@@ -771,29 +772,22 @@ out:
 /*
  * Helper function to retrieve some fields from an inode item.
  */
-static int get_inode_info(struct btrfs_root *root,
-                          u64 ino, u64 *size, u64 *gen,
-                          u64 *mode, u64 *uid, u64 *gid,
-                          u64 *rdev)
+static int __get_inode_info(struct btrfs_root *root, struct btrfs_path *path,
+                          u64 ino, u64 *size, u64 *gen, u64 *mode, u64 *uid,
+                          u64 *gid, u64 *rdev)
 {
         int ret;
         struct btrfs_inode_item *ii;
         struct btrfs_key key;
-        struct btrfs_path *path;
-
-        path = alloc_path_for_send();
-        if (!path)
-                return -ENOMEM;
 
         key.objectid = ino;
         key.type = BTRFS_INODE_ITEM_KEY;
         key.offset = 0;
         ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-        if (ret < 0)
-                goto out;
         if (ret) {
-                ret = -ENOENT;
-                goto out;
+                if (ret > 0)
+                        ret = -ENOENT;
+                return ret;
         }
 
         ii = btrfs_item_ptr(path->nodes[0], path->slots[0],
@@ -811,7 +805,22 @@ static int get_inode_info(struct btrfs_root *root,
         if (rdev)
                 *rdev = btrfs_inode_rdev(path->nodes[0], ii);
 
-out:
+        return ret;
+}
+
+static int get_inode_info(struct btrfs_root *root,
+                          u64 ino, u64 *size, u64 *gen,
+                          u64 *mode, u64 *uid, u64 *gid,
+                          u64 *rdev)
+{
+        struct btrfs_path *path;
+        int ret;
+
+        path = alloc_path_for_send();
+        if (!path)
+                return -ENOMEM;
+        ret = __get_inode_info(root, path, ino, size, gen, mode, uid, gid,
+                               rdev);
         btrfs_free_path(path);
         return ret;
 }
@@ -1085,6 +1094,7 @@ out:
 struct backref_ctx {
         struct send_ctx *sctx;
 
+        struct btrfs_path *path;
         /* number of total found references */
         u64 found;
 
@@ -1155,8 +1165,9 @@ static int __iterate_backrefs(u64 ino, u64 offset, u64 root, void *ctx_)
          * There are inodes that have extents that lie behind its i_size. Don't
          * accept clones from these extents.
          */
-        ret = get_inode_info(found->root, ino, &i_size, NULL, NULL, NULL, NULL,
-                        NULL);
+        ret = __get_inode_info(found->root, bctx->path, ino, &i_size, NULL, NULL,
+                               NULL, NULL, NULL);
+        btrfs_release_path(bctx->path);
         if (ret < 0)
                 return ret;
 
@@ -1235,12 +1246,17 @@ static int find_extent_clone(struct send_ctx *sctx,
         if (!tmp_path)
                 return -ENOMEM;
 
+        /* We only use this path under the commit sem */
+        tmp_path->need_commit_sem = 0;
+
         backref_ctx = kmalloc(sizeof(*backref_ctx), GFP_NOFS);
         if (!backref_ctx) {
                 ret = -ENOMEM;
                 goto out;
         }
 
+        backref_ctx->path = tmp_path;
+
         if (data_offset >= ino_size) {
                 /*
                  * There may be extents that lie behind the file's size.
@@ -1268,8 +1284,10 @@ static int find_extent_clone(struct send_ctx *sctx,
         }
         logical = disk_byte + btrfs_file_extent_offset(eb, fi);
 
+        down_read(&sctx->send_root->fs_info->commit_root_sem);
         ret = extent_from_logical(sctx->send_root->fs_info, disk_byte, tmp_path,
                                   &found_key, &flags);
+        up_read(&sctx->send_root->fs_info->commit_root_sem);
         btrfs_release_path(tmp_path);
 
         if (ret < 0)
@@ -4418,6 +4436,9 @@ static int send_hole(struct send_ctx *sctx, u64 end)
         p = fs_path_alloc();
         if (!p)
                 return -ENOMEM;
+        ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, p);
+        if (ret < 0)
+                goto tlv_put_failure;
         memset(sctx->read_buf, 0, BTRFS_SEND_READ_SIZE);
         while (offset < end) {
                 len = min_t(u64, end - offset, BTRFS_SEND_READ_SIZE);
@@ -4425,9 +4446,6 @@ static int send_hole(struct send_ctx *sctx, u64 end)
                 ret = begin_cmd(sctx, BTRFS_SEND_C_WRITE);
                 if (ret < 0)
                         break;
-                ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, p);
-                if (ret < 0)
-                        break;
                 TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);
                 TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);
                 TLV_PUT(sctx, BTRFS_SEND_A_DATA, sctx->read_buf, len);
@@ -4968,7 +4986,9 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
 
         if (S_ISREG(sctx->cur_inode_mode)) {
                 if (need_send_hole(sctx)) {
-                        if (sctx->cur_inode_last_extent == (u64)-1) {
+                        if (sctx->cur_inode_last_extent == (u64)-1 ||
+                            sctx->cur_inode_last_extent <
+                            sctx->cur_inode_size) {
                                 ret = get_last_extent(sctx, (u64)-1);
                                 if (ret)
                                         goto out;
@@ -5367,57 +5387,21 @@ out:
 static int full_send_tree(struct send_ctx *sctx)
 {
         int ret;
-        struct btrfs_trans_handle *trans = NULL;
         struct btrfs_root *send_root = sctx->send_root;
         struct btrfs_key key;
         struct btrfs_key found_key;
         struct btrfs_path *path;
         struct extent_buffer *eb;
         int slot;
-        u64 start_ctransid;
-        u64 ctransid;
 
         path = alloc_path_for_send();
         if (!path)
                 return -ENOMEM;
 
-        spin_lock(&send_root->root_item_lock);
-        start_ctransid = btrfs_root_ctransid(&send_root->root_item);
-        spin_unlock(&send_root->root_item_lock);
-
         key.objectid = BTRFS_FIRST_FREE_OBJECTID;
         key.type = BTRFS_INODE_ITEM_KEY;
         key.offset = 0;
 
-join_trans:
-        /*
-         * We need to make sure the transaction does not get committed
-         * while we do anything on commit roots. Join a transaction to prevent
-         * this.
-         */
-        trans = btrfs_join_transaction(send_root);
-        if (IS_ERR(trans)) {
-                ret = PTR_ERR(trans);
-                trans = NULL;
-                goto out;
-        }
-
-        /*
-         * Make sure the tree has not changed after re-joining. We detect this
-         * by comparing start_ctransid and ctransid. They should always match.
-         */
-        spin_lock(&send_root->root_item_lock);
-        ctransid = btrfs_root_ctransid(&send_root->root_item);
-        spin_unlock(&send_root->root_item_lock);
-
-        if (ctransid != start_ctransid) {
-                WARN(1, KERN_WARNING "BTRFS: the root that you're trying to "
-                                     "send was modified in between. This is "
-                                     "probably a bug.\n");
-                ret = -EIO;
-                goto out;
-        }
-
         ret = btrfs_search_slot_for_read(send_root, &key, path, 1, 0);
         if (ret < 0)
                 goto out;
@@ -5425,19 +5409,6 @@ join_trans:
                 goto out_finish;
 
         while (1) {
-                /*
-                 * When someone want to commit while we iterate, end the
-                 * joined transaction and rejoin.
-                 */
-                if (btrfs_should_end_transaction(trans, send_root)) {
-                        ret = btrfs_end_transaction(trans, send_root);
-                        trans = NULL;
-                        if (ret < 0)
-                                goto out;
-                        btrfs_release_path(path);
-                        goto join_trans;
-                }
-
                 eb = path->nodes[0];
                 slot = path->slots[0];
                 btrfs_item_key_to_cpu(eb, &found_key, slot);
@@ -5465,12 +5436,6 @@ out_finish:
 
 out:
         btrfs_free_path(path);
-        if (trans) {
-                if (!ret)
-                        ret = btrfs_end_transaction(trans, send_root);
-                else
-                        btrfs_end_transaction(trans, send_root);
-        }
         return ret;
 }
 
@@ -5718,7 +5683,9 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
                         NULL);
         sort_clone_roots = 1;
 
+        current->journal_info = (void *)BTRFS_SEND_TRANS_STUB;
         ret = send_subvol(sctx);
+        current->journal_info = NULL;
         if (ret < 0)
                 goto out;
 
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 9dbf42395153..5011aadacab8 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -66,6 +66,8 @@
 static const struct super_operations btrfs_super_ops;
 static struct file_system_type btrfs_fs_type;
 
+static int btrfs_remount(struct super_block *sb, int *flags, char *data);
+
 static const char *btrfs_decode_error(int errno)
 {
         char *errstr = "unknown";
@@ -1185,6 +1187,26 @@ static struct dentry *mount_subvol(const char *subvol_name, int flags,
         mnt = vfs_kern_mount(&btrfs_fs_type, flags, device_name,
                              newargs);
         kfree(newargs);
+
+        if (PTR_RET(mnt) == -EBUSY) {
+                if (flags & MS_RDONLY) {
+                        mnt = vfs_kern_mount(&btrfs_fs_type, flags & ~MS_RDONLY, device_name,
+                                             newargs);
+                } else {
+                        int r;
+                        mnt = vfs_kern_mount(&btrfs_fs_type, flags | MS_RDONLY, device_name,
+                                             newargs);
+                        if (IS_ERR(mnt))
+                                return ERR_CAST(mnt);
+
+                        r = btrfs_remount(mnt->mnt_sb, &flags, NULL);
+                        if (r < 0) {
+                                /* FIXME: release vfsmount mnt ??*/
+                                return ERR_PTR(r);
+                        }
+                }
+        }
+
         if (IS_ERR(mnt))
                 return ERR_CAST(mnt);
 
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index a04707f740d6..7579f6d0b854 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -75,10 +75,21 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction)
         }
 }
 
-static noinline void switch_commit_root(struct btrfs_root *root)
+static noinline void switch_commit_roots(struct btrfs_transaction *trans,
+                                         struct btrfs_fs_info *fs_info)
 {
-        free_extent_buffer(root->commit_root);
-        root->commit_root = btrfs_root_node(root);
+        struct btrfs_root *root, *tmp;
+
+        down_write(&fs_info->commit_root_sem);
+        list_for_each_entry_safe(root, tmp, &trans->switch_commits,
+                                 dirty_list) {
+                list_del_init(&root->dirty_list);
+                free_extent_buffer(root->commit_root);
+                root->commit_root = btrfs_root_node(root);
+                if (is_fstree(root->objectid))
+                        btrfs_unpin_free_ino(root);
+        }
+        up_write(&fs_info->commit_root_sem);
 }
 
 static inline void extwriter_counter_inc(struct btrfs_transaction *trans,
@@ -208,6 +219,7 @@ loop:
         INIT_LIST_HEAD(&cur_trans->pending_snapshots);
         INIT_LIST_HEAD(&cur_trans->ordered_operations);
         INIT_LIST_HEAD(&cur_trans->pending_chunks);
+        INIT_LIST_HEAD(&cur_trans->switch_commits);
         list_add_tail(&cur_trans->list, &fs_info->trans_list);
         extent_io_tree_init(&cur_trans->dirty_pages,
                              fs_info->btree_inode->i_mapping);
@@ -375,7 +387,8 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
         if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
                 return ERR_PTR(-EROFS);
 
-        if (current->journal_info) {
+        if (current->journal_info &&
+            current->journal_info != (void *)BTRFS_SEND_TRANS_STUB) {
                 WARN_ON(type & TRANS_EXTWRITERS);
                 h = current->journal_info;
                 h->use_count++;
@@ -919,9 +932,6 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
                         return ret;
         }
 
-        if (root != root->fs_info->extent_root)
-                switch_commit_root(root);
-
         return 0;
 }
 
@@ -977,15 +987,16 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
                 list_del_init(next);
                 root = list_entry(next, struct btrfs_root, dirty_list);
 
+                if (root != fs_info->extent_root)
+                        list_add_tail(&root->dirty_list,
+                                      &trans->transaction->switch_commits);
                 ret = update_cowonly_root(trans, root);
                 if (ret)
                         return ret;
         }
 
-        down_write(&fs_info->extent_commit_sem);
-        switch_commit_root(fs_info->extent_root);
-        up_write(&fs_info->extent_commit_sem);
-
+        list_add_tail(&fs_info->extent_root->dirty_list,
+                      &trans->transaction->switch_commits);
         btrfs_after_dev_replace_commit(fs_info);
 
         return 0;
@@ -1042,11 +1053,8 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans,
                         smp_wmb();
 
                         if (root->commit_root != root->node) {
-                                mutex_lock(&root->fs_commit_mutex);
-                                switch_commit_root(root);
-                                btrfs_unpin_free_ino(root);
-                                mutex_unlock(&root->fs_commit_mutex);
-
+                                list_add_tail(&root->dirty_list,
+                                        &trans->transaction->switch_commits);
                                 btrfs_set_root_node(&root->root_item,
                                                     root->node);
                         }
@@ -1857,11 +1865,15 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 
         btrfs_set_root_node(&root->fs_info->tree_root->root_item,
                             root->fs_info->tree_root->node);
-        switch_commit_root(root->fs_info->tree_root);
+        list_add_tail(&root->fs_info->tree_root->dirty_list,
+                      &cur_trans->switch_commits);
 
         btrfs_set_root_node(&root->fs_info->chunk_root->root_item,
                             root->fs_info->chunk_root->node);
-        switch_commit_root(root->fs_info->chunk_root);
+        list_add_tail(&root->fs_info->chunk_root->dirty_list,
+                      &cur_trans->switch_commits);
+
+        switch_commit_roots(cur_trans, root->fs_info);
 
         assert_qgroups_uptodate(trans);
         update_super_roots(root);
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 6ac037e9f9f0..b57b924e8e03 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -57,6 +57,7 @@ struct btrfs_transaction {
         struct list_head pending_snapshots;
         struct list_head ordered_operations;
         struct list_head pending_chunks;
+        struct list_head switch_commits;
         struct btrfs_delayed_ref_root delayed_refs;
         int aborted;
 };
@@ -78,6 +79,8 @@ struct btrfs_transaction {
 #define TRANS_EXTWRITERS        (__TRANS_USERSPACE | __TRANS_START |    \
                                  __TRANS_ATTACH)
 
+#define BTRFS_SEND_TRANS_STUB   1
+
 struct btrfs_trans_handle {
         u64 transid;
         u64 bytes_reserved;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d241130a32fd..49d7fab73360 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -448,6 +448,14 @@ static void pending_bios_fn(struct btrfs_work *work)
         run_scheduled_bios(device);
 }
 
+/*
+ * Add new device to list of registered devices
+ *
+ * Returns:
+ * 1   - first time device is seen
+ * 0   - device already known
+ * < 0 - error
+ */
 static noinline int device_list_add(const char *path,
                            struct btrfs_super_block *disk_super,
                            u64 devid, struct btrfs_fs_devices **fs_devices_ret)
@@ -455,6 +463,7 @@ static noinline int device_list_add(const char *path,
         struct btrfs_device *device;
         struct btrfs_fs_devices *fs_devices;
         struct rcu_string *name;
+        int ret = 0;
         u64 found_transid = btrfs_super_generation(disk_super);
 
         fs_devices = find_fsid(disk_super->fsid);
@@ -495,6 +504,7 @@ static noinline int device_list_add(const char *path,
                 fs_devices->num_devices++;
                 mutex_unlock(&fs_devices->device_list_mutex);
 
+                ret = 1;
                 device->fs_devices = fs_devices;
         } else if (!device->name || strcmp(device->name->str, path)) {
                 name = rcu_string_strdup(path, GFP_NOFS);
@@ -513,7 +523,8 @@ static noinline int device_list_add(const char *path,
                 fs_devices->latest_trans = found_transid;
         }
         *fs_devices_ret = fs_devices;
-        return 0;
+
+        return ret;
 }
 
 static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
@@ -910,17 +921,19 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
         transid = btrfs_super_generation(disk_super);
         total_devices = btrfs_super_num_devices(disk_super);
 
-        if (disk_super->label[0]) {
-                if (disk_super->label[BTRFS_LABEL_SIZE - 1])
-                        disk_super->label[BTRFS_LABEL_SIZE - 1] = '\0';
-                printk(KERN_INFO "BTRFS: device label %s ", disk_super->label);
-        } else {
-                printk(KERN_INFO "BTRFS: device fsid %pU ", disk_super->fsid);
-        }
-
-        printk(KERN_CONT "devid %llu transid %llu %s\n", devid, transid, path);
-
         ret = device_list_add(path, disk_super, devid, fs_devices_ret);
+        if (ret > 0) {
+                if (disk_super->label[0]) {
+                        if (disk_super->label[BTRFS_LABEL_SIZE - 1])
+                                disk_super->label[BTRFS_LABEL_SIZE - 1] = '\0';
+                        printk(KERN_INFO "BTRFS: device label %s ", disk_super->label);
+                } else {
+                        printk(KERN_INFO "BTRFS: device fsid %pU ", disk_super->fsid);
+                }
+
+                printk(KERN_CONT "devid %llu transid %llu %s\n", devid, transid, path);
+                ret = 0;
+        }
         if (!ret && fs_devices_ret)
                 (*fs_devices_ret)->total_devices = total_devices;
 
diff --git a/fs/buffer.c b/fs/buffer.c
index 8c53a2b15ecb..9ddb9fc7d923 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2114,8 +2114,8 @@ EXPORT_SYMBOL(generic_write_end);
  * Returns true if all buffers which correspond to a file portion
  * we want to read are uptodate.
  */
-int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
-                                        unsigned long from)
+int block_is_partially_uptodate(struct page *page, unsigned long from,
+                                        unsigned long count)
 {
         unsigned block_start, block_end, blocksize;
         unsigned to;
@@ -2127,7 +2127,7 @@ int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
 
         head = page_buffers(page);
         blocksize = head->b_size;
-        to = min_t(unsigned, PAGE_CACHE_SIZE - from, desc->count);
+        to = min_t(unsigned, PAGE_CACHE_SIZE - from, count);
         to = from + to;
         if (from < blocksize && to > PAGE_CACHE_SIZE - blocksize)
                 return 0;
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index 622f4696e484..5b99bafc31d1 100644
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -124,7 +124,6 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
         /* check parameters */
         ret = -EOPNOTSUPP;
         if (!root->d_inode ||
-            !root->d_inode->i_op ||
             !root->d_inode->i_op->lookup ||
             !root->d_inode->i_op->mkdir ||
             !root->d_inode->i_op->setxattr ||
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 6494d9f673aa..c0a681705104 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -779,8 +779,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
         }
 
         ret = -EPERM;
-        if (!subdir->d_inode->i_op ||
-            !subdir->d_inode->i_op->setxattr ||
+        if (!subdir->d_inode->i_op->setxattr ||
             !subdir->d_inode->i_op->getxattr ||
             !subdir->d_inode->i_op->lookup ||
             !subdir->d_inode->i_op->mkdir ||
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 66075a4ad979..39da1c2efa50 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -601,7 +601,7 @@ ceph_sync_direct_write(struct kiocb *iocb, const struct iovec *iov,
                                             false);
                 if (IS_ERR(req)) {
                         ret = PTR_ERR(req);
-                        goto out;
+                        break;
                 }
 
                 num_pages = calc_pages_for(page_align, len);
@@ -719,7 +719,7 @@ static ssize_t ceph_sync_write(struct kiocb *iocb, const struct iovec *iov,
                                             false);
                 if (IS_ERR(req)) {
                         ret = PTR_ERR(req);
-                        goto out;
+                        break;
                 }
 
                 /*
@@ -972,6 +972,7 @@ retry_snap:
                 }
         } else {
                 loff_t old_size = inode->i_size;
+                struct iov_iter from;
                 /*
                  * No need to acquire the i_truncate_mutex. Because
                  * the MDS revokes Fwb caps before sending truncate
@@ -979,9 +980,10 @@ retry_snap:
                  * are pending vmtruncate. So write and vmtruncate
                  * can not run at the same time
                  */
-                written = generic_file_buffered_write(iocb, iov, nr_segs,
-                                                      pos, &iocb->ki_pos,
-                                                      count, 0);
+                iov_iter_init(&from, iov, nr_segs, count, 0);
+                written = generic_perform_write(file, &from, pos);
+                if (likely(written >= 0))
+                        iocb->ki_pos = pos + written;
                 if (inode->i_size > old_size)
                         ceph_fscache_update_objectsize(inode);
                 mutex_unlock(&inode->i_mutex);
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index efbe08289292..fdf941b44ff1 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -1,9 +1,8 @@
+#include <linux/ceph/ceph_debug.h>
 #include <linux/in.h>
 
 #include "super.h"
 #include "mds_client.h"
-#include <linux/ceph/ceph_debug.h>
-
 #include "ioctl.h"
 
 
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 2c70cbe35d39..df9c9141c099 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -850,7 +850,6 @@ const struct inode_operations cifs_file_inode_ops = {
 /*      revalidate:cifs_revalidate, */
         .setattr = cifs_setattr,
         .getattr = cifs_getattr, /* do we need this anymore? */
-        .rename = cifs_rename,
         .permission = cifs_permission,
 #ifdef CONFIG_CIFS_XATTR
         .setxattr = cifs_setxattr,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 216d7e99f921..8807442c94dd 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2579,19 +2579,32 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,
         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 = pos;
+        loff_t lock_pos = iocb->ki_pos;
 
-        if (file->f_flags & O_APPEND)
-                lock_pos = i_size_read(inode);
         /*
          * We need to hold the sem to be sure nobody modifies lock list
          * with a brlock that prevents writing.
          */
         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_length(iov, nr_segs),
                                      server->vals->exclusive_lock_type, NULL,
-                                     CIFS_WRITE_OP))
-                rc = generic_file_aio_write(iocb, iov, nr_segs, pos);
+                                     CIFS_WRITE_OP)) {
+                rc = __generic_file_aio_write(iocb, iov, nr_segs);
+                mutex_unlock(&inode->i_mutex);
+
+                if (rc > 0) {
+                        ssize_t err;
+
+                        err = generic_write_sync(file, iocb->ki_pos - rc, rc);
+                        if (rc < 0)
+                                rc = err;
+                }
+        } else {
+                mutex_unlock(&inode->i_mutex);
+        }
         up_read(&cinode->lock_sem);
         return rc;
 }
@@ -2727,56 +2740,27 @@ cifs_retry_async_readv(struct cifs_readdata *rdata)
 /**
  * cifs_readdata_to_iov - copy data from pages in response to an iovec
  * @rdata:      the readdata response with list of pages holding data
- * @iov:        vector in which we should copy the data
- * @nr_segs:    number of segments in vector
- * @offset:     offset into file of the first iovec
- * @copied:     used to return the amount of data copied to the iov
+ * @iter:       destination for our data
  *
  * This function copies data from a list of pages in a readdata response into
  * an array of iovecs. It will first calculate where the data should go
  * based on the info in the readdata and then copy the data into that spot.
  */
-static ssize_t
-cifs_readdata_to_iov(struct cifs_readdata *rdata, const struct iovec *iov,
-                        unsigned long nr_segs, loff_t offset, ssize_t *copied)
+static int
+cifs_readdata_to_iov(struct cifs_readdata *rdata, struct iov_iter *iter)
 {
-        int rc = 0;
-        struct iov_iter ii;
-        size_t pos = rdata->offset - offset;
-        ssize_t remaining = rdata->bytes;
-        unsigned char *pdata;
+        size_t remaining = rdata->bytes;
         unsigned int i;
 
-        /* set up iov_iter and advance to the correct offset */
-        iov_iter_init(&ii, iov, nr_segs, iov_length(iov, nr_segs), 0);
-        iov_iter_advance(&ii, pos);
-
-        *copied = 0;
         for (i = 0; i < rdata->nr_pages; i++) {
-                ssize_t copy;
                 struct page *page = rdata->pages[i];
-
-                /* copy a whole page or whatever's left */
-                copy = min_t(ssize_t, remaining, PAGE_SIZE);
-
-                /* ...but limit it to whatever space is left in the iov */
-                copy = min_t(ssize_t, copy, iov_iter_count(&ii));
-
-                /* go while there's data to be copied and no errors */
-                if (copy && !rc) {
-                        pdata = kmap(page);
-                        rc = memcpy_toiovecend(ii.iov, pdata, ii.iov_offset,
-                                                (int)copy);
-                        kunmap(page);
-                        if (!rc) {
-                                *copied += copy;
-                                remaining -= copy;
-                                iov_iter_advance(&ii, copy);
-                        }
-                }
+                size_t copy = min(remaining, PAGE_SIZE);
+                size_t written = copy_page_to_iter(page, 0, copy, iter);
+                remaining -= written;
+                if (written < copy && iov_iter_count(iter) > 0)
+                        break;
         }
-
-        return rc;
+        return remaining ? -EFAULT : 0;
 }
 
 static void
@@ -2837,20 +2821,21 @@ cifs_uncached_read_into_pages(struct TCP_Server_Info *server,
         return total_read > 0 ? total_read : result;
 }
 
-static ssize_t
-cifs_iovec_read(struct file *file, const struct iovec *iov,
-                 unsigned long nr_segs, loff_t *poffset)
+ssize_t cifs_user_readv(struct kiocb *iocb, const struct iovec *iov,
+                               unsigned long nr_segs, loff_t pos)
 {
+        struct file *file = iocb->ki_filp;
         ssize_t rc;
         size_t len, cur_len;
         ssize_t total_read = 0;
-        loff_t offset = *poffset;
+        loff_t offset = pos;
         unsigned int npages;
         struct cifs_sb_info *cifs_sb;
         struct cifs_tcon *tcon;
         struct cifsFileInfo *open_file;
         struct cifs_readdata *rdata, *tmp;
         struct list_head rdata_list;
+        struct iov_iter to;
         pid_t pid;
 
         if (!nr_segs)
@@ -2860,6 +2845,8 @@ cifs_iovec_read(struct file *file, const struct iovec *iov,
         if (!len)
                 return 0;
 
+        iov_iter_init(&to, iov, nr_segs, len, 0);
+
         INIT_LIST_HEAD(&rdata_list);
         cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
         open_file = file->private_data;
@@ -2917,55 +2904,44 @@ error:
         if (!list_empty(&rdata_list))
                 rc = 0;
 
+        len = iov_iter_count(&to);
         /* the loop below should proceed in the order of increasing offsets */
-restart_loop:
         list_for_each_entry_safe(rdata, tmp, &rdata_list, list) {
+        again:
                 if (!rc) {
-                        ssize_t copied;
-
                         /* FIXME: freezable sleep too? */
                         rc = wait_for_completion_killable(&rdata->done);
                         if (rc)
                                 rc = -EINTR;
-                        else if (rdata->result)
+                        else if (rdata->result) {
                                 rc = rdata->result;
-                        else {
-                                rc = cifs_readdata_to_iov(rdata, iov,
-                                                        nr_segs, *poffset,
-                                                        &copied);
-                                total_read += copied;
+                                /* resend call if it's a retryable error */
+                                if (rc == -EAGAIN) {
+                                        rc = cifs_retry_async_readv(rdata);
+                                        goto again;
+                                }
+                        } else {
+                                rc = cifs_readdata_to_iov(rdata, &to);
                         }
 
-                        /* resend call if it's a retryable error */
-                        if (rc == -EAGAIN) {
-                                rc = cifs_retry_async_readv(rdata);
-                                goto restart_loop;
-                        }
                 }
                 list_del_init(&rdata->list);
                 kref_put(&rdata->refcount, cifs_uncached_readdata_release);
         }
 
+        total_read = len - iov_iter_count(&to);
+
         cifs_stats_bytes_read(tcon, total_read);
-        *poffset += total_read;
 
         /* mask nodata case */
         if (rc == -ENODATA)
                 rc = 0;
 
-        return total_read ? total_read : rc;
-}
-
-ssize_t cifs_user_readv(struct kiocb *iocb, const struct iovec *iov,
-                               unsigned long nr_segs, loff_t pos)
-{
-        ssize_t read;
-
-        read = cifs_iovec_read(iocb->ki_filp, iov, nr_segs, &pos);
-        if (read > 0)
-                iocb->ki_pos = pos;
-
-        return read;
+        if (total_read) {
+                iocb->ki_pos = pos + total_read;
+                return total_read;
+        }
+        return rc;
 }
 
 ssize_t
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 3190ca973dd6..1e5b45359509 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -424,7 +424,7 @@ int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)
 }
 
 /* Data available on socket or listen socket received a connect */
-static void lowcomms_data_ready(struct sock *sk, int count_unused)
+static void lowcomms_data_ready(struct sock *sk)
 {
         struct connection *con = sock2con(sk);
         if (con && !test_and_set_bit(CF_READ_PENDING, &con->flags))
diff --git a/fs/exec.c b/fs/exec.c
index 9e81c630dfa7..476f3ebf437e 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -813,7 +813,7 @@ EXPORT_SYMBOL(kernel_read);
 
 ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len)
 {
-        ssize_t res = file->f_op->read(file, (void __user *)addr, len, &pos);
+        ssize_t res = vfs_read(file, (void __user *)addr, len, &pos);
         if (res > 0)
                 flush_icache_range(addr, addr + len);
         return res;
diff --git a/fs/exofs/ore_raid.c b/fs/exofs/ore_raid.c
index 7682b970d0f1..4e2c032ab8a1 100644
--- a/fs/exofs/ore_raid.c
+++ b/fs/exofs/ore_raid.c
@@ -21,12 +21,12 @@
 #undef ORE_DBGMSG2
 #define ORE_DBGMSG2 ORE_DBGMSG
 
-struct page *_raid_page_alloc(void)
+static struct page *_raid_page_alloc(void)
 {
         return alloc_page(GFP_KERNEL);
 }
 
-void _raid_page_free(struct page *p)
+static void _raid_page_free(struct page *p)
 {
         __free_page(p);
 }
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 9d9763328734..ed73ed8ebbee 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -543,7 +543,7 @@ static int exofs_devs_2_odi(struct exofs_dt_device_info *dt_dev,
         return !(odi->systemid_len || odi->osdname_len);
 }
 
-int __alloc_dev_table(struct exofs_sb_info *sbi, unsigned numdevs,
+static int __alloc_dev_table(struct exofs_sb_info *sbi, unsigned numdevs,
                       struct exofs_dev **peds)
 {
         struct __alloc_ore_devs_and_exofs_devs {
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 4e508fc83dcf..ca7502d89fde 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -146,7 +146,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
                         overwrite = 1;
         }
 
-        ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
+        ret = __generic_file_aio_write(iocb, iov, nr_segs);
         mutex_unlock(&inode->i_mutex);
 
         if (ret > 0) {
diff --git a/fs/file.c b/fs/file.c
index b61293badfb1..8f294cfac697 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -25,7 +25,10 @@
 
 int sysctl_nr_open __read_mostly = 1024*1024;
 int sysctl_nr_open_min = BITS_PER_LONG;
-int sysctl_nr_open_max = 1024 * 1024; /* raised later */
+/* our max() is unusable in constant expressions ;-/ */
+#define __const_max(x, y) ((x) < (y) ? (x) : (y))
+int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &
+                         -BITS_PER_LONG;
 
 static void *alloc_fdmem(size_t size)
 {
@@ -429,12 +432,6 @@ void exit_files(struct task_struct *tsk)
         }
 }
 
-void __init files_defer_init(void)
-{
-        sysctl_nr_open_max = min((size_t)INT_MAX, ~(size_t)0/sizeof(void *)) &
-                             -BITS_PER_LONG;
-}
-
 struct files_struct init_files = {
         .count          = ATOMIC_INIT(1),
         .fdt            = &init_files.fdtab,
diff --git a/fs/file_table.c b/fs/file_table.c
index 01071c4d752e..a374f5033e97 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -52,7 +52,6 @@ static void file_free_rcu(struct rcu_head *head)
 static inline void file_free(struct file *f)
 {
         percpu_counter_dec(&nr_files);
-        file_check_state(f);
         call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
 }
 
@@ -178,47 +177,12 @@ struct file *alloc_file(struct path *path, fmode_t mode,
         file->f_mapping = path->dentry->d_inode->i_mapping;
         file->f_mode = mode;
         file->f_op = fop;
-
-        /*
-         * These mounts don't really matter in practice
-         * for r/o bind mounts.  They aren't userspace-
-         * visible.  We do this for consistency, and so
-         * that we can do debugging checks at __fput()
-         */
-        if ((mode & FMODE_WRITE) && !special_file(path->dentry->d_inode->i_mode)) {
-                file_take_write(file);
-                WARN_ON(mnt_clone_write(path->mnt));
-        }
         if ((mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
                 i_readcount_inc(path->dentry->d_inode);
         return file;
 }
 EXPORT_SYMBOL(alloc_file);
 
-/**
- * drop_file_write_access - give up ability to write to a file
- * @file: the file to which we will stop writing
- *
- * This is a central place which will give up the ability
- * to write to @file, along with access to write through
- * its vfsmount.
- */
-static void drop_file_write_access(struct file *file)
-{
-        struct vfsmount *mnt = file->f_path.mnt;
-        struct dentry *dentry = file->f_path.dentry;
-        struct inode *inode = dentry->d_inode;
-
-        put_write_access(inode);
-
-        if (special_file(inode->i_mode))
-                return;
-        if (file_check_writeable(file) != 0)
-                return;
-        __mnt_drop_write(mnt);
-        file_release_write(file);
-}
-
 /* the real guts of fput() - releasing the last reference to file
  */
 static void __fput(struct file *file)
@@ -253,8 +217,10 @@ static void __fput(struct file *file)
         put_pid(file->f_owner.pid);
         if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
                 i_readcount_dec(inode);
-        if (file->f_mode & FMODE_WRITE)
-                drop_file_write_access(file);
+        if (file->f_mode & FMODE_WRITER) {
+                put_write_access(inode);
+                __mnt_drop_write(mnt);
+        }
         file->f_path.dentry = NULL;
         file->f_path.mnt = NULL;
         file->f_inode = NULL;
@@ -359,6 +325,5 @@ void __init files_init(unsigned long mempages)
 
         n = (mempages * (PAGE_SIZE / 1024)) / 10;
         files_stat.max_files = max_t(unsigned long, n, NR_FILE);
-        files_defer_init();
         percpu_counter_init(&nr_files, 0);
 } 
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 0a648bb455ae..aac71ce373e4 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -667,15 +667,15 @@ static void fuse_copy_finish(struct fuse_copy_state *cs)
                 struct pipe_buffer *buf = cs->currbuf;
 
                 if (!cs->write) {
-                        buf->ops->unmap(cs->pipe, buf, cs->mapaddr);
+                        kunmap_atomic(cs->mapaddr);
                 } else {
-                        kunmap(buf->page);
+                        kunmap_atomic(cs->mapaddr);
                         buf->len = PAGE_SIZE - cs->len;
                 }
                 cs->currbuf = NULL;
                 cs->mapaddr = NULL;
         } else if (cs->mapaddr) {
-                kunmap(cs->pg);
+                kunmap_atomic(cs->mapaddr);
                 if (cs->write) {
                         flush_dcache_page(cs->pg);
                         set_page_dirty_lock(cs->pg);
@@ -706,7 +706,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
 
                         BUG_ON(!cs->nr_segs);
                         cs->currbuf = buf;
-                        cs->mapaddr = buf->ops->map(cs->pipe, buf, 0);
+                        cs->mapaddr = kmap_atomic(buf->page);
                         cs->len = buf->len;
                         cs->buf = cs->mapaddr + buf->offset;
                         cs->pipebufs++;
@@ -726,7 +726,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
                         buf->len = 0;
 
                         cs->currbuf = buf;
-                        cs->mapaddr = kmap(page);
+                        cs->mapaddr = kmap_atomic(page);
                         cs->buf = cs->mapaddr;
                         cs->len = PAGE_SIZE;
                         cs->pipebufs++;
@@ -745,7 +745,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
                         return err;
                 BUG_ON(err != 1);
                 offset = cs->addr % PAGE_SIZE;
-                cs->mapaddr = kmap(cs->pg);
+                cs->mapaddr = kmap_atomic(cs->pg);
                 cs->buf = cs->mapaddr + offset;
                 cs->len = min(PAGE_SIZE - offset, cs->seglen);
                 cs->seglen -= cs->len;
@@ -874,7 +874,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
 out_fallback_unlock:
         unlock_page(newpage);
 out_fallback:
-        cs->mapaddr = buf->ops->map(cs->pipe, buf, 1);
+        cs->mapaddr = kmap_atomic(buf->page);
         cs->buf = cs->mapaddr + buf->offset;
 
         err = lock_request(cs->fc, cs->req);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 48992cac714b..13f8bdec5110 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1086,9 +1086,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
                 if (mapping_writably_mapped(mapping))
                         flush_dcache_page(page);
 
-                pagefault_disable();
                 tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes);
-                pagefault_enable();
                 flush_dcache_page(page);
 
                 mark_page_accessed(page);
@@ -1237,8 +1235,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                 goto out;
 
         if (file->f_flags & O_DIRECT) {
-                written = generic_file_direct_write(iocb, iov, &nr_segs,
-                                                    pos, &iocb->ki_pos,
+                written = generic_file_direct_write(iocb, iov, &nr_segs, pos, 
                                                     count, ocount);
                 if (written < 0 || written == count)
                         goto out;
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 10d6c41aecad..6bf06a07f3e0 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -235,6 +235,7 @@ out_err:
         if (warned++ == 0)
                 printk(KERN_WARNING
                         "lockd_up: makesock failed, error=%d\n", err);
+        svc_shutdown_net(serv, net);
         return err;
 }
 
diff --git a/fs/mount.h b/fs/mount.h
index b29e42f05f34..d55297f2fa05 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -10,7 +10,7 @@ struct mnt_namespace {
         struct user_namespace   *user_ns;
         u64                     seq;    /* Sequence number to prevent loops */
         wait_queue_head_t poll;
-        int event;
+        u64 event;
 };
 
 struct mnt_pcp {
@@ -104,6 +104,9 @@ struct proc_mounts {
         struct mnt_namespace *ns;
         struct path root;
         int (*show)(struct seq_file *, struct vfsmount *);
+        void *cached_mount;
+        u64 cached_event;
+        loff_t cached_index;
 };
 
 #define proc_mounts(p) (container_of((p), struct proc_mounts, m))
diff --git a/fs/namei.c b/fs/namei.c
index 88339f59efb5..c6157c894fce 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -358,6 +358,7 @@ int generic_permission(struct inode *inode, int mask)
 
         return -EACCES;
 }
+EXPORT_SYMBOL(generic_permission);
 
 /*
  * We _really_ want to just do "generic_permission()" without
@@ -455,6 +456,7 @@ int inode_permission(struct inode *inode, int mask)
                 return retval;
         return __inode_permission(inode, mask);
 }
+EXPORT_SYMBOL(inode_permission);
 
 /**
  * path_get - get a reference to a path
@@ -924,6 +926,7 @@ int follow_up(struct path *path)
         path->mnt = &parent->mnt;
         return 1;
 }
+EXPORT_SYMBOL(follow_up);
 
 /*
  * Perform an automount
@@ -1085,6 +1088,7 @@ int follow_down_one(struct path *path)
         }
         return 0;
 }
+EXPORT_SYMBOL(follow_down_one);
 
 static inline bool managed_dentry_might_block(struct dentry *dentry)
 {
@@ -1223,6 +1227,7 @@ int follow_down(struct path *path)
         }
         return 0;
 }
+EXPORT_SYMBOL(follow_down);
 
 /*
  * Skip to top of mountpoint pile in refwalk mode for follow_dotdot()
@@ -2025,6 +2030,7 @@ int kern_path(const char *name, unsigned int flags, struct path *path)
                 *path = nd.path;
         return res;
 }
+EXPORT_SYMBOL(kern_path);
 
 /**
  * vfs_path_lookup - lookup a file path relative to a dentry-vfsmount pair
@@ -2049,6 +2055,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
                 *path = nd.path;
         return err;
 }
+EXPORT_SYMBOL(vfs_path_lookup);
 
 /*
  * Restricted form of lookup. Doesn't follow links, single-component only,
@@ -2111,6 +2118,7 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
 
         return __lookup_hash(&this, base, 0);
 }
+EXPORT_SYMBOL(lookup_one_len);
 
 int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
                  struct path *path, int *empty)
@@ -2135,6 +2143,7 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
 {
         return user_path_at_empty(dfd, name, flags, path, NULL);
 }
+EXPORT_SYMBOL(user_path_at);
 
 /*
  * NB: most callers don't do anything directly with the reference to the
@@ -2477,6 +2486,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
         mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD);
         return NULL;
 }
+EXPORT_SYMBOL(lock_rename);
 
 void unlock_rename(struct dentry *p1, struct dentry *p2)
 {
@@ -2486,6 +2496,7 @@ void unlock_rename(struct dentry *p1, struct dentry *p2)
                 mutex_unlock(&p1->d_inode->i_sb->s_vfs_rename_mutex);
         }
 }
+EXPORT_SYMBOL(unlock_rename);
 
 int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
                 bool want_excl)
@@ -2506,6 +2517,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
                 fsnotify_create(dir, dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_create);
 
 static int may_open(struct path *path, int acc_mode, int flag)
 {
@@ -3375,6 +3387,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
                 fsnotify_create(dir, dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_mknod);
 
 static int may_mknod(umode_t mode)
 {
@@ -3464,6 +3477,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
                 fsnotify_mkdir(dir, dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_mkdir);
 
 SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
 {
@@ -3518,6 +3532,7 @@ void dentry_unhash(struct dentry *dentry)
                 __d_drop(dentry);
         spin_unlock(&dentry->d_lock);
 }
+EXPORT_SYMBOL(dentry_unhash);
 
 int vfs_rmdir(struct inode *dir, struct dentry *dentry)
 {
@@ -3555,6 +3570,7 @@ out:
                 d_delete(dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_rmdir);
 
 static long do_rmdir(int dfd, const char __user *pathname)
 {
@@ -3672,6 +3688,7 @@ out:
 
         return error;
 }
+EXPORT_SYMBOL(vfs_unlink);
 
 /*
  * Make sure that the actual truncation of the file will occur outside its
@@ -3785,6 +3802,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
                 fsnotify_create(dir, dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_symlink);
 
 SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
                 int, newdfd, const char __user *, newname)
@@ -3893,6 +3911,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
                 fsnotify_link(dir, inode, new_dentry);
         return error;
 }
+EXPORT_SYMBOL(vfs_link);
 
 /*
  * Hardlinks are often used in delicate situations.  We avoid
@@ -4152,6 +4171,7 @@ out:
 
         return error;
 }
+EXPORT_SYMBOL(vfs_rename);
 
 SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,
                 int, newdfd, const char __user *, newname, unsigned int, flags)
@@ -4304,11 +4324,9 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
         return sys_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
 }
 
-int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
+int readlink_copy(char __user *buffer, int buflen, const char *link)
 {
-        int len;
-
-        len = PTR_ERR(link);
+        int len = PTR_ERR(link);
         if (IS_ERR(link))
                 goto out;
 
@@ -4320,6 +4338,7 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
 out:
         return len;
 }
+EXPORT_SYMBOL(readlink_copy);
 
 /*
  * A helper for ->readlink().  This should be used *ONLY* for symlinks that
@@ -4337,11 +4356,12 @@ int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen)
         if (IS_ERR(cookie))
                 return PTR_ERR(cookie);
 
-        res = vfs_readlink(dentry, buffer, buflen, nd_get_link(&nd));
+        res = readlink_copy(buffer, buflen, nd_get_link(&nd));
         if (dentry->d_inode->i_op->put_link)
                 dentry->d_inode->i_op->put_link(dentry, &nd, cookie);
         return res;
 }
+EXPORT_SYMBOL(generic_readlink);
 
 /* get the link contents into pagecache */
 static char *page_getlink(struct dentry * dentry, struct page **ppage)
@@ -4361,14 +4381,14 @@ static char *page_getlink(struct dentry * dentry, struct page **ppage)
 int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)
 {
         struct page *page = NULL;
-        char *s = page_getlink(dentry, &page);
-        int res = vfs_readlink(dentry,buffer,buflen,s);
+        int res = readlink_copy(buffer, buflen, page_getlink(dentry, &page));
         if (page) {
                 kunmap(page);
                 page_cache_release(page);
         }
         return res;
 }
+EXPORT_SYMBOL(page_readlink);
 
 void *page_follow_link_light(struct dentry *dentry, struct nameidata *nd)
 {
@@ -4376,6 +4396,7 @@ void *page_follow_link_light(struct dentry *dentry, struct nameidata *nd)
         nd_set_link(nd, page_getlink(dentry, &page));
         return page;
 }
+EXPORT_SYMBOL(page_follow_link_light);
 
 void page_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
 {
@@ -4386,6 +4407,7 @@ void page_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
                 page_cache_release(page);
         }
 }
+EXPORT_SYMBOL(page_put_link);
 
 /*
  * The nofs argument instructs pagecache_write_begin to pass AOP_FLAG_NOFS
@@ -4423,45 +4445,18 @@ retry:
 fail:
         return err;
 }
+EXPORT_SYMBOL(__page_symlink);
 
 int page_symlink(struct inode *inode, const char *symname, int len)
 {
         return __page_symlink(inode, symname, len,
                         !(mapping_gfp_mask(inode->i_mapping) & __GFP_FS));
 }
+EXPORT_SYMBOL(page_symlink);
 
 const struct inode_operations page_symlink_inode_operations = {
         .readlink       = generic_readlink,
         .follow_link    = page_follow_link_light,
         .put_link       = page_put_link,
 };
-
-EXPORT_SYMBOL(user_path_at);
-EXPORT_SYMBOL(follow_down_one);
-EXPORT_SYMBOL(follow_down);
-EXPORT_SYMBOL(follow_up);
-EXPORT_SYMBOL(get_write_access); /* nfsd */
-EXPORT_SYMBOL(lock_rename);
-EXPORT_SYMBOL(lookup_one_len);
-EXPORT_SYMBOL(page_follow_link_light);
-EXPORT_SYMBOL(page_put_link);
-EXPORT_SYMBOL(page_readlink);
-EXPORT_SYMBOL(__page_symlink);
-EXPORT_SYMBOL(page_symlink);
 EXPORT_SYMBOL(page_symlink_inode_operations);
-EXPORT_SYMBOL(kern_path);
-EXPORT_SYMBOL(vfs_path_lookup);
-EXPORT_SYMBOL(inode_permission);
-EXPORT_SYMBOL(unlock_rename);
-EXPORT_SYMBOL(vfs_create);
-EXPORT_SYMBOL(vfs_link);
-EXPORT_SYMBOL(vfs_mkdir);
-EXPORT_SYMBOL(vfs_mknod);
-EXPORT_SYMBOL(generic_permission);
-EXPORT_SYMBOL(vfs_readlink);
-EXPORT_SYMBOL(vfs_rename);
-EXPORT_SYMBOL(vfs_rmdir);
-EXPORT_SYMBOL(vfs_symlink);
-EXPORT_SYMBOL(vfs_unlink);
-EXPORT_SYMBOL(dentry_unhash);
-EXPORT_SYMBOL(generic_readlink);
diff --git a/fs/namespace.c b/fs/namespace.c
index 2ffc5a2905d4..182bc41cd887 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -52,7 +52,7 @@ static int __init set_mphash_entries(char *str)
 }
 __setup("mphash_entries=", set_mphash_entries);
 
-static int event;
+static u64 event;
 static DEFINE_IDA(mnt_id_ida);
 static DEFINE_IDA(mnt_group_ida);
 static DEFINE_SPINLOCK(mnt_id_lock);
@@ -414,9 +414,7 @@ EXPORT_SYMBOL_GPL(mnt_clone_write);
  */
 int __mnt_want_write_file(struct file *file)
 {
-        struct inode *inode = file_inode(file);
-
-        if (!(file->f_mode & FMODE_WRITE) || special_file(inode->i_mode))
+        if (!(file->f_mode & FMODE_WRITER))
                 return __mnt_want_write(file->f_path.mnt);
         else
                 return mnt_clone_write(file->f_path.mnt);
@@ -570,13 +568,17 @@ int sb_prepare_remount_readonly(struct super_block *sb)
 static void free_vfsmnt(struct mount *mnt)
 {
         kfree(mnt->mnt_devname);
-        mnt_free_id(mnt);
 #ifdef CONFIG_SMP
         free_percpu(mnt->mnt_pcp);
 #endif
         kmem_cache_free(mnt_cache, mnt);
 }
 
+static void delayed_free_vfsmnt(struct rcu_head *head)
+{
+        free_vfsmnt(container_of(head, struct mount, mnt_rcu));
+}
+
 /* call under rcu_read_lock */
 bool legitimize_mnt(struct vfsmount *bastard, unsigned seq)
 {
@@ -848,6 +850,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
 
         root = mount_fs(type, flags, name, data);
         if (IS_ERR(root)) {
+                mnt_free_id(mnt);
                 free_vfsmnt(mnt);
                 return ERR_CAST(root);
         }
@@ -885,7 +888,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
                         goto out_free;
         }
 
-        mnt->mnt.mnt_flags = old->mnt.mnt_flags & ~MNT_WRITE_HOLD;
+        mnt->mnt.mnt_flags = old->mnt.mnt_flags & ~(MNT_WRITE_HOLD|MNT_MARKED);
         /* Don't allow unprivileged users to change mount flags */
         if ((flag & CL_UNPRIVILEGED) && (mnt->mnt.mnt_flags & MNT_READONLY))
                 mnt->mnt.mnt_flags |= MNT_LOCK_READONLY;
@@ -928,20 +931,11 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
         return mnt;
 
  out_free:
+        mnt_free_id(mnt);
         free_vfsmnt(mnt);
         return ERR_PTR(err);
 }
 
-static void delayed_free(struct rcu_head *head)
-{
-        struct mount *mnt = container_of(head, struct mount, mnt_rcu);
-        kfree(mnt->mnt_devname);
-#ifdef CONFIG_SMP
-        free_percpu(mnt->mnt_pcp);
-#endif
-        kmem_cache_free(mnt_cache, mnt);
-}
-
 static void mntput_no_expire(struct mount *mnt)
 {
 put_again:
@@ -991,7 +985,7 @@ put_again:
         dput(mnt->mnt.mnt_root);
         deactivate_super(mnt->mnt.mnt_sb);
         mnt_free_id(mnt);
-        call_rcu(&mnt->mnt_rcu, delayed_free);
+        call_rcu(&mnt->mnt_rcu, delayed_free_vfsmnt);
 }
 
 void mntput(struct vfsmount *mnt)
@@ -1100,14 +1094,29 @@ static void *m_start(struct seq_file *m, loff_t *pos)
         struct proc_mounts *p = proc_mounts(m);
 
         down_read(&namespace_sem);
-        return seq_list_start(&p->ns->list, *pos);
+        if (p->cached_event == p->ns->event) {
+                void *v = p->cached_mount;
+                if (*pos == p->cached_index)
+                        return v;
+                if (*pos == p->cached_index + 1) {
+                        v = seq_list_next(v, &p->ns->list, &p->cached_index);
+                        return p->cached_mount = v;
+                }
+        }
+
+        p->cached_event = p->ns->event;
+        p->cached_mount = seq_list_start(&p->ns->list, *pos);
+        p->cached_index = *pos;
+        return p->cached_mount;
 }
 
 static void *m_next(struct seq_file *m, void *v, loff_t *pos)
 {
         struct proc_mounts *p = proc_mounts(m);
 
-        return seq_list_next(v, &p->ns->list, pos);
+        p->cached_mount = seq_list_next(v, &p->ns->list, pos);
+        p->cached_index = *pos;
+        return p->cached_mount;
 }
 
 static void m_stop(struct seq_file *m, void *v)
@@ -1661,9 +1670,9 @@ static int attach_recursive_mnt(struct mount *source_mnt,
                 if (err)
                         goto out;
                 err = propagate_mnt(dest_mnt, dest_mp, source_mnt, &tree_list);
+                lock_mount_hash();
                 if (err)
                         goto out_cleanup_ids;
-                lock_mount_hash();
                 for (p = source_mnt; p; p = next_mnt(p, source_mnt))
                         set_mnt_shared(p);
         } else {
@@ -1690,6 +1699,11 @@ static int attach_recursive_mnt(struct mount *source_mnt,
         return 0;
 
  out_cleanup_ids:
+        while (!hlist_empty(&tree_list)) {
+                child = hlist_entry(tree_list.first, struct mount, mnt_hash);
+                umount_tree(child, 0);
+        }
+        unlock_mount_hash();
         cleanup_group_ids(source_mnt, NULL);
  out:
         return err;
@@ -2044,7 +2058,7 @@ static int do_add_mount(struct mount *newmnt, struct path *path, int mnt_flags)
         struct mount *parent;
         int err;
 
-        mnt_flags &= ~(MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | MNT_DOOMED | MNT_SYNC_UMOUNT);
+        mnt_flags &= ~MNT_INTERNAL_FLAGS;
 
         mp = lock_mount(path);
         if (IS_ERR(mp))
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index c320ac52353e..08b8ea8c353e 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -339,7 +339,7 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
         if (val)
                 goto finished;
 
-        DDPRINTK("ncp_lookup_validate: %pd2 not valid, age=%ld, server lookup\n",
+        ncp_dbg(2, "%pd2 not valid, age=%ld, server lookup\n",
                 dentry, NCP_GET_AGE(dentry));
 
         len = sizeof(__name);
@@ -358,7 +358,7 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
                         res = ncp_obtain_info(server, dir, __name, &(finfo.i));
         }
         finfo.volume = finfo.i.volNumber;
-        DDPRINTK("ncp_lookup_validate: looked for %pd/%s, res=%d\n",
+        ncp_dbg(2, "looked for %pd/%s, res=%d\n",
                 dentry->d_parent, __name, res);
         /*
          * If we didn't find it, or if it has a different dirEntNum to
@@ -372,14 +372,14 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
                         ncp_new_dentry(dentry);
                         val=1;
                 } else
-                        DDPRINTK("ncp_lookup_validate: found, but dirEntNum changed\n");
+                        ncp_dbg(2, "found, but dirEntNum changed\n");
 
                 ncp_update_inode2(inode, &finfo);
                 mutex_unlock(&inode->i_mutex);
         }
 
 finished:
-        DDPRINTK("ncp_lookup_validate: result=%d\n", val);
+        ncp_dbg(2, "result=%d\n", val);
         dput(parent);
         return val;
 }
@@ -453,8 +453,7 @@ static int ncp_readdir(struct file *file, struct dir_context *ctx)
         ctl.page  = NULL;
         ctl.cache = NULL;
 
-        DDPRINTK("ncp_readdir: reading %pD2, pos=%d\n", file,
-                (int) ctx->pos);
+        ncp_dbg(2, "reading %pD2, pos=%d\n", file, (int)ctx->pos);
 
         result = -EIO;
         /* Do not generate '.' and '..' when server is dead. */
@@ -697,8 +696,7 @@ ncp_read_volume_list(struct file *file, struct dir_context *ctx,
         struct ncp_entry_info entry;
         int i;
 
-        DPRINTK("ncp_read_volume_list: pos=%ld\n",
-                        (unsigned long) ctx->pos);
+        ncp_dbg(1, "pos=%ld\n", (unsigned long)ctx->pos);
 
         for (i = 0; i < NCP_NUMBER_OF_VOLUMES; i++) {
                 int inval_dentry;
@@ -708,12 +706,11 @@ ncp_read_volume_list(struct file *file, struct dir_context *ctx,
                 if (!strlen(info.volume_name))
                         continue;
 
-                DPRINTK("ncp_read_volume_list: found vol: %s\n",
-                        info.volume_name);
+                ncp_dbg(1, "found vol: %s\n", info.volume_name);
 
                 if (ncp_lookup_volume(server, info.volume_name,
                                         &entry.i)) {
-                        DPRINTK("ncpfs: could not lookup vol %s\n",
+                        ncp_dbg(1, "could not lookup vol %s\n",
                                 info.volume_name);
                         continue;
                 }
@@ -738,14 +735,13 @@ ncp_do_readdir(struct file *file, struct dir_context *ctx,
         int more;
         size_t bufsize;
 
-        DPRINTK("ncp_do_readdir: %pD2, fpos=%ld\n", file,
-                (unsigned long) ctx->pos);
-        PPRINTK("ncp_do_readdir: init %pD, volnum=%d, dirent=%u\n",
-                file, NCP_FINFO(dir)->volNumber, NCP_FINFO(dir)->dirEntNum);
+        ncp_dbg(1, "%pD2, fpos=%ld\n", file, (unsigned long)ctx->pos);
+        ncp_vdbg("init %pD, volnum=%d, dirent=%u\n",
+                 file, NCP_FINFO(dir)->volNumber, NCP_FINFO(dir)->dirEntNum);
 
         err = ncp_initialize_search(server, dir, &seq);
         if (err) {
-                DPRINTK("ncp_do_readdir: init failed, err=%d\n", err);
+                ncp_dbg(1, "init failed, err=%d\n", err);
                 return;
         }
         /* We MUST NOT use server->buffer_size handshaked with server if we are
@@ -808,8 +804,7 @@ int ncp_conn_logged_in(struct super_block *sb)
                         goto out;
                 result = -ENOENT;
                 if (ncp_get_volume_root(server, __name, &volNumber, &dirEntNum, &DosDirNum)) {
-                        PPRINTK("ncp_conn_logged_in: %s not found\n",
-                                server->m.mounted_vol);
+                        ncp_vdbg("%s not found\n", server->m.mounted_vol);
                         goto out;
                 }
                 dent = sb->s_root;
@@ -822,10 +817,10 @@ int ncp_conn_logged_in(struct super_block *sb)
                                 NCP_FINFO(ino)->DosDirNum = DosDirNum;
                                 result = 0;
                         } else {
-                                DPRINTK("ncpfs: sb->s_root->d_inode == NULL!\n");
+                                ncp_dbg(1, "sb->s_root->d_inode == NULL!\n");
                         }
                 } else {
-                        DPRINTK("ncpfs: sb->s_root == NULL!\n");
+                        ncp_dbg(1, "sb->s_root == NULL!\n");
                 }
         } else
                 result = 0;
@@ -846,7 +841,7 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, unsig
         if (!ncp_conn_valid(server))
                 goto finished;
 
-        PPRINTK("ncp_lookup: server lookup for %pd2\n", dentry);
+        ncp_vdbg("server lookup for %pd2\n", dentry);
 
         len = sizeof(__name);
         if (ncp_is_server_root(dir)) {
@@ -854,15 +849,15 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, unsig
                                  dentry->d_name.len, 1);
                 if (!res)
                         res = ncp_lookup_volume(server, __name, &(finfo.i));
-                        if (!res)
-                                ncp_update_known_namespace(server, finfo.i.volNumber, NULL);
+                if (!res)
+                        ncp_update_known_namespace(server, finfo.i.volNumber, NULL);
         } else {
                 res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
                                  dentry->d_name.len, !ncp_preserve_case(dir));
                 if (!res)
                         res = ncp_obtain_info(server, dir, __name, &(finfo.i));
         }
-        PPRINTK("ncp_lookup: looked for %pd2, res=%d\n", dentry, res);
+        ncp_vdbg("looked for %pd2, res=%d\n", dentry, res);
         /*
          * If we didn't find an entry, make a negative dentry.
          */
@@ -886,7 +881,7 @@ add_entry:
         }
 
 finished:
-        PPRINTK("ncp_lookup: result=%d\n", error);
+        ncp_vdbg("result=%d\n", error);
         return ERR_PTR(error);
 }
 
@@ -909,7 +904,7 @@ out:
         return error;
 
 out_close:
-        PPRINTK("ncp_instantiate: %pd2 failed, closing file\n", dentry);
+        ncp_vdbg("%pd2 failed, closing file\n", dentry);
         ncp_close_file(NCP_SERVER(dir), finfo->file_handle);
         goto out;
 }
@@ -923,7 +918,7 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, umode_t mode,
         int opmode;
         __u8 __name[NCP_MAXPATHLEN + 1];
         
-        PPRINTK("ncp_create_new: creating %pd2, mode=%hx\n", dentry, mode);
+        ncp_vdbg("creating %pd2, mode=%hx\n", dentry, mode);
 
         ncp_age_dentry(server, dentry);
         len = sizeof(__name);
@@ -952,7 +947,7 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, umode_t mode,
                                 error = -ENAMETOOLONG;
                         else if (result < 0)
                                 error = result;
-                        DPRINTK("ncp_create: %pd2 failed\n", dentry);
+                        ncp_dbg(1, "%pd2 failed\n", dentry);
                         goto out;
                 }
                 opmode = O_WRONLY;
@@ -985,7 +980,7 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
         int error, len;
         __u8 __name[NCP_MAXPATHLEN + 1];
 
-        DPRINTK("ncp_mkdir: making %pd2\n", dentry);
+        ncp_dbg(1, "making %pd2\n", dentry);
 
         ncp_age_dentry(server, dentry);
         len = sizeof(__name);
@@ -1022,7 +1017,7 @@ static int ncp_rmdir(struct inode *dir, struct dentry *dentry)
         int error, result, len;
         __u8 __name[NCP_MAXPATHLEN + 1];
 
-        DPRINTK("ncp_rmdir: removing %pd2\n", dentry);
+        ncp_dbg(1, "removing %pd2\n", dentry);
 
         len = sizeof(__name);
         error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
@@ -1067,13 +1062,13 @@ static int ncp_unlink(struct inode *dir, struct dentry *dentry)
         int error;
 
         server = NCP_SERVER(dir);
-        DPRINTK("ncp_unlink: unlinking %pd2\n", dentry);
+        ncp_dbg(1, "unlinking %pd2\n", dentry);
         
         /*
          * Check whether to close the file ...
          */
         if (inode) {
-                PPRINTK("ncp_unlink: closing file\n");
+                ncp_vdbg("closing file\n");
                 ncp_make_closed(inode);
         }
 
@@ -1087,7 +1082,7 @@ static int ncp_unlink(struct inode *dir, struct dentry *dentry)
 #endif
         switch (error) {
                 case 0x00:
-                        DPRINTK("ncp: removed %pd2\n", dentry);
+                        ncp_dbg(1, "removed %pd2\n", dentry);
                         break;
                 case 0x85:
                 case 0x8A:
@@ -1120,7 +1115,7 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
         int old_len, new_len;
         __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
 
-        DPRINTK("ncp_rename: %pd2 to %pd2\n", old_dentry, new_dentry);
+        ncp_dbg(1, "%pd2 to %pd2\n", old_dentry, new_dentry);
 
         ncp_age_dentry(server, old_dentry);
         ncp_age_dentry(server, new_dentry);
@@ -1150,8 +1145,8 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
 #endif
         switch (error) {
                 case 0x00:
-                        DPRINTK("ncp renamed %pd -> %pd.\n",
-                                old_dentry, new_dentry);
+                        ncp_dbg(1, "renamed %pd -> %pd\n",
+                                old_dentry, new_dentry);
                         break;
                 case 0x9E:
                         error = -ENAMETOOLONG;
@@ -1173,7 +1168,7 @@ static int ncp_mknod(struct inode * dir, struct dentry *dentry,
         if (!new_valid_dev(rdev))
                 return -EINVAL;
         if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) {
-                DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%ho\n", mode);
+                ncp_dbg(1, "mode = 0%ho\n", mode);
                 return ncp_create_new(dir, dentry, mode, rdev, 0);
         }
         return -EPERM; /* Strange, but true */
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 8f5074e1ecb9..77640a8bfb87 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -6,6 +6,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <asm/uaccess.h>
 
 #include <linux/time.h>
@@ -34,11 +36,11 @@ int ncp_make_open(struct inode *inode, int right)
 
         error = -EINVAL;
         if (!inode) {
-                printk(KERN_ERR "ncp_make_open: got NULL inode\n");
+                pr_err("%s: got NULL inode\n", __func__);
                 goto out;
         }
 
-        DPRINTK("ncp_make_open: opened=%d, volume # %u, dir entry # %u\n",
+        ncp_dbg(1, "opened=%d, volume # %u, dir entry # %u\n",
                 atomic_read(&NCP_FINFO(inode)->opened), 
                 NCP_FINFO(inode)->volNumber, 
                 NCP_FINFO(inode)->dirEntNum);
@@ -71,7 +73,7 @@ int ncp_make_open(struct inode *inode, int right)
                                 break;
                 }
                 if (result) {
-                        PPRINTK("ncp_make_open: failed, result=%d\n", result);
+                        ncp_vdbg("failed, result=%d\n", result);
                         goto out_unlock;
                 }
                 /*
@@ -83,7 +85,7 @@ int ncp_make_open(struct inode *inode, int right)
         }
 
         access = NCP_FINFO(inode)->access;
-        PPRINTK("ncp_make_open: file open, access=%x\n", access);
+        ncp_vdbg("file open, access=%x\n", access);
         if (access == right || access == O_RDWR) {
                 atomic_inc(&NCP_FINFO(inode)->opened);
                 error = 0;
@@ -107,7 +109,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         void* freepage;
         size_t freelen;
 
-        DPRINTK("ncp_file_read: enter %pd2\n", dentry);
+        ncp_dbg(1, "enter %pd2\n", dentry);
 
         pos = *ppos;
 
@@ -124,7 +126,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 
         error = ncp_make_open(inode, O_RDONLY);
         if (error) {
-                DPRINTK(KERN_ERR "ncp_file_read: open failed, error=%d\n", error);
+                ncp_dbg(1, "open failed, error=%d\n", error);
                 return error;
         }
 
@@ -165,7 +167,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 
         file_accessed(file);
 
-        DPRINTK("ncp_file_read: exit %pd2\n", dentry);
+        ncp_dbg(1, "exit %pd2\n", dentry);
 outrel:
         ncp_inode_close(inode);         
         return already_read ? already_read : error;
@@ -182,7 +184,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
         int errno;
         void* bouncebuffer;
 
-        DPRINTK("ncp_file_write: enter %pd2\n", dentry);
+        ncp_dbg(1, "enter %pd2\n", dentry);
         if ((ssize_t) count < 0)
                 return -EINVAL;
         pos = *ppos;
@@ -211,7 +213,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
                 return 0;
         errno = ncp_make_open(inode, O_WRONLY);
         if (errno) {
-                DPRINTK(KERN_ERR "ncp_file_write: open failed, error=%d\n", errno);
+                ncp_dbg(1, "open failed, error=%d\n", errno);
                 return errno;
         }
         bufsize = NCP_SERVER(inode)->buffer_size;
@@ -261,7 +263,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
                         i_size_write(inode, pos);
                 mutex_unlock(&inode->i_mutex);
         }
-        DPRINTK("ncp_file_write: exit %pd2\n", dentry);
+        ncp_dbg(1, "exit %pd2\n", dentry);
 outrel:
         ncp_inode_close(inode);         
         return already_written ? already_written : errno;
@@ -269,7 +271,7 @@ outrel:
 
 static int ncp_release(struct inode *inode, struct file *file) {
         if (ncp_make_closed(inode)) {
-                DPRINTK("ncp_release: failed to close\n");
+                ncp_dbg(1, "failed to close\n");
         }
         return 0;
 }
diff --git a/fs/ncpfs/getopt.c b/fs/ncpfs/getopt.c
index 0af3349de851..03ffde1f44d6 100644
--- a/fs/ncpfs/getopt.c
+++ b/fs/ncpfs/getopt.c
@@ -2,6 +2,8 @@
  * getopt.c
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 
@@ -46,8 +48,8 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
                                 if (opts->has_arg & OPT_NOPARAM) {
                                         return opts->val;
                                 }
-                                printk(KERN_INFO "%s: the %s option requires an argument\n",
-                                       caller, token);
+                                pr_info("%s: the %s option requires an argument\n",
+                                        caller, token);
                                 return -EINVAL;
                         }
                         if (opts->has_arg & OPT_INT) {
@@ -57,18 +59,18 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
                                 if (!*v) {
                                         return opts->val;
                                 }
-                                printk(KERN_INFO "%s: invalid numeric value in %s=%s\n",
+                                pr_info("%s: invalid numeric value in %s=%s\n",
                                         caller, token, val);
                                 return -EDOM;
                         }
                         if (opts->has_arg & OPT_STRING) {
                                 return opts->val;
                         }
-                        printk(KERN_INFO "%s: unexpected argument %s to the %s option\n",
+                        pr_info("%s: unexpected argument %s to the %s option\n",
                                 caller, val, token);
                         return -EINVAL;
                 }
         }
-        printk(KERN_INFO "%s: Unrecognized mount option %s\n", caller, token);
+        pr_info("%s: Unrecognized mount option %s\n", caller, token);
         return -EOPNOTSUPP;
 }
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 647d86d2db39..e31e589369a4 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 
 #include <asm/uaccess.h>
@@ -133,7 +135,7 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo)
         NCP_FINFO(inode)->access = nwinfo->access;
         memcpy(NCP_FINFO(inode)->file_handle, nwinfo->file_handle,
                         sizeof(nwinfo->file_handle));
-        DPRINTK("ncp_update_inode: updated %s, volnum=%d, dirent=%u\n",
+        ncp_dbg(1, "updated %s, volnum=%d, dirent=%u\n",
                 nwinfo->i.entryName, NCP_FINFO(inode)->volNumber,
                 NCP_FINFO(inode)->dirEntNum);
 }
@@ -141,8 +143,7 @@ void ncp_update_inode(struct inode *inode, struct ncp_entry_info *nwinfo)
 static void ncp_update_dates(struct inode *inode, struct nw_info_struct *nwi)
 {
         /* NFS namespace mode overrides others if it's set. */
-        DPRINTK(KERN_DEBUG "ncp_update_dates_and_mode: (%s) nfs.mode=0%o\n",
-                nwi->entryName, nwi->nfs.mode);
+        ncp_dbg(1, "(%s) nfs.mode=0%o\n", nwi->entryName, nwi->nfs.mode);
         if (nwi->nfs.mode) {
                 /* XXX Security? */
                 inode->i_mode = nwi->nfs.mode;
@@ -230,7 +231,7 @@ static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo)
         
         ncp_update_attrs(inode, nwinfo);
 
-        DDPRINTK("ncp_read_inode: inode->i_mode = %u\n", inode->i_mode);
+        ncp_dbg(2, "inode->i_mode = %u\n", inode->i_mode);
 
         set_nlink(inode, 1);
         inode->i_uid = server->m.uid;
@@ -258,7 +259,7 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info)
         struct inode *inode;
 
         if (info == NULL) {
-                printk(KERN_ERR "ncp_iget: info is NULL\n");
+                pr_err("%s: info is NULL\n", __func__);
                 return NULL;
         }
 
@@ -290,7 +291,7 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info)
                 }
                 insert_inode_hash(inode);
         } else
-                printk(KERN_ERR "ncp_iget: iget failed!\n");
+                pr_err("%s: iget failed!\n", __func__);
         return inode;
 }
 
@@ -301,12 +302,12 @@ ncp_evict_inode(struct inode *inode)
         clear_inode(inode);
 
         if (S_ISDIR(inode->i_mode)) {
-                DDPRINTK("ncp_evict_inode: put directory %ld\n", inode->i_ino);
+                ncp_dbg(2, "put directory %ld\n", inode->i_ino);
         }
 
         if (ncp_make_closed(inode) != 0) {
                 /* We can't do anything but complain. */
-                printk(KERN_ERR "ncp_evict_inode: could not close\n");
+                pr_err("%s: could not close\n", __func__);
         }
 }
 
@@ -469,9 +470,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
 {
         struct ncp_mount_data_kernel data;
         struct ncp_server *server;
-        struct file *ncp_filp;
         struct inode *root_inode;
-        struct inode *sock_inode;
         struct socket *sock;
         int error;
         int default_bufsize;
@@ -540,18 +539,10 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (!uid_valid(data.mounted_uid) || !uid_valid(data.uid) ||
             !gid_valid(data.gid))
                 goto out;
-        error = -EBADF;
-        ncp_filp = fget(data.ncp_fd);
-        if (!ncp_filp)
-                goto out;
-        error = -ENOTSOCK;
-        sock_inode = file_inode(ncp_filp);
-        if (!S_ISSOCK(sock_inode->i_mode))
-                goto out_fput;
-        sock = SOCKET_I(sock_inode);
+        sock = sockfd_lookup(data.ncp_fd, &error);
         if (!sock)
-                goto out_fput;
-                
+                goto out;
+
         if (sock->type == SOCK_STREAM)
                 default_bufsize = 0xF000;
         else
@@ -573,27 +564,16 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (error)
                 goto out_fput;
 
-        server->ncp_filp = ncp_filp;
         server->ncp_sock = sock;
         
         if (data.info_fd != -1) {
-                struct socket *info_sock;
-
-                error = -EBADF;
-                server->info_filp = fget(data.info_fd);
-                if (!server->info_filp)
-                        goto out_bdi;
-                error = -ENOTSOCK;
-                sock_inode = file_inode(server->info_filp);
-                if (!S_ISSOCK(sock_inode->i_mode))
-                        goto out_fput2;
-                info_sock = SOCKET_I(sock_inode);
+                struct socket *info_sock = sockfd_lookup(data.info_fd, &error);
                 if (!info_sock)
-                        goto out_fput2;
+                        goto out_bdi;
+                server->info_sock = info_sock;
                 error = -EBADFD;
                 if (info_sock->type != SOCK_STREAM)
                         goto out_fput2;
-                server->info_sock = info_sock;
         }
 
 /*      server->lock = 0;       */
@@ -621,7 +601,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
            now because of PATH_MAX changes.. */
         if (server->m.time_out < 1) {
                 server->m.time_out = 10;
-                printk(KERN_INFO "You need to recompile your ncpfs utils..\n");
+                pr_info("You need to recompile your ncpfs utils..\n");
         }
         server->m.time_out = server->m.time_out * HZ / 100;
         server->m.file_mode = (server->m.file_mode & S_IRWXUGO) | S_IFREG;
@@ -682,7 +662,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         ncp_unlock_server(server);
         if (error < 0)
                 goto out_rxbuf;
-        DPRINTK("ncp_fill_super: NCP_SBP(sb) = %x\n", (int) NCP_SBP(sb));
+        ncp_dbg(1, "NCP_SBP(sb) = %p\n", NCP_SBP(sb));
 
         error = -EMSGSIZE;      /* -EREMOTESIDEINCOMPATIBLE */
 #ifdef CONFIG_NCPFS_PACKET_SIGNING
@@ -710,7 +690,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (ncp_negotiate_buffersize(server, default_bufsize,
                                      &(server->buffer_size)) != 0)
                 goto out_disconnect;
-        DPRINTK("ncpfs: bufsize = %d\n", server->buffer_size);
+        ncp_dbg(1, "bufsize = %d\n", server->buffer_size);
 
         memset(&finfo, 0, sizeof(finfo));
         finfo.i.attributes      = aDIR;
@@ -739,7 +719,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         root_inode = ncp_iget(sb, &finfo);
         if (!root_inode)
                 goto out_disconnect;
-        DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber);
+        ncp_dbg(1, "root vol=%d\n", NCP_FINFO(root_inode)->volNumber);
         sb->s_root = d_make_root(root_inode);
         if (!sb->s_root)
                 goto out_disconnect;
@@ -765,17 +745,12 @@ out_nls:
         mutex_destroy(&server->root_setup_lock);
         mutex_destroy(&server->mutex);
 out_fput2:
-        if (server->info_filp)
-                fput(server->info_filp);
+        if (server->info_sock)
+                sockfd_put(server->info_sock);
 out_bdi:
         bdi_destroy(&server->bdi);
 out_fput:
-        /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>:
-         * 
-         * The previously used put_filp(ncp_filp); was bogus, since
-         * it doesn't perform proper unlocking.
-         */
-        fput(ncp_filp);
+        sockfd_put(sock);
 out:
         put_pid(data.wdog_pid);
         sb->s_fs_info = NULL;
@@ -808,9 +783,9 @@ static void ncp_put_super(struct super_block *sb)
         mutex_destroy(&server->root_setup_lock);
         mutex_destroy(&server->mutex);
 
-        if (server->info_filp)
-                fput(server->info_filp);
-        fput(server->ncp_filp);
+        if (server->info_sock)
+                sockfd_put(server->info_sock);
+        sockfd_put(server->ncp_sock);
         kill_pid(server->m.wdog_pid, SIGTERM, 1);
         put_pid(server->m.wdog_pid);
 
@@ -985,8 +960,7 @@ int ncp_notify_change(struct dentry *dentry, struct iattr *attr)
         if ((attr->ia_valid & ATTR_SIZE) != 0) {
                 int written;
 
-                DPRINTK("ncpfs: trying to change size to %ld\n",
-                        attr->ia_size);
+                ncp_dbg(1, "trying to change size to %llu\n", attr->ia_size);
 
                 if ((result = ncp_make_open(inode, O_WRONLY)) < 0) {
                         result = -EACCES;
@@ -1072,7 +1046,7 @@ MODULE_ALIAS_FS("ncpfs");
 static int __init init_ncp_fs(void)
 {
         int err;
-        DPRINTK("ncpfs: init_ncp_fs called\n");
+        ncp_dbg(1, "called\n");
 
         err = init_inodecache();
         if (err)
@@ -1089,7 +1063,7 @@ out1:
 
 static void __exit exit_ncp_fs(void)
 {
-        DPRINTK("ncpfs: exit_ncp_fs called\n");
+        ncp_dbg(1, "called\n");
         unregister_filesystem(&ncp_fs_type);
         destroy_inodecache();
 }
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c
index 60426ccb3b65..d5659d96ee7f 100644
--- a/fs/ncpfs/ioctl.c
+++ b/fs/ncpfs/ioctl.c
@@ -41,7 +41,7 @@ ncp_get_fs_info(struct ncp_server * server, struct inode *inode,
                 return -EFAULT;
 
         if (info.version != NCP_GET_FS_INFO_VERSION) {
-                DPRINTK("info.version invalid: %d\n", info.version);
+                ncp_dbg(1, "info.version invalid: %d\n", info.version);
                 return -EINVAL;
         }
         /* TODO: info.addr = server->m.serv_addr; */
@@ -66,7 +66,7 @@ ncp_get_fs_info_v2(struct ncp_server * server, struct inode *inode,
                 return -EFAULT;
 
         if (info2.version != NCP_GET_FS_INFO_VERSION_V2) {
-                DPRINTK("info.version invalid: %d\n", info2.version);
+                ncp_dbg(1, "info.version invalid: %d\n", info2.version);
                 return -EINVAL;
         }
         info2.mounted_uid   = from_kuid_munged(current_user_ns(), server->m.mounted_uid);
@@ -132,7 +132,7 @@ ncp_get_compat_fs_info_v2(struct ncp_server * server, struct inode *inode,
                 return -EFAULT;
 
         if (info2.version != NCP_GET_FS_INFO_VERSION_V2) {
-                DPRINTK("info.version invalid: %d\n", info2.version);
+                ncp_dbg(1, "info.version invalid: %d\n", info2.version);
                 return -EINVAL;
         }
         info2.mounted_uid   = from_kuid_munged(current_user_ns(), server->m.mounted_uid);
@@ -308,8 +308,7 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg
                 else
                         result = server->reply_size;
                 ncp_unlock_server(server);
-                DPRINTK("ncp_ioctl: copy %d bytes\n",
-                        result);
+                ncp_dbg(1, "copy %d bytes\n", result);
                 if (result >= 0)
                         if (copy_to_user(request.data, bouncebuffer, result))
                                 result = -EFAULT;
@@ -385,9 +384,9 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg
                                                 sr.namespace = server->name_space[sr.volNumber];
                                                 result = 0;
                                         } else
-                                                DPRINTK("ncpfs: s_root->d_inode==NULL\n");
+                                                ncp_dbg(1, "s_root->d_inode==NULL\n");
                                 } else
-                                        DPRINTK("ncpfs: s_root==NULL\n");
+                                        ncp_dbg(1, "s_root==NULL\n");
                         } else {
                                 sr.volNumber = -1;
                                 sr.namespace = 0;
@@ -440,11 +439,11 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg
                                                         NCP_FINFO(s_inode)->DosDirNum = dosde;
                                                         server->root_setuped = 1;
                                                 } else {
-                                                        DPRINTK("ncpfs: s_root->d_inode==NULL\n");
+                                                        ncp_dbg(1, "s_root->d_inode==NULL\n");
                                                         result = -EIO;
                                                 }
                                         } else {
-                                                DPRINTK("ncpfs: s_root==NULL\n");
+                                                ncp_dbg(1, "s_root==NULL\n");
                                                 result = -EIO;
                                         }
                                 }
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c
index 3c5dd55d284c..b359d12eb359 100644
--- a/fs/ncpfs/mmap.c
+++ b/fs/ncpfs/mmap.c
@@ -107,7 +107,7 @@ int ncp_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct inode *inode = file_inode(file);
         
-        DPRINTK("ncp_mmap: called\n");
+        ncp_dbg(1, "called\n");
 
         if (!ncp_conn_valid(NCP_SERVER(inode)))
                 return -EIO;
diff --git a/fs/ncpfs/ncp_fs.h b/fs/ncpfs/ncp_fs.h
index 31831afe1c3b..b9f69e1b1f43 100644
--- a/fs/ncpfs/ncp_fs.h
+++ b/fs/ncpfs/ncp_fs.h
@@ -2,30 +2,32 @@
 #include "ncp_fs_i.h"
 #include "ncp_fs_sb.h"
 
-/* define because it is easy to change PRINTK to {*}PRINTK */
-#define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)
-
 #undef NCPFS_PARANOIA
 #ifdef NCPFS_PARANOIA
-#define PPRINTK(format, args...) PRINTK(format , ## args)
+#define ncp_vdbg(fmt, ...)                                      \
+        pr_debug(fmt, ##__VA_ARGS__)
 #else
-#define PPRINTK(format, args...)
+#define ncp_vdbg(fmt, ...)                                      \
+do {                                                            \
+        if (0)                                                  \
+                pr_debug(fmt, ##__VA_ARGS__);                   \
+} while (0)
 #endif
 
 #ifndef DEBUG_NCP
 #define DEBUG_NCP 0
 #endif
-#if DEBUG_NCP > 0
-#define DPRINTK(format, args...) PRINTK(format , ## args)
-#else
-#define DPRINTK(format, args...)
-#endif
-#if DEBUG_NCP > 1
-#define DDPRINTK(format, args...) PRINTK(format , ## args)
-#else
-#define DDPRINTK(format, args...)
+
+#if DEBUG_NCP > 0 && !defined(DEBUG)
+#define DEBUG
 #endif
 
+#define ncp_dbg(level, fmt, ...)                                \
+do {                                                            \
+        if (level <= DEBUG_NCP)                                 \
+                pr_debug(fmt, ##__VA_ARGS__);                   \
+} while (0)
+
 #define NCP_MAX_RPC_TIMEOUT (6*HZ)
 
 
diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h
index b81e97adc5a9..55e26fd80886 100644
--- a/fs/ncpfs/ncp_fs_sb.h
+++ b/fs/ncpfs/ncp_fs_sb.h
@@ -45,9 +45,7 @@ struct ncp_server {
 
         __u8 name_space[NCP_NUMBER_OF_VOLUMES + 2];
 
-        struct file *ncp_filp;  /* File pointer to ncp socket */
         struct socket *ncp_sock;/* ncp socket */
-        struct file *info_filp;
         struct socket *info_sock;
 
         u8 sequence;
@@ -111,7 +109,7 @@ struct ncp_server {
 
         spinlock_t requests_lock;       /* Lock accesses to tx.requests, tx.creq and rcv.creq when STREAM mode */
 
-        void (*data_ready)(struct sock* sk, int len);
+        void (*data_ready)(struct sock* sk);
         void (*error_report)(struct sock* sk);
         void (*write_space)(struct sock* sk);   /* STREAM mode only */
         struct {
@@ -153,7 +151,7 @@ extern void ncp_tcp_tx_proc(struct work_struct *work);
 extern void ncpdgram_rcv_proc(struct work_struct *work);
 extern void ncpdgram_timeout_proc(struct work_struct *work);
 extern void ncpdgram_timeout_call(unsigned long server);
-extern void ncp_tcp_data_ready(struct sock* sk, int len);
+extern void ncp_tcp_data_ready(struct sock* sk);
 extern void ncp_tcp_write_space(struct sock* sk);
 extern void ncp_tcp_error_report(struct sock* sk);
 
diff --git a/fs/ncpfs/ncplib_kernel.c b/fs/ncpfs/ncplib_kernel.c
index 981a95617fc9..482387532f54 100644
--- a/fs/ncpfs/ncplib_kernel.c
+++ b/fs/ncpfs/ncplib_kernel.c
@@ -9,14 +9,14 @@
  *
  */
 
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include "ncp_fs.h"
 
 static inline void assert_server_locked(struct ncp_server *server)
 {
         if (server->lock == 0) {
-                DPRINTK("ncpfs: server not locked!\n");
+                ncp_dbg(1, "server not locked!\n");
         }
 }
 
@@ -75,7 +75,7 @@ static void ncp_add_pstring(struct ncp_server *server, const char *s)
         int len = strlen(s);
         assert_server_locked(server);
         if (len > 255) {
-                DPRINTK("ncpfs: string too long: %s\n", s);
+                ncp_dbg(1, "string too long: %s\n", s);
                 len = 255;
         }
         ncp_add_byte(server, len);
@@ -225,7 +225,7 @@ int ncp_get_volume_info_with_number(struct ncp_server* server,
         result = -EIO;
         len = ncp_reply_byte(server, 29);
         if (len > NCP_VOLNAME_LEN) {
-                DPRINTK("ncpfs: volume name too long: %d\n", len);
+                ncp_dbg(1, "volume name too long: %d\n", len);
                 goto out;
         }
         memcpy(&(target->volume_name), ncp_reply_data(server, 30), len);
@@ -259,7 +259,7 @@ int ncp_get_directory_info(struct ncp_server* server, __u8 n,
         result = -EIO;
         len = ncp_reply_byte(server, 21);
         if (len > NCP_VOLNAME_LEN) {
-                DPRINTK("ncpfs: volume name too long: %d\n", len);
+                ncp_dbg(1, "volume name too long: %d\n", len);
                 goto out;
         }
         memcpy(&(target->volume_name), ncp_reply_data(server, 22), len);
@@ -295,9 +295,9 @@ ncp_make_closed(struct inode *inode)
                 err = ncp_close_file(NCP_SERVER(inode), NCP_FINFO(inode)->file_handle);
 
                 if (!err)
-                        PPRINTK("ncp_make_closed: volnum=%d, dirent=%u, error=%d\n",
-                                NCP_FINFO(inode)->volNumber,
-                                NCP_FINFO(inode)->dirEntNum, err);
+                        ncp_vdbg("volnum=%d, dirent=%u, error=%d\n",
+                                 NCP_FINFO(inode)->volNumber,
+                                 NCP_FINFO(inode)->dirEntNum, err);
         }
         mutex_unlock(&NCP_FINFO(inode)->open_mutex);
         return err;
@@ -394,8 +394,7 @@ int ncp_obtain_nfs_info(struct ncp_server *server,
 
                 if ((result = ncp_request(server, 87)) == 0) {
                         ncp_extract_nfs_info(ncp_reply_data(server, 0), &target->nfs);
-                        DPRINTK(KERN_DEBUG
-                                "ncp_obtain_nfs_info: (%s) mode=0%o, rdev=0x%x\n",
+                        ncp_dbg(1, "(%s) mode=0%o, rdev=0x%x\n",
                                 target->entryName, target->nfs.mode,
                                 target->nfs.rdev);
                 } else {
@@ -425,7 +424,7 @@ int ncp_obtain_info(struct ncp_server *server, struct inode *dir, const char *pa
         int result;
 
         if (target == NULL) {
-                printk(KERN_ERR "ncp_obtain_info: invalid call\n");
+                pr_err("%s: invalid call\n", __func__);
                 return -EINVAL;
         }
         ncp_init_request(server);
@@ -498,7 +497,7 @@ ncp_get_known_namespace(struct ncp_server *server, __u8 volume)
         namespace = ncp_reply_data(server, 2);
 
         while (no_namespaces > 0) {
-                DPRINTK("get_namespaces: found %d on %d\n", *namespace, volume);
+                ncp_dbg(1, "found %d on %d\n", *namespace, volume);
 
 #ifdef CONFIG_NCPFS_NFS_NS
                 if ((*namespace == NW_NS_NFS) && !(server->m.flags&NCP_MOUNT_NO_NFS)) 
@@ -531,8 +530,7 @@ ncp_update_known_namespace(struct ncp_server *server, __u8 volume, int *ret_ns)
         if (ret_ns)
                 *ret_ns = ns;
 
-        DPRINTK("lookup_vol: namespace[%d] = %d\n",
-                volume, server->name_space[volume]);
+        ncp_dbg(1, "namespace[%d] = %d\n", volume, server->name_space[volume]);
 
         if (server->name_space[volume] == ns)
                 return 0;
@@ -596,7 +594,7 @@ ncp_get_volume_root(struct ncp_server *server,
 {
         int result;
 
-        DPRINTK("ncp_get_volume_root: looking up vol %s\n", volname);
+        ncp_dbg(1, "looking up vol %s\n", volname);
 
         ncp_init_request(server);
         ncp_add_byte(server, 22);       /* Subfunction: Generate dir handle */
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index 3a1587222c8a..471bc3d1139e 100644
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -8,6 +8,7 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/time.h>
 #include <linux/errno.h>
@@ -96,11 +97,11 @@ static void ncp_req_put(struct ncp_request_reply *req)
                 kfree(req);
 }
 
-void ncp_tcp_data_ready(struct sock *sk, int len)
+void ncp_tcp_data_ready(struct sock *sk)
 {
         struct ncp_server *server = sk->sk_user_data;
 
-        server->data_ready(sk, len);
+        server->data_ready(sk);
         schedule_work(&server->rcv.tq);
 }
 
@@ -231,7 +232,7 @@ static void __ncptcp_try_send(struct ncp_server *server)
                 return;
 
         if (result < 0) {
-                printk(KERN_ERR "ncpfs: tcp: Send failed: %d\n", result);
+                pr_err("tcp: Send failed: %d\n", result);
                 __ncp_abort_request(server, rq, result);
                 return;
         }
@@ -332,7 +333,7 @@ static int ncp_add_request(struct ncp_server *server, struct ncp_request_reply *
         mutex_lock(&server->rcv.creq_mutex);
         if (!ncp_conn_valid(server)) {
                 mutex_unlock(&server->rcv.creq_mutex);
-                printk(KERN_ERR "ncpfs: tcp: Server died\n");
+                pr_err("tcp: Server died\n");
                 return -EIO;
         }
         ncp_req_get(req);
@@ -405,15 +406,15 @@ void ncpdgram_rcv_proc(struct work_struct *work)
                                 }
                                 result = _recv(sock, buf, sizeof(buf), MSG_DONTWAIT);
                                 if (result < 0) {
-                                        DPRINTK("recv failed with %d\n", result);
+                                        ncp_dbg(1, "recv failed with %d\n", result);
                                         continue;
                                 }
                                 if (result < 10) {
-                                        DPRINTK("too short (%u) watchdog packet\n", result);
+                                        ncp_dbg(1, "too short (%u) watchdog packet\n", result);
                                         continue;
                                 }
                                 if (buf[9] != '?') {
-                                        DPRINTK("bad signature (%02X) in watchdog packet\n", buf[9]);
+                                        ncp_dbg(1, "bad signature (%02X) in watchdog packet\n", buf[9]);
                                         continue;
                                 }
                                 buf[9] = 'Y';
@@ -448,7 +449,7 @@ void ncpdgram_rcv_proc(struct work_struct *work)
                                                         result -= 8;
                                                         hdrl = sock->sk->sk_family == AF_INET ? 8 : 6;
                                                         if (sign_verify_reply(server, server->rxbuf + hdrl, result - hdrl, cpu_to_le32(result), server->rxbuf + result)) {
-                                                                printk(KERN_INFO "ncpfs: Signature violation\n");
+                                                                pr_info("Signature violation\n");
                                                                 result = -EIO;
                                                         }
                                                 }
@@ -524,7 +525,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len)
                 return result;
         }
         if (result > len) {
-                printk(KERN_ERR "ncpfs: tcp: bug in recvmsg (%u > %Zu)\n", result, len);
+                pr_err("tcp: bug in recvmsg (%u > %Zu)\n", result, len);
                 return -EIO;                    
         }
         return result;
@@ -552,9 +553,9 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
                                         __ncptcp_abort(server);
                                 }
                                 if (result < 0) {
-                                        printk(KERN_ERR "ncpfs: tcp: error in recvmsg: %d\n", result);
+                                        pr_err("tcp: error in recvmsg: %d\n", result);
                                 } else {
-                                        DPRINTK(KERN_ERR "ncpfs: tcp: EOF\n");
+                                        ncp_dbg(1, "tcp: EOF\n");
                                 }
                                 return -EIO;
                         }
@@ -566,20 +567,20 @@ static int __ncptcp_rcv_proc(struct ncp_server *server)
                 switch (server->rcv.state) {
                         case 0:
                                 if (server->rcv.buf.magic != htonl(NCP_TCP_RCVD_MAGIC)) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
+                                        pr_err("tcp: Unexpected reply type %08X\n", ntohl(server->rcv.buf.magic));
                                         __ncptcp_abort(server);
                                         return -EIO;
                                 }
                                 datalen = ntohl(server->rcv.buf.len) & 0x0FFFFFFF;
                                 if (datalen < 10) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
+                                        pr_err("tcp: Unexpected reply len %d\n", datalen);
                                         __ncptcp_abort(server);
                                         return -EIO;
                                 }
 #ifdef CONFIG_NCPFS_PACKET_SIGNING                              
                                 if (server->sign_active) {
                                         if (datalen < 18) {
-                                                printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d\n", datalen);
+                                                pr_err("tcp: Unexpected reply len %d\n", datalen);
                                                 __ncptcp_abort(server);
                                                 return -EIO;
                                         }
@@ -604,7 +605,7 @@ cont:;
                                                 server->rcv.len = datalen - 10;
                                                 break;
                                         }                                       
-                                        DPRINTK("ncpfs: tcp: Unexpected NCP type %02X\n", type);
+                                        ncp_dbg(1, "tcp: Unexpected NCP type %02X\n", type);
 skipdata2:;
                                         server->rcv.state = 2;
 skipdata:;
@@ -614,11 +615,11 @@ skipdata:;
                                 }
                                 req = server->rcv.creq;
                                 if (!req) {
-                                        DPRINTK(KERN_ERR "ncpfs: Reply without appropriate request\n");
+                                        ncp_dbg(1, "Reply without appropriate request\n");
                                         goto skipdata2;
                                 }
                                 if (datalen > req->datalen + 8) {
-                                        printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
+                                        pr_err("tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
                                         server->rcv.state = 3;
                                         goto skipdata;
                                 }
@@ -638,12 +639,12 @@ skipdata:;
                                 req = server->rcv.creq;
                                 if (req->tx_type != NCP_ALLOC_SLOT_REQUEST) {
                                         if (((struct ncp_reply_header*)server->rxbuf)->sequence != server->sequence) {
-                                                printk(KERN_ERR "ncpfs: tcp: Bad sequence number\n");
+                                                pr_err("tcp: Bad sequence number\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
                                         if ((((struct ncp_reply_header*)server->rxbuf)->conn_low | (((struct ncp_reply_header*)server->rxbuf)->conn_high << 8)) != server->connection) {
-                                                printk(KERN_ERR "ncpfs: tcp: Connection number mismatch\n");
+                                                pr_err("tcp: Connection number mismatch\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
@@ -651,7 +652,7 @@ skipdata:;
 #ifdef CONFIG_NCPFS_PACKET_SIGNING                              
                                 if (server->sign_active && req->tx_type != NCP_DEALLOC_SLOT_REQUEST) {
                                         if (sign_verify_reply(server, server->rxbuf + 6, req->datalen - 6, cpu_to_be32(req->datalen + 16), &server->rcv.buf.type)) {
-                                                printk(KERN_ERR "ncpfs: tcp: Signature violation\n");
+                                                pr_err("tcp: Signature violation\n");
                                                 __ncp_abort_request(server, req, -EIO);
                                                 return -EIO;
                                         }
@@ -742,7 +743,7 @@ static int ncp_do_request(struct ncp_server *server, int size,
         int result;
 
         if (server->lock == 0) {
-                printk(KERN_ERR "ncpfs: Server not locked!\n");
+                pr_err("Server not locked!\n");
                 return -EIO;
         }
         if (!ncp_conn_valid(server)) {
@@ -781,7 +782,7 @@ static int ncp_do_request(struct ncp_server *server, int size,
                 spin_unlock_irqrestore(&current->sighand->siglock, flags);
         }
 
-        DDPRINTK("do_ncp_rpc_call returned %d\n", result);
+        ncp_dbg(2, "do_ncp_rpc_call returned %d\n", result);
 
         return result;
 }
@@ -811,7 +812,7 @@ int ncp_request2(struct ncp_server *server, int function,
 
         result = ncp_do_request(server, server->current_size, reply, size);
         if (result < 0) {
-                DPRINTK("ncp_request_error: %d\n", result);
+                ncp_dbg(1, "ncp_request_error: %d\n", result);
                 goto out;
         }
         server->completion = reply->completion_code;
@@ -822,7 +823,7 @@ int ncp_request2(struct ncp_server *server, int function,
         result = reply->completion_code;
 
         if (result != 0)
-                PPRINTK("ncp_request: completion code=%x\n", result);
+                ncp_vdbg("completion code=%x\n", result);
 out:
         return result;
 }
@@ -865,14 +866,14 @@ void ncp_lock_server(struct ncp_server *server)
 {
         mutex_lock(&server->mutex);
         if (server->lock)
-                printk(KERN_WARNING "ncp_lock_server: was locked!\n");
+                pr_warn("%s: was locked!\n", __func__);
         server->lock = 1;
 }
 
 void ncp_unlock_server(struct ncp_server *server)
 {
         if (!server->lock) {
-                printk(KERN_WARNING "ncp_unlock_server: was not locked!\n");
+                pr_warn("%s: was not locked!\n", __func__);
                 return;
         }
         server->lock = 0;
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c
index 52439ddc8de0..1a63bfdb4a65 100644
--- a/fs/ncpfs/symlink.c
+++ b/fs/ncpfs/symlink.c
@@ -112,7 +112,7 @@ int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) {
         __le32 attr;
         unsigned int hdr;
 
-        DPRINTK("ncp_symlink(dir=%p,dentry=%p,symname=%s)\n",dir,dentry,symname);
+        ncp_dbg(1, "dir=%p, dentry=%p, symname=%s\n", dir, dentry, symname);
 
         if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber))
                 kludge = 0;
diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h
index a812fd1b92a4..b481e1f5eecc 100644
--- a/fs/nfsd/acl.h
+++ b/fs/nfsd/acl.h
@@ -39,9 +39,13 @@ struct nfs4_acl;
 struct svc_fh;
 struct svc_rqst;
 
-/* Maximum ACL we'll accept from client; chosen (somewhat arbitrarily) to
- * fit in a page: */
-#define NFS4_ACL_MAX 170
+/*
+ * Maximum ACL we'll accept from a client; chosen (somewhat
+ * arbitrarily) so that kmalloc'ing the ACL shouldn't require a
+ * high-order allocation.  This allows 204 ACEs on x86_64:
+ */
+#define NFS4_ACL_MAX ((PAGE_SIZE - sizeof(struct nfs4_acl)) \
+                        / sizeof(struct nfs4_ace))
 
 struct nfs4_acl *nfs4_acl_new(int);
 int nfs4_acl_get_whotype(char *, u32);
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index d190e33d0ec2..6f3f392d48af 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -542,7 +542,10 @@ posix_state_to_acl(struct posix_acl_state *state, unsigned int flags)
          * up setting a 3-element effective posix ACL with all
          * permissions zero.
          */
-        nace = 4 + state->users->n + state->groups->n;
+        if (!state->users->n && !state->groups->n)
+                nace = 3;
+        else /* Note we also include a MASK ACE in this case: */
+                nace = 4 + state->users->n + state->groups->n;
         pacl = posix_acl_alloc(nace, GFP_KERNEL);
         if (!pacl)
                 return ERR_PTR(-ENOMEM);
@@ -586,9 +589,11 @@ posix_state_to_acl(struct posix_acl_state *state, unsigned int flags)
                 add_to_mask(state, &state->groups->aces[i].perms);
         }
 
-        pace++;
-        pace->e_tag = ACL_MASK;
-        low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);
+        if (!state->users->n && !state->groups->n) {
+                pace++;
+                pace->e_tag = ACL_MASK;
+                low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);
+        }
 
         pace++;
         pace->e_tag = ACL_OTHER;
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 7f05cd140de3..39c8ef875f91 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/xprt.h>
 #include <linux/sunrpc/svc_xprt.h>
 #include <linux/slab.h>
 #include "nfsd.h"
@@ -635,6 +636,22 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc
         }
 }
 
+static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args)
+{
+        struct rpc_xprt *xprt;
+
+        if (args->protocol != XPRT_TRANSPORT_BC_TCP)
+                return rpc_create(args);
+
+        xprt = args->bc_xprt->xpt_bc_xprt;
+        if (xprt) {
+                xprt_get(xprt);
+                return rpc_create_xprt(args, xprt);
+        }
+
+        return rpc_create(args);
+}
+
 static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses)
 {
         struct rpc_timeout      timeparms = {
@@ -674,7 +691,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 args.authflavor = ses->se_cb_sec.flavor;
         }
         /* Create RPC client */
-        client = rpc_create(&args);
+        client = create_backchannel_client(&args);
         if (IS_ERR(client)) {
                 dprintk("NFSD: couldn't create callback client: %ld\n",
                         PTR_ERR(client));
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 82189b208af3..d543222babf3 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1273,6 +1273,8 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
         struct nfsd4_op *op;
         struct nfsd4_operation *opdesc;
         struct nfsd4_compound_state *cstate = &resp->cstate;
+        struct svc_fh *current_fh = &cstate->current_fh;
+        struct svc_fh *save_fh = &cstate->save_fh;
         int             slack_bytes;
         u32             plen = 0;
         __be32          status;
@@ -1288,11 +1290,11 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
         resp->tag = args->tag;
         resp->opcnt = 0;
         resp->rqstp = rqstp;
-        resp->cstate.minorversion = args->minorversion;
-        resp->cstate.replay_owner = NULL;
-        resp->cstate.session = NULL;
-        fh_init(&resp->cstate.current_fh, NFS4_FHSIZE);
-        fh_init(&resp->cstate.save_fh, NFS4_FHSIZE);
+        cstate->minorversion = args->minorversion;
+        cstate->replay_owner = NULL;
+        cstate->session = NULL;
+        fh_init(current_fh, NFS4_FHSIZE);
+        fh_init(save_fh, NFS4_FHSIZE);
         /*
          * Don't use the deferral mechanism for NFSv4; compounds make it
          * too hard to avoid non-idempotency problems.
@@ -1345,20 +1347,28 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
 
                 opdesc = OPDESC(op);
 
-                if (!cstate->current_fh.fh_dentry) {
+                if (!current_fh->fh_dentry) {
                         if (!(opdesc->op_flags & ALLOWED_WITHOUT_FH)) {
                                 op->status = nfserr_nofilehandle;
                                 goto encode_op;
                         }
-                } else if (cstate->current_fh.fh_export->ex_fslocs.migrated &&
+                } else if (current_fh->fh_export->ex_fslocs.migrated &&
                           !(opdesc->op_flags & ALLOWED_ON_ABSENT_FS)) {
                         op->status = nfserr_moved;
                         goto encode_op;
                 }
 
+                fh_clear_wcc(current_fh);
+
                 /* If op is non-idempotent */
                 if (opdesc->op_flags & OP_MODIFIES_SOMETHING) {
                         plen = opdesc->op_rsize_bop(rqstp, op);
+                        /*
+                         * If there's still another operation, make sure
+                         * we'll have space to at least encode an error:
+                         */
+                        if (resp->opcnt < args->opcnt)
+                                plen += COMPOUND_ERR_SLACK_SPACE;
                         op->status = nfsd4_check_resp_size(resp, plen);
                 }
 
@@ -1377,12 +1387,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                                 clear_current_stateid(cstate);
 
                         if (need_wrongsec_check(rqstp))
-                                op->status = check_nfsd_access(cstate->current_fh.fh_export, rqstp);
+                                op->status = check_nfsd_access(current_fh->fh_export, rqstp);
                 }
 
 encode_op:
                 /* Only from SEQUENCE */
-                if (resp->cstate.status == nfserr_replay_cache) {
+                if (cstate->status == nfserr_replay_cache) {
                         dprintk("%s NFS4.1 replay from cache\n", __func__);
                         status = op->status;
                         goto out;
@@ -1411,10 +1421,10 @@ encode_op:
                 nfsd4_increment_op_stats(op->opnum);
         }
 
-        resp->cstate.status = status;
-        fh_put(&resp->cstate.current_fh);
-        fh_put(&resp->cstate.save_fh);
-        BUG_ON(resp->cstate.replay_owner);
+        cstate->status = status;
+        fh_put(current_fh);
+        fh_put(save_fh);
+        BUG_ON(cstate->replay_owner);
 out:
         /* Reset deferral mechanism for RPC deferrals */
         rqstp->rq_usedeferral = 1;
@@ -1523,7 +1533,8 @@ static inline u32 nfsd4_setattr_rsize(struct svc_rqst *rqstp, struct nfsd4_op *o
 
 static inline u32 nfsd4_setclientid_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
 {
-        return (op_encode_hdr_size + 2 + 1024) * sizeof(__be32);
+        return (op_encode_hdr_size + 2 + XDR_QUADLEN(NFS4_VERIFIER_SIZE)) *
+                                                                sizeof(__be32);
 }
 
 static inline u32 nfsd4_write_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d5d070fbeb35..3ba65979a3cd 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1538,7 +1538,7 @@ out_err:
 }
 
 /*
- * Cache a reply. nfsd4_check_drc_limit() has bounded the cache size.
+ * Cache a reply. nfsd4_check_resp_size() has bounded the cache size.
  */
 void
 nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
@@ -1596,7 +1596,7 @@ nfsd4_enc_sequence_replay(struct nfsd4_compoundargs *args,
  * The sequence operation is not cached because we can use the slot and
  * session values.
  */
-__be32
+static __be32
 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
                          struct nfsd4_sequence *seq)
 {
@@ -1605,9 +1605,8 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
 
         dprintk("--> %s slot %p\n", __func__, slot);
 
-        /* Either returns 0 or nfserr_retry_uncached */
         status = nfsd4_enc_sequence_replay(resp->rqstp->rq_argp, resp);
-        if (status == nfserr_retry_uncached_rep)
+        if (status)
                 return status;
 
         /* The sequence operation has been encoded, cstate->datap set. */
@@ -2287,7 +2286,8 @@ out:
         if (!list_empty(&clp->cl_revoked))
                 seq->status_flags |= SEQ4_STATUS_RECALLABLE_STATE_REVOKED;
 out_no_session:
-        kfree(conn);
+        if (conn)
+                free_conn(conn);
         spin_unlock(&nn->client_lock);
         return status;
 out_put_session:
@@ -3627,8 +3627,11 @@ static __be32 nfsd4_lookup_stateid(stateid_t *stateid, unsigned char typemask,
                 return nfserr_bad_stateid;
         status = lookup_clientid(&stateid->si_opaque.so_clid, sessions,
                                                         nn, &cl);
-        if (status == nfserr_stale_clientid)
+        if (status == nfserr_stale_clientid) {
+                if (sessions)
+                        return nfserr_bad_stateid;
                 return nfserr_stale_stateid;
+        }
         if (status)
                 return status;
         *s = find_stateid_by_type(cl, stateid, typemask);
@@ -5062,7 +5065,6 @@ nfs4_state_destroy_net(struct net *net)
         int i;
         struct nfs4_client *clp = NULL;
         struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-        struct rb_node *node, *tmp;
 
         for (i = 0; i < CLIENT_HASH_SIZE; i++) {
                 while (!list_empty(&nn->conf_id_hashtbl[i])) {
@@ -5071,13 +5073,11 @@ nfs4_state_destroy_net(struct net *net)
                 }
         }
 
-        node = rb_first(&nn->unconf_name_tree);
-        while (node != NULL) {
-                tmp = node;
-                node = rb_next(tmp);
-                clp = rb_entry(tmp, struct nfs4_client, cl_namenode);
-                rb_erase(tmp, &nn->unconf_name_tree);
-                destroy_client(clp);
+        for (i = 0; i < CLIENT_HASH_SIZE; i++) {
+                while (!list_empty(&nn->unconf_id_hashtbl[i])) {
+                        clp = list_entry(nn->unconf_id_hashtbl[i].next, struct nfs4_client, cl_idhash);
+                        destroy_client(clp);
+                }
         }
 
         kfree(nn->sessionid_hashtbl);
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 63f2395c57ed..2723c1badd01 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -294,7 +294,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                 READ32(nace);
 
                 if (nace > NFS4_ACL_MAX)
-                        return nfserr_resource;
+                        return nfserr_fbig;
 
                 *acl = nfs4_acl_new(nace);
                 if (*acl == NULL)
@@ -1222,7 +1222,6 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
         }
         write->wr_head.iov_base = p;
         write->wr_head.iov_len = avail;
-        WARN_ON(avail != (XDR_QUADLEN(avail) << 2));
         write->wr_pagelist = argp->pagelist;
 
         len = XDR_QUADLEN(write->wr_buflen) << 2;
@@ -2483,6 +2482,8 @@ out_acl:
                         goto out;
         }
         if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
+                if ((buflen -= 16) < 0)
+                        goto out_resource;
                 WRITE32(3);
                 WRITE32(NFSD_SUPPATTR_EXCLCREAT_WORD0);
                 WRITE32(NFSD_SUPPATTR_EXCLCREAT_WORD1);
@@ -2499,8 +2500,10 @@ out:
                 security_release_secctx(context, contextlen);
 #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
         kfree(acl);
-        if (tempfh)
+        if (tempfh) {
                 fh_put(tempfh);
+                kfree(tempfh);
+        }
         return status;
 out_nfserr:
         status = nfserrno(err);
@@ -3471,6 +3474,9 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
         struct nfsd4_test_stateid_id *stateid, *next;
         __be32 *p;
 
+        if (nfserr)
+                return nfserr;
+
         RESERVE_SPACE(4 + (4 * test_stateid->ts_num_ids));
         *p++ = htonl(test_stateid->ts_num_ids);
 
@@ -3579,8 +3585,6 @@ __be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad)
                 return 0;
 
         session = resp->cstate.session;
-        if (session == NULL)
-                return 0;
 
         if (xb->page_len == 0) {
                 length = (char *)resp->p - (char *)xb->head[0].iov_base + pad;
@@ -3620,9 +3624,17 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
         BUG_ON(op->opnum < 0 || op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) ||
                !nfsd4_enc_ops[op->opnum]);
         op->status = nfsd4_enc_ops[op->opnum](resp, op->status, &op->u);
-        /* nfsd4_check_drc_limit guarantees enough room for error status */
+        /* nfsd4_check_resp_size guarantees enough room for error status */
         if (!op->status)
                 op->status = nfsd4_check_resp_size(resp, 0);
+        if (op->status == nfserr_resource && nfsd4_has_session(&resp->cstate)) {
+                struct nfsd4_slot *slot = resp->cstate.slot;
+
+                if (slot->sl_flags & NFSD4_SLOT_CACHETHIS)
+                        op->status = nfserr_rep_too_big_to_cache;
+                else
+                        op->status = nfserr_rep_too_big;
+        }
         if (so) {
                 so->so_replay.rp_status = op->status;
                 so->so_replay.rp_buflen = (char *)resp->p - (char *)(statp+1);
@@ -3691,6 +3703,12 @@ int nfsd4_release_compoundargs(void *rq, __be32 *p, void *resp)
 int
 nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoundargs *args)
 {
+        if (rqstp->rq_arg.head[0].iov_len % 4) {
+                /* client is nuts */
+                dprintk("%s: compound not properly padded! (peeraddr=%pISc xid=0x%x)",
+                        __func__, svc_addr(rqstp), be32_to_cpu(rqstp->rq_xid));
+                return 0;
+        }
         args->p = p;
         args->end = rqstp->rq_arg.head[0].iov_base + rqstp->rq_arg.head[0].iov_len;
         args->pagelist = rqstp->rq_arg.pages;
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 7f555179bf81..f34d9de802ab 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -699,6 +699,11 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net)
         if (err != 0 || fd < 0)
                 return -EINVAL;
 
+        if (svc_alien_sock(net, fd)) {
+                printk(KERN_ERR "%s: socket net is different to NFSd's one\n", __func__);
+                return -EINVAL;
+        }
+
         err = nfsd_create_serv(net);
         if (err != 0)
                 return err;
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 30f34ab02137..479eb681c27c 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -282,7 +282,7 @@ void		nfsd_lockd_shutdown(void);
  * reason.
  */
 #define COMPOUND_SLACK_SPACE            140    /* OP_GETFH */
-#define COMPOUND_ERR_SLACK_SPACE        12     /* OP_SETATTR */
+#define COMPOUND_ERR_SLACK_SPACE        16     /* OP_SETATTR */
 
 #define NFSD_LAUNDROMAT_MINTIMEOUT      1   /* seconds */
 
diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
index 4775bc4896c8..ad67964d0bb1 100644
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@ -133,6 +133,17 @@ fh_init(struct svc_fh *fhp, int maxsize)
 
 #ifdef CONFIG_NFSD_V3
 /*
+ * The wcc data stored in current_fh should be cleared
+ * between compound ops.
+ */
+static inline void
+fh_clear_wcc(struct svc_fh *fhp)
+{
+        fhp->fh_post_saved = 0;
+        fhp->fh_pre_saved = 0;
+}
+
+/*
  * Fill in the pre_op attr for the wcc data
  */
 static inline void
@@ -152,7 +163,8 @@ fill_pre_wcc(struct svc_fh *fhp)
 
 extern void fill_post_wcc(struct svc_fh *);
 #else
-#define fill_pre_wcc(ignored)
+#define fh_clear_wcc(ignored)
+#define fill_pre_wcc(ignored)
 #define fill_post_wcc(notused)
 #endif /* CONFIG_NFSD_V3 */
 
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index b17d93214d01..9c769a47ac5a 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -152,7 +152,7 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
         type = (stat->mode & S_IFMT);
 
         *p++ = htonl(nfs_ftypes[type >> 12]);
-        *p++ = htonl((u32) (stat->mode & S_IALLUGO));
+        *p++ = htonl((u32) stat->mode);
         *p++ = htonl((u32) stat->nlink);
         *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
         *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 915808b36df7..16f0673a423c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -404,6 +404,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
         umode_t         ftype = 0;
         __be32          err;
         int             host_err;
+        bool            get_write_count;
         int             size_change = 0;
 
         if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE))
@@ -411,10 +412,18 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
         if (iap->ia_valid & ATTR_SIZE)
                 ftype = S_IFREG;
 
+        /* Callers that do fh_verify should do the fh_want_write: */
+        get_write_count = !fhp->fh_dentry;
+
         /* Get inode */
         err = fh_verify(rqstp, fhp, ftype, accmode);
         if (err)
                 goto out;
+        if (get_write_count) {
+                host_err = fh_want_write(fhp);
+                if (host_err)
+                        return nfserrno(host_err);
+        }
 
         dentry = fhp->fh_dentry;
         inode = dentry->d_inode;
@@ -1706,10 +1715,10 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
         dput(odentry);
  out_nfserr:
         err = nfserrno(host_err);
-
-        /* we cannot reply on fh_unlock on the two filehandles,
+        /*
+         * We cannot rely on fh_unlock on the two filehandles,
          * as that would do the wrong thing if the two directories
-         * were the same, so again we do it by hand
+         * were the same, so again we do it by hand.
          */
         fill_post_wcc(ffhp);
         fill_post_wcc(tfhp);
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index d278a0d03496..5ea7df305083 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -574,8 +574,6 @@ extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                 struct nfsd4_compound_state *,
                 struct nfsd4_setclientid_confirm *setclientid_confirm);
 extern void nfsd4_store_cache_entry(struct nfsd4_compoundres *resp);
-extern __be32 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
-                struct nfsd4_sequence *seq);
 extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,
                 struct nfsd4_compound_state *, struct nfsd4_exchange_id *);
 extern __be32 nfsd4_backchannel_ctl(struct svc_rqst *, struct nfsd4_compound_state *, struct nfsd4_backchannel_ctl *);
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 9d8153ebacfb..f47af5e6e230 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -1704,8 +1704,6 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi)
         iput(bvi);
 skip_large_index_stuff:
         /* Setup the operations for this index inode. */
-        vi->i_op = NULL;
-        vi->i_fop = NULL;
         vi->i_mapping->a_ops = &ntfs_mst_aops;
         vi->i_blocks = ni->allocated_size >> 9;
         /*
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index eb649d23a4de..c6b90e670389 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -137,7 +137,7 @@ static int o2net_sys_err_translations[O2NET_ERR_MAX] =
 static void o2net_sc_connect_completed(struct work_struct *work);
 static void o2net_rx_until_empty(struct work_struct *work);
 static void o2net_shutdown_sc(struct work_struct *work);
-static void o2net_listen_data_ready(struct sock *sk, int bytes);
+static void o2net_listen_data_ready(struct sock *sk);
 static void o2net_sc_send_keep_req(struct work_struct *work);
 static void o2net_idle_timer(unsigned long data);
 static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);
@@ -597,9 +597,9 @@ static void o2net_set_nn_state(struct o2net_node *nn,
 }
 
 /* see o2net_register_callbacks() */
-static void o2net_data_ready(struct sock *sk, int bytes)
+static void o2net_data_ready(struct sock *sk)
 {
-        void (*ready)(struct sock *sk, int bytes);
+        void (*ready)(struct sock *sk);
 
         read_lock(&sk->sk_callback_lock);
         if (sk->sk_user_data) {
@@ -613,7 +613,7 @@ static void o2net_data_ready(struct sock *sk, int bytes)
         }
         read_unlock(&sk->sk_callback_lock);
 
-        ready(sk, bytes);
+        ready(sk);
 }
 
 /* see o2net_register_callbacks() */
@@ -916,57 +916,30 @@ static struct o2net_msg_handler *o2net_handler_get(u32 msg_type, u32 key)
 
 static int o2net_recv_tcp_msg(struct socket *sock, void *data, size_t len)
 {
-        int ret;
-        mm_segment_t oldfs;
-        struct kvec vec = {
-                .iov_len = len,
-                .iov_base = data,
-        };
-        struct msghdr msg = {
-                .msg_iovlen = 1,
-                .msg_iov = (struct iovec *)&vec,
-                .msg_flags = MSG_DONTWAIT,
-        };
-
-        oldfs = get_fs();
-        set_fs(get_ds());
-        ret = sock_recvmsg(sock, &msg, len, msg.msg_flags);
-        set_fs(oldfs);
-
-        return ret;
+        struct kvec vec = { .iov_len = len, .iov_base = data, };
+        struct msghdr msg = { .msg_flags = MSG_DONTWAIT, };
+        return kernel_recvmsg(sock, &msg, &vec, 1, len, msg.msg_flags);
 }
 
 static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec,
                               size_t veclen, size_t total)
 {
         int ret;
-        mm_segment_t oldfs;
-        struct msghdr msg = {
-                .msg_iov = (struct iovec *)vec,
-                .msg_iovlen = veclen,
-        };
+        struct msghdr msg;
 
         if (sock == NULL) {
                 ret = -EINVAL;
                 goto out;
         }
 
-        oldfs = get_fs();
-        set_fs(get_ds());
-        ret = sock_sendmsg(sock, &msg, total);
-        set_fs(oldfs);
-        if (ret != total) {
-                mlog(ML_ERROR, "sendmsg returned %d instead of %zu\n", ret,
-                     total);
-                if (ret >= 0)
-                        ret = -EPIPE; /* should be smarter, I bet */
-                goto out;
-        }
-
-        ret = 0;
+        ret = kernel_sendmsg(sock, &msg, vec, veclen, total);
+        if (likely(ret == total))
+                return 0;
+        mlog(ML_ERROR, "sendmsg returned %d instead of %zu\n", ret, total);
+        if (ret >= 0)
+                ret = -EPIPE; /* should be smarter, I bet */
 out:
-        if (ret < 0)
-                mlog(0, "returning error: %d\n", ret);
+        mlog(0, "returning error: %d\n", ret);
         return ret;
 }
 
@@ -1953,9 +1926,9 @@ static void o2net_accept_many(struct work_struct *work)
                 cond_resched();
 }
 
-static void o2net_listen_data_ready(struct sock *sk, int bytes)
+static void o2net_listen_data_ready(struct sock *sk)
 {
-        void (*ready)(struct sock *sk, int bytes);
+        void (*ready)(struct sock *sk);
 
         read_lock(&sk->sk_callback_lock);
         ready = sk->sk_user_data;
@@ -1978,7 +1951,6 @@ static void o2net_listen_data_ready(struct sock *sk, int bytes)
          */
 
         if (sk->sk_state == TCP_LISTEN) {
-                mlog(ML_TCP, "bytes: %d\n", bytes);
                 queue_work(o2net_wq, &o2net_listen_work);
         } else {
                 ready = NULL;
@@ -1987,7 +1959,7 @@ static void o2net_listen_data_ready(struct sock *sk, int bytes)
 out:
         read_unlock(&sk->sk_callback_lock);
         if (ready != NULL)
-                ready(sk, bytes);
+                ready(sk);
 }
 
 static int o2net_open_listening_sock(__be32 addr, __be16 port)
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h
index 4cbcb65784a3..dc024367110a 100644
--- a/fs/ocfs2/cluster/tcp_internal.h
+++ b/fs/ocfs2/cluster/tcp_internal.h
@@ -165,7 +165,7 @@ struct o2net_sock_container {
 
         /* original handlers for the sockets */
         void                    (*sc_state_change)(struct sock *sk);
-        void                    (*sc_data_ready)(struct sock *sk, int bytes);
+        void                    (*sc_data_ready)(struct sock *sk);
 
         u32                     sc_msg_key;
         u16                     sc_msg_type;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index ff33c5ef87f2..8970dcf74de5 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2367,15 +2367,18 @@ relock:
 
         if (direct_io) {
                 written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,
-                                                    ppos, count, ocount);
+                                                    count, ocount);
                 if (written < 0) {
                         ret = written;
                         goto out_dio;
                 }
         } else {
+                struct iov_iter from;
+                iov_iter_init(&from, iov, nr_segs, count, 0);
                 current->backing_dev_info = file->f_mapping->backing_dev_info;
-                written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos,
-                                                      ppos, count, 0);
+                written = generic_perform_write(file, &from, *ppos);
+                if (likely(written >= 0))
+                        iocb->ki_pos = *ppos + written;
                 current->backing_dev_info = NULL;
         }
 
diff --git a/fs/open.c b/fs/open.c
index 631aea815def..3d30eb1fc95e 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -655,35 +655,6 @@ out:
         return error;
 }
 
-/*
- * You have to be very careful that these write
- * counts get cleaned up in error cases and
- * upon __fput().  This should probably never
- * be called outside of __dentry_open().
- */
-static inline int __get_file_write_access(struct inode *inode,
-                                          struct vfsmount *mnt)
-{
-        int error;
-        error = get_write_access(inode);
-        if (error)
-                return error;
-        /*
-         * Do not take mount writer counts on
-         * special files since no writes to
-         * the mount itself will occur.
-         */
-        if (!special_file(inode->i_mode)) {
-                /*
-                 * Balanced in __fput()
-                 */
-                error = __mnt_want_write(mnt);
-                if (error)
-                        put_write_access(inode);
-        }
-        return error;
-}
-
 int open_check_o_direct(struct file *f)
 {
         /* NB: we're sure to have correct a_ops only after f_op->open */
@@ -708,26 +679,28 @@ static int do_dentry_open(struct file *f,
         f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK |
                                 FMODE_PREAD | FMODE_PWRITE;
 
-        if (unlikely(f->f_flags & O_PATH))
-                f->f_mode = FMODE_PATH;
-
         path_get(&f->f_path);
         inode = f->f_inode = f->f_path.dentry->d_inode;
-        if (f->f_mode & FMODE_WRITE) {
-                error = __get_file_write_access(inode, f->f_path.mnt);
-                if (error)
-                        goto cleanup_file;
-                if (!special_file(inode->i_mode))
-                        file_take_write(f);
-        }
-
         f->f_mapping = inode->i_mapping;
 
-        if (unlikely(f->f_mode & FMODE_PATH)) {
+        if (unlikely(f->f_flags & O_PATH)) {
+                f->f_mode = FMODE_PATH;
                 f->f_op = &empty_fops;
                 return 0;
         }
 
+        if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) {
+                error = get_write_access(inode);
+                if (unlikely(error))
+                        goto cleanup_file;
+                error = __mnt_want_write(f->f_path.mnt);
+                if (unlikely(error)) {
+                        put_write_access(inode);
+                        goto cleanup_file;
+                }
+                f->f_mode |= FMODE_WRITER;
+        }
+
         /* POSIX.1-2008/SUSv4 Section XSI 2.9.7 */
         if (S_ISREG(inode->i_mode))
                 f->f_mode |= FMODE_ATOMIC_POS;
@@ -764,18 +737,9 @@ static int do_dentry_open(struct file *f,
 
 cleanup_all:
         fops_put(f->f_op);
-        if (f->f_mode & FMODE_WRITE) {
+        if (f->f_mode & FMODE_WRITER) {
                 put_write_access(inode);
-                if (!special_file(inode->i_mode)) {
-                        /*
-                         * We don't consider this a real
-                         * mnt_want/drop_write() pair
-                         * because it all happenend right
-                         * here, so just reset the state.
-                         */
-                        file_reset_write(f);
-                        __mnt_drop_write(f->f_path.mnt);
-                }
+                __mnt_drop_write(f->f_path.mnt);
         }
 cleanup_file:
         path_put(&f->f_path);
diff --git a/fs/pipe.c b/fs/pipe.c
index 78fd0d0788db..034bffac3f97 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -142,55 +142,6 @@ pipe_iov_copy_from_user(void *to, struct iovec *iov, unsigned long len,
         return 0;
 }
 
-static int
-pipe_iov_copy_to_user(struct iovec *iov, const void *from, unsigned long len,
-                      int atomic)
-{
-        unsigned long copy;
-
-        while (len > 0) {
-                while (!iov->iov_len)
-                        iov++;
-                copy = min_t(unsigned long, len, iov->iov_len);
-
-                if (atomic) {
-                        if (__copy_to_user_inatomic(iov->iov_base, from, copy))
-                                return -EFAULT;
-                } else {
-                        if (copy_to_user(iov->iov_base, from, copy))
-                                return -EFAULT;
-                }
-                from += copy;
-                len -= copy;
-                iov->iov_base += copy;
-                iov->iov_len -= copy;
-        }
-        return 0;
-}
-
-/*
- * Attempt to pre-fault in the user memory, so we can use atomic copies.
- * Returns the number of bytes not faulted in.
- */
-static int iov_fault_in_pages_write(struct iovec *iov, unsigned long len)
-{
-        while (!iov->iov_len)
-                iov++;
-
-        while (len > 0) {
-                unsigned long this_len;
-
-                this_len = min_t(unsigned long, len, iov->iov_len);
-                if (fault_in_pages_writeable(iov->iov_base, this_len))
-                        break;
-
-                len -= this_len;
-                iov++;
-        }
-
-        return len;
-}
-
 /*
  * Pre-fault in the user memory, so we can use atomic copies.
  */
@@ -226,52 +177,6 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 /**
- * generic_pipe_buf_map - virtually map a pipe buffer
- * @pipe:       the pipe that the buffer belongs to
- * @buf:        the buffer that should be mapped
- * @atomic:     whether to use an atomic map
- *
- * Description:
- *      This function returns a kernel virtual address mapping for the
- *      pipe_buffer passed in @buf. If @atomic is set, an atomic map is provided
- *      and the caller has to be careful not to fault before calling
- *      the unmap function.
- *
- *      Note that this function calls kmap_atomic() if @atomic != 0.
- */
-void *generic_pipe_buf_map(struct pipe_inode_info *pipe,
-                           struct pipe_buffer *buf, int atomic)
-{
-        if (atomic) {
-                buf->flags |= PIPE_BUF_FLAG_ATOMIC;
-                return kmap_atomic(buf->page);
-        }
-
-        return kmap(buf->page);
-}
-EXPORT_SYMBOL(generic_pipe_buf_map);
-
-/**
- * generic_pipe_buf_unmap - unmap a previously mapped pipe buffer
- * @pipe:       the pipe that the buffer belongs to
- * @buf:        the buffer that should be unmapped
- * @map_data:   the data that the mapping function returned
- *
- * Description:
- *      This function undoes the mapping that ->map() provided.
- */
-void generic_pipe_buf_unmap(struct pipe_inode_info *pipe,
-                            struct pipe_buffer *buf, void *map_data)
-{
-        if (buf->flags & PIPE_BUF_FLAG_ATOMIC) {
-                buf->flags &= ~PIPE_BUF_FLAG_ATOMIC;
-                kunmap_atomic(map_data);
-        } else
-                kunmap(buf->page);
-}
-EXPORT_SYMBOL(generic_pipe_buf_unmap);
-
-/**
  * generic_pipe_buf_steal - attempt to take ownership of a &pipe_buffer
  * @pipe:       the pipe that the buffer belongs to
  * @buf:        the buffer to attempt to steal
@@ -351,8 +256,6 @@ EXPORT_SYMBOL(generic_pipe_buf_release);
 
 static const struct pipe_buf_operations anon_pipe_buf_ops = {
         .can_merge = 1,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = anon_pipe_buf_release,
         .steal = generic_pipe_buf_steal,
@@ -361,8 +264,6 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = {
 
 static const struct pipe_buf_operations packet_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = anon_pipe_buf_release,
         .steal = generic_pipe_buf_steal,
@@ -379,12 +280,15 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
         ssize_t ret;
         struct iovec *iov = (struct iovec *)_iov;
         size_t total_len;
+        struct iov_iter iter;
 
         total_len = iov_length(iov, nr_segs);
         /* Null read succeeds. */
         if (unlikely(total_len == 0))
                 return 0;
 
+        iov_iter_init(&iter, iov, nr_segs, total_len, 0);
+
         do_wakeup = 0;
         ret = 0;
         __pipe_lock(pipe);
@@ -394,9 +298,9 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
                         int curbuf = pipe->curbuf;
                         struct pipe_buffer *buf = pipe->bufs + curbuf;
                         const struct pipe_buf_operations *ops = buf->ops;
-                        void *addr;
                         size_t chars = buf->len;
-                        int error, atomic;
+                        size_t written;
+                        int error;
 
                         if (chars > total_len)
                                 chars = total_len;
@@ -408,21 +312,10 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
                                 break;
                         }
 
-                        atomic = !iov_fault_in_pages_write(iov, chars);
-redo:
-                        addr = ops->map(pipe, buf, atomic);
-                        error = pipe_iov_copy_to_user(iov, addr + buf->offset, chars, atomic);
-                        ops->unmap(pipe, buf, addr);
-                        if (unlikely(error)) {
-                                /*
-                                 * Just retry with the slow path if we failed.
-                                 */
-                                if (atomic) {
-                                        atomic = 0;
-                                        goto redo;
-                                }
+                        written = copy_page_to_iter(buf->page, buf->offset, chars, &iter);
+                        if (unlikely(written < chars)) {
                                 if (!ret)
-                                        ret = error;
+                                        ret = -EFAULT;
                                 break;
                         }
                         ret += chars;
@@ -538,10 +431,16 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
 
                         iov_fault_in_pages_read(iov, chars);
 redo1:
-                        addr = ops->map(pipe, buf, atomic);
+                        if (atomic)
+                                addr = kmap_atomic(buf->page);
+                        else
+                                addr = kmap(buf->page);
                         error = pipe_iov_copy_from_user(offset + addr, iov,
                                                         chars, atomic);
-                        ops->unmap(pipe, buf, addr);
+                        if (atomic)
+                                kunmap_atomic(addr);
+                        else
+                                kunmap(buf->page);
                         ret = error;
                         do_wakeup = 1;
                         if (error) {
diff --git a/fs/pnode.c b/fs/pnode.c
index 88396df725b4..302bf22c4a30 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -164,46 +164,94 @@ static struct mount *propagation_next(struct mount *m,
         }
 }
 
-/*
- * return the source mount to be used for cloning
- *
- * @dest        the current destination mount
- * @last_dest   the last seen destination mount
- * @last_src    the last seen source mount
- * @type        return CL_SLAVE if the new mount has to be
- *              cloned as a slave.
- */
-static struct mount *get_source(struct mount *dest,
-                                struct mount *last_dest,
-                                struct mount *last_src,
-                                int *type)
+static struct mount *next_group(struct mount *m, struct mount *origin)
 {
-        struct mount *p_last_src = NULL;
-        struct mount *p_last_dest = NULL;
-
-        while (last_dest != dest->mnt_master) {
-                p_last_dest = last_dest;
-                p_last_src = last_src;
-                last_dest = last_dest->mnt_master;
-                last_src = last_src->mnt_master;
+        while (1) {
+                while (1) {
+                        struct mount *next;
+                        if (!IS_MNT_NEW(m) && !list_empty(&m->mnt_slave_list))
+                                return first_slave(m);
+                        next = next_peer(m);
+                        if (m->mnt_group_id == origin->mnt_group_id) {
+                                if (next == origin)
+                                        return NULL;
+                        } else if (m->mnt_slave.next != &next->mnt_slave)
+                                break;
+                        m = next;
+                }
+                /* m is the last peer */
+                while (1) {
+                        struct mount *master = m->mnt_master;
+                        if (m->mnt_slave.next != &master->mnt_slave_list)
+                                return next_slave(m);
+                        m = next_peer(master);
+                        if (master->mnt_group_id == origin->mnt_group_id)
+                                break;
+                        if (master->mnt_slave.next == &m->mnt_slave)
+                                break;
+                        m = master;
+                }
+                if (m == origin)
+                        return NULL;
         }
+}
 
-        if (p_last_dest) {
-                do {
-                        p_last_dest = next_peer(p_last_dest);
-                } while (IS_MNT_NEW(p_last_dest));
-                /* is that a peer of the earlier? */
-                if (dest == p_last_dest) {
-                        *type = CL_MAKE_SHARED;
-                        return p_last_src;
+/* all accesses are serialized by namespace_sem */
+static struct user_namespace *user_ns;
+static struct mount *last_dest, *last_source, *dest_master;
+static struct mountpoint *mp;
+static struct hlist_head *list;
+
+static int propagate_one(struct mount *m)
+{
+        struct mount *child;
+        int type;
+        /* skip ones added by this propagate_mnt() */
+        if (IS_MNT_NEW(m))
+                return 0;
+        /* skip if mountpoint isn't covered by it */
+        if (!is_subdir(mp->m_dentry, m->mnt.mnt_root))
+                return 0;
+        if (m->mnt_group_id == last_dest->mnt_group_id) {
+                type = CL_MAKE_SHARED;
+        } else {
+                struct mount *n, *p;
+                for (n = m; ; n = p) {
+                        p = n->mnt_master;
+                        if (p == dest_master || IS_MNT_MARKED(p)) {
+                                while (last_dest->mnt_master != p) {
+                                        last_source = last_source->mnt_master;
+                                        last_dest = last_source->mnt_parent;
+                                }
+                                if (n->mnt_group_id != last_dest->mnt_group_id) {
+                                        last_source = last_source->mnt_master;
+                                        last_dest = last_source->mnt_parent;
+                                }
+                                break;
+                        }
                 }
+                type = CL_SLAVE;
+                /* beginning of peer group among the slaves? */
+                if (IS_MNT_SHARED(m))
+                        type |= CL_MAKE_SHARED;
         }
-        /* slave of the earlier, then */
-        *type = CL_SLAVE;
-        /* beginning of peer group among the slaves? */
-        if (IS_MNT_SHARED(dest))
-                *type |= CL_MAKE_SHARED;
-        return last_src;
+                
+        /* Notice when we are propagating across user namespaces */
+        if (m->mnt_ns->user_ns != user_ns)
+                type |= CL_UNPRIVILEGED;
+        child = copy_tree(last_source, last_source->mnt.mnt_root, type);
+        if (IS_ERR(child))
+                return PTR_ERR(child);
+        mnt_set_mountpoint(m, mp, child);
+        last_dest = m;
+        last_source = child;
+        if (m->mnt_master != dest_master) {
+                read_seqlock_excl(&mount_lock);
+                SET_MNT_MARK(m->mnt_master);
+                read_sequnlock_excl(&mount_lock);
+        }
+        hlist_add_head(&child->mnt_hash, list);
+        return 0;
 }
 
 /*
@@ -222,56 +270,48 @@ static struct mount *get_source(struct mount *dest,
 int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp,
                     struct mount *source_mnt, struct hlist_head *tree_list)
 {
-        struct user_namespace *user_ns = current->nsproxy->mnt_ns->user_ns;
-        struct mount *m, *child;
+        struct mount *m, *n;
         int ret = 0;
-        struct mount *prev_dest_mnt = dest_mnt;
-        struct mount *prev_src_mnt  = source_mnt;
-        HLIST_HEAD(tmp_list);
-
-        for (m = propagation_next(dest_mnt, dest_mnt); m;
-                        m = propagation_next(m, dest_mnt)) {
-                int type;
-                struct mount *source;
-
-                if (IS_MNT_NEW(m))
-                        continue;
-
-                source =  get_source(m, prev_dest_mnt, prev_src_mnt, &type);
-
-                /* Notice when we are propagating across user namespaces */
-                if (m->mnt_ns->user_ns != user_ns)
-                        type |= CL_UNPRIVILEGED;
-
-                child = copy_tree(source, source->mnt.mnt_root, type);
-                if (IS_ERR(child)) {
-                        ret = PTR_ERR(child);
-                        tmp_list = *tree_list;
-                        tmp_list.first->pprev = &tmp_list.first;
-                        INIT_HLIST_HEAD(tree_list);
+
+        /*
+         * we don't want to bother passing tons of arguments to
+         * propagate_one(); everything is serialized by namespace_sem,
+         * so globals will do just fine.
+         */
+        user_ns = current->nsproxy->mnt_ns->user_ns;
+        last_dest = dest_mnt;
+        last_source = source_mnt;
+        mp = dest_mp;
+        list = tree_list;
+        dest_master = dest_mnt->mnt_master;
+
+        /* all peers of dest_mnt, except dest_mnt itself */
+        for (n = next_peer(dest_mnt); n != dest_mnt; n = next_peer(n)) {
+                ret = propagate_one(n);
+                if (ret)
                         goto out;
-                }
+        }
 
-                if (is_subdir(dest_mp->m_dentry, m->mnt.mnt_root)) {
-                        mnt_set_mountpoint(m, dest_mp, child);
-                        hlist_add_head(&child->mnt_hash, tree_list);
-                } else {
-                        /*
-                         * This can happen if the parent mount was bind mounted
-                         * on some subdirectory of a shared/slave mount.
-                         */
-                        hlist_add_head(&child->mnt_hash, &tmp_list);
-                }
-                prev_dest_mnt = m;
-                prev_src_mnt  = child;
+        /* all slave groups */
+        for (m = next_group(dest_mnt, dest_mnt); m;
+                        m = next_group(m, dest_mnt)) {
+                /* everything in that slave group */
+                n = m;
+                do {
+                        ret = propagate_one(n);
+                        if (ret)
+                                goto out;
+                        n = next_peer(n);
+                } while (n != m);
         }
 out:
-        lock_mount_hash();
-        while (!hlist_empty(&tmp_list)) {
-                child = hlist_entry(tmp_list.first, struct mount, mnt_hash);
-                umount_tree(child, 0);
+        read_seqlock_excl(&mount_lock);
+        hlist_for_each_entry(n, tree_list, mnt_hash) {
+                m = n->mnt_parent;
+                if (m->mnt_master != dest_mnt->mnt_master)
+                        CLEAR_MNT_MARK(m->mnt_master);
         }
-        unlock_mount_hash();
+        read_sequnlock_excl(&mount_lock);
         return ret;
 }
 
diff --git a/fs/pnode.h b/fs/pnode.h
index fc28a27fa892..4a246358b031 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -16,6 +16,9 @@
 #define IS_MNT_NEW(m)  (!(m)->mnt_ns)
 #define CLEAR_MNT_SHARED(m) ((m)->mnt.mnt_flags &= ~MNT_SHARED)
 #define IS_MNT_UNBINDABLE(m) ((m)->mnt.mnt_flags & MNT_UNBINDABLE)
+#define IS_MNT_MARKED(m) ((m)->mnt.mnt_flags & MNT_MARKED)
+#define SET_MNT_MARK(m) ((m)->mnt.mnt_flags |= MNT_MARKED)
+#define CLEAR_MNT_MARK(m) ((m)->mnt.mnt_flags &= ~MNT_MARKED)
 
 #define CL_EXPIRE               0x01
 #define CL_SLAVE                0x02
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 6b7087e2e8fb..2d696b0c93bf 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -200,41 +200,9 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
         return result;
 }
 
-static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+static int proc_pid_cmdline(struct task_struct *task, char *buffer)
 {
-        int res = 0;
-        unsigned int len;
-        struct mm_struct *mm = get_task_mm(task);
-        if (!mm)
-                goto out;
-        if (!mm->arg_end)
-                goto out_mm;    /* Shh! No looking before we're done */
-
-        len = mm->arg_end - mm->arg_start;
- 
-        if (len > PAGE_SIZE)
-                len = PAGE_SIZE;
- 
-        res = access_process_vm(task, mm->arg_start, buffer, len, 0);
-
-        // If the nul at the end of args has been overwritten, then
-        // assume application is using setproctitle(3).
-        if (res > 0 && buffer[res-1] != '\0' && len < PAGE_SIZE) {
-                len = strnlen(buffer, res);
-                if (len < res) {
-                    res = len;
-                } else {
-                        len = mm->env_end - mm->env_start;
-                        if (len > PAGE_SIZE - res)
-                                len = PAGE_SIZE - res;
-                        res += access_process_vm(task, mm->env_start, buffer+res, len, 0);
-                        res = strnlen(buffer, res);
-                }
-        }
-out_mm:
-        mmput(mm);
-out:
-        return res;
+        return get_cmdline(task, buffer, PAGE_SIZE);
 }
 
 static int proc_pid_auxv(struct task_struct *task, char *buffer)
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 9ae46b87470d..89026095f2b5 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -146,7 +146,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
         struct task_struct *task;
         void *ns;
         char name[50];
-        int len = -EACCES;
+        int res = -EACCES;
 
         task = get_proc_task(inode);
         if (!task)
@@ -155,24 +155,18 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
         if (!ptrace_may_access(task, PTRACE_MODE_READ))
                 goto out_put_task;
 
-        len = -ENOENT;
+        res = -ENOENT;
         ns = ns_ops->get(task);
         if (!ns)
                 goto out_put_task;
 
         snprintf(name, sizeof(name), "%s:[%u]", ns_ops->name, ns_ops->inum(ns));
-        len = strlen(name);
-
-        if (len > buflen)
-                len = buflen;
-        if (copy_to_user(buffer, name, len))
-                len = -EFAULT;
-
+        res = readlink_copy(buffer, buflen, name);
         ns_ops->put(ns);
 out_put_task:
         put_task_struct(task);
 out:
-        return len;
+        return res;
 }
 
 static const struct inode_operations proc_ns_link_inode_operations = {
diff --git a/fs/proc/self.c b/fs/proc/self.c
index ffeb202ec942..4348bb8907c2 100644
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -16,7 +16,7 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
         if (!tgid)
                 return -ENOENT;
         sprintf(tmp, "%d", tgid);
-        return vfs_readlink(dentry,buffer,buflen,tmp);
+        return readlink_copy(buffer, buflen, tmp);
 }
 
 static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 7be26f03a3f5..1a81373947f3 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -267,6 +267,7 @@ static int mounts_open_common(struct inode *inode, struct file *file,
         p->root = root;
         p->m.poll_event = ns->event;
         p->show = show;
+        p->cached_event = ~0ULL;
 
         return 0;
 
diff --git a/fs/splice.c b/fs/splice.c
index 12028fa41def..9bc07d2b53cf 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -136,8 +136,6 @@ error:
 
 const struct pipe_buf_operations page_cache_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = page_cache_pipe_buf_confirm,
         .release = page_cache_pipe_buf_release,
         .steal = page_cache_pipe_buf_steal,
@@ -156,8 +154,6 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe,
 
 static const struct pipe_buf_operations user_page_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = page_cache_pipe_buf_release,
         .steal = user_page_pipe_buf_steal,
@@ -547,8 +543,6 @@ EXPORT_SYMBOL(generic_file_splice_read);
 
 static const struct pipe_buf_operations default_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = generic_pipe_buf_release,
         .steal = generic_pipe_buf_steal,
@@ -564,8 +558,6 @@ static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe,
 /* Pipe buffer operations for a socket and similar. */
 const struct pipe_buf_operations nosteal_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = generic_pipe_buf_release,
         .steal = generic_pipe_buf_nosteal,
@@ -767,13 +759,13 @@ int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                 goto out;
 
         if (buf->page != page) {
-                char *src = buf->ops->map(pipe, buf, 1);
+                char *src = kmap_atomic(buf->page);
                 char *dst = kmap_atomic(page);
 
                 memcpy(dst + offset, src + buf->offset, this_len);
                 flush_dcache_page(page);
                 kunmap_atomic(dst);
-                buf->ops->unmap(pipe, buf, src);
+                kunmap_atomic(src);
         }
         ret = pagecache_write_end(file, mapping, sd->pos, this_len, this_len,
                                 page, fsdata);
@@ -1067,9 +1059,9 @@ static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
         void *data;
         loff_t tmp = sd->pos;
 
-        data = buf->ops->map(pipe, buf, 0);
+        data = kmap(buf->page);
         ret = __kernel_write(sd->u.file, data + buf->offset, sd->len, &tmp);
-        buf->ops->unmap(pipe, buf, data);
+        kunmap(buf->page);
 
         return ret;
 }
@@ -1528,116 +1520,48 @@ static int get_iovec_page_array(const struct iovec __user *iov,
 static int pipe_to_user(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                         struct splice_desc *sd)
 {
-        char *src;
-        int ret;
-
-        /*
-         * See if we can use the atomic maps, by prefaulting in the
-         * pages and doing an atomic copy
-         */
-        if (!fault_in_pages_writeable(sd->u.userptr, sd->len)) {
-                src = buf->ops->map(pipe, buf, 1);
-                ret = __copy_to_user_inatomic(sd->u.userptr, src + buf->offset,
-                                                        sd->len);
-                buf->ops->unmap(pipe, buf, src);
-                if (!ret) {
-                        ret = sd->len;
-                        goto out;
-                }
-        }
-
-        /*
-         * No dice, use slow non-atomic map and copy
-         */
-        src = buf->ops->map(pipe, buf, 0);
-
-        ret = sd->len;
-        if (copy_to_user(sd->u.userptr, src + buf->offset, sd->len))
-                ret = -EFAULT;
-
-        buf->ops->unmap(pipe, buf, src);
-out:
-        if (ret > 0)
-                sd->u.userptr += ret;
-        return ret;
+        int n = copy_page_to_iter(buf->page, buf->offset, sd->len, sd->u.data);
+        return n == sd->len ? n : -EFAULT;
 }
 
 /*
  * For lack of a better implementation, implement vmsplice() to userspace
  * as a simple copy of the pipes pages to the user iov.
  */
-static long vmsplice_to_user(struct file *file, const struct iovec __user *iov,
+static long vmsplice_to_user(struct file *file, const struct iovec __user *uiov,
                              unsigned long nr_segs, unsigned int flags)
 {
         struct pipe_inode_info *pipe;
         struct splice_desc sd;
-        ssize_t size;
-        int error;
         long ret;
+        struct iovec iovstack[UIO_FASTIOV];
+        struct iovec *iov = iovstack;
+        struct iov_iter iter;
+        ssize_t count = 0;
 
         pipe = get_pipe_info(file);
         if (!pipe)
                 return -EBADF;
 
-        pipe_lock(pipe);
-
-        error = ret = 0;
-        while (nr_segs) {
-                void __user *base;
-                size_t len;
-
-                /*
-                 * Get user address base and length for this iovec.
-                 */
-                error = get_user(base, &iov->iov_base);
-                if (unlikely(error))
-                        break;
-                error = get_user(len, &iov->iov_len);
-                if (unlikely(error))
-                        break;
-
-                /*
-                 * Sanity check this iovec. 0 read succeeds.
-                 */
-                if (unlikely(!len))
-                        break;
-                if (unlikely(!base)) {
-                        error = -EFAULT;
-                        break;
-                }
-
-                if (unlikely(!access_ok(VERIFY_WRITE, base, len))) {
-                        error = -EFAULT;
-                        break;
-                }
-
-                sd.len = 0;
-                sd.total_len = len;
-                sd.flags = flags;
-                sd.u.userptr = base;
-                sd.pos = 0;
-
-                size = __splice_from_pipe(pipe, &sd, pipe_to_user);
-                if (size < 0) {
-                        if (!ret)
-                                ret = size;
-
-                        break;
-                }
-
-                ret += size;
+        ret = rw_copy_check_uvector(READ, uiov, nr_segs,
+                                    ARRAY_SIZE(iovstack), iovstack, &iov);
+        if (ret <= 0)
+                return ret;
 
-                if (size < len)
-                        break;
+        iov_iter_init(&iter, iov, nr_segs, count, 0);
 
-                nr_segs--;
-                iov++;
-        }
+        sd.len = 0;
+        sd.total_len = count;
+        sd.flags = flags;
+        sd.u.data = &iter;
+        sd.pos = 0;
 
+        pipe_lock(pipe);
+        ret = __splice_from_pipe(pipe, &sd, pipe_to_user);
         pipe_unlock(pipe);
 
-        if (!ret)
-                ret = error;
+        if (iov != iovstack)
+                kfree(iov);
 
         return ret;
 }
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 1037637957c7..d2c170f8b035 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -171,7 +171,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         } else
                 up_write(&iinfo->i_data_sem);
 
-        retval = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
+        retval = __generic_file_aio_write(iocb, iov, nr_segs);
         mutex_unlock(&inode->i_mutex);
 
         if (retval > 0) {
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 003c0051b62f..79e96ce98733 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -699,7 +699,7 @@ xfs_file_dio_aio_write(
 
         trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0);
         ret = generic_file_direct_write(iocb, iovp,
-                        &nr_segs, pos, &iocb->ki_pos, count, ocount);
+                        &nr_segs, pos, count, ocount);
 
 out:
         xfs_rw_iunlock(ip, iolock);
@@ -715,7 +715,7 @@ xfs_file_buffered_aio_write(
         const struct iovec      *iovp,
         unsigned long           nr_segs,
         loff_t                  pos,
-        size_t                  ocount)
+        size_t                  count)
 {
         struct file             *file = iocb->ki_filp;
         struct address_space    *mapping = file->f_mapping;
@@ -724,7 +724,7 @@ xfs_file_buffered_aio_write(
         ssize_t                 ret;
         int                     enospc = 0;
         int                     iolock = XFS_IOLOCK_EXCL;
-        size_t                  count = ocount;
+        struct iov_iter         from;
 
         xfs_rw_ilock(ip, iolock);
 
@@ -732,14 +732,15 @@ xfs_file_buffered_aio_write(
         if (ret)
                 goto out;
 
+        iov_iter_init(&from, iovp, nr_segs, count, 0);
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = mapping->backing_dev_info;
 
 write_retry:
         trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, 0);
-        ret = generic_file_buffered_write(iocb, iovp, nr_segs,
-                        pos, &iocb->ki_pos, count, 0);
-
+        ret = generic_perform_write(file, &from, pos);
+        if (likely(ret >= 0))
+                iocb->ki_pos = pos + ret;
         /*
          * If we just got an ENOSPC, try to write back all dirty inodes to
          * convert delalloc space to free up some of the excess reserved
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index bcfe61202115..0b18776b075e 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -271,32 +271,6 @@ xfs_open_by_handle(
         return error;
 }
 
-/*
- * This is a copy from fs/namei.c:vfs_readlink(), except for removing it's
- * unused first argument.
- */
-STATIC int
-do_readlink(
-        char __user             *buffer,
-        int                     buflen,
-        const char              *link)
-{
-        int len;
-
-        len = PTR_ERR(link);
-        if (IS_ERR(link))
-                goto out;
-
-        len = strlen(link);
-        if (len > (unsigned) buflen)
-                len = buflen;
-        if (copy_to_user(buffer, link, len))
-                len = -EFAULT;
- out:
-        return len;
-}
-
-
 int
 xfs_readlink_by_handle(
         struct file             *parfilp,
@@ -334,7 +308,7 @@ xfs_readlink_by_handle(
         error = -xfs_readlink(XFS_I(dentry->d_inode), link);
         if (error)
                 goto out_kfree;
-        error = do_readlink(hreq->ohandle, olen, link);
+        error = readlink_copy(hreq->ohandle, olen, link);
         if (error)
                 goto out_kfree;
 
diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index d8d4c898c1bb..70bef78912b7 100644
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -4,7 +4,8 @@
 #include <linux/types.h>
 #include <linux/irqflags.h>
 
-extern unsigned long wrong_size_cmpxchg(volatile void *ptr);
+extern unsigned long wrong_size_cmpxchg(volatile void *ptr)
+        __noreturn;
 
 /*
  * Generic version of __cmpxchg_local (disables interrupts). Takes an unsigned
diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
index 5b09392db673..d401e5463fb0 100644
--- a/include/asm-generic/syscall.h
+++ b/include/asm-generic/syscall.h
@@ -144,8 +144,6 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
 
 /**
  * syscall_get_arch - return the AUDIT_ARCH for the current system call
- * @task:       task of interest, must be in system call entry tracing
- * @regs:       task_pt_regs() of @task
  *
  * Returns the AUDIT_ARCH_* based on the system call convention in use.
  *
@@ -155,5 +153,5 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
  * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must
  * provide an implementation of this.
  */
-int syscall_get_arch(struct task_struct *task, struct pt_regs *regs);
+int syscall_get_arch(void);
 #endif  /* _ASM_SYSCALL_H */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 97d5497debc1..595f85c392ac 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -56,6 +56,12 @@ extern bool i915_gpu_turbo_disable(void);
 
 #define I830_GMCH_CTRL                  0x52
 
+#define I830_GMCH_GMS_MASK              0x70
+#define I830_GMCH_GMS_LOCAL             0x10
+#define I830_GMCH_GMS_STOLEN_512        0x20
+#define I830_GMCH_GMS_STOLEN_1024       0x30
+#define I830_GMCH_GMS_STOLEN_8192       0x40
+
 #define I855_GMCH_GMS_MASK              0xF0
 #define I855_GMCH_GMS_STOLEN_0M         0x0
 #define I855_GMCH_GMS_STOLEN_1M         (0x1 << 4)
@@ -72,4 +78,18 @@ extern bool i915_gpu_turbo_disable(void);
 #define INTEL_GMCH_GMS_STOLEN_224M      (0xc << 4)
 #define INTEL_GMCH_GMS_STOLEN_352M      (0xd << 4)
 
+#define I830_DRB3               0x63
+#define I85X_DRB3               0x43
+#define I865_TOUD               0xc4
+
+#define I830_ESMRAMC            0x91
+#define I845_ESMRAMC            0x9e
+#define I85X_ESMRAMC            0x61
+#define    TSEG_ENABLE          (1 << 0)
+#define    I830_TSEG_SIZE_512K  (0 << 1)
+#define    I830_TSEG_SIZE_1M    (1 << 1)
+#define    I845_TSEG_SIZE_MASK  (3 << 1)
+#define    I845_TSEG_SIZE_512K  (2 << 1)
+#define    I845_TSEG_SIZE_1M    (3 << 1)
+
 #endif                          /* _I915_DRM_H_ */
diff --git a/include/linux/acpi_dma.h b/include/linux/acpi_dma.h
index fb0298082916..329436d38e66 100644
--- a/include/linux/acpi_dma.h
+++ b/include/linux/acpi_dma.h
@@ -16,6 +16,7 @@
 
 #include <linux/list.h>
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/dmaengine.h>
 
 /**
@@ -103,12 +104,12 @@ static inline void devm_acpi_dma_controller_free(struct device *dev)
 static inline struct dma_chan *acpi_dma_request_slave_chan_by_index(
                 struct device *dev, size_t index)
 {
-        return NULL;
+        return ERR_PTR(-ENODEV);
 }
 static inline struct dma_chan *acpi_dma_request_slave_chan_by_name(
                 struct device *dev, const char *name)
 {
-        return NULL;
+        return ERR_PTR(-ENODEV);
 }
 
 #define acpi_dma_simple_xlate   NULL
diff --git a/include/linux/audit.h b/include/linux/audit.h
index ec1464df4c60..22cfddb75566 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -79,6 +79,14 @@ extern int is_audit_feature_set(int which);
 extern int __init audit_register_class(int class, unsigned *list);
 extern int audit_classify_syscall(int abi, unsigned syscall);
 extern int audit_classify_arch(int arch);
+/* only for compat system calls */
+extern unsigned compat_write_class[];
+extern unsigned compat_read_class[];
+extern unsigned compat_dir_class[];
+extern unsigned compat_chattr_class[];
+extern unsigned compat_signal_class[];
+
+extern int __weak audit_classify_compat_syscall(int abi, unsigned syscall);
 
 /* audit_names->type values */
 #define AUDIT_TYPE_UNKNOWN      0       /* we don't know yet */
@@ -94,6 +102,12 @@ struct filename;
 
 extern void audit_log_session_info(struct audit_buffer *ab);
 
+#ifdef CONFIG_AUDIT_COMPAT_GENERIC
+#define audit_is_compat(arch)  (!((arch) & __AUDIT_ARCH_64BIT))
+#else
+#define audit_is_compat(arch)  false
+#endif
+
 #ifdef CONFIG_AUDITSYSCALL
 /* These are defined in auditsc.c */
                                 /* Public API */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 5a4d39b4686b..bba550826921 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -216,9 +216,9 @@ static inline void bvec_iter_advance(struct bio_vec *bv, struct bvec_iter *iter,
 }
 
 #define for_each_bvec(bvl, bio_vec, iter, start)                        \
-        for ((iter) = start;                                            \
-             (bvl) = bvec_iter_bvec((bio_vec), (iter)),                 \
-                (iter).bi_size;                                         \
+        for (iter = (start);                                            \
+             (iter).bi_size &&                                          \
+                ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \
              bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len))
 
 
@@ -388,7 +388,7 @@ struct sg_iovec;
 struct rq_map_data;
 extern struct bio *bio_map_user_iov(struct request_queue *,
                                     struct block_device *,
-                                    struct sg_iovec *, int, int, gfp_t);
+                                    const struct sg_iovec *, int, int, gfp_t);
 extern void bio_unmap_user(struct bio *);
 extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int,
                                 gfp_t);
@@ -414,7 +414,8 @@ extern int bio_alloc_pages(struct bio *bio, gfp_t gfp);
 extern struct bio *bio_copy_user(struct request_queue *, struct rq_map_data *,
                                  unsigned long, unsigned int, int, gfp_t);
 extern struct bio *bio_copy_user_iov(struct request_queue *,
-                                     struct rq_map_data *, struct sg_iovec *,
+                                     struct rq_map_data *,
+                                     const struct sg_iovec *,
                                      int, int, gfp_t);
 extern int bio_uncopy_user(struct bio *);
 void zero_fill_bio(struct bio *bio);
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index bbc3a6c88fce..aa0eaa2d0bd8 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -189,6 +189,7 @@ enum rq_flag_bits {
         __REQ_KERNEL,           /* direct IO to kernel pages */
         __REQ_PM,               /* runtime pm request */
         __REQ_END,              /* last of chain of requests */
+        __REQ_HASHED,           /* on IO scheduler merge hash */
         __REQ_NR_BITS,          /* stops here */
 };
 
@@ -241,5 +242,6 @@ enum rq_flag_bits {
 #define REQ_KERNEL              (1ULL << __REQ_KERNEL)
 #define REQ_PM                  (1ULL << __REQ_PM)
 #define REQ_END                 (1ULL << __REQ_END)
+#define REQ_HASHED              (1ULL << __REQ_HASHED)
 
 #endif /* __LINUX_BLK_TYPES_H */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1e1fa3f93d5f..0d84981ee03f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -118,7 +118,18 @@ struct request {
         struct bio *bio;
         struct bio *biotail;
 
-        struct hlist_node hash; /* merge hash */
+        /*
+         * The hash is used inside the scheduler, and killed once the
+         * request reaches the dispatch list. The ipi_list is only used
+         * to queue the request for softirq completion, which is long
+         * after the request has been unhashed (and even removed from
+         * the dispatch list).
+         */
+        union {
+                struct hlist_node hash; /* merge hash */
+                struct list_head ipi_list;
+        };
+
         /*
          * The rb_node is only used inside the io scheduler, requests
          * are pruned when moved to the dispatch queue. So let the
@@ -824,8 +835,8 @@ extern int blk_rq_map_user(struct request_queue *, struct request *,
 extern int blk_rq_unmap_user(struct bio *);
 extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t);
 extern int blk_rq_map_user_iov(struct request_queue *, struct request *,
-                               struct rq_map_data *, struct sg_iovec *, int,
-                               unsigned int, gfp_t);
+                               struct rq_map_data *, const struct sg_iovec *,
+                               int, unsigned int, gfp_t);
 extern int blk_execute_rq(struct request_queue *, struct gendisk *,
                           struct request *, int);
 extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index d77797a52b7b..c40302f909ce 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -210,8 +210,8 @@ int block_write_full_page(struct page *page, get_block_t *get_block,
 int block_write_full_page_endio(struct page *page, get_block_t *get_block,
                         struct writeback_control *wbc, bh_end_io_t *handler);
 int block_read_full_page(struct page*, get_block_t*);
-int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
-                                unsigned long from);
+int block_is_partially_uptodate(struct page *page, unsigned long from,
+                                unsigned long count);
 int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
                 unsigned flags, struct page **pagep, get_block_t *get_block);
 int __block_write_begin(struct page *page, loff_t pos, unsigned len,
diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h
new file mode 100644
index 000000000000..d1e49d52b640
--- /dev/null
+++ b/include/linux/compiler-clang.h
@@ -0,0 +1,12 @@
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-clang.h> directly, include <linux/compiler.h> instead."
+#endif
+
+/* Some compiler specific definitions are overwritten here
+ * for Clang compiler
+ */
+
+#ifdef uninitialized_var
+#undef uninitialized_var
+#define uninitialized_var(x) x = *(&(x))
+#endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 2472740d7ab2..ee7239ea1583 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -63,6 +63,13 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 # include <linux/compiler-intel.h>
 #endif
 
+/* Clang compiler defines __GNUC__. So we will overwrite implementations
+ * coming from above header files here
+ */
+#ifdef __clang__
+#include <linux/compiler-clang.h>
+#endif
+
 /*
  * Generic compiler-dependent macros required for kernel
  * build go below this comment. Actual compiler/compiler version
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index c48e595f623e..5ae5100c1f24 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -455,11 +455,14 @@ extern struct cpufreq_governor cpufreq_gov_conservative;
  *                     FREQUENCY TABLE HELPERS                       *
  *********************************************************************/
 
-#define CPUFREQ_ENTRY_INVALID ~0
-#define CPUFREQ_TABLE_END     ~1
-#define CPUFREQ_BOOST_FREQ    ~2
+/* Special Values of .frequency field */
+#define CPUFREQ_ENTRY_INVALID   ~0
+#define CPUFREQ_TABLE_END       ~1
+/* Special Values of .flags field */
+#define CPUFREQ_BOOST_FREQ      (1 << 0)
 
 struct cpufreq_frequency_table {
+        unsigned int    flags;
         unsigned int    driver_data; /* driver specific data, not used by core */
         unsigned int    frequency; /* kHz - doesn't need to be in ascending
                                     * order */
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index c5c92d59e531..8300fb87b84a 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -341,15 +341,11 @@ enum dma_slave_buswidth {
  * and this struct will then be passed in as an argument to the
  * DMA engine device_control() function.
  *
- * The rationale for adding configuration information to this struct
- * is as follows: if it is likely that most DMA slave controllers in
- * the world will support the configuration option, then make it
- * generic. If not: if it is fixed so that it be sent in static from
- * the platform data, then prefer to do that. Else, if it is neither
- * fixed at runtime, nor generic enough (such as bus mastership on
- * some CPU family and whatnot) then create a custom slave config
- * struct and pass that, then make this config a member of that
- * struct, if applicable.
+ * The rationale for adding configuration information to this struct is as
+ * follows: if it is likely that more than one DMA slave controllers in
+ * the world will support the configuration option, then make it generic.
+ * If not: if it is fixed so that it be sent in static from the platform
+ * data, then prefer to do that.
  */
 struct dma_slave_config {
         enum dma_transfer_direction direction;
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 481ab2345d6b..68b4024184de 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -1,6 +1,5 @@
 /*
- * Driver for the Synopsys DesignWare DMA Controller (aka DMACA on
- * AVR32 systems.)
+ * Driver for the Synopsys DesignWare DMA Controller
  *
  * Copyright (C) 2007 Atmel Corporation
  * Copyright (C) 2010-2011 ST Microelectronics
@@ -44,8 +43,6 @@ struct dw_dma_slave {
  * @nr_masters: Number of AHB masters supported by the controller
  * @data_width: Maximum data width supported by hardware per AHB master
  *              (0 - 8bits, 1 - 16bits, ..., 5 - 256bits)
- * @sd: slave specific data. Used for configuring channels
- * @sd_count: count of slave data structures passed.
  */
 struct dw_dma_platform_data {
         unsigned int    nr_channels;
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 70e8e21c0a30..230f87bdf5ad 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -63,8 +63,6 @@ struct file_operations;
 struct vfsmount;
 struct dentry;
 
-extern void __init files_defer_init(void);
-
 #define rcu_dereference_check_fdtable(files, fdtfd) \
         rcu_dereference_check((fdtfd), lockdep_is_held(&(files)->file_lock))
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 81048f9bc783..7a9c5bca2b76 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -48,6 +48,7 @@ struct cred;
 struct swap_info_struct;
 struct seq_file;
 struct workqueue_struct;
+struct iov_iter;
 
 extern void __init inode_init(void);
 extern void __init inode_init_early(void);
@@ -125,6 +126,8 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
 
 /* File needs atomic accesses to f_pos */
 #define FMODE_ATOMIC_POS        ((__force fmode_t)0x8000)
+/* Write access to underlying fs */
+#define FMODE_WRITER            ((__force fmode_t)0x10000)
 
 /* File was opened by fanotify and shouldn't generate fanotify events */
 #define FMODE_NONOTIFY          ((__force fmode_t)0x1000000)
@@ -293,38 +296,6 @@ struct page;
 struct address_space;
 struct writeback_control;
 
-struct iov_iter {
-        const struct iovec *iov;
-        unsigned long nr_segs;
-        size_t iov_offset;
-        size_t count;
-};
-
-size_t iov_iter_copy_from_user_atomic(struct page *page,
-                struct iov_iter *i, unsigned long offset, size_t bytes);
-size_t iov_iter_copy_from_user(struct page *page,
-                struct iov_iter *i, unsigned long offset, size_t bytes);
-void iov_iter_advance(struct iov_iter *i, size_t bytes);
-int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes);
-size_t iov_iter_single_seg_count(const struct iov_iter *i);
-
-static inline void iov_iter_init(struct iov_iter *i,
-                        const struct iovec *iov, unsigned long nr_segs,
-                        size_t count, size_t written)
-{
-        i->iov = iov;
-        i->nr_segs = nr_segs;
-        i->iov_offset = 0;
-        i->count = count + written;
-
-        iov_iter_advance(i, written);
-}
-
-static inline size_t iov_iter_count(struct iov_iter *i)
-{
-        return i->count;
-}
-
 /*
  * "descriptor" for what we're up to with a read.
  * This allows us to use the same read code yet
@@ -383,7 +354,7 @@ struct address_space_operations {
         int (*migratepage) (struct address_space *,
                         struct page *, struct page *, enum migrate_mode);
         int (*launder_page) (struct page *);
-        int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+        int (*is_partially_uptodate) (struct page *, unsigned long,
                                         unsigned long);
         void (*is_dirty_writeback) (struct page *, bool *, bool *);
         int (*error_remove_page)(struct address_space *, struct page *);
@@ -770,9 +741,6 @@ static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index)
                 index <  ra->start + ra->size);
 }
 
-#define FILE_MNT_WRITE_TAKEN    1
-#define FILE_MNT_WRITE_RELEASED 2
-
 struct file {
         union {
                 struct llist_node       fu_llist;
@@ -810,9 +778,6 @@ struct file {
         struct list_head        f_tfile_llink;
 #endif /* #ifdef CONFIG_EPOLL */
         struct address_space    *f_mapping;
-#ifdef CONFIG_DEBUG_WRITECOUNT
-        unsigned long f_mnt_write_state;
-#endif
 } __attribute__((aligned(4)));  /* lest something weird decides that 2 is OK */
 
 struct file_handle {
@@ -830,49 +795,6 @@ static inline struct file *get_file(struct file *f)
 #define fput_atomic(x)  atomic_long_add_unless(&(x)->f_count, -1, 1)
 #define file_count(x)   atomic_long_read(&(x)->f_count)
 
-#ifdef CONFIG_DEBUG_WRITECOUNT
-static inline void file_take_write(struct file *f)
-{
-        WARN_ON(f->f_mnt_write_state != 0);
-        f->f_mnt_write_state = FILE_MNT_WRITE_TAKEN;
-}
-static inline void file_release_write(struct file *f)
-{
-        f->f_mnt_write_state |= FILE_MNT_WRITE_RELEASED;
-}
-static inline void file_reset_write(struct file *f)
-{
-        f->f_mnt_write_state = 0;
-}
-static inline void file_check_state(struct file *f)
-{
-        /*
-         * At this point, either both or neither of these bits
-         * should be set.
-         */
-        WARN_ON(f->f_mnt_write_state == FILE_MNT_WRITE_TAKEN);
-        WARN_ON(f->f_mnt_write_state == FILE_MNT_WRITE_RELEASED);
-}
-static inline int file_check_writeable(struct file *f)
-{
-        if (f->f_mnt_write_state == FILE_MNT_WRITE_TAKEN)
-                return 0;
-        printk(KERN_WARNING "writeable file with no "
-                            "mnt_want_write()\n");
-        WARN_ON(1);
-        return -EINVAL;
-}
-#else /* !CONFIG_DEBUG_WRITECOUNT */
-static inline void file_take_write(struct file *filp) {}
-static inline void file_release_write(struct file *filp) {}
-static inline void file_reset_write(struct file *filp) {}
-static inline void file_check_state(struct file *filp) {}
-static inline int file_check_writeable(struct file *filp)
-{
-        return 0;
-}
-#endif /* CONFIG_DEBUG_WRITECOUNT */
-
 #define MAX_NON_LFS     ((1UL<<31) - 1)
 
 /* Page cache limit. The filesystems should put that into their s_maxbytes 
@@ -2481,16 +2403,13 @@ extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_remap_pages(struct vm_area_struct *, unsigned long addr,
                 unsigned long size, pgoff_t pgoff);
-extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
 int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
 extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
-extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long,
-                loff_t *);
+extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long);
 extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
 extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
-                unsigned long *, loff_t, loff_t *, size_t, size_t);
-extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
-                unsigned long, loff_t, loff_t *, size_t, ssize_t);
+                unsigned long *, loff_t, size_t, size_t);
+extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
 extern int generic_segment_checks(const struct iovec *iov,
@@ -2582,7 +2501,7 @@ extern const struct file_operations generic_ro_fops;
 
 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
 
-extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
+extern int readlink_copy(char __user *, int, const char *);
 extern int page_readlink(struct dentry *, char __user *, int);
 extern void *page_follow_link_light(struct dentry *, struct nameidata *);
 extern void page_put_link(struct dentry *, struct nameidata *, void *);
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index cdc30111d2f8..d16da3e53bc7 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -7,6 +7,7 @@
 #include <linux/percpu.h>
 #include <linux/hardirq.h>
 #include <linux/perf_event.h>
+#include <linux/tracepoint.h>
 
 struct trace_array;
 struct trace_buffer;
@@ -232,6 +233,7 @@ enum {
         TRACE_EVENT_FL_IGNORE_ENABLE_BIT,
         TRACE_EVENT_FL_WAS_ENABLED_BIT,
         TRACE_EVENT_FL_USE_CALL_FILTER_BIT,
+        TRACE_EVENT_FL_TRACEPOINT_BIT,
 };
 
 /*
@@ -244,6 +246,7 @@ enum {
  *                    (used for module unloading, if a module event is enabled,
  *                     it is best to clear the buffers that used it).
  *  USE_CALL_FILTER - For ftrace internal events, don't use file filter
+ *  TRACEPOINT    - Event is a tracepoint
  */
 enum {
         TRACE_EVENT_FL_FILTERED         = (1 << TRACE_EVENT_FL_FILTERED_BIT),
@@ -252,12 +255,17 @@ enum {
         TRACE_EVENT_FL_IGNORE_ENABLE    = (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT),
         TRACE_EVENT_FL_WAS_ENABLED      = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),
         TRACE_EVENT_FL_USE_CALL_FILTER  = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),
+        TRACE_EVENT_FL_TRACEPOINT       = (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),
 };
 
 struct ftrace_event_call {
         struct list_head        list;
         struct ftrace_event_class *class;
-        char                    *name;
+        union {
+                char                    *name;
+                /* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */
+                struct tracepoint       *tp;
+        };
         struct trace_event      event;
         const char              *print_fmt;
         struct event_filter     *filter;
@@ -271,6 +279,7 @@ struct ftrace_event_call {
          *   bit 3:             ftrace internal event (do not enable)
          *   bit 4:             Event was enabled by module
          *   bit 5:             use call filter rather than file filter
+         *   bit 6:             Event is a tracepoint
          */
         int                     flags; /* static flags of different events */
 
@@ -283,6 +292,15 @@ struct ftrace_event_call {
 #endif
 };
 
+static inline const char *
+ftrace_event_name(struct ftrace_event_call *call)
+{
+        if (call->flags & TRACE_EVENT_FL_TRACEPOINT)
+                return call->tp ? call->tp->name : NULL;
+        else
+                return call->name;
+}
+
 struct trace_array;
 struct ftrace_subsystem_dir;
 
@@ -353,7 +371,7 @@ struct ftrace_event_file {
 #define __TRACE_EVENT_FLAGS(name, value)                                \
         static int __init trace_init_flags_##name(void)                 \
         {                                                               \
-                event_##name.flags = value;                             \
+                event_##name.flags |= value;                            \
                 return 0;                                               \
         }                                                               \
         early_initcall(trace_init_flags_##name);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index deddeb8c337c..b556e0ab946f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -487,6 +487,7 @@ void i2c_unlock_adapter(struct i2c_adapter *);
 #define I2C_CLASS_HWMON         (1<<0)  /* lm_sensors, ... */
 #define I2C_CLASS_DDC           (1<<3)  /* DDC bus on graphics adapters */
 #define I2C_CLASS_SPD           (1<<7)  /* Memory modules */
+#define I2C_CLASS_DEPRECATED    (1<<8)  /* Warn users that adapter will stop using classes */
 
 /* Internal numbers to terminate lists */
 #define I2C_CLIENT_END          0xfffeU
diff --git a/include/linux/i2c/bfin_twi.h b/include/linux/i2c/bfin_twi.h
new file mode 100644
index 000000000000..135a4e0876ae
--- /dev/null
+++ b/include/linux/i2c/bfin_twi.h
@@ -0,0 +1,145 @@
+/*
+ * i2c-bfin-twi.h - interface to ADI TWI controller
+ *
+ * Copyright 2005-2014 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __I2C_BFIN_TWI_H__
+#define __I2C_BFIN_TWI_H__
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/*
+ * ADI twi registers layout
+ */
+struct bfin_twi_regs {
+        u16 clkdiv;
+        u16 dummy1;
+        u16 control;
+        u16 dummy2;
+        u16 slave_ctl;
+        u16 dummy3;
+        u16 slave_stat;
+        u16 dummy4;
+        u16 slave_addr;
+        u16 dummy5;
+        u16 master_ctl;
+        u16 dummy6;
+        u16 master_stat;
+        u16 dummy7;
+        u16 master_addr;
+        u16 dummy8;
+        u16 int_stat;
+        u16 dummy9;
+        u16 int_mask;
+        u16 dummy10;
+        u16 fifo_ctl;
+        u16 dummy11;
+        u16 fifo_stat;
+        u16 dummy12;
+        u32 __pad[20];
+        u16 xmt_data8;
+        u16 dummy13;
+        u16 xmt_data16;
+        u16 dummy14;
+        u16 rcv_data8;
+        u16 dummy15;
+        u16 rcv_data16;
+        u16 dummy16;
+};
+
+struct bfin_twi_iface {
+        int                     irq;
+        spinlock_t              lock;
+        char                    read_write;
+        u8                      command;
+        u8                      *transPtr;
+        int                     readNum;
+        int                     writeNum;
+        int                     cur_mode;
+        int                     manual_stop;
+        int                     result;
+        struct i2c_adapter      adap;
+        struct completion       complete;
+        struct i2c_msg          *pmsg;
+        int                     msg_num;
+        int                     cur_msg;
+        u16                     saved_clkdiv;
+        u16                     saved_control;
+        struct bfin_twi_regs __iomem *regs_base;
+};
+
+/*  ********************  TWO-WIRE INTERFACE (TWI) MASKS  ********************/
+/* TWI_CLKDIV Macros (Use: *pTWI_CLKDIV = CLKLOW(x)|CLKHI(y);  ) */
+#define CLKLOW(x)       ((x) & 0xFF)    /* Periods Clock Is Held Low */
+#define CLKHI(y)        (((y)&0xFF)<<0x8) /* Periods Before New Clock Low */
+
+/* TWI_PRESCALE Masks */
+#define PRESCALE        0x007F  /* SCLKs Per Internal Time Reference (10MHz) */
+#define TWI_ENA         0x0080  /* TWI Enable */
+#define SCCB            0x0200  /* SCCB Compatibility Enable */
+
+/* TWI_SLAVE_CTL Masks */
+#define SEN             0x0001  /* Slave Enable */
+#define SADD_LEN        0x0002  /* Slave Address Length */
+#define STDVAL          0x0004  /* Slave Transmit Data Valid */
+#define NAK             0x0008  /* NAK Generated At Conclusion Of Transfer */
+#define GEN             0x0010  /* General Call Address Matching Enabled */
+
+/* TWI_SLAVE_STAT Masks */
+#define SDIR            0x0001  /* Slave Transfer Direction (RX/TX*) */
+#define GCALL           0x0002  /* General Call Indicator */
+
+/* TWI_MASTER_CTL Masks */
+#define MEN             0x0001  /* Master Mode Enable          */
+#define MADD_LEN        0x0002  /* Master Address Length       */
+#define MDIR            0x0004  /* Master Transmit Direction (RX/TX*) */
+#define FAST            0x0008  /* Use Fast Mode Timing Specs  */
+#define STOP            0x0010  /* Issue Stop Condition        */
+#define RSTART          0x0020  /* Repeat Start or Stop* At End Of Transfer */
+#define DCNT            0x3FC0  /* Data Bytes To Transfer      */
+#define SDAOVR          0x4000  /* Serial Data Override        */
+#define SCLOVR          0x8000  /* Serial Clock Override       */
+
+/* TWI_MASTER_STAT Masks */
+#define MPROG           0x0001  /* Master Transfer In Progress */
+#define LOSTARB         0x0002  /* Lost Arbitration Indicator (Xfer Aborted) */
+#define ANAK            0x0004  /* Address Not Acknowledged    */
+#define DNAK            0x0008  /* Data Not Acknowledged       */
+#define BUFRDERR        0x0010  /* Buffer Read Error           */
+#define BUFWRERR        0x0020  /* Buffer Write Error          */
+#define SDASEN          0x0040  /* Serial Data Sense           */
+#define SCLSEN          0x0080  /* Serial Clock Sense          */
+#define BUSBUSY         0x0100  /* Bus Busy Indicator          */
+
+/* TWI_INT_SRC and TWI_INT_ENABLE Masks */
+#define SINIT           0x0001  /* Slave Transfer Initiated    */
+#define SCOMP           0x0002  /* Slave Transfer Complete     */
+#define SERR            0x0004  /* Slave Transfer Error        */
+#define SOVF            0x0008  /* Slave Overflow              */
+#define MCOMP           0x0010  /* Master Transfer Complete    */
+#define MERR            0x0020  /* Master Transfer Error       */
+#define XMTSERV         0x0040  /* Transmit FIFO Service       */
+#define RCVSERV         0x0080  /* Receive FIFO Service        */
+
+/* TWI_FIFO_CTRL Masks */
+#define XMTFLUSH        0x0001  /* Transmit Buffer Flush                 */
+#define RCVFLUSH        0x0002  /* Receive Buffer Flush                  */
+#define XMTINTLEN       0x0004  /* Transmit Buffer Interrupt Length      */
+#define RCVINTLEN       0x0008  /* Receive Buffer Interrupt Length       */
+
+/* TWI_FIFO_STAT Masks */
+#define XMTSTAT         0x0003  /* Transmit FIFO Status                  */
+#define XMT_EMPTY       0x0000  /* Transmit FIFO Empty                   */
+#define XMT_HALF        0x0001  /* Transmit FIFO Has 1 Byte To Write     */
+#define XMT_FULL        0x0003  /* Transmit FIFO Full (2 Bytes To Write) */
+
+#define RCVSTAT         0x000C  /* Receive FIFO Status                   */
+#define RCV_EMPTY       0x0000  /* Receive FIFO Empty                    */
+#define RCV_HALF        0x0004  /* Receive FIFO Has 1 Byte To Read       */
+#define RCV_FULL        0x000C  /* Receive FIFO Full (2 Bytes To Read)   */
+
+#endif
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index ac39d910e70b..a326c850f046 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -104,6 +104,9 @@ enum {
         MC13892_LED_R,
         MC13892_LED_G,
         MC13892_LED_B,
+        /* MC34708 LED IDs */
+        MC34708_LED_R,
+        MC34708_LED_G,
 };
 
 struct mc13xxx_led_platform_data {
@@ -163,6 +166,9 @@ struct mc13xxx_leds_platform_data {
 #define MC13892_LED_C2_CURRENT_G(x)     (((x) & 0x7) << 21)
 /* MC13892 LED Control 3 */
 #define MC13892_LED_C3_CURRENT_B(x)     (((x) & 0x7) << 9)
+/* MC34708 LED Control 0 */
+#define MC34708_LED_C0_CURRENT_R(x)     (((x) & 0x3) << 9)
+#define MC34708_LED_C0_CURRENT_G(x)     (((x) & 0x3) << 21)
         u32 led_control[MAX_LED_CONTROL_REGS];
 };
 
diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/mfd/rtsx_common.h
index 443176ee1ab0..7c36cc55d2c7 100644
--- a/include/linux/mfd/rtsx_common.h
+++ b/include/linux/mfd/rtsx_common.h
@@ -45,6 +45,7 @@ struct platform_device;
 struct rtsx_slot {
         struct platform_device  *p_dev;
         void                    (*card_event)(struct platform_device *p_dev);
+        void                    (*done_transfer)(struct platform_device *p_dev);
 };
 
 #endif
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 0ce772105508..8d6bbd609ad9 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -144,7 +144,7 @@
 #define HOST_TO_DEVICE          0
 #define DEVICE_TO_HOST          1
 
-#define MAX_PHASE               31
+#define RTSX_PHASE_MAX          32
 #define RX_TUNING_CNT           3
 
 /* SG descriptor */
@@ -943,6 +943,12 @@ void rtsx_pci_send_cmd_no_wait(struct rtsx_pcr *pcr);
 int rtsx_pci_send_cmd(struct rtsx_pcr *pcr, int timeout);
 int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist *sglist,
                 int num_sg, bool read, int timeout);
+int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int num_sg, bool read);
+int rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int num_sg, bool read);
+int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *sglist,
+                int sg_count, bool read);
 int rtsx_pci_read_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len);
 int rtsx_pci_write_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len);
 int rtsx_pci_card_pull_ctl_enable(struct rtsx_pcr *pcr, int card);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index abc848412e3c..bf9811e1321a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1204,6 +1204,7 @@ void account_page_writeback(struct page *page);
 int set_page_dirty(struct page *page);
 int set_page_dirty_lock(struct page *page);
 int clear_page_dirty_for_io(struct page *page);
+int get_cmdline(struct task_struct *task, char *buffer, int buflen);
 
 /* Is the vma a continuation of the stack vma above it? */
 static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 87079fc38011..f206e29f94d7 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -95,7 +95,7 @@ struct mmc_command {
  *              actively failing requests
  */
 
-        unsigned int            cmd_timeout_ms; /* in milliseconds */
+        unsigned int            busy_timeout;   /* busy detect timeout in ms */
         /* Set this flag only for blocking sanitize request */
         bool                    sanitize_busy;
 
@@ -152,7 +152,7 @@ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
 extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
 extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool,
-                        bool);
+                        bool, bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
 extern int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
 
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 99f5709ac343..cb61ea4d6945 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -264,15 +264,12 @@ struct mmc_host {
         u32                     caps2;          /* More host capabilities */
 
 #define MMC_CAP2_BOOTPART_NOACC (1 << 0)        /* Boot partition no access */
-#define MMC_CAP2_CACHE_CTRL     (1 << 1)        /* Allow cache control */
 #define MMC_CAP2_FULL_PWR_CYCLE (1 << 2)        /* Can do full power cycle */
 #define MMC_CAP2_NO_MULTI_READ  (1 << 3)        /* Multiblock reads don't work */
-#define MMC_CAP2_NO_SLEEP_CMD   (1 << 4)        /* Don't allow sleep command */
 #define MMC_CAP2_HS200_1_8V_SDR (1 << 5)        /* can support */
 #define MMC_CAP2_HS200_1_2V_SDR (1 << 6)        /* can support */
 #define MMC_CAP2_HS200          (MMC_CAP2_HS200_1_8V_SDR | \
                                  MMC_CAP2_HS200_1_2V_SDR)
-#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)        /* Use the broken voltage */
 #define MMC_CAP2_HC_ERASE_SZ    (1 << 9)        /* High-capacity erase size */
 #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10)       /* Card-detect signal active high */
 #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)       /* Write-protect signal active high */
@@ -281,7 +278,6 @@ struct mmc_host {
 #define MMC_CAP2_PACKED_CMD     (MMC_CAP2_PACKED_RD | \
                                  MMC_CAP2_PACKED_WR)
 #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14)   /* Don't power up before scan */
-#define MMC_CAP2_SANITIZE       (1 << 15)               /* Support Sanitize */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
@@ -304,7 +300,7 @@ struct mmc_host {
         unsigned int            max_req_size;   /* maximum number of bytes in one req */
         unsigned int            max_blk_size;   /* maximum size of one mmc block */
         unsigned int            max_blk_count;  /* maximum number of blocks in one req */
-        unsigned int            max_discard_to; /* max. discard timeout in ms */
+        unsigned int            max_busy_timeout; /* max busy timeout in ms */
 
         /* private data */
         spinlock_t              lock;           /* lock for claim and bus ops */
@@ -388,8 +384,6 @@ int mmc_power_restore_host(struct mmc_host *host);
 void mmc_detect_change(struct mmc_host *, unsigned long delay);
 void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
-int mmc_cache_ctrl(struct mmc_host *, u8);
-
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
         host->ops->enable_sdio_irq(host, 0);
@@ -424,12 +418,9 @@ static inline int mmc_regulator_get_supply(struct mmc_host *mmc)
 
 int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *);
 
-/* Module parameter */
-extern bool mmc_assume_removable;
-
 static inline int mmc_card_is_removable(struct mmc_host *host)
 {
-        return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable;
+        return !(host->caps & MMC_CAP_NONREMOVABLE);
 }
 
 static inline int mmc_card_keep_power(struct mmc_host *host)
diff --git a/include/linux/mmc/sdhci-spear.h b/include/linux/mmc/sdhci-spear.h
index e78c0e236e9d..8cc095a76cf8 100644
--- a/include/linux/mmc/sdhci-spear.h
+++ b/include/linux/mmc/sdhci-spear.h
@@ -18,17 +18,9 @@
 /*
  * struct sdhci_plat_data: spear sdhci platform data structure
  *
- * @card_power_gpio: gpio pin for enabling/disabling power to sdhci socket
- * @power_active_high: if set, enable power to sdhci socket by setting
- *                      card_power_gpio
- * @power_always_enb: If set, then enable power on probe, otherwise enable only
- *                      on card insertion and disable on card removal.
  * card_int_gpio: gpio pin used for card detection
  */
 struct sdhci_plat_data {
-        int card_power_gpio;
-        int power_active_high;
-        int power_always_enb;
         int card_int_gpio;
 };
 
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 362927c48f97..7be12b883485 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -100,6 +100,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_BROKEN_HOST_CONTROL                (1<<5)
 /* Controller does not support HS200 */
 #define SDHCI_QUIRK2_BROKEN_HS200                       (1<<6)
+/* Controller does not support DDR50 */
+#define SDHCI_QUIRK2_BROKEN_DDR50                       (1<<7)
 
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
index b0c73e4cacea..d2433381e828 100644
--- a/include/linux/mmc/slot-gpio.h
+++ b/include/linux/mmc/slot-gpio.h
@@ -22,4 +22,10 @@ int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio,
                         unsigned int debounce);
 void mmc_gpio_free_cd(struct mmc_host *host);
 
+int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
+                         unsigned int idx, bool override_active_level,
+                         unsigned int debounce);
+void mmc_gpiod_free_cd(struct mmc_host *host);
+void mmc_gpiod_request_cd_irq(struct mmc_host *host);
+
 #endif
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 9a165a213d93..44eeef0da186 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -556,6 +556,11 @@ struct amba_id {
  * See documentation of "x86_match_cpu" for details.
  */
 
+/*
+ * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id.
+ * Although gcc seems to ignore this error, clang fails without this define.
+ */
+#define x86cpu_device_id x86_cpu_id
 struct x86_cpu_id {
         __u16 vendor;
         __u16 family;
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 371d346fa270..839bac270904 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -44,6 +44,8 @@ struct mnt_namespace;
 #define MNT_SHARED_MASK (MNT_UNBINDABLE)
 #define MNT_PROPAGATION_MASK    (MNT_SHARED | MNT_UNBINDABLE)
 
+#define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \
+                            MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED)
 
 #define MNT_INTERNAL    0x4000
 
@@ -51,6 +53,7 @@ struct mnt_namespace;
 #define MNT_LOCKED              0x800000
 #define MNT_DOOMED              0x1000000
 #define MNT_SYNC_UMOUNT         0x2000000
+#define MNT_MARKED              0x4000000
 
 struct vfsmount {
         struct dentry *mnt_root;        /* root of the mounted tree */
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index ae4981ebd18e..f62f78aef4ac 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -24,8 +24,7 @@ struct request;
 struct nbd_device {
         int flags;
         int harderror;          /* Code of hard error                   */
-        struct socket * sock;
-        struct file * file;     /* If == NULL, device is not ready, yet */
+        struct socket * sock;   /* If == NULL, device is not ready, yet */
         int magic;
 
         spinlock_t queue_lock;
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index f6a15205853b..9ac1a62fc6f5 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -50,8 +50,13 @@ struct ntb_transport_qp;
 
 struct ntb_client {
         struct device_driver driver;
-        int (*probe) (struct pci_dev *pdev);
-        void (*remove) (struct pci_dev *pdev);
+        int (*probe)(struct pci_dev *pdev);
+        void (*remove)(struct pci_dev *pdev);
+};
+
+enum {
+        NTB_LINK_DOWN = 0,
+        NTB_LINK_UP,
 };
 
 int ntb_register_client(struct ntb_client *drvr);
@@ -60,11 +65,11 @@ int ntb_register_client_dev(char *device_name);
 void ntb_unregister_client_dev(char *device_name);
 
 struct ntb_queue_handlers {
-        void (*rx_handler) (struct ntb_transport_qp *qp, void *qp_data,
-                            void *data, int len);
-        void (*tx_handler) (struct ntb_transport_qp *qp, void *qp_data,
-                            void *data, int len);
-        void (*event_handler) (void *data, int status);
+        void (*rx_handler)(struct ntb_transport_qp *qp, void *qp_data,
+                           void *data, int len);
+        void (*tx_handler)(struct ntb_transport_qp *qp, void *qp_data,
+                           void *data, int len);
+        void (*event_handler)(void *data, int status);
 };
 
 unsigned char ntb_transport_qp_num(struct ntb_transport_qp *qp);
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 6b9aafed225f..a50173ca1d72 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -66,20 +66,25 @@ enum {
 
 #define NVME_VS(major, minor)   (major << 16 | minor)
 
-#define NVME_IO_TIMEOUT (5 * HZ)
+extern unsigned char io_timeout;
+#define NVME_IO_TIMEOUT (io_timeout * HZ)
 
 /*
  * Represents an NVM Express device.  Each nvme_dev is a PCI function.
  */
 struct nvme_dev {
         struct list_head node;
-        struct nvme_queue **queues;
+        struct nvme_queue __rcu **queues;
+        unsigned short __percpu *io_queue;
         u32 __iomem *dbs;
         struct pci_dev *pci_dev;
         struct dma_pool *prp_page_pool;
         struct dma_pool *prp_small_pool;
         int instance;
-        int queue_count;
+        unsigned queue_count;
+        unsigned online_queues;
+        unsigned max_qid;
+        int q_depth;
         u32 db_stride;
         u32 ctrl_config;
         struct msix_entry *entry;
@@ -89,6 +94,7 @@ struct nvme_dev {
         struct miscdevice miscdev;
         work_func_t reset_workfn;
         struct work_struct reset_work;
+        struct notifier_block nb;
         char name[12];
         char serial[20];
         char model[40];
@@ -131,6 +137,7 @@ struct nvme_iod {
         int length;             /* Of data, in bytes */
         unsigned long start_time;
         dma_addr_t first_dma;
+        struct list_head node;
         struct scatterlist sg[0];
 };
 
@@ -146,16 +153,12 @@ static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector)
  */
 void nvme_free_iod(struct nvme_dev *dev, struct nvme_iod *iod);
 
-int nvme_setup_prps(struct nvme_dev *dev, struct nvme_common_command *cmd,
-                        struct nvme_iod *iod, int total_len, gfp_t gfp);
+int nvme_setup_prps(struct nvme_dev *, struct nvme_iod *, int , gfp_t);
 struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
                                 unsigned long addr, unsigned length);
 void nvme_unmap_user_pages(struct nvme_dev *dev, int write,
                         struct nvme_iod *iod);
-struct nvme_queue *get_nvmeq(struct nvme_dev *dev);
-void put_nvmeq(struct nvme_queue *nvmeq);
-int nvme_submit_sync_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd,
-                                                u32 *result, unsigned timeout);
+int nvme_submit_io_cmd(struct nvme_dev *, struct nvme_command *, u32 *);
 int nvme_submit_flush_data(struct nvme_queue *nvmeq, struct nvme_ns *ns);
 int nvme_submit_admin_cmd(struct nvme_dev *, struct nvme_command *,
                                                         u32 *result);
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 4d9389c79e61..eb8b8ac6df3c 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -83,23 +83,6 @@ struct pipe_buf_operations {
         int can_merge;
 
         /*
-         * ->map() returns a virtual address mapping of the pipe buffer.
-         * The last integer flag reflects whether this should be an atomic
-         * mapping or not. The atomic map is faster, however you can't take
-         * page faults before calling ->unmap() again. So if you need to eg
-         * access user data through copy_to/from_user(), then you must get
-         * a non-atomic map. ->map() uses the kmap_atomic slot for
-         * atomic maps, you have to be careful if mapping another page as
-         * source or destination for a copy.
-         */
-        void * (*map)(struct pipe_inode_info *, struct pipe_buffer *, int);
-
-        /*
-         * Undoes ->map(), finishes the virtual mapping of the pipe buffer.
-         */
-        void (*unmap)(struct pipe_inode_info *, struct pipe_buffer *, void *);
-
-        /*
          * ->confirm() verifies that the data in the pipe buffer is there
          * and that the contents are good. If the pages in the pipe belong
          * to a file system, we may need to wait for IO completion in this
@@ -150,8 +133,6 @@ struct pipe_inode_info *alloc_pipe_info(void);
 void free_pipe_info(struct pipe_inode_info *);
 
 /* Generic pipe buffer ops functions */
-void *generic_pipe_buf_map(struct pipe_inode_info *, struct pipe_buffer *, int);
-void generic_pipe_buf_unmap(struct pipe_inode_info *, struct pipe_buffer *, void *);
 void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
 int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *);
 int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *);
diff --git a/include/linux/platform_data/dma-rcar-audmapp.h b/include/linux/platform_data/dma-rcar-audmapp.h
new file mode 100644
index 000000000000..471fffebbeb4
--- /dev/null
+++ b/include/linux/platform_data/dma-rcar-audmapp.h
@@ -0,0 +1,34 @@
+/*
+ * This is for Renesas R-Car Audio-DMAC-peri-peri.
+ *
+ * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright (C) 2014 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This file is based on the include/linux/sh_dma.h
+ *
+ * Header for the new SH dmaengine driver
+ *
+ * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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.
+ */
+#ifndef SH_AUDMAPP_H
+#define SH_AUDMAPP_H
+
+#include <linux/dmaengine.h>
+
+struct audmapp_slave_config {
+        int             slave_id;
+        dma_addr_t      src;
+        dma_addr_t      dst;
+        u32             chcr;
+};
+
+struct audmapp_pdata {
+        struct audmapp_slave_config *slave;
+        int slave_num;
+};
+
+#endif /* SH_AUDMAPP_H */
diff --git a/include/linux/platform_data/i2c-s3c2410.h b/include/linux/platform_data/i2c-s3c2410.h
index 2a50048c1c44..05af66b840b9 100644
--- a/include/linux/platform_data/i2c-s3c2410.h
+++ b/include/linux/platform_data/i2c-s3c2410.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/iic.h
- *
+/*
  * Copyright 2004-2009 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *
@@ -10,8 +9,8 @@
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_ARCH_IIC_H
-#define __ASM_ARCH_IIC_H __FILE__
+#ifndef __I2C_S3C2410_H
+#define __I2C_S3C2410_H __FILE__
 
 #define S3C_IICFLG_FILTER       (1<<0)  /* enable s3c2440 filter */
 
@@ -76,4 +75,4 @@ extern void s3c_i2c7_cfg_gpio(struct platform_device *dev);
 
 extern struct s3c2410_platform_i2c default_i2c_data;
 
-#endif /* __ASM_ARCH_IIC_H */
+#endif /* __I2C_S3C2410_H */
diff --git a/include/linux/platform_data/leds-s3c24xx.h b/include/linux/platform_data/leds-s3c24xx.h
index d8a7672519b6..441a6f290649 100644
--- a/include/linux/platform_data/leds-s3c24xx.h
+++ b/include/linux/platform_data/leds-s3c24xx.h
@@ -1,5 +1,4 @@
-/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h
- *
+/*
  * Copyright (c) 2006 Simtec Electronics
  *      http://armlinux.simtec.co.uk/
  *      Ben Dooks <ben@simtec.co.uk>
@@ -11,8 +10,8 @@
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_ARCH_LEDSGPIO_H
-#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h"
+#ifndef __LEDS_S3C24XX_H
+#define __LEDS_S3C24XX_H
 
 #define S3C24XX_LEDF_ACTLOW     (1<<0)          /* LED is on when GPIO low */
 #define S3C24XX_LEDF_TRISTATE   (1<<1)          /* tristate to turn off */
@@ -25,4 +24,4 @@ struct s3c24xx_led_platdata {
         char                    *def_trigger;
 };
 
-#endif /* __ASM_ARCH_LEDSGPIO_H */
+#endif /* __LEDS_S3C24XX_H */
diff --git a/include/linux/platform_data/mmc-msm_sdcc.h b/include/linux/platform_data/mmc-msm_sdcc.h
index ffcd9e3a6a7e..55aa873c9396 100644
--- a/include/linux/platform_data/mmc-msm_sdcc.h
+++ b/include/linux/platform_data/mmc-msm_sdcc.h
@@ -1,8 +1,5 @@
-/*
- *  arch/arm/include/asm/mach/mmc.h
- */
-#ifndef ASMARM_MACH_MMC_H
-#define ASMARM_MACH_MMC_H
+#ifndef __MMC_MSM_SDCC_H
+#define __MMC_MSM_SDCC_H
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
diff --git a/include/linux/platform_data/mmc-mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
index 1190efedcb94..d02704cd3695 100644
--- a/include/linux/platform_data/mmc-mvsdio.h
+++ b/include/linux/platform_data/mmc-mvsdio.h
@@ -1,13 +1,11 @@
 /*
- * arch/arm/plat-orion/include/plat/mvsdio.h
- *
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __MACH_MVSDIO_H
-#define __MACH_MVSDIO_H
+#ifndef __MMC_MVSDIO_H
+#define __MMC_MVSDIO_H
 
 #include <linux/mbus.h>
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 075b3056c0c0..25f54c79f757 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1719,6 +1719,24 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
 }
 
 
+static inline int pid_alive(const struct task_struct *p);
+static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)
+{
+        pid_t pid = 0;
+
+        rcu_read_lock();
+        if (pid_alive(tsk))
+                pid = task_tgid_nr_ns(rcu_dereference(tsk->real_parent), ns);
+        rcu_read_unlock();
+
+        return pid;
+}
+
+static inline pid_t task_ppid_nr(const struct task_struct *tsk)
+{
+        return task_ppid_nr_ns(tsk, &init_pid_ns);
+}
+
 static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,
                                         struct pid_namespace *ns)
 {
@@ -1758,7 +1776,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
  *
  * Return: 1 if the process is alive. 0 otherwise.
  */
-static inline int pid_alive(struct task_struct *p)
+static inline int pid_alive(const struct task_struct *p)
 {
         return p->pids[PIDTYPE_PID].pid != NULL;
 }
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 8af2804bab16..70736b98c721 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -130,6 +130,8 @@ struct rpc_create_args {
 #define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT      (1UL << 9)
 
 struct rpc_clnt *rpc_create(struct rpc_create_args *args);
+struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
+                                        struct rpc_xprt *xprt);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
                                 const struct rpc_program *, u32);
 void rpc_task_reset_client(struct rpc_task *task, struct rpc_clnt *clnt);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 62fd1b756e99..2e780134f449 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -22,7 +22,7 @@ struct svc_sock {
 
         /* We keep the old state_change and data_ready CB's here */
         void                    (*sk_ostate)(struct sock *);
-        void                    (*sk_odata)(struct sock *, int bytes);
+        void                    (*sk_odata)(struct sock *);
         void                    (*sk_owspace)(struct sock *);
 
         /* private TCP part */
@@ -56,6 +56,7 @@ int		svc_recv(struct svc_rqst *, long);
 int             svc_send(struct svc_rqst *);
 void            svc_drop(struct svc_rqst *);
 void            svc_sock_update_bufs(struct svc_serv *serv);
+bool            svc_alien_sock(struct net *net, int fd);
 int             svc_addsock(struct svc_serv *serv, const int fd,
                                         char *name_return, const size_t len);
 void            svc_init_xprt_sock(void);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 8097b9df6773..3e5efb2b236e 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -295,13 +295,24 @@ int			xprt_adjust_timeout(struct rpc_rqst *req);
 void                    xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task);
 void                    xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);
 void                    xprt_release(struct rpc_task *task);
-struct rpc_xprt *       xprt_get(struct rpc_xprt *xprt);
 void                    xprt_put(struct rpc_xprt *xprt);
 struct rpc_xprt *       xprt_alloc(struct net *net, size_t size,
                                 unsigned int num_prealloc,
                                 unsigned int max_req);
 void                    xprt_free(struct rpc_xprt *);
 
+/**
+ * xprt_get - return a reference to an RPC transport.
+ * @xprt: pointer to the transport
+ *
+ */
+static inline struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)
+{
+        if (atomic_inc_not_zero(&xprt->count))
+                return xprt;
+        return NULL;
+}
+
 static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)
 {
         return p + xprt->tsh_size;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 697ceb70a9a9..a4a0588c5397 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -119,8 +119,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
         static struct syscall_metadata __syscall_meta_##sname;          \
         static struct ftrace_event_call __used                          \
           event_enter_##sname = {                                       \
-                .name                   = "sys_enter"#sname,            \
                 .class                  = &event_class_syscall_enter,   \
+                {                                                       \
+                        .name                   = "sys_enter"#sname,    \
+                },                                                      \
                 .event.funcs            = &enter_syscall_print_funcs,   \
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
@@ -133,8 +135,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
         static struct syscall_metadata __syscall_meta_##sname;          \
         static struct ftrace_event_call __used                          \
           event_exit_##sname = {                                        \
-                .name                   = "sys_exit"#sname,             \
                 .class                  = &event_class_syscall_exit,    \
+                {                                                       \
+                        .name                   = "sys_exit"#sname,     \
+                },                                                      \
                 .event.funcs            = &exit_syscall_print_funcs,    \
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 812b2553dfd8..9d30ee469c2a 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -6,7 +6,7 @@
  *
  * See Documentation/trace/tracepoints.txt.
  *
- * (C) Copyright 2008 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (C) 2008-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Heavily inspired from the Linux Kernel Markers.
  *
@@ -21,6 +21,7 @@
 
 struct module;
 struct tracepoint;
+struct notifier_block;
 
 struct tracepoint_func {
         void *func;
@@ -35,31 +36,38 @@ struct tracepoint {
         struct tracepoint_func __rcu *funcs;
 };
 
-/*
- * Connect a probe to a tracepoint.
- * Internal API, should not be used directly.
- */
-extern int tracepoint_probe_register(const char *name, void *probe, void *data);
-
-/*
- * Disconnect a probe from a tracepoint.
- * Internal API, should not be used directly.
- */
 extern int
-tracepoint_probe_unregister(const char *name, void *probe, void *data);
+tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data);
+extern int
+tracepoint_probe_unregister(struct tracepoint *tp, void *probe, void *data);
+extern void
+for_each_kernel_tracepoint(void (*fct)(struct tracepoint *tp, void *priv),
+                void *priv);
 
 #ifdef CONFIG_MODULES
 struct tp_module {
         struct list_head list;
-        unsigned int num_tracepoints;
-        struct tracepoint * const *tracepoints_ptrs;
+        struct module *mod;
 };
+
 bool trace_module_has_bad_taint(struct module *mod);
+extern int register_tracepoint_module_notifier(struct notifier_block *nb);
+extern int unregister_tracepoint_module_notifier(struct notifier_block *nb);
 #else
 static inline bool trace_module_has_bad_taint(struct module *mod)
 {
         return false;
 }
+static inline
+int register_tracepoint_module_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
+static inline
+int unregister_tracepoint_module_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
 #endif /* CONFIG_MODULES */
 
 /*
@@ -72,6 +80,11 @@ static inline void tracepoint_synchronize_unregister(void)
         synchronize_sched();
 }
 
+#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
+extern void syscall_regfunc(void);
+extern void syscall_unregfunc(void);
+#endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
+
 #define PARAMS(args...) args
 
 #endif /* _LINUX_TRACEPOINT_H */
@@ -160,14 +173,14 @@ static inline void tracepoint_synchronize_unregister(void)
         static inline int                                               \
         register_trace_##name(void (*probe)(data_proto), void *data)    \
         {                                                               \
-                return tracepoint_probe_register(#name, (void *)probe,  \
-                                                 data);                 \
+                return tracepoint_probe_register(&__tracepoint_##name,  \
+                                                (void *)probe, data);   \
         }                                                               \
         static inline int                                               \
         unregister_trace_##name(void (*probe)(data_proto), void *data)  \
         {                                                               \
-                return tracepoint_probe_unregister(#name, (void *)probe, \
-                                                   data);               \
+                return tracepoint_probe_unregister(&__tracepoint_##name,\
+                                                (void *)probe, data);   \
         }                                                               \
         static inline void                                              \
         check_trace_callback_type_##name(void (*cb)(data_proto))        \
diff --git a/include/linux/uio.h b/include/linux/uio.h
index c55ce243cc09..199bcc34241b 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -9,14 +9,23 @@
 #ifndef __LINUX_UIO_H
 #define __LINUX_UIO_H
 
+#include <linux/kernel.h>
 #include <uapi/linux/uio.h>
 
+struct page;
 
 struct kvec {
         void *iov_base; /* and that should *never* hold a userland pointer */
         size_t iov_len;
 };
 
+struct iov_iter {
+        const struct iovec *iov;
+        unsigned long nr_segs;
+        size_t iov_offset;
+        size_t count;
+};
+
 /*
  * Total number of bytes covered by an iovec.
  *
@@ -34,8 +43,51 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
         return ret;
 }
 
+static inline struct iovec iov_iter_iovec(const struct iov_iter *iter)
+{
+        return (struct iovec) {
+                .iov_base = iter->iov->iov_base + iter->iov_offset,
+                .iov_len = min(iter->count,
+                               iter->iov->iov_len - iter->iov_offset),
+        };
+}
+
+#define iov_for_each(iov, iter, start)                          \
+        for (iter = (start);                                    \
+             (iter).count &&                                    \
+             ((iov = iov_iter_iovec(&(iter))), 1);              \
+             iov_iter_advance(&(iter), (iov).iov_len))
+
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
 
+size_t iov_iter_copy_from_user_atomic(struct page *page,
+                struct iov_iter *i, unsigned long offset, size_t bytes);
+size_t iov_iter_copy_from_user(struct page *page,
+                struct iov_iter *i, unsigned long offset, size_t bytes);
+void iov_iter_advance(struct iov_iter *i, size_t bytes);
+int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes);
+size_t iov_iter_single_seg_count(const struct iov_iter *i);
+size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
+                         struct iov_iter *i);
+
+static inline void iov_iter_init(struct iov_iter *i,
+                        const struct iovec *iov, unsigned long nr_segs,
+                        size_t count, size_t written)
+{
+        i->iov = iov;
+        i->nr_segs = nr_segs;
+        i->iov_offset = 0;
+        i->count = count + written;
+
+        iov_iter_advance(i, written);
+}
+
+static inline size_t iov_iter_count(struct iov_iter *i)
+{
+        return i->count;
+}
+
 int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
 int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len);
+
 #endif
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 0b9f890ce431..fde142e5f25a 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -60,6 +60,7 @@ enum rc_filter_type {
 /**
  * struct rc_dev - represents a remote control device
  * @dev: driver model's view of this device
+ * @sysfs_groups: sysfs attribute groups
  * @input_name: name of the input child device
  * @input_phys: physical path to the input child device
  * @input_id: id of the input child device (struct input_id)
@@ -112,10 +113,12 @@ enum rc_filter_type {
  *      device doesn't interrupt host until it sees IR pulses
  * @s_learning_mode: enable wide band receiver used for learning
  * @s_carrier_report: enable carrier reports
- * @s_filter: set the scancode filter of a given type
+ * @s_filter: set the scancode filter 
+ * @s_wakeup_filter: set the wakeup scancode filter
  */
 struct rc_dev {
         struct device                   dev;
+        const struct attribute_group    *sysfs_groups[5];
         const char                      *input_name;
         const char                      *input_phys;
         struct input_id                 input_id;
@@ -159,8 +162,9 @@ struct rc_dev {
         int                             (*s_learning_mode)(struct rc_dev *dev, int enable);
         int                             (*s_carrier_report) (struct rc_dev *dev, int enable);
         int                             (*s_filter)(struct rc_dev *dev,
-                                                    enum rc_filter_type type,
                                                     struct rc_scancode_filter *filter);
+        int                             (*s_wakeup_filter)(struct rc_dev *dev,
+                                                           struct rc_scancode_filter *filter);
 };
 
 #define to_rc_dev(d) container_of(d, struct rc_dev, dev)
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index c38a005bd0cf..6fab66c5c5af 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -67,7 +67,6 @@ enum p9_trans_status {
  * @REQ_STATUS_ALLOC: request has been allocated but not sent
  * @REQ_STATUS_UNSENT: request waiting to be sent
  * @REQ_STATUS_SENT: request sent to server
- * @REQ_STATUS_FLSH: a flush has been sent for this request
  * @REQ_STATUS_RCVD: response received from server
  * @REQ_STATUS_FLSHD: request has been flushed
  * @REQ_STATUS_ERROR: request encountered an error on the client side
@@ -83,7 +82,6 @@ enum p9_req_status_t {
         REQ_STATUS_ALLOC,
         REQ_STATUS_UNSENT,
         REQ_STATUS_SENT,
-        REQ_STATUS_FLSH,
         REQ_STATUS_RCVD,
         REQ_STATUS_FLSHD,
         REQ_STATUS_ERROR,
@@ -130,7 +128,6 @@ struct p9_req_t {
  * @proto_version: 9P protocol version to use
  * @trans_mod: module API instantiated with this client
  * @trans: tranport instance state and API
- * @conn: connection state information used by trans_fd
  * @fidpool: fid handle accounting for session
  * @fidlist: List of active fid handles
  * @tagpool - transaction id accounting for session
@@ -159,7 +156,6 @@ struct p9_client {
         struct p9_trans_module *trans_mod;
         enum p9_trans_status status;
         void *trans;
-        struct p9_conn *conn;
 
         struct p9_idpool *fidpool;
         struct list_head fidlist;
@@ -261,7 +257,7 @@ int p9_client_mkdir_dotl(struct p9_fid *fid, char *name, int mode,
 int p9_client_lock_dotl(struct p9_fid *fid, struct p9_flock *flock, u8 *status);
 int p9_client_getlock_dotl(struct p9_fid *fid, struct p9_getlock *fl);
 struct p9_req_t *p9_tag_lookup(struct p9_client *, u16);
-void p9_client_cb(struct p9_client *c, struct p9_req_t *req);
+void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status);
 
 int p9_parse_header(struct p9_fcall *, int32_t *, int8_t *, int16_t *, int);
 int p9stat_read(struct p9_client *, char *, int, struct p9_wstat *);
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
index 9a36d9297114..d9fa68f26c41 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
@@ -40,6 +40,8 @@
  * @close: member function to discard a connection on this transport
  * @request: member function to issue a request to the transport
  * @cancel: member function to cancel a request (if it hasn't been sent)
+ * @cancelled: member function to notify that a cancelled request will not
+ *             not receive a reply
  *
  * This is the basic API for a transport module which is registered by the
  * transport module with the 9P core network module and used by the client
@@ -58,6 +60,7 @@ struct p9_trans_module {
         void (*close) (struct p9_client *);
         int (*request) (struct p9_client *, struct p9_req_t *req);
         int (*cancel) (struct p9_client *, struct p9_req_t *req);
+        int (*cancelled)(struct p9_client *, struct p9_req_t *req);
         int (*zc_request)(struct p9_client *, struct p9_req_t *,
                           char *, char *, int , int, int, int);
 };
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index a3353f45ef94..8e4de46c052e 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -101,7 +101,7 @@ void sctp_addr_wq_mgmt(struct net *, struct sctp_sockaddr_entry *, int);
 int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
 int sctp_inet_listen(struct socket *sock, int backlog);
 void sctp_write_space(struct sock *sk);
-void sctp_data_ready(struct sock *sk, int len);
+void sctp_data_ready(struct sock *sk);
 unsigned int sctp_poll(struct file *file, struct socket *sock,
                 poll_table *wait);
 void sctp_sock_rfree(struct sk_buff *skb);
diff --git a/include/net/sock.h b/include/net/sock.h
index 06a5668f05c9..8338a14e4805 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -418,7 +418,7 @@ struct sock {
         u32                     sk_classid;
         struct cg_proto         *sk_cgrp;
         void                    (*sk_state_change)(struct sock *sk);
-        void                    (*sk_data_ready)(struct sock *sk, int bytes);
+        void                    (*sk_data_ready)(struct sock *sk);
         void                    (*sk_write_space)(struct sock *sk);
         void                    (*sk_error_report)(struct sock *sk);
         int                     (*sk_backlog_rcv)(struct sock *sk,
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 4e845b80efd3..5853c913d2b0 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -423,11 +423,11 @@ extern int scsi_is_target_device(const struct device *);
 extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
                         int data_direction, void *buffer, unsigned bufflen,
                         unsigned char *sense, int timeout, int retries,
-                        int flag, int *resid);
+                        u64 flags, int *resid);
 extern int scsi_execute_req_flags(struct scsi_device *sdev,
         const unsigned char *cmd, int data_direction, void *buffer,
         unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,
-        int retries, int *resid, int flags);
+        int retries, int *resid, u64 flags);
 static inline int scsi_execute_req(struct scsi_device *sdev,
         const unsigned char *cmd, int data_direction, void *buffer,
         unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,
diff --git a/include/sound/cs8427.h b/include/sound/cs8427.h
index f862cfff5f6a..0b6a1876639b 100644
--- a/include/sound/cs8427.h
+++ b/include/sound/cs8427.h
@@ -188,6 +188,7 @@
 
 struct snd_pcm_substream;
 
+int snd_cs8427_init(struct snd_i2c_bus *bus, struct snd_i2c_device *device);
 int snd_cs8427_create(struct snd_i2c_bus *bus, unsigned char addr,
                       unsigned int reset_timeout, struct snd_i2c_device **r_cs8427);
 int snd_cs8427_reg_write(struct snd_i2c_device *device, unsigned char reg,
diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
index 4483fadfa68d..33b487b5da92 100644
--- a/include/target/iscsi/iscsi_transport.h
+++ b/include/target/iscsi/iscsi_transport.h
@@ -21,6 +21,8 @@ struct iscsit_transport {
         int (*iscsit_get_dataout)(struct iscsi_conn *, struct iscsi_cmd *, bool);
         int (*iscsit_queue_data_in)(struct iscsi_conn *, struct iscsi_cmd *);
         int (*iscsit_queue_status)(struct iscsi_conn *, struct iscsi_cmd *);
+        void (*iscsit_aborted_task)(struct iscsi_conn *, struct iscsi_cmd *);
+        enum target_prot_op (*iscsit_get_sup_prot_ops)(struct iscsi_conn *);
 };
 
 static inline void *iscsit_priv_cmd(struct iscsi_cmd *cmd)
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 7020e33e742e..3a1c1eea1fff 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -73,10 +73,12 @@ sense_reason_t sbc_execute_unmap(struct se_cmd *cmd,
         sense_reason_t (*do_unmap_fn)(struct se_cmd *cmd, void *priv,
                                       sector_t lba, sector_t nolb),
         void *priv);
+void    sbc_dif_generate(struct se_cmd *);
 sense_reason_t  sbc_dif_verify_write(struct se_cmd *, sector_t, unsigned int,
                                      unsigned int, struct scatterlist *, int);
 sense_reason_t  sbc_dif_verify_read(struct se_cmd *, sector_t, unsigned int,
                                     unsigned int, struct scatterlist *, int);
+sense_reason_t  sbc_dif_read_strip(struct se_cmd *);
 
 void    transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 1772fadcff62..9ec9864ecf38 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -162,7 +162,7 @@ enum se_cmd_flags_table {
         SCF_SENT_CHECK_CONDITION        = 0x00000800,
         SCF_OVERFLOW_BIT                = 0x00001000,
         SCF_UNDERFLOW_BIT               = 0x00002000,
-        SCF_SENT_DELAYED_TAS            = 0x00004000,
+        SCF_SEND_DELAYED_TAS            = 0x00004000,
         SCF_ALUA_NON_OPTIMIZED          = 0x00008000,
         SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00020000,
         SCF_ACK_KREF                    = 0x00040000,
@@ -442,19 +442,18 @@ struct se_tmr_req {
 };
 
 enum target_prot_op {
-        TARGET_PROT_NORMAL = 0,
-        TARGET_PROT_DIN_INSERT,
-        TARGET_PROT_DOUT_INSERT,
-        TARGET_PROT_DIN_STRIP,
-        TARGET_PROT_DOUT_STRIP,
-        TARGET_PROT_DIN_PASS,
-        TARGET_PROT_DOUT_PASS,
+        TARGET_PROT_NORMAL      = 0,
+        TARGET_PROT_DIN_INSERT  = (1 << 0),
+        TARGET_PROT_DOUT_INSERT = (1 << 1),
+        TARGET_PROT_DIN_STRIP   = (1 << 2),
+        TARGET_PROT_DOUT_STRIP  = (1 << 3),
+        TARGET_PROT_DIN_PASS    = (1 << 4),
+        TARGET_PROT_DOUT_PASS   = (1 << 5),
 };
 
-enum target_prot_ho {
-        PROT_SEPERATED,
-        PROT_INTERLEAVED,
-};
+#define TARGET_PROT_ALL TARGET_PROT_DIN_INSERT | TARGET_PROT_DOUT_INSERT | \
+                        TARGET_PROT_DIN_STRIP | TARGET_PROT_DOUT_STRIP | \
+                        TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS
 
 enum target_prot_type {
         TARGET_DIF_TYPE0_PROT,
@@ -463,6 +462,12 @@ enum target_prot_type {
         TARGET_DIF_TYPE3_PROT,
 };
 
+enum target_core_dif_check {
+        TARGET_DIF_CHECK_GUARD  = 0x1 << 0,
+        TARGET_DIF_CHECK_APPTAG = 0x1 << 1,
+        TARGET_DIF_CHECK_REFTAG = 0x1 << 2,
+};
+
 struct se_dif_v1_tuple {
         __be16                  guard_tag;
         __be16                  app_tag;
@@ -556,13 +561,14 @@ struct se_cmd {
         /* DIF related members */
         enum target_prot_op     prot_op;
         enum target_prot_type   prot_type;
+        u8                      prot_checks;
         u32                     prot_length;
         u32                     reftag_seed;
         struct scatterlist      *t_prot_sg;
         unsigned int            t_prot_nents;
-        enum target_prot_ho     prot_handover;
         sense_reason_t          pi_err;
         sector_t                bad_sector;
+        bool                    prot_pto;
 };
 
 struct se_ua {
@@ -603,6 +609,7 @@ struct se_node_acl {
 struct se_session {
         unsigned                sess_tearing_down:1;
         u64                     sess_bin_isid;
+        enum target_prot_op     sup_prot_ops;
         struct se_node_acl      *se_node_acl;
         struct se_portal_group *se_tpg;
         void                    *fabric_sess_ptr;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 0218d689b3d7..22a4e98eec80 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -62,6 +62,7 @@ struct target_core_fabric_ops {
         int (*queue_data_in)(struct se_cmd *);
         int (*queue_status)(struct se_cmd *);
         void (*queue_tm_rsp)(struct se_cmd *);
+        void (*aborted_task)(struct se_cmd *);
         /*
          * fabric module calls for target_core_fabric_configfs.c
          */
@@ -83,10 +84,11 @@ struct target_core_fabric_ops {
         void (*fabric_drop_nodeacl)(struct se_node_acl *);
 };
 
-struct se_session *transport_init_session(void);
+struct se_session *transport_init_session(enum target_prot_op);
 int transport_alloc_session_tags(struct se_session *, unsigned int,
                 unsigned int);
-struct se_session *transport_init_session_tags(unsigned int, unsigned int);
+struct se_session *transport_init_session_tags(unsigned int, unsigned int,
+                enum target_prot_op);
 void    __transport_register_session(struct se_portal_group *,
                 struct se_node_acl *, struct se_session *, void *);
 void    transport_register_session(struct se_portal_group *,
diff --git a/include/trace/events/i2c.h b/include/trace/events/i2c.h
new file mode 100644
index 000000000000..fe17187df65d
--- /dev/null
+++ b/include/trace/events/i2c.h
@@ -0,0 +1,372 @@
+/* I2C and SMBUS message transfer tracepoints
+ *
+ * Copyright (C) 2013 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 Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM i2c
+
+#if !defined(_TRACE_I2C_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_I2C_H
+
+#include <linux/i2c.h>
+#include <linux/tracepoint.h>
+
+/*
+ * drivers/i2c/i2c-core.c
+ */
+extern void i2c_transfer_trace_reg(void);
+extern void i2c_transfer_trace_unreg(void);
+
+/*
+ * __i2c_transfer() write request
+ */
+TRACE_EVENT_FN(i2c_write,
+               TP_PROTO(const struct i2c_adapter *adap, const struct i2c_msg *msg,
+                        int num),
+               TP_ARGS(adap, msg, num),
+               TP_STRUCT__entry(
+                       __field(int,     adapter_nr              )
+                       __field(__u16,   msg_nr                  )
+                       __field(__u16,   addr                    )
+                       __field(__u16,   flags                   )
+                       __field(__u16,   len                     )
+                       __dynamic_array(__u8, buf, msg->len)     ),
+               TP_fast_assign(
+                       __entry->adapter_nr = adap->nr;
+                       __entry->msg_nr = num;
+                       __entry->addr = msg->addr;
+                       __entry->flags = msg->flags;
+                       __entry->len = msg->len;
+                       memcpy(__get_dynamic_array(buf), msg->buf, msg->len);
+                              ),
+               TP_printk("i2c-%d #%u a=%03x f=%04x l=%u [%*phD]",
+                         __entry->adapter_nr,
+                         __entry->msg_nr,
+                         __entry->addr,
+                         __entry->flags,
+                         __entry->len,
+                         __entry->len, __get_dynamic_array(buf)
+                         ),
+               i2c_transfer_trace_reg,
+               i2c_transfer_trace_unreg);
+
+/*
+ * __i2c_transfer() read request
+ */
+TRACE_EVENT_FN(i2c_read,
+               TP_PROTO(const struct i2c_adapter *adap, const struct i2c_msg *msg,
+                        int num),
+               TP_ARGS(adap, msg, num),
+               TP_STRUCT__entry(
+                       __field(int,     adapter_nr              )
+                       __field(__u16,   msg_nr                  )
+                       __field(__u16,   addr                    )
+                       __field(__u16,   flags                   )
+                       __field(__u16,   len                     )
+                                ),
+               TP_fast_assign(
+                       __entry->adapter_nr = adap->nr;
+                       __entry->msg_nr = num;
+                       __entry->addr = msg->addr;
+                       __entry->flags = msg->flags;
+                       __entry->len = msg->len;
+                              ),
+               TP_printk("i2c-%d #%u a=%03x f=%04x l=%u",
+                         __entry->adapter_nr,
+                         __entry->msg_nr,
+                         __entry->addr,
+                         __entry->flags,
+                         __entry->len
+                         ),
+               i2c_transfer_trace_reg,
+                       i2c_transfer_trace_unreg);
+
+/*
+ * __i2c_transfer() read reply
+ */
+TRACE_EVENT_FN(i2c_reply,
+               TP_PROTO(const struct i2c_adapter *adap, const struct i2c_msg *msg,
+                        int num),
+               TP_ARGS(adap, msg, num),
+               TP_STRUCT__entry(
+                       __field(int,     adapter_nr              )
+                       __field(__u16,   msg_nr                  )
+                       __field(__u16,   addr                    )
+                       __field(__u16,   flags                   )
+                       __field(__u16,   len                     )
+                       __dynamic_array(__u8, buf, msg->len)     ),
+               TP_fast_assign(
+                       __entry->adapter_nr = adap->nr;
+                       __entry->msg_nr = num;
+                       __entry->addr = msg->addr;
+                       __entry->flags = msg->flags;
+                       __entry->len = msg->len;
+                       memcpy(__get_dynamic_array(buf), msg->buf, msg->len);
+                              ),
+               TP_printk("i2c-%d #%u a=%03x f=%04x l=%u [%*phD]",
+                         __entry->adapter_nr,
+                         __entry->msg_nr,
+                         __entry->addr,
+                         __entry->flags,
+                         __entry->len,
+                         __entry->len, __get_dynamic_array(buf)
+                         ),
+               i2c_transfer_trace_reg,
+               i2c_transfer_trace_unreg);
+
+/*
+ * __i2c_transfer() result
+ */
+TRACE_EVENT_FN(i2c_result,
+               TP_PROTO(const struct i2c_adapter *adap, int num, int ret),
+               TP_ARGS(adap, num, ret),
+               TP_STRUCT__entry(
+                       __field(int,     adapter_nr              )
+                       __field(__u16,   nr_msgs                 )
+                       __field(__s16,   ret                     )
+                                ),
+               TP_fast_assign(
+                       __entry->adapter_nr = adap->nr;
+                       __entry->nr_msgs = num;
+                       __entry->ret = ret;
+                              ),
+               TP_printk("i2c-%d n=%u ret=%d",
+                         __entry->adapter_nr,
+                         __entry->nr_msgs,
+                         __entry->ret
+                         ),
+               i2c_transfer_trace_reg,
+               i2c_transfer_trace_unreg);
+
+/*
+ * i2c_smbus_xfer() write data or procedure call request
+ */
+TRACE_EVENT_CONDITION(smbus_write,
+        TP_PROTO(const struct i2c_adapter *adap,
+                 u16 addr, unsigned short flags,
+                 char read_write, u8 command, int protocol,
+                 const union i2c_smbus_data *data),
+        TP_ARGS(adap, addr, flags, read_write, command, protocol, data),
+        TP_CONDITION(read_write == I2C_SMBUS_WRITE ||
+                     protocol == I2C_SMBUS_PROC_CALL ||
+                     protocol == I2C_SMBUS_BLOCK_PROC_CALL),
+        TP_STRUCT__entry(
+                __field(int,    adapter_nr              )
+                __field(__u16,  addr                    )
+                __field(__u16,  flags                   )
+                __field(__u8,   command                 )
+                __field(__u8,   len                     )
+                __field(__u32,  protocol                )
+                __array(__u8, buf, I2C_SMBUS_BLOCK_MAX + 2)     ),
+        TP_fast_assign(
+                __entry->adapter_nr = adap->nr;
+                __entry->addr = addr;
+                __entry->flags = flags;
+                __entry->command = command;
+                __entry->protocol = protocol;
+
+                switch (protocol) {
+                case I2C_SMBUS_BYTE_DATA:
+                        __entry->len = 1;
+                        goto copy;
+                case I2C_SMBUS_WORD_DATA:
+                case I2C_SMBUS_PROC_CALL:
+                        __entry->len = 2;
+                        goto copy;
+                case I2C_SMBUS_BLOCK_DATA:
+                case I2C_SMBUS_BLOCK_PROC_CALL:
+                case I2C_SMBUS_I2C_BLOCK_DATA:
+                        __entry->len = data->block[0] + 1;
+                copy:
+                        memcpy(__entry->buf, data->block, __entry->len);
+                        break;
+                case I2C_SMBUS_QUICK:
+                case I2C_SMBUS_BYTE:
+                case I2C_SMBUS_I2C_BLOCK_BROKEN:
+                default:
+                        __entry->len = 0;
+                }
+                       ),
+        TP_printk("i2c-%d a=%03x f=%04x c=%x %s l=%u [%*phD]",
+                  __entry->adapter_nr,
+                  __entry->addr,
+                  __entry->flags,
+                  __entry->command,
+                  __print_symbolic(__entry->protocol,
+                                   { I2C_SMBUS_QUICK,           "QUICK" },
+                                   { I2C_SMBUS_BYTE,            "BYTE"  },
+                                   { I2C_SMBUS_BYTE_DATA,               "BYTE_DATA" },
+                                   { I2C_SMBUS_WORD_DATA,               "WORD_DATA" },
+                                   { I2C_SMBUS_PROC_CALL,               "PROC_CALL" },
+                                   { I2C_SMBUS_BLOCK_DATA,              "BLOCK_DATA" },
+                                   { I2C_SMBUS_I2C_BLOCK_BROKEN,        "I2C_BLOCK_BROKEN" },
+                                   { I2C_SMBUS_BLOCK_PROC_CALL, "BLOCK_PROC_CALL" },
+                                   { I2C_SMBUS_I2C_BLOCK_DATA,  "I2C_BLOCK_DATA" }),
+                  __entry->len,
+                  __entry->len, __entry->buf
+                  ));
+
+/*
+ * i2c_smbus_xfer() read data request
+ */
+TRACE_EVENT_CONDITION(smbus_read,
+        TP_PROTO(const struct i2c_adapter *adap,
+                 u16 addr, unsigned short flags,
+                 char read_write, u8 command, int protocol),
+        TP_ARGS(adap, addr, flags, read_write, command, protocol),
+        TP_CONDITION(!(read_write == I2C_SMBUS_WRITE ||
+                       protocol == I2C_SMBUS_PROC_CALL ||
+                       protocol == I2C_SMBUS_BLOCK_PROC_CALL)),
+        TP_STRUCT__entry(
+                __field(int,    adapter_nr              )
+                __field(__u16,  flags                   )
+                __field(__u16,  addr                    )
+                __field(__u8,   command                 )
+                __field(__u32,  protocol                )
+                __array(__u8, buf, I2C_SMBUS_BLOCK_MAX + 2)     ),
+        TP_fast_assign(
+                __entry->adapter_nr = adap->nr;
+                __entry->addr = addr;
+                __entry->flags = flags;
+                __entry->command = command;
+                __entry->protocol = protocol;
+                       ),
+        TP_printk("i2c-%d a=%03x f=%04x c=%x %s",
+                  __entry->adapter_nr,
+                  __entry->addr,
+                  __entry->flags,
+                  __entry->command,
+                  __print_symbolic(__entry->protocol,
+                                   { I2C_SMBUS_QUICK,           "QUICK" },
+                                   { I2C_SMBUS_BYTE,            "BYTE"  },
+                                   { I2C_SMBUS_BYTE_DATA,               "BYTE_DATA" },
+                                   { I2C_SMBUS_WORD_DATA,               "WORD_DATA" },
+                                   { I2C_SMBUS_PROC_CALL,               "PROC_CALL" },
+                                   { I2C_SMBUS_BLOCK_DATA,              "BLOCK_DATA" },
+                                   { I2C_SMBUS_I2C_BLOCK_BROKEN,        "I2C_BLOCK_BROKEN" },
+                                   { I2C_SMBUS_BLOCK_PROC_CALL, "BLOCK_PROC_CALL" },
+                                   { I2C_SMBUS_I2C_BLOCK_DATA,  "I2C_BLOCK_DATA" })
+                  ));
+
+/*
+ * i2c_smbus_xfer() read data or procedure call reply
+ */
+TRACE_EVENT_CONDITION(smbus_reply,
+        TP_PROTO(const struct i2c_adapter *adap,
+                 u16 addr, unsigned short flags,
+                 char read_write, u8 command, int protocol,
+                 const union i2c_smbus_data *data),
+        TP_ARGS(adap, addr, flags, read_write, command, protocol, data),
+        TP_CONDITION(read_write == I2C_SMBUS_READ),
+        TP_STRUCT__entry(
+                __field(int,    adapter_nr              )
+                __field(__u16,  addr                    )
+                __field(__u16,  flags                   )
+                __field(__u8,   command                 )
+                __field(__u8,   len                     )
+                __field(__u32,  protocol                )
+                __array(__u8, buf, I2C_SMBUS_BLOCK_MAX + 2)     ),
+        TP_fast_assign(
+                __entry->adapter_nr = adap->nr;
+                __entry->addr = addr;
+                __entry->flags = flags;
+                __entry->command = command;
+                __entry->protocol = protocol;
+
+                switch (protocol) {
+                case I2C_SMBUS_BYTE:
+                case I2C_SMBUS_BYTE_DATA:
+                        __entry->len = 1;
+                        goto copy;
+                case I2C_SMBUS_WORD_DATA:
+                case I2C_SMBUS_PROC_CALL:
+                        __entry->len = 2;
+                        goto copy;
+                case I2C_SMBUS_BLOCK_DATA:
+                case I2C_SMBUS_BLOCK_PROC_CALL:
+                case I2C_SMBUS_I2C_BLOCK_DATA:
+                        __entry->len = data->block[0] + 1;
+                copy:
+                        memcpy(__entry->buf, data->block, __entry->len);
+                        break;
+                case I2C_SMBUS_QUICK:
+                case I2C_SMBUS_I2C_BLOCK_BROKEN:
+                default:
+                        __entry->len = 0;
+                }
+                       ),
+        TP_printk("i2c-%d a=%03x f=%04x c=%x %s l=%u [%*phD]",
+                  __entry->adapter_nr,
+                  __entry->addr,
+                  __entry->flags,
+                  __entry->command,
+                  __print_symbolic(__entry->protocol,
+                                   { I2C_SMBUS_QUICK,           "QUICK" },
+                                   { I2C_SMBUS_BYTE,            "BYTE"  },
+                                   { I2C_SMBUS_BYTE_DATA,               "BYTE_DATA" },
+                                   { I2C_SMBUS_WORD_DATA,               "WORD_DATA" },
+                                   { I2C_SMBUS_PROC_CALL,               "PROC_CALL" },
+                                   { I2C_SMBUS_BLOCK_DATA,              "BLOCK_DATA" },
+                                   { I2C_SMBUS_I2C_BLOCK_BROKEN,        "I2C_BLOCK_BROKEN" },
+                                   { I2C_SMBUS_BLOCK_PROC_CALL, "BLOCK_PROC_CALL" },
+                                   { I2C_SMBUS_I2C_BLOCK_DATA,  "I2C_BLOCK_DATA" }),
+                  __entry->len,
+                  __entry->len, __entry->buf
+                  ));
+
+/*
+ * i2c_smbus_xfer() result
+ */
+TRACE_EVENT(smbus_result,
+            TP_PROTO(const struct i2c_adapter *adap,
+                     u16 addr, unsigned short flags,
+                     char read_write, u8 command, int protocol,
+                     int res),
+            TP_ARGS(adap, addr, flags, read_write, command, protocol, res),
+            TP_STRUCT__entry(
+                    __field(int,        adapter_nr              )
+                    __field(__u16,      addr                    )
+                    __field(__u16,      flags                   )
+                    __field(__u8,       read_write              )
+                    __field(__u8,       command                 )
+                    __field(__s16,      res                     )
+                    __field(__u32,      protocol                )
+                             ),
+            TP_fast_assign(
+                    __entry->adapter_nr = adap->nr;
+                    __entry->addr = addr;
+                    __entry->flags = flags;
+                    __entry->read_write = read_write;
+                    __entry->command = command;
+                    __entry->protocol = protocol;
+                    __entry->res = res;
+                           ),
+            TP_printk("i2c-%d a=%03x f=%04x c=%x %s %s res=%d",
+                      __entry->adapter_nr,
+                      __entry->addr,
+                      __entry->flags,
+                      __entry->command,
+                      __print_symbolic(__entry->protocol,
+                                       { I2C_SMBUS_QUICK,               "QUICK" },
+                                       { I2C_SMBUS_BYTE,                "BYTE"  },
+                                       { I2C_SMBUS_BYTE_DATA,           "BYTE_DATA" },
+                                       { I2C_SMBUS_WORD_DATA,           "WORD_DATA" },
+                                       { I2C_SMBUS_PROC_CALL,           "PROC_CALL" },
+                                       { I2C_SMBUS_BLOCK_DATA,          "BLOCK_DATA" },
+                                       { I2C_SMBUS_I2C_BLOCK_BROKEN,    "I2C_BLOCK_BROKEN" },
+                                       { I2C_SMBUS_BLOCK_PROC_CALL,     "BLOCK_PROC_CALL" },
+                                       { I2C_SMBUS_I2C_BLOCK_DATA,      "I2C_BLOCK_DATA" }),
+                      __entry->read_write == I2C_SMBUS_WRITE ? "wr" : "rd",
+                      __entry->res
+                      ));
+
+#endif /* _TRACE_I2C_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h
index 5a4c04a75b3d..14e49c798135 100644
--- a/include/trace/events/syscalls.h
+++ b/include/trace/events/syscalls.h
@@ -13,9 +13,6 @@
 
 #ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
-extern void syscall_regfunc(void);
-extern void syscall_unregfunc(void);
-
 TRACE_EVENT_FN(sys_enter,
 
         TP_PROTO(struct pt_regs *regs, long id),
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 8765126b328c..0a1a4f7caf09 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -470,10 +470,13 @@ static inline notrace int ftrace_get_offsets_##call(			\
  * };
  *
  * static struct ftrace_event_call event_<call> = {
- *      .name                   = "<call>",
  *      .class                  = event_class_<template>,
+ *      {
+ *              .tp                     = &__tracepoint_<call>,
+ *      },
  *      .event                  = &ftrace_event_type_<call>,
  *      .print_fmt              = print_fmt_<call>,
+ *      .flags                  = TRACE_EVENT_FL_TRACEPOINT,
  * };
  * // its only safe to use pointers when doing linker tricks to
  * // create an array.
@@ -605,10 +608,13 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \
 #define DEFINE_EVENT(template, call, proto, args)                       \
                                                                         \
 static struct ftrace_event_call __used event_##call = {                 \
-        .name                   = #call,                                \
         .class                  = &event_class_##template,              \
+        {                                                               \
+                .tp                     = &__tracepoint_##call,         \
+        },                                                              \
         .event.funcs            = &ftrace_event_type_funcs_##template,  \
         .print_fmt              = print_fmt_##template,                 \
+        .flags                  = TRACE_EVENT_FL_TRACEPOINT,            \
 };                                                                      \
 static struct ftrace_event_call __used                                  \
 __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
@@ -619,10 +625,13 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
 static const char print_fmt_##call[] = print;                           \
                                                                         \
 static struct ftrace_event_call __used event_##call = {                 \
-        .name                   = #call,                                \
         .class                  = &event_class_##template,              \
+        {                                                               \
+                .tp                     = &__tracepoint_##call,         \
+        },                                                              \
         .event.funcs            = &ftrace_event_type_funcs_##call,      \
         .print_fmt              = print_fmt_##call,                     \
+        .flags                  = TRACE_EVENT_FL_TRACEPOINT,            \
 };                                                                      \
 static struct ftrace_event_call __used                                  \
 __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 2d48fe1274ca..11917f747cb4 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -70,7 +70,6 @@
 #define AUDIT_TTY_SET           1017    /* Set TTY auditing status */
 #define AUDIT_SET_FEATURE       1018    /* Turn an audit feature on or off */
 #define AUDIT_GET_FEATURE       1019    /* Get which features are enabled */
-#define AUDIT_FEATURE_CHANGE    1020    /* audit log listing feature changes */
 
 #define AUDIT_FIRST_USER_MSG    1100    /* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC          1107    /* We filter this differently */
@@ -109,6 +108,8 @@
 #define AUDIT_NETFILTER_PKT     1324    /* Packets traversing netfilter chains */
 #define AUDIT_NETFILTER_CFG     1325    /* Netfilter chain modifications */
 #define AUDIT_SECCOMP           1326    /* Secure Computing event */
+#define AUDIT_PROCTITLE         1327    /* Proctitle emit event */
+#define AUDIT_FEATURE_CHANGE    1328    /* audit log listing feature changes */
 
 #define AUDIT_AVC               1400    /* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR       1401    /* Internal SE Linux Errors */
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h
index ba478fa3012e..154dd6d3c8fe 100644
--- a/include/uapi/linux/capability.h
+++ b/include/uapi/linux/capability.h
@@ -308,8 +308,12 @@ struct vfs_cap_data {
 
 #define CAP_LEASE            28
 
+/* Allow writing the audit log via unicast netlink socket */
+
 #define CAP_AUDIT_WRITE      29
 
+/* Allow configuration of audit via unicast netlink socket */
+
 #define CAP_AUDIT_CONTROL    30
 
 #define CAP_SETFCAP          31
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
index e5ab62201119..096fe1c6f83d 100644
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
@@ -434,6 +434,7 @@ enum {
         NVME_SC_REFTAG_CHECK            = 0x284,
         NVME_SC_COMPARE_FAILED          = 0x285,
         NVME_SC_ACCESS_DENIED           = 0x286,
+        NVME_SC_DNR                     = 0x4000,
 };
 
 struct nvme_completion {
diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h
index 270db8914c01..9bf508ad0957 100644
--- a/include/uapi/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
@@ -29,6 +29,8 @@
 #ifndef __V4L2_COMMON__
 #define __V4L2_COMMON__
 
+#include <linux/types.h>
+
 /*
  *
  * Selection interface definitions
diff --git a/init/Kconfig b/init/Kconfig
index 427ba60d638f..765018c24cf9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -292,9 +292,12 @@ config AUDIT
           logging of avc messages output).  Does not do system-call
           auditing without CONFIG_AUDITSYSCALL.
 
+config HAVE_ARCH_AUDITSYSCALL
+        bool
+
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ALPHA)
+        depends on AUDIT && HAVE_ARCH_AUDITSYSCALL
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
diff --git a/kernel/audit.c b/kernel/audit.c
index 95a20f3f52f1..7c2893602d06 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -182,7 +182,7 @@ struct audit_buffer {
 
 struct audit_reply {
         __u32 portid;
-        struct net *net;        
+        struct net *net;
         struct sk_buff *skb;
 };
 
@@ -396,7 +396,7 @@ static void audit_printk_skb(struct sk_buff *skb)
                 if (printk_ratelimit())
                         pr_notice("type=%d %s\n", nlh->nlmsg_type, data);
                 else
-                        audit_log_lost("printk limit exceeded\n");
+                        audit_log_lost("printk limit exceeded");
         }
 
         audit_hold_skb(skb);
@@ -412,7 +412,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
                 BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */
                 if (audit_pid) {
                         pr_err("*NO* daemon at audit_pid=%d\n", audit_pid);
-                        audit_log_lost("auditd disappeared\n");
+                        audit_log_lost("auditd disappeared");
                         audit_pid = 0;
                         audit_sock = NULL;
                 }
@@ -607,7 +607,7 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
 {
         int err = 0;
 
-        /* Only support the initial namespaces for now. */
+        /* Only support initial user namespace for now. */
         /*
          * We return ECONNREFUSED because it tricks userspace into thinking
          * that audit was not configured into the kernel.  Lots of users
@@ -618,8 +618,7 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
          * userspace will reject all logins.  This should be removed when we
          * support non init namespaces!!
          */
-        if ((current_user_ns() != &init_user_ns) ||
-            (task_active_pid_ns(current) != &init_pid_ns))
+        if (current_user_ns() != &init_user_ns)
                 return -ECONNREFUSED;
 
         switch (msg_type) {
@@ -639,6 +638,11 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
         case AUDIT_TTY_SET:
         case AUDIT_TRIM:
         case AUDIT_MAKE_EQUIV:
+                /* Only support auditd and auditctl in initial pid namespace
+                 * for now. */
+                if ((task_active_pid_ns(current) != &init_pid_ns))
+                        return -EPERM;
+
                 if (!capable(CAP_AUDIT_CONTROL))
                         err = -EPERM;
                 break;
@@ -659,6 +663,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type)
 {
         int rc = 0;
         uid_t uid = from_kuid(&init_user_ns, current_uid());
+        pid_t pid = task_tgid_nr(current);
 
         if (!audit_enabled && msg_type != AUDIT_USER_AVC) {
                 *ab = NULL;
@@ -668,7 +673,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type)
         *ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
         if (unlikely(!*ab))
                 return rc;
-        audit_log_format(*ab, "pid=%d uid=%u", task_tgid_vnr(current), uid);
+        audit_log_format(*ab, "pid=%d uid=%u", pid, uid);
         audit_log_session_info(*ab);
         audit_log_task_context(*ab);
 
@@ -1097,7 +1102,7 @@ static void __net_exit audit_net_exit(struct net *net)
                 audit_sock = NULL;
         }
 
-        rcu_assign_pointer(aunet->nlsk, NULL);
+        RCU_INIT_POINTER(aunet->nlsk, NULL);
         synchronize_net();
         netlink_kernel_release(sock);
 }
@@ -1829,11 +1834,11 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
         spin_unlock_irq(&tsk->sighand->siglock);
 
         audit_log_format(ab,
-                         " ppid=%ld pid=%d auid=%u uid=%u gid=%u"
+                         " ppid=%d pid=%d auid=%u uid=%u gid=%u"
                          " euid=%u suid=%u fsuid=%u"
                          " egid=%u sgid=%u fsgid=%u tty=%s ses=%u",
-                         sys_getppid(),
-                         tsk->pid,
+                         task_ppid_nr(tsk),
+                         task_pid_nr(tsk),
                          from_kuid(&init_user_ns, audit_get_loginuid(tsk)),
                          from_kuid(&init_user_ns, cred->uid),
                          from_kgid(&init_user_ns, cred->gid),
diff --git a/kernel/audit.h b/kernel/audit.h
index 8df132214606..7bb65730c890 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -106,6 +106,11 @@ struct audit_names {
         bool                    should_free;
 };
 
+struct audit_proctitle {
+        int     len;    /* length of the cmdline field. */
+        char    *value; /* the cmdline field */
+};
+
 /* The per-task audit context. */
 struct audit_context {
         int                 dummy;      /* must be the first element */
@@ -202,6 +207,7 @@ struct audit_context {
                 } execve;
         };
         int fds[2];
+        struct audit_proctitle proctitle;
 
 #if AUDIT_DEBUG
         int                 put_count;
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 92062fd6cc8c..8e9bc9c3dbb7 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/audit.h>
 #include <linux/kthread.h>
@@ -226,7 +228,7 @@ static int audit_match_signal(struct audit_entry *entry)
 #endif
 
 /* Common user-space to kernel rule translation. */
-static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
+static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data *rule)
 {
         unsigned listnr;
         struct audit_entry *entry;
@@ -249,7 +251,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
                 ;
         }
         if (unlikely(rule->action == AUDIT_POSSIBLE)) {
-                printk(KERN_ERR "AUDIT_POSSIBLE is deprecated\n");
+                pr_err("AUDIT_POSSIBLE is deprecated\n");
                 goto exit_err;
         }
         if (rule->action != AUDIT_NEVER && rule->action != AUDIT_ALWAYS)
@@ -403,7 +405,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
         int i;
         char *str;
 
-        entry = audit_to_entry_common((struct audit_rule *)data);
+        entry = audit_to_entry_common(data);
         if (IS_ERR(entry))
                 goto exit_nofree;
 
@@ -431,6 +433,19 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
                         f->val = 0;
                 }
 
+                if ((f->type == AUDIT_PID) || (f->type == AUDIT_PPID)) {
+                        struct pid *pid;
+                        rcu_read_lock();
+                        pid = find_vpid(f->val);
+                        if (!pid) {
+                                rcu_read_unlock();
+                                err = -ESRCH;
+                                goto exit_free;
+                        }
+                        f->val = pid_nr(pid);
+                        rcu_read_unlock();
+                }
+
                 err = audit_field_valid(entry, f);
                 if (err)
                         goto exit_free;
@@ -479,8 +494,8 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
                         /* Keep currently invalid fields around in case they
                          * become valid after a policy reload. */
                         if (err == -EINVAL) {
-                                printk(KERN_WARNING "audit rule for LSM "
-                                       "\'%s\' is invalid\n",  str);
+                                pr_warn("audit rule for LSM \'%s\' is invalid\n",
+                                        str);
                                 err = 0;
                         }
                         if (err) {
@@ -709,8 +724,8 @@ static inline int audit_dupe_lsm_field(struct audit_field *df,
         /* Keep currently invalid fields around in case they
          * become valid after a policy reload. */
         if (ret == -EINVAL) {
-                printk(KERN_WARNING "audit rule for LSM \'%s\' is "
-                       "invalid\n", df->lsm_str);
+                pr_warn("audit rule for LSM \'%s\' is invalid\n",
+                        df->lsm_str);
                 ret = 0;
         }
 
@@ -1240,12 +1255,14 @@ static int audit_filter_user_rules(struct audit_krule *rule, int type,
 
         for (i = 0; i < rule->field_count; i++) {
                 struct audit_field *f = &rule->fields[i];
+                pid_t pid;
                 int result = 0;
                 u32 sid;
 
                 switch (f->type) {
                 case AUDIT_PID:
-                        result = audit_comparator(task_pid_vnr(current), f->op, f->val);
+                        pid = task_pid_nr(current);
+                        result = audit_comparator(pid, f->op, f->val);
                         break;
                 case AUDIT_UID:
                         result = audit_uid_comparator(current_uid(), f->op, f->uid);
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 7aef2f4b6c64..f251a5e8d17a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -42,6 +42,8 @@
  * and <dustin.kirkland@us.ibm.com> for LSPP certification compliance.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <asm/types.h>
 #include <linux/atomic.h>
@@ -68,6 +70,7 @@
 #include <linux/capability.h>
 #include <linux/fs_struct.h>
 #include <linux/compat.h>
+#include <linux/ctype.h>
 
 #include "audit.h"
 
@@ -79,6 +82,9 @@
 /* no execve audit message should be longer than this (userspace limits) */
 #define MAX_EXECVE_AUDIT_LEN 7500
 
+/* max length to print of cmdline/proctitle value during audit */
+#define MAX_PROCTITLE_AUDIT_LEN 128
+
 /* number of audit rules */
 int audit_n_rules;
 
@@ -451,15 +457,17 @@ static int audit_filter_rules(struct task_struct *tsk,
                 struct audit_field *f = &rule->fields[i];
                 struct audit_names *n;
                 int result = 0;
+                pid_t pid;
 
                 switch (f->type) {
                 case AUDIT_PID:
-                        result = audit_comparator(tsk->pid, f->op, f->val);
+                        pid = task_pid_nr(tsk);
+                        result = audit_comparator(pid, f->op, f->val);
                         break;
                 case AUDIT_PPID:
                         if (ctx) {
                                 if (!ctx->ppid)
-                                        ctx->ppid = sys_getppid();
+                                        ctx->ppid = task_ppid_nr(tsk);
                                 result = audit_comparator(ctx->ppid, f->op, f->val);
                         }
                         break;
@@ -805,7 +813,8 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx)
         rcu_read_unlock();
 }
 
-static inline struct audit_context *audit_get_context(struct task_struct *tsk,
+/* Transfer the audit context pointer to the caller, clearing it in the tsk's struct */
+static inline struct audit_context *audit_take_context(struct task_struct *tsk,
                                                       int return_valid,
                                                       long return_code)
 {
@@ -842,6 +851,13 @@ static inline struct audit_context *audit_get_context(struct task_struct *tsk,
         return context;
 }
 
+static inline void audit_proctitle_free(struct audit_context *context)
+{
+        kfree(context->proctitle.value);
+        context->proctitle.value = NULL;
+        context->proctitle.len = 0;
+}
+
 static inline void audit_free_names(struct audit_context *context)
 {
         struct audit_names *n, *next;
@@ -850,16 +866,15 @@ static inline void audit_free_names(struct audit_context *context)
         if (context->put_count + context->ino_count != context->name_count) {
                 int i = 0;
 
-                printk(KERN_ERR "%s:%d(:%d): major=%d in_syscall=%d"
-                       " name_count=%d put_count=%d"
-                       " ino_count=%d [NOT freeing]\n",
-                       __FILE__, __LINE__,
+                pr_err("%s:%d(:%d): major=%d in_syscall=%d"
+                       " name_count=%d put_count=%d ino_count=%d"
+                       " [NOT freeing]\n", __FILE__, __LINE__,
                        context->serial, context->major, context->in_syscall,
                        context->name_count, context->put_count,
                        context->ino_count);
                 list_for_each_entry(n, &context->names_list, list) {
-                        printk(KERN_ERR "names[%d] = %p = %s\n", i++,
-                               n->name, n->name->name ?: "(null)");
+                        pr_err("names[%d] = %p = %s\n", i++, n->name,
+                               n->name->name ?: "(null)");
                 }
                 dump_stack();
                 return;
@@ -955,6 +970,7 @@ static inline void audit_free_context(struct audit_context *context)
         audit_free_aux(context);
         kfree(context->filterkey);
         kfree(context->sockaddr);
+        audit_proctitle_free(context);
         kfree(context);
 }
 
@@ -1157,7 +1173,7 @@ static void audit_log_execve_info(struct audit_context *context,
          */
         buf = kmalloc(MAX_EXECVE_AUDIT_LEN + 1, GFP_KERNEL);
         if (!buf) {
-                audit_panic("out of memory for argv string\n");
+                audit_panic("out of memory for argv string");
                 return;
         }
 
@@ -1271,6 +1287,59 @@ static void show_special(struct audit_context *context, int *call_panic)
         audit_log_end(ab);
 }
 
+static inline int audit_proctitle_rtrim(char *proctitle, int len)
+{
+        char *end = proctitle + len - 1;
+        while (end > proctitle && !isprint(*end))
+                end--;
+
+        /* catch the case where proctitle is only 1 non-print character */
+        len = end - proctitle + 1;
+        len -= isprint(proctitle[len-1]) == 0;
+        return len;
+}
+
+static void audit_log_proctitle(struct task_struct *tsk,
+                         struct audit_context *context)
+{
+        int res;
+        char *buf;
+        char *msg = "(null)";
+        int len = strlen(msg);
+        struct audit_buffer *ab;
+
+        ab = audit_log_start(context, GFP_KERNEL, AUDIT_PROCTITLE);
+        if (!ab)
+                return; /* audit_panic or being filtered */
+
+        audit_log_format(ab, "proctitle=");
+
+        /* Not  cached */
+        if (!context->proctitle.value) {
+                buf = kmalloc(MAX_PROCTITLE_AUDIT_LEN, GFP_KERNEL);
+                if (!buf)
+                        goto out;
+                /* Historically called this from procfs naming */
+                res = get_cmdline(tsk, buf, MAX_PROCTITLE_AUDIT_LEN);
+                if (res == 0) {
+                        kfree(buf);
+                        goto out;
+                }
+                res = audit_proctitle_rtrim(buf, res);
+                if (res == 0) {
+                        kfree(buf);
+                        goto out;
+                }
+                context->proctitle.value = buf;
+                context->proctitle.len = res;
+        }
+        msg = context->proctitle.value;
+        len = context->proctitle.len;
+out:
+        audit_log_n_untrustedstring(ab, msg, len);
+        audit_log_end(ab);
+}
+
 static void audit_log_exit(struct audit_context *context, struct task_struct *tsk)
 {
         int i, call_panic = 0;
@@ -1388,6 +1457,8 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
                 audit_log_name(context, n, NULL, i++, &call_panic);
         }
 
+        audit_log_proctitle(tsk, context);
+
         /* Send end of event record to help user space know we are finished */
         ab = audit_log_start(context, GFP_KERNEL, AUDIT_EOE);
         if (ab)
@@ -1406,7 +1477,7 @@ void __audit_free(struct task_struct *tsk)
 {
         struct audit_context *context;
 
-        context = audit_get_context(tsk, 0, 0);
+        context = audit_take_context(tsk, 0, 0);
         if (!context)
                 return;
 
@@ -1500,7 +1571,7 @@ void __audit_syscall_exit(int success, long return_code)
         else
                 success = AUDITSC_FAILURE;
 
-        context = audit_get_context(tsk, success, return_code);
+        context = audit_take_context(tsk, success, return_code);
         if (!context)
                 return;
 
@@ -1550,7 +1621,7 @@ static inline void handle_one(const struct inode *inode)
         if (likely(put_tree_ref(context, chunk)))
                 return;
         if (unlikely(!grow_tree_refs(context))) {
-                printk(KERN_WARNING "out of memory, audit has lost a tree reference\n");
+                pr_warn("out of memory, audit has lost a tree reference\n");
                 audit_set_auditable(context);
                 audit_put_chunk(chunk);
                 unroll_tree_refs(context, p, count);
@@ -1609,8 +1680,7 @@ retry:
                         goto retry;
                 }
                 /* too bad */
-                printk(KERN_WARNING
-                        "out of memory, audit has lost a tree reference\n");
+                pr_warn("out of memory, audit has lost a tree reference\n");
                 unroll_tree_refs(context, p, count);
                 audit_set_auditable(context);
                 return;
@@ -1682,7 +1752,7 @@ void __audit_getname(struct filename *name)
 
         if (!context->in_syscall) {
 #if AUDIT_DEBUG == 2
-                printk(KERN_ERR "%s:%d(:%d): ignoring getname(%p)\n",
+                pr_err("%s:%d(:%d): ignoring getname(%p)\n",
                        __FILE__, __LINE__, context->serial, name);
                 dump_stack();
 #endif
@@ -1721,15 +1791,15 @@ void audit_putname(struct filename *name)
         BUG_ON(!context);
         if (!name->aname || !context->in_syscall) {
 #if AUDIT_DEBUG == 2
-                printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
+                pr_err("%s:%d(:%d): final_putname(%p)\n",
                        __FILE__, __LINE__, context->serial, name);
                 if (context->name_count) {
                         struct audit_names *n;
                         int i = 0;
 
                         list_for_each_entry(n, &context->names_list, list)
-                                printk(KERN_ERR "name[%d] = %p = %s\n", i++,
-                                       n->name, n->name->name ?: "(null)");
+                                pr_err("name[%d] = %p = %s\n", i++, n->name,
+                                       n->name->name ?: "(null)");
                         }
 #endif
                 final_putname(name);
@@ -1738,9 +1808,8 @@ void audit_putname(struct filename *name)
         else {
                 ++context->put_count;
                 if (context->put_count > context->name_count) {
-                        printk(KERN_ERR "%s:%d(:%d): major=%d"
-                               " in_syscall=%d putname(%p) name_count=%d"
-                               " put_count=%d\n",
+                        pr_err("%s:%d(:%d): major=%d in_syscall=%d putname(%p)"
+                               " name_count=%d put_count=%d\n",
                                __FILE__, __LINE__,
                                context->serial, context->major,
                                context->in_syscall, name->name,
@@ -1981,12 +2050,10 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
         ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
         if (!ab)
                 return;
-        audit_log_format(ab, "pid=%d uid=%u"
-                         " old-auid=%u new-auid=%u old-ses=%u new-ses=%u"
-                         " res=%d",
-                         current->pid, uid,
-                         oldloginuid, loginuid, oldsessionid, sessionid,
-                         !rc);
+        audit_log_format(ab, "pid=%d uid=%u", task_pid_nr(current), uid);
+        audit_log_task_context(ab);
+        audit_log_format(ab, " old-auid=%u auid=%u old-ses=%u ses=%u res=%d",
+                         oldloginuid, loginuid, oldsessionid, sessionid, !rc);
         audit_log_end(ab);
 }
 
@@ -2208,7 +2275,7 @@ void __audit_ptrace(struct task_struct *t)
 {
         struct audit_context *context = current->audit_context;
 
-        context->target_pid = t->pid;
+        context->target_pid = task_pid_nr(t);
         context->target_auid = audit_get_loginuid(t);
         context->target_uid = task_uid(t);
         context->target_sessionid = audit_get_sessionid(t);
@@ -2233,7 +2300,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
 
         if (audit_pid && t->tgid == audit_pid) {
                 if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1 || sig == SIGUSR2) {
-                        audit_sig_pid = tsk->pid;
+                        audit_sig_pid = task_pid_nr(tsk);
                         if (uid_valid(tsk->loginuid))
                                 audit_sig_uid = tsk->loginuid;
                         else
@@ -2247,7 +2314,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
         /* optimize the common case by putting first signal recipient directly
          * in audit_context */
         if (!ctx->target_pid) {
-                ctx->target_pid = t->tgid;
+                ctx->target_pid = task_tgid_nr(t);
                 ctx->target_auid = audit_get_loginuid(t);
                 ctx->target_uid = t_uid;
                 ctx->target_sessionid = audit_get_sessionid(t);
@@ -2268,7 +2335,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
         }
         BUG_ON(axp->pid_count >= AUDIT_AUX_PIDS);
 
-        axp->target_pid[axp->pid_count] = t->tgid;
+        axp->target_pid[axp->pid_count] = task_tgid_nr(t);
         axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
         axp->target_uid[axp->pid_count] = t_uid;
         axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
@@ -2368,7 +2435,7 @@ static void audit_log_task(struct audit_buffer *ab)
                          from_kgid(&init_user_ns, gid),
                          sessionid);
         audit_log_task_context(ab);
-        audit_log_format(ab, " pid=%d comm=", current->pid);
+        audit_log_format(ab, " pid=%d comm=", task_pid_nr(current));
         audit_log_untrustedstring(ab, current->comm);
         if (mm) {
                 down_read(&mm->mmap_sem);
diff --git a/kernel/futex.c b/kernel/futex.c
index 67dacaf93e56..5f589279e462 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -70,7 +70,10 @@
 #include "locking/rtmutex_common.h"
 
 /*
- * Basic futex operation and ordering guarantees:
+ * READ this before attempting to hack on futexes!
+ *
+ * Basic futex operation and ordering guarantees
+ * =============================================
  *
  * The waiter reads the futex value in user space and calls
  * futex_wait(). This function computes the hash bucket and acquires
@@ -119,7 +122,7 @@
  * sys_futex(WAIT, futex, val);
  *   futex_wait(futex, val);
  *
- *   waiters++;
+ *   waiters++; (a)
  *   mb(); (A) <-- paired with -.
  *                              |
  *   lock(hash_bucket(futex));  |
@@ -135,14 +138,14 @@
  *     unlock(hash_bucket(futex));
  *     schedule();                         if (waiters)
  *                                           lock(hash_bucket(futex));
- *                                           wake_waiters(futex);
- *                                           unlock(hash_bucket(futex));
+ *   else                                    wake_waiters(futex);
+ *     waiters--; (b)                        unlock(hash_bucket(futex));
  *
- * Where (A) orders the waiters increment and the futex value read -- this
- * is guaranteed by the head counter in the hb spinlock; and where (B)
- * orders the write to futex and the waiters read -- this is done by the
- * barriers in get_futex_key_refs(), through either ihold or atomic_inc,
- * depending on the futex type.
+ * Where (A) orders the waiters increment and the futex value read through
+ * atomic operations (see hb_waiters_inc) and where (B) orders the write
+ * to futex and the waiters read -- this is done by the barriers in
+ * get_futex_key_refs(), through either ihold or atomic_inc, depending on the
+ * futex type.
  *
  * This yields the following case (where X:=waiters, Y:=futex):
  *
@@ -155,6 +158,17 @@
  * Which guarantees that x==0 && y==0 is impossible; which translates back into
  * the guarantee that we cannot both miss the futex variable change and the
  * enqueue.
+ *
+ * Note that a new waiter is accounted for in (a) even when it is possible that
+ * the wait call can return error, in which case we backtrack from it in (b).
+ * Refer to the comment in queue_lock().
+ *
+ * Similarly, in order to account for waiters being requeued on another
+ * address we always increment the waiters for the destination bucket before
+ * acquiring the lock. It then decrements them again  after releasing it -
+ * the code that actually moves the futex(es) between hash buckets (requeue_futex)
+ * will do the additional required waiter count housekeeping. This is done for
+ * double_lock_hb() and double_unlock_hb(), respectively.
  */
 
 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
@@ -1452,6 +1466,7 @@ retry:
         hb2 = hash_futex(&key2);
 
 retry_private:
+        hb_waiters_inc(hb2);
         double_lock_hb(hb1, hb2);
 
         if (likely(cmpval != NULL)) {
@@ -1461,6 +1476,7 @@ retry_private:
 
                 if (unlikely(ret)) {
                         double_unlock_hb(hb1, hb2);
+                        hb_waiters_dec(hb2);
 
                         ret = get_user(curval, uaddr1);
                         if (ret)
@@ -1510,6 +1526,7 @@ retry_private:
                         break;
                 case -EFAULT:
                         double_unlock_hb(hb1, hb2);
+                        hb_waiters_dec(hb2);
                         put_futex_key(&key2);
                         put_futex_key(&key1);
                         ret = fault_in_user_writeable(uaddr2);
@@ -1519,6 +1536,7 @@ retry_private:
                 case -EAGAIN:
                         /* The owner was exiting, try again. */
                         double_unlock_hb(hb1, hb2);
+                        hb_waiters_dec(hb2);
                         put_futex_key(&key2);
                         put_futex_key(&key1);
                         cond_resched();
@@ -1594,6 +1612,7 @@ retry_private:
 
 out_unlock:
         double_unlock_hb(hb1, hb2);
+        hb_waiters_dec(hb2);
 
         /*
          * drop_futex_key_refs() must be called outside the spinlocks. During
diff --git a/kernel/relay.c b/kernel/relay.c
index 52d6a6f56261..5a56d3c8dc03 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1195,8 +1195,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
 
 static const struct pipe_buf_operations relay_pipe_buf_ops = {
         .can_merge = 0,
-        .map = generic_pipe_buf_map,
-        .unmap = generic_pipe_buf_unmap,
         .confirm = generic_pipe_buf_confirm,
         .release = relay_pipe_buf_release,
         .steal = generic_pipe_buf_steal,
@@ -1253,7 +1251,7 @@ static ssize_t subbuf_splice_actor(struct file *in,
         subbuf_pages = rbuf->chan->alloc_size >> PAGE_SHIFT;
         pidx = (read_start / PAGE_SIZE) % subbuf_pages;
         poff = read_start & ~PAGE_MASK;
-        nr_pages = min_t(unsigned int, subbuf_pages, pipe->buffers);
+        nr_pages = min_t(unsigned int, subbuf_pages, spd.nr_pages_max);
 
         for (total_len = 0; spd.nr_pages < nr_pages; spd.nr_pages++) {
                 unsigned int this_len, this_end, private;
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index fd609bd9d6dd..d8d046c0726a 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -71,7 +71,7 @@ static void populate_seccomp_data(struct seccomp_data *sd)
         struct pt_regs *regs = task_pt_regs(task);
 
         sd->nr = syscall_get_nr(task, regs);
-        sd->arch = syscall_get_arch(task, regs);
+        sd->arch = syscall_get_arch();
 
         /* Unroll syscall_get_args to help gcc on arm. */
         syscall_get_arguments(task, regs, 0, 1, (unsigned long *) &sd->args[0]);
@@ -348,7 +348,7 @@ static void seccomp_send_sigsys(int syscall, int reason)
         info.si_code = SYS_SECCOMP;
         info.si_call_addr = (void __user *)KSTK_EIP(current);
         info.si_errno = reason;
-        info.si_arch = syscall_get_arch(current, task_pt_regs(current));
+        info.si_arch = syscall_get_arch();
         info.si_syscall = syscall;
         force_sig_info(SIGSYS, &info, current);
 }
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9be67c5e5b0f..737b0efa1a62 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3611,6 +3611,8 @@ static const char readme_msg[] =
 #ifdef CONFIG_TRACER_SNAPSHOT
         "\t\t      snapshot\n"
 #endif
+        "\t\t      dump\n"
+        "\t\t      cpudump\n"
         "\t     example: echo do_fault:traceoff > set_ftrace_filter\n"
         "\t              echo do_trap:traceoff:3 > set_ftrace_filter\n"
         "\t     The first one will disable tracing every time do_fault is hit\n"
@@ -4390,8 +4392,6 @@ static void tracing_spd_release_pipe(struct splice_pipe_desc *spd,
 
 static const struct pipe_buf_operations tracing_pipe_buf_ops = {
         .can_merge              = 0,
-        .map                    = generic_pipe_buf_map,
-        .unmap                  = generic_pipe_buf_unmap,
         .confirm                = generic_pipe_buf_confirm,
         .release                = generic_pipe_buf_release,
         .steal                  = generic_pipe_buf_steal,
@@ -4486,7 +4486,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
         trace_access_lock(iter->cpu_file);
 
         /* Fill as many pages as possible. */
-        for (i = 0, rem = len; i < pipe->buffers && rem; i++) {
+        for (i = 0, rem = len; i < spd.nr_pages_max && rem; i++) {
                 spd.pages[i] = alloc_page(GFP_KERNEL);
                 if (!spd.pages[i])
                         break;
@@ -5279,8 +5279,6 @@ static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
 /* Pipe buffer operations for a buffer. */
 static const struct pipe_buf_operations buffer_pipe_buf_ops = {
         .can_merge              = 0,
-        .map                    = generic_pipe_buf_map,
-        .unmap                  = generic_pipe_buf_unmap,
         .confirm                = generic_pipe_buf_confirm,
         .release                = buffer_pipe_buf_release,
         .steal                  = generic_pipe_buf_steal,
@@ -5356,7 +5354,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
         trace_access_lock(iter->cpu_file);
         entries = ring_buffer_entries_cpu(iter->trace_buffer->buffer, iter->cpu_file);
 
-        for (i = 0; i < pipe->buffers && len && entries; i++, len -= PAGE_SIZE) {
+        for (i = 0; i < spd.nr_pages_max && len && entries; i++, len -= PAGE_SIZE) {
                 struct page *page;
                 int r;
 
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 83a4378dc5e0..3ddfd8f62c05 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -223,24 +223,25 @@ int ftrace_event_reg(struct ftrace_event_call *call,
 {
         struct ftrace_event_file *file = data;
 
+        WARN_ON(!(call->flags & TRACE_EVENT_FL_TRACEPOINT));
         switch (type) {
         case TRACE_REG_REGISTER:
-                return tracepoint_probe_register(call->name,
+                return tracepoint_probe_register(call->tp,
                                                  call->class->probe,
                                                  file);
         case TRACE_REG_UNREGISTER:
-                tracepoint_probe_unregister(call->name,
+                tracepoint_probe_unregister(call->tp,
                                             call->class->probe,
                                             file);
                 return 0;
 
 #ifdef CONFIG_PERF_EVENTS
         case TRACE_REG_PERF_REGISTER:
-                return tracepoint_probe_register(call->name,
+                return tracepoint_probe_register(call->tp,
                                                  call->class->perf_probe,
                                                  call);
         case TRACE_REG_PERF_UNREGISTER:
-                tracepoint_probe_unregister(call->name,
+                tracepoint_probe_unregister(call->tp,
                                             call->class->perf_probe,
                                             call);
                 return 0;
@@ -352,7 +353,7 @@ static int __ftrace_event_enable_disable(struct ftrace_event_file *file,
                         if (ret) {
                                 tracing_stop_cmdline_record();
                                 pr_info("event trace: Could not enable event "
-                                        "%s\n", call->name);
+                                        "%s\n", ftrace_event_name(call));
                                 break;
                         }
                         set_bit(FTRACE_EVENT_FL_ENABLED_BIT, &file->flags);
@@ -481,27 +482,29 @@ __ftrace_set_clr_event_nolock(struct trace_array *tr, const char *match,
 {
         struct ftrace_event_file *file;
         struct ftrace_event_call *call;
+        const char *name;
         int ret = -EINVAL;
 
         list_for_each_entry(file, &tr->events, list) {
 
                 call = file->event_call;
+                name = ftrace_event_name(call);
 
-                if (!call->name || !call->class || !call->class->reg)
+                if (!name || !call->class || !call->class->reg)
                         continue;
 
                 if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)
                         continue;
 
                 if (match &&
-                    strcmp(match, call->name) != 0 &&
+                    strcmp(match, name) != 0 &&
                     strcmp(match, call->class->system) != 0)
                         continue;
 
                 if (sub && strcmp(sub, call->class->system) != 0)
                         continue;
 
-                if (event && strcmp(event, call->name) != 0)
+                if (event && strcmp(event, name) != 0)
                         continue;
 
                 ftrace_event_enable_disable(file, set);
@@ -699,7 +702,7 @@ static int t_show(struct seq_file *m, void *v)
 
         if (strcmp(call->class->system, TRACE_SYSTEM) != 0)
                 seq_printf(m, "%s:", call->class->system);
-        seq_printf(m, "%s\n", call->name);
+        seq_printf(m, "%s\n", ftrace_event_name(call));
 
         return 0;
 }
@@ -792,7 +795,7 @@ system_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
         mutex_lock(&event_mutex);
         list_for_each_entry(file, &tr->events, list) {
                 call = file->event_call;
-                if (!call->name || !call->class || !call->class->reg)
+                if (!ftrace_event_name(call) || !call->class || !call->class->reg)
                         continue;
 
                 if (system && strcmp(call->class->system, system->name) != 0)
@@ -907,7 +910,7 @@ static int f_show(struct seq_file *m, void *v)
 
         switch ((unsigned long)v) {
         case FORMAT_HEADER:
-                seq_printf(m, "name: %s\n", call->name);
+                seq_printf(m, "name: %s\n", ftrace_event_name(call));
                 seq_printf(m, "ID: %d\n", call->event.type);
                 seq_printf(m, "format:\n");
                 return 0;
@@ -1527,6 +1530,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
         struct trace_array *tr = file->tr;
         struct list_head *head;
         struct dentry *d_events;
+        const char *name;
         int ret;
 
         /*
@@ -1540,10 +1544,11 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
         } else
                 d_events = parent;
 
-        file->dir = debugfs_create_dir(call->name, d_events);
+        name = ftrace_event_name(call);
+        file->dir = debugfs_create_dir(name, d_events);
         if (!file->dir) {
                 pr_warning("Could not create debugfs '%s' directory\n",
-                           call->name);
+                           name);
                 return -1;
         }
 
@@ -1567,7 +1572,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file)
                 ret = call->class->define_fields(call);
                 if (ret < 0) {
                         pr_warning("Could not initialize trace point"
-                                   " events/%s\n", call->name);
+                                   " events/%s\n", name);
                         return -1;
                 }
         }
@@ -1631,15 +1636,17 @@ static void event_remove(struct ftrace_event_call *call)
 static int event_init(struct ftrace_event_call *call)
 {
         int ret = 0;
+        const char *name;
 
-        if (WARN_ON(!call->name))
+        name = ftrace_event_name(call);
+        if (WARN_ON(!name))
                 return -EINVAL;
 
         if (call->class->raw_init) {
                 ret = call->class->raw_init(call);
                 if (ret < 0 && ret != -ENOSYS)
                         pr_warn("Could not initialize trace events/%s\n",
-                                call->name);
+                                name);
         }
 
         return ret;
@@ -1885,7 +1892,7 @@ __trace_add_event_dirs(struct trace_array *tr)
                 ret = __trace_add_new_event(call, tr);
                 if (ret < 0)
                         pr_warning("Could not create directory for event %s\n",
-                                   call->name);
+                                   ftrace_event_name(call));
         }
 }
 
@@ -1894,18 +1901,20 @@ find_event_file(struct trace_array *tr, const char *system,  const char *event)
 {
         struct ftrace_event_file *file;
         struct ftrace_event_call *call;
+        const char *name;
 
         list_for_each_entry(file, &tr->events, list) {
 
                 call = file->event_call;
+                name = ftrace_event_name(call);
 
-                if (!call->name || !call->class || !call->class->reg)
+                if (!name || !call->class || !call->class->reg)
                         continue;
 
                 if (call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)
                         continue;
 
-                if (strcmp(event, call->name) == 0 &&
+                if (strcmp(event, name) == 0 &&
                     strcmp(system, call->class->system) == 0)
                         return file;
         }
@@ -1973,7 +1982,7 @@ event_enable_print(struct seq_file *m, unsigned long ip,
         seq_printf(m, "%s:%s:%s",
                    data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
                    data->file->event_call->class->system,
-                   data->file->event_call->name);
+                   ftrace_event_name(data->file->event_call));
 
         if (data->count == -1)
                 seq_printf(m, ":unlimited\n");
@@ -2193,7 +2202,7 @@ __trace_early_add_event_dirs(struct trace_array *tr)
                 ret = event_create_dir(tr->event_dir, file);
                 if (ret < 0)
                         pr_warning("Could not create directory for event %s\n",
-                                   file->event_call->name);
+                                   ftrace_event_name(file->event_call));
         }
 }
 
@@ -2217,7 +2226,7 @@ __trace_early_add_events(struct trace_array *tr)
                 ret = __trace_early_add_new_event(call, tr);
                 if (ret < 0)
                         pr_warning("Could not create early event %s\n",
-                                   call->name);
+                                   ftrace_event_name(call));
         }
 }
 
@@ -2549,7 +2558,7 @@ static __init void event_trace_self_tests(void)
                         continue;
 #endif
 
-                pr_info("Testing event %s: ", call->name);
+                pr_info("Testing event %s: ", ftrace_event_name(call));
 
                 /*
                  * If an event is already enabled, someone is using
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 8efbb69b04f0..925f537f07d1 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
         seq_printf(m, "%s:%s:%s",
                    enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
                    enable_data->file->event_call->class->system,
-                   enable_data->file->event_call->name);
+                   ftrace_event_name(enable_data->file->event_call));
 
         if (data->count == -1)
                 seq_puts(m, ":unlimited");
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index ee0a5098ac43..d4ddde28a81a 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -173,9 +173,11 @@ struct ftrace_event_class __refdata event_class_ftrace_##call = {	\
 };                                                                      \
                                                                         \
 struct ftrace_event_call __used event_##call = {                        \
-        .name                   = #call,                                \
-        .event.type             = etype,                                \
         .class                  = &event_class_ftrace_##call,           \
+        {                                                               \
+                .name                   = #call,                        \
+        },                                                              \
+        .event.type             = etype,                                \
         .print_fmt              = print,                                \
         .flags                  = TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \
 };                                                                      \
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d021d21dd150..903ae28962be 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -341,7 +341,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event,
         struct trace_kprobe *tk;
 
         list_for_each_entry(tk, &probe_list, list)
-                if (strcmp(tk->tp.call.name, event) == 0 &&
+                if (strcmp(ftrace_event_name(&tk->tp.call), event) == 0 &&
                     strcmp(tk->tp.call.class->system, group) == 0)
                         return tk;
         return NULL;
@@ -516,7 +516,8 @@ static int register_trace_kprobe(struct trace_kprobe *tk)
         mutex_lock(&probe_lock);
 
         /* Delete old (same name) event if exist */
-        old_tk = find_trace_kprobe(tk->tp.call.name, tk->tp.call.class->system);
+        old_tk = find_trace_kprobe(ftrace_event_name(&tk->tp.call),
+                        tk->tp.call.class->system);
         if (old_tk) {
                 ret = unregister_trace_kprobe(old_tk);
                 if (ret < 0)
@@ -564,7 +565,8 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,
                         if (ret)
                                 pr_warning("Failed to re-register probe %s on"
                                            "%s: %d\n",
-                                           tk->tp.call.name, mod->name, ret);
+                                           ftrace_event_name(&tk->tp.call),
+                                           mod->name, ret);
                 }
         }
         mutex_unlock(&probe_lock);
@@ -818,7 +820,8 @@ static int probes_seq_show(struct seq_file *m, void *v)
         int i;
 
         seq_printf(m, "%c", trace_kprobe_is_return(tk) ? 'r' : 'p');
-        seq_printf(m, ":%s/%s", tk->tp.call.class->system, tk->tp.call.name);
+        seq_printf(m, ":%s/%s", tk->tp.call.class->system,
+                        ftrace_event_name(&tk->tp.call));
 
         if (!tk->symbol)
                 seq_printf(m, " 0x%p", tk->rp.kp.addr);
@@ -876,7 +879,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
 {
         struct trace_kprobe *tk = v;
 
-        seq_printf(m, "  %-44s %15lu %15lu\n", tk->tp.call.name, tk->nhit,
+        seq_printf(m, "  %-44s %15lu %15lu\n",
+                   ftrace_event_name(&tk->tp.call), tk->nhit,
                    tk->rp.kp.nmissed);
 
         return 0;
@@ -1011,7 +1015,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags,
         field = (struct kprobe_trace_entry_head *)iter->ent;
         tp = container_of(event, struct trace_probe, call.event);
 
-        if (!trace_seq_printf(s, "%s: (", tp->call.name))
+        if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
                 goto partial;
 
         if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET))
@@ -1047,7 +1051,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
         field = (struct kretprobe_trace_entry_head *)iter->ent;
         tp = container_of(event, struct trace_probe, call.event);
 
-        if (!trace_seq_printf(s, "%s: (", tp->call.name))
+        if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
                 goto partial;
 
         if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET))
@@ -1286,7 +1290,8 @@ static int register_kprobe_event(struct trace_kprobe *tk)
         call->data = tk;
         ret = trace_add_event_call(call);
         if (ret) {
-                pr_info("Failed to register kprobe event: %s\n", call->name);
+                pr_info("Failed to register kprobe event: %s\n",
+                        ftrace_event_name(call));
                 kfree(call->print_fmt);
                 unregister_ftrace_event(&call->event);
         }
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index ca0e79e2abaa..a436de18aa99 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -431,7 +431,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter,
         }
 
         trace_seq_init(p);
-        ret = trace_seq_printf(s, "%s: ", event->name);
+        ret = trace_seq_printf(s, "%s: ", ftrace_event_name(event));
         if (!ret)
                 return TRACE_TYPE_PARTIAL_LINE;
 
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e4473367e7a4..930e51462dc8 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -294,7 +294,7 @@ static struct trace_uprobe *find_probe_event(const char *event, const char *grou
         struct trace_uprobe *tu;
 
         list_for_each_entry(tu, &uprobe_list, list)
-                if (strcmp(tu->tp.call.name, event) == 0 &&
+                if (strcmp(ftrace_event_name(&tu->tp.call), event) == 0 &&
                     strcmp(tu->tp.call.class->system, group) == 0)
                         return tu;
 
@@ -324,7 +324,8 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
         mutex_lock(&uprobe_lock);
 
         /* register as an event */
-        old_tu = find_probe_event(tu->tp.call.name, tu->tp.call.class->system);
+        old_tu = find_probe_event(ftrace_event_name(&tu->tp.call),
+                        tu->tp.call.class->system);
         if (old_tu) {
                 /* delete old event */
                 ret = unregister_trace_uprobe(old_tu);
@@ -599,7 +600,8 @@ static int probes_seq_show(struct seq_file *m, void *v)
         char c = is_ret_probe(tu) ? 'r' : 'p';
         int i;
 
-        seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system, tu->tp.call.name);
+        seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system,
+                        ftrace_event_name(&tu->tp.call));
         seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset);
 
         for (i = 0; i < tu->tp.nr_args; i++)
@@ -649,7 +651,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
 {
         struct trace_uprobe *tu = v;
 
-        seq_printf(m, "  %s %-44s %15lu\n", tu->filename, tu->tp.call.name, tu->nhit);
+        seq_printf(m, "  %s %-44s %15lu\n", tu->filename,
+                        ftrace_event_name(&tu->tp.call), tu->nhit);
         return 0;
 }
 
@@ -844,12 +847,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
         tu = container_of(event, struct trace_uprobe, tp.call.event);
 
         if (is_ret_probe(tu)) {
-                if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", tu->tp.call.name,
+                if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
+                                        ftrace_event_name(&tu->tp.call),
                                         entry->vaddr[1], entry->vaddr[0]))
                         goto partial;
                 data = DATAOF_TRACE_ENTRY(entry, true);
         } else {
-                if (!trace_seq_printf(s, "%s: (0x%lx)", tu->tp.call.name,
+                if (!trace_seq_printf(s, "%s: (0x%lx)",
+                                        ftrace_event_name(&tu->tp.call),
                                         entry->vaddr[0]))
                         goto partial;
                 data = DATAOF_TRACE_ENTRY(entry, false);
@@ -1275,7 +1280,8 @@ static int register_uprobe_event(struct trace_uprobe *tu)
         ret = trace_add_event_call(call);
 
         if (ret) {
-                pr_info("Failed to register uprobe event: %s\n", call->name);
+                pr_info("Failed to register uprobe event: %s\n",
+                        ftrace_event_name(call));
                 kfree(call->print_fmt);
                 unregister_ftrace_event(&call->event);
         }
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index fb0a38a26555..ac5b23cf7212 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Mathieu Desnoyers
+ * Copyright (C) 2008-2014 Mathieu Desnoyers
  *
  * 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
@@ -33,39 +33,27 @@ extern struct tracepoint * const __stop___tracepoints_ptrs[];
 /* Set to 1 to enable tracepoint debug output */
 static const int tracepoint_debug;
 
+#ifdef CONFIG_MODULES
 /*
- * Tracepoints mutex protects the builtin and module tracepoints and the hash
- * table, as well as the local module list.
+ * Tracepoint module list mutex protects the local module list.
  */
-static DEFINE_MUTEX(tracepoints_mutex);
+static DEFINE_MUTEX(tracepoint_module_list_mutex);
 
-#ifdef CONFIG_MODULES
-/* Local list of struct module */
+/* Local list of struct tp_module */
 static LIST_HEAD(tracepoint_module_list);
 #endif /* CONFIG_MODULES */
 
 /*
- * Tracepoint hash table, containing the active tracepoints.
- * Protected by tracepoints_mutex.
+ * tracepoints_mutex protects the builtin and module tracepoints.
+ * tracepoints_mutex nests inside tracepoint_module_list_mutex.
  */
-#define TRACEPOINT_HASH_BITS 6
-#define TRACEPOINT_TABLE_SIZE (1 << TRACEPOINT_HASH_BITS)
-static struct hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE];
+static DEFINE_MUTEX(tracepoints_mutex);
 
 /*
  * Note about RCU :
  * It is used to delay the free of multiple probes array until a quiescent
  * state is reached.
- * Tracepoint entries modifications are protected by the tracepoints_mutex.
  */
-struct tracepoint_entry {
-        struct hlist_node hlist;
-        struct tracepoint_func *funcs;
-        int refcount;   /* Number of times armed. 0 if disarmed. */
-        int enabled;    /* Tracepoint enabled */
-        char name[0];
-};
-
 struct tp_probes {
         struct rcu_head rcu;
         struct tracepoint_func probes[0];
@@ -92,34 +80,33 @@ static inline void release_probes(struct tracepoint_func *old)
         }
 }
 
-static void debug_print_probes(struct tracepoint_entry *entry)
+static void debug_print_probes(struct tracepoint_func *funcs)
 {
         int i;
 
-        if (!tracepoint_debug || !entry->funcs)
+        if (!tracepoint_debug || !funcs)
                 return;
 
-        for (i = 0; entry->funcs[i].func; i++)
-                printk(KERN_DEBUG "Probe %d : %p\n", i, entry->funcs[i].func);
+        for (i = 0; funcs[i].func; i++)
+                printk(KERN_DEBUG "Probe %d : %p\n", i, funcs[i].func);
 }
 
-static struct tracepoint_func *
-tracepoint_entry_add_probe(struct tracepoint_entry *entry,
-                           void *probe, void *data)
+static struct tracepoint_func *func_add(struct tracepoint_func **funcs,
+                struct tracepoint_func *tp_func)
 {
         int nr_probes = 0;
         struct tracepoint_func *old, *new;
 
-        if (WARN_ON(!probe))
+        if (WARN_ON(!tp_func->func))
                 return ERR_PTR(-EINVAL);
 
-        debug_print_probes(entry);
-        old = entry->funcs;
+        debug_print_probes(*funcs);
+        old = *funcs;
         if (old) {
                 /* (N -> N+1), (N != 0, 1) probes */
                 for (nr_probes = 0; old[nr_probes].func; nr_probes++)
-                        if (old[nr_probes].func == probe &&
-                            old[nr_probes].data == data)
+                        if (old[nr_probes].func == tp_func->func &&
+                            old[nr_probes].data == tp_func->data)
                                 return ERR_PTR(-EEXIST);
         }
         /* + 2 : one for new probe, one for NULL func */
@@ -128,33 +115,30 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
                 return ERR_PTR(-ENOMEM);
         if (old)
                 memcpy(new, old, nr_probes * sizeof(struct tracepoint_func));
-        new[nr_probes].func = probe;
-        new[nr_probes].data = data;
+        new[nr_probes] = *tp_func;
         new[nr_probes + 1].func = NULL;
-        entry->refcount = nr_probes + 1;
-        entry->funcs = new;
-        debug_print_probes(entry);
+        *funcs = new;
+        debug_print_probes(*funcs);
         return old;
 }
 
-static void *
-tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
-                              void *probe, void *data)
+static void *func_remove(struct tracepoint_func **funcs,
+                struct tracepoint_func *tp_func)
 {
         int nr_probes = 0, nr_del = 0, i;
         struct tracepoint_func *old, *new;
 
-        old = entry->funcs;
+        old = *funcs;
 
         if (!old)
                 return ERR_PTR(-ENOENT);
 
-        debug_print_probes(entry);
+        debug_print_probes(*funcs);
         /* (N -> M), (N > 1, M >= 0) probes */
-        if (probe) {
+        if (tp_func->func) {
                 for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
-                        if (old[nr_probes].func == probe &&
-                             old[nr_probes].data == data)
+                        if (old[nr_probes].func == tp_func->func &&
+                             old[nr_probes].data == tp_func->data)
                                 nr_del++;
                 }
         }
@@ -165,9 +149,8 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
          */
         if (nr_probes - nr_del == 0) {
                 /* N -> 0, (N > 1) */
-                entry->funcs = NULL;
-                entry->refcount = 0;
-                debug_print_probes(entry);
+                *funcs = NULL;
+                debug_print_probes(*funcs);
                 return old;
         } else {
                 int j = 0;
@@ -177,91 +160,35 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
                 if (new == NULL)
                         return ERR_PTR(-ENOMEM);
                 for (i = 0; old[i].func; i++)
-                        if (old[i].func != probe || old[i].data != data)
+                        if (old[i].func != tp_func->func
+                                        || old[i].data != tp_func->data)
                                 new[j++] = old[i];
                 new[nr_probes - nr_del].func = NULL;
-                entry->refcount = nr_probes - nr_del;
-                entry->funcs = new;
+                *funcs = new;
         }
-        debug_print_probes(entry);
+        debug_print_probes(*funcs);
         return old;
 }
 
 /*
- * Get tracepoint if the tracepoint is present in the tracepoint hash table.
- * Must be called with tracepoints_mutex held.
- * Returns NULL if not present.
+ * Add the probe function to a tracepoint.
  */
-static struct tracepoint_entry *get_tracepoint(const char *name)
+static int tracepoint_add_func(struct tracepoint *tp,
+                struct tracepoint_func *func)
 {
-        struct hlist_head *head;
-        struct tracepoint_entry *e;
-        u32 hash = jhash(name, strlen(name), 0);
-
-        head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
-        hlist_for_each_entry(e, head, hlist) {
-                if (!strcmp(name, e->name))
-                        return e;
-        }
-        return NULL;
-}
+        struct tracepoint_func *old, *tp_funcs;
 
-/*
- * Add the tracepoint to the tracepoint hash table. Must be called with
- * tracepoints_mutex held.
- */
-static struct tracepoint_entry *add_tracepoint(const char *name)
-{
-        struct hlist_head *head;
-        struct tracepoint_entry *e;
-        size_t name_len = strlen(name) + 1;
-        u32 hash = jhash(name, name_len-1, 0);
-
-        head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
-        hlist_for_each_entry(e, head, hlist) {
-                if (!strcmp(name, e->name)) {
-                        printk(KERN_NOTICE
-                                "tracepoint %s busy\n", name);
-                        return ERR_PTR(-EEXIST);        /* Already there */
-                }
-        }
-        /*
-         * Using kmalloc here to allocate a variable length element. Could
-         * cause some memory fragmentation if overused.
-         */
-        e = kmalloc(sizeof(struct tracepoint_entry) + name_len, GFP_KERNEL);
-        if (!e)
-                return ERR_PTR(-ENOMEM);
-        memcpy(&e->name[0], name, name_len);
-        e->funcs = NULL;
-        e->refcount = 0;
-        e->enabled = 0;
-        hlist_add_head(&e->hlist, head);
-        return e;
-}
+        if (tp->regfunc && !static_key_enabled(&tp->key))
+                tp->regfunc();
 
-/*
- * Remove the tracepoint from the tracepoint hash table. Must be called with
- * mutex_lock held.
- */
-static inline void remove_tracepoint(struct tracepoint_entry *e)
-{
-        hlist_del(&e->hlist);
-        kfree(e);
-}
-
-/*
- * Sets the probe callback corresponding to one tracepoint.
- */
-static void set_tracepoint(struct tracepoint_entry **entry,
-        struct tracepoint *elem, int active)
-{
-        WARN_ON(strcmp((*entry)->name, elem->name) != 0);
-
-        if (elem->regfunc && !static_key_enabled(&elem->key) && active)
-                elem->regfunc();
-        else if (elem->unregfunc && static_key_enabled(&elem->key) && !active)
-                elem->unregfunc();
+        tp_funcs = rcu_dereference_protected(tp->funcs,
+                        lockdep_is_held(&tracepoints_mutex));
+        old = func_add(&tp_funcs, func);
+        if (IS_ERR(old)) {
+                WARN_ON_ONCE(1);
+                return PTR_ERR(old);
+        }
+        release_probes(old);
 
         /*
          * rcu_assign_pointer has a smp_wmb() which makes sure that the new
@@ -270,193 +197,90 @@ static void set_tracepoint(struct tracepoint_entry **entry,
          * include/linux/tracepoints.h. A matching smp_read_barrier_depends()
          * is used.
          */
-        rcu_assign_pointer(elem->funcs, (*entry)->funcs);
-        if (active && !static_key_enabled(&elem->key))
-                static_key_slow_inc(&elem->key);
-        else if (!active && static_key_enabled(&elem->key))
-                static_key_slow_dec(&elem->key);
+        rcu_assign_pointer(tp->funcs, tp_funcs);
+        if (!static_key_enabled(&tp->key))
+                static_key_slow_inc(&tp->key);
+        return 0;
 }
 
 /*
- * Disable a tracepoint and its probe callback.
+ * Remove a probe function from a tracepoint.
  * Note: only waiting an RCU period after setting elem->call to the empty
  * function insures that the original callback is not used anymore. This insured
  * by preempt_disable around the call site.
  */
-static void disable_tracepoint(struct tracepoint *elem)
+static int tracepoint_remove_func(struct tracepoint *tp,
+                struct tracepoint_func *func)
 {
-        if (elem->unregfunc && static_key_enabled(&elem->key))
-                elem->unregfunc();
-
-        if (static_key_enabled(&elem->key))
-                static_key_slow_dec(&elem->key);
-        rcu_assign_pointer(elem->funcs, NULL);
-}
+        struct tracepoint_func *old, *tp_funcs;
 
-/**
- * tracepoint_update_probe_range - Update a probe range
- * @begin: beginning of the range
- * @end: end of the range
- *
- * Updates the probe callback corresponding to a range of tracepoints.
- * Called with tracepoints_mutex held.
- */
-static void tracepoint_update_probe_range(struct tracepoint * const *begin,
-                                          struct tracepoint * const *end)
-{
-        struct tracepoint * const *iter;
-        struct tracepoint_entry *mark_entry;
-
-        if (!begin)
-                return;
-
-        for (iter = begin; iter < end; iter++) {
-                mark_entry = get_tracepoint((*iter)->name);
-                if (mark_entry) {
-                        set_tracepoint(&mark_entry, *iter,
-                                        !!mark_entry->refcount);
-                        mark_entry->enabled = !!mark_entry->refcount;
-                } else {
-                        disable_tracepoint(*iter);
-                }
+        tp_funcs = rcu_dereference_protected(tp->funcs,
+                        lockdep_is_held(&tracepoints_mutex));
+        old = func_remove(&tp_funcs, func);
+        if (IS_ERR(old)) {
+                WARN_ON_ONCE(1);
+                return PTR_ERR(old);
         }
-}
-
-#ifdef CONFIG_MODULES
-void module_update_tracepoints(void)
-{
-        struct tp_module *tp_mod;
-
-        list_for_each_entry(tp_mod, &tracepoint_module_list, list)
-                tracepoint_update_probe_range(tp_mod->tracepoints_ptrs,
-                        tp_mod->tracepoints_ptrs + tp_mod->num_tracepoints);
-}
-#else /* CONFIG_MODULES */
-void module_update_tracepoints(void)
-{
-}
-#endif /* CONFIG_MODULES */
+        release_probes(old);
 
+        if (!tp_funcs) {
+                /* Removed last function */
+                if (tp->unregfunc && static_key_enabled(&tp->key))
+                        tp->unregfunc();
 
-/*
- * Update probes, removing the faulty probes.
- * Called with tracepoints_mutex held.
- */
-static void tracepoint_update_probes(void)
-{
-        /* Core kernel tracepoints */
-        tracepoint_update_probe_range(__start___tracepoints_ptrs,
-                __stop___tracepoints_ptrs);
-        /* tracepoints in modules. */
-        module_update_tracepoints();
-}
-
-static struct tracepoint_func *
-tracepoint_add_probe(const char *name, void *probe, void *data)
-{
-        struct tracepoint_entry *entry;
-        struct tracepoint_func *old;
-
-        entry = get_tracepoint(name);
-        if (!entry) {
-                entry = add_tracepoint(name);
-                if (IS_ERR(entry))
-                        return (struct tracepoint_func *)entry;
+                if (static_key_enabled(&tp->key))
+                        static_key_slow_dec(&tp->key);
         }
-        old = tracepoint_entry_add_probe(entry, probe, data);
-        if (IS_ERR(old) && !entry->refcount)
-                remove_tracepoint(entry);
-        return old;
+        rcu_assign_pointer(tp->funcs, tp_funcs);
+        return 0;
 }
 
 /**
  * tracepoint_probe_register -  Connect a probe to a tracepoint
- * @name: tracepoint name
+ * @tp: tracepoint
  * @probe: probe handler
- * @data: probe private data
- *
- * Returns:
- * - 0 if the probe was successfully registered, and tracepoint
- *   callsites are currently loaded for that probe,
- * - -ENODEV if the probe was successfully registered, but no tracepoint
- *   callsite is currently loaded for that probe,
- * - other negative error value on error.
- *
- * When tracepoint_probe_register() returns either 0 or -ENODEV,
- * parameters @name, @probe, and @data may be used by the tracepoint
- * infrastructure until the probe is unregistered.
  *
- * The probe address must at least be aligned on the architecture pointer size.
+ * Returns 0 if ok, error value on error.
+ * Note: if @tp is within a module, the caller is responsible for
+ * unregistering the probe before the module is gone. This can be
+ * performed either with a tracepoint module going notifier, or from
+ * within module exit functions.
  */
-int tracepoint_probe_register(const char *name, void *probe, void *data)
+int tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data)
 {
-        struct tracepoint_func *old;
-        struct tracepoint_entry *entry;
-        int ret = 0;
+        struct tracepoint_func tp_func;
+        int ret;
 
         mutex_lock(&tracepoints_mutex);
-        old = tracepoint_add_probe(name, probe, data);
-        if (IS_ERR(old)) {
-                mutex_unlock(&tracepoints_mutex);
-                return PTR_ERR(old);
-        }
-        tracepoint_update_probes();             /* may update entry */
-        entry = get_tracepoint(name);
-        /* Make sure the entry was enabled */
-        if (!entry || !entry->enabled)
-                ret = -ENODEV;
+        tp_func.func = probe;
+        tp_func.data = data;
+        ret = tracepoint_add_func(tp, &tp_func);
         mutex_unlock(&tracepoints_mutex);
-        release_probes(old);
         return ret;
 }
 EXPORT_SYMBOL_GPL(tracepoint_probe_register);
 
-static struct tracepoint_func *
-tracepoint_remove_probe(const char *name, void *probe, void *data)
-{
-        struct tracepoint_entry *entry;
-        struct tracepoint_func *old;
-
-        entry = get_tracepoint(name);
-        if (!entry)
-                return ERR_PTR(-ENOENT);
-        old = tracepoint_entry_remove_probe(entry, probe, data);
-        if (IS_ERR(old))
-                return old;
-        if (!entry->refcount)
-                remove_tracepoint(entry);
-        return old;
-}
-
 /**
  * tracepoint_probe_unregister -  Disconnect a probe from a tracepoint
- * @name: tracepoint name
+ * @tp: tracepoint
  * @probe: probe function pointer
- * @data: probe private data
  *
- * We do not need to call a synchronize_sched to make sure the probes have
- * finished running before doing a module unload, because the module unload
- * itself uses stop_machine(), which insures that every preempt disabled section
- * have finished.
+ * Returns 0 if ok, error value on error.
  */
-int tracepoint_probe_unregister(const char *name, void *probe, void *data)
+int tracepoint_probe_unregister(struct tracepoint *tp, void *probe, void *data)
 {
-        struct tracepoint_func *old;
+        struct tracepoint_func tp_func;
+        int ret;
 
         mutex_lock(&tracepoints_mutex);
-        old = tracepoint_remove_probe(name, probe, data);
-        if (IS_ERR(old)) {
-                mutex_unlock(&tracepoints_mutex);
-                return PTR_ERR(old);
-        }
-        tracepoint_update_probes();             /* may update entry */
+        tp_func.func = probe;
+        tp_func.data = data;
+        ret = tracepoint_remove_func(tp, &tp_func);
         mutex_unlock(&tracepoints_mutex);
-        release_probes(old);
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(tracepoint_probe_unregister);
 
-
 #ifdef CONFIG_MODULES
 bool trace_module_has_bad_taint(struct module *mod)
 {
@@ -464,6 +288,74 @@ bool trace_module_has_bad_taint(struct module *mod)
                                (1 << TAINT_UNSIGNED_MODULE));
 }
 
+static BLOCKING_NOTIFIER_HEAD(tracepoint_notify_list);
+
+/**
+ * register_tracepoint_notifier - register tracepoint coming/going notifier
+ * @nb: notifier block
+ *
+ * Notifiers registered with this function are called on module
+ * coming/going with the tracepoint_module_list_mutex held.
+ * The notifier block callback should expect a "struct tp_module" data
+ * pointer.
+ */
+int register_tracepoint_module_notifier(struct notifier_block *nb)
+{
+        struct tp_module *tp_mod;
+        int ret;
+
+        mutex_lock(&tracepoint_module_list_mutex);
+        ret = blocking_notifier_chain_register(&tracepoint_notify_list, nb);
+        if (ret)
+                goto end;
+        list_for_each_entry(tp_mod, &tracepoint_module_list, list)
+                (void) nb->notifier_call(nb, MODULE_STATE_COMING, tp_mod);
+end:
+        mutex_unlock(&tracepoint_module_list_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(register_tracepoint_module_notifier);
+
+/**
+ * unregister_tracepoint_notifier - unregister tracepoint coming/going notifier
+ * @nb: notifier block
+ *
+ * The notifier block callback should expect a "struct tp_module" data
+ * pointer.
+ */
+int unregister_tracepoint_module_notifier(struct notifier_block *nb)
+{
+        struct tp_module *tp_mod;
+        int ret;
+
+        mutex_lock(&tracepoint_module_list_mutex);
+        ret = blocking_notifier_chain_unregister(&tracepoint_notify_list, nb);
+        if (ret)
+                goto end;
+        list_for_each_entry(tp_mod, &tracepoint_module_list, list)
+                (void) nb->notifier_call(nb, MODULE_STATE_GOING, tp_mod);
+end:
+        mutex_unlock(&tracepoint_module_list_mutex);
+        return ret;
+
+}
+EXPORT_SYMBOL_GPL(unregister_tracepoint_module_notifier);
+
+/*
+ * Ensure the tracer unregistered the module's probes before the module
+ * teardown is performed. Prevents leaks of probe and data pointers.
+ */
+static void tp_module_going_check_quiescent(struct tracepoint * const *begin,
+                struct tracepoint * const *end)
+{
+        struct tracepoint * const *iter;
+
+        if (!begin)
+                return;
+        for (iter = begin; iter < end; iter++)
+                WARN_ON_ONCE((*iter)->funcs);
+}
+
 static int tracepoint_module_coming(struct module *mod)
 {
         struct tp_module *tp_mod;
@@ -479,36 +371,41 @@ static int tracepoint_module_coming(struct module *mod)
          */
         if (trace_module_has_bad_taint(mod))
                 return 0;
-        mutex_lock(&tracepoints_mutex);
+        mutex_lock(&tracepoint_module_list_mutex);
         tp_mod = kmalloc(sizeof(struct tp_module), GFP_KERNEL);
         if (!tp_mod) {
                 ret = -ENOMEM;
                 goto end;
         }
-        tp_mod->num_tracepoints = mod->num_tracepoints;
-        tp_mod->tracepoints_ptrs = mod->tracepoints_ptrs;
+        tp_mod->mod = mod;
         list_add_tail(&tp_mod->list, &tracepoint_module_list);
-        tracepoint_update_probe_range(mod->tracepoints_ptrs,
-                mod->tracepoints_ptrs + mod->num_tracepoints);
+        blocking_notifier_call_chain(&tracepoint_notify_list,
+                        MODULE_STATE_COMING, tp_mod);
 end:
-        mutex_unlock(&tracepoints_mutex);
+        mutex_unlock(&tracepoint_module_list_mutex);
         return ret;
 }
 
-static int tracepoint_module_going(struct module *mod)
+static void tracepoint_module_going(struct module *mod)
 {
-        struct tp_module *pos;
+        struct tp_module *tp_mod;
 
         if (!mod->num_tracepoints)
-                return 0;
+                return;
 
-        mutex_lock(&tracepoints_mutex);
-        tracepoint_update_probe_range(mod->tracepoints_ptrs,
-                mod->tracepoints_ptrs + mod->num_tracepoints);
-        list_for_each_entry(pos, &tracepoint_module_list, list) {
-                if (pos->tracepoints_ptrs == mod->tracepoints_ptrs) {
-                        list_del(&pos->list);
-                        kfree(pos);
+        mutex_lock(&tracepoint_module_list_mutex);
+        list_for_each_entry(tp_mod, &tracepoint_module_list, list) {
+                if (tp_mod->mod == mod) {
+                        blocking_notifier_call_chain(&tracepoint_notify_list,
+                                        MODULE_STATE_GOING, tp_mod);
+                        list_del(&tp_mod->list);
+                        kfree(tp_mod);
+                        /*
+                         * Called the going notifier before checking for
+                         * quiescence.
+                         */
+                        tp_module_going_check_quiescent(mod->tracepoints_ptrs,
+                                mod->tracepoints_ptrs + mod->num_tracepoints);
                         break;
                 }
         }
@@ -518,12 +415,11 @@ static int tracepoint_module_going(struct module *mod)
          * flag on "going", in case a module taints the kernel only after being
          * loaded.
          */
-        mutex_unlock(&tracepoints_mutex);
-        return 0;
+        mutex_unlock(&tracepoint_module_list_mutex);
 }
 
-int tracepoint_module_notify(struct notifier_block *self,
-                             unsigned long val, void *data)
+static int tracepoint_module_notify(struct notifier_block *self,
+                unsigned long val, void *data)
 {
         struct module *mod = data;
         int ret = 0;
@@ -535,24 +431,58 @@ int tracepoint_module_notify(struct notifier_block *self,
         case MODULE_STATE_LIVE:
                 break;
         case MODULE_STATE_GOING:
-                ret = tracepoint_module_going(mod);
+                tracepoint_module_going(mod);
+                break;
+        case MODULE_STATE_UNFORMED:
                 break;
         }
         return ret;
 }
 
-struct notifier_block tracepoint_module_nb = {
+static struct notifier_block tracepoint_module_nb = {
         .notifier_call = tracepoint_module_notify,
         .priority = 0,
 };
 
-static int init_tracepoints(void)
+static __init int init_tracepoints(void)
 {
-        return register_module_notifier(&tracepoint_module_nb);
+        int ret;
+
+        ret = register_module_notifier(&tracepoint_module_nb);
+        if (ret)
+                pr_warning("Failed to register tracepoint module enter notifier\n");
+
+        return ret;
 }
 __initcall(init_tracepoints);
 #endif /* CONFIG_MODULES */
 
+static void for_each_tracepoint_range(struct tracepoint * const *begin,
+                struct tracepoint * const *end,
+                void (*fct)(struct tracepoint *tp, void *priv),
+                void *priv)
+{
+        struct tracepoint * const *iter;
+
+        if (!begin)
+                return;
+        for (iter = begin; iter < end; iter++)
+                fct(*iter, priv);
+}
+
+/**
+ * for_each_kernel_tracepoint - iteration on all kernel tracepoints
+ * @fct: callback
+ * @priv: private data
+ */
+void for_each_kernel_tracepoint(void (*fct)(struct tracepoint *tp, void *priv),
+                void *priv)
+{
+        for_each_tracepoint_range(__start___tracepoints_ptrs,
+                __stop___tracepoints_ptrs, fct, priv);
+}
+EXPORT_SYMBOL_GPL(for_each_kernel_tracepoint);
+
 #ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
 /* NB: reg/unreg are called while guarded with the tracepoints_mutex */
diff --git a/lib/Kconfig b/lib/Kconfig
index 5d4984c505f8..4771fb3f4da4 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -182,6 +182,15 @@ config AUDIT_GENERIC
         depends on AUDIT && !AUDIT_ARCH
         default y
 
+config AUDIT_ARCH_COMPAT_GENERIC
+        bool
+        default n
+
+config AUDIT_COMPAT_GENERIC
+        bool
+        depends on AUDIT_GENERIC && AUDIT_ARCH_COMPAT_GENERIC && COMPAT
+        default y
+
 config RANDOM32_SELFTEST
         bool "PRNG perform self test on init"
         default n
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index dd7f8858188a..140b66a874c1 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1045,16 +1045,6 @@ config DEBUG_BUGVERBOSE
           of the BUG call as well as the EIP and oops trace.  This aids
           debugging but costs about 70-100K of memory.
 
-config DEBUG_WRITECOUNT
-        bool "Debug filesystem writers count"
-        depends on DEBUG_KERNEL
-        help
-          Enable this to catch wrong use of the writers count in struct
-          vfsmount.  This will increase the size of each file struct by
-          32 bits.
-
-          If unsure, say N.
-
 config DEBUG_LIST
         bool "Debug linked list manipulation"
         depends on DEBUG_KERNEL
diff --git a/lib/Makefile b/lib/Makefile
index 48140e3ba73f..0cd7b68e1382 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -96,6 +96,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
 obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
 obj-$(CONFIG_SMP) += percpu_counter.o
 obj-$(CONFIG_AUDIT_GENERIC) += audit.o
+obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
 obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o
diff --git a/lib/audit.c b/lib/audit.c
index 76bbed4a20e5..1d726a22565b 100644
--- a/lib/audit.c
+++ b/lib/audit.c
@@ -30,11 +30,17 @@ static unsigned signal_class[] = {
 
 int audit_classify_arch(int arch)
 {
-        return 0;
+        if (audit_is_compat(arch))
+                return 1;
+        else
+                return 0;
 }
 
 int audit_classify_syscall(int abi, unsigned syscall)
 {
+        if (audit_is_compat(abi))
+                return audit_classify_compat_syscall(abi, syscall);
+
         switch(syscall) {
 #ifdef __NR_open
         case __NR_open:
@@ -57,6 +63,13 @@ int audit_classify_syscall(int abi, unsigned syscall)
 
 static int __init audit_classes_init(void)
 {
+#ifdef CONFIG_AUDIT_COMPAT_GENERIC
+        audit_register_class(AUDIT_CLASS_WRITE_32, compat_write_class);
+        audit_register_class(AUDIT_CLASS_READ_32, compat_read_class);
+        audit_register_class(AUDIT_CLASS_DIR_WRITE_32, compat_dir_class);
+        audit_register_class(AUDIT_CLASS_CHATTR_32, compat_chattr_class);
+        audit_register_class(AUDIT_CLASS_SIGNAL_32, compat_signal_class);
+#endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
diff --git a/lib/compat_audit.c b/lib/compat_audit.c
new file mode 100644
index 000000000000..873f75b640ab
--- /dev/null
+++ b/lib/compat_audit.c
@@ -0,0 +1,50 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <asm/unistd32.h>
+
+unsigned compat_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned compat_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+unsigned compat_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned compat_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+unsigned compat_signal_class[] = {
+#include <asm-generic/audit_signal.h>
+~0U
+};
+
+int audit_classify_compat_syscall(int abi, unsigned syscall)
+{
+        switch (syscall) {
+#ifdef __NR_open
+        case __NR_open:
+                return 2;
+#endif
+#ifdef __NR_openat
+        case __NR_openat:
+                return 3;
+#endif
+#ifdef __NR_socketcall
+        case __NR_socketcall:
+                return 4;
+#endif
+        case __NR_execve:
+                return 5;
+        default:
+                return 1;
+        }
+}
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 8280a5dd1727..7dd33577b905 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -169,7 +169,7 @@ static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
         struct percpu_counter *fbc;
 
         compute_batch_value();
-        if (action != CPU_DEAD)
+        if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
                 return NOTIFY_OK;
 
         cpu = (unsigned long)hcpu;
diff --git a/mm/Makefile b/mm/Makefile
index 9e5aaf92197d..b484452dac57 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -17,7 +17,8 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
                            util.o mmzone.o vmstat.o backing-dev.o \
                            mm_init.o mmu_context.o percpu.o slab_common.o \
                            compaction.o balloon_compaction.o vmacache.o \
-                           interval_tree.o list_lru.o workingset.o $(mmu-y)
+                           interval_tree.o list_lru.o workingset.o \
+                           iov_iter.o $(mmu-y)
 
 obj-y += init-mm.o
 
diff --git a/mm/filemap.c b/mm/filemap.c
index 27ebc0c9571b..a82fbe4c9e8e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -77,7 +77,7 @@
  *  ->mmap_sem
  *    ->lock_page               (access_process_vm)
  *
- *  ->i_mutex                   (generic_file_buffered_write)
+ *  ->i_mutex                   (generic_perform_write)
  *    ->mmap_sem                (fault_in_pages_readable->do_page_fault)
  *
  *  bdi->wb.list_lock
@@ -1428,7 +1428,8 @@ static void shrink_readahead_size_eio(struct file *filp,
  * do_generic_file_read - generic file read routine
  * @filp:       the file to read
  * @ppos:       current file position
- * @desc:       read_descriptor
+ * @iter:       data destination
+ * @written:    already copied
  *
  * This is a generic file read routine, and uses the
  * mapping->a_ops->readpage() function for the actual low-level stuff.
@@ -1436,8 +1437,8 @@ static void shrink_readahead_size_eio(struct file *filp,
  * This is really ugly. But the goto's actually try to clarify some
  * of the logic when it comes to error handling etc.
  */
-static void do_generic_file_read(struct file *filp, loff_t *ppos,
-                read_descriptor_t *desc)
+static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
+                struct iov_iter *iter, ssize_t written)
 {
         struct address_space *mapping = filp->f_mapping;
         struct inode *inode = mapping->host;
@@ -1447,12 +1448,12 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos,
         pgoff_t prev_index;
         unsigned long offset;      /* offset into pagecache page */
         unsigned int prev_offset;
-        int error;
+        int error = 0;
 
         index = *ppos >> PAGE_CACHE_SHIFT;
         prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
         prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1);
-        last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
+        last_index = (*ppos + iter->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
         offset = *ppos & ~PAGE_CACHE_MASK;
 
         for (;;) {
@@ -1487,7 +1488,7 @@ find_page:
                         if (!page->mapping)
                                 goto page_not_up_to_date_locked;
                         if (!mapping->a_ops->is_partially_uptodate(page,
-                                                                desc, offset))
+                                                        offset, iter->count))
                                 goto page_not_up_to_date_locked;
                         unlock_page(page);
                 }
@@ -1537,24 +1538,23 @@ page_ok:
                 /*
                  * Ok, we have the page, and it's up-to-date, so
                  * now we can copy it to user space...
-                 *
-                 * The file_read_actor routine returns how many bytes were
-                 * actually used..
-                 * NOTE! This may not be the same as how much of a user buffer
-                 * we filled up (we may be padding etc), so we can only update
-                 * "pos" here (the actor routine has to update the user buffer
-                 * pointers and the remaining count).
                  */
-                ret = file_read_actor(desc, page, offset, nr);
+
+                ret = copy_page_to_iter(page, offset, nr, iter);
                 offset += ret;
                 index += offset >> PAGE_CACHE_SHIFT;
                 offset &= ~PAGE_CACHE_MASK;
                 prev_offset = offset;
 
                 page_cache_release(page);
-                if (ret == nr && desc->count)
-                        continue;
-                goto out;
+                written += ret;
+                if (!iov_iter_count(iter))
+                        goto out;
+                if (ret < nr) {
+                        error = -EFAULT;
+                        goto out;
+                }
+                continue;
 
 page_not_up_to_date:
                 /* Get exclusive access to the page ... */
@@ -1589,6 +1589,7 @@ readpage:
                 if (unlikely(error)) {
                         if (error == AOP_TRUNCATED_PAGE) {
                                 page_cache_release(page);
+                                error = 0;
                                 goto find_page;
                         }
                         goto readpage_error;
@@ -1619,7 +1620,6 @@ readpage:
 
 readpage_error:
                 /* UHHUH! A synchronous read error occurred. Report it */
-                desc->error = error;
                 page_cache_release(page);
                 goto out;
 
@@ -1630,16 +1630,17 @@ no_cached_page:
                  */
                 page = page_cache_alloc_cold(mapping);
                 if (!page) {
-                        desc->error = -ENOMEM;
+                        error = -ENOMEM;
                         goto out;
                 }
                 error = add_to_page_cache_lru(page, mapping,
                                                 index, GFP_KERNEL);
                 if (error) {
                         page_cache_release(page);
-                        if (error == -EEXIST)
+                        if (error == -EEXIST) {
+                                error = 0;
                                 goto find_page;
-                        desc->error = error;
+                        }
                         goto out;
                 }
                 goto readpage;
@@ -1652,44 +1653,7 @@ out:
 
         *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
         file_accessed(filp);
-}
-
-int file_read_actor(read_descriptor_t *desc, struct page *page,
-                        unsigned long offset, unsigned long size)
-{
-        char *kaddr;
-        unsigned long left, count = desc->count;
-
-        if (size > count)
-                size = count;
-
-        /*
-         * Faults on the destination of a read are common, so do it before
-         * taking the kmap.
-         */
-        if (!fault_in_pages_writeable(desc->arg.buf, size)) {
-                kaddr = kmap_atomic(page);
-                left = __copy_to_user_inatomic(desc->arg.buf,
-                                                kaddr + offset, size);
-                kunmap_atomic(kaddr);
-                if (left == 0)
-                        goto success;
-        }
-
-        /* Do it the slow way */
-        kaddr = kmap(page);
-        left = __copy_to_user(desc->arg.buf, kaddr + offset, size);
-        kunmap(page);
-
-        if (left) {
-                size -= left;
-                desc->error = -EFAULT;
-        }
-success:
-        desc->count = count - size;
-        desc->written += size;
-        desc->arg.buf += size;
-        return size;
+        return written ? written : error;
 }
 
 /*
@@ -1747,14 +1711,15 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 {
         struct file *filp = iocb->ki_filp;
         ssize_t retval;
-        unsigned long seg = 0;
         size_t count;
         loff_t *ppos = &iocb->ki_pos;
+        struct iov_iter i;
 
         count = 0;
         retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
         if (retval)
                 return retval;
+        iov_iter_init(&i, iov, nr_segs, count, 0);
 
         /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
         if (filp->f_flags & O_DIRECT) {
@@ -1776,6 +1741,11 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                 if (retval > 0) {
                         *ppos = pos + retval;
                         count -= retval;
+                        /*
+                         * If we did a short DIO read we need to skip the
+                         * section of the iov that we've already read data into.
+                         */
+                        iov_iter_advance(&i, retval);
                 }
 
                 /*
@@ -1792,39 +1762,7 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                 }
         }
 
-        count = retval;
-        for (seg = 0; seg < nr_segs; seg++) {
-                read_descriptor_t desc;
-                loff_t offset = 0;
-
-                /*
-                 * If we did a short DIO read we need to skip the section of the
-                 * iov that we've already read data into.
-                 */
-                if (count) {
-                        if (count > iov[seg].iov_len) {
-                                count -= iov[seg].iov_len;
-                                continue;
-                        }
-                        offset = count;
-                        count = 0;
-                }
-
-                desc.written = 0;
-                desc.arg.buf = iov[seg].iov_base + offset;
-                desc.count = iov[seg].iov_len - offset;
-                if (desc.count == 0)
-                        continue;
-                desc.error = 0;
-                do_generic_file_read(filp, ppos, &desc);
-                retval += desc.written;
-                if (desc.error) {
-                        retval = retval ?: desc.error;
-                        break;
-                }
-                if (desc.count > 0)
-                        break;
-        }
+        retval = do_generic_file_read(filp, ppos, &i, retval);
 out:
         return retval;
 }
@@ -2335,150 +2273,6 @@ struct page *read_cache_page_gfp(struct address_space *mapping,
 }
 EXPORT_SYMBOL(read_cache_page_gfp);
 
-static size_t __iovec_copy_from_user_inatomic(char *vaddr,
-                        const struct iovec *iov, size_t base, size_t bytes)
-{
-        size_t copied = 0, left = 0;
-
-        while (bytes) {
-                char __user *buf = iov->iov_base + base;
-                int copy = min(bytes, iov->iov_len - base);
-
-                base = 0;
-                left = __copy_from_user_inatomic(vaddr, buf, copy);
-                copied += copy;
-                bytes -= copy;
-                vaddr += copy;
-                iov++;
-
-                if (unlikely(left))
-                        break;
-        }
-        return copied - left;
-}
-
-/*
- * Copy as much as we can into the page and return the number of bytes which
- * were successfully copied.  If a fault is encountered then return the number of
- * bytes which were copied.
- */
-size_t iov_iter_copy_from_user_atomic(struct page *page,
-                struct iov_iter *i, unsigned long offset, size_t bytes)
-{
-        char *kaddr;
-        size_t copied;
-
-        BUG_ON(!in_atomic());
-        kaddr = kmap_atomic(page);
-        if (likely(i->nr_segs == 1)) {
-                int left;
-                char __user *buf = i->iov->iov_base + i->iov_offset;
-                left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
-                copied = bytes - left;
-        } else {
-                copied = __iovec_copy_from_user_inatomic(kaddr + offset,
-                                                i->iov, i->iov_offset, bytes);
-        }
-        kunmap_atomic(kaddr);
-
-        return copied;
-}
-EXPORT_SYMBOL(iov_iter_copy_from_user_atomic);
-
-/*
- * This has the same sideeffects and return value as
- * iov_iter_copy_from_user_atomic().
- * The difference is that it attempts to resolve faults.
- * Page must not be locked.
- */
-size_t iov_iter_copy_from_user(struct page *page,
-                struct iov_iter *i, unsigned long offset, size_t bytes)
-{
-        char *kaddr;
-        size_t copied;
-
-        kaddr = kmap(page);
-        if (likely(i->nr_segs == 1)) {
-                int left;
-                char __user *buf = i->iov->iov_base + i->iov_offset;
-                left = __copy_from_user(kaddr + offset, buf, bytes);
-                copied = bytes - left;
-        } else {
-                copied = __iovec_copy_from_user_inatomic(kaddr + offset,
-                                                i->iov, i->iov_offset, bytes);
-        }
-        kunmap(page);
-        return copied;
-}
-EXPORT_SYMBOL(iov_iter_copy_from_user);
-
-void iov_iter_advance(struct iov_iter *i, size_t bytes)
-{
-        BUG_ON(i->count < bytes);
-
-        if (likely(i->nr_segs == 1)) {
-                i->iov_offset += bytes;
-                i->count -= bytes;
-        } else {
-                const struct iovec *iov = i->iov;
-                size_t base = i->iov_offset;
-                unsigned long nr_segs = i->nr_segs;
-
-                /*
-                 * The !iov->iov_len check ensures we skip over unlikely
-                 * zero-length segments (without overruning the iovec).
-                 */
-                while (bytes || unlikely(i->count && !iov->iov_len)) {
-                        int copy;
-
-                        copy = min(bytes, iov->iov_len - base);
-                        BUG_ON(!i->count || i->count < copy);
-                        i->count -= copy;
-                        bytes -= copy;
-                        base += copy;
-                        if (iov->iov_len == base) {
-                                iov++;
-                                nr_segs--;
-                                base = 0;
-                        }
-                }
-                i->iov = iov;
-                i->iov_offset = base;
-                i->nr_segs = nr_segs;
-        }
-}
-EXPORT_SYMBOL(iov_iter_advance);
-
-/*
- * Fault in the first iovec of the given iov_iter, to a maximum length
- * of bytes. Returns 0 on success, or non-zero if the memory could not be
- * accessed (ie. because it is an invalid address).
- *
- * writev-intensive code may want this to prefault several iovecs -- that
- * would be possible (callers must not rely on the fact that _only_ the
- * first iovec will be faulted with the current implementation).
- */
-int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes)
-{
-        char __user *buf = i->iov->iov_base + i->iov_offset;
-        bytes = min(bytes, i->iov->iov_len - i->iov_offset);
-        return fault_in_pages_readable(buf, bytes);
-}
-EXPORT_SYMBOL(iov_iter_fault_in_readable);
-
-/*
- * Return the count of just the current iov_iter segment.
- */
-size_t iov_iter_single_seg_count(const struct iov_iter *i)
-{
-        const struct iovec *iov = i->iov;
-        if (i->nr_segs == 1)
-                return i->count;
-        else
-                return min(i->count, iov->iov_len - i->iov_offset);
-}
-EXPORT_SYMBOL(iov_iter_single_seg_count);
-
 /*
  * Performs necessary checks before doing a write
  *
@@ -2585,7 +2379,7 @@ EXPORT_SYMBOL(pagecache_write_end);
 
 ssize_t
 generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
-                unsigned long *nr_segs, loff_t pos, loff_t *ppos,
+                unsigned long *nr_segs, loff_t pos,
                 size_t count, size_t ocount)
 {
         struct file     *file = iocb->ki_filp;
@@ -2646,7 +2440,7 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
                         i_size_write(inode, pos);
                         mark_inode_dirty(inode);
                 }
-                *ppos = pos;
+                iocb->ki_pos = pos;
         }
 out:
         return written;
@@ -2692,7 +2486,7 @@ found:
 }
 EXPORT_SYMBOL(grab_cache_page_write_begin);
 
-static ssize_t generic_perform_write(struct file *file,
+ssize_t generic_perform_write(struct file *file,
                                 struct iov_iter *i, loff_t pos)
 {
         struct address_space *mapping = file->f_mapping;
@@ -2742,9 +2536,7 @@ again:
                 if (mapping_writably_mapped(mapping))
                         flush_dcache_page(page);
 
-                pagefault_disable();
                 copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
-                pagefault_enable();
                 flush_dcache_page(page);
 
                 mark_page_accessed(page);
@@ -2782,27 +2574,7 @@ again:
 
         return written ? written : status;
 }
-
-ssize_t
-generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
-                unsigned long nr_segs, loff_t pos, loff_t *ppos,
-                size_t count, ssize_t written)
-{
-        struct file *file = iocb->ki_filp;
-        ssize_t status;
-        struct iov_iter i;
-
-        iov_iter_init(&i, iov, nr_segs, count, written);
-        status = generic_perform_write(file, &i, pos);
-
-        if (likely(status >= 0)) {
-                written += status;
-                *ppos = pos + status;
-        }
-        
-        return written ? written : status;
-}
-EXPORT_SYMBOL(generic_file_buffered_write);
+EXPORT_SYMBOL(generic_perform_write);
 
 /**
  * __generic_file_aio_write - write data to a file
@@ -2824,16 +2596,18 @@ EXPORT_SYMBOL(generic_file_buffered_write);
  * avoid syncing under i_mutex.
  */
 ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
-                                 unsigned long nr_segs, loff_t *ppos)
+                                 unsigned long nr_segs)
 {
         struct file *file = iocb->ki_filp;
         struct address_space * mapping = file->f_mapping;
         size_t ocount;          /* original count */
         size_t count;           /* after file limit checks */
         struct inode    *inode = mapping->host;
-        loff_t          pos;
-        ssize_t         written;
+        loff_t          pos = iocb->ki_pos;
+        ssize_t         written = 0;
         ssize_t         err;
+        ssize_t         status;
+        struct iov_iter from;
 
         ocount = 0;
         err = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);
@@ -2841,12 +2615,9 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                 return err;
 
         count = ocount;
-        pos = *ppos;
 
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = mapping->backing_dev_info;
-        written = 0;
-
         err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
         if (err)
                 goto out;
@@ -2862,45 +2633,47 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         if (err)
                 goto out;
 
+        iov_iter_init(&from, iov, nr_segs, count, 0);
+
         /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
         if (unlikely(file->f_flags & O_DIRECT)) {
                 loff_t endbyte;
-                ssize_t written_buffered;
 
-                written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
-                                                        ppos, count, ocount);
+                written = generic_file_direct_write(iocb, iov, &from.nr_segs, pos,
+                                                        count, ocount);
                 if (written < 0 || written == count)
                         goto out;
+                iov_iter_advance(&from, written);
+
                 /*
                  * direct-io write to a hole: fall through to buffered I/O
                  * for completing the rest of the request.
                  */
                 pos += written;
                 count -= written;
-                written_buffered = generic_file_buffered_write(iocb, iov,
-                                                nr_segs, pos, ppos, count,
-                                                written);
+
+                status = generic_perform_write(file, &from, pos);
                 /*
-                 * If generic_file_buffered_write() retuned a synchronous error
+                 * If generic_perform_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) {
-                        err = written_buffered;
+                if (unlikely(status < 0) && !written) {
+                        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 + written_buffered - written - 1;
+                endbyte = pos + status - 1;
                 err = filemap_write_and_wait_range(file->f_mapping, pos, endbyte);
                 if (err == 0) {
-                        written = written_buffered;
+                        written += status;
                         invalidate_mapping_pages(mapping,
                                                  pos >> PAGE_CACHE_SHIFT,
                                                  endbyte >> PAGE_CACHE_SHIFT);
@@ -2911,8 +2684,9 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                          */
                 }
         } else {
-                written = generic_file_buffered_write(iocb, iov, nr_segs,
-                                pos, ppos, count, written);
+                written = generic_perform_write(file, &from, pos);
+                if (likely(written >= 0))
+                        iocb->ki_pos = pos + written;
         }
 out:
         current->backing_dev_info = NULL;
@@ -2941,7 +2715,7 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         BUG_ON(iocb->ki_pos != pos);
 
         mutex_lock(&inode->i_mutex);
-        ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
+        ret = __generic_file_aio_write(iocb, iov, nr_segs);
         mutex_unlock(&inode->i_mutex);
 
         if (ret > 0) {
diff --git a/mm/iov_iter.c b/mm/iov_iter.c
new file mode 100644
index 000000000000..10e46cd721de
--- /dev/null
+++ b/mm/iov_iter.c
@@ -0,0 +1,224 @@
+#include <linux/export.h>
+#include <linux/uio.h>
+#include <linux/pagemap.h>
+
+size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
+                         struct iov_iter *i)
+{
+        size_t skip, copy, left, wanted;
+        const struct iovec *iov;
+        char __user *buf;
+        void *kaddr, *from;
+
+        if (unlikely(bytes > i->count))
+                bytes = i->count;
+
+        if (unlikely(!bytes))
+                return 0;
+
+        wanted = bytes;
+        iov = i->iov;
+        skip = i->iov_offset;
+        buf = iov->iov_base + skip;
+        copy = min(bytes, iov->iov_len - skip);
+
+        if (!fault_in_pages_writeable(buf, copy)) {
+                kaddr = kmap_atomic(page);
+                from = kaddr + offset;
+
+                /* first chunk, usually the only one */
+                left = __copy_to_user_inatomic(buf, from, copy);
+                copy -= left;
+                skip += copy;
+                from += copy;
+                bytes -= copy;
+
+                while (unlikely(!left && bytes)) {
+                        iov++;
+                        buf = iov->iov_base;
+                        copy = min(bytes, iov->iov_len);
+                        left = __copy_to_user_inatomic(buf, from, copy);
+                        copy -= left;
+                        skip = copy;
+                        from += copy;
+                        bytes -= copy;
+                }
+                if (likely(!bytes)) {
+                        kunmap_atomic(kaddr);
+                        goto done;
+                }
+                offset = from - kaddr;
+                buf += copy;
+                kunmap_atomic(kaddr);
+                copy = min(bytes, iov->iov_len - skip);
+        }
+        /* Too bad - revert to non-atomic kmap */
+        kaddr = kmap(page);
+        from = kaddr + offset;
+        left = __copy_to_user(buf, from, copy);
+        copy -= left;
+        skip += copy;
+        from += copy;
+        bytes -= copy;
+        while (unlikely(!left && bytes)) {
+                iov++;
+                buf = iov->iov_base;
+                copy = min(bytes, iov->iov_len);
+                left = __copy_to_user(buf, from, copy);
+                copy -= left;
+                skip = copy;
+                from += copy;
+                bytes -= copy;
+        }
+        kunmap(page);
+done:
+        i->count -= wanted - bytes;
+        i->nr_segs -= iov - i->iov;
+        i->iov = iov;
+        i->iov_offset = skip;
+        return wanted - bytes;
+}
+EXPORT_SYMBOL(copy_page_to_iter);
+
+static size_t __iovec_copy_from_user_inatomic(char *vaddr,
+                        const struct iovec *iov, size_t base, size_t bytes)
+{
+        size_t copied = 0, left = 0;
+
+        while (bytes) {
+                char __user *buf = iov->iov_base + base;
+                int copy = min(bytes, iov->iov_len - base);
+
+                base = 0;
+                left = __copy_from_user_inatomic(vaddr, buf, copy);
+                copied += copy;
+                bytes -= copy;
+                vaddr += copy;
+                iov++;
+
+                if (unlikely(left))
+                        break;
+        }
+        return copied - left;
+}
+
+/*
+ * Copy as much as we can into the page and return the number of bytes which
+ * were successfully copied.  If a fault is encountered then return the number of
+ * bytes which were copied.
+ */
+size_t iov_iter_copy_from_user_atomic(struct page *page,
+                struct iov_iter *i, unsigned long offset, size_t bytes)
+{
+        char *kaddr;
+        size_t copied;
+
+        kaddr = kmap_atomic(page);
+        if (likely(i->nr_segs == 1)) {
+                int left;
+                char __user *buf = i->iov->iov_base + i->iov_offset;
+                left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
+                copied = bytes - left;
+        } else {
+                copied = __iovec_copy_from_user_inatomic(kaddr + offset,
+                                                i->iov, i->iov_offset, bytes);
+        }
+        kunmap_atomic(kaddr);
+
+        return copied;
+}
+EXPORT_SYMBOL(iov_iter_copy_from_user_atomic);
+
+/*
+ * This has the same sideeffects and return value as
+ * iov_iter_copy_from_user_atomic().
+ * The difference is that it attempts to resolve faults.
+ * Page must not be locked.
+ */
+size_t iov_iter_copy_from_user(struct page *page,
+                struct iov_iter *i, unsigned long offset, size_t bytes)
+{
+        char *kaddr;
+        size_t copied;
+
+        kaddr = kmap(page);
+        if (likely(i->nr_segs == 1)) {
+                int left;
+                char __user *buf = i->iov->iov_base + i->iov_offset;
+                left = __copy_from_user(kaddr + offset, buf, bytes);
+                copied = bytes - left;
+        } else {
+                copied = __iovec_copy_from_user_inatomic(kaddr + offset,
+                                                i->iov, i->iov_offset, bytes);
+        }
+        kunmap(page);
+        return copied;
+}
+EXPORT_SYMBOL(iov_iter_copy_from_user);
+
+void iov_iter_advance(struct iov_iter *i, size_t bytes)
+{
+        BUG_ON(i->count < bytes);
+
+        if (likely(i->nr_segs == 1)) {
+                i->iov_offset += bytes;
+                i->count -= bytes;
+        } else {
+                const struct iovec *iov = i->iov;
+                size_t base = i->iov_offset;
+                unsigned long nr_segs = i->nr_segs;
+
+                /*
+                 * The !iov->iov_len check ensures we skip over unlikely
+                 * zero-length segments (without overruning the iovec).
+                 */
+                while (bytes || unlikely(i->count && !iov->iov_len)) {
+                        int copy;
+
+                        copy = min(bytes, iov->iov_len - base);
+                        BUG_ON(!i->count || i->count < copy);
+                        i->count -= copy;
+                        bytes -= copy;
+                        base += copy;
+                        if (iov->iov_len == base) {
+                                iov++;
+                                nr_segs--;
+                                base = 0;
+                        }
+                }
+                i->iov = iov;
+                i->iov_offset = base;
+                i->nr_segs = nr_segs;
+        }
+}
+EXPORT_SYMBOL(iov_iter_advance);
+
+/*
+ * Fault in the first iovec of the given iov_iter, to a maximum length
+ * of bytes. Returns 0 on success, or non-zero if the memory could not be
+ * accessed (ie. because it is an invalid address).
+ *
+ * writev-intensive code may want this to prefault several iovecs -- that
+ * would be possible (callers must not rely on the fact that _only_ the
+ * first iovec will be faulted with the current implementation).
+ */
+int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes)
+{
+        char __user *buf = i->iov->iov_base + i->iov_offset;
+        bytes = min(bytes, i->iov->iov_len - i->iov_offset);
+        return fault_in_pages_readable(buf, bytes);
+}
+EXPORT_SYMBOL(iov_iter_fault_in_readable);
+
+/*
+ * Return the count of just the current iov_iter segment.
+ */
+size_t iov_iter_single_seg_count(const struct iov_iter *i)
+{
+        const struct iovec *iov = i->iov;
+        if (i->nr_segs == 1)
+                return i->count;
+        else
+                return min(i->count, iov->iov_len - i->iov_offset);
+}
+EXPORT_SYMBOL(iov_iter_single_seg_count);
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index cb79065c19e5..8505c9262b35 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -23,129 +23,44 @@
 
 /**
  * process_vm_rw_pages - read/write pages from task specified
- * @task: task to read/write from
- * @mm: mm for task
- * @process_pages: struct pages area that can store at least
- *  nr_pages_to_copy struct page pointers
- * @pa: address of page in task to start copying from/to
+ * @pages: array of pointers to pages we want to copy
  * @start_offset: offset in page to start copying from/to
  * @len: number of bytes to copy
- * @lvec: iovec array specifying where to copy to/from
- * @lvec_cnt: number of elements in iovec array
- * @lvec_current: index in iovec array we are up to
- * @lvec_offset: offset in bytes from current iovec iov_base we are up to
+ * @iter: where to copy to/from locally
  * @vm_write: 0 means copy from, 1 means copy to
- * @nr_pages_to_copy: number of pages to copy
- * @bytes_copied: returns number of bytes successfully copied
  * Returns 0 on success, error code otherwise
  */
-static int process_vm_rw_pages(struct task_struct *task,
-                               struct mm_struct *mm,
-                               struct page **process_pages,
-                               unsigned long pa,
-                               unsigned long start_offset,
-                               unsigned long len,
-                               const struct iovec *lvec,
-                               unsigned long lvec_cnt,
-                               unsigned long *lvec_current,
-                               size_t *lvec_offset,
-                               int vm_write,
-                               unsigned int nr_pages_to_copy,
-                               ssize_t *bytes_copied)
+static int process_vm_rw_pages(struct page **pages,
+                               unsigned offset,
+                               size_t len,
+                               struct iov_iter *iter,
+                               int vm_write)
 {
-        int pages_pinned;
-        void *target_kaddr;
-        int pgs_copied = 0;
-        int j;
-        int ret;
-        ssize_t bytes_to_copy;
-        ssize_t rc = 0;
-
-        *bytes_copied = 0;
-
-        /* Get the pages we're interested in */
-        down_read(&mm->mmap_sem);
-        pages_pinned = get_user_pages(task, mm, pa,
-                                      nr_pages_to_copy,
-                                      vm_write, 0, process_pages, NULL);
-        up_read(&mm->mmap_sem);
-
-        if (pages_pinned != nr_pages_to_copy) {
-                rc = -EFAULT;
-                goto end;
-        }
-
         /* Do the copy for each page */
-        for (pgs_copied = 0;
-             (pgs_copied < nr_pages_to_copy) && (*lvec_current < lvec_cnt);
-             pgs_copied++) {
-                /* Make sure we have a non zero length iovec */
-                while (*lvec_current < lvec_cnt
-                       && lvec[*lvec_current].iov_len == 0)
-                        (*lvec_current)++;
-                if (*lvec_current == lvec_cnt)
-                        break;
-
-                /*
-                 * Will copy smallest of:
-                 * - bytes remaining in page
-                 * - bytes remaining in destination iovec
-                 */
-                bytes_to_copy = min_t(ssize_t, PAGE_SIZE - start_offset,
-                                      len - *bytes_copied);
-                bytes_to_copy = min_t(ssize_t, bytes_to_copy,
-                                      lvec[*lvec_current].iov_len
-                                      - *lvec_offset);
-
-                target_kaddr = kmap(process_pages[pgs_copied]) + start_offset;
-
-                if (vm_write)
-                        ret = copy_from_user(target_kaddr,
-                                             lvec[*lvec_current].iov_base
-                                             + *lvec_offset,
-                                             bytes_to_copy);
-                else
-                        ret = copy_to_user(lvec[*lvec_current].iov_base
-                                           + *lvec_offset,
-                                           target_kaddr, bytes_to_copy);
-                kunmap(process_pages[pgs_copied]);
-                if (ret) {
-                        *bytes_copied += bytes_to_copy - ret;
-                        pgs_copied++;
-                        rc = -EFAULT;
-                        goto end;
-                }
-                *bytes_copied += bytes_to_copy;
-                *lvec_offset += bytes_to_copy;
-                if (*lvec_offset == lvec[*lvec_current].iov_len) {
-                        /*
-                         * Need to copy remaining part of page into the
-                         * next iovec if there are any bytes left in page
-                         */
-                        (*lvec_current)++;
-                        *lvec_offset = 0;
-                        start_offset = (start_offset + bytes_to_copy)
-                                % PAGE_SIZE;
-                        if (start_offset)
-                                pgs_copied--;
+        while (len && iov_iter_count(iter)) {
+                struct page *page = *pages++;
+                size_t copy = PAGE_SIZE - offset;
+                size_t copied;
+
+                if (copy > len)
+                        copy = len;
+
+                if (vm_write) {
+                        if (copy > iov_iter_count(iter))
+                                copy = iov_iter_count(iter);
+                        copied = iov_iter_copy_from_user(page, iter,
+                                        offset, copy);
+                        iov_iter_advance(iter, copied);
+                        set_page_dirty_lock(page);
                 } else {
-                        start_offset = 0;
-                }
-        }
-
-end:
-        if (vm_write) {
-                for (j = 0; j < pages_pinned; j++) {
-                        if (j < pgs_copied)
-                                set_page_dirty_lock(process_pages[j]);
-                        put_page(process_pages[j]);
+                        copied = copy_page_to_iter(page, offset, copy, iter);
                 }
-        } else {
-                for (j = 0; j < pages_pinned; j++)
-                        put_page(process_pages[j]);
+                len -= copied;
+                if (copied < copy && iov_iter_count(iter))
+                        return -EFAULT;
+                offset = 0;
         }
-
-        return rc;
+        return 0;
 }
 
 /* Maximum number of pages kmalloc'd to hold struct page's during copy */
@@ -155,67 +70,60 @@ end:
  * process_vm_rw_single_vec - read/write pages from task specified
  * @addr: start memory address of target process
  * @len: size of area to copy to/from
- * @lvec: iovec array specifying where to copy to/from locally
- * @lvec_cnt: number of elements in iovec array
- * @lvec_current: index in iovec array we are up to
- * @lvec_offset: offset in bytes from current iovec iov_base we are up to
+ * @iter: where to copy to/from locally
  * @process_pages: struct pages area that can store at least
  *  nr_pages_to_copy struct page pointers
  * @mm: mm for task
  * @task: task to read/write from
  * @vm_write: 0 means copy from, 1 means copy to
- * @bytes_copied: returns number of bytes successfully copied
  * Returns 0 on success or on failure error code
  */
 static int process_vm_rw_single_vec(unsigned long addr,
                                     unsigned long len,
-                                    const struct iovec *lvec,
-                                    unsigned long lvec_cnt,
-                                    unsigned long *lvec_current,
-                                    size_t *lvec_offset,
+                                    struct iov_iter *iter,
                                     struct page **process_pages,
                                     struct mm_struct *mm,
                                     struct task_struct *task,
-                                    int vm_write,
-                                    ssize_t *bytes_copied)
+                                    int vm_write)
 {
         unsigned long pa = addr & PAGE_MASK;
         unsigned long start_offset = addr - pa;
         unsigned long nr_pages;
-        ssize_t bytes_copied_loop;
         ssize_t rc = 0;
-        unsigned long nr_pages_copied = 0;
-        unsigned long nr_pages_to_copy;
         unsigned long max_pages_per_loop = PVM_MAX_KMALLOC_PAGES
                 / sizeof(struct pages *);
 
-        *bytes_copied = 0;
-
         /* Work out address and page range required */
         if (len == 0)
                 return 0;
         nr_pages = (addr + len - 1) / PAGE_SIZE - addr / PAGE_SIZE + 1;
 
-        while ((nr_pages_copied < nr_pages) && (*lvec_current < lvec_cnt)) {
-                nr_pages_to_copy = min(nr_pages - nr_pages_copied,
-                                       max_pages_per_loop);
+        while (!rc && nr_pages && iov_iter_count(iter)) {
+                int pages = min(nr_pages, max_pages_per_loop);
+                size_t bytes;
 
-                rc = process_vm_rw_pages(task, mm, process_pages, pa,
-                                         start_offset, len,
-                                         lvec, lvec_cnt,
-                                         lvec_current, lvec_offset,
-                                         vm_write, nr_pages_to_copy,
-                                         &bytes_copied_loop);
-                start_offset = 0;
-                *bytes_copied += bytes_copied_loop;
+                /* Get the pages we're interested in */
+                down_read(&mm->mmap_sem);
+                pages = get_user_pages(task, mm, pa, pages,
+                                      vm_write, 0, process_pages, NULL);
+                up_read(&mm->mmap_sem);
 
-                if (rc < 0) {
-                        return rc;
-                } else {
-                        len -= bytes_copied_loop;
-                        nr_pages_copied += nr_pages_to_copy;
-                        pa += nr_pages_to_copy * PAGE_SIZE;
-                }
+                if (pages <= 0)
+                        return -EFAULT;
+
+                bytes = pages * PAGE_SIZE - start_offset;
+                if (bytes > len)
+                        bytes = len;
+
+                rc = process_vm_rw_pages(process_pages,
+                                         start_offset, bytes, iter,
+                                         vm_write);
+                len -= bytes;
+                start_offset = 0;
+                nr_pages -= pages;
+                pa += pages * PAGE_SIZE;
+                while (pages)
+                        put_page(process_pages[--pages]);
         }
 
         return rc;
@@ -228,8 +136,7 @@ static int process_vm_rw_single_vec(unsigned long addr,
 /**
  * process_vm_rw_core - core of reading/writing pages from task specified
  * @pid: PID of process to read/write from/to
- * @lvec: iovec array specifying where to copy to/from locally
- * @liovcnt: size of lvec array
+ * @iter: where to copy to/from locally
  * @rvec: iovec array specifying where to copy to/from in the other process
  * @riovcnt: size of rvec array
  * @flags: currently unused
@@ -238,8 +145,7 @@ static int process_vm_rw_single_vec(unsigned long addr,
  *  return less bytes than expected if an error occurs during the copying
  *  process.
  */
-static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
-                                  unsigned long liovcnt,
+static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
                                   const struct iovec *rvec,
                                   unsigned long riovcnt,
                                   unsigned long flags, int vm_write)
@@ -250,13 +156,10 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
         struct mm_struct *mm;
         unsigned long i;
         ssize_t rc = 0;
-        ssize_t bytes_copied_loop;
-        ssize_t bytes_copied = 0;
         unsigned long nr_pages = 0;
         unsigned long nr_pages_iov;
-        unsigned long iov_l_curr_idx = 0;
-        size_t iov_l_curr_offset = 0;
         ssize_t iov_len;
+        size_t total_len = iov_iter_count(iter);
 
         /*
          * Work out how many pages of struct pages we're going to need
@@ -310,24 +213,20 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
                 goto put_task_struct;
         }
 
-        for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
+        for (i = 0; i < riovcnt && iov_iter_count(iter) && !rc; i++)
                 rc = process_vm_rw_single_vec(
                         (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
-                        lvec, liovcnt, &iov_l_curr_idx, &iov_l_curr_offset,
-                        process_pages, mm, task, vm_write, &bytes_copied_loop);
-                bytes_copied += bytes_copied_loop;
-                if (rc != 0) {
-                        /* If we have managed to copy any data at all then
-                           we return the number of bytes copied. Otherwise
-                           we return the error code */
-                        if (bytes_copied)
-                                rc = bytes_copied;
-                        goto put_mm;
-                }
-        }
+                        iter, process_pages, mm, task, vm_write);
+
+        /* copied = space before - space after */
+        total_len -= iov_iter_count(iter);
+
+        /* If we have managed to copy any data at all then
+           we return the number of bytes copied. Otherwise
+           we return the error code */
+        if (total_len)
+                rc = total_len;
 
-        rc = bytes_copied;
-put_mm:
         mmput(mm);
 
 put_task_struct:
@@ -363,6 +262,7 @@ static ssize_t process_vm_rw(pid_t pid,
         struct iovec iovstack_r[UIO_FASTIOV];
         struct iovec *iov_l = iovstack_l;
         struct iovec *iov_r = iovstack_r;
+        struct iov_iter iter;
         ssize_t rc;
 
         if (flags != 0)
@@ -378,13 +278,14 @@ static ssize_t process_vm_rw(pid_t pid,
         if (rc <= 0)
                 goto free_iovecs;
 
+        iov_iter_init(&iter, iov_l, liovcnt, rc, 0);
+
         rc = rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV,
                                    iovstack_r, &iov_r);
         if (rc <= 0)
                 goto free_iovecs;
 
-        rc = process_vm_rw_core(pid, iov_l, liovcnt, iov_r, riovcnt, flags,
-                                vm_write);
+        rc = process_vm_rw_core(pid, &iter, iov_r, riovcnt, flags, vm_write);
 
 free_iovecs:
         if (iov_r != iovstack_r)
@@ -424,6 +325,7 @@ compat_process_vm_rw(compat_pid_t pid,
         struct iovec iovstack_r[UIO_FASTIOV];
         struct iovec *iov_l = iovstack_l;
         struct iovec *iov_r = iovstack_r;
+        struct iov_iter iter;
         ssize_t rc = -EFAULT;
 
         if (flags != 0)
@@ -439,14 +341,14 @@ compat_process_vm_rw(compat_pid_t pid,
                                                   &iov_l);
         if (rc <= 0)
                 goto free_iovecs;
+        iov_iter_init(&iter, iov_l, liovcnt, rc, 0);
         rc = compat_rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt,
                                           UIO_FASTIOV, iovstack_r,
                                           &iov_r);
         if (rc <= 0)
                 goto free_iovecs;
 
-        rc = process_vm_rw_core(pid, iov_l, liovcnt, iov_r, riovcnt, flags,
-                           vm_write);
+        rc = process_vm_rw_core(pid, &iter, iov_r, riovcnt, flags, vm_write);
 
 free_iovecs:
         if (iov_r != iovstack_r)
diff --git a/mm/shmem.c b/mm/shmem.c
index 70273f8df586..8f1a95406bae 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1402,13 +1402,25 @@ shmem_write_end(struct file *file, struct address_space *mapping,
         return copied;
 }
 
-static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
+static ssize_t shmem_file_aio_read(struct kiocb *iocb,
+                const struct iovec *iov, unsigned long nr_segs, loff_t pos)
 {
-        struct inode *inode = file_inode(filp);
+        struct file *file = iocb->ki_filp;
+        struct inode *inode = file_inode(file);
         struct address_space *mapping = inode->i_mapping;
         pgoff_t index;
         unsigned long offset;
         enum sgp_type sgp = SGP_READ;
+        int error;
+        ssize_t retval;
+        size_t count;
+        loff_t *ppos = &iocb->ki_pos;
+        struct iov_iter iter;
+
+        retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
+        if (retval)
+                return retval;
+        iov_iter_init(&iter, iov, nr_segs, count, 0);
 
         /*
          * Might this read be for a stacking filesystem?  Then when reading
@@ -1436,10 +1448,10 @@ static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_
                                 break;
                 }
 
-                desc->error = shmem_getpage(inode, index, &page, sgp, NULL);
-                if (desc->error) {
-                        if (desc->error == -EINVAL)
-                                desc->error = 0;
+                error = shmem_getpage(inode, index, &page, sgp, NULL);
+                if (error) {
+                        if (error == -EINVAL)
+                                error = 0;
                         break;
                 }
                 if (page)
@@ -1483,61 +1495,26 @@ static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_
                 /*
                  * Ok, we have the page, and it's up-to-date, so
                  * now we can copy it to user space...
-                 *
-                 * The actor routine returns how many bytes were actually used..
-                 * NOTE! This may not be the same as how much of a user buffer
-                 * we filled up (we may be padding etc), so we can only update
-                 * "pos" here (the actor routine has to update the user buffer
-                 * pointers and the remaining count).
                  */
-                ret = actor(desc, page, offset, nr);
+                ret = copy_page_to_iter(page, offset, nr, &iter);
+                retval += ret;
                 offset += ret;
                 index += offset >> PAGE_CACHE_SHIFT;
                 offset &= ~PAGE_CACHE_MASK;
 
                 page_cache_release(page);
-                if (ret != nr || !desc->count)
+                if (!iov_iter_count(&iter))
                         break;
-
+                if (ret < nr) {
+                        error = -EFAULT;
+                        break;
+                }
                 cond_resched();
         }
 
         *ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset;
-        file_accessed(filp);
-}
-
-static ssize_t shmem_file_aio_read(struct kiocb *iocb,
-                const struct iovec *iov, unsigned long nr_segs, loff_t pos)
-{
-        struct file *filp = iocb->ki_filp;
-        ssize_t retval;
-        unsigned long seg;
-        size_t count;
-        loff_t *ppos = &iocb->ki_pos;
-
-        retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
-        if (retval)
-                return retval;
-
-        for (seg = 0; seg < nr_segs; seg++) {
-                read_descriptor_t desc;
-
-                desc.written = 0;
-                desc.arg.buf = iov[seg].iov_base;
-                desc.count = iov[seg].iov_len;
-                if (desc.count == 0)
-                        continue;
-                desc.error = 0;
-                do_shmem_file_read(filp, ppos, &desc, file_read_actor);
-                retval += desc.written;
-                if (desc.error) {
-                        retval = retval ?: desc.error;
-                        break;
-                }
-                if (desc.count > 0)
-                        break;
-        }
-        return retval;
+        file_accessed(file);
+        return retval ? retval : error;
 }
 
 static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
@@ -1576,7 +1553,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
         index = *ppos >> PAGE_CACHE_SHIFT;
         loff = *ppos & ~PAGE_CACHE_MASK;
         req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-        nr_pages = min(req_pages, pipe->buffers);
+        nr_pages = min(req_pages, spd.nr_pages_max);
 
         spd.nr_pages = find_get_pages_contig(mapping, index,
                                                 nr_pages, spd.pages);
diff --git a/mm/util.c b/mm/util.c
index d7813e6d4cc7..f380af7ea779 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -446,6 +446,54 @@ unsigned long vm_commit_limit(void)
         return allowed;
 }
 
+/**
+ * get_cmdline() - copy the cmdline value to a buffer.
+ * @task:     the task whose cmdline value to copy.
+ * @buffer:   the buffer to copy to.
+ * @buflen:   the length of the buffer. Larger cmdline values are truncated
+ *            to this length.
+ * Returns the size of the cmdline field copied. Note that the copy does
+ * not guarantee an ending NULL byte.
+ */
+int get_cmdline(struct task_struct *task, char *buffer, int buflen)
+{
+        int res = 0;
+        unsigned int len;
+        struct mm_struct *mm = get_task_mm(task);
+        if (!mm)
+                goto out;
+        if (!mm->arg_end)
+                goto out_mm;    /* Shh! No looking before we're done */
+
+        len = mm->arg_end - mm->arg_start;
+
+        if (len > buflen)
+                len = buflen;
+
+        res = access_process_vm(task, mm->arg_start, buffer, len, 0);
+
+        /*
+         * If the nul at the end of args has been overwritten, then
+         * assume application is using setproctitle(3).
+         */
+        if (res > 0 && buffer[res-1] != '\0' && len < buflen) {
+                len = strnlen(buffer, res);
+                if (len < res) {
+                        res = len;
+                } else {
+                        len = mm->env_end - mm->env_start;
+                        if (len > buflen - res)
+                                len = buflen - res;
+                        res += access_process_vm(task, mm->env_start,
+                                                 buffer+res, len, 0);
+                        res = strnlen(buffer, res);
+                }
+        }
+out_mm:
+        mmput(mm);
+out:
+        return res;
+}
 
 /* Tracepoints definitions. */
 EXPORT_TRACEPOINT_SYMBOL(kmalloc);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 06879ead7380..9b6497eda806 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1862,7 +1862,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
         struct zone *zone = lruvec_zone(lruvec);
         unsigned long anon_prio, file_prio;
         enum scan_balance scan_balance;
-        unsigned long anon, file, free;
+        unsigned long anon, file;
         bool force_scan = false;
         unsigned long ap, fp;
         enum lru_list lru;
@@ -1916,20 +1916,6 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
                 get_lru_size(lruvec, LRU_INACTIVE_FILE);
 
         /*
-         * If it's foreseeable that reclaiming the file cache won't be
-         * enough to get the zone back into a desirable shape, we have
-         * to swap.  Better start now and leave the - probably heavily
-         * thrashing - remaining file pages alone.
-         */
-        if (global_reclaim(sc)) {
-                free = zone_page_state(zone, NR_FREE_PAGES);
-                if (unlikely(file + free <= high_wmark_pages(zone))) {
-                        scan_balance = SCAN_ANON;
-                        goto out;
-                }
-        }
-
-        /*
          * There is enough inactive page cache, do not reclaim
          * anything from the anonymous working set right now.
          */
diff --git a/net/9p/client.c b/net/9p/client.c
index 9186550d77a6..0004cbaac4a4 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -415,9 +415,17 @@ static void p9_free_req(struct p9_client *c, struct p9_req_t *r)
  * req: request received
  *
  */
-void p9_client_cb(struct p9_client *c, struct p9_req_t *req)
+void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status)
 {
         p9_debug(P9_DEBUG_MUX, " tag %d\n", req->tc->tag);
+
+        /*
+         * This barrier is needed to make sure any change made to req before
+         * the other thread wakes up will indeed be seen by the waiting side.
+         */
+        smp_wmb();
+        req->status = status;
+
         wake_up(req->wq);
         p9_debug(P9_DEBUG_MUX, "wakeup: %d\n", req->tc->tag);
 }
@@ -655,16 +663,13 @@ static int p9_client_flush(struct p9_client *c, struct p9_req_t *oldreq)
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-
         /*
          * if we haven't received a response for oldreq,
          * remove it from the list
          */
-        if (oldreq->status == REQ_STATUS_FLSH) {
-                spin_lock(&c->lock);
-                list_del(&oldreq->req_list);
-                spin_unlock(&c->lock);
-        }
+        if (oldreq->status == REQ_STATUS_SENT)
+                if (c->trans_mod->cancelled)
+                        c->trans_mod->cancelled(c, oldreq);
 
         p9_free_req(c, req);
         return 0;
@@ -751,6 +756,12 @@ again:
         err = wait_event_interruptible(*req->wq,
                                        req->status >= REQ_STATUS_RCVD);
 
+        /*
+         * Make sure our req is coherent with regard to updates in other
+         * threads - echoes to wmb() in the callback
+         */
+        smp_rmb();
+
         if ((err == -ERESTARTSYS) && (c->status == Connected)
                                   && (type == P9_TFLUSH)) {
                 sigpending = 1;
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index b7bd7f2961bf..80d08f6664cb 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -66,20 +66,6 @@ struct p9_fd_opts {
         int privport;
 };
 
-/**
- * struct p9_trans_fd - transport state
- * @rd: reference to file to read from
- * @wr: reference of file to write to
- * @conn: connection state reference
- *
- */
-
-struct p9_trans_fd {
-        struct file *rd;
-        struct file *wr;
-        struct p9_conn *conn;
-};
-
 /*
   * Option Parsing (code inspired by NFS code)
   *  - a little lazy - parse all fd-transport options
@@ -159,6 +145,20 @@ struct p9_conn {
         unsigned long wsched;
 };
 
+/**
+ * struct p9_trans_fd - transport state
+ * @rd: reference to file to read from
+ * @wr: reference of file to write to
+ * @conn: connection state reference
+ *
+ */
+
+struct p9_trans_fd {
+        struct file *rd;
+        struct file *wr;
+        struct p9_conn conn;
+};
+
 static void p9_poll_workfn(struct work_struct *work);
 
 static DEFINE_SPINLOCK(p9_poll_lock);
@@ -212,15 +212,9 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
         m->err = err;
 
         list_for_each_entry_safe(req, rtmp, &m->req_list, req_list) {
-                req->status = REQ_STATUS_ERROR;
-                if (!req->t_err)
-                        req->t_err = err;
                 list_move(&req->req_list, &cancel_list);
         }
         list_for_each_entry_safe(req, rtmp, &m->unsent_req_list, req_list) {
-                req->status = REQ_STATUS_ERROR;
-                if (!req->t_err)
-                        req->t_err = err;
                 list_move(&req->req_list, &cancel_list);
         }
         spin_unlock_irqrestore(&m->client->lock, flags);
@@ -228,7 +222,9 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
         list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) {
                 p9_debug(P9_DEBUG_ERROR, "call back req %p\n", req);
                 list_del(&req->req_list);
-                p9_client_cb(m->client, req);
+                if (!req->t_err)
+                        req->t_err = err;
+                p9_client_cb(m->client, req, REQ_STATUS_ERROR);
         }
 }
 
@@ -302,6 +298,7 @@ static void p9_read_work(struct work_struct *work)
 {
         int n, err;
         struct p9_conn *m;
+        int status = REQ_STATUS_ERROR;
 
         m = container_of(work, struct p9_conn, rq);
 
@@ -348,8 +345,7 @@ static void p9_read_work(struct work_struct *work)
                          "mux %p pkt: size: %d bytes tag: %d\n", m, n, tag);
 
                 m->req = p9_tag_lookup(m->client, tag);
-                if (!m->req || (m->req->status != REQ_STATUS_SENT &&
-                                        m->req->status != REQ_STATUS_FLSH)) {
+                if (!m->req || (m->req->status != REQ_STATUS_SENT)) {
                         p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n",
                                  tag);
                         err = -EIO;
@@ -375,10 +371,10 @@ static void p9_read_work(struct work_struct *work)
                 p9_debug(P9_DEBUG_TRANS, "got new packet\n");
                 spin_lock(&m->client->lock);
                 if (m->req->status != REQ_STATUS_ERROR)
-                        m->req->status = REQ_STATUS_RCVD;
+                        status = REQ_STATUS_RCVD;
                 list_del(&m->req->req_list);
                 spin_unlock(&m->client->lock);
-                p9_client_cb(m->client, m->req);
+                p9_client_cb(m->client, m->req, status);
                 m->rbuf = NULL;
                 m->rpos = 0;
                 m->rsize = 0;
@@ -573,21 +569,19 @@ p9_pollwait(struct file *filp, wait_queue_head_t *wait_address, poll_table *p)
 }
 
 /**
- * p9_conn_create - allocate and initialize the per-session mux data
+ * p9_conn_create - initialize the per-session mux data
  * @client: client instance
  *
  * Note: Creates the polling task if this is the first session.
  */
 
-static struct p9_conn *p9_conn_create(struct p9_client *client)
+static void p9_conn_create(struct p9_client *client)
 {
         int n;
-        struct p9_conn *m;
+        struct p9_trans_fd *ts = client->trans;
+        struct p9_conn *m = &ts->conn;
 
         p9_debug(P9_DEBUG_TRANS, "client %p msize %d\n", client, client->msize);
-        m = kzalloc(sizeof(struct p9_conn), GFP_KERNEL);
-        if (!m)
-                return ERR_PTR(-ENOMEM);
 
         INIT_LIST_HEAD(&m->mux_list);
         m->client = client;
@@ -609,8 +603,6 @@ static struct p9_conn *p9_conn_create(struct p9_client *client)
                 p9_debug(P9_DEBUG_TRANS, "mux %p can write\n", m);
                 set_bit(Wpending, &m->wsched);
         }
-
-        return m;
 }
 
 /**
@@ -669,7 +661,7 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)
 {
         int n;
         struct p9_trans_fd *ts = client->trans;
-        struct p9_conn *m = ts->conn;
+        struct p9_conn *m = &ts->conn;
 
         p9_debug(P9_DEBUG_TRANS, "mux %p task %p tcall %p id %d\n",
                  m, current, req->tc, req->tc->id);
@@ -704,14 +696,26 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)
                 list_del(&req->req_list);
                 req->status = REQ_STATUS_FLSHD;
                 ret = 0;
-        } else if (req->status == REQ_STATUS_SENT)
-                req->status = REQ_STATUS_FLSH;
-
+        }
         spin_unlock(&client->lock);
 
         return ret;
 }
 
+static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req)
+{
+        p9_debug(P9_DEBUG_TRANS, "client %p req %p\n", client, req);
+
+        /* we haven't received a response for oldreq,
+         * remove it from the list.
+         */
+        spin_lock(&client->lock);
+        list_del(&req->req_list);
+        spin_unlock(&client->lock);
+
+        return 0;
+}
+
 /**
  * parse_opts - parse mount options into p9_fd_opts structure
  * @params: options string passed from mount
@@ -780,7 +784,7 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)
 
 static int p9_fd_open(struct p9_client *client, int rfd, int wfd)
 {
-        struct p9_trans_fd *ts = kmalloc(sizeof(struct p9_trans_fd),
+        struct p9_trans_fd *ts = kzalloc(sizeof(struct p9_trans_fd),
                                            GFP_KERNEL);
         if (!ts)
                 return -ENOMEM;
@@ -806,9 +810,8 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)
 {
         struct p9_trans_fd *p;
         struct file *file;
-        int ret;
 
-        p = kmalloc(sizeof(struct p9_trans_fd), GFP_KERNEL);
+        p = kzalloc(sizeof(struct p9_trans_fd), GFP_KERNEL);
         if (!p)
                 return -ENOMEM;
 
@@ -829,20 +832,12 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)
 
         p->rd->f_flags |= O_NONBLOCK;
 
-        p->conn = p9_conn_create(client);
-        if (IS_ERR(p->conn)) {
-                ret = PTR_ERR(p->conn);
-                p->conn = NULL;
-                kfree(p);
-                sockfd_put(csocket);
-                sockfd_put(csocket);
-                return ret;
-        }
+        p9_conn_create(client);
         return 0;
 }
 
 /**
- * p9_mux_destroy - cancels all pending requests and frees mux resources
+ * p9_mux_destroy - cancels all pending requests of mux
  * @m: mux to destroy
  *
  */
@@ -859,7 +854,6 @@ static void p9_conn_destroy(struct p9_conn *m)
         p9_conn_cancel(m, -ECONNRESET);
 
         m->client = NULL;
-        kfree(m);
 }
 
 /**
@@ -881,7 +875,7 @@ static void p9_fd_close(struct p9_client *client)
 
         client->status = Disconnected;
 
-        p9_conn_destroy(ts->conn);
+        p9_conn_destroy(&ts->conn);
 
         if (ts->rd)
                 fput(ts->rd);
@@ -1033,14 +1027,7 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args)
                 return err;
 
         p = (struct p9_trans_fd *) client->trans;
-        p->conn = p9_conn_create(client);
-        if (IS_ERR(p->conn)) {
-                err = PTR_ERR(p->conn);
-                p->conn = NULL;
-                fput(p->rd);
-                fput(p->wr);
-                return err;
-        }
+        p9_conn_create(client);
 
         return 0;
 }
@@ -1053,6 +1040,7 @@ static struct p9_trans_module p9_tcp_trans = {
         .close = p9_fd_close,
         .request = p9_fd_request,
         .cancel = p9_fd_cancel,
+        .cancelled = p9_fd_cancelled,
         .owner = THIS_MODULE,
 };
 
@@ -1064,6 +1052,7 @@ static struct p9_trans_module p9_unix_trans = {
         .close = p9_fd_close,
         .request = p9_fd_request,
         .cancel = p9_fd_cancel,
+        .cancelled = p9_fd_cancelled,
         .owner = THIS_MODULE,
 };
 
@@ -1075,6 +1064,7 @@ static struct p9_trans_module p9_fd_trans = {
         .close = p9_fd_close,
         .request = p9_fd_request,
         .cancel = p9_fd_cancel,
+        .cancelled = p9_fd_cancelled,
         .owner = THIS_MODULE,
 };
 
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 8f68df5d2973..14ad43b5cf89 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -193,6 +193,8 @@ static int parse_opts(char *params, struct p9_rdma_opts *opts)
                 if (!*p)
                         continue;
                 token = match_token(p, tokens, args);
+                if (token == Opt_err)
+                        continue;
                 r = match_int(&args[0], &option);
                 if (r < 0) {
                         p9_debug(P9_DEBUG_ERROR,
@@ -305,8 +307,7 @@ handle_recv(struct p9_client *client, struct p9_trans_rdma *rdma,
         }
 
         req->rc = c->rc;
-        req->status = REQ_STATUS_RCVD;
-        p9_client_cb(client, req);
+        p9_client_cb(client, req, REQ_STATUS_RCVD);
 
         return;
 
@@ -511,6 +512,11 @@ dont_need_post_recv:
                 goto send_error;
         }
 
+        /* Mark request as `sent' *before* we actually send it,
+         * because doing if after could erase the REQ_STATUS_RCVD
+         * status in case of a very fast reply.
+         */
+        req->status = REQ_STATUS_SENT;
         err = ib_post_send(rdma->qp, &wr, &bad_wr);
         if (err)
                 goto send_error;
@@ -520,6 +526,7 @@ dont_need_post_recv:
 
  /* Handle errors that happened during or while preparing the send: */
  send_error:
+        req->status = REQ_STATUS_ERROR;
         kfree(c);
         p9_debug(P9_DEBUG_ERROR, "Error %d in rdma_request()\n", err);
 
@@ -582,12 +589,24 @@ static struct p9_trans_rdma *alloc_rdma(struct p9_rdma_opts *opts)
         return rdma;
 }
 
-/* its not clear to me we can do anything after send has been posted */
 static int rdma_cancel(struct p9_client *client, struct p9_req_t *req)
 {
+        /* Nothing to do here.
+         * We will take care of it (if we have to) in rdma_cancelled()
+         */
         return 1;
 }
 
+/* A request has been fully flushed without a reply.
+ * That means we have posted one buffer in excess.
+ */
+static int rdma_cancelled(struct p9_client *client, struct p9_req_t *req)
+{
+        struct p9_trans_rdma *rdma = client->trans;
+        atomic_inc(&rdma->excess_rc);
+        return 0;
+}
+
 /**
  * trans_create_rdma - Transport method for creating atransport instance
  * @client: client instance
@@ -721,6 +740,7 @@ static struct p9_trans_module p9_rdma_trans = {
         .close = rdma_close,
         .request = rdma_request,
         .cancel = rdma_cancel,
+        .cancelled = rdma_cancelled,
 };
 
 /**
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index ac2666c1d011..6940d8fe8971 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -164,8 +164,7 @@ static void req_done(struct virtqueue *vq)
                 p9_debug(P9_DEBUG_TRANS, ": rc %p\n", rc);
                 p9_debug(P9_DEBUG_TRANS, ": lookup tag %d\n", rc->tag);
                 req = p9_tag_lookup(chan->client, rc->tag);
-                req->status = REQ_STATUS_RCVD;
-                p9_client_cb(chan->client, req);
+                p9_client_cb(chan->client, req, REQ_STATUS_RCVD);
         }
 }
 
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 8215f7cb170b..ba291ce4bdff 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -68,7 +68,7 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
 
         sk = sk_atm(atmarpd);
         skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
         return 0;
 }
 
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 5a2f602d07e1..4c5b8ba0f84f 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -152,7 +152,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
                 atm_force_charge(priv->lecd, skb2->truesize);
                 sk = sk_atm(priv->lecd);
                 skb_queue_tail(&sk->sk_receive_queue, skb2);
-                sk->sk_data_ready(sk, skb2->len);
+                sk->sk_data_ready(sk);
         }
 }
 #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
@@ -447,7 +447,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                         atm_force_charge(priv->lecd, skb2->truesize);
                         sk = sk_atm(priv->lecd);
                         skb_queue_tail(&sk->sk_receive_queue, skb2);
-                        sk->sk_data_ready(sk, skb2->len);
+                        sk->sk_data_ready(sk);
                 }
         }
 #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
@@ -530,13 +530,13 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
         atm_force_charge(priv->lecd, skb->truesize);
         sk = sk_atm(priv->lecd);
         skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
 
         if (data != NULL) {
                 pr_debug("about to send %d bytes of data\n", data->len);
                 atm_force_charge(priv->lecd, data->truesize);
                 skb_queue_tail(&sk->sk_receive_queue, data);
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
         }
 
         return 0;
@@ -616,7 +616,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
 
                 pr_debug("%s: To daemon\n", dev->name);
                 skb_queue_tail(&sk->sk_receive_queue, skb);
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
         } else {                /* Data frame, queue to protocol handlers */
                 struct lec_arp_table *entry;
                 unsigned char *src, *dst;
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 91dc58f1124d..e8e0e7a8a23d 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -706,7 +706,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 dprintk("(%s) control packet arrived\n", dev->name);
                 /* Pass control packets to daemon */
                 skb_queue_tail(&sk->sk_receive_queue, skb);
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
                 return;
         }
 
@@ -992,7 +992,7 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc)
 
         sk = sk_atm(mpc->mpoad_vcc);
         skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
 
         return 0;
 }
@@ -1273,7 +1273,7 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry)
 
         sk = sk_atm(vcc);
         skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
         dprintk("exiting\n");
 }
 
diff --git a/net/atm/raw.c b/net/atm/raw.c
index b4f7b9ff3c74..2e17e97a7a8b 100644
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -25,7 +25,7 @@ static void atm_push_raw(struct atm_vcc *vcc, struct sk_buff *skb)
                 struct sock *sk = sk_atm(vcc);
 
                 skb_queue_tail(&sk->sk_receive_queue, skb);
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
         }
 }
 
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 4176887e72eb..523bce72f698 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -51,7 +51,7 @@ static void sigd_put_skb(struct sk_buff *skb)
 #endif
         atm_force_charge(sigd, skb->truesize);
         skb_queue_tail(&sk_atm(sigd)->sk_receive_queue, skb);
-        sk_atm(sigd)->sk_data_ready(sk_atm(sigd), skb->len);
+        sk_atm(sigd)->sk_data_ready(sk_atm(sigd));
 }
 
 static void modify_qos(struct atm_vcc *vcc, struct atmsvc_msg *msg)
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 96f4cab3a2f9..7ed8ab724819 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -422,7 +422,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
 
         if (sk) {
                 if (!sock_flag(sk, SOCK_DEAD))
-                        sk->sk_data_ready(sk, skb->len);
+                        sk->sk_data_ready(sk);
                 sock_put(sk);
         } else {
 free:
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f59e00c2daa9..ef5e5b04f34f 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1271,7 +1271,7 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)
 
                 if (parent) {
                         bt_accept_unlink(sk);
-                        parent->sk_data_ready(parent, 0);
+                        parent->sk_data_ready(parent);
                 } else {
                         sk->sk_state_change(sk);
                 }
@@ -1327,7 +1327,7 @@ static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
         sk->sk_state_change(sk);
 
         if (parent)
-                parent->sk_data_ready(parent, 0);
+                parent->sk_data_ready(parent);
 
         release_sock(sk);
 }
@@ -1340,7 +1340,7 @@ static void l2cap_sock_defer_cb(struct l2cap_chan *chan)
 
         parent = bt_sk(sk)->parent;
         if (parent)
-                parent->sk_data_ready(parent, 0);
+                parent->sk_data_ready(parent);
 
         release_sock(sk);
 }
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 633cceeb943e..cf620260affa 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -186,9 +186,9 @@ static void rfcomm_l2state_change(struct sock *sk)
         rfcomm_schedule();
 }
 
-static void rfcomm_l2data_ready(struct sock *sk, int bytes)
+static void rfcomm_l2data_ready(struct sock *sk)
 {
-        BT_DBG("%p bytes %d", sk, bytes);
+        BT_DBG("%p", sk);
         rfcomm_schedule();
 }
 
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index eabd25ab5ad9..c603a5eb4720 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -54,7 +54,7 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb)
 
         atomic_add(skb->len, &sk->sk_rmem_alloc);
         skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
 
         if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf)
                 rfcomm_dlc_throttle(d);
@@ -84,7 +84,7 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
                         sock_set_flag(sk, SOCK_ZAPPED);
                         bt_accept_unlink(sk);
                 }
-                parent->sk_data_ready(parent, 0);
+                parent->sk_data_ready(parent);
         } else {
                 if (d->state == BT_CONNECTED)
                         rfcomm_session_getaddr(d->session,
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index ab1e6fcca4c5..c06dbd3938e8 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -1024,7 +1024,7 @@ static void sco_conn_ready(struct sco_conn *conn)
                         sk->sk_state = BT_CONNECTED;
 
                 /* Wake up parent */
-                parent->sk_data_ready(parent, 1);
+                parent->sk_data_ready(parent);
 
                 bh_unlock_sock(parent);
 
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index d0cca3c65f01..7985deaff52f 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -73,7 +73,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
                 goto drop;
 
         if (!br_allowed_ingress(p->br, nbp_get_vlan_info(p), skb, &vid))
-                goto drop;
+                goto out;
 
         /* insert into forwarding database after filtering to avoid spoofing */
         br = p->br;
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 91510712c7a7..4a3716102789 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -170,7 +170,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
          * rejected.
          */
         if (!v)
-                return false;
+                goto drop;
 
         /* If vlan tx offload is disabled on bridge device and frame was
          * sent from vlan device on the bridge device, it does not have
@@ -193,7 +193,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
                  * vlan untagged or priority-tagged traffic belongs to.
                  */
                 if (pvid == VLAN_N_VID)
-                        return false;
+                        goto drop;
 
                 /* PVID is set on this port.  Any untagged or priority-tagged
                  * ingress frame is considered to belong to this vlan.
@@ -216,7 +216,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
         /* Frame had a valid vlan tag.  See if vlan is allowed */
         if (test_bit(*vid, v->vlan_bitmap))
                 return true;
-
+drop:
+        kfree_skb(skb);
         return false;
 }
 
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index d6be3edb7a43..e8437094d15f 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -124,7 +124,6 @@ static void caif_flow_ctrl(struct sock *sk, int mode)
 static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
         int err;
-        int skb_len;
         unsigned long flags;
         struct sk_buff_head *list = &sk->sk_receive_queue;
         struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
@@ -153,14 +152,13 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
          * may be freed by other threads of control pulling packets
          * from the queue.
          */
-        skb_len = skb->len;
         spin_lock_irqsave(&list->lock, flags);
         if (!sock_flag(sk, SOCK_DEAD))
                 __skb_queue_tail(list, skb);
         spin_unlock_irqrestore(&list->lock, flags);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb_len);
+                sk->sk_data_ready(sk);
         else
                 kfree_skb(skb);
         return 0;
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 4f55f9ce63fa..dac7f9b98687 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -383,7 +383,7 @@ static void con_sock_state_closed(struct ceph_connection *con)
  */
 
 /* data available on socket, or listen socket received a connect */
-static void ceph_sock_data_ready(struct sock *sk, int count_unused)
+static void ceph_sock_data_ready(struct sock *sk)
 {
         struct ceph_connection *con = sk->sk_user_data;
         if (atomic_read(&con->msgr->stopping)) {
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index d068ec25db1e..0304f981f7ff 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3338,7 +3338,9 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
         queue_map = skb_get_queue_mapping(pkt_dev->skb);
         txq = netdev_get_tx_queue(odev, queue_map);
 
-        __netif_tx_lock_bh(txq);
+        local_bh_disable();
+
+        HARD_TX_LOCK(odev, txq, smp_processor_id());
 
         if (unlikely(netif_xmit_frozen_or_drv_stopped(txq))) {
                 ret = NETDEV_TX_BUSY;
@@ -3374,7 +3376,9 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 pkt_dev->last_ok = 0;
         }
 unlock:
-        __netif_tx_unlock_bh(txq);
+        HARD_TX_UNLOCK(odev, txq);
+
+        local_bh_enable();
 
         /* If pkt_dev->count is zero, then run forever */
         if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 30c7d35dd862..1b62343f5837 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3458,8 +3458,6 @@ static void sock_rmem_free(struct sk_buff *skb)
  */
 int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
 {
-        int len = skb->len;
-
         if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
             (unsigned int)sk->sk_rcvbuf)
                 return -ENOMEM;
@@ -3474,7 +3472,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
 
         skb_queue_tail(&sk->sk_error_queue, skb);
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, len);
+                sk->sk_data_ready(sk);
         return 0;
 }
 EXPORT_SYMBOL(sock_queue_err_skb);
@@ -3937,12 +3935,14 @@ EXPORT_SYMBOL_GPL(skb_scrub_packet);
 unsigned int skb_gso_transport_seglen(const struct sk_buff *skb)
 {
         const struct skb_shared_info *shinfo = skb_shinfo(skb);
-        unsigned int hdr_len;
 
         if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))
-                hdr_len = tcp_hdrlen(skb);
-        else
-                hdr_len = sizeof(struct udphdr);
-        return hdr_len + shinfo->gso_size;
+                return tcp_hdrlen(skb) + shinfo->gso_size;
+
+        /* UFO sets gso_size to the size of the fragmentation
+         * payload, i.e. the size of the L4 (UDP) header is already
+         * accounted for.
+         */
+        return shinfo->gso_size;
 }
 EXPORT_SYMBOL_GPL(skb_gso_transport_seglen);
diff --git a/net/core/sock.c b/net/core/sock.c
index c0fc6bdad1e3..b4fff008136f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -428,7 +428,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
         spin_unlock_irqrestore(&list->lock, flags);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb_len);
+                sk->sk_data_ready(sk);
         return 0;
 }
 EXPORT_SYMBOL(sock_queue_rcv_skb);
@@ -2196,7 +2196,7 @@ static void sock_def_error_report(struct sock *sk)
         rcu_read_unlock();
 }
 
-static void sock_def_readable(struct sock *sk, int len)
+static void sock_def_readable(struct sock *sk)
 {
         struct socket_wq *wq;
 
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 14cdafad7a90..3c8ec7d4a34e 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -28,7 +28,7 @@ static void dccp_enqueue_skb(struct sock *sk, struct sk_buff *skb)
         __skb_pull(skb, dccp_hdr(skb)->dccph_doff * 4);
         __skb_queue_tail(&sk->sk_receive_queue, skb);
         skb_set_owner_r(skb, sk);
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
 }
 
 static void dccp_fin(struct sock *sk, struct sk_buff *skb)
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 9e2f78bc1553..c69eb9c4fbb8 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -237,7 +237,7 @@ int dccp_child_process(struct sock *parent, struct sock *child,
 
                 /* Wakeup parent, send SIGIO */
                 if (state == DCCP_RESPOND && child->sk_state != state)
-                        parent->sk_data_ready(parent, 0);
+                        parent->sk_data_ready(parent);
         } else {
                 /* Alas, it is possible again, because we do lookup
                  * in main socket hash table and lock on listening
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index c344163e6ac0..fe5f01485d33 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -585,7 +585,6 @@ out:
 static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig, struct sk_buff_head *queue)
 {
         int err;
-        int skb_len;
 
         /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
            number of warnings when compiling with -W --ANK
@@ -600,12 +599,11 @@ static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig
         if (err)
                 goto out;
 
-        skb_len = skb->len;
         skb_set_owner_r(skb, sk);
         skb_queue_tail(queue, skb);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb_len);
+                sk->sk_data_ready(sk);
 out:
         return err;
 }
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index ec4f762efda5..94213c891565 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -463,6 +463,7 @@ static const struct net_device_ops ipgre_netdev_ops = {
 static void ipgre_tunnel_setup(struct net_device *dev)
 {
         dev->netdev_ops         = &ipgre_netdev_ops;
+        dev->type               = ARPHRD_IPGRE;
         ip_tunnel_setup(dev, ipgre_net_id);
 }
 
@@ -501,7 +502,6 @@ static int ipgre_tunnel_init(struct net_device *dev)
         memcpy(dev->dev_addr, &iph->saddr, 4);
         memcpy(dev->broadcast, &iph->daddr, 4);
 
-        dev->type               = ARPHRD_IPGRE;
         dev->flags              = IFF_NOARP;
         dev->priv_flags         &= ~IFF_XMIT_DST_RELEASE;
         dev->addr_len           = 4;
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 687ddef4e574..afcee51b90ed 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -337,6 +337,7 @@ static const struct net_device_ops vti_netdev_ops = {
 static void vti_tunnel_setup(struct net_device *dev)
 {
         dev->netdev_ops         = &vti_netdev_ops;
+        dev->type               = ARPHRD_TUNNEL;
         ip_tunnel_setup(dev, vti_net_id);
 }
 
@@ -348,7 +349,6 @@ static int vti_tunnel_init(struct net_device *dev)
         memcpy(dev->dev_addr, &iph->saddr, 4);
         memcpy(dev->broadcast, &iph->daddr, 4);
 
-        dev->type               = ARPHRD_TUNNEL;
         dev->hard_header_len    = LL_MAX_HEADER + sizeof(struct iphdr);
         dev->mtu                = ETH_DATA_LEN;
         dev->flags              = IFF_NOARP;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e1661f46fd19..d6b46eb2f94c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4413,7 +4413,7 @@ queue_and_out:
                 if (eaten > 0)
                         kfree_skb_partial(skb, fragstolen);
                 if (!sock_flag(sk, SOCK_DEAD))
-                        sk->sk_data_ready(sk, 0);
+                        sk->sk_data_ready(sk);
                 return;
         }
 
@@ -4914,7 +4914,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t
                                 BUG();
                         tp->urg_data = TCP_URG_VALID | tmp;
                         if (!sock_flag(sk, SOCK_DEAD))
-                                sk->sk_data_ready(sk, 0);
+                                sk->sk_data_ready(sk);
                 }
         }
 }
@@ -5000,11 +5000,11 @@ static bool tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb,
                     (tcp_flag_word(tcp_hdr(skb)) & TCP_FLAG_PSH) ||
                     (atomic_read(&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >> 1))) {
                         tp->ucopy.wakeup = 1;
-                        sk->sk_data_ready(sk, 0);
+                        sk->sk_data_ready(sk);
                 }
         } else if (chunk > 0) {
                 tp->ucopy.wakeup = 1;
-                sk->sk_data_ready(sk, 0);
+                sk->sk_data_ready(sk);
         }
 out:
         return copied_early;
@@ -5275,7 +5275,7 @@ no_ack:
 #endif
                         if (eaten)
                                 kfree_skb_partial(skb, fragstolen);
-                        sk->sk_data_ready(sk, 0);
+                        sk->sk_data_ready(sk);
                         return;
                 }
         }
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 6379894ec210..438f3b95143d 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1434,7 +1434,7 @@ static int tcp_v4_conn_req_fastopen(struct sock *sk,
                 tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
                 tp->syn_data_acked = 1;
         }
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
         bh_unlock_sock(child);
         sock_put(child);
         WARN_ON(req->sk == NULL);
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index ca788ada5bd3..05c1b155251d 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -745,7 +745,7 @@ int tcp_child_process(struct sock *parent, struct sock *child,
                                             skb->len);
                 /* Wakeup parent, send SIGIO */
                 if (state == TCP_SYN_RECV && child->sk_state != state)
-                        parent->sk_data_ready(parent, 0);
+                        parent->sk_data_ready(parent);
         } else {
                 /* Alas, it is possible again, because we do lookup
                  * in main socket hash table and lock on listening
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 5ca56cee2dae..e289830ed6e3 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -798,7 +798,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
         __tcp_v6_send_check(buff, &fl6.saddr, &fl6.daddr);
 
         fl6.flowi6_proto = IPPROTO_TCP;
-        if (rt6_need_strict(&fl6.daddr) || !oif)
+        if (rt6_need_strict(&fl6.daddr) && !oif)
                 fl6.flowi6_oif = inet6_iif(skb);
         else
                 fl6.flowi6_oif = oif;
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index a5e03119107a..01e77b0ae075 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1757,7 +1757,7 @@ static int iucv_callback_connreq(struct iucv_path *path,
 
         /* Wake up accept */
         nsk->sk_state = IUCV_CONNECTED;
-        sk->sk_data_ready(sk, 1);
+        sk->sk_data_ready(sk);
         err = 0;
 fail:
         bh_unlock_sock(sk);
@@ -1968,7 +1968,7 @@ static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb)
         if (!err) {
                 iucv_accept_enqueue(sk, nsk);
                 nsk->sk_state = IUCV_CONNECTED;
-                sk->sk_data_ready(sk, 1);
+                sk->sk_data_ready(sk);
         } else
                 iucv_sock_kill(nsk);
         bh_unlock_sock(sk);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index e72589a8400d..f3c83073afc4 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -205,7 +205,7 @@ static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
                 if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) {
                         skb_set_owner_r(*skb2, sk);
                         skb_queue_tail(&sk->sk_receive_queue, *skb2);
-                        sk->sk_data_ready(sk, (*skb2)->len);
+                        sk->sk_data_ready(sk);
                         *skb2 = NULL;
                         err = 0;
                 }
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index d276e2d4a589..950909f04ee6 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -753,9 +753,9 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
         session->deref = pppol2tp_session_sock_put;
 
         /* If PMTU discovery was enabled, use the MTU that was discovered */
-        dst = sk_dst_get(sk);
+        dst = sk_dst_get(tunnel->sock);
         if (dst != NULL) {
-                u32 pmtu = dst_mtu(__sk_dst_get(sk));
+                u32 pmtu = dst_mtu(__sk_dst_get(tunnel->sock));
                 if (pmtu != 0)
                         session->mtu = session->mru = pmtu -
                                 PPPOL2TP_HEADER_OVERHEAD;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index c2d585c4f7c5..894cda0206bb 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1653,7 +1653,7 @@ static int __netlink_sendskb(struct sock *sk, struct sk_buff *skb)
         else
 #endif /* CONFIG_NETLINK_MMAP */
                 skb_queue_tail(&sk->sk_receive_queue, skb);
-        sk->sk_data_ready(sk, len);
+        sk->sk_data_ready(sk);
         return len;
 }
 
@@ -2394,7 +2394,7 @@ out:
         return err ? : copied;
 }
 
-static void netlink_data_ready(struct sock *sk, int len)
+static void netlink_data_ready(struct sock *sk)
 {
         BUG();
 }
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index b74aa0755521..ede50d197e10 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1011,7 +1011,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
         skb_queue_head(&sk->sk_receive_queue, skb);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
 
         bh_unlock_sock(sk);
 
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index b486f12ae243..b4671958fcf9 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -976,7 +976,7 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
         new_sk->sk_state = LLCP_CONNECTED;
 
         /* Wake the listening processes */
-        parent->sk_data_ready(parent, 0);
+        parent->sk_data_ready(parent);
 
         /* Send CC */
         nfc_llcp_send_cc(new_sock);
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 72e0c71fb01d..b85c67ccb797 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1848,7 +1848,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
         skb->dropcount = atomic_read(&sk->sk_drops);
         __skb_queue_tail(&sk->sk_receive_queue, skb);
         spin_unlock(&sk->sk_receive_queue.lock);
-        sk->sk_data_ready(sk, skb->len);
+        sk->sk_data_ready(sk);
         return 0;
 
 drop_n_acct:
@@ -2054,7 +2054,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
         else
                 prb_clear_blk_fill_status(&po->rx_ring);
 
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
 
 drop_n_restore:
         if (skb_head != skb->data && skb_shared(skb)) {
@@ -2069,7 +2069,7 @@ ring_is_full:
         po->stats.stats1.tp_drops++;
         spin_unlock(&sk->sk_receive_queue.lock);
 
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
         kfree_skb(copy_skb);
         goto drop_n_restore;
 }
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index a2fba7edfd1f..66dc65e7c6a1 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -37,7 +37,7 @@
 struct gprs_dev {
         struct sock             *sk;
         void                    (*old_state_change)(struct sock *);
-        void                    (*old_data_ready)(struct sock *, int);
+        void                    (*old_data_ready)(struct sock *);
         void                    (*old_write_space)(struct sock *);
 
         struct net_device       *dev;
@@ -146,7 +146,7 @@ drop:
         return err;
 }
 
-static void gprs_data_ready(struct sock *sk, int len)
+static void gprs_data_ready(struct sock *sk)
 {
         struct gprs_dev *gp = sk->sk_user_data;
         struct sk_buff *skb;
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index e77411735de8..70a547ea5177 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -462,10 +462,9 @@ out:
 queue:
         skb->dev = NULL;
         skb_set_owner_r(skb, sk);
-        err = skb->len;
         skb_queue_tail(queue, skb);
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, err);
+                sk->sk_data_ready(sk);
         return NET_RX_SUCCESS;
 }
 
@@ -587,10 +586,9 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
                 pn->rx_credits--;
                 skb->dev = NULL;
                 skb_set_owner_r(skb, sk);
-                err = skb->len;
                 skb_queue_tail(&sk->sk_receive_queue, skb);
                 if (!sock_flag(sk, SOCK_DEAD))
-                        sk->sk_data_ready(sk, err);
+                        sk->sk_data_ready(sk);
                 return NET_RX_SUCCESS;
 
         case PNS_PEP_CONNECT_RESP:
@@ -698,7 +696,7 @@ static int pep_do_rcv(struct sock *sk, struct sk_buff *skb)
                 skb_queue_head(&sk->sk_receive_queue, skb);
                 sk_acceptq_added(sk);
                 if (!sock_flag(sk, SOCK_DEAD))
-                        sk->sk_data_ready(sk, 0);
+                        sk->sk_data_ready(sk);
                 return NET_RX_SUCCESS;
 
         case PNS_PEP_DISCONNECT_REQ:
diff --git a/net/rds/tcp.h b/net/rds/tcp.h
index 9cf2927d0021..65637491f728 100644
--- a/net/rds/tcp.h
+++ b/net/rds/tcp.h
@@ -61,12 +61,12 @@ void rds_tcp_state_change(struct sock *sk);
 /* tcp_listen.c */
 int rds_tcp_listen_init(void);
 void rds_tcp_listen_stop(void);
-void rds_tcp_listen_data_ready(struct sock *sk, int bytes);
+void rds_tcp_listen_data_ready(struct sock *sk);
 
 /* tcp_recv.c */
 int rds_tcp_recv_init(void);
 void rds_tcp_recv_exit(void);
-void rds_tcp_data_ready(struct sock *sk, int bytes);
+void rds_tcp_data_ready(struct sock *sk);
 int rds_tcp_recv(struct rds_connection *conn);
 void rds_tcp_inc_free(struct rds_incoming *inc);
 int rds_tcp_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 7787537e9c2e..4e638f851185 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -108,9 +108,9 @@ static void rds_tcp_accept_worker(struct work_struct *work)
                 cond_resched();
 }
 
-void rds_tcp_listen_data_ready(struct sock *sk, int bytes)
+void rds_tcp_listen_data_ready(struct sock *sk)
 {
-        void (*ready)(struct sock *sk, int bytes);
+        void (*ready)(struct sock *sk);
 
         rdsdebug("listen data ready sk %p\n", sk);
 
@@ -132,7 +132,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes)
 
 out:
         read_unlock(&sk->sk_callback_lock);
-        ready(sk, bytes);
+        ready(sk);
 }
 
 int rds_tcp_listen_init(void)
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index 4fac4f2bb9dc..9ae6e0a264ec 100644
--- a/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@ -314,13 +314,13 @@ int rds_tcp_recv(struct rds_connection *conn)
         return ret;
 }
 
-void rds_tcp_data_ready(struct sock *sk, int bytes)
+void rds_tcp_data_ready(struct sock *sk)
 {
-        void (*ready)(struct sock *sk, int bytes);
+        void (*ready)(struct sock *sk);
         struct rds_connection *conn;
         struct rds_tcp_connection *tc;
 
-        rdsdebug("data ready sk %p bytes %d\n", sk, bytes);
+        rdsdebug("data ready sk %p\n", sk);
 
         read_lock(&sk->sk_callback_lock);
         conn = sk->sk_user_data;
@@ -337,7 +337,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes)
                 queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
 out:
         read_unlock(&sk->sk_callback_lock);
-        ready(sk, bytes);
+        ready(sk);
 }
 
 int rds_tcp_recv_init(void)
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index c2cca2ee6aef..8451c8cdc9de 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1041,7 +1041,7 @@ int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct ros
         rose_start_heartbeat(make);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
 
         return 1;
 }
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
index 73742647c135..63b21e580de9 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -113,7 +113,7 @@ int rxrpc_queue_rcv_skb(struct rxrpc_call *call, struct sk_buff *skb,
                         spin_unlock_bh(&sk->sk_receive_queue.lock);
 
                         if (!sock_flag(sk, SOCK_DEAD))
-                                sk->sk_data_ready(sk, skb_len);
+                                sk->sk_data_ready(sk);
                 }
                 skb = NULL;
         } else {
@@ -632,14 +632,14 @@ cant_find_conn:
  * handle data received on the local endpoint
  * - may be called in interrupt context
  */
-void rxrpc_data_ready(struct sock *sk, int count)
+void rxrpc_data_ready(struct sock *sk)
 {
         struct rxrpc_skb_priv *sp;
         struct rxrpc_local *local;
         struct sk_buff *skb;
         int ret;
 
-        _enter("%p, %d", sk, count);
+        _enter("%p", sk);
 
         ASSERT(!irqs_disabled());
 
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index c831d44b0841..ba9fd36d3f15 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -518,7 +518,7 @@ void rxrpc_UDP_error_handler(struct work_struct *);
  */
 extern const char *rxrpc_pkts[];
 
-void rxrpc_data_ready(struct sock *, int);
+void rxrpc_data_ready(struct sock *);
 int rxrpc_queue_rcv_skb(struct rxrpc_call *, struct sk_buff *, bool, bool);
 void rxrpc_fast_process_packet(struct rxrpc_call *, struct sk_buff *);
 
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 5f83a6a2fa67..e13519e9df80 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -6604,6 +6604,12 @@ static void sctp_wake_up_waiters(struct sock *sk,
         if (asoc->ep->sndbuf_policy)
                 return __sctp_write_space(asoc);
 
+        /* If association goes down and is just flushing its
+         * outq, then just normally notify others.
+         */
+        if (asoc->base.dead)
+                return sctp_write_space(sk);
+
         /* Accounting for the sndbuf space is per socket, so we
          * need to wake up others, try to be fair and in case of
          * other associations, let them have a go first instead
@@ -6739,7 +6745,7 @@ do_nonblock:
         goto out;
 }
 
-void sctp_data_ready(struct sock *sk, int len)
+void sctp_data_ready(struct sock *sk)
 {
         struct socket_wq *wq;
 
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 5dc94117e9d4..7144eb6a1b95 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -259,7 +259,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
                 sctp_ulpq_clear_pd(ulpq);
 
         if (queue == &sk->sk_receive_queue)
-                sk->sk_data_ready(sk, 0);
+                sk->sk_data_ready(sk);
         return 1;
 
 out_free:
@@ -1135,5 +1135,5 @@ void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)
 
         /* If there is data waiting, send it up the socket now. */
         if (sctp_ulpq_clear_pd(ulpq) || ev)
-                sk->sk_data_ready(sk, 0);
+                sk->sk_data_ready(sk);
 }
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 241b54f30204..0754d0f466d2 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -9,19 +9,6 @@ config SUNRPC_BACKCHANNEL
         bool
         depends on SUNRPC
 
-config SUNRPC_XPRT_RDMA
-        tristate
-        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
-        default SUNRPC && INFINIBAND
-        help
-          This option allows the NFS client and server to support
-          an RDMA-enabled transport.
-
-          To compile RPC client RDMA transport support as a module,
-          choose M here: the module will be called xprtrdma.
-
-          If unsure, say N.
-
 config SUNRPC_SWAP
         bool
         depends on SUNRPC
@@ -57,3 +44,29 @@ config SUNRPC_DEBUG
           but makes troubleshooting NFS issues significantly harder.
 
           If unsure, say Y.
+
+config SUNRPC_XPRT_RDMA_CLIENT
+        tristate "RPC over RDMA Client Support"
+        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
+        default SUNRPC && INFINIBAND
+        help
+          This option allows the NFS client to support an RDMA-enabled
+          transport.
+
+          To compile RPC client RDMA transport support as a module,
+          choose M here: the module will be called xprtrdma.
+
+          If unsure, say N.
+
+config SUNRPC_XPRT_RDMA_SERVER
+        tristate "RPC over RDMA Server Support"
+        depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS
+        default SUNRPC && INFINIBAND
+        help
+          This option allows the NFS server to support an RDMA-enabled
+          transport.
+
+          To compile RPC server RDMA transport support as a module,
+          choose M here: the module will be called svcrdma.
+
+          If unsure, say N.
diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile
index 8209a0411bca..e5a7a1cac8f3 100644
--- a/net/sunrpc/Makefile
+++ b/net/sunrpc/Makefile
@@ -5,7 +5,8 @@
 
 obj-$(CONFIG_SUNRPC) += sunrpc.o
 obj-$(CONFIG_SUNRPC_GSS) += auth_gss/
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma/
+
+obj-y += xprtrdma/
 
 sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \
             auth.o auth_null.o auth_unix.o auth_generic.o \
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f400445d1a44..2e6ab10734f6 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -438,6 +438,38 @@ out_no_rpciod:
         return ERR_PTR(err);
 }
 
+struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
+                                        struct rpc_xprt *xprt)
+{
+        struct rpc_clnt *clnt = NULL;
+
+        clnt = rpc_new_client(args, xprt, NULL);
+        if (IS_ERR(clnt))
+                return clnt;
+
+        if (!(args->flags & RPC_CLNT_CREATE_NOPING)) {
+                int err = rpc_ping(clnt);
+                if (err != 0) {
+                        rpc_shutdown_client(clnt);
+                        return ERR_PTR(err);
+                }
+        }
+
+        clnt->cl_softrtry = 1;
+        if (args->flags & RPC_CLNT_CREATE_HARDRTRY)
+                clnt->cl_softrtry = 0;
+
+        if (args->flags & RPC_CLNT_CREATE_AUTOBIND)
+                clnt->cl_autobind = 1;
+        if (args->flags & RPC_CLNT_CREATE_DISCRTRY)
+                clnt->cl_discrtry = 1;
+        if (!(args->flags & RPC_CLNT_CREATE_QUIET))
+                clnt->cl_chatty = 1;
+
+        return clnt;
+}
+EXPORT_SYMBOL_GPL(rpc_create_xprt);
+
 /**
  * rpc_create - create an RPC client and transport with one call
  * @args: rpc_clnt create argument structure
@@ -451,7 +483,6 @@ out_no_rpciod:
 struct rpc_clnt *rpc_create(struct rpc_create_args *args)
 {
         struct rpc_xprt *xprt;
-        struct rpc_clnt *clnt;
         struct xprt_create xprtargs = {
                 .net = args->net,
                 .ident = args->protocol,
@@ -515,30 +546,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
         if (args->flags & RPC_CLNT_CREATE_NONPRIVPORT)
                 xprt->resvport = 0;
 
-        clnt = rpc_new_client(args, xprt, NULL);
-        if (IS_ERR(clnt))
-                return clnt;
-
-        if (!(args->flags & RPC_CLNT_CREATE_NOPING)) {
-                int err = rpc_ping(clnt);
-                if (err != 0) {
-                        rpc_shutdown_client(clnt);
-                        return ERR_PTR(err);
-                }
-        }
-
-        clnt->cl_softrtry = 1;
-        if (args->flags & RPC_CLNT_CREATE_HARDRTRY)
-                clnt->cl_softrtry = 0;
-
-        if (args->flags & RPC_CLNT_CREATE_AUTOBIND)
-                clnt->cl_autobind = 1;
-        if (args->flags & RPC_CLNT_CREATE_DISCRTRY)
-                clnt->cl_discrtry = 1;
-        if (!(args->flags & RPC_CLNT_CREATE_QUIET))
-                clnt->cl_chatty = 1;
-
-        return clnt;
+        return rpc_create_xprt(args, xprt);
 }
 EXPORT_SYMBOL_GPL(rpc_create);
 
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index b6e59f0a9475..43bcb4699d69 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -60,7 +60,7 @@
 
 static struct svc_sock *svc_setup_socket(struct svc_serv *, struct socket *,
                                          int flags);
-static void             svc_udp_data_ready(struct sock *, int);
+static void             svc_udp_data_ready(struct sock *);
 static int              svc_udp_recvfrom(struct svc_rqst *);
 static int              svc_udp_sendto(struct svc_rqst *);
 static void             svc_sock_detach(struct svc_xprt *);
@@ -403,14 +403,14 @@ static void svc_sock_setbufsize(struct socket *sock, unsigned int snd,
 /*
  * INET callback when data has been received on the socket.
  */
-static void svc_udp_data_ready(struct sock *sk, int count)
+static void svc_udp_data_ready(struct sock *sk)
 {
         struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
         wait_queue_head_t *wq = sk_sleep(sk);
 
         if (svsk) {
-                dprintk("svc: socket %p(inet %p), count=%d, busy=%d\n",
-                        svsk, sk, count,
+                dprintk("svc: socket %p(inet %p), busy=%d\n",
+                        svsk, sk,
                         test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));
                 set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
                 svc_xprt_enqueue(&svsk->sk_xprt);
@@ -731,7 +731,7 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
  * A data_ready event on a listening socket means there's a connection
  * pending. Do not use state_change as a substitute for it.
  */
-static void svc_tcp_listen_data_ready(struct sock *sk, int count_unused)
+static void svc_tcp_listen_data_ready(struct sock *sk)
 {
         struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
         wait_queue_head_t *wq;
@@ -783,7 +783,7 @@ static void svc_tcp_state_change(struct sock *sk)
                 wake_up_interruptible_all(wq);
 }
 
-static void svc_tcp_data_ready(struct sock *sk, int count)
+static void svc_tcp_data_ready(struct sock *sk)
 {
         struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
         wait_queue_head_t *wq = sk_sleep(sk);
@@ -1397,6 +1397,22 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
         return svsk;
 }
 
+bool svc_alien_sock(struct net *net, int fd)
+{
+        int err;
+        struct socket *sock = sockfd_lookup(fd, &err);
+        bool ret = false;
+
+        if (!sock)
+                goto out;
+        if (sock_net(sock->sk) != net)
+                ret = true;
+        sockfd_put(sock);
+out:
+        return ret;
+}
+EXPORT_SYMBOL_GPL(svc_alien_sock);
+
 /**
  * svc_addsock - add a listener socket to an RPC service
  * @serv: pointer to RPC service to which to add a new listener
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 1504bb11e4f3..dd97ba3c4456 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -833,8 +833,20 @@ xdr_buf_from_iov(struct kvec *iov, struct xdr_buf *buf)
 }
 EXPORT_SYMBOL_GPL(xdr_buf_from_iov);
 
-/* Sets subbuf to the portion of buf of length len beginning base bytes
- * from the start of buf. Returns -1 if base of length are out of bounds. */
+/**
+ * xdr_buf_subsegment - set subbuf to a portion of buf
+ * @buf: an xdr buffer
+ * @subbuf: the result buffer
+ * @base: beginning of range in bytes
+ * @len: length of range in bytes
+ *
+ * sets @subbuf to an xdr buffer representing the portion of @buf of
+ * length @len starting at offset @base.
+ *
+ * @buf and @subbuf may be pointers to the same struct xdr_buf.
+ *
+ * Returns -1 if base of length are out of bounds.
+ */
 int
 xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,
                         unsigned int base, unsigned int len)
@@ -847,9 +859,8 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,
                 len -= subbuf->head[0].iov_len;
                 base = 0;
         } else {
-                subbuf->head[0].iov_base = NULL;
-                subbuf->head[0].iov_len = 0;
                 base -= buf->head[0].iov_len;
+                subbuf->head[0].iov_len = 0;
         }
 
         if (base < buf->page_len) {
@@ -871,9 +882,8 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,
                 len -= subbuf->tail[0].iov_len;
                 base = 0;
         } else {
-                subbuf->tail[0].iov_base = NULL;
-                subbuf->tail[0].iov_len = 0;
                 base -= buf->tail[0].iov_len;
+                subbuf->tail[0].iov_len = 0;
         }
 
         if (base || len)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 7d4df99f761f..d173f79947c6 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1383,15 +1383,3 @@ void xprt_put(struct rpc_xprt *xprt)
         if (atomic_dec_and_test(&xprt->count))
                 xprt_destroy(xprt);
 }
-
-/**
- * xprt_get - return a reference to an RPC transport.
- * @xprt: pointer to the transport
- *
- */
-struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)
-{
-        if (atomic_inc_not_zero(&xprt->count))
-                return xprt;
-        return NULL;
-}
diff --git a/net/sunrpc/xprtrdma/Makefile b/net/sunrpc/xprtrdma/Makefile
index 5a8f268bdd30..da5136fd5694 100644
--- a/net/sunrpc/xprtrdma/Makefile
+++ b/net/sunrpc/xprtrdma/Makefile
@@ -1,8 +1,8 @@
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma.o
+obj-$(CONFIG_SUNRPC_XPRT_RDMA_CLIENT) += xprtrdma.o
 
 xprtrdma-y := transport.o rpc_rdma.o verbs.o
 
-obj-$(CONFIG_SUNRPC_XPRT_RDMA) += svcrdma.o
+obj-$(CONFIG_SUNRPC_XPRT_RDMA_SERVER) += svcrdma.o
 
 svcrdma-y := svc_rdma.o svc_rdma_transport.o \
         svc_rdma_marshal.o svc_rdma_sendto.o svc_rdma_recvfrom.o
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 0ce75524ed21..8d904e4eef15 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -90,6 +90,7 @@ static void rdma_build_arg_xdr(struct svc_rqst *rqstp,
                 sge_no++;
         }
         rqstp->rq_respages = &rqstp->rq_pages[sge_no];
+        rqstp->rq_next_page = rqstp->rq_respages + 1;
 
         /* We should never run out of SGE because the limit is defined to
          * support the max allowed RPC data length
@@ -169,6 +170,7 @@ static int map_read_chunks(struct svcxprt_rdma *xprt,
                  */
                 head->arg.pages[page_no] = rqstp->rq_arg.pages[page_no];
                 rqstp->rq_respages = &rqstp->rq_arg.pages[page_no+1];
+                rqstp->rq_next_page = rqstp->rq_respages + 1;
 
                 byte_count -= sge_bytes;
                 ch_bytes -= sge_bytes;
@@ -276,6 +278,7 @@ static int fast_reg_read_chunks(struct svcxprt_rdma *xprt,
 
         /* rq_respages points one past arg pages */
         rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
+        rqstp->rq_next_page = rqstp->rq_respages + 1;
 
         /* Create the reply and chunk maps */
         offset = 0;
@@ -520,13 +523,6 @@ next_sge:
         for (ch_no = 0; &rqstp->rq_pages[ch_no] < rqstp->rq_respages; ch_no++)
                 rqstp->rq_pages[ch_no] = NULL;
 
-        /*
-         * Detach res pages. If svc_release sees any it will attempt to
-         * put them.
-         */
-        while (rqstp->rq_next_page != rqstp->rq_respages)
-                *(--rqstp->rq_next_page) = NULL;
-
         return err;
 }
 
@@ -550,7 +546,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
 
         /* rq_respages starts after the last arg page */
         rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
-        rqstp->rq_next_page = &rqstp->rq_arg.pages[page_no];
+        rqstp->rq_next_page = rqstp->rq_respages + 1;
 
         /* Rebuild rq_arg head and tail. */
         rqstp->rq_arg.head[0] = head->arg.head[0];
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index c1d124dc772b..7e024a51617e 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -265,6 +265,7 @@ static dma_addr_t dma_map_xdr(struct svcxprt_rdma *xprt,
                 xdr_off -= xdr->head[0].iov_len;
                 if (xdr_off < xdr->page_len) {
                         /* This offset is in the page list */
+                        xdr_off += xdr->page_base;
                         page = xdr->pages[xdr_off >> PAGE_SHIFT];
                         xdr_off &= ~PAGE_MASK;
                 } else {
@@ -625,6 +626,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
                 if (page_no+1 >= sge_no)
                         ctxt->sge[page_no+1].length = 0;
         }
+        rqstp->rq_next_page = rqstp->rq_respages + 1;
         BUG_ON(sge_no > rdma->sc_max_sge);
         memset(&send_wr, 0, sizeof send_wr);
         ctxt->wr_op = IB_WR_SEND;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 62e4f9bcc387..25688fa2207f 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -477,8 +477,7 @@ struct page *svc_rdma_get_page(void)
 
         while ((page = alloc_page(GFP_KERNEL)) == NULL) {
                 /* If we can't get memory, wait a bit and try again */
-                printk(KERN_INFO "svcrdma: out of memory...retrying in 1000 "
-                       "jiffies.\n");
+                printk(KERN_INFO "svcrdma: out of memory...retrying in 1s\n");
                 schedule_timeout_uninterruptible(msecs_to_jiffies(1000));
         }
         return page;
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 966763d735e9..25a3dcf15cae 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -254,7 +254,7 @@ struct sock_xprt {
         /*
          * Saved socket callback addresses
          */
-        void                    (*old_data_ready)(struct sock *, int);
+        void                    (*old_data_ready)(struct sock *);
         void                    (*old_state_change)(struct sock *);
         void                    (*old_write_space)(struct sock *);
         void                    (*old_error_report)(struct sock *);
@@ -909,6 +909,12 @@ static void xs_tcp_close(struct rpc_xprt *xprt)
                 xs_tcp_shutdown(xprt);
 }
 
+static void xs_xprt_free(struct rpc_xprt *xprt)
+{
+        xs_free_peer_addresses(xprt);
+        xprt_free(xprt);
+}
+
 /**
  * xs_destroy - prepare to shutdown a transport
  * @xprt: doomed transport
@@ -919,8 +925,7 @@ static void xs_destroy(struct rpc_xprt *xprt)
         dprintk("RPC:       xs_destroy xprt %p\n", xprt);
 
         xs_close(xprt);
-        xs_free_peer_addresses(xprt);
-        xprt_free(xprt);
+        xs_xprt_free(xprt);
         module_put(THIS_MODULE);
 }
 
@@ -946,7 +951,7 @@ static int xs_local_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
  *
  * Currently this assumes we can read the whole reply in a single gulp.
  */
-static void xs_local_data_ready(struct sock *sk, int len)
+static void xs_local_data_ready(struct sock *sk)
 {
         struct rpc_task *task;
         struct rpc_xprt *xprt;
@@ -1009,7 +1014,7 @@ static void xs_local_data_ready(struct sock *sk, int len)
  * @len: how much data to read
  *
  */
-static void xs_udp_data_ready(struct sock *sk, int len)
+static void xs_udp_data_ready(struct sock *sk)
 {
         struct rpc_task *task;
         struct rpc_xprt *xprt;
@@ -1432,7 +1437,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
  * @bytes: how much data to read
  *
  */
-static void xs_tcp_data_ready(struct sock *sk, int bytes)
+static void xs_tcp_data_ready(struct sock *sk)
 {
         struct rpc_xprt *xprt;
         read_descriptor_t rd_desc;
@@ -2532,6 +2537,10 @@ static void bc_close(struct rpc_xprt *xprt)
 
 static void bc_destroy(struct rpc_xprt *xprt)
 {
+        dprintk("RPC:       bc_destroy xprt %p\n", xprt);
+
+        xs_xprt_free(xprt);
+        module_put(THIS_MODULE);
 }
 
 static struct rpc_xprt_ops xs_local_ops = {
@@ -2732,7 +2741,7 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args)
                 return xprt;
         ret = ERR_PTR(-EINVAL);
 out_err:
-        xprt_free(xprt);
+        xs_xprt_free(xprt);
         return ret;
 }
 
@@ -2810,7 +2819,7 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args)
                 return xprt;
         ret = ERR_PTR(-EINVAL);
 out_err:
-        xprt_free(xprt);
+        xs_xprt_free(xprt);
         return ret;
 }
 
@@ -2885,12 +2894,11 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
                                 xprt->address_strings[RPC_DISPLAY_ADDR],
                                 xprt->address_strings[RPC_DISPLAY_PROTO]);
 
-
         if (try_module_get(THIS_MODULE))
                 return xprt;
         ret = ERR_PTR(-EINVAL);
 out_err:
-        xprt_free(xprt);
+        xs_xprt_free(xprt);
         return ret;
 }
 
@@ -2907,15 +2915,6 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args)
         struct svc_sock *bc_sock;
         struct rpc_xprt *ret;
 
-        if (args->bc_xprt->xpt_bc_xprt) {
-                /*
-                 * This server connection already has a backchannel
-                 * transport; we can't create a new one, as we wouldn't
-                 * be able to match replies based on xid any more.  So,
-                 * reuse the already-existing one:
-                 */
-                 return args->bc_xprt->xpt_bc_xprt;
-        }
         xprt = xs_setup_xprt(args, xprt_tcp_slot_table_entries,
                         xprt_tcp_slot_table_entries);
         if (IS_ERR(xprt))
@@ -2973,13 +2972,14 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args)
          */
         xprt_set_connected(xprt);
 
-
         if (try_module_get(THIS_MODULE))
                 return xprt;
+
+        args->bc_xprt->xpt_bc_xprt = NULL;
         xprt_put(xprt);
         ret = ERR_PTR(-EINVAL);
 out_err:
-        xprt_free(xprt);
+        xs_xprt_free(xprt);
         return ret;
 }
 
diff --git a/net/tipc/server.c b/net/tipc/server.c
index 646a930eefbf..a538a02f869b 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -119,7 +119,7 @@ static struct tipc_conn *tipc_conn_lookup(struct tipc_server *s, int conid)
         return con;
 }
 
-static void sock_data_ready(struct sock *sk, int unused)
+static void sock_data_ready(struct sock *sk)
 {
         struct tipc_conn *con;
 
@@ -297,7 +297,7 @@ static int tipc_accept_from_sock(struct tipc_conn *con)
         newcon->usr_data = s->tipc_conn_new(newcon->conid);
 
         /* Wake up receive process in case of 'SYN+' message */
-        newsock->sk->sk_data_ready(newsock->sk, 0);
+        newsock->sk->sk_data_ready(newsock->sk);
         return ret;
 }
 
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index adc12e227303..3c0256962f7d 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -45,7 +45,7 @@
 #define CONN_TIMEOUT_DEFAULT    8000    /* default connect timeout = 8s */
 
 static int backlog_rcv(struct sock *sk, struct sk_buff *skb);
-static void tipc_data_ready(struct sock *sk, int len);
+static void tipc_data_ready(struct sock *sk);
 static void tipc_write_space(struct sock *sk);
 static int tipc_release(struct socket *sock);
 static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags);
@@ -1248,7 +1248,7 @@ static void tipc_write_space(struct sock *sk)
  * @sk: socket
  * @len: the length of messages
  */
-static void tipc_data_ready(struct sock *sk, int len)
+static void tipc_data_ready(struct sock *sk)
 {
         struct socket_wq *wq;
 
@@ -1410,7 +1410,7 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
         __skb_queue_tail(&sk->sk_receive_queue, buf);
         skb_set_owner_r(buf, sk);
 
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
         return TIPC_OK;
 }
 
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 94404f19f9de..bb7e8ba821f4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1217,7 +1217,7 @@ restart:
         __skb_queue_tail(&other->sk_receive_queue, skb);
         spin_unlock(&other->sk_receive_queue.lock);
         unix_state_unlock(other);
-        other->sk_data_ready(other, 0);
+        other->sk_data_ready(other);
         sock_put(other);
         return 0;
 
@@ -1600,7 +1600,7 @@ restart:
         if (max_level > unix_sk(other)->recursion_level)
                 unix_sk(other)->recursion_level = max_level;
         unix_state_unlock(other);
-        other->sk_data_ready(other, len);
+        other->sk_data_ready(other);
         sock_put(other);
         scm_destroy(siocb->scm);
         return len;
@@ -1706,7 +1706,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                 if (max_level > unix_sk(other)->recursion_level)
                         unix_sk(other)->recursion_level = max_level;
                 unix_state_unlock(other);
-                other->sk_data_ready(other, size);
+                other->sk_data_ready(other);
                 sent += size;
         }
 
diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
index 9a730744e7bc..9b7f207f2bee 100644
--- a/net/vmw_vsock/vmci_transport_notify.c
+++ b/net/vmw_vsock/vmci_transport_notify.c
@@ -315,7 +315,7 @@ vmci_transport_handle_wrote(struct sock *sk,
         struct vsock_sock *vsk = vsock_sk(sk);
         PKT_FIELD(vsk, sent_waiting_read) = false;
 #endif
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
 }
 
 static void vmci_transport_notify_pkt_socket_init(struct sock *sk)
diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
index 622bd7aa1016..dc9c7929a2f9 100644
--- a/net/vmw_vsock/vmci_transport_notify_qstate.c
+++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
@@ -92,7 +92,7 @@ vmci_transport_handle_wrote(struct sock *sk,
                             bool bottom_half,
                             struct sockaddr_vm *dst, struct sockaddr_vm *src)
 {
-        sk->sk_data_ready(sk, 0);
+        sk->sk_data_ready(sk);
 }
 
 static void vsock_block_update_write_window(struct sock *sk)
@@ -290,7 +290,7 @@ vmci_transport_notify_pkt_recv_post_dequeue(
                 /* See the comment in
                  * vmci_transport_notify_pkt_send_post_enqueue().
                  */
-                sk->sk_data_ready(sk, 0);
+                sk->sk_data_ready(sk);
         }
 
         return err;
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 6177479c7de9..5ad4418ef093 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1064,7 +1064,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
         x25_start_heartbeat(make);
 
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skb->len);
+                sk->sk_data_ready(sk);
         rc = 1;
         sock_put(sk);
 out:
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index d1b0dc79bb6f..7ac50098a375 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -79,7 +79,7 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
         skb_set_owner_r(skbn, sk);
         skb_queue_tail(&sk->sk_receive_queue, skbn);
         if (!sock_flag(sk, SOCK_DEAD))
-                sk->sk_data_ready(sk, skbn->len);
+                sk->sk_data_ready(sk);
 
         return 0;
 }
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 9f0ee22b914f..003bc263105a 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -65,12 +65,22 @@ warning-  := $(empty)
 warning-1 := -Wextra -Wunused -Wno-unused-parameter
 warning-1 += -Wmissing-declarations
 warning-1 += -Wmissing-format-attribute
-warning-1 += -Wmissing-prototypes
+warning-1 += $(call cc-option, -Wmissing-prototypes)
 warning-1 += -Wold-style-definition
 warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
 warning-1 += $(call cc-disable-warning, missing-field-initializers)
 
+# Clang
+warning-1 += $(call cc-disable-warning, initializer-overrides)
+warning-1 += $(call cc-disable-warning, unused-value)
+warning-1 += $(call cc-disable-warning, format)
+warning-1 += $(call cc-disable-warning, unknown-warning-option)
+warning-1 += $(call cc-disable-warning, sign-compare)
+warning-1 += $(call cc-disable-warning, format-zero-length)
+warning-1 += $(call cc-disable-warning, uninitialized)
+warning-1 += $(call cc-option, -fcatch-undefined-behavior)
+
 warning-2 := -Waggregate-return
 warning-2 += -Wcast-align
 warning-2 += -Wdisabled-optimization
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index b78fca994a15..9ca667bcaee9 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -38,6 +38,31 @@
 #
 
 use strict;
+use Getopt::Long;
+my $header = 0;
+
+sub help {
+        my $text = << "EOM";
+Usage:
+1) dmesg | perl scripts/bootgraph.pl [OPTION] > output.svg
+2) perl scripts/bootgraph.pl -h
+
+Options:
+        -header Insert kernel version and date
+EOM
+        my $std=shift;
+        if ($std == 1) {
+                print STDERR $text;
+        } else {
+                print $text;
+        }
+        exit;
+}
+
+GetOptions(
+        'h|help'        =>\&help,
+        'header'        =>\$header
+);
 
 my %start;
 my %end;
@@ -49,6 +74,11 @@ my $count = 0;
 my %pids;
 my %pidctr;
 
+my $headerstep = 20;
+my $xheader = 15;
+my $yheader = 25;
+my $cyheader = 0;
+
 while (<>) {
         my $line = $_;
         if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_\.]+)\+/) {
@@ -112,15 +142,23 @@ if ($count == 0) {
     print STDERR <<END;
 No data found in the dmesg. Make sure that 'printk.time=1' and
 'initcall_debug' are passed on the kernel command line.
-Usage:
-      dmesg | perl scripts/bootgraph.pl > output.svg
 END
+        help(1);
     exit 1;
 }
 
 print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
 print "<svg width=\"2000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
 
+
+if ($header) {
+        my $version = `uname -a`;
+        my $date = `date`;
+        print "<text transform=\"translate($xheader,$yheader)\">Kernel version: $version</text>\n";
+        $cyheader = $yheader+$headerstep;
+        print "<text transform=\"translate($xheader,$cyheader)\">Date: $date</text>\n";
+}
+
 my @styles;
 
 $styles[0] = "fill:rgb(0,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
diff --git a/scripts/coccinelle/api/ptr_ret.cocci b/scripts/coccinelle/api/ptr_ret.cocci
index e18f8402e37c..dd58dab5d411 100644
--- a/scripts/coccinelle/api/ptr_ret.cocci
+++ b/scripts/coccinelle/api/ptr_ret.cocci
@@ -7,7 +7,7 @@
 // URL: http://coccinelle.lip6.fr/
 // Options: --no-includes --include-headers
 //
-// Keywords: ERR_PTR, PTR_ERR, PTR_RET, PTR_ERR_OR_ZERO
+// Keywords: ERR_PTR, PTR_ERR, PTR_ERR_OR_ZERO
 // Version min: 2.6.39
 //
 
@@ -62,35 +62,35 @@ position p3;
 p << r1.p1;
 @@
 
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
+coccilib.org.print_todo(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
 
 
 @script:python depends on org@
 p << r2.p2;
 @@
 
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
+coccilib.org.print_todo(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
 
 @script:python depends on org@
 p << r3.p3;
 @@
 
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
+coccilib.org.print_todo(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
 
 @script:python depends on report@
 p << r1.p1;
 @@
 
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
+coccilib.report.print_report(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
 
 @script:python depends on report@
 p << r2.p2;
 @@
 
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
+coccilib.report.print_report(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
 
 @script:python depends on report@
 p << r3.p3;
 @@
 
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
+coccilib.report.print_report(p[0], "WARNING: PTR_ERR_OR_ZERO can be used")
diff --git a/scripts/coccinelle/misc/memcpy-assign.cocci b/scripts/coccinelle/misc/memcpy-assign.cocci
deleted file mode 100644
index afd058be497f..000000000000
--- a/scripts/coccinelle/misc/memcpy-assign.cocci
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Replace memcpy with struct assignment.
-//
-// Confidence: High
-// Copyright: (C) 2012 Peter Senna Tschudin, INRIA/LIP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: --no-includes --include-headers
-
-virtual patch
-virtual report
-virtual context
-virtual org
-
-@r1 depends on !patch@
-identifier struct_name;
-struct struct_name to;
-struct struct_name from;
-struct struct_name *top;
-struct struct_name *fromp;
-position p;
-@@
-memcpy@p(\(&(to)\|top\), \(&(from)\|fromp\), \(sizeof(to)\|sizeof(from)\|sizeof(struct struct_name)\|sizeof(*top)\|sizeof(*fromp)\))
-
-@script:python depends on report@
-p << r1.p;
-@@
-coccilib.report.print_report(p[0],"Replace memcpy with struct assignment")
-
-@depends on context@
-position r1.p;
-@@
-*memcpy@p(...);
-
-@script:python depends on org@
-p << r1.p;
-@@
-cocci.print_main("Replace memcpy with struct assignment",p)
-
-@depends on patch@
-identifier struct_name;
-struct struct_name to;
-struct struct_name from;
-@@
-(
--memcpy(&(to), &(from), sizeof(to));
-+to = from;
-|
--memcpy(&(to), &(from), sizeof(from));
-+to = from;
-|
--memcpy(&(to), &(from), sizeof(struct struct_name));
-+to = from;
-)
-
-@depends on patch@
-identifier struct_name;
-struct struct_name to;
-struct struct_name *from;
-@@
-(
--memcpy(&(to), from, sizeof(to));
-+to = *from;
-|
--memcpy(&(to), from, sizeof(*from));
-+to = *from;
-|
--memcpy(&(to), from, sizeof(struct struct_name));
-+to = *from;
-)
-
-@depends on patch@
-identifier struct_name;
-struct struct_name *to;
-struct struct_name from;
-@@
-(
--memcpy(to, &(from), sizeof(*to));
-+ *to = from;
-|
--memcpy(to, &(from), sizeof(from));
-+ *to = from;
-|
--memcpy(to, &(from), sizeof(struct struct_name));
-+ *to = from;
-)
-
-@depends on patch@
-identifier struct_name;
-struct struct_name *to;
-struct struct_name *from;
-@@
-(
--memcpy(to, from, sizeof(*to));
-+ *to = *from;
-|
--memcpy(to, from, sizeof(*from));
-+ *to = *from;
-|
--memcpy(to, from, sizeof(struct struct_name));
-+ *to = *from;
-)
-
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index f221ddf69080..cfb8440cc0b2 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -76,7 +76,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
   echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
   echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
 
-  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version '`\"
 ) > .tmpcompile
 
 # Only replace the real compile.h if the new one is different,
diff --git a/scripts/objdiff b/scripts/objdiff
new file mode 100755
index 000000000000..b3e4f10bfc3e
--- /dev/null
+++ b/scripts/objdiff
@@ -0,0 +1,141 @@
+#!/bin/bash
+
+# objdiff - a small script for validating that a commit or series of commits
+# didn't change object code.
+#
+# Copyright 2014, Jason Cooper <jason@lakedaemon.net>
+#
+# Licensed under the terms of the GNU GPL version 2
+
+# usage example:
+#
+# $ git checkout COMMIT_A
+# $ <your fancy build command here>
+# $ ./scripts/objdiff record path/to/*.o
+#
+# $ git checkout COMMIT_B
+# $ <your fancy build command here>
+# $ ./scripts/objdiff record path/to/*.o
+#
+# $ ./scripts/objdiff diff COMMIT_A COMMIT_B
+# $
+
+# And to clean up (everything is in .tmp_objdiff/*)
+# $ ./scripts/objdiff clean all
+#
+# Note: 'make mrproper' will also remove .tmp_objdiff
+
+GIT_DIR="`git rev-parse --git-dir`"
+
+if [ -d "$GIT_DIR" ]; then
+        TMPD="${GIT_DIR%git}tmp_objdiff"
+
+        [ -d "$TMPD" ] || mkdir "$TMPD"
+else
+        echo "ERROR: git directory not found."
+        exit 1
+fi
+
+usage() {
+        echo "Usage: $0 <command> <args>"
+        echo "  record    <list of object files>"
+        echo "  diff      <commitA> <commitB>"
+        echo "  clean     all | <commit>"
+        exit 1
+}
+
+dorecord() {
+        [ $# -eq 0 ] && usage
+
+        FILES="$*"
+
+        CMT="`git rev-parse --short HEAD`"
+
+        OBJDUMP="${CROSS_COMPILE}objdump"
+        OBJDIFFD="$TMPD/$CMT"
+
+        [ ! -d "$OBJDIFFD" ] && mkdir -p "$OBJDIFFD"
+
+        for f in $FILES; do
+                dn="${f%/*}"
+                bn="${f##*/}"
+
+                [ ! -d "$OBJDIFFD/$dn" ] && mkdir -p "$OBJDIFFD/$dn"
+
+                # remove addresses for a more clear diff
+                # http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-scientificlinux-and
+                $OBJDUMP -D "$f" | sed "s/^[[:space:]]\+[0-9a-f]\+//" \
+                        >"$OBJDIFFD/$dn/$bn"
+        done
+}
+
+dodiff() {
+        [ $# -ne 2 ] && [ $# -ne 0 ] && usage
+
+        if [ $# -eq 0 ]; then
+                SRC="`git rev-parse --short HEAD^`"
+                DST="`git rev-parse --short HEAD`"
+        else
+                SRC="`git rev-parse --short $1`"
+                DST="`git rev-parse --short $2`"
+        fi
+
+        DIFF="`which colordiff`"
+
+        if [ ${#DIFF} -eq 0 ] || [ ! -x "$DIFF" ]; then
+                DIFF="`which diff`"
+        fi
+
+        SRCD="$TMPD/$SRC"
+        DSTD="$TMPD/$DST"
+
+        if [ ! -d "$SRCD" ]; then
+                echo "ERROR: $SRCD doesn't exist"
+                exit 1
+        fi
+
+        if [ ! -d "$DSTD" ]; then
+                echo "ERROR: $DSTD doesn't exist"
+                exit 1
+        fi
+
+        $DIFF -Nurd $SRCD $DSTD
+}
+
+doclean() {
+        [ $# -eq 0 ] && usage
+        [ $# -gt 1 ] && usage
+
+        if [ "x$1" = "xall" ]; then
+                rm -rf $TMPD/*
+        else
+                CMT="`git rev-parse --short $1`"
+
+                if [ -d "$TMPD/$CMT" ]; then
+                        rm -rf $TMPD/$CMT
+                else
+                        echo "$CMT not found"
+                fi
+        fi
+}
+
+[ $# -eq 0 ] && usage
+
+case "$1" in
+        record)
+                shift
+                dorecord $*
+                ;;
+        diff)
+                shift
+                dodiff $*
+                ;;
+        clean)
+                shift
+                doclean $*
+                ;;
+        *)
+                echo "Unrecognized command '$1'"
+                exit 1
+                ;;
+esac
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 58c455929091..f2c5b006a3d7 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -11,11 +11,10 @@ if [ "$KBUILD_VERBOSE" = "1" ]; then
         set -x
 fi
 
-# This is a duplicate of RCS_FIND_IGNORE without escaped '()'
-ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
-          -name CVS  -o -name .pc       -o -name .hg  -o \
-          -name .git )                                   \
-          -prune -o"
+# RCS_FIND_IGNORE has escaped ()s -- remove them.
+ignore="$(echo "$RCS_FIND_IGNORE" | sed 's|\\||g' )"
+# tags and cscope files should also ignore MODVERSION *.mod.c files
+ignore="$ignore ( -name *.mod.c ) -prune -o"
 
 # Do not use full path if we do not use O=.. builds
 # Use make O=. {tags|cscope}
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index babd8626bf96..6b540f1822e0 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -139,7 +139,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
         int error;
         int size;
 
-        if (!inode->i_op || !inode->i_op->getxattr)
+        if (!inode->i_op->getxattr)
                 return -EOPNOTSUPP;
         desc = init_desc(type);
         if (IS_ERR(desc))
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index 996092f21b64..6e0bd933b6a9 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -64,7 +64,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry)
         int error;
         int count = 0;
 
-        if (!inode->i_op || !inode->i_op->getxattr)
+        if (!inode->i_op->getxattr)
                 return -EOPNOTSUPP;
 
         for (xattr = evm_config_xattrnames; *xattr != NULL; xattr++) {
diff --git a/security/integrity/integrity_audit.c b/security/integrity/integrity_audit.c
index aab9fa5a8231..90987d15b6fe 100644
--- a/security/integrity/integrity_audit.c
+++ b/security/integrity/integrity_audit.c
@@ -40,7 +40,7 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
 
         ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno);
         audit_log_format(ab, "pid=%d uid=%u auid=%u ses=%u",
-                         current->pid,
+                         task_pid_nr(current),
                          from_kuid(&init_user_ns, current_cred()->uid),
                          from_kuid(&init_user_ns, audit_get_loginuid(current)),
                          audit_get_sessionid(current));
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 9a62045e6282..69fdf3bc765b 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
          */
         BUILD_BUG_ON(sizeof(a->u) > sizeof(void *)*2);
 
-        audit_log_format(ab, " pid=%d comm=", tsk->pid);
+        audit_log_format(ab, " pid=%d comm=", task_pid_nr(tsk));
         audit_log_untrustedstring(ab, tsk->comm);
 
         switch (a->type) {
@@ -278,9 +278,12 @@ static void dump_common_audit_data(struct audit_buffer *ab,
         }
         case LSM_AUDIT_DATA_TASK:
                 tsk = a->u.tsk;
-                if (tsk && tsk->pid) {
-                        audit_log_format(ab, " pid=%d comm=", tsk->pid);
-                        audit_log_untrustedstring(ab, tsk->comm);
+                if (tsk) {
+                        pid_t pid = task_pid_nr(tsk);
+                        if (pid) {
+                                audit_log_format(ab, " pid=%d comm=", pid);
+                                audit_log_untrustedstring(ab, tsk->comm);
+                        }
                 }
                 break;
         case LSM_AUDIT_DATA_NET:
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c
index 80a09c37cac8..a3386d119425 100644
--- a/security/tomoyo/realpath.c
+++ b/security/tomoyo/realpath.c
@@ -173,7 +173,7 @@ static char *tomoyo_get_local_path(struct dentry *dentry, char * const buffer,
                  * Use filesystem name if filesystem does not support rename()
                  * operation.
                  */
-                if (inode->i_op && !inode->i_op->rename)
+                if (!inode->i_op->rename)
                         goto prepend_filesystem_name;
         }
         /* Prepend device name. */
@@ -282,7 +282,7 @@ char *tomoyo_realpath_from_path(struct path *path)
                  * Get local name for filesystems without rename() operation
                  * or dentry without vfsmount.
                  */
-                if (!path->mnt || (inode->i_op && !inode->i_op->rename))
+                if (!path->mnt || !inode->i_op->rename)
                         pos = tomoyo_get_local_path(path->dentry, buf,
                                                     buf_len - 1);
                 /* Get absolute name for the rest. */
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index 6c2dc3863ac0..7e21621e492a 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -150,10 +150,8 @@ static void snd_cs8427_free(struct snd_i2c_device *device)
         kfree(device->private_data);
 }
 
-int snd_cs8427_create(struct snd_i2c_bus *bus,
-                      unsigned char addr,
-                      unsigned int reset_timeout,
-                      struct snd_i2c_device **r_cs8427)
+int snd_cs8427_init(struct snd_i2c_bus *bus,
+                    struct snd_i2c_device *device)
 {
         static unsigned char initvals1[] = {
           CS8427_REG_CONTROL1 | CS8427_REG_AUTOINC,
@@ -200,22 +198,10 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,
              Inhibit E->F transfers. */
           CS8427_UD | CS8427_EFTUI | CS8427_DETUI,
         };
+        struct cs8427 *chip = device->private_data;
         int err;
-        struct cs8427 *chip;
-        struct snd_i2c_device *device;
         unsigned char buf[24];
 
-        if ((err = snd_i2c_device_create(bus, "CS8427",
-                                         CS8427_ADDR | (addr & 7),
-                                         &device)) < 0)
-                return err;
-        chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                snd_i2c_device_free(device);
-                return -ENOMEM;
-        }
-        device->private_free = snd_cs8427_free;
-        
         snd_i2c_lock(bus);
         err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);
         if (err != CS8427_VER8427A) {
@@ -264,10 +250,44 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,
         snd_i2c_unlock(bus);
 
         /* turn on run bit and rock'n'roll */
+        snd_cs8427_reset(device);
+
+        return 0;
+
+__fail:
+        snd_i2c_unlock(bus);
+
+        return err;
+}
+EXPORT_SYMBOL(snd_cs8427_init);
+
+int snd_cs8427_create(struct snd_i2c_bus *bus,
+                      unsigned char addr,
+                      unsigned int reset_timeout,
+                      struct snd_i2c_device **r_cs8427)
+{
+        int err;
+        struct cs8427 *chip;
+        struct snd_i2c_device *device;
+
+        err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7),
+                                    &device);
+        if (err < 0)
+                return err;
+        chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                snd_i2c_device_free(device);
+                return -ENOMEM;
+        }
+        device->private_free = snd_cs8427_free;
+
         if (reset_timeout < 1)
                 reset_timeout = 1;
         chip->reset_timeout = reset_timeout;
-        snd_cs8427_reset(device);
+
+        err = snd_cs8427_init(bus, device);
+        if (err)
+                goto __fail;
 
 #if 0   // it's nice for read tests
         {
@@ -286,7 +306,6 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,
         return 0;
 
       __fail:
-        snd_i2c_unlock(bus);
         snd_i2c_device_free(device);
         return err < 0 ? err : -EIO;
 }
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index a7cc49e96068..d10ef7675268 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -725,15 +725,4 @@ struct platform_driver au1000_ac97c_driver = {
         .remove         = au1000_ac97_remove,
 };
 
-static int __init au1000_ac97_load(void)
-{
-        return platform_driver_register(&au1000_ac97c_driver);
-}
-
-static void __exit au1000_ac97_unload(void)
-{
-        platform_driver_unregister(&au1000_ac97c_driver);
-}
-
-module_init(au1000_ac97_load);
-module_exit(au1000_ac97_unload);
+module_platform_driver(au1000_ac97c_driver);
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 4918b7145b73..ec1ee07df59d 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -50,8 +50,6 @@
 #include <linux/pnp.h>
 #include <linux/spinlock.h>
 
-#define DEB(x)
-#define DEB1(x)
 #include "sound_config.h"
 
 #include "ad1848.h"
@@ -1016,8 +1014,6 @@ static void ad1848_close(int dev)
         ad1848_info    *devc = (ad1848_info *) audio_devs[dev]->devc;
         ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]->portc;
 
-        DEB(printk("ad1848_close(void)\n"));
-
         devc->intr_active = 0;
         ad1848_halt(dev);
 
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index 87910e992133..c2d45a5848bc 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -733,19 +733,7 @@ static struct platform_driver amiga_audio_driver = {
         },
 };
 
-static int __init amiga_audio_init(void)
-{
-        return platform_driver_probe(&amiga_audio_driver, amiga_audio_probe);
-}
-
-module_init(amiga_audio_init);
-
-static void __exit amiga_audio_exit(void)
-{
-        platform_driver_unregister(&amiga_audio_driver);
-}
-
-module_exit(amiga_audio_exit);
+module_platform_driver_probe(amiga_audio_driver, amiga_audio_probe);
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:amiga-audio");
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index c5c24409ceb0..4709e592e2cc 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -275,7 +275,6 @@ static int opl3_kill_note  (int devno, int voice, int note, int velocity)
          devc->v_alloc->map[voice] = 0;
 
          map = &pv_map[devc->lv_map[voice]];
-         DEB(printk("Kill note %d\n", voice));
 
          if (map->voice_mode == 0)
                  return 0;
@@ -873,8 +872,6 @@ static void opl3_aftertouch(int dev, int voice, int pressure)
 
         map = &pv_map[devc->lv_map[voice]];
 
-        DEB(printk("Aftertouch %d\n", voice));
-
         if (map->voice_mode == 0)
                 return;
 
diff --git a/sound/oss/pas2_mixer.c b/sound/oss/pas2_mixer.c
index a0bcb85c3904..50b5bd501247 100644
--- a/sound/oss/pas2_mixer.c
+++ b/sound/oss/pas2_mixer.c
@@ -21,10 +21,6 @@
 
 #include "pas2.h"
 
-#ifndef DEB
-#define DEB(what)               /* (what) */
-#endif
-
 extern int      pas_translate_code;
 extern char     pas_model;
 extern int     *pas_osp;
@@ -120,8 +116,6 @@ pas_mixer_set(int whichDev, unsigned int level)
 {
         int             left, right, devmask, changed, i, mixer = 0;
 
-        DEB(printk("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));
-
         left = level & 0x7f;
         right = (level & 0x7f00) >> 8;
 
@@ -207,8 +201,6 @@ pas_mixer_reset(void)
 {
         int             foo;
 
-        DEB(printk("pas2_mixer.c: void pas_mixer_reset(void)\n"));
-
         for (foo = 0; foo < SOUND_MIXER_NRDEVICES; foo++)
                 pas_mixer_set(foo, levels[foo]);
 
@@ -220,7 +212,6 @@ static int pas_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
         int level,v ;
         int __user *p = (int __user *)arg;
 
-        DEB(printk("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
         if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */
                 if (get_user(level, p))
                         return -EFAULT;
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c
index 6f13ab4afc6b..474803b52f7d 100644
--- a/sound/oss/pas2_pcm.c
+++ b/sound/oss/pas2_pcm.c
@@ -22,10 +22,6 @@
 
 #include "pas2.h"
 
-#ifndef DEB
-#define DEB(WHAT)
-#endif
-
 #define PAS_PCM_INTRBITS (0x08)
 /*
  * Sample buffer timer interrupt enable
@@ -156,8 +152,6 @@ static int pas_audio_ioctl(int dev, unsigned int cmd, void __user *arg)
         int val, ret;
         int __user *p = arg;
 
-        DEB(printk("pas2_pcm.c: static int pas_audio_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
-
         switch (cmd) 
         {
         case SOUND_PCM_WRITE_RATE:
@@ -204,8 +198,6 @@ static int pas_audio_ioctl(int dev, unsigned int cmd, void __user *arg)
 
 static void pas_audio_reset(int dev)
 {
-        DEB(printk("pas2_pcm.c: static void pas_audio_reset(void)\n"));
-
         pas_write(pas_read(0xF8A) & ~0x40, 0xF8A);      /* Disable PCM */
 }
 
@@ -214,8 +206,6 @@ static int pas_audio_open(int dev, int mode)
         int             err;
         unsigned long   flags;
 
-        DEB(printk("pas2_pcm.c: static int pas_audio_open(int mode = %X)\n", mode));
-
         spin_lock_irqsave(&pas_lock, flags);
         if (pcm_busy)
         {
@@ -239,8 +229,6 @@ static void pas_audio_close(int dev)
 {
         unsigned long   flags;
 
-        DEB(printk("pas2_pcm.c: static void pas_audio_close(void)\n"));
-
         spin_lock_irqsave(&pas_lock, flags);
 
         pas_audio_reset(dev);
@@ -256,8 +244,6 @@ static void pas_audio_output_block(int dev, unsigned long buf, int count,
 {
         unsigned long   flags, cnt;
 
-        DEB(printk("pas2_pcm.c: static void pas_audio_output_block(char *buf = %P, int count = %X)\n", buf, count));
-
         cnt = count;
         if (audio_devs[dev]->dmap_out->dma > 3)
                 cnt >>= 1;
@@ -303,8 +289,6 @@ static void pas_audio_start_input(int dev, unsigned long buf, int count,
         unsigned long   flags;
         int             cnt;
 
-        DEB(printk("pas2_pcm.c: static void pas_audio_start_input(char *buf = %P, int count = %X)\n", buf, count));
-
         cnt = count;
         if (audio_devs[dev]->dmap_out->dma > 3)
                 cnt >>= 1;
@@ -388,8 +372,6 @@ static struct audio_driver pas_audio_driver =
 
 void __init pas_pcm_init(struct address_info *hw_config)
 {
-        DEB(printk("pas2_pcm.c: long pas_pcm_init()\n"));
-
         pcm_bitsok = 8;
         if (pas_read(0xEF8B) & 0x08)
                 pcm_bitsok |= 16;
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 851a1da46be1..3d50fb4236ed 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -226,8 +226,6 @@ int sb_dsp_reset(sb_devc * devc)
 {
         int loopc;
 
-        DEB(printk("Entered sb_dsp_reset()\n"));
-
         if (devc->model == MDL_ESS) return ess_dsp_reset (devc);
 
         /* This is only for non-ESS chips */
@@ -246,8 +244,6 @@ int sb_dsp_reset(sb_devc * devc)
                 return 0;       /* Sorry */
         }
 
-        DEB(printk("sb_dsp_reset() OK\n"));
-
         return 1;
 }
 
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 0e7254bde4c2..b47a69026f1b 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -865,8 +865,6 @@ printk(KERN_INFO "FKS: ess_dsp_reset 1\n");
 ess_show_mixerregs (devc);
 #endif
 
-        DEB(printk("Entered ess_dsp_reset()\n"));
-
         outb(3, DSP_RESET); /* Reset FIFO too */
 
         udelay(10);
@@ -881,8 +879,6 @@ ess_show_mixerregs (devc);
         }
         ess_extended (devc);
 
-        DEB(printk("sb_dsp_reset() OK\n"));
-
 #ifdef FKS_LOGGING
 printk(KERN_INFO "FKS: dsp_reset 2\n");
 ess_show_mixerregs (devc);
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 9b9f7d385134..c0eea1dfe90f 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -216,8 +216,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
 
         dev = dev >> 4;
 
-        DEB(printk("sequencer_write(dev=%d, count=%d)\n", dev, count));
-
         if (mode == OPEN_READ)
                 return -EIO;
 
@@ -959,8 +957,6 @@ int sequencer_open(int dev, struct file *file)
         dev = dev >> 4;
         mode = translate_mode(file);
 
-        DEB(printk("sequencer_open(dev=%d)\n", dev));
-
         if (!sequencer_ok)
         {
 /*              printk("Sound card: sequencer not initialized\n");*/
@@ -1133,8 +1129,6 @@ void sequencer_release(int dev, struct file *file)
 
         dev = dev >> 4;
 
-        DEB(printk("sequencer_release(dev=%d)\n", dev));
-
         /*
          * Wait until the queue is empty (if we don't have nonblock)
          */
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h
index 9d35c4c65b9b..f2554ab78f5e 100644
--- a/sound/oss/sound_config.h
+++ b/sound/oss/sound_config.h
@@ -123,10 +123,6 @@ static inline int translate_mode(struct file *file)
 #include "sound_calls.h"
 #include "dev_table.h"
 
-#ifndef DEB
-#define DEB(x)
-#endif
-
 #ifndef DDB
 #define DDB(x) do {} while (0)
 #endif
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index e7780349cc55..b70c7c8f9c5d 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -154,7 +154,6 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof
          
         mutex_lock(&soundcard_mutex);
         
-        DEB(printk("sound_read(dev=%d, count=%d)\n", dev, count));
         switch (dev & 0x0f) {
         case SND_DEV_DSP:
         case SND_DEV_DSP16:
@@ -180,7 +179,6 @@ static ssize_t sound_write(struct file *file, const char __user *buf, size_t cou
         int ret = -EINVAL;
         
         mutex_lock(&soundcard_mutex);
-        DEB(printk("sound_write(dev=%d, count=%d)\n", dev, count));
         switch (dev & 0x0f) {
         case SND_DEV_SEQ:
         case SND_DEV_SEQ2:
@@ -206,7 +204,6 @@ static int sound_open(struct inode *inode, struct file *file)
         int dev = iminor(inode);
         int retval;
 
-        DEB(printk("sound_open(dev=%d)\n", dev));
         if ((dev >= SND_NDEVS) || (dev < 0)) {
                 printk(KERN_ERR "Invalid minor device %d\n", dev);
                 return -ENXIO;
@@ -257,7 +254,6 @@ static int sound_release(struct inode *inode, struct file *file)
         int dev = iminor(inode);
 
         mutex_lock(&soundcard_mutex);
-        DEB(printk("sound_release(dev=%d)\n", dev));
         switch (dev & 0x0f) {
         case SND_DEV_CTL:
                 module_put(mixer_devs[dev >> 4]->owner);
@@ -351,7 +347,6 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         if (!access_ok(VERIFY_WRITE, p, len))
                                 return -EFAULT;
         }
-        DEB(printk("sound_ioctl(dev=%d, cmd=0x%x, arg=0x%x)\n", dev, cmd, arg));
         if (cmd == OSS_GETVERSION)
                 return __put_user(SOUND_VERSION, (int __user *)p);
         
@@ -409,7 +404,6 @@ static unsigned int sound_poll(struct file *file, poll_table * wait)
         struct inode *inode = file_inode(file);
         int dev = iminor(inode);
 
-        DEB(printk("sound_poll(dev=%d)\n", dev));
         switch (dev & 0x0f) {
         case SND_DEV_SEQ:
         case SND_DEV_SEQ2:
diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
index 5433c6f5eca2..62b8869f5a4c 100644
--- a/sound/oss/uart401.c
+++ b/sound/oss/uart401.c
@@ -274,19 +274,12 @@ static int reset_uart401(uart401_devc * devc)
                 }
         }
 
-
+        /* Flush input before enabling interrupts */
         if (ok)
-        {
-                DEB(printk("Reset UART401 OK\n"));
-        }
+                uart401_input_loop(devc);
         else
                 DDB(printk("Reset UART401 failed - No hardware detected.\n"));
 
-        if (ok)
-                uart401_input_loop(devc);       /*
-                                                 * Flush input before enabling interrupts
-                                                 */
-
         return ok;
 }
 
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 97993e17f46a..248b90abb882 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -187,13 +187,14 @@ azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)
                 struct azx_dev *azx_dev = &chip->azx_dev[dev];
                 dsp_lock(azx_dev);
                 if (!azx_dev->opened && !dsp_is_locked(azx_dev)) {
-                        res = azx_dev;
-                        if (res->assigned_key == key) {
-                                res->opened = 1;
-                                res->assigned_key = key;
+                        if (azx_dev->assigned_key == key) {
+                                azx_dev->opened = 1;
+                                azx_dev->assigned_key = key;
                                 dsp_unlock(azx_dev);
                                 return azx_dev;
                         }
+                        if (!res)
+                                res = azx_dev;
                 }
                 dsp_unlock(azx_dev);
         }
@@ -1604,7 +1605,7 @@ static void azx_exit_link_reset(struct azx *chip)
 }
 
 /* reset codec link */
-static int azx_reset(struct azx *chip, int full_reset)
+static int azx_reset(struct azx *chip, bool full_reset)
 {
         if (!full_reset)
                 goto __skip;
@@ -1701,7 +1702,7 @@ static void azx_int_clear(struct azx *chip)
 /*
  * reset and start the controller registers
  */
-void azx_init_chip(struct azx *chip, int full_reset)
+void azx_init_chip(struct azx *chip, bool full_reset)
 {
         if (chip->initialized)
                 return;
@@ -1758,7 +1759,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
 
 #ifdef CONFIG_PM_RUNTIME
         if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
-                if (chip->card->dev->power.runtime_status != RPM_ACTIVE)
+                if (!pm_runtime_active(chip->card->dev))
                         return IRQ_NONE;
 #endif
 
@@ -1841,7 +1842,7 @@ static void azx_bus_reset(struct hda_bus *bus)
 
         bus->in_reset = 1;
         azx_stop_chip(chip);
-        azx_init_chip(chip, 1);
+        azx_init_chip(chip, true);
 #ifdef CONFIG_PM
         if (chip->initialized) {
                 struct azx_pcm *p;
@@ -1948,7 +1949,7 @@ int azx_codec_create(struct azx *chip, const char *model,
                                  * get back to the sanity state.
                                  */
                                 azx_stop_chip(chip);
-                                azx_init_chip(chip, 1);
+                                azx_init_chip(chip, true);
                         }
                 }
         }
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index 1d2e3be2bae6..baf0e77330af 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -37,7 +37,7 @@ int azx_alloc_stream_pages(struct azx *chip);
 void azx_free_stream_pages(struct azx *chip);
 
 /* Low level azx interface */
-void azx_init_chip(struct azx *chip, int full_reset);
+void azx_init_chip(struct azx *chip, bool full_reset);
 void azx_stop_chip(struct azx *chip);
 void azx_enter_link_reset(struct azx *chip);
 irqreturn_t azx_interrupt(int irq, void *dev_id);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 77ca894f8284..d6bca62ef387 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -636,7 +636,7 @@ static int azx_resume(struct device *dev)
                 return -EIO;
         azx_init_pci(chip);
 
-        azx_init_chip(chip, 1);
+        azx_init_chip(chip, true);
 
         snd_hda_resume(chip->bus);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -689,7 +689,7 @@ static int azx_runtime_resume(struct device *dev)
         status = azx_readw(chip, STATESTS);
 
         azx_init_pci(chip);
-        azx_init_chip(chip, 1);
+        azx_init_chip(chip, true);
 
         bus = chip->bus;
         if (status && bus) {
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ea2351d119f0..14ae979a92ea 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3026,6 +3026,11 @@ static void alc283_init(struct hda_codec *codec)
         bool hp_pin_sense;
         int val;
 
+        if (!spec->gen.autocfg.hp_outs) {
+                if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
+                        hp_pin = spec->gen.autocfg.line_out_pins[0];
+        }
+
         alc283_restore_default_value(codec);
 
         if (!hp_pin)
@@ -3062,6 +3067,11 @@ static void alc283_shutup(struct hda_codec *codec)
         bool hp_pin_sense;
         int val;
 
+        if (!spec->gen.autocfg.hp_outs) {
+                if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
+                        hp_pin = spec->gen.autocfg.line_out_pins[0];
+        }
+
         if (!hp_pin) {
                 alc269_shutup(codec);
                 return;
@@ -3085,6 +3095,7 @@ static void alc283_shutup(struct hda_codec *codec)
 
         if (hp_pin_sense)
                 msleep(100);
+        alc_auto_setup_eapd(codec, false);
         snd_hda_shutup_pins(codec);
         alc_write_coef_idx(codec, 0x43, 0x9614);
 }
@@ -3361,8 +3372,9 @@ static void alc269_fixup_mic_mute_hook(void *private_data, int enabled)
 
         if (spec->mute_led_polarity)
                 enabled = !enabled;
-        pinval = AC_PINCTL_IN_EN |
-                (enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80);
+        pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid);
+        pinval &= ~AC_PINCTL_VREFEN;
+        pinval |= enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80;
         if (spec->mute_led_nid)
                 snd_hda_set_pin_ctl_cache(codec, spec->mute_led_nid, pinval);
 }
@@ -3994,6 +4006,10 @@ static void alc283_fixup_chromebook(struct hda_codec *codec,
                 spec->gen.mixer_nid = 0;
                 break;
         case HDA_FIXUP_ACT_INIT:
+                /* MIC2-VREF control */
+                /* Set to manual mode */
+                val = alc_read_coef_idx(codec, 0x06);
+                alc_write_coef_idx(codec, 0x06, val & ~0x000c);
                 /* Enable Line1 input control by verb */
                 val = alc_read_coef_idx(codec, 0x1a);
                 alc_write_coef_idx(codec, 0x1a, val | (1 << 4));
@@ -4602,6 +4618,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0658, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x065f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0662, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x0667, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0668, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0669, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
@@ -4768,7 +4785,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
         {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
         {.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},
-        {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-chrome"},
+        {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
         {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
         {}
 };
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index ed2144eee38a..496dbd0ad5db 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -579,12 +579,37 @@ static struct snd_ak4xxx_private akm_vx442_priv = {
 #ifdef CONFIG_PM_SLEEP
 static int snd_ice1712_delta_resume(struct snd_ice1712 *ice)
 {
-        unsigned char akm_backup[AK4XXX_IMAGE_SIZE];
+        unsigned char akm_img_bak[AK4XXX_IMAGE_SIZE];
+        unsigned char akm_vol_bak[AK4XXX_IMAGE_SIZE];
+
+        /* init spdif */
+        switch (ice->eeprom.subvendor) {
+        case ICE1712_SUBDEVICE_AUDIOPHILE:
+        case ICE1712_SUBDEVICE_DELTA410:
+        case ICE1712_SUBDEVICE_DELTA1010E:
+        case ICE1712_SUBDEVICE_DELTA1010LT:
+        case ICE1712_SUBDEVICE_VX442:
+        case ICE1712_SUBDEVICE_DELTA66E:
+                snd_cs8427_init(ice->i2c, ice->cs8427);
+                break;
+        case ICE1712_SUBDEVICE_DELTA1010:
+        case ICE1712_SUBDEVICE_MEDIASTATION:
+                /* nothing */
+                break;
+        case ICE1712_SUBDEVICE_DELTADIO2496:
+        case ICE1712_SUBDEVICE_DELTA66:
+                /* Set spdif defaults */
+                snd_ice1712_delta_cs8403_spdif_write(ice, ice->spdif.cs8403_bits);
+                break;
+        }
+
         /* init codec and restore registers */
         if (ice->akm_codecs) {
-                memcpy(akm_backup, ice->akm->images, sizeof(akm_backup));
+                memcpy(akm_img_bak, ice->akm->images, sizeof(akm_img_bak));
+                memcpy(akm_vol_bak, ice->akm->volumes, sizeof(akm_vol_bak));
                 snd_akm4xxx_init(ice->akm);
-                memcpy(ice->akm->images, akm_backup, sizeof(akm_backup));
+                memcpy(ice->akm->images, akm_img_bak, sizeof(akm_img_bak));
+                memcpy(ice->akm->volumes, akm_vol_bak, sizeof(akm_vol_bak));
                 snd_akm4xxx_reset(ice->akm, 0);
         }
 
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 291672fc4a99..d9b9e4595f17 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -685,9 +685,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pointer(struct snd_pcm_substream *
         if (!(snd_ice1712_read(ice, ICE1712_IREG_PBK_CTRL) & 1))
                 return 0;
         ptr = runtime->buffer_size - inw(ice->ddma_port + 4);
+        ptr = bytes_to_frames(substream->runtime, ptr);
         if (ptr == runtime->buffer_size)
                 ptr = 0;
-        return bytes_to_frames(substream->runtime, ptr);
+        return ptr;
 }
 
 static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substream *substream)
@@ -704,9 +705,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substrea
                 addr = ICE1712_DSC_ADDR0;
         ptr = snd_ice1712_ds_read(ice, substream->number * 2, addr) -
                 ice->playback_con_virt_addr[substream->number];
+        ptr = bytes_to_frames(substream->runtime, ptr);
         if (ptr == substream->runtime->buffer_size)
                 ptr = 0;
-        return bytes_to_frames(substream->runtime, ptr);
+        return ptr;
 }
 
 static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *substream)
@@ -717,9 +719,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *s
         if (!(snd_ice1712_read(ice, ICE1712_IREG_CAP_CTRL) & 1))
                 return 0;
         ptr = inl(ICEREG(ice, CONCAP_ADDR)) - ice->capture_con_virt_addr;
+        ptr = bytes_to_frames(substream->runtime, ptr);
         if (ptr == substream->runtime->buffer_size)
                 ptr = 0;
-        return bytes_to_frames(substream->runtime, ptr);
+        return ptr;
 }
 
 static const struct snd_pcm_hardware snd_ice1712_playback = {
@@ -1048,6 +1051,8 @@ __out:
         old = inb(ICEMT(ice, RATE));
         if (!force && old == val)
                 goto __out;
+
+        ice->cur_rate = rate;
         outb(val, ICEMT(ice, RATE));
         spin_unlock_irqrestore(&ice->reg_lock, flags);
 
@@ -1114,9 +1119,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pro_pointer(struct snd_pcm_substre
         if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) & ICE1712_PLAYBACK_START))
                 return 0;
         ptr = ice->playback_pro_size - (inw(ICEMT(ice, PLAYBACK_SIZE)) << 2);
+        ptr = bytes_to_frames(substream->runtime, ptr);
         if (ptr == substream->runtime->buffer_size)
                 ptr = 0;
-        return bytes_to_frames(substream->runtime, ptr);
+        return ptr;
 }
 
 static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substream *substream)
@@ -1127,9 +1133,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substrea
         if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) & ICE1712_CAPTURE_START_SHADOW))
                 return 0;
         ptr = ice->capture_pro_size - (inw(ICEMT(ice, CAPTURE_SIZE)) << 2);
+        ptr = bytes_to_frames(substream->runtime, ptr);
         if (ptr == substream->runtime->buffer_size)
                 ptr = 0;
-        return bytes_to_frames(substream->runtime, ptr);
+        return ptr;
 }
 
 static const struct snd_pcm_hardware snd_ice1712_playback_pro = {
@@ -2832,6 +2839,12 @@ static int snd_ice1712_suspend(struct device *dev)
         snd_pcm_suspend_all(ice->pcm_ds);
         snd_ac97_suspend(ice->ac97);
 
+        spin_lock_irq(&ice->reg_lock);
+        ice->pm_saved_is_spdif_master = is_spdif_master(ice);
+        ice->pm_saved_spdif_ctrl = inw(ICEMT(ice, ROUTE_SPDOUT));
+        ice->pm_saved_route = inw(ICEMT(ice, ROUTE_PSDOUT03));
+        spin_unlock_irq(&ice->reg_lock);
+
         if (ice->pm_suspend)
                 ice->pm_suspend(ice);
 
@@ -2846,6 +2859,7 @@ static int snd_ice1712_resume(struct device *dev)
         struct pci_dev *pci = to_pci_dev(dev);
         struct snd_card *card = dev_get_drvdata(dev);
         struct snd_ice1712 *ice = card->private_data;
+        int rate;
 
         if (!ice->pm_suspend_enabled)
                 return 0;
@@ -2860,14 +2874,37 @@ static int snd_ice1712_resume(struct device *dev)
 
         pci_set_master(pci);
 
+        if (ice->cur_rate)
+                rate = ice->cur_rate;
+        else
+                rate = PRO_RATE_DEFAULT;
+
         if (snd_ice1712_chip_init(ice) < 0) {
                 snd_card_disconnect(card);
                 return -EIO;
         }
 
+        ice->cur_rate = rate;
+
         if (ice->pm_resume)
                 ice->pm_resume(ice);
 
+        if (ice->pm_saved_is_spdif_master) {
+                /* switching to external clock via SPDIF */
+                spin_lock_irq(&ice->reg_lock);
+                outb(inb(ICEMT(ice, RATE)) | ICE1712_SPDIF_MASTER,
+                        ICEMT(ice, RATE));
+                spin_unlock_irq(&ice->reg_lock);
+                snd_ice1712_set_input_clock_source(ice, 1);
+        } else {
+                /* internal on-card clock */
+                snd_ice1712_set_pro_rate(ice, rate, 1);
+                snd_ice1712_set_input_clock_source(ice, 0);
+        }
+
+        outw(ice->pm_saved_spdif_ctrl, ICEMT(ice, ROUTE_SPDOUT));
+        outw(ice->pm_saved_route, ICEMT(ice, ROUTE_PSDOUT03));
+
         if (ice->ac97)
                 snd_ac97_resume(ice->ac97);
 
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 09f7e773bafb..f500905e9373 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -902,7 +902,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
 {
         struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
 
         alc5623_reset(codec);
 
@@ -961,7 +960,7 @@ static int alc5623_probe(struct snd_soc_codec *codec)
                 return -EINVAL;
         }
 
-        return ret;
+        return 0;
 }
 
 /* power down chip */
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index ec071a6306ef..85942ca36cbf 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1061,7 +1061,6 @@ static int alc5632_resume(struct snd_soc_codec *codec)
 static int alc5632_probe(struct snd_soc_codec *codec)
 {
         struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec);
-        int ret;
 
         /* power on device  */
         alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -1075,7 +1074,7 @@ static int alc5632_probe(struct snd_soc_codec *codec)
                 return -EINVAL;
         }
 
-        return ret;
+        return 0;
 }
 
 /* power down chip */
@@ -1191,11 +1190,18 @@ static const struct i2c_device_id alc5632_i2c_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, alc5632_i2c_table);
 
+static const struct of_device_id alc5632_of_match[] = {
+        { .compatible = "realtek,alc5632", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, alc5632_of_match);
+
 /* i2c codec control layer */
 static struct i2c_driver alc5632_i2c_driver = {
         .driver = {
                 .name = "alc5632",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(alc5632_of_match),
         },
         .probe = alc5632_i2c_probe,
         .remove =  alc5632_i2c_remove,
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index f0ca6bee6771..460d35547a68 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1259,7 +1259,7 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
         }
 
         dev_info(&i2c_client->dev, "Cirrus Logic CS42L52, Revision: %02X\n",
-                        reg & 0xFF);
+                 reg & CS42L52_CHIP_REV_MASK);
 
         /* Set Platform Data */
         if (cs42l52->pdata.mica_diff_cfg)
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h
index 6fb8f00f4191..ac445993e6bf 100644
--- a/sound/soc/codecs/cs42l52.h
+++ b/sound/soc/codecs/cs42l52.h
@@ -37,7 +37,7 @@
 #define CS42L52_CHIP_REV_A0                     0x00
 #define CS42L52_CHIP_REV_A1                     0x01
 #define CS42L52_CHIP_REV_B0                     0x02
-#define CS42L52_CHIP_REV_MASK                   0x03
+#define CS42L52_CHIP_REV_MASK                   0x07
 
 #define CS42L52_PWRCTL1                         0x02
 #define CS42L52_PWRCTL1_PDN_ALL                 0x9F
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index 082299a4e2fa..85020322eee7 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -495,17 +495,16 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
         regcache_cache_bypass(cs42xx8->regmap, true);
 
         /* Validate the chip ID */
-        regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
-        if (val < 0) {
-                dev_err(dev, "failed to get device ID: %x", val);
-                ret = -EINVAL;
+        ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
+        if (ret < 0) {
+                dev_err(dev, "failed to get device ID, ret = %d", ret);
                 goto err_enable;
         }
 
         /* The top four bits of the chip ID should be 0000 */
-        if ((val & CS42XX8_CHIPID_CHIP_ID_MASK) != 0x00) {
+        if (((val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4) != 0x00) {
                 dev_err(dev, "unmatched chip ID: %d\n",
-                                val & CS42XX8_CHIPID_CHIP_ID_MASK);
+                        (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4);
                 ret = -EINVAL;
                 goto err_enable;
         }
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 7d168ec71cd7..48f3fef68484 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1571,7 +1571,8 @@ static int da732x_i2c_probe(struct i2c_client *i2c,
         }
 
         dev_info(&i2c->dev, "Revision: %d.%d\n",
-                 (reg & DA732X_ID_MAJOR_MASK), (reg & DA732X_ID_MINOR_MASK));
+                 (reg & DA732X_ID_MAJOR_MASK) >> 4,
+                 (reg & DA732X_ID_MINOR_MASK));
 
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_da732x,
                                      da732x_dai, ARRAY_SIZE(da732x_dai));
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 98c6e104357c..f7b0b37aa858 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2399,11 +2399,18 @@ static const struct i2c_device_id max98090_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max98090_i2c_id);
 
+static const struct of_device_id max98090_of_match[] = {
+        { .compatible = "maxim,max98090", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, max98090_of_match);
+
 static struct i2c_driver max98090_i2c_driver = {
         .driver = {
                 .name = "max98090",
                 .owner = THIS_MODULE,
                 .pm = &max98090_pm,
+                .of_match_table = of_match_ptr(max98090_of_match),
         },
         .probe  = max98090_i2c_probe,
         .remove = max98090_i2c_remove,
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 0061ae6b6716..68b4dd622b87 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2074,6 +2074,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
 
+#if defined(CONFIG_OF)
+static const struct of_device_id rt5640_of_match[] = {
+        { .compatible = "realtek,rt5640", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt5640_of_match);
+#endif
+
 #ifdef CONFIG_ACPI
 static struct acpi_device_id rt5640_acpi_match[] = {
         { "INT33CA", 0 },
@@ -2203,6 +2211,7 @@ static struct i2c_driver rt5640_i2c_driver = {
                 .name = "rt5640",
                 .owner = THIS_MODULE,
                 .acpi_match_table = ACPI_PTR(rt5640_acpi_match),
+                .of_match_table = of_match_ptr(rt5640_of_match),
         },
         .probe = rt5640_i2c_probe,
         .remove   = rt5640_i2c_remove,
diff --git a/sound/soc/codecs/tlv320aic23-i2c.c b/sound/soc/codecs/tlv320aic23-i2c.c
index 20fc46092c2c..b73c94ebcc2a 100644
--- a/sound/soc/codecs/tlv320aic23-i2c.c
+++ b/sound/soc/codecs/tlv320aic23-i2c.c
@@ -43,9 +43,16 @@ static const struct i2c_device_id tlv320aic23_id[] = {
 
 MODULE_DEVICE_TABLE(i2c, tlv320aic23_id);
 
+static const struct of_device_id tlv320aic23_of_match[] = {
+        { .compatible = "ti,tlv320aic23", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, tlv320aic23_of_match);
+
 static struct i2c_driver tlv320aic23_i2c_driver = {
         .driver = {
                    .name = "tlv320aic23-codec",
+                   .of_match_table = of_match_ptr(tlv320aic23_of_match),
                    },
         .probe = tlv320aic23_i2c_probe,
         .remove = __exit_p(tlv320aic23_i2c_remove),
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index a01ae97c90aa..4f75cac462d1 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -336,7 +336,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
 
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
                 break;
 
@@ -344,7 +344,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
 
-                mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
+                mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
                 break;
 
@@ -352,7 +352,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
 
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
                 break;
 
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index c4a423111673..56da8c8c5960 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -23,6 +23,71 @@
 
 #include "fsl_sai.h"
 
+#define FSL_SAI_FLAGS (FSL_SAI_CSR_SEIE |\
+                       FSL_SAI_CSR_FEIE)
+
+static irqreturn_t fsl_sai_isr(int irq, void *devid)
+{
+        struct fsl_sai *sai = (struct fsl_sai *)devid;
+        struct device *dev = &sai->pdev->dev;
+        u32 xcsr, mask;
+
+        /* Only handle those what we enabled */
+        mask = (FSL_SAI_FLAGS >> FSL_SAI_CSR_xIE_SHIFT) << FSL_SAI_CSR_xF_SHIFT;
+
+        /* Tx IRQ */
+        regmap_read(sai->regmap, FSL_SAI_TCSR, &xcsr);
+        xcsr &= mask;
+
+        if (xcsr & FSL_SAI_CSR_WSF)
+                dev_dbg(dev, "isr: Start of Tx word detected\n");
+
+        if (xcsr & FSL_SAI_CSR_SEF)
+                dev_warn(dev, "isr: Tx Frame sync error detected\n");
+
+        if (xcsr & FSL_SAI_CSR_FEF) {
+                dev_warn(dev, "isr: Transmit underrun detected\n");
+                /* FIFO reset for safety */
+                xcsr |= FSL_SAI_CSR_FR;
+        }
+
+        if (xcsr & FSL_SAI_CSR_FWF)
+                dev_dbg(dev, "isr: Enabled transmit FIFO is empty\n");
+
+        if (xcsr & FSL_SAI_CSR_FRF)
+                dev_dbg(dev, "isr: Transmit FIFO watermark has been reached\n");
+
+        regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
+                           FSL_SAI_CSR_xF_W_MASK | FSL_SAI_CSR_FR, xcsr);
+
+        /* Rx IRQ */
+        regmap_read(sai->regmap, FSL_SAI_RCSR, &xcsr);
+        xcsr &= mask;
+
+        if (xcsr & FSL_SAI_CSR_WSF)
+                dev_dbg(dev, "isr: Start of Rx word detected\n");
+
+        if (xcsr & FSL_SAI_CSR_SEF)
+                dev_warn(dev, "isr: Rx Frame sync error detected\n");
+
+        if (xcsr & FSL_SAI_CSR_FEF) {
+                dev_warn(dev, "isr: Receive overflow detected\n");
+                /* FIFO reset for safety */
+                xcsr |= FSL_SAI_CSR_FR;
+        }
+
+        if (xcsr & FSL_SAI_CSR_FWF)
+                dev_dbg(dev, "isr: Enabled receive FIFO is full\n");
+
+        if (xcsr & FSL_SAI_CSR_FRF)
+                dev_dbg(dev, "isr: Receive FIFO watermark has been reached\n");
+
+        regmap_update_bits(sai->regmap, FSL_SAI_RCSR,
+                           FSL_SAI_CSR_xF_W_MASK | FSL_SAI_CSR_FR, xcsr);
+
+        return IRQ_HANDLED;
+}
+
 static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai,
                 int clk_id, unsigned int freq, int fsl_dir)
 {
@@ -114,7 +179,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * that is, together with the last bit of the previous
                  * data word.
                  */
-                val_cr2 &= ~FSL_SAI_CR2_BCP;
+                val_cr2 |= FSL_SAI_CR2_BCP;
                 val_cr4 |= FSL_SAI_CR4_FSE | FSL_SAI_CR4_FSP;
                 break;
         case SND_SOC_DAIFMT_LEFT_J:
@@ -122,7 +187,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * Frame high, one word length for frame sync,
                  * frame sync asserts with the first bit of the frame.
                  */
-                val_cr2 &= ~FSL_SAI_CR2_BCP;
+                val_cr2 |= FSL_SAI_CR2_BCP;
                 val_cr4 &= ~(FSL_SAI_CR4_FSE | FSL_SAI_CR4_FSP);
                 break;
         case SND_SOC_DAIFMT_DSP_A:
@@ -132,7 +197,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * that is, together with the last bit of the previous
                  * data word.
                  */
-                val_cr2 &= ~FSL_SAI_CR2_BCP;
+                val_cr2 |= FSL_SAI_CR2_BCP;
                 val_cr4 &= ~FSL_SAI_CR4_FSP;
                 val_cr4 |= FSL_SAI_CR4_FSE;
                 sai->is_dsp_mode = true;
@@ -142,7 +207,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * Frame high, one bit for frame sync,
                  * frame sync asserts with the first bit of the frame.
                  */
-                val_cr2 &= ~FSL_SAI_CR2_BCP;
+                val_cr2 |= FSL_SAI_CR2_BCP;
                 val_cr4 &= ~(FSL_SAI_CR4_FSE | FSL_SAI_CR4_FSP);
                 sai->is_dsp_mode = true;
                 break;
@@ -373,8 +438,8 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev);
 
-        regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 0xffffffff, 0x0);
-        regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 0xffffffff, 0x0);
+        regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 0xffffffff, FSL_SAI_FLAGS);
+        regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 0xffffffff, FSL_SAI_FLAGS);
         regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,
                            FSL_SAI_MAXBURST_TX * 2);
         regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
@@ -490,12 +555,14 @@ static int fsl_sai_probe(struct platform_device *pdev)
         struct fsl_sai *sai;
         struct resource *res;
         void __iomem *base;
-        int ret;
+        int irq, ret;
 
         sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
         if (!sai)
                 return -ENOMEM;
 
+        sai->pdev = pdev;
+
         sai->big_endian_regs = of_property_read_bool(np, "big-endian-regs");
         if (sai->big_endian_regs)
                 fsl_sai_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
@@ -514,6 +581,18 @@ static int fsl_sai_probe(struct platform_device *pdev)
                 return PTR_ERR(sai->regmap);
         }
 
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+                return irq;
+        }
+
+        ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, 0, np->name, sai);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to claim irq %u\n", irq);
+                return ret;
+        }
+
         sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
         sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
         sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index e432260be598..a264185c7138 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -37,7 +37,21 @@
 
 /* SAI Transmit/Recieve Control Register */
 #define FSL_SAI_CSR_TERE        BIT(31)
+#define FSL_SAI_CSR_FR          BIT(25)
+#define FSL_SAI_CSR_xF_SHIFT    16
+#define FSL_SAI_CSR_xF_W_SHIFT  18
+#define FSL_SAI_CSR_xF_MASK     (0x1f << FSL_SAI_CSR_xF_SHIFT)
+#define FSL_SAI_CSR_xF_W_MASK   (0x7 << FSL_SAI_CSR_xF_W_SHIFT)
+#define FSL_SAI_CSR_WSF         BIT(20)
+#define FSL_SAI_CSR_SEF         BIT(19)
+#define FSL_SAI_CSR_FEF         BIT(18)
 #define FSL_SAI_CSR_FWF         BIT(17)
+#define FSL_SAI_CSR_FRF         BIT(16)
+#define FSL_SAI_CSR_xIE_SHIFT   8
+#define FSL_SAI_CSR_WSIE        BIT(12)
+#define FSL_SAI_CSR_SEIE        BIT(11)
+#define FSL_SAI_CSR_FEIE        BIT(10)
+#define FSL_SAI_CSR_FWIE        BIT(9)
 #define FSL_SAI_CSR_FRIE        BIT(8)
 #define FSL_SAI_CSR_FRDE        BIT(0)
 
@@ -99,6 +113,7 @@
 #define FSL_SAI_MAXBURST_RX 6
 
 struct fsl_sai {
+        struct platform_device *pdev;
         struct regmap *regmap;
 
         bool big_endian_regs;
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 4a88e36c82ec..76b072bd4ba2 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -39,15 +39,15 @@ struct s3c_ac97_info {
 };
 static struct s3c_ac97_info s3c_ac97;
 
-static struct s3c2410_dma_client s3c_dma_client_out = {
+static struct s3c_dma_client s3c_dma_client_out = {
         .name = "AC97 PCMOut"
 };
 
-static struct s3c2410_dma_client s3c_dma_client_in = {
+static struct s3c_dma_client s3c_dma_client_in = {
         .name = "AC97 PCMIn"
 };
 
-static struct s3c2410_dma_client s3c_dma_client_micin = {
+static struct s3c_dma_client s3c_dma_client_micin = {
         .name = "AC97 MicIn"
 };
 
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h
index 225e5378014e..ad7c0f04f00d 100644
--- a/sound/soc/samsung/dma.h
+++ b/sound/soc/samsung/dma.h
@@ -14,8 +14,12 @@
 
 #include <sound/dmaengine_pcm.h>
 
+struct s3c_dma_client {
+        char *name;
+};
+
 struct s3c_dma_params {
-        struct s3c2410_dma_client *client;      /* stream identifier */
+        struct s3c_dma_client *client;  /* stream identifier */
         int channel;                            /* Channel ID */
         dma_addr_t dma_addr;
         int dma_size;                   /* Size of the DMA transfer */
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 0a9b44c940ce..048ead967199 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1211,10 +1211,10 @@ static int samsung_i2s_probe(struct platform_device *pdev)
         pri_dai->dma_playback.dma_addr = regs_base + I2STXD;
         pri_dai->dma_capture.dma_addr = regs_base + I2SRXD;
         pri_dai->dma_playback.client =
-                (struct s3c2410_dma_client *)&pri_dai->dma_playback;
+                (struct s3c_dma_client *)&pri_dai->dma_playback;
         pri_dai->dma_playback.ch_name = "tx";
         pri_dai->dma_capture.client =
-                (struct s3c2410_dma_client *)&pri_dai->dma_capture;
+                (struct s3c_dma_client *)&pri_dai->dma_capture;
         pri_dai->dma_capture.ch_name = "rx";
         pri_dai->dma_playback.dma_size = 4;
         pri_dai->dma_capture.dma_size = 4;
@@ -1233,7 +1233,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 }
                 sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
                 sec_dai->dma_playback.client =
-                        (struct s3c2410_dma_client *)&sec_dai->dma_playback;
+                        (struct s3c_dma_client *)&sec_dai->dma_playback;
                 sec_dai->dma_playback.ch_name = "tx-sec";
 
                 if (!np) {
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index 6a5e4bf6ac96..ab54e297957c 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -20,7 +20,6 @@
 #include <sound/pcm_params.h>
 
 #include <linux/platform_data/asoc-s3c.h>
-#include <mach/dma.h>
 
 #include "dma.h"
 #include "pcm.h"
@@ -132,11 +131,11 @@ struct s3c_pcm_info {
         struct s3c_dma_params   *dma_capture;
 };
 
-static struct s3c2410_dma_client s3c_pcm_dma_client_out = {
+static struct s3c_dma_client s3c_pcm_dma_client_out = {
         .name           = "PCM Stereo out"
 };
 
-static struct s3c2410_dma_client s3c_pcm_dma_client_in = {
+static struct s3c_dma_client s3c_pcm_dma_client_in = {
         .name           = "PCM Stereo in"
 };
 
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index d0794458963a..e9bb5d7a71ee 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -33,11 +33,11 @@
 #include "regs-i2s-v2.h"
 #include "s3c2412-i2s.h"
 
-static struct s3c2410_dma_client s3c2412_dma_client_out = {
+static struct s3c_dma_client s3c2412_dma_client_out = {
         .name           = "I2S PCM Stereo out"
 };
 
-static struct s3c2410_dma_client s3c2412_dma_client_in = {
+static struct s3c_dma_client s3c2412_dma_client_in = {
         .name           = "I2S PCM Stereo in"
 };
 
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index f31e916dd8c4..d7b8457b5650 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -31,11 +31,11 @@
 #include "dma.h"
 #include "s3c24xx-i2s.h"
 
-static struct s3c2410_dma_client s3c24xx_dma_client_out = {
+static struct s3c_dma_client s3c24xx_dma_client_out = {
         .name = "I2S PCM Stereo out"
 };
 
-static struct s3c2410_dma_client s3c24xx_dma_client_in = {
+static struct s3c_dma_client s3c24xx_dma_client_in = {
         .name = "I2S PCM Stereo in"
 };
 
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index 28487dcc4538..cfe63b7bcc9f 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -18,7 +18,6 @@
 #include <sound/pcm_params.h>
 
 #include <linux/platform_data/asoc-s3c.h>
-#include <mach/dma.h>
 
 #include "dma.h"
 #include "spdif.h"
@@ -94,7 +93,7 @@ struct samsung_spdif_info {
         struct s3c_dma_params   *dma_playback;
 };
 
-static struct s3c2410_dma_client spdif_dma_client_out = {
+static struct s3c_dma_client spdif_dma_client_out = {
         .name           = "S/PDIF Stereo out",
 };
 
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 49de5c1284f6..131336d40492 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1501,7 +1501,8 @@ static void retire_playback_urb(struct snd_usb_substream *subs,
          * The error should be lower than 2ms since the estimate relies
          * on two reads of a counter updated every ms.
          */
-        if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
+        if (printk_ratelimit() &&
+            abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
                 dev_dbg(&subs->dev->dev,
                         "delay: estimated %d, actual %d\n",
                         est_delay, subs->last_delay);
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index b4ddb748356c..56bfb523c5bb 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -47,21 +47,22 @@ displays the statistics gathered since it was forked.
 .PP
 .SH FIELD DESCRIPTIONS
 .nf
-\fBpk\fP processor package number.
-\fBcor\fP processor core number.
+\fBPackage\fP processor package number.
+\fBCore\fP processor core number.
 \fBCPU\fP Linux CPU (logical processor) number.
 Note that multiple CPUs per core indicate support for Intel(R) Hyper-Threading Technology.
-\fB%c0\fP percent of the interval that the CPU retired instructions.
-\fBGHz\fP average clock rate while the CPU was in c0 state.
-\fBTSC\fP average GHz that the TSC ran during the entire interval.
-\fB%c1, %c3, %c6, %c7\fP show the percentage residency in hardware core idle states.
-\fBCTMP\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
-\fBPTMP\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
-\fB%pc2, %pc3, %pc6, %pc7\fP percentage residency in hardware package idle states.
-\fBPkg_W\fP Watts consumed by the whole package.
-\fBCor_W\fP Watts consumed by the core part of the package.
-\fBGFX_W\fP Watts consumed by the Graphics part of the package -- available only on client processors.
-\fBRAM_W\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
+\fBAVG_MHz\fP number of cycles executed divided by time elapsed.
+\fB%Buzy\fP percent of the interval that the CPU retired instructions, aka. % of time in "C0" state.
+\fBBzy_MHz\fP average clock rate while the CPU was busy (in "c0" state).
+\fBTSC_MHz\fP average MHz that the TSC ran during the entire interval.
+\fBCPU%c1, CPU%c3, CPU%c6, CPU%c7\fP show the percentage residency in hardware core idle states.
+\fBCoreTmp\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
+\fBPkgTtmp\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
+\fBPkg%pc2, Pkg%pc3, Pkg%pc6, Pkg%pc7\fP percentage residency in hardware package idle states.
+\fBPkgWatt\fP Watts consumed by the whole package.
+\fBCorWatt\fP Watts consumed by the core part of the package.
+\fBGFXWatt\fP Watts consumed by the Graphics part of the package -- available only on client processors.
+\fBRAMWatt\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
 \fBPKG_%\fP percent of the interval that RAPL throttling was active on the Package.
 \fBRAM_%\fP percent of the interval that RAPL throttling was active on DRAM.
 .fi
@@ -78,29 +79,17 @@ For Watts columns, the summary is a system total.
 Subsequent rows show per-CPU statistics.
 
 .nf
-[root@sandy]# ./turbostat
-cor CPU    %c0  GHz  TSC    %c1    %c3    %c6    %c7 CTMP PTMP   %pc2   %pc3   %pc6   %pc7  Pkg_W  Cor_W GFX_W
-          0.06 0.80 2.29   0.11   0.00   0.00  99.83   47   40   0.26   0.01   0.44  98.78   3.49   0.12  0.14
-  0   0   0.07 0.80 2.29   0.07   0.00   0.00  99.86   40   40   0.26   0.01   0.44  98.78   3.49   0.12  0.14
-  0   4   0.03 0.80 2.29   0.12
-  1   1   0.04 0.80 2.29   0.25   0.01   0.00  99.71   40
-  1   5   0.16 0.80 2.29   0.13
-  2   2   0.05 0.80 2.29   0.06   0.01   0.00  99.88   40
-  2   6   0.03 0.80 2.29   0.08
-  3   3   0.05 0.80 2.29   0.08   0.00   0.00  99.87   47
-  3   7   0.04 0.84 2.29   0.09
-.fi
-.SH SUMMARY EXAMPLE
-The "-s" option prints the column headers just once,
-and then the one line system summary for each sample interval.
-
-.nf
-[root@wsm]# turbostat -S
-   %c0  GHz  TSC    %c1    %c3    %c6 CTMP   %pc3   %pc6
-  1.40 2.81 3.38  10.78  43.47  44.35   42  13.67   2.09
-  1.34 2.90 3.38  11.48  58.96  28.23   41  19.89   0.15
-  1.55 2.72 3.38  26.73  37.66  34.07   42   2.53   2.80
-  1.37 2.83 3.38  16.95  60.05  21.63   42   5.76   0.20
+[root@ivy]# ./turbostat
+    Core     CPU Avg_MHz   %Busy Bzy_MHz TSC_MHz     SMI  CPU%c1  CPU%c3  CPU%c6  CPU%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt 
+       -       -       6    0.36    1596    3492       0    0.59    0.01   99.04    0.00      23      24   23.82    0.01   72.47    0.00    6.40    1.01    0.00
+       0       0       9    0.58    1596    3492       0    0.28    0.01   99.13    0.00      23      24   23.82    0.01   72.47    0.00    6.40    1.01    0.00
+       0       4       1    0.07    1596    3492       0    0.79
+       1       1      10    0.65    1596    3492       0    0.59    0.00   98.76    0.00      23
+       1       5       5    0.28    1596    3492       0    0.95
+       2       2      10    0.66    1596    3492       0    0.41    0.01   98.92    0.00      23
+       2       6       2    0.10    1597    3492       0    0.97
+       3       3       3    0.20    1596    3492       0    0.44    0.00   99.37    0.00      23
+       3       7       5    0.31    1596    3492       0    0.33
 .fi
 .SH VERBOSE EXAMPLE
 The "-v" option adds verbosity to the output:
@@ -154,55 +143,35 @@ eg. Here a cycle soaker is run on 1 CPU (see %c0) for a few seconds
 until ^C while the other CPUs are mostly idle:
 
 .nf
-[root@x980 lenb]# ./turbostat cat /dev/zero > /dev/null
+root@ivy: turbostat cat /dev/zero > /dev/null
 ^C
-cor CPU    %c0  GHz  TSC    %c1    %c3    %c6   %pc3   %pc6
-          8.86 3.61 3.38  15.06  31.19  44.89   0.00   0.00
-  0   0   1.46 3.22 3.38  16.84  29.48  52.22   0.00   0.00
-  0   6   0.21 3.06 3.38  18.09
-  1   2   0.53 3.33 3.38   2.80  46.40  50.27
-  1   8   0.89 3.47 3.38   2.44
-  2   4   1.36 3.43 3.38   9.04  23.71  65.89
-  2  10   0.18 2.86 3.38  10.22
-  8   1   0.04 2.87 3.38  99.96   0.01   0.00
-  8   7  99.72 3.63 3.38   0.27
-  9   3   0.31 3.21 3.38   7.64  56.55  35.50
-  9   9   0.08 2.95 3.38   7.88
- 10   5   1.42 3.43 3.38   2.14  30.99  65.44
- 10  11   0.16 2.88 3.38   3.40
+    Core     CPU Avg_MHz   %Busy Bzy_MHz TSC_MHz     SMI  CPU%c1  CPU%c3  CPU%c6  CPU%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt 
+       -       -     496   12.75    3886    3492       0   13.16    0.04   74.04    0.00      36      36    0.00    0.00    0.00    0.00   23.15   17.65    0.00
+       0       0      22    0.57    3830    3492       0    0.83    0.02   98.59    0.00      27      36    0.00    0.00    0.00    0.00   23.15   17.65    0.00
+       0       4       9    0.24    3829    3492       0    1.15
+       1       1       4    0.09    3783    3492       0   99.91    0.00    0.00    0.00      36
+       1       5    3880   99.82    3888    3492       0    0.18
+       2       2      17    0.44    3813    3492       0    0.77    0.04   98.75    0.00      28
+       2       6      12    0.32    3823    3492       0    0.89
+       3       3      16    0.43    3844    3492       0    0.63    0.11   98.84    0.00      30
+       3       7       4    0.11    3827    3492       0    0.94
+30.372243 sec
+
 .fi
-Above the cycle soaker drives cpu7 up its 3.6 GHz turbo limit
+Above the cycle soaker drives cpu5 up its 3.8 GHz turbo limit
 while the other processors are generally in various states of idle.
 
-Note that cpu1 and cpu7 are HT siblings within core8.
-As cpu7 is very busy, it prevents its sibling, cpu1,
+Note that cpu1 and cpu5 are HT siblings within core1.
+As cpu5 is very busy, it prevents its sibling, cpu1,
 from entering a c-state deeper than c1.
 
-Note that turbostat reports average GHz of 3.63, while
-the arithmetic average of the GHz column above is lower.
-This is a weighted average, where the weight is %c0.  ie. it is the total number of
-un-halted cycles elapsed per time divided by the number of CPUs.
-.SH SMI COUNTING EXAMPLE
-On Intel Nehalem and newer processors, MSR 0x34 is a System Management Mode Interrupt (SMI) counter.
-This counter is shown by default under the "SMI" column.
-.nf
-[root@x980 ~]# turbostat
-cor CPU    %c0  GHz  TSC SMI    %c1    %c3    %c6 CTMP   %pc3   %pc6
-          0.11 1.91 3.38   0   1.84   0.26  97.79   29   0.82  83.87
-  0   0   0.40 1.63 3.38   0  10.27   0.12  89.20   20   0.82  83.88
-  0   6   0.06 1.63 3.38   0  10.61
-  1   2   0.37 2.63 3.38   0   0.02   0.10  99.51   22
-  1   8   0.01 1.62 3.38   0   0.39
-  2   4   0.07 1.62 3.38   0   0.04   0.07  99.82   23
-  2  10   0.02 1.62 3.38   0   0.09
-  8   1   0.23 1.64 3.38   0   0.10   1.07  98.60   24
-  8   7   0.02 1.64 3.38   0   0.31
-  9   3   0.03 1.62 3.38   0   0.03   0.05  99.89   29
-  9   9   0.02 1.62 3.38   0   0.05
- 10   5   0.07 1.62 3.38   0   0.08   0.12  99.73   27
- 10  11   0.03 1.62 3.38   0   0.13
-^C
-.fi
+Note that the Avg_MHz column reflects the total number of cycles executed
+divided by the measurement interval.  If the %Busy column is 100%,
+then the processor was running at that speed the entire interval.
+The Avg_MHz multiplied by the %Busy results in the Bzy_MHz --
+which is the average frequency while the processor was executing --
+not including any non-busy idle time.
+
 .SH NOTES
 
 .B "turbostat "
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 77eb130168da..7c9d8e71eb9e 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -56,7 +56,7 @@ unsigned int do_slm_cstates;
 unsigned int use_c1_residency_msr;
 unsigned int has_aperf;
 unsigned int has_epb;
-unsigned int units = 1000000000;        /* Ghz etc */
+unsigned int units = 1000000;   /* MHz etc */
 unsigned int genuine_intel;
 unsigned int has_invariant_tsc;
 unsigned int do_nehalem_platform_info;
@@ -264,88 +264,93 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
         return 0;
 }
 
+/*
+ * Example Format w/ field column widths:
+ *
+ * Package    Core     CPU Avg_MHz Bzy_MHz TSC_MHz     SMI   %Busy CPU_%c1 CPU_%c3 CPU_%c6 CPU_%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt
+ * 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567
+ */
+
 void print_header(void)
 {
         if (show_pkg)
-                outp += sprintf(outp, "pk");
-        if (show_pkg)
-                outp += sprintf(outp, " ");
+                outp += sprintf(outp, "Package ");
         if (show_core)
-                outp += sprintf(outp, "cor");
+                outp += sprintf(outp, "    Core ");
         if (show_cpu)
-                outp += sprintf(outp, " CPU");
-        if (show_pkg || show_core || show_cpu)
-                outp += sprintf(outp, " ");
+                outp += sprintf(outp, "    CPU ");
+        if (has_aperf)
+                outp += sprintf(outp, "Avg_MHz ");
         if (do_nhm_cstates)
-                outp += sprintf(outp, "   %%c0");
+                outp += sprintf(outp, "  %%Busy ");
         if (has_aperf)
-                outp += sprintf(outp, "  GHz");
-        outp += sprintf(outp, "  TSC");
+                outp += sprintf(outp, "Bzy_MHz ");
+        outp += sprintf(outp, "TSC_MHz ");
         if (do_smi)
-                outp += sprintf(outp, " SMI");
+                outp += sprintf(outp, "    SMI ");
         if (extra_delta_offset32)
-                outp += sprintf(outp, "  count 0x%03X", extra_delta_offset32);
+                outp += sprintf(outp, " count 0x%03X ", extra_delta_offset32);
         if (extra_delta_offset64)
-                outp += sprintf(outp, "  COUNT 0x%03X", extra_delta_offset64);
+                outp += sprintf(outp, " COUNT 0x%03X ", extra_delta_offset64);
         if (extra_msr_offset32)
-                outp += sprintf(outp, "   MSR 0x%03X", extra_msr_offset32);
+                outp += sprintf(outp, "  MSR 0x%03X ", extra_msr_offset32);
         if (extra_msr_offset64)
-                outp += sprintf(outp, "           MSR 0x%03X", extra_msr_offset64);
+                outp += sprintf(outp, "          MSR 0x%03X ", extra_msr_offset64);
         if (do_nhm_cstates)
-                outp += sprintf(outp, "    %%c1");
+                outp += sprintf(outp, " CPU%%c1 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "    %%c3");
+                outp += sprintf(outp, " CPU%%c3 ");
         if (do_nhm_cstates)
-                outp += sprintf(outp, "    %%c6");
+                outp += sprintf(outp, " CPU%%c6 ");
         if (do_snb_cstates)
-                outp += sprintf(outp, "    %%c7");
+                outp += sprintf(outp, " CPU%%c7 ");
 
         if (do_dts)
-                outp += sprintf(outp, " CTMP");
+                outp += sprintf(outp, "CoreTmp ");
         if (do_ptm)
-                outp += sprintf(outp, " PTMP");
+                outp += sprintf(outp, " PkgTmp ");
 
         if (do_snb_cstates)
-                outp += sprintf(outp, "   %%pc2");
+                outp += sprintf(outp, "Pkg%%pc2 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "   %%pc3");
+                outp += sprintf(outp, "Pkg%%pc3 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "   %%pc6");
+                outp += sprintf(outp, "Pkg%%pc6 ");
         if (do_snb_cstates)
-                outp += sprintf(outp, "   %%pc7");
+                outp += sprintf(outp, "Pkg%%pc7 ");
         if (do_c8_c9_c10) {
-                outp += sprintf(outp, "   %%pc8");
-                outp += sprintf(outp, "   %%pc9");
-                outp += sprintf(outp, "  %%pc10");
+                outp += sprintf(outp, "Pkg%%pc8 ");
+                outp += sprintf(outp, "Pkg%%pc9 ");
+                outp += sprintf(outp, "Pk%%pc10 ");
         }
 
         if (do_rapl && !rapl_joules) {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, "  Pkg_W");
+                        outp += sprintf(outp, "PkgWatt ");
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, "  Cor_W");
+                        outp += sprintf(outp, "CorWatt ");
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, " GFX_W");
+                        outp += sprintf(outp, "GFXWatt ");
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, " RAM_W");
+                        outp += sprintf(outp, "RAMWatt ");
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, " PKG_%%");
+                        outp += sprintf(outp, "  PKG_%% ");
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, " RAM_%%");
+                        outp += sprintf(outp, "  RAM_%% ");
         } else {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, "  Pkg_J");
+                        outp += sprintf(outp, "  Pkg_J ");
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, "  Cor_J");
+                        outp += sprintf(outp, "  Cor_J ");
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, " GFX_J");
+                        outp += sprintf(outp, "  GFX_J ");
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, " RAM_W");
+                        outp += sprintf(outp, "  RAM_W ");
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, " PKG_%%");
+                        outp += sprintf(outp, "  PKG_%% ");
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, " RAM_%%");
-                outp += sprintf(outp, " time");
+                        outp += sprintf(outp, "  RAM_%% ");
+                outp += sprintf(outp, "  time ");
 
         }
         outp += sprintf(outp, "\n");
@@ -410,25 +415,12 @@ int dump_counters(struct thread_data *t, struct core_data *c,
 
 /*
  * column formatting convention & formats
- * package: "pk" 2 columns %2d
- * core: "cor" 3 columns %3d
- * CPU: "CPU" 3 columns %3d
- * Pkg_W: %6.2
- * Cor_W: %6.2
- * GFX_W: %5.2
- * RAM_W: %5.2
- * GHz: "GHz" 3 columns %3.2
- * TSC: "TSC" 3 columns %3.2
- * SMI: "SMI" 4 columns %4d
- * percentage " %pc3" %6.2
- * Perf Status percentage: %5.2
- * "CTMP" 4 columns %4d
  */
 int format_counters(struct thread_data *t, struct core_data *c,
         struct pkg_data *p)
 {
         double interval_float;
-        char *fmt5, *fmt6;
+        char *fmt8;
 
          /* if showing only 1st thread in core and this isn't one, bail out */
         if (show_core_only && !(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
@@ -443,65 +435,52 @@ int format_counters(struct thread_data *t, struct core_data *c,
         /* topo columns, print blanks on 1st (average) line */
         if (t == &average.threads) {
                 if (show_pkg)
-                        outp += sprintf(outp, "  ");
-                if (show_pkg && show_core)
-                        outp += sprintf(outp, " ");
+                        outp += sprintf(outp, "       -");
                 if (show_core)
-                        outp += sprintf(outp, "   ");
+                        outp += sprintf(outp, "       -");
                 if (show_cpu)
-                        outp += sprintf(outp, " " "   ");
+                        outp += sprintf(outp, "       -");
         } else {
                 if (show_pkg) {
                         if (p)
-                                outp += sprintf(outp, "%2d", p->package_id);
+                                outp += sprintf(outp, "%8d", p->package_id);
                         else
-                                outp += sprintf(outp, "  ");
+                                outp += sprintf(outp, "       -");
                 }
-                if (show_pkg && show_core)
-                        outp += sprintf(outp, " ");
                 if (show_core) {
                         if (c)
-                                outp += sprintf(outp, "%3d", c->core_id);
+                                outp += sprintf(outp, "%8d", c->core_id);
                         else
-                                outp += sprintf(outp, "   ");
+                                outp += sprintf(outp, "       -");
                 }
                 if (show_cpu)
-                        outp += sprintf(outp, " %3d", t->cpu_id);
+                        outp += sprintf(outp, "%8d", t->cpu_id);
         }
+
+        /* AvgMHz */
+        if (has_aperf)
+                outp += sprintf(outp, "%8.0f",
+                        1.0 / units * t->aperf / interval_float);
+
         /* %c0 */
         if (do_nhm_cstates) {
-                if (show_pkg || show_core || show_cpu)
-                        outp += sprintf(outp, " ");
                 if (!skip_c0)
-                        outp += sprintf(outp, "%6.2f", 100.0 * t->mperf/t->tsc);
+                        outp += sprintf(outp, "%8.2f", 100.0 * t->mperf/t->tsc);
                 else
-                        outp += sprintf(outp, "  ****");
+                        outp += sprintf(outp, "********");
         }
 
-        /* GHz */
-        if (has_aperf) {
-                if (!aperf_mperf_unstable) {
-                        outp += sprintf(outp, " %3.2f",
-                                1.0 * t->tsc / units * t->aperf /
-                                t->mperf / interval_float);
-                } else {
-                        if (t->aperf > t->tsc || t->mperf > t->tsc) {
-                                outp += sprintf(outp, " ***");
-                        } else {
-                                outp += sprintf(outp, "%3.1f*",
-                                        1.0 * t->tsc /
-                                        units * t->aperf /
-                                        t->mperf / interval_float);
-                        }
-                }
-        }
+        /* BzyMHz */
+        if (has_aperf)
+                outp += sprintf(outp, "%8.0f",
+                        1.0 * t->tsc / units * t->aperf / t->mperf / interval_float);
 
         /* TSC */
-        outp += sprintf(outp, "%5.2f", 1.0 * t->tsc/units/interval_float);
+        outp += sprintf(outp, "%8.0f", 1.0 * t->tsc/units/interval_float);
 
         /* SMI */
         if (do_smi)
-                outp += sprintf(outp, "%4d", t->smi_count);
+                outp += sprintf(outp, "%8d", t->smi_count);
 
         /* delta */
         if (extra_delta_offset32)
@@ -520,9 +499,9 @@ int format_counters(struct thread_data *t, struct core_data *c,
 
         if (do_nhm_cstates) {
                 if (!skip_c1)
-                        outp += sprintf(outp, " %6.2f", 100.0 * t->c1/t->tsc);
+                        outp += sprintf(outp, "%8.2f", 100.0 * t->c1/t->tsc);
                 else
-                        outp += sprintf(outp, "  ****");
+                        outp += sprintf(outp, "********");
         }
 
         /* print per-core data only for 1st thread in core */
@@ -530,79 +509,76 @@ int format_counters(struct thread_data *t, struct core_data *c,
                 goto done;
 
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c3/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c3/t->tsc);
         if (do_nhm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c6/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c6/t->tsc);
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c7/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c7/t->tsc);
 
         if (do_dts)
-                outp += sprintf(outp, " %4d", c->core_temp_c);
+                outp += sprintf(outp, "%8d", c->core_temp_c);
 
         /* print per-package data only for 1st core in package */
         if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
                 goto done;
 
         if (do_ptm)
-                outp += sprintf(outp, " %4d", p->pkg_temp_c);
+                outp += sprintf(outp, "%8d", p->pkg_temp_c);
 
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc2/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc2/t->tsc);
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc3/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc3/t->tsc);
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc6/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc6/t->tsc);
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc7/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc7/t->tsc);
         if (do_c8_c9_c10) {
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc8/t->tsc);
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc9/t->tsc);
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc10/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc8/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc9/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc10/t->tsc);
         }
 
         /*
          * If measurement interval exceeds minimum RAPL Joule Counter range,
          * indicate that results are suspect by printing "**" in fraction place.
          */
-        if (interval_float < rapl_joule_counter_range) {
-                fmt5 = " %5.2f";
-                fmt6 = " %6.2f";
-        } else {
-                fmt5 = " %3.0f**";
-                fmt6 = " %4.0f**";
-        }
+        if (interval_float < rapl_joule_counter_range)
+                fmt8 = "%8.2f";
+        else
+                fmt8 = " %6.0f**";
 
         if (do_rapl && !rapl_joules) {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, fmt6, p->energy_pkg * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_pkg * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, fmt6, p->energy_cores * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_cores * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, fmt5, p->energy_gfx * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_gfx * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, fmt5, p->energy_dram * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_dram * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
         } else {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, fmt6,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_pkg * rapl_energy_units);
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, fmt6,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_cores * rapl_energy_units);
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, fmt5,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_gfx * rapl_energy_units);
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, fmt5,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_dram * rapl_energy_units);
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
-        outp += sprintf(outp, fmt5, interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
+        outp += sprintf(outp, fmt8, interval_float);
 
         }
 done:
@@ -1516,6 +1492,9 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model)
         case 0x46:      /* HSW */
         case 0x37:      /* BYT */
         case 0x4D:      /* AVN */
+        case 0x3D:      /* BDW */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 return 1;
         case 0x2E:      /* Nehalem-EX Xeon - Beckton */
         case 0x2F:      /* Westmere-EX Xeon - Eagleton */
@@ -1629,9 +1608,12 @@ void rapl_probe(unsigned int family, unsigned int model)
         case 0x3C:      /* HSW */
         case 0x45:      /* HSW */
         case 0x46:      /* HSW */
+        case 0x3D:      /* BDW */
                 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
                 break;
         case 0x3F:      /* HSX */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
         case 0x2D:
@@ -1875,6 +1857,9 @@ int is_snb(unsigned int family, unsigned int model)
         case 0x3F:      /* HSW */
         case 0x45:      /* HSW */
         case 0x46:      /* HSW */
+        case 0x3D:      /* BDW */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 return 1;
         }
         return 0;
@@ -1886,7 +1871,8 @@ int has_c8_c9_c10(unsigned int family, unsigned int model)
                 return 0;
 
         switch (model) {
-        case 0x45:
+        case 0x45:      /* HSW */
+        case 0x3D:      /* BDW */
                 return 1;
         }
         return 0;
@@ -2455,7 +2441,7 @@ int main(int argc, char **argv)
         cmdline(argc, argv);
 
         if (verbose)
-                fprintf(stderr, "turbostat v3.6 Dec 2, 2013"
+                fprintf(stderr, "turbostat v3.7 Feb 6, 2014"
                         " - Len Brown <lenb@kernel.org>\n");
 
         turbostat_init();
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 5081e809821f..22fa819a9b6a 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -277,7 +277,7 @@ int kvm_timer_hyp_init(void)
 
         host_vtimer_irq = ppi;
 
-        err = register_cpu_notifier(&kvm_timer_cpu_nb);
+        err = __register_cpu_notifier(&kvm_timer_cpu_nb);
         if (err) {
                 kvm_err("Cannot register timer CPU notifier\n");
                 goto out_free;
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 8ca405cd7c1a..47b29834a6b6 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1496,7 +1496,7 @@ int kvm_vgic_hyp_init(void)
                 goto out;
         }
 
-        ret = register_cpu_notifier(&vgic_cpu_nb);
+        ret = __register_cpu_notifier(&vgic_cpu_nb);
         if (ret) {
                 kvm_err("Cannot register vgic CPU notifier\n");
                 goto out_free_irq;