285 files changed, 5662 insertions, 2003 deletions

diff --git a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
index 4b641c7bf1c2..09089a6d69ed 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
@@ -32,8 +32,8 @@ Example:
                 touchscreen-fuzz-x = <4>;
                 touchscreen-fuzz-y = <7>;
                 touchscreen-fuzz-pressure = <2>;
-                touchscreen-max-x = <4096>;
-                touchscreen-max-y = <4096>;
+                touchscreen-size-x = <4096>;
+                touchscreen-size-y = <4096>;
                 touchscreen-max-pressure = <2048>;
 
                 ti,x-plate-ohms = <280>;
diff --git a/Documentation/devicetree/bindings/sound/mt8173-max98090.txt b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
new file mode 100644
index 000000000000..829bd26d17f8
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
@@ -0,0 +1,13 @@
+MT8173 with MAX98090 CODEC
+
+Required properties:
+- compatible : "mediatek,mt8173-max98090"
+- mediatek,audio-codec: the phandle of the MAX98090 audio codec
+
+Example:
+
+        sound {
+                compatible = "mediatek,mt8173-max98090";
+                mediatek,audio-codec = <&max98090>;
+        };
+
diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
new file mode 100644
index 000000000000..61e98c976bd4
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
@@ -0,0 +1,13 @@
+MT8173 with RT5650 RT5676 CODECS
+
+Required properties:
+- compatible : "mediatek,mt8173-rt5650-rt5676"
+- mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs
+
+Example:
+
+        sound {
+                compatible = "mediatek,mt8173-rt5650-rt5676";
+                mediatek,audio-codec = <&rt5650 &rt5676>;
+        };
+
diff --git a/Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt b/Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt
new file mode 100644
index 000000000000..e302c7f43b95
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt
@@ -0,0 +1,45 @@
+Mediatek AFE PCM controller
+
+Required properties:
+- compatible = "mediatek,mt8173-afe-pcm";
+- reg: register location and size
+- interrupts: Should contain AFE interrupt
+- clock-names: should have these clock names:
+                "infra_sys_audio_clk",
+                "top_pdn_audio",
+                "top_pdn_aud_intbus",
+                "bck0",
+                "bck1",
+                "i2s0_m",
+                "i2s1_m",
+                "i2s2_m",
+                "i2s3_m",
+                "i2s3_b";
+
+Example:
+
+        afe: mt8173-afe-pcm@11220000  {
+                compatible = "mediatek,mt8173-afe-pcm";
+                reg = <0 0x11220000 0 0x1000>;
+                interrupts = <GIC_SPI 134 IRQ_TYPE_EDGE_FALLING>;
+                clocks = <&infracfg INFRA_AUDIO>,
+                        <&topckgen TOP_AUDIO_SEL>,
+                        <&topckgen TOP_AUD_INTBUS_SEL>,
+                        <&topckgen TOP_APLL1_DIV0>,
+                        <&topckgen TOP_APLL2_DIV0>,
+                        <&topckgen TOP_I2S0_M_CK_SEL>,
+                        <&topckgen TOP_I2S1_M_CK_SEL>,
+                        <&topckgen TOP_I2S2_M_CK_SEL>,
+                        <&topckgen TOP_I2S3_M_CK_SEL>,
+                        <&topckgen TOP_I2S3_B_CK_SEL>;
+                clock-names = "infra_sys_audio_clk",
+                                "top_pdn_audio",
+                                "top_pdn_aud_intbus",
+                                "bck0",
+                                "bck1",
+                                "i2s0_m",
+                                "i2s1_m",
+                                "i2s2_m",
+                                "i2s3_m",
+                                "i2s3_b";
+        };
diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
new file mode 100644
index 000000000000..48129368d4d9
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
@@ -0,0 +1,60 @@
+* Qualcomm Technologies APQ8016 SBC ASoC machine driver
+
+This node models the Qualcomm Technologies APQ8016 SBC ASoC machine driver
+
+Required properties:
+
+- compatible            : "qcom,apq8016-sbc-sndcard"
+
+- pinctrl-N             : One property must exist for each entry in
+                          pinctrl-names.  See ../pinctrl/pinctrl-bindings.txt
+                          for details of the property values.
+- pinctrl-names         : Must contain a "default" entry.
+- reg                   : Must contain an address for each entry in reg-names.
+- reg-names             : A list which must include the following entries:
+                                * "mic-iomux"
+                                * "spkr-iomux"
+- qcom,model            : Name of the sound card.
+
+Dai-link subnode properties and subnodes:
+
+Required dai-link subnodes:
+
+- cpu                                   : CPU   sub-node
+- codec                                 : CODEC sub-node
+
+Required CPU/CODEC subnodes properties:
+
+-link-name              : Name of the dai link.
+-sound-dai              : phandle and port of CPU/CODEC
+-capture-dai            : phandle and port of CPU/CODEC
+
+Example:
+
+sound: sound {
+        compatible = "qcom,apq8016-sbc-sndcard";
+        reg = <0x07702000 0x4>, <0x07702004 0x4>;
+        reg-names = "mic-iomux", "spkr-iomux";
+        qcom,model = "DB410c";
+
+        /* I2S - Internal codec */
+        internal-dai-link@0 {
+                cpu { /* PRIMARY */
+                        sound-dai = <&lpass MI2S_PRIMARY>;
+                };
+                codec {
+                        sound-dai = <&wcd_codec 0>;
+                };
+        };
+
+        /* External Primary or External Secondary -ADV7533 HDMI */
+        external-dai-link@0 {
+                link-name = "ADV7533";
+                cpu { /* QUAT */
+                        sound-dai = <&lpass MI2S_QUATERNARY>;
+                };
+                codec {
+                        sound-dai = <&adv_bridge 0>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/sound/rt5645.txt b/Documentation/devicetree/bindings/sound/rt5645.txt
new file mode 100644
index 000000000000..7cee1f518f59
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rt5645.txt
@@ -0,0 +1,72 @@
+RT5650/RT5645 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+- compatible : One of "realtek,rt5645" or "realtek,rt5650".
+
+- reg : The I2C address of the device.
+
+- interrupts : The CODEC's interrupt output.
+
+Optional properties:
+
+- hp-detect-gpios:
+  a GPIO spec for the external headphone detect pin. If jd-mode = 0,
+  we will get the JD status by getting the value of hp-detect-gpios.
+
+- realtek,in2-differential
+  Boolean. Indicate MIC2 input are differential, rather than single-ended.
+
+- realtek,dmic1-data-pin
+  0: dmic1 is not used
+  1: using IN2P pin as dmic1 data pin
+  2: using GPIO6 pin as dmic1 data pin
+  3: using GPIO10 pin as dmic1 data pin
+  4: using GPIO12 pin as dmic1 data pin
+
+- realtek,dmic2-data-pin
+  0: dmic2 is not used
+  1: using IN2N pin as dmic2 data pin
+  2: using GPIO5 pin as dmic2 data pin
+  3: using GPIO11 pin as dmic2 data pin
+
+-- realtek,jd-mode : The JD mode of rt5645/rt5650
+   0 : rt5645/rt5650 JD function is not used
+   1 : Mode-0 (VDD=3.3V), two port jack detection
+   2 : Mode-1 (VDD=3.3V), one port jack detection
+   3 : Mode-2 (VDD=1.8V), one port jack detection
+
+Pins on the device (for linking into audio routes) for RT5645/RT5650:
+
+  * DMIC L1
+  * DMIC R1
+  * DMIC L2
+  * DMIC R2
+  * IN1P
+  * IN1N
+  * IN2P
+  * IN2N
+  * Haptic Generator
+  * HPOL
+  * HPOR
+  * LOUTL
+  * LOUTR
+  * PDM1L
+  * PDM1R
+  * SPOL
+  * SPOR
+
+Example:
+
+codec: rt5650@1a {
+        compatible = "realtek,rt5650";
+        reg = <0x1a>;
+        hp-detect-gpios = <&gpio 19 0>;
+        interrupt-parent = <&gpio>;
+        interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+        realtek,dmic-en = "true";
+        realtek,en-jd-func = "true";
+        realtek,jd-mode = <3>;
+};
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 73bf314f7240..cf3979eb3578 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -16,7 +16,8 @@ Optional properties:
                                           connection's sink, the second being the connection's
                                           source.
 - simple-audio-card,mclk-fs             : Multiplication factor between stream rate and codec
-                                          mclk.
+                                          mclk. When defined, mclk-fs property defined in
+                                          dai-link sub nodes are ignored.
 - simple-audio-card,hp-det-gpio         : Reference to GPIO that signals when
                                           headphones are attached.
 - simple-audio-card,mic-det-gpio        : Reference to GPIO that signals when
@@ -55,6 +56,9 @@ Optional dai-link subnode properties:
                                           dai-link uses bit clock inversion.
 - frame-inversion                       : bool property. Add this if the
                                           dai-link uses frame clock inversion.
+- mclk-fs                               : Multiplication factor between stream
+                                          rate and codec mclk, applied only for
+                                          the dai-link.
 
 For backward compatibility the frame-master and bitclock-master
 properties can be used as booleans in codec subnode to indicate if the
diff --git a/Documentation/devicetree/bindings/sound/tas2552.txt b/Documentation/devicetree/bindings/sound/tas2552.txt
index 55e2a0af5645..c49992c0b62a 100644
--- a/Documentation/devicetree/bindings/sound/tas2552.txt
+++ b/Documentation/devicetree/bindings/sound/tas2552.txt
@@ -14,6 +14,12 @@ Required properties:
 Optional properties:
         - enable-gpio - gpio pin to enable/disable the device
 
+tas2552 can receive it's reference clock via MCLK, BCLK, IVCLKIN pin or use the
+internal 1.8MHz. This CLKIN is used by the PLL. In addition to PLL, the PDM
+reference clock is also selectable: PLL, IVCLKIN, BCLK or MCLK.
+For system integration the dt-bindings/sound/tas2552.h header file provides
+defined values to selct and configure the PLL and PDM reference clocks.
+
 Example:
 
 tas2552: tas2552@41 {
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index dc2a18f0b3a1..ddbe304beb21 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -15,10 +15,8 @@ Optional properties:
   - phys: phandle + phy specifier pair
   - phy-names: must be "usb"
   - dmas: Must contain a list of references to DMA specifiers.
-  - dma-names : Must contain a list of DMA names:
-   - tx0 ... tx<n>
-   - rx0 ... rx<n>
-    - This <n> means DnFIFO in USBHS module.
+  - dma-names : named "ch%d", where %d is the channel number ranging from zero
+                to the number of channels (DnFIFOs) minus one.
 
 Example:
         usbhs: usb@e6590000 {
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 61ab1628a057..6726139bd289 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1481,6 +1481,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         By default, super page will be supported if Intel IOMMU
                         has the capability. With this option, super page will
                         not be supported.
+                ecs_off [Default Off]
+                        By default, extended context tables will be supported if
+                        the hardware advertises that it has support both for the
+                        extended tables themselves, and also PASID support. With
+                        this option set, extended tables will not be used even
+                        on hardware which claims to support them.
 
         intel_idle.max_cstate=  [KNL,HW,ACPI,X86]
                         0       disables intel_idle and fall back on acpi_idle.
diff --git a/Documentation/networking/udplite.txt b/Documentation/networking/udplite.txt
index d727a3829100..53a726855e49 100644
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
@@ -20,7 +20,7 @@
         files/UDP-Lite-HOWTO.txt
 
    o The Wireshark UDP-Lite WiKi (with capture files):
-       http://wiki.wireshark.org/Lightweight_User_Datagram_Protocol
+       https://wiki.wireshark.org/Lightweight_User_Datagram_Protocol
 
    o The Protocol Spec, RFC 3828, http://www.ietf.org/rfc/rfc3828.txt
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 34d9b3bf4e2e..8939e1b29f6d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -51,9 +51,9 @@ trivial patch so apply some common sense.
         or does something very odd once a month document it.
 
         PLEASE remember that submissions must be made under the terms
-        of the OSDL certificate of contribution and should include a
-        Signed-off-by: line.  The current version of this "Developer's
-        Certificate of Origin" (DCO) is listed in the file
+        of the Linux Foundation certificate of contribution and should
+        include a Signed-off-by: line.  The current version of this
+        "Developer's Certificate of Origin" (DCO) is listed in the file
         Documentation/SubmittingPatches.
 
 6.      Make sure you have the right to send any changes you make. If you
@@ -7575,6 +7575,7 @@ F:	drivers/pci/host/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSIS DESIGNWARE
 M:      Jingoo Han <jingoohan1@gmail.com>
+M:      Pratyush Anand <pratyush.anand@gmail.com>
 L:      linux-pci@vger.kernel.org
 S:      Maintained
 F:      drivers/pci/host/*designware*
@@ -7588,8 +7589,9 @@ F:	Documentation/devicetree/bindings/pci/host-generic-pci.txt
 F:      drivers/pci/host/pci-host-generic.c
 
 PCIE DRIVER FOR ST SPEAR13XX
+M:      Pratyush Anand <pratyush.anand@gmail.com>
 L:      linux-pci@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      drivers/pci/host/*spear*
 
 PCMCIA SUBSYSTEM
@@ -10593,8 +10595,7 @@ F:	drivers/virtio/virtio_input.c
 F:      include/uapi/linux/virtio_input.h
 
 VIA RHINE NETWORK DRIVER
-M:      Roger Luethi <rl@hellgate.ch>
-S:      Maintained
+S:      Orphan
 F:      drivers/net/ethernet/via/via-rhine.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
diff --git a/Makefile b/Makefile
index aee7e5cb4c15..3ba504496cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc8
 NAME = Hurr durr I'ma sheep
 
 # *DOCUMENTATION*
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index c3255e0c90aa..dbb3f4d2bf84 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -223,6 +223,25 @@
 /include/ "tps65217.dtsi"
 
 &tps {
+        /*
+         * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
+         * mode") at poweroff.  Most BeagleBone versions do not support RTC-only
+         * mode and risk hardware damage if this mode is entered.
+         *
+         * For details, see linux-omap mailing list May 2015 thread
+         *      [PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller
+         * In particular, messages:
+         *      http://www.spinics.net/lists/linux-omap/msg118585.html
+         *      http://www.spinics.net/lists/linux-omap/msg118615.html
+         *
+         * You can override this later with
+         *      &tps {  /delete-property/ ti,pmic-shutdown-controller;  }
+         * if you want to use RTC-only mode and made sure you are not affected
+         * by the hardware problems. (Tip: double-check by performing a current
+         * measurement after shutdown: it should be less than 1 mA.)
+         */
+        ti,pmic-shutdown-controller;
+
         regulators {
                 dcdc1_reg: regulator@0 {
                         regulator-name = "vdds_dpr";
diff --git a/arch/arm/boot/dts/am35xx-clocks.dtsi b/arch/arm/boot/dts/am35xx-clocks.dtsi
index 518b8fde88b0..18cc826e9db5 100644
--- a/arch/arm/boot/dts/am35xx-clocks.dtsi
+++ b/arch/arm/boot/dts/am35xx-clocks.dtsi
@@ -12,7 +12,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,am35xx-gate-clock";
                 clocks = <&ipss_ick>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <1>;
         };
 
@@ -20,7 +20,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,gate-clock";
                 clocks = <&rmii_ck>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <9>;
         };
 
@@ -28,7 +28,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,am35xx-gate-clock";
                 clocks = <&ipss_ick>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <2>;
         };
 
@@ -36,7 +36,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,gate-clock";
                 clocks = <&pclk_ck>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <10>;
         };
 
@@ -44,7 +44,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,am35xx-gate-clock";
                 clocks = <&ipss_ick>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <0>;
         };
 
@@ -52,7 +52,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,gate-clock";
                 clocks = <&sys_ck>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <8>;
         };
 
@@ -60,7 +60,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,am35xx-gate-clock";
                 clocks = <&sys_ck>;
-                reg = <0x059c>;
+                reg = <0x032c>;
                 ti,bit-shift = <3>;
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index a2cf2154dcdb..fdd187c55aa5 100644
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -95,6 +95,11 @@
 
                 internal-regs {
 
+                        rtc@10300 {
+                                /* No crystal connected to the internal RTC */
+                                status = "disabled";
+                        };
+
                         /* J10: VCC, NC, RX, NC, TX, GND  */
                         serial@12000 {
                                 status = "okay";
diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index de8427be830a..289806adb343 100644
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -382,7 +382,7 @@
                         ti,hwmods = "usb_otg_hs";
 
                         usb0: usb@47401000 {
-                                compatible = "ti,musb-am33xx";
+                                compatible = "ti,musb-dm816";
                                 reg = <0x47401400 0x400
                                        0x47401000 0x200>;
                                 reg-names = "mc", "control";
@@ -422,7 +422,7 @@
                         };
 
                         usb1: usb@47401800 {
-                                compatible = "ti,musb-am33xx";
+                                compatible = "ti,musb-dm816";
                                 reg = <0x47401c00 0x400
                                        0x47401800 0x200>;
                                 reg-names = "mc", "control";
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 5c16145920ea..5f5e0f3d5b64 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -832,8 +832,8 @@
                 touchscreen-fuzz-x = <4>;
                 touchscreen-fuzz-y = <7>;
                 touchscreen-fuzz-pressure = <2>;
-                touchscreen-max-x = <4096>;
-                touchscreen-max-y = <4096>;
+                touchscreen-size-x = <4096>;
+                touchscreen-size-y = <4096>;
                 touchscreen-max-pressure = <2048>;
 
                 ti,x-plate-ohms = <280>;
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index c0b6dccbf7bd..7d23ce04cad5 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3;
 static u32 exynos_irqwake_intmask = 0xffffffff;
 
 static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {
-        { 105, BIT(1) }, /* RTC alarm */
-        { 106, BIT(2) }, /* RTC tick */
+        { 73, BIT(1) }, /* RTC alarm */
+        { 74, BIT(2) }, /* RTC tick */
         { /* sentinel */ },
 };
 
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index d1dedc8195ed..eafd120b53f1 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -203,23 +203,8 @@ save_context_wfi:
          */
         ldr     r1, kernel_flush
         blx     r1
-        /*
-         * The kernel doesn't interwork: v7_flush_dcache_all in particluar will
-         * always return in Thumb state when CONFIG_THUMB2_KERNEL is enabled.
-         * This sequence switches back to ARM.  Note that .align may insert a
-         * nop: bx pc needs to be word-aligned in order to work.
-         */
- THUMB( .thumb          )
- THUMB( .align          )
- THUMB( bx      pc      )
- THUMB( nop             )
-        .arm
-
         b       omap3_do_wfi
-
-/*
- * Local variables
- */
+ENDPROC(omap34xx_cpu_suspend)
 omap3_do_wfi_sram_addr:
         .word omap3_do_wfi_sram
 kernel_flush:
@@ -364,10 +349,7 @@ exit_nonoff_modes:
  * ===================================
  */
         ldmfd   sp!, {r4 - r11, pc}     @ restore regs and return
-
-/*
- * Local variables
- */
+ENDPROC(omap3_do_wfi)
 sdrc_power:
         .word   SDRC_POWER_V
 cm_idlest1_core:
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 43d54017b779..d0ab012fa379 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -16,7 +16,8 @@
 #include "mt8173.dtsi"
 
 / {
-        model = "mediatek,mt8173-evb";
+        model = "MediaTek MT8173 evaluation board";
+        compatible = "mediatek,mt8173-evb", "mediatek,mt8173";
 
         aliases {
                 serial0 = &uart0;
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h
index 4e8ad0523118..6abebe82d4e9 100644
--- a/arch/blackfin/include/asm/io.h
+++ b/arch/blackfin/include/asm/io.h
@@ -10,6 +10,7 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
+#include <asm/def_LPBlackfin.h>
 
 #define __raw_readb bfin_read8
 #define __raw_readw bfin_read16
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 15051e9c2c6f..b054c5c6e713 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -127,7 +127,7 @@ int smp_num_siblings = 1;
 volatile int ia64_cpu_to_sapicid[NR_CPUS];
 EXPORT_SYMBOL(ia64_cpu_to_sapicid);
 
-static volatile cpumask_t cpu_callin_map;
+static cpumask_t cpu_callin_map;
 
 struct smp_boot_data smp_boot_data __initdata;
 
@@ -477,6 +477,7 @@ do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
         for (timeout = 0; timeout < 100000; timeout++) {
                 if (cpumask_test_cpu(cpu, &cpu_callin_map))
                         break;  /* It has booted */
+                barrier(); /* Make sure we re-read cpu_callin_map */
                 udelay(100);
         }
         Dprintk("\n");
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index a73c93c3d44a..7fc8397d16f2 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -225,7 +225,7 @@ void __init plat_time_init(void)
         ddr_clk_rate = ath79_get_sys_clk_rate("ddr");
         ref_clk_rate = ath79_get_sys_clk_rate("ref");
 
-        pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz",
+        pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz\n",
                 cpu_clk_rate / 1000000, (cpu_clk_rate / 1000) % 1000,
                 ddr_clk_rate / 1000000, (ddr_clk_rate / 1000) % 1000,
                 ahb_clk_rate / 1000000, (ahb_clk_rate / 1000) % 1000,
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 558e94977942..68f0c5871adc 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
+obj-y := buttons.o irq.o lcd.o led.o mtd.o reset.o rtc.o serial.o setup.o time.o
 
 obj-$(CONFIG_PCI)               += pci.o
-obj-$(CONFIG_MTD_PHYSMAP)       += mtd.o
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index 18ae5ddef118..c28a8499aec7 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -113,7 +113,7 @@
 #define _PAGE_PRESENT_SHIFT     0
 #define _PAGE_PRESENT           (1 << _PAGE_PRESENT_SHIFT)
 /* R2 or later cores check for RI/XI support to determine _PAGE_READ */
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 #define _PAGE_WRITE_SHIFT       (_PAGE_PRESENT_SHIFT + 1)
 #define _PAGE_WRITE             (1 << _PAGE_WRITE_SHIFT)
 #else
@@ -135,16 +135,16 @@
 #define _PAGE_SPLITTING         (1 << _PAGE_SPLITTING_SHIFT)
 
 /* Only R2 or newer cores have the XI bit */
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 #define _PAGE_NO_EXEC_SHIFT     (_PAGE_SPLITTING_SHIFT + 1)
 #else
 #define _PAGE_GLOBAL_SHIFT      (_PAGE_SPLITTING_SHIFT + 1)
 #define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
-#endif  /* CONFIG_CPU_MIPSR2 */
+#endif  /* CONFIG_CPU_MIPSR2 || CONFIG_CPU_MIPSR6 */
 
 #endif  /* CONFIG_64BIT && CONFIG_MIPS_HUGE_TLB_SUPPORT */
 
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 /* XI - page cannot be executed */
 #ifndef _PAGE_NO_EXEC_SHIFT
 #define _PAGE_NO_EXEC_SHIFT     (_PAGE_MODIFIED_SHIFT + 1)
@@ -160,10 +160,10 @@
 #define _PAGE_GLOBAL_SHIFT      (_PAGE_NO_READ_SHIFT + 1)
 #define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
 
-#else   /* !CONFIG_CPU_MIPSR2 */
+#else   /* !CONFIG_CPU_MIPSR2 && !CONFIG_CPU_MIPSR6 */
 #define _PAGE_GLOBAL_SHIFT      (_PAGE_MODIFIED_SHIFT + 1)
 #define _PAGE_GLOBAL            (1 << _PAGE_GLOBAL_SHIFT)
-#endif  /* CONFIG_CPU_MIPSR2 */
+#endif  /* CONFIG_CPU_MIPSR2 || CONFIG_CPU_MIPSR6 */
 
 #define _PAGE_VALID_SHIFT       (_PAGE_GLOBAL_SHIFT + 1)
 #define _PAGE_VALID             (1 << _PAGE_VALID_SHIFT)
@@ -205,7 +205,7 @@
  */
 static inline uint64_t pte_to_entrylo(unsigned long pte_val)
 {
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         if (cpu_has_rixi) {
                 int sa;
 #ifdef CONFIG_32BIT
diff --git a/arch/mips/include/asm/switch_to.h b/arch/mips/include/asm/switch_to.h
index e92d6c4b5ed1..7163cd7fdd69 100644
--- a/arch/mips/include/asm/switch_to.h
+++ b/arch/mips/include/asm/switch_to.h
@@ -104,7 +104,6 @@ do {									\
         if (test_and_clear_tsk_thread_flag(prev, TIF_USEDMSA))          \
                 __fpsave = FP_SAVE_VECTOR;                              \
         (last) = resume(prev, next, task_thread_info(next), __fpsave);  \
-        disable_msa();                                                  \
 } while (0)
 
 #define finish_arch_switch(prev)                                        \
@@ -122,6 +121,7 @@ do {									\
         if (cpu_has_userlocal)                                          \
                 write_c0_userlocal(current_thread_info()->tp_value);    \
         __restore_watch();                                              \
+        disable_msa();                                                  \
 } while (0)
 
 #endif /* _ASM_SWITCH_TO_H */
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index e36515dcd3b2..209e5b76c1bc 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -74,13 +74,12 @@ static inline void cpu_set_fpu_fcsr_mask(struct cpuinfo_mips *c)
 {
         unsigned long sr, mask, fcsr, fcsr0, fcsr1;
 
+        fcsr = c->fpu_csr31;
         mask = FPU_CSR_ALL_X | FPU_CSR_ALL_E | FPU_CSR_ALL_S | FPU_CSR_RM;
 
         sr = read_c0_status();
         __enable_fpu(FPU_AS_IS);
 
-        fcsr = read_32bit_cp1_register(CP1_STATUS);
-
         fcsr0 = fcsr & mask;
         write_32bit_cp1_register(CP1_STATUS, fcsr0);
         fcsr0 = read_32bit_cp1_register(CP1_STATUS);
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 51f57d841662..3c8a18a00a65 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -109,7 +109,7 @@ void __init init_IRQ(void)
 #endif
 }
 
-#ifdef DEBUG_STACKOVERFLOW
+#ifdef CONFIG_DEBUG_STACKOVERFLOW
 static inline void check_stack_overflow(void)
 {
         unsigned long sp;
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 4b50c5787e25..d5fa3eaf39a1 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -2409,7 +2409,7 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,
                 if (vcpu->mmio_needed == 2)
                         *gpr = *(int16_t *) run->mmio.data;
                 else
-                        *gpr = *(int16_t *) run->mmio.data;
+                        *gpr = *(uint16_t *)run->mmio.data;
 
                 break;
         case 1:
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index e70c33fdb881..f2e8153e44f5 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -3,15 +3,13 @@
 #
 
 obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
-    bonito-irq.o mem.o machtype.o platform.o
+    bonito-irq.o mem.o machtype.o platform.o serial.o
 obj-$(CONFIG_PCI) += pci.o
 
 #
 # Serial port support
 #
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-loongson-serial-$(CONFIG_SERIAL_8250) := serial.o
-obj-y += $(loongson-serial-m) $(loongson-serial-y)
 obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o
 obj-$(CONFIG_LOONGSON_MC146818) += rtc.o
 
diff --git a/arch/mips/loongson/loongson-3/smp.c b/arch/mips/loongson/loongson-3/smp.c
index e3c68b5da18d..509877c6e9d9 100644
--- a/arch/mips/loongson/loongson-3/smp.c
+++ b/arch/mips/loongson/loongson-3/smp.c
@@ -272,7 +272,7 @@ void loongson3_ipi_interrupt(struct pt_regs *regs)
         if (action & SMP_ASK_C0COUNT) {
                 BUG_ON(cpu != 0);
                 c0count = read_c0_count();
-                for (i = 1; i < loongson_sysconf.nr_cpus; i++)
+                for (i = 1; i < num_possible_cpus(); i++)
                         per_cpu(core0_c0count, i) = c0count;
         }
 }
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 0dbb65a51ce5..2e03ab173591 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1372,7 +1372,7 @@ static int probe_scache(void)
         scache_size = addr;
         c->scache.linesz = 16 << ((config & R4K_CONF_SB) >> 22);
         c->scache.ways = 1;
-        c->dcache.waybit = 0;           /* does not matter */
+        c->scache.waybit = 0;           /* does not matter */
 
         return 1;
 }
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 5d6139390bf8..e23fdf2a9c80 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -681,11 +681,7 @@ static unsigned int get_stack_depth(struct jit_ctx *ctx)
                 sp_off += config_enabled(CONFIG_64BIT) ?
                         (ARGS_USED_BY_JIT + 1) * RSIZE : RSIZE;
 
-        /*
-         * Subtract the bytes for the last registers since we only care about
-         * the location on the stack pointer.
-         */
-        return sp_off - RSIZE;
+        return sp_off;
 }
 
 static void build_prologue(struct jit_ctx *ctx)
diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c
index e20b02e3ae28..e10d10b9e82a 100644
--- a/arch/mips/ralink/ill_acc.c
+++ b/arch/mips/ralink/ill_acc.c
@@ -41,7 +41,7 @@ static irqreturn_t ill_acc_irq_handler(int irq, void *_priv)
                 addr, (type >> ILL_ACC_OFF_S) & ILL_ACC_OFF_M,
                 type & ILL_ACC_LEN_M);
 
-        rt_memc_w32(REG_ILL_ACC_TYPE, REG_ILL_ACC_TYPE);
+        rt_memc_w32(ILL_INT_STATUS, REG_ILL_ACC_TYPE);
 
         return IRQ_HANDLED;
 }
diff --git a/arch/s390/net/bpf_jit.h b/arch/s390/net/bpf_jit.h
index ba8593a515ba..de156ba3bd71 100644
--- a/arch/s390/net/bpf_jit.h
+++ b/arch/s390/net/bpf_jit.h
@@ -48,7 +48,9 @@ extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
  * We get 160 bytes stack space from calling function, but only use
  * 11 * 8 byte (old backchain + r15 - r6) for storing registers.
  */
-#define STK_OFF (MAX_BPF_STACK + 8 + 4 + 4 + (160 - 11 * 8))
+#define STK_SPACE       (MAX_BPF_STACK + 8 + 4 + 4 + 160)
+#define STK_160_UNUSED  (160 - 11 * 8)
+#define STK_OFF         (STK_SPACE - STK_160_UNUSED)
 #define STK_OFF_TMP     160     /* Offset of tmp buffer on stack */
 #define STK_OFF_HLEN    168     /* Offset of SKB header length on stack */
 
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 20c146d1251a..55423d8be580 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -384,13 +384,16 @@ static void bpf_jit_prologue(struct bpf_jit *jit)
         }
         /* Setup stack and backchain */
         if (jit->seen & SEEN_STACK) {
-                /* lgr %bfp,%r15 (BPF frame pointer) */
-                EMIT4(0xb9040000, BPF_REG_FP, REG_15);
+                if (jit->seen & SEEN_FUNC)
+                        /* lgr %w1,%r15 (backchain) */
+                        EMIT4(0xb9040000, REG_W1, REG_15);
+                /* la %bfp,STK_160_UNUSED(%r15) (BPF frame pointer) */
+                EMIT4_DISP(0x41000000, BPF_REG_FP, REG_15, STK_160_UNUSED);
                 /* aghi %r15,-STK_OFF */
                 EMIT4_IMM(0xa70b0000, REG_15, -STK_OFF);
                 if (jit->seen & SEEN_FUNC)
-                        /* stg %bfp,152(%r15) (backchain) */
-                        EMIT6_DISP_LH(0xe3000000, 0x0024, BPF_REG_FP, REG_0,
+                        /* stg %w1,152(%r15) (backchain) */
+                        EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W1, REG_0,
                                       REG_15, 152);
         }
         /*
diff --git a/arch/score/lib/string.S b/arch/score/lib/string.S
index 00b7d3a2fc60..16efa3ad037f 100644
--- a/arch/score/lib/string.S
+++ b/arch/score/lib/string.S
@@ -175,10 +175,10 @@ ENTRY(__clear_user)
         br      r3
 
         .section .fixup, "ax"
+99:
         br      r3
         .previous
         .section __ex_table, "a"
         .align  2
-99:
         .word   0b, 99b
         .previous
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index a6e424d185d0..a6cfdabb6054 100644
--- a/arch/sparc/include/asm/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
@@ -24,7 +24,8 @@ typedef struct {
         unsigned int    icache_line_size;
         unsigned int    ecache_size;
         unsigned int    ecache_line_size;
-        int             core_id;
+        unsigned short  sock_id;
+        unsigned short  core_id;
         int             proc_id;
 } cpuinfo_sparc;
 
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index dc165ebdf05a..2a52c91d2c8a 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -308,12 +308,26 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot)
         "       sllx            %1, 32, %1\n"
         "       or              %0, %1, %0\n"
         "       .previous\n"
+        "       .section        .sun_m7_2insn_patch, \"ax\"\n"
+        "       .word           661b\n"
+        "       sethi           %%uhi(%4), %1\n"
+        "       sethi           %%hi(%4), %0\n"
+        "       .word           662b\n"
+        "       or              %1, %%ulo(%4), %1\n"
+        "       or              %0, %%lo(%4), %0\n"
+        "       .word           663b\n"
+        "       sllx            %1, 32, %1\n"
+        "       or              %0, %1, %0\n"
+        "       .previous\n"
         : "=r" (mask), "=r" (tmp)
         : "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |
                _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U |
                _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U),
           "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |
                _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V |
+               _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V),
+          "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |
+               _PAGE_CP_4V | _PAGE_E_4V |
                _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V));
 
         return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));
@@ -342,9 +356,15 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot)
         "       andn            %0, %4, %0\n"
         "       or              %0, %5, %0\n"
         "       .previous\n"
+        "       .section        .sun_m7_2insn_patch, \"ax\"\n"
+        "       .word           661b\n"
+        "       andn            %0, %6, %0\n"
+        "       or              %0, %5, %0\n"
+        "       .previous\n"
         : "=r" (val)
         : "0" (val), "i" (_PAGE_CP_4U | _PAGE_CV_4U), "i" (_PAGE_E_4U),
-                     "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V));
+                     "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V),
+                     "i" (_PAGE_CP_4V));
 
         return __pgprot(val);
 }
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index ed8f071132e4..d1761df5cca6 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -40,11 +40,12 @@ static inline int pcibus_to_node(struct pci_bus *pbus)
 #ifdef CONFIG_SMP
 #define topology_physical_package_id(cpu)       (cpu_data(cpu).proc_id)
 #define topology_core_id(cpu)                   (cpu_data(cpu).core_id)
-#define topology_core_cpumask(cpu)              (&cpu_core_map[cpu])
+#define topology_core_cpumask(cpu)              (&cpu_core_sib_map[cpu])
 #define topology_thread_cpumask(cpu)            (&per_cpu(cpu_sibling_map, cpu))
 #endif /* CONFIG_SMP */
 
 extern cpumask_t cpu_core_map[NR_CPUS];
+extern cpumask_t cpu_core_sib_map[NR_CPUS];
 static inline const struct cpumask *cpu_coregroup_mask(int cpu)
 {
         return &cpu_core_map[cpu];
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
index 6fd4436d32f0..ec9c04de3664 100644
--- a/arch/sparc/include/asm/trap_block.h
+++ b/arch/sparc/include/asm/trap_block.h
@@ -79,6 +79,8 @@ struct sun4v_2insn_patch_entry {
 };
 extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
         __sun4v_2insn_patch_end;
+extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
+        __sun_m7_2insn_patch_end;
 
 
 #endif /* !(__ASSEMBLY__) */
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index 07cc49e541f4..0f679421b468 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -69,6 +69,8 @@ void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,
                              struct sun4v_1insn_patch_entry *);
 void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,
                              struct sun4v_2insn_patch_entry *);
+void sun_m7_patch_2insn_range(struct sun4v_2insn_patch_entry *,
+                             struct sun4v_2insn_patch_entry *);
 extern unsigned int dcache_parity_tl1_occurred;
 extern unsigned int icache_parity_tl1_occurred;
 
diff --git a/arch/sparc/kernel/leon_pci_grpci2.c b/arch/sparc/kernel/leon_pci_grpci2.c
index 94e392bdee7d..814fb1729b12 100644
--- a/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/arch/sparc/kernel/leon_pci_grpci2.c
@@ -723,7 +723,6 @@ static int grpci2_of_probe(struct platform_device *ofdev)
                 err = -ENOMEM;
                 goto err1;
         }
-        memset(grpci2priv, 0, sizeof(*grpci2priv));
         priv->regs = regs;
         priv->irq = ofdev->archdata.irqs[0]; /* BASE IRQ */
         priv->irq_mode = (capability & STS_IRQMODE) >> STS_IRQMODE_BIT;
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 26c80e18d7b1..6f80936e0eea 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -614,45 +614,68 @@ static void fill_in_one_cache(cpuinfo_sparc *c, struct mdesc_handle *hp, u64 mp)
         }
 }
 
-static void mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
+static void find_back_node_value(struct mdesc_handle *hp, u64 node,
+                                 char *srch_val,
+                                 void (*func)(struct mdesc_handle *, u64, int),
+                                 u64 val, int depth)
 {
-        u64 a;
-
-        mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_BACK) {
-                u64 t = mdesc_arc_target(hp, a);
-                const char *name;
-                const u64 *id;
+        u64 arc;
 
-                name = mdesc_node_name(hp, t);
-                if (!strcmp(name, "cpu")) {
-                        id = mdesc_get_property(hp, t, "id", NULL);
-                        if (*id < NR_CPUS)
-                                cpu_data(*id).core_id = core_id;
-                } else {
-                        u64 j;
+        /* Since we have an estimate of recursion depth, do a sanity check. */
+        if (depth == 0)
+                return;
 
-                        mdesc_for_each_arc(j, hp, t, MDESC_ARC_TYPE_BACK) {
-                                u64 n = mdesc_arc_target(hp, j);
-                                const char *n_name;
+        mdesc_for_each_arc(arc, hp, node, MDESC_ARC_TYPE_BACK) {
+                u64 n = mdesc_arc_target(hp, arc);
+                const char *name = mdesc_node_name(hp, n);
 
-                                n_name = mdesc_node_name(hp, n);
-                                if (strcmp(n_name, "cpu"))
-                                        continue;
+                if (!strcmp(srch_val, name))
+                        (*func)(hp, n, val);
 
-                                id = mdesc_get_property(hp, n, "id", NULL);
-                                if (*id < NR_CPUS)
-                                        cpu_data(*id).core_id = core_id;
-                        }
-                }
+                find_back_node_value(hp, n, srch_val, func, val, depth-1);
         }
 }
 
+static void __mark_core_id(struct mdesc_handle *hp, u64 node,
+                           int core_id)
+{
+        const u64 *id = mdesc_get_property(hp, node, "id", NULL);
+
+        if (*id < num_possible_cpus())
+                cpu_data(*id).core_id = core_id;
+}
+
+static void __mark_sock_id(struct mdesc_handle *hp, u64 node,
+                           int sock_id)
+{
+        const u64 *id = mdesc_get_property(hp, node, "id", NULL);
+
+        if (*id < num_possible_cpus())
+                cpu_data(*id).sock_id = sock_id;
+}
+
+static void mark_core_ids(struct mdesc_handle *hp, u64 mp,
+                          int core_id)
+{
+        find_back_node_value(hp, mp, "cpu", __mark_core_id, core_id, 10);
+}
+
+static void mark_sock_ids(struct mdesc_handle *hp, u64 mp,
+                          int sock_id)
+{
+        find_back_node_value(hp, mp, "cpu", __mark_sock_id, sock_id, 10);
+}
+
 static void set_core_ids(struct mdesc_handle *hp)
 {
         int idx;
         u64 mp;
 
         idx = 1;
+
+        /* Identify unique cores by looking for cpus backpointed to by
+         * level 1 instruction caches.
+         */
         mdesc_for_each_node_by_name(hp, mp, "cache") {
                 const u64 *level;
                 const char *type;
@@ -667,11 +690,72 @@ static void set_core_ids(struct mdesc_handle *hp)
                         continue;
 
                 mark_core_ids(hp, mp, idx);
+                idx++;
+        }
+}
+
+static int set_sock_ids_by_cache(struct mdesc_handle *hp, int level)
+{
+        u64 mp;
+        int idx = 1;
+        int fnd = 0;
+
+        /* Identify unique sockets by looking for cpus backpointed to by
+         * shared level n caches.
+         */
+        mdesc_for_each_node_by_name(hp, mp, "cache") {
+                const u64 *cur_lvl;
+
+                cur_lvl = mdesc_get_property(hp, mp, "level", NULL);
+                if (*cur_lvl != level)
+                        continue;
+
+                mark_sock_ids(hp, mp, idx);
+                idx++;
+                fnd = 1;
+        }
+        return fnd;
+}
+
+static void set_sock_ids_by_socket(struct mdesc_handle *hp, u64 mp)
+{
+        int idx = 1;
 
+        mdesc_for_each_node_by_name(hp, mp, "socket") {
+                u64 a;
+
+                mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
+                        u64 t = mdesc_arc_target(hp, a);
+                        const char *name;
+                        const u64 *id;
+
+                        name = mdesc_node_name(hp, t);
+                        if (strcmp(name, "cpu"))
+                                continue;
+
+                        id = mdesc_get_property(hp, t, "id", NULL);
+                        if (*id < num_possible_cpus())
+                                cpu_data(*id).sock_id = idx;
+                }
                 idx++;
         }
 }
 
+static void set_sock_ids(struct mdesc_handle *hp)
+{
+        u64 mp;
+
+        /* If machine description exposes sockets data use it.
+         * Otherwise fallback to use shared L3 or L2 caches.
+         */
+        mp = mdesc_node_by_name(hp, MDESC_NODE_NULL, "sockets");
+        if (mp != MDESC_NODE_NULL)
+                return set_sock_ids_by_socket(hp, mp);
+
+        if (!set_sock_ids_by_cache(hp, 3))
+                set_sock_ids_by_cache(hp, 2);
+}
+
 static void mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
 {
         u64 a;
@@ -707,7 +791,6 @@ static void __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
                         continue;
 
                 mark_proc_ids(hp, mp, idx);
-
                 idx++;
         }
 }
@@ -900,6 +983,7 @@ void mdesc_fill_in_cpu_data(cpumask_t *mask)
 
         set_core_ids(hp);
         set_proc_ids(hp);
+        set_sock_ids(hp);
 
         mdesc_release(hp);
 
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 6f7251fd2eab..c928bc64b4ba 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -1002,6 +1002,38 @@ static int __init pcibios_init(void)
 subsys_initcall(pcibios_init);
 
 #ifdef CONFIG_SYSFS
+
+#define SLOT_NAME_SIZE  11  /* Max decimal digits + null in u32 */
+
+static void pcie_bus_slot_names(struct pci_bus *pbus)
+{
+        struct pci_dev *pdev;
+        struct pci_bus *bus;
+
+        list_for_each_entry(pdev, &pbus->devices, bus_list) {
+                char name[SLOT_NAME_SIZE];
+                struct pci_slot *pci_slot;
+                const u32 *slot_num;
+                int len;
+
+                slot_num = of_get_property(pdev->dev.of_node,
+                                           "physical-slot#", &len);
+
+                if (slot_num == NULL || len != 4)
+                        continue;
+
+                snprintf(name, sizeof(name), "%u", slot_num[0]);
+                pci_slot = pci_create_slot(pbus, slot_num[0], name, NULL);
+
+                if (IS_ERR(pci_slot))
+                        pr_err("PCI: pci_create_slot returned %ld.\n",
+                               PTR_ERR(pci_slot));
+        }
+
+        list_for_each_entry(bus, &pbus->children, node)
+                pcie_bus_slot_names(bus);
+}
+
 static void pci_bus_slot_names(struct device_node *node, struct pci_bus *bus)
 {
         const struct pci_slot_names {
@@ -1053,18 +1085,29 @@ static int __init of_pci_slot_init(void)
 
         while ((pbus = pci_find_next_bus(pbus)) != NULL) {
                 struct device_node *node;
+                struct pci_dev *pdev;
+
+                pdev = list_first_entry(&pbus->devices, struct pci_dev,
+                                        bus_list);
 
-                if (pbus->self) {
-                        /* PCI->PCI bridge */
-                        node = pbus->self->dev.of_node;
+                if (pdev && pci_is_pcie(pdev)) {
+                        pcie_bus_slot_names(pbus);
                 } else {
-                        struct pci_pbm_info *pbm = pbus->sysdata;
 
-                        /* Host PCI controller */
-                        node = pbm->op->dev.of_node;
-                }
+                        if (pbus->self) {
+
+                                /* PCI->PCI bridge */
+                                node = pbus->self->dev.of_node;
+
+                        } else {
+                                struct pci_pbm_info *pbm = pbus->sysdata;
 
-                pci_bus_slot_names(node, pbus);
+                                /* Host PCI controller */
+                                node = pbm->op->dev.of_node;
+                        }
+
+                        pci_bus_slot_names(node, pbus);
+                }
         }
 
         return 0;
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index c38d19fc27ba..f7b261749383 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -255,6 +255,24 @@ void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *start,
         }
 }
 
+void sun_m7_patch_2insn_range(struct sun4v_2insn_patch_entry *start,
+                             struct sun4v_2insn_patch_entry *end)
+{
+        while (start < end) {
+                unsigned long addr = start->addr;
+
+                *(unsigned int *) (addr +  0) = start->insns[0];
+                wmb();
+                __asm__ __volatile__("flush     %0" : : "r" (addr +  0));
+
+                *(unsigned int *) (addr +  4) = start->insns[1];
+                wmb();
+                __asm__ __volatile__("flush     %0" : : "r" (addr +  4));
+
+                start++;
+        }
+}
+
 static void __init sun4v_patch(void)
 {
         extern void sun4v_hvapi_init(void);
@@ -267,6 +285,9 @@ static void __init sun4v_patch(void)
 
         sun4v_patch_2insn_range(&__sun4v_2insn_patch,
                                 &__sun4v_2insn_patch_end);
+        if (sun4v_chip_type == SUN4V_CHIP_SPARC_M7)
+                sun_m7_patch_2insn_range(&__sun_m7_2insn_patch,
+                                         &__sun_m7_2insn_patch_end);
 
         sun4v_hvapi_init();
 }
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 61139d9924ca..19cd08d18672 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -60,8 +60,12 @@ DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
 cpumask_t cpu_core_map[NR_CPUS] __read_mostly =
         { [0 ... NR_CPUS-1] = CPU_MASK_NONE };
 
+cpumask_t cpu_core_sib_map[NR_CPUS] __read_mostly = {
+        [0 ... NR_CPUS-1] = CPU_MASK_NONE };
+
 EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
 EXPORT_SYMBOL(cpu_core_map);
+EXPORT_SYMBOL(cpu_core_sib_map);
 
 static cpumask_t smp_commenced_mask;
 
@@ -1243,6 +1247,15 @@ void smp_fill_in_sib_core_maps(void)
                 }
         }
 
+        for_each_present_cpu(i)  {
+                unsigned int j;
+
+                for_each_present_cpu(j)  {
+                        if (cpu_data(i).sock_id == cpu_data(j).sock_id)
+                                cpumask_set_cpu(j, &cpu_core_sib_map[i]);
+                }
+        }
+
         for_each_present_cpu(i) {
                 unsigned int j;
 
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 09243057cb0b..f1a2f688b28a 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -138,6 +138,11 @@ SECTIONS
                 *(.pause_3insn_patch)
                 __pause_3insn_patch_end = .;
         }
+        .sun_m7_2insn_patch : {
+                __sun_m7_2insn_patch = .;
+                *(.sun_m7_2insn_patch)
+                __sun_m7_2insn_patch_end = .;
+        }
         PERCPU_SECTION(SMP_CACHE_BYTES)
 
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 4ca0d6ba5ec8..559cb744112c 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -54,6 +54,7 @@
 #include "init_64.h"
 
 unsigned long kern_linear_pte_xor[4] __read_mostly;
+static unsigned long page_cache4v_flag;
 
 /* A bitmap, two bits for every 256MB of physical memory.  These two
  * bits determine what page size we use for kernel linear
@@ -1909,11 +1910,24 @@ static void __init sun4u_linear_pte_xor_finalize(void)
 
 static void __init sun4v_linear_pte_xor_finalize(void)
 {
+        unsigned long pagecv_flag;
+
+        /* Bit 9 of TTE is no longer CV bit on M7 processor and it instead
+         * enables MCD error. Do not set bit 9 on M7 processor.
+         */
+        switch (sun4v_chip_type) {
+        case SUN4V_CHIP_SPARC_M7:
+                pagecv_flag = 0x00;
+                break;
+        default:
+                pagecv_flag = _PAGE_CV_4V;
+                break;
+        }
 #ifndef CONFIG_DEBUG_PAGEALLOC
         if (cpu_pgsz_mask & HV_PGSZ_MASK_256MB) {
                 kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^
                         PAGE_OFFSET;
-                kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V |
+                kern_linear_pte_xor[1] |= (_PAGE_CP_4V | pagecv_flag |
                                            _PAGE_P_4V | _PAGE_W_4V);
         } else {
                 kern_linear_pte_xor[1] = kern_linear_pte_xor[0];
@@ -1922,7 +1936,7 @@ static void __init sun4v_linear_pte_xor_finalize(void)
         if (cpu_pgsz_mask & HV_PGSZ_MASK_2GB) {
                 kern_linear_pte_xor[2] = (_PAGE_VALID | _PAGE_SZ2GB_4V) ^
                         PAGE_OFFSET;
-                kern_linear_pte_xor[2] |= (_PAGE_CP_4V | _PAGE_CV_4V |
+                kern_linear_pte_xor[2] |= (_PAGE_CP_4V | pagecv_flag |
                                            _PAGE_P_4V | _PAGE_W_4V);
         } else {
                 kern_linear_pte_xor[2] = kern_linear_pte_xor[1];
@@ -1931,7 +1945,7 @@ static void __init sun4v_linear_pte_xor_finalize(void)
         if (cpu_pgsz_mask & HV_PGSZ_MASK_16GB) {
                 kern_linear_pte_xor[3] = (_PAGE_VALID | _PAGE_SZ16GB_4V) ^
                         PAGE_OFFSET;
-                kern_linear_pte_xor[3] |= (_PAGE_CP_4V | _PAGE_CV_4V |
+                kern_linear_pte_xor[3] |= (_PAGE_CP_4V | pagecv_flag |
                                            _PAGE_P_4V | _PAGE_W_4V);
         } else {
                 kern_linear_pte_xor[3] = kern_linear_pte_xor[2];
@@ -1958,6 +1972,13 @@ static phys_addr_t __init available_memory(void)
         return available;
 }
 
+#define _PAGE_CACHE_4U  (_PAGE_CP_4U | _PAGE_CV_4U)
+#define _PAGE_CACHE_4V  (_PAGE_CP_4V | _PAGE_CV_4V)
+#define __DIRTY_BITS_4U  (_PAGE_MODIFIED_4U | _PAGE_WRITE_4U | _PAGE_W_4U)
+#define __DIRTY_BITS_4V  (_PAGE_MODIFIED_4V | _PAGE_WRITE_4V | _PAGE_W_4V)
+#define __ACCESS_BITS_4U (_PAGE_ACCESSED_4U | _PAGE_READ_4U | _PAGE_R)
+#define __ACCESS_BITS_4V (_PAGE_ACCESSED_4V | _PAGE_READ_4V | _PAGE_R)
+
 /* We need to exclude reserved regions. This exclusion will include
  * vmlinux and initrd. To be more precise the initrd size could be used to
  * compute a new lower limit because it is freed later during initialization.
@@ -2034,6 +2055,25 @@ void __init paging_init(void)
         memset(swapper_4m_tsb, 0x40, sizeof(swapper_4m_tsb));
 #endif
 
+        /* TTE.cv bit on sparc v9 occupies the same position as TTE.mcde
+         * bit on M7 processor. This is a conflicting usage of the same
+         * bit. Enabling TTE.cv on M7 would turn on Memory Corruption
+         * Detection error on all pages and this will lead to problems
+         * later. Kernel does not run with MCD enabled and hence rest
+         * of the required steps to fully configure memory corruption
+         * detection are not taken. We need to ensure TTE.mcde is not
+         * set on M7 processor. Compute the value of cacheability
+         * flag for use later taking this into consideration.
+         */
+        switch (sun4v_chip_type) {
+        case SUN4V_CHIP_SPARC_M7:
+                page_cache4v_flag = _PAGE_CP_4V;
+                break;
+        default:
+                page_cache4v_flag = _PAGE_CACHE_4V;
+                break;
+        }
+
         if (tlb_type == hypervisor)
                 sun4v_pgprot_init();
         else
@@ -2274,13 +2314,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-#define _PAGE_CACHE_4U  (_PAGE_CP_4U | _PAGE_CV_4U)
-#define _PAGE_CACHE_4V  (_PAGE_CP_4V | _PAGE_CV_4V)
-#define __DIRTY_BITS_4U  (_PAGE_MODIFIED_4U | _PAGE_WRITE_4U | _PAGE_W_4U)
-#define __DIRTY_BITS_4V  (_PAGE_MODIFIED_4V | _PAGE_WRITE_4V | _PAGE_W_4V)
-#define __ACCESS_BITS_4U (_PAGE_ACCESSED_4U | _PAGE_READ_4U | _PAGE_R)
-#define __ACCESS_BITS_4V (_PAGE_ACCESSED_4V | _PAGE_READ_4V | _PAGE_R)
-
 pgprot_t PAGE_KERNEL __read_mostly;
 EXPORT_SYMBOL(PAGE_KERNEL);
 
@@ -2312,8 +2345,7 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,
                     _PAGE_P_4U | _PAGE_W_4U);
         if (tlb_type == hypervisor)
                 pte_base = (_PAGE_VALID | _PAGE_SZ4MB_4V |
-                            _PAGE_CP_4V | _PAGE_CV_4V |
-                            _PAGE_P_4V | _PAGE_W_4V);
+                            page_cache4v_flag | _PAGE_P_4V | _PAGE_W_4V);
 
         pte_base |= _PAGE_PMD_HUGE;
 
@@ -2450,14 +2482,14 @@ static void __init sun4v_pgprot_init(void)
         int i;
 
         PAGE_KERNEL = __pgprot (_PAGE_PRESENT_4V | _PAGE_VALID |
-                                _PAGE_CACHE_4V | _PAGE_P_4V |
+                                page_cache4v_flag | _PAGE_P_4V |
                                 __ACCESS_BITS_4V | __DIRTY_BITS_4V |
                                 _PAGE_EXEC_4V);
         PAGE_KERNEL_LOCKED = PAGE_KERNEL;
 
         _PAGE_IE = _PAGE_IE_4V;
         _PAGE_E = _PAGE_E_4V;
-        _PAGE_CACHE = _PAGE_CACHE_4V;
+        _PAGE_CACHE = page_cache4v_flag;
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
         kern_linear_pte_xor[0] = _PAGE_VALID ^ PAGE_OFFSET;
@@ -2465,8 +2497,8 @@ static void __init sun4v_pgprot_init(void)
         kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^
                 PAGE_OFFSET;
 #endif
-        kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |
-                                   _PAGE_P_4V | _PAGE_W_4V);
+        kern_linear_pte_xor[0] |= (page_cache4v_flag | _PAGE_P_4V |
+                                   _PAGE_W_4V);
 
         for (i = 1; i < 4; i++)
                 kern_linear_pte_xor[i] = kern_linear_pte_xor[0];
@@ -2479,12 +2511,12 @@ static void __init sun4v_pgprot_init(void)
                              _PAGE_SZ4MB_4V | _PAGE_SZ512K_4V |
                              _PAGE_SZ64K_4V | _PAGE_SZ8K_4V);
 
-        page_none = _PAGE_PRESENT_4V | _PAGE_ACCESSED_4V | _PAGE_CACHE_4V;
-        page_shared = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
+        page_none = _PAGE_PRESENT_4V | _PAGE_ACCESSED_4V | page_cache4v_flag;
+        page_shared = (_PAGE_VALID | _PAGE_PRESENT_4V | page_cache4v_flag |
                        __ACCESS_BITS_4V | _PAGE_WRITE_4V | _PAGE_EXEC_4V);
-        page_copy   = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
+        page_copy   = (_PAGE_VALID | _PAGE_PRESENT_4V | page_cache4v_flag |
                        __ACCESS_BITS_4V | _PAGE_EXEC_4V);
-        page_readonly = (_PAGE_VALID | _PAGE_PRESENT_4V | _PAGE_CACHE_4V |
+        page_readonly = (_PAGE_VALID | _PAGE_PRESENT_4V | page_cache4v_flag |
                          __ACCESS_BITS_4V | _PAGE_EXEC_4V);
 
         page_exec_bit = _PAGE_EXEC_4V;
@@ -2542,7 +2574,7 @@ static unsigned long kern_large_tte(unsigned long paddr)
                _PAGE_EXEC_4U | _PAGE_L_4U | _PAGE_W_4U);
         if (tlb_type == hypervisor)
                 val = (_PAGE_VALID | _PAGE_SZ4MB_4V |
-                       _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_P_4V |
+                       page_cache4v_flag | _PAGE_P_4V |
                        _PAGE_EXEC_4V | _PAGE_W_4V);
 
         return val | paddr;
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 89dd0d78013a..805d25ca5f1d 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -2,15 +2,14 @@
 #define BOOT_COMPRESSED_MISC_H
 
 /*
- * we have to be careful, because no indirections are allowed here, and
- * paravirt_ops is a kind of one. As it will only run in baremetal anyway,
- * we just keep it from happening
+ * Special hack: we have to be careful, because no indirections are allowed here,
+ * and paravirt_ops is a kind of one. As it will only run in baremetal anyway,
+ * we just keep it from happening. (This list needs to be extended when new
+ * paravirt and debugging variants are added.)
  */
 #undef CONFIG_PARAVIRT
+#undef CONFIG_PARAVIRT_SPINLOCKS
 #undef CONFIG_KASAN
-#ifdef CONFIG_X86_32
-#define _ASM_X86_DESC_H 1
-#endif
 
 #include <linux/linkage.h>
 #include <linux/screen_info.h>
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 19507ffa5d28..5fabf1362942 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -107,7 +107,7 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
 static inline int user_mode(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-        return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
+        return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >= USER_RPL;
 #else
         return !!(regs->cs & 3);
 #endif
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 5a9856eb12ba..7d5a1929d76b 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -231,11 +231,21 @@
 #define TLS_SIZE                        (GDT_ENTRY_TLS_ENTRIES* 8)
 
 #ifdef __KERNEL__
+
+/*
+ * early_idt_handler_array is an array of entry points referenced in the
+ * early IDT.  For simplicity, it's a real array with one entry point
+ * every nine bytes.  That leaves room for an optional 'push $0' if the
+ * vector has no error code (two bytes), a 'push $vector_number' (two
+ * bytes), and a jump to the common entry code (up to five bytes).
+ */
+#define EARLY_IDT_HANDLER_SIZE 9
+
 #ifndef __ASSEMBLY__
 
-extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][2+2+5];
+extern const char early_idt_handler_array[NUM_EXCEPTION_VECTORS][EARLY_IDT_HANDLER_SIZE];
 #ifdef CONFIG_TRACING
-# define trace_early_idt_handlers early_idt_handlers
+# define trace_early_idt_handler_array early_idt_handler_array
 #endif
 
 /*
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 87848ebe2bb7..4f7001f28936 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -190,6 +190,7 @@ static bool check_hw_exists(void)
         u64 val, val_fail, val_new= ~0;
         int i, reg, reg_fail, ret = 0;
         int bios_fail = 0;
+        int reg_safe = -1;
 
         /*
          * Check to see if the BIOS enabled any of the counters, if so
@@ -204,6 +205,8 @@ static bool check_hw_exists(void)
                         bios_fail = 1;
                         val_fail = val;
                         reg_fail = reg;
+                } else {
+                        reg_safe = i;
                 }
         }
 
@@ -222,11 +225,22 @@ static bool check_hw_exists(void)
         }
 
         /*
+         * If all the counters are enabled, the below test will always
+         * fail.  The tools will also become useless in this scenario.
+         * Just fail and disable the hardware counters.
+         */
+
+        if (reg_safe == -1) {
+                reg = reg_safe;
+                goto msr_fail;
+        }
+
+        /*
          * Read the current value, change it and read it back to see if it
          * matches, this is needed to detect certain hardware emulators
          * (qemu/kvm) that don't trap on the MSR access and always return 0s.
          */
-        reg = x86_pmu_event_addr(0);
+        reg = x86_pmu_event_addr(reg_safe);
         if (rdmsrl_safe(reg, &val))
                 goto msr_fail;
         val ^= 0xffffUL;
@@ -611,6 +625,7 @@ struct sched_state {
         int     event;          /* event index */
         int     counter;        /* counter index */
         int     unassigned;     /* number of events to be assigned left */
+        int     nr_gp;          /* number of GP counters used */
         unsigned long used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 };
 
@@ -620,27 +635,29 @@ struct sched_state {
 struct perf_sched {
         int                     max_weight;
         int                     max_events;
-        struct perf_event       **events;
-        struct sched_state      state;
+        int                     max_gp;
         int                     saved_states;
+        struct event_constraint **constraints;
+        struct sched_state      state;
         struct sched_state      saved[SCHED_STATES_MAX];
 };
 
 /*
  * Initialize interator that runs through all events and counters.
  */
-static void perf_sched_init(struct perf_sched *sched, struct perf_event **events,
-                            int num, int wmin, int wmax)
+static void perf_sched_init(struct perf_sched *sched, struct event_constraint **constraints,
+                            int num, int wmin, int wmax, int gpmax)
 {
         int idx;
 
         memset(sched, 0, sizeof(*sched));
         sched->max_events       = num;
         sched->max_weight       = wmax;
-        sched->events           = events;
+        sched->max_gp           = gpmax;
+        sched->constraints      = constraints;
 
         for (idx = 0; idx < num; idx++) {
-                if (events[idx]->hw.constraint->weight == wmin)
+                if (constraints[idx]->weight == wmin)
                         break;
         }
 
@@ -687,7 +704,7 @@ static bool __perf_sched_find_counter(struct perf_sched *sched)
         if (sched->state.event >= sched->max_events)
                 return false;
 
-        c = sched->events[sched->state.event]->hw.constraint;
+        c = sched->constraints[sched->state.event];
         /* Prefer fixed purpose counters */
         if (c->idxmsk64 & (~0ULL << INTEL_PMC_IDX_FIXED)) {
                 idx = INTEL_PMC_IDX_FIXED;
@@ -696,11 +713,16 @@ static bool __perf_sched_find_counter(struct perf_sched *sched)
                                 goto done;
                 }
         }
+
         /* Grab the first unused counter starting with idx */
         idx = sched->state.counter;
         for_each_set_bit_from(idx, c->idxmsk, INTEL_PMC_IDX_FIXED) {
-                if (!__test_and_set_bit(idx, sched->state.used))
+                if (!__test_and_set_bit(idx, sched->state.used)) {
+                        if (sched->state.nr_gp++ >= sched->max_gp)
+                                return false;
+
                         goto done;
+                }
         }
 
         return false;
@@ -745,7 +767,7 @@ static bool perf_sched_next_event(struct perf_sched *sched)
                         if (sched->state.weight > sched->max_weight)
                                 return false;
                 }
-                c = sched->events[sched->state.event]->hw.constraint;
+                c = sched->constraints[sched->state.event];
         } while (c->weight != sched->state.weight);
 
         sched->state.counter = 0;       /* start with first counter */
@@ -756,12 +778,12 @@ static bool perf_sched_next_event(struct perf_sched *sched)
 /*
  * Assign a counter for each event.
  */
-int perf_assign_events(struct perf_event **events, int n,
-                        int wmin, int wmax, int *assign)
+int perf_assign_events(struct event_constraint **constraints, int n,
+                        int wmin, int wmax, int gpmax, int *assign)
 {
         struct perf_sched sched;
 
-        perf_sched_init(&sched, events, n, wmin, wmax);
+        perf_sched_init(&sched, constraints, n, wmin, wmax, gpmax);
 
         do {
                 if (!perf_sched_find_counter(&sched))
@@ -788,9 +810,9 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
                 x86_pmu.start_scheduling(cpuc);
 
         for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i < n; i++) {
-                hwc = &cpuc->event_list[i]->hw;
+                cpuc->event_constraint[i] = NULL;
                 c = x86_pmu.get_event_constraints(cpuc, i, cpuc->event_list[i]);
-                hwc->constraint = c;
+                cpuc->event_constraint[i] = c;
 
                 wmin = min(wmin, c->weight);
                 wmax = max(wmax, c->weight);
@@ -801,7 +823,7 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
          */
         for (i = 0; i < n; i++) {
                 hwc = &cpuc->event_list[i]->hw;
-                c = hwc->constraint;
+                c = cpuc->event_constraint[i];
 
                 /* never assigned */
                 if (hwc->idx == -1)
@@ -821,9 +843,26 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
         }
 
         /* slow path */
-        if (i != n)
-                unsched = perf_assign_events(cpuc->event_list, n, wmin,
-                                             wmax, assign);
+        if (i != n) {
+                int gpmax = x86_pmu.num_counters;
+
+                /*
+                 * Do not allow scheduling of more than half the available
+                 * generic counters.
+                 *
+                 * This helps avoid counter starvation of sibling thread by
+                 * ensuring at most half the counters cannot be in exclusive
+                 * mode. There is no designated counters for the limits. Any
+                 * N/2 counters can be used. This helps with events with
+                 * specific counter constraints.
+                 */
+                if (is_ht_workaround_enabled() && !cpuc->is_fake &&
+                    READ_ONCE(cpuc->excl_cntrs->exclusive_present))
+                        gpmax /= 2;
+
+                unsched = perf_assign_events(cpuc->event_constraint, n, wmin,
+                                             wmax, gpmax, assign);
+        }
 
         /*
          * In case of success (unsched = 0), mark events as committed,
@@ -840,7 +879,7 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
                         e = cpuc->event_list[i];
                         e->hw.flags |= PERF_X86_EVENT_COMMITTED;
                         if (x86_pmu.commit_scheduling)
-                                x86_pmu.commit_scheduling(cpuc, e, assign[i]);
+                                x86_pmu.commit_scheduling(cpuc, i, assign[i]);
                 }
         }
 
@@ -1292,8 +1331,10 @@ static void x86_pmu_del(struct perf_event *event, int flags)
                 x86_pmu.put_event_constraints(cpuc, event);
 
         /* Delete the array entry. */
-        while (++i < cpuc->n_events)
+        while (++i < cpuc->n_events) {
                 cpuc->event_list[i-1] = cpuc->event_list[i];
+                cpuc->event_constraint[i-1] = cpuc->event_constraint[i];
+        }
         --cpuc->n_events;
 
         perf_event_update_userpage(event);
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index 6ac5cb7a9e14..ef78516850fb 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -74,6 +74,7 @@ struct event_constraint {
 #define PERF_X86_EVENT_EXCL             0x0040 /* HT exclusivity on counter */
 #define PERF_X86_EVENT_DYNAMIC          0x0080 /* dynamic alloc'd constraint */
 #define PERF_X86_EVENT_RDPMC_ALLOWED    0x0100 /* grant rdpmc permission */
+#define PERF_X86_EVENT_EXCL_ACCT        0x0200 /* accounted EXCL event */
 
 
 struct amd_nb {
@@ -134,8 +135,6 @@ enum intel_excl_state_type {
 struct intel_excl_states {
         enum intel_excl_state_type init_state[X86_PMC_IDX_MAX];
         enum intel_excl_state_type state[X86_PMC_IDX_MAX];
-        int  num_alloc_cntrs;/* #counters allocated */
-        int  max_alloc_cntrs;/* max #counters allowed */
         bool sched_started; /* true if scheduling has started */
 };
 
@@ -144,6 +143,11 @@ struct intel_excl_cntrs {
 
         struct intel_excl_states states[2];
 
+        union {
+                u16     has_exclusive[2];
+                u32     exclusive_present;
+        };
+
         int             refcnt;         /* per-core: #HT threads */
         unsigned        core_id;        /* per-core: core id */
 };
@@ -172,7 +176,11 @@ struct cpu_hw_events {
                                              added in the current transaction */
         int                     assign[X86_PMC_IDX_MAX]; /* event to counter assignment */
         u64                     tags[X86_PMC_IDX_MAX];
+
         struct perf_event       *event_list[X86_PMC_IDX_MAX]; /* in enabled order */
+        struct event_constraint *event_constraint[X86_PMC_IDX_MAX];
+
+        int                     n_excl; /* the number of exclusive events */
 
         unsigned int            group_flag;
         int                     is_fake;
@@ -519,9 +527,7 @@ struct x86_pmu {
         void            (*put_event_constraints)(struct cpu_hw_events *cpuc,
                                                  struct perf_event *event);
 
-        void            (*commit_scheduling)(struct cpu_hw_events *cpuc,
-                                             struct perf_event *event,
-                                             int cntr);
+        void            (*commit_scheduling)(struct cpu_hw_events *cpuc, int idx, int cntr);
 
         void            (*start_scheduling)(struct cpu_hw_events *cpuc);
 
@@ -717,8 +723,8 @@ static inline void __x86_pmu_enable_event(struct hw_perf_event *hwc,
 
 void x86_pmu_enable_all(int added);
 
-int perf_assign_events(struct perf_event **events, int n,
-                        int wmin, int wmax, int *assign);
+int perf_assign_events(struct event_constraint **constraints, int n,
+                        int wmin, int wmax, int gpmax, int *assign);
 int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign);
 
 void x86_pmu_stop(struct perf_event *event, int flags);
@@ -929,4 +935,8 @@ static inline struct intel_shared_regs *allocate_shared_regs(int cpu)
         return NULL;
 }
 
+static inline int is_ht_workaround_enabled(void)
+{
+        return 0;
+}
 #endif /* CONFIG_CPU_SUP_INTEL */
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 3998131d1a68..a1e35c9f06b9 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1923,7 +1923,6 @@ intel_start_scheduling(struct cpu_hw_events *cpuc)
         xl = &excl_cntrs->states[tid];
 
         xl->sched_started = true;
-        xl->num_alloc_cntrs = 0;
         /*
          * lock shared state until we are done scheduling
          * in stop_event_scheduling()
@@ -2000,6 +1999,11 @@ intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event,
          * across HT threads
          */
         is_excl = c->flags & PERF_X86_EVENT_EXCL;
+        if (is_excl && !(event->hw.flags & PERF_X86_EVENT_EXCL_ACCT)) {
+                event->hw.flags |= PERF_X86_EVENT_EXCL_ACCT;
+                if (!cpuc->n_excl++)
+                        WRITE_ONCE(excl_cntrs->has_exclusive[tid], 1);
+        }
 
         /*
          * xl = state of current HT
@@ -2008,18 +2012,6 @@ intel_get_excl_constraints(struct cpu_hw_events *cpuc, struct perf_event *event,
         xl = &excl_cntrs->states[tid];
         xlo = &excl_cntrs->states[o_tid];
 
-        /*
-         * do not allow scheduling of more than max_alloc_cntrs
-         * which is set to half the available generic counters.
-         * this helps avoid counter starvation of sibling thread
-         * by ensuring at most half the counters cannot be in
-         * exclusive mode. There is not designated counters for the
-         * limits. Any N/2 counters can be used. This helps with
-         * events with specifix counter constraints
-         */
-        if (xl->num_alloc_cntrs++ == xl->max_alloc_cntrs)
-                return &emptyconstraint;
-
         cx = c;
 
         /*
@@ -2106,7 +2098,7 @@ static struct event_constraint *
 intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
                             struct perf_event *event)
 {
-        struct event_constraint *c1 = event->hw.constraint;
+        struct event_constraint *c1 = cpuc->event_constraint[idx];
         struct event_constraint *c2;
 
         /*
@@ -2150,6 +2142,11 @@ static void intel_put_excl_constraints(struct cpu_hw_events *cpuc,
 
         xl = &excl_cntrs->states[tid];
         xlo = &excl_cntrs->states[o_tid];
+        if (hwc->flags & PERF_X86_EVENT_EXCL_ACCT) {
+                hwc->flags &= ~PERF_X86_EVENT_EXCL_ACCT;
+                if (!--cpuc->n_excl)
+                        WRITE_ONCE(excl_cntrs->has_exclusive[tid], 0);
+        }
 
         /*
          * put_constraint may be called from x86_schedule_events()
@@ -2188,8 +2185,6 @@ intel_put_shared_regs_event_constraints(struct cpu_hw_events *cpuc,
 static void intel_put_event_constraints(struct cpu_hw_events *cpuc,
                                         struct perf_event *event)
 {
-        struct event_constraint *c = event->hw.constraint;
-
         intel_put_shared_regs_event_constraints(cpuc, event);
 
         /*
@@ -2197,19 +2192,14 @@ static void intel_put_event_constraints(struct cpu_hw_events *cpuc,
          * all events are subject to and must call the
          * put_excl_constraints() routine
          */
-        if (c && cpuc->excl_cntrs)
+        if (cpuc->excl_cntrs)
                 intel_put_excl_constraints(cpuc, event);
-
-        /* cleanup dynamic constraint */
-        if (c && (c->flags & PERF_X86_EVENT_DYNAMIC))
-                event->hw.constraint = NULL;
 }
 
-static void intel_commit_scheduling(struct cpu_hw_events *cpuc,
-                                    struct perf_event *event, int cntr)
+static void intel_commit_scheduling(struct cpu_hw_events *cpuc, int idx, int cntr)
 {
         struct intel_excl_cntrs *excl_cntrs = cpuc->excl_cntrs;
-        struct event_constraint *c = event->hw.constraint;
+        struct event_constraint *c = cpuc->event_constraint[idx];
         struct intel_excl_states *xlo, *xl;
         int tid = cpuc->excl_thread_id;
         int o_tid = 1 - tid;
@@ -2639,8 +2629,6 @@ static void intel_pmu_cpu_starting(int cpu)
                 cpuc->lbr_sel = &cpuc->shared_regs->regs[EXTRA_REG_LBR];
 
         if (x86_pmu.flags & PMU_FL_EXCL_CNTRS) {
-                int h = x86_pmu.num_counters >> 1;
-
                 for_each_cpu(i, topology_thread_cpumask(cpu)) {
                         struct intel_excl_cntrs *c;
 
@@ -2654,11 +2642,6 @@ static void intel_pmu_cpu_starting(int cpu)
                 }
                 cpuc->excl_cntrs->core_id = core_id;
                 cpuc->excl_cntrs->refcnt++;
-                /*
-                 * set hard limit to half the number of generic counters
-                 */
-                cpuc->excl_cntrs->states[0].max_alloc_cntrs = h;
-                cpuc->excl_cntrs->states[1].max_alloc_cntrs = h;
         }
 }
 
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 813f75d71175..7f73b3553e2e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -706,9 +706,9 @@ void intel_pmu_pebs_disable(struct perf_event *event)
 
         cpuc->pebs_enabled &= ~(1ULL << hwc->idx);
 
-        if (event->hw.constraint->flags & PERF_X86_EVENT_PEBS_LDLAT)
+        if (event->hw.flags & PERF_X86_EVENT_PEBS_LDLAT)
                 cpuc->pebs_enabled &= ~(1ULL << (hwc->idx + 32));
-        else if (event->hw.constraint->flags & PERF_X86_EVENT_PEBS_ST)
+        else if (event->hw.flags & PERF_X86_EVENT_PEBS_ST)
                 cpuc->pebs_enabled &= ~(1ULL << 63);
 
         if (cpuc->enabled)
diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
index ffe666c2c6b5..123ff1bb2f60 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
@@ -151,7 +151,7 @@ static int __init pt_pmu_hw_init(void)
 
                 de_attr->attr.attr.name = pt_caps[i].name;
 
-                sysfs_attr_init(&de_attrs->attr.attr);
+                sysfs_attr_init(&de_attr->attr.attr);
 
                 de_attr->attr.attr.mode         = S_IRUGO;
                 de_attr->attr.show              = pt_cap_show;
@@ -615,7 +615,8 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf,
                                    struct perf_output_handle *handle)
 
 {
-        unsigned long idx, npages, end;
+        unsigned long head = local64_read(&buf->head);
+        unsigned long idx, npages, wakeup;
 
         if (buf->snapshot)
                 return 0;
@@ -634,17 +635,26 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf,
         buf->topa_index[buf->stop_pos]->stop = 0;
         buf->topa_index[buf->intr_pos]->intr = 0;
 
-        if (pt_cap_get(PT_CAP_topa_multiple_entries)) {
-                npages = (handle->size + 1) >> PAGE_SHIFT;
-                end = (local64_read(&buf->head) >> PAGE_SHIFT) + npages;
-                /*if (end > handle->wakeup >> PAGE_SHIFT)
-                  end = handle->wakeup >> PAGE_SHIFT;*/
-                idx = end & (buf->nr_pages - 1);
-                buf->stop_pos = idx;
-                idx = (local64_read(&buf->head) >> PAGE_SHIFT) + npages - 1;
-                idx &= buf->nr_pages - 1;
-                buf->intr_pos = idx;
-        }
+        /* how many pages till the STOP marker */
+        npages = handle->size >> PAGE_SHIFT;
+
+        /* if it's on a page boundary, fill up one more page */
+        if (!offset_in_page(head + handle->size + 1))
+                npages++;
+
+        idx = (head >> PAGE_SHIFT) + npages;
+        idx &= buf->nr_pages - 1;
+        buf->stop_pos = idx;
+
+        wakeup = handle->wakeup >> PAGE_SHIFT;
+
+        /* in the worst case, wake up the consumer one page before hard stop */
+        idx = (head >> PAGE_SHIFT) + npages - 1;
+        if (idx > wakeup)
+                idx = wakeup;
+
+        idx &= buf->nr_pages - 1;
+        buf->intr_pos = idx;
 
         buf->topa_index[buf->stop_pos]->stop = 1;
         buf->topa_index[buf->intr_pos]->intr = 1;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index c635b8b49e93..90b7c501c95b 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -365,9 +365,8 @@ static int uncore_assign_events(struct intel_uncore_box *box, int assign[], int
         bitmap_zero(used_mask, UNCORE_PMC_IDX_MAX);
 
         for (i = 0, wmin = UNCORE_PMC_IDX_MAX, wmax = 0; i < n; i++) {
-                hwc = &box->event_list[i]->hw;
                 c = uncore_get_event_constraint(box, box->event_list[i]);
-                hwc->constraint = c;
+                box->event_constraint[i] = c;
                 wmin = min(wmin, c->weight);
                 wmax = max(wmax, c->weight);
         }
@@ -375,7 +374,7 @@ static int uncore_assign_events(struct intel_uncore_box *box, int assign[], int
         /* fastpath, try to reuse previous register */
         for (i = 0; i < n; i++) {
                 hwc = &box->event_list[i]->hw;
-                c = hwc->constraint;
+                c = box->event_constraint[i];
 
                 /* never assigned */
                 if (hwc->idx == -1)
@@ -395,8 +394,8 @@ static int uncore_assign_events(struct intel_uncore_box *box, int assign[], int
         }
         /* slow path */
         if (i != n)
-                ret = perf_assign_events(box->event_list, n,
-                                         wmin, wmax, assign);
+                ret = perf_assign_events(box->event_constraint, n,
+                                         wmin, wmax, n, assign);
 
         if (!assign || ret) {
                 for (i = 0; i < n; i++)
@@ -840,6 +839,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id
         box->phys_id = phys_id;
         box->pci_dev = pdev;
         box->pmu = pmu;
+        uncore_box_init(box);
         pci_set_drvdata(pdev, box);
 
         raw_spin_lock(&uncore_box_lock);
@@ -1003,8 +1003,10 @@ static int uncore_cpu_starting(int cpu)
                         pmu = &type->pmus[j];
                         box = *per_cpu_ptr(pmu->box, cpu);
                         /* called by uncore_cpu_init? */
-                        if (box && box->phys_id >= 0)
+                        if (box && box->phys_id >= 0) {
+                                uncore_box_init(box);
                                 continue;
+                        }
 
                         for_each_online_cpu(k) {
                                 exist = *per_cpu_ptr(pmu->box, k);
@@ -1020,8 +1022,10 @@ static int uncore_cpu_starting(int cpu)
                                 }
                         }
 
-                        if (box)
+                        if (box) {
                                 box->phys_id = phys_id;
+                                uncore_box_init(box);
+                        }
                 }
         }
         return 0;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 6c8c1e7e69d8..ceac8f5dc018 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -97,6 +97,7 @@ struct intel_uncore_box {
         atomic_t refcnt;
         struct perf_event *events[UNCORE_PMC_IDX_MAX];
         struct perf_event *event_list[UNCORE_PMC_IDX_MAX];
+        struct event_constraint *event_constraint[UNCORE_PMC_IDX_MAX];
         unsigned long active_mask[BITS_TO_LONGS(UNCORE_PMC_IDX_MAX)];
         u64 tags[UNCORE_PMC_IDX_MAX];
         struct pci_dev *pci_dev;
@@ -257,14 +258,6 @@ static inline int uncore_num_counters(struct intel_uncore_box *box)
         return box->pmu->type->num_counters;
 }
 
-static inline void uncore_box_init(struct intel_uncore_box *box)
-{
-        if (!test_and_set_bit(UNCORE_BOX_FLAG_INITIATED, &box->flags)) {
-                if (box->pmu->type->ops->init_box)
-                        box->pmu->type->ops->init_box(box);
-        }
-}
-
 static inline void uncore_disable_box(struct intel_uncore_box *box)
 {
         if (box->pmu->type->ops->disable_box)
@@ -273,8 +266,6 @@ static inline void uncore_disable_box(struct intel_uncore_box *box)
 
 static inline void uncore_enable_box(struct intel_uncore_box *box)
 {
-        uncore_box_init(box);
-
         if (box->pmu->type->ops->enable_box)
                 box->pmu->type->ops->enable_box(box);
 }
@@ -297,6 +288,14 @@ static inline u64 uncore_read_counter(struct intel_uncore_box *box,
         return box->pmu->type->ops->read_counter(box, event);
 }
 
+static inline void uncore_box_init(struct intel_uncore_box *box)
+{
+        if (!test_and_set_bit(UNCORE_BOX_FLAG_INITIATED, &box->flags)) {
+                if (box->pmu->type->ops->init_box)
+                        box->pmu->type->ops->init_box(box);
+        }
+}
+
 static inline bool uncore_box_is_fake(struct intel_uncore_box *box)
 {
         return (box->phys_id < 0);
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 12d9548457e7..6d6e85dd5849 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -164,8 +164,8 @@
                                 ((1ULL << (n)) - 1)))
 
 /* Haswell-EP Ubox */
-#define HSWEP_U_MSR_PMON_CTR0                   0x705
-#define HSWEP_U_MSR_PMON_CTL0                   0x709
+#define HSWEP_U_MSR_PMON_CTR0                   0x709
+#define HSWEP_U_MSR_PMON_CTL0                   0x705
 #define HSWEP_U_MSR_PMON_FILTER                 0x707
 
 #define HSWEP_U_MSR_PMON_UCLK_FIXED_CTL         0x703
@@ -1914,7 +1914,7 @@ static struct intel_uncore_type hswep_uncore_cbox = {
         .name                   = "cbox",
         .num_counters           = 4,
         .num_boxes              = 18,
-        .perf_ctr_bits          = 44,
+        .perf_ctr_bits          = 48,
         .event_ctl              = HSWEP_C0_MSR_PMON_CTL0,
         .perf_ctr               = HSWEP_C0_MSR_PMON_CTR0,
         .event_mask             = SNBEP_CBO_MSR_PMON_RAW_EVENT_MASK,
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 2b55ee6db053..5a4668136e98 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -167,7 +167,7 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
         clear_bss();
 
         for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
-                set_intr_gate(i, early_idt_handlers[i]);
+                set_intr_gate(i, early_idt_handler_array[i]);
         load_idt((const struct desc_ptr *)&idt_descr);
 
         copy_bootdata(__va(real_mode_data));
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index d031bad9e07e..53eeb226657c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -478,21 +478,22 @@ is486:
 __INIT
 setup_once:
         /*
-         * Set up a idt with 256 entries pointing to ignore_int,
-         * interrupt gates. It doesn't actually load idt - that needs
-         * to be done on each CPU. Interrupts are enabled elsewhere,
-         * when we can be relatively sure everything is ok.
+         * Set up a idt with 256 interrupt gates that push zero if there
+         * is no error code and then jump to early_idt_handler_common.
+         * It doesn't actually load the idt - that needs to be done on
+         * each CPU. Interrupts are enabled elsewhere, when we can be
+         * relatively sure everything is ok.
          */
 
         movl $idt_table,%edi
-        movl $early_idt_handlers,%eax
+        movl $early_idt_handler_array,%eax
         movl $NUM_EXCEPTION_VECTORS,%ecx
 1:
         movl %eax,(%edi)
         movl %eax,4(%edi)
         /* interrupt gate, dpl=0, present */
         movl $(0x8E000000 + __KERNEL_CS),2(%edi)
-        addl $9,%eax
+        addl $EARLY_IDT_HANDLER_SIZE,%eax
         addl $8,%edi
         loop 1b
 
@@ -524,26 +525,28 @@ setup_once:
         andl $0,setup_once_ref  /* Once is enough, thanks */
         ret
 
-ENTRY(early_idt_handlers)
+ENTRY(early_idt_handler_array)
         # 36(%esp) %eflags
         # 32(%esp) %cs
         # 28(%esp) %eip
         # 24(%rsp) error code
         i = 0
         .rept NUM_EXCEPTION_VECTORS
-        .if (EXCEPTION_ERRCODE_MASK >> i) & 1
-        ASM_NOP2
-        .else
+        .ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1
         pushl $0                # Dummy error code, to make stack frame uniform
         .endif
         pushl $i                # 20(%esp) Vector number
-        jmp early_idt_handler
+        jmp early_idt_handler_common
         i = i + 1
+        .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc
         .endr
-ENDPROC(early_idt_handlers)
+ENDPROC(early_idt_handler_array)
         
-        /* This is global to keep gas from relaxing the jumps */
-ENTRY(early_idt_handler)
+early_idt_handler_common:
+        /*
+         * The stack is the hardware frame, an error code or zero, and the
+         * vector number.
+         */
         cld
 
         cmpl $2,(%esp)          # X86_TRAP_NMI
@@ -603,7 +606,7 @@ ex_entry:
 is_nmi:
         addl $8,%esp            /* drop vector number and error code */
         iret
-ENDPROC(early_idt_handler)
+ENDPROC(early_idt_handler_common)
 
 /* This is the default interrupt "handler" :-) */
         ALIGN
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index ae6588b301c2..df7e78057ae0 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -321,26 +321,28 @@ bad_address:
         jmp bad_address
 
         __INIT
-        .globl early_idt_handlers
-early_idt_handlers:
+ENTRY(early_idt_handler_array)
         # 104(%rsp) %rflags
         #  96(%rsp) %cs
         #  88(%rsp) %rip
         #  80(%rsp) error code
         i = 0
         .rept NUM_EXCEPTION_VECTORS
-        .if (EXCEPTION_ERRCODE_MASK >> i) & 1
-        ASM_NOP2
-        .else
+        .ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1
         pushq $0                # Dummy error code, to make stack frame uniform
         .endif
         pushq $i                # 72(%rsp) Vector number
-        jmp early_idt_handler
+        jmp early_idt_handler_common
         i = i + 1
+        .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc
         .endr
+ENDPROC(early_idt_handler_array)
 
-/* This is global to keep gas from relaxing the jumps */
-ENTRY(early_idt_handler)
+early_idt_handler_common:
+        /*
+         * The stack is the hardware frame, an error code or zero, and the
+         * vector number.
+         */
         cld
 
         cmpl $2,(%rsp)          # X86_TRAP_NMI
@@ -412,7 +414,7 @@ ENTRY(early_idt_handler)
 is_nmi:
         addq $16,%rsp           # drop vector number and error code
         INTERRUPT_RETURN
-ENDPROC(early_idt_handler)
+ENDPROC(early_idt_handler_common)
 
         __INITDATA
 
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 44a7d2515497..b73337634214 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -4215,13 +4215,13 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
         u64 entry, gentry, *spte;
         int npte;
         bool remote_flush, local_flush, zap_page;
-        union kvm_mmu_page_role mask = (union kvm_mmu_page_role) {
-                .cr0_wp = 1,
-                .cr4_pae = 1,
-                .nxe = 1,
-                .smep_andnot_wp = 1,
-                .smap_andnot_wp = 1,
-        };
+        union kvm_mmu_page_role mask = { };
+
+        mask.cr0_wp = 1;
+        mask.cr4_pae = 1;
+        mask.nxe = 1;
+        mask.smep_andnot_wp = 1;
+        mask.smap_andnot_wp = 1;
 
         /*
          * If we don't have indirect shadow pages, it means no page is
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e68b71b85a7e..594eea04266e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1600,6 +1600,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action,
         return NOTIFY_OK;
 }
 
+/* hctx->ctxs will be freed in queue's release handler */
 static void blk_mq_exit_hctx(struct request_queue *q,
                 struct blk_mq_tag_set *set,
                 struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx)
@@ -1618,7 +1619,6 @@ static void blk_mq_exit_hctx(struct request_queue *q,
 
         blk_mq_unregister_cpu_notifier(&hctx->cpu_notifier);
         blk_free_flush_queue(hctx->fq);
-        kfree(hctx->ctxs);
         blk_mq_free_bitmap(&hctx->ctx_map);
 }
 
@@ -1891,8 +1891,12 @@ void blk_mq_release(struct request_queue *q)
         unsigned int i;
 
         /* hctx kobj stays in hctx */
-        queue_for_each_hw_ctx(q, hctx, i)
+        queue_for_each_hw_ctx(q, hctx, i) {
+                if (!hctx)
+                        continue;
+                kfree(hctx->ctxs);
                 kfree(hctx);
+        }
 
         kfree(q->queue_hw_ctx);
 
diff --git a/block/genhd.c b/block/genhd.c
index 0a536dc05f3b..ea982eadaf63 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -422,9 +422,9 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt)
         /* allocate ext devt */
         idr_preload(GFP_KERNEL);
 
-        spin_lock(&ext_devt_lock);
+        spin_lock_bh(&ext_devt_lock);
         idx = idr_alloc(&ext_devt_idr, part, 0, NR_EXT_DEVT, GFP_NOWAIT);
-        spin_unlock(&ext_devt_lock);
+        spin_unlock_bh(&ext_devt_lock);
 
         idr_preload_end();
         if (idx < 0)
@@ -449,9 +449,9 @@ void blk_free_devt(dev_t devt)
                 return;
 
         if (MAJOR(devt) == BLOCK_EXT_MAJOR) {
-                spin_lock(&ext_devt_lock);
+                spin_lock_bh(&ext_devt_lock);
                 idr_remove(&ext_devt_idr, blk_mangle_minor(MINOR(devt)));
-                spin_unlock(&ext_devt_lock);
+                spin_unlock_bh(&ext_devt_lock);
         }
 }
 
@@ -653,7 +653,6 @@ void del_gendisk(struct gendisk *disk)
         disk->flags &= ~GENHD_FL_UP;
 
         sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
-        bdi_unregister(&disk->queue->backing_dev_info);
         blk_unregister_queue(disk);
         blk_unregister_region(disk_devt(disk), disk->minors);
 
@@ -691,13 +690,13 @@ struct gendisk *get_gendisk(dev_t devt, int *partno)
         } else {
                 struct hd_struct *part;
 
-                spin_lock(&ext_devt_lock);
+                spin_lock_bh(&ext_devt_lock);
                 part = idr_find(&ext_devt_idr, blk_mangle_minor(MINOR(devt)));
                 if (part && get_disk(part_to_disk(part))) {
                         *partno = part->partno;
                         disk = part_to_disk(part);
                 }
-                spin_unlock(&ext_devt_lock);
+                spin_unlock_bh(&ext_devt_lock);
         }
 
         return disk;
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 23716dd8a7ec..5928d0746a27 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -45,7 +45,7 @@ static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv,
                 writel((cs->mbus_attr << 8) |
                        (dram->mbus_dram_target_id << 4) | 1,
                        hpriv->mmio + AHCI_WINDOW_CTRL(i));
-                writel(cs->base, hpriv->mmio + AHCI_WINDOW_BASE(i));
+                writel(cs->base >> 16, hpriv->mmio + AHCI_WINDOW_BASE(i));
                 writel(((cs->size - 1) & 0xffff0000),
                        hpriv->mmio + AHCI_WINDOW_SIZE(i));
         }
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 80a80548ad0a..27245957eee3 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -1053,7 +1053,7 @@ static struct of_device_id octeon_cf_match[] = {
         },
         {},
 };
-MODULE_DEVICE_TABLE(of, octeon_i2c_match);
+MODULE_DEVICE_TABLE(of, octeon_cf_match);
 
 static struct platform_driver octeon_cf_driver = {
         .probe          = octeon_cf_probe,
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 9c2ba1c97c42..df0c66cb7ad3 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -179,7 +179,7 @@ static int detect_cache_attributes(unsigned int cpu)
 {
         int ret;
 
-        if (init_cache_level(cpu))
+        if (init_cache_level(cpu) || !cache_leaves(cpu))
                 return -ENOENT;
 
         per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu),
diff --git a/drivers/base/init.c b/drivers/base/init.c
index da033d3bab3c..48c0e220acc0 100644
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -8,6 +8,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/memory.h>
+#include <linux/of.h>
 
 #include "base.h"
 
@@ -34,4 +35,5 @@ void __init driver_init(void)
         cpu_dev_init();
         memory_dev_init();
         container_dev_init();
+        of_core_init();
 }
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index eb1fed5bd516..3ccef9eba6f9 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -406,6 +406,7 @@ config BLK_DEV_RAM_DAX
 
 config BLK_DEV_PMEM
         tristate "Persistent memory block device support"
+        depends on HAS_IOMEM
         help
           Saying Y here will allow you to use a contiguous range of reserved
           memory as one or more persistent block devices.
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 85b8036deaa3..683dff272562 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1750,6 +1750,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         struct nvme_iod *iod;
         dma_addr_t meta_dma = 0;
         void *meta = NULL;
+        void __user *metadata;
 
         if (copy_from_user(&io, uio, sizeof(io)))
                 return -EFAULT;
@@ -1763,6 +1764,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
                 meta_len = 0;
         }
 
+        metadata = (void __user *)(unsigned long)io.metadata;
+
         write = io.opcode & 1;
 
         switch (io.opcode) {
@@ -1786,13 +1789,13 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         if (meta_len) {
                 meta = dma_alloc_coherent(&dev->pci_dev->dev, meta_len,
                                                 &meta_dma, GFP_KERNEL);
+
                 if (!meta) {
                         status = -ENOMEM;
                         goto unmap;
                 }
                 if (write) {
-                        if (copy_from_user(meta, (void __user *)io.metadata,
-                                                                meta_len)) {
+                        if (copy_from_user(meta, metadata, meta_len)) {
                                 status = -EFAULT;
                                 goto unmap;
                         }
@@ -1819,8 +1822,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
         nvme_free_iod(dev, iod);
         if (meta) {
                 if (status == NVME_SC_SUCCESS && !write) {
-                        if (copy_to_user((void __user *)io.metadata, meta,
-                                                                meta_len))
+                        if (copy_to_user(metadata, meta, meta_len))
                                 status = -EFAULT;
                 }
                 dma_free_coherent(&dev->pci_dev->dev, meta_len, meta, meta_dma);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 8dcbced0eafd..6e134f4759c0 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -805,7 +805,9 @@ static void zram_reset_device(struct zram *zram)
         memset(&zram->stats, 0, sizeof(zram->stats));
         zram->disksize = 0;
         zram->max_comp_streams = 1;
+
         set_capacity(zram->disk, 0);
+        part_stat_set_all(&zram->disk->part0, 0);
 
         up_write(&zram->init_lock);
         /* I/O operation under all of CPU are done so let's free */
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index fb9ec6221730..6f047dcb94c2 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -58,7 +58,6 @@
 #include <linux/debugfs.h>
 #include <linux/log2.h>
 #include <linux/syscore_ops.h>
-#include <linux/memblock.h>
 
 /*
  * DDR target is the same on all platforms.
@@ -70,6 +69,7 @@
  */
 #define WIN_CTRL_OFF            0x0000
 #define   WIN_CTRL_ENABLE       BIT(0)
+/* Only on HW I/O coherency capable platforms */
 #define   WIN_CTRL_SYNCBARRIER  BIT(1)
 #define   WIN_CTRL_TGT_MASK     0xf0
 #define   WIN_CTRL_TGT_SHIFT    4
@@ -102,9 +102,7 @@
 
 /* Relative to mbusbridge_base */
 #define MBUS_BRIDGE_CTRL_OFF    0x0
-#define  MBUS_BRIDGE_SIZE_MASK  0xffff0000
 #define MBUS_BRIDGE_BASE_OFF    0x4
-#define  MBUS_BRIDGE_BASE_MASK  0xffff0000
 
 /* Maximum number of windows, for all known platforms */
 #define MBUS_WINS_MAX           20
@@ -323,8 +321,9 @@ static int mvebu_mbus_setup_window(struct mvebu_mbus_state *mbus,
         ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) |
                 (attr << WIN_CTRL_ATTR_SHIFT)    |
                 (target << WIN_CTRL_TGT_SHIFT)   |
-                WIN_CTRL_SYNCBARRIER             |
                 WIN_CTRL_ENABLE;
+        if (mbus->hw_io_coherency)
+                ctrl |= WIN_CTRL_SYNCBARRIER;
 
         writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF);
         writel(ctrl, addr + WIN_CTRL_OFF);
@@ -577,106 +576,36 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win)
                 return MVEBU_MBUS_NO_REMAP;
 }
 
-/*
- * Use the memblock information to find the MBus bridge hole in the
- * physical address space.
- */
-static void __init
-mvebu_mbus_find_bridge_hole(uint64_t *start, uint64_t *end)
-{
-        struct memblock_region *r;
-        uint64_t s = 0;
-
-        for_each_memblock(memory, r) {
-                /*
-                 * This part of the memory is above 4 GB, so we don't
-                 * care for the MBus bridge hole.
-                 */
-                if (r->base >= 0x100000000)
-                        continue;
-
-                /*
-                 * The MBus bridge hole is at the end of the RAM under
-                 * the 4 GB limit.
-                 */
-                if (r->base + r->size > s)
-                        s = r->base + r->size;
-        }
-
-        *start = s;
-        *end = 0x100000000;
-}
-
 static void __init
 mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
 {
         int i;
         int cs;
-        uint64_t mbus_bridge_base, mbus_bridge_end;
 
         mvebu_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
 
-        mvebu_mbus_find_bridge_hole(&mbus_bridge_base, &mbus_bridge_end);
-
         for (i = 0, cs = 0; i < 4; i++) {
-                u64 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i));
-                u64 size = readl(mbus->sdramwins_base + DDR_SIZE_CS_OFF(i));
-                u64 end;
-                struct mbus_dram_window *w;
-
-                /* Ignore entries that are not enabled */
-                if (!(size & DDR_SIZE_ENABLED))
-                        continue;
-
-                /*
-                 * Ignore entries whose base address is above 2^32,
-                 * since devices cannot DMA to such high addresses
-                 */
-                if (base & DDR_BASE_CS_HIGH_MASK)
-                        continue;
-
-                base = base & DDR_BASE_CS_LOW_MASK;
-                size = (size | ~DDR_SIZE_MASK) + 1;
-                end = base + size;
-
-                /*
-                 * Adjust base/size of the current CS to make sure it
-                 * doesn't overlap with the MBus bridge hole. This is
-                 * particularly important for devices that do DMA from
-                 * DRAM to a SRAM mapped in a MBus window, such as the
-                 * CESA cryptographic engine.
-                 */
+                u32 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i));
+                u32 size = readl(mbus->sdramwins_base + DDR_SIZE_CS_OFF(i));
 
                 /*
-                 * The CS is fully enclosed inside the MBus bridge
-                 * area, so ignore it.
+                 * We only take care of entries for which the chip
+                 * select is enabled, and that don't have high base
+                 * address bits set (devices can only access the first
+                 * 32 bits of the memory).
                  */
-                if (base >= mbus_bridge_base && end <= mbus_bridge_end)
-                        continue;
+                if ((size & DDR_SIZE_ENABLED) &&
+                    !(base & DDR_BASE_CS_HIGH_MASK)) {
+                        struct mbus_dram_window *w;
 
-                /*
-                 * Beginning of CS overlaps with end of MBus, raise CS
-                 * base address, and shrink its size.
-                 */
-                if (base >= mbus_bridge_base && end > mbus_bridge_end) {
-                        size -= mbus_bridge_end - base;
-                        base = mbus_bridge_end;
+                        w = &mvebu_mbus_dram_info.cs[cs++];
+                        w->cs_index = i;
+                        w->mbus_attr = 0xf & ~(1 << i);
+                        if (mbus->hw_io_coherency)
+                                w->mbus_attr |= ATTR_HW_COHERENCY;
+                        w->base = base & DDR_BASE_CS_LOW_MASK;
+                        w->size = (size | ~DDR_SIZE_MASK) + 1;
                 }
-
-                /*
-                 * End of CS overlaps with beginning of MBus, shrink
-                 * CS size.
-                 */
-                if (base < mbus_bridge_base && end > mbus_bridge_base)
-                        size -= end - mbus_bridge_base;
-
-                w = &mvebu_mbus_dram_info.cs[cs++];
-                w->cs_index = i;
-                w->mbus_attr = 0xf & ~(1 << i);
-                if (mbus->hw_io_coherency)
-                        w->mbus_attr |= ATTR_HW_COHERENCY;
-                w->base = base;
-                w->size = size;
         }
         mvebu_mbus_dram_info.num_cs = cs;
 }
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 933e4b338459..7992164ea9ec 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -174,6 +174,8 @@
 #define AT_XDMAC_MBR_UBC_NDV3           (0x3 << 27)     /* Next Descriptor View 3 */
 
 #define AT_XDMAC_MAX_CHAN       0x20
+#define AT_XDMAC_MAX_CSIZE      16      /* 16 data */
+#define AT_XDMAC_MAX_DWIDTH     8       /* 64 bits */
 
 #define AT_XDMAC_DMA_BUSWIDTHS\
         (BIT(DMA_SLAVE_BUSWIDTH_UNDEFINED) |\
@@ -192,20 +194,17 @@ struct at_xdmac_chan {
         struct dma_chan                 chan;
         void __iomem                    *ch_regs;
         u32                             mask;           /* Channel Mask */
-        u32                             cfg[2];         /* Channel Configuration Register */
-        #define AT_XDMAC_DEV_TO_MEM_CFG 0               /* Predifined dev to mem channel conf */
-        #define AT_XDMAC_MEM_TO_DEV_CFG 1               /* Predifined mem to dev channel conf */
+        u32                             cfg;            /* Channel Configuration Register */
         u8                              perid;          /* Peripheral ID */
         u8                              perif;          /* Peripheral Interface */
         u8                              memif;          /* Memory Interface */
-        u32                             per_src_addr;
-        u32                             per_dst_addr;
         u32                             save_cc;
         u32                             save_cim;
         u32                             save_cnda;
         u32                             save_cndc;
         unsigned long                   status;
         struct tasklet_struct           tasklet;
+        struct dma_slave_config         sconfig;
 
         spinlock_t                      lock;
 
@@ -415,8 +414,9 @@ static dma_cookie_t at_xdmac_tx_submit(struct dma_async_tx_descriptor *tx)
         struct at_xdmac_desc    *desc = txd_to_at_desc(tx);
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(tx->chan);
         dma_cookie_t            cookie;
+        unsigned long           irqflags;
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, irqflags);
         cookie = dma_cookie_assign(tx);
 
         dev_vdbg(chan2dev(tx->chan), "%s: atchan 0x%p, add desc 0x%p to xfers_list\n",
@@ -425,7 +425,7 @@ static dma_cookie_t at_xdmac_tx_submit(struct dma_async_tx_descriptor *tx)
         if (list_is_singular(&atchan->xfers_list))
                 at_xdmac_start_xfer(atchan, desc);
 
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, irqflags);
         return cookie;
 }
 
@@ -494,61 +494,94 @@ static struct dma_chan *at_xdmac_xlate(struct of_phandle_args *dma_spec,
         return chan;
 }
 
+static int at_xdmac_compute_chan_conf(struct dma_chan *chan,
+                                      enum dma_transfer_direction direction)
+{
+        struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
+        int                     csize, dwidth;
+
+        if (direction == DMA_DEV_TO_MEM) {
+                atchan->cfg =
+                        AT91_XDMAC_DT_PERID(atchan->perid)
+                        | AT_XDMAC_CC_DAM_INCREMENTED_AM
+                        | AT_XDMAC_CC_SAM_FIXED_AM
+                        | AT_XDMAC_CC_DIF(atchan->memif)
+                        | AT_XDMAC_CC_SIF(atchan->perif)
+                        | AT_XDMAC_CC_SWREQ_HWR_CONNECTED
+                        | AT_XDMAC_CC_DSYNC_PER2MEM
+                        | AT_XDMAC_CC_MBSIZE_SIXTEEN
+                        | AT_XDMAC_CC_TYPE_PER_TRAN;
+                csize = ffs(atchan->sconfig.src_maxburst) - 1;
+                if (csize < 0) {
+                        dev_err(chan2dev(chan), "invalid src maxburst value\n");
+                        return -EINVAL;
+                }
+                atchan->cfg |= AT_XDMAC_CC_CSIZE(csize);
+                dwidth = ffs(atchan->sconfig.src_addr_width) - 1;
+                if (dwidth < 0) {
+                        dev_err(chan2dev(chan), "invalid src addr width value\n");
+                        return -EINVAL;
+                }
+                atchan->cfg |= AT_XDMAC_CC_DWIDTH(dwidth);
+        } else if (direction == DMA_MEM_TO_DEV) {
+                atchan->cfg =
+                        AT91_XDMAC_DT_PERID(atchan->perid)
+                        | AT_XDMAC_CC_DAM_FIXED_AM
+                        | AT_XDMAC_CC_SAM_INCREMENTED_AM
+                        | AT_XDMAC_CC_DIF(atchan->perif)
+                        | AT_XDMAC_CC_SIF(atchan->memif)
+                        | AT_XDMAC_CC_SWREQ_HWR_CONNECTED
+                        | AT_XDMAC_CC_DSYNC_MEM2PER
+                        | AT_XDMAC_CC_MBSIZE_SIXTEEN
+                        | AT_XDMAC_CC_TYPE_PER_TRAN;
+                csize = ffs(atchan->sconfig.dst_maxburst) - 1;
+                if (csize < 0) {
+                        dev_err(chan2dev(chan), "invalid src maxburst value\n");
+                        return -EINVAL;
+                }
+                atchan->cfg |= AT_XDMAC_CC_CSIZE(csize);
+                dwidth = ffs(atchan->sconfig.dst_addr_width) - 1;
+                if (dwidth < 0) {
+                        dev_err(chan2dev(chan), "invalid dst addr width value\n");
+                        return -EINVAL;
+                }
+                atchan->cfg |= AT_XDMAC_CC_DWIDTH(dwidth);
+        }
+
+        dev_dbg(chan2dev(chan), "%s: cfg=0x%08x\n", __func__, atchan->cfg);
+
+        return 0;
+}
+
+/*
+ * Only check that maxburst and addr width values are supported by the
+ * the controller but not that the configuration is good to perform the
+ * transfer since we don't know the direction at this stage.
+ */
+static int at_xdmac_check_slave_config(struct dma_slave_config *sconfig)
+{
+        if ((sconfig->src_maxburst > AT_XDMAC_MAX_CSIZE)
+            || (sconfig->dst_maxburst > AT_XDMAC_MAX_CSIZE))
+                return -EINVAL;
+
+        if ((sconfig->src_addr_width > AT_XDMAC_MAX_DWIDTH)
+            || (sconfig->dst_addr_width > AT_XDMAC_MAX_DWIDTH))
+                return -EINVAL;
+
+        return 0;
+}
+
 static int at_xdmac_set_slave_config(struct dma_chan *chan,
                                       struct dma_slave_config *sconfig)
 {
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
-        u8 dwidth;
-        int csize;
 
-        atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG] =
-                AT91_XDMAC_DT_PERID(atchan->perid)
-                | AT_XDMAC_CC_DAM_INCREMENTED_AM
-                | AT_XDMAC_CC_SAM_FIXED_AM
-                | AT_XDMAC_CC_DIF(atchan->memif)
-                | AT_XDMAC_CC_SIF(atchan->perif)
-                | AT_XDMAC_CC_SWREQ_HWR_CONNECTED
-                | AT_XDMAC_CC_DSYNC_PER2MEM
-                | AT_XDMAC_CC_MBSIZE_SIXTEEN
-                | AT_XDMAC_CC_TYPE_PER_TRAN;
-        csize = at_xdmac_csize(sconfig->src_maxburst);
-        if (csize < 0) {
-                dev_err(chan2dev(chan), "invalid src maxburst value\n");
+        if (at_xdmac_check_slave_config(sconfig)) {
+                dev_err(chan2dev(chan), "invalid slave configuration\n");
                 return -EINVAL;
         }
-        atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG] |= AT_XDMAC_CC_CSIZE(csize);
-        dwidth = ffs(sconfig->src_addr_width) - 1;
-        atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG] |= AT_XDMAC_CC_DWIDTH(dwidth);
-
-
-        atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG] =
-                AT91_XDMAC_DT_PERID(atchan->perid)
-                | AT_XDMAC_CC_DAM_FIXED_AM
-                | AT_XDMAC_CC_SAM_INCREMENTED_AM
-                | AT_XDMAC_CC_DIF(atchan->perif)
-                | AT_XDMAC_CC_SIF(atchan->memif)
-                | AT_XDMAC_CC_SWREQ_HWR_CONNECTED
-                | AT_XDMAC_CC_DSYNC_MEM2PER
-                | AT_XDMAC_CC_MBSIZE_SIXTEEN
-                | AT_XDMAC_CC_TYPE_PER_TRAN;
-        csize = at_xdmac_csize(sconfig->dst_maxburst);
-        if (csize < 0) {
-                dev_err(chan2dev(chan), "invalid src maxburst value\n");
-                return -EINVAL;
-        }
-        atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG] |= AT_XDMAC_CC_CSIZE(csize);
-        dwidth = ffs(sconfig->dst_addr_width) - 1;
-        atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG] |= AT_XDMAC_CC_DWIDTH(dwidth);
-
-        /* Src and dst addr are needed to configure the link list descriptor. */
-        atchan->per_src_addr = sconfig->src_addr;
-        atchan->per_dst_addr = sconfig->dst_addr;
 
-        dev_dbg(chan2dev(chan),
-                "%s: cfg[dev2mem]=0x%08x, cfg[mem2dev]=0x%08x, per_src_addr=0x%08x, per_dst_addr=0x%08x\n",
-                __func__, atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG],
-                atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG],
-                atchan->per_src_addr, atchan->per_dst_addr);
+        memcpy(&atchan->sconfig, sconfig, sizeof(atchan->sconfig));
 
         return 0;
 }
@@ -563,6 +596,8 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
         struct scatterlist      *sg;
         int                     i;
         unsigned int            xfer_size = 0;
+        unsigned long           irqflags;
+        struct dma_async_tx_descriptor  *ret = NULL;
 
         if (!sgl)
                 return NULL;
@@ -578,7 +613,10 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                  flags);
 
         /* Protect dma_sconfig field that can be modified by set_slave_conf. */
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, irqflags);
+
+        if (at_xdmac_compute_chan_conf(chan, direction))
+                goto spin_unlock;
 
         /* Prepare descriptors. */
         for_each_sg(sgl, sg, sg_len, i) {
@@ -589,8 +627,7 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 mem = sg_dma_address(sg);
                 if (unlikely(!len)) {
                         dev_err(chan2dev(chan), "sg data length is zero\n");
-                        spin_unlock_bh(&atchan->lock);
-                        return NULL;
+                        goto spin_unlock;
                 }
                 dev_dbg(chan2dev(chan), "%s: * sg%d len=%u, mem=0x%08x\n",
                          __func__, i, len, mem);
@@ -600,20 +637,18 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                         dev_err(chan2dev(chan), "can't get descriptor\n");
                         if (first)
                                 list_splice_init(&first->descs_list, &atchan->free_descs_list);
-                        spin_unlock_bh(&atchan->lock);
-                        return NULL;
+                        goto spin_unlock;
                 }
 
                 /* Linked list descriptor setup. */
                 if (direction == DMA_DEV_TO_MEM) {
-                        desc->lld.mbr_sa = atchan->per_src_addr;
+                        desc->lld.mbr_sa = atchan->sconfig.src_addr;
                         desc->lld.mbr_da = mem;
-                        desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG];
                 } else {
                         desc->lld.mbr_sa = mem;
-                        desc->lld.mbr_da = atchan->per_dst_addr;
-                        desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG];
+                        desc->lld.mbr_da = atchan->sconfig.dst_addr;
                 }
+                desc->lld.mbr_cfg = atchan->cfg;
                 dwidth = at_xdmac_get_dwidth(desc->lld.mbr_cfg);
                 fixed_dwidth = IS_ALIGNED(len, 1 << dwidth)
                                ? at_xdmac_get_dwidth(desc->lld.mbr_cfg)
@@ -645,13 +680,15 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 xfer_size += len;
         }
 
-        spin_unlock_bh(&atchan->lock);
 
         first->tx_dma_desc.flags = flags;
         first->xfer_size = xfer_size;
         first->direction = direction;
+        ret = &first->tx_dma_desc;
 
-        return &first->tx_dma_desc;
+spin_unlock:
+        spin_unlock_irqrestore(&atchan->lock, irqflags);
+        return ret;
 }
 
 static struct dma_async_tx_descriptor *
@@ -664,6 +701,7 @@ at_xdmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr,
         struct at_xdmac_desc    *first = NULL, *prev = NULL;
         unsigned int            periods = buf_len / period_len;
         int                     i;
+        unsigned long           irqflags;
 
         dev_dbg(chan2dev(chan), "%s: buf_addr=%pad, buf_len=%zd, period_len=%zd, dir=%s, flags=0x%lx\n",
                 __func__, &buf_addr, buf_len, period_len,
@@ -679,32 +717,34 @@ at_xdmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr,
                 return NULL;
         }
 
+        if (at_xdmac_compute_chan_conf(chan, direction))
+                return NULL;
+
         for (i = 0; i < periods; i++) {
                 struct at_xdmac_desc    *desc = NULL;
 
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, irqflags);
                 desc = at_xdmac_get_desc(atchan);
                 if (!desc) {
                         dev_err(chan2dev(chan), "can't get descriptor\n");
                         if (first)
                                 list_splice_init(&first->descs_list, &atchan->free_descs_list);
-                        spin_unlock_bh(&atchan->lock);
+                        spin_unlock_irqrestore(&atchan->lock, irqflags);
                         return NULL;
                 }
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, irqflags);
                 dev_dbg(chan2dev(chan),
                         "%s: desc=0x%p, tx_dma_desc.phys=%pad\n",
                         __func__, desc, &desc->tx_dma_desc.phys);
 
                 if (direction == DMA_DEV_TO_MEM) {
-                        desc->lld.mbr_sa = atchan->per_src_addr;
+                        desc->lld.mbr_sa = atchan->sconfig.src_addr;
                         desc->lld.mbr_da = buf_addr + i * period_len;
-                        desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_DEV_TO_MEM_CFG];
                 } else {
                         desc->lld.mbr_sa = buf_addr + i * period_len;
-                        desc->lld.mbr_da = atchan->per_dst_addr;
-                        desc->lld.mbr_cfg = atchan->cfg[AT_XDMAC_MEM_TO_DEV_CFG];
+                        desc->lld.mbr_da = atchan->sconfig.dst_addr;
                 }
+                desc->lld.mbr_cfg = atchan->cfg;
                 desc->lld.mbr_ubc = AT_XDMAC_MBR_UBC_NDV1
                         | AT_XDMAC_MBR_UBC_NDEN
                         | AT_XDMAC_MBR_UBC_NSEN
@@ -766,6 +806,7 @@ at_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
                                         | AT_XDMAC_CC_SIF(0)
                                         | AT_XDMAC_CC_MBSIZE_SIXTEEN
                                         | AT_XDMAC_CC_TYPE_MEM_TRAN;
+        unsigned long           irqflags;
 
         dev_dbg(chan2dev(chan), "%s: src=%pad, dest=%pad, len=%zd, flags=0x%lx\n",
                 __func__, &src, &dest, len, flags);
@@ -798,9 +839,9 @@ at_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
 
                 dev_dbg(chan2dev(chan), "%s: remaining_size=%zu\n", __func__, remaining_size);
 
-                spin_lock_bh(&atchan->lock);
+                spin_lock_irqsave(&atchan->lock, irqflags);
                 desc = at_xdmac_get_desc(atchan);
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, irqflags);
                 if (!desc) {
                         dev_err(chan2dev(chan), "can't get descriptor\n");
                         if (first)
@@ -886,6 +927,7 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         int                     residue;
         u32                     cur_nda, mask, value;
         u8                      dwidth = 0;
+        unsigned long           flags;
 
         ret = dma_cookie_status(chan, cookie, txstate);
         if (ret == DMA_COMPLETE)
@@ -894,7 +936,7 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         if (!txstate)
                 return ret;
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
 
         desc = list_first_entry(&atchan->xfers_list, struct at_xdmac_desc, xfer_node);
 
@@ -904,8 +946,7 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
          */
         if (!desc->active_xfer) {
                 dma_set_residue(txstate, desc->xfer_size);
-                spin_unlock_bh(&atchan->lock);
-                return ret;
+                goto spin_unlock;
         }
 
         residue = desc->xfer_size;
@@ -936,14 +977,14 @@ at_xdmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         }
         residue += at_xdmac_chan_read(atchan, AT_XDMAC_CUBC) << dwidth;
 
-        spin_unlock_bh(&atchan->lock);
-
         dma_set_residue(txstate, residue);
 
         dev_dbg(chan2dev(chan),
                  "%s: desc=0x%p, tx_dma_desc.phys=%pad, tx_status=%d, cookie=%d, residue=%d\n",
                  __func__, desc, &desc->tx_dma_desc.phys, ret, cookie, residue);
 
+spin_unlock:
+        spin_unlock_irqrestore(&atchan->lock, flags);
         return ret;
 }
 
@@ -964,8 +1005,9 @@ static void at_xdmac_remove_xfer(struct at_xdmac_chan *atchan,
 static void at_xdmac_advance_work(struct at_xdmac_chan *atchan)
 {
         struct at_xdmac_desc    *desc;
+        unsigned long           flags;
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
 
         /*
          * If channel is enabled, do nothing, advance_work will be triggered
@@ -980,7 +1022,7 @@ static void at_xdmac_advance_work(struct at_xdmac_chan *atchan)
                         at_xdmac_start_xfer(atchan, desc);
         }
 
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 }
 
 static void at_xdmac_handle_cyclic(struct at_xdmac_chan *atchan)
@@ -1116,12 +1158,13 @@ static int at_xdmac_device_config(struct dma_chan *chan,
 {
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         int ret;
+        unsigned long           flags;
 
         dev_dbg(chan2dev(chan), "%s\n", __func__);
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
         ret = at_xdmac_set_slave_config(chan, config);
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 
         return ret;
 }
@@ -1130,18 +1173,19 @@ static int at_xdmac_device_pause(struct dma_chan *chan)
 {
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         struct at_xdmac         *atxdmac = to_at_xdmac(atchan->chan.device);
+        unsigned long           flags;
 
         dev_dbg(chan2dev(chan), "%s\n", __func__);
 
         if (test_and_set_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status))
                 return 0;
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
         at_xdmac_write(atxdmac, AT_XDMAC_GRWS, atchan->mask);
         while (at_xdmac_chan_read(atchan, AT_XDMAC_CC)
                & (AT_XDMAC_CC_WRIP | AT_XDMAC_CC_RDIP))
                 cpu_relax();
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 
         return 0;
 }
@@ -1150,18 +1194,19 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
 {
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         struct at_xdmac         *atxdmac = to_at_xdmac(atchan->chan.device);
+        unsigned long           flags;
 
         dev_dbg(chan2dev(chan), "%s\n", __func__);
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
         if (!at_xdmac_chan_is_paused(atchan)) {
-                spin_unlock_bh(&atchan->lock);
+                spin_unlock_irqrestore(&atchan->lock, flags);
                 return 0;
         }
 
         at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
         clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 
         return 0;
 }
@@ -1171,10 +1216,11 @@ static int at_xdmac_device_terminate_all(struct dma_chan *chan)
         struct at_xdmac_desc    *desc, *_desc;
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         struct at_xdmac         *atxdmac = to_at_xdmac(atchan->chan.device);
+        unsigned long           flags;
 
         dev_dbg(chan2dev(chan), "%s\n", __func__);
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
         at_xdmac_write(atxdmac, AT_XDMAC_GD, atchan->mask);
         while (at_xdmac_read(atxdmac, AT_XDMAC_GS) & atchan->mask)
                 cpu_relax();
@@ -1184,7 +1230,7 @@ static int at_xdmac_device_terminate_all(struct dma_chan *chan)
                 at_xdmac_remove_xfer(atchan, desc);
 
         clear_bit(AT_XDMAC_CHAN_IS_CYCLIC, &atchan->status);
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
 
         return 0;
 }
@@ -1194,8 +1240,9 @@ static int at_xdmac_alloc_chan_resources(struct dma_chan *chan)
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         struct at_xdmac_desc    *desc;
         int                     i;
+        unsigned long           flags;
 
-        spin_lock_bh(&atchan->lock);
+        spin_lock_irqsave(&atchan->lock, flags);
 
         if (at_xdmac_chan_is_enabled(atchan)) {
                 dev_err(chan2dev(chan),
@@ -1226,7 +1273,7 @@ static int at_xdmac_alloc_chan_resources(struct dma_chan *chan)
         dev_dbg(chan2dev(chan), "%s: allocated %d descriptors\n", __func__, i);
 
 spin_unlock:
-        spin_unlock_bh(&atchan->lock);
+        spin_unlock_irqrestore(&atchan->lock, flags);
         return i;
 }
 
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 2890d744bb1b..3ddfd1f6c23c 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -487,7 +487,11 @@ int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
         caps->directions = device->directions;
         caps->residue_granularity = device->residue_granularity;
 
-        caps->cmd_pause = !!device->device_pause;
+        /*
+         * Some devices implement only pause (e.g. to get residuum) but no
+         * resume. However cmd_pause is advertised as pause AND resume.
+         */
+        caps->cmd_pause = !!(device->device_pause && device->device_resume);
         caps->cmd_terminate = !!device->device_terminate_all;
 
         return 0;
diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
index 9b84def7a353..f42f71e37e73 100644
--- a/drivers/dma/hsu/hsu.c
+++ b/drivers/dma/hsu/hsu.c
@@ -384,7 +384,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
         spin_lock_irqsave(&hsuc->vchan.lock, flags);
 
         hsu_dma_stop_channel(hsuc);
-        hsuc->desc = NULL;
+        if (hsuc->desc) {
+                hsu_dma_desc_free(&hsuc->desc->vdesc);
+                hsuc->desc = NULL;
+        }
 
         vchan_get_all_descriptors(&hsuc->vchan, &head);
         spin_unlock_irqrestore(&hsuc->vchan.lock, flags);
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index a7d9d3029b14..340f9e607cd8 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2127,6 +2127,7 @@ static int pl330_terminate_all(struct dma_chan *chan)
         struct pl330_dmac *pl330 = pch->dmac;
         LIST_HEAD(list);
 
+        pm_runtime_get_sync(pl330->ddma.dev);
         spin_lock_irqsave(&pch->lock, flags);
         spin_lock(&pl330->lock);
         _stop(pch->thread);
@@ -2151,6 +2152,8 @@ static int pl330_terminate_all(struct dma_chan *chan)
         list_splice_tail_init(&pch->work_list, &pl330->desc_pool);
         list_splice_tail_init(&pch->completed_list, &pl330->desc_pool);
         spin_unlock_irqrestore(&pch->lock, flags);
+        pm_runtime_mark_last_busy(pl330->ddma.dev);
+        pm_runtime_put_autosuspend(pl330->ddma.dev);
 
         return 0;
 }
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 071c2c969eec..72791232e46b 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -186,8 +186,20 @@ struct ibft_kobject {
 
 static struct iscsi_boot_kset *boot_kset;
 
+/* fully null address */
 static const char nulls[16];
 
+/* IPv4-mapped IPv6 ::ffff:0.0.0.0 */
+static const char mapped_nulls[16] = { 0x00, 0x00, 0x00, 0x00,
+                                       0x00, 0x00, 0x00, 0x00,
+                                       0x00, 0x00, 0xff, 0xff,
+                                       0x00, 0x00, 0x00, 0x00 };
+
+static int address_not_null(u8 *ip)
+{
+        return (memcmp(ip, nulls, 16) && memcmp(ip, mapped_nulls, 16));
+}
+
 /*
  * Helper functions to parse data properly.
  */
@@ -445,7 +457,7 @@ static umode_t ibft_check_nic_for(void *data, int type)
                 rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_IP_ADDR:
-                if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr)))
+                if (address_not_null(nic->ip_addr))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_SUBNET_MASK:
@@ -456,21 +468,19 @@ static umode_t ibft_check_nic_for(void *data, int type)
                 rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_GATEWAY:
-                if (memcmp(nic->gateway, nulls, sizeof(nic->gateway)))
+                if (address_not_null(nic->gateway))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_PRIMARY_DNS:
-                if (memcmp(nic->primary_dns, nulls,
-                           sizeof(nic->primary_dns)))
+                if (address_not_null(nic->primary_dns))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_SECONDARY_DNS:
-                if (memcmp(nic->secondary_dns, nulls,
-                           sizeof(nic->secondary_dns)))
+                if (address_not_null(nic->secondary_dns))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_DHCP:
-                if (memcmp(nic->dhcp, nulls, sizeof(nic->dhcp)))
+                if (address_not_null(nic->dhcp))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_ETH_VLAN:
@@ -536,23 +546,19 @@ static umode_t __init ibft_check_initiator_for(void *data, int type)
                 rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_INI_ISNS_SERVER:
-                if (memcmp(init->isns_server, nulls,
-                           sizeof(init->isns_server)))
+                if (address_not_null(init->isns_server))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_INI_SLP_SERVER:
-                if (memcmp(init->slp_server, nulls,
-                           sizeof(init->slp_server)))
+                if (address_not_null(init->slp_server))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_INI_PRI_RADIUS_SERVER:
-                if (memcmp(init->pri_radius_server, nulls,
-                           sizeof(init->pri_radius_server)))
+                if (address_not_null(init->pri_radius_server))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_INI_SEC_RADIUS_SERVER:
-                if (memcmp(init->sec_radius_server, nulls,
-                           sizeof(init->sec_radius_server)))
+                if (address_not_null(init->sec_radius_server))
                         rc = S_IRUGO;
                 break;
         case ISCSI_BOOT_INI_INITIATOR_NAME:
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index e469c4b2e8cc..c25728bc388a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -684,8 +684,6 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                         dev->node_props.cpu_core_id_base);
         sysfs_show_32bit_prop(buffer, "simd_id_base",
                         dev->node_props.simd_id_base);
-        sysfs_show_32bit_prop(buffer, "capability",
-                        dev->node_props.capability);
         sysfs_show_32bit_prop(buffer, "max_waves_per_simd",
                         dev->node_props.max_waves_per_simd);
         sysfs_show_32bit_prop(buffer, "lds_size_in_kb",
@@ -736,6 +734,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                         dev->gpu->kfd2kgd->get_fw_version(
                                                 dev->gpu->kgd,
                                                 KGD_ENGINE_MEC1));
+                sysfs_show_32bit_prop(buffer, "capability",
+                                dev->node_props.capability);
         }
 
         return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute",
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index ffc305fc2076..eb7e61078a5b 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -217,7 +217,7 @@ static ssize_t status_store(struct device *device,
 
         mutex_unlock(&dev->mode_config.mutex);
 
-        return ret;
+        return ret ? ret : count;
 }
 
 static ssize_t status_show(struct device *device,
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 007c7d7d8295..dc55c51964ab 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1667,12 +1667,15 @@ static int i915_sr_status(struct seq_file *m, void *unused)
 
         if (HAS_PCH_SPLIT(dev))
                 sr_enabled = I915_READ(WM1_LP_ILK) & WM1_LP_SR_EN;
-        else if (IS_CRESTLINE(dev) || IS_I945G(dev) || IS_I945GM(dev))
+        else if (IS_CRESTLINE(dev) || IS_G4X(dev) ||
+                 IS_I945G(dev) || IS_I945GM(dev))
                 sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;
         else if (IS_I915GM(dev))
                 sr_enabled = I915_READ(INSTPM) & INSTPM_SELF_EN;
         else if (IS_PINEVIEW(dev))
                 sr_enabled = I915_READ(DSPFW3) & PINEVIEW_SELF_REFRESH_EN;
+        else if (IS_VALLEYVIEW(dev))
+                sr_enabled = I915_READ(FW_BLC_SELF_VLV) & FW_CSPWRDWNEN;
 
         intel_runtime_pm_put(dev_priv);
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 53394f998a1f..851b585987f9 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2656,9 +2656,6 @@ void i915_gem_reset(struct drm_device *dev)
 void
 i915_gem_retire_requests_ring(struct intel_engine_cs *ring)
 {
-        if (list_empty(&ring->request_list))
-                return;
-
         WARN_ON(i915_verify_lists(ring->dev));
 
         /* Retire requests first as we use it above for the early return.
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f27346e907b1..d714a4b5711e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -880,10 +880,8 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
                                       DP_AUX_CH_CTL_RECEIVE_ERROR))
                                 continue;
                         if (status & DP_AUX_CH_CTL_DONE)
-                                break;
+                                goto done;
                 }
-                if (status & DP_AUX_CH_CTL_DONE)
-                        break;
         }
 
         if ((status & DP_AUX_CH_CTL_DONE) == 0) {
@@ -892,6 +890,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
                 goto out;
         }
 
+done:
         /* Check for timeout or receive error.
          * Timeouts occur when the sink is not connected
          */
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 56e437e31580..ae628001fd97 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -435,7 +435,7 @@ gmbus_xfer(struct i2c_adapter *adapter,
                                                struct intel_gmbus,
                                                adapter);
         struct drm_i915_private *dev_priv = bus->dev_priv;
-        int i, reg_offset;
+        int i = 0, inc, try = 0, reg_offset;
         int ret = 0;
 
         intel_aux_display_runtime_get(dev_priv);
@@ -448,12 +448,14 @@ gmbus_xfer(struct i2c_adapter *adapter,
 
         reg_offset = dev_priv->gpio_mmio_base;
 
+retry:
         I915_WRITE(GMBUS0 + reg_offset, bus->reg0);
 
-        for (i = 0; i < num; i++) {
+        for (; i < num; i += inc) {
+                inc = 1;
                 if (gmbus_is_index_read(msgs, i, num)) {
                         ret = gmbus_xfer_index_read(dev_priv, &msgs[i]);
-                        i += 1;  /* set i to the index of the read xfer */
+                        inc = 2; /* an index read is two msgs */
                 } else if (msgs[i].flags & I2C_M_RD) {
                         ret = gmbus_xfer_read(dev_priv, &msgs[i], 0);
                 } else {
@@ -525,6 +527,18 @@ clear_err:
                          adapter->name, msgs[i].addr,
                          (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);
 
+        /*
+         * Passive adapters sometimes NAK the first probe. Retry the first
+         * message once on -ENXIO for GMBUS transfers; the bit banging algorithm
+         * has retries internally. See also the retry loop in
+         * drm_do_probe_ddc_edid, which bails out on the first -ENXIO.
+         */
+        if (ret == -ENXIO && i == 0 && try++ == 0) {
+                DRM_DEBUG_KMS("GMBUS [%s] NAK on first message, retry\n",
+                              adapter->name);
+                goto retry;
+        }
+
         goto out;
 
 timeout:
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 09df74b8e917..424e62197787 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1134,6 +1134,12 @@ static int gen8_init_common_ring(struct intel_engine_cs *ring)
         I915_WRITE_IMR(ring, ~(ring->irq_enable_mask | ring->irq_keep_mask));
         I915_WRITE(RING_HWSTAM(ring->mmio_base), 0xffffffff);
 
+        if (ring->status_page.obj) {
+                I915_WRITE(RING_HWS_PGA(ring->mmio_base),
+                           (u32)ring->status_page.gfx_addr);
+                POSTING_READ(RING_HWS_PGA(ring->mmio_base));
+        }
+
         I915_WRITE(RING_MODE_GEN7(ring),
                    _MASKED_BIT_DISABLE(GFX_REPLAY_MODE) |
                    _MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE));
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 441e2502b889..005b5e04de4d 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -901,13 +901,6 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
                             GEN6_WIZ_HASHING_MASK,
                             GEN6_WIZ_HASHING_16x4);
 
-        if (INTEL_REVID(dev) == SKL_REVID_C0 ||
-            INTEL_REVID(dev) == SKL_REVID_D0)
-                /* WaBarrierPerformanceFixDisable:skl */
-                WA_SET_BIT_MASKED(HDC_CHICKEN0,
-                                  HDC_FENCE_DEST_SLM_DISABLE |
-                                  HDC_BARRIER_PERFORMANCE_DISABLE);
-
         return 0;
 }
 
@@ -1024,6 +1017,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
                 WA_SET_BIT_MASKED(HIZ_CHICKEN,
                                   BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
 
+        if (INTEL_REVID(dev) == SKL_REVID_C0 ||
+            INTEL_REVID(dev) == SKL_REVID_D0)
+                /* WaBarrierPerformanceFixDisable:skl */
+                WA_SET_BIT_MASKED(HDC_CHICKEN0,
+                                  HDC_FENCE_DEST_SLM_DISABLE |
+                                  HDC_BARRIER_PERFORMANCE_DISABLE);
+
         return skl_tune_iz_hashing(ring);
 }
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e87d2f418de4..987b81f31b0e 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2550,7 +2550,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
 
         DRM_DEBUG_KMS("initialising analog device %d\n", device);
 
-        intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
+        intel_sdvo_connector = intel_sdvo_connector_alloc();
         if (!intel_sdvo_connector)
                 return false;
 
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index e597ffc26563..dac78ad24b31 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -580,9 +580,6 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                 else
                         radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
 
-                /* if there is no audio, set MINM_OVER_MAXP  */
-                if (!drm_detect_monitor_audio(radeon_connector_edid(connector)))
-                        radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;
                 if (rdev->family < CHIP_RV770)
                         radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;
                 /* use frac fb div on APUs */
@@ -1798,9 +1795,7 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc)
                         if ((crtc->mode.clock == test_crtc->mode.clock) &&
                             (adjusted_clock == test_adjusted_clock) &&
                             (radeon_crtc->ss_enabled == test_radeon_crtc->ss_enabled) &&
-                            (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID) &&
-                            (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) ==
-                             drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector))))
+                            (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID))
                                 return test_radeon_crtc->pll_id;
                 }
         }
diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c
index f04205170b8a..cfa3a84a2af0 100644
--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
+++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
@@ -173,7 +173,7 @@ void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset,
         struct drm_device *dev = encoder->dev;
         struct radeon_device *rdev = dev->dev_private;
 
-        WREG32(HDMI0_ACR_PACKET_CONTROL + offset,
+        WREG32(DCE3_HDMI0_ACR_PACKET_CONTROL + offset,
                 HDMI0_ACR_SOURCE |              /* select SW CTS value */
                 HDMI0_ACR_AUTO_SEND);   /* allow hw to sent ACR packets when required */
 
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index b7ca4c514621..a7fdfa4f0857 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1463,6 +1463,21 @@ int radeon_device_init(struct radeon_device *rdev,
         if (r)
                 DRM_ERROR("ib ring test failed (%d).\n", r);
 
+        /*
+         * Turks/Thames GPU will freeze whole laptop if DPM is not restarted
+         * after the CP ring have chew one packet at least. Hence here we stop
+         * and restart DPM after the radeon_ib_ring_tests().
+         */
+        if (rdev->pm.dpm_enabled &&
+            (rdev->pm.pm_method == PM_METHOD_DPM) &&
+            (rdev->family == CHIP_TURKS) &&
+            (rdev->flags & RADEON_IS_MOBILITY)) {
+                mutex_lock(&rdev->pm.mutex);
+                radeon_dpm_disable(rdev);
+                radeon_dpm_enable(rdev);
+                mutex_unlock(&rdev->pm.mutex);
+        }
+
         if ((radeon_testing & 1)) {
                 if (rdev->accel_working)
                         radeon_test_moves(rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index de42fc4a22b8..9c3377ca17b7 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -458,14 +458,16 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                 /* make sure object fit at this offset */
                 eoffset = soffset + size;
                 if (soffset >= eoffset) {
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto error_unreserve;
                 }
 
                 last_pfn = eoffset / RADEON_GPU_PAGE_SIZE;
                 if (last_pfn > rdev->vm_manager.max_pfn) {
                         dev_err(rdev->dev, "va above limit (0x%08X > 0x%08X)\n",
                                 last_pfn, rdev->vm_manager.max_pfn);
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto error_unreserve;
                 }
 
         } else {
@@ -486,7 +488,8 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                                 "(bo %p 0x%010lx 0x%010lx)\n", bo_va->bo,
                                 soffset, tmp->bo, tmp->it.start, tmp->it.last);
                         mutex_unlock(&vm->mutex);
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto error_unreserve;
                 }
         }
 
@@ -497,7 +500,8 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                         tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
                         if (!tmp) {
                                 mutex_unlock(&vm->mutex);
-                                return -ENOMEM;
+                                r = -ENOMEM;
+                                goto error_unreserve;
                         }
                         tmp->it.start = bo_va->it.start;
                         tmp->it.last = bo_va->it.last;
@@ -555,7 +559,6 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                 r = radeon_vm_clear_bo(rdev, pt);
                 if (r) {
                         radeon_bo_unref(&pt);
-                        radeon_bo_reserve(bo_va->bo, false);
                         return r;
                 }
 
@@ -575,6 +578,10 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
 
         mutex_unlock(&vm->mutex);
         return 0;
+
+error_unreserve:
+        radeon_bo_unreserve(bo_va->bo);
+        return r;
 }
 
 /**
diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c
index 8fe78d08e01c..7c6966434ee7 100644
--- a/drivers/i2c/busses/i2c-hix5hd2.c
+++ b/drivers/i2c/busses/i2c-hix5hd2.c
@@ -554,4 +554,4 @@ module_platform_driver(hix5hd2_i2c_driver);
 MODULE_DESCRIPTION("Hix5hd2 I2C Bus driver");
 MODULE_AUTHOR("Wei Yan <sledge.yanwei@huawei.com>");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:i2c-hix5hd2");
+MODULE_ALIAS("platform:hix5hd2-i2c");
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 958c8db4ec30..297e9c9ac943 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1143,6 +1143,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         i2c->quirks = s3c24xx_get_device_quirks(pdev);
+        i2c->sysreg = ERR_PTR(-ENOENT);
         if (pdata)
                 memcpy(i2c->pdata, pdata, sizeof(*pdata));
         else
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 89d8aa1d2818..df12c57e6ce0 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -1001,7 +1001,7 @@ static struct platform_driver twl6030_gpadc_driver = {
 
 module_platform_driver(twl6030_gpadc_driver);
 
-MODULE_ALIAS("platform: " DRIVER_NAME);
+MODULE_ALIAS("platform:" DRIVER_NAME);
 MODULE_AUTHOR("Balaji T K <balajitk@ti.com>");
 MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>");
 MODULE_AUTHOR("Oleksandr Kozaruk <oleksandr.kozaruk@ti.com");
diff --git a/drivers/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h
index 0916bf6b6c31..73b189c1c0fb 100644
--- a/drivers/iio/imu/adis16400.h
+++ b/drivers/iio/imu/adis16400.h
@@ -139,6 +139,7 @@
 #define ADIS16400_NO_BURST              BIT(1)
 #define ADIS16400_HAS_SLOW_MODE         BIT(2)
 #define ADIS16400_HAS_SERIAL_NUMBER     BIT(3)
+#define ADIS16400_BURST_DIAG_STAT       BIT(4)
 
 struct adis16400_state;
 
@@ -165,6 +166,7 @@ struct adis16400_state {
         int                             filt_int;
 
         struct adis adis;
+        unsigned long avail_scan_mask[2];
 };
 
 /* At the moment triggers are only used for ring buffer
diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c
index 6e727ffe5262..90c24a23c679 100644
--- a/drivers/iio/imu/adis16400_buffer.c
+++ b/drivers/iio/imu/adis16400_buffer.c
@@ -18,7 +18,8 @@ int adis16400_update_scan_mode(struct iio_dev *indio_dev,
 {
         struct adis16400_state *st = iio_priv(indio_dev);
         struct adis *adis = &st->adis;
-        uint16_t *tx;
+        unsigned int burst_length;
+        u8 *tx;
 
         if (st->variant->flags & ADIS16400_NO_BURST)
                 return adis_update_scan_mode(indio_dev, scan_mask);
@@ -26,26 +27,29 @@ int adis16400_update_scan_mode(struct iio_dev *indio_dev,
         kfree(adis->xfer);
         kfree(adis->buffer);
 
+        /* All but the timestamp channel */
+        burst_length = (indio_dev->num_channels - 1) * sizeof(u16);
+        if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
+                burst_length += sizeof(u16);
+
         adis->xfer = kcalloc(2, sizeof(*adis->xfer), GFP_KERNEL);
         if (!adis->xfer)
                 return -ENOMEM;
 
-        adis->buffer = kzalloc(indio_dev->scan_bytes + sizeof(u16),
-                GFP_KERNEL);
+        adis->buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL);
         if (!adis->buffer)
                 return -ENOMEM;
 
-        tx = adis->buffer + indio_dev->scan_bytes;
-
+        tx = adis->buffer + burst_length;
         tx[0] = ADIS_READ_REG(ADIS16400_GLOB_CMD);
         tx[1] = 0;
 
         adis->xfer[0].tx_buf = tx;
         adis->xfer[0].bits_per_word = 8;
         adis->xfer[0].len = 2;
-        adis->xfer[1].tx_buf = tx;
+        adis->xfer[1].rx_buf = adis->buffer;
         adis->xfer[1].bits_per_word = 8;
-        adis->xfer[1].len = indio_dev->scan_bytes;
+        adis->xfer[1].len = burst_length;
 
         spi_message_init(&adis->msg);
         spi_message_add_tail(&adis->xfer[0], &adis->msg);
@@ -61,6 +65,7 @@ irqreturn_t adis16400_trigger_handler(int irq, void *p)
         struct adis16400_state *st = iio_priv(indio_dev);
         struct adis *adis = &st->adis;
         u32 old_speed_hz = st->adis.spi->max_speed_hz;
+        void *buffer;
         int ret;
 
         if (!adis->buffer)
@@ -81,7 +86,12 @@ irqreturn_t adis16400_trigger_handler(int irq, void *p)
                 spi_setup(st->adis.spi);
         }
 
-        iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
+        if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
+                buffer = adis->buffer + sizeof(u16);
+        else
+                buffer = adis->buffer;
+
+        iio_push_to_buffers_with_timestamp(indio_dev, buffer,
                 pf->timestamp);
 
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
index fa795dcd5f75..2fd68f2219a7 100644
--- a/drivers/iio/imu/adis16400_core.c
+++ b/drivers/iio/imu/adis16400_core.c
@@ -405,6 +405,11 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
                         *val = st->variant->temp_scale_nano / 1000000;
                         *val2 = (st->variant->temp_scale_nano % 1000000);
                         return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_PRESSURE:
+                        /* 20 uBar = 0.002kPascal */
+                        *val = 0;
+                        *val2 = 2000;
+                        return IIO_VAL_INT_PLUS_MICRO;
                 default:
                         return -EINVAL;
                 }
@@ -454,10 +459,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
         }
 }
 
-#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \
+#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \
         .type = IIO_VOLTAGE, \
         .indexed = 1, \
-        .channel = 0, \
+        .channel = chn, \
         .extend_name = name, \
         .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                 BIT(IIO_CHAN_INFO_SCALE), \
@@ -474,10 +479,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
 }
 
 #define ADIS16400_SUPPLY_CHAN(addr, bits) \
-        ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY)
+        ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY, 0)
 
 #define ADIS16400_AUX_ADC_CHAN(addr, bits) \
-        ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC)
+        ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC, 1)
 
 #define ADIS16400_GYRO_CHAN(mod, addr, bits) { \
         .type = IIO_ANGL_VEL, \
@@ -773,7 +778,8 @@ static struct adis16400_chip_info adis16400_chips[] = {
                 .channels = adis16448_channels,
                 .num_channels = ARRAY_SIZE(adis16448_channels),
                 .flags = ADIS16400_HAS_PROD_ID |
-                                ADIS16400_HAS_SERIAL_NUMBER,
+                                ADIS16400_HAS_SERIAL_NUMBER |
+                                ADIS16400_BURST_DIAG_STAT,
                 .gyro_scale_micro = IIO_DEGREE_TO_RAD(10000), /* 0.01 deg/s */
                 .accel_scale_micro = IIO_G_TO_M_S_2(833), /* 1/1200 g */
                 .temp_scale_nano = 73860000, /* 0.07386 C */
@@ -791,11 +797,6 @@ static const struct iio_info adis16400_info = {
         .debugfs_reg_access = adis_debugfs_reg_access,
 };
 
-static const unsigned long adis16400_burst_scan_mask[] = {
-        ~0UL,
-        0,
-};
-
 static const char * const adis16400_status_error_msgs[] = {
         [ADIS16400_DIAG_STAT_ZACCL_FAIL] = "Z-axis accelerometer self-test failure",
         [ADIS16400_DIAG_STAT_YACCL_FAIL] = "Y-axis accelerometer self-test failure",
@@ -843,6 +844,20 @@ static const struct adis_data adis16400_data = {
                 BIT(ADIS16400_DIAG_STAT_POWER_LOW),
 };
 
+static void adis16400_setup_chan_mask(struct adis16400_state *st)
+{
+        const struct adis16400_chip_info *chip_info = st->variant;
+        unsigned i;
+
+        for (i = 0; i < chip_info->num_channels; i++) {
+                const struct iio_chan_spec *ch = &chip_info->channels[i];
+
+                if (ch->scan_index >= 0 &&
+                    ch->scan_index != ADIS16400_SCAN_TIMESTAMP)
+                        st->avail_scan_mask[0] |= BIT(ch->scan_index);
+        }
+}
+
 static int adis16400_probe(struct spi_device *spi)
 {
         struct adis16400_state *st;
@@ -866,8 +881,10 @@ static int adis16400_probe(struct spi_device *spi)
         indio_dev->info = &adis16400_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        if (!(st->variant->flags & ADIS16400_NO_BURST))
-                indio_dev->available_scan_masks = adis16400_burst_scan_mask;
+        if (!(st->variant->flags & ADIS16400_NO_BURST)) {
+                adis16400_setup_chan_mask(st);
+                indio_dev->available_scan_masks = st->avail_scan_mask;
+        }
 
         ret = adis_init(&st->adis, indio_dev, spi, &adis16400_data);
         if (ret)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 7752bd59d4b7..a353b7de6d22 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1063,9 +1063,8 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse)
         right = (packet[1] & 0x02) >> 1;
         middle = (packet[1] & 0x04) >> 2;
 
-        /* Divide 2 since trackpoint's speed is too fast */
-        input_report_rel(dev2, REL_X, (char)x / 2);
-        input_report_rel(dev2, REL_Y, -((char)y / 2));
+        input_report_rel(dev2, REL_X, (char)x);
+        input_report_rel(dev2, REL_Y, -((char)y));
 
         input_report_key(dev2, BTN_LEFT, left);
         input_report_key(dev2, BTN_RIGHT, right);
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 79363b687195..ce3d40004458 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1376,10 +1376,11 @@ static bool elantech_is_signature_valid(const unsigned char *param)
                 return true;
 
         /*
-         * Some models have a revision higher then 20. Meaning param[2] may
-         * be 10 or 20, skip the rates check for these.
+         * Some hw_version >= 4 models have a revision higher then 20. Meaning
+         * that param[2] may be 10 or 20, skip the rates check for these.
          */
-        if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40)
+        if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f &&
+            param[2] < 40)
                 return true;
 
         for (i = 0; i < ARRAY_SIZE(rates); i++)
@@ -1555,6 +1556,7 @@ static int elantech_set_properties(struct elantech_data *etd)
                 case 9:
                 case 10:
                 case 13:
+                case 14:
                         etd->hw_version = 4;
                         break;
                 default:
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 630af73e98c4..35c8d0ceabee 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -151,6 +151,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
                 1024, 5112, 2024, 4832
         },
         {
+                (const char * const []){"LEN2000", NULL},
+                {ANY_BOARD_ID, ANY_BOARD_ID},
+                1024, 5113, 2021, 4832
+        },
+        {
                 (const char * const []){"LEN2001", NULL},
                 {ANY_BOARD_ID, ANY_BOARD_ID},
                 1024, 5022, 2508, 4832
@@ -191,7 +196,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
         "LEN0045",
         "LEN0047",
         "LEN0049",
-        "LEN2000",
+        "LEN2000", /* S540 */
         "LEN2001", /* Edge E431 */
         "LEN2002", /* Edge E531 */
         "LEN2003",
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index e43d48956dea..e1c7e9e51045 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2930,6 +2930,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
         size      = PAGE_ALIGN(size);
         dma_mask  = dev->coherent_dma_mask;
         flag     &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
+        flag     |= __GFP_ZERO;
 
         page = alloc_pages(flag | __GFP_NOWARN,  get_order(size));
         if (!page) {
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 68d43beccb7e..5ecfaf29933a 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -422,6 +422,14 @@ static int dmar_map_gfx = 1;
 static int dmar_forcedac;
 static int intel_iommu_strict;
 static int intel_iommu_superpage = 1;
+static int intel_iommu_ecs = 1;
+
+/* We only actually use ECS when PASID support (on the new bit 40)
+ * is also advertised. Some early implementations — the ones with
+ * PASID support on bit 28 — have issues even when we *only* use
+ * extended root/context tables. */
+#define ecs_enabled(iommu) (intel_iommu_ecs && ecap_ecs(iommu->ecap) && \
+                            ecap_pasid(iommu->ecap))
 
 int intel_iommu_gfx_mapped;
 EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
@@ -465,6 +473,10 @@ static int __init intel_iommu_setup(char *str)
                         printk(KERN_INFO
                                 "Intel-IOMMU: disable supported super page\n");
                         intel_iommu_superpage = 0;
+                } else if (!strncmp(str, "ecs_off", 7)) {
+                        printk(KERN_INFO
+                                "Intel-IOMMU: disable extended context table support\n");
+                        intel_iommu_ecs = 0;
                 }
 
                 str += strcspn(str, ",");
@@ -669,7 +681,7 @@ static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu
         struct context_entry *context;
         u64 *entry;
 
-        if (ecap_ecs(iommu->ecap)) {
+        if (ecs_enabled(iommu)) {
                 if (devfn >= 0x80) {
                         devfn -= 0x80;
                         entry = &root->hi;
@@ -696,6 +708,11 @@ static inline struct context_entry *iommu_context_addr(struct intel_iommu *iommu
         return &context[devfn];
 }
 
+static int iommu_dummy(struct device *dev)
+{
+        return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
+}
+
 static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn)
 {
         struct dmar_drhd_unit *drhd = NULL;
@@ -705,6 +722,9 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf
         u16 segment = 0;
         int i;
 
+        if (iommu_dummy(dev))
+                return NULL;
+
         if (dev_is_pci(dev)) {
                 pdev = to_pci_dev(dev);
                 segment = pci_domain_nr(pdev->bus);
@@ -798,7 +818,7 @@ static void free_context_table(struct intel_iommu *iommu)
                 if (context)
                         free_pgtable_page(context);
 
-                if (!ecap_ecs(iommu->ecap))
+                if (!ecs_enabled(iommu))
                         continue;
 
                 context = iommu_context_addr(iommu, i, 0x80, 0);
@@ -1133,7 +1153,7 @@ static void iommu_set_root_entry(struct intel_iommu *iommu)
         unsigned long flag;
 
         addr = virt_to_phys(iommu->root_entry);
-        if (ecap_ecs(iommu->ecap))
+        if (ecs_enabled(iommu))
                 addr |= DMA_RTADDR_RTT;
 
         raw_spin_lock_irqsave(&iommu->register_lock, flag);
@@ -2969,11 +2989,6 @@ static inline struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
         return __get_valid_domain_for_dev(dev);
 }
 
-static int iommu_dummy(struct device *dev)
-{
-        return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
-}
-
 /* Check if the dev needs to go through non-identity map and unmap process.*/
 static int iommu_no_mapping(struct device *dev)
 {
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 57f09cb54464..269c2354c431 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -271,7 +271,7 @@ int gic_get_c0_fdc_int(void)
                                   GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_FDC));
 }
 
-static void gic_handle_shared_int(void)
+static void gic_handle_shared_int(bool chained)
 {
         unsigned int i, intr, virq;
         unsigned long *pcpu_mask;
@@ -299,7 +299,10 @@ static void gic_handle_shared_int(void)
         while (intr != gic_shared_intrs) {
                 virq = irq_linear_revmap(gic_irq_domain,
                                          GIC_SHARED_TO_HWIRQ(intr));
-                do_IRQ(virq);
+                if (chained)
+                        generic_handle_irq(virq);
+                else
+                        do_IRQ(virq);
 
                 /* go to next pending bit */
                 bitmap_clear(pending, intr, 1);
@@ -431,7 +434,7 @@ static struct irq_chip gic_edge_irq_controller = {
 #endif
 };
 
-static void gic_handle_local_int(void)
+static void gic_handle_local_int(bool chained)
 {
         unsigned long pending, masked;
         unsigned int intr, virq;
@@ -445,7 +448,10 @@ static void gic_handle_local_int(void)
         while (intr != GIC_NUM_LOCAL_INTRS) {
                 virq = irq_linear_revmap(gic_irq_domain,
                                          GIC_LOCAL_TO_HWIRQ(intr));
-                do_IRQ(virq);
+                if (chained)
+                        generic_handle_irq(virq);
+                else
+                        do_IRQ(virq);
 
                 /* go to next pending bit */
                 bitmap_clear(&pending, intr, 1);
@@ -509,13 +515,14 @@ static struct irq_chip gic_all_vpes_local_irq_controller = {
 
 static void __gic_irq_dispatch(void)
 {
-        gic_handle_local_int();
-        gic_handle_shared_int();
+        gic_handle_local_int(false);
+        gic_handle_shared_int(false);
 }
 
 static void gic_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 {
-        __gic_irq_dispatch();
+        gic_handle_local_int(true);
+        gic_handle_shared_int(true);
 }
 
 #ifdef CONFIG_MIPS_GIC_IPI
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index 4a9ce5b50c5b..6b2b582433bd 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -104,7 +104,7 @@ static int sunxi_sc_nmi_set_type(struct irq_data *data, unsigned int flow_type)
         irqd_set_trigger_type(data, flow_type);
         irq_setup_alt_chip(data, flow_type);
 
-        for (i = 0; i <= gc->num_ct; i++, ct++)
+        for (i = 0; i < gc->num_ct; i++, ct++)
                 if (ct->type & flow_type)
                         ctrl_off = ct->regs.type;
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 27506302eb7a..4dbed4a67aaf 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3834,7 +3834,7 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len)
                                 err = -EBUSY;
                 }
                 spin_unlock(&mddev->lock);
-                return err;
+                return err ?: len;
         }
         err = mddev_lock(mddev);
         if (err)
@@ -4217,13 +4217,14 @@ action_store(struct mddev *mddev, const char *page, size_t len)
                         set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
                 else
                         clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
-                flush_workqueue(md_misc_wq);
-                if (mddev->sync_thread) {
-                        set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-                        if (mddev_lock(mddev) == 0) {
+                if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
+                    mddev_lock(mddev) == 0) {
+                        flush_workqueue(md_misc_wq);
+                        if (mddev->sync_thread) {
+                                set_bit(MD_RECOVERY_INTR, &mddev->recovery);
                                 md_reap_sync_thread(mddev);
-                                mddev_unlock(mddev);
                         }
+                        mddev_unlock(mddev);
                 }
         } else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
                    test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
@@ -8261,6 +8262,7 @@ void md_reap_sync_thread(struct mddev *mddev)
         if (mddev_is_clustered(mddev))
                 md_cluster_ops->metadata_update_finish(mddev);
         clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+        clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
         clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
         clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
         clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e793ab6b3570..f55c3f35b746 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4156,6 +4156,7 @@ static int raid10_start_reshape(struct mddev *mddev)
 
         clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
         clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+        clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
         set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
         set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 553d54b87052..b6793d2e051f 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -7354,6 +7354,7 @@ static int raid5_start_reshape(struct mddev *mddev)
 
         clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
         clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+        clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
         set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
         set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
         mddev->sync_thread = md_register_thread(md_do_sync, mddev,
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index db84ddcfec84..9fd6c69a8bac 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -423,7 +423,7 @@ static void xgbe_tx_timer(unsigned long data)
         if (napi_schedule_prep(napi)) {
                 /* Disable Tx and Rx interrupts */
                 if (pdata->per_channel_irq)
-                        disable_irq(channel->dma_irq);
+                        disable_irq_nosync(channel->dma_irq);
                 else
                         xgbe_disable_rx_tx_ints(pdata);
 
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 77363d680532..a3b1c07ae0af 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2464,6 +2464,7 @@ err_out_powerdown:
         ssb_bus_may_powerdown(sdev->bus);
 
 err_out_free_dev:
+        netif_napi_del(&bp->napi);
         free_netdev(dev);
 
 out:
@@ -2480,6 +2481,7 @@ static void b44_remove_one(struct ssb_device *sdev)
                 b44_unregister_phy_one(bp);
         ssb_device_disable(sdev, 0);
         ssb_bus_may_powerdown(sdev->bus);
+        netif_napi_del(&bp->napi);
         free_netdev(dev);
         ssb_pcihost_set_power_state(sdev, PCI_D3hot);
         ssb_set_drvdata(sdev, NULL);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index a3b0f7a0c61e..1f82a04ce01a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1774,7 +1774,7 @@ struct bnx2x {
         int                     stats_state;
 
         /* used for synchronization of concurrent threads statistics handling */
-        struct mutex            stats_lock;
+        struct semaphore        stats_lock;
 
         /* used by dmae command loader */
         struct dmae_command     stats_dmae;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index fd52ce95127e..33501bcddc48 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12054,7 +12054,7 @@ static int bnx2x_init_bp(struct bnx2x *bp)
         mutex_init(&bp->port.phy_mutex);
         mutex_init(&bp->fw_mb_mutex);
         mutex_init(&bp->drv_info_mutex);
-        mutex_init(&bp->stats_lock);
+        sema_init(&bp->stats_lock, 1);
         bp->drv_info_mng_owner = false;
 
         INIT_DELAYED_WORK(&bp->sp_task, bnx2x_sp_task);
@@ -13690,9 +13690,10 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
         cancel_delayed_work_sync(&bp->sp_task);
         cancel_delayed_work_sync(&bp->period_task);
 
-        mutex_lock(&bp->stats_lock);
-        bp->stats_state = STATS_STATE_DISABLED;
-        mutex_unlock(&bp->stats_lock);
+        if (!down_timeout(&bp->stats_lock, HZ / 10)) {
+                bp->stats_state = STATS_STATE_DISABLED;
+                up(&bp->stats_lock);
+        }
 
         bnx2x_save_statistics(bp);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 266b055c2360..69d699f0730a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1372,19 +1372,23 @@ void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
          * that context in case someone is in the middle of a transition.
          * For other events, wait a bit until lock is taken.
          */
-        if (!mutex_trylock(&bp->stats_lock)) {
+        if (down_trylock(&bp->stats_lock)) {
                 if (event == STATS_EVENT_UPDATE)
                         return;
 
                 DP(BNX2X_MSG_STATS,
                    "Unlikely stats' lock contention [event %d]\n", event);
-                mutex_lock(&bp->stats_lock);
+                if (unlikely(down_timeout(&bp->stats_lock, HZ / 10))) {
+                        BNX2X_ERR("Failed to take stats lock [event %d]\n",
+                                  event);
+                        return;
+                }
         }
 
         bnx2x_stats_stm[state][event].action(bp);
         bp->stats_state = bnx2x_stats_stm[state][event].next_state;
 
-        mutex_unlock(&bp->stats_lock);
+        up(&bp->stats_lock);
 
         if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))
                 DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
@@ -1970,7 +1974,11 @@ int bnx2x_stats_safe_exec(struct bnx2x *bp,
         /* Wait for statistics to end [while blocking further requests],
          * then run supplied function 'safely'.
          */
-        mutex_lock(&bp->stats_lock);
+        rc = down_timeout(&bp->stats_lock, HZ / 10);
+        if (unlikely(rc)) {
+                BNX2X_ERR("Failed to take statistics lock for safe execution\n");
+                goto out_no_lock;
+        }
 
         bnx2x_stats_comp(bp);
         while (bp->stats_pending && cnt--)
@@ -1988,7 +1996,7 @@ out:
         /* No need to restart statistics - if they're enabled, the timer
          * will restart the statistics.
          */
-        mutex_unlock(&bp->stats_lock);
-
+        up(&bp->stats_lock);
+out_no_lock:
         return rc;
 }
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index e7651b3c6c57..420949cc55aa 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -299,9 +299,6 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
                         phy_name = "external RGMII (no delay)";
                 else
                         phy_name = "external RGMII (TX delay)";
-                reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);
-                reg |= RGMII_MODE_EN | id_mode_dis;
-                bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
                 bcmgenet_sys_writel(priv,
                                     PORT_MODE_EXT_GPHY, SYS_PORT_CTRL);
                 break;
@@ -310,6 +307,15 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
                 return -EINVAL;
         }
 
+        /* This is an external PHY (xMII), so we need to enable the RGMII
+         * block for the interface to work
+         */
+        if (priv->ext_phy) {
+                reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);
+                reg |= RGMII_MODE_EN | id_mode_dis;
+                bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
+        }
+
         if (init)
                 dev_info(kdev, "configuring instance for %s\n", phy_name);
 
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
index 594a2ab36d31..68f3c13c9ef6 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
@@ -2414,7 +2414,7 @@ bfa_ioc_boot(struct bfa_ioc *ioc, enum bfi_fwboot_type boot_type,
         if (status == BFA_STATUS_OK)
                 bfa_ioc_lpu_start(ioc);
         else
-                bfa_nw_iocpf_timeout(ioc);
+                bfa_fsm_send_event(&ioc->iocpf, IOCPF_E_TIMEOUT);
 
         return status;
 }
@@ -3029,7 +3029,7 @@ bfa_ioc_poll_fwinit(struct bfa_ioc *ioc)
         }
 
         if (ioc->iocpf.poll_time >= BFA_IOC_TOV) {
-                bfa_nw_iocpf_timeout(ioc);
+                bfa_fsm_send_event(&ioc->iocpf, IOCPF_E_TIMEOUT);
         } else {
                 ioc->iocpf.poll_time += BFA_IOC_POLL_TOV;
                 mod_timer(&ioc->iocpf_timer, jiffies +
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 37072a83f9d6..caae6cb2bc1a 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3701,10 +3701,6 @@ bnad_pci_probe(struct pci_dev *pdev,
         setup_timer(&bnad->bna.ioceth.ioc.sem_timer, bnad_iocpf_sem_timeout,
                                 ((unsigned long)bnad));
 
-        /* Now start the timer before calling IOC */
-        mod_timer(&bnad->bna.ioceth.ioc.iocpf_timer,
-                  jiffies + msecs_to_jiffies(BNA_IOC_TIMER_FREQ));
-
         /*
          * Start the chip
          * If the call back comes with error, we bail out.
diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
index ebf462d8082f..badea368bdc8 100644
--- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c
+++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
@@ -30,6 +30,7 @@ cna_read_firmware(struct pci_dev *pdev, u32 **bfi_image,
                         u32 *bfi_image_size, char *fw_name)
 {
         const struct firmware *fw;
+        u32 n;
 
         if (request_firmware(&fw, fw_name, &pdev->dev)) {
                 pr_alert("Can't locate firmware %s\n", fw_name);
@@ -40,6 +41,12 @@ cna_read_firmware(struct pci_dev *pdev, u32 **bfi_image,
         *bfi_image_size = fw->size/sizeof(u32);
         bfi_fw = fw;
 
+        /* Convert loaded firmware to host order as it is stored in file
+         * as sequence of LE32 integers.
+         */
+        for (n = 0; n < *bfi_image_size; n++)
+                le32_to_cpus(*bfi_image + n);
+
         return *bfi_image;
 error:
         return NULL;
diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
index 28d9ca675a27..68d47b196dae 100644
--- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
+++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
@@ -131,8 +131,15 @@ static void enic_get_drvinfo(struct net_device *netdev,
 {
         struct enic *enic = netdev_priv(netdev);
         struct vnic_devcmd_fw_info *fw_info;
+        int err;
 
-        enic_dev_fw_info(enic, &fw_info);
+        err = enic_dev_fw_info(enic, &fw_info);
+        /* return only when pci_zalloc_consistent fails in vnic_dev_fw_info
+         * For other failures, like devcmd failure, we return previously
+         * recorded info.
+         */
+        if (err == -ENOMEM)
+                return;
 
         strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
@@ -181,8 +188,15 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
         struct enic *enic = netdev_priv(netdev);
         struct vnic_stats *vstats;
         unsigned int i;
-
-        enic_dev_stats_dump(enic, &vstats);
+        int err;
+
+        err = enic_dev_stats_dump(enic, &vstats);
+        /* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump
+         * For other failures, like devcmd failure, we return previously
+         * recorded stats.
+         */
+        if (err == -ENOMEM)
+                return;
 
         for (i = 0; i < enic_n_tx_stats; i++)
                 *(data++) = ((u64 *)&vstats->tx)[enic_tx_stats[i].index];
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 204bd182473b..eadae1b412c6 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -615,8 +615,15 @@ static struct rtnl_link_stats64 *enic_get_stats(struct net_device *netdev,
 {
         struct enic *enic = netdev_priv(netdev);
         struct vnic_stats *stats;
+        int err;
 
-        enic_dev_stats_dump(enic, &stats);
+        err = enic_dev_stats_dump(enic, &stats);
+        /* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump
+         * For other failures, like devcmd failure, we return previously
+         * recorded stats.
+         */
+        if (err == -ENOMEM)
+                return net_stats;
 
         net_stats->tx_packets = stats->tx.tx_frames_ok;
         net_stats->tx_bytes = stats->tx.tx_bytes_ok;
@@ -1407,6 +1414,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)
                  */
                 enic_calc_int_moderation(enic, &enic->rq[rq]);
 
+        enic_poll_unlock_napi(&enic->rq[rq]);
         if (work_done < work_to_do) {
 
                 /* Some work done, but not enough to stay in polling,
@@ -1418,7 +1426,6 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)
                         enic_set_int_moderation(enic, &enic->rq[rq]);
                 vnic_intr_unmask(&enic->intr[intr]);
         }
-        enic_poll_unlock_napi(&enic->rq[rq]);
 
         return work_done;
 }
diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
index 36a2ed606c91..c4b2183bf352 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_rq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_rq.c
@@ -188,16 +188,15 @@ void vnic_rq_clean(struct vnic_rq *rq,
         struct vnic_rq_buf *buf;
         u32 fetch_index;
         unsigned int count = rq->ring.desc_count;
+        int i;
 
         buf = rq->to_clean;
 
-        while (vnic_rq_desc_used(rq) > 0) {
-
+        for (i = 0; i < rq->ring.desc_count; i++) {
                 (*buf_clean)(rq, buf);
-
-                buf = rq->to_clean = buf->next;
-                rq->ring.desc_avail++;
+                buf = buf->next;
         }
+        rq->ring.desc_avail = rq->ring.desc_count - 1;
 
         /* Use current fetch_index as the ring starting point */
         fetch_index = ioread32(&rq->ctrl->fetch_index);
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index fb140faeafb1..c5e1d0ac75f9 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1720,9 +1720,9 @@ int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
         total_size = buf_len;
 
         get_fat_cmd.size = sizeof(struct be_cmd_req_get_fat) + 60*1024;
-        get_fat_cmd.va = pci_alloc_consistent(adapter->pdev,
-                                              get_fat_cmd.size,
-                                              &get_fat_cmd.dma);
+        get_fat_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                             get_fat_cmd.size,
+                                             &get_fat_cmd.dma, GFP_ATOMIC);
         if (!get_fat_cmd.va) {
                 dev_err(&adapter->pdev->dev,
                         "Memory allocation failure while reading FAT data\n");
@@ -1767,8 +1767,8 @@ int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
                 log_offset += buf_size;
         }
 err:
-        pci_free_consistent(adapter->pdev, get_fat_cmd.size,
-                            get_fat_cmd.va, get_fat_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, get_fat_cmd.size,
+                          get_fat_cmd.va, get_fat_cmd.dma);
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
@@ -2215,12 +2215,12 @@ int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,
                 return -EINVAL;
 
         cmd.size = sizeof(struct be_cmd_resp_port_type);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory allocation failed\n");
                 return -ENOMEM;
         }
-        memset(cmd.va, 0, cmd.size);
 
         spin_lock_bh(&adapter->mcc_lock);
 
@@ -2245,7 +2245,7 @@ int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,
         }
 err:
         spin_unlock_bh(&adapter->mcc_lock);
-        pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma);
         return status;
 }
 
@@ -2720,7 +2720,8 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)
                 goto err;
         }
         cmd.size = sizeof(struct be_cmd_req_get_phy_info);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
                 status = -ENOMEM;
@@ -2754,7 +2755,7 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)
                                 BE_SUPPORTED_SPEED_1GBPS;
                 }
         }
-        pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma);
 err:
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
@@ -2805,8 +2806,9 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
 
         memset(&attribs_cmd, 0, sizeof(struct be_dma_mem));
         attribs_cmd.size = sizeof(struct be_cmd_resp_cntl_attribs);
-        attribs_cmd.va = pci_alloc_consistent(adapter->pdev, attribs_cmd.size,
-                                              &attribs_cmd.dma);
+        attribs_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                             attribs_cmd.size,
+                                             &attribs_cmd.dma, GFP_ATOMIC);
         if (!attribs_cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
                 status = -ENOMEM;
@@ -2833,8 +2835,8 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
 err:
         mutex_unlock(&adapter->mbox_lock);
         if (attribs_cmd.va)
-                pci_free_consistent(adapter->pdev, attribs_cmd.size,
-                                    attribs_cmd.va, attribs_cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, attribs_cmd.size,
+                                  attribs_cmd.va, attribs_cmd.dma);
         return status;
 }
 
@@ -2972,9 +2974,10 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
 
         memset(&get_mac_list_cmd, 0, sizeof(struct be_dma_mem));
         get_mac_list_cmd.size = sizeof(struct be_cmd_resp_get_mac_list);
-        get_mac_list_cmd.va = pci_alloc_consistent(adapter->pdev,
-                                                   get_mac_list_cmd.size,
-                                                   &get_mac_list_cmd.dma);
+        get_mac_list_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                                  get_mac_list_cmd.size,
+                                                  &get_mac_list_cmd.dma,
+                                                  GFP_ATOMIC);
 
         if (!get_mac_list_cmd.va) {
                 dev_err(&adapter->pdev->dev,
@@ -3047,8 +3050,8 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
 
 out:
         spin_unlock_bh(&adapter->mcc_lock);
-        pci_free_consistent(adapter->pdev, get_mac_list_cmd.size,
-                            get_mac_list_cmd.va, get_mac_list_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, get_mac_list_cmd.size,
+                          get_mac_list_cmd.va, get_mac_list_cmd.dma);
         return status;
 }
 
@@ -3101,8 +3104,8 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
 
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_req_set_mac_list);
-        cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size,
-                                    &cmd.dma, GFP_KERNEL);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_KERNEL);
         if (!cmd.va)
                 return -ENOMEM;
 
@@ -3291,7 +3294,8 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
 
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_resp_acpi_wol_magic_config_v1);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
                 status = -ENOMEM;
@@ -3326,7 +3330,8 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
 err:
         mutex_unlock(&adapter->mbox_lock);
         if (cmd.va)
-                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
+                                  cmd.dma);
         return status;
 
 }
@@ -3340,8 +3345,9 @@ int be_cmd_set_fw_log_level(struct be_adapter *adapter, u32 level)
 
         memset(&extfat_cmd, 0, sizeof(struct be_dma_mem));
         extfat_cmd.size = sizeof(struct be_cmd_resp_get_ext_fat_caps);
-        extfat_cmd.va = pci_alloc_consistent(adapter->pdev, extfat_cmd.size,
-                                             &extfat_cmd.dma);
+        extfat_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                            extfat_cmd.size, &extfat_cmd.dma,
+                                            GFP_ATOMIC);
         if (!extfat_cmd.va)
                 return -ENOMEM;
 
@@ -3363,8 +3369,8 @@ int be_cmd_set_fw_log_level(struct be_adapter *adapter, u32 level)
 
         status = be_cmd_set_ext_fat_capabilites(adapter, &extfat_cmd, cfgs);
 err:
-        pci_free_consistent(adapter->pdev, extfat_cmd.size, extfat_cmd.va,
-                            extfat_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, extfat_cmd.size, extfat_cmd.va,
+                          extfat_cmd.dma);
         return status;
 }
 
@@ -3377,8 +3383,9 @@ int be_cmd_get_fw_log_level(struct be_adapter *adapter)
 
         memset(&extfat_cmd, 0, sizeof(struct be_dma_mem));
         extfat_cmd.size = sizeof(struct be_cmd_resp_get_ext_fat_caps);
-        extfat_cmd.va = pci_alloc_consistent(adapter->pdev, extfat_cmd.size,
-                                             &extfat_cmd.dma);
+        extfat_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                            extfat_cmd.size, &extfat_cmd.dma,
+                                            GFP_ATOMIC);
 
         if (!extfat_cmd.va) {
                 dev_err(&adapter->pdev->dev, "%s: Memory allocation failure\n",
@@ -3396,8 +3403,8 @@ int be_cmd_get_fw_log_level(struct be_adapter *adapter)
                                 level = cfgs->module[0].trace_lvl[j].dbg_lvl;
                 }
         }
-        pci_free_consistent(adapter->pdev, extfat_cmd.size, extfat_cmd.va,
-                            extfat_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, extfat_cmd.size, extfat_cmd.va,
+                          extfat_cmd.dma);
 err:
         return level;
 }
@@ -3595,7 +3602,8 @@ int be_cmd_get_func_config(struct be_adapter *adapter, struct be_resources *res)
 
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_resp_get_func_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
                 status = -ENOMEM;
@@ -3635,7 +3643,8 @@ int be_cmd_get_func_config(struct be_adapter *adapter, struct be_resources *res)
 err:
         mutex_unlock(&adapter->mbox_lock);
         if (cmd.va)
-                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
+                                  cmd.dma);
         return status;
 }
 
@@ -3656,7 +3665,8 @@ int be_cmd_get_profile_config(struct be_adapter *adapter,
 
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_resp_get_profile_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va)
                 return -ENOMEM;
 
@@ -3702,7 +3712,8 @@ int be_cmd_get_profile_config(struct be_adapter *adapter,
                 res->vf_if_cap_flags = vf_res->cap_flags;
 err:
         if (cmd.va)
-                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
+                                  cmd.dma);
         return status;
 }
 
@@ -3717,7 +3728,8 @@ static int be_cmd_set_profile_config(struct be_adapter *adapter, void *desc,
 
         memset(&cmd, 0, sizeof(struct be_dma_mem));
         cmd.size = sizeof(struct be_cmd_req_set_profile_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                     GFP_ATOMIC);
         if (!cmd.va)
                 return -ENOMEM;
 
@@ -3733,7 +3745,8 @@ static int be_cmd_set_profile_config(struct be_adapter *adapter, void *desc,
         status = be_cmd_notify_wait(adapter, &wrb);
 
         if (cmd.va)
-                pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
+                                  cmd.dma);
         return status;
 }
 
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index b765c24625bf..2835dee5dc39 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -264,8 +264,8 @@ static int lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
         int status = 0;
 
         read_cmd.size = LANCER_READ_FILE_CHUNK;
-        read_cmd.va = pci_alloc_consistent(adapter->pdev, read_cmd.size,
-                                           &read_cmd.dma);
+        read_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev, read_cmd.size,
+                                          &read_cmd.dma, GFP_ATOMIC);
 
         if (!read_cmd.va) {
                 dev_err(&adapter->pdev->dev,
@@ -289,8 +289,8 @@ static int lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
                         break;
                 }
         }
-        pci_free_consistent(adapter->pdev, read_cmd.size, read_cmd.va,
-                            read_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, read_cmd.size, read_cmd.va,
+                          read_cmd.dma);
 
         return status;
 }
@@ -818,8 +818,9 @@ static int be_test_ddr_dma(struct be_adapter *adapter)
         };
 
         ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
-        ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size,
-                                           &ddrdma_cmd.dma, GFP_KERNEL);
+        ddrdma_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                            ddrdma_cmd.size, &ddrdma_cmd.dma,
+                                            GFP_KERNEL);
         if (!ddrdma_cmd.va)
                 return -ENOMEM;
 
@@ -941,8 +942,9 @@ static int be_read_eeprom(struct net_device *netdev,
 
         memset(&eeprom_cmd, 0, sizeof(struct be_dma_mem));
         eeprom_cmd.size = sizeof(struct be_cmd_req_seeprom_read);
-        eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size,
-                                           &eeprom_cmd.dma, GFP_KERNEL);
+        eeprom_cmd.va = dma_zalloc_coherent(&adapter->pdev->dev,
+                                            eeprom_cmd.size, &eeprom_cmd.dma,
+                                            GFP_KERNEL);
 
         if (!eeprom_cmd.va)
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 6f9ffb9026cd..e43cc8a73ea7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4605,8 +4605,8 @@ static int lancer_fw_download(struct be_adapter *adapter,
 
         flash_cmd.size = sizeof(struct lancer_cmd_req_write_object)
                                 + LANCER_FW_DOWNLOAD_CHUNK;
-        flash_cmd.va = dma_alloc_coherent(dev, flash_cmd.size,
-                                          &flash_cmd.dma, GFP_KERNEL);
+        flash_cmd.va = dma_zalloc_coherent(dev, flash_cmd.size,
+                                           &flash_cmd.dma, GFP_KERNEL);
         if (!flash_cmd.va)
                 return -ENOMEM;
 
@@ -4739,8 +4739,8 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
         }
 
         flash_cmd.size = sizeof(struct be_cmd_write_flashrom);
-        flash_cmd.va = dma_alloc_coherent(dev, flash_cmd.size, &flash_cmd.dma,
-                                          GFP_KERNEL);
+        flash_cmd.va = dma_zalloc_coherent(dev, flash_cmd.size, &flash_cmd.dma,
+                                           GFP_KERNEL);
         if (!flash_cmd.va)
                 return -ENOMEM;
 
@@ -5291,16 +5291,15 @@ static int be_drv_init(struct be_adapter *adapter)
         int status = 0;
 
         mbox_mem_alloc->size = sizeof(struct be_mcc_mailbox) + 16;
-        mbox_mem_alloc->va = dma_alloc_coherent(dev, mbox_mem_alloc->size,
-                                                &mbox_mem_alloc->dma,
-                                                GFP_KERNEL);
+        mbox_mem_alloc->va = dma_zalloc_coherent(dev, mbox_mem_alloc->size,
+                                                 &mbox_mem_alloc->dma,
+                                                 GFP_KERNEL);
         if (!mbox_mem_alloc->va)
                 return -ENOMEM;
 
         mbox_mem_align->size = sizeof(struct be_mcc_mailbox);
         mbox_mem_align->va = PTR_ALIGN(mbox_mem_alloc->va, 16);
         mbox_mem_align->dma = PTR_ALIGN(mbox_mem_alloc->dma, 16);
-        memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox));
 
         rx_filter->size = sizeof(struct be_cmd_req_rx_filter);
         rx_filter->va = dma_zalloc_coherent(dev, rx_filter->size,
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 33c35d3b7420..5d47307121ab 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -317,6 +317,7 @@ struct i40e_pf {
 #endif
 #define I40E_FLAG_PORT_ID_VALID                (u64)(1 << 28)
 #define I40E_FLAG_DCB_CAPABLE                  (u64)(1 << 29)
+#define I40E_FLAG_VEB_MODE_ENABLED              BIT_ULL(40)
 
         /* tracks features that get auto disabled by errors */
         u64 auto_disable_flags;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 34170eabca7d..da0faf478af0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1021,6 +1021,15 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                         goto command_write_done;
                 }
 
+                /* By default we are in VEPA mode, if this is the first VF/VMDq
+                 * VSI to be added switch to VEB mode.
+                 */
+                if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {
+                        pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;
+                        i40e_do_reset_safe(pf,
+                                           BIT_ULL(__I40E_PF_RESET_REQUESTED));
+                }
+
                 vsi = i40e_vsi_setup(pf, I40E_VSI_VMDQ2, vsi_seid, 0);
                 if (vsi)
                         dev_info(&pf->pdev->dev, "added VSI %d to relay %d\n",
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index a54c14491e3b..5b5bea159bd5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6097,6 +6097,10 @@ static int i40e_reconstitute_veb(struct i40e_veb *veb)
         if (ret)
                 goto end_reconstitute;
 
+        if (pf->flags & I40E_FLAG_VEB_MODE_ENABLED)
+                veb->bridge_mode = BRIDGE_MODE_VEB;
+        else
+                veb->bridge_mode = BRIDGE_MODE_VEPA;
         i40e_config_bridge_mode(veb);
 
         /* create the remaining VSIs attached to this VEB */
@@ -8031,7 +8035,12 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,
                 } else if (mode != veb->bridge_mode) {
                         /* Existing HW bridge but different mode needs reset */
                         veb->bridge_mode = mode;
-                        i40e_do_reset(pf, (1 << __I40E_PF_RESET_REQUESTED));
+                        /* TODO: If no VFs or VMDq VSIs, disallow VEB mode */
+                        if (mode == BRIDGE_MODE_VEB)
+                                pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;
+                        else
+                                pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED;
+                        i40e_do_reset(pf, BIT_ULL(__I40E_PF_RESET_REQUESTED));
                         break;
                 }
         }
@@ -8343,11 +8352,12 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                 ctxt.uplink_seid = vsi->uplink_seid;
                 ctxt.connection_type = I40E_AQ_VSI_CONN_TYPE_NORMAL;
                 ctxt.flags = I40E_AQ_VSI_TYPE_PF;
-                if (i40e_is_vsi_uplink_mode_veb(vsi)) {
+                if ((pf->flags & I40E_FLAG_VEB_MODE_ENABLED) &&
+                    (i40e_is_vsi_uplink_mode_veb(vsi))) {
                         ctxt.info.valid_sections |=
-                                cpu_to_le16(I40E_AQ_VSI_PROP_SWITCH_VALID);
+                             cpu_to_le16(I40E_AQ_VSI_PROP_SWITCH_VALID);
                         ctxt.info.switch_id =
-                                cpu_to_le16(I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB);
+                           cpu_to_le16(I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB);
                 }
                 i40e_vsi_setup_queue_map(vsi, &ctxt, enabled_tc, true);
                 break;
@@ -8746,6 +8756,14 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
                                          __func__);
                                 return NULL;
                         }
+                        /* We come up by default in VEPA mode if SRIOV is not
+                         * already enabled, in which case we can't force VEPA
+                         * mode.
+                         */
+                        if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {
+                                veb->bridge_mode = BRIDGE_MODE_VEPA;
+                                pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED;
+                        }
                         i40e_config_bridge_mode(veb);
                 }
                 for (i = 0; i < I40E_MAX_VEB && !veb; i++) {
@@ -9856,6 +9874,15 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_switch_setup;
         }
 
+#ifdef CONFIG_PCI_IOV
+        /* prep for VF support */
+        if ((pf->flags & I40E_FLAG_SRIOV_ENABLED) &&
+            (pf->flags & I40E_FLAG_MSIX_ENABLED) &&
+            !test_bit(__I40E_BAD_EEPROM, &pf->state)) {
+                if (pci_num_vf(pdev))
+                        pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;
+        }
+#endif
         err = i40e_setup_pf_switch(pf, false);
         if (err) {
                 dev_info(&pdev->dev, "setup_pf_switch failed: %d\n", err);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 4bd3a80aba82..9d95042d5a0f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2410,14 +2410,12 @@ static int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)
  * i40e_chk_linearize - Check if there are more than 8 fragments per packet
  * @skb:      send buffer
  * @tx_flags: collected send information
- * @hdr_len:  size of the packet header
  *
  * Note: Our HW can't scatter-gather more than 8 fragments to build
  * a packet on the wire and so we need to figure out the cases where we
  * need to linearize the skb.
  **/
-static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
-                               const u8 hdr_len)
+static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags)
 {
         struct skb_frag_struct *frag;
         bool linearize = false;
@@ -2429,7 +2427,7 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
         gso_segs = skb_shinfo(skb)->gso_segs;
 
         if (tx_flags & (I40E_TX_FLAGS_TSO | I40E_TX_FLAGS_FSO)) {
-                u16 j = 1;
+                u16 j = 0;
 
                 if (num_frags < (I40E_MAX_BUFFER_TXD))
                         goto linearize_chk_done;
@@ -2440,21 +2438,18 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
                         goto linearize_chk_done;
                 }
                 frag = &skb_shinfo(skb)->frags[0];
-                size = hdr_len;
                 /* we might still have more fragments per segment */
                 do {
                         size += skb_frag_size(frag);
                         frag++; j++;
+                        if ((size >= skb_shinfo(skb)->gso_size) &&
+                            (j < I40E_MAX_BUFFER_TXD)) {
+                                size = (size % skb_shinfo(skb)->gso_size);
+                                j = (size) ? 1 : 0;
+                        }
                         if (j == I40E_MAX_BUFFER_TXD) {
-                                if (size < skb_shinfo(skb)->gso_size) {
-                                        linearize = true;
-                                        break;
-                                }
-                                j = 1;
-                                size -= skb_shinfo(skb)->gso_size;
-                                if (size)
-                                        j++;
-                                size += hdr_len;
+                                linearize = true;
+                                break;
                         }
                         num_frags--;
                 } while (num_frags);
@@ -2724,7 +2719,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
         if (tsyn)
                 tx_flags |= I40E_TX_FLAGS_TSYN;
 
-        if (i40e_chk_linearize(skb, tx_flags, hdr_len))
+        if (i40e_chk_linearize(skb, tx_flags))
                 if (skb_linearize(skb))
                         goto out_drop;
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 78d1c4ff565e..4e9376da0518 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1018,11 +1018,19 @@ int i40e_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
 {
         struct i40e_pf *pf = pci_get_drvdata(pdev);
 
-        if (num_vfs)
+        if (num_vfs) {
+                if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {
+                        pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;
+                        i40e_do_reset_safe(pf,
+                                           BIT_ULL(__I40E_PF_RESET_REQUESTED));
+                }
                 return i40e_pci_sriov_enable(pdev, num_vfs);
+        }
 
         if (!pci_vfs_assigned(pf->pdev)) {
                 i40e_free_vfs(pf);
+                pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED;
+                i40e_do_reset_safe(pf, BIT_ULL(__I40E_PF_RESET_REQUESTED));
         } else {
                 dev_warn(&pdev->dev, "Unable to free VFs because some are assigned to VMs.\n");
                 return -EINVAL;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index b077e02a0cc7..458fbb421090 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1619,14 +1619,12 @@ static void i40e_create_tx_ctx(struct i40e_ring *tx_ring,
  * i40e_chk_linearize - Check if there are more than 8 fragments per packet
  * @skb:      send buffer
  * @tx_flags: collected send information
- * @hdr_len:  size of the packet header
  *
  * Note: Our HW can't scatter-gather more than 8 fragments to build
  * a packet on the wire and so we need to figure out the cases where we
  * need to linearize the skb.
  **/
-static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
-                               const u8 hdr_len)
+static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags)
 {
         struct skb_frag_struct *frag;
         bool linearize = false;
@@ -1638,7 +1636,7 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
         gso_segs = skb_shinfo(skb)->gso_segs;
 
         if (tx_flags & (I40E_TX_FLAGS_TSO | I40E_TX_FLAGS_FSO)) {
-                u16 j = 1;
+                u16 j = 0;
 
                 if (num_frags < (I40E_MAX_BUFFER_TXD))
                         goto linearize_chk_done;
@@ -1649,21 +1647,18 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags,
                         goto linearize_chk_done;
                 }
                 frag = &skb_shinfo(skb)->frags[0];
-                size = hdr_len;
                 /* we might still have more fragments per segment */
                 do {
                         size += skb_frag_size(frag);
                         frag++; j++;
+                        if ((size >= skb_shinfo(skb)->gso_size) &&
+                            (j < I40E_MAX_BUFFER_TXD)) {
+                                size = (size % skb_shinfo(skb)->gso_size);
+                                j = (size) ? 1 : 0;
+                        }
                         if (j == I40E_MAX_BUFFER_TXD) {
-                                if (size < skb_shinfo(skb)->gso_size) {
-                                        linearize = true;
-                                        break;
-                                }
-                                j = 1;
-                                size -= skb_shinfo(skb)->gso_size;
-                                if (size)
-                                        j++;
-                                size += hdr_len;
+                                linearize = true;
+                                break;
                         }
                         num_frags--;
                 } while (num_frags);
@@ -1950,7 +1945,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
         else if (tso)
                 tx_flags |= I40E_TX_FLAGS_TSO;
 
-        if (i40e_chk_linearize(skb, tx_flags, hdr_len))
+        if (i40e_chk_linearize(skb, tx_flags))
                 if (skb_linearize(skb))
                         goto out_drop;
 
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index e3b9b63ad010..c3a9392cbc19 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -538,8 +538,8 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp,
                         igb->perout[i].start.tv_nsec = rq->perout.start.nsec;
                         igb->perout[i].period.tv_sec = ts.tv_sec;
                         igb->perout[i].period.tv_nsec = ts.tv_nsec;
-                        wr32(trgttiml, rq->perout.start.sec);
-                        wr32(trgttimh, rq->perout.start.nsec);
+                        wr32(trgttimh, rq->perout.start.sec);
+                        wr32(trgttiml, rq->perout.start.nsec);
                         tsauxc |= tsauxc_mask;
                         tsim |= tsim_mask;
                 } else {
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index c0ad95d2f63d..809ea4610a77 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -224,12 +224,17 @@ static void efx_unmap_rx_buffer(struct efx_nic *efx,
         }
 }
 
-static void efx_free_rx_buffer(struct efx_rx_buffer *rx_buf)
+static void efx_free_rx_buffers(struct efx_rx_queue *rx_queue,
+                                struct efx_rx_buffer *rx_buf,
+                                unsigned int num_bufs)
 {
-        if (rx_buf->page) {
-                put_page(rx_buf->page);
-                rx_buf->page = NULL;
-        }
+        do {
+                if (rx_buf->page) {
+                        put_page(rx_buf->page);
+                        rx_buf->page = NULL;
+                }
+                rx_buf = efx_rx_buf_next(rx_queue, rx_buf);
+        } while (--num_bufs);
 }
 
 /* Attempt to recycle the page if there is an RX recycle ring; the page can
@@ -278,7 +283,7 @@ static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
         /* If this is the last buffer in a page, unmap and free it. */
         if (rx_buf->flags & EFX_RX_BUF_LAST_IN_PAGE) {
                 efx_unmap_rx_buffer(rx_queue->efx, rx_buf);
-                efx_free_rx_buffer(rx_buf);
+                efx_free_rx_buffers(rx_queue, rx_buf, 1);
         }
         rx_buf->page = NULL;
 }
@@ -304,10 +309,7 @@ static void efx_discard_rx_packet(struct efx_channel *channel,
 
         efx_recycle_rx_pages(channel, rx_buf, n_frags);
 
-        do {
-                efx_free_rx_buffer(rx_buf);
-                rx_buf = efx_rx_buf_next(rx_queue, rx_buf);
-        } while (--n_frags);
+        efx_free_rx_buffers(rx_queue, rx_buf, n_frags);
 }
 
 /**
@@ -431,11 +433,10 @@ efx_rx_packet_gro(struct efx_channel *channel, struct efx_rx_buffer *rx_buf,
 
         skb = napi_get_frags(napi);
         if (unlikely(!skb)) {
-                while (n_frags--) {
-                        put_page(rx_buf->page);
-                        rx_buf->page = NULL;
-                        rx_buf = efx_rx_buf_next(&channel->rx_queue, rx_buf);
-                }
+                struct efx_rx_queue *rx_queue;
+
+                rx_queue = efx_channel_get_rx_queue(channel);
+                efx_free_rx_buffers(rx_queue, rx_buf, n_frags);
                 return;
         }
 
@@ -622,7 +623,10 @@ static void efx_rx_deliver(struct efx_channel *channel, u8 *eh,
 
         skb = efx_rx_mk_skb(channel, rx_buf, n_frags, eh, hdr_len);
         if (unlikely(skb == NULL)) {
-                efx_free_rx_buffer(rx_buf);
+                struct efx_rx_queue *rx_queue;
+
+                rx_queue = efx_channel_get_rx_queue(channel);
+                efx_free_rx_buffers(rx_queue, rx_buf, n_frags);
                 return;
         }
         skb_record_rx_queue(skb, channel->rx_queue.core_index);
@@ -661,8 +665,12 @@ void __efx_rx_packet(struct efx_channel *channel)
          * loopback layer, and free the rx_buf here
          */
         if (unlikely(efx->loopback_selftest)) {
+                struct efx_rx_queue *rx_queue;
+
                 efx_loopback_rx_packet(efx, eh, rx_buf->len);
-                efx_free_rx_buffer(rx_buf);
+                rx_queue = efx_channel_get_rx_queue(channel);
+                efx_free_rx_buffers(rx_queue, rx_buf,
+                                    channel->rx_pkt_n_frags);
                 goto out;
         }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
index 4ec9811f49c8..65efb1468988 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
@@ -511,11 +511,9 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx,
                                      msgbuf->rx_pktids,
                                      msgbuf->ioctl_resp_pktid);
         if (msgbuf->ioctl_resp_ret_len != 0) {
-                if (!skb) {
-                        brcmf_err("Invalid packet id idx recv'd %d\n",
-                                  msgbuf->ioctl_resp_pktid);
+                if (!skb)
                         return -EBADF;
-                }
+
                 memcpy(buf, skb->data, (len < msgbuf->ioctl_resp_ret_len) ?
                                        len : msgbuf->ioctl_resp_ret_len);
         }
@@ -874,10 +872,8 @@ brcmf_msgbuf_process_txstatus(struct brcmf_msgbuf *msgbuf, void *buf)
         flowid -= BRCMF_NROF_H2D_COMMON_MSGRINGS;
         skb = brcmf_msgbuf_get_pktid(msgbuf->drvr->bus_if->dev,
                                      msgbuf->tx_pktids, idx);
-        if (!skb) {
-                brcmf_err("Invalid packet id idx recv'd %d\n", idx);
+        if (!skb)
                 return;
-        }
 
         set_bit(flowid, msgbuf->txstatus_done_map);
         commonring = msgbuf->flowrings[flowid];
@@ -1156,6 +1152,8 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
 
         skb = brcmf_msgbuf_get_pktid(msgbuf->drvr->bus_if->dev,
                                      msgbuf->rx_pktids, idx);
+        if (!skb)
+                return;
 
         if (data_offset)
                 skb_pull(skb, data_offset);
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index 75e96db6626b..8e604a3931ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@ -471,7 +471,7 @@ static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
         if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
                 return le16_to_cpup(nvm_sw + RADIO_CFG);
 
-        return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));
+        return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_8000));
 
 }
 
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index 01996c9d98a7..376b84e54ad7 100644
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -320,7 +320,7 @@ struct iwl_trans_pcie {
 
         /*protect hw register */
         spinlock_t reg_lock;
-        bool cmd_in_flight;
+        bool cmd_hold_nic_awake;
         bool ref_cmd_in_flight;
 
         /* protect ref counter */
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index d6f6515fe663..dc179094e6a0 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1372,7 +1372,7 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent,
 
         spin_lock_irqsave(&trans_pcie->reg_lock, *flags);
 
-        if (trans_pcie->cmd_in_flight)
+        if (trans_pcie->cmd_hold_nic_awake)
                 goto out;
 
         /* this bit wakes up the NIC */
@@ -1438,7 +1438,7 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,
          */
         __acquire(&trans_pcie->reg_lock);
 
-        if (trans_pcie->cmd_in_flight)
+        if (trans_pcie->cmd_hold_nic_awake)
                 goto out;
 
         __iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 06952aadfd7b..5ef8044c2ea3 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1039,18 +1039,14 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
                 iwl_trans_pcie_ref(trans);
         }
 
-        if (trans_pcie->cmd_in_flight)
-                return 0;
-
-        trans_pcie->cmd_in_flight = true;
-
         /*
          * wake up the NIC to make sure that the firmware will see the host
          * command - we will let the NIC sleep once all the host commands
          * returned. This needs to be done only on NICs that have
          * apmg_wake_up_wa set.
          */
-        if (trans->cfg->base_params->apmg_wake_up_wa) {
+        if (trans->cfg->base_params->apmg_wake_up_wa &&
+            !trans_pcie->cmd_hold_nic_awake) {
                 __iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
                                          CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
                 if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
@@ -1064,10 +1060,10 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
                 if (ret < 0) {
                         __iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
                                         CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-                        trans_pcie->cmd_in_flight = false;
                         IWL_ERR(trans, "Failed to wake NIC for hcmd\n");
                         return -EIO;
                 }
+                trans_pcie->cmd_hold_nic_awake = true;
         }
 
         return 0;
@@ -1085,15 +1081,14 @@ static int iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)
                 iwl_trans_pcie_unref(trans);
         }
 
-        if (WARN_ON(!trans_pcie->cmd_in_flight))
-                return 0;
-
-        trans_pcie->cmd_in_flight = false;
+        if (trans->cfg->base_params->apmg_wake_up_wa) {
+                if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))
+                        return 0;
 
-        if (trans->cfg->base_params->apmg_wake_up_wa)
+                trans_pcie->cmd_hold_nic_awake = false;
                 __iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
-                                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-
+                                           CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        }
         return 0;
 }
 
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 4de46aa61d95..0d2594395ffb 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1250,7 +1250,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
                         netdev_err(queue->vif->dev,
                                    "txreq.offset: %x, size: %u, end: %lu\n",
                                    txreq.offset, txreq.size,
-                                   (txreq.offset&~PAGE_MASK) + txreq.size);
+                                   (unsigned long)(txreq.offset&~PAGE_MASK) + txreq.size);
                         xenvif_fatal_tx_err(queue->vif);
                         break;
                 }
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index fee02414529e..968787abf78d 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -34,6 +34,8 @@ struct backend_info {
         enum xenbus_state frontend_state;
         struct xenbus_watch hotplug_status_watch;
         u8 have_hotplug_status_watch:1;
+
+        const char *hotplug_script;
 };
 
 static int connect_rings(struct backend_info *be, struct xenvif_queue *queue);
@@ -238,6 +240,7 @@ static int netback_remove(struct xenbus_device *dev)
                 xenvif_free(be->vif);
                 be->vif = NULL;
         }
+        kfree(be->hotplug_script);
         kfree(be);
         dev_set_drvdata(&dev->dev, NULL);
         return 0;
@@ -255,6 +258,7 @@ static int netback_probe(struct xenbus_device *dev,
         struct xenbus_transaction xbt;
         int err;
         int sg;
+        const char *script;
         struct backend_info *be = kzalloc(sizeof(struct backend_info),
                                           GFP_KERNEL);
         if (!be) {
@@ -347,6 +351,15 @@ static int netback_probe(struct xenbus_device *dev,
         if (err)
                 pr_debug("Error writing multi-queue-max-queues\n");
 
+        script = xenbus_read(XBT_NIL, dev->nodename, "script", NULL);
+        if (IS_ERR(script)) {
+                err = PTR_ERR(script);
+                xenbus_dev_fatal(dev, err, "reading script");
+                goto fail;
+        }
+
+        be->hotplug_script = script;
+
         err = xenbus_switch_state(dev, XenbusStateInitWait);
         if (err)
                 goto fail;
@@ -379,22 +392,14 @@ static int netback_uevent(struct xenbus_device *xdev,
                           struct kobj_uevent_env *env)
 {
         struct backend_info *be = dev_get_drvdata(&xdev->dev);
-        char *val;
 
-        val = xenbus_read(XBT_NIL, xdev->nodename, "script", NULL);
-        if (IS_ERR(val)) {
-                int err = PTR_ERR(val);
-                xenbus_dev_fatal(xdev, err, "reading script");
-                return err;
-        } else {
-                if (add_uevent_var(env, "script=%s", val)) {
-                        kfree(val);
-                        return -ENOMEM;
-                }
-                kfree(val);
-        }
+        if (!be)
+                return 0;
+
+        if (add_uevent_var(env, "script=%s", be->hotplug_script))
+                return -ENOMEM;
 
-        if (!be || !be->vif)
+        if (!be->vif)
                 return 0;
 
         return add_uevent_var(env, "vif=%s", be->vif->dev->name);
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index cd29b1038c5e..15f9b7c9e4d3 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -1660,6 +1660,7 @@ static int ntb_atom_detect(struct ntb_device *ndev)
         u32 ppd;
 
         ndev->hw_type = BWD_HW;
+        ndev->limits.max_mw = BWD_MAX_MW;
 
         rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd);
         if (rc)
@@ -1778,7 +1779,7 @@ static int ntb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         dev_warn(&pdev->dev, "Cannot remap BAR %d\n",
                                  MW_TO_BAR(i));
                         rc = -EIO;
-                        goto err3;
+                        goto err4;
                 }
         }
 
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 99764db0875a..f0650265febf 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -189,7 +189,7 @@ int __of_attach_node_sysfs(struct device_node *np)
         return 0;
 }
 
-static int __init of_init(void)
+void __init of_core_init(void)
 {
         struct device_node *np;
 
@@ -198,7 +198,8 @@ static int __init of_init(void)
         of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj);
         if (!of_kset) {
                 mutex_unlock(&of_mutex);
-                return -ENOMEM;
+                pr_err("devicetree: failed to register existing nodes\n");
+                return;
         }
         for_each_of_allnodes(np)
                 __of_attach_node_sysfs(np);
@@ -207,10 +208,7 @@ static int __init of_init(void)
         /* Symlink in /proc as required by userspace ABI */
         if (of_root)
                 proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base");
-
-        return 0;
 }
-core_initcall(of_init);
 
 static struct property *__of_find_property(const struct device_node *np,
                                            const char *name, int *lenp)
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 3351ef408125..53826b84e0ec 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -225,7 +225,7 @@ void __of_attach_node(struct device_node *np)
         phandle = __of_get_property(np, "phandle", &sz);
         if (!phandle)
                 phandle = __of_get_property(np, "linux,phandle", &sz);
-        if (IS_ENABLED(PPC_PSERIES) && !phandle)
+        if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle)
                 phandle = __of_get_property(np, "ibm,phandle", &sz);
         np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0;
 
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 4fd0cacf7ca0..508cc56130e3 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -428,16 +428,19 @@ static void __assign_resources_sorted(struct list_head *head,
                  * consistent.
                  */
                 if (add_align > dev_res->res->start) {
+                        resource_size_t r_size = resource_size(dev_res->res);
+
                         dev_res->res->start = add_align;
-                        dev_res->res->end = add_align +
-                                            resource_size(dev_res->res);
+                        dev_res->res->end = add_align + r_size - 1;
 
                         list_for_each_entry(dev_res2, head, list) {
                                 align = pci_resource_alignment(dev_res2->dev,
                                                                dev_res2->res);
-                                if (add_align > align)
+                                if (add_align > align) {
                                         list_move_tail(&dev_res->list,
                                                        &dev_res2->list);
+                                        break;
+                                }
                         }
                }
 
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index a53bd5b52df9..fc9b9f0ea91e 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -38,7 +38,9 @@ config ARMADA375_USBCLUSTER_PHY
 config PHY_DM816X_USB
         tristate "TI dm816x USB PHY driver"
         depends on ARCH_OMAP2PLUS
+        depends on USB_SUPPORT
         select GENERIC_PHY
+        select USB_PHY
         help
           Enable this for dm816x USB to work.
 
@@ -97,8 +99,9 @@ config OMAP_CONTROL_PHY
 config OMAP_USB2
         tristate "OMAP USB2 PHY Driver"
         depends on ARCH_OMAP2PLUS
-        depends on USB_PHY
+        depends on USB_SUPPORT
         select GENERIC_PHY
+        select USB_PHY
         select OMAP_CONTROL_PHY
         depends on OMAP_OCP2SCP
         help
@@ -122,8 +125,9 @@ config TI_PIPE3
 config TWL4030_USB
         tristate "TWL4030 USB Transceiver Driver"
         depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
-        depends on USB_PHY
+        depends on USB_SUPPORT
         select GENERIC_PHY
+        select USB_PHY
         help
           Enable this to support the USB OTG transceiver on TWL4030
           family chips (including the TWL5030 and TPS659x0 devices).
@@ -304,7 +308,7 @@ config PHY_STIH41X_USB
 
 config PHY_QCOM_UFS
         tristate "Qualcomm UFS PHY driver"
-        depends on OF && ARCH_MSM
+        depends on OF && ARCH_QCOM
         select GENERIC_PHY
         help
           Support for UFS PHY on QCOM chipsets.
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3791838f4bd4..63bc12d7a73e 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -530,7 +530,7 @@ struct phy *phy_optional_get(struct device *dev, const char *string)
 {
         struct phy *phy = phy_get(dev, string);
 
-        if (PTR_ERR(phy) == -ENODEV)
+        if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))
                 phy = NULL;
 
         return phy;
@@ -584,7 +584,7 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string)
 {
         struct phy *phy = devm_phy_get(dev, string);
 
-        if (PTR_ERR(phy) == -ENODEV)
+        if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))
                 phy = NULL;
 
         return phy;
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 183ef4368101..c1a468686bdc 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -275,6 +275,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
                 phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
                 if (IS_ERR(phy->wkupclk)) {
                         dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");
+                        pm_runtime_disable(phy->dev);
                         return PTR_ERR(phy->wkupclk);
                 } else {
                         dev_warn(&pdev->dev,
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 778276aba3aa..97d45f47d1ad 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -23,7 +23,7 @@
 #define USBHS_LPSTS                     0x02
 #define USBHS_UGCTRL                    0x80
 #define USBHS_UGCTRL2                   0x84
-#define USBHS_UGSTS                     0x88    /* The manuals have 0x90 */
+#define USBHS_UGSTS                     0x88    /* From technical update */
 
 /* Low Power Status register (LPSTS) */
 #define USBHS_LPSTS_SUSPM               0x4000
@@ -41,7 +41,7 @@
 #define USBHS_UGCTRL2_USB0SEL_HS_USB    0x00000030
 
 /* USB General status register (UGSTS) */
-#define USBHS_UGSTS_LOCK                0x00000300 /* The manuals have 0x3 */
+#define USBHS_UGSTS_LOCK                0x00000100 /* From technical update */
 
 #define PHYS_PER_CHANNEL        2
 
diff --git a/drivers/soc/mediatek/Kconfig b/drivers/soc/mediatek/Kconfig
index bcdb22d5e215..3c1850332a90 100644
--- a/drivers/soc/mediatek/Kconfig
+++ b/drivers/soc/mediatek/Kconfig
@@ -4,6 +4,7 @@
 config MTK_PMIC_WRAP
         tristate "MediaTek PMIC Wrapper Support"
         depends on ARCH_MEDIATEK
+        depends on RESET_CONTROLLER
         select REGMAP
         help
           Say yes here to add support for MediaTek PMIC Wrapper found
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index db5be1eec54c..f432291feee9 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -443,11 +443,6 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp,
 static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
 {
         int ret;
-        u32 val;
-
-        val = pwrap_readl(wrp, PWRAP_WACS2_RDATA);
-        if (PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR)
-                pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
 
         ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
         if (ret)
@@ -462,11 +457,6 @@ static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
 static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
 {
         int ret;
-        u32 val;
-
-        val = pwrap_readl(wrp, PWRAP_WACS2_RDATA);
-        if (PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR)
-                pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
 
         ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
         if (ret)
@@ -480,6 +470,8 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
 
         *rdata = PWRAP_GET_WACS_RDATA(pwrap_readl(wrp, PWRAP_WACS2_RDATA));
 
+        pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
+
         return 0;
 }
 
@@ -563,45 +555,17 @@ static int pwrap_init_sidly(struct pmic_wrapper *wrp)
 
 static int pwrap_init_reg_clock(struct pmic_wrapper *wrp)
 {
-        unsigned long rate_spi;
-        int ck_mhz;
-
-        rate_spi = clk_get_rate(wrp->clk_spi);
-
-        if (rate_spi > 26000000)
-                ck_mhz = 26;
-        else if (rate_spi > 18000000)
-                ck_mhz = 18;
-        else
-                ck_mhz = 0;
-
-        switch (ck_mhz) {
-        case 18:
-                if (pwrap_is_mt8135(wrp))
-                        pwrap_writel(wrp, 0xc, PWRAP_CSHEXT);
-                pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_WRITE);
-                pwrap_writel(wrp, 0xc, PWRAP_CSHEXT_READ);
-                pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_START);
-                pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_END);
-                break;
-        case 26:
-                if (pwrap_is_mt8135(wrp))
-                        pwrap_writel(wrp, 0x4, PWRAP_CSHEXT);
+        if (pwrap_is_mt8135(wrp)) {
+                pwrap_writel(wrp, 0x4, PWRAP_CSHEXT);
                 pwrap_writel(wrp, 0x0, PWRAP_CSHEXT_WRITE);
                 pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_READ);
                 pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_START);
                 pwrap_writel(wrp, 0x0, PWRAP_CSLEXT_END);
-                break;
-        case 0:
-                if (pwrap_is_mt8135(wrp))
-                        pwrap_writel(wrp, 0xf, PWRAP_CSHEXT);
-                pwrap_writel(wrp, 0xf, PWRAP_CSHEXT_WRITE);
-                pwrap_writel(wrp, 0xf, PWRAP_CSHEXT_READ);
-                pwrap_writel(wrp, 0xf, PWRAP_CSLEXT_START);
-                pwrap_writel(wrp, 0xf, PWRAP_CSLEXT_END);
-                break;
-        default:
-                return -EINVAL;
+        } else {
+                pwrap_writel(wrp, 0x0, PWRAP_CSHEXT_WRITE);
+                pwrap_writel(wrp, 0x4, PWRAP_CSHEXT_READ);
+                pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_START);
+                pwrap_writel(wrp, 0x2, PWRAP_CSLEXT_END);
         }
 
         return 0;
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 09428412139e..c5352ea4821e 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -621,8 +621,8 @@ static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc)
         u32 crystalfreq;
         const struct pmu0_plltab_entry *e = NULL;
 
-        crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) &
-                      SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT;
+        crystalfreq = (chipco_read32(cc, SSB_CHIPCO_PMU_CTL) &
+                       SSB_CHIPCO_PMU_CTL_XTALFREQ)  >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT;
         e = pmu0_plltab_find_entry(crystalfreq);
         BUG_ON(!e);
         return e->freq * 1000;
@@ -634,7 +634,7 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc)
 
         switch (bus->chip_id) {
         case 0x5354:
-                ssb_pmu_get_alp_clock_clk0(cc);
+                return ssb_pmu_get_alp_clock_clk0(cc);
         default:
                 ssb_err("ERROR: PMU alp clock unknown for device %04X\n",
                         bus->chip_id);
diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c
index 5ff4716b72c3..784b5ecfa849 100644
--- a/drivers/staging/ozwpan/ozhcd.c
+++ b/drivers/staging/ozwpan/ozhcd.c
@@ -746,8 +746,8 @@ void oz_hcd_pd_reset(void *hpd, void *hport)
 /*
  * Context: softirq
  */
-void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status, const u8 *desc,
-                        int length, int offset, int total_size)
+void oz_hcd_get_desc_cnf(void *hport, u8 req_id, u8 status, const u8 *desc,
+                        u8 length, u16 offset, u16 total_size)
 {
         struct oz_port *port = hport;
         struct urb *urb;
@@ -759,8 +759,8 @@ void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status, const u8 *desc,
         if (!urb)
                 return;
         if (status == 0) {
-                int copy_len;
-                int required_size = urb->transfer_buffer_length;
+                unsigned int copy_len;
+                unsigned int required_size = urb->transfer_buffer_length;
 
                 if (required_size > total_size)
                         required_size = total_size;
diff --git a/drivers/staging/ozwpan/ozusbif.h b/drivers/staging/ozwpan/ozusbif.h
index 4249fa374012..d2a6085345be 100644
--- a/drivers/staging/ozwpan/ozusbif.h
+++ b/drivers/staging/ozwpan/ozusbif.h
@@ -29,8 +29,8 @@ void oz_usb_request_heartbeat(void *hpd);
 
 /* Confirmation functions.
  */
-void oz_hcd_get_desc_cnf(void *hport, u8 req_id, int status,
-        const u8 *desc, int length, int offset, int total_size);
+void oz_hcd_get_desc_cnf(void *hport, u8 req_id, u8 status,
+        const u8 *desc, u8 length, u16 offset, u16 total_size);
 void oz_hcd_control_cnf(void *hport, u8 req_id, u8 rcode,
         const u8 *data, int data_len);
 
diff --git a/drivers/staging/ozwpan/ozusbsvc1.c b/drivers/staging/ozwpan/ozusbsvc1.c
index d434d8c6fff6..f660bb198c65 100644
--- a/drivers/staging/ozwpan/ozusbsvc1.c
+++ b/drivers/staging/ozwpan/ozusbsvc1.c
@@ -326,7 +326,11 @@ static void oz_usb_handle_ep_data(struct oz_usb_ctx *usb_ctx,
                         struct oz_multiple_fixed *body =
                                 (struct oz_multiple_fixed *)data_hdr;
                         u8 *data = body->data;
-                        int n = (len - sizeof(struct oz_multiple_fixed)+1)
+                        unsigned int n;
+                        if (!body->unit_size ||
+                                len < sizeof(struct oz_multiple_fixed) - 1)
+                                break;
+                        n = (len - (sizeof(struct oz_multiple_fixed) - 1))
                                 / body->unit_size;
                         while (n--) {
                                 oz_hcd_data_ind(usb_ctx->hport, body->endpoint,
@@ -390,10 +394,15 @@ void oz_usb_rx(struct oz_pd *pd, struct oz_elt *elt)
         case OZ_GET_DESC_RSP: {
                         struct oz_get_desc_rsp *body =
                                 (struct oz_get_desc_rsp *)usb_hdr;
-                        int data_len = elt->length -
-                                        sizeof(struct oz_get_desc_rsp) + 1;
-                        u16 offs = le16_to_cpu(get_unaligned(&body->offset));
-                        u16 total_size =
+                        u16 offs, total_size;
+                        u8 data_len;
+
+                        if (elt->length < sizeof(struct oz_get_desc_rsp) - 1)
+                                break;
+                        data_len = elt->length -
+                                        (sizeof(struct oz_get_desc_rsp) - 1);
+                        offs = le16_to_cpu(get_unaligned(&body->offset));
+                        total_size =
                                 le16_to_cpu(get_unaligned(&body->total_size));
                         oz_dbg(ON, "USB_REQ_GET_DESCRIPTOR - cnf\n");
                         oz_hcd_get_desc_cnf(usb_ctx->hport, body->req_id,
diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c
index f1d47a0676c3..ada8d5dafd49 100644
--- a/drivers/staging/rtl8712/rtl8712_led.c
+++ b/drivers/staging/rtl8712/rtl8712_led.c
@@ -898,11 +898,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
                           IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedNoLinkBlinkInProgress = true;
@@ -921,11 +921,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
                             IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedLinkBlinkInProgress = true;
@@ -946,15 +946,15 @@ static void SwLedControlMode1(struct _adapter *padapter,
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                  pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -975,11 +975,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
                             IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedLinkBlinkInProgress = false;
                         }
                         pLed->bLedBlinkInProgress = true;
@@ -998,19 +998,19 @@ static void SwLedControlMode1(struct _adapter *padapter,
         case LED_CTL_START_WPS_BOTTON:
                  if (pLed->bLedWPSBlinkInProgress == false) {
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                  pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedScanBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedScanBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1025,23 +1025,23 @@ static void SwLedControlMode1(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS:
                 if (pLed->bLedNoLinkBlinkInProgress == true) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedNoLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedLinkBlinkInProgress == true) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                          pLed->bLedLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedBlinkInProgress == true) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress == true) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress)
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                 else
                         pLed->bLedWPSBlinkInProgress = true;
                 pLed->CurrLedState = LED_BLINK_WPS_STOP;
@@ -1057,7 +1057,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS_FAIL:
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->bLedNoLinkBlinkInProgress = true;
@@ -1073,23 +1073,23 @@ static void SwLedControlMode1(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedNoLinkBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedNoLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedLinkBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 mod_timer(&pLed->BlinkTimer,
@@ -1116,7 +1116,7 @@ static void SwLedControlMode2(struct _adapter *padapter,
                                 return;
 
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -1154,11 +1154,11 @@ static void SwLedControlMode2(struct _adapter *padapter,
                 pLed->CurrLedState = LED_ON;
                 pLed->BlinkingLedState = LED_ON;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
 
@@ -1170,11 +1170,11 @@ static void SwLedControlMode2(struct _adapter *padapter,
         case LED_CTL_START_WPS_BOTTON:
                 if (pLed->bLedWPSBlinkInProgress == false) {
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedScanBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedScanBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1214,15 +1214,15 @@ static void SwLedControlMode2(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 mod_timer(&pLed->BlinkTimer,
@@ -1248,7 +1248,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -1286,11 +1286,11 @@ static void SwLedControlMode3(struct _adapter *padapter,
                 pLed->CurrLedState = LED_ON;
                 pLed->BlinkingLedState = LED_ON;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 mod_timer(&pLed->BlinkTimer,
@@ -1300,11 +1300,11 @@ static void SwLedControlMode3(struct _adapter *padapter,
         case LED_CTL_START_WPS_BOTTON:
                 if (pLed->bLedWPSBlinkInProgress == false) {
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedScanBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedScanBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1319,7 +1319,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS:
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 } else
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1336,7 +1336,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS_FAIL:
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->CurrLedState = LED_OFF;
@@ -1357,15 +1357,15 @@ static void SwLedControlMode3(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 mod_timer(&pLed->BlinkTimer,
@@ -1388,7 +1388,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
         case LED_CTL_START_TO_LINK:
                 if (pLed1->bLedWPSBlinkInProgress) {
                         pLed1->bLedWPSBlinkInProgress = false;
-                        del_timer_sync(&pLed1->BlinkTimer);
+                        del_timer(&pLed1->BlinkTimer);
                         pLed1->BlinkingLedState = LED_OFF;
                         pLed1->CurrLedState = LED_OFF;
                         if (pLed1->bLedOn)
@@ -1400,11 +1400,11 @@ static void SwLedControlMode4(struct _adapter *padapter,
                             IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         pLed->bLedStartToLinkBlinkInProgress = true;
@@ -1426,7 +1426,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 if (LedAction == LED_CTL_LINK) {
                         if (pLed1->bLedWPSBlinkInProgress) {
                                 pLed1->bLedWPSBlinkInProgress = false;
-                                del_timer_sync(&pLed1->BlinkTimer);
+                                del_timer(&pLed1->BlinkTimer);
                                 pLed1->BlinkingLedState = LED_OFF;
                                 pLed1->CurrLedState = LED_OFF;
                                 if (pLed1->bLedOn)
@@ -1439,7 +1439,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                             IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedNoLinkBlinkInProgress = true;
@@ -1460,11 +1460,11 @@ static void SwLedControlMode4(struct _adapter *padapter,
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -1485,7 +1485,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                             IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         pLed->bLedBlinkInProgress = true;
@@ -1503,7 +1503,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
         case LED_CTL_START_WPS_BOTTON:
                 if (pLed1->bLedWPSBlinkInProgress) {
                         pLed1->bLedWPSBlinkInProgress = false;
-                        del_timer_sync(&(pLed1->BlinkTimer));
+                        del_timer(&pLed1->BlinkTimer);
                         pLed1->BlinkingLedState = LED_OFF;
                         pLed1->CurrLedState = LED_OFF;
                         if (pLed1->bLedOn)
@@ -1512,15 +1512,15 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 }
                 if (pLed->bLedWPSBlinkInProgress == false) {
                         if (pLed->bLedNoLinkBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedScanBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedScanBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1538,7 +1538,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS:  /*WPS connect success*/
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->bLedNoLinkBlinkInProgress = true;
@@ -1552,7 +1552,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS_FAIL:     /*WPS authentication fail*/
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->bLedNoLinkBlinkInProgress = true;
@@ -1565,7 +1565,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                           msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
                 /*LED1 settings*/
                 if (pLed1->bLedWPSBlinkInProgress)
-                        del_timer_sync(&pLed1->BlinkTimer);
+                        del_timer(&pLed1->BlinkTimer);
                 else
                         pLed1->bLedWPSBlinkInProgress = true;
                 pLed1->CurrLedState = LED_BLINK_WPS_STOP;
@@ -1578,7 +1578,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 break;
         case LED_CTL_STOP_WPS_FAIL_OVERLAP:     /*WPS session overlap*/
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->bLedNoLinkBlinkInProgress = true;
@@ -1591,7 +1591,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
                           msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
                 /*LED1 settings*/
                 if (pLed1->bLedWPSBlinkInProgress)
-                        del_timer_sync(&pLed1->BlinkTimer);
+                        del_timer(&pLed1->BlinkTimer);
                 else
                         pLed1->bLedWPSBlinkInProgress = true;
                 pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP;
@@ -1607,31 +1607,31 @@ static void SwLedControlMode4(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedNoLinkBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedNoLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedLinkBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 if (pLed->bLedStartToLinkBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedStartToLinkBlinkInProgress = false;
                 }
                 if (pLed1->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed1->BlinkTimer);
+                        del_timer(&pLed1->BlinkTimer);
                         pLed1->bLedWPSBlinkInProgress = false;
                 }
                 pLed1->BlinkingLedState = LED_UNKNOWN;
@@ -1671,7 +1671,7 @@ static void SwLedControlMode5(struct _adapter *padapter,
                         ; /* dummy branch */
                 else if (pLed->bLedScanBlinkInProgress == false) {
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -1705,7 +1705,7 @@ static void SwLedControlMode5(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 SwLedOff(padapter, pLed);
@@ -1756,7 +1756,7 @@ static void SwLedControlMode6(struct _adapter *padapter,
         case LED_CTL_START_WPS_BOTTON:
                 if (pLed->bLedWPSBlinkInProgress == false) {
                         if (pLed->bLedBlinkInProgress == true) {
-                                del_timer_sync(&pLed->BlinkTimer);
+                                del_timer(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -1772,7 +1772,7 @@ static void SwLedControlMode6(struct _adapter *padapter,
         case LED_CTL_STOP_WPS_FAIL:
         case LED_CTL_STOP_WPS:
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->CurrLedState = LED_ON;
@@ -1784,11 +1784,11 @@ static void SwLedControlMode6(struct _adapter *padapter,
                 pLed->CurrLedState = LED_OFF;
                 pLed->BlinkingLedState = LED_OFF;
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&pLed->BlinkTimer);
+                        del_timer(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 SwLedOff(padapter, pLed);
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 1a1c38f885d6..e35854d28f90 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -910,7 +910,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
         if (pcmd->res != H2C_SUCCESS)
                 mod_timer(&pmlmepriv->assoc_timer,
                           jiffies + msecs_to_jiffies(1));
-        del_timer_sync(&pmlmepriv->assoc_timer);
+        del_timer(&pmlmepriv->assoc_timer);
 #ifdef __BIG_ENDIAN
         /* endian_convert */
         pnetwork->Length = le32_to_cpu(pnetwork->Length);
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index fb2b195b90af..c044b0e55ba9 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -582,7 +582,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
         spin_lock_irqsave(&pmlmepriv->lock, irqL);
 
         if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
-                del_timer_sync(&pmlmepriv->scan_to_timer);
+                del_timer(&pmlmepriv->scan_to_timer);
 
                 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
         }
@@ -696,7 +696,7 @@ void r8712_ind_disconnect(struct _adapter *padapter)
         }
         if (padapter->pwrctrlpriv.pwr_mode !=
             padapter->registrypriv.power_mgnt) {
-                del_timer_sync(&pmlmepriv->dhcp_timer);
+                del_timer(&pmlmepriv->dhcp_timer);
                 r8712_set_ps_mode(padapter, padapter->registrypriv.power_mgnt,
                                   padapter->registrypriv.smart_ps);
         }
@@ -910,7 +910,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
                         if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
                                 == true)
                                 r8712_indicate_connect(adapter);
-                        del_timer_sync(&pmlmepriv->assoc_timer);
+                        del_timer(&pmlmepriv->assoc_timer);
                 } else
                         goto ignore_joinbss_callback;
         } else {
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index aaa584435c87..9bc04f474d18 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -103,7 +103,7 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter,
 
         if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80))
                 return;
-        del_timer_sync(&padapter->pwrctrlpriv.rpwm_check_timer);
+        del_timer(&padapter->pwrctrlpriv.rpwm_check_timer);
         _enter_pwrlock(&pwrpriv->lock);
         pwrpriv->cpwm = (preportpwrstate->state) & 0xf;
         if (pwrpriv->cpwm >= PS_STATE_S2) {
diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 7bb96c47f188..a9b93d0f6f56 100644
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -198,7 +198,7 @@ void r8712_free_stainfo(struct _adapter *padapter, struct sta_info *psta)
          * cancel reordering_ctrl_timer */
         for (i = 0; i < 16; i++) {
                 preorder_ctrl = &psta->recvreorder_ctrl[i];
-                del_timer_sync(&preorder_ctrl->reordering_ctrl_timer);
+                del_timer(&preorder_ctrl->reordering_ctrl_timer);
         }
         spin_lock(&(pfree_sta_queue->lock));
         /* insert into free_sta_queue; 20061114 */
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index cc57a3a6b02b..396344cb011f 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -162,6 +162,17 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
         return put_user(x, ptr);
 }
 
+static inline int tty_copy_to_user(struct tty_struct *tty,
+                                        void __user *to,
+                                        const void *from,
+                                        unsigned long n)
+{
+        struct n_tty_data *ldata = tty->disc_data;
+
+        tty_audit_add_data(tty, to, n, ldata->icanon);
+        return copy_to_user(to, from, n);
+}
+
 /**
  *      n_tty_kick_worker - start input worker (if required)
  *      @tty: terminal
@@ -2070,8 +2081,8 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
 
         size = N_TTY_BUF_SIZE - tail;
         n = eol - tail;
-        if (n > 4096)
-                n += 4096;
+        if (n > N_TTY_BUF_SIZE)
+                n += N_TTY_BUF_SIZE;
         n += found;
         c = n;
 
@@ -2084,12 +2095,12 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
                     __func__, eol, found, n, c, size, more);
 
         if (n > size) {
-                ret = copy_to_user(*b, read_buf_addr(ldata, tail), size);
+                ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), size);
                 if (ret)
                         return -EFAULT;
-                ret = copy_to_user(*b + size, ldata->read_buf, n - size);
+                ret = tty_copy_to_user(tty, *b + size, ldata->read_buf, n - size);
         } else
-                ret = copy_to_user(*b, read_buf_addr(ldata, tail), n);
+                ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), n);
 
         if (ret)
                 return -EFAULT;
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 9289999cb7c6..dce1a23706e8 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -562,12 +562,36 @@ static irqreturn_t omap_wake_irq(int irq, void *dev_id)
         return IRQ_NONE;
 }
 
+#ifdef CONFIG_SERIAL_8250_DMA
+static int omap_8250_dma_handle_irq(struct uart_port *port);
+#endif
+
+static irqreturn_t omap8250_irq(int irq, void *dev_id)
+{
+        struct uart_port *port = dev_id;
+        struct uart_8250_port *up = up_to_u8250p(port);
+        unsigned int iir;
+        int ret;
+
+#ifdef CONFIG_SERIAL_8250_DMA
+        if (up->dma) {
+                ret = omap_8250_dma_handle_irq(port);
+                return IRQ_RETVAL(ret);
+        }
+#endif
+
+        serial8250_rpm_get(up);
+        iir = serial_port_in(port, UART_IIR);
+        ret = serial8250_handle_irq(port, iir);
+        serial8250_rpm_put(up);
+
+        return IRQ_RETVAL(ret);
+}
+
 static int omap_8250_startup(struct uart_port *port)
 {
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
+        struct uart_8250_port *up = up_to_u8250p(port);
         struct omap8250_priv *priv = port->private_data;
-
         int ret;
 
         if (priv->wakeirq) {
@@ -580,10 +604,31 @@ static int omap_8250_startup(struct uart_port *port)
 
         pm_runtime_get_sync(port->dev);
 
-        ret = serial8250_do_startup(port);
-        if (ret)
+        up->mcr = 0;
+        serial_out(up, UART_FCR, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+
+        serial_out(up, UART_LCR, UART_LCR_WLEN8);
+
+        up->lsr_saved_flags = 0;
+        up->msr_saved_flags = 0;
+
+        if (up->dma) {
+                ret = serial8250_request_dma(up);
+                if (ret) {
+                        dev_warn_ratelimited(port->dev,
+                                             "failed to request DMA\n");
+                        up->dma = NULL;
+                }
+        }
+
+        ret = request_irq(port->irq, omap8250_irq, IRQF_SHARED,
+                          dev_name(port->dev), port);
+        if (ret < 0)
                 goto err;
 
+        up->ier = UART_IER_RLSI | UART_IER_RDI;
+        serial_out(up, UART_IER, up->ier);
+
 #ifdef CONFIG_PM
         up->capabilities |= UART_CAP_RPM;
 #endif
@@ -610,8 +655,7 @@ err:
 
 static void omap_8250_shutdown(struct uart_port *port)
 {
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
+        struct uart_8250_port *up = up_to_u8250p(port);
         struct omap8250_priv *priv = port->private_data;
 
         flush_work(&priv->qos_work);
@@ -621,11 +665,24 @@ static void omap_8250_shutdown(struct uart_port *port)
         pm_runtime_get_sync(port->dev);
 
         serial_out(up, UART_OMAP_WER, 0);
-        serial8250_do_shutdown(port);
+
+        up->ier = 0;
+        serial_out(up, UART_IER, 0);
+
+        if (up->dma)
+                serial8250_release_dma(up);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+        if (up->lcr & UART_LCR_SBC)
+                serial_out(up, UART_LCR, up->lcr & ~UART_LCR_SBC);
+        serial_out(up, UART_FCR, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
 
         pm_runtime_mark_last_busy(port->dev);
         pm_runtime_put_autosuspend(port->dev);
 
+        free_irq(port->irq, port);
         if (priv->wakeirq)
                 free_irq(priv->wakeirq, port);
 }
@@ -974,6 +1031,13 @@ static inline int omap_8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
 }
 #endif
 
+static int omap8250_no_handle_irq(struct uart_port *port)
+{
+        /* IRQ has not been requested but handling irq? */
+        WARN_ONCE(1, "Unexpected irq handling before port startup\n");
+        return 0;
+}
+
 static int omap8250_probe(struct platform_device *pdev)
 {
         struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1075,6 +1139,7 @@ static int omap8250_probe(struct platform_device *pdev)
         pm_runtime_get_sync(&pdev->dev);
 
         omap_serial_fill_features_erratas(&up, priv);
+        up.port.handle_irq = omap8250_no_handle_irq;
 #ifdef CONFIG_SERIAL_8250_DMA
         if (pdev->dev.of_node) {
                 /*
@@ -1088,7 +1153,6 @@ static int omap8250_probe(struct platform_device *pdev)
                 ret = of_property_count_strings(pdev->dev.of_node, "dma-names");
                 if (ret == 2) {
                         up.dma = &priv->omap8250_dma;
-                        up.port.handle_irq = omap_8250_dma_handle_irq;
                         priv->omap8250_dma.fn = the_no_dma_filter_fn;
                         priv->omap8250_dma.tx_dma = omap_8250_tx_dma;
                         priv->omap8250_dma.rx_dma = omap_8250_rx_dma;
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 6f5a0720a8c8..763eb20fe321 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1249,20 +1249,19 @@ __acquires(&uap->port.lock)
 
 /*
  * Transmit a character
- * There must be at least one free entry in the TX FIFO to accept the char.
  *
- * Returns true if the FIFO might have space in it afterwards;
- * returns false if the FIFO definitely became full.
+ * Returns true if the character was successfully queued to the FIFO.
+ * Returns false otherwise.
  */
 static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c)
 {
+        if (readw(uap->port.membase + UART01x_FR) & UART01x_FR_TXFF)
+                return false; /* unable to transmit character */
+
         writew(c, uap->port.membase + UART01x_DR);
         uap->port.icount.tx++;
 
-        if (likely(uap->tx_irq_seen > 1))
-                return true;
-
-        return !(readw(uap->port.membase + UART01x_FR) & UART01x_FR_TXFF);
+        return true;
 }
 
 static bool pl011_tx_chars(struct uart_amba_port *uap)
@@ -1296,7 +1295,8 @@ static bool pl011_tx_chars(struct uart_amba_port *uap)
                 return false;
 
         if (uap->port.x_char) {
-                pl011_tx_char(uap, uap->port.x_char);
+                if (!pl011_tx_char(uap, uap->port.x_char))
+                        goto done;
                 uap->port.x_char = 0;
                 --count;
         }
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index c8cfa0637128..88250395b0ce 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -911,6 +911,14 @@ static void dma_rx_callback(void *data)
 
         status = dmaengine_tx_status(chan, (dma_cookie_t)0, &state);
         count = RX_BUF_SIZE - state.residue;
+
+        if (readl(sport->port.membase + USR2) & USR2_IDLE) {
+                /* In condition [3] the SDMA counted up too early */
+                count--;
+
+                writel(USR2_IDLE, sport->port.membase + USR2);
+        }
+
         dev_dbg(sport->port.dev, "We get %d bytes.\n", count);
 
         if (count) {
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index fdab715a0631..c0eafa6fd403 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -339,7 +339,7 @@
 #define DWC3_DGCMD_SET_ENDPOINT_NRDY    0x0c
 #define DWC3_DGCMD_RUN_SOC_BUS_LOOPBACK 0x10
 
-#define DWC3_DGCMD_STATUS(n)            (((n) >> 15) & 1)
+#define DWC3_DGCMD_STATUS(n)            (((n) >> 12) & 0x0F)
 #define DWC3_DGCMD_CMDACT               (1 << 10)
 #define DWC3_DGCMD_CMDIOC               (1 << 8)
 
@@ -355,7 +355,7 @@
 #define DWC3_DEPCMD_PARAM_SHIFT         16
 #define DWC3_DEPCMD_PARAM(x)            ((x) << DWC3_DEPCMD_PARAM_SHIFT)
 #define DWC3_DEPCMD_GET_RSC_IDX(x)      (((x) >> DWC3_DEPCMD_PARAM_SHIFT) & 0x7f)
-#define DWC3_DEPCMD_STATUS(x)           (((x) >> 15) & 1)
+#define DWC3_DEPCMD_STATUS(x)           (((x) >> 12) & 0x0F)
 #define DWC3_DEPCMD_HIPRI_FORCERM       (1 << 11)
 #define DWC3_DEPCMD_CMDACT              (1 << 10)
 #define DWC3_DEPCMD_CMDIOC              (1 << 8)
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 6bdb57069044..3507f880eb74 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -315,7 +315,6 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
                                 return ret;
                         }
 
-                        set_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags);
                         return len;
                 }
                 break;
@@ -847,7 +846,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
                                 ret = ep->status;
                                 if (io_data->read && ret > 0) {
                                         ret = copy_to_iter(data, ret, &io_data->data);
-                                        if (unlikely(iov_iter_count(&io_data->data)))
+                                        if (!ret)
                                                 ret = -EFAULT;
                                 }
                         }
@@ -1463,8 +1462,7 @@ static void ffs_data_clear(struct ffs_data *ffs)
 {
         ENTER();
 
-        if (test_and_clear_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags))
-                ffs_closed(ffs);
+        ffs_closed(ffs);
 
         BUG_ON(ffs->gadget);
 
@@ -3422,9 +3420,13 @@ static int ffs_ready(struct ffs_data *ffs)
         ffs_obj->desc_ready = true;
         ffs_obj->ffs_data = ffs;
 
-        if (ffs_obj->ffs_ready_callback)
+        if (ffs_obj->ffs_ready_callback) {
                 ret = ffs_obj->ffs_ready_callback(ffs);
+                if (ret)
+                        goto done;
+        }
 
+        set_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags);
 done:
         ffs_dev_unlock();
         return ret;
@@ -3443,7 +3445,8 @@ static void ffs_closed(struct ffs_data *ffs)
 
         ffs_obj->desc_ready = false;
 
-        if (ffs_obj->ffs_closed_callback)
+        if (test_and_clear_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags) &&
+            ffs_obj->ffs_closed_callback)
                 ffs_obj->ffs_closed_callback(ffs);
 
         if (!ffs_obj->opts || ffs_obj->opts->no_configfs
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 259b656c0b3e..6316aa5b1c49 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -973,7 +973,13 @@ static ssize_t f_midi_opts_id_show(struct f_midi_opts *opts, char *page)
         int result;
 
         mutex_lock(&opts->lock);
-        result = strlcpy(page, opts->id, PAGE_SIZE);
+        if (opts->id) {
+                result = strlcpy(page, opts->id, PAGE_SIZE);
+        } else {
+                page[0] = 0;
+                result = 0;
+        }
+
         mutex_unlock(&opts->lock);
 
         return result;
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 9719abfb6145..7856b3394494 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -588,7 +588,10 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
         if (intf == 1) {
                 if (alt == 1) {
-                        config_ep_by_speed(cdev->gadget, f, out_ep);
+                        err = config_ep_by_speed(cdev->gadget, f, out_ep);
+                        if (err)
+                                return err;
+
                         usb_ep_enable(out_ep);
                         out_ep->driver_data = audio;
                         audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index 7b9ef7e257d2..e821931c965c 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -304,8 +304,10 @@ static int functionfs_ready_callback(struct ffs_data *ffs)
         gfs_registered = true;
 
         ret = usb_composite_probe(&gfs_driver);
-        if (unlikely(ret < 0))
+        if (unlikely(ret < 0)) {
+                ++missing_funcs;
                 gfs_registered = false;
+        }
         
         return ret;
 }
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index b808951491cc..99fd9a5667df 100644
--- a/drivers/usb/gadget/udc/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
@@ -1487,7 +1487,7 @@ static int s3c2410_udc_pullup(struct usb_gadget *gadget, int is_on)
 
         dprintk(DEBUG_NORMAL, "%s()\n", __func__);
 
-        s3c2410_udc_set_pullup(udc, is_on ? 0 : 1);
+        s3c2410_udc_set_pullup(udc, is_on);
         return 0;
 }
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index ec8ac1674854..36bf089b708f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3682,18 +3682,21 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
         unsigned long flags;
-        int ret;
+        int ret, slot_id;
         struct xhci_command *command;
 
         command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
         if (!command)
                 return 0;
 
+        /* xhci->slot_id and xhci->addr_dev are not thread-safe */
+        mutex_lock(&xhci->mutex);
         spin_lock_irqsave(&xhci->lock, flags);
         command->completion = &xhci->addr_dev;
         ret = xhci_queue_slot_control(xhci, command, TRB_ENABLE_SLOT, 0);
         if (ret) {
                 spin_unlock_irqrestore(&xhci->lock, flags);
+                mutex_unlock(&xhci->mutex);
                 xhci_dbg(xhci, "FIXME: allocate a command ring segment\n");
                 kfree(command);
                 return 0;
@@ -3702,8 +3705,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
         spin_unlock_irqrestore(&xhci->lock, flags);
 
         wait_for_completion(command->completion);
+        slot_id = xhci->slot_id;
+        mutex_unlock(&xhci->mutex);
 
-        if (!xhci->slot_id || command->status != COMP_SUCCESS) {
+        if (!slot_id || command->status != COMP_SUCCESS) {
                 xhci_err(xhci, "Error while assigning device slot ID\n");
                 xhci_err(xhci, "Max number of devices this xHCI host supports is %u.\n",
                                 HCS_MAX_SLOTS(
@@ -3728,11 +3733,11 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
          * xhci_discover_or_reset_device(), which may be called as part of
          * mass storage driver error handling.
          */
-        if (!xhci_alloc_virt_device(xhci, xhci->slot_id, udev, GFP_NOIO)) {
+        if (!xhci_alloc_virt_device(xhci, slot_id, udev, GFP_NOIO)) {
                 xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n");
                 goto disable_slot;
         }
-        udev->slot_id = xhci->slot_id;
+        udev->slot_id = slot_id;
 
 #ifndef CONFIG_USB_DEFAULT_PERSIST
         /*
@@ -3778,12 +3783,15 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
         struct xhci_slot_ctx *slot_ctx;
         struct xhci_input_control_ctx *ctrl_ctx;
         u64 temp_64;
-        struct xhci_command *command;
+        struct xhci_command *command = NULL;
+
+        mutex_lock(&xhci->mutex);
 
         if (!udev->slot_id) {
                 xhci_dbg_trace(xhci, trace_xhci_dbg_address,
                                 "Bad Slot ID %d", udev->slot_id);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
 
         virt_dev = xhci->devs[udev->slot_id];
@@ -3796,7 +3804,8 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                  */
                 xhci_warn(xhci, "Virt dev invalid for slot_id 0x%x!\n",
                         udev->slot_id);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
 
         if (setup == SETUP_CONTEXT_ONLY) {
@@ -3804,13 +3813,15 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                 if (GET_SLOT_STATE(le32_to_cpu(slot_ctx->dev_state)) ==
                     SLOT_STATE_DEFAULT) {
                         xhci_dbg(xhci, "Slot already in default state\n");
-                        return 0;
+                        goto out;
                 }
         }
 
         command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
-        if (!command)
-                return -ENOMEM;
+        if (!command) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         command->in_ctx = virt_dev->in_ctx;
         command->completion = &xhci->addr_dev;
@@ -3820,8 +3831,8 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
         if (!ctrl_ctx) {
                 xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
                                 __func__);
-                kfree(command);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
         /*
          * If this is the first Set Address since device plug-in or
@@ -3848,8 +3859,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                 spin_unlock_irqrestore(&xhci->lock, flags);
                 xhci_dbg_trace(xhci, trace_xhci_dbg_address,
                                 "FIXME: allocate a command ring segment");
-                kfree(command);
-                return ret;
+                goto out;
         }
         xhci_ring_cmd_db(xhci);
         spin_unlock_irqrestore(&xhci->lock, flags);
@@ -3896,10 +3906,8 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
                 ret = -EINVAL;
                 break;
         }
-        if (ret) {
-                kfree(command);
-                return ret;
-        }
+        if (ret)
+                goto out;
         temp_64 = xhci_read_64(xhci, &xhci->op_regs->dcbaa_ptr);
         xhci_dbg_trace(xhci, trace_xhci_dbg_address,
                         "Op regs DCBAA ptr = %#016llx", temp_64);
@@ -3932,8 +3940,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
         xhci_dbg_trace(xhci, trace_xhci_dbg_address,
                        "Internal device address = %d",
                        le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK);
+out:
+        mutex_unlock(&xhci->mutex);
         kfree(command);
-        return 0;
+        return ret;
 }
 
 int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -4855,6 +4865,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
                 return 0;
         }
 
+        mutex_init(&xhci->mutex);
         xhci->cap_regs = hcd->regs;
         xhci->op_regs = hcd->regs +
                 HC_LENGTH(readl(&xhci->cap_regs->hc_capbase));
@@ -5011,4 +5022,12 @@ static int __init xhci_hcd_init(void)
         BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
         return 0;
 }
+
+/*
+ * If an init function is provided, an exit function must also be provided
+ * to allow module unload.
+ */
+static void __exit xhci_hcd_fini(void) { }
+
 module_init(xhci_hcd_init);
+module_exit(xhci_hcd_fini);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index ea75e8ccd3c1..6977f8491fa7 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1497,6 +1497,8 @@ struct xhci_hcd {
         struct list_head        lpm_failed_devs;
 
         /* slot enabling and address device helpers */
+        /* these are not thread safe so use mutex */
+        struct mutex mutex;
         struct completion       addr_dev;
         int slot_id;
         /* For USB 3.0 LPM enable/disable. */
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3789b08ef67b..6dca3d794ced 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2021,13 +2021,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (musb->ops->quirks)
                 musb->io.quirks = musb->ops->quirks;
 
-        /* At least tusb6010 has it's own offsets.. */
-        if (musb->ops->ep_offset)
-                musb->io.ep_offset = musb->ops->ep_offset;
-        if (musb->ops->ep_select)
-                musb->io.ep_select = musb->ops->ep_select;
-
-        /* ..and some devices use indexed offset or flat offset */
+        /* Most devices use indexed offset or flat offset */
         if (musb->io.quirks & MUSB_INDEXED_EP) {
                 musb->io.ep_offset = musb_indexed_ep_offset;
                 musb->io.ep_select = musb_indexed_ep_select;
@@ -2036,6 +2030,12 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                 musb->io.ep_select = musb_flat_ep_select;
         }
 
+        /* At least tusb6010 has its own offsets */
+        if (musb->ops->ep_offset)
+                musb->io.ep_offset = musb->ops->ep_offset;
+        if (musb->ops->ep_select)
+                musb->io.ep_select = musb->ops->ep_select;
+
         if (musb->ops->fifo_mode)
                 fifo_mode = musb->ops->fifo_mode;
         else
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 7225d526df04..03ab0c699f74 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -1179,7 +1179,7 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
                 }
                 err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                 ab8500_usb_link_status_irq,
-                                IRQF_NO_SUSPEND | IRQF_SHARED,
+                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
                                 "usb-link-status", ab);
                 if (err < 0) {
                         dev_err(ab->dev, "request_irq failed for link status irq\n");
@@ -1195,7 +1195,7 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
                 }
                 err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                 ab8500_usb_disconnect_irq,
-                                IRQF_NO_SUSPEND | IRQF_SHARED,
+                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
                                 "usb-id-fall", ab);
                 if (err < 0) {
                         dev_err(ab->dev, "request_irq failed for ID fall irq\n");
@@ -1211,7 +1211,7 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
                 }
                 err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                 ab8500_usb_disconnect_irq,
-                                IRQF_NO_SUSPEND | IRQF_SHARED,
+                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
                                 "usb-vbus-fall", ab);
                 if (err < 0) {
                         dev_err(ab->dev, "request_irq failed for Vbus fall irq\n");
diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 845f658276b1..2b28443d07b9 100644
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -401,7 +401,8 @@ static int tahvo_usb_probe(struct platform_device *pdev)
         dev_set_drvdata(&pdev->dev, tu);
 
         tu->irq = platform_get_irq(pdev, 0);
-        ret = request_threaded_irq(tu->irq, NULL, tahvo_usb_vbus_interrupt, 0,
+        ret = request_threaded_irq(tu->irq, NULL, tahvo_usb_vbus_interrupt,
+                                   IRQF_ONESHOT,
                                    "tahvo-vbus", tu);
         if (ret) {
                 dev_err(&pdev->dev, "could not register tahvo-vbus irq: %d\n",
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 8597cf9cfceb..c0f5c652d272 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -611,6 +611,8 @@ struct usbhs_pkt_handle usbhs_fifo_pio_push_handler = {
 static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
 {
         struct usbhs_pipe *pipe = pkt->pipe;
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+        struct usbhs_fifo *fifo = usbhsf_get_cfifo(priv);
 
         if (usbhs_pipe_is_busy(pipe))
                 return 0;
@@ -624,6 +626,9 @@ static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
         usbhs_pipe_data_sequence(pipe, pkt->sequence);
         pkt->sequence = -1; /* -1 sequence will be ignored */
 
+        if (usbhs_pipe_is_dcp(pipe))
+                usbhsf_fifo_clear(pipe, fifo);
+
         usbhs_pipe_set_trans_count_if_bulk(pipe, pkt->length);
         usbhs_pipe_enable(pipe);
         usbhs_pipe_running(pipe, 1);
@@ -673,7 +678,14 @@ static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
                 *is_done = 1;
                 usbhsf_rx_irq_ctrl(pipe, 0);
                 usbhs_pipe_running(pipe, 0);
-                usbhs_pipe_disable(pipe);       /* disable pipe first */
+                /*
+                 * If function mode, since this controller is possible to enter
+                 * Control Write status stage at this timing, this driver
+                 * should not disable the pipe. If such a case happens, this
+                 * controller is not able to complete the status stage.
+                 */
+                if (!usbhs_mod_is_host(priv) && !usbhs_pipe_is_dcp(pipe))
+                        usbhs_pipe_disable(pipe);       /* disable pipe first */
         }
 
         /*
@@ -1227,15 +1239,21 @@ static void usbhsf_dma_init_dt(struct device *dev, struct usbhs_fifo *fifo,
 {
         char name[16];
 
-        snprintf(name, sizeof(name), "tx%d", channel);
-        fifo->tx_chan = dma_request_slave_channel_reason(dev, name);
-        if (IS_ERR(fifo->tx_chan))
-                fifo->tx_chan = NULL;
-
-        snprintf(name, sizeof(name), "rx%d", channel);
-        fifo->rx_chan = dma_request_slave_channel_reason(dev, name);
-        if (IS_ERR(fifo->rx_chan))
-                fifo->rx_chan = NULL;
+        /*
+         * To avoid complex handing for DnFIFOs, the driver uses each
+         * DnFIFO as TX or RX direction (not bi-direction).
+         * So, the driver uses odd channels for TX, even channels for RX.
+         */
+        snprintf(name, sizeof(name), "ch%d", channel);
+        if (channel & 1) {
+                fifo->tx_chan = dma_request_slave_channel_reason(dev, name);
+                if (IS_ERR(fifo->tx_chan))
+                        fifo->tx_chan = NULL;
+        } else {
+                fifo->rx_chan = dma_request_slave_channel_reason(dev, name);
+                if (IS_ERR(fifo->rx_chan))
+                        fifo->rx_chan = NULL;
+        }
 }
 
 static void usbhsf_dma_init(struct usbhs_priv *priv, struct usbhs_fifo *fifo,
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 9031750e7404..ffd739e31bfc 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -128,6 +128,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
         { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */
         { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
+        { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8eb68a31cab6..4c8b3b82103d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -699,6 +699,7 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
         { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
         { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
+        { USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },
         { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
         { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 4e4f46f3c89c..792e054126de 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -155,6 +155,7 @@
 #define XSENS_AWINDA_STATION_PID 0x0101
 #define XSENS_AWINDA_DONGLE_PID 0x0102
 #define XSENS_MTW_PID           0x0200  /* Xsens MTw */
+#define XSENS_MTDEVBOARD_PID    0x0300  /* Motion Tracker Development Board */
 #define XSENS_CONVERTER_PID     0xD00D  /* Xsens USB-serial converter */
 
 /* Xsens devices using FTDI VID */
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index e894eb278d83..eba1b7ac7294 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -423,6 +423,7 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
                 if (cpu == -1)
                         irq_set_affinity_hint(irq, NULL);
                 else {
+                        cpumask_clear(mask);
                         cpumask_set_cpu(cpu, mask);
                         irq_set_affinity_hint(irq, mask);
                 }
diff --git a/fs/fhandle.c b/fs/fhandle.c
index 999ff5c3cab0..d59712dfa3e7 100644
--- a/fs/fhandle.c
+++ b/fs/fhandle.c
@@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
                 goto out_err;
         }
         /* copy the full handle */
-        if (copy_from_user(handle, ufh,
-                           sizeof(struct file_handle) +
+        *handle = f_handle;
+        if (copy_from_user(&handle->f_handle,
+                           &ufh->f_handle,
                            f_handle.handle_bytes)) {
                 retval = -EFAULT;
                 goto out_handle;
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index aff923ae8c4b..d87d8eced064 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -116,7 +116,6 @@ __printf(3, 4)
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
                 const char *fmt, ...);
 int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
-void bdi_unregister(struct backing_dev_info *bdi);
 int __must_check bdi_setup_and_register(struct backing_dev_info *, char *);
 void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages,
                         enum wb_reason reason);
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 796ef9645827..a240e61a7700 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -115,13 +115,14 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
  * Extended Capability Register
  */
 
+#define ecap_pasid(e)           ((e >> 40) & 0x1)
 #define ecap_pss(e)             ((e >> 35) & 0x1f)
 #define ecap_eafs(e)            ((e >> 34) & 0x1)
 #define ecap_nwfs(e)            ((e >> 33) & 0x1)
 #define ecap_srs(e)             ((e >> 31) & 0x1)
 #define ecap_ers(e)             ((e >> 30) & 0x1)
 #define ecap_prs(e)             ((e >> 29) & 0x1)
-#define ecap_pasid(e)           ((e >> 28) & 0x1)
+/* PASID support used to be on bit 28 */
 #define ecap_dis(e)             ((e >> 27) & 0x1)
 #define ecap_nest(e)            ((e >> 26) & 0x1)
 #define ecap_mts(e)             ((e >> 25) & 0x1)
diff --git a/include/linux/of.h b/include/linux/of.h
index ddeaae6d2083..b871ff9d81d7 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -121,6 +121,8 @@ extern struct device_node *of_stdout;
 extern raw_spinlock_t devtree_lock;
 
 #ifdef CONFIG_OF
+void of_core_init(void);
+
 static inline bool is_of_node(struct fwnode_handle *fwnode)
 {
         return fwnode && fwnode->type == FWNODE_OF;
@@ -376,6 +378,10 @@ bool of_console_check(struct device_node *dn, char *name, int index);
 
 #else /* CONFIG_OF */
 
+static inline void of_core_init(void)
+{
+}
+
 static inline bool is_of_node(struct fwnode_handle *fwnode)
 {
         return false;
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 61992cf2e977..d8a82a89f35a 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -92,8 +92,6 @@ struct hw_perf_event_extra {
         int             idx;    /* index in shared_regs->regs[] */
 };
 
-struct event_constraint;
-
 /**
  * struct hw_perf_event - performance event hardware details:
  */
@@ -112,8 +110,6 @@ struct hw_perf_event {
 
                         struct hw_perf_event_extra extra_reg;
                         struct hw_perf_event_extra branch_reg;
-
-                        struct event_constraint *constraint;
                 };
                 struct { /* software */
                         struct hrtimer  hrtimer;
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 497bc14cdb85..0320bbb7d7b5 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -98,7 +98,8 @@ struct inet_connection_sock {
         const struct tcp_congestion_ops *icsk_ca_ops;
         const struct inet_connection_sock_af_ops *icsk_af_ops;
         unsigned int              (*icsk_sync_mss)(struct sock *sk, u32 pmtu);
-        __u8                      icsk_ca_state:7,
+        __u8                      icsk_ca_state:6,
+                                  icsk_ca_setsockopt:1,
                                   icsk_ca_dst_locked:1;
         __u8                      icsk_retransmits;
         __u8                      icsk_pending;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8e3668b44c29..fc57f6b82fc5 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -354,7 +354,7 @@ enum ieee80211_rssi_event_data {
 };
 
 /**
- * enum ieee80211_rssi_event - data attached to an %RSSI_EVENT
+ * struct ieee80211_rssi_event - data attached to an %RSSI_EVENT
  * @data: See &enum ieee80211_rssi_event_data
  */
 struct ieee80211_rssi_event {
@@ -388,7 +388,7 @@ enum ieee80211_mlme_event_status {
 };
 
 /**
- * enum ieee80211_mlme_event - data attached to an %MLME_EVENT
+ * struct ieee80211_mlme_event - data attached to an %MLME_EVENT
  * @data: See &enum ieee80211_mlme_event_data
  * @status: See &enum ieee80211_mlme_event_status
  * @reason: the reason code if applicable
@@ -401,9 +401,10 @@ struct ieee80211_mlme_event {
 
 /**
  * struct ieee80211_event - event to be sent to the driver
- * @type The event itself. See &enum ieee80211_event_type.
+ * @type: The event itself. See &enum ieee80211_event_type.
  * @rssi: relevant if &type is %RSSI_EVENT
  * @mlme: relevant if &type is %AUTH_EVENT
+ * @u:    union holding the above two fields
  */
 struct ieee80211_event {
         enum ieee80211_event_type type;
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
index 652cb9e4afe5..22734bc3ffd4 100644
--- a/include/sound/rt5645.h
+++ b/include/sound/rt5645.h
@@ -20,9 +20,6 @@ struct rt5645_platform_data {
         unsigned int dmic2_data_pin;
         /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */
 
-        unsigned int hp_det_gpio;
-        bool gpio_hp_det_active_high;
-
         unsigned int jd_mode;
 };
 
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 880dd7437172..c178d13d6f4c 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -250,7 +250,6 @@ DEFINE_EVENT(writeback_class, name, \
 DEFINE_WRITEBACK_EVENT(writeback_nowork);
 DEFINE_WRITEBACK_EVENT(writeback_wake_background);
 DEFINE_WRITEBACK_EVENT(writeback_bdi_register);
-DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister);
 
 DECLARE_EVENT_CLASS(wbc_class,
         TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h
index 984169a819ee..d7f1cbc3766c 100644
--- a/include/uapi/linux/virtio_balloon.h
+++ b/include/uapi/linux/virtio_balloon.h
@@ -26,6 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE. */
 #include <linux/types.h>
+#include <linux/virtio_types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
 
diff --git a/kernel/compat.c b/kernel/compat.c
index 24f00610c575..333d364be29d 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -912,7 +912,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
                          * bitmap. We must however ensure the end of the
                          * kernel bitmap is zeroed.
                          */
-                        if (nr_compat_longs-- > 0) {
+                        if (nr_compat_longs) {
+                                nr_compat_longs--;
                                 if (__get_user(um, umask))
                                         return -EFAULT;
                         } else {
@@ -954,7 +955,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
                          * We dont want to write past the end of the userspace
                          * bitmap.
                          */
-                        if (nr_compat_longs-- > 0) {
+                        if (nr_compat_longs) {
+                                nr_compat_longs--;
                                 if (__put_user(um, umask))
                                         return -EFAULT;
                         }
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 1a3bf48743ce..eddf1ed4155e 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3442,7 +3442,6 @@ static void free_event_rcu(struct rcu_head *head)
         if (event->ns)
                 put_pid_ns(event->ns);
         perf_event_free_filter(event);
-        perf_event_free_bpf_prog(event);
         kfree(event);
 }
 
@@ -3573,6 +3572,8 @@ static void __free_event(struct perf_event *event)
                         put_callchain_buffers();
         }
 
+        perf_event_free_bpf_prog(event);
+
         if (event->destroy)
                 event->destroy(event);
 
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 232f00f273cb..725c416085e3 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -493,6 +493,20 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
                         rb->aux_pages[rb->aux_nr_pages] = page_address(page++);
         }
 
+        /*
+         * In overwrite mode, PMUs that don't support SG may not handle more
+         * than one contiguous allocation, since they rely on PMI to do double
+         * buffering. In this case, the entire buffer has to be one contiguous
+         * chunk.
+         */
+        if ((event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) &&
+            overwrite) {
+                struct page *page = virt_to_page(rb->aux_pages[0]);
+
+                if (page_private(page) != max_order)
+                        goto out;
+        }
+
         rb->aux_priv = event->pmu->setup_aux(event->cpu, rb->aux_pages, nr_pages,
                                              overwrite);
         if (!rb->aux_priv)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a0831e1b99f4..aaeae885d9af 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3900,7 +3900,8 @@ static void zap_class(struct lock_class *class)
         list_del_rcu(&class->hash_entry);
         list_del_rcu(&class->lock_entry);
 
-        class->key = NULL;
+        RCU_INIT_POINTER(class->key, NULL);
+        RCU_INIT_POINTER(class->name, NULL);
 }
 
 static inline int within(const void *addr, void *start, unsigned long size)
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index ef43ac4bafb5..d83d798bef95 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -426,10 +426,12 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
 
 static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
 {
-        char name[39];
-        struct lock_class *class;
+        struct lockdep_subclass_key *ckey;
         struct lock_class_stats *stats;
+        struct lock_class *class;
+        const char *cname;
         int i, namelen;
+        char name[39];
 
         class = data->class;
         stats = &data->stats;
@@ -440,15 +442,25 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
         if (class->subclass)
                 namelen -= 2;
 
-        if (!class->name) {
+        rcu_read_lock_sched();
+        cname = rcu_dereference_sched(class->name);
+        ckey  = rcu_dereference_sched(class->key);
+
+        if (!cname && !ckey) {
+                rcu_read_unlock_sched();
+                return;
+
+        } else if (!cname) {
                 char str[KSYM_NAME_LEN];
                 const char *key_name;
 
-                key_name = __get_key_name(class->key, str);
+                key_name = __get_key_name(ckey, str);
                 snprintf(name, namelen, "%s", key_name);
         } else {
-                snprintf(name, namelen, "%s", class->name);
+                snprintf(name, namelen, "%s", cname);
         }
+        rcu_read_unlock_sched();
+
         namelen = strlen(name);
         if (class->name_version > 1) {
                 snprintf(name+namelen, 3, "#%d", class->name_version);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ffeaa4105e48..c2980e8733bc 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2181,7 +2181,7 @@ void task_numa_work(struct callback_head *work)
         }
         for (; vma; vma = vma->vm_next) {
                 if (!vma_migratable(vma) || !vma_policy_mof(vma) ||
-                        is_vm_hugetlb_page(vma)) {
+                        is_vm_hugetlb_page(vma) || (vma->vm_flags & VM_MIXEDMAP)) {
                         continue;
                 }
 
diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c
index 13d945c0d03f..1b28df2d9104 100644
--- a/kernel/trace/ring_buffer_benchmark.c
+++ b/kernel/trace/ring_buffer_benchmark.c
@@ -450,7 +450,7 @@ static int __init ring_buffer_benchmark_init(void)
 
         if (producer_fifo >= 0) {
                 struct sched_param param = {
-                        .sched_priority = consumer_fifo
+                        .sched_priority = producer_fifo
                 };
                 sched_setscheduler(producer, SCHED_FIFO, &param);
         } else
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index aac511417ad1..a89d041592c8 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -639,7 +639,7 @@ do { \
         **************  MIPS  *****************
         ***************************************/
 #if defined(__mips__) && W_TYPE_SIZE == 32
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
 #define umul_ppmm(w1, w0, u, v)                 \
 do {                                            \
         UDItype __ll = (UDItype)(u) * (v);      \
@@ -671,7 +671,7 @@ do {						\
         **************  MIPS/64  **************
         ***************************************/
 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
 #define umul_ppmm(w1, w0, u, v) \
 do {                                                                    \
         typedef unsigned int __ll_UTItype __attribute__((mode(TI)));    \
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 4396434e4715..8609378e6505 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -26,6 +26,7 @@
 #include <linux/random.h>
 #include <linux/rhashtable.h>
 #include <linux/err.h>
+#include <linux/export.h>
 
 #define HASH_DEFAULT_SIZE       64UL
 #define HASH_MIN_SIZE           4U
diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
index a28df5206d95..fe9a32591c24 100644
--- a/lib/strnlen_user.c
+++ b/lib/strnlen_user.c
@@ -57,7 +57,8 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,
                         return res + find_zero(data) + 1 - align;
                 }
                 res += sizeof(unsigned long);
-                if (unlikely(max < sizeof(unsigned long)))
+                /* We already handled 'unsigned long' bytes. Did we do it all ? */
+                if (unlikely(max <= sizeof(unsigned long)))
                         break;
                 max -= sizeof(unsigned long);
                 if (unlikely(__get_user(c,(unsigned long __user *)(src+res))))
@@ -89,8 +90,15 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,
  * Get the size of a NUL-terminated string in user space.
  *
  * Returns the size of the string INCLUDING the terminating NUL.
- * If the string is too long, returns 'count+1'.
+ * If the string is too long, returns a number larger than @count. User
+ * has to check the return value against "> count".
  * On exception (or invalid count), returns 0.
+ *
+ * NOTE! You should basically never use this function. There is
+ * almost never any valid case for using the length of a user space
+ * string, since the string can be changed at any time by other
+ * threads. Use "strncpy_from_user()" instead to get a stable copy
+ * of the string.
  */
 long strnlen_user(const char __user *str, long count)
 {
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 4abda074ea45..3c365ab6cf5f 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -537,8 +537,9 @@ EXPORT_SYMBOL_GPL(swiotlb_tbl_map_single);
  * Allocates bounce buffer and returns its kernel virtual address.
  */
 
-phys_addr_t map_single(struct device *hwdev, phys_addr_t phys, size_t size,
-                       enum dma_data_direction dir)
+static phys_addr_t
+map_single(struct device *hwdev, phys_addr_t phys, size_t size,
+           enum dma_data_direction dir)
 {
         dma_addr_t start_dma_addr = phys_to_dma(hwdev, io_tlb_start);
 
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 6dc4580df2af..000e7b3b9896 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -359,23 +359,6 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
         flush_delayed_work(&bdi->wb.dwork);
 }
 
-/*
- * Called when the device behind @bdi has been removed or ejected.
- *
- * We can't really do much here except for reducing the dirty ratio at
- * the moment.  In the future we should be able to set a flag so that
- * the filesystem can handle errors at mark_inode_dirty time instead
- * of only at writeback time.
- */
-void bdi_unregister(struct backing_dev_info *bdi)
-{
-        if (WARN_ON_ONCE(!bdi->dev))
-                return;
-
-        bdi_set_min_ratio(bdi, 0);
-}
-EXPORT_SYMBOL(bdi_unregister);
-
 static void bdi_wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi)
 {
         memset(wb, 0, sizeof(*wb));
@@ -443,6 +426,7 @@ void bdi_destroy(struct backing_dev_info *bdi)
         int i;
 
         bdi_wb_shutdown(bdi);
+        bdi_set_min_ratio(bdi, 0);
 
         WARN_ON(!list_empty(&bdi->work_list));
         WARN_ON(delayed_work_pending(&bdi->wb.dwork));
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 14c2f2017e37..a04225d372ba 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2323,6 +2323,8 @@ done_restock:
         css_get_many(&memcg->css, batch);
         if (batch > nr_pages)
                 refill_stock(memcg, batch - nr_pages);
+        if (!(gfp_mask & __GFP_WAIT))
+                goto done;
         /*
          * If the hierarchy is above the normal consumption range,
          * make the charging task trim their excess contribution.
@@ -5833,9 +5835,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
         if (!mem_cgroup_is_root(memcg))
                 page_counter_uncharge(&memcg->memory, 1);
 
-        /* XXX: caller holds IRQ-safe mapping->tree_lock */
-        VM_BUG_ON(!irqs_disabled());
-
+        /* Caller disabled preemption with mapping->tree_lock */
         mem_cgroup_charge_statistics(memcg, page, -1);
         memcg_check_events(memcg, page);
 }
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 457bde530cbe..9e88f749aa51 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1969,8 +1969,10 @@ void try_offline_node(int nid)
                  * wait_table may be allocated from boot memory,
                  * here only free if it's allocated by vmalloc.
                  */
-                if (is_vmalloc_addr(zone->wait_table))
+                if (is_vmalloc_addr(zone->wait_table)) {
                         vfree(zone->wait_table);
+                        zone->wait_table = NULL;
+                }
         }
 }
 EXPORT_SYMBOL(try_offline_node);
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 08bd7a3d464a..a8b5e749e84e 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -289,7 +289,8 @@ static int create_handle_cache(struct zs_pool *pool)
 
 static void destroy_handle_cache(struct zs_pool *pool)
 {
-        kmem_cache_destroy(pool->handle_cachep);
+        if (pool->handle_cachep)
+                kmem_cache_destroy(pool->handle_cachep);
 }
 
 static unsigned long alloc_handle(struct zs_pool *pool)
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index e0670d7054f9..659fb96672e4 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -796,9 +796,11 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p,
         int err = 0;
 
         if (ndm->ndm_flags & NTF_USE) {
+                local_bh_disable();
                 rcu_read_lock();
                 br_fdb_update(p->br, p, addr, vid, true);
                 rcu_read_unlock();
+                local_bh_enable();
         } else {
                 spin_lock_bh(&p->br->hash_lock);
                 err = fdb_add_entry(p, addr, ndm->ndm_state,
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index a3abe6ed111e..ff667e18b2d6 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1167,6 +1167,9 @@ static void br_multicast_add_router(struct net_bridge *br,
         struct net_bridge_port *p;
         struct hlist_node *slot = NULL;
 
+        if (!hlist_unhashed(&port->rlist))
+                return;
+
         hlist_for_each_entry(p, &br->router_list, rlist) {
                 if ((unsigned long) port >= (unsigned long) p)
                         break;
@@ -1194,12 +1197,8 @@ static void br_multicast_mark_router(struct net_bridge *br,
         if (port->multicast_router != 1)
                 return;
 
-        if (!hlist_unhashed(&port->rlist))
-                goto timer;
-
         br_multicast_add_router(br, port);
 
-timer:
         mod_timer(&port->multicast_router_timer,
                   now + br->multicast_querier_interval);
 }
@@ -1822,7 +1821,7 @@ static void br_multicast_query_expired(struct net_bridge *br,
         if (query->startup_sent < br->multicast_startup_query_count)
                 query->startup_sent++;
 
-        RCU_INIT_POINTER(querier, NULL);
+        RCU_INIT_POINTER(querier->port, NULL);
         br_multicast_send_query(br, NULL, query);
         spin_unlock(&br->multicast_lock);
 }
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 24c7c96bf5f8..91180a7fc943 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1117,8 +1117,6 @@ static int do_replace(struct net *net, const void __user *user,
                 return -ENOMEM;
         if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
                 return -ENOMEM;
-        if (tmp.num_counters == 0)
-                return -EINVAL;
 
         tmp.name[sizeof(tmp.name) - 1] = 0;
 
@@ -2161,8 +2159,6 @@ static int compat_copy_ebt_replace_from_user(struct ebt_replace *repl,
                 return -ENOMEM;
         if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
                 return -ENOMEM;
-        if (tmp.num_counters == 0)
-                return -EINVAL;
 
         memcpy(repl, &tmp, offsetof(struct ebt_replace, hook_entry));
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 2c1c67fad64d..aa82f9ab6a36 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1718,15 +1718,8 @@ EXPORT_SYMBOL_GPL(is_skb_forwardable);
 
 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
-        if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
-                if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
-                        atomic_long_inc(&dev->rx_dropped);
-                        kfree_skb(skb);
-                        return NET_RX_DROP;
-                }
-        }
-
-        if (unlikely(!is_skb_forwardable(dev, skb))) {
+        if (skb_orphan_frags(skb, GFP_ATOMIC) ||
+            unlikely(!is_skb_forwardable(dev, skb))) {
                 atomic_long_inc(&dev->rx_dropped);
                 kfree_skb(skb);
                 return NET_RX_DROP;
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 1347e11f5cc9..1d00b8922902 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -359,15 +359,7 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)
         int err;
         struct ethtool_cmd cmd;
 
-        if (!dev->ethtool_ops->get_settings)
-                return -EOPNOTSUPP;
-
-        if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
-                return -EFAULT;
-
-        cmd.cmd = ETHTOOL_GSET;
-
-        err = dev->ethtool_ops->get_settings(dev, &cmd);
+        err = __ethtool_get_settings(dev, &cmd);
         if (err < 0)
                 return err;
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 3cfff2a3d651..41ec02242ea7 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4398,7 +4398,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len,
 
                 while (order) {
                         if (npages >= 1 << order) {
-                                page = alloc_pages(gfp_mask |
+                                page = alloc_pages((gfp_mask & ~__GFP_WAIT) |
                                                    __GFP_COMP |
                                                    __GFP_NOWARN |
                                                    __GFP_NORETRY,
diff --git a/net/core/sock.c b/net/core/sock.c
index 292f42228bfb..dc30dc5bb1b8 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -354,15 +354,12 @@ void sk_clear_memalloc(struct sock *sk)
 
         /*
          * SOCK_MEMALLOC is allowed to ignore rmem limits to ensure forward
-         * progress of swapping. However, if SOCK_MEMALLOC is cleared while
-         * it has rmem allocations there is a risk that the user of the
-         * socket cannot make forward progress due to exceeding the rmem
-         * limits. By rights, sk_clear_memalloc() should only be called
-         * on sockets being torn down but warn and reset the accounting if
-         * that assumption breaks.
+         * progress of swapping. SOCK_MEMALLOC may be cleared while
+         * it has rmem allocations due to the last swapfile being deactivated
+         * but there is a risk that the socket is unusable due to exceeding
+         * the rmem limits. Reclaim the reserves and obey rmem limits again.
          */
-        if (WARN_ON(sk->sk_forward_alloc))
-                sk_mem_reclaim(sk);
+        sk_mem_reclaim(sk);
 }
 EXPORT_SYMBOL_GPL(sk_clear_memalloc);
 
@@ -1883,7 +1880,7 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t gfp)
 
         pfrag->offset = 0;
         if (SKB_FRAG_PAGE_ORDER) {
-                pfrag->page = alloc_pages(gfp | __GFP_COMP |
+                pfrag->page = alloc_pages((gfp & ~__GFP_WAIT) | __GFP_COMP |
                                           __GFP_NOWARN | __GFP_NORETRY,
                                           SKB_FRAG_PAGE_ORDER);
                 if (likely(pfrag->page)) {
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index e6f6cc3a1bcf..392e29a0227d 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -359,7 +359,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
          */
         ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL);
         if (ds == NULL)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         ds->dst = dst;
         ds->index = index;
@@ -370,7 +370,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
 
         ret = dsa_switch_setup_one(ds, parent);
         if (ret)
-                return NULL;
+                return ERR_PTR(ret);
 
         return ds;
 }
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 421a80b09b62..30b544f025ac 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -256,7 +256,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
         aead_givcrypt_set_assoc(req, asg, assoclen);
         aead_givcrypt_set_giv(req, esph->enc_data,
-                              XFRM_SKB_CB(skb)->seq.output.low);
+                              XFRM_SKB_CB(skb)->seq.output.low +
+                              ((u64)XFRM_SKB_CB(skb)->seq.output.hi << 32));
 
         ESP_SKB_CB(skb)->tmp = tmp;
         err = crypto_aead_givencrypt(req);
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 9f7269f3c54a..0c152087ca15 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -65,7 +65,6 @@ static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi,
                         goto drop;
 
                 XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4 = tunnel;
-                skb->mark = be32_to_cpu(tunnel->parms.i_key);
 
                 return xfrm_input(skb, nexthdr, spi, encap_type);
         }
@@ -91,6 +90,8 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
         struct pcpu_sw_netstats *tstats;
         struct xfrm_state *x;
         struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4;
+        u32 orig_mark = skb->mark;
+        int ret;
 
         if (!tunnel)
                 return 1;
@@ -107,7 +108,11 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
         x = xfrm_input_state(skb);
         family = x->inner_mode->afinfo->family;
 
-        if (!xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family))
+        skb->mark = be32_to_cpu(tunnel->parms.i_key);
+        ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);
+        skb->mark = orig_mark;
+
+        if (!ret)
                 return -EPERM;
 
         skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(skb->dev)));
@@ -216,8 +221,6 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 
         memset(&fl, 0, sizeof(fl));
 
-        skb->mark = be32_to_cpu(tunnel->parms.o_key);
-
         switch (skb->protocol) {
         case htons(ETH_P_IP):
                 xfrm_decode_session(skb, &fl, AF_INET);
@@ -233,6 +236,9 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                 return NETDEV_TX_OK;
         }
 
+        /* override mark with tunnel output key */
+        fl.flowi_mark = be32_to_cpu(tunnel->parms.o_key);
+
         return vti_xmit(skb, dev, &fl);
 }
 
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index 7a5ae50c80c8..84be008c945c 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -187,6 +187,7 @@ static void tcp_reinit_congestion_control(struct sock *sk,
 
         tcp_cleanup_congestion_control(sk);
         icsk->icsk_ca_ops = ca;
+        icsk->icsk_ca_setsockopt = 1;
 
         if (sk->sk_state != TCP_CLOSE && icsk->icsk_ca_ops->init)
                 icsk->icsk_ca_ops->init(sk);
@@ -335,8 +336,10 @@ int tcp_set_congestion_control(struct sock *sk, const char *name)
         rcu_read_lock();
         ca = __tcp_ca_find_autoload(name);
         /* No change asking for existing value */
-        if (ca == icsk->icsk_ca_ops)
+        if (ca == icsk->icsk_ca_ops) {
+                icsk->icsk_ca_setsockopt = 1;
                 goto out;
+        }
         if (!ca)
                 err = -ENOENT;
         else if (!((ca->flags & TCP_CONG_NON_RESTRICTED) ||
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index b5732a54f2ad..17e7339ee5ca 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -420,7 +420,10 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)
                 rcu_read_unlock();
         }
 
-        if (!ca_got_dst && !try_module_get(icsk->icsk_ca_ops->owner))
+        /* If no valid choice made yet, assign current system default ca. */
+        if (!ca_got_dst &&
+            (!icsk->icsk_ca_setsockopt ||
+             !try_module_get(icsk->icsk_ca_ops->owner)))
                 tcp_assign_congestion_control(sk);
 
         tcp_set_ca_state(sk, TCP_CA_Open);
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d10b7e0112eb..83aa604f9273 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -90,6 +90,7 @@
 #include <linux/socket.h>
 #include <linux/sockios.h>
 #include <linux/igmp.h>
+#include <linux/inetdevice.h>
 #include <linux/in.h>
 #include <linux/errno.h>
 #include <linux/timer.h>
@@ -1345,10 +1346,8 @@ csum_copy_err:
         }
         unlock_sock_fast(sk, slow);
 
-        if (noblock)
-                return -EAGAIN;
-
-        /* starting over for a new packet */
+        /* starting over for a new packet, but check if we need to yield */
+        cond_resched();
         msg->msg_flags &= ~MSG_TRUNC;
         goto try_again;
 }
@@ -1962,6 +1961,7 @@ void udp_v4_early_demux(struct sk_buff *skb)
         struct sock *sk;
         struct dst_entry *dst;
         int dif = skb->dev->ifindex;
+        int ours;
 
         /* validate the packet */
         if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(struct udphdr)))
@@ -1971,14 +1971,24 @@ void udp_v4_early_demux(struct sk_buff *skb)
         uh = udp_hdr(skb);
 
         if (skb->pkt_type == PACKET_BROADCAST ||
-            skb->pkt_type == PACKET_MULTICAST)
+            skb->pkt_type == PACKET_MULTICAST) {
+                struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
+
+                if (!in_dev)
+                        return;
+
+                ours = ip_check_mc_rcu(in_dev, iph->daddr, iph->saddr,
+                                       iph->protocol);
+                if (!ours)
+                        return;
                 sk = __udp4_lib_mcast_demux_lookup(net, uh->dest, iph->daddr,
                                                    uh->source, iph->saddr, dif);
-        else if (skb->pkt_type == PACKET_HOST)
+        } else if (skb->pkt_type == PACKET_HOST) {
                 sk = __udp4_lib_demux_lookup(net, uh->dest, iph->daddr,
                                              uh->source, iph->saddr, dif);
-        else
+        } else {
                 return;
+        }
 
         if (!sk)
                 return;
diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index d873ceea86e6..ca09bf49ac68 100644
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
         free_percpu(idev->stats.ipv6);
 }
 
+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
+{
+        struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
+
+        snmp6_free_dev(idev);
+        kfree(idev);
+}
+
 /* Nobody refers to this device, we may destroy it. */
 
 void in6_dev_finish_destroy(struct inet6_dev *idev)
@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
                 pr_warn("Freeing alive inet6 device %p\n", idev);
                 return;
         }
-        snmp6_free_dev(idev);
-        kfree_rcu(idev, rcu);
+        call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
 }
 EXPORT_SYMBOL(in6_dev_finish_destroy);
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 31f1b5d5e2ef..7c07ce36aae2 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -248,7 +248,8 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
         aead_givcrypt_set_crypt(req, sg, sg, clen, iv);
         aead_givcrypt_set_assoc(req, asg, assoclen);
         aead_givcrypt_set_giv(req, esph->enc_data,
-                              XFRM_SKB_CB(skb)->seq.output.low);
+                              XFRM_SKB_CB(skb)->seq.output.low +
+                              ((u64)XFRM_SKB_CB(skb)->seq.output.hi << 32));
 
         ESP_SKB_CB(skb)->tmp = tmp;
         err = crypto_aead_givencrypt(req);
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index ed9d681207fa..0224c032dca5 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -322,7 +322,6 @@ static int vti6_rcv(struct sk_buff *skb)
                 }
 
                 XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6 = t;
-                skb->mark = be32_to_cpu(t->parms.i_key);
 
                 rcu_read_unlock();
 
@@ -342,6 +341,8 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
         struct pcpu_sw_netstats *tstats;
         struct xfrm_state *x;
         struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6;
+        u32 orig_mark = skb->mark;
+        int ret;
 
         if (!t)
                 return 1;
@@ -358,7 +359,11 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
         x = xfrm_input_state(skb);
         family = x->inner_mode->afinfo->family;
 
-        if (!xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family))
+        skb->mark = be32_to_cpu(t->parms.i_key);
+        ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);
+        skb->mark = orig_mark;
+
+        if (!ret)
                 return -EPERM;
 
         skb_scrub_packet(skb, !net_eq(t->net, dev_net(skb->dev)));
@@ -430,6 +435,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
         struct net_device *tdev;
         struct xfrm_state *x;
         int err = -1;
+        int mtu;
 
         if (!dst)
                 goto tx_err_link_failure;
@@ -463,6 +469,19 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
         skb_dst_set(skb, dst);
         skb->dev = skb_dst(skb)->dev;
 
+        mtu = dst_mtu(dst);
+        if (!skb->ignore_df && skb->len > mtu) {
+                skb_dst(skb)->ops->update_pmtu(dst, NULL, skb, mtu);
+
+                if (skb->protocol == htons(ETH_P_IPV6))
+                        icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
+                else
+                        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
+                                  htonl(mtu));
+
+                return -EMSGSIZE;
+        }
+
         err = dst_output(skb);
         if (net_xmit_eval(err) == 0) {
                 struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);
@@ -495,7 +514,6 @@ vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
         int ret;
 
         memset(&fl, 0, sizeof(fl));
-        skb->mark = be32_to_cpu(t->parms.o_key);
 
         switch (skb->protocol) {
         case htons(ETH_P_IPV6):
@@ -516,6 +534,9 @@ vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto tx_err;
         }
 
+        /* override mark with tunnel output key */
+        fl.flowi_mark = be32_to_cpu(t->parms.o_key);
+
         ret = vti6_xmit(skb, dev, &fl);
         if (ret < 0)
                 goto tx_err;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index c2ec41617a35..e51fc3eee6db 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -525,10 +525,8 @@ csum_copy_err:
         }
         unlock_sock_fast(sk, slow);
 
-        if (noblock)
-                return -EAGAIN;
-
-        /* starting over for a new packet */
+        /* starting over for a new packet, but check if we need to yield */
+        cond_resched();
         msg->msg_flags &= ~MSG_TRUNC;
         goto try_again;
 }
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 7b3f732269e4..1f93a5978f2a 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -541,7 +541,7 @@ static void mpls_ifdown(struct net_device *dev)
 
         RCU_INIT_POINTER(dev->mpls_ptr, NULL);
 
-        kfree(mdev);
+        kfree_rcu(mdev, rcu);
 }
 
 static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
@@ -564,6 +564,17 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
         case NETDEV_UNREGISTER:
                 mpls_ifdown(dev);
                 break;
+        case NETDEV_CHANGENAME:
+                mdev = mpls_dev_get(dev);
+                if (mdev) {
+                        int err;
+
+                        mpls_dev_sysctl_unregister(mdev);
+                        err = mpls_dev_sysctl_register(dev, mdev);
+                        if (err)
+                                return notifier_from_errno(err);
+                }
+                break;
         }
         return NOTIFY_OK;
 }
diff --git a/net/mpls/internal.h b/net/mpls/internal.h
index b064c345042c..8cabeb5a1cb9 100644
--- a/net/mpls/internal.h
+++ b/net/mpls/internal.h
@@ -16,6 +16,7 @@ struct mpls_dev {
         int                     input_enabled;
 
         struct ctl_table_header *sysctl;
+        struct rcu_head         rcu;
 };
 
 struct sk_buff;
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index 4776282c6417..33e6d6e2908f 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -125,6 +125,7 @@ static struct vport *netdev_create(const struct vport_parms *parms)
         if (err)
                 goto error_master_upper_dev_unlink;
 
+        dev_disable_lro(netdev_vport->dev);
         dev_set_promiscuity(netdev_vport->dev, 1);
         netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
         rtnl_unlock();
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index fb7976aee61c..4f15b7d730e1 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -381,13 +381,14 @@ nomem:
 }
 
 
-/* Public interface to creat the association shared key.
+/* Public interface to create the association shared key.
  * See code above for the algorithm.
  */
 int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp)
 {
         struct sctp_auth_bytes  *secret;
         struct sctp_shared_key *ep_key;
+        struct sctp_chunk *chunk;
 
         /* If we don't support AUTH, or peer is not capable
          * we don't need to do anything.
@@ -410,6 +411,14 @@ int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp)
         sctp_auth_key_put(asoc->asoc_shared_key);
         asoc->asoc_shared_key = secret;
 
+        /* Update send queue in case any chunk already in there now
+         * needs authenticating
+         */
+        list_for_each_entry(chunk, &asoc->outqueue.out_chunk_list, list) {
+                if (sctp_auth_send_cid(chunk->chunk_hdr->type, asoc))
+                        chunk->auth = 1;
+        }
+
         return 0;
 }
 
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 9074b5cede38..f485600c4507 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2142,11 +2142,17 @@ static void tipc_sk_timeout(unsigned long data)
         peer_node = tsk_peer_node(tsk);
 
         if (tsk->probing_state == TIPC_CONN_PROBING) {
-                /* Previous probe not answered -> self abort */
-                skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,
-                                      TIPC_CONN_MSG, SHORT_H_SIZE, 0,
-                                      own_node, peer_node, tsk->portid,
-                                      peer_port, TIPC_ERR_NO_PORT);
+                if (!sock_owned_by_user(sk)) {
+                        sk->sk_socket->state = SS_DISCONNECTING;
+                        tsk->connected = 0;
+                        tipc_node_remove_conn(sock_net(sk), tsk_peer_node(tsk),
+                                              tsk_peer_port(tsk));
+                        sk->sk_state_change(sk);
+                } else {
+                        /* Try again later */
+                        sk_reset_timer(sk, &sk->sk_timer, (HZ / 20));
+                }
+
         } else {
                 skb = tipc_msg_create(CONN_MANAGER, CONN_PROBE,
                                       INT_H_SIZE, 0, peer_node, own_node,
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index fff1bef6ed6d..fd682832a0e3 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -1333,6 +1333,8 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
         memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN);
         wdev_unlock(wdev);
 
+        memset(&sinfo, 0, sizeof(sinfo));
+
         if (rdev_get_station(rdev, dev, bssid, &sinfo))
                 return NULL;
 
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 526c4feb3b50..b58286ecd156 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -13,6 +13,8 @@
 #include <net/dst.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
+#include <net/ip_tunnels.h>
+#include <net/ip6_tunnel.h>
 
 static struct kmem_cache *secpath_cachep __read_mostly;
 
@@ -186,6 +188,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
         struct xfrm_state *x = NULL;
         xfrm_address_t *daddr;
         struct xfrm_mode *inner_mode;
+        u32 mark = skb->mark;
         unsigned int family;
         int decaps = 0;
         int async = 0;
@@ -203,6 +206,18 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                                    XFRM_SPI_SKB_CB(skb)->daddroff);
         family = XFRM_SPI_SKB_CB(skb)->family;
 
+        /* if tunnel is present override skb->mark value with tunnel i_key */
+        if (XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4) {
+                switch (family) {
+                case AF_INET:
+                        mark = be32_to_cpu(XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4->parms.i_key);
+                        break;
+                case AF_INET6:
+                        mark = be32_to_cpu(XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6->parms.i_key);
+                        break;
+                }
+        }
+
         /* Allocate new secpath or COW existing one. */
         if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
                 struct sec_path *sp;
@@ -229,7 +244,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
                         goto drop;
                 }
 
-                x = xfrm_state_lookup(net, skb->mark, daddr, spi, nexthdr, family);
+                x = xfrm_state_lookup(net, mark, daddr, spi, nexthdr, family);
                 if (x == NULL) {
                         XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOSTATES);
                         xfrm_audit_state_notfound(skb, family, spi, seq);
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index dab57daae408..4fd725a0c500 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -99,6 +99,7 @@ static int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
 
         if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
                 XFRM_SKB_CB(skb)->seq.output.low = ++x->replay.oseq;
+                XFRM_SKB_CB(skb)->seq.output.hi = 0;
                 if (unlikely(x->replay.oseq == 0)) {
                         x->replay.oseq--;
                         xfrm_audit_state_replay_overflow(x, skb);
@@ -177,6 +178,7 @@ static int xfrm_replay_overflow_bmp(struct xfrm_state *x, struct sk_buff *skb)
 
         if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
                 XFRM_SKB_CB(skb)->seq.output.low = ++replay_esn->oseq;
+                XFRM_SKB_CB(skb)->seq.output.hi = 0;
                 if (unlikely(replay_esn->oseq == 0)) {
                         replay_esn->oseq--;
                         xfrm_audit_state_replay_overflow(x, skb);
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f5e39e35d73a..96688cd0f6f1 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -927,8 +927,8 @@ struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi,
                         x->id.spi != spi)
                         continue;
 
-                spin_unlock_bh(&net->xfrm.xfrm_state_lock);
                 xfrm_state_hold(x);
+                spin_unlock_bh(&net->xfrm.xfrm_state_lock);
                 return x;
         }
         spin_unlock_bh(&net->xfrm.xfrm_state_lock);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 89b1df4e72ab..c5ec977b9c37 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3169,12 +3169,12 @@ sub process {
                 }
 
 # check for global initialisers.
-                if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/) {
+                if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) {
                         if (ERROR("GLOBAL_INITIALISERS",
                                   "do not initialise globals to 0 or NULL\n" .
                                       $herecurr) &&
                             $fix) {
-                                $fixed[$fixlinenr] =~ s/($Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/;
+                                $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0|NULL|false)\s*;/$1;/;
                         }
                 }
 # check for static initialisers.
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index e2828e101433..2ae9619443d1 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -45,6 +45,7 @@ source "sound/soc/nuc900/Kconfig"
 source "sound/soc/omap/Kconfig"
 source "sound/soc/kirkwood/Kconfig"
 source "sound/soc/intel/Kconfig"
+source "sound/soc/mediatek/Kconfig"
 source "sound/soc/mxs/Kconfig"
 source "sound/soc/pxa/Kconfig"
 source "sound/soc/qcom/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index a0e1ee6b507d..e189903fabf4 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_SND_SOC)	+= dwc/
 obj-$(CONFIG_SND_SOC)   += fsl/
 obj-$(CONFIG_SND_SOC)   += jz4740/
 obj-$(CONFIG_SND_SOC)   += intel/
+obj-$(CONFIG_SND_SOC)   += mediatek/
 obj-$(CONFIG_SND_SOC)   += mxs/
 obj-$(CONFIG_SND_SOC)   += nuc900/
 obj-$(CONFIG_SND_SOC)   += omap/
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index c3152072d682..1489cd461aec 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -9,21 +9,32 @@ config SND_ATMEL_SOC
 if SND_ATMEL_SOC
 
 config SND_ATMEL_SOC_PDC
-        bool
+        tristate
+        default m if SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=m
+        default y if SND_ATMEL_SOC_SSC_PDC=y || (SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=y)
+
+config SND_ATMEL_SOC_SSC_PDC
+        tristate
 
 config SND_ATMEL_SOC_DMA
-        bool
+        tristate
         select SND_SOC_GENERIC_DMAENGINE_PCM
+        default m if SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=m
+        default y if SND_ATMEL_SOC_SSC_DMA=y || (SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=y)
+
+config SND_ATMEL_SOC_SSC_DMA
+        tristate
 
 config SND_ATMEL_SOC_SSC
         tristate
+        default y if SND_ATMEL_SOC_SSC_DMA=y || SND_ATMEL_SOC_SSC_PDC=y
+        default m if SND_ATMEL_SOC_SSC_DMA=m || SND_ATMEL_SOC_SSC_PDC=m
 
 config SND_AT91_SOC_SAM9G20_WM8731
         tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
         depends on ARCH_AT91 || COMPILE_TEST
         depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
-        select SND_ATMEL_SOC_PDC
-        select SND_ATMEL_SOC_SSC
+        select SND_ATMEL_SOC_SSC_PDC
         select SND_SOC_WM8731
         help
           Say Y if you want to add support for SoC audio on WM8731-based
@@ -33,8 +44,7 @@ config SND_ATMEL_SOC_WM8904
         tristate "Atmel ASoC driver for boards using WM8904 codec"
         depends on ARCH_AT91 || COMPILE_TEST
         depends on ATMEL_SSC && I2C
-        select SND_ATMEL_SOC_SSC
-        select SND_ATMEL_SOC_DMA
+        select SND_ATMEL_SOC_SSC_DMA
         select SND_SOC_WM8904
         help
           Say Y if you want to add support for Atmel ASoC driver for boards using
@@ -44,8 +54,7 @@ config SND_AT91_SOC_SAM9X5_WM8731
         tristate "SoC Audio support for WM8731-based at91sam9x5 board"
         depends on ARCH_AT91 || COMPILE_TEST
         depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
-        select SND_ATMEL_SOC_SSC
-        select SND_ATMEL_SOC_DMA
+        select SND_ATMEL_SOC_SSC_DMA
         select SND_SOC_WM8731
         help
           Say Y if you want to add support for audio SoC on an
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
index 4fa7ac91f972..b327e5cc8de3 100644
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
@@ -1,8 +1,10 @@
 # AT91 Platform Support
-snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_PDC) := atmel-pcm-pdc.o
-snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o
-snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o $(snd-soc-atmel-pcm-y)
+snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o
+snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o
+snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o
 
+obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o
+obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o
 obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o
 
 # AT91 Machine Support
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9b36011a814e..efaafce8ba38 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -509,6 +509,11 @@ config SND_SOC_RL6231
         default m if SND_SOC_RT5670=m
         default m if SND_SOC_RT5677=m
 
+config SND_SOC_RL6347A
+        tristate
+        default y if SND_SOC_RT286=y
+        default m if SND_SOC_RT286=m
+
 config SND_SOC_RT286
         tristate
         depends on I2C
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 3dcf5ac85e89..cf160d972cb3 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -77,6 +77,7 @@ snd-soc-pcm512x-objs := pcm512x.o
 snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
 snd-soc-pcm512x-spi-objs := pcm512x-spi.o
 snd-soc-rl6231-objs := rl6231.o
+snd-soc-rl6347a-objs := rl6347a.o
 snd-soc-rt286-objs := rt286.o
 snd-soc-rt5631-objs := rt5631.o
 snd-soc-rt5640-objs := rt5640.o
@@ -263,6 +264,7 @@ obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
 obj-$(CONFIG_SND_SOC_PCM512x_I2C)       += snd-soc-pcm512x-i2c.o
 obj-$(CONFIG_SND_SOC_PCM512x_SPI)       += snd-soc-pcm512x-spi.o
 obj-$(CONFIG_SND_SOC_RL6231)    += snd-soc-rl6231.o
+obj-$(CONFIG_SND_SOC_RL6347A)   += snd-soc-rl6347a.o
 obj-$(CONFIG_SND_SOC_RT286)     += snd-soc-rt286.o
 obj-$(CONFIG_SND_SOC_RT5631)    += snd-soc-rt5631.o
 obj-$(CONFIG_SND_SOC_RT5640)    += snd-soc-rt5640.o
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 679f0a0f7039..78268f0514e9 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -27,7 +27,7 @@
 #include "max98090.h"
 
 /* Allows for sparsely populated register maps */
-static struct reg_default max98090_reg[] = {
+static const struct reg_default max98090_reg[] = {
         { 0x00, 0x00 }, /* 00 Software Reset */
         { 0x03, 0x04 }, /* 03 Interrupt Masks */
         { 0x04, 0x00 }, /* 04 System Clock Quick */
@@ -2704,7 +2704,7 @@ static const struct of_device_id max98090_of_match[] = {
 MODULE_DEVICE_TABLE(of, max98090_of_match);
 
 #ifdef CONFIG_ACPI
-static struct acpi_device_id max98090_acpi_match[] = {
+static const struct acpi_device_id max98090_acpi_match[] = {
         { "193C9890", MAX98090 },
         { }
 };
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c
index 62dda2488f14..b74118e019fb 100644
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@@ -341,6 +341,7 @@ static int ml26124_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_codec *codec = dai->codec;
         struct ml26124_priv *priv = snd_soc_codec_get_drvdata(codec);
         int i = get_coeff(priv->mclk, params_rate(hw_params));
+        int srate;
 
         if (i < 0)
                 return i;
@@ -370,53 +371,16 @@ static int ml26124_hw_params(struct snd_pcm_substream *substream,
                                     BIT(0) | BIT(1), 0);
         }
 
-        switch (params_rate(hw_params)) {
-        case 16000:
-                snd_soc_update_bits(codec, ML26124_SMPLING_RATE, 0xf,
-                                    get_srate(params_rate(hw_params)));
-                snd_soc_update_bits(codec, ML26124_PLLNL, 0xff,
-                                    coeff_div[i].pllnl);
-                snd_soc_update_bits(codec, ML26124_PLLNH, 0x1,
-                                    coeff_div[i].pllnh);
-                snd_soc_update_bits(codec, ML26124_PLLML, 0xff,
-                                    coeff_div[i].pllml);
-                snd_soc_update_bits(codec, ML26124_PLLMH, 0x3f,
-                                    coeff_div[i].pllmh);
-                snd_soc_update_bits(codec, ML26124_PLLDIV, 0x1f,
-                                    coeff_div[i].plldiv);
-                break;
-        case 32000:
-                snd_soc_update_bits(codec, ML26124_SMPLING_RATE, 0xf,
-                                    get_srate(params_rate(hw_params)));
-                snd_soc_update_bits(codec, ML26124_PLLNL, 0xff,
-                                    coeff_div[i].pllnl);
-                snd_soc_update_bits(codec, ML26124_PLLNH, 0x1,
-                                    coeff_div[i].pllnh);
-                snd_soc_update_bits(codec, ML26124_PLLML, 0xff,
-                                    coeff_div[i].pllml);
-                snd_soc_update_bits(codec, ML26124_PLLMH, 0x3f,
-                                    coeff_div[i].pllmh);
-                snd_soc_update_bits(codec, ML26124_PLLDIV, 0x1f,
-                                    coeff_div[i].plldiv);
-                break;
-        case 48000:
-                snd_soc_update_bits(codec, ML26124_SMPLING_RATE, 0xf,
-                                    get_srate(params_rate(hw_params)));
-                snd_soc_update_bits(codec, ML26124_PLLNL, 0xff,
-                                    coeff_div[i].pllnl);
-                snd_soc_update_bits(codec, ML26124_PLLNH, 0x1,
-                                    coeff_div[i].pllnh);
-                snd_soc_update_bits(codec, ML26124_PLLML, 0xff,
-                                    coeff_div[i].pllml);
-                snd_soc_update_bits(codec, ML26124_PLLMH, 0x3f,
-                                    coeff_div[i].pllmh);
-                snd_soc_update_bits(codec, ML26124_PLLDIV, 0x1f,
-                                    coeff_div[i].plldiv);
-                break;
-        default:
-                pr_err("%s:this rate is no support for ml26124\n", __func__);
-                return -EINVAL;
-        }
+        srate = get_srate(params_rate(hw_params));
+        if (srate < 0)
+                return srate;
+
+        snd_soc_update_bits(codec, ML26124_SMPLING_RATE, 0xf, srate);
+        snd_soc_update_bits(codec, ML26124_PLLNL, 0xff, coeff_div[i].pllnl);
+        snd_soc_update_bits(codec, ML26124_PLLNH, 0x1, coeff_div[i].pllnh);
+        snd_soc_update_bits(codec, ML26124_PLLML, 0xff, coeff_div[i].pllml);
+        snd_soc_update_bits(codec, ML26124_PLLMH, 0x3f, coeff_div[i].pllmh);
+        snd_soc_update_bits(codec, ML26124_PLLDIV, 0x1f, coeff_div[i].plldiv);
 
         return 0;
 }
diff --git a/sound/soc/codecs/rl6347a.c b/sound/soc/codecs/rl6347a.c
new file mode 100644
index 000000000000..91d5166bd3a1
--- /dev/null
+++ b/sound/soc/codecs/rl6347a.c
@@ -0,0 +1,128 @@
+/*
+ * rl6347a.c - RL6347A class device shared support
+ *
+ * Copyright 2015 Realtek Semiconductor Corp.
+ *
+ * Author: Oder Chiou <oder_chiou@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/dmi.h>
+#include <linux/acpi.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+#include <sound/jack.h>
+#include <linux/workqueue.h>
+#include <sound/hda_verbs.h>
+
+#include "rl6347a.h"
+
+int rl6347a_hw_write(void *context, unsigned int reg, unsigned int value)
+{
+        struct i2c_client *client = context;
+        struct rl6347a_priv *rl6347a = i2c_get_clientdata(client);
+        u8 data[4];
+        int ret, i;
+
+        /* handle index registers */
+        if (reg <= 0xff) {
+                rl6347a_hw_write(client, RL6347A_COEF_INDEX, reg);
+                for (i = 0; i < rl6347a->index_cache_size; i++) {
+                        if (reg == rl6347a->index_cache[i].reg) {
+                                rl6347a->index_cache[i].def = value;
+                                break;
+                        }
+
+                }
+                reg = RL6347A_PROC_COEF;
+        }
+
+        data[0] = (reg >> 24) & 0xff;
+        data[1] = (reg >> 16) & 0xff;
+        /*
+         * 4 bit VID: reg should be 0
+         * 12 bit VID: value should be 0
+         * So we use an OR operator to handle it rather than use if condition.
+         */
+        data[2] = ((reg >> 8) & 0xff) | ((value >> 8) & 0xff);
+        data[3] = value & 0xff;
+
+        ret = i2c_master_send(client, data, 4);
+
+        if (ret == 4)
+                return 0;
+        else
+                pr_err("ret=%d\n", ret);
+        if (ret < 0)
+                return ret;
+        else
+                return -EIO;
+}
+EXPORT_SYMBOL_GPL(rl6347a_hw_write);
+
+int rl6347a_hw_read(void *context, unsigned int reg, unsigned int *value)
+{
+        struct i2c_client *client = context;
+        struct i2c_msg xfer[2];
+        int ret;
+        __be32 be_reg;
+        unsigned int index, vid, buf = 0x0;
+
+        /* handle index registers */
+        if (reg <= 0xff) {
+                rl6347a_hw_write(client, RL6347A_COEF_INDEX, reg);
+                reg = RL6347A_PROC_COEF;
+        }
+
+        reg = reg | 0x80000;
+        vid = (reg >> 8) & 0xfff;
+
+        if (AC_VERB_GET_AMP_GAIN_MUTE == (vid & 0xf00)) {
+                index = (reg >> 8) & 0xf;
+                reg = (reg & ~0xf0f) | index;
+        }
+        be_reg = cpu_to_be32(reg);
+
+        /* Write register */
+        xfer[0].addr = client->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 4;
+        xfer[0].buf = (u8 *)&be_reg;
+
+        /* Read data */
+        xfer[1].addr = client->addr;
+        xfer[1].flags = I2C_M_RD;
+        xfer[1].len = 4;
+        xfer[1].buf = (u8 *)&buf;
+
+        ret = i2c_transfer(client->adapter, xfer, 2);
+        if (ret < 0)
+                return ret;
+        else if (ret != 2)
+                return -EIO;
+
+        *value = be32_to_cpu(buf);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rl6347a_hw_read);
+
+MODULE_DESCRIPTION("RL6347A class device shared support");
+MODULE_AUTHOR("Oder Chiou <oder_chiou@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rl6347a.h b/sound/soc/codecs/rl6347a.h
new file mode 100644
index 000000000000..1cb56e50b7f3
--- /dev/null
+++ b/sound/soc/codecs/rl6347a.h
@@ -0,0 +1,32 @@
+/*
+ * rl6347a.h - RL6347A class device shared support
+ *
+ * Copyright 2015 Realtek Semiconductor Corp.
+ *
+ * Author: Oder Chiou <oder_chiou@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __RL6347A_H__
+#define __RL6347A_H__
+
+#define VERB_CMD(V, N, D) ((N << 20) | (V << 8) | D)
+
+#define RL6347A_VENDOR_REGISTERS        0x20
+
+#define RL6347A_COEF_INDEX\
+        VERB_CMD(AC_VERB_SET_COEF_INDEX, RL6347A_VENDOR_REGISTERS, 0)
+#define RL6347A_PROC_COEF\
+        VERB_CMD(AC_VERB_SET_PROC_COEF, RL6347A_VENDOR_REGISTERS, 0)
+
+struct rl6347a_priv {
+        struct reg_default *index_cache;
+        int index_cache_size;
+};
+
+int rl6347a_hw_write(void *context, unsigned int reg, unsigned int value);
+int rl6347a_hw_read(void *context, unsigned int reg, unsigned int *value);
+
+#endif /* __RL6347A_H__ */
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index c6cca0639e0d..5c43e263b2c1 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -31,12 +31,15 @@
 #include <sound/rt286.h>
 #include <sound/hda_verbs.h>
 
+#include "rl6347a.h"
 #include "rt286.h"
 
 #define RT286_VENDOR_ID 0x10ec0286
 #define RT288_VENDOR_ID 0x10ec0288
 
 struct rt286_priv {
+        struct reg_default *index_cache;
+        int index_cache_size;
         struct regmap *regmap;
         struct snd_soc_codec *codec;
         struct rt286_platform_data pdata;
@@ -45,7 +48,6 @@ struct rt286_priv {
         struct delayed_work jack_detect_work;
         int sys_clk;
         int clk_id;
-        struct reg_default *index_cache;
 };
 
 static struct reg_default rt286_index_def[] = {
@@ -185,94 +187,6 @@ static bool rt286_readable_register(struct device *dev, unsigned int reg)
         }
 }
 
-static int rt286_hw_write(void *context, unsigned int reg, unsigned int value)
-{
-        struct i2c_client *client = context;
-        struct rt286_priv *rt286 = i2c_get_clientdata(client);
-        u8 data[4];
-        int ret, i;
-
-        /* handle index registers */
-        if (reg <= 0xff) {
-                rt286_hw_write(client, RT286_COEF_INDEX, reg);
-                for (i = 0; i < INDEX_CACHE_SIZE; i++) {
-                        if (reg == rt286->index_cache[i].reg) {
-                                rt286->index_cache[i].def = value;
-                                break;
-                        }
-
-                }
-                reg = RT286_PROC_COEF;
-        }
-
-        data[0] = (reg >> 24) & 0xff;
-        data[1] = (reg >> 16) & 0xff;
-        /*
-         * 4 bit VID: reg should be 0
-         * 12 bit VID: value should be 0
-         * So we use an OR operator to handle it rather than use if condition.
-         */
-        data[2] = ((reg >> 8) & 0xff) | ((value >> 8) & 0xff);
-        data[3] = value & 0xff;
-
-        ret = i2c_master_send(client, data, 4);
-
-        if (ret == 4)
-                return 0;
-        else
-                pr_err("ret=%d\n", ret);
-        if (ret < 0)
-                return ret;
-        else
-                return -EIO;
-}
-
-static int rt286_hw_read(void *context, unsigned int reg, unsigned int *value)
-{
-        struct i2c_client *client = context;
-        struct i2c_msg xfer[2];
-        int ret;
-        __be32 be_reg;
-        unsigned int index, vid, buf = 0x0;
-
-        /* handle index registers */
-        if (reg <= 0xff) {
-                rt286_hw_write(client, RT286_COEF_INDEX, reg);
-                reg = RT286_PROC_COEF;
-        }
-
-        reg = reg | 0x80000;
-        vid = (reg >> 8) & 0xfff;
-
-        if (AC_VERB_GET_AMP_GAIN_MUTE == (vid & 0xf00)) {
-                index = (reg >> 8) & 0xf;
-                reg = (reg & ~0xf0f) | index;
-        }
-        be_reg = cpu_to_be32(reg);
-
-        /* Write register */
-        xfer[0].addr = client->addr;
-        xfer[0].flags = 0;
-        xfer[0].len = 4;
-        xfer[0].buf = (u8 *)&be_reg;
-
-        /* Read data */
-        xfer[1].addr = client->addr;
-        xfer[1].flags = I2C_M_RD;
-        xfer[1].len = 4;
-        xfer[1].buf = (u8 *)&buf;
-
-        ret = i2c_transfer(client->adapter, xfer, 2);
-        if (ret < 0)
-                return ret;
-        else if (ret != 2)
-                return -EIO;
-
-        *value = be32_to_cpu(buf);
-
-        return 0;
-}
-
 #ifdef CONFIG_PM
 static void rt286_index_sync(struct snd_soc_codec *codec)
 {
@@ -1174,8 +1088,8 @@ static const struct regmap_config rt286_regmap = {
         .max_register = 0x02370100,
         .volatile_reg = rt286_volatile_register,
         .readable_reg = rt286_readable_register,
-        .reg_write = rt286_hw_write,
-        .reg_read = rt286_hw_read,
+        .reg_write = rl6347a_hw_write,
+        .reg_read = rl6347a_hw_read,
         .cache_type = REGCACHE_RBTREE,
         .reg_defaults = rt286_reg,
         .num_reg_defaults = ARRAY_SIZE(rt286_reg),
@@ -1248,6 +1162,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
         }
 
         rt286->index_cache = rt286_index_def;
+        rt286->index_cache_size = INDEX_CACHE_SIZE;
         rt286->i2c = i2c;
         i2c_set_clientdata(i2c, rt286);
 
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index f40752a6c242..9bc78e57513d 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -51,7 +51,7 @@ static const struct regmap_range_cfg rt5640_ranges[] = {
           .window_len = 0x1, },
 };
 
-static struct reg_default init_list[] = {
+static const struct reg_default init_list[] = {
         {RT5640_PR_BASE + 0x3d, 0x3600},
         {RT5640_PR_BASE + 0x12, 0x0aa8},
         {RT5640_PR_BASE + 0x14, 0x0aaa},
@@ -59,7 +59,6 @@ static struct reg_default init_list[] = {
         {RT5640_PR_BASE + 0x21, 0xe0e0},
         {RT5640_PR_BASE + 0x23, 0x1804},
 };
-#define RT5640_INIT_REG_LEN ARRAY_SIZE(init_list)
 
 static const struct reg_default rt5640_reg[] = {
         { 0x00, 0x000e },
@@ -2122,7 +2121,7 @@ MODULE_DEVICE_TABLE(of, rt5640_of_match);
 #endif
 
 #ifdef CONFIG_ACPI
-static struct acpi_device_id rt5640_acpi_match[] = {
+static const struct acpi_device_id rt5640_acpi_match[] = {
         { "INT33CA", 0 },
         { "10EC5640", 0 },
         { "10EC5642", 0 },
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index d5f0f5680d3b..9ce311e088fc 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -349,6 +349,7 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)
         case RT5645_TDM_CTRL_1:
         case RT5645_TDM_CTRL_2:
         case RT5645_TDM_CTRL_3:
+        case RT5650_TDM_CTRL_4:
         case RT5645_GLB_CLK:
         case RT5645_PLL_CTRL1:
         case RT5645_PLL_CTRL2:
@@ -1705,15 +1706,6 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
         SND_SOC_DAPM_MUX("RT5645 IF1 ADC Mux", SND_SOC_NOPM,
                 0, 0, &rt5645_if1_adc_in_mux),
 
-        SND_SOC_DAPM_MUX("RT5650 IF1 ADC1 Swap Mux", SND_SOC_NOPM,
-                0, 0, &rt5650_if1_adc1_in_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 ADC2 Swap Mux", SND_SOC_NOPM,
-                0, 0, &rt5650_if1_adc2_in_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 ADC3 Swap Mux", SND_SOC_NOPM,
-                0, 0, &rt5650_if1_adc3_in_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 ADC Mux", SND_SOC_NOPM,
-                0, 0, &rt5650_if1_adc_in_mux),
-
         SND_SOC_DAPM_MUX("IF2 ADC Mux", SND_SOC_NOPM,
                 0, 0, &rt5645_if2_adc_in_mux),
 
@@ -1732,14 +1724,6 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
                 &rt5645_if1_dac2_tdm_sel_mux),
         SND_SOC_DAPM_MUX("RT5645 IF1 DAC2 R Mux", SND_SOC_NOPM, 0, 0,
                 &rt5645_if1_dac3_tdm_sel_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 DAC1 L Mux", SND_SOC_NOPM, 0, 0,
-                &rt5650_if1_dac0_tdm_sel_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 DAC1 R Mux", SND_SOC_NOPM, 0, 0,
-                &rt5650_if1_dac1_tdm_sel_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 DAC2 L Mux", SND_SOC_NOPM, 0, 0,
-                &rt5650_if1_dac2_tdm_sel_mux),
-        SND_SOC_DAPM_MUX("RT5650 IF1 DAC2 R Mux", SND_SOC_NOPM, 0, 0,
-                &rt5650_if1_dac3_tdm_sel_mux),
         SND_SOC_DAPM_PGA("IF1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_PGA("IF1 ADC L", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_PGA("IF1 ADC R", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -1881,6 +1865,24 @@ static const struct snd_soc_dapm_widget rt5650_specific_dapm_widgets[] = {
                 0, 0, &rt5650_a_dac2_l_mux),
         SND_SOC_DAPM_MUX("A DAC2 R Mux", SND_SOC_NOPM,
                 0, 0, &rt5650_a_dac2_r_mux),
+
+        SND_SOC_DAPM_MUX("RT5650 IF1 ADC1 Swap Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_if1_adc1_in_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 ADC2 Swap Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_if1_adc2_in_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 ADC3 Swap Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_if1_adc3_in_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 ADC Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_if1_adc_in_mux),
+
+        SND_SOC_DAPM_MUX("RT5650 IF1 DAC1 L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5650_if1_dac0_tdm_sel_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 DAC1 R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5650_if1_dac1_tdm_sel_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 DAC2 L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5650_if1_dac2_tdm_sel_mux),
+        SND_SOC_DAPM_MUX("RT5650 IF1 DAC2 R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5650_if1_dac3_tdm_sel_mux),
 };
 
 static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
@@ -2761,6 +2763,7 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
         struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
 
         if (enable) {
+                snd_soc_dapm_mutex_lock(&codec->dapm);
                 snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
                                                         "ADC L power");
                 snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
@@ -2770,6 +2773,8 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
                 snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
                                                         "Mic Det Power");
                 snd_soc_dapm_sync_unlocked(&codec->dapm);
+                snd_soc_dapm_mutex_unlock(&codec->dapm);
+
                 snd_soc_update_bits(codec,
                                         RT5645_INT_IRQ_ST, 0x8, 0x8);
                 snd_soc_update_bits(codec,
@@ -2780,6 +2785,8 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
         } else {
                 snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0);
                 snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0);
+
+                snd_soc_dapm_mutex_lock(&codec->dapm);
                 snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
                                                         "ADC L power");
                 snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
@@ -2790,6 +2797,7 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
                 snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
                                                         "Mic Det Power");
                 snd_soc_dapm_sync_unlocked(&codec->dapm);
+                snd_soc_dapm_mutex_unlock(&codec->dapm);
         }
 }
 
@@ -2937,17 +2945,11 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)
 
         switch (rt5645->pdata.jd_mode) {
         case 0: /* Not using rt5645 JD */
-                if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
-                        gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio);
-                        dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n",
-                                rt5645->pdata.hp_det_gpio, gpio_state);
-                }
-                if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) ||
-                        (!rt5645->pdata.gpio_hp_det_active_high &&
-                         !gpio_state)) {
-                        report = rt5645_jack_detect(rt5645->codec, 1);
-                } else {
-                        report = rt5645_jack_detect(rt5645->codec, 0);
+                if (rt5645->gpiod_hp_det) {
+                        gpio_state = gpiod_get_value(rt5645->gpiod_hp_det);
+                        dev_dbg(rt5645->codec->dev, "gpio_state = %d\n",
+                                gpio_state);
+                        report = rt5645_jack_detect(rt5645->codec, gpio_state);
                 }
                 snd_soc_jack_report(rt5645->hp_jack,
                                     report, SND_JACK_HEADPHONE);
@@ -3230,6 +3232,20 @@ static struct dmi_system_id dmi_platform_intel_braswell[] = {
         { }
 };
 
+static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
+{
+        rt5645->pdata.in2_diff = device_property_read_bool(dev,
+                "realtek,in2-differential");
+        device_property_read_u32(dev,
+                "realtek,dmic1-data-pin", &rt5645->pdata.dmic1_data_pin);
+        device_property_read_u32(dev,
+                "realtek,dmic2-data-pin", &rt5645->pdata.dmic2_data_pin);
+        device_property_read_u32(dev,
+                "realtek,jd-mode", &rt5645->pdata.jd_mode);
+
+        return 0;
+}
+
 static int rt5645_i2c_probe(struct i2c_client *i2c,
                     const struct i2c_device_id *id)
 {
@@ -3237,7 +3253,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
         struct rt5645_priv *rt5645;
         int ret;
         unsigned int val;
-        struct gpio_desc *gpiod;
 
         rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv),
                                 GFP_KERNEL);
@@ -3247,22 +3262,19 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
         rt5645->i2c = i2c;
         i2c_set_clientdata(i2c, rt5645);
 
-        if (pdata) {
+        if (pdata)
                 rt5645->pdata = *pdata;
-        } else {
-                if (dmi_check_system(dmi_platform_intel_braswell)) {
-                        rt5645->pdata = *rt5645_pdata;
-                        gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0);
+        else if (dmi_check_system(dmi_platform_intel_braswell))
+                rt5645->pdata = *rt5645_pdata;
+        else
+                rt5645_parse_dt(rt5645, &i2c->dev);
 
-                        if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) {
-                                rt5645->pdata.hp_det_gpio = -1;
-                                dev_err(&i2c->dev, "failed to initialize gpiod\n");
-                        } else {
-                                rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod);
-                                rt5645->pdata.gpio_hp_det_active_high
-                                                = !gpiod_is_active_low(gpiod);
-                        }
-                }
+        rt5645->gpiod_hp_det = devm_gpiod_get_optional(&i2c->dev, "hp-detect",
+                                                       GPIOD_IN);
+
+        if (IS_ERR(rt5645->gpiod_hp_det)) {
+                dev_err(&i2c->dev, "failed to initialize gpiod\n");
+                return PTR_ERR(rt5645->gpiod_hp_det);
         }
 
         rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);
@@ -3426,16 +3438,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
                         dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
         }
 
-        if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
-                ret = gpio_request(rt5645->pdata.hp_det_gpio, "rt5645");
-                if (ret)
-                        dev_err(&i2c->dev, "Fail gpio_request hp_det_gpio\n");
-
-                ret = gpio_direction_input(rt5645->pdata.hp_det_gpio);
-                if (ret)
-                        dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n");
-        }
-
         return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645,
                                       rt5645_dai, ARRAY_SIZE(rt5645_dai));
 }
@@ -3449,9 +3451,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
 
         cancel_delayed_work_sync(&rt5645->jack_detect_work);
 
-        if (gpio_is_valid(rt5645->pdata.hp_det_gpio))
-                gpio_free(rt5645->pdata.hp_det_gpio);
-
         snd_soc_unregister_codec(&i2c->dev);
 
         return 0;
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index 9ec4e899795d..0353a6a273ab 100644
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -2182,6 +2182,7 @@ struct rt5645_priv {
         struct rt5645_platform_data pdata;
         struct regmap *regmap;
         struct i2c_client *i2c;
+        struct gpio_desc *gpiod_hp_det;
         struct snd_soc_jack *hp_jack;
         struct snd_soc_jack *mic_jack;
         struct snd_soc_jack *btn_jack;
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 840dd6d0003a..a9123d414178 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -51,12 +51,11 @@ static const struct regmap_range_cfg rt5670_ranges[] = {
           .window_len = 0x1, },
 };
 
-static struct reg_default init_list[] = {
+static const struct reg_default init_list[] = {
         { RT5670_PR_BASE + 0x14, 0x9a8a },
         { RT5670_PR_BASE + 0x38, 0x3ba1 },
         { RT5670_PR_BASE + 0x3d, 0x3640 },
 };
-#define RT5670_INIT_REG_LEN ARRAY_SIZE(init_list)
 
 static const struct reg_default rt5670_reg[] = {
         { 0x00, 0x0000 },
@@ -2809,7 +2808,7 @@ static const struct i2c_device_id rt5670_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id);
 
 #ifdef CONFIG_ACPI
-static struct acpi_device_id rt5670_acpi_match[] = {
+static const struct acpi_device_id rt5670_acpi_match[] = {
         { "10EC5670", 0},
         { },
 };
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index 891e2c529df3..4f25a7d0efa2 100644
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -45,7 +45,7 @@ static struct reg_default tas2552_reg_defs[] = {
         {TAS2552_OUTPUT_DATA, 0xc0},
         {TAS2552_PDM_CFG, 0x01},
         {TAS2552_PGA_GAIN, 0x00},
-        {TAS2552_BOOST_PT_CTRL, 0x0f},
+        {TAS2552_BOOST_APT_CTRL, 0x0f},
         {TAS2552_RESERVED_0D, 0xbe},
         {TAS2552_LIMIT_RATE_HYS, 0x08},
         {TAS2552_CFG_2, 0xef},
@@ -77,7 +77,9 @@ struct tas2552_data {
         struct gpio_desc *enable_gpio;
         unsigned char regs[TAS2552_VBAT_DATA];
         unsigned int pll_clkin;
+        int pll_clk_id;
         unsigned int pdm_clk;
+        int pdm_clk_id;
 
         unsigned int dai_fmt;
         unsigned int tdm_delay;
@@ -143,31 +145,105 @@ static const struct snd_soc_dapm_route tas2552_audio_map[] = {
 };
 
 #ifdef CONFIG_PM
-static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)
+static void tas2552_sw_shutdown(struct tas2552_data *tas2552, int sw_shutdown)
 {
         u8 cfg1_reg = 0;
 
-        if (!tas_data->codec)
+        if (!tas2552->codec)
                 return;
 
         if (sw_shutdown)
                 cfg1_reg = TAS2552_SWS;
 
-        snd_soc_update_bits(tas_data->codec, TAS2552_CFG_1, TAS2552_SWS,
+        snd_soc_update_bits(tas2552->codec, TAS2552_CFG_1, TAS2552_SWS,
                             cfg1_reg);
 }
 #endif
 
+static int tas2552_setup_pll(struct snd_soc_codec *codec,
+                             struct snd_pcm_hw_params *params)
+{
+        struct tas2552_data *tas2552 = dev_get_drvdata(codec->dev);
+        bool bypass_pll = false;
+        unsigned int pll_clk = params_rate(params) * 512;
+        unsigned int pll_clkin = tas2552->pll_clkin;
+        u8 pll_enable;
+
+        if (!pll_clkin) {
+                if (tas2552->pll_clk_id != TAS2552_PLL_CLKIN_BCLK)
+                        return -EINVAL;
+
+                pll_clkin = snd_soc_params_to_bclk(params);
+                pll_clkin += tas2552->tdm_delay;
+        }
+
+        pll_enable = snd_soc_read(codec, TAS2552_CFG_2) & TAS2552_PLL_ENABLE;
+        snd_soc_update_bits(codec, TAS2552_CFG_2, TAS2552_PLL_ENABLE, 0);
+
+        if (pll_clkin == pll_clk)
+                bypass_pll = true;
+
+        if (bypass_pll) {
+                /* By pass the PLL configuration */
+                snd_soc_update_bits(codec, TAS2552_PLL_CTRL_2,
+                                    TAS2552_PLL_BYPASS, TAS2552_PLL_BYPASS);
+        } else {
+                /* Fill in the PLL control registers for J & D
+                 * pll_clk = (.5 * pll_clkin * J.D) / 2^p
+                 * Need to fill in J and D here based on incoming freq
+                 */
+                unsigned int d;
+                u8 j;
+                u8 pll_sel = (tas2552->pll_clk_id << 3) & TAS2552_PLL_SRC_MASK;
+                u8 p = snd_soc_read(codec, TAS2552_PLL_CTRL_1);
+
+                p = (p >> 7);
+
+recalc:
+                j = (pll_clk * 2 * (1 << p)) / pll_clkin;
+                d = (pll_clk * 2 * (1 << p)) % pll_clkin;
+                d /= (pll_clkin / 10000);
+
+                if (d && (pll_clkin < 512000 || pll_clkin > 9200000)) {
+                        if (tas2552->pll_clk_id == TAS2552_PLL_CLKIN_BCLK) {
+                                pll_clkin = 1800000;
+                                pll_sel = (TAS2552_PLL_CLKIN_1_8_FIXED << 3) &
+                                                        TAS2552_PLL_SRC_MASK;
+                        } else {
+                                pll_clkin = snd_soc_params_to_bclk(params);
+                                pll_clkin += tas2552->tdm_delay;
+                                pll_sel = (TAS2552_PLL_CLKIN_BCLK << 3) &
+                                                        TAS2552_PLL_SRC_MASK;
+                        }
+                        goto recalc;
+                }
+
+                snd_soc_update_bits(codec, TAS2552_CFG_1, TAS2552_PLL_SRC_MASK,
+                                    pll_sel);
+
+                snd_soc_update_bits(codec, TAS2552_PLL_CTRL_1,
+                                    TAS2552_PLL_J_MASK, j);
+                /* Will clear the PLL_BYPASS bit */
+                snd_soc_write(codec, TAS2552_PLL_CTRL_2,
+                              TAS2552_PLL_D_UPPER(d));
+                snd_soc_write(codec, TAS2552_PLL_CTRL_3,
+                              TAS2552_PLL_D_LOWER(d));
+        }
+
+        /* Restore PLL status */
+        snd_soc_update_bits(codec, TAS2552_CFG_2, TAS2552_PLL_ENABLE,
+                            pll_enable);
+
+        return 0;
+}
+
 static int tas2552_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *params,
                              struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct tas2552_data *tas2552 = dev_get_drvdata(codec->dev);
-        int sample_rate, pll_clk;
-        int d;
         int cpf;
-        u8 p, j;
         u8 ser_ctrl1_reg, wclk_rate;
 
         switch (params_width(params)) {
@@ -245,49 +321,7 @@ static int tas2552_hw_params(struct snd_pcm_substream *substream,
         snd_soc_update_bits(codec, TAS2552_CFG_3, TAS2552_WCLK_FREQ_MASK,
                             wclk_rate);
 
-        if (!tas2552->pll_clkin)
-                return -EINVAL;
-
-        snd_soc_update_bits(codec, TAS2552_CFG_2, TAS2552_PLL_ENABLE, 0);
-
-        if (tas2552->pll_clkin == TAS2552_245MHZ_CLK ||
-            tas2552->pll_clkin == TAS2552_225MHZ_CLK) {
-                /* By pass the PLL configuration */
-                snd_soc_update_bits(codec, TAS2552_PLL_CTRL_2,
-                                    TAS2552_PLL_BYPASS_MASK,
-                                    TAS2552_PLL_BYPASS);
-        } else {
-                /* Fill in the PLL control registers for J & D
-                 * PLL_CLK = (.5 * freq * J.D) / 2^p
-                 * Need to fill in J and D here based on incoming freq
-                 */
-                p = snd_soc_read(codec, TAS2552_PLL_CTRL_1);
-                p = (p >> 7);
-                sample_rate = params_rate(params);
-
-                if (sample_rate == 48000)
-                        pll_clk = TAS2552_245MHZ_CLK;
-                else if (sample_rate == 44100)
-                        pll_clk = TAS2552_225MHZ_CLK;
-                else {
-                        dev_vdbg(codec->dev, "Substream sample rate is not found %i\n",
-                                        params_rate(params));
-                        return -EINVAL;
-                }
-
-                j = (pll_clk * 2 * (1 << p)) / tas2552->pll_clkin;
-                d = (pll_clk * 2 * (1 << p)) % tas2552->pll_clkin;
-
-                snd_soc_update_bits(codec, TAS2552_PLL_CTRL_1,
-                                TAS2552_PLL_J_MASK, j);
-                snd_soc_write(codec, TAS2552_PLL_CTRL_2,
-                                        (d >> 7) & TAS2552_PLL_D_UPPER_MASK);
-                snd_soc_write(codec, TAS2552_PLL_CTRL_3,
-                                d & TAS2552_PLL_D_LOWER_MASK);
-
-        }
-
-        return 0;
+        return tas2552_setup_pll(codec, params);
 }
 
 #define TAS2552_DAI_FMT_MASK    (TAS2552_BCLKDIR | \
@@ -370,12 +404,21 @@ static int tas2552_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 
         switch (clk_id) {
         case TAS2552_PLL_CLKIN_MCLK:
-        case TAS2552_PLL_CLKIN_BCLK:
         case TAS2552_PLL_CLKIN_IVCLKIN:
+                if (freq < 512000 || freq > 24576000) {
+                        /* out of range PLL_CLKIN, fall back to use BCLK */
+                        dev_warn(codec->dev, "Out of range PLL_CLKIN: %u\n",
+                                 freq);
+                        clk_id = TAS2552_PLL_CLKIN_BCLK;
+                        freq = 0;
+                }
+                /* fall through */
+        case TAS2552_PLL_CLKIN_BCLK:
         case TAS2552_PLL_CLKIN_1_8_FIXED:
                 mask = TAS2552_PLL_SRC_MASK;
                 val = (clk_id << 3) & mask; /* bit 4:5 in the register */
                 reg = TAS2552_CFG_1;
+                tas2552->pll_clk_id = clk_id;
                 tas2552->pll_clkin = freq;
                 break;
         case TAS2552_PDM_CLK_PLL:
@@ -385,6 +428,7 @@ static int tas2552_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
                 mask = TAS2552_PDM_CLK_SEL_MASK;
                 val = (clk_id >> 1) & mask; /* bit 0:1 in the register */
                 reg = TAS2552_PDM_CFG;
+                tas2552->pdm_clk_id = clk_id;
                 tas2552->pdm_clk = freq;
                 break;
         default:
@@ -509,9 +553,20 @@ static struct snd_soc_dai_driver tas2552_dai[] = {
  */
 static DECLARE_TLV_DB_SCALE(dac_tlv, -7, 100, 0);
 
+static const char * const tas2552_din_source_select[] = {
+        "Muted",
+        "Left",
+        "Right",
+        "Left + Right average",
+};
+static SOC_ENUM_SINGLE_DECL(tas2552_din_source_enum,
+                            TAS2552_CFG_3, 3,
+                            tas2552_din_source_select);
+
 static const struct snd_kcontrol_new tas2552_snd_controls[] = {
         SOC_SINGLE_TLV("Speaker Driver Playback Volume",
                          TAS2552_PGA_GAIN, 0, 0x1f, 0, dac_tlv),
+        SOC_ENUM("DIN source", tas2552_din_source_enum),
 };
 
 static int tas2552_codec_probe(struct snd_soc_codec *codec)
@@ -543,13 +598,14 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, TAS2552_CFG_1, TAS2552_MUTE, TAS2552_MUTE);
         snd_soc_write(codec, TAS2552_CFG_3, TAS2552_I2S_OUT_SEL |
                                             TAS2552_DIN_SRC_SEL_AVG_L_R);
-        snd_soc_write(codec, TAS2552_DOUT, TAS2552_PDM_DATA_I);
-        snd_soc_write(codec, TAS2552_OUTPUT_DATA, TAS2552_PDM_DATA_V_I | 0x8);
-        snd_soc_write(codec, TAS2552_BOOST_PT_CTRL, TAS2552_APT_DELAY_200 |
-                                TAS2552_APT_THRESH_2_1_7);
+        snd_soc_write(codec, TAS2552_OUTPUT_DATA,
+                      TAS2552_PDM_DATA_SEL_V_I |
+                      TAS2552_R_DATA_OUT(TAS2552_DATA_OUT_V_DATA));
+        snd_soc_write(codec, TAS2552_BOOST_APT_CTRL, TAS2552_APT_DELAY_200 |
+                                                     TAS2552_APT_THRESH_20_17);
 
-        snd_soc_write(codec, TAS2552_CFG_2, TAS2552_BOOST_EN |
-                                  TAS2552_APT_EN | TAS2552_LIM_EN);
+        snd_soc_write(codec, TAS2552_CFG_2, TAS2552_BOOST_EN | TAS2552_APT_EN |
+                                            TAS2552_LIM_EN);
 
         return 0;
 
@@ -647,13 +703,10 @@ static int tas2552_probe(struct i2c_client *client,
         if (data == NULL)
                 return -ENOMEM;
 
-        data->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
-        if (IS_ERR(data->enable_gpio)) {
-                if (PTR_ERR(data->enable_gpio) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                data->enable_gpio = NULL;;
-        }
+        data->enable_gpio = devm_gpiod_get_optional(dev, "enable",
+                                                    GPIOD_OUT_LOW);
+        if (IS_ERR(data->enable_gpio))
+                return PTR_ERR(data->enable_gpio);
 
         data->tas2552_client = client;
         data->regmap = devm_regmap_init_i2c(client, &tas2552_regmap_config);
@@ -695,6 +748,7 @@ static int tas2552_probe(struct i2c_client *client,
 static int tas2552_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
+        pm_runtime_disable(&client->dev);
         return 0;
 }
 
diff --git a/sound/soc/codecs/tas2552.h b/sound/soc/codecs/tas2552.h
index bbb820495516..5746f8fd0afd 100644
--- a/sound/soc/codecs/tas2552.h
+++ b/sound/soc/codecs/tas2552.h
@@ -19,7 +19,7 @@
 #define __TAS2552_H__
 
 /* Register Address Map */
-#define TAS2552_DEVICE_STATUS   0x00
+#define TAS2552_DEVICE_STATUS           0x00
 #define TAS2552_CFG_1                   0x01
 #define TAS2552_CFG_2                   0x02
 #define TAS2552_CFG_3                   0x03
@@ -33,13 +33,13 @@
 #define TAS2552_BTIP                    0x0b
 #define TAS2552_BTS_CTRL                0x0c
 #define TAS2552_RESERVED_0D             0x0d
-#define TAS2552_LIMIT_RATE_HYS  0x0e
-#define TAS2552_LIMIT_RELEASE   0x0f
-#define TAS2552_LIMIT_INT_COUNT 0x10
+#define TAS2552_LIMIT_RATE_HYS          0x0e
+#define TAS2552_LIMIT_RELEASE           0x0f
+#define TAS2552_LIMIT_INT_COUNT         0x10
 #define TAS2552_PDM_CFG                 0x11
 #define TAS2552_PGA_GAIN                0x12
-#define TAS2552_EDGE_RATE_CTRL  0x13
-#define TAS2552_BOOST_PT_CTRL   0x14
+#define TAS2552_EDGE_RATE_CTRL          0x13
+#define TAS2552_BOOST_APT_CTRL          0x14
 #define TAS2552_VER_NUM                 0x16
 #define TAS2552_VBAT_DATA               0x19
 #define TAS2552_MAX_REG                 0x20
@@ -103,10 +103,21 @@
 #define TAS2552_WCLKDIR                 (1 << 7)
 
 /* OUTPUT_DATA register */
-#define TAS2552_PDM_DATA_I              0x00
-#define TAS2552_PDM_DATA_V              (1 << 6)
-#define TAS2552_PDM_DATA_I_V    (1 << 7)
-#define TAS2552_PDM_DATA_V_I    (0x11 << 6)
+#define TAS2552_DATA_OUT_I_DATA         (0x0)
+#define TAS2552_DATA_OUT_V_DATA         (0x1)
+#define TAS2552_DATA_OUT_VBAT_DATA      (0x2)
+#define TAS2552_DATA_OUT_VBOOST_DATA    (0x3)
+#define TAS2552_DATA_OUT_PGA_GAIN       (0x4)
+#define TAS2552_DATA_OUT_IV_DATA        (0x5)
+#define TAS2552_DATA_OUT_VBAT_VBOOST_GAIN       (0x6)
+#define TAS2552_DATA_OUT_DISABLED       (0x7)
+#define TAS2552_L_DATA_OUT(x)           ((x) << 0)
+#define TAS2552_R_DATA_OUT(x)           ((x) << 3)
+#define TAS2552_PDM_DATA_SEL_I          (0x0 << 6)
+#define TAS2552_PDM_DATA_SEL_V          (0x1 << 6)
+#define TAS2552_PDM_DATA_SEL_I_V        (0x2 << 6)
+#define TAS2552_PDM_DATA_SEL_V_I        (0x3 << 6)
+#define TAS2552_PDM_DATA_SEL_MASK       TAS2552_PDM_DATA_SEL_V_I
 
 /* PDM CFG Register */
 #define TAS2552_PDM_CLK_SEL_PLL         (0x0 << 0)
@@ -116,24 +127,20 @@
 #define TAS2552_PDM_CLK_SEL_MASK        TAS2552_PDM_CLK_SEL_MCLK
 #define TAS2552_PDM_DATA_ES             (1 << 2)
 
-/* Boost pass-through register */
-#define TAS2552_APT_DELAY_50    0x00
-#define TAS2552_APT_DELAY_75    (1 << 1)
-#define TAS2552_APT_DELAY_125   (1 << 2)
-#define TAS2552_APT_DELAY_200   (1 << 3)
-
-#define TAS2552_APT_THRESH_2_5          0x00
-#define TAS2552_APT_THRESH_1_7          (1 << 3)
-#define TAS2552_APT_THRESH_1_4_1_1      (1 << 4)
-#define TAS2552_APT_THRESH_2_1_7        (0x11 << 2)
+/* Boost Auto-pass through register */
+#define TAS2552_APT_DELAY_50            (0x0 << 0)
+#define TAS2552_APT_DELAY_75            (0x1 << 0)
+#define TAS2552_APT_DELAY_125           (0x2 << 0)
+#define TAS2552_APT_DELAY_200           (0x3 << 0)
+#define TAS2552_APT_THRESH_05_02        (0x0 << 2)
+#define TAS2552_APT_THRESH_10_07        (0x1 << 2)
+#define TAS2552_APT_THRESH_14_11        (0x2 << 2)
+#define TAS2552_APT_THRESH_20_17        (0x3 << 2)
 
 /* PLL Control Register */
-#define TAS2552_245MHZ_CLK                      24576000
-#define TAS2552_225MHZ_CLK                      22579200
-#define TAS2552_PLL_J_MASK                      0x7f
-#define TAS2552_PLL_D_UPPER_MASK        0x3f
-#define TAS2552_PLL_D_LOWER_MASK        0xff
-#define TAS2552_PLL_BYPASS_MASK         0x80
-#define TAS2552_PLL_BYPASS                      0x80
+#define TAS2552_PLL_J_MASK              0x7f
+#define TAS2552_PLL_D_UPPER(x)          (((x) >> 8) & 0x3f)
+#define TAS2552_PLL_D_LOWER(x)          ((x) & 0xff)
+#define TAS2552_PLL_BYPASS              (1 << 7)
 
 #endif
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index d8959e31853d..c5ec519d34be 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1876,8 +1876,8 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 2);
-        if (ret != 0)
+        ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);
+        if (ret)
                 return ret;
 
         arizona_init_spk(codec);
@@ -1894,6 +1894,8 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
 
+        wm_adsp2_codec_remove(&priv->core.adsp[0], codec);
+
         priv->core.arizona->dapm = NULL;
 
         return 0;
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 14a7739d6c09..5f032a37b61f 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1600,7 +1600,7 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
         struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
-        int ret;
+        int i, ret;
 
         priv->core.arizona->dapm = dapm;
 
@@ -1608,9 +1608,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
         arizona_init_gpio(codec);
         arizona_init_mono(codec);
 
-        ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 8);
-        if (ret != 0)
-                return ret;
+        for (i = 0; i < WM5110_NUM_ADSP; ++i) {
+                ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec);
+                if (ret)
+                        return ret;
+        }
 
         snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 
@@ -1620,6 +1622,10 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
 static int wm5110_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
+        int i;
+
+        for (i = 0; i < WM5110_NUM_ADSP; ++i)
+                wm_adsp2_codec_remove(&priv->core.adsp[i], codec);
 
         priv->core.arizona->dapm = NULL;
 
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 8c5b9df3e542..43ea8ae5f871 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -113,6 +113,15 @@ static struct {
         { 7, 1152 },
 };
 
+static struct {
+        int value;
+        int ratio;
+} bclk_ratios[WM8523_NUM_RATES] = {
+        { 2, 32 },
+        { 3, 64 },
+        { 4, 128 },
+};
+
 static int wm8523_startup(struct snd_pcm_substream *substream,
                           struct snd_soc_dai *dai)
 {
@@ -162,6 +171,23 @@ static int wm8523_hw_params(struct snd_pcm_substream *substream,
         aifctrl2 &= ~WM8523_SR_MASK;
         aifctrl2 |= lrclk_ratios[i].value;
 
+        if (aifctrl1 & WM8523_AIF_MSTR) {
+                /* Find a fs->bclk ratio */
+                for (i = 0; i < ARRAY_SIZE(bclk_ratios); i++)
+                        if (params_width(params) * 2 <= bclk_ratios[i].ratio)
+                                break;
+
+                if (i == ARRAY_SIZE(bclk_ratios)) {
+                        dev_err(codec->dev,
+                                "No matching BCLK/fs ratio for word length %d\n",
+                                params_width(params));
+                        return -EINVAL;
+                }
+
+                aifctrl2 &= ~WM8523_BCLKDIV_MASK;
+                aifctrl2 |= bclk_ratios[i].value << WM8523_BCLKDIV_SHIFT;
+        }
+
         aifctrl1 &= ~WM8523_WL_MASK;
         switch (params_width(params)) {
         case 16:
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 09ff01f2fc1e..b34623786e35 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -125,18 +125,6 @@ static const struct snd_soc_dapm_route wm8741_dapm_routes[] = {
         { "VOUTRN", NULL, "DACR" },
 };
 
-static struct {
-        int value;
-        int ratio;
-} lrclk_ratios[WM8741_NUM_RATES] = {
-        { 1, 128 },
-        { 2, 192 },
-        { 3, 256 },
-        { 4, 384 },
-        { 5, 512 },
-        { 6, 768 },
-};
-
 static const unsigned int rates_11289[] = {
         44100, 88200,
 };
@@ -209,25 +197,16 @@ static const struct snd_pcm_hw_constraint_list constraints_36864 = {
         .list   = rates_36864,
 };
 
-
 static int wm8741_startup(struct snd_pcm_substream *substream,
                           struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);
 
-        /* The set of sample rates that can be supported depends on the
-         * MCLK supplied to the CODEC - enforce this.
-         */
-        if (!wm8741->sysclk) {
-                dev_err(codec->dev,
-                        "No MCLK configured, call set_sysclk() on init\n");
-                return -EINVAL;
-        }
-
-        snd_pcm_hw_constraint_list(substream->runtime, 0,
-                                   SNDRV_PCM_HW_PARAM_RATE,
-                                   wm8741->sysclk_constraints);
+        if (wm8741->sysclk)
+                snd_pcm_hw_constraint_list(substream->runtime, 0,
+                                SNDRV_PCM_HW_PARAM_RATE,
+                                wm8741->sysclk_constraints);
 
         return 0;
 }
@@ -241,17 +220,24 @@ static int wm8741_hw_params(struct snd_pcm_substream *substream,
         u16 iface = snd_soc_read(codec, WM8741_FORMAT_CONTROL) & 0x1FC;
         int i;
 
-        /* Find a supported LRCLK ratio */
-        for (i = 0; i < ARRAY_SIZE(lrclk_ratios); i++) {
-                if (wm8741->sysclk / params_rate(params) ==
-                    lrclk_ratios[i].ratio)
+        /* The set of sample rates that can be supported depends on the
+         * MCLK supplied to the CODEC - enforce this.
+         */
+        if (!wm8741->sysclk) {
+                dev_err(codec->dev,
+                        "No MCLK configured, call set_sysclk() on init or in hw_params\n");
+                return -EINVAL;
+        }
+
+        /* Find a supported LRCLK rate */
+        for (i = 0; i < wm8741->sysclk_constraints->count; i++) {
+                if (wm8741->sysclk_constraints->list[i] == params_rate(params))
                         break;
         }
 
-        /* Should never happen, should be handled by constraints */
-        if (i == ARRAY_SIZE(lrclk_ratios)) {
-                dev_err(codec->dev, "MCLK/fs ratio %d unsupported\n",
-                        wm8741->sysclk / params_rate(params));
+        if (i == wm8741->sysclk_constraints->count) {
+                dev_err(codec->dev, "LRCLK %d unsupported with MCLK %d\n",
+                        params_rate(params), wm8741->sysclk);
                 return -EINVAL;
         }
 
@@ -274,8 +260,8 @@ static int wm8741_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        dev_dbg(codec->dev, "wm8741_hw_params:    bit size param = %d",
-                params_width(params));
+        dev_dbg(codec->dev, "wm8741_hw_params:    bit size param = %d, rate param = %d",
+                params_width(params), params_rate(params));
 
         snd_soc_write(codec, WM8741_FORMAT_CONTROL, iface);
         return 0;
@@ -290,6 +276,11 @@ static int wm8741_set_dai_sysclk(struct snd_soc_dai *codec_dai,
         dev_dbg(codec->dev, "wm8741_set_dai_sysclk info: freq=%dHz\n", freq);
 
         switch (freq) {
+        case 0:
+                wm8741->sysclk_constraints = NULL;
+                wm8741->sysclk = freq;
+                return 0;
+
         case 11289600:
                 wm8741->sysclk_constraints = &constraints_11289;
                 wm8741->sysclk = freq;
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 761418f05d59..94c5c4681ce5 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -247,7 +247,7 @@ SOC_SINGLE("PCM Playback -6dB Switch", WM8960_DACCTL1, 7, 1, 0),
 SOC_ENUM("ADC Polarity", wm8960_enum[0]),
 SOC_SINGLE("ADC High Pass Filter Switch", WM8960_DACCTL1, 0, 1, 0),
 
-SOC_ENUM("DAC Polarity", wm8960_enum[2]),
+SOC_ENUM("DAC Polarity", wm8960_enum[1]),
 SOC_SINGLE_BOOL_EXT("DAC Deemphasis Switch", 0,
                     wm8960_get_deemph, wm8960_put_deemph),
 
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 687c4dd7ec99..505b65f5734f 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1930,7 +1930,7 @@ static int wm8995_set_dai_sysclk(struct snd_soc_dai *dai,
                         dai->id + 1, freq);
                 break;
         case WM8995_SYSCLK_MCLK2:
-                wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK1;
+                wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK2;
                 wm8995->mclk[1] = freq;
                 dev_dbg(dai->dev, "AIF%d using MCLK2 at %uHz\n",
                         dai->id + 1, freq);
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index b62ffd0c133e..f9f90b0f5db4 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
+#include <linux/debugfs.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -248,6 +249,175 @@ struct wm_coeff_ctl {
         unsigned int flags;
 };
 
+#ifdef CONFIG_DEBUG_FS
+static void wm_adsp_debugfs_save_wmfwname(struct wm_adsp *dsp, const char *s)
+{
+        char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
+
+        mutex_lock(&dsp->debugfs_lock);
+        kfree(dsp->wmfw_file_name);
+        dsp->wmfw_file_name = tmp;
+        mutex_unlock(&dsp->debugfs_lock);
+}
+
+static void wm_adsp_debugfs_save_binname(struct wm_adsp *dsp, const char *s)
+{
+        char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
+
+        mutex_lock(&dsp->debugfs_lock);
+        kfree(dsp->bin_file_name);
+        dsp->bin_file_name = tmp;
+        mutex_unlock(&dsp->debugfs_lock);
+}
+
+static void wm_adsp_debugfs_clear(struct wm_adsp *dsp)
+{
+        mutex_lock(&dsp->debugfs_lock);
+        kfree(dsp->wmfw_file_name);
+        kfree(dsp->bin_file_name);
+        dsp->wmfw_file_name = NULL;
+        dsp->bin_file_name = NULL;
+        mutex_unlock(&dsp->debugfs_lock);
+}
+
+static ssize_t wm_adsp_debugfs_wmfw_read(struct file *file,
+                                         char __user *user_buf,
+                                         size_t count, loff_t *ppos)
+{
+        struct wm_adsp *dsp = file->private_data;
+        ssize_t ret;
+
+        mutex_lock(&dsp->debugfs_lock);
+
+        if (!dsp->wmfw_file_name || !dsp->running)
+                ret = 0;
+        else
+                ret = simple_read_from_buffer(user_buf, count, ppos,
+                                              dsp->wmfw_file_name,
+                                              strlen(dsp->wmfw_file_name));
+
+        mutex_unlock(&dsp->debugfs_lock);
+        return ret;
+}
+
+static ssize_t wm_adsp_debugfs_bin_read(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct wm_adsp *dsp = file->private_data;
+        ssize_t ret;
+
+        mutex_lock(&dsp->debugfs_lock);
+
+        if (!dsp->bin_file_name || !dsp->running)
+                ret = 0;
+        else
+                ret = simple_read_from_buffer(user_buf, count, ppos,
+                                              dsp->bin_file_name,
+                                              strlen(dsp->bin_file_name));
+
+        mutex_unlock(&dsp->debugfs_lock);
+        return ret;
+}
+
+static const struct {
+        const char *name;
+        const struct file_operations fops;
+} wm_adsp_debugfs_fops[] = {
+        {
+                .name = "wmfw_file_name",
+                .fops = {
+                        .open = simple_open,
+                        .read = wm_adsp_debugfs_wmfw_read,
+                },
+        },
+        {
+                .name = "bin_file_name",
+                .fops = {
+                        .open = simple_open,
+                        .read = wm_adsp_debugfs_bin_read,
+                },
+        },
+};
+
+static void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
+                                  struct snd_soc_codec *codec)
+{
+        struct dentry *root = NULL;
+        char *root_name;
+        int i;
+
+        if (!codec->component.debugfs_root) {
+                adsp_err(dsp, "No codec debugfs root\n");
+                goto err;
+        }
+
+        root_name = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!root_name)
+                goto err;
+
+        snprintf(root_name, PAGE_SIZE, "dsp%d", dsp->num);
+        root = debugfs_create_dir(root_name, codec->component.debugfs_root);
+        kfree(root_name);
+
+        if (!root)
+                goto err;
+
+        if (!debugfs_create_bool("running", S_IRUGO, root, &dsp->running))
+                goto err;
+
+        if (!debugfs_create_x32("fw_id", S_IRUGO, root, &dsp->fw_id))
+                goto err;
+
+        if (!debugfs_create_x32("fw_version", S_IRUGO, root,
+                                &dsp->fw_id_version))
+                goto err;
+
+        for (i = 0; i < ARRAY_SIZE(wm_adsp_debugfs_fops); ++i) {
+                if (!debugfs_create_file(wm_adsp_debugfs_fops[i].name,
+                                         S_IRUGO, root, dsp,
+                                         &wm_adsp_debugfs_fops[i].fops))
+                        goto err;
+        }
+
+        dsp->debugfs_root = root;
+        return;
+
+err:
+        debugfs_remove_recursive(root);
+        adsp_err(dsp, "Failed to create debugfs\n");
+}
+
+static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)
+{
+        wm_adsp_debugfs_clear(dsp);
+        debugfs_remove_recursive(dsp->debugfs_root);
+}
+#else
+static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp,
+                                         struct snd_soc_codec *codec)
+{
+}
+
+static inline void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp)
+{
+}
+
+static inline void wm_adsp_debugfs_save_wmfwname(struct wm_adsp *dsp,
+                                                 const char *s)
+{
+}
+
+static inline void wm_adsp_debugfs_save_binname(struct wm_adsp *dsp,
+                                                const char *s)
+{
+}
+
+static inline void wm_adsp_debugfs_clear(struct wm_adsp *dsp)
+{
+}
+#endif
+
 static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
@@ -298,7 +468,6 @@ const struct snd_kcontrol_new wm_adsp1_fw_controls[] = {
 };
 EXPORT_SYMBOL_GPL(wm_adsp1_fw_controls);
 
-#if IS_ENABLED(CONFIG_SND_SOC_ARIZONA)
 static const struct soc_enum wm_adsp2_rate_enum[] = {
         SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP1_CONTROL_1,
                               ARIZONA_DSP1_RATE_SHIFT, 0xf,
@@ -318,22 +487,28 @@ static const struct soc_enum wm_adsp2_rate_enum[] = {
                               arizona_rate_text, arizona_rate_val),
 };
 
-const struct snd_kcontrol_new wm_adsp2_fw_controls[] = {
-        SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
-                     wm_adsp_fw_get, wm_adsp_fw_put),
-        SOC_ENUM("DSP1 Rate", wm_adsp2_rate_enum[0]),
-        SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
-                     wm_adsp_fw_get, wm_adsp_fw_put),
-        SOC_ENUM("DSP2 Rate", wm_adsp2_rate_enum[1]),
-        SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
-                     wm_adsp_fw_get, wm_adsp_fw_put),
-        SOC_ENUM("DSP3 Rate", wm_adsp2_rate_enum[2]),
-        SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],
-                     wm_adsp_fw_get, wm_adsp_fw_put),
-        SOC_ENUM("DSP4 Rate", wm_adsp2_rate_enum[3]),
+static const struct snd_kcontrol_new wm_adsp2_fw_controls[4][2] = {
+        {
+                SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
+                             wm_adsp_fw_get, wm_adsp_fw_put),
+                SOC_ENUM("DSP1 Rate", wm_adsp2_rate_enum[0]),
+        },
+        {
+                SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
+                             wm_adsp_fw_get, wm_adsp_fw_put),
+                SOC_ENUM("DSP2 Rate", wm_adsp2_rate_enum[1]),
+        },
+        {
+                SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
+                             wm_adsp_fw_get, wm_adsp_fw_put),
+                SOC_ENUM("DSP3 Rate", wm_adsp2_rate_enum[2]),
+        },
+        {
+                SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],
+                             wm_adsp_fw_get, wm_adsp_fw_put),
+                SOC_ENUM("DSP4 Rate", wm_adsp2_rate_enum[3]),
+        },
 };
-EXPORT_SYMBOL_GPL(wm_adsp2_fw_controls);
-#endif
 
 static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
                                                         int type)
@@ -1128,6 +1303,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                 adsp_warn(dsp, "%s.%d: %zu bytes at end of file\n",
                           file, regions, pos - firmware->size);
 
+        wm_adsp_debugfs_save_wmfwname(dsp, file);
+
 out_fw:
         regmap_async_complete(regmap);
         wm_adsp_buf_free(&buf_list);
@@ -1345,11 +1522,12 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
 
         n_algs = be32_to_cpu(adsp2_id.n_algs);
         dsp->fw_id = be32_to_cpu(adsp2_id.fw.id);
+        dsp->fw_id_version = be32_to_cpu(adsp2_id.fw.ver);
         adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
                   dsp->fw_id,
-                  (be32_to_cpu(adsp2_id.fw.ver) & 0xff0000) >> 16,
-                  (be32_to_cpu(adsp2_id.fw.ver) & 0xff00) >> 8,
-                  be32_to_cpu(adsp2_id.fw.ver) & 0xff,
+                  (dsp->fw_id_version & 0xff0000) >> 16,
+                  (dsp->fw_id_version & 0xff00) >> 8,
+                  dsp->fw_id_version & 0xff,
                   n_algs);
 
         alg_region = wm_adsp_create_region(dsp, WMFW_ADSP2_XM,
@@ -1625,6 +1803,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                 adsp_warn(dsp, "%s.%d: %zu bytes at end of file\n",
                           file, blocks, pos - firmware->size);
 
+        wm_adsp_debugfs_save_binname(dsp, file);
+
 out_fw:
         regmap_async_complete(regmap);
         release_firmware(firmware);
@@ -1638,6 +1818,9 @@ int wm_adsp1_init(struct wm_adsp *dsp)
 {
         INIT_LIST_HEAD(&dsp->alg_regions);
 
+#ifdef CONFIG_DEBUG_FS
+        mutex_init(&dsp->debugfs_lock);
+#endif
         return 0;
 }
 EXPORT_SYMBOL_GPL(wm_adsp1_init);
@@ -1896,6 +2079,10 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                 /* Log firmware state, it can be useful for analysis */
                 wm_adsp2_show_fw_status(dsp);
 
+                wm_adsp_debugfs_clear(dsp);
+
+                dsp->fw_id = 0;
+                dsp->fw_id_version = 0;
                 dsp->running = false;
 
                 regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
@@ -1933,6 +2120,24 @@ err:
 }
 EXPORT_SYMBOL_GPL(wm_adsp2_event);
 
+int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec)
+{
+        wm_adsp2_init_debugfs(dsp, codec);
+
+        return snd_soc_add_codec_controls(codec,
+                                          wm_adsp2_fw_controls[dsp->num - 1],
+                                          ARRAY_SIZE(wm_adsp2_fw_controls[0]));
+}
+EXPORT_SYMBOL_GPL(wm_adsp2_codec_probe);
+
+int wm_adsp2_codec_remove(struct wm_adsp *dsp, struct snd_soc_codec *codec)
+{
+        wm_adsp2_cleanup_debugfs(dsp);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm_adsp2_codec_remove);
+
 int wm_adsp2_init(struct wm_adsp *dsp)
 {
         int ret;
@@ -1952,6 +2157,9 @@ int wm_adsp2_init(struct wm_adsp *dsp)
         INIT_LIST_HEAD(&dsp->ctl_list);
         INIT_WORK(&dsp->boot_work, wm_adsp2_boot_work);
 
+#ifdef CONFIG_DEBUG_FS
+        mutex_init(&dsp->debugfs_lock);
+#endif
         return 0;
 }
 EXPORT_SYMBOL_GPL(wm_adsp2_init);
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 0e5f07c35d50..5042cbd39e54 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -46,17 +46,26 @@ struct wm_adsp {
         struct list_head alg_regions;
 
         int fw_id;
+        int fw_id_version;
 
         const struct wm_adsp_region *mem;
         int num_mems;
 
         int fw;
         int fw_ver;
-        bool running;
+        u32 running;
 
         struct list_head ctl_list;
 
         struct work_struct boot_work;
+
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_root;
+        struct mutex debugfs_lock;
+        char *wmfw_file_name;
+        char *bin_file_name;
+#endif
+
 };
 
 #define WM_ADSP1(wname, num) \
@@ -75,10 +84,11 @@ struct wm_adsp {
         WM_ADSP2_E(wname, num, wm_adsp2_early_event)
 
 extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
-extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];
 
 int wm_adsp1_init(struct wm_adsp *dsp);
 int wm_adsp2_init(struct wm_adsp *dsp);
+int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec);
+int wm_adsp2_codec_remove(struct wm_adsp *dsp, struct snd_soc_codec *codec);
 int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event);
 int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index d79349434a9a..b960e626dad9 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -686,6 +686,8 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream,
                 if (mcasp->serial_dir[i] == TX_MODE &&
                                         tx_ser < max_active_serializers) {
                         mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AXR(i));
+                        mcasp_mod_bits(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i),
+                                       DISMOD_LOW, DISMOD_MASK);
                         tx_ser++;
                 } else if (mcasp->serial_dir[i] == RX_MODE &&
                                         rx_ser < max_active_serializers) {
@@ -1565,6 +1567,49 @@ static int davinci_mcasp_init_ch_constraints(struct davinci_mcasp *mcasp)
         return ret;
 }
 
+enum {
+        PCM_EDMA,
+        PCM_SDMA,
+};
+static const char *sdma_prefix = "ti,omap";
+
+static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
+{
+        struct dma_chan *chan;
+        const char *tmp;
+        int ret = PCM_EDMA;
+
+        if (!mcasp->dev->of_node)
+                return PCM_EDMA;
+
+        tmp = mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].filter_data;
+        chan = dma_request_slave_channel_reason(mcasp->dev, tmp);
+        if (IS_ERR(chan)) {
+                if (PTR_ERR(chan) != -EPROBE_DEFER)
+                        dev_err(mcasp->dev,
+                                "Can't verify DMA configuration (%ld)\n",
+                                PTR_ERR(chan));
+                return PTR_ERR(chan);
+        }
+        BUG_ON(!chan->device || !chan->device->dev);
+
+        if (chan->device->dev->of_node)
+                ret = of_property_read_string(chan->device->dev->of_node,
+                                              "compatible", &tmp);
+        else
+                dev_dbg(mcasp->dev, "DMA controller has no of-node\n");
+
+        dma_release_channel(chan);
+        if (ret)
+                return ret;
+
+        dev_dbg(mcasp->dev, "DMA controller compatible = \"%s\"\n", tmp);
+        if (!strncmp(tmp, sdma_prefix, strlen(sdma_prefix)))
+                return PCM_SDMA;
+
+        return PCM_EDMA;
+}
+
 static int davinci_mcasp_probe(struct platform_device *pdev)
 {
         struct snd_dmaengine_dai_dma_data *dma_data;
@@ -1763,27 +1808,34 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         if (ret != 0)
                 goto err;
 
-        switch (mcasp->version) {
+        ret = davinci_mcasp_get_dma_type(mcasp);
+        switch (ret) {
+        case PCM_EDMA:
 #if IS_BUILTIN(CONFIG_SND_EDMA_SOC) || \
         (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \
          IS_MODULE(CONFIG_SND_EDMA_SOC))
-        case MCASP_VERSION_1:
-        case MCASP_VERSION_2:
-        case MCASP_VERSION_3:
                 ret = edma_pcm_platform_register(&pdev->dev);
-                break;
+#else
+                dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n");
+                ret = -EINVAL;
+                goto err;
 #endif
+                break;
+        case PCM_SDMA:
 #if IS_BUILTIN(CONFIG_SND_OMAP_SOC) || \
         (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \
          IS_MODULE(CONFIG_SND_OMAP_SOC))
-        case MCASP_VERSION_4:
                 ret = omap_pcm_platform_register(&pdev->dev);
-                break;
+#else
+                dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n");
+                ret = -EINVAL;
+                goto err;
 #endif
+                break;
         default:
-                dev_err(&pdev->dev, "Invalid McASP version: %d\n",
-                        mcasp->version);
-                ret = -EINVAL;
+                dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);
+        case -EPROBE_DEFER:
+                goto err;
                 break;
         }
 
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 79dc511180bf..a3be108a8c17 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -215,7 +215,10 @@
  * DAVINCI_MCASP_XRSRCTL_BASE_REG -  Serializer Control Register Bits
  */
 #define MODE(val)       (val)
-#define DISMOD          (val)(val<<2)
+#define DISMOD_3STATE   (0x0)
+#define DISMOD_LOW      (0x2 << 2)
+#define DISMOD_HIGH     (0x3 << 2)
+#define DISMOD_MASK     DISMOD_HIGH
 #define TXSTATE         BIT(4)
 #define RXSTATE         BIT(5)
 #define SRMOD_MASK      3
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index cd146d4fa805..b38b98cae855 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -190,7 +190,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "audmux internal port setup failed\n");
                 return ret;
         }
-        imx_audmux_v2_configure_port(ext_port,
+        ret = imx_audmux_v2_configure_port(ext_port,
                         IMX_AUDMUX_V2_PTCR_SYN,
                         IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
         if (ret) {
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c87e58504a62..d5554939146e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -26,6 +26,7 @@ struct simple_card_data {
         struct simple_dai_props {
                 struct asoc_simple_dai cpu_dai;
                 struct asoc_simple_dai codec_dai;
+                unsigned int mclk_fs;
         } *dai_props;
         unsigned int mclk_fs;
         int gpio_hp_det;
@@ -76,11 +77,18 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
-        unsigned int mclk;
+        struct simple_dai_props *dai_props =
+                &priv->dai_props[rtd - rtd->card->rtd];
+        unsigned int mclk, mclk_fs = 0;
         int ret = 0;
 
-        if (priv->mclk_fs) {
-                mclk = params_rate(params) * priv->mclk_fs;
+        if (priv->mclk_fs)
+                mclk_fs = priv->mclk_fs;
+        else if (dai_props->mclk_fs)
+                mclk_fs = dai_props->mclk_fs;
+
+        if (mclk_fs) {
+                mclk = params_rate(params) * mclk_fs;
                 ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
                                              SND_SOC_CLOCK_IN);
         }
@@ -313,6 +321,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
         char prop[128];
         char *prefix = "";
         int ret, cpu_args;
+        u32 val;
 
         /* For single DAI link & old style of DT node */
         if (is_top_level_node)
@@ -338,6 +347,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
         if (ret < 0)
                 goto dai_link_of_err;
 
+        if (!of_property_read_u32(node, "mclk-fs", &val))
+                dai_props->mclk_fs = val;
+
         ret = asoc_simple_card_sub_parse_of(cpu, &dai_props->cpu_dai,
                                             &dai_link->cpu_of_node,
                                             &dai_link->cpu_dai_name,
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 791953ffbc41..f3060a4ca040 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -112,7 +112,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
 
 config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
-        depends on X86_INTEL_LPSS
+        depends on X86_INTEL_LPSS && I2C
         select SND_SOC_RT5645
         select SND_SST_MFLD_PLATFORM
         select SND_SST_IPC_ACPI
@@ -123,7 +123,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
 
 config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
-        depends on X86_INTEL_LPSS
+        depends on X86_INTEL_LPSS && I2C
         select SND_SOC_MAX98090
         select SND_SOC_TS3A227E
         select SND_SST_MFLD_PLATFORM
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index 61e240935451..31e9b9ecbb8a 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -1401,36 +1401,32 @@ static int sst_fill_widget_module_info(struct snd_soc_dapm_widget *w,
         down_read(&card->controls_rwsem);
 
         list_for_each_entry(kctl, &card->controls, list) {
-                idx = strstr(kctl->id.name, " ");
+                idx = strchr(kctl->id.name, ' ');
                 if (idx == NULL)
                         continue;
-                index  = strlen(kctl->id.name) - strlen(idx);
+                index = idx - (char*)kctl->id.name;
+                if (strncmp(kctl->id.name, w->name, index))
+                        continue;
 
-                if (strstr(kctl->id.name, "Volume") &&
-                    !strncmp(kctl->id.name, w->name, index))
+                if (strstr(kctl->id.name, "Volume"))
                         ret = sst_fill_module_list(kctl, w, SST_MODULE_GAIN);
 
-                else if (strstr(kctl->id.name, "params") &&
-                         !strncmp(kctl->id.name, w->name, index))
+                else if (strstr(kctl->id.name, "params"))
                         ret = sst_fill_module_list(kctl, w, SST_MODULE_ALGO);
 
                 else if (strstr(kctl->id.name, "Switch") &&
-                         !strncmp(kctl->id.name, w->name, index) &&
                          strstr(kctl->id.name, "Gain")) {
                         struct sst_gain_mixer_control *mc =
                                                 (void *)kctl->private_value;
 
                         mc->w = w;
 
-                } else if (strstr(kctl->id.name, "interleaver") &&
-                         !strncmp(kctl->id.name, w->name, index)) {
+                } else if (strstr(kctl->id.name, "interleaver")) {
                         struct sst_enum *e = (void *)kctl->private_value;
 
                         e->w = w;
 
-                } else if (strstr(kctl->id.name, "deinterleaver") &&
-                         !strncmp(kctl->id.name, w->name, index)) {
-
+                } else if (strstr(kctl->id.name, "deinterleaver")) {
                         struct sst_enum *e = (void *)kctl->private_value;
 
                         e->w = w;
diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index 96c2e420cce6..a4b458e77089 100644
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -368,8 +368,8 @@ static inline void sst_restore_shim64(struct intel_sst_drv *ctx,
          * initialize by FW or driver when firmware is loaded
          */
         spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags);
-        sst_shim_write64(shim, SST_IMRX, shim_regs->imrx),
-        sst_shim_write64(shim, SST_CSR, shim_regs->csr),
+        sst_shim_write64(shim, SST_IMRX, shim_regs->imrx);
+        sst_shim_write64(shim, SST_CSR, shim_regs->csr);
         spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags);
 }
 
diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c
index 7b50a9d17ec1..620da1d1b9e3 100644
--- a/sound/soc/intel/atom/sst/sst_drv_interface.c
+++ b/sound/soc/intel/atom/sst/sst_drv_interface.c
@@ -533,7 +533,7 @@ static inline int sst_calc_tstamp(struct intel_sst_drv *ctx,
 
         info->buffer_ptr = pointer_samples / substream->runtime->channels;
 
-        info->pcm_delay = delay_frames / substream->runtime->channels;
+        info->pcm_delay = delay_frames;
         dev_dbg(ctx->dev, "buffer ptr %llu pcm_delay rep: %llu\n",
                         info->buffer_ptr, info->pcm_delay);
         return 0;
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index 1be079423d1e..d604ee80eda4 100644
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -101,6 +101,33 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
+static int cht_ti_jack_event(struct notifier_block *nb,
+                unsigned long event, void *data)
+{
+
+        struct snd_soc_jack *jack = (struct snd_soc_jack *)data;
+        struct snd_soc_dai *codec_dai = jack->card->rtd->codec_dai;
+        struct snd_soc_codec *codec = codec_dai->codec;
+
+        if (event & SND_JACK_MICROPHONE) {
+
+                snd_soc_dapm_force_enable_pin(&codec->dapm, "SHDN");
+                snd_soc_dapm_force_enable_pin(&codec->dapm, "MICBIAS");
+                snd_soc_dapm_sync(&codec->dapm);
+        } else {
+
+                snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS");
+                snd_soc_dapm_disable_pin(&codec->dapm, "SHDN");
+                snd_soc_dapm_sync(&codec->dapm);
+        }
+
+        return 0;
+}
+
+static struct notifier_block cht_jack_nb = {
+        .notifier_call = cht_ti_jack_event,
+};
+
 static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
 {
         int ret;
@@ -130,6 +157,9 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
                 return ret;
         }
 
+        if (ctx->ts3a227e_present)
+                snd_soc_jack_notifier_register(jack, &cht_jack_nb);
+
         return ret;
 }
 
diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c
index 42f293f9c6e2..67b6d3d52f57 100644
--- a/sound/soc/intel/common/sst-acpi.c
+++ b/sound/soc/intel/common/sst-acpi.c
@@ -263,7 +263,7 @@ static struct sst_acpi_desc sst_acpi_baytrail_desc = {
         .resindex_dma_base = -1,
 };
 
-static struct acpi_device_id sst_acpi_match[] = {
+static const struct acpi_device_id sst_acpi_match[] = {
         { "INT33C8", (unsigned long)&sst_acpi_haswell_desc },
         { "INT3438", (unsigned long)&sst_acpi_broadwell_desc },
         { "80860F28", (unsigned long)&sst_acpi_baytrail_desc },
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
new file mode 100644
index 000000000000..15c04e2eae34
--- /dev/null
+++ b/sound/soc/mediatek/Kconfig
@@ -0,0 +1,30 @@
+config SND_SOC_MEDIATEK
+        tristate "ASoC support for Mediatek chip"
+        depends on ARCH_MEDIATEK
+        help
+          This adds ASoC platform driver support for Mediatek chip
+          that can be used with other codecs.
+          Select Y if you have such device.
+          Ex: MT8173
+
+config SND_SOC_MT8173_MAX98090
+        tristate "ASoC Audio driver for MT8173 with MAX98090 codec"
+        depends on SND_SOC_MEDIATEK
+        select SND_SOC_MAX98090
+        help
+          This adds ASoC driver for Mediatek MT8173 boards
+          with the MAX98090 audio codec.
+          Select Y if you have such device.
+          If unsure select "N".
+
+config SND_SOC_MT8173_RT5650_RT5676
+        tristate "ASoC Audio driver for MT8173 with RT5650 RT5676 codecs"
+        depends on SND_SOC_MEDIATEK
+        select SND_SOC_RT5645
+        select SND_SOC_RT5677
+        help
+          This adds ASoC driver for Mediatek MT8173 boards
+          with the RT5650 and RT5676 codecs.
+          Select Y if you have such device.
+          If unsure select "N".
+
diff --git a/sound/soc/mediatek/Makefile b/sound/soc/mediatek/Makefile
new file mode 100644
index 000000000000..75effbec438d
--- /dev/null
+++ b/sound/soc/mediatek/Makefile
@@ -0,0 +1,5 @@
+# MTK Platform Support
+obj-$(CONFIG_SND_SOC_MEDIATEK) += mtk-afe-pcm.o
+# Machine support
+obj-$(CONFIG_SND_SOC_MT8173_MAX98090) += mt8173-max98090.o
+obj-$(CONFIG_SND_SOC_MT8173_RT5650_RT5676) += mt8173-rt5650-rt5676.o
diff --git a/sound/soc/mediatek/mt8173-max98090.c b/sound/soc/mediatek/mt8173-max98090.c
new file mode 100644
index 000000000000..4d44b5803e55
--- /dev/null
+++ b/sound/soc/mediatek/mt8173-max98090.c
@@ -0,0 +1,213 @@
+/*
+ * mt8173-max98090.c  --  MT8173 MAX98090 ALSA SoC machine driver
+ *
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Koro Chen <koro.chen@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 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 <sound/soc.h>
+#include <sound/jack.h>
+#include <linux/gpio.h>
+#include "../codecs/max98090.h"
+
+static struct snd_soc_jack mt8173_max98090_jack;
+
+static struct snd_soc_jack_pin mt8173_max98090_jack_pins[] = {
+        {
+                .pin    = "Headphone",
+                .mask   = SND_JACK_HEADPHONE,
+        },
+        {
+                .pin    = "Headset Mic",
+                .mask   = SND_JACK_MICROPHONE,
+        },
+};
+
+static const struct snd_soc_dapm_widget mt8173_max98090_widgets[] = {
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_MIC("Int Mic", NULL),
+        SND_SOC_DAPM_HP("Headphone", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static const struct snd_soc_dapm_route mt8173_max98090_routes[] = {
+        {"Speaker", NULL, "SPKL"},
+        {"Speaker", NULL, "SPKR"},
+        {"DMICL", NULL, "Int Mic"},
+        {"Headphone", NULL, "HPL"},
+        {"Headphone", NULL, "HPR"},
+        {"Headset Mic", NULL, "MICBIAS"},
+        {"IN34", NULL, "Headset Mic"},
+};
+
+static const struct snd_kcontrol_new mt8173_max98090_controls[] = {
+        SOC_DAPM_PIN_SWITCH("Speaker"),
+        SOC_DAPM_PIN_SWITCH("Int Mic"),
+        SOC_DAPM_PIN_SWITCH("Headphone"),
+        SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static int mt8173_max98090_hw_params(struct snd_pcm_substream *substream,
+                                     struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+
+        return snd_soc_dai_set_sysclk(codec_dai, 0, params_rate(params) * 256,
+                                      SND_SOC_CLOCK_IN);
+}
+
+static struct snd_soc_ops mt8173_max98090_ops = {
+        .hw_params = mt8173_max98090_hw_params,
+};
+
+static int mt8173_max98090_init(struct snd_soc_pcm_runtime *runtime)
+{
+        int ret;
+        struct snd_soc_card *card = runtime->card;
+        struct snd_soc_codec *codec = runtime->codec;
+
+        /* enable jack detection */
+        ret = snd_soc_card_jack_new(card, "Headphone", SND_JACK_HEADPHONE,
+                                    &mt8173_max98090_jack, NULL, 0);
+        if (ret) {
+                dev_err(card->dev, "Can't snd_soc_jack_new %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_jack_add_pins(&mt8173_max98090_jack,
+                                    ARRAY_SIZE(mt8173_max98090_jack_pins),
+                                    mt8173_max98090_jack_pins);
+        if (ret) {
+                dev_err(card->dev, "Can't snd_soc_jack_add_pins %d\n", ret);
+                return ret;
+        }
+
+        return max98090_mic_detect(codec, &mt8173_max98090_jack);
+}
+
+/* Digital audio interface glue - connects codec <---> CPU */
+static struct snd_soc_dai_link mt8173_max98090_dais[] = {
+        /* Front End DAI links */
+        {
+                .name = "MAX98090 Playback",
+                .stream_name = "MAX98090 Playback",
+                .cpu_dai_name = "DL1",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dynamic = 1,
+                .dpcm_playback = 1,
+        },
+        {
+                .name = "MAX98090 Capture",
+                .stream_name = "MAX98090 Capture",
+                .cpu_dai_name = "VUL",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dynamic = 1,
+                .dpcm_capture = 1,
+        },
+        /* Back End DAI links */
+        {
+                .name = "Codec",
+                .cpu_dai_name = "I2S",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .no_pcm = 1,
+                .codec_dai_name = "HiFi",
+                .init = mt8173_max98090_init,
+                .ops = &mt8173_max98090_ops,
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                           SND_SOC_DAIFMT_CBS_CFS,
+                .dpcm_playback = 1,
+                .dpcm_capture = 1,
+        },
+};
+
+static struct snd_soc_card mt8173_max98090_card = {
+        .name = "mt8173-max98090",
+        .dai_link = mt8173_max98090_dais,
+        .num_links = ARRAY_SIZE(mt8173_max98090_dais),
+        .controls = mt8173_max98090_controls,
+        .num_controls = ARRAY_SIZE(mt8173_max98090_controls),
+        .dapm_widgets = mt8173_max98090_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(mt8173_max98090_widgets),
+        .dapm_routes = mt8173_max98090_routes,
+        .num_dapm_routes = ARRAY_SIZE(mt8173_max98090_routes),
+};
+
+static int mt8173_max98090_dev_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &mt8173_max98090_card;
+        struct device_node *codec_node;
+        int ret, i;
+
+        codec_node = of_parse_phandle(pdev->dev.of_node,
+                                      "mediatek,audio-codec", 0);
+        if (!codec_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
+        for (i = 0; i < card->num_links; i++) {
+                if (mt8173_max98090_dais[i].codec_name)
+                        continue;
+                mt8173_max98090_dais[i].codec_of_node = codec_node;
+        }
+        card->dev = &pdev->dev;
+
+        ret = snd_soc_register_card(card);
+        if (ret)
+                dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
+                        __func__, ret);
+        return ret;
+}
+
+static int mt8173_max98090_dev_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+        return 0;
+}
+
+static const struct of_device_id mt8173_max98090_dt_match[] = {
+        { .compatible = "mediatek,mt8173-max98090", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, mt8173_max98090_dt_match);
+
+static struct platform_driver mt8173_max98090_driver = {
+        .driver = {
+                   .name = "mt8173-max98090",
+                   .owner = THIS_MODULE,
+                   .of_match_table = mt8173_max98090_dt_match,
+#ifdef CONFIG_PM
+                   .pm = &snd_soc_pm_ops,
+#endif
+        },
+        .probe = mt8173_max98090_dev_probe,
+        .remove = mt8173_max98090_dev_remove,
+};
+
+module_platform_driver(mt8173_max98090_driver);
+
+/* Module information */
+MODULE_DESCRIPTION("MT8173 MAX98090 ALSA SoC machine driver");
+MODULE_AUTHOR("Koro Chen <koro.chen@mediatek.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:mt8173-max98090");
+
diff --git a/sound/soc/mediatek/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
new file mode 100644
index 000000000000..094055323059
--- /dev/null
+++ b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
@@ -0,0 +1,278 @@
+/*
+ * mt8173-rt5650-rt5676.c  --  MT8173 machine driver with RT5650/5676 codecs
+ *
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Koro Chen <koro.chen@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 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/gpio.h>
+#include <linux/of_gpio.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+#include "../codecs/rt5645.h"
+#include "../codecs/rt5677.h"
+
+#define MCLK_FOR_CODECS         12288000
+
+static const struct snd_soc_dapm_widget mt8173_rt5650_rt5676_widgets[] = {
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_MIC("Int Mic", NULL),
+        SND_SOC_DAPM_HP("Headphone", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static const struct snd_soc_dapm_route mt8173_rt5650_rt5676_routes[] = {
+        {"Speaker", NULL, "SPOL"},
+        {"Speaker", NULL, "SPOR"},
+        {"Speaker", NULL, "Sub AIF2TX"}, /* IF2 ADC to 5650  */
+        {"Sub DMIC L1", NULL, "Int Mic"}, /* DMIC from 5676 */
+        {"Sub DMIC R1", NULL, "Int Mic"},
+        {"Headphone", NULL, "HPOL"},
+        {"Headphone", NULL, "HPOR"},
+        {"Headphone", NULL, "Sub AIF2TX"}, /* IF2 ADC to 5650  */
+        {"Headset Mic", NULL, "micbias1"},
+        {"Headset Mic", NULL, "micbias2"},
+        {"IN1P", NULL, "Headset Mic"},
+        {"IN1N", NULL, "Headset Mic"},
+        {"Sub AIF2RX", NULL, "Headset Mic"}, /* IF2 DAC from 5650  */
+};
+
+static const struct snd_kcontrol_new mt8173_rt5650_rt5676_controls[] = {
+        SOC_DAPM_PIN_SWITCH("Speaker"),
+        SOC_DAPM_PIN_SWITCH("Int Mic"),
+        SOC_DAPM_PIN_SWITCH("Headphone"),
+        SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static int mt8173_rt5650_rt5676_hw_params(struct snd_pcm_substream *substream,
+                                          struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        int i, ret;
+
+        for (i = 0; i < rtd->num_codecs; i++) {
+                struct snd_soc_dai *codec_dai = rtd->codec_dais[i];
+
+                /* pll from mclk 12.288M */
+                ret = snd_soc_dai_set_pll(codec_dai, 0, 0, MCLK_FOR_CODECS,
+                                          params_rate(params) * 512);
+                if (ret)
+                        return ret;
+
+                /* sysclk from pll */
+                ret = snd_soc_dai_set_sysclk(codec_dai, 1,
+                                             params_rate(params) * 512,
+                                             SND_SOC_CLOCK_IN);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+
+static struct snd_soc_ops mt8173_rt5650_rt5676_ops = {
+        .hw_params = mt8173_rt5650_rt5676_hw_params,
+};
+
+static struct snd_soc_jack mt8173_rt5650_rt5676_jack;
+
+static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime)
+{
+        struct snd_soc_card *card = runtime->card;
+        struct snd_soc_codec *codec = runtime->codec_dais[0]->codec;
+        struct snd_soc_codec *codec_sub = runtime->codec_dais[1]->codec;
+        int ret;
+
+        rt5645_sel_asrc_clk_src(codec,
+                                RT5645_DA_STEREO_FILTER |
+                                RT5645_AD_STEREO_FILTER,
+                                RT5645_CLK_SEL_I2S1_ASRC);
+        rt5677_sel_asrc_clk_src(codec_sub,
+                                RT5677_DA_STEREO_FILTER |
+                                RT5677_AD_STEREO1_FILTER,
+                                RT5677_CLK_SEL_I2S1_ASRC);
+        rt5677_sel_asrc_clk_src(codec_sub,
+                                RT5677_AD_STEREO2_FILTER |
+                                RT5677_I2S2_SOURCE,
+                                RT5677_CLK_SEL_I2S2_ASRC);
+
+        /* enable jack detection */
+        ret = snd_soc_card_jack_new(card, "Headset Jack",
+                                    SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
+                                    SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                    SND_JACK_BTN_2 | SND_JACK_BTN_3,
+                                    &mt8173_rt5650_rt5676_jack, NULL, 0);
+        if (ret) {
+                dev_err(card->dev, "Can't new Headset Jack %d\n", ret);
+                return ret;
+        }
+
+        return rt5645_set_jack_detect(codec,
+                                      &mt8173_rt5650_rt5676_jack,
+                                      &mt8173_rt5650_rt5676_jack,
+                                      &mt8173_rt5650_rt5676_jack);
+}
+
+static struct snd_soc_dai_link_component mt8173_rt5650_rt5676_codecs[] = {
+        {
+                .dai_name = "rt5645-aif1",
+        },
+        {
+                .dai_name = "rt5677-aif1",
+        },
+};
+
+/* Digital audio interface glue - connects codec <---> CPU */
+static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
+        /* Front End DAI links */
+        {
+                .name = "rt5650_rt5676 Playback",
+                .stream_name = "rt5650_rt5676 Playback",
+                .cpu_dai_name = "DL1",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dynamic = 1,
+                .dpcm_playback = 1,
+        },
+        {
+                .name = "rt5650_rt5676 Capture",
+                .stream_name = "rt5650_rt5676 Capture",
+                .cpu_dai_name = "VUL",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dynamic = 1,
+                .dpcm_capture = 1,
+        },
+
+        /* Back End DAI links */
+        {
+                .name = "Codec",
+                .cpu_dai_name = "I2S",
+                .platform_name = "11220000.mt8173-afe-pcm",
+                .no_pcm = 1,
+                .codecs = mt8173_rt5650_rt5676_codecs,
+                .num_codecs = 2,
+                .init = mt8173_rt5650_rt5676_init,
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                           SND_SOC_DAIFMT_CBS_CFS,
+                .ops = &mt8173_rt5650_rt5676_ops,
+                .ignore_pmdown_time = 1,
+                .dpcm_playback = 1,
+                .dpcm_capture = 1,
+        },
+        { /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */
+                .name = "rt5650_rt5676 intercodec",
+                .stream_name = "rt5650_rt5676 intercodec",
+                .cpu_dai_name = "snd-soc-dummy-dai",
+                .platform_name = "snd-soc-dummy",
+                .no_pcm = 1,
+                .codec_dai_name = "rt5677-aif2",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                           SND_SOC_DAIFMT_CBM_CFM,
+        },
+
+};
+
+static struct snd_soc_codec_conf mt8173_rt5650_rt5676_codec_conf[] = {
+        {
+                .name_prefix = "Sub",
+        },
+};
+
+static struct snd_soc_card mt8173_rt5650_rt5676_card = {
+        .name = "mtk-rt5650-rt5676",
+        .dai_link = mt8173_rt5650_rt5676_dais,
+        .num_links = ARRAY_SIZE(mt8173_rt5650_rt5676_dais),
+        .codec_conf = mt8173_rt5650_rt5676_codec_conf,
+        .num_configs = ARRAY_SIZE(mt8173_rt5650_rt5676_codec_conf),
+        .controls = mt8173_rt5650_rt5676_controls,
+        .num_controls = ARRAY_SIZE(mt8173_rt5650_rt5676_controls),
+        .dapm_widgets = mt8173_rt5650_rt5676_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(mt8173_rt5650_rt5676_widgets),
+        .dapm_routes = mt8173_rt5650_rt5676_routes,
+        .num_dapm_routes = ARRAY_SIZE(mt8173_rt5650_rt5676_routes),
+};
+
+static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &mt8173_rt5650_rt5676_card;
+        int ret;
+
+        mt8173_rt5650_rt5676_codecs[0].of_node =
+                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);
+        if (!mt8173_rt5650_rt5676_codecs[0].of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
+        mt8173_rt5650_rt5676_codecs[1].of_node =
+                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1);
+        if (!mt8173_rt5650_rt5676_codecs[1].of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
+        mt8173_rt5650_rt5676_codec_conf[0].of_node =
+                mt8173_rt5650_rt5676_codecs[1].of_node;
+
+        mt8173_rt5650_rt5676_dais[3].codec_of_node =
+                mt8173_rt5650_rt5676_codecs[1].of_node;
+
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
+
+        ret = snd_soc_register_card(card);
+        if (ret)
+                dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
+                        __func__, ret);
+        return ret;
+}
+
+static int mt8173_rt5650_rt5676_dev_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+        return 0;
+}
+
+static const struct of_device_id mt8173_rt5650_rt5676_dt_match[] = {
+        { .compatible = "mediatek,mt8173-rt5650-rt5676", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, mt8173_rt5650_rt5676_dt_match);
+
+static struct platform_driver mt8173_rt5650_rt5676_driver = {
+        .driver = {
+                   .name = "mtk-rt5650-rt5676",
+                   .owner = THIS_MODULE,
+                   .of_match_table = mt8173_rt5650_rt5676_dt_match,
+#ifdef CONFIG_PM
+                   .pm = &snd_soc_pm_ops,
+#endif
+        },
+        .probe = mt8173_rt5650_rt5676_dev_probe,
+        .remove = mt8173_rt5650_rt5676_dev_remove,
+};
+
+module_platform_driver(mt8173_rt5650_rt5676_driver);
+
+/* Module information */
+MODULE_DESCRIPTION("MT8173 RT5650 and RT5676 SoC machine driver");
+MODULE_AUTHOR("Koro Chen <koro.chen@mediatek.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:mtk-rt5650-rt5676");
+
diff --git a/sound/soc/mediatek/mtk-afe-common.h b/sound/soc/mediatek/mtk-afe-common.h
new file mode 100644
index 000000000000..a88b17511fdf
--- /dev/null
+++ b/sound/soc/mediatek/mtk-afe-common.h
@@ -0,0 +1,109 @@
+/*
+ * mtk_afe_common.h  --  Mediatek audio driver common definitions
+ *
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Koro Chen <koro.chen@mediatek.com>
+ *             Sascha Hauer <s.hauer@pengutronix.de>
+ *             Hidalgo Huang <hidalgo.huang@mediatek.com>
+ *             Ir Lian <ir.lian@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 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.
+ */
+
+#ifndef _MTK_AFE_COMMON_H_
+#define _MTK_AFE_COMMON_H_
+
+#include <linux/clk.h>
+#include <linux/regmap.h>
+
+enum {
+        MTK_AFE_MEMIF_DL1,
+        MTK_AFE_MEMIF_DL2,
+        MTK_AFE_MEMIF_VUL,
+        MTK_AFE_MEMIF_DAI,
+        MTK_AFE_MEMIF_AWB,
+        MTK_AFE_MEMIF_MOD_DAI,
+        MTK_AFE_MEMIF_HDMI,
+        MTK_AFE_MEMIF_NUM,
+        MTK_AFE_IO_MOD_PCM1 = MTK_AFE_MEMIF_NUM,
+        MTK_AFE_IO_MOD_PCM2,
+        MTK_AFE_IO_PMIC,
+        MTK_AFE_IO_I2S,
+        MTK_AFE_IO_2ND_I2S,
+        MTK_AFE_IO_HW_GAIN1,
+        MTK_AFE_IO_HW_GAIN2,
+        MTK_AFE_IO_MRG_O,
+        MTK_AFE_IO_MRG_I,
+        MTK_AFE_IO_DAIBT,
+        MTK_AFE_IO_HDMI,
+};
+
+enum {
+        MTK_AFE_IRQ_1,
+        MTK_AFE_IRQ_2,
+        MTK_AFE_IRQ_3,
+        MTK_AFE_IRQ_4,
+        MTK_AFE_IRQ_5,
+        MTK_AFE_IRQ_6,
+        MTK_AFE_IRQ_7,
+        MTK_AFE_IRQ_8,
+        MTK_AFE_IRQ_NUM,
+};
+
+enum {
+        MTK_CLK_INFRASYS_AUD,
+        MTK_CLK_TOP_PDN_AUD,
+        MTK_CLK_TOP_PDN_AUD_BUS,
+        MTK_CLK_I2S0_M,
+        MTK_CLK_I2S1_M,
+        MTK_CLK_I2S2_M,
+        MTK_CLK_I2S3_M,
+        MTK_CLK_I2S3_B,
+        MTK_CLK_BCK0,
+        MTK_CLK_BCK1,
+        MTK_CLK_NUM
+};
+
+struct mtk_afe;
+struct snd_pcm_substream;
+
+struct mtk_afe_memif_data {
+        int id;
+        const char *name;
+        int reg_ofs_base;
+        int reg_ofs_cur;
+        int fs_shift;
+        int mono_shift;
+        int enable_shift;
+        int irq_reg_cnt;
+        int irq_cnt_shift;
+        int irq_en_shift;
+        int irq_fs_shift;
+        int irq_clr_shift;
+};
+
+struct mtk_afe_memif {
+        unsigned int phys_buf_addr;
+        int buffer_size;
+        unsigned int hw_ptr;            /* Previous IRQ's HW ptr */
+        struct snd_pcm_substream *substream;
+        const struct mtk_afe_memif_data *data;
+        const struct mtk_afe_irq_data *irqdata;
+};
+
+struct mtk_afe {
+        /* address for ioremap audio hardware register */
+        void __iomem *base_addr;
+        struct device *dev;
+        struct regmap *regmap;
+        struct mtk_afe_memif memif[MTK_AFE_MEMIF_NUM];
+        struct clk *clocks[MTK_CLK_NUM];
+};
+#endif
diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c
new file mode 100644
index 000000000000..cc228db5fb76
--- /dev/null
+++ b/sound/soc/mediatek/mtk-afe-pcm.c
@@ -0,0 +1,1233 @@
+/*
+ * Mediatek ALSA SoC AFE platform driver
+ *
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Koro Chen <koro.chen@mediatek.com>
+ *             Sascha Hauer <s.hauer@pengutronix.de>
+ *             Hidalgo Huang <hidalgo.huang@mediatek.com>
+ *             Ir Lian <ir.lian@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 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/delay.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/pm_runtime.h>
+#include <sound/soc.h>
+#include "mtk-afe-common.h"
+
+/*****************************************************************************
+ *                  R E G I S T E R       D E F I N I T I O N
+ *****************************************************************************/
+#define AUDIO_TOP_CON0          0x0000
+#define AUDIO_TOP_CON1          0x0004
+#define AFE_DAC_CON0            0x0010
+#define AFE_DAC_CON1            0x0014
+#define AFE_I2S_CON1            0x0034
+#define AFE_I2S_CON2            0x0038
+#define AFE_CONN_24BIT          0x006c
+
+#define AFE_CONN1               0x0024
+#define AFE_CONN2               0x0028
+#define AFE_CONN7               0x0460
+#define AFE_CONN8               0x0464
+#define AFE_HDMI_CONN0          0x0390
+
+/* Memory interface */
+#define AFE_DL1_BASE            0x0040
+#define AFE_DL1_CUR             0x0044
+#define AFE_DL2_BASE            0x0050
+#define AFE_DL2_CUR             0x0054
+#define AFE_AWB_BASE            0x0070
+#define AFE_AWB_CUR             0x007c
+#define AFE_VUL_BASE            0x0080
+#define AFE_VUL_CUR             0x008c
+#define AFE_DAI_BASE            0x0090
+#define AFE_DAI_CUR             0x009c
+#define AFE_MOD_PCM_BASE        0x0330
+#define AFE_MOD_PCM_CUR         0x033c
+#define AFE_HDMI_OUT_BASE       0x0374
+#define AFE_HDMI_OUT_CUR        0x0378
+
+#define AFE_ADDA2_TOP_CON0      0x0600
+
+#define AFE_HDMI_OUT_CON0       0x0370
+
+#define AFE_IRQ_MCU_CON         0x03a0
+#define AFE_IRQ_STATUS          0x03a4
+#define AFE_IRQ_CLR             0x03a8
+#define AFE_IRQ_CNT1            0x03ac
+#define AFE_IRQ_CNT2            0x03b0
+#define AFE_IRQ_MCU_EN          0x03b4
+#define AFE_IRQ_CNT5            0x03bc
+#define AFE_IRQ_CNT7            0x03dc
+
+#define AFE_TDM_CON1            0x0548
+#define AFE_TDM_CON2            0x054c
+
+#define AFE_BASE_END_OFFSET     8
+#define AFE_IRQ_STATUS_BITS     0xff
+
+/* AUDIO_TOP_CON0 (0x0000) */
+#define AUD_TCON0_PDN_SPDF              (0x1 << 21)
+#define AUD_TCON0_PDN_HDMI              (0x1 << 20)
+#define AUD_TCON0_PDN_24M               (0x1 << 9)
+#define AUD_TCON0_PDN_22M               (0x1 << 8)
+#define AUD_TCON0_PDN_AFE               (0x1 << 2)
+
+/* AFE_I2S_CON1 (0x0034) */
+#define AFE_I2S_CON1_LOW_JITTER_CLK     (0x1 << 12)
+#define AFE_I2S_CON1_RATE(x)            (((x) & 0xf) << 8)
+#define AFE_I2S_CON1_FORMAT_I2S         (0x1 << 3)
+#define AFE_I2S_CON1_EN                 (0x1 << 0)
+
+/* AFE_I2S_CON2 (0x0038) */
+#define AFE_I2S_CON2_LOW_JITTER_CLK     (0x1 << 12)
+#define AFE_I2S_CON2_RATE(x)            (((x) & 0xf) << 8)
+#define AFE_I2S_CON2_FORMAT_I2S         (0x1 << 3)
+#define AFE_I2S_CON2_EN                 (0x1 << 0)
+
+/* AFE_CONN_24BIT (0x006c) */
+#define AFE_CONN_24BIT_O04              (0x1 << 4)
+#define AFE_CONN_24BIT_O03              (0x1 << 3)
+
+/* AFE_HDMI_CONN0 (0x0390) */
+#define AFE_HDMI_CONN0_O37_I37          (0x7 << 21)
+#define AFE_HDMI_CONN0_O36_I36          (0x6 << 18)
+#define AFE_HDMI_CONN0_O35_I33          (0x3 << 15)
+#define AFE_HDMI_CONN0_O34_I32          (0x2 << 12)
+#define AFE_HDMI_CONN0_O33_I35          (0x5 << 9)
+#define AFE_HDMI_CONN0_O32_I34          (0x4 << 6)
+#define AFE_HDMI_CONN0_O31_I31          (0x1 << 3)
+#define AFE_HDMI_CONN0_O30_I30          (0x0 << 0)
+
+/* AFE_TDM_CON1 (0x0548) */
+#define AFE_TDM_CON1_LRCK_WIDTH(x)      (((x) - 1) << 24)
+#define AFE_TDM_CON1_32_BCK_CYCLES      (0x2 << 12)
+#define AFE_TDM_CON1_WLEN_32BIT         (0x2 << 8)
+#define AFE_TDM_CON1_MSB_ALIGNED        (0x1 << 4)
+#define AFE_TDM_CON1_1_BCK_DELAY        (0x1 << 3)
+#define AFE_TDM_CON1_BCK_INV            (0x1 << 1)
+#define AFE_TDM_CON1_EN                 (0x1 << 0)
+
+enum afe_tdm_ch_start {
+        AFE_TDM_CH_START_O30_O31 = 0,
+        AFE_TDM_CH_START_O32_O33,
+        AFE_TDM_CH_START_O34_O35,
+        AFE_TDM_CH_START_O36_O37,
+        AFE_TDM_CH_ZERO,
+};
+
+static const struct snd_pcm_hardware mtk_afe_hardware = {
+        .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                 SNDRV_PCM_INFO_MMAP_VALID),
+        .buffer_bytes_max = 256 * 1024,
+        .period_bytes_min = 512,
+        .period_bytes_max = 128 * 1024,
+        .periods_min = 2,
+        .periods_max = 256,
+        .fifo_size = 0,
+};
+
+static snd_pcm_uframes_t mtk_afe_pcm_pointer
+                         (struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+
+        return bytes_to_frames(substream->runtime, memif->hw_ptr);
+}
+
+static const struct snd_pcm_ops mtk_afe_pcm_ops = {
+        .ioctl = snd_pcm_lib_ioctl,
+        .pointer = mtk_afe_pcm_pointer,
+};
+
+static int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+        size_t size;
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_pcm *pcm = rtd->pcm;
+
+        size = mtk_afe_hardware.buffer_bytes_max;
+
+        return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                                     card->dev, size, size);
+}
+
+static void mtk_afe_pcm_free(struct snd_pcm *pcm)
+{
+        snd_pcm_lib_preallocate_free_for_all(pcm);
+}
+
+static const struct snd_soc_platform_driver mtk_afe_pcm_platform = {
+        .ops = &mtk_afe_pcm_ops,
+        .pcm_new = mtk_afe_pcm_new,
+        .pcm_free = mtk_afe_pcm_free,
+};
+
+struct mtk_afe_rate {
+        unsigned int rate;
+        unsigned int regvalue;
+};
+
+static const struct mtk_afe_rate mtk_afe_i2s_rates[] = {
+        { .rate = 8000, .regvalue = 0 },
+        { .rate = 11025, .regvalue = 1 },
+        { .rate = 12000, .regvalue = 2 },
+        { .rate = 16000, .regvalue = 4 },
+        { .rate = 22050, .regvalue = 5 },
+        { .rate = 24000, .regvalue = 6 },
+        { .rate = 32000, .regvalue = 8 },
+        { .rate = 44100, .regvalue = 9 },
+        { .rate = 48000, .regvalue = 10 },
+        { .rate = 88000, .regvalue = 11 },
+        { .rate = 96000, .regvalue = 12 },
+        { .rate = 174000, .regvalue = 13 },
+        { .rate = 192000, .regvalue = 14 },
+};
+
+static int mtk_afe_i2s_fs(unsigned int sample_rate)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mtk_afe_i2s_rates); i++)
+                if (mtk_afe_i2s_rates[i].rate == sample_rate)
+                        return mtk_afe_i2s_rates[i].regvalue;
+
+        return -EINVAL;
+}
+
+static int mtk_afe_set_i2s(struct mtk_afe *afe, unsigned int rate)
+{
+        unsigned int val;
+        int fs = mtk_afe_i2s_fs(rate);
+
+        if (fs < 0)
+                return -EINVAL;
+
+        /* from external ADC */
+        regmap_update_bits(afe->regmap, AFE_ADDA2_TOP_CON0, 0x1, 0x1);
+
+        /* set input */
+        val = AFE_I2S_CON2_LOW_JITTER_CLK |
+              AFE_I2S_CON2_RATE(fs) |
+              AFE_I2S_CON2_FORMAT_I2S;
+
+        regmap_update_bits(afe->regmap, AFE_I2S_CON2, ~AFE_I2S_CON2_EN, val);
+
+        /* set output */
+        val = AFE_I2S_CON1_LOW_JITTER_CLK |
+              AFE_I2S_CON1_RATE(fs) |
+              AFE_I2S_CON1_FORMAT_I2S;
+
+        regmap_update_bits(afe->regmap, AFE_I2S_CON1, ~AFE_I2S_CON1_EN, val);
+        return 0;
+}
+
+static void mtk_afe_set_i2s_enable(struct mtk_afe *afe, bool enable)
+{
+        unsigned int val;
+
+        regmap_read(afe->regmap, AFE_I2S_CON2, &val);
+        if (!!(val & AFE_I2S_CON2_EN) == enable)
+                return; /* must skip soft reset */
+
+        /* I2S soft reset begin */
+        regmap_update_bits(afe->regmap, AUDIO_TOP_CON1, 0x4, 0x4);
+
+        /* input */
+        regmap_update_bits(afe->regmap, AFE_I2S_CON2, 0x1, enable);
+
+        /* output */
+        regmap_update_bits(afe->regmap, AFE_I2S_CON1, 0x1, enable);
+
+        /* I2S soft reset end */
+        udelay(1);
+        regmap_update_bits(afe->regmap, AUDIO_TOP_CON1, 0x4, 0);
+}
+
+static int mtk_afe_dais_enable_clks(struct mtk_afe *afe,
+                                    struct clk *m_ck, struct clk *b_ck)
+{
+        int ret;
+
+        if (m_ck) {
+                ret = clk_prepare_enable(m_ck);
+                if (ret) {
+                        dev_err(afe->dev, "Failed to enable m_ck\n");
+                        return ret;
+                }
+                regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
+                                   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M, 0);
+        }
+
+        if (b_ck) {
+                ret = clk_prepare_enable(b_ck);
+                if (ret) {
+                        dev_err(afe->dev, "Failed to enable b_ck\n");
+                        return ret;
+                }
+        }
+        return 0;
+}
+
+static int mtk_afe_dais_set_clks(struct mtk_afe *afe,
+                                 struct clk *m_ck, unsigned int mck_rate,
+                                 struct clk *b_ck, unsigned int bck_rate)
+{
+        int ret;
+
+        if (m_ck) {
+                ret = clk_set_rate(m_ck, mck_rate);
+                if (ret) {
+                        dev_err(afe->dev, "Failed to set m_ck rate\n");
+                        return ret;
+                }
+        }
+
+        if (b_ck) {
+                ret = clk_set_rate(b_ck, bck_rate);
+                if (ret) {
+                        dev_err(afe->dev, "Failed to set b_ck rate\n");
+                        return ret;
+                }
+        }
+        return 0;
+}
+
+static void mtk_afe_dais_disable_clks(struct mtk_afe *afe,
+                                      struct clk *m_ck, struct clk *b_ck)
+{
+        if (m_ck) {
+                regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
+                                   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M,
+                                   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M);
+                clk_disable_unprepare(m_ck);
+        }
+        if (b_ck)
+                clk_disable_unprepare(b_ck);
+}
+
+static int mtk_afe_i2s_startup(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        if (dai->active)
+                return 0;
+
+        mtk_afe_dais_enable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL);
+        return 0;
+}
+
+static void mtk_afe_i2s_shutdown(struct snd_pcm_substream *substream,
+                                 struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        if (dai->active)
+                return;
+
+        mtk_afe_set_i2s_enable(afe, false);
+        mtk_afe_dais_disable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL);
+
+        /* disable AFE */
+        regmap_update_bits(afe->regmap, AFE_DAC_CON0, 0x1, 0);
+}
+
+static int mtk_afe_i2s_prepare(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_pcm_runtime * const runtime = substream->runtime;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        int ret;
+
+        mtk_afe_dais_set_clks(afe,
+                              afe->clocks[MTK_CLK_I2S1_M], runtime->rate * 256,
+                              NULL, 0);
+        /* config I2S */
+        ret = mtk_afe_set_i2s(afe, substream->runtime->rate);
+        if (ret)
+                return ret;
+
+        mtk_afe_set_i2s_enable(afe, true);
+
+        return 0;
+}
+
+static int mtk_afe_hdmi_startup(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        if (dai->active)
+                return 0;
+
+        mtk_afe_dais_enable_clks(afe, afe->clocks[MTK_CLK_I2S3_M],
+                                 afe->clocks[MTK_CLK_I2S3_B]);
+        return 0;
+}
+
+static void mtk_afe_hdmi_shutdown(struct snd_pcm_substream *substream,
+                                  struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        if (dai->active)
+                return;
+
+        mtk_afe_dais_disable_clks(afe, afe->clocks[MTK_CLK_I2S3_M],
+                                  afe->clocks[MTK_CLK_I2S3_B]);
+
+        /* disable AFE */
+        regmap_update_bits(afe->regmap, AFE_DAC_CON0, 0x1, 0);
+}
+
+static int mtk_afe_hdmi_prepare(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_pcm_runtime * const runtime = substream->runtime;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        unsigned int val;
+
+        mtk_afe_dais_set_clks(afe,
+                              afe->clocks[MTK_CLK_I2S3_M], runtime->rate * 128,
+                              afe->clocks[MTK_CLK_I2S3_B],
+                              runtime->rate * runtime->channels * 32);
+
+        val = AFE_TDM_CON1_BCK_INV |
+              AFE_TDM_CON1_1_BCK_DELAY |
+              AFE_TDM_CON1_MSB_ALIGNED | /* I2S mode */
+              AFE_TDM_CON1_WLEN_32BIT |
+              AFE_TDM_CON1_32_BCK_CYCLES |
+              AFE_TDM_CON1_LRCK_WIDTH(32);
+        regmap_update_bits(afe->regmap, AFE_TDM_CON1, ~AFE_TDM_CON1_EN, val);
+
+        /* set tdm2 config */
+        switch (runtime->channels) {
+        case 1:
+        case 2:
+                val = AFE_TDM_CH_START_O30_O31;
+                val |= (AFE_TDM_CH_ZERO << 4);
+                val |= (AFE_TDM_CH_ZERO << 8);
+                val |= (AFE_TDM_CH_ZERO << 12);
+                break;
+        case 3:
+        case 4:
+                val = AFE_TDM_CH_START_O30_O31;
+                val |= (AFE_TDM_CH_START_O32_O33 << 4);
+                val |= (AFE_TDM_CH_ZERO << 8);
+                val |= (AFE_TDM_CH_ZERO << 12);
+                break;
+        case 5:
+        case 6:
+                val = AFE_TDM_CH_START_O30_O31;
+                val |= (AFE_TDM_CH_START_O32_O33 << 4);
+                val |= (AFE_TDM_CH_START_O34_O35 << 8);
+                val |= (AFE_TDM_CH_ZERO << 12);
+                break;
+        case 7:
+        case 8:
+                val = AFE_TDM_CH_START_O30_O31;
+                val |= (AFE_TDM_CH_START_O32_O33 << 4);
+                val |= (AFE_TDM_CH_START_O34_O35 << 8);
+                val |= (AFE_TDM_CH_START_O36_O37 << 12);
+                break;
+        default:
+                val = 0;
+        }
+        regmap_update_bits(afe->regmap, AFE_TDM_CON2, 0x0000ffff, val);
+
+        regmap_update_bits(afe->regmap, AFE_HDMI_OUT_CON0,
+                           0x000000f0, runtime->channels << 4);
+        return 0;
+}
+
+static int mtk_afe_hdmi_trigger(struct snd_pcm_substream *substream, int cmd,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        dev_info(afe->dev, "%s cmd=%d %s\n", __func__, cmd, dai->name);
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
+                                   AUD_TCON0_PDN_HDMI | AUD_TCON0_PDN_SPDF, 0);
+
+                /* set connections:  O30~O37: L/R/LS/RS/C/LFE/CH7/CH8 */
+                regmap_write(afe->regmap, AFE_HDMI_CONN0,
+                             AFE_HDMI_CONN0_O30_I30 | AFE_HDMI_CONN0_O31_I31 |
+                             AFE_HDMI_CONN0_O32_I34 | AFE_HDMI_CONN0_O33_I35 |
+                             AFE_HDMI_CONN0_O34_I32 | AFE_HDMI_CONN0_O35_I33 |
+                             AFE_HDMI_CONN0_O36_I36 | AFE_HDMI_CONN0_O37_I37);
+
+                /* enable Out control */
+                regmap_update_bits(afe->regmap, AFE_HDMI_OUT_CON0, 0x1, 0x1);
+
+                /* enable tdm */
+                regmap_update_bits(afe->regmap, AFE_TDM_CON1, 0x1, 0x1);
+
+                return 0;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                /* disable tdm */
+                regmap_update_bits(afe->regmap, AFE_TDM_CON1, 0x1, 0);
+
+                /* disable Out control */
+                regmap_update_bits(afe->regmap, AFE_HDMI_OUT_CON0, 0x1, 0);
+
+                regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
+                                   AUD_TCON0_PDN_HDMI | AUD_TCON0_PDN_SPDF,
+                                   AUD_TCON0_PDN_HDMI | AUD_TCON0_PDN_SPDF);
+
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int mtk_afe_dais_startup(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+        int ret;
+
+        memif->substream = substream;
+
+        snd_soc_set_runtime_hwparams(substream, &mtk_afe_hardware);
+        ret = snd_pcm_hw_constraint_integer(runtime,
+                                            SNDRV_PCM_HW_PARAM_PERIODS);
+        if (ret < 0)
+                dev_err(afe->dev, "snd_pcm_hw_constraint_integer failed\n");
+        return ret;
+}
+
+static void mtk_afe_dais_shutdown(struct snd_pcm_substream *substream,
+                                  struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+
+        memif->substream = NULL;
+}
+
+static int mtk_afe_dais_hw_params(struct snd_pcm_substream *substream,
+                                  struct snd_pcm_hw_params *params,
+                                  struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+        int ret;
+
+        dev_dbg(afe->dev,
+                "%s period = %u, rate= %u, channels=%u\n",
+                __func__, params_period_size(params), params_rate(params),
+                params_channels(params));
+
+        ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+        if (ret < 0)
+                return ret;
+
+        memif->phys_buf_addr = substream->runtime->dma_addr;
+        memif->buffer_size = substream->runtime->dma_bytes;
+        memif->hw_ptr = 0;
+
+        /* start */
+        regmap_write(afe->regmap,
+                     memif->data->reg_ofs_base, memif->phys_buf_addr);
+        /* end */
+        regmap_write(afe->regmap,
+                     memif->data->reg_ofs_base + AFE_BASE_END_OFFSET,
+                     memif->phys_buf_addr + memif->buffer_size - 1);
+
+        /* set channel */
+        if (memif->data->mono_shift >= 0) {
+                unsigned int mono = (params_channels(params) == 1) ? 1 : 0;
+
+                regmap_update_bits(afe->regmap, AFE_DAC_CON1,
+                                   1 << memif->data->mono_shift,
+                                   mono << memif->data->mono_shift);
+        }
+
+        /* set rate */
+        if (memif->data->fs_shift < 0)
+                return 0;
+        if (memif->data->id == MTK_AFE_MEMIF_DAI ||
+            memif->data->id == MTK_AFE_MEMIF_MOD_DAI) {
+                unsigned int val;
+
+                switch (params_rate(params)) {
+                case 8000:
+                        val = 0;
+                        break;
+                case 16000:
+                        val = 1;
+                        break;
+                case 32000:
+                        val = 2;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+
+                if (memif->data->id == MTK_AFE_MEMIF_DAI)
+                        regmap_update_bits(afe->regmap, AFE_DAC_CON0,
+                                           0x3 << memif->data->fs_shift,
+                                           val << memif->data->fs_shift);
+                else
+                        regmap_update_bits(afe->regmap, AFE_DAC_CON1,
+                                           0x3 << memif->data->fs_shift,
+                                           val << memif->data->fs_shift);
+
+        } else {
+                int fs = mtk_afe_i2s_fs(params_rate(params));
+
+                if (fs < 0)
+                        return -EINVAL;
+
+                regmap_update_bits(afe->regmap, AFE_DAC_CON1,
+                                   0xf << memif->data->fs_shift,
+                                   fs << memif->data->fs_shift);
+        }
+
+        return 0;
+}
+
+static int mtk_afe_dais_hw_free(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        return snd_pcm_lib_free_pages(substream);
+}
+
+static int mtk_afe_dais_prepare(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+
+        /* enable AFE */
+        regmap_update_bits(afe->regmap, AFE_DAC_CON0, 0x1, 0x1);
+        return 0;
+}
+
+static int mtk_afe_dais_trigger(struct snd_pcm_substream *substream, int cmd,
+                                struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_pcm_runtime * const runtime = substream->runtime;
+        struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
+        struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+        unsigned int counter = runtime->period_size;
+
+        dev_info(afe->dev, "%s %s cmd=%d\n", __func__, memif->data->name, cmd);
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                if (memif->data->enable_shift >= 0)
+                        regmap_update_bits(afe->regmap, AFE_DAC_CON0,
+                                           1 << memif->data->enable_shift,
+                                           1 << memif->data->enable_shift);
+
+                /* set irq counter */
+                regmap_update_bits(afe->regmap,
+                                   memif->data->irq_reg_cnt,
+                                   0x3ffff << memif->data->irq_cnt_shift,
+                                   counter << memif->data->irq_cnt_shift);
+
+                /* set irq fs */
+                if (memif->data->irq_fs_shift >= 0) {
+                        int fs = mtk_afe_i2s_fs(runtime->rate);
+
+                        if (fs < 0)
+                                return -EINVAL;
+
+                        regmap_update_bits(afe->regmap,
+                                           AFE_IRQ_MCU_CON,
+                                           0xf << memif->data->irq_fs_shift,
+                                           fs << memif->data->irq_fs_shift);
+                }
+                /* enable interrupt */
+                regmap_update_bits(afe->regmap, AFE_IRQ_MCU_CON,
+                                   1 << memif->data->irq_en_shift,
+                                   1 << memif->data->irq_en_shift);
+
+                return 0;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                if (memif->data->enable_shift >= 0)
+                        regmap_update_bits(afe->regmap, AFE_DAC_CON0,
+                                           1 << memif->data->enable_shift, 0);
+                /* disable interrupt */
+                regmap_update_bits(afe->regmap, AFE_IRQ_MCU_CON,
+                                   1 << memif->data->irq_en_shift,
+                                   0 << memif->data->irq_en_shift);
+                /* and clear pending IRQ */
+                regmap_write(afe->regmap, AFE_IRQ_CLR,
+                             1 << memif->data->irq_clr_shift);
+                memif->hw_ptr = 0;
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+/* FE DAIs */
+static const struct snd_soc_dai_ops mtk_afe_dai_ops = {
+        .startup        = mtk_afe_dais_startup,
+        .shutdown       = mtk_afe_dais_shutdown,
+        .hw_params      = mtk_afe_dais_hw_params,
+        .hw_free        = mtk_afe_dais_hw_free,
+        .prepare        = mtk_afe_dais_prepare,
+        .trigger        = mtk_afe_dais_trigger,
+};
+
+/* BE DAIs */
+static const struct snd_soc_dai_ops mtk_afe_i2s_ops = {
+        .startup        = mtk_afe_i2s_startup,
+        .shutdown       = mtk_afe_i2s_shutdown,
+        .prepare        = mtk_afe_i2s_prepare,
+};
+
+static const struct snd_soc_dai_ops mtk_afe_hdmi_ops = {
+        .startup        = mtk_afe_hdmi_startup,
+        .shutdown       = mtk_afe_hdmi_shutdown,
+        .prepare        = mtk_afe_hdmi_prepare,
+        .trigger        = mtk_afe_hdmi_trigger,
+
+};
+
+static struct snd_soc_dai_driver mtk_afe_pcm_dais[] = {
+        /* FE DAIs: memory intefaces to CPU */
+        {
+                .name = "DL1", /* downlink 1 */
+                .id = MTK_AFE_MEMIF_DL1,
+                .playback = {
+                        .stream_name = "DL1",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .ops = &mtk_afe_dai_ops,
+        }, {
+                .name = "VUL", /* voice uplink */
+                .id = MTK_AFE_MEMIF_VUL,
+                .capture = {
+                        .stream_name = "VUL",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .ops = &mtk_afe_dai_ops,
+        }, {
+        /* BE DAIs */
+                .name = "I2S",
+                .id = MTK_AFE_IO_I2S,
+                .playback = {
+                        .stream_name = "I2S Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .capture = {
+                        .stream_name = "I2S Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .ops = &mtk_afe_i2s_ops,
+                .symmetric_rates = 1,
+        },
+};
+
+static struct snd_soc_dai_driver mtk_afe_hdmi_dais[] = {
+        /* FE DAIs */
+        {
+                .name = "HDMI",
+                .id = MTK_AFE_MEMIF_HDMI,
+                .playback = {
+                        .stream_name = "HDMI",
+                        .channels_min = 2,
+                        .channels_max = 8,
+                        .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
+                                SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+                                SNDRV_PCM_RATE_192000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .ops = &mtk_afe_dai_ops,
+        }, {
+        /* BE DAIs */
+                .name = "HDMIO",
+                .id = MTK_AFE_IO_HDMI,
+                .playback = {
+                        .stream_name = "HDMIO Playback",
+                        .channels_min = 2,
+                        .channels_max = 8,
+                        .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
+                                SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+                                SNDRV_PCM_RATE_192000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .ops = &mtk_afe_hdmi_ops,
+        },
+};
+
+static const struct snd_kcontrol_new mtk_afe_o03_mix[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("I05 Switch", AFE_CONN1, 21, 1, 0),
+};
+
+static const struct snd_kcontrol_new mtk_afe_o04_mix[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("I06 Switch", AFE_CONN2, 6, 1, 0),
+};
+
+static const struct snd_kcontrol_new mtk_afe_o09_mix[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("I17 Switch", AFE_CONN7, 30, 1, 0),
+};
+
+static const struct snd_kcontrol_new mtk_afe_o10_mix[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("I18 Switch", AFE_CONN8, 0, 1, 0),
+};
+
+static const struct snd_soc_dapm_widget mtk_afe_pcm_widgets[] = {
+        /* Backend DAIs  */
+        SND_SOC_DAPM_AIF_IN("I2S Capture", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("I2S Playback", NULL, 0, SND_SOC_NOPM, 0, 0),
+
+        /* inter-connections */
+        SND_SOC_DAPM_MIXER("I05", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("I06", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("I17", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("I18", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_MIXER("O03", SND_SOC_NOPM, 0, 0,
+                           mtk_afe_o03_mix, ARRAY_SIZE(mtk_afe_o03_mix)),
+        SND_SOC_DAPM_MIXER("O04", SND_SOC_NOPM, 0, 0,
+                           mtk_afe_o04_mix, ARRAY_SIZE(mtk_afe_o04_mix)),
+        SND_SOC_DAPM_MIXER("O09", SND_SOC_NOPM, 0, 0,
+                           mtk_afe_o09_mix, ARRAY_SIZE(mtk_afe_o09_mix)),
+        SND_SOC_DAPM_MIXER("O10", SND_SOC_NOPM, 0, 0,
+                           mtk_afe_o10_mix, ARRAY_SIZE(mtk_afe_o10_mix)),
+};
+
+static const struct snd_soc_dapm_route mtk_afe_pcm_routes[] = {
+        {"I05", NULL, "DL1"},
+        {"I06", NULL, "DL1"},
+        {"I2S Playback", NULL, "O03"},
+        {"I2S Playback", NULL, "O04"},
+        {"VUL", NULL, "O09"},
+        {"VUL", NULL, "O10"},
+        {"I17", NULL, "I2S Capture"},
+        {"I18", NULL, "I2S Capture"},
+        { "O03", "I05 Switch", "I05" },
+        { "O04", "I06 Switch", "I06" },
+        { "O09", "I17 Switch", "I17" },
+        { "O10", "I18 Switch", "I18" },
+};
+
+static const struct snd_soc_dapm_widget mtk_afe_hdmi_widgets[] = {
+        /* Backend DAIs  */
+        SND_SOC_DAPM_AIF_OUT("HDMIO Playback", NULL, 0, SND_SOC_NOPM, 0, 0),
+};
+
+static const struct snd_soc_dapm_route mtk_afe_hdmi_routes[] = {
+        {"HDMIO Playback", NULL, "HDMI"},
+};
+
+static const struct snd_soc_component_driver mtk_afe_pcm_dai_component = {
+        .name = "mtk-afe-pcm-dai",
+        .dapm_widgets = mtk_afe_pcm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(mtk_afe_pcm_widgets),
+        .dapm_routes = mtk_afe_pcm_routes,
+        .num_dapm_routes = ARRAY_SIZE(mtk_afe_pcm_routes),
+};
+
+static const struct snd_soc_component_driver mtk_afe_hdmi_dai_component = {
+        .name = "mtk-afe-hdmi-dai",
+        .dapm_widgets = mtk_afe_hdmi_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(mtk_afe_hdmi_widgets),
+        .dapm_routes = mtk_afe_hdmi_routes,
+        .num_dapm_routes = ARRAY_SIZE(mtk_afe_hdmi_routes),
+};
+
+static const char *aud_clks[MTK_CLK_NUM] = {
+        [MTK_CLK_INFRASYS_AUD] = "infra_sys_audio_clk",
+        [MTK_CLK_TOP_PDN_AUD] = "top_pdn_audio",
+        [MTK_CLK_TOP_PDN_AUD_BUS] = "top_pdn_aud_intbus",
+        [MTK_CLK_I2S0_M] =  "i2s0_m",
+        [MTK_CLK_I2S1_M] =  "i2s1_m",
+        [MTK_CLK_I2S2_M] =  "i2s2_m",
+        [MTK_CLK_I2S3_M] =  "i2s3_m",
+        [MTK_CLK_I2S3_B] =  "i2s3_b",
+        [MTK_CLK_BCK0] =  "bck0",
+        [MTK_CLK_BCK1] =  "bck1",
+};
+
+static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = {
+        {
+                .name = "DL1",
+                .id = MTK_AFE_MEMIF_DL1,
+                .reg_ofs_base = AFE_DL1_BASE,
+                .reg_ofs_cur = AFE_DL1_CUR,
+                .fs_shift = 0,
+                .mono_shift = 21,
+                .enable_shift = 1,
+                .irq_reg_cnt = AFE_IRQ_CNT1,
+                .irq_cnt_shift = 0,
+                .irq_en_shift = 0,
+                .irq_fs_shift = 4,
+                .irq_clr_shift = 0,
+        }, {
+                .name = "DL2",
+                .id = MTK_AFE_MEMIF_DL2,
+                .reg_ofs_base = AFE_DL2_BASE,
+                .reg_ofs_cur = AFE_DL2_CUR,
+                .fs_shift = 4,
+                .mono_shift = 22,
+                .enable_shift = 2,
+                .irq_reg_cnt = AFE_IRQ_CNT1,
+                .irq_cnt_shift = 20,
+                .irq_en_shift = 2,
+                .irq_fs_shift = 16,
+                .irq_clr_shift = 2,
+        }, {
+                .name = "VUL",
+                .id = MTK_AFE_MEMIF_VUL,
+                .reg_ofs_base = AFE_VUL_BASE,
+                .reg_ofs_cur = AFE_VUL_CUR,
+                .fs_shift = 16,
+                .mono_shift = 27,
+                .enable_shift = 3,
+                .irq_reg_cnt = AFE_IRQ_CNT2,
+                .irq_cnt_shift = 0,
+                .irq_en_shift = 1,
+                .irq_fs_shift = 8,
+                .irq_clr_shift = 1,
+        }, {
+                .name = "DAI",
+                .id = MTK_AFE_MEMIF_DAI,
+                .reg_ofs_base = AFE_DAI_BASE,
+                .reg_ofs_cur = AFE_DAI_CUR,
+                .fs_shift = 24,
+                .mono_shift = -1,
+                .enable_shift = 4,
+                .irq_reg_cnt = AFE_IRQ_CNT2,
+                .irq_cnt_shift = 20,
+                .irq_en_shift = 3,
+                .irq_fs_shift = 20,
+                .irq_clr_shift = 3,
+        }, {
+                .name = "AWB",
+                .id = MTK_AFE_MEMIF_AWB,
+                .reg_ofs_base = AFE_AWB_BASE,
+                .reg_ofs_cur = AFE_AWB_CUR,
+                .fs_shift = 12,
+                .mono_shift = 24,
+                .enable_shift = 6,
+                .irq_reg_cnt = AFE_IRQ_CNT7,
+                .irq_cnt_shift = 0,
+                .irq_en_shift = 14,
+                .irq_fs_shift = 24,
+                .irq_clr_shift = 6,
+        }, {
+                .name = "MOD_DAI",
+                .id = MTK_AFE_MEMIF_MOD_DAI,
+                .reg_ofs_base = AFE_MOD_PCM_BASE,
+                .reg_ofs_cur = AFE_MOD_PCM_CUR,
+                .fs_shift = 30,
+                .mono_shift = 30,
+                .enable_shift = 7,
+                .irq_reg_cnt = AFE_IRQ_CNT2,
+                .irq_cnt_shift = 20,
+                .irq_en_shift = 3,
+                .irq_fs_shift = 20,
+                .irq_clr_shift = 3,
+        }, {
+                .name = "HDMI",
+                .id = MTK_AFE_MEMIF_HDMI,
+                .reg_ofs_base = AFE_HDMI_OUT_BASE,
+                .reg_ofs_cur = AFE_HDMI_OUT_CUR,
+                .fs_shift = -1,
+                .mono_shift = -1,
+                .enable_shift = -1,
+                .irq_reg_cnt = AFE_IRQ_CNT5,
+                .irq_cnt_shift = 0,
+                .irq_en_shift = 12,
+                .irq_fs_shift = -1,
+                .irq_clr_shift = 4,
+        },
+};
+
+static const struct regmap_config mtk_afe_regmap_config = {
+        .reg_bits = 32,
+        .reg_stride = 4,
+        .val_bits = 32,
+        .max_register = AFE_ADDA2_TOP_CON0,
+        .cache_type = REGCACHE_NONE,
+};
+
+static irqreturn_t mtk_afe_irq_handler(int irq, void *dev_id)
+{
+        struct mtk_afe *afe = dev_id;
+        unsigned int reg_value, hw_ptr;
+        int i, ret;
+
+        ret = regmap_read(afe->regmap, AFE_IRQ_STATUS, &reg_value);
+        if (ret) {
+                dev_err(afe->dev, "%s irq status err\n", __func__);
+                reg_value = AFE_IRQ_STATUS_BITS;
+                goto err_irq;
+        }
+
+        for (i = 0; i < MTK_AFE_MEMIF_NUM; i++) {
+                struct mtk_afe_memif *memif = &afe->memif[i];
+
+                if (!(reg_value & (1 << memif->data->irq_clr_shift)))
+                        continue;
+
+                ret = regmap_read(afe->regmap, memif->data->reg_ofs_cur,
+                                  &hw_ptr);
+                if (ret || hw_ptr == 0) {
+                        dev_err(afe->dev, "%s hw_ptr err\n", __func__);
+                        hw_ptr = memif->phys_buf_addr;
+                }
+                memif->hw_ptr = hw_ptr - memif->phys_buf_addr;
+                snd_pcm_period_elapsed(memif->substream);
+        }
+
+err_irq:
+        /* clear irq */
+        regmap_write(afe->regmap, AFE_IRQ_CLR, reg_value & AFE_IRQ_STATUS_BITS);
+
+        return IRQ_HANDLED;
+}
+
+static int mtk_afe_runtime_suspend(struct device *dev)
+{
+        struct mtk_afe *afe = dev_get_drvdata(dev);
+
+        /* disable AFE clk */
+        regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
+                           AUD_TCON0_PDN_AFE, AUD_TCON0_PDN_AFE);
+
+        clk_disable_unprepare(afe->clocks[MTK_CLK_BCK0]);
+        clk_disable_unprepare(afe->clocks[MTK_CLK_BCK1]);
+        clk_disable_unprepare(afe->clocks[MTK_CLK_TOP_PDN_AUD]);
+        clk_disable_unprepare(afe->clocks[MTK_CLK_TOP_PDN_AUD_BUS]);
+        clk_disable_unprepare(afe->clocks[MTK_CLK_INFRASYS_AUD]);
+        return 0;
+}
+
+static int mtk_afe_runtime_resume(struct device *dev)
+{
+        struct mtk_afe *afe = dev_get_drvdata(dev);
+        int ret;
+
+        ret = clk_prepare_enable(afe->clocks[MTK_CLK_INFRASYS_AUD]);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(afe->clocks[MTK_CLK_TOP_PDN_AUD_BUS]);
+        if (ret)
+                goto err_infra;
+
+        ret = clk_prepare_enable(afe->clocks[MTK_CLK_TOP_PDN_AUD]);
+        if (ret)
+                goto err_top_aud_bus;
+
+        ret = clk_prepare_enable(afe->clocks[MTK_CLK_BCK0]);
+        if (ret)
+                goto err_top_aud;
+
+        ret = clk_prepare_enable(afe->clocks[MTK_CLK_BCK1]);
+        if (ret)
+                goto err_bck0;
+
+        /* enable AFE clk */
+        regmap_update_bits(afe->regmap, AUDIO_TOP_CON0, AUD_TCON0_PDN_AFE, 0);
+
+        /* set O3/O4 16bits */
+        regmap_update_bits(afe->regmap, AFE_CONN_24BIT,
+                           AFE_CONN_24BIT_O03 | AFE_CONN_24BIT_O04, 0);
+
+        /* unmask all IRQs */
+        regmap_update_bits(afe->regmap, AFE_IRQ_MCU_EN, 0xff, 0xff);
+        return 0;
+
+err_bck0:
+        clk_disable_unprepare(afe->clocks[MTK_CLK_BCK0]);
+err_top_aud:
+        clk_disable_unprepare(afe->clocks[MTK_CLK_TOP_PDN_AUD]);
+err_top_aud_bus:
+        clk_disable_unprepare(afe->clocks[MTK_CLK_TOP_PDN_AUD_BUS]);
+err_infra:
+        clk_disable_unprepare(afe->clocks[MTK_CLK_INFRASYS_AUD]);
+        return ret;
+}
+
+static int mtk_afe_init_audio_clk(struct mtk_afe *afe)
+{
+        size_t i;
+
+        for (i = 0; i < ARRAY_SIZE(aud_clks); i++) {
+                afe->clocks[i] = devm_clk_get(afe->dev, aud_clks[i]);
+                if (IS_ERR(afe->clocks[i])) {
+                        dev_err(afe->dev, "%s devm_clk_get %s fail\n",
+                                __func__, aud_clks[i]);
+                        return PTR_ERR(afe->clocks[i]);
+                }
+        }
+        clk_set_rate(afe->clocks[MTK_CLK_BCK0], 22579200); /* 22M */
+        clk_set_rate(afe->clocks[MTK_CLK_BCK1], 24576000); /* 24M */
+        return 0;
+}
+
+static int mtk_afe_pcm_dev_probe(struct platform_device *pdev)
+{
+        int ret, i;
+        unsigned int irq_id;
+        struct mtk_afe *afe;
+        struct resource *res;
+
+        afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
+        if (!afe)
+                return -ENOMEM;
+
+        afe->dev = &pdev->dev;
+
+        irq_id = platform_get_irq(pdev, 0);
+        if (!irq_id) {
+                dev_err(afe->dev, "np %s no irq\n", afe->dev->of_node->name);
+                return -ENXIO;
+        }
+        ret = devm_request_irq(afe->dev, irq_id, mtk_afe_irq_handler,
+                               0, "Afe_ISR_Handle", (void *)afe);
+        if (ret) {
+                dev_err(afe->dev, "could not request_irq\n");
+                return ret;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        afe->base_addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(afe->base_addr))
+                return PTR_ERR(afe->base_addr);
+
+        afe->regmap = devm_regmap_init_mmio(&pdev->dev, afe->base_addr,
+                &mtk_afe_regmap_config);
+        if (IS_ERR(afe->regmap))
+                return PTR_ERR(afe->regmap);
+
+        /* initial audio related clock */
+        ret = mtk_afe_init_audio_clk(afe);
+        if (ret) {
+                dev_err(afe->dev, "mtk_afe_init_audio_clk fail\n");
+                return ret;
+        }
+
+        for (i = 0; i < MTK_AFE_MEMIF_NUM; i++)
+                afe->memif[i].data = &memif_data[i];
+
+        platform_set_drvdata(pdev, afe);
+
+        pm_runtime_enable(&pdev->dev);
+        if (!pm_runtime_enabled(&pdev->dev)) {
+                ret = mtk_afe_runtime_resume(&pdev->dev);
+                if (ret)
+                        goto err_pm_disable;
+        }
+
+        ret = snd_soc_register_platform(&pdev->dev, &mtk_afe_pcm_platform);
+        if (ret)
+                goto err_pm_disable;
+
+        ret = snd_soc_register_component(&pdev->dev,
+                                         &mtk_afe_pcm_dai_component,
+                                         mtk_afe_pcm_dais,
+                                         ARRAY_SIZE(mtk_afe_pcm_dais));
+        if (ret)
+                goto err_platform;
+
+        ret = snd_soc_register_component(&pdev->dev,
+                                         &mtk_afe_hdmi_dai_component,
+                                         mtk_afe_hdmi_dais,
+                                         ARRAY_SIZE(mtk_afe_hdmi_dais));
+        if (ret)
+                goto err_comp;
+
+        dev_info(&pdev->dev, "MTK AFE driver initialized.\n");
+        return 0;
+
+err_comp:
+        snd_soc_unregister_component(&pdev->dev);
+err_platform:
+        snd_soc_unregister_platform(&pdev->dev);
+err_pm_disable:
+        pm_runtime_disable(&pdev->dev);
+        return ret;
+}
+
+static int mtk_afe_pcm_dev_remove(struct platform_device *pdev)
+{
+        pm_runtime_disable(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
+}
+
+static const struct of_device_id mtk_afe_pcm_dt_match[] = {
+        { .compatible = "mediatek,mt8173-afe-pcm", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, mtk_afe_pcm_dt_match);
+
+static const struct dev_pm_ops mtk_afe_pm_ops = {
+        SET_RUNTIME_PM_OPS(mtk_afe_runtime_suspend, mtk_afe_runtime_resume,
+                           NULL)
+};
+
+static struct platform_driver mtk_afe_pcm_driver = {
+        .driver = {
+                   .name = "mtk-afe-pcm",
+                   .owner = THIS_MODULE,
+                   .of_match_table = mtk_afe_pcm_dt_match,
+                   .pm = &mtk_afe_pm_ops,
+        },
+        .probe = mtk_afe_pcm_dev_probe,
+        .remove = mtk_afe_pcm_dev_remove,
+};
+
+module_platform_driver(mtk_afe_pcm_driver);
+
+MODULE_DESCRIPTION("Mediatek ALSA SoC AFE platform driver");
+MODULE_AUTHOR("Koro Chen <koro.chen@mediatek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index fded99362d39..3bebfb1d3a6f 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -245,6 +245,8 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
 static const struct snd_soc_dapm_route audio_map[] = {
         {"Ext Spk", NULL, "HPLOUT"},
         {"Ext Spk", NULL, "HPROUT"},
+        {"Ext Spk", NULL, "HPLCOM"},
+        {"Ext Spk", NULL, "HPRCOM"},
         {"Headphone Jack", NULL, "LLOUT"},
         {"Headphone Jack", NULL, "RLOUT"},
         {"FM Transmitter", NULL, "LLOUT"},
@@ -288,15 +290,8 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_card *card = rtd->card;
         struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
-
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* Set up NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "MIC3L");
-        snd_soc_dapm_nc_pin(dapm, "MIC3R");
-        snd_soc_dapm_nc_pin(dapm, "LINE1R");
-
         err = tpa6130a2_add_controls(codec);
         if (err < 0) {
                 dev_err(card->dev, "Failed to add TPA6130A2 controls\n");
@@ -383,6 +378,7 @@ static struct snd_soc_card rx51_sound_card = {
         .num_aux_devs = ARRAY_SIZE(rx51_aux_dev),
         .codec_conf = rx51_codec_conf,
         .num_configs = ARRAY_SIZE(rx51_codec_conf),
+        .fully_routed = true,
 
         .controls = aic34_rx51_controls,
         .num_controls = ARRAY_SIZE(aic34_rx51_controls),
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index 938144c59e2b..807fedfa1c76 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -32,3 +32,12 @@ config SND_SOC_STORM
         help
           Say Y or M if you want add support for SoC audio on the
           Qualcomm Technologies IPQ806X-based Storm board.
+
+config SND_SOC_APQ8016_SBC
+        tristate "SoC Audio support for APQ8016 SBC platforms"
+        depends on SND_SOC_QCOM && (ARCH_QCOM || COMPILE_TEST)
+        select SND_SOC_LPASS_APQ8016
+        help
+          Support for Qualcomm Technologies LPASS audio block in
+          APQ8016 SOC-based systems.
+          Say Y if you want to use audio devices on MI2S.
diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
index ac7630833fe5..79e5c50a8f71 100644
--- a/sound/soc/qcom/Makefile
+++ b/sound/soc/qcom/Makefile
@@ -11,5 +11,7 @@ obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o
 
 # Machine
 snd-soc-storm-objs := storm.o
+snd-soc-apq8016-sbc-objs := apq8016_sbc.o
 
 obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
+obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
new file mode 100644
index 000000000000..1efdf0088ecd
--- /dev/null
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015 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/device.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <dt-bindings/sound/apq8016-lpass.h>
+
+struct apq8016_sbc_data {
+        void __iomem *mic_iomux;
+        void __iomem *spkr_iomux;
+        struct snd_soc_dai_link dai_link[];     /* dynamically allocated */
+};
+
+#define MIC_CTRL_QUA_WS_SLAVE_SEL_10    BIT(17)
+#define MIC_CTRL_TLMM_SCLK_EN           BIT(1)
+#define SPKR_CTL_PRI_WS_SLAVE_SEL_11    (BIT(17) | BIT(16))
+
+static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_card *card = rtd->card;
+        struct apq8016_sbc_data *pdata = snd_soc_card_get_drvdata(card);
+        int rval = 0;
+
+        switch (cpu_dai->id) {
+        case MI2S_PRIMARY:
+                writel(readl(pdata->spkr_iomux) | SPKR_CTL_PRI_WS_SLAVE_SEL_11,
+                        pdata->spkr_iomux);
+                break;
+
+        case MI2S_QUATERNARY:
+                /* Configure the Quat MI2S to TLMM */
+                writel(readl(pdata->mic_iomux) | MIC_CTRL_QUA_WS_SLAVE_SEL_10 |
+                        MIC_CTRL_TLMM_SCLK_EN,
+                        pdata->mic_iomux);
+                break;
+
+        default:
+                dev_err(card->dev, "unsupported cpu dai configuration\n");
+                rval = -EINVAL;
+                break;
+
+        }
+
+        return rval;
+}
+
+static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
+{
+        struct device *dev = card->dev;
+        struct snd_soc_dai_link *link;
+        struct device_node *np, *codec, *cpu, *node  = dev->of_node;
+        struct apq8016_sbc_data *data;
+        int ret, num_links;
+
+        ret = snd_soc_of_parse_card_name(card, "qcom,model");
+        if (ret) {
+                dev_err(dev, "Error parsing card name: %d\n", ret);
+                return ERR_PTR(ret);
+        }
+
+        /* Populate links */
+        num_links = of_get_child_count(node);
+
+        /* Allocate the private data and the DAI link array */
+        data = devm_kzalloc(dev, sizeof(*data) + sizeof(*link) * num_links,
+                            GFP_KERNEL);
+        if (!data)
+                return ERR_PTR(-ENOMEM);
+
+        card->dai_link  = &data->dai_link[0];
+        card->num_links = num_links;
+
+        link = data->dai_link;
+
+        for_each_child_of_node(node, np) {
+                cpu = of_get_child_by_name(np, "cpu");
+                codec = of_get_child_by_name(np, "codec");
+
+                if (!cpu || !codec) {
+                        dev_err(dev, "Can't find cpu/codec DT node\n");
+                        return ERR_PTR(-EINVAL);
+                }
+
+                link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0);
+                if (!link->cpu_of_node) {
+                        dev_err(card->dev, "error getting cpu phandle\n");
+                        return ERR_PTR(-EINVAL);
+                }
+
+                link->codec_of_node = of_parse_phandle(codec, "sound-dai", 0);
+                if (!link->codec_of_node) {
+                        dev_err(card->dev, "error getting codec phandle\n");
+                        return ERR_PTR(-EINVAL);
+                }
+
+                ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);
+                if (ret) {
+                        dev_err(card->dev, "error getting cpu dai name\n");
+                        return ERR_PTR(ret);
+                }
+
+                ret = snd_soc_of_get_dai_name(codec, &link->codec_dai_name);
+                if (ret) {
+                        dev_err(card->dev, "error getting codec dai name\n");
+                        return ERR_PTR(ret);
+                }
+
+                link->platform_of_node = link->cpu_of_node;
+                /* For now we only support playback */
+                link->playback_only = true;
+
+                ret = of_property_read_string(np, "link-name", &link->name);
+                if (ret) {
+                        dev_err(card->dev, "error getting codec dai_link name\n");
+                        return ERR_PTR(ret);
+                }
+
+                link->stream_name = link->name;
+                link->init = apq8016_sbc_dai_init;
+                link++;
+        }
+
+        return data;
+}
+
+static int apq8016_sbc_platform_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct snd_soc_card *card;
+        struct apq8016_sbc_data *data;
+        struct resource *res;
+
+        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+
+        card->dev = dev;
+        data = apq8016_sbc_parse_of(card);
+        if (IS_ERR(data)) {
+                dev_err(&pdev->dev, "Error resolving dai links: %ld\n",
+                        PTR_ERR(data));
+                return PTR_ERR(data);
+        }
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mic-iomux");
+        data->mic_iomux = devm_ioremap_resource(dev, res);
+        if (IS_ERR(data->mic_iomux))
+                return PTR_ERR(data->mic_iomux);
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "spkr-iomux");
+        data->spkr_iomux = devm_ioremap_resource(dev, res);
+        if (IS_ERR(data->spkr_iomux))
+                return PTR_ERR(data->spkr_iomux);
+
+        platform_set_drvdata(pdev, data);
+        snd_soc_card_set_drvdata(card, data);
+
+        return devm_snd_soc_register_card(&pdev->dev, card);
+}
+
+static const struct of_device_id apq8016_sbc_device_id[]  = {
+        { .compatible = "qcom,apq8016-sbc-sndcard" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, apq8016_sbc_device_id);
+
+static struct platform_driver apq8016_sbc_platform_driver = {
+        .driver = {
+                .name = "qcom-apq8016-sbc",
+                .of_match_table = of_match_ptr(apq8016_sbc_device_id),
+        },
+        .probe = apq8016_sbc_platform_probe,
+};
+module_platform_driver(apq8016_sbc_platform_driver);
+
+MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@linaro.org");
+MODULE_DESCRIPTION("APQ8016 ASoC Machine Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c
index b8bd296190ad..2d833bffdba0 100644
--- a/sound/soc/qcom/storm.c
+++ b/sound/soc/qcom/storm.c
@@ -69,11 +69,6 @@ static struct snd_soc_dai_link storm_dai_link = {
         .ops            = &storm_soc_ops,
 };
 
-static struct snd_soc_card storm_soc_card = {
-        .name   = "ipq806x-storm",
-        .dev    = NULL,
-};
-
 static int storm_parse_of(struct snd_soc_card *card)
 {
         struct snd_soc_dai_link *dai_link = card->dai_link;
@@ -99,14 +94,13 @@ static int storm_parse_of(struct snd_soc_card *card)
 
 static int storm_platform_probe(struct platform_device *pdev)
 {
-        struct snd_soc_card *card = &storm_soc_card;
+        struct snd_soc_card *card;
         int ret;
 
-        if (card->dev) {
-                dev_err(&pdev->dev, "%s() error, existing soundcard\n",
-                                __func__);
-                return -ENODEV;
-        }
+        card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+
         card->dev = &pdev->dev;
         platform_set_drvdata(pdev, card);
 
@@ -128,16 +122,12 @@ static int storm_platform_probe(struct platform_device *pdev)
         }
 
         ret = devm_snd_soc_register_card(&pdev->dev, card);
-        if (ret == -EPROBE_DEFER) {
-                card->dev = NULL;
-                return ret;
-        } else if (ret) {
+        if (ret)
                 dev_err(&pdev->dev, "%s() error registering soundcard: %d\n",
                                 __func__, ret);
-                return ret;
-        }
 
-        return 0;
+        return ret;
+
 }
 
 #ifdef CONFIG_OF
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index d460d2aa82ee..f1e5920654f6 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -137,15 +137,17 @@ char *rsnd_mod_name(struct rsnd_mod *mod)
         return mod->ops->name;
 }
 
-struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod)
+struct dma_chan *rsnd_mod_dma_req(struct rsnd_dai_stream *io,
+                                  struct rsnd_mod *mod)
 {
         if (!mod || !mod->ops || !mod->ops->dma_req)
                 return NULL;
 
-        return mod->ops->dma_req(mod);
+        return mod->ops->dma_req(io, mod);
 }
 
-int rsnd_mod_init(struct rsnd_mod *mod,
+int rsnd_mod_init(struct rsnd_priv *priv,
+                  struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
                    struct clk *clk,
                    enum rsnd_mod_type type,
@@ -160,6 +162,7 @@ int rsnd_mod_init(struct rsnd_mod *mod,
         mod->ops        = ops;
         mod->type       = type;
         mod->clk        = clk;
+        mod->priv       = priv;
 
         return ret;
 }
@@ -170,10 +173,31 @@ void rsnd_mod_quit(struct rsnd_mod *mod)
                 clk_unprepare(mod->clk);
 }
 
-int rsnd_mod_is_working(struct rsnd_mod *mod)
+void rsnd_mod_interrupt(struct rsnd_mod *mod,
+                        void (*callback)(struct rsnd_mod *mod,
+                                         struct rsnd_dai_stream *io))
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io;
+        struct rsnd_dai *rdai;
+        int i, j;
+
+        for_each_rsnd_dai(rdai, priv, j) {
+
+                for (i = 0; i < RSND_MOD_MAX; i++) {
+                        io = &rdai->playback;
+                        if (mod == io->mod[i])
+                                callback(mod, io);
+
+                        io = &rdai->capture;
+                        if (mod == io->mod[i])
+                                callback(mod, io);
+                }
+        }
+}
 
+int rsnd_io_is_working(struct rsnd_dai_stream *io)
+{
         /* see rsnd_dai_stream_init/quit() */
         return !!io->substream;
 }
@@ -181,10 +205,9 @@ int rsnd_mod_is_working(struct rsnd_mod *mod)
 /*
  *      settting function
  */
-u32 rsnd_get_adinr(struct rsnd_mod *mod)
+u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         u32 adinr = runtime->channels;
@@ -207,26 +230,31 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
 /*
  *      rsnd_dai functions
  */
-#define __rsnd_mod_call(mod, func, param...)                    \
+#define __rsnd_mod_call(mod, io, func, param...)                \
 ({                                                              \
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);         \
         struct device *dev = rsnd_priv_to_dev(priv);            \
-        u32 mask = (1 << __rsnd_mod_shift_##func) & ~(1 << 31); \
-        u32 call = __rsnd_mod_call_##func << __rsnd_mod_shift_##func;   \
+        u32 mask = 0xF << __rsnd_mod_shift_##func;                      \
+        u8 val  = (mod->status >> __rsnd_mod_shift_##func) & 0xF;       \
+        u8 add  = ((val + __rsnd_mod_add_##func) & 0xF);                \
         int ret = 0;                                                    \
-        if ((mod->status & mask) == call) {                             \
-                dev_dbg(dev, "%s[%d] %s\n",                             \
-                        rsnd_mod_name(mod), rsnd_mod_id(mod), #func);   \
-                ret = (mod)->ops->func(mod, param);                     \
-                mod->status = (mod->status & ~mask) | (~call & mask);   \
+        int called = 0;                                                 \
+        if (val == __rsnd_mod_call_##func) {                            \
+                called = 1;                                             \
+                ret = (mod)->ops->func(mod, io, param);                 \
+                mod->status = (mod->status & ~mask) +                   \
+                        (add << __rsnd_mod_shift_##func);               \
         }                                                               \
+        dev_dbg(dev, "%s[%d] 0x%08x %s\n",                              \
+                rsnd_mod_name(mod), rsnd_mod_id(mod), mod->status,      \
+                called ? #func : "");                                   \
         ret;                                                            \
 })
 
-#define rsnd_mod_call(mod, func, param...)      \
+#define rsnd_mod_call(mod, io, func, param...)  \
         (!(mod) ? -ENODEV :                     \
          !((mod)->ops->func) ? 0 :              \
-         __rsnd_mod_call(mod, func, param))
+         __rsnd_mod_call(mod, io, func, param))
 
 #define rsnd_dai_call(fn, io, param...)                         \
 ({                                                              \
@@ -236,7 +264,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
                 mod = (io)->mod[i];                             \
                 if (!mod)                                       \
                         continue;                               \
-                ret = rsnd_mod_call(mod, fn, param);            \
+                ret = rsnd_mod_call(mod, io, fn, param);        \
                 if (ret < 0)                                    \
                         break;                                  \
         }                                                       \
@@ -260,7 +288,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
         }
 
         io->mod[mod->type] = mod;
-        mod->io = io;
 
         return 0;
 }
@@ -268,7 +295,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
 static void rsnd_dai_disconnect(struct rsnd_mod *mod,
                                 struct rsnd_dai_stream *io)
 {
-        mod->io = NULL;
         io->mod[mod->type] = NULL;
 }
 
@@ -302,7 +328,7 @@ int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional)
         return pos;
 }
 
-void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int byte)
+bool rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int byte)
 {
         io->byte_pos += byte;
 
@@ -319,8 +345,24 @@ void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int byte)
                         io->next_period_byte = io->byte_per_period;
                 }
 
-                snd_pcm_period_elapsed(substream);
+                return true;
         }
+
+        return false;
+}
+
+void rsnd_dai_period_elapsed(struct rsnd_dai_stream *io)
+{
+        struct snd_pcm_substream *substream = io->substream;
+
+        /*
+         * this function should be called...
+         *
+         * - if rsnd_dai_pointer_update() returns true
+         * - without spin lock
+         */
+
+        snd_pcm_period_elapsed(substream);
 }
 
 static void rsnd_dai_stream_init(struct rsnd_dai_stream *io,
@@ -834,16 +876,18 @@ static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,
         }
 
         if (change)
-                cfg->update(mod);
+                cfg->update(cfg->io, mod);
 
         return change;
 }
 
 static int __rsnd_kctrl_new(struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io,
                             struct snd_soc_pcm_runtime *rtd,
                             const unsigned char *name,
                             struct rsnd_kctrl_cfg *cfg,
-                            void (*update)(struct rsnd_mod *mod))
+                            void (*update)(struct rsnd_dai_stream *io,
+                                           struct rsnd_mod *mod))
 {
         struct snd_soc_card *soc_card = rtd->card;
         struct snd_card *card = rtd->card->snd_card;
@@ -872,6 +916,7 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
         cfg->update = update;
         cfg->card = card;
         cfg->kctrl = kctrl;
+        cfg->io = io;
 
         return 0;
 }
@@ -882,36 +927,42 @@ void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg)
 }
 
 int rsnd_kctrl_new_m(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_m *_cfg,
                      u32 max)
 {
         _cfg->cfg.max   = max;
         _cfg->cfg.size  = RSND_DVC_CHANNELS;
         _cfg->cfg.val   = _cfg->val;
-        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, io, rtd, name, &_cfg->cfg, update);
 }
 
 int rsnd_kctrl_new_s(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_s *_cfg,
                      u32 max)
 {
         _cfg->cfg.max   = max;
         _cfg->cfg.size  = 1;
         _cfg->cfg.val   = &_cfg->val;
-        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, io, rtd, name, &_cfg->cfg, update);
 }
 
 int rsnd_kctrl_new_e(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      struct rsnd_kctrl_cfg_s *_cfg,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      const char * const *texts,
                      u32 max)
 {
@@ -919,7 +970,7 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
         _cfg->cfg.size  = 1;
         _cfg->cfg.val   = &_cfg->val;
         _cfg->cfg.texts = texts;
-        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, io, rtd, name, &_cfg->cfg, update);
 }
 
 /*
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 144308f15fb3..d306e298c63d 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -32,11 +32,12 @@ struct rsnd_dma_ctrl {
 /*
  *              Audio DMAC
  */
-static void rsnd_dmaen_complete(void *data)
+static void __rsnd_dmaen_complete(struct rsnd_mod *mod,
+                                  struct rsnd_dai_stream *io)
 {
-        struct rsnd_dma *dma = (struct rsnd_dma *)data;
-        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        bool elapsed = false;
+        unsigned long flags;
 
         /*
          * Renesas sound Gen1 needs 1 DMAC,
@@ -49,23 +50,36 @@ static void rsnd_dmaen_complete(void *data)
          * rsnd_dai_pointer_update() will be called twice,
          * ant it will breaks io->byte_pos
          */
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (rsnd_io_is_working(io))
+                elapsed = rsnd_dai_pointer_update(io, io->byte_per_period);
 
-        rsnd_dai_pointer_update(io, io->byte_per_period);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        if (elapsed)
+                rsnd_dai_period_elapsed(io);
 }
 
-static void rsnd_dmaen_stop(struct rsnd_dma *dma)
+static void rsnd_dmaen_complete(void *data)
+{
+        struct rsnd_mod *mod = data;
+
+        rsnd_mod_interrupt(mod, __rsnd_dmaen_complete);
+}
+
+static void rsnd_dmaen_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
 
         dmaengine_terminate_all(dmaen->chan);
 }
 
-static void rsnd_dmaen_start(struct rsnd_dma *dma)
+static void rsnd_dmaen_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
         struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_substream *substream = io->substream;
         struct device *dev = rsnd_priv_to_dev(priv);
         struct dma_async_tx_descriptor *desc;
@@ -84,7 +98,7 @@ static void rsnd_dmaen_start(struct rsnd_dma *dma)
         }
 
         desc->callback          = rsnd_dmaen_complete;
-        desc->callback_param    = dma;
+        desc->callback_param    = mod;
 
         if (dmaengine_submit(desc) < 0) {
                 dev_err(dev, "dmaengine_submit() fail\n");
@@ -115,7 +129,8 @@ struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
         return chan;
 }
 
-static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_mod *mod_from,
+static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_dai_stream *io,
+                                                   struct rsnd_mod *mod_from,
                                                    struct rsnd_mod *mod_to)
 {
         if ((!mod_from && !mod_to) ||
@@ -123,19 +138,19 @@ static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_mod *mod_from,
                 return NULL;
 
         if (mod_from)
-                return rsnd_mod_dma_req(mod_from);
+                return rsnd_mod_dma_req(io, mod_from);
         else
-                return rsnd_mod_dma_req(mod_to);
+                return rsnd_mod_dma_req(io, mod_to);
 }
 
-static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+static int rsnd_dmaen_init(struct rsnd_dai_stream *io,
+                           struct rsnd_dma *dma, int id,
                            struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
         struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         struct dma_slave_config cfg = {};
-        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         int is_play = rsnd_io_is_play(io);
         int ret;
 
@@ -145,7 +160,7 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
         }
 
         if (dev->of_node) {
-                dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to);
+                dmaen->chan = rsnd_dmaen_request_channel(io, mod_from, mod_to);
         } else {
                 dma_cap_mask_t mask;
 
@@ -177,7 +192,7 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
         return 0;
 
 rsnd_dma_init_err:
-        rsnd_dma_quit(dma);
+        rsnd_dma_quit(io, dma);
 rsnd_dma_channel_err:
 
         /*
@@ -189,7 +204,7 @@ rsnd_dma_channel_err:
         return -EAGAIN;
 }
 
-static void rsnd_dmaen_quit(struct rsnd_dma *dma)
+static void rsnd_dmaen_quit(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
 
@@ -238,9 +253,9 @@ static const u8 gen2_id_table_cmd[] = {
         0x38, /* SCU_CMD1 */
 };
 
-static u32 rsnd_dmapp_get_id(struct rsnd_mod *mod)
+static u32 rsnd_dmapp_get_id(struct rsnd_dai_stream *io,
+                             struct rsnd_mod *mod)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
         struct rsnd_mod *src = rsnd_io_to_mod_src(io);
         struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
@@ -268,11 +283,12 @@ static u32 rsnd_dmapp_get_id(struct rsnd_mod *mod)
         return entry[id];
 }
 
-static u32 rsnd_dmapp_get_chcr(struct rsnd_mod *mod_from,
+static u32 rsnd_dmapp_get_chcr(struct rsnd_dai_stream *io,
+                               struct rsnd_mod *mod_from,
                                struct rsnd_mod *mod_to)
 {
-        return  (rsnd_dmapp_get_id(mod_from) << 24) +
-                (rsnd_dmapp_get_id(mod_to) << 16);
+        return  (rsnd_dmapp_get_id(io, mod_from) << 24) +
+                (rsnd_dmapp_get_id(io, mod_to) << 16);
 }
 
 #define rsnd_dmapp_addr(dmac, dma, reg) \
@@ -299,7 +315,7 @@ static u32 rsnd_dmapp_read(struct rsnd_dma *dma, u32 reg)
         return ioread32(rsnd_dmapp_addr(dmac, dma, reg));
 }
 
-static void rsnd_dmapp_stop(struct rsnd_dma *dma)
+static void rsnd_dmapp_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         int i;
 
@@ -312,7 +328,7 @@ static void rsnd_dmapp_stop(struct rsnd_dma *dma)
         }
 }
 
-static void rsnd_dmapp_start(struct rsnd_dma *dma)
+static void rsnd_dmapp_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
 
@@ -321,19 +337,21 @@ static void rsnd_dmapp_start(struct rsnd_dma *dma)
         rsnd_dmapp_write(dma, dmapp->chcr,      PDMACHCR);
 }
 
-static int rsnd_dmapp_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+static int rsnd_dmapp_init(struct rsnd_dai_stream *io,
+                           struct rsnd_dma *dma, int id,
                            struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
         struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
         struct device *dev = rsnd_priv_to_dev(priv);
 
         dmapp->dmapp_id = dmac->dmapp_num;
-        dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE;
+        dmapp->chcr = rsnd_dmapp_get_chcr(io, mod_from, mod_to) | PDMACHCR_DE;
 
         dmac->dmapp_num++;
 
-        rsnd_dmapp_stop(dma);
+        rsnd_dmapp_stop(io, dma);
 
         dev_dbg(dev, "id/src/dst/chcr = %d/%pad/%pad/%08x\n",
                 dmapp->dmapp_id, &dma->src_addr, &dma->dst_addr, dmapp->chcr);
@@ -386,12 +404,12 @@ static struct rsnd_dma_ops rsnd_dmapp_ops = {
 #define RDMA_CMD_O_P(addr, i)   (addr ##_reg - 0x001f8000 + (0x400 * i))
 
 static dma_addr_t
-rsnd_gen2_dma_addr(struct rsnd_priv *priv,
+rsnd_gen2_dma_addr(struct rsnd_dai_stream *io,
                    struct rsnd_mod *mod,
                    int is_play, int is_from)
 {
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct device *dev = rsnd_priv_to_dev(priv);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SSI);
         phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SCU);
         int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
@@ -438,7 +456,7 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv,
                 dev_err(dev, "DVC is selected without SRC\n");
 
         /* use SSIU or SSI ? */
-        if (is_ssi && rsnd_ssi_use_busif(mod))
+        if (is_ssi && rsnd_ssi_use_busif(io, mod))
                 is_ssi++;
 
         return (is_from) ?
@@ -446,10 +464,12 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv,
                 dma_addrs[is_ssi][is_play][use_src + use_dvc].in_addr;
 }
 
-static dma_addr_t rsnd_dma_addr(struct rsnd_priv *priv,
+static dma_addr_t rsnd_dma_addr(struct rsnd_dai_stream *io,
                                 struct rsnd_mod *mod,
                                 int is_play, int is_from)
 {
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
+
         /*
          * gen1 uses default DMA addr
          */
@@ -459,17 +479,17 @@ static dma_addr_t rsnd_dma_addr(struct rsnd_priv *priv,
         if (!mod)
                 return 0;
 
-        return rsnd_gen2_dma_addr(priv, mod, is_play, is_from);
+        return rsnd_gen2_dma_addr(io, mod, is_play, is_from);
 }
 
 #define MOD_MAX 4 /* MEM/SSI/SRC/DVC */
 static void rsnd_dma_of_path(struct rsnd_dma *dma,
+                             struct rsnd_dai_stream *io,
                              int is_play,
                              struct rsnd_mod **mod_from,
                              struct rsnd_mod **mod_to)
 {
         struct rsnd_mod *this = rsnd_dma_to_mod(dma);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(this);
         struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
         struct rsnd_mod *src = rsnd_io_to_mod_src(io);
         struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
@@ -524,17 +544,17 @@ static void rsnd_dma_of_path(struct rsnd_dma *dma,
         }
 }
 
-void rsnd_dma_stop(struct rsnd_dma *dma)
+void rsnd_dma_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
-        dma->ops->stop(dma);
+        dma->ops->stop(io, dma);
 }
 
-void rsnd_dma_start(struct rsnd_dma *dma)
+void rsnd_dma_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
-        dma->ops->start(dma);
+        dma->ops->start(io, dma);
 }
 
-void rsnd_dma_quit(struct rsnd_dma *dma)
+void rsnd_dma_quit(struct rsnd_dai_stream *io, struct rsnd_dma *dma)
 {
         struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
@@ -543,15 +563,14 @@ void rsnd_dma_quit(struct rsnd_dma *dma)
         if (!dmac)
                 return;
 
-        dma->ops->quit(dma);
+        dma->ops->quit(io, dma);
 }
 
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id)
+int rsnd_dma_init(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id)
 {
-        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
         struct rsnd_mod *mod_from;
         struct rsnd_mod *mod_to;
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
         int is_play = rsnd_io_is_play(io);
 
@@ -564,10 +583,10 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id)
         if (!dmac)
                 return -EAGAIN;
 
-        rsnd_dma_of_path(dma, is_play, &mod_from, &mod_to);
+        rsnd_dma_of_path(dma, io, is_play, &mod_from, &mod_to);
 
-        dma->src_addr = rsnd_dma_addr(priv, mod_from, is_play, 1);
-        dma->dst_addr = rsnd_dma_addr(priv, mod_to,   is_play, 0);
+        dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1);
+        dma->dst_addr = rsnd_dma_addr(io, mod_to,   is_play, 0);
 
         /* for Gen2 */
         if (mod_from && mod_to)
@@ -579,7 +598,7 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id)
         if (rsnd_is_gen1(priv))
                 dma->ops = &rsnd_dmaen_ops;
 
-        return dma->ops->init(priv, dma, id, mod_from, mod_to);
+        return dma->ops->init(io, dma, id, mod_from, mod_to);
 }
 
 int rsnd_dma_probe(struct platform_device *pdev,
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index e5fcb062ad77..36fc020cbc18 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -63,7 +63,8 @@ static const char * const dvc_ramp_rate[] = {
         "0.125 dB/8192 steps",   /* 10111 */
 };
 
-static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
+static void rsnd_dvc_volume_update(struct rsnd_dai_stream *io,
+                                   struct rsnd_mod *mod)
 {
         struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
         u32 val[RSND_DVC_CHANNELS];
@@ -120,6 +121,7 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
 }
 
 static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,
+                                struct rsnd_dai_stream *io,
                                 struct rsnd_priv *priv)
 {
         struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
@@ -134,9 +136,9 @@ static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(dvc_mod);
         struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         int dvc_id = rsnd_mod_id(dvc_mod);
@@ -168,10 +170,10 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
 
         rsnd_mod_write(dvc_mod, DVC_DVUIR, 1);
 
-        rsnd_mod_write(dvc_mod, DVC_ADINR, rsnd_get_adinr(dvc_mod));
+        rsnd_mod_write(dvc_mod, DVC_ADINR, rsnd_get_adinr(dvc_mod, io));
 
         /* ch0/ch1 Volume */
-        rsnd_dvc_volume_update(dvc_mod);
+        rsnd_dvc_volume_update(io, dvc_mod);
 
         rsnd_mod_write(dvc_mod, DVC_DVUIR, 0);
 
@@ -181,6 +183,7 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
 }
 
 static int rsnd_dvc_quit(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         rsnd_mod_hw_stop(mod);
@@ -189,6 +192,7 @@ static int rsnd_dvc_quit(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_start(struct rsnd_mod *mod,
+                          struct rsnd_dai_stream *io,
                           struct rsnd_priv *priv)
 {
         rsnd_mod_write(mod, CMD_CTRL, 0x10);
@@ -197,6 +201,7 @@ static int rsnd_dvc_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_stop(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         rsnd_mod_write(mod, CMD_CTRL, 0);
@@ -205,15 +210,15 @@ static int rsnd_dvc_stop(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io,
                             struct snd_soc_pcm_runtime *rtd)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
         int is_play = rsnd_io_is_play(io);
         int ret;
 
         /* Volume */
-        ret = rsnd_kctrl_new_m(mod, rtd,
+        ret = rsnd_kctrl_new_m(mod, io, rtd,
                         is_play ?
                         "DVC Out Playback Volume" : "DVC In Capture Volume",
                         rsnd_dvc_volume_update,
@@ -222,7 +227,7 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
                 return ret;
 
         /* Mute */
-        ret = rsnd_kctrl_new_m(mod, rtd,
+        ret = rsnd_kctrl_new_m(mod, io, rtd,
                         is_play ?
                         "DVC Out Mute Switch" : "DVC In Mute Switch",
                         rsnd_dvc_volume_update,
@@ -231,7 +236,7 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
                 return ret;
 
         /* Ramp */
-        ret = rsnd_kctrl_new_s(mod, rtd,
+        ret = rsnd_kctrl_new_s(mod, io, rtd,
                         is_play ?
                         "DVC Out Ramp Switch" : "DVC In Ramp Switch",
                         rsnd_dvc_volume_update,
@@ -239,7 +244,7 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_kctrl_new_e(mod, rtd,
+        ret = rsnd_kctrl_new_e(mod, io, rtd,
                         is_play ?
                         "DVC Out Ramp Up Rate" : "DVC In Ramp Up Rate",
                         &dvc->rup,
@@ -248,7 +253,7 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_kctrl_new_e(mod, rtd,
+        ret = rsnd_kctrl_new_e(mod, io, rtd,
                         is_play ?
                         "DVC Out Ramp Down Rate" : "DVC In Ramp Down Rate",
                         &dvc->rdown,
@@ -261,7 +266,8 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
         return 0;
 }
 
-static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_mod *mod)
+static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_dai_stream *io,
+                                         struct rsnd_mod *mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
 
@@ -366,7 +372,7 @@ int rsnd_dvc_probe(struct platform_device *pdev,
 
                 dvc->info = &info->dvc_info[i];
 
-                ret = rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops,
+                ret = rsnd_mod_init(priv, &dvc->mod, &rsnd_dvc_ops,
                               clk, RSND_MOD_DVC, i);
                 if (ret)
                         return ret;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 03ff071d012f..09fcc54a8ee0 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -165,18 +165,18 @@ void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod,
                 enum rsnd_reg reg, u32 data);
 void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg,
                     u32 mask, u32 data);
-u32 rsnd_get_adinr(struct rsnd_mod *mod);
+u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io);
 
 /*
  *      R-Car DMA
  */
 struct rsnd_dma;
 struct rsnd_dma_ops {
-        void (*start)(struct rsnd_dma *dma);
-        void (*stop)(struct rsnd_dma *dma);
-        int (*init)(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+        void (*start)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
+        void (*stop)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
+        int (*init)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id,
                     struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);
-        void  (*quit)(struct rsnd_dma *dma);
+        void (*quit)(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 };
 
 struct rsnd_dmaen {
@@ -200,10 +200,10 @@ struct rsnd_dma {
 #define rsnd_dma_to_dmaen(dma)  (&(dma)->dma.en)
 #define rsnd_dma_to_dmapp(dma)  (&(dma)->dma.pp)
 
-void rsnd_dma_start(struct rsnd_dma *dma);
-void rsnd_dma_stop(struct rsnd_dma *dma);
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id);
-void  rsnd_dma_quit(struct rsnd_dma *dma);
+void rsnd_dma_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
+void rsnd_dma_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
+int rsnd_dma_init(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id);
+void rsnd_dma_quit(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 int rsnd_dma_probe(struct platform_device *pdev,
                    const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv);
@@ -224,25 +224,35 @@ enum rsnd_mod_type {
 
 struct rsnd_mod_ops {
         char *name;
-        struct dma_chan* (*dma_req)(struct rsnd_mod *mod);
+        struct dma_chan* (*dma_req)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod);
         int (*probe)(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct rsnd_priv *priv);
         int (*remove)(struct rsnd_mod *mod,
+                      struct rsnd_dai_stream *io,
                       struct rsnd_priv *priv);
         int (*init)(struct rsnd_mod *mod,
+                    struct rsnd_dai_stream *io,
                     struct rsnd_priv *priv);
         int (*quit)(struct rsnd_mod *mod,
+                    struct rsnd_dai_stream *io,
                     struct rsnd_priv *priv);
         int (*start)(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct rsnd_priv *priv);
         int (*stop)(struct rsnd_mod *mod,
+                    struct rsnd_dai_stream *io,
                     struct rsnd_priv *priv);
         int (*pcm_new)(struct rsnd_mod *mod,
+                       struct rsnd_dai_stream *io,
                        struct snd_soc_pcm_runtime *rtd);
         int (*hw_params)(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct snd_pcm_substream *substream,
                          struct snd_pcm_hw_params *hw_params);
         int (*fallback)(struct rsnd_mod *mod,
+                        struct rsnd_dai_stream *io,
                         struct rsnd_priv *priv);
 };
 
@@ -252,32 +262,43 @@ struct rsnd_mod {
         enum rsnd_mod_type type;
         struct rsnd_mod_ops *ops;
         struct rsnd_dma dma;
-        struct rsnd_dai_stream *io;
+        struct rsnd_priv *priv;
         struct clk *clk;
         u32 status;
 };
 /*
  * status
  *
- * bit
- * 0    0: probe        1: remove
- * 1    0: init         1: quit
- * 2    0: start        1: stop
- * 3    0: pcm_new
- * 4    0: fallback
+ * 0xH0000CBA
+ *
+ * A    0: probe        1: remove
+ * B    0: init         1: quit
+ * C    0: start        1: stop
  *
- * 31 bit is always called (see __rsnd_mod_call)
- * 31   0: hw_params
+ * H is always called (see __rsnd_mod_call)
+ * H    0: pcm_new
+ * H    0: fallback
+ * H    0: hw_params
  */
 #define __rsnd_mod_shift_probe          0
 #define __rsnd_mod_shift_remove         0
-#define __rsnd_mod_shift_init           1
-#define __rsnd_mod_shift_quit           1
-#define __rsnd_mod_shift_start          2
-#define __rsnd_mod_shift_stop           2
-#define __rsnd_mod_shift_pcm_new        3
-#define __rsnd_mod_shift_fallback       4
-#define __rsnd_mod_shift_hw_params      31 /* always called */
+#define __rsnd_mod_shift_init           4
+#define __rsnd_mod_shift_quit           4
+#define __rsnd_mod_shift_start          8
+#define __rsnd_mod_shift_stop           8
+#define __rsnd_mod_shift_pcm_new        28 /* always called */
+#define __rsnd_mod_shift_fallback       28 /* always called */
+#define __rsnd_mod_shift_hw_params      28 /* always called */
+
+#define __rsnd_mod_add_probe             1
+#define __rsnd_mod_add_remove           -1
+#define __rsnd_mod_add_init              1
+#define __rsnd_mod_add_quit             -1
+#define __rsnd_mod_add_start             1
+#define __rsnd_mod_add_stop             -1
+#define __rsnd_mod_add_pcm_new          0
+#define __rsnd_mod_add_fallback         0
+#define __rsnd_mod_add_hw_params        0
 
 #define __rsnd_mod_call_probe           0
 #define __rsnd_mod_call_remove          1
@@ -289,22 +310,25 @@ struct rsnd_mod {
 #define __rsnd_mod_call_fallback        0
 #define __rsnd_mod_call_hw_params       0
 
-#define rsnd_mod_to_priv(mod) (rsnd_io_to_priv(rsnd_mod_to_io(mod)))
+#define rsnd_mod_to_priv(mod) ((mod)->priv)
 #define rsnd_mod_to_dma(mod) (&(mod)->dma)
-#define rsnd_mod_to_io(mod) ((mod)->io)
 #define rsnd_mod_id(mod) ((mod)->id)
 #define rsnd_mod_hw_start(mod)  clk_enable((mod)->clk)
 #define rsnd_mod_hw_stop(mod)   clk_disable((mod)->clk)
 
-int rsnd_mod_init(struct rsnd_mod *mod,
+int rsnd_mod_init(struct rsnd_priv *priv,
+                  struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
                    struct clk *clk,
                    enum rsnd_mod_type type,
                    int id);
 void rsnd_mod_quit(struct rsnd_mod *mod);
 char *rsnd_mod_name(struct rsnd_mod *mod);
-int rsnd_mod_is_working(struct rsnd_mod *mod);
-struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod);
+struct dma_chan *rsnd_mod_dma_req(struct rsnd_dai_stream *io,
+                                  struct rsnd_mod *mod);
+void rsnd_mod_interrupt(struct rsnd_mod *mod,
+                        void (*callback)(struct rsnd_mod *mod,
+                                         struct rsnd_dai_stream *io));
 
 /*
  *      R-Car sound DAI
@@ -329,7 +353,7 @@ struct rsnd_dai_stream {
 #define rsnd_io_is_play(io)     (&rsnd_io_to_rdai(io)->playback == io)
 #define rsnd_io_to_runtime(io) ((io)->substream ? \
                                 (io)->substream->runtime : NULL)
-
+int rsnd_io_is_working(struct rsnd_dai_stream *io);
 
 struct rsnd_dai {
         char name[RSND_DAI_NAME_SIZE];
@@ -355,7 +379,8 @@ struct rsnd_dai {
 
 struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id);
 
-void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt);
+bool rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt);
+void rsnd_dai_period_elapsed(struct rsnd_dai_stream *io);
 int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);
 
 /*
@@ -459,7 +484,8 @@ struct rsnd_kctrl_cfg {
         unsigned int size;
         u32 *val;
         const char * const *texts;
-        void (*update)(struct rsnd_mod *mod);
+        void (*update)(struct rsnd_dai_stream *io, struct rsnd_mod *mod);
+        struct rsnd_dai_stream *io;
         struct snd_card *card;
         struct snd_kcontrol *kctrl;
 };
@@ -479,22 +505,28 @@ void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg);
 #define rsnd_kctrl_remove(_cfg) _rsnd_kctrl_remove(&((_cfg).cfg))
 
 int rsnd_kctrl_new_m(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_m *_cfg,
                      u32 max);
 int rsnd_kctrl_new_s(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_s *_cfg,
                      u32 max);
 int rsnd_kctrl_new_e(struct rsnd_mod *mod,
+                     struct rsnd_dai_stream *io,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      struct rsnd_kctrl_cfg_s *_cfg,
-                     void (*update)(struct rsnd_mod *mod),
+                     void (*update)(struct rsnd_dai_stream *io,
+                                    struct rsnd_mod *mod),
                      const char * const *texts,
                      u32 max);
 
@@ -511,8 +543,10 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                                    struct rsnd_dai_stream *io,
                                    struct snd_pcm_runtime *runtime);
 int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
+                        struct rsnd_dai_stream *io,
                         int use_busif);
-int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod);
+int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
+                       struct rsnd_dai_stream *io);
 int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod);
 int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);
 
@@ -529,7 +563,7 @@ void rsnd_ssi_remove(struct platform_device *pdev,
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
 int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
 int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);
-int rsnd_ssi_use_busif(struct rsnd_mod *mod);
+int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod);
 
 /*
  *      R-Car DVC
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 050b0dbcee65..8caca2e180c3 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -45,61 +45,50 @@ static const struct of_device_id rsrc_card_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, rsrc_card_of_match);
 
+#define DAI_NAME_NUM    32
 struct rsrc_card_dai {
-        const char *name;
         unsigned int fmt;
         unsigned int sysclk;
         struct clk *clk;
+        char dai_name[DAI_NAME_NUM];
 };
 
-#define RSRC_FB_NUM     2 /* FE/BE */
 #define IDX_CPU         0
 #define IDX_CODEC       1
 struct rsrc_card_priv {
         struct snd_soc_card snd_card;
-        struct rsrc_card_dai_props {
-                struct rsrc_card_dai cpu_dai;
-                struct rsrc_card_dai codec_dai;
-        } dai_props[RSRC_FB_NUM];
         struct snd_soc_codec_conf codec_conf;
-        struct snd_soc_dai_link dai_link[RSRC_FB_NUM];
+        struct rsrc_card_dai *dai_props;
+        struct snd_soc_dai_link *dai_link;
+        int dai_num;
         u32 convert_rate;
 };
 
 #define rsrc_priv_to_dev(priv) ((priv)->snd_card.dev)
-#define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + i)
-#define rsrc_priv_to_props(priv, i) ((priv)->dai_props + i)
+#define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i))
+#define rsrc_priv_to_props(priv, i) ((priv)->dai_props + (i))
 #define rsrc_dev_to_of_data(dev) (of_match_device(rsrc_card_of_match, (dev))->data)
 
 static int rsrc_card_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
-        struct rsrc_card_dai_props *dai_props =
-                &priv->dai_props[rtd - rtd->card->rtd];
+        struct rsrc_card_dai *dai_props =
+                rsrc_priv_to_props(priv, rtd - rtd->card->rtd);
         int ret;
 
-        ret = clk_prepare_enable(dai_props->cpu_dai.clk);
-        if (ret)
-                return ret;
-
-        ret = clk_prepare_enable(dai_props->codec_dai.clk);
-        if (ret)
-                clk_disable_unprepare(dai_props->cpu_dai.clk);
 
-        return ret;
+        return clk_prepare_enable(dai_props->clk);
 }
 
 static void rsrc_card_shutdown(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
-        struct rsrc_card_dai_props *dai_props =
-                &priv->dai_props[rtd - rtd->card->rtd];
-
-        clk_disable_unprepare(dai_props->cpu_dai.clk);
+        struct rsrc_card_dai *dai_props =
+                rsrc_priv_to_props(priv, rtd - rtd->card->rtd);
 
-        clk_disable_unprepare(dai_props->codec_dai.clk);
+        clk_disable_unprepare(dai_props->clk);
 }
 
 static struct snd_soc_ops rsrc_card_ops = {
@@ -107,21 +96,31 @@ static struct snd_soc_ops rsrc_card_ops = {
         .shutdown = rsrc_card_shutdown,
 };
 
-static int __rsrc_card_dai_init(struct snd_soc_dai *dai,
-                                struct rsrc_card_dai *set)
+static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
+        struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct snd_soc_dai *dai;
+        struct snd_soc_dai_link *dai_link;
+        struct rsrc_card_dai *dai_props;
+        int num = rtd - rtd->card->rtd;
         int ret;
 
-        if (set->fmt) {
-                ret = snd_soc_dai_set_fmt(dai, set->fmt);
+        dai_link        = rsrc_priv_to_link(priv, num);
+        dai_props       = rsrc_priv_to_props(priv, num);
+        dai             = dai_link->dynamic ?
+                                rtd->cpu_dai :
+                                rtd->codec_dai;
+
+        if (dai_props->fmt) {
+                ret = snd_soc_dai_set_fmt(dai, dai_props->fmt);
                 if (ret && ret != -ENOTSUPP) {
                         dev_err(dai->dev, "set_fmt error\n");
                         goto err;
                 }
         }
 
-        if (set->sysclk) {
-                ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
+        if (dai_props->sysclk) {
+                ret = snd_soc_dai_set_sysclk(dai, 0, dai_props->sysclk, 0);
                 if (ret && ret != -ENOTSUPP) {
                         dev_err(dai->dev, "set_sysclk error\n");
                         goto err;
@@ -134,27 +133,6 @@ err:
         return ret;
 }
 
-static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
-        struct snd_soc_dai *codec = rtd->codec_dai;
-        struct snd_soc_dai *cpu = rtd->cpu_dai;
-        struct rsrc_card_dai_props *dai_props;
-        int num, ret;
-
-        num = rtd - rtd->card->rtd;
-        dai_props = &priv->dai_props[num];
-        ret = __rsrc_card_dai_init(codec, &dai_props->codec_dai);
-        if (ret < 0)
-                return ret;
-
-        ret = __rsrc_card_dai_init(cpu, &dai_props->cpu_dai);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
 static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                         struct snd_pcm_hw_params *params)
 {
@@ -170,40 +148,47 @@ static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
         return 0;
 }
 
-static int
-rsrc_card_sub_parse_of(struct rsrc_card_priv *priv,
-                       struct device_node *np,
-                       struct rsrc_card_dai *dai,
-                       struct snd_soc_dai_link *dai_link,
-                       int *args_count)
+static int rsrc_card_parse_daifmt(struct device_node *node,
+                                  struct device_node *np,
+                                  struct rsrc_card_priv *priv,
+                                  int idx, bool is_fe)
 {
-        struct device *dev = rsrc_priv_to_dev(priv);
-        const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
-        struct of_phandle_args args;
-        struct device_node **p_node;
-        struct clk *clk;
-        const char **dai_name;
-        const char **name;
-        u32 val;
-        int ret;
+        struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, idx);
+        struct device_node *bitclkmaster = NULL;
+        struct device_node *framemaster = NULL;
+        struct device_node *codec = is_fe ? NULL : np;
+        unsigned int daifmt;
 
-        if (args_count) {
-                p_node          = &dai_link->cpu_of_node;
-                dai_name        = &dai_link->cpu_dai_name;
-                name            = &dai_link->cpu_name;
-        } else {
-                p_node          = &dai_link->codec_of_node;
-                dai_name        = &dai_link->codec_dai_name;
-                name            = &dai_link->codec_name;
-        }
+        daifmt = snd_soc_of_parse_daifmt(node, NULL,
+                                         &bitclkmaster, &framemaster);
+        daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
 
-        if (!np) {
-                /* use snd-soc-dummy */
-                *p_node         = NULL;
-                *dai_name       = "snd-soc-dummy-dai";
-                *name           = "snd-soc-dummy";
-                return 0;
-        }
+        if (!bitclkmaster && !framemaster)
+                return -EINVAL;
+
+        if (codec == bitclkmaster)
+                daifmt |= (codec == framemaster) ?
+                        SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;
+        else
+                daifmt |= (codec == framemaster) ?
+                        SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;
+
+        dai_props->fmt  = daifmt;
+
+        of_node_put(bitclkmaster);
+        of_node_put(framemaster);
+
+        return 0;
+}
+
+static int rsrc_card_parse_links(struct device_node *np,
+                                 struct rsrc_card_priv *priv,
+                                 int idx, bool is_fe)
+{
+        struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);
+        struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, idx);
+        struct of_phandle_args args;
+        int ret;
 
         /*
          * Get node via "sound-dai = <&phandle port>"
@@ -214,31 +199,82 @@ rsrc_card_sub_parse_of(struct rsrc_card_priv *priv,
         if (ret)
                 return ret;
 
-        *p_node = args.np;
+        if (is_fe) {
+                /* BE is dummy */
+                dai_link->codec_of_node         = NULL;
+                dai_link->codec_dai_name        = "snd-soc-dummy-dai";
+                dai_link->codec_name            = "snd-soc-dummy";
+
+                /* FE settings */
+                dai_link->dynamic               = 1;
+                dai_link->dpcm_merged_format    = 1;
+                dai_link->cpu_of_node           = args.np;
+                snd_soc_of_get_dai_name(np, &dai_link->cpu_dai_name);
+
+                /* set dai_name */
+                snprintf(dai_props->dai_name, DAI_NAME_NUM, "fe.%s",
+                         dai_link->cpu_dai_name);
+
+                /*
+                 * In soc_bind_dai_link() will check cpu name after
+                 * of_node matching if dai_link has cpu_dai_name.
+                 * but, it will never match if name was created by
+                 * fmt_single_name() remove cpu_dai_name if cpu_args
+                 * was 0. See:
+                 *      fmt_single_name()
+                 *      fmt_multiple_name()
+                 */
+                if (!args.args_count)
+                        dai_link->cpu_dai_name = NULL;
+        } else {
+                struct device *dev = rsrc_priv_to_dev(priv);
+                const struct rsrc_card_of_data *of_data;
 
-        /* Get dai->name */
-        ret = snd_soc_of_get_dai_name(np, dai_name);
-        if (ret < 0)
-                return ret;
+                of_data = rsrc_dev_to_of_data(dev);
 
-        /*
-         * FIXME
-         *
-         * rsrc assumes DPCM playback/capture
-         */
-        dai_link->dpcm_playback = 1;
-        dai_link->dpcm_capture = 1;
+                /* FE is dummy */
+                dai_link->cpu_of_node           = NULL;
+                dai_link->cpu_dai_name          = "snd-soc-dummy-dai";
+                dai_link->cpu_name              = "snd-soc-dummy";
 
-        if (args_count) {
-                *args_count = args.args_count;
-                dai_link->dynamic = 1;
-                dai_link->dpcm_merged_format = 1;
-        } else {
-                dai_link->no_pcm = 1;
-                priv->codec_conf.of_node = (*p_node);
-                priv->codec_conf.name_prefix = of_data->prefix;
+                /* BE settings */
+                dai_link->no_pcm                = 1;
+                dai_link->be_hw_params_fixup    = rsrc_card_be_hw_params_fixup;
+                dai_link->codec_of_node         = args.np;
+                snd_soc_of_get_dai_name(np, &dai_link->codec_dai_name);
+
+                /* additional name prefix */
+                priv->codec_conf.of_node        = dai_link->codec_of_node;
+                priv->codec_conf.name_prefix    = of_data->prefix;
+
+                /* set dai_name */
+                snprintf(dai_props->dai_name, DAI_NAME_NUM, "be.%s",
+                         dai_link->codec_dai_name);
         }
 
+        /* Simple Card assumes platform == cpu */
+        dai_link->platform_of_node      = dai_link->cpu_of_node;
+        dai_link->dpcm_playback         = 1;
+        dai_link->dpcm_capture          = 1;
+        dai_link->name                  = dai_props->dai_name;
+        dai_link->stream_name           = dai_props->dai_name;
+        dai_link->ops                   = &rsrc_card_ops;
+        dai_link->init                  = rsrc_card_dai_init;
+
+        return 0;
+}
+
+static int rsrc_card_parse_clk(struct device_node *np,
+                               struct rsrc_card_priv *priv,
+                               int idx, bool is_fe)
+{
+        struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);
+        struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, idx);
+        struct clk *clk;
+        struct device_node *of_np = is_fe ?     dai_link->cpu_of_node :
+                                                dai_link->codec_of_node;
+        u32 val;
+
         /*
          * Parse dai->sysclk come from "clocks = <&xxx>"
          * (if system has common clock)
@@ -247,173 +283,92 @@ rsrc_card_sub_parse_of(struct rsrc_card_priv *priv,
          */
         if (of_property_read_bool(np, "clocks")) {
                 clk = of_clk_get(np, 0);
-                if (IS_ERR(clk)) {
-                        ret = PTR_ERR(clk);
-                        return ret;
-                }
+                if (IS_ERR(clk))
+                        return PTR_ERR(clk);
 
-                dai->sysclk = clk_get_rate(clk);
-                dai->clk = clk;
+                dai_props->sysclk = clk_get_rate(clk);
+                dai_props->clk = clk;
         } else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
-                dai->sysclk = val;
+                dai_props->sysclk = val;
         } else {
-                clk = of_clk_get(args.np, 0);
+                clk = of_clk_get(of_np, 0);
                 if (!IS_ERR(clk))
-                        dai->sysclk = clk_get_rate(clk);
+                        dai_props->sysclk = clk_get_rate(clk);
         }
 
         return 0;
 }
 
-static int rsrc_card_parse_daifmt(struct device_node *node,
-                                  struct rsrc_card_priv *priv,
-                                  struct device_node *codec,
-                                  int idx)
-{
-        struct device_node *bitclkmaster = NULL;
-        struct device_node *framemaster = NULL;
-        struct rsrc_card_dai_props *dai_props = rsrc_priv_to_props(priv, idx);
-        struct rsrc_card_dai *cpu_dai = &dai_props->cpu_dai;
-        struct rsrc_card_dai *codec_dai = &dai_props->codec_dai;
-        unsigned int daifmt;
-
-        daifmt = snd_soc_of_parse_daifmt(node, NULL,
-                                         &bitclkmaster, &framemaster);
-        daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
-
-        if (!bitclkmaster && !framemaster)
-                return -EINVAL;
-
-        if (codec == bitclkmaster)
-                daifmt |= (codec == framemaster) ?
-                        SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;
-        else
-                daifmt |= (codec == framemaster) ?
-                        SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;
-
-        cpu_dai->fmt    = daifmt;
-        codec_dai->fmt  = daifmt;
-
-        of_node_put(bitclkmaster);
-        of_node_put(framemaster);
-
-        return 0;
-}
-
 static int rsrc_card_dai_link_of(struct device_node *node,
+                                 struct device_node *np,
                                  struct rsrc_card_priv *priv,
                                  int idx)
 {
         struct device *dev = rsrc_priv_to_dev(priv);
-        struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);
-        struct rsrc_card_dai_props *dai_props = rsrc_priv_to_props(priv, idx);
-        struct device_node *cpu = NULL;
-        struct device_node *codec = NULL;
-        char *name;
-        char prop[128];
-        int ret, cpu_args;
-
-        cpu = of_get_child_by_name(node, "cpu");
-        codec = of_get_child_by_name(node, "codec");
-
-        if (!cpu || !codec) {
-                ret = -EINVAL;
-                dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
-                goto dai_link_of_err;
-        }
+        struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, idx);
+        bool is_fe = false;
+        int ret;
 
-        ret = rsrc_card_parse_daifmt(node, priv, codec, idx);
-        if (ret < 0)
-                goto dai_link_of_err;
+        if (0 == strcmp(np->name, "cpu"))
+                is_fe = true;
 
-        ret = rsrc_card_sub_parse_of(priv, (idx == IDX_CPU) ? cpu : NULL,
-                                     &dai_props->cpu_dai,
-                                     dai_link,
-                                     &cpu_args);
+        ret = rsrc_card_parse_daifmt(node, np, priv, idx, is_fe);
         if (ret < 0)
-                goto dai_link_of_err;
+                return ret;
 
-        ret = rsrc_card_sub_parse_of(priv, (idx == IDX_CODEC) ? codec : NULL,
-                                     &dai_props->codec_dai,
-                                     dai_link,
-                                     NULL);
+        ret = rsrc_card_parse_links(np, priv, idx, is_fe);
         if (ret < 0)
-                goto dai_link_of_err;
-
-        if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
-                ret = -EINVAL;
-                goto dai_link_of_err;
-        }
-
-        /* Simple Card assumes platform == cpu */
-        dai_link->platform_of_node = dai_link->cpu_of_node;
-
-        /* DAI link name is created from CPU/CODEC dai name */
-        name = devm_kzalloc(dev,
-                            strlen(dai_link->cpu_dai_name)   +
-                            strlen(dai_link->codec_dai_name) + 2,
-                            GFP_KERNEL);
-        if (!name) {
-                ret = -ENOMEM;
-                goto dai_link_of_err;
-        }
-
-        sprintf(name, "%s-%s", dai_link->cpu_dai_name,
-                dai_link->codec_dai_name);
-        dai_link->name = dai_link->stream_name = name;
-        dai_link->ops = &rsrc_card_ops;
-        dai_link->init = rsrc_card_dai_init;
-
-        if (idx == IDX_CODEC)
-                dai_link->be_hw_params_fixup = rsrc_card_be_hw_params_fixup;
-
-        dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
-        dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
-                dai_link->cpu_dai_name,
-                dai_props->cpu_dai.fmt,
-                dai_props->cpu_dai.sysclk);
-        dev_dbg(dev, "\tcodec : %s / %04x / %d\n",
-                dai_link->codec_dai_name,
-                dai_props->codec_dai.fmt,
-                dai_props->codec_dai.sysclk);
+                return ret;
 
-        /*
-         * In soc_bind_dai_link() will check cpu name after
-         * of_node matching if dai_link has cpu_dai_name.
-         * but, it will never match if name was created by
-         * fmt_single_name() remove cpu_dai_name if cpu_args
-         * was 0. See:
-         *      fmt_single_name()
-         *      fmt_multiple_name()
-         */
-        if (!cpu_args)
-                dai_link->cpu_dai_name = NULL;
+        ret = rsrc_card_parse_clk(np, priv, idx, is_fe);
+        if (ret < 0)
+                return ret;
 
-dai_link_of_err:
-        of_node_put(cpu);
-        of_node_put(codec);
+        dev_dbg(dev, "\t%s / %04x / %d\n",
+                dai_props->dai_name,
+                dai_props->fmt,
+                dai_props->sysclk);
 
         return ret;
 }
 
 static int rsrc_card_parse_of(struct device_node *node,
-                              struct rsrc_card_priv *priv)
+                              struct rsrc_card_priv *priv,
+                              struct device *dev)
 {
-        struct device *dev = rsrc_priv_to_dev(priv);
         const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
+        struct rsrc_card_dai *props;
+        struct snd_soc_dai_link *links;
+        struct device_node *np;
         int ret;
-        int i;
+        int i, num;
 
         if (!node)
                 return -EINVAL;
 
-        /* Parse the card name from DT */
-        snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
+        num = of_get_child_count(node);
+        props = devm_kzalloc(dev, sizeof(*props) * num, GFP_KERNEL);
+        links = devm_kzalloc(dev, sizeof(*links) * num, GFP_KERNEL);
+        if (!props || !links)
+                return -ENOMEM;
+
+        priv->dai_props = props;
+        priv->dai_link  = links;
+        priv->dai_num   = num;
 
-        /* DAPM routes */
+        /* Init snd_soc_card */
+        priv->snd_card.owner                    = THIS_MODULE;
+        priv->snd_card.dev                      = dev;
+        priv->snd_card.dai_link                 = priv->dai_link;
+        priv->snd_card.num_links                = num;
+        priv->snd_card.codec_conf               = &priv->codec_conf;
+        priv->snd_card.num_configs              = 1;
         priv->snd_card.of_dapm_routes           = of_data->routes;
         priv->snd_card.num_of_dapm_routes       = of_data->num_routes;
 
+        /* Parse the card name from DT */
+        snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
+
         /* sampling rate convert */
         of_property_read_u32(node, "convert-rate", &priv->convert_rate);
 
@@ -421,11 +376,12 @@ static int rsrc_card_parse_of(struct device_node *node,
                 priv->snd_card.name ? priv->snd_card.name : "",
                 priv->convert_rate);
 
-        /* FE/BE */
-        for (i = 0; i < RSRC_FB_NUM; i++) {
-                ret = rsrc_card_dai_link_of(node, priv, i);
+        i = 0;
+        for_each_child_of_node(node, np) {
+                ret = rsrc_card_dai_link_of(node, np, priv, i);
                 if (ret < 0)
                         return ret;
+                i++;
         }
 
         if (!priv->snd_card.name)
@@ -452,7 +408,6 @@ static int rsrc_card_unref(struct snd_soc_card *card)
 static int rsrc_card_probe(struct platform_device *pdev)
 {
         struct rsrc_card_priv *priv;
-        struct snd_soc_dai_link *dai_link;
         struct device_node *np = pdev->dev.of_node;
         struct device *dev = &pdev->dev;
         int ret;
@@ -462,16 +417,7 @@ static int rsrc_card_probe(struct platform_device *pdev)
         if (!priv)
                 return -ENOMEM;
 
-        /* Init snd_soc_card */
-        priv->snd_card.owner = THIS_MODULE;
-        priv->snd_card.dev = dev;
-        dai_link = priv->dai_link;
-        priv->snd_card.dai_link = dai_link;
-        priv->snd_card.num_links = RSRC_FB_NUM;
-        priv->snd_card.codec_conf = &priv->codec_conf;
-        priv->snd_card.num_configs = 1;
-
-        ret = rsrc_card_parse_of(np, priv);
+        ret = rsrc_card_parse_of(np, priv, dev);
         if (ret < 0) {
                 if (ret != -EPROBE_DEFER)
                         dev_err(dev, "parse error %d\n", ret);
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index fbe9166e26d1..c61c17180142 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -117,10 +117,10 @@ struct rsnd_src {
 /*
  *              Gen1/Gen2 common functions
  */
-static struct dma_chan *rsnd_src_dma_req(struct rsnd_mod *mod)
+static struct dma_chan *rsnd_src_dma_req(struct rsnd_dai_stream *io,
+                                         struct rsnd_mod *mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         int is_play = rsnd_io_is_play(io);
 
         return rsnd_dma_request_channel(rsnd_src_of_node(priv),
@@ -129,9 +129,9 @@ static struct dma_chan *rsnd_src_dma_req(struct rsnd_mod *mod)
 }
 
 int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
+                        struct rsnd_dai_stream *io,
                         int use_busif)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(ssi_mod);
         struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         int ssi_id = rsnd_mod_id(ssi_mod);
@@ -174,7 +174,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
                 u32 mask = ~0;
 
                 rsnd_mod_write(ssi_mod, SSI_BUSIF_ADINR,
-                               rsnd_get_adinr(ssi_mod));
+                               rsnd_get_adinr(ssi_mod, io));
                 rsnd_mod_write(ssi_mod, SSI_BUSIF_MODE,  1);
                 rsnd_mod_write(ssi_mod, SSI_CTRL, 0x1);
 
@@ -196,7 +196,8 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
         return 0;
 }
 
-int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod)
+int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
+                       struct rsnd_dai_stream *io)
 {
         /*
          * DMA settings for SSIU
@@ -235,10 +236,9 @@ int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod)
         return 0;
 }
 
-static u32 rsnd_src_convert_rate(struct rsnd_src *src)
+static u32 rsnd_src_convert_rate(struct rsnd_dai_stream *io,
+                                 struct rsnd_src *src)
 {
-        struct rsnd_mod *mod = &src->mod;
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 convert_rate;
 
@@ -274,7 +274,7 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                  * return convert rate if SRC is used,
                  * otherwise, return runtime->rate as usual
                  */
-                rate = rsnd_src_convert_rate(src);
+                rate = rsnd_src_convert_rate(io, src);
         }
 
         if (!rate)
@@ -283,12 +283,12 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
         return rate;
 }
 
-static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)
+static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
+                                     struct rsnd_dai_stream *io)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 convert_rate = rsnd_src_convert_rate(io, src);
         u32 fsrate = 0;
 
         if (convert_rate)
@@ -299,7 +299,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)
         rsnd_mod_write(mod, SRC_SWRSR, 1);
 
         /* Set channel number and output bit length */
-        rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod));
+        rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod, io));
 
         /* Enable the initial value of IFS */
         if (fsrate) {
@@ -316,6 +316,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)
 }
 
 static int rsnd_src_hw_params(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *fe_params)
 {
@@ -372,6 +373,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_quit(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
@@ -411,9 +413,9 @@ static int rsnd_src_stop(struct rsnd_mod *mod)
 /*
  *              Gen1 functions
  */
-static int rsnd_src_set_route_gen1(struct rsnd_mod *mod)
+static int rsnd_src_set_route_gen1(struct rsnd_dai_stream *io,
+                                   struct rsnd_mod *mod)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct src_route_config {
                 u32 mask;
                 int shift;
@@ -448,13 +450,13 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod)
+static int rsnd_src_set_convert_timing_gen1(struct rsnd_dai_stream *io,
+                                            struct rsnd_mod *mod)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
-        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 convert_rate = rsnd_src_convert_rate(io, src);
         u32 mask;
         u32 val;
         int shift;
@@ -506,12 +508,13 @@ static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
+static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
+                                          struct rsnd_dai_stream *io)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod);
+        ret = rsnd_src_set_convert_rate(mod, io);
         if (ret < 0)
                 return ret;
 
@@ -523,7 +526,7 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
                        rsnd_mod_read(mod, SRC_IFSVR) / 100 * 98);
 
         /* Gen1/Gen2 are not compatible */
-        if (rsnd_src_convert_rate(src))
+        if (rsnd_src_convert_rate(io, src))
                 rsnd_mod_write(mod, SRC_ROUTE_MODE0, 1);
 
         /* no SRC_BFSSR settings, since SRC_SRCCR::BUFMD is 0 */
@@ -532,6 +535,7 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
 }
 
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         int ret;
@@ -540,15 +544,15 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_route_gen1(mod);
+        ret = rsnd_src_set_route_gen1(io, mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen1(mod);
+        ret = rsnd_src_set_convert_rate_gen1(mod, io);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen1(mod);
+        ret = rsnd_src_set_convert_timing_gen1(io, mod);
         if (ret < 0)
                 return ret;
 
@@ -556,6 +560,7 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen1(struct rsnd_mod *mod,
+                               struct rsnd_dai_stream *io,
                                struct rsnd_priv *priv)
 {
         int id = rsnd_mod_id(mod);
@@ -566,6 +571,7 @@ static int rsnd_src_start_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         int id = rsnd_mod_id(mod);
@@ -643,9 +649,9 @@ static bool rsnd_src_error_record_gen2(struct rsnd_mod *mod)
         return ret;
 }
 
-static int _rsnd_src_start_gen2(struct rsnd_mod *mod)
+static int _rsnd_src_start_gen2(struct rsnd_mod *mod,
+                                struct rsnd_dai_stream *io)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         u32 val = rsnd_io_to_mod_dvc(io) ? 0x01 : 0x11;
 
         rsnd_mod_write(mod, SRC_CTRL, val);
@@ -670,15 +676,15 @@ static int _rsnd_src_stop_gen2(struct rsnd_mod *mod)
         return rsnd_src_stop(mod);
 }
 
-static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data)
+static void __rsnd_src_interrupt_gen2(struct rsnd_mod *mod,
+                                      struct rsnd_dai_stream *io)
 {
-        struct rsnd_mod *mod = data;
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
 
         spin_lock(&priv->lock);
 
         /* ignore all cases if not working */
-        if (!rsnd_mod_is_working(mod))
+        if (!rsnd_io_is_working(io))
                 goto rsnd_src_interrupt_gen2_out;
 
         if (rsnd_src_error_record_gen2(mod)) {
@@ -691,24 +697,32 @@ static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data)
 
                 _rsnd_src_stop_gen2(mod);
                 if (src->err < 1024)
-                        _rsnd_src_start_gen2(mod);
+                        _rsnd_src_start_gen2(mod, io);
                 else
                         dev_warn(dev, "no more SRC restart\n");
         }
+
 rsnd_src_interrupt_gen2_out:
         spin_unlock(&priv->lock);
+}
+
+static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data)
+{
+        struct rsnd_mod *mod = data;
+
+        rsnd_mod_interrupt(mod, __rsnd_src_interrupt_gen2);
 
         return IRQ_HANDLED;
 }
 
-static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
+static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
+                                          struct rsnd_dai_stream *io)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 convert_rate = rsnd_src_convert_rate(io, src);
         u32 cr, route;
         uint ratio;
         int ret;
@@ -726,7 +740,7 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
                 return -EINVAL;
         }
 
-        ret = rsnd_src_set_convert_rate(mod);
+        ret = rsnd_src_set_convert_rate(mod, io);
         if (ret < 0)
                 return ret;
 
@@ -762,12 +776,12 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod)
+static int rsnd_src_set_convert_timing_gen2(struct rsnd_dai_stream *io,
+                                            struct rsnd_mod *mod)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 convert_rate = rsnd_src_convert_rate(io, src);
         int ret;
 
         if (convert_rate)
@@ -781,6 +795,7 @@ static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod)
 }
 
 static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
+                               struct rsnd_dai_stream *io,
                                struct rsnd_priv *priv)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
@@ -802,7 +817,7 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
                         return ret;
         }
 
-        ret = rsnd_dma_init(priv,
+        ret = rsnd_dma_init(io,
                             rsnd_mod_to_dma(mod),
                             src->info->dma_id);
 
@@ -810,14 +825,16 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
+                                struct rsnd_dai_stream *io,
                                 struct rsnd_priv *priv)
 {
-        rsnd_dma_quit(rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(io, rsnd_mod_to_dma(mod));
 
         return 0;
 }
 
 static int rsnd_src_init_gen2(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         int ret;
@@ -826,11 +843,11 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen2(mod);
+        ret = rsnd_src_set_convert_rate_gen2(mod, io);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen2(mod);
+        ret = rsnd_src_set_convert_timing_gen2(io, mod);
         if (ret < 0)
                 return ret;
 
@@ -838,31 +855,33 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen2(struct rsnd_mod *mod,
+                               struct rsnd_dai_stream *io,
                                struct rsnd_priv *priv)
 {
-        rsnd_dma_start(rsnd_mod_to_dma(mod));
+        rsnd_dma_start(io, rsnd_mod_to_dma(mod));
 
-        return _rsnd_src_start_gen2(mod);
+        return _rsnd_src_start_gen2(mod, io);
 }
 
 static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         int ret;
 
         ret = _rsnd_src_stop_gen2(mod);
 
-        rsnd_dma_stop(rsnd_mod_to_dma(mod));
+        rsnd_dma_stop(io, rsnd_mod_to_dma(mod));
 
         return ret;
 }
 
-static void rsnd_src_reconvert_update(struct rsnd_mod *mod)
+static void rsnd_src_reconvert_update(struct rsnd_dai_stream *io,
+                                      struct rsnd_mod *mod)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 convert_rate = rsnd_src_convert_rate(io, src);
         u32 fsrate;
 
         if (!runtime)
@@ -878,10 +897,10 @@ static void rsnd_src_reconvert_update(struct rsnd_mod *mod)
 }
 
 static int rsnd_src_pcm_new(struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io,
                             struct snd_soc_pcm_runtime *rtd)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         int ret;
@@ -912,7 +931,7 @@ static int rsnd_src_pcm_new(struct rsnd_mod *mod,
         /*
          * enable sync convert
          */
-        ret = rsnd_kctrl_new_s(mod, rtd,
+        ret = rsnd_kctrl_new_s(mod, io, rtd,
                                rsnd_io_is_play(io) ?
                                "SRC Out Rate Switch" :
                                "SRC In Rate Switch",
@@ -921,7 +940,7 @@ static int rsnd_src_pcm_new(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_kctrl_new_s(mod, rtd,
+        ret = rsnd_kctrl_new_s(mod, io, rtd,
                                rsnd_io_is_play(io) ?
                                "SRC Out Rate" :
                                "SRC In Rate",
@@ -1046,7 +1065,7 @@ int rsnd_src_probe(struct platform_device *pdev,
 
                 src->info = &info->src_info[i];
 
-                ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);
+                ret = rsnd_mod_init(priv, &src->mod, ops, clk, RSND_MOD_SRC, i);
                 if (ret)
                         return ret;
         }
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 50fa3928a003..2fbe59f7f9b5 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -87,10 +87,9 @@ struct rsnd_ssi {
 #define rsnd_ssi_of_node(priv) \
         of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ssi")
 
-int rsnd_ssi_use_busif(struct rsnd_mod *mod)
+int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         int use_busif = 0;
 
         if (!rsnd_ssi_is_dma_mode(mod))
@@ -199,15 +198,17 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
                 }
         }
 
-        cr_mode = rsnd_ssi_is_dma_mode(&ssi->mod) ?
-                DMEN :  /* DMA : enable DMA */
-                DIEN;   /* PIO : enable Data interrupt */
-
+        if (rsnd_ssi_is_dma_mode(&ssi->mod)) {
+                cr_mode = UIEN | OIEN | /* over/under run */
+                          DMEN;         /* DMA : enable DMA */
+        } else {
+                cr_mode = DIEN;         /* PIO : enable Data interrupt */
+        }
 
         cr  =   ssi->cr_own     |
                 ssi->cr_clk     |
                 cr_mode         |
-                UIEN | OIEN | EN;
+                EN;
 
         rsnd_mod_write(&ssi->mod, SSICR, cr);
 
@@ -224,10 +225,9 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
                 rsnd_mod_name(&ssi->mod), rsnd_mod_id(&ssi->mod));
 }
 
-static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi)
+static void rsnd_ssi_hw_stop(struct rsnd_dai_stream *io, struct rsnd_ssi *ssi)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(&ssi->mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(&ssi->mod);
         struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         u32 cr;
@@ -261,7 +261,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi)
                         struct rsnd_ssi *ssi_parent = rsnd_ssi_parent(ssi);
 
                         if (ssi_parent)
-                                rsnd_ssi_hw_stop(ssi_parent);
+                                rsnd_ssi_hw_stop(io, ssi_parent);
                         else
                                 rsnd_ssi_master_clk_stop(ssi);
                 }
@@ -279,10 +279,10 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi)
  *      SSI mod common functions
  */
 static int rsnd_ssi_init(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 cr;
@@ -330,6 +330,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_quit(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -346,6 +347,7 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_hw_params(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
 {
@@ -369,7 +371,8 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod,
         /* It will be removed on rsnd_ssi_hw_stop */
         ssi->chan = chan;
         if (ssi_parent)
-                return rsnd_ssi_hw_params(&ssi_parent->mod, substream, params);
+                return rsnd_ssi_hw_params(&ssi_parent->mod, io,
+                                          substream, params);
 
         return 0;
 }
@@ -386,12 +389,12 @@ static void rsnd_ssi_record_error(struct rsnd_ssi *ssi, u32 status)
 }
 
 static int rsnd_ssi_start(struct rsnd_mod *mod,
+                          struct rsnd_dai_stream *io,
                           struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
-        rsnd_src_ssiu_start(mod, rsnd_ssi_use_busif(mod));
+        rsnd_src_ssiu_start(mod, io, rsnd_ssi_use_busif(io, mod));
 
         rsnd_ssi_hw_start(ssi, io);
 
@@ -401,6 +404,7 @@ static int rsnd_ssi_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_stop(struct rsnd_mod *mod,
+                         struct rsnd_dai_stream *io,
                          struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -409,26 +413,26 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod,
 
         rsnd_ssi_record_error(ssi, rsnd_mod_read(mod, SSISR));
 
-        rsnd_ssi_hw_stop(ssi);
+        rsnd_ssi_hw_stop(io, ssi);
 
-        rsnd_src_ssiu_stop(mod);
+        rsnd_src_ssiu_stop(mod, io);
 
         return 0;
 }
 
-static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
+static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+                                 struct rsnd_dai_stream *io)
 {
-        struct rsnd_ssi *ssi = data;
-        struct rsnd_mod *mod = &ssi->mod;
+        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         int is_dma = rsnd_ssi_is_dma_mode(mod);
         u32 status;
+        bool elapsed = false;
 
         spin_lock(&priv->lock);
 
         /* ignore all cases if not working */
-        if (!rsnd_mod_is_working(mod))
+        if (!rsnd_io_is_working(io))
                 goto rsnd_ssi_interrupt_out;
 
         status = rsnd_mod_read(mod, SSISR);
@@ -449,11 +453,11 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                 else
                         *buf = rsnd_mod_read(mod, SSIRDR);
 
-                rsnd_dai_pointer_update(io, sizeof(*buf));
+                elapsed = rsnd_dai_pointer_update(io, sizeof(*buf));
         }
 
-        /* PIO / DMA */
-        if (status & (UIRQ | OIRQ)) {
+        /* DMA only */
+        if (is_dma && (status & (UIRQ | OIRQ))) {
                 struct device *dev = rsnd_priv_to_dev(priv);
 
                 /*
@@ -462,9 +466,9 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                 dev_dbg(dev, "%s[%d] restart\n",
                         rsnd_mod_name(mod), rsnd_mod_id(mod));
 
-                rsnd_ssi_stop(mod, priv);
+                rsnd_ssi_stop(mod, io, priv);
                 if (ssi->err < 1024)
-                        rsnd_ssi_start(mod, priv);
+                        rsnd_ssi_start(mod, io, priv);
                 else
                         dev_warn(dev, "no more SSI restart\n");
         }
@@ -474,6 +478,16 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
 rsnd_ssi_interrupt_out:
         spin_unlock(&priv->lock);
 
+        if (elapsed)
+                rsnd_dai_period_elapsed(io);
+}
+
+static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
+{
+        struct rsnd_mod *mod = data;
+
+        rsnd_mod_interrupt(mod, __rsnd_ssi_interrupt);
+
         return IRQ_HANDLED;
 }
 
@@ -481,6 +495,7 @@ rsnd_ssi_interrupt_out:
  *              SSI PIO
  */
 static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         struct device *dev = rsnd_priv_to_dev(priv);
@@ -490,7 +505,7 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
         ret = devm_request_irq(dev, ssi->info->irq,
                                rsnd_ssi_interrupt,
                                IRQF_SHARED,
-                               dev_name(dev), ssi);
+                               dev_name(dev), mod);
 
         return ret;
 }
@@ -506,6 +521,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
 };
 
 static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -516,25 +532,26 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
         ret = devm_request_irq(dev, ssi->info->irq,
                                rsnd_ssi_interrupt,
                                IRQF_SHARED,
-                               dev_name(dev), ssi);
+                               dev_name(dev), mod);
         if (ret)
                 return ret;
 
         ret = rsnd_dma_init(
-                priv, rsnd_mod_to_dma(mod),
+                io, rsnd_mod_to_dma(mod),
                 dma_id);
 
         return ret;
 }
 
 static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
+                               struct rsnd_dai_stream *io,
                                struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
         int irq = ssi->info->irq;
 
-        rsnd_dma_quit(rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(io, rsnd_mod_to_dma(mod));
 
         /* PIO will request IRQ again */
         devm_free_irq(dev, irq, ssi);
@@ -543,6 +560,7 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_fallback(struct rsnd_mod *mod,
+                             struct rsnd_dai_stream *io,
                              struct rsnd_priv *priv)
 {
         struct device *dev = rsnd_priv_to_dev(priv);
@@ -563,37 +581,39 @@ static int rsnd_ssi_fallback(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
+                              struct rsnd_dai_stream *io,
                               struct rsnd_priv *priv)
 {
         struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
 
-        rsnd_dma_start(dma);
+        rsnd_dma_start(io, dma);
 
-        rsnd_ssi_start(mod, priv);
+        rsnd_ssi_start(mod, io, priv);
 
         return 0;
 }
 
 static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
+                             struct rsnd_dai_stream *io,
                              struct rsnd_priv *priv)
 {
         struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
 
-        rsnd_ssi_stop(mod, priv);
+        rsnd_ssi_stop(mod, io, priv);
 
-        rsnd_dma_stop(dma);
+        rsnd_dma_stop(io, dma);
 
         return 0;
 }
 
-static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_mod *mod)
+static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io,
+                                         struct rsnd_mod *mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         int is_play = rsnd_io_is_play(io);
         char *name;
 
-        if (rsnd_ssi_use_busif(mod))
+        if (rsnd_ssi_use_busif(io, mod))
                 name = is_play ? "rxu" : "txu";
         else
                 name = is_play ? "rx" : "tx";
@@ -776,7 +796,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                 else if (rsnd_ssi_pio_available(ssi))
                         ops = &rsnd_ssi_pio_ops;
 
-                ret = rsnd_mod_init(&ssi->mod, ops, clk, RSND_MOD_SSI, i);
+                ret = rsnd_mod_init(priv, &ssi->mod, ops, clk, RSND_MOD_SSI, i);
                 if (ret)
                         return ret;
 
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index 5bdb781163d1..9b0d8baf2934 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -5,8 +5,10 @@ include ../lib.mk
 .PHONY: all all_32 all_64 warn_32bit_failure clean
 
 TARGETS_C_BOTHBITS := sigreturn single_step_syscall
+TARGETS_C_32BIT_ONLY := entry_from_vm86
 
-BINARIES_32 := $(TARGETS_C_BOTHBITS:%=%_32)
+TARGETS_C_32BIT_ALL := $(TARGETS_C_BOTHBITS) $(TARGETS_C_32BIT_ONLY)
+BINARIES_32 := $(TARGETS_C_32BIT_ALL:%=%_32)
 BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64)
 
 CFLAGS := -O2 -g -std=gnu99 -pthread -Wall
@@ -32,7 +34,7 @@ all_64: $(BINARIES_64)
 clean:
         $(RM) $(BINARIES_32) $(BINARIES_64)
 
-$(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c
+$(TARGETS_C_32BIT_ALL:%=%_32): %_32: %.c
         $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
 
 $(TARGETS_C_BOTHBITS:%=%_64): %_64: %.c
diff --git a/tools/testing/selftests/x86/entry_from_vm86.c b/tools/testing/selftests/x86/entry_from_vm86.c
new file mode 100644
index 000000000000..5c38a187677b
--- /dev/null
+++ b/tools/testing/selftests/x86/entry_from_vm86.c
@@ -0,0 +1,114 @@
+/*
+ * entry_from_vm86.c - tests kernel entries from vm86 mode
+ * Copyright (c) 2014-2015 Andrew Lutomirski
+ *
+ * This exercises a few paths that need to special-case vm86 mode.
+ *
+ * GPL v2.
+ */
+
+#define _GNU_SOURCE
+
+#include <assert.h>
+#include <stdlib.h>
+#include <sys/syscall.h>
+#include <sys/signal.h>
+#include <sys/ucontext.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include <sys/mman.h>
+#include <err.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <sys/vm86.h>
+
+static unsigned long load_addr = 0x10000;
+static int nerrs = 0;
+
+asm (
+        ".pushsection .rodata\n\t"
+        ".type vmcode_bound, @object\n\t"
+        "vmcode:\n\t"
+        "vmcode_bound:\n\t"
+        ".code16\n\t"
+        "bound %ax, (2048)\n\t"
+        "int3\n\t"
+        "vmcode_sysenter:\n\t"
+        "sysenter\n\t"
+        ".size vmcode, . - vmcode\n\t"
+        "end_vmcode:\n\t"
+        ".code32\n\t"
+        ".popsection"
+        );
+
+extern unsigned char vmcode[], end_vmcode[];
+extern unsigned char vmcode_bound[], vmcode_sysenter[];
+
+static void do_test(struct vm86plus_struct *v86, unsigned long eip,
+                    const char *text)
+{
+        long ret;
+
+        printf("[RUN]\t%s from vm86 mode\n", text);
+        v86->regs.eip = eip;
+        ret = vm86(VM86_ENTER, v86);
+
+        if (ret == -1 && errno == ENOSYS) {
+                printf("[SKIP]\tvm86 not supported\n");
+                return;
+        }
+
+        if (VM86_TYPE(ret) == VM86_INTx) {
+                char trapname[32];
+                int trapno = VM86_ARG(ret);
+                if (trapno == 13)
+                        strcpy(trapname, "GP");
+                else if (trapno == 5)
+                        strcpy(trapname, "BR");
+                else if (trapno == 14)
+                        strcpy(trapname, "PF");
+                else
+                        sprintf(trapname, "%d", trapno);
+
+                printf("[OK]\tExited vm86 mode due to #%s\n", trapname);
+        } else if (VM86_TYPE(ret) == VM86_UNKNOWN) {
+                printf("[OK]\tExited vm86 mode due to unhandled GP fault\n");
+        } else {
+                printf("[OK]\tExited vm86 mode due to type %ld, arg %ld\n",
+                       VM86_TYPE(ret), VM86_ARG(ret));
+        }
+}
+
+int main(void)
+{
+        struct vm86plus_struct v86;
+        unsigned char *addr = mmap((void *)load_addr, 4096,
+                                   PROT_READ | PROT_WRITE | PROT_EXEC,
+                                   MAP_ANONYMOUS | MAP_PRIVATE, -1,0);
+        if (addr != (unsigned char *)load_addr)
+                err(1, "mmap");
+
+        memcpy(addr, vmcode, end_vmcode - vmcode);
+        addr[2048] = 2;
+        addr[2050] = 3;
+
+        memset(&v86, 0, sizeof(v86));
+
+        v86.regs.cs = load_addr / 16;
+        v86.regs.ss = load_addr / 16;
+        v86.regs.ds = load_addr / 16;
+        v86.regs.es = load_addr / 16;
+
+        assert((v86.regs.cs & 3) == 0); /* Looks like RPL = 0 */
+
+        /* #BR -- should deliver SIG??? */
+        do_test(&v86, vmcode_bound - vmcode, "#BR");
+
+        /* SYSENTER -- should cause #GP or #UD depending on CPU */
+        do_test(&v86, vmcode_sysenter - vmcode, "SYSENTER");
+
+        return (nerrs == 0 ? 0 : 1);
+}