Merge tag 'asoc-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.7 part 2 Really sorry about this late pull request. It looks like at the time I sent my pull request for v4.7 there was some conflict or other issue which caused my script to stop merging the ASoC branches at some point after the HDMI changes. It's all specific driver updates, including: - New drivers for MAX98371 and TAS5720. - SPI support for TLV320AIC32x4. - TDM support for STI Uniperf IPs. This code should all have been in -next prior to the merge window apart from some fixes, it dropped out on the 18th.
author: Takashi Iwai <tiwai@suse.de> 2016-05-27 11:16:53 -0400
committer: Takashi Iwai <tiwai@suse.de> 2016-05-27 11:16:53 -0400
commit: eb4606e64a7d548f5d60a9583baa8104890b2c6e (patch)
tree: 2dc8e587fc79c207dab2fb74830963cc84dcf801
parent: 86c72d1ce91d804e4fa8d90b316a89597dd220f1 (diff)
parent: bf65921380cd50b87618df550398e06581f4a361 (diff)
237 files changed, 4366 insertions, 1052 deletions
diff --git a/Documentation/devicetree/bindings/regmap/regmap.txt b/Documentation/devicetree/bindings/regmap/regmap.txt
index e98a9652ccc8..0127be360fe8 100644
--- a/Documentation/devicetree/bindings/regmap/regmap.txt
+++ b/Documentation/devicetree/bindings/regmap/regmap.txt
@@ -1,50 +1,29 @@
-Device-Tree binding for regmap
+Devicetree binding for regmap
-The endianness mode of CPU & Device scenarios:
-Index     Device     Endianness properties
---------------------------------------------------
-1         BE         'big-endian'
-2         LE         'little-endian'
-3         Native     'native-endian'
-For one device driver, which will run in different scenarios above
-on different SoCs using the devicetree, we need one way to simplify
-this.
 Optional properties:
- {big,little,native}-endian: these are boolean properties, if absent
-  then the implementation will choose a default based on the device
-  being controlled.  These properties are for register values and all
-  the buffers only.  Native endian means that the CPU and device have
-  the same endianness.
-Examples:
+   little-endian,
-Scenario 1 : CPU in LE mode & device in LE mode.
+   big-endian,
-dev: dev@40031000 {
+   native-endian:       See common-properties.txt for a definition
-              compatible = "name";
-              reg = <0x40031000 0x1000>;
-              ...
-};
-Scenario 2 : CPU in LE mode & device in BE mode.
+Note:
-dev: dev@40031000 {
+Regmap defaults to little-endian register access on MMIO based
-              compatible = "name";
+devices, this is by far the most common setting. On CPU
-              reg = <0x40031000 0x1000>;
+architectures that typically run big-endian operating systems
-              ...
+(e.g. PowerPC), registers can be defined as big-endian and must
-              big-endian;
+be marked that way in the devicetree.
-};
-Scenario 3 : CPU in BE mode & device in BE mode.
+On SoCs that can be operated in both big-endian and little-endian
-dev: dev@40031000 {
+modes, with a single hardware switch controlling both the endianess
-              compatible = "name";
+of the CPU and a byteswap for MMIO registers (e.g. many Broadcom MIPS
-              reg = <0x40031000 0x1000>;
+chips), "native-endian" is used to allow using the same device tree
-              ...
+blob in both cases.
-};
-Scenario 4 : CPU in BE mode & device in LE mode.
+Examples:
+Scenario 1 : a register set in big-endian mode.
 dev: dev@40031000 {
-              compatible = "name";
+              compatible = "syscon";
              reg = <0x40031000 0x1000>;
+              big-endian;
              ...
-              little-endian;
 };
diff --git a/Documentation/devicetree/bindings/sound/max98371.txt b/Documentation/devicetree/bindings/sound/max98371.txt
new file mode 100644
index 000000000000..6c285235e64b
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max98371.txt
@@ -0,0 +1,17 @@
+max98371 codec
+This device supports I2C mode only.
+Required properties:
+- compatible : "maxim,max98371"
+- reg : The chip select number on the I2C bus
+Example:
+&i2c {
+        max98371: max98371@0x31 {
+                compatible = "maxim,max98371";
+                reg = <0x31>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
index f205ce9e31dd..ac28cdb4910e 100644
--- a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
@@ -1,15 +1,16 @@
-MT8173 with RT5650 RT5676 CODECS
+MT8173 with RT5650 RT5676 CODECS and HDMI via I2S
 Required properties:
 - compatible : "mediatek,mt8173-rt5650-rt5676"
 - mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs
+                        and of the hdmi encoder node
 - mediatek,platform: the phandle of MT8173 ASoC platform
 Example:
        sound {
                compatible = "mediatek,mt8173-rt5650-rt5676";
-                mediatek,audio-codec = <&rt5650 &rt5676>;
+                mediatek,audio-codec = <&rt5650 &rt5676 &hdmi0>;
                mediatek,platform = <&afe>;
        };
diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
index fe5a5ef1714d..5bfa6b60530b 100644
--- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
@@ -5,11 +5,21 @@ Required properties:
 - mediatek,audio-codec: the phandles of rt5650 codecs
 - mediatek,platform: the phandle of MT8173 ASoC platform
+Optional subnodes:
+- codec-capture : the subnode of rt5650 codec capture
+Required codec-capture subnode properties:
+- sound-dai: audio codec dai name on capture path
+  <&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1)
+  <&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2)
 Example:
        sound {
                compatible = "mediatek,mt8173-rt5650";
                mediatek,audio-codec = <&rt5650>;
                mediatek,platform = <&afe>;
+                codec-capture {
+                        sound-dai = <&rt5650 1>;
+                };
        };
diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
index 028fa1c82f50..4d9a83d9a017 100644
--- a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
+++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -37,17 +37,18 @@ Required properties:
  - dai-name: DAI name that describes the IP.
+  - IP mode: IP working mode depending on associated codec.
+        "HDMI" connected to HDMI codec and support IEC HDMI formats (player only).
+        "SPDIF" connected to SPDIF codec and support SPDIF formats (player only).
+        "PCM" PCM standard mode for I2S or TDM bus.
+        "TDM" TDM mode for TDM bus.
 Required properties ("st,sti-uni-player" compatibility only):
  - clocks: CPU_DAI IP clock source, listed in the same order than the
            CPU_DAI properties.
  - uniperiph-id: internal SOC IP instance ID.
-  - IP mode: IP working mode depending on associated codec.
-        "HDMI" connected to HDMI codec IP and IEC HDMI formats.
-        "SPDIF"connected to SPDIF codec and support SPDIF formats.
-        "PCM"  PCM standard mode for I2S or TDM bus.
 Optional properties:
  - pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for
               external codecs connection.
@@ -56,6 +57,22 @@ Optional properties:
 Example:
+        sti_uni_player1: sti-uni-player@1 {
+                compatible = "st,sti-uni-player";
+                status = "okay";
+                #sound-dai-cells = <0>;
+                st,syscfg = <&syscfg_core>;
+                clocks = <&clk_s_d0_flexgen CLK_PCM_1>;
+                reg = <0x8D81000 0x158>;
+                interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+                dmas = <&fdma0 3 0 1>;
+                st,dai-name = "Uni Player #1 (I2S)";
+                dma-names = "tx";
+                st,uniperiph-id = <1>;
+                st,version = <5>;
+                st,mode = "TDM";
+        };
        sti_uni_player2: sti-uni-player@2 {
                compatible = "st,sti-uni-player";
                status = "okay";
@@ -65,7 +82,7 @@ Example:
                reg = <0x8D82000 0x158>;
                interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
                dmas = <&fdma0 4 0 1>;
-                dai-name = "Uni Player #1 (DAC)";
+                dai-name = "Uni Player #2 (DAC)";
                dma-names = "tx";
                uniperiph-id = <2>;
                version = <5>;
@@ -82,7 +99,7 @@ Example:
                interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
                dmas = <&fdma0 7 0 1>;
                dma-names = "tx";
-                dai-name = "Uni Player #1 (PIO)";
+                dai-name = "Uni Player #3 (SPDIF)";
                uniperiph-id = <3>;
                version = <5>;
                mode = "SPDIF";
@@ -99,6 +116,7 @@ Example:
                dma-names = "rx";
                dai-name = "Uni Reader #1 (HDMI RX)";
                version = <3>;
+                st,mode = "PCM";
        };
 2) sti-sas-codec: internal audio codec IPs driver
@@ -152,4 +170,20 @@ Example of audio card declaration:
                                sound-dai = <&sti_sasg_codec 0>;
                        };
                };
+                simple-audio-card,dai-link@2 {
+                        /* TDM playback  */
+                        format = "left_j";
+                        frame-inversion = <1>;
+                        cpu {
+                                sound-dai = <&sti_uni_player1>;
+                                dai-tdm-slot-num = <16>;
+                                dai-tdm-slot-width = <16>;
+                                dai-tdm-slot-tx-mask =
+                                        <1 1 1 1 0 0 0 0 0 0 1 1 0 0 1 1>;
+                        };
+                        codec {
+                                sound-dai = <&sti_sasg_codec 3>;
+                        };
+                };
        };
diff --git a/Documentation/devicetree/bindings/sound/tas571x.txt b/Documentation/devicetree/bindings/sound/tas571x.txt
index 0ac31d8d5ac4..b4959f10b74b 100644
--- a/Documentation/devicetree/bindings/sound/tas571x.txt
+++ b/Documentation/devicetree/bindings/sound/tas571x.txt
@@ -1,4 +1,4 @@
-Texas Instruments TAS5711/TAS5717/TAS5719 stereo power amplifiers
+Texas Instruments TAS5711/TAS5717/TAS5719/TAS5721 stereo power amplifiers
 The codec is controlled through an I2C interface.  It also has two other
 signals that can be wired up to GPIOs: reset (strongly recommended), and
@@ -6,7 +6,11 @@ powerdown (optional).
 Required properties:
- compatible: "ti,tas5711", "ti,tas5717", or "ti,tas5719"
+- compatible: should be one of the following:
+  - "ti,tas5711",
+  - "ti,tas5717",
+  - "ti,tas5719",
+  - "ti,tas5721"
 - reg: The I2C address of the device
 - #sound-dai-cells: must be equal to 0
@@ -25,6 +29,8 @@ Optional properties:
 - PVDD_B-supply: regulator phandle for the PVDD_B supply (5711)
 - PVDD_C-supply: regulator phandle for the PVDD_C supply (5711)
 - PVDD_D-supply: regulator phandle for the PVDD_D supply (5711)
+- DRVDD-supply: regulator phandle for the DRVDD supply (5721)
+- PVDD-supply: regulator phandle for the PVDD supply (5721)
 Example:
diff --git a/Documentation/devicetree/bindings/sound/tas5720.txt b/Documentation/devicetree/bindings/sound/tas5720.txt
new file mode 100644
index 000000000000..806ea7381483
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tas5720.txt
@@ -0,0 +1,25 @@
+Texas Instruments TAS5720 Mono Audio amplifier
+The TAS5720 serial control bus communicates through the I2C protocol only. The
+serial bus is also used for periodic codec fault checking/reporting during
+audio playback. For more product information please see the links below:
+http://www.ti.com/product/TAS5720L
+http://www.ti.com/product/TAS5720M
+Required properties:
+- compatible : "ti,tas5720"
+- reg : I2C slave address
+- dvdd-supply : phandle to a 3.3-V supply for the digital circuitry
+- pvdd-supply : phandle to a supply used for the Class-D amp and the analog
+Example:
+tas5720: tas5720@6c {
+        status = "okay";
+        compatible = "ti,tas5720";
+        reg = <0x6c>;
+        dvdd-supply = <&vdd_3v3_reg>;
+        pvdd-supply = <&amp_supply_reg>;
+};
diff --git a/Documentation/networking/checksum-offloads.txt b/Documentation/networking/checksum-offloads.txt
index de2a327766a7..56e36861245f 100644
--- a/Documentation/networking/checksum-offloads.txt
+++ b/Documentation/networking/checksum-offloads.txt
@@ -69,18 +69,18 @@ LCO: Local Checksum Offload
 LCO is a technique for efficiently computing the outer checksum of an
 encapsulated datagram when the inner checksum is due to be offloaded.
 The ones-complement sum of a correctly checksummed TCP or UDP packet is
- equal to the sum of the pseudo header, because everything else gets
+ equal to the complement of the sum of the pseudo header, because everything
- 'cancelled out' by the checksum field.  This is because the sum was
+ else gets 'cancelled out' by the checksum field.  This is because the sum was
 complemented before being written to the checksum field.
 More generally, this holds in any case where the 'IP-style' ones complement
 checksum is used, and thus any checksum that TX Checksum Offload supports.
 That is, if we have set up TX Checksum Offload with a start/offset pair, we
- know that _after the device has filled in that checksum_, the ones
+ know that after the device has filled in that checksum, the ones
 complement sum from csum_start to the end of the packet will be equal to
- _whatever value we put in the checksum field beforehand_.  This allows us
+ the complement of whatever value we put in the checksum field beforehand.
- to compute the outer checksum without looking at the payload: we simply
+ This allows us to compute the outer checksum without looking at the payload:
- stop summing when we get to csum_start, then add the 16-bit word at
+ we simply stop summing when we get to csum_start, then add the complement of
- (csum_start + csum_offset).
+ the 16-bit word at (csum_start + csum_offset).
 Then, when the true inner checksum is filled in (either by hardware or by
 skb_checksum_help()), the outer checksum will become correct by virtue of
 the arithmetic.
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 57653a44b128..fcddfd5ded99 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -645,7 +645,7 @@ allowed to execute.
 perf_event_paranoid:
 Controls use of the performance events system by unprivileged
-users (without CAP_SYS_ADMIN).  The default value is 1.
+users (without CAP_SYS_ADMIN).  The default value is 2.
 -1: Allow use of (almost) all events by all users
 >=0: Disallow raw tracepoint access by users without CAP_IOC_LOCK
diff --git a/MAINTAINERS b/MAINTAINERS
index 09a9cf1e0a8a..8e325edbf62c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11319,6 +11319,20 @@ F:	include/trace/
 F:      kernel/trace/
 F:      tools/testing/selftests/ftrace/
+TRACING MMIO ACCESSES (MMIOTRACE)
+M:      Steven Rostedt <rostedt@goodmis.org>
+M:      Ingo Molnar <mingo@kernel.org>
+R:      Karol Herbst <karolherbst@gmail.com>
+R:      Pekka Paalanen <ppaalanen@gmail.com>
+S:      Maintained
+L:      linux-kernel@vger.kernel.org
+L:      nouveau@lists.freedesktop.org
+F:      kernel/trace/trace_mmiotrace.c
+F:      include/linux/mmiotrace.h
+F:      arch/x86/mm/kmmio.c
+F:      arch/x86/mm/mmio-mod.c
+F:      arch/x86/mm/testmmiotrace.c
 TRIVIAL PATCHES
 M:      Jiri Kosina <trivial@kernel.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
diff --git a/Makefile b/Makefile
index acf6155421cc..0f9cb36d45c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION =
 NAME = Charred Weasel
 # *DOCUMENTATION*
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 0827d594b1f0..cd0cd5fd09a3 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -106,7 +106,7 @@
                        pmc: pmc@fffffc00 {
                                compatible = "atmel,at91sam9x5-pmc", "syscon";
-                                reg = <0xfffffc00 0x100>;
+                                reg = <0xfffffc00 0x200>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                interrupt-controller;
                                #address-cells = <1>;
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 78996bdbd3df..9817090c1b73 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -280,7 +280,7 @@
                        status = "disabled";
                        nfc@c0000000 {
-                                compatible = "atmel,sama5d4-nfc";
+                                compatible = "atmel,sama5d3-nfc";
                                #address-cells = <1>;
                                #size-cells = <1>;
                                reg = < /* NFC Command Registers */
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index efa77c146415..521b1ec59157 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -2,6 +2,7 @@ menu "Platform selection"
 config ARCH_SUNXI
        bool "Allwinner sunxi 64-bit SoC Family"
+        select GENERIC_IRQ_CHIP
        help
          This enables support for Allwinner sunxi based SoCs like the A64.
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a34420a5df9a..b405bbb54431 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -476,6 +476,7 @@ emit_cond_jmp:
                case BPF_JGE:
                        jmp_cond = A64_COND_CS;
                        break;
+                case BPF_JSET:
                case BPF_JNE:
                        jmp_cond = A64_COND_NE;
                        break;
diff --git a/arch/x86/configs/kvm_guest.config b/arch/x86/configs/kvm_guest.config
index f9affcc3b9f1..9906505c998a 100644
--- a/arch/x86/configs/kvm_guest.config
+++ b/arch/x86/configs/kvm_guest.config
@@ -26,3 +26,6 @@ CONFIG_VIRTIO_NET=y
 CONFIG_9P_FS=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_VIRTIO_INPUT=y
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index b30dd8154cc2..4cddd17153fb 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -384,5 +384,5 @@
 375     i386    membarrier              sys_membarrier
 376     i386    mlock2                  sys_mlock2
 377     i386    copy_file_range         sys_copy_file_range
-378     i386    preadv2                 sys_preadv2
+378     i386    preadv2                 sys_preadv2                     compat_sys_preadv2
-379     i386    pwritev2                sys_pwritev2
+379     i386    pwritev2                sys_pwritev2                    compat_sys_pwritev2
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a6fd4dbcf820..5210eaa4aa62 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3708,7 +3708,7 @@ __init int intel_pmu_init(void)
                                c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;
                        }
                        c->idxmsk64 &=
-                                ~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));
+                                ~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));
                        c->weight = hweight64(c->idxmsk64);
                }
        }
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index 09a77dbc73c9..7377814de30b 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -709,6 +709,7 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf,
        /* clear STOP and INT from current entry */
        buf->topa_index[buf->stop_pos]->stop = 0;
+        buf->topa_index[buf->stop_pos]->intr = 0;
        buf->topa_index[buf->intr_pos]->intr = 0;
        /* how many pages till the STOP marker */
@@ -733,6 +734,7 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf,
        buf->intr_pos = idx;
        buf->topa_index[buf->stop_pos]->stop = 1;
+        buf->topa_index[buf->stop_pos]->intr = 1;
        buf->topa_index[buf->intr_pos]->intr = 1;
        return 0;
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index ab2bcaaebe38..b2625867ebd1 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -219,6 +219,9 @@
 #define KNL_CHA_MSR_PMON_BOX_FILTER_TID         0x1ff
 #define KNL_CHA_MSR_PMON_BOX_FILTER_STATE       (7 << 18)
 #define KNL_CHA_MSR_PMON_BOX_FILTER_OP          (0xfffffe2aULL << 32)
+#define KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE (0x1ULL << 32)
+#define KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE  (0x1ULL << 33)
+#define KNL_CHA_MSR_PMON_BOX_FILTER_NNC         (0x1ULL << 37)
 /* KNL EDC/MC UCLK */
 #define KNL_UCLK_MSR_PMON_CTR0_LOW              0x400
@@ -1902,6 +1905,10 @@ static int knl_cha_hw_config(struct intel_uncore_box *box,
                reg1->reg = HSWEP_C0_MSR_PMON_BOX_FILTER0 +
                            KNL_CHA_MSR_OFFSET * box->pmu->pmu_idx;
                reg1->config = event->attr.config1 & knl_cha_filter_mask(idx);
+                reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE;
+                reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE;
+                reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_NNC;
                reg1->idx = idx;
        }
        return 0;
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index ec863b9a9f78..8bef19f098d4 100644
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -166,7 +166,7 @@ again:
        if (unlikely(event->hw.event_base == MSR_SMI_COUNT))
                delta = sign_extend64(delta, 31);
-        local64_add(now - prev, &event->count);
+        local64_add(delta, &event->count);
 }
 static void msr_event_start(struct perf_event *event, int flags)
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index a969ae607be8..2e7513d1f1f4 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -108,6 +108,14 @@ struct exception_table_entry {
 #define ARCH_HAS_RELATIVE_EXTABLE
+#define swap_ex_entry_fixup(a, b, tmp, delta)                   \
+        do {                                                    \
+                (a)->fixup = (b)->fixup + (delta);              \
+                (b)->fixup = (tmp).fixup - (delta);             \
+                (a)->handler = (b)->handler + (delta);          \
+                (b)->handler = (tmp).handler - (delta);         \
+        } while (0)
 extern int fixup_exception(struct pt_regs *regs, int trapnr);
 extern bool ex_has_fault_handler(unsigned long ip);
 extern int early_fixup_exception(unsigned long *ip);
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 1f7fdb91a818..e4393bfc7f0d 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -336,7 +336,7 @@ static int intel_num_cpu_cores(struct cpuinfo_x86 *c)
 {
        unsigned int eax, ebx, ecx, edx;
-        if (c->cpuid_level < 4)
+        if (!IS_ENABLED(CONFIG_SMP) || c->cpuid_level < 4)
                return 1;
        /* Intel has a non-standard dependency on %ecx for this CPUID level. */
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a2065d3b3b39..0e4329ed91ef 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -332,6 +332,11 @@ static void __init smp_init_package_map(void)
         * primary cores.
         */
        ncpus = boot_cpu_data.x86_max_cores;
+        if (!ncpus) {
+                pr_warn("x86_max_cores == zero !?!?");
+                ncpus = 1;
+        }
        __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus);
        /*
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 0f6294376fbd..a2f24af3c999 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -5110,13 +5110,17 @@ static void fetch_possible_mmx_operand(struct x86_emulate_ctxt *ctxt,
 static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *))
 {
+        register void *__sp asm(_ASM_SP);
        ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF;
        if (!(ctxt->d & ByteOp))
                fop += __ffs(ctxt->dst.bytes) * FASTOP_SIZE;
        asm("push %[flags]; popf; call *%[fastop]; pushf; pop %[flags]\n"
            : "+a"(ctxt->dst.val), "+d"(ctxt->src.val), [flags]"+D"(flags),
-              [fastop]"+S"(fop)
+              [fastop]"+S"(fop), "+r"(__sp)
            : "c"(ctxt->src2.val));
        ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK);
        if (!fop) /* exception is returned in fop variable */
                return emulate_de(ctxt);
diff --git a/block/blk-map.c b/block/blk-map.c
index a54f0543b956..b9f88b7751fb 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -9,24 +9,6 @@
 #include "blk.h"
-static bool iovec_gap_to_prv(struct request_queue *q,
-                             struct iovec *prv, struct iovec *cur)
-{
-        unsigned long prev_end;
-        if (!queue_virt_boundary(q))
-                return false;
-        if (prv->iov_base == NULL && prv->iov_len == 0)
-                /* prv is not set - don't check */
-                return false;
-        prev_end = (unsigned long)(prv->iov_base + prv->iov_len);
-        return (((unsigned long)cur->iov_base & queue_virt_boundary(q)) ||
-                prev_end & queue_virt_boundary(q));
-}
 int blk_rq_append_bio(struct request_queue *q, struct request *rq,
                      struct bio *bio)
 {
@@ -125,31 +107,18 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                        struct rq_map_data *map_data,
                        const struct iov_iter *iter, gfp_t gfp_mask)
 {
-        struct iovec iov, prv = {.iov_base = NULL, .iov_len = 0};
+        bool copy = false;
-        bool copy = (q->dma_pad_mask & iter->count) || map_data;
+        unsigned long align = q->dma_pad_mask | queue_dma_alignment(q);
        struct bio *bio = NULL;
        struct iov_iter i;
        int ret;
-        if (!iter || !iter->count)
+        if (map_data)
-                return -EINVAL;
+                copy = true;
+        else if (iov_iter_alignment(iter) & align)
-        iov_for_each(iov, i, *iter) {
+                copy = true;
-                unsigned long uaddr = (unsigned long) iov.iov_base;
+        else if (queue_virt_boundary(q))
+                copy = queue_virt_boundary(q) & iov_iter_gap_alignment(iter);
-                if (!iov.iov_len)
-                        return -EINVAL;
-                /*
-                 * Keep going so we check length of all segments
-                 */
-                if ((uaddr & queue_dma_alignment(q)) ||
-                    iovec_gap_to_prv(q, &prv, &iov))
-                        copy = true;
-                prv.iov_base = iov.iov_base;
-                prv.iov_len = iov.iov_len;
-        }
        i = *iter;
        do {
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 93a1fdc1feee..1d33beb6a1ae 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -96,6 +96,7 @@ config CRYPTO_AKCIPHER
 config CRYPTO_RSA
        tristate "RSA algorithm"
        select CRYPTO_AKCIPHER
+        select CRYPTO_MANAGER
        select MPILIB
        select ASN1
        help
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 5fc1f172963d..3887a98abcc3 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -69,8 +69,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk)
        struct scatterlist *sg;
        sg = walk->sg;
-        walk->pg = sg_page(sg);
        walk->offset = sg->offset;
+        walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
+        walk->offset = offset_in_page(walk->offset);
        walk->entrylen = sg->length;
        if (walk->entrylen > walk->total)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index b86883aedca1..7d4acc449233 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1776,6 +1776,7 @@ static int alg_test_drbg(const struct alg_test_desc *desc, const char *driver,
 static int do_test_rsa(struct crypto_akcipher *tfm,
                       struct akcipher_testvec *vecs)
 {
+        char *xbuf[XBUFSIZE];
        struct akcipher_request *req;
        void *outbuf_enc = NULL;
        void *outbuf_dec = NULL;
@@ -1784,9 +1785,12 @@ static int do_test_rsa(struct crypto_akcipher *tfm,
        int err = -ENOMEM;
        struct scatterlist src, dst, src_tab[2];
+        if (testmgr_alloc_buf(xbuf))
+                return err;
        req = akcipher_request_alloc(tfm, GFP_KERNEL);
        if (!req)
-                return err;
+                goto free_xbuf;
        init_completion(&result.completion);
@@ -1804,9 +1808,14 @@ static int do_test_rsa(struct crypto_akcipher *tfm,
        if (!outbuf_enc)
                goto free_req;
+        if (WARN_ON(vecs->m_size > PAGE_SIZE))
+                goto free_all;
+        memcpy(xbuf[0], vecs->m, vecs->m_size);
        sg_init_table(src_tab, 2);
-        sg_set_buf(&src_tab[0], vecs->m, 8);
+        sg_set_buf(&src_tab[0], xbuf[0], 8);
-        sg_set_buf(&src_tab[1], vecs->m + 8, vecs->m_size - 8);
+        sg_set_buf(&src_tab[1], xbuf[0] + 8, vecs->m_size - 8);
        sg_init_one(&dst, outbuf_enc, out_len_max);
        akcipher_request_set_crypt(req, src_tab, &dst, vecs->m_size,
                                   out_len_max);
@@ -1825,7 +1834,7 @@ static int do_test_rsa(struct crypto_akcipher *tfm,
                goto free_all;
        }
        /* verify that encrypted message is equal to expected */
-        if (memcmp(vecs->c, sg_virt(req->dst), vecs->c_size)) {
+        if (memcmp(vecs->c, outbuf_enc, vecs->c_size)) {
                pr_err("alg: rsa: encrypt test failed. Invalid output\n");
                err = -EINVAL;
                goto free_all;
@@ -1840,7 +1849,13 @@ static int do_test_rsa(struct crypto_akcipher *tfm,
                err = -ENOMEM;
                goto free_all;
        }
-        sg_init_one(&src, vecs->c, vecs->c_size);
+        if (WARN_ON(vecs->c_size > PAGE_SIZE))
+                goto free_all;
+        memcpy(xbuf[0], vecs->c, vecs->c_size);
+        sg_init_one(&src, xbuf[0], vecs->c_size);
        sg_init_one(&dst, outbuf_dec, out_len_max);
        init_completion(&result.completion);
        akcipher_request_set_crypt(req, &src, &dst, vecs->c_size, out_len_max);
@@ -1867,6 +1882,8 @@ free_all:
        kfree(outbuf_enc);
 free_req:
        akcipher_request_free(req);
+free_xbuf:
+        testmgr_free_buf(xbuf);
        return err;
 }
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 5c79526245c2..a0380338946a 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -13,6 +13,7 @@
 #ifndef _REGMAP_INTERNAL_H
 #define _REGMAP_INTERNAL_H
+#include <linux/device.h>
 #include <linux/regmap.h>
 #include <linux/fs.h>
 #include <linux/list.h>
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 7526906ca080..5189fd6182f6 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -23,6 +23,8 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include "internal.h"
 struct regmap_mmio_context {
        void __iomem *regs;
        unsigned val_bytes;
@@ -212,6 +214,7 @@ static const struct regmap_bus regmap_mmio = {
        .reg_write = regmap_mmio_write,
        .reg_read = regmap_mmio_read,
        .free_context = regmap_mmio_free_context,
+        .val_format_endian_default = REGMAP_ENDIAN_LITTLE,
 };
 static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
@@ -245,7 +248,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
        ctx->val_bytes = config->val_bits / 8;
        ctx->clk = ERR_PTR(-ENODEV);
-        switch (config->reg_format_endian) {
+        switch (regmap_get_val_endian(dev, &regmap_mmio, config)) {
        case REGMAP_ENDIAN_DEFAULT:
        case REGMAP_ENDIAN_LITTLE:
 #ifdef __LITTLE_ENDIAN
diff --git a/drivers/base/regmap/regmap-spmi.c b/drivers/base/regmap/regmap-spmi.c
index 7e58f6560399..4a36e415e938 100644
--- a/drivers/base/regmap/regmap-spmi.c
+++ b/drivers/base/regmap/regmap-spmi.c
@@ -142,7 +142,7 @@ static int regmap_spmi_ext_read(void *context,
        while (val_size) {
                len = min_t(size_t, val_size, 8);
-                err = spmi_ext_register_readl(context, addr, val, val_size);
+                err = spmi_ext_register_readl(context, addr, val, len);
                if (err)
                        goto err_out;
diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h
index 0e82ce3c383e..976b01e58afb 100644
--- a/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@ -236,6 +236,8 @@ void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,
                                 uint32_t vf_mask);
 void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);
 void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);
+int adf_init_pf_wq(void);
+void adf_exit_pf_wq(void);
 #else
 static inline int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
 {
@@ -253,5 +255,14 @@ static inline void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev)
 static inline void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev)
 {
 }
+static inline int adf_init_pf_wq(void)
+{
+        return 0;
+}
+static inline void adf_exit_pf_wq(void)
+{
+}
 #endif
 #endif
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 5c897e6e7994..3c3f948290ca 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -462,12 +462,17 @@ static int __init adf_register_ctl_device_driver(void)
        if (adf_init_aer())
                goto err_aer;
+        if (adf_init_pf_wq())
+                goto err_pf_wq;
        if (qat_crypto_register())
                goto err_crypto_register;
        return 0;
 err_crypto_register:
+        adf_exit_pf_wq();
+err_pf_wq:
        adf_exit_aer();
 err_aer:
        adf_chr_drv_destroy();
@@ -480,6 +485,7 @@ static void __exit adf_unregister_ctl_device_driver(void)
 {
        adf_chr_drv_destroy();
        adf_exit_aer();
+        adf_exit_pf_wq();
        qat_crypto_unregister();
        adf_clean_vf_map(false);
        mutex_destroy(&adf_ctl_lock);
diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c
index 1117a8b58280..38a0415e767d 100644
--- a/drivers/crypto/qat/qat_common/adf_sriov.c
+++ b/drivers/crypto/qat/qat_common/adf_sriov.c
@@ -119,11 +119,6 @@ static int adf_enable_sriov(struct adf_accel_dev *accel_dev)
        int i;
        u32 reg;
-        /* Workqueue for PF2VF responses */
-        pf2vf_resp_wq = create_workqueue("qat_pf2vf_resp_wq");
-        if (!pf2vf_resp_wq)
-                return -ENOMEM;
        for (i = 0, vf_info = accel_dev->pf.vf_info; i < totalvfs;
             i++, vf_info++) {
                /* This ptr will be populated when VFs will be created */
@@ -216,11 +211,6 @@ void adf_disable_sriov(struct adf_accel_dev *accel_dev)
        kfree(accel_dev->pf.vf_info);
        accel_dev->pf.vf_info = NULL;
-        if (pf2vf_resp_wq) {
-                destroy_workqueue(pf2vf_resp_wq);
-                pf2vf_resp_wq = NULL;
-        }
 }
 EXPORT_SYMBOL_GPL(adf_disable_sriov);
@@ -304,3 +294,19 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
        return numvfs;
 }
 EXPORT_SYMBOL_GPL(adf_sriov_configure);
+int __init adf_init_pf_wq(void)
+{
+        /* Workqueue for PF2VF responses */
+        pf2vf_resp_wq = create_workqueue("qat_pf2vf_resp_wq");
+        return !pf2vf_resp_wq ? -ENOMEM : 0;
+}
+void adf_exit_pf_wq(void)
+{
+        if (pf2vf_resp_wq) {
+                destroy_workqueue(pf2vf_resp_wq);
+                pf2vf_resp_wq = NULL;
+        }
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
index bf731e9f643e..7f85c2c1d681 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
@@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector
                        }
                }
        } else {
-                for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
+                for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
-                        for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
+                        for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
                                max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
                                if (max_pix_clock >= pix_clock) {
                                        *dp_lanes = lane_num;
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index a0f1bd711b53..e3f4c725a1c6 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2872,20 +2872,6 @@ static void intel_dp_info(struct seq_file *m,
                intel_panel_info(m, &intel_connector->panel);
 }
-static void intel_dp_mst_info(struct seq_file *m,
-                          struct intel_connector *intel_connector)
-{
-        struct intel_encoder *intel_encoder = intel_connector->encoder;
-        struct intel_dp_mst_encoder *intel_mst =
-                enc_to_mst(&intel_encoder->base);
-        struct intel_digital_port *intel_dig_port = intel_mst->primary;
-        struct intel_dp *intel_dp = &intel_dig_port->dp;
-        bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
-                                        intel_connector->port);
-        seq_printf(m, "\taudio support: %s\n", yesno(has_audio));
-}
 static void intel_hdmi_info(struct seq_file *m,
                            struct intel_connector *intel_connector)
 {
@@ -2929,8 +2915,6 @@ static void intel_connector_info(struct seq_file *m,
                        intel_hdmi_info(m, intel_connector);
                else if (intel_encoder->type == INTEL_OUTPUT_LVDS)
                        intel_lvds_info(m, intel_connector);
-                else if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
-                        intel_dp_mst_info(m, intel_connector);
        }
        seq_printf(m, "\tmodes:\n");
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index fffdac801d3b..363bd79dea2e 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7444,6 +7444,8 @@ enum skl_disp_power_wells {
 #define  TRANS_CLK_SEL_DISABLED         (0x0<<29)
 #define  TRANS_CLK_SEL_PORT(x)          (((x)+1)<<29)
+#define CDCLK_FREQ                      _MMIO(0x46200)
 #define _TRANSA_MSA_MISC                0x60410
 #define _TRANSB_MSA_MISC                0x61410
 #define _TRANSC_MSA_MISC                0x62410
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 30f921421b0c..7d281b40064a 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -262,8 +262,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder)
        tmp |= AUD_CONFIG_N_PROG_ENABLE;
        tmp &= ~AUD_CONFIG_UPPER_N_MASK;
        tmp &= ~AUD_CONFIG_LOWER_N_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
-            intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
                tmp |= AUD_CONFIG_N_VALUE_INDEX;
        I915_WRITE(HSW_AUD_CFG(pipe), tmp);
@@ -476,8 +475,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
        tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
        tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
        tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
-            intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
                tmp |= AUD_CONFIG_N_VALUE_INDEX;
        else
                tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -515,8 +513,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
        /* ELD Conn_Type */
        connector->eld[5] &= ~(3 << 2);
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
-            intel_pipe_has_type(crtc, INTEL_OUTPUT_DP_MST))
                connector->eld[5] |= (1 << 2);
        connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 505fc5cf26f8..0364292367b1 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -257,8 +257,14 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder,
                pipe_config->has_pch_encoder = true;
        /* LPT FDI RX only supports 8bpc. */
-        if (HAS_PCH_LPT(dev))
+        if (HAS_PCH_LPT(dev)) {
+                if (pipe_config->bw_constrained && pipe_config->pipe_bpp < 24) {
+                        DRM_DEBUG_KMS("LPT only supports 24bpp\n");
+                        return false;
+                }
                pipe_config->pipe_bpp = 24;
+        }
        /* FDI must always be 2.7 GHz */
        if (HAS_DDI(dev)) {
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 3b57bf06abe8..96ffcc541e17 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3106,23 +3106,6 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)
        I915_WRITE(FDI_RX_CTL(PIPE_A), val);
 }
-bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
-                                 struct intel_crtc *intel_crtc)
-{
-        u32 temp;
-        if (intel_display_power_get_if_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
-                temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
-                intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
-                if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
-                        return true;
-        }
-        return false;
-}
 void intel_ddi_get_config(struct intel_encoder *encoder,
                          struct intel_crtc_state *pipe_config)
 {
@@ -3183,8 +3166,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
                break;
        }
-        pipe_config->has_audio =
+        if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
-                intel_ddi_is_audio_enabled(dev_priv, intel_crtc);
+                temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
+                if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
+                        pipe_config->has_audio = true;
+        }
        if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp &&
            pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 182f84937345..0104a06d01fd 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7988,9 +7988,6 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,
        pipe_config->gmch_pfit.control = tmp;
        pipe_config->gmch_pfit.pgm_ratios = I915_READ(PFIT_PGM_RATIOS);
-        if (INTEL_INFO(dev)->gen < 5)
-                pipe_config->gmch_pfit.lvds_border_bits =
-                        I915_READ(LVDS) & LVDS_BORDER_ENABLE;
 }
 static void vlv_crtc_clock_get(struct intel_crtc *crtc,
@@ -9752,6 +9749,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
        sandybridge_pcode_write(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ, data);
        mutex_unlock(&dev_priv->rps.hw_lock);
+        I915_WRITE(CDCLK_FREQ, DIV_ROUND_CLOSEST(cdclk, 1000) - 1);
        intel_update_cdclk(dev);
        WARN(cdclk != dev_priv->cdclk_freq,
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 937e77228466..2c999725b3d4 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -78,8 +78,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
                return false;
        }
-        if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, found->port))
-                pipe_config->has_audio = true;
        mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
        pipe_config->pbn = mst_pbn;
@@ -104,11 +102,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)
        struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
        struct intel_digital_port *intel_dig_port = intel_mst->primary;
        struct intel_dp *intel_dp = &intel_dig_port->dp;
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc = encoder->base.crtc;
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        int ret;
        DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
@@ -119,10 +112,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)
        if (ret) {
                DRM_ERROR("failed to update payload %d\n", ret);
        }
-        if (intel_crtc->config->has_audio) {
-                intel_audio_codec_disable(encoder);
-                intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
-        }
 }
 static void intel_mst_post_disable_dp(struct intel_encoder *encoder)
@@ -221,7 +210,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)
        struct intel_dp *intel_dp = &intel_dig_port->dp;
        struct drm_device *dev = intel_dig_port->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
        enum port port = intel_dig_port->port;
        int ret;
@@ -234,13 +222,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)
        ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
        ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
-        if (crtc->config->has_audio) {
-                DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",
-                                 pipe_name(crtc->pipe));
-                intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
-                intel_audio_codec_enable(encoder);
-        }
 }
 static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -266,9 +247,6 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
        pipe_config->has_dp_encoder = true;
-        pipe_config->has_audio =
-                intel_ddi_is_audio_enabled(dev_priv, crtc);
        temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
        if (temp & TRANS_DDI_PHSYNC)
                flags |= DRM_MODE_FLAG_PHSYNC;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 7d3af3a72abe..9d0770c23fde 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1019,8 +1019,6 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
 void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
 bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
 void intel_ddi_fdi_disable(struct drm_crtc *crtc);
-bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
-                                 struct intel_crtc *intel_crtc);
 void intel_ddi_get_config(struct intel_encoder *encoder,
                          struct intel_crtc_state *pipe_config);
 struct intel_encoder *
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index cd9fe609aefb..10dc3517b63b 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -123,6 +123,10 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,
        pipe_config->base.adjusted_mode.flags |= flags;
+        if (INTEL_INFO(dev)->gen < 5)
+                pipe_config->gmch_pfit.lvds_border_bits =
+                        tmp & LVDS_BORDER_ENABLE;
        /* gen2/3 store dither state in pfit control, needs to match */
        if (INTEL_INFO(dev)->gen < 4) {
                tmp = I915_READ(PFIT_CONTROL);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8ed3cf34f82d..3425d8e737b3 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6646,6 +6646,12 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
        misccpctl = I915_READ(GEN7_MISCCPCTL);
        I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
        I915_WRITE(GEN8_L3SQCREG1, BDW_WA_L3SQCREG1_DEFAULT);
+        /*
+         * Wait at least 100 clocks before re-enabling clock gating. See
+         * the definition of L3SQCREG1 in BSpec.
+         */
+        POSTING_READ(GEN8_L3SQCREG1);
+        udelay(1);
        I915_WRITE(GEN7_MISCCPCTL, misccpctl);
        /*
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index b80b08f71cb4..532127c55de6 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1742,6 +1742,7 @@ static u32 radeon_get_pll_use_mask(struct drm_crtc *crtc)
 static int radeon_get_shared_dp_ppll(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
        struct drm_crtc *test_crtc;
        struct radeon_crtc *test_radeon_crtc;
@@ -1751,6 +1752,10 @@ static int radeon_get_shared_dp_ppll(struct drm_crtc *crtc)
                test_radeon_crtc = to_radeon_crtc(test_crtc);
                if (test_radeon_crtc->encoder &&
                    ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_radeon_crtc->encoder))) {
+                        /* PPLL2 is exclusive to UNIPHYA on DCE61 */
+                        if (ASIC_IS_DCE61(rdev) && !ASIC_IS_DCE8(rdev) &&
+                            test_radeon_crtc->pll_id == ATOM_PPLL2)
+                                continue;
                        /* for DP use the same PLL for all */
                        if (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID)
                                return test_radeon_crtc->pll_id;
@@ -1772,6 +1777,7 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc)
 {
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
        struct drm_crtc *test_crtc;
        struct radeon_crtc *test_radeon_crtc;
        u32 adjusted_clock, test_adjusted_clock;
@@ -1787,6 +1793,10 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc)
                test_radeon_crtc = to_radeon_crtc(test_crtc);
                if (test_radeon_crtc->encoder &&
                    !ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_radeon_crtc->encoder))) {
+                        /* PPLL2 is exclusive to UNIPHYA on DCE61 */
+                        if (ASIC_IS_DCE61(rdev) && !ASIC_IS_DCE8(rdev) &&
+                            test_radeon_crtc->pll_id == ATOM_PPLL2)
+                                continue;
                        /* check if we are already driving this connector with another crtc */
                        if (test_radeon_crtc->connector == radeon_crtc->connector) {
                                /* if we are, return that pll */
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index afa9db1dc0e3..cead089a9e7d 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector,
                        }
                }
        } else {
-                for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
+                for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
-                        for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
+                        for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
                                max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
                                if (max_pix_clock >= pix_clock) {
                                        *dp_lanes = lane_num;
diff --git a/drivers/gpu/drm/radeon/radeon_dp_auxch.c b/drivers/gpu/drm/radeon/radeon_dp_auxch.c
index 3b0c229d7dcd..db64e0062689 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_auxch.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_auxch.c
@@ -105,7 +105,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg
        tmp &= AUX_HPD_SEL(0x7);
        tmp |= AUX_HPD_SEL(chan->rec.hpd);
-        tmp |= AUX_EN | AUX_LS_READ_EN;
+        tmp |= AUX_EN | AUX_LS_READ_EN | AUX_HPD_DISCON(0x1);
        WREG32(AUX_CONTROL + aux_offset[instance], tmp);
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index a806ba3818f7..8d6326d7e7be 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev)
        struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
        const struct max8997_platform_data *pdata =
                                        dev_get_platdata(iodev->dev);
-        const struct max8997_haptic_platform_data *haptic_pdata =
+        const struct max8997_haptic_platform_data *haptic_pdata = NULL;
-                                        pdata->haptic_pdata;
        struct max8997_haptic *chip;
        struct input_dev *input_dev;
        int error;
+        if (pdata)
+                haptic_pdata = pdata->haptic_pdata;
        if (!haptic_pdata) {
                dev_err(&pdev->dev, "no haptic platform data\n");
                return -EINVAL;
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index df3581f60628..42de34b92996 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -257,6 +257,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
        int vddvibr_uV = 0;
        int error;
+        of_node_get(twl6040_core_dev->of_node);
        twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,
                                                 "vibra");
        if (!twl6040_core_node) {
diff --git a/drivers/input/mouse/byd.c b/drivers/input/mouse/byd.c
index fdc243ca93ed..e583f8b50454 100644
--- a/drivers/input/mouse/byd.c
+++ b/drivers/input/mouse/byd.c
@@ -2,6 +2,10 @@
 * BYD TouchPad PS/2 mouse driver
 *
 * Copyright (C) 2015 Chris Diamand <chris@diamand.org>
+ * Copyright (C) 2015 Richard Pospesel
+ * Copyright (C) 2015 Tai Chi Minh Ralph Eastwood
+ * Copyright (C) 2015 Martin Wimpress
+ * Copyright (C) 2015 Jay Kuri
 *
 * 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
diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index 7f366f1b0377..0b1b8c7b6ce5 100644
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -74,11 +74,6 @@ static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer
        return 0;
 }
-static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb)
-{
-        return __verify_planes_array(vb, pb);
-}
 /**
 * __verify_length() - Verify that the bytesused value for each plane fits in
 * the plane length and that the data offset doesn't exceed the bytesused value.
@@ -442,7 +437,6 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
 }
 static const struct vb2_buf_ops v4l2_buf_ops = {
-        .verify_planes_array    = __verify_planes_array_core,
        .fill_user_buffer       = __fill_v4l2_buffer,
        .fill_vb2_buffer        = __fill_vb2_buffer,
        .copy_timestamp         = __copy_timestamp,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
index b212488606da..11be8044e0d7 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
@@ -43,6 +43,7 @@ static void xgene_cle_idt_to_hw(u32 dstqid, u32 fpsel,
 static void xgene_cle_dbptr_to_hw(struct xgene_enet_pdata *pdata,
                                  struct xgene_cle_dbptr *dbptr, u32 *buf)
 {
+        buf[0] = SET_VAL(CLE_DROP, dbptr->drop);
        buf[4] = SET_VAL(CLE_FPSEL, dbptr->fpsel) |
                 SET_VAL(CLE_DSTQIDL, dbptr->dstqid);
@@ -412,7 +413,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                        .branch = {
                                {
                                        /* IPV4 */
-                                        .valid = 0,
+                                        .valid = 1,
                                        .next_packet_pointer = 22,
                                        .jump_bw = JMP_FW,
                                        .jump_rel = JMP_ABS,
@@ -420,7 +421,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                        .next_node = PKT_PROT_NODE,
                                        .next_branch = 0,
                                        .data = 0x8,
-                                        .mask = 0xffff
+                                        .mask = 0x0
                                },
                                {
                                        .valid = 0,
@@ -456,7 +457,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                        .next_node = RSS_IPV4_TCP_NODE,
                                        .next_branch = 0,
                                        .data = 0x0600,
-                                        .mask = 0xffff
+                                        .mask = 0x00ff
                                },
                                {
                                        /* UDP */
@@ -468,7 +469,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                        .next_node = RSS_IPV4_UDP_NODE,
                                        .next_branch = 0,
                                        .data = 0x1100,
-                                        .mask = 0xffff
+                                        .mask = 0x00ff
                                },
                                {
                                        .valid = 0,
@@ -642,7 +643,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                {
                                        /* TCP DST Port */
                                        .valid = 0,
-                                        .next_packet_pointer = 256,
+                                        .next_packet_pointer = 258,
                                        .jump_bw = JMP_FW,
                                        .jump_rel = JMP_ABS,
                                        .operation = EQT,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
index 29a17abdd828..3bf90683240e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
@@ -83,6 +83,8 @@
 #define CLE_TYPE_POS            0
 #define CLE_TYPE_LEN            2
+#define CLE_DROP_POS            28
+#define CLE_DROP_LEN            1
 #define CLE_DSTQIDL_POS         25
 #define CLE_DSTQIDL_LEN         7
 #define CLE_DSTQIDH_POS         0
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 39e081a70f5b..513d2a62ee6d 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -219,27 +219,30 @@ void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
                            struct xgene_enet_pdata *pdata,
                            enum xgene_enet_err_code status)
 {
-        struct rtnl_link_stats64 *stats = &pdata->stats;
        switch (status) {
        case INGRESS_CRC:
-                stats->rx_crc_errors++;
+                ring->rx_crc_errors++;
+                ring->rx_dropped++;
                break;
        case INGRESS_CHECKSUM:
        case INGRESS_CHECKSUM_COMPUTE:
-                stats->rx_errors++;
+                ring->rx_errors++;
+                ring->rx_dropped++;
                break;
        case INGRESS_TRUNC_FRAME:
-                stats->rx_frame_errors++;
+                ring->rx_frame_errors++;
+                ring->rx_dropped++;
                break;
        case INGRESS_PKT_LEN:
-                stats->rx_length_errors++;
+                ring->rx_length_errors++;
+                ring->rx_dropped++;
                break;
        case INGRESS_PKT_UNDER:
-                stats->rx_frame_errors++;
+                ring->rx_frame_errors++;
+                ring->rx_dropped++;
                break;
        case INGRESS_FIFO_OVERRUN:
-                stats->rx_fifo_errors++;
+                ring->rx_fifo_errors++;
                break;
        default:
                break;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index ba7da98af2ef..45220be3122f 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -86,7 +86,7 @@ enum xgene_enet_rm {
 #define RINGADDRL_POS           5
 #define RINGADDRL_LEN           27
 #define RINGADDRH_POS           0
-#define RINGADDRH_LEN           6
+#define RINGADDRH_LEN           7
 #define RINGSIZE_POS            23
 #define RINGSIZE_LEN            3
 #define RINGTYPE_POS            19
@@ -94,9 +94,9 @@ enum xgene_enet_rm {
 #define RINGMODE_POS            20
 #define RINGMODE_LEN            3
 #define RECOMTIMEOUTL_POS       28
-#define RECOMTIMEOUTL_LEN       3
+#define RECOMTIMEOUTL_LEN       4
 #define RECOMTIMEOUTH_POS       0
-#define RECOMTIMEOUTH_LEN       2
+#define RECOMTIMEOUTH_LEN       3
 #define NUMMSGSINQ_POS          1
 #define NUMMSGSINQ_LEN          16
 #define ACCEPTLERR              BIT(19)
@@ -201,6 +201,8 @@ enum xgene_enet_rm {
 #define USERINFO_LEN                    32
 #define FPQNUM_POS                      32
 #define FPQNUM_LEN                      12
+#define ELERR_POS                       46
+#define ELERR_LEN                       2
 #define NV_POS                          50
 #define NV_LEN                          1
 #define LL_POS                          51
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 8d4c1ad2fc60..fd200883d228 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -443,8 +443,8 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb,
        skb_tx_timestamp(skb);
-        pdata->stats.tx_packets++;
+        tx_ring->tx_packets++;
-        pdata->stats.tx_bytes += skb->len;
+        tx_ring->tx_bytes += skb->len;
        pdata->ring_ops->wr_cmd(tx_ring, count);
        return NETDEV_TX_OK;
@@ -483,12 +483,12 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
        skb = buf_pool->rx_skb[skb_index];
        /* checking for error */
-        status = GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
+        status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) ||
+                  GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
        if (unlikely(status > 2)) {
                dev_kfree_skb_any(skb);
                xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),
                                       status);
-                pdata->stats.rx_dropped++;
                ret = -EIO;
                goto out;
        }
@@ -506,8 +506,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
                xgene_enet_skip_csum(skb);
        }
-        pdata->stats.rx_packets++;
+        rx_ring->rx_packets++;
-        pdata->stats.rx_bytes += datalen;
+        rx_ring->rx_bytes += datalen;
        napi_gro_receive(&rx_ring->napi, skb);
 out:
        if (--rx_ring->nbufpool == 0) {
@@ -630,7 +630,7 @@ static int xgene_enet_register_irq(struct net_device *ndev)
                ring = pdata->rx_ring[i];
                irq_set_status_flags(ring->irq, IRQ_DISABLE_UNLAZY);
                ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq,
-                                       IRQF_SHARED, ring->irq_name, ring);
+                                       0, ring->irq_name, ring);
                if (ret) {
                        netdev_err(ndev, "Failed to request irq %s\n",
                                   ring->irq_name);
@@ -641,7 +641,7 @@ static int xgene_enet_register_irq(struct net_device *ndev)
                ring = pdata->tx_ring[i]->cp_ring;
                irq_set_status_flags(ring->irq, IRQ_DISABLE_UNLAZY);
                ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq,
-                                       IRQF_SHARED, ring->irq_name, ring);
+                                       0, ring->irq_name, ring);
                if (ret) {
                        netdev_err(ndev, "Failed to request irq %s\n",
                                   ring->irq_name);
@@ -1114,12 +1114,31 @@ static struct rtnl_link_stats64 *xgene_enet_get_stats64(
 {
        struct xgene_enet_pdata *pdata = netdev_priv(ndev);
        struct rtnl_link_stats64 *stats = &pdata->stats;
+        struct xgene_enet_desc_ring *ring;
+        int i;
-        stats->rx_errors += stats->rx_length_errors +
+        memset(stats, 0, sizeof(struct rtnl_link_stats64));
-                            stats->rx_crc_errors +
+        for (i = 0; i < pdata->txq_cnt; i++) {
-                            stats->rx_frame_errors +
+                ring = pdata->tx_ring[i];
-                            stats->rx_fifo_errors;
+                if (ring) {
-        memcpy(storage, &pdata->stats, sizeof(struct rtnl_link_stats64));
+                        stats->tx_packets += ring->tx_packets;
+                        stats->tx_bytes += ring->tx_bytes;
+                }
+        }
+        for (i = 0; i < pdata->rxq_cnt; i++) {
+                ring = pdata->rx_ring[i];
+                if (ring) {
+                        stats->rx_packets += ring->rx_packets;
+                        stats->rx_bytes += ring->rx_bytes;
+                        stats->rx_errors += ring->rx_length_errors +
+                                ring->rx_crc_errors +
+                                ring->rx_frame_errors +
+                                ring->rx_fifo_errors;
+                        stats->rx_dropped += ring->rx_dropped;
+                }
+        }
+        memcpy(storage, stats, sizeof(struct rtnl_link_stats64));
        return storage;
 }
@@ -1234,6 +1253,13 @@ static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)
        for (i = 0; i < max_irqs; i++) {
                ret = platform_get_irq(pdev, i);
                if (ret <= 0) {
+                        if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
+                                max_irqs = i;
+                                pdata->rxq_cnt = max_irqs / 2;
+                                pdata->txq_cnt = max_irqs / 2;
+                                pdata->cq_cnt = max_irqs / 2;
+                                break;
+                        }
                        dev_err(dev, "Unable to get ENET IRQ\n");
                        ret = ret ? : -ENXIO;
                        return ret;
@@ -1437,19 +1463,28 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
                pdata->port_ops = &xgene_xgport_ops;
                pdata->cle_ops = &xgene_cle3in_ops;
                pdata->rm = RM0;
-                pdata->rxq_cnt = XGENE_NUM_RX_RING;
+                if (!pdata->rxq_cnt) {
-                pdata->txq_cnt = XGENE_NUM_TX_RING;
+                        pdata->rxq_cnt = XGENE_NUM_RX_RING;
-                pdata->cq_cnt = XGENE_NUM_TXC_RING;
+                        pdata->txq_cnt = XGENE_NUM_TX_RING;
+                        pdata->cq_cnt = XGENE_NUM_TXC_RING;
+                }
                break;
        }
        if (pdata->enet_id == XGENE_ENET1) {
                switch (pdata->port_id) {
                case 0:
-                        pdata->cpu_bufnum = START_CPU_BUFNUM_0;
+                        if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
-                        pdata->eth_bufnum = START_ETH_BUFNUM_0;
+                                pdata->cpu_bufnum = X2_START_CPU_BUFNUM_0;
-                        pdata->bp_bufnum = START_BP_BUFNUM_0;
+                                pdata->eth_bufnum = X2_START_ETH_BUFNUM_0;
-                        pdata->ring_num = START_RING_NUM_0;
+                                pdata->bp_bufnum = X2_START_BP_BUFNUM_0;
+                                pdata->ring_num = START_RING_NUM_0;
+                        } else {
+                                pdata->cpu_bufnum = START_CPU_BUFNUM_0;
+                                pdata->eth_bufnum = START_ETH_BUFNUM_0;
+                                pdata->bp_bufnum = START_BP_BUFNUM_0;
+                                pdata->ring_num = START_RING_NUM_0;
+                        }
                        break;
                case 1:
                        if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
@@ -1595,21 +1630,22 @@ static int xgene_enet_probe(struct platform_device *pdev)
        ret = xgene_enet_init_hw(pdata);
        if (ret)
-                goto err;
+                goto err_netdev;
        mac_ops = pdata->mac_ops;
        if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
                ret = xgene_enet_mdio_config(pdata);
                if (ret)
-                        goto err;
+                        goto err_netdev;
        } else {
                INIT_DELAYED_WORK(&pdata->link_work, mac_ops->link_state);
        }
        xgene_enet_napi_add(pdata);
        return 0;
-err:
+err_netdev:
        unregister_netdev(ndev);
+err:
        free_netdev(ndev);
        return ret;
 }
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 175d18890c7a..9d9cf445148c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -49,10 +49,10 @@
 #define XGENE_ENET_MSS  1448
 #define XGENE_MIN_ENET_FRAME_SIZE       60
-#define XGENE_MAX_ENET_IRQ      8
+#define XGENE_MAX_ENET_IRQ      16
-#define XGENE_NUM_RX_RING       4
+#define XGENE_NUM_RX_RING       8
-#define XGENE_NUM_TX_RING       4
+#define XGENE_NUM_TX_RING       8
-#define XGENE_NUM_TXC_RING      4
+#define XGENE_NUM_TXC_RING      8
 #define START_CPU_BUFNUM_0      0
 #define START_ETH_BUFNUM_0      2
@@ -121,6 +121,16 @@ struct xgene_enet_desc_ring {
                struct xgene_enet_raw_desc16 *raw_desc16;
        };
        __le64 *exp_bufs;
+        u64 tx_packets;
+        u64 tx_bytes;
+        u64 rx_packets;
+        u64 rx_bytes;
+        u64 rx_dropped;
+        u64 rx_errors;
+        u64 rx_length_errors;
+        u64 rx_crc_errors;
+        u64 rx_frame_errors;
+        u64 rx_fifo_errors;
 };
 struct xgene_mac_ops {
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
index 29a71b4dcc44..002df5a6756e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
@@ -33,7 +33,7 @@
 #define LINK_STATUS                     BIT(2)
 #define LINK_UP                         BIT(15)
 #define MPA_IDLE_WITH_QMI_EMPTY         BIT(12)
-#define SG_RX_DV_GATE_REG_0_ADDR        0x0dfc
+#define SG_RX_DV_GATE_REG_0_ADDR        0x05fc
 extern const struct xgene_mac_ops xgene_sgmac_ops;
 extern const struct xgene_port_ops xgene_sgport_ops;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 72eb29ed0359..c39a7f5c6a01 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -813,6 +813,46 @@ static inline struct sk_buff *bnxt_copy_skb(struct bnxt_napi *bnapi, u8 *data,
        return skb;
 }
+static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_napi *bnapi,
+                           u32 *raw_cons, void *cmp)
+{
+        struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
+        struct rx_cmp *rxcmp = cmp;
+        u32 tmp_raw_cons = *raw_cons;
+        u8 cmp_type, agg_bufs = 0;
+        cmp_type = RX_CMP_TYPE(rxcmp);
+        if (cmp_type == CMP_TYPE_RX_L2_CMP) {
+                agg_bufs = (le32_to_cpu(rxcmp->rx_cmp_misc_v1) &
+                            RX_CMP_AGG_BUFS) >>
+                           RX_CMP_AGG_BUFS_SHIFT;
+        } else if (cmp_type == CMP_TYPE_RX_L2_TPA_END_CMP) {
+                struct rx_tpa_end_cmp *tpa_end = cmp;
+                agg_bufs = (le32_to_cpu(tpa_end->rx_tpa_end_cmp_misc_v1) &
+                            RX_TPA_END_CMP_AGG_BUFS) >>
+                           RX_TPA_END_CMP_AGG_BUFS_SHIFT;
+        }
+        if (agg_bufs) {
+                if (!bnxt_agg_bufs_valid(bp, cpr, agg_bufs, &tmp_raw_cons))
+                        return -EBUSY;
+        }
+        *raw_cons = tmp_raw_cons;
+        return 0;
+}
+static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)
+{
+        if (!rxr->bnapi->in_reset) {
+                rxr->bnapi->in_reset = true;
+                set_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event);
+                schedule_work(&bp->sp_task);
+        }
+        rxr->rx_next_cons = 0xffff;
+}
 static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
                           struct rx_tpa_start_cmp *tpa_start,
                           struct rx_tpa_start_cmp_ext *tpa_start1)
@@ -830,6 +870,11 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
        prod_rx_buf = &rxr->rx_buf_ring[prod];
        tpa_info = &rxr->rx_tpa[agg_id];
+        if (unlikely(cons != rxr->rx_next_cons)) {
+                bnxt_sched_reset(bp, rxr);
+                return;
+        }
        prod_rx_buf->data = tpa_info->data;
        mapping = tpa_info->mapping;
@@ -867,6 +912,7 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
        rxr->rx_prod = NEXT_RX(prod);
        cons = NEXT_RX(cons);
+        rxr->rx_next_cons = NEXT_RX(cons);
        cons_rx_buf = &rxr->rx_buf_ring[cons];
        bnxt_reuse_rx_data(rxr, cons, cons_rx_buf->data);
@@ -980,6 +1026,14 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
        dma_addr_t mapping;
        struct sk_buff *skb;
+        if (unlikely(bnapi->in_reset)) {
+                int rc = bnxt_discard_rx(bp, bnapi, raw_cons, tpa_end);
+                if (rc < 0)
+                        return ERR_PTR(-EBUSY);
+                return NULL;
+        }
        tpa_info = &rxr->rx_tpa[agg_id];
        data = tpa_info->data;
        prefetch(data);
@@ -1146,6 +1200,12 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
        cons = rxcmp->rx_cmp_opaque;
        rx_buf = &rxr->rx_buf_ring[cons];
        data = rx_buf->data;
+        if (unlikely(cons != rxr->rx_next_cons)) {
+                int rc1 = bnxt_discard_rx(bp, bnapi, raw_cons, rxcmp);
+                bnxt_sched_reset(bp, rxr);
+                return rc1;
+        }
        prefetch(data);
        agg_bufs = (le32_to_cpu(rxcmp->rx_cmp_misc_v1) & RX_CMP_AGG_BUFS) >>
@@ -1245,6 +1305,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
 next_rx:
        rxr->rx_prod = NEXT_RX(prod);
+        rxr->rx_next_cons = NEXT_RX(cons);
 next_rx_no_prod:
        *raw_cons = tmp_raw_cons;
@@ -1388,6 +1449,10 @@ static int bnxt_poll_work(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)
                if (!TX_CMP_VALID(txcmp, raw_cons))
                        break;
+                /* The valid test of the entry must be done first before
+                 * reading any further.
+                 */
+                rmb();
                if (TX_CMP_TYPE(txcmp) == CMP_TYPE_TX_L2_CMP) {
                        tx_pkts++;
                        /* return full budget so NAPI will complete. */
@@ -2482,6 +2547,7 @@ static void bnxt_clear_ring_indices(struct bnxt *bp)
                        rxr->rx_prod = 0;
                        rxr->rx_agg_prod = 0;
                        rxr->rx_sw_agg_prod = 0;
+                        rxr->rx_next_cons = 0;
                }
        }
 }
@@ -4038,9 +4104,11 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)
 }
 static int bnxt_cfg_rx_mode(struct bnxt *);
+static bool bnxt_mc_list_updated(struct bnxt *, u32 *);
 static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
 {
+        struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
        int rc = 0;
        if (irq_re_init) {
@@ -4096,13 +4164,22 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
                netdev_err(bp->dev, "HWRM vnic filter failure rc: %x\n", rc);
                goto err_out;
        }
-        bp->vnic_info[0].uc_filter_count = 1;
+        vnic->uc_filter_count = 1;
-        bp->vnic_info[0].rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
+        vnic->rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
        if ((bp->dev->flags & IFF_PROMISC) && BNXT_PF(bp))
-                bp->vnic_info[0].rx_mask |=
+                vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
-                                CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
+        if (bp->dev->flags & IFF_ALLMULTI) {
+                vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;
+                vnic->mc_list_count = 0;
+        } else {
+                u32 mask = 0;
+                bnxt_mc_list_updated(bp, &mask);
+                vnic->rx_mask |= mask;
+        }
        rc = bnxt_cfg_rx_mode(bp);
        if (rc)
@@ -4447,6 +4524,7 @@ static void bnxt_enable_napi(struct bnxt *bp)
        int i;
        for (i = 0; i < bp->cp_nr_rings; i++) {
+                bp->bnapi[i]->in_reset = false;
                bnxt_enable_poll(bp->bnapi[i]);
                napi_enable(&bp->bnapi[i]->napi);
        }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 8b823ff558ff..de9d53eee3dd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -584,6 +584,7 @@ struct bnxt_rx_ring_info {
        u16                     rx_prod;
        u16                     rx_agg_prod;
        u16                     rx_sw_agg_prod;
+        u16                     rx_next_cons;
        void __iomem            *rx_doorbell;
        void __iomem            *rx_agg_doorbell;
@@ -636,6 +637,7 @@ struct bnxt_napi {
 #ifdef CONFIG_NET_RX_BUSY_POLL
        atomic_t                poll_state;
 #endif
+        bool                    in_reset;
 };
 #ifdef CONFIG_NET_RX_BUSY_POLL
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
index fa05e347262f..06b819db51b1 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
@@ -533,6 +533,7 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs,
                nicvf_config_vlan_stripping(nic, nic->netdev->features);
        /* Enable Receive queue */
+        memset(&rq_cfg, 0, sizeof(struct rq_cfg));
        rq_cfg.ena = 1;
        rq_cfg.tcp_ena = 0;
        nicvf_queue_reg_write(nic, NIC_QSET_RQ_0_7_CFG, qidx, *(u64 *)&rq_cfg);
@@ -565,6 +566,7 @@ void nicvf_cmp_queue_config(struct nicvf *nic, struct queue_set *qs,
                              qidx, (u64)(cq->dmem.phys_base));
        /* Enable Completion queue */
+        memset(&cq_cfg, 0, sizeof(struct cq_cfg));
        cq_cfg.ena = 1;
        cq_cfg.reset = 0;
        cq_cfg.caching = 0;
@@ -613,6 +615,7 @@ static void nicvf_snd_queue_config(struct nicvf *nic, struct queue_set *qs,
                              qidx, (u64)(sq->dmem.phys_base));
        /* Enable send queue  & set queue size */
+        memset(&sq_cfg, 0, sizeof(struct sq_cfg));
        sq_cfg.ena = 1;
        sq_cfg.reset = 0;
        sq_cfg.ldwb = 0;
@@ -649,6 +652,7 @@ static void nicvf_rbdr_config(struct nicvf *nic, struct queue_set *qs,
        /* Enable RBDR  & set queue size */
        /* Buffer size should be in multiples of 128 bytes */
+        memset(&rbdr_cfg, 0, sizeof(struct rbdr_cfg));
        rbdr_cfg.ena = 1;
        rbdr_cfg.reset = 0;
        rbdr_cfg.ldwb = 0;
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 1f23845a0694..085f9125cf42 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -145,7 +145,7 @@ static void nps_enet_tx_handler(struct net_device *ndev)
        u32 tx_ctrl_nt = (tx_ctrl_value & TX_CTL_NT_MASK) >> TX_CTL_NT_SHIFT;
        /* Check if we got TX */
-        if (!priv->tx_packet_sent || tx_ctrl_ct)
+        if (!priv->tx_skb || tx_ctrl_ct)
                return;
        /* Ack Tx ctrl register */
@@ -160,7 +160,7 @@ static void nps_enet_tx_handler(struct net_device *ndev)
        }
        dev_kfree_skb(priv->tx_skb);
-        priv->tx_packet_sent = false;
+        priv->tx_skb = NULL;
        if (netif_queue_stopped(ndev))
                netif_wake_queue(ndev);
@@ -183,6 +183,9 @@ static int nps_enet_poll(struct napi_struct *napi, int budget)
        work_done = nps_enet_rx_handler(ndev);
        if (work_done < budget) {
                u32 buf_int_enable_value = 0;
+                u32 tx_ctrl_value = nps_enet_reg_get(priv, NPS_ENET_REG_TX_CTL);
+                u32 tx_ctrl_ct =
+                        (tx_ctrl_value & TX_CTL_CT_MASK) >> TX_CTL_CT_SHIFT;
                napi_complete(napi);
@@ -192,6 +195,18 @@ static int nps_enet_poll(struct napi_struct *napi, int budget)
                nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE,
                                 buf_int_enable_value);
+                /* in case we will get a tx interrupt while interrupts
+                 * are masked, we will lose it since the tx is edge interrupt.
+                 * specifically, while executing the code section above,
+                 * between nps_enet_tx_handler and the interrupts enable, all
+                 * tx requests will be stuck until we will get an rx interrupt.
+                 * the two code lines below will solve this situation by
+                 * re-adding ourselves to the poll list.
+                 */
+                if (priv->tx_skb && !tx_ctrl_ct)
+                        napi_reschedule(napi);
        }
        return work_done;
@@ -217,7 +232,7 @@ static irqreturn_t nps_enet_irq_handler(s32 irq, void *dev_instance)
        u32 tx_ctrl_ct = (tx_ctrl_value & TX_CTL_CT_MASK) >> TX_CTL_CT_SHIFT;
        u32 rx_ctrl_cr = (rx_ctrl_value & RX_CTL_CR_MASK) >> RX_CTL_CR_SHIFT;
-        if ((!tx_ctrl_ct && priv->tx_packet_sent) || rx_ctrl_cr)
+        if ((!tx_ctrl_ct && priv->tx_skb) || rx_ctrl_cr)
                if (likely(napi_schedule_prep(&priv->napi))) {
                        nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, 0);
                        __napi_schedule(&priv->napi);
@@ -387,8 +402,6 @@ static void nps_enet_send_frame(struct net_device *ndev,
        /* Write the length of the Frame */
        tx_ctrl_value |= length << TX_CTL_NT_SHIFT;
-        /* Indicate SW is done */
-        priv->tx_packet_sent = true;
        tx_ctrl_value |= NPS_ENET_ENABLE << TX_CTL_CT_SHIFT;
        /* Send Frame */
        nps_enet_reg_set(priv, NPS_ENET_REG_TX_CTL, tx_ctrl_value);
@@ -465,7 +478,7 @@ static s32 nps_enet_open(struct net_device *ndev)
        s32 err;
        /* Reset private variables */
-        priv->tx_packet_sent = false;
+        priv->tx_skb = NULL;
        priv->ge_mac_cfg_2_value = 0;
        priv->ge_mac_cfg_3_value = 0;
@@ -534,6 +547,11 @@ static netdev_tx_t nps_enet_start_xmit(struct sk_buff *skb,
        priv->tx_skb = skb;
+        /* make sure tx_skb is actually written to the memory
+         * before the HW is informed and the IRQ is fired.
+         */
+        wmb();
        nps_enet_send_frame(ndev, skb);
        return NETDEV_TX_OK;
diff --git a/drivers/net/ethernet/ezchip/nps_enet.h b/drivers/net/ethernet/ezchip/nps_enet.h
index d0cab600bce8..3939ca20cc9f 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.h
+++ b/drivers/net/ethernet/ezchip/nps_enet.h
@@ -165,14 +165,12 @@
 * struct nps_enet_priv - Storage of ENET's private information.
 * @regs_base:      Base address of ENET memory-mapped control registers.
 * @irq:            For RX/TX IRQ number.
- * @tx_packet_sent: SW indication if frame is being sent.
 * @tx_skb:         socket buffer of sent frame.
 * @napi:           Structure for NAPI.
 */
 struct nps_enet_priv {
        void __iomem *regs_base;
        s32 irq;
-        bool tx_packet_sent;
        struct sk_buff *tx_skb;
        struct napi_struct napi;
        u32 ge_mac_cfg_2_value;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 08243c2ff4b4..2a03857cca18 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1521,9 +1521,15 @@ fec_enet_rx(struct net_device *ndev, int budget)
        struct fec_enet_private *fep = netdev_priv(ndev);
        for_each_set_bit(queue_id, &fep->work_rx, FEC_ENET_MAX_RX_QS) {
-                clear_bit(queue_id, &fep->work_rx);
+                int ret;
-                pkt_received += fec_enet_rx_queue(ndev,
+                ret = fec_enet_rx_queue(ndev,
                                        budget - pkt_received, queue_id);
+                if (ret < budget - pkt_received)
+                        clear_bit(queue_id, &fep->work_rx);
+                pkt_received += ret;
        }
        return pkt_received;
 }
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index b5c6d42daa12..2664827ddecd 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -68,7 +68,7 @@ config MVNETA
 config MVNETA_BM
        tristate
-        default y if MVNETA=y && MVNETA_BM_ENABLE
+        default y if MVNETA=y && MVNETA_BM_ENABLE!=n
        default MVNETA_BM_ENABLE
        select HWBM
        help
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index b723e3bcab39..ca3a38421ee7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -707,7 +707,7 @@ static int get_fixed_ipv6_csum(__wsum hw_checksum, struct sk_buff *skb,
        if (ipv6h->nexthdr == IPPROTO_FRAGMENT || ipv6h->nexthdr == IPPROTO_HOPOPTS)
                return -1;
-        hw_checksum = csum_add(hw_checksum, (__force __wsum)(ipv6h->nexthdr << 8));
+        hw_checksum = csum_add(hw_checksum, (__force __wsum)htons(ipv6h->nexthdr));
        csum_pseudo_hdr = csum_partial(&ipv6h->saddr,
                                       sizeof(ipv6h->saddr) + sizeof(ipv6h->daddr), 0);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 559d11a443bc..f5c3b9465d8d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -14,7 +14,6 @@ config MLX5_CORE_EN
        bool "Mellanox Technologies ConnectX-4 Ethernet support"
        depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
        select PTP_1588_CLOCK
-        select VXLAN if MLX5_CORE=y
        default n
        ---help---
          Ethernet support in Mellanox Technologies ConnectX-4 NIC.
@@ -32,3 +31,10 @@ config MLX5_CORE_EN_DCB
          This flag is depended on the kernel's DCB support.
          If unsure, set to Y
+config MLX5_CORE_EN_VXLAN
+        bool "VXLAN offloads Support"
+        default y
+        depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m)
+        ---help---
+          Say Y here if you want to use VXLAN offloads in the driver.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 4fc45ee0c5d1..bf65b71c7360 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -6,6 +6,7 @@ mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \
 mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \
                en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \
-                en_txrx.o en_clock.o vxlan.o en_tc.o
+                en_txrx.o en_clock.o en_tc.o
+mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o
 mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 3881dce0cc30..24344aafbd36 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -564,7 +564,9 @@ struct mlx5e_priv {
        struct mlx5e_flow_tables   fts;
        struct mlx5e_eth_addr_db   eth_addr;
        struct mlx5e_vlan_db       vlan;
+#ifdef CONFIG_MLX5_CORE_EN_VXLAN
        struct mlx5e_vxlan_db      vxlan;
+#endif
        struct mlx5e_params        params;
        struct workqueue_struct    *wq;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d4dfc5ce516a..94fef705890b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2149,6 +2149,7 @@ static int mlx5e_get_vf_stats(struct net_device *dev,
                                            vf_stats);
 }
+#if IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN)
 static void mlx5e_add_vxlan_port(struct net_device *netdev,
                                 sa_family_t sa_family, __be16 port)
 {
@@ -2220,6 +2221,7 @@ static netdev_features_t mlx5e_features_check(struct sk_buff *skb,
        return features;
 }
+#endif
 static const struct net_device_ops mlx5e_netdev_ops_basic = {
        .ndo_open                = mlx5e_open,
@@ -2251,9 +2253,11 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = {
        .ndo_set_features        = mlx5e_set_features,
        .ndo_change_mtu          = mlx5e_change_mtu,
        .ndo_do_ioctl            = mlx5e_ioctl,
+#ifdef CONFIG_MLX5_CORE_EN_VXLAN
        .ndo_add_vxlan_port      = mlx5e_add_vxlan_port,
        .ndo_del_vxlan_port      = mlx5e_del_vxlan_port,
        .ndo_features_check      = mlx5e_features_check,
+#endif
        .ndo_set_vf_mac          = mlx5e_set_vf_mac,
        .ndo_set_vf_vlan         = mlx5e_set_vf_vlan,
        .ndo_get_vf_config       = mlx5e_get_vf_config,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
index 129f3527aa14..217ac530a514 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
@@ -48,14 +48,21 @@ struct mlx5e_vxlan_work {
 static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)
 {
-        return (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) &&
+        return IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN) &&
+                (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) &&
                mlx5_core_is_pf(mdev));
 }
+#ifdef CONFIG_MLX5_CORE_EN_VXLAN
 void mlx5e_vxlan_init(struct mlx5e_priv *priv);
+void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);
+#else
+static inline void mlx5e_vxlan_init(struct mlx5e_priv *priv) {}
+static inline void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv) {}
+#endif
 void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, sa_family_t sa_family,
                            u16 port, int add);
 struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port);
-void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);
 #endif /* __MLX5_VXLAN_H__ */
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 4afbc3e9e381..668b2f465ca5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2541,11 +2541,11 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port,
        lag->ref_count++;
        return 0;
+err_col_port_enable:
+        mlxsw_sp_lag_col_port_remove(mlxsw_sp_port, lag_id);
 err_col_port_add:
        if (!lag->ref_count)
                mlxsw_sp_lag_destroy(mlxsw_sp, lag_id);
-err_col_port_enable:
-        mlxsw_sp_lag_col_port_remove(mlxsw_sp_port, lag_id);
        return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index e1c74efff51a..9cd6f472234a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -214,7 +214,15 @@ static int __mlxsw_sp_port_flood_set(struct mlxsw_sp_port *mlxsw_sp_port,
        mlxsw_reg_sftr_pack(sftr_pl, MLXSW_SP_FLOOD_TABLE_BM, idx_begin,
                            table_type, range, local_port, set);
        err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sftr), sftr_pl);
+        if (err)
+                goto err_flood_bm_set;
+        else
+                goto buffer_out;
+err_flood_bm_set:
+        mlxsw_reg_sftr_pack(sftr_pl, MLXSW_SP_FLOOD_TABLE_UC, idx_begin,
+                            table_type, range, local_port, !set);
+        mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sftr), sftr_pl);
 buffer_out:
        kfree(sftr_pl);
        return err;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index db80eb1c6d4f..2b10f1bcd151 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -1015,20 +1015,24 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
 {
        int i, v, addr;
        __le32 *ptr32;
+        int ret;
        addr = base;
        ptr32 = buf;
        for (i = 0; i < size / sizeof(u32); i++) {
-                if (netxen_rom_fast_read(adapter, addr, &v) == -1)
+                ret = netxen_rom_fast_read(adapter, addr, &v);
-                        return -1;
+                if (ret)
+                        return ret;
                *ptr32 = cpu_to_le32(v);
                ptr32++;
                addr += sizeof(u32);
        }
        if ((char *)buf + size > (char *)ptr32) {
                __le32 local;
-                if (netxen_rom_fast_read(adapter, addr, &v) == -1)
+                ret = netxen_rom_fast_read(adapter, addr, &v);
-                        return -1;
+                if (ret)
+                        return ret;
                local = cpu_to_le32(v);
                memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32);
        }
@@ -1940,7 +1944,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
                                if (adapter->phy_read &&
                                    adapter->phy_read(adapter,
                                                      NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                                      &autoneg) != 0)
+                                                      &autoneg) == 0)
                                        adapter->link_autoneg = autoneg;
                        } else
                                goto link_down;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index fd362b6923f4..9c6eed9b45f7 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -852,7 +852,8 @@ netxen_check_options(struct netxen_adapter *adapter)
        ptr32 = (__le32 *)&serial_num;
        offset = NX_FW_SERIAL_NUM_OFFSET;
        for (i = 0; i < 8; i++) {
-                if (netxen_rom_fast_read(adapter, offset, &val) == -1) {
+                err = netxen_rom_fast_read(adapter, offset, &val);
+                if (err) {
                        dev_err(&pdev->dev, "error reading board info\n");
                        adapter->driver_mismatch = 1;
                        return;
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 7869465435fa..12f6615797de 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -421,7 +421,7 @@ netdev_tx_t qede_start_xmit(struct sk_buff *skb,
        u8 xmit_type;
        u16 idx;
        u16 hlen;
-        bool data_split;
+        bool data_split = false;
        /* Get tx-queue context and netdev index */
        txq_index = skb_get_queue_mapping(skb);
@@ -1938,8 +1938,6 @@ static struct qede_dev *qede_alloc_etherdev(struct qed_dev *cdev,
        edev->q_num_rx_buffers = NUM_RX_BDS_DEF;
        edev->q_num_tx_buffers = NUM_TX_BDS_DEF;
-        DP_INFO(edev, "Allocated netdev with 64 tx queues and 64 rx queues\n");
        SET_NETDEV_DEV(ndev, &pdev->dev);
        memset(&edev->stats, 0, sizeof(edev->stats));
@@ -2090,9 +2088,9 @@ static void qede_update_pf_params(struct qed_dev *cdev)
 {
        struct qed_pf_params pf_params;
-        /* 16 rx + 16 tx */
+        /* 64 rx + 64 tx */
        memset(&pf_params, 0, sizeof(struct qed_pf_params));
-        pf_params.eth_pf_params.num_cons = 32;
+        pf_params.eth_pf_params.num_cons = 128;
        qed_ops->common->update_pf_params(cdev, &pf_params);
 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
index cda9e604a95f..0844b7c75767 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
@@ -1417,6 +1417,7 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
        struct qlcnic_fw_dump *fw_dump = &ahw->fw_dump;
        struct pci_dev *pdev = adapter->pdev;
        bool extended = false;
+        int ret;
        prev_version = adapter->fw_version;
        current_version = qlcnic_83xx_get_fw_version(adapter);
@@ -1427,8 +1428,11 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
                if (qlcnic_83xx_md_check_extended_dump_capability(adapter))
                        extended = !qlcnic_83xx_extend_md_capab(adapter);
-                if (!qlcnic_fw_cmd_get_minidump_temp(adapter))
+                ret = qlcnic_fw_cmd_get_minidump_temp(adapter);
-                        dev_info(&pdev->dev, "Supports FW dump capability\n");
+                if (ret)
+                        return;
+                dev_info(&pdev->dev, "Supports FW dump capability\n");
                /* Once we have minidump template with extended iSCSI dump
                 * capability, update the minidump capture mask to 0x1f as
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 9e2a0bd8f5a8..4277d0c12101 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1506,6 +1506,8 @@ static int ravb_close(struct net_device *ndev)
                priv->phydev = NULL;
        }
+        if (priv->chip_id == RCAR_GEN3)
+                free_irq(priv->emac_irq, ndev);
        free_irq(ndev->irq, ndev);
        napi_disable(&priv->napi[RAVB_NC]);
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index bc168894bda3..7b0a644122eb 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -504,8 +504,6 @@ static int geneve_gro_complete(struct sk_buff *skb, int nhoff,
        int gh_len;
        int err = -ENOSYS;
-        udp_tunnel_gro_complete(skb, nhoff);
        gh = (struct genevehdr *)(skb->data + nhoff);
        gh_len = geneve_hlen(gh);
        type = gh->proto_type;
@@ -516,6 +514,9 @@ static int geneve_gro_complete(struct sk_buff *skb, int nhoff,
                err = ptype->callbacks.gro_complete(skb, nhoff + gh_len);
        rcu_read_unlock();
+        skb_set_inner_mac_header(skb, nhoff + gh_len);
        return err;
 }
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index c6385617bfb2..92eaab95ae2b 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -85,7 +85,7 @@ struct gcm_iv {
 * @tfm: crypto struct, key storage
 */
 struct macsec_key {
-        u64 id;
+        u8 id[MACSEC_KEYID_LEN];
        struct crypto_aead *tfm;
 };
@@ -1529,7 +1529,8 @@ static const struct nla_policy macsec_genl_sa_policy[NUM_MACSEC_SA_ATTR] = {
        [MACSEC_SA_ATTR_AN] = { .type = NLA_U8 },
        [MACSEC_SA_ATTR_ACTIVE] = { .type = NLA_U8 },
        [MACSEC_SA_ATTR_PN] = { .type = NLA_U32 },
-        [MACSEC_SA_ATTR_KEYID] = { .type = NLA_U64 },
+        [MACSEC_SA_ATTR_KEYID] = { .type = NLA_BINARY,
+                                   .len = MACSEC_KEYID_LEN, },
        [MACSEC_SA_ATTR_KEY] = { .type = NLA_BINARY,
                                 .len = MACSEC_MAX_KEY_LEN, },
 };
@@ -1576,6 +1577,9 @@ static bool validate_add_rxsa(struct nlattr **attrs)
                        return false;
        }
+        if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
+                return false;
        return true;
 }
@@ -1641,7 +1645,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
        if (tb_sa[MACSEC_SA_ATTR_ACTIVE])
                rx_sa->active = !!nla_get_u8(tb_sa[MACSEC_SA_ATTR_ACTIVE]);
-        rx_sa->key.id = nla_get_u64(tb_sa[MACSEC_SA_ATTR_KEYID]);
+        nla_memcpy(rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN);
        rx_sa->sc = rx_sc;
        rcu_assign_pointer(rx_sc->sa[assoc_num], rx_sa);
@@ -1722,6 +1726,9 @@ static bool validate_add_txsa(struct nlattr **attrs)
                        return false;
        }
+        if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
+                return false;
        return true;
 }
@@ -1777,7 +1784,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
                return -ENOMEM;
        }
-        tx_sa->key.id = nla_get_u64(tb_sa[MACSEC_SA_ATTR_KEYID]);
+        nla_memcpy(tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN);
        spin_lock_bh(&tx_sa->lock);
        tx_sa->next_pn = nla_get_u32(tb_sa[MACSEC_SA_ATTR_PN]);
@@ -2318,7 +2325,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
                if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
                    nla_put_u32(skb, MACSEC_SA_ATTR_PN, tx_sa->next_pn) ||
-                    nla_put_u64(skb, MACSEC_SA_ATTR_KEYID, tx_sa->key.id) ||
+                    nla_put(skb, MACSEC_SA_ATTR_KEYID, MACSEC_KEYID_LEN, tx_sa->key.id) ||
                    nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, tx_sa->active)) {
                        nla_nest_cancel(skb, txsa_nest);
                        nla_nest_cancel(skb, txsa_list);
@@ -2419,7 +2426,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
                        if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
                            nla_put_u32(skb, MACSEC_SA_ATTR_PN, rx_sa->next_pn) ||
-                            nla_put_u64(skb, MACSEC_SA_ATTR_KEYID, rx_sa->key.id) ||
+                            nla_put(skb, MACSEC_SA_ATTR_KEYID, MACSEC_KEYID_LEN, rx_sa->key.id) ||
                            nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, rx_sa->active)) {
                                nla_nest_cancel(skb, rxsa_nest);
                                nla_nest_cancel(skb, rxsc_nest);
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 95394edd1ed5..9a35aa462314 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -373,7 +373,7 @@ static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb)
                        goto wake_up;
                }
-                kfree_skb(skb);
+                consume_skb(skb);
                while (segs) {
                        struct sk_buff *nskb = segs->next;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 5590b9c182c9..445fc5aef308 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -790,9 +790,11 @@ void phy_start(struct phy_device *phydev)
                break;
        case PHY_HALTED:
                /* make sure interrupts are re-enabled for the PHY */
-                err = phy_enable_interrupts(phydev);
+                if (phydev->irq != PHY_POLL) {
-                if (err < 0)
+                        err = phy_enable_interrupts(phydev);
-                        break;
+                        if (err < 0)
+                                break;
+                }
                phydev->state = PHY_RESUMING;
                do_resume = true;
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 1c0fa364323e..8ac261ab7d7d 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -616,8 +616,9 @@ out:
 static int vxlan_gro_complete(struct sk_buff *skb, int nhoff,
                              struct udp_offload *uoff)
 {
-        udp_tunnel_gro_complete(skb, nhoff);
+        /* Sets 'skb->inner_mac_header' since we are always called with
+         * 'skb->encapsulation' set.
+         */
        return eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 75870e68a7c3..34731e29c589 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -105,6 +105,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
                        struct iwl_tx_cmd *tx_cmd,
                        struct ieee80211_tx_info *info, u8 sta_id)
 {
+        struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (void *)skb->data;
        __le16 fc = hdr->frame_control;
        u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);
@@ -185,7 +186,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
        tx_cmd->tx_flags = cpu_to_le32(tx_flags);
        /* Total # bytes to be transmitted */
        tx_cmd->len = cpu_to_le16((u16)skb->len +
-                (uintptr_t)info->driver_data[0]);
+                (uintptr_t)skb_info->driver_data[0]);
        tx_cmd->next_frame_len = 0;
        tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
        tx_cmd->sta_id = sta_id;
@@ -327,10 +328,11 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,
 */
 static struct iwl_device_cmd *
 iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,
-                      int hdrlen, struct ieee80211_sta *sta, u8 sta_id)
+                      struct ieee80211_tx_info *info, int hdrlen,
+                      struct ieee80211_sta *sta, u8 sta_id)
 {
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
        struct iwl_device_cmd *dev_cmd;
        struct iwl_tx_cmd *tx_cmd;
@@ -350,10 +352,10 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,
        iwl_mvm_set_tx_cmd_rate(mvm, tx_cmd, info, sta, hdr->frame_control);
-        memset(&info->status, 0, sizeof(info->status));
+        memset(&skb_info->status, 0, sizeof(skb_info->status));
-        memset(info->driver_data, 0, sizeof(info->driver_data));
+        memset(skb_info->driver_data, 0, sizeof(skb_info->driver_data));
-        info->driver_data[1] = dev_cmd;
+        skb_info->driver_data[1] = dev_cmd;
        return dev_cmd;
 }
@@ -361,22 +363,25 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,
 int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
 {
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info info;
        struct iwl_device_cmd *dev_cmd;
        struct iwl_tx_cmd *tx_cmd;
        u8 sta_id;
        int hdrlen = ieee80211_hdrlen(hdr->frame_control);
-        if (WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_AMPDU))
+        memcpy(&info, skb->cb, sizeof(info));
+        if (WARN_ON_ONCE(info.flags & IEEE80211_TX_CTL_AMPDU))
                return -1;
-        if (WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM &&
+        if (WARN_ON_ONCE(info.flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM &&
-                         (!info->control.vif ||
+                         (!info.control.vif ||
-                          info->hw_queue != info->control.vif->cab_queue)))
+                          info.hw_queue != info.control.vif->cab_queue)))
                return -1;
        /* This holds the amsdu headers length */
-        info->driver_data[0] = (void *)(uintptr_t)0;
+        skb_info->driver_data[0] = (void *)(uintptr_t)0;
        /*
         * IWL_MVM_OFFCHANNEL_QUEUE is used for ROC packets that can be used
@@ -385,7 +390,7 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
         * and hence needs to be sent on the aux queue
         */
        if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_MVM_OFFCHANNEL_QUEUE &&
-            info->control.vif->type == NL80211_IFTYPE_STATION)
+            info.control.vif->type == NL80211_IFTYPE_STATION)
                IEEE80211_SKB_CB(skb)->hw_queue = mvm->aux_queue;
        /*
@@ -398,14 +403,14 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
         * AUX station.
         */
        sta_id = mvm->aux_sta.sta_id;
-        if (info->control.vif) {
+        if (info.control.vif) {
                struct iwl_mvm_vif *mvmvif =
-                        iwl_mvm_vif_from_mac80211(info->control.vif);
+                        iwl_mvm_vif_from_mac80211(info.control.vif);
-                if (info->control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||
+                if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||
-                    info->control.vif->type == NL80211_IFTYPE_AP)
+                    info.control.vif->type == NL80211_IFTYPE_AP)
                        sta_id = mvmvif->bcast_sta.sta_id;
-                else if (info->control.vif->type == NL80211_IFTYPE_STATION &&
+                else if (info.control.vif->type == NL80211_IFTYPE_STATION &&
                         is_multicast_ether_addr(hdr->addr1)) {
                        u8 ap_sta_id = ACCESS_ONCE(mvmvif->ap_sta_id);
@@ -414,19 +419,18 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
                }
        }
-        IWL_DEBUG_TX(mvm, "station Id %d, queue=%d\n", sta_id, info->hw_queue);
+        IWL_DEBUG_TX(mvm, "station Id %d, queue=%d\n", sta_id, info.hw_queue);
-        dev_cmd = iwl_mvm_set_tx_params(mvm, skb, hdrlen, NULL, sta_id);
+        dev_cmd = iwl_mvm_set_tx_params(mvm, skb, &info, hdrlen, NULL, sta_id);
        if (!dev_cmd)
                return -1;
-        /* From now on, we cannot access info->control */
        tx_cmd = (struct iwl_tx_cmd *)dev_cmd->payload;
        /* Copy MAC header from skb into command buffer */
        memcpy(tx_cmd->hdr, hdr, hdrlen);
-        if (iwl_trans_tx(mvm->trans, skb, dev_cmd, info->hw_queue)) {
+        if (iwl_trans_tx(mvm->trans, skb, dev_cmd, info.hw_queue)) {
                iwl_trans_free_tx_cmd(mvm->trans, dev_cmd);
                return -1;
        }
@@ -445,11 +449,11 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
 #ifdef CONFIG_INET
 static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
+                          struct ieee80211_tx_info *info,
                          struct ieee80211_sta *sta,
                          struct sk_buff_head *mpdus_skb)
 {
        struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (void *)skb->data;
        unsigned int mss = skb_shinfo(skb)->gso_size;
        struct sk_buff *tmp, *next;
@@ -544,6 +548,8 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
        /* This skb fits in one single A-MSDU */
        if (num_subframes * mss >= tcp_payload_len) {
+                struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
                /*
                 * Compute the length of all the data added for the A-MSDU.
                 * This will be used to compute the length to write in the TX
@@ -552,11 +558,10 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
                 * already had one set of SNAP / IP / TCP headers.
                 */
                num_subframes = DIV_ROUND_UP(tcp_payload_len, mss);
-                info = IEEE80211_SKB_CB(skb);
                amsdu_add = num_subframes * sizeof(struct ethhdr) +
                        (num_subframes - 1) * (snap_ip_tcp + pad);
                /* This holds the amsdu headers length */
-                info->driver_data[0] = (void *)(uintptr_t)amsdu_add;
+                skb_info->driver_data[0] = (void *)(uintptr_t)amsdu_add;
                __skb_queue_tail(mpdus_skb, skb);
                return 0;
@@ -596,11 +601,14 @@ segment:
                        ip_hdr(tmp)->id = htons(ip_base_id + i * num_subframes);
                if (tcp_payload_len > mss) {
+                        struct ieee80211_tx_info *skb_info =
+                                IEEE80211_SKB_CB(tmp);
                        num_subframes = DIV_ROUND_UP(tcp_payload_len, mss);
-                        info = IEEE80211_SKB_CB(tmp);
                        amsdu_add = num_subframes * sizeof(struct ethhdr) +
                                (num_subframes - 1) * (snap_ip_tcp + pad);
-                        info->driver_data[0] = (void *)(uintptr_t)amsdu_add;
+                        skb_info->driver_data[0] =
+                                (void *)(uintptr_t)amsdu_add;
                        skb_shinfo(tmp)->gso_size = mss;
                } else {
                        qc = ieee80211_get_qos_ctl((void *)tmp->data);
@@ -622,6 +630,7 @@ segment:
 }
 #else /* CONFIG_INET */
 static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
+                          struct ieee80211_tx_info *info,
                          struct ieee80211_sta *sta,
                          struct sk_buff_head *mpdus_skb)
 {
@@ -636,10 +645,10 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
 * Sets the fields in the Tx cmd that are crypto related
 */
 static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
+                           struct ieee80211_tx_info *info,
                           struct ieee80211_sta *sta)
 {
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct iwl_mvm_sta *mvmsta;
        struct iwl_device_cmd *dev_cmd;
        struct iwl_tx_cmd *tx_cmd;
@@ -660,7 +669,8 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                return -1;
-        dev_cmd = iwl_mvm_set_tx_params(mvm, skb, hdrlen, sta, mvmsta->sta_id);
+        dev_cmd = iwl_mvm_set_tx_params(mvm, skb, info, hdrlen,
+                                        sta, mvmsta->sta_id);
        if (!dev_cmd)
                goto drop;
@@ -736,7 +746,8 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
                   struct ieee80211_sta *sta)
 {
        struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info info;
        struct sk_buff_head mpdus_skbs;
        unsigned int payload_len;
        int ret;
@@ -747,21 +758,23 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                return -1;
+        memcpy(&info, skb->cb, sizeof(info));
        /* This holds the amsdu headers length */
-        info->driver_data[0] = (void *)(uintptr_t)0;
+        skb_info->driver_data[0] = (void *)(uintptr_t)0;
        if (!skb_is_gso(skb))
-                return iwl_mvm_tx_mpdu(mvm, skb, sta);
+                return iwl_mvm_tx_mpdu(mvm, skb, &info, sta);
        payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -
                tcp_hdrlen(skb) + skb->data_len;
        if (payload_len <= skb_shinfo(skb)->gso_size)
-                return iwl_mvm_tx_mpdu(mvm, skb, sta);
+                return iwl_mvm_tx_mpdu(mvm, skb, &info, sta);
        __skb_queue_head_init(&mpdus_skbs);
-        ret = iwl_mvm_tx_tso(mvm, skb, sta, &mpdus_skbs);
+        ret = iwl_mvm_tx_tso(mvm, skb, &info, sta, &mpdus_skbs);
        if (ret)
                return ret;
@@ -771,7 +784,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
        while (!skb_queue_empty(&mpdus_skbs)) {
                skb = __skb_dequeue(&mpdus_skbs);
-                ret = iwl_mvm_tx_mpdu(mvm, skb, sta);
+                ret = iwl_mvm_tx_mpdu(mvm, skb, &info, sta);
                if (ret) {
                        __skb_queue_purge(&mpdus_skbs);
                        return ret;
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index b42f26029225..4412a57ec862 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -711,6 +711,7 @@ static void xenvif_tx_err(struct xenvif_queue *queue,
                if (cons == end)
                        break;
                RING_COPY_REQUEST(&queue->tx, cons++, txp);
+                extra_count = 0; /* only the first frag can have extras */
        } while (1);
        queue->tx.req_cons = cons;
 }
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 5101f3ab4f29..92f536596b24 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -402,9 +402,9 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
                /*
                 * vmemmap_populate_hugepages() allocates the memmap array in
-                 * HPAGE_SIZE chunks.
+                 * PMD_SIZE chunks.
                 */
-                memmap_size = ALIGN(64 * npfns, HPAGE_SIZE);
+                memmap_size = ALIGN(64 * npfns, PMD_SIZE);
                offset = ALIGN(start + SZ_8K + memmap_size, nd_pfn->align)
                        - start;
        } else if (nd_pfn->mode == PFN_MODE_RAM)
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 6c9f5467bc5f..dd7cdbee8029 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -294,7 +294,7 @@ void pci_bus_add_device(struct pci_dev *dev)
        dev->match_driver = true;
        retval = device_attach(&dev->dev);
-        if (retval < 0) {
+        if (retval < 0 && retval != -EPROBE_DEFER) {
                dev_warn(&dev->dev, "device attach failed (%d)\n", retval);
                pci_proc_detach_device(dev);
                pci_remove_sysfs_dev_files(dev);
@@ -324,7 +324,9 @@ void pci_bus_add_devices(const struct pci_bus *bus)
        }
        list_for_each_entry(dev, &bus->devices, bus_list) {
-                BUG_ON(!dev->is_added);
+                /* Skip if device attach failed */
+                if (!dev->is_added)
+                        continue;
                child = dev->subordinate;
                if (child)
                        pci_bus_add_devices(child);
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 4429312e848d..2c447130b954 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -722,9 +722,11 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
                        break;
                case PIN_CONFIG_BIAS_PULL_UP:
                        conf |= ATMEL_PIO_PUEN_MASK;
+                        conf &= (~ATMEL_PIO_PDEN_MASK);
                        break;
                case PIN_CONFIG_BIAS_PULL_DOWN:
                        conf |= ATMEL_PIO_PDEN_MASK;
+                        conf &= (~ATMEL_PIO_PUEN_MASK);
                        break;
                case PIN_CONFIG_DRIVE_OPEN_DRAIN:
                        if (arg == 0)
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 40cd894e4df5..514a5e8fdbab 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -157,7 +157,9 @@ static struct regulator_ops axp20x_ops_sw = {
 static const struct regulator_linear_range axp20x_ldo4_ranges[] = {
        REGULATOR_LINEAR_RANGE(1250000, 0x0, 0x0, 0),
        REGULATOR_LINEAR_RANGE(1300000, 0x1, 0x8, 100000),
-        REGULATOR_LINEAR_RANGE(2500000, 0x9, 0xf, 100000),
+        REGULATOR_LINEAR_RANGE(2500000, 0x9, 0x9, 0),
+        REGULATOR_LINEAR_RANGE(2700000, 0xa, 0xb, 100000),
+        REGULATOR_LINEAR_RANGE(3000000, 0xc, 0xf, 100000),
 };
 static const struct regulator_desc axp20x_regulators[] = {
@@ -215,10 +217,14 @@ static const struct regulator_desc axp22x_regulators[] = {
                 AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),
        AXP_DESC(AXP22X, ELDO3, "eldo3", "eldoin", 700, 3300, 100,
                 AXP22X_ELDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(2)),
-        AXP_DESC_IO(AXP22X, LDO_IO0, "ldo_io0", "ips", 1800, 3300, 100,
+        /* Note the datasheet only guarantees reliable operation up to
+         * 3.3V, this needs to be enforced via dts provided constraints */
+        AXP_DESC_IO(AXP22X, LDO_IO0, "ldo_io0", "ips", 700, 3800, 100,
                    AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07,
                    AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
-        AXP_DESC_IO(AXP22X, LDO_IO1, "ldo_io1", "ips", 1800, 3300, 100,
+        /* Note the datasheet only guarantees reliable operation up to
+         * 3.3V, this needs to be enforced via dts provided constraints */
+        AXP_DESC_IO(AXP22X, LDO_IO1, "ldo_io1", "ips", 700, 3800, 100,
                    AXP22X_LDO_IO1_V_OUT, 0x1f, AXP20X_GPIO1_CTRL, 0x07,
                    AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
        AXP_DESC_FIXED(AXP22X, RTC_LDO, "rtc_ldo", "ips", 3000),
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index ed9e7e96f877..c6af343f54ea 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -900,4 +900,4 @@ module_exit(da9063_regulator_cleanup);
 MODULE_AUTHOR("Krystian Garbaciak <krystian.garbaciak@diasemi.com>");
 MODULE_DESCRIPTION("DA9063 regulators driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("paltform:" DA9063_DRVNAME_REGULATORS);
+MODULE_ALIAS("platform:" DA9063_DRVNAME_REGULATORS);
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index a8718e98674a..83e89e5d4752 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -162,6 +162,8 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
        of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
        config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+        if (config->enable_gpio == -EPROBE_DEFER)
+                return ERR_PTR(-EPROBE_DEFER);
        /* Fetch GPIOs. - optional property*/
        ret = of_gpio_count(np);
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index d24e2c783dc5..6dfa3502e1f1 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -308,7 +308,7 @@ static struct regulator_ops s2mps11_buck_ops = {
        .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
-#define regulator_desc_s2mps11_buck6_10(num, min, step) {       \
+#define regulator_desc_s2mps11_buck67810(num, min, step) {      \
        .name           = "BUCK"#num,                           \
        .id             = S2MPS11_BUCK##num,                    \
        .ops            = &s2mps11_buck_ops,                    \
@@ -324,6 +324,22 @@ static struct regulator_ops s2mps11_buck_ops = {
        .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
+#define regulator_desc_s2mps11_buck9 {                          \
+        .name           = "BUCK9",                              \
+        .id             = S2MPS11_BUCK9,                        \
+        .ops            = &s2mps11_buck_ops,                    \
+        .type           = REGULATOR_VOLTAGE,                    \
+        .owner          = THIS_MODULE,                          \
+        .min_uV         = MIN_3000_MV,                          \
+        .uV_step        = STEP_25_MV,                           \
+        .n_voltages     = S2MPS11_BUCK9_N_VOLTAGES,             \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
+        .vsel_reg       = S2MPS11_REG_B9CTRL2,                  \
+        .vsel_mask      = S2MPS11_BUCK9_VSEL_MASK,              \
+        .enable_reg     = S2MPS11_REG_B9CTRL1,                  \
+        .enable_mask    = S2MPS11_ENABLE_MASK                   \
+}
 static const struct regulator_desc s2mps11_regulators[] = {
        regulator_desc_s2mps11_ldo(1, STEP_25_MV),
        regulator_desc_s2mps11_ldo(2, STEP_50_MV),
@@ -368,11 +384,11 @@ static const struct regulator_desc s2mps11_regulators[] = {
        regulator_desc_s2mps11_buck1_4(3),
        regulator_desc_s2mps11_buck1_4(4),
        regulator_desc_s2mps11_buck5,
-        regulator_desc_s2mps11_buck6_10(6, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck67810(6, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(7, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck67810(7, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(8, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck67810(8, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(9, MIN_3000_MV, STEP_25_MV),
+        regulator_desc_s2mps11_buck9,
-        regulator_desc_s2mps11_buck6_10(10, MIN_750_MV, STEP_12_5_MV),
+        regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV),
 };
 static struct regulator_ops s2mps14_reg_ops;
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 8eaed0522aa3..a655cf29c16f 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -532,6 +532,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
                return SCSI_DH_DEV_TEMP_BUSY;
 retry:
+        err = 0;
        retval = submit_rtpg(sdev, buff, bufflen, &sense_hdr, pg->flags);
        if (retval) {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5d0ec42a9317..634254a52301 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4214,7 +4214,7 @@ static struct scsi_host_template qla1280_driver_template = {
        .eh_bus_reset_handler   = qla1280_eh_bus_reset,
        .eh_host_reset_handler  = qla1280_eh_adapter_reset,
        .bios_param             = qla1280_biosparam,
-        .can_queue              = 0xfffff,
+        .can_queue              = MAX_OUTSTANDING_COMMANDS,
        .this_id                = -1,
        .sg_tablesize           = SG_ALL,
        .use_clustering         = ENABLE_CLUSTERING,
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index bb00be8d1851..17a6387e20b5 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -567,7 +567,7 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi)
        txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV);
        if (IS_ERR(txd)) {
                ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);
-                dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));
+                dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(txd));
                msg->status = PTR_ERR(txd);
                return;
        }
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 39412c9097c6..c1a2d747b246 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -385,8 +385,8 @@ static int dspi_transfer_one_message(struct spi_master *master,
                dspi->cur_chip = spi_get_ctldata(spi);
                dspi->cs = spi->chip_select;
                dspi->cs_change = 0;
-                if (dspi->cur_transfer->transfer_list.next
+                if (list_is_last(&dspi->cur_transfer->transfer_list,
-                                == &dspi->cur_msg->transfers)
+                                 &dspi->cur_msg->transfers) || transfer->cs_change)
                        dspi->cs_change = 1;
                dspi->void_write_data = dspi->cur_chip->void_write_data;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 43a02e377b3b..0caa3c8bef46 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -423,12 +423,16 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi,
        if (mcspi_dma->dma_tx) {
                struct dma_async_tx_descriptor *tx;
+                struct scatterlist sg;
                dmaengine_slave_config(mcspi_dma->dma_tx, &cfg);
-                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
+                sg_init_table(&sg, 1);
-                                             xfer->tx_sg.nents, DMA_MEM_TO_DEV,
+                sg_dma_address(&sg) = xfer->tx_dma;
-                                             DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                sg_dma_len(&sg) = xfer->len;
+                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, &sg, 1,
+                DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
                if (tx) {
                        tx->callback = omap2_mcspi_tx_callback;
                        tx->callback_param = spi;
@@ -474,15 +478,20 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer,
        if (mcspi_dma->dma_rx) {
                struct dma_async_tx_descriptor *tx;
+                struct scatterlist sg;
                dmaengine_slave_config(mcspi_dma->dma_rx, &cfg);
                if ((l & OMAP2_MCSPI_CHCONF_TURBO) && mcspi->fifo_depth == 0)
                        dma_count -= es;
-                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, xfer->rx_sg.sgl,
+                sg_init_table(&sg, 1);
-                                             xfer->rx_sg.nents, DMA_DEV_TO_MEM,
+                sg_dma_address(&sg) = xfer->rx_dma;
-                                             DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                sg_dma_len(&sg) = dma_count;
+                tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, &sg, 1,
+                                DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT |
+                                DMA_CTRL_ACK);
                if (tx) {
                        tx->callback = omap2_mcspi_rx_callback;
                        tx->callback_param = spi;
@@ -496,6 +505,8 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer,
        omap2_mcspi_set_dma_req(spi, 1, 1);
        wait_for_completion(&mcspi_dma->dma_rx_completion);
+        dma_unmap_single(mcspi->dev, xfer->rx_dma, count,
+                         DMA_FROM_DEVICE);
        if (mcspi->fifo_depth > 0)
                return count;
@@ -608,6 +619,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
        if (tx != NULL) {
                wait_for_completion(&mcspi_dma->dma_tx_completion);
+                dma_unmap_single(mcspi->dev, xfer->tx_dma, xfer->len,
+                                 DMA_TO_DEVICE);
                if (mcspi->fifo_depth > 0) {
                        irqstat_reg = mcspi->base + OMAP2_MCSPI_IRQSTATUS;
@@ -1074,16 +1087,6 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
                gpio_free(spi->cs_gpio);
 }
-static bool omap2_mcspi_can_dma(struct spi_master *master,
-                                struct spi_device *spi,
-                                struct spi_transfer *xfer)
-{
-        if (xfer->len < DMA_MIN_BYTES)
-                return false;
-        return true;
-}
 static int omap2_mcspi_work_one(struct omap2_mcspi *mcspi,
                struct spi_device *spi, struct spi_transfer *t)
 {
@@ -1265,6 +1268,32 @@ static int omap2_mcspi_transfer_one(struct spi_master *master,
                return -EINVAL;
        }
+        if (len < DMA_MIN_BYTES)
+                goto skip_dma_map;
+        if (mcspi_dma->dma_tx && tx_buf != NULL) {
+                t->tx_dma = dma_map_single(mcspi->dev, (void *) tx_buf,
+                                len, DMA_TO_DEVICE);
+                if (dma_mapping_error(mcspi->dev, t->tx_dma)) {
+                        dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
+                                        'T', len);
+                        return -EINVAL;
+                }
+        }
+        if (mcspi_dma->dma_rx && rx_buf != NULL) {
+                t->rx_dma = dma_map_single(mcspi->dev, rx_buf, t->len,
+                                DMA_FROM_DEVICE);
+                if (dma_mapping_error(mcspi->dev, t->rx_dma)) {
+                        dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
+                                        'R', len);
+                        if (tx_buf != NULL)
+                                dma_unmap_single(mcspi->dev, t->tx_dma,
+                                                len, DMA_TO_DEVICE);
+                        return -EINVAL;
+                }
+        }
+skip_dma_map:
        return omap2_mcspi_work_one(mcspi, spi, t);
 }
@@ -1348,7 +1377,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
        master->transfer_one = omap2_mcspi_transfer_one;
        master->set_cs = omap2_mcspi_set_cs;
        master->cleanup = omap2_mcspi_cleanup;
-        master->can_dma = omap2_mcspi_can_dma;
        master->dev.of_node = node;
        master->max_speed_hz = OMAP2_MCSPI_MAX_FREQ;
        master->min_speed_hz = OMAP2_MCSPI_MAX_FREQ >> 15;
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 85e59a406a4c..86138e4101b0 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -126,7 +126,7 @@ static const struct lpss_config lpss_platforms[] = {
                .reg_general = -1,
                .reg_ssp = 0x20,
                .reg_cs_ctrl = 0x24,
-                .reg_capabilities = 0xfc,
+                .reg_capabilities = -1,
                .rx_threshold = 1,
                .tx_threshold_lo = 32,
                .tx_threshold_hi = 56,
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index eac3c960b2de..443f664534e1 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -94,6 +94,7 @@ struct ti_qspi {
 #define QSPI_FLEN(n)                    ((n - 1) << 0)
 #define QSPI_WLEN_MAX_BITS              128
 #define QSPI_WLEN_MAX_BYTES             16
+#define QSPI_WLEN_MASK                  QSPI_WLEN(QSPI_WLEN_MAX_BITS)
 /* STATUS REGISTER */
 #define BUSY                            0x01
@@ -235,16 +236,16 @@ static inline int ti_qspi_poll_wc(struct ti_qspi *qspi)
        return  -ETIMEDOUT;
 }
-static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t)
+static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t,
+                          int count)
 {
-        int wlen, count, xfer_len;
+        int wlen, xfer_len;
        unsigned int cmd;
        const u8 *txbuf;
        u32 data;
        txbuf = t->tx_buf;
        cmd = qspi->cmd | QSPI_WR_SNGL;
-        count = t->len;
        wlen = t->bits_per_word >> 3;   /* in bytes */
        xfer_len = wlen;
@@ -304,9 +305,10 @@ static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t)
        return 0;
 }
-static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t)
+static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t,
+                         int count)
 {
-        int wlen, count;
+        int wlen;
        unsigned int cmd;
        u8 *rxbuf;
@@ -323,7 +325,6 @@ static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t)
                cmd |= QSPI_RD_SNGL;
                break;
        }
-        count = t->len;
        wlen = t->bits_per_word >> 3;   /* in bytes */
        while (count) {
@@ -354,12 +355,13 @@ static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t)
        return 0;
 }
-static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t)
+static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t,
+                             int count)
 {
        int ret;
        if (t->tx_buf) {
-                ret = qspi_write_msg(qspi, t);
+                ret = qspi_write_msg(qspi, t, count);
                if (ret) {
                        dev_dbg(qspi->dev, "Error while writing\n");
                        return ret;
@@ -367,7 +369,7 @@ static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t)
        }
        if (t->rx_buf) {
-                ret = qspi_read_msg(qspi, t);
+                ret = qspi_read_msg(qspi, t, count);
                if (ret) {
                        dev_dbg(qspi->dev, "Error while reading\n");
                        return ret;
@@ -450,7 +452,8 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
        struct spi_device *spi = m->spi;
        struct spi_transfer *t;
        int status = 0, ret;
-        int frame_length;
+        unsigned int frame_len_words, transfer_len_words;
+        int wlen;
        /* setup device control reg */
        qspi->dc = 0;
@@ -462,14 +465,15 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
        if (spi->mode & SPI_CS_HIGH)
                qspi->dc |= QSPI_CSPOL(spi->chip_select);
-        frame_length = (m->frame_length << 3) / spi->bits_per_word;
+        frame_len_words = 0;
+        list_for_each_entry(t, &m->transfers, transfer_list)
-        frame_length = clamp(frame_length, 0, QSPI_FRAME);
+                frame_len_words += t->len / (t->bits_per_word >> 3);
+        frame_len_words = min_t(unsigned int, frame_len_words, QSPI_FRAME);
        /* setup command reg */
        qspi->cmd = 0;
        qspi->cmd |= QSPI_EN_CS(spi->chip_select);
-        qspi->cmd |= QSPI_FLEN(frame_length);
+        qspi->cmd |= QSPI_FLEN(frame_len_words);
        ti_qspi_write(qspi, qspi->dc, QSPI_SPI_DC_REG);
@@ -479,16 +483,23 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
                ti_qspi_disable_memory_map(spi);
        list_for_each_entry(t, &m->transfers, transfer_list) {
-                qspi->cmd |= QSPI_WLEN(t->bits_per_word);
+                qspi->cmd = ((qspi->cmd & ~QSPI_WLEN_MASK) |
+                             QSPI_WLEN(t->bits_per_word));
+                wlen = t->bits_per_word >> 3;
+                transfer_len_words = min(t->len / wlen, frame_len_words);
-                ret = qspi_transfer_msg(qspi, t);
+                ret = qspi_transfer_msg(qspi, t, transfer_len_words * wlen);
                if (ret) {
                        dev_dbg(qspi->dev, "transfer message failed\n");
                        mutex_unlock(&qspi->list_lock);
                        return -EINVAL;
                }
-                m->actual_length += t->len;
+                m->actual_length += transfer_len_words * wlen;
+                frame_len_words -= transfer_len_words;
+                if (frame_len_words == 0)
+                        break;
        }
        mutex_unlock(&qspi->list_lock);
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index feef8a9c4de7..f02404052b7b 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -112,7 +112,6 @@ static int ecryptfs_readdir(struct file *file, struct dir_context *ctx)
                .sb = inode->i_sb,
        };
        lower_file = ecryptfs_file_to_lower(file);
-        lower_file->f_pos = ctx->pos;
        rc = iterate_dir(lower_file, &buf.ctx);
        ctx->pos = buf.ctx.pos;
        if (rc < 0)
@@ -223,14 +222,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
        }
        ecryptfs_set_file_lower(
                file, ecryptfs_inode_to_private(inode)->lower_file);
-        if (d_is_dir(ecryptfs_dentry)) {
-                ecryptfs_printk(KERN_DEBUG, "This is a directory\n");
-                mutex_lock(&crypt_stat->cs_mutex);
-                crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-                mutex_unlock(&crypt_stat->cs_mutex);
-                rc = 0;
-                goto out;
-        }
        rc = read_or_initialize_metadata(ecryptfs_dentry);
        if (rc)
                goto out_put;
@@ -247,6 +238,45 @@ out:
        return rc;
 }
+/**
+ * ecryptfs_dir_open
+ * @inode: inode speciying file to open
+ * @file: Structure to return filled in
+ *
+ * Opens the file specified by inode.
+ *
+ * Returns zero on success; non-zero otherwise
+ */
+static int ecryptfs_dir_open(struct inode *inode, struct file *file)
+{
+        struct dentry *ecryptfs_dentry = file->f_path.dentry;
+        /* Private value of ecryptfs_dentry allocated in
+         * ecryptfs_lookup() */
+        struct ecryptfs_file_info *file_info;
+        struct file *lower_file;
+        /* Released in ecryptfs_release or end of function if failure */
+        file_info = kmem_cache_zalloc(ecryptfs_file_info_cache, GFP_KERNEL);
+        ecryptfs_set_file_private(file, file_info);
+        if (unlikely(!file_info)) {
+                ecryptfs_printk(KERN_ERR,
+                                "Error attempting to allocate memory\n");
+                return -ENOMEM;
+        }
+        lower_file = dentry_open(ecryptfs_dentry_to_lower_path(ecryptfs_dentry),
+                                 file->f_flags, current_cred());
+        if (IS_ERR(lower_file)) {
+                printk(KERN_ERR "%s: Error attempting to initialize "
+                        "the lower file for the dentry with name "
+                        "[%pd]; rc = [%ld]\n", __func__,
+                        ecryptfs_dentry, PTR_ERR(lower_file));
+                kmem_cache_free(ecryptfs_file_info_cache, file_info);
+                return PTR_ERR(lower_file);
+        }
+        ecryptfs_set_file_lower(file, lower_file);
+        return 0;
+}
 static int ecryptfs_flush(struct file *file, fl_owner_t td)
 {
        struct file *lower_file = ecryptfs_file_to_lower(file);
@@ -267,6 +297,19 @@ static int ecryptfs_release(struct inode *inode, struct file *file)
        return 0;
 }
+static int ecryptfs_dir_release(struct inode *inode, struct file *file)
+{
+        fput(ecryptfs_file_to_lower(file));
+        kmem_cache_free(ecryptfs_file_info_cache,
+                        ecryptfs_file_to_private(file));
+        return 0;
+}
+static loff_t ecryptfs_dir_llseek(struct file *file, loff_t offset, int whence)
+{
+        return vfs_llseek(ecryptfs_file_to_lower(file), offset, whence);
+}
 static int
 ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
@@ -346,20 +389,16 @@ const struct file_operations ecryptfs_dir_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl = ecryptfs_compat_ioctl,
 #endif
-        .open = ecryptfs_open,
+        .open = ecryptfs_dir_open,
-        .flush = ecryptfs_flush,
+        .release = ecryptfs_dir_release,
-        .release = ecryptfs_release,
        .fsync = ecryptfs_fsync,
-        .fasync = ecryptfs_fasync,
+        .llseek = ecryptfs_dir_llseek,
-        .splice_read = generic_file_splice_read,
-        .llseek = default_llseek,
 };
 const struct file_operations ecryptfs_main_fops = {
        .llseek = generic_file_llseek,
        .read_iter = ecryptfs_read_update_atime,
        .write_iter = generic_file_write_iter,
-        .iterate = ecryptfs_readdir,
        .unlocked_ioctl = ecryptfs_unlocked_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl = ecryptfs_compat_ioctl,
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 5384ceb35b1c..98b3eb7d8eaf 100644
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -203,6 +203,8 @@ int get_rock_ridge_filename(struct iso_directory_record *de,
        int retnamlen = 0;
        int truncate = 0;
        int ret = 0;
+        char *p;
+        int len;
        if (!ISOFS_SB(inode->i_sb)->s_rock)
                return 0;
@@ -267,12 +269,17 @@ repeat:
                                        rr->u.NM.flags);
                                break;
                        }
-                        if ((strlen(retname) + rr->len - 5) >= 254) {
+                        len = rr->len - 5;
+                        if (retnamlen + len >= 254) {
                                truncate = 1;
                                break;
                        }
-                        strncat(retname, rr->u.NM.name, rr->len - 5);
+                        p = memchr(rr->u.NM.name, '\0', len);
-                        retnamlen += rr->len - 5;
+                        if (unlikely(p))
+                                len = p - rr->u.NM.name;
+                        memcpy(retname + retnamlen, rr->u.NM.name, len);
+                        retnamlen += len;
+                        retname[retnamlen] = '\0';
                        break;
                case SIG('R', 'E'):
                        kfree(rs.buffer);
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 03b688d19f69..37f9678ae4df 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -153,9 +153,9 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,
        p = buf + len + nlen;
        *p = '\0';
        for (kn = kn_to; kn != common; kn = kn->parent) {
-                nlen = strlen(kn->name);
+                size_t tmp = strlen(kn->name);
-                p -= nlen;
+                p -= tmp;
-                memcpy(p, kn->name, nlen);
+                memcpy(p, kn->name, tmp);
                *(--p) = '/';
        }
diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index f73541fbe7af..3d670a3678f2 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/namei.h>
+#include <linux/seq_file.h>
 #include "kernfs-internal.h"
@@ -40,6 +41,19 @@ static int kernfs_sop_show_options(struct seq_file *sf, struct dentry *dentry)
        return 0;
 }
+static int kernfs_sop_show_path(struct seq_file *sf, struct dentry *dentry)
+{
+        struct kernfs_node *node = dentry->d_fsdata;
+        struct kernfs_root *root = kernfs_root(node);
+        struct kernfs_syscall_ops *scops = root->syscall_ops;
+        if (scops && scops->show_path)
+                return scops->show_path(sf, node, root);
+        seq_dentry(sf, dentry, " \t\n\\");
+        return 0;
+}
 const struct super_operations kernfs_sops = {
        .statfs         = simple_statfs,
        .drop_inode     = generic_delete_inode,
@@ -47,6 +61,7 @@ const struct super_operations kernfs_sops = {
        .remount_fs     = kernfs_sop_remount_fs,
        .show_options   = kernfs_sop_show_options,
+        .show_path      = kernfs_sop_show_path,
 };
 /**
diff --git a/fs/namei.c b/fs/namei.c
index 1d9ca2d5dff6..30145f8f21ed 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2267,6 +2267,33 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
 EXPORT_SYMBOL(vfs_path_lookup);
 /**
+ * lookup_hash - lookup single pathname component on already hashed name
+ * @name:       name and hash to lookup
+ * @base:       base directory to lookup from
+ *
+ * The name must have been verified and hashed (see lookup_one_len()).  Using
+ * this after just full_name_hash() is unsafe.
+ *
+ * This function also doesn't check for search permission on base directory.
+ *
+ * Use lookup_one_len_unlocked() instead, unless you really know what you are
+ * doing.
+ *
+ * Do not hold i_mutex; this helper takes i_mutex if necessary.
+ */
+struct dentry *lookup_hash(const struct qstr *name, struct dentry *base)
+{
+        struct dentry *ret;
+        ret = lookup_dcache(name, base, 0);
+        if (!ret)
+                ret = lookup_slow(name, base, 0);
+        return ret;
+}
+EXPORT_SYMBOL(lookup_hash);
+/**
 * lookup_one_len - filesystem helper to lookup single pathname component
 * @name:       pathname component to lookup
 * @base:       base directory to lookup from
@@ -2337,7 +2364,6 @@ struct dentry *lookup_one_len_unlocked(const char *name,
        struct qstr this;
        unsigned int c;
        int err;
-        struct dentry *ret;
        this.name = name;
        this.len = len;
@@ -2369,10 +2395,7 @@ struct dentry *lookup_one_len_unlocked(const char *name,
        if (err)
                return ERR_PTR(err);
-        ret = lookup_dcache(&this, base, 0);
+        return lookup_hash(&this, base);
-        if (!ret)
-                ret = lookup_slow(&this, base, 0);
-        return ret;
 }
 EXPORT_SYMBOL(lookup_one_len_unlocked);
@@ -2942,22 +2965,10 @@ no_open:
                dentry = lookup_real(dir, dentry, nd->flags);
                if (IS_ERR(dentry))
                        return PTR_ERR(dentry);
+        }
-                if (create_error) {
+        if (create_error && !dentry->d_inode) {
-                        int open_flag = op->open_flag;
+                error = create_error;
+                goto out;
-                        error = create_error;
-                        if ((open_flag & O_EXCL)) {
-                                if (!dentry->d_inode)
-                                        goto out;
-                        } else if (!dentry->d_inode) {
-                                goto out;
-                        } else if ((open_flag & O_TRUNC) &&
-                                   d_is_reg(dentry)) {
-                                goto out;
-                        }
-                        /* will fail later, go on to get the right error */
-                }
        }
 looked_up:
        path->dentry = dentry;
@@ -4213,7 +4224,11 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        bool new_is_dir = false;
        unsigned max_links = new_dir->i_sb->s_max_links;
-        if (source == target)
+        /*
+         * Check source == target.
+         * On overlayfs need to look at underlying inodes.
+         */
+        if (vfs_select_inode(old_dentry, 0) == vfs_select_inode(new_dentry, 0))
                return 0;
        error = may_delete(old_dir, old_dentry, is_dir);
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index 0cdf497c91ef..2162434728c0 100644
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -322,3 +322,90 @@ struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type)
        brelse(di_bh);
        return acl;
 }
+int ocfs2_acl_chmod(struct inode *inode, struct buffer_head *bh)
+{
+        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+        struct posix_acl *acl;
+        int ret;
+        if (S_ISLNK(inode->i_mode))
+                return -EOPNOTSUPP;
+        if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
+                return 0;
+        acl = ocfs2_get_acl_nolock(inode, ACL_TYPE_ACCESS, bh);
+        if (IS_ERR(acl) || !acl)
+                return PTR_ERR(acl);
+        ret = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+        if (ret)
+                return ret;
+        ret = ocfs2_set_acl(NULL, inode, NULL, ACL_TYPE_ACCESS,
+                            acl, NULL, NULL);
+        posix_acl_release(acl);
+        return ret;
+}
+/*
+ * Initialize the ACLs of a new inode. If parent directory has default ACL,
+ * then clone to new inode. Called from ocfs2_mknod.
+ */
+int ocfs2_init_acl(handle_t *handle,
+                   struct inode *inode,
+                   struct inode *dir,
+                   struct buffer_head *di_bh,
+                   struct buffer_head *dir_bh,
+                   struct ocfs2_alloc_context *meta_ac,
+                   struct ocfs2_alloc_context *data_ac)
+{
+        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+        struct posix_acl *acl = NULL;
+        int ret = 0, ret2;
+        umode_t mode;
+        if (!S_ISLNK(inode->i_mode)) {
+                if (osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL) {
+                        acl = ocfs2_get_acl_nolock(dir, ACL_TYPE_DEFAULT,
+                                                   dir_bh);
+                        if (IS_ERR(acl))
+                                return PTR_ERR(acl);
+                }
+                if (!acl) {
+                        mode = inode->i_mode & ~current_umask();
+                        ret = ocfs2_acl_set_mode(inode, di_bh, handle, mode);
+                        if (ret) {
+                                mlog_errno(ret);
+                                goto cleanup;
+                        }
+                }
+        }
+        if ((osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL) && acl) {
+                if (S_ISDIR(inode->i_mode)) {
+                        ret = ocfs2_set_acl(handle, inode, di_bh,
+                                            ACL_TYPE_DEFAULT, acl,
+                                            meta_ac, data_ac);
+                        if (ret)
+                                goto cleanup;
+                }
+                mode = inode->i_mode;
+                ret = __posix_acl_create(&acl, GFP_NOFS, &mode);
+                if (ret < 0)
+                        return ret;
+                ret2 = ocfs2_acl_set_mode(inode, di_bh, handle, mode);
+                if (ret2) {
+                        mlog_errno(ret2);
+                        ret = ret2;
+                        goto cleanup;
+                }
+                if (ret > 0) {
+                        ret = ocfs2_set_acl(handle, inode,
+                                            di_bh, ACL_TYPE_ACCESS,
+                                            acl, meta_ac, data_ac);
+                }
+        }
+cleanup:
+        posix_acl_release(acl);
+        return ret;
+}
diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h
index 3fce68d08625..2783a75b3999 100644
--- a/fs/ocfs2/acl.h
+++ b/fs/ocfs2/acl.h
@@ -35,5 +35,10 @@ int ocfs2_set_acl(handle_t *handle,
                         struct posix_acl *acl,
                         struct ocfs2_alloc_context *meta_ac,
                         struct ocfs2_alloc_context *data_ac);
+extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *);
+extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
+                          struct buffer_head *, struct buffer_head *,
+                          struct ocfs2_alloc_context *,
+                          struct ocfs2_alloc_context *);
 #endif /* OCFS2_ACL_H */
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 5308841756be..59cce53c91d8 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1268,20 +1268,20 @@ bail_unlock_rw:
        if (size_change)
                ocfs2_rw_unlock(inode, 1);
 bail:
-        brelse(bh);
        /* Release quota pointers in case we acquired them */
        for (qtype = 0; qtype < OCFS2_MAXQUOTAS; qtype++)
                dqput(transfer_to[qtype]);
        if (!status && attr->ia_valid & ATTR_MODE) {
-                status = posix_acl_chmod(inode, inode->i_mode);
+                status = ocfs2_acl_chmod(inode, bh);
                if (status < 0)
                        mlog_errno(status);
        }
        if (inode_locked)
                ocfs2_inode_unlock(inode, 1);
+        brelse(bh);
        return status;
 }
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 6b3e87189a64..a8f1225e6d9b 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -259,7 +259,6 @@ static int ocfs2_mknod(struct inode *dir,
        struct ocfs2_dir_lookup_result lookup = { NULL, };
        sigset_t oldset;
        int did_block_signals = 0;
-        struct posix_acl *default_acl = NULL, *acl = NULL;
        struct ocfs2_dentry_lock *dl = NULL;
        trace_ocfs2_mknod(dir, dentry, dentry->d_name.len, dentry->d_name.name,
@@ -367,12 +366,6 @@ static int ocfs2_mknod(struct inode *dir,
                goto leave;
        }
-        status = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
-        if (status) {
-                mlog_errno(status);
-                goto leave;
-        }
        handle = ocfs2_start_trans(osb, ocfs2_mknod_credits(osb->sb,
                                                            S_ISDIR(mode),
                                                            xattr_credits));
@@ -421,16 +414,8 @@ static int ocfs2_mknod(struct inode *dir,
                inc_nlink(dir);
        }
-        if (default_acl) {
+        status = ocfs2_init_acl(handle, inode, dir, new_fe_bh, parent_fe_bh,
-                status = ocfs2_set_acl(handle, inode, new_fe_bh,
+                         meta_ac, data_ac);
-                                       ACL_TYPE_DEFAULT, default_acl,
-                                       meta_ac, data_ac);
-        }
-        if (!status && acl) {
-                status = ocfs2_set_acl(handle, inode, new_fe_bh,
-                                       ACL_TYPE_ACCESS, acl,
-                                       meta_ac, data_ac);
-        }
        if (status < 0) {
                mlog_errno(status);
@@ -472,10 +457,6 @@ static int ocfs2_mknod(struct inode *dir,
        d_instantiate(dentry, inode);
        status = 0;
 leave:
-        if (default_acl)
-                posix_acl_release(default_acl);
-        if (acl)
-                posix_acl_release(acl);
        if (status < 0 && did_quota_inode)
                dquot_free_inode(inode);
        if (handle)
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 744d5d90c363..92bbe93bfe10 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4248,20 +4248,12 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
        struct inode *inode = d_inode(old_dentry);
        struct buffer_head *old_bh = NULL;
        struct inode *new_orphan_inode = NULL;
-        struct posix_acl *default_acl, *acl;
-        umode_t mode;
        if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb)))
                return -EOPNOTSUPP;
-        mode = inode->i_mode;
-        error = posix_acl_create(dir, &mode, &default_acl, &acl);
-        if (error) {
-                mlog_errno(error);
-                return error;
-        }
-        error = ocfs2_create_inode_in_orphan(dir, mode,
+        error = ocfs2_create_inode_in_orphan(dir, inode->i_mode,
                                             &new_orphan_inode);
        if (error) {
                mlog_errno(error);
@@ -4300,16 +4292,11 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
        /* If the security isn't preserved, we need to re-initialize them. */
        if (!preserve) {
                error = ocfs2_init_security_and_acl(dir, new_orphan_inode,
-                                                    &new_dentry->d_name,
+                                                    &new_dentry->d_name);
-                                                    default_acl, acl);
                if (error)
                        mlog_errno(error);
        }
 out:
-        if (default_acl)
-                posix_acl_release(default_acl);
-        if (acl)
-                posix_acl_release(acl);
        if (!error) {
                error = ocfs2_mv_orphaned_inode_to_new(dir, new_orphan_inode,
                                                       new_dentry);
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 7d3d979f57d9..f19b7381a998 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7216,12 +7216,10 @@ out:
 */
 int ocfs2_init_security_and_acl(struct inode *dir,
                                struct inode *inode,
-                                const struct qstr *qstr,
+                                const struct qstr *qstr)
-                                struct posix_acl *default_acl,
-                                struct posix_acl *acl)
 {
-        struct buffer_head *dir_bh = NULL;
        int ret = 0;
+        struct buffer_head *dir_bh = NULL;
        ret = ocfs2_init_security_get(inode, dir, qstr, NULL);
        if (ret) {
@@ -7234,11 +7232,9 @@ int ocfs2_init_security_and_acl(struct inode *dir,
                mlog_errno(ret);
                goto leave;
        }
+        ret = ocfs2_init_acl(NULL, inode, dir, NULL, dir_bh, NULL, NULL);
-        if (!ret && default_acl)
+        if (ret)
-                ret = ocfs2_iop_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
+                mlog_errno(ret);
-        if (!ret && acl)
-                ret = ocfs2_iop_set_acl(inode, acl, ACL_TYPE_ACCESS);
        ocfs2_inode_unlock(dir, 0);
        brelse(dir_bh);
diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h
index f10d5b93c366..1633cc15ea1f 100644
--- a/fs/ocfs2/xattr.h
+++ b/fs/ocfs2/xattr.h
@@ -94,7 +94,5 @@ int ocfs2_reflink_xattrs(struct inode *old_inode,
                         bool preserve_security);
 int ocfs2_init_security_and_acl(struct inode *dir,
                                struct inode *inode,
-                                const struct qstr *qstr,
+                                const struct qstr *qstr);
-                                struct posix_acl *default_acl,
-                                struct posix_acl *acl);
 #endif /* OCFS2_XATTR_H */
diff --git a/fs/open.c b/fs/open.c
index 17cb6b1dab75..081d3d6df74b 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -840,16 +840,12 @@ EXPORT_SYMBOL(file_path);
 int vfs_open(const struct path *path, struct file *file,
             const struct cred *cred)
 {
-        struct dentry *dentry = path->dentry;
+        struct inode *inode = vfs_select_inode(path->dentry, file->f_flags);
-        struct inode *inode = dentry->d_inode;
-        file->f_path = *path;
+        if (IS_ERR(inode))
-        if (dentry->d_flags & DCACHE_OP_SELECT_INODE) {
+                return PTR_ERR(inode);
-                inode = dentry->d_op->d_select_inode(dentry, file->f_flags);
-                if (IS_ERR(inode))
-                        return PTR_ERR(inode);
-        }
+        file->f_path = *path;
        return do_dentry_open(file, inode, NULL, cred);
 }
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 5d972e6cd3fe..791235e03d17 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -411,9 +411,7 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir,
 {
        struct dentry *dentry;
-        inode_lock(dir->d_inode);
+        dentry = lookup_hash(name, dir);
-        dentry = lookup_one_len(name->name, dir, name->len);
-        inode_unlock(dir->d_inode);
        if (IS_ERR(dentry)) {
                if (PTR_ERR(dentry) == -ENOENT)
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 92e37e224cd2..0d163a84082d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -434,7 +434,7 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
                        && !lookup_symbol_name(wchan, symname))
                seq_printf(m, "%s", symname);
        else
-                seq_puts(m, "0\n");
+                seq_putc(m, '0');
        return 0;
 }
diff --git a/fs/splice.c b/fs/splice.c
index b018eb485019..dd9bf7e410d2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1143,6 +1143,9 @@ static long do_splice_to(struct file *in, loff_t *ppos,
        if (unlikely(ret < 0))
                return ret;
+        if (unlikely(len > MAX_RW_COUNT))
+                len = MAX_RW_COUNT;
        if (in->f_op->splice_read)
                splice_read = in->f_op->splice_read;
        else
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index eeae401a2412..3d5202eda22f 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -246,7 +246,7 @@
 #define __HAVE_BUILTIN_BSWAP32__
 #define __HAVE_BUILTIN_BSWAP64__
 #endif
-#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
+#if GCC_VERSION >= 40800
 #define __HAVE_BUILTIN_BSWAP16__
 #endif
 #endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 4bb4de8d95ea..7e9422cb5989 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -565,4 +565,16 @@ static inline struct dentry *d_real(struct dentry *dentry)
                return dentry;
 }
+static inline struct inode *vfs_select_inode(struct dentry *dentry,
+                                             unsigned open_flags)
+{
+        struct inode *inode = d_inode(dentry);
+        if (inode && unlikely(dentry->d_flags & DCACHE_OP_SELECT_INODE))
+                inode = dentry->d_op->d_select_inode(dentry, open_flags);
+        return inode;
+}
 #endif  /* __LINUX_DCACHE_H */
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index c06c44242f39..30f089ebe0a4 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -152,6 +152,8 @@ struct kernfs_syscall_ops {
        int (*rmdir)(struct kernfs_node *kn);
        int (*rename)(struct kernfs_node *kn, struct kernfs_node *new_parent,
                      const char *new_name);
+        int (*show_path)(struct seq_file *sf, struct kernfs_node *kn,
+                         struct kernfs_root *root);
 };
 struct kernfs_root {
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index b288965e8101..2c14eeca46f0 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -173,10 +173,12 @@ enum s2mps11_regulators {
 #define S2MPS11_LDO_VSEL_MASK   0x3F
 #define S2MPS11_BUCK_VSEL_MASK  0xFF
+#define S2MPS11_BUCK9_VSEL_MASK 0x1F
 #define S2MPS11_ENABLE_MASK     (0x03 << S2MPS11_ENABLE_SHIFT)
 #define S2MPS11_ENABLE_SHIFT    0x06
 #define S2MPS11_LDO_N_VOLTAGES  (S2MPS11_LDO_VSEL_MASK + 1)
 #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
+#define S2MPS11_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1)
 #define S2MPS11_RAMP_DELAY      25000           /* uV/us */
 #define S2MPS11_CTRL1_PWRHOLD_MASK      BIT(4)
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 8f9fc3d26e6d..8e95cd87cd74 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -134,6 +134,7 @@
 #define TWL6040_HFDACENA                (1 << 0)
 #define TWL6040_HFPGAENA                (1 << 1)
 #define TWL6040_HFDRVENA                (1 << 4)
+#define TWL6040_HFSWENA                 (1 << 6)
 /* VIBCTLL/R (0x18/0x1A) fields */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 864d7221de84..8f468e0d2534 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -500,11 +500,20 @@ static inline int page_mapcount(struct page *page)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 int total_mapcount(struct page *page);
+int page_trans_huge_mapcount(struct page *page, int *total_mapcount);
 #else
 static inline int total_mapcount(struct page *page)
 {
        return page_mapcount(page);
 }
+static inline int page_trans_huge_mapcount(struct page *page,
+                                           int *total_mapcount)
+{
+        int mapcount = page_mapcount(page);
+        if (total_mapcount)
+                *total_mapcount = mapcount;
+        return mapcount;
+}
 #endif
 static inline struct page *virt_to_head_page(const void *x)
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 77d01700daf7..ec5ec2818a28 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -79,6 +79,8 @@ extern int kern_path_mountpoint(int, const char *, struct path *, unsigned int);
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 extern struct dentry *lookup_one_len_unlocked(const char *, struct dentry *, int);
+struct qstr;
+extern struct dentry *lookup_hash(const struct qstr *, struct dentry *);
 extern int follow_down_one(struct path *);
 extern int follow_down(struct path *);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b3c46b019ac1..78181a88903b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2164,6 +2164,9 @@ struct packet_offload {
 struct udp_offload;
+/* 'skb->encapsulation' is set before gro_complete() is called.  gro_complete()
+ * must set 'skb->inner_mac_header' to the beginning of tunnel payload.
+ */
 struct udp_offload_callbacks {
        struct sk_buff          **(*gro_receive)(struct sk_buff **head,
                                                 struct sk_buff *skb,
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 0a4cd4703f40..ad220359f1b0 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -418,7 +418,7 @@ extern sector_t swapdev_block(int, pgoff_t);
 extern int page_swapcount(struct page *);
 extern int swp_swapcount(swp_entry_t entry);
 extern struct swap_info_struct *page_swap_info(struct page *);
-extern int reuse_swap_page(struct page *);
+extern bool reuse_swap_page(struct page *, int *);
 extern int try_to_free_swap(struct page *);
 struct backing_dev_info;
@@ -513,8 +513,8 @@ static inline int swp_swapcount(swp_entry_t entry)
        return 0;
 }
-#define reuse_swap_page(page) \
+#define reuse_swap_page(page, total_mapcount) \
-        (!PageTransCompound(page) && page_mapcount(page) == 1)
+        (page_trans_huge_mapcount(page, total_mapcount) == 1)
 static inline int try_to_free_swap(struct page *page)
 {
diff --git a/include/linux/uio.h b/include/linux/uio.h
index fd9bcfedad42..1b5d1cd796e2 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -87,6 +87,7 @@ size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i);
 size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i);
 size_t iov_iter_zero(size_t bytes, struct iov_iter *);
 unsigned long iov_iter_alignment(const struct iov_iter *i);
+unsigned long iov_iter_gap_alignment(const struct iov_iter *i);
 void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov,
                        unsigned long nr_segs, size_t count);
 void iov_iter_kvec(struct iov_iter *i, int direction, const struct kvec *kvec,
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 730d82ad6ee5..24cd3949a9a4 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -80,6 +80,7 @@ struct netns_xfrm {
        struct flow_cache       flow_cache_global;
        atomic_t                flow_cache_genid;
        struct list_head        flow_cache_gc_list;
+        atomic_t                flow_cache_gc_count;
        spinlock_t              flow_cache_gc_lock;
        struct work_struct      flow_cache_gc_work;
        struct work_struct      flow_cache_flush_work;
diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index b83114077cee..a1140249ec25 100644
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -106,15 +106,6 @@ static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,
        return iptunnel_handle_offloads(skb, type);
 }
-static inline void udp_tunnel_gro_complete(struct sk_buff *skb, int nhoff)
-{
-        struct udphdr *uh;
-        uh = (struct udphdr *)(skb->data + nhoff - sizeof(struct udphdr));
-        skb_shinfo(skb)->gso_type |= uh->check ?
-                                SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
-}
 static inline void udp_tunnel_encap_enable(struct socket *sock)
 {
 #if IS_ENABLED(CONFIG_IPV6)
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index f80277569f24..e601c8c3bdc7 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -19,14 +19,20 @@
 #ifndef _LINUX_IF_H
 #define _LINUX_IF_H
+#include <linux/libc-compat.h>          /* for compatibility with glibc */
 #include <linux/types.h>                /* for "__kernel_caddr_t" et al */
 #include <linux/socket.h>               /* for "struct sockaddr" et al  */
 #include <linux/compiler.h>             /* for "__user" et al           */
+#if __UAPI_DEF_IF_IFNAMSIZ
 #define IFNAMSIZ        16
+#endif /* __UAPI_DEF_IF_IFNAMSIZ */
 #define IFALIASZ        256
 #include <linux/hdlc/ioctl.h>
+/* For glibc compatibility. An empty enum does not compile. */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \
+    __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
 /**
 * enum net_device_flags - &struct net_device flags
 *
@@ -68,6 +74,8 @@
 * @IFF_ECHO: echo sent packets. Volatile.
 */
 enum net_device_flags {
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
        IFF_UP                          = 1<<0,  /* sysfs */
        IFF_BROADCAST                   = 1<<1,  /* volatile */
        IFF_DEBUG                       = 1<<2,  /* sysfs */
@@ -84,11 +92,17 @@ enum net_device_flags {
        IFF_PORTSEL                     = 1<<13, /* sysfs */
        IFF_AUTOMEDIA                   = 1<<14, /* sysfs */
        IFF_DYNAMIC                     = 1<<15, /* sysfs */
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
        IFF_LOWER_UP                    = 1<<16, /* volatile */
        IFF_DORMANT                     = 1<<17, /* volatile */
        IFF_ECHO                        = 1<<18, /* volatile */
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
 };
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
 #define IFF_UP                          IFF_UP
 #define IFF_BROADCAST                   IFF_BROADCAST
 #define IFF_DEBUG                       IFF_DEBUG
@@ -105,9 +119,13 @@ enum net_device_flags {
 #define IFF_PORTSEL                     IFF_PORTSEL
 #define IFF_AUTOMEDIA                   IFF_AUTOMEDIA
 #define IFF_DYNAMIC                     IFF_DYNAMIC
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
 #define IFF_LOWER_UP                    IFF_LOWER_UP
 #define IFF_DORMANT                     IFF_DORMANT
 #define IFF_ECHO                        IFF_ECHO
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
 #define IFF_VOLATILE    (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
                IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
@@ -166,6 +184,8 @@ enum {
 *      being very small might be worth keeping for clean configuration.
 */
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFMAP
 struct ifmap {
        unsigned long mem_start;
        unsigned long mem_end;
@@ -175,6 +195,7 @@ struct ifmap {
        unsigned char port;
        /* 3 bytes spare */
 };
+#endif /* __UAPI_DEF_IF_IFMAP */
 struct if_settings {
        unsigned int type;      /* Type of physical device or protocol */
@@ -200,6 +221,8 @@ struct if_settings {
 * remainder may be interface specific.
 */
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFREQ
 struct ifreq {
 #define IFHWADDRLEN     6
        union
@@ -223,6 +246,7 @@ struct ifreq {
                struct  if_settings ifru_settings;
        } ifr_ifru;
 };
+#endif /* __UAPI_DEF_IF_IFREQ */
 #define ifr_name        ifr_ifrn.ifrn_name      /* interface name       */
 #define ifr_hwaddr      ifr_ifru.ifru_hwaddr    /* MAC address          */
@@ -249,6 +273,8 @@ struct ifreq {
 * must know all networks accessible).
 */
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFCONF
 struct ifconf  {
        int     ifc_len;                        /* size of buffer       */
        union {
@@ -256,6 +282,8 @@ struct ifconf  {
                struct ifreq __user *ifcu_req;
        } ifc_ifcu;
 };
+#endif /* __UAPI_DEF_IF_IFCONF */
 #define ifc_buf ifc_ifcu.ifcu_buf               /* buffer address       */
 #define ifc_req ifc_ifcu.ifcu_req               /* array of structures  */
diff --git a/include/uapi/linux/if_macsec.h b/include/uapi/linux/if_macsec.h
index 4c58d9917aa4..3411ed06b9c0 100644
--- a/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
@@ -19,6 +19,8 @@
 #define MACSEC_MAX_KEY_LEN 128
+#define MACSEC_KEYID_LEN 16
 #define MACSEC_DEFAULT_CIPHER_ID   0x0080020001000001ULL
 #define MACSEC_DEFAULT_CIPHER_ALT  0x0080C20001000001ULL
@@ -77,7 +79,7 @@ enum macsec_sa_attrs {
        MACSEC_SA_ATTR_ACTIVE, /* config/dump, u8 0..1 */
        MACSEC_SA_ATTR_PN,     /* config/dump, u32 */
        MACSEC_SA_ATTR_KEY,    /* config, data */
-        MACSEC_SA_ATTR_KEYID,  /* config/dump, u64 */
+        MACSEC_SA_ATTR_KEYID,  /* config/dump, 128-bit */
        MACSEC_SA_ATTR_STATS,  /* dump, nested, macsec_sa_stats_attr */
        __MACSEC_SA_ATTR_END,
        NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END,
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index 7d024ceb075d..d5e38c73377c 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -51,6 +51,40 @@
 /* We have included glibc headers... */
 #if defined(__GLIBC__)
+/* Coordinate with glibc net/if.h header. */
+#if defined(_NET_IF_H)
+/* GLIBC headers included first so don't define anything
+ * that would already be defined. */
+#define __UAPI_DEF_IF_IFCONF 0
+#define __UAPI_DEF_IF_IFMAP 0
+#define __UAPI_DEF_IF_IFNAMSIZ 0
+#define __UAPI_DEF_IF_IFREQ 0
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
+#else /* _NET_IF_H */
+/* Linux headers included first, and we must define everything
+ * we need. The expectation is that glibc will check the
+ * __UAPI_DEF_* defines and adjust appropriately. */
+#define __UAPI_DEF_IF_IFCONF 1
+#define __UAPI_DEF_IF_IFMAP 1
+#define __UAPI_DEF_IF_IFNAMSIZ 1
+#define __UAPI_DEF_IF_IFREQ 1
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+#endif /* _NET_IF_H */
 /* Coordinate with glibc netinet/in.h header. */
 #if defined(_NETINET_IN_H)
@@ -117,6 +151,16 @@
 * that we need. */
 #else /* !defined(__GLIBC__) */
+/* Definitions for if.h */
+#define __UAPI_DEF_IF_IFCONF 1
+#define __UAPI_DEF_IF_IFMAP 1
+#define __UAPI_DEF_IF_IFNAMSIZ 1
+#define __UAPI_DEF_IF_IFREQ 1
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
 /* Definitions for in.h */
 #define __UAPI_DEF_IN_ADDR              1
 #define __UAPI_DEF_IN_IPPROTO           1
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild
index 242cf0c6e33d..e3969bd939e4 100644
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
@@ -10,3 +10,4 @@ header-y += tc_skbedit.h
 header-y += tc_vlan.h
 header-y += tc_bpf.h
 header-y += tc_connmark.h
+header-y += tc_ife.h
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index c4cc1e40b35c..e4701a3c6331 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -116,6 +116,14 @@
 #define SND_SOC_TPLG_STREAM_PLAYBACK    0
 #define SND_SOC_TPLG_STREAM_CAPTURE     1
+/* vendor tuple types */
+#define SND_SOC_TPLG_TUPLE_TYPE_UUID    0
+#define SND_SOC_TPLG_TUPLE_TYPE_STRING  1
+#define SND_SOC_TPLG_TUPLE_TYPE_BOOL    2
+#define SND_SOC_TPLG_TUPLE_TYPE_BYTE    3
+#define SND_SOC_TPLG_TUPLE_TYPE_WORD    4
+#define SND_SOC_TPLG_TUPLE_TYPE_SHORT   5
 /*
 * Block Header.
 * This header precedes all object and object arrays below.
@@ -132,6 +140,35 @@ struct snd_soc_tplg_hdr {
        __le32 count;           /* number of elements in block */
 } __attribute__((packed));
+/* vendor tuple for uuid */
+struct snd_soc_tplg_vendor_uuid_elem {
+        __le32 token;
+        char uuid[16];
+} __attribute__((packed));
+/* vendor tuple for a bool/byte/short/word value */
+struct snd_soc_tplg_vendor_value_elem {
+        __le32 token;
+        __le32 value;
+} __attribute__((packed));
+/* vendor tuple for string */
+struct snd_soc_tplg_vendor_string_elem {
+        __le32 token;
+        char string[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+} __attribute__((packed));
+struct snd_soc_tplg_vendor_array {
+        __le32 size;    /* size in bytes of the array, including all elements */
+        __le32 type;    /* SND_SOC_TPLG_TUPLE_TYPE_ */
+        __le32 num_elems;       /* number of elements in array */
+        union {
+                struct snd_soc_tplg_vendor_uuid_elem uuid[0];
+                struct snd_soc_tplg_vendor_value_elem value[0];
+                struct snd_soc_tplg_vendor_string_elem string[0];
+        };
+} __attribute__((packed));
 /*
 * Private data.
 * All topology objects may have private data that can be used by the driver or
@@ -139,7 +176,10 @@ struct snd_soc_tplg_hdr {
 */
 struct snd_soc_tplg_private {
        __le32 size;    /* in bytes of private data */
-        char data[0];
+        union {
+                char data[0];
+                struct snd_soc_tplg_vendor_array array[0];
+        };
 } __attribute__((packed));
 /*
@@ -383,7 +423,7 @@ struct snd_soc_tplg_pcm {
        __le32 size;            /* in bytes of this structure */
        char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
        char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        __le32 pcm_id;          /* unique ID - used to match */
+        __le32 pcm_id;          /* unique ID - used to match with DAI link */
        __le32 dai_id;          /* unique ID - used to match */
        __le32 playback;        /* supports playback mode */
        __le32 capture;         /* supports capture mode */
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 909a7d31ffd3..86cb5c6e8932 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1215,6 +1215,41 @@ static void cgroup_destroy_root(struct cgroup_root *root)
        cgroup_free_root(root);
 }
+/*
+ * look up cgroup associated with current task's cgroup namespace on the
+ * specified hierarchy
+ */
+static struct cgroup *
+current_cgns_cgroup_from_root(struct cgroup_root *root)
+{
+        struct cgroup *res = NULL;
+        struct css_set *cset;
+        lockdep_assert_held(&css_set_lock);
+        rcu_read_lock();
+        cset = current->nsproxy->cgroup_ns->root_cset;
+        if (cset == &init_css_set) {
+                res = &root->cgrp;
+        } else {
+                struct cgrp_cset_link *link;
+                list_for_each_entry(link, &cset->cgrp_links, cgrp_link) {
+                        struct cgroup *c = link->cgrp;
+                        if (c->root == root) {
+                                res = c;
+                                break;
+                        }
+                }
+        }
+        rcu_read_unlock();
+        BUG_ON(!res);
+        return res;
+}
 /* look up cgroup associated with given css_set on the specified hierarchy */
 static struct cgroup *cset_cgroup_from_root(struct css_set *cset,
                                            struct cgroup_root *root)
@@ -1593,6 +1628,33 @@ static int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask)
        return 0;
 }
+static int cgroup_show_path(struct seq_file *sf, struct kernfs_node *kf_node,
+                            struct kernfs_root *kf_root)
+{
+        int len = 0;
+        char *buf = NULL;
+        struct cgroup_root *kf_cgroot = cgroup_root_from_kf(kf_root);
+        struct cgroup *ns_cgroup;
+        buf = kmalloc(PATH_MAX, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        spin_lock_bh(&css_set_lock);
+        ns_cgroup = current_cgns_cgroup_from_root(kf_cgroot);
+        len = kernfs_path_from_node(kf_node, ns_cgroup->kn, buf, PATH_MAX);
+        spin_unlock_bh(&css_set_lock);
+        if (len >= PATH_MAX)
+                len = -ERANGE;
+        else if (len > 0) {
+                seq_escape(sf, buf, " \t\n\\");
+                len = 0;
+        }
+        kfree(buf);
+        return len;
+}
 static int cgroup_show_options(struct seq_file *seq,
                               struct kernfs_root *kf_root)
 {
@@ -5433,6 +5495,7 @@ static struct kernfs_syscall_ops cgroup_kf_syscall_ops = {
        .mkdir                  = cgroup_mkdir,
        .rmdir                  = cgroup_rmdir,
        .rename                 = cgroup_rename,
+        .show_path              = cgroup_show_path,
 };
 static void __init cgroup_init_subsys(struct cgroup_subsys *ss, bool early)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4e2ebf6f2f1f..c0ded2416615 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -351,7 +351,7 @@ static struct srcu_struct pmus_srcu;
 *   1 - disallow cpu events for unpriv
 *   2 - disallow kernel profiling for unpriv
 */
-int sysctl_perf_event_paranoid __read_mostly = 1;
+int sysctl_perf_event_paranoid __read_mostly = 2;
 /* Minimum for 512 kiB + 1 user control page */
 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index c61f0cbd308b..7611d0f66cf8 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -347,6 +347,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
                         bool truncated)
 {
        struct ring_buffer *rb = handle->rb;
+        bool wakeup = truncated;
        unsigned long aux_head;
        u64 flags = 0;
@@ -375,9 +376,16 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
        aux_head = rb->user_page->aux_head = local_read(&rb->aux_head);
        if (aux_head - local_read(&rb->aux_wakeup) >= rb->aux_watermark) {
-                perf_output_wakeup(handle);
+                wakeup = true;
                local_add(rb->aux_watermark, &rb->aux_wakeup);
        }
+        if (wakeup) {
+                if (truncated)
+                        handle->event->pending_disable = 1;
+                perf_output_wakeup(handle);
+        }
        handle->event = NULL;
        local_set(&rb->aux_nest, 0);
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index affd97ec9f65..686ec8adf952 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1394,6 +1394,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq)
                                     !cpumask_test_cpu(later_rq->cpu,
                                                       &task->cpus_allowed) ||
                                     task_running(rq, task) ||
+                                     !dl_task(task) ||
                                     !task_on_rq_queued(task))) {
                                double_unlock_balance(rq, later_rq);
                                later_rq = NULL;
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0fe30e66aff1..e7dd0ec169be 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3030,7 +3030,14 @@ static int idle_balance(struct rq *this_rq);
 #else /* CONFIG_SMP */
-static inline void update_load_avg(struct sched_entity *se, int update_tg) {}
+static inline void update_load_avg(struct sched_entity *se, int not_used)
+{
+        struct cfs_rq *cfs_rq = cfs_rq_of(se);
+        struct rq *rq = rq_of(cfs_rq);
+        cpufreq_trigger_update(rq_clock(rq));
+}
 static inline void
 enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}
 static inline void
@@ -3181,25 +3188,17 @@ static inline void check_schedstat_required(void)
 static void
 enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 {
-        bool renorm = !(flags & ENQUEUE_WAKEUP) || (flags & ENQUEUE_WAKING);
-        bool curr = cfs_rq->curr == se;
        /*
-         * If we're the current task, we must renormalise before calling
+         * Update the normalized vruntime before updating min_vruntime
-         * update_curr().
+         * through calling update_curr().
         */
-        if (renorm && curr)
+        if (!(flags & ENQUEUE_WAKEUP) || (flags & ENQUEUE_WAKING))
                se->vruntime += cfs_rq->min_vruntime;
-        update_curr(cfs_rq);
        /*
-         * Otherwise, renormalise after, such that we're placed at the current
+         * Update run-time statistics of the 'current'.
-         * moment in time, instead of some random moment in the past.
         */
-        if (renorm && !curr)
+        update_curr(cfs_rq);
-                se->vruntime += cfs_rq->min_vruntime;
        enqueue_entity_load_avg(cfs_rq, se);
        account_entity_enqueue(cfs_rq, se);
        update_cfs_shares(cfs_rq);
@@ -3215,7 +3214,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
                update_stats_enqueue(cfs_rq, se);
                check_spread(cfs_rq, se);
        }
-        if (!curr)
+        if (se != cfs_rq->curr)
                __enqueue_entity(cfs_rq, se);
        se->on_rq = 1;
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index c41ea7ac1764..ec4f538d4396 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1729,6 +1729,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)
                                     !cpumask_test_cpu(lowest_rq->cpu,
                                                       tsk_cpus_allowed(task)) ||
                                     task_running(rq, task) ||
+                                     !rt_task(task) ||
                                     !task_on_rq_queued(task))) {
                                double_unlock_balance(rq, lowest_rq);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 3bfdff06eea7..5f5068e94003 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4554,6 +4554,17 @@ static void rebind_workers(struct worker_pool *pool)
                                                  pool->attrs->cpumask) < 0);
        spin_lock_irq(&pool->lock);
+        /*
+         * XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED
+         * w/o preceding DOWN_PREPARE.  Work around it.  CPU hotplug is
+         * being reworked and this can go away in time.
+         */
+        if (!(pool->flags & POOL_DISASSOCIATED)) {
+                spin_unlock_irq(&pool->lock);
+                return;
+        }
        pool->flags &= ~POOL_DISASSOCIATED;
        for_each_pool_worker(worker, pool) {
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index 2b3f46c049d4..554522934c44 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -74,7 +74,7 @@ next_tag:
        /* Extract a tag from the data */
        tag = data[dp++];
-        if (tag == 0) {
+        if (tag == ASN1_EOC) {
                /* It appears to be an EOC. */
                if (data[dp++] != 0)
                        goto invalid_eoc;
@@ -96,10 +96,8 @@ next_tag:
        /* Extract the length */
        len = data[dp++];
-        if (len <= 0x7f) {
+        if (len <= 0x7f)
-                dp += len;
+                goto check_length;
-                goto next_tag;
-        }
        if (unlikely(len == ASN1_INDEFINITE_LENGTH)) {
                /* Indefinite length */
@@ -110,14 +108,18 @@ next_tag:
        }
        n = len - 0x80;
-        if (unlikely(n > sizeof(size_t) - 1))
+        if (unlikely(n > sizeof(len) - 1))
                goto length_too_long;
        if (unlikely(n > datalen - dp))
                goto data_overrun_error;
-        for (len = 0; n > 0; n--) {
+        len = 0;
+        for (; n > 0; n--) {
                len <<= 8;
                len |= data[dp++];
        }
+check_length:
+        if (len > datalen - dp)
+                goto data_overrun_error;
        dp += len;
        goto next_tag;
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 5fecddc32b1b..ca5316e0087b 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -569,6 +569,25 @@ unsigned long iov_iter_alignment(const struct iov_iter *i)
 }
 EXPORT_SYMBOL(iov_iter_alignment);
+unsigned long iov_iter_gap_alignment(const struct iov_iter *i)
+{
+        unsigned long res = 0;
+        size_t size = i->count;
+        if (!size)
+                return 0;
+        iterate_all_kinds(i, size, v,
+                (res |= (!res ? 0 : (unsigned long)v.iov_base) |
+                        (size != v.iov_len ? size : 0), 0),
+                (res |= (!res ? 0 : (unsigned long)v.bv_offset) |
+                        (size != v.bv_len ? size : 0)),
+                (res |= (!res ? 0 : (unsigned long)v.iov_base) |
+                        (size != v.iov_len ? size : 0))
+                );
+                return res;
+}
+EXPORT_SYMBOL(iov_iter_gap_alignment);
 ssize_t iov_iter_get_pages(struct iov_iter *i,
                   struct page **pages, size_t maxsize, unsigned maxpages,
                   size_t *start)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index f7daa7de8f48..b49ee126d4d1 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1298,15 +1298,9 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
        VM_BUG_ON_PAGE(!PageCompound(page) || !PageHead(page), page);
        /*
         * We can only reuse the page if nobody else maps the huge page or it's
-         * part. We can do it by checking page_mapcount() on each sub-page, but
+         * part.
-         * it's expensive.
-         * The cheaper way is to check page_count() to be equal 1: every
-         * mapcount takes page reference reference, so this way we can
-         * guarantee, that the PMD is the only mapping.
-         * This can give false negative if somebody pinned the page, but that's
-         * fine.
         */
-        if (page_mapcount(page) == 1 && page_count(page) == 1) {
+        if (page_trans_huge_mapcount(page, NULL) == 1) {
                pmd_t entry;
                entry = pmd_mkyoung(orig_pmd);
                entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);
@@ -2079,7 +2073,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
                if (pte_write(pteval)) {
                        writable = true;
                } else {
-                        if (PageSwapCache(page) && !reuse_swap_page(page)) {
+                        if (PageSwapCache(page) &&
+                            !reuse_swap_page(page, NULL)) {
                                unlock_page(page);
                                result = SCAN_SWAP_CACHE_PAGE;
                                goto out;
@@ -3223,6 +3218,64 @@ int total_mapcount(struct page *page)
 }
 /*
+ * This calculates accurately how many mappings a transparent hugepage
+ * has (unlike page_mapcount() which isn't fully accurate). This full
+ * accuracy is primarily needed to know if copy-on-write faults can
+ * reuse the page and change the mapping to read-write instead of
+ * copying them. At the same time this returns the total_mapcount too.
+ *
+ * The function returns the highest mapcount any one of the subpages
+ * has. If the return value is one, even if different processes are
+ * mapping different subpages of the transparent hugepage, they can
+ * all reuse it, because each process is reusing a different subpage.
+ *
+ * The total_mapcount is instead counting all virtual mappings of the
+ * subpages. If the total_mapcount is equal to "one", it tells the
+ * caller all mappings belong to the same "mm" and in turn the
+ * anon_vma of the transparent hugepage can become the vma->anon_vma
+ * local one as no other process may be mapping any of the subpages.
+ *
+ * It would be more accurate to replace page_mapcount() with
+ * page_trans_huge_mapcount(), however we only use
+ * page_trans_huge_mapcount() in the copy-on-write faults where we
+ * need full accuracy to avoid breaking page pinning, because
+ * page_trans_huge_mapcount() is slower than page_mapcount().
+ */
+int page_trans_huge_mapcount(struct page *page, int *total_mapcount)
+{
+        int i, ret, _total_mapcount, mapcount;
+        /* hugetlbfs shouldn't call it */
+        VM_BUG_ON_PAGE(PageHuge(page), page);
+        if (likely(!PageTransCompound(page))) {
+                mapcount = atomic_read(&page->_mapcount) + 1;
+                if (total_mapcount)
+                        *total_mapcount = mapcount;
+                return mapcount;
+        }
+        page = compound_head(page);
+        _total_mapcount = ret = 0;
+        for (i = 0; i < HPAGE_PMD_NR; i++) {
+                mapcount = atomic_read(&page[i]._mapcount) + 1;
+                ret = max(ret, mapcount);
+                _total_mapcount += mapcount;
+        }
+        if (PageDoubleMap(page)) {
+                ret -= 1;
+                _total_mapcount -= HPAGE_PMD_NR;
+        }
+        mapcount = compound_mapcount(page);
+        ret += mapcount;
+        _total_mapcount += mapcount;
+        if (total_mapcount)
+                *total_mapcount = _total_mapcount;
+        return ret;
+}
+/*
 * This function splits huge page into normal pages. @page can point to any
 * subpage of huge page to split. Split doesn't change the position of @page.
 *
diff --git a/mm/ksm.c b/mm/ksm.c
index b99e828172f6..4786b4150f62 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -783,6 +783,7 @@ static int unmerge_and_remove_all_rmap_items(void)
                }
                remove_trailing_rmap_items(mm_slot, &mm_slot->rmap_list);
+                up_read(&mm->mmap_sem);
                spin_lock(&ksm_mmlist_lock);
                ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
@@ -794,12 +795,9 @@ static int unmerge_and_remove_all_rmap_items(void)
                        free_mm_slot(mm_slot);
                        clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-                        up_read(&mm->mmap_sem);
                        mmdrop(mm);
-                } else {
+                } else
                        spin_unlock(&ksm_mmlist_lock);
-                        up_read(&mm->mmap_sem);
-                }
        }
        /* Clean up stable nodes, but don't worry if some are still busy */
@@ -1663,8 +1661,15 @@ next_mm:
                up_read(&mm->mmap_sem);
                mmdrop(mm);
        } else {
-                spin_unlock(&ksm_mmlist_lock);
                up_read(&mm->mmap_sem);
+                /*
+                 * up_read(&mm->mmap_sem) first because after
+                 * spin_unlock(&ksm_mmlist_lock) run, the "mm" may
+                 * already have been freed under us by __ksm_exit()
+                 * because the "mm_slot" is still hashed and
+                 * ksm_scan.mm_slot doesn't point to it anymore.
+                 */
+                spin_unlock(&ksm_mmlist_lock);
        }
        /* Repeat until we've completed scanning the whole list */
diff --git a/mm/memory.c b/mm/memory.c
index 52c218e2b724..07493e34ab7e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2373,6 +2373,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
         * not dirty accountable.
         */
        if (PageAnon(old_page) && !PageKsm(old_page)) {
+                int total_mapcount;
                if (!trylock_page(old_page)) {
                        get_page(old_page);
                        pte_unmap_unlock(page_table, ptl);
@@ -2387,13 +2388,18 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
                        }
                        put_page(old_page);
                }
-                if (reuse_swap_page(old_page)) {
+                if (reuse_swap_page(old_page, &total_mapcount)) {
-                        /*
+                        if (total_mapcount == 1) {
-                         * The page is all ours.  Move it to our anon_vma so
+                                /*
-                         * the rmap code will not search our parent or siblings.
+                                 * The page is all ours. Move it to
-                         * Protected against the rmap code by the page lock.
+                                 * our anon_vma so the rmap code will
-                         */
+                                 * not search our parent or siblings.
-                        page_move_anon_rmap(old_page, vma, address);
+                                 * Protected against the rmap code by
+                                 * the page lock.
+                                 */
+                                page_move_anon_rmap(compound_head(old_page),
+                                                    vma, address);
+                        }
                        unlock_page(old_page);
                        return wp_page_reuse(mm, vma, address, page_table, ptl,
                                             orig_pte, old_page, 0, 0);
@@ -2617,7 +2623,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
        inc_mm_counter_fast(mm, MM_ANONPAGES);
        dec_mm_counter_fast(mm, MM_SWAPENTS);
        pte = mk_pte(page, vma->vm_page_prot);
-        if ((flags & FAULT_FLAG_WRITE) && reuse_swap_page(page)) {
+        if ((flags & FAULT_FLAG_WRITE) && reuse_swap_page(page, NULL)) {
                pte = maybe_mkwrite(pte_mkdirty(pte), vma);
                flags &= ~FAULT_FLAG_WRITE;
                ret |= VM_FAULT_WRITE;
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 83874eced5bf..031713ab40ce 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -922,18 +922,19 @@ out:
 * to it.  And as a side-effect, free up its swap: because the old content
 * on disk will never be read, and seeking back there to write new content
 * later would only waste time away from clustering.
+ *
+ * NOTE: total_mapcount should not be relied upon by the caller if
+ * reuse_swap_page() returns false, but it may be always overwritten
+ * (see the other implementation for CONFIG_SWAP=n).
 */
-int reuse_swap_page(struct page *page)
+bool reuse_swap_page(struct page *page, int *total_mapcount)
 {
        int count;
        VM_BUG_ON_PAGE(!PageLocked(page), page);
        if (unlikely(PageKsm(page)))
-                return 0;
+                return false;
-        /* The page is part of THP and cannot be reused */
+        count = page_trans_huge_mapcount(page, total_mapcount);
-        if (PageTransCompound(page))
-                return 0;
-        count = page_mapcount(page);
        if (count <= 1 && PageSwapCache(page)) {
                count += page_swapcount(page);
                if (count == 1 && !PageWriteback(page)) {
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index e72efb109fde..fe47fbba995a 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1735,10 +1735,13 @@ static struct page *isolate_source_page(struct size_class *class)
 static unsigned long zs_can_compact(struct size_class *class)
 {
        unsigned long obj_wasted;
+        unsigned long obj_allocated = zs_stat_get(class, OBJ_ALLOCATED);
+        unsigned long obj_used = zs_stat_get(class, OBJ_USED);
-        obj_wasted = zs_stat_get(class, OBJ_ALLOCATED) -
+        if (obj_allocated <= obj_used)
-                zs_stat_get(class, OBJ_USED);
+                return 0;
+        obj_wasted = obj_allocated - obj_used;
        obj_wasted /= get_maxobj_per_zspage(class->size,
                        class->pages_per_zspage);
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 263b4de4de57..60a3dbfca8a1 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -21,18 +21,19 @@
 #include <asm/uaccess.h>
 #include "br_private.h"
-/* called with RTNL */
 static int get_bridge_ifindices(struct net *net, int *indices, int num)
 {
        struct net_device *dev;
        int i = 0;
-        for_each_netdev(net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(net, dev) {
                if (i >= num)
                        break;
                if (dev->priv_flags & IFF_EBRIDGE)
                        indices[i++] = dev->ifindex;
        }
+        rcu_read_unlock();
        return i;
 }
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 191ea66e4d92..6852f3c7009c 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1279,6 +1279,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
        struct br_ip saddr;
        unsigned long max_delay;
        unsigned long now = jiffies;
+        unsigned int offset = skb_transport_offset(skb);
        __be32 group;
        int err = 0;
@@ -1289,14 +1290,14 @@ static int br_ip4_multicast_query(struct net_bridge *br,
        group = ih->group;
-        if (skb->len == sizeof(*ih)) {
+        if (skb->len == offset + sizeof(*ih)) {
                max_delay = ih->code * (HZ / IGMP_TIMER_SCALE);
                if (!max_delay) {
                        max_delay = 10 * HZ;
                        group = 0;
                }
-        } else if (skb->len >= sizeof(*ih3)) {
+        } else if (skb->len >= offset + sizeof(*ih3)) {
                ih3 = igmpv3_query_hdr(skb);
                if (ih3->nsrcs)
                        goto out;
@@ -1357,6 +1358,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
        struct br_ip saddr;
        unsigned long max_delay;
        unsigned long now = jiffies;
+        unsigned int offset = skb_transport_offset(skb);
        const struct in6_addr *group = NULL;
        bool is_general_query;
        int err = 0;
@@ -1366,8 +1368,8 @@ static int br_ip6_multicast_query(struct net_bridge *br,
            (port && port->state == BR_STATE_DISABLED))
                goto out;
-        if (skb->len == sizeof(*mld)) {
+        if (skb->len == offset + sizeof(*mld)) {
-                if (!pskb_may_pull(skb, sizeof(*mld))) {
+                if (!pskb_may_pull(skb, offset + sizeof(*mld))) {
                        err = -EINVAL;
                        goto out;
                }
@@ -1376,7 +1378,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
                if (max_delay)
                        group = &mld->mld_mca;
        } else {
-                if (!pskb_may_pull(skb, sizeof(*mld2q))) {
+                if (!pskb_may_pull(skb, offset + sizeof(*mld2q))) {
                        err = -EINVAL;
                        goto out;
                }
diff --git a/net/core/flow.c b/net/core/flow.c
index 1033725be40b..3937b1b68d5b 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -92,8 +92,11 @@ static void flow_cache_gc_task(struct work_struct *work)
        list_splice_tail_init(&xfrm->flow_cache_gc_list, &gc_list);
        spin_unlock_bh(&xfrm->flow_cache_gc_lock);
-        list_for_each_entry_safe(fce, n, &gc_list, u.gc_list)
+        list_for_each_entry_safe(fce, n, &gc_list, u.gc_list) {
                flow_entry_kill(fce, xfrm);
+                atomic_dec(&xfrm->flow_cache_gc_count);
+                WARN_ON(atomic_read(&xfrm->flow_cache_gc_count) < 0);
+        }
 }
 static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp,
@@ -101,6 +104,7 @@ static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp,
                                     struct netns_xfrm *xfrm)
 {
        if (deleted) {
+                atomic_add(deleted, &xfrm->flow_cache_gc_count);
                fcp->hash_count -= deleted;
                spin_lock_bh(&xfrm->flow_cache_gc_lock);
                list_splice_tail(gc_list, &xfrm->flow_cache_gc_list);
@@ -232,6 +236,13 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
                if (fcp->hash_count > fc->high_watermark)
                        flow_cache_shrink(fc, fcp);
+                if (fcp->hash_count > 2 * fc->high_watermark ||
+                    atomic_read(&net->xfrm.flow_cache_gc_count) > fc->high_watermark) {
+                        atomic_inc(&net->xfrm.flow_cache_genid);
+                        flo = ERR_PTR(-ENOBUFS);
+                        goto ret_object;
+                }
                fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);
                if (fle) {
                        fle->net = net;
@@ -446,6 +457,7 @@ int flow_cache_init(struct net *net)
        INIT_WORK(&net->xfrm.flow_cache_gc_work, flow_cache_gc_task);
        INIT_WORK(&net->xfrm.flow_cache_flush_work, flow_cache_flush_task);
        mutex_init(&net->xfrm.flow_flush_sem);
+        atomic_set(&net->xfrm.flow_cache_gc_count, 0);
        fc->hash_shift = 10;
        fc->low_watermark = 2 * flow_cache_hash_size(fc);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a75f7e94b445..65763c29f845 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1180,14 +1180,16 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
 static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
 {
-        struct rtnl_link_ifmap map = {
+        struct rtnl_link_ifmap map;
-                .mem_start   = dev->mem_start,
-                .mem_end     = dev->mem_end,
+        memset(&map, 0, sizeof(map));
-                .base_addr   = dev->base_addr,
+        map.mem_start   = dev->mem_start;
-                .irq         = dev->irq,
+        map.mem_end     = dev->mem_end;
-                .dma         = dev->dma,
+        map.base_addr   = dev->base_addr;
-                .port        = dev->if_port,
+        map.irq         = dev->irq;
-        };
+        map.dma         = dev->dma;
+        map.port        = dev->if_port;
        if (nla_put(skb, IFLA_MAP, sizeof(map), &map))
                return -EMSGSIZE;
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index d97268e8ff10..2b68418c7198 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -975,6 +975,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)
                        val = 65535 - 40;
                if (type == RTAX_MTU && val > 65535 - 15)
                        val = 65535 - 15;
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                        return -EINVAL;
                fi->fib_metrics[type - 1] = val;
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index a39068b4a4d9..a6962ccad98a 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -228,8 +228,6 @@ static int fou_gro_complete(struct sk_buff *skb, int nhoff,
        int err = -ENOSYS;
        const struct net_offload **offloads;
-        udp_tunnel_gro_complete(skb, nhoff);
        rcu_read_lock();
        offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
        ops = rcu_dereference(offloads[proto]);
@@ -238,6 +236,8 @@ static int fou_gro_complete(struct sk_buff *skb, int nhoff,
        err = ops->callbacks.gro_complete(skb, nhoff);
+        skb_set_inner_mac_header(skb, nhoff);
 out_unlock:
        rcu_read_unlock();
@@ -414,6 +414,8 @@ static int gue_gro_complete(struct sk_buff *skb, int nhoff,
        err = ops->callbacks.gro_complete(skb, nhoff + guehlen);
+        skb_set_inner_mac_header(skb, nhoff + guehlen);
 out_unlock:
        rcu_read_unlock();
        return err;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 205a2b8a5a84..4cc84212cce1 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -398,7 +398,10 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
                                  iph->saddr, iph->daddr, tpi->key);
        if (tunnel) {
-                skb_pop_mac_header(skb);
+                if (tunnel->dev->type != ARPHRD_NONE)
+                        skb_pop_mac_header(skb);
+                else
+                        skb_reset_mac_header(skb);
                if (tunnel->collect_md) {
                        __be16 flags;
                        __be64 tun_id;
@@ -1031,6 +1034,8 @@ static void ipgre_netlink_parms(struct net_device *dev,
                struct ip_tunnel *t = netdev_priv(dev);
                t->collect_md = true;
+                if (dev->type == ARPHRD_IPGRE)
+                        dev->type = ARPHRD_NONE;
        }
 }
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 5cf10b777b7e..a917903d5e97 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -156,6 +156,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
        struct dst_entry *dst = skb_dst(skb);
        struct net_device *tdev;        /* Device to other host */
        int err;
+        int mtu;
        if (!dst) {
                dev->stats.tx_carrier_errors++;
@@ -192,6 +193,23 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
                        tunnel->err_count = 0;
        }
+        mtu = dst_mtu(dst);
+        if (skb->len > mtu) {
+                skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
+                if (skb->protocol == htons(ETH_P_IP)) {
+                        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
+                                  htonl(mtu));
+                } else {
+                        if (mtu < IPV6_MIN_MTU)
+                                mtu = IPV6_MIN_MTU;
+                        icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
+                }
+                dst_release(dst);
+                goto tx_error;
+        }
        skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(dev)));
        skb_dst_set(skb, dst);
        skb->dev = skb_dst(skb)->dev;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 441ae9da3a23..79a03b87a771 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2640,8 +2640,10 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
         */
        if (unlikely((NET_IP_ALIGN && ((unsigned long)skb->data & 3)) ||
                     skb_headroom(skb) >= 0xFFFF)) {
-                struct sk_buff *nskb = __pskb_copy(skb, MAX_TCP_HEADER,
+                struct sk_buff *nskb;
-                                                   GFP_ATOMIC);
+                skb_mstamp_get(&skb->skb_mstamp);
+                nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
                err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
                             -ENOBUFS;
        } else {
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 0ed2dafb7cc4..e330c0e56b11 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -399,6 +399,11 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff)
        uh->len = newlen;
+        /* Set encapsulation before calling into inner gro_complete() functions
+         * to make them set up the inner offsets.
+         */
+        skb->encapsulation = 1;
        rcu_read_lock();
        uo_priv = rcu_dereference(udp_offload_base);
@@ -421,9 +426,6 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff)
        if (skb->remcsum_offload)
                skb_shinfo(skb)->gso_type |= SKB_GSO_TUNNEL_REMCSUM;
-        skb->encapsulation = 1;
-        skb_set_inner_mac_header(skb, nhoff + sizeof(struct udphdr));
        return err;
 }
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 0a37ddc7af51..0013cacf7164 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -445,6 +445,8 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
        if (__ipv6_addr_needs_scope_id(addr_type))
                iif = skb->dev->ifindex;
+        else
+                iif = l3mdev_master_ifindex(skb->dev);
        /*
         *      Must not send error if the source does not uniquely
@@ -499,9 +501,6 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
        else if (!fl6.flowi6_oif)
                fl6.flowi6_oif = np->ucast_oif;
-        if (!fl6.flowi6_oif)
-                fl6.flowi6_oif = l3mdev_master_ifindex(skb->dev);
        dst = icmpv6_route_lookup(net, skb, sk, &fl6);
        if (IS_ERR(dst))
                goto out;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d916d6ab9ad2..6f32944e0223 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1750,6 +1750,8 @@ static int ip6_convert_metrics(struct mx6_config *mxc,
                } else {
                        val = nla_get_u32(nla);
                }
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                        goto err;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 711d209f9124..f443c6b0ce16 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -810,8 +810,13 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32
        fl6.flowi6_proto = IPPROTO_TCP;
        if (rt6_need_strict(&fl6.daddr) && !oif)
                fl6.flowi6_oif = tcp_v6_iif(skb);
-        else
+        else {
+                if (!oif && netif_index_is_l3_master(net, skb->skb_iif))
+                        oif = skb->skb_iif;
                fl6.flowi6_oif = oif;
+        }
        fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark);
        fl6.fl6_dport = t1->dest;
        fl6.fl6_sport = t1->source;
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index b3c52e3f689a..8ae3ed97d95c 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)
        if (llc->cmsg_flags & LLC_CMSG_PKTINFO) {
                struct llc_pktinfo info;
+                memset(&info, 0, sizeof(info));
                info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex;
                llc_pdu_decode_dsap(skb, &info.lpi_sap);
                llc_pdu_decode_da(skb, info.lpi_mac);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index afde5f5e728a..e27fd17c6743 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -66,7 +66,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_locks);
 __cacheline_aligned_in_smp DEFINE_SPINLOCK(nf_conntrack_expect_lock);
 EXPORT_SYMBOL_GPL(nf_conntrack_expect_lock);
-static __read_mostly spinlock_t nf_conntrack_locks_all_lock;
+static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);
 static __read_mostly bool nf_conntrack_locks_all;
 void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)
@@ -1778,6 +1778,7 @@ void nf_conntrack_init_end(void)
 int nf_conntrack_init_net(struct net *net)
 {
+        static atomic64_t unique_id;
        int ret = -ENOMEM;
        int cpu;
@@ -1800,7 +1801,8 @@ int nf_conntrack_init_net(struct net *net)
        if (!net->ct.stat)
                goto err_pcpu_lists;
-        net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
+        net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%llu",
+                                (u64)atomic64_inc_return(&unique_id));
        if (!net->ct.slabname)
                goto err_slabname;
diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
index 4c2b4c0c4d5f..dbd0803b1827 100644
--- a/net/netfilter/nfnetlink_acct.c
+++ b/net/netfilter/nfnetlink_acct.c
@@ -96,6 +96,8 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl,
                        return -EINVAL;
                if (flags & NFACCT_F_OVERQUOTA)
                        return -EINVAL;
+                if ((flags & NFACCT_F_QUOTA) && !tb[NFACCT_QUOTA])
+                        return -EINVAL;
                size += sizeof(u64);
        }
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 29d2c31f406c..daf45da448fa 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -236,6 +236,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)
                list_del(&info->timer->entry);
                del_timer_sync(&info->timer->timer);
+                cancel_work_sync(&info->timer->work);
                sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr);
                kfree(info->timer->attr.attr.name);
                kfree(info->timer);
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index b5fea1101faa..10c84d882881 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -776,6 +776,19 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                        return -EINVAL;
                }
+                /* Userspace may decide to perform a ct lookup without a helper
+                 * specified followed by a (recirculate and) commit with one.
+                 * Therefore, for unconfirmed connections which we will commit,
+                 * we need to attach the helper here.
+                 */
+                if (!nf_ct_is_confirmed(ct) && info->commit &&
+                    info->helper && !nfct_help(ct)) {
+                        int err = __nf_ct_try_assign_helper(ct, info->ct,
+                                                            GFP_ATOMIC);
+                        if (err)
+                                return err;
+                }
                /* Call the helper only if:
                 * - nf_conntrack_in() was executed above ("!cached") for a
                 *   confirmed connection, or
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index c589a9ba506a..343d011aa818 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -423,7 +423,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
        u16 ife_type = 0;
        u8 *daddr = NULL;
        u8 *saddr = NULL;
-        int ret = 0;
+        int ret = 0, exists = 0;
        int err;
        err = nla_parse_nested(tb, TCA_IFE_MAX, nla, ife_policy);
@@ -435,25 +435,29 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
        parm = nla_data(tb[TCA_IFE_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
        if (parm->flags & IFE_ENCODE) {
                /* Until we get issued the ethertype, we cant have
                 * a default..
                **/
                if (!tb[TCA_IFE_TYPE]) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                        pr_info("You MUST pass etherype for encoding\n");
                        return -EINVAL;
                }
        }
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                ret = tcf_hash_create(tn, parm->index, est, a, sizeof(*ife),
                                      bind, false);
                if (ret)
                        return ret;
                ret = ACT_P_CREATED;
        } else {
-                if (bind)       /* dont override defaults */
-                        return 0;
                tcf_hash_release(a, bind);
                if (!ovr)
                        return -EEXIST;
@@ -495,6 +499,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
                                       NULL);
                if (err) {
 metadata_parse_err:
+                        if (exists)
+                                tcf_hash_release(a, bind);
                        if (ret == ACT_P_CREATED)
                                _tcf_ife_cleanup(a, bind);
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 350e134cffb3..8b5270008a6e 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -96,7 +96,7 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
        struct tcf_ipt *ipt;
        struct xt_entry_target *td, *t;
        char *tname;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
        u32 hook = 0;
        u32 index = 0;
@@ -107,18 +107,23 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
        if (err < 0)
                return err;
-        if (tb[TCA_IPT_HOOK] == NULL)
+        if (tb[TCA_IPT_INDEX] != NULL)
-                return -EINVAL;
+                index = nla_get_u32(tb[TCA_IPT_INDEX]);
-        if (tb[TCA_IPT_TARG] == NULL)
+        exists = tcf_hash_check(tn, index, a, bind);
+        if (exists && bind)
+                return 0;
+        if (tb[TCA_IPT_HOOK] == NULL || tb[TCA_IPT_TARG] == NULL) {
+                if (exists)
+                        tcf_hash_release(a, bind);
                return -EINVAL;
+        }
        td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]);
        if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size)
                return -EINVAL;
-        if (tb[TCA_IPT_INDEX] != NULL)
-                index = nla_get_u32(tb[TCA_IPT_INDEX]);
        if (!tcf_hash_check(tn, index, a, bind)) {
                ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind,
                                      false);
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index e8a760cf7775..8f3948dd38b8 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -61,7 +61,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
        struct tc_mirred *parm;
        struct tcf_mirred *m;
        struct net_device *dev;
-        int ret, ok_push = 0;
+        int ret, ok_push = 0, exists = 0;
        if (nla == NULL)
                return -EINVAL;
@@ -71,17 +71,27 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
        if (tb[TCA_MIRRED_PARMS] == NULL)
                return -EINVAL;
        parm = nla_data(tb[TCA_MIRRED_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
        switch (parm->eaction) {
        case TCA_EGRESS_MIRROR:
        case TCA_EGRESS_REDIR:
                break;
        default:
+                if (exists)
+                        tcf_hash_release(a, bind);
                return -EINVAL;
        }
        if (parm->ifindex) {
                dev = __dev_get_by_index(net, parm->ifindex);
-                if (dev == NULL)
+                if (dev == NULL) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                        return -ENODEV;
+                }
                switch (dev->type) {
                case ARPHRD_TUNNEL:
                case ARPHRD_TUNNEL6:
@@ -99,7 +109,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                dev = NULL;
        }
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                if (dev == NULL)
                        return -EINVAL;
                ret = tcf_hash_create(tn, parm->index, est, a,
@@ -108,9 +118,6 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                        return ret;
                ret = ACT_P_CREATED;
        } else {
-                if (bind)
-                        return 0;
                tcf_hash_release(a, bind);
                if (!ovr)
                        return -EEXIST;
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 75b2be13fbcc..3a33fb648a6d 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -87,7 +87,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        struct tc_defact *parm;
        struct tcf_defact *d;
        char *defdata;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
        if (nla == NULL)
                return -EINVAL;
@@ -99,13 +99,21 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        if (tb[TCA_DEF_PARMS] == NULL)
                return -EINVAL;
-        if (tb[TCA_DEF_DATA] == NULL)
-                return -EINVAL;
        parm = nla_data(tb[TCA_DEF_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+        if (tb[TCA_DEF_DATA] == NULL) {
+                if (exists)
+                        tcf_hash_release(a, bind);
+                return -EINVAL;
+        }
        defdata = nla_data(tb[TCA_DEF_DATA]);
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                ret = tcf_hash_create(tn, parm->index, est, a,
                                      sizeof(*d), bind, false);
                if (ret)
@@ -122,8 +130,6 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        } else {
                d = to_defact(a);
-                if (bind)
-                        return 0;
                tcf_hash_release(a, bind);
                if (!ovr)
                        return -EEXIST;
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index cfcdbdc00c9b..69da5a8f0034 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -69,7 +69,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
        struct tcf_skbedit *d;
        u32 flags = 0, *priority = NULL, *mark = NULL;
        u16 *queue_mapping = NULL;
-        int ret = 0, err;
+        int ret = 0, err, exists = 0;
        if (nla == NULL)
                return -EINVAL;
@@ -96,12 +96,18 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                mark = nla_data(tb[TCA_SKBEDIT_MARK]);
        }
-        if (!flags)
-                return -EINVAL;
        parm = nla_data(tb[TCA_SKBEDIT_PARMS]);
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
+        if (!flags) {
+                tcf_hash_release(a, bind);
+                return -EINVAL;
+        }
+        if (!exists) {
                ret = tcf_hash_create(tn, parm->index, est, a,
                                      sizeof(*d), bind, false);
                if (ret)
@@ -111,8 +117,6 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                ret = ACT_P_CREATED;
        } else {
                d = to_skbedit(a);
-                if (bind)
-                        return 0;
                tcf_hash_release(a, bind);
                if (!ovr)
                        return -EEXIST;
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index bab8ae0cefc0..c45f926dafb9 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -77,7 +77,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
        int action;
        __be16 push_vid = 0;
        __be16 push_proto = 0;
-        int ret = 0;
+        int ret = 0, exists = 0;
        int err;
        if (!nla)
@@ -90,15 +90,25 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
        if (!tb[TCA_VLAN_PARMS])
                return -EINVAL;
        parm = nla_data(tb[TCA_VLAN_PARMS]);
+        exists = tcf_hash_check(tn, parm->index, a, bind);
+        if (exists && bind)
+                return 0;
        switch (parm->v_action) {
        case TCA_VLAN_ACT_POP:
                break;
        case TCA_VLAN_ACT_PUSH:
-                if (!tb[TCA_VLAN_PUSH_VLAN_ID])
+                if (!tb[TCA_VLAN_PUSH_VLAN_ID]) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                        return -EINVAL;
+                }
                push_vid = nla_get_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
-                if (push_vid >= VLAN_VID_MASK)
+                if (push_vid >= VLAN_VID_MASK) {
+                        if (exists)
+                                tcf_hash_release(a, bind);
                        return -ERANGE;
+                }
                if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
                        push_proto = nla_get_be16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
@@ -114,11 +124,13 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
                }
                break;
        default:
+                if (exists)
+                        tcf_hash_release(a, bind);
                return -EINVAL;
        }
        action = parm->v_action;
-        if (!tcf_hash_check(tn, parm->index, a, bind)) {
+        if (!exists) {
                ret = tcf_hash_create(tn, parm->index, est, a,
                                      sizeof(*v), bind, false);
                if (ret)
@@ -126,8 +138,6 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
                ret = ACT_P_CREATED;
        } else {
-                if (bind)
-                        return 0;
                tcf_hash_release(a, bind);
                if (!ovr)
                        return -EEXIST;
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 3dce53ebea92..b5f1221f48d4 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1808,27 +1808,8 @@ vsock_stream_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
        else if (sk->sk_shutdown & RCV_SHUTDOWN)
                err = 0;
-        if (copied > 0) {
+        if (copied > 0)
-                /* We only do these additional bookkeeping/notification steps
-                 * if we actually copied something out of the queue pair
-                 * instead of just peeking ahead.
-                 */
-                if (!(flags & MSG_PEEK)) {
-                        /* If the other side has shutdown for sending and there
-                         * is nothing more to read, then modify the socket
-                         * state.
-                         */
-                        if (vsk->peer_shutdown & SEND_SHUTDOWN) {
-                                if (vsock_stream_has_data(vsk) <= 0) {
-                                        sk->sk_state = SS_UNCONNECTED;
-                                        sock_set_flag(sk, SOCK_DONE);
-                                        sk->sk_state_change(sk);
-                                }
-                        }
-                }
                err = copied;
-        }
 out:
        release_sock(sk);
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c
index 7ecd04c21360..997ff7b2509b 100644
--- a/net/x25/x25_facilities.c
+++ b/net/x25/x25_facilities.c
@@ -277,6 +277,7 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk,
        memset(&theirs, 0, sizeof(theirs));
        memcpy(new, ours, sizeof(*new));
+        memset(dte, 0, sizeof(*dte));
        len = x25_parse_facilities(skb, &theirs, dte, &x25->vc_facil_mask);
        if (len < 0)
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index ff4a91fcab9f..637387bbaaea 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -99,6 +99,9 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                skb_dst_force(skb);
+                /* Inner headers are invalid now. */
+                skb->encapsulation = 0;
                err = x->type->output(x, skb);
                if (err == -EINPROGRESS)
                        goto out;
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index b3afae990e39..4d82a58ff6b0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -43,6 +43,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK5386
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
+        select SND_SOC_BT_SCO
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS42L51_I2C if I2C
@@ -64,7 +65,6 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
-        select SND_SOC_BT_SCO
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
@@ -79,6 +79,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX98090 if I2C
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
+        select SND_SOC_MAX98371 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
@@ -126,12 +127,14 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TAS571X if I2C
+        select SND_SOC_TAS5720 if I2C
        select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC31XX if I2C
-        select SND_SOC_TLV320AIC32X4 if I2C
+        select SND_SOC_TLV320AIC32X4_I2C if I2C
+        select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
@@ -367,6 +370,9 @@ config SND_SOC_ALC5623
 config SND_SOC_ALC5632
        tristate
+config SND_SOC_BT_SCO
+        tristate
 config SND_SOC_CQ0093VC
        tristate
@@ -473,9 +479,6 @@ config SND_SOC_DA732X
 config SND_SOC_DA9055
        tristate
-config SND_SOC_BT_SCO
-        tristate
 config SND_SOC_DMIC
        tristate
@@ -529,6 +532,9 @@ config SND_SOC_MAX98095
 config SND_SOC_MAX98357A
       tristate
+config SND_SOC_MAX98371
+       tristate
 config SND_SOC_MAX9867
        tristate
@@ -748,9 +754,16 @@ config SND_SOC_TAS5086
        depends on I2C
 config SND_SOC_TAS571X
-        tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"
+        tristate "Texas Instruments TAS5711/TAS5717/TAS5719/TAS5721 power amplifiers"
        depends on I2C
+config SND_SOC_TAS5720
+        tristate "Texas Instruments TAS5720 Mono Audio amplifier"
+        depends on I2C
+        help
+          Enable support for Texas Instruments TAS5720L/M high-efficiency mono
+          Class-D audio power amplifiers.
 config SND_SOC_TFA9879
        tristate "NXP Semiconductors TFA9879 amplifier"
        depends on I2C
@@ -780,6 +793,16 @@ config SND_SOC_TLV320AIC31XX
 config SND_SOC_TLV320AIC32X4
        tristate
+config SND_SOC_TLV320AIC32X4_I2C
+        tristate
+        depends on I2C
+        select SND_SOC_TLV320AIC32X4
+config SND_SOC_TLV320AIC32X4_SPI
+        tristate
+        depends on SPI_MASTER
+        select SND_SOC_TLV320AIC32X4
 config SND_SOC_TLV320AIC3X
        tristate "Texas Instruments TLV320AIC3x CODECs"
        depends on I2C
@@ -920,7 +943,8 @@ config SND_SOC_WM8955
        tristate
 config SND_SOC_WM8960
-        tristate
+        tristate "Wolfson Microelectronics WM8960 CODEC"
+        depends on I2C
 config SND_SOC_WM8961
        tristate
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index b7b99416537f..0f548fd34ca3 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -32,6 +32,7 @@ snd-soc-ak4642-objs := ak4642.o
 snd-soc-ak4671-objs := ak4671.o
 snd-soc-ak5386-objs := ak5386.o
 snd-soc-arizona-objs := arizona.o
+snd-soc-bt-sco-objs := bt-sco.o
 snd-soc-cq93vc-objs := cq93vc.o
 snd-soc-cs35l32-objs := cs35l32.o
 snd-soc-cs42l51-objs := cs42l51.o
@@ -55,7 +56,6 @@ snd-soc-da7218-objs := da7218.o
 snd-soc-da7219-objs := da7219.o da7219-aad.o
 snd-soc-da732x-objs := da732x.o
 snd-soc-da9055-objs := da9055.o
-snd-soc-bt-sco-objs := bt-sco.o
 snd-soc-dmic-objs := dmic.o
 snd-soc-es8328-objs := es8328.o
 snd-soc-es8328-i2c-objs := es8328-i2c.o
@@ -74,6 +74,7 @@ snd-soc-max98088-objs := max98088.o
 snd-soc-max98090-objs := max98090.o
 snd-soc-max98095-objs := max98095.o
 snd-soc-max98357a-objs := max98357a.o
+snd-soc-max98371-objs := max98371.o
 snd-soc-max9867-objs := max9867.o
 snd-soc-max98925-objs := max98925.o
 snd-soc-max98926-objs := max98926.o
@@ -131,6 +132,7 @@ snd-soc-stac9766-objs := stac9766.o
 snd-soc-sti-sas-objs := sti-sas.o
 snd-soc-tas5086-objs := tas5086.o
 snd-soc-tas571x-objs := tas571x.o
+snd-soc-tas5720-objs := tas5720.o
 snd-soc-tfa9879-objs := tfa9879.o
 snd-soc-tlv320aic23-objs := tlv320aic23.o
 snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
@@ -138,6 +140,8 @@ snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
 snd-soc-tlv320aic26-objs := tlv320aic26.o
 snd-soc-tlv320aic31xx-objs := tlv320aic31xx.o
 snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
+snd-soc-tlv320aic32x4-i2c-objs := tlv320aic32x4-i2c.o
+snd-soc-tlv320aic32x4-spi-objs := tlv320aic32x4-spi.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
 snd-soc-tlv320dac33-objs := tlv320dac33.o
 snd-soc-ts3a227e-objs := ts3a227e.o
@@ -243,6 +247,7 @@ obj-$(CONFIG_SND_SOC_AK5386)	+= snd-soc-ak5386.o
 obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o
 obj-$(CONFIG_SND_SOC_ALC5632)   += snd-soc-alc5632.o
 obj-$(CONFIG_SND_SOC_ARIZONA)   += snd-soc-arizona.o
+obj-$(CONFIG_SND_SOC_BT_SCO)    += snd-soc-bt-sco.o
 obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
 obj-$(CONFIG_SND_SOC_CS35L32)   += snd-soc-cs35l32.o
 obj-$(CONFIG_SND_SOC_CS42L51)   += snd-soc-cs42l51.o
@@ -266,7 +271,6 @@ obj-$(CONFIG_SND_SOC_DA7218)	+= snd-soc-da7218.o
 obj-$(CONFIG_SND_SOC_DA7219)    += snd-soc-da7219.o
 obj-$(CONFIG_SND_SOC_DA732X)    += snd-soc-da732x.o
 obj-$(CONFIG_SND_SOC_DA9055)    += snd-soc-da9055.o
-obj-$(CONFIG_SND_SOC_BT_SCO)    += snd-soc-bt-sco.o
 obj-$(CONFIG_SND_SOC_DMIC)      += snd-soc-dmic.o
 obj-$(CONFIG_SND_SOC_ES8328)    += snd-soc-es8328.o
 obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
@@ -339,6 +343,7 @@ obj-$(CONFIG_SND_SOC_STI_SAS)	+= snd-soc-sti-sas.o
 obj-$(CONFIG_SND_SOC_TAS2552)   += snd-soc-tas2552.o
 obj-$(CONFIG_SND_SOC_TAS5086)   += snd-soc-tas5086.o
 obj-$(CONFIG_SND_SOC_TAS571X)   += snd-soc-tas571x.o
+obj-$(CONFIG_SND_SOC_TAS5720)   += snd-soc-tas5720.o
 obj-$(CONFIG_SND_SOC_TFA9879)   += snd-soc-tfa9879.o
 obj-$(CONFIG_SND_SOC_TLV320AIC23)       += snd-soc-tlv320aic23.o
 obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)   += snd-soc-tlv320aic23-i2c.o
@@ -346,6 +351,8 @@ obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o
 obj-$(CONFIG_SND_SOC_TLV320AIC26)       += snd-soc-tlv320aic26.o
 obj-$(CONFIG_SND_SOC_TLV320AIC31XX)     += snd-soc-tlv320aic31xx.o
 obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o
+obj-$(CONFIG_SND_SOC_TLV320AIC32X4_I2C) += snd-soc-tlv320aic32x4-i2c.o
+obj-$(CONFIG_SND_SOC_TLV320AIC32X4_SPI) += snd-soc-tlv320aic32x4-spi.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X)       += snd-soc-tlv320aic3x.o
 obj-$(CONFIG_SND_SOC_TLV320DAC33)       += snd-soc-tlv320dac33.o
 obj-$(CONFIG_SND_SOC_TS3A227E)  += snd-soc-ts3a227e.o
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 1ee8506c06c7..4d8b9e49e8d6 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -560,6 +560,7 @@ static const struct regmap_config ak4642_regmap = {
        .max_register           = FIL1_3,
        .reg_defaults           = ak4642_reg,
        .num_reg_defaults       = NUM_AK4642_REG_DEFAULTS,
+        .cache_type             = REGCACHE_RBTREE,
 };
 static const struct regmap_config ak4643_regmap = {
@@ -568,6 +569,7 @@ static const struct regmap_config ak4643_regmap = {
        .max_register           = SPK_MS,
        .reg_defaults           = ak4643_reg,
        .num_reg_defaults       = ARRAY_SIZE(ak4643_reg),
+        .cache_type             = REGCACHE_RBTREE,
 };
 static const struct regmap_config ak4648_regmap = {
@@ -576,6 +578,7 @@ static const struct regmap_config ak4648_regmap = {
        .max_register           = EQ_FBEQE,
        .reg_defaults           = ak4648_reg,
        .num_reg_defaults       = ARRAY_SIZE(ak4648_reg),
+        .cache_type             = REGCACHE_RBTREE,
 };
 static const struct ak4642_drvdata ak4642_drvdata = {
diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c
new file mode 100644
index 000000000000..cf0a39bb631a
--- /dev/null
+++ b/sound/soc/codecs/max98371.c
@@ -0,0 +1,441 @@
+/*
+ * max98371.c -- ALSA SoC Stereo MAX98371 driver
+ *
+ * Copyright 2015-16 Maxim Integrated Products
+ *
+ * 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/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include "max98371.h"
+static const char *const monomix_text[] = {
+        "Left", "Right", "LeftRightDiv2",
+};
+static const char *const hpf_cutoff_txt[] = {
+        "Disable", "DC Block", "50Hz",
+        "100Hz", "200Hz", "400Hz", "800Hz",
+};
+static SOC_ENUM_SINGLE_DECL(max98371_monomix, MAX98371_MONOMIX_CFG, 0,
+                monomix_text);
+static SOC_ENUM_SINGLE_DECL(max98371_hpf_cutoff, MAX98371_HPF, 0,
+                hpf_cutoff_txt);
+static const DECLARE_TLV_DB_RANGE(max98371_dht_min_gain,
+        0, 1, TLV_DB_SCALE_ITEM(537, 66, 0),
+        2, 3, TLV_DB_SCALE_ITEM(677, 82, 0),
+        4, 5, TLV_DB_SCALE_ITEM(852, 104, 0),
+        6, 7, TLV_DB_SCALE_ITEM(1072, 131, 0),
+        8, 9, TLV_DB_SCALE_ITEM(1350, 165, 0),
+        10, 11, TLV_DB_SCALE_ITEM(1699, 101, 0),
+);
+static const DECLARE_TLV_DB_RANGE(max98371_dht_max_gain,
+        0, 1, TLV_DB_SCALE_ITEM(537, 66, 0),
+        2, 3, TLV_DB_SCALE_ITEM(677, 82, 0),
+        4, 5, TLV_DB_SCALE_ITEM(852, 104, 0),
+        6, 7, TLV_DB_SCALE_ITEM(1072, 131, 0),
+        8, 9, TLV_DB_SCALE_ITEM(1350, 165, 0),
+        10, 11, TLV_DB_SCALE_ITEM(1699, 208, 0),
+);
+static const DECLARE_TLV_DB_RANGE(max98371_dht_rot_gain,
+        0, 1, TLV_DB_SCALE_ITEM(-50, -50, 0),
+        2, 6, TLV_DB_SCALE_ITEM(-100, -100, 0),
+        7, 8, TLV_DB_SCALE_ITEM(-800, -200, 0),
+        9, 11, TLV_DB_SCALE_ITEM(-1200, -300, 0),
+        12, 13, TLV_DB_SCALE_ITEM(-2000, -200, 0),
+        14, 15, TLV_DB_SCALE_ITEM(-2500, -500, 0),
+);
+static const struct reg_default max98371_reg[] = {
+        { 0x01, 0x00 },
+        { 0x02, 0x00 },
+        { 0x03, 0x00 },
+        { 0x04, 0x00 },
+        { 0x05, 0x00 },
+        { 0x06, 0x00 },
+        { 0x07, 0x00 },
+        { 0x08, 0x00 },
+        { 0x09, 0x00 },
+        { 0x0A, 0x00 },
+        { 0x10, 0x06 },
+        { 0x11, 0x08 },
+        { 0x14, 0x80 },
+        { 0x15, 0x00 },
+        { 0x16, 0x00 },
+        { 0x18, 0x00 },
+        { 0x19, 0x00 },
+        { 0x1C, 0x00 },
+        { 0x1D, 0x00 },
+        { 0x1E, 0x00 },
+        { 0x1F, 0x00 },
+        { 0x20, 0x00 },
+        { 0x21, 0x00 },
+        { 0x22, 0x00 },
+        { 0x23, 0x00 },
+        { 0x24, 0x00 },
+        { 0x25, 0x00 },
+        { 0x26, 0x00 },
+        { 0x27, 0x00 },
+        { 0x28, 0x00 },
+        { 0x29, 0x00 },
+        { 0x2A, 0x00 },
+        { 0x2B, 0x00 },
+        { 0x2C, 0x00 },
+        { 0x2D, 0x00 },
+        { 0x2E, 0x0B },
+        { 0x31, 0x00 },
+        { 0x32, 0x18 },
+        { 0x33, 0x00 },
+        { 0x34, 0x00 },
+        { 0x36, 0x00 },
+        { 0x37, 0x00 },
+        { 0x38, 0x00 },
+        { 0x39, 0x00 },
+        { 0x3A, 0x00 },
+        { 0x3B, 0x00 },
+        { 0x3C, 0x00 },
+        { 0x3D, 0x00 },
+        { 0x3E, 0x00 },
+        { 0x3F, 0x00 },
+        { 0x40, 0x00 },
+        { 0x41, 0x00 },
+        { 0x42, 0x00 },
+        { 0x43, 0x00 },
+        { 0x4A, 0x00 },
+        { 0x4B, 0x00 },
+        { 0x4C, 0x00 },
+        { 0x4D, 0x00 },
+        { 0x4E, 0x00 },
+        { 0x50, 0x00 },
+        { 0x51, 0x00 },
+        { 0x55, 0x00 },
+        { 0x58, 0x00 },
+        { 0x59, 0x00 },
+        { 0x5C, 0x00 },
+        { 0xFF, 0x43 },
+};
+static bool max98371_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case MAX98371_IRQ_CLEAR1:
+        case MAX98371_IRQ_CLEAR2:
+        case MAX98371_IRQ_CLEAR3:
+        case MAX98371_VERSION:
+                return true;
+        default:
+                return false;
+        }
+}
+static bool max98371_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case MAX98371_SOFT_RESET:
+                return false;
+        default:
+                return true;
+        }
+};
+static const DECLARE_TLV_DB_RANGE(max98371_gain_tlv,
+        0, 7, TLV_DB_SCALE_ITEM(0, 50, 0),
+        8, 10, TLV_DB_SCALE_ITEM(400, 100, 0)
+);
+static const DECLARE_TLV_DB_RANGE(max98371_noload_gain_tlv,
+        0, 11, TLV_DB_SCALE_ITEM(950, 100, 0),
+);
+static const DECLARE_TLV_DB_SCALE(digital_tlv, -6300, 50, 1);
+static const struct snd_kcontrol_new max98371_snd_controls[] = {
+        SOC_SINGLE_TLV("Speaker Volume", MAX98371_GAIN,
+                        MAX98371_GAIN_SHIFT, (1<<MAX98371_GAIN_WIDTH)-1, 0,
+                        max98371_gain_tlv),
+        SOC_SINGLE_TLV("Digital Volume", MAX98371_DIGITAL_GAIN, 0,
+                        (1<<MAX98371_DIGITAL_GAIN_WIDTH)-1, 1, digital_tlv),
+        SOC_SINGLE_TLV("Speaker DHT Max Volume", MAX98371_GAIN,
+                        0, (1<<MAX98371_DHT_MAX_WIDTH)-1, 0,
+                        max98371_dht_max_gain),
+        SOC_SINGLE_TLV("Speaker DHT Min Volume", MAX98371_DHT_GAIN,
+                        0, (1<<MAX98371_DHT_GAIN_WIDTH)-1, 0,
+                        max98371_dht_min_gain),
+        SOC_SINGLE_TLV("Speaker DHT Rotation Volume", MAX98371_DHT_GAIN,
+                        0, (1<<MAX98371_DHT_ROT_WIDTH)-1, 0,
+                        max98371_dht_rot_gain),
+        SOC_SINGLE("DHT Attack Step", MAX98371_DHT, MAX98371_DHT_STEP, 3, 0),
+        SOC_SINGLE("DHT Attack Rate", MAX98371_DHT, 0, 7, 0),
+        SOC_ENUM("Monomix Select", max98371_monomix),
+        SOC_ENUM("HPF Cutoff", max98371_hpf_cutoff),
+};
+static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai,
+                unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val = 0;
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFS:
+                break;
+        default:
+                dev_err(codec->dev, "DAI clock mode unsupported");
+                return -EINVAL;
+        }
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                val |= 0;
+                break;
+        case SND_SOC_DAIFMT_RIGHT_J:
+                val |= MAX98371_DAI_RIGHT;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                val |= MAX98371_DAI_LEFT;
+                break;
+        default:
+                dev_err(codec->dev, "DAI wrong mode unsupported");
+                return -EINVAL;
+        }
+        regmap_update_bits(max98371->regmap, MAX98371_FMT,
+                        MAX98371_FMT_MODE_MASK, val);
+        return 0;
+}
+static int max98371_dai_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 max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec);
+        int blr_clk_ratio, ch_size, channels = params_channels(params);
+        int rate = params_rate(params);
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S8:
+                regmap_update_bits(max98371->regmap, MAX98371_FMT,
+                                MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16);
+                ch_size = 8;
+                break;
+        case SNDRV_PCM_FORMAT_S16_LE:
+                regmap_update_bits(max98371->regmap, MAX98371_FMT,
+                                MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16);
+                ch_size = 16;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                regmap_update_bits(max98371->regmap, MAX98371_FMT,
+                                MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32);
+                ch_size = 24;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                regmap_update_bits(max98371->regmap, MAX98371_FMT,
+                                MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32);
+                ch_size = 32;
+                break;
+        default:
+                return -EINVAL;
+        }
+        /* BCLK/LRCLK ratio calculation */
+        blr_clk_ratio = channels * ch_size;
+        switch (blr_clk_ratio) {
+        case 32:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_DAI_CLK,
+                        MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_32);
+                break;
+        case 48:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_DAI_CLK,
+                        MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_48);
+                break;
+        case 64:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_DAI_CLK,
+                        MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_64);
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (rate) {
+        case 32000:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_SPK_SR,
+                        MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_32);
+                break;
+        case 44100:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_SPK_SR,
+                        MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_44);
+                break;
+        case 48000:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_SPK_SR,
+                        MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_48);
+                break;
+        case 88200:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_SPK_SR,
+                        MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_88);
+                break;
+        case 96000:
+                regmap_update_bits(max98371->regmap,
+                        MAX98371_SPK_SR,
+                        MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_96);
+                break;
+        default:
+                return -EINVAL;
+        }
+        /* enabling both the RX channels*/
+        regmap_update_bits(max98371->regmap, MAX98371_MONOMIX_SRC,
+                        MAX98371_MONOMIX_SRC_MASK, MONOMIX_RX_0_1);
+        regmap_update_bits(max98371->regmap, MAX98371_DAI_CHANNEL,
+                        MAX98371_CHANNEL_MASK, MAX98371_CHANNEL_MASK);
+        return 0;
+}
+static const struct snd_soc_dapm_widget max98371_dapm_widgets[] = {
+        SND_SOC_DAPM_DAC("DAC", NULL, MAX98371_SPK_ENABLE, 0, 0),
+        SND_SOC_DAPM_SUPPLY("Global Enable", MAX98371_GLOBAL_ENABLE,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_OUTPUT("SPK_OUT"),
+};
+static const struct snd_soc_dapm_route max98371_audio_map[] = {
+        {"DAC", NULL, "HiFi Playback"},
+        {"SPK_OUT", NULL, "DAC"},
+        {"SPK_OUT", NULL, "Global Enable"},
+};
+#define MAX98371_RATES SNDRV_PCM_RATE_8000_48000
+#define MAX98371_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \
+                SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE)
+static const struct snd_soc_dai_ops max98371_dai_ops = {
+        .set_fmt = max98371_dai_set_fmt,
+        .hw_params = max98371_dai_hw_params,
+};
+static struct snd_soc_dai_driver max98371_dai[] = {
+        {
+                .name = "max98371-aif1",
+                .playback = {
+                        .stream_name = "HiFi Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = MAX98371_FORMATS,
+                },
+                .ops = &max98371_dai_ops,
+        }
+};
+static const struct snd_soc_codec_driver max98371_codec = {
+        .controls = max98371_snd_controls,
+        .num_controls = ARRAY_SIZE(max98371_snd_controls),
+        .dapm_routes = max98371_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(max98371_audio_map),
+        .dapm_widgets = max98371_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(max98371_dapm_widgets),
+};
+static const struct regmap_config max98371_regmap = {
+        .reg_bits         = 8,
+        .val_bits         = 8,
+        .max_register     = MAX98371_VERSION,
+        .reg_defaults     = max98371_reg,
+        .num_reg_defaults = ARRAY_SIZE(max98371_reg),
+        .volatile_reg     = max98371_volatile_register,
+        .readable_reg     = max98371_readable_register,
+        .cache_type       = REGCACHE_RBTREE,
+};
+static int max98371_i2c_probe(struct i2c_client *i2c,
+                const struct i2c_device_id *id)
+{
+        struct max98371_priv *max98371;
+        int ret, reg;
+        max98371 = devm_kzalloc(&i2c->dev,
+                        sizeof(*max98371), GFP_KERNEL);
+        if (!max98371)
+                return -ENOMEM;
+        i2c_set_clientdata(i2c, max98371);
+        max98371->regmap = devm_regmap_init_i2c(i2c, &max98371_regmap);
+        if (IS_ERR(max98371->regmap)) {
+                ret = PTR_ERR(max98371->regmap);
+                dev_err(&i2c->dev,
+                                "Failed to allocate regmap: %d\n", ret);
+                return ret;
+        }
+        ret = regmap_read(max98371->regmap, MAX98371_VERSION, &reg);
+        if (ret < 0) {
+                dev_info(&i2c->dev, "device error %d\n", ret);
+                return ret;
+        }
+        dev_info(&i2c->dev, "device version %x\n", reg);
+        ret = snd_soc_register_codec(&i2c->dev, &max98371_codec,
+                        max98371_dai, ARRAY_SIZE(max98371_dai));
+        if (ret < 0) {
+                dev_err(&i2c->dev, "Failed to register codec: %d\n", ret);
+                return ret;
+        }
+        return ret;
+}
+static int max98371_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        return 0;
+}
+static const struct i2c_device_id max98371_i2c_id[] = {
+        { "max98371", 0 },
+};
+MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);
+static const struct of_device_id max98371_of_match[] = {
+        { .compatible = "maxim,max98371", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, max98371_of_match);
+static struct i2c_driver max98371_i2c_driver = {
+        .driver = {
+                .name = "max98371",
+                .owner = THIS_MODULE,
+                .pm = NULL,
+                .of_match_table = of_match_ptr(max98371_of_match),
+        },
+        .probe  = max98371_i2c_probe,
+        .remove = max98371_i2c_remove,
+        .id_table = max98371_i2c_id,
+};
+module_i2c_driver(max98371_i2c_driver);
+MODULE_AUTHOR("anish kumar <yesanishhere@gmail.com>");
+MODULE_DESCRIPTION("ALSA SoC MAX98371 driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/max98371.h b/sound/soc/codecs/max98371.h
new file mode 100644
index 000000000000..9f6330964d98
--- /dev/null
+++ b/sound/soc/codecs/max98371.h
@@ -0,0 +1,67 @@
+/*
+ * max98371.h -- MAX98371 ALSA SoC Audio driver
+ *
+ * Copyright 2011-2012 Maxim Integrated Products
+ *
+ * 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 _MAX98371_H
+#define _MAX98371_H
+#define MAX98371_IRQ_CLEAR1                     0x01
+#define MAX98371_IRQ_CLEAR2                     0x02
+#define MAX98371_IRQ_CLEAR3                     0x03
+#define MAX98371_DAI_CLK                        0x10
+#define MAX98371_DAI_BSEL_MASK                  0xF
+#define MAX98371_DAI_BSEL_32                    2
+#define MAX98371_DAI_BSEL_48                    3
+#define MAX98371_DAI_BSEL_64                    4
+#define MAX98371_SPK_SR                         0x11
+#define MAX98371_SPK_SR_MASK                    0xF
+#define MAX98371_SPK_SR_32                      6
+#define MAX98371_SPK_SR_44                      7
+#define MAX98371_SPK_SR_48                      8
+#define MAX98371_SPK_SR_88                      10
+#define MAX98371_SPK_SR_96                      11
+#define MAX98371_DAI_CHANNEL                    0x15
+#define MAX98371_CHANNEL_MASK                   0x3
+#define MAX98371_MONOMIX_SRC                    0x18
+#define MAX98371_MONOMIX_CFG                    0x19
+#define MAX98371_HPF                            0x1C
+#define MAX98371_MONOMIX_SRC_MASK               0xFF
+#define MONOMIX_RX_0_1                          ((0x1)<<(4))
+#define M98371_DAI_CHANNEL_I2S                  0x3
+#define MAX98371_DIGITAL_GAIN                   0x2D
+#define MAX98371_DIGITAL_GAIN_WIDTH             0x7
+#define MAX98371_GAIN                           0x2E
+#define MAX98371_GAIN_SHIFT                     0x4
+#define MAX98371_GAIN_WIDTH                     0x4
+#define MAX98371_DHT_MAX_WIDTH                  4
+#define MAX98371_FMT                            0x14
+#define MAX98371_CHANSZ_WIDTH                   6
+#define MAX98371_FMT_MASK                       ((0x3)<<(MAX98371_CHANSZ_WIDTH))
+#define MAX98371_FMT_MODE_MASK                  ((0x7)<<(3))
+#define MAX98371_DAI_LEFT                       ((0x1)<<(3))
+#define MAX98371_DAI_RIGHT                      ((0x2)<<(3))
+#define MAX98371_DAI_CHANSZ_16                  ((1)<<(MAX98371_CHANSZ_WIDTH))
+#define MAX98371_DAI_CHANSZ_24                  ((2)<<(MAX98371_CHANSZ_WIDTH))
+#define MAX98371_DAI_CHANSZ_32                  ((3)<<(MAX98371_CHANSZ_WIDTH))
+#define MAX98371_DHT  0x32
+#define MAX98371_DHT_STEP                       0x3
+#define MAX98371_DHT_GAIN                       0x31
+#define MAX98371_DHT_GAIN_WIDTH                 0x4
+#define MAX98371_DHT_ROT_WIDTH                  0x4
+#define MAX98371_SPK_ENABLE                     0x4A
+#define MAX98371_GLOBAL_ENABLE                  0x50
+#define MAX98371_SOFT_RESET                     0x51
+#define MAX98371_VERSION                        0xFF
+struct max98371_priv {
+        struct regmap *regmap;
+        struct snd_soc_codec *codec;
+};
+#endif
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
index a1aaffc20862..f80cfe4d2ef2 100644
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@ -276,6 +276,8 @@ static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic)
                } else {
                        *mic = false;
                        regmap_write(rt298->regmap, RT298_SET_MIC1, 0x20);
+                        regmap_update_bits(rt298->regmap,
+                                RT298_CBJ_CTRL1, 0x0400, 0x0000);
                }
        } else {
                regmap_read(rt298->regmap, RT298_GET_HP_SENSE, &buf);
@@ -482,6 +484,26 @@ static int rt298_adc_event(struct snd_soc_dapm_widget *w,
                snd_soc_update_bits(codec,
                        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),
                        0x7080, 0x7000);
+                 /* If MCLK doesn't exist, reset AD filter */
+                if (!(snd_soc_read(codec, RT298_VAD_CTRL) & 0x200)) {
+                        pr_info("NO MCLK\n");
+                        switch (nid) {
+                        case RT298_ADC_IN1:
+                                snd_soc_update_bits(codec,
+                                        RT298_D_FILTER_CTRL, 0x2, 0x2);
+                                mdelay(10);
+                                snd_soc_update_bits(codec,
+                                        RT298_D_FILTER_CTRL, 0x2, 0x0);
+                                break;
+                        case RT298_ADC_IN2:
+                                snd_soc_update_bits(codec,
+                                        RT298_D_FILTER_CTRL, 0x4, 0x4);
+                                mdelay(10);
+                                snd_soc_update_bits(codec,
+                                        RT298_D_FILTER_CTRL, 0x4, 0x0);
+                                break;
+                        }
+                }
                break;
        case SND_SOC_DAPM_PRE_PMD:
                snd_soc_update_bits(codec,
@@ -520,30 +542,12 @@ static int rt298_mic1_event(struct snd_soc_dapm_widget *w,
        return 0;
 }
-static int rt298_vref_event(struct snd_soc_dapm_widget *w,
-                             struct snd_kcontrol *kcontrol, int event)
-{
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
-        switch (event) {
-        case SND_SOC_DAPM_PRE_PMU:
-                snd_soc_update_bits(codec,
-                        RT298_CBJ_CTRL1, 0x0400, 0x0000);
-                mdelay(50);
-                break;
-        default:
-                return 0;
-        }
-        return 0;
-}
 static const struct snd_soc_dapm_widget rt298_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY_S("HV", 1, RT298_POWER_CTRL1,
                12, 1, NULL, 0),
        SND_SOC_DAPM_SUPPLY("VREF", RT298_POWER_CTRL1,
-                0, 1, rt298_vref_event, SND_SOC_DAPM_PRE_PMU),
+                0, 1, NULL, 0),
        SND_SOC_DAPM_SUPPLY_S("BG_MBIAS", 1, RT298_POWER_CTRL2,
                1, 0, NULL, 0),
        SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT298_POWER_CTRL2,
@@ -934,18 +938,9 @@ static int rt298_set_bias_level(struct snd_soc_codec *codec,
                }
                break;
-        case SND_SOC_BIAS_ON:
-                mdelay(30);
-                snd_soc_update_bits(codec,
-                        RT298_CBJ_CTRL1, 0x0400, 0x0400);
-                break;
        case SND_SOC_BIAS_STANDBY:
                snd_soc_write(codec,
                        RT298_SET_AUDIO_POWER, AC_PWRST_D3);
-                snd_soc_update_bits(codec,
-                        RT298_CBJ_CTRL1, 0x0400, 0x0000);
                break;
        default:
diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h
index d66f8847b676..3638f3d61209 100644
--- a/sound/soc/codecs/rt298.h
+++ b/sound/soc/codecs/rt298.h
@@ -137,6 +137,7 @@
 #define RT298_A_BIAS_CTRL2      0x02
 #define RT298_POWER_CTRL1       0x03
 #define RT298_A_BIAS_CTRL3      0x04
+#define RT298_D_FILTER_CTRL     0x05
 #define RT298_POWER_CTRL2       0x08
 #define RT298_I2S_CTRL1         0x09
 #define RT298_I2S_CTRL2         0x0a
@@ -148,6 +149,7 @@
 #define RT298_IRQ_CTRL          0x33
 #define RT298_WIND_FILTER_CTRL  0x46
 #define RT298_PLL_CTRL1         0x49
+#define RT298_VAD_CTRL          0x4e
 #define RT298_CBJ_CTRL1         0x4f
 #define RT298_CBJ_CTRL2         0x50
 #define RT298_PLL_CTRL          0x63
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 33e290b703df..b3f1db5bae4a 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -1241,60 +1241,46 @@ static int rt5677_dmic_use_asrc(struct snd_soc_dapm_widget *source,
                regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_STO1_CLK_SEL_MASK) >>
                                RT5677_AD_STO1_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        case 10:
                regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_STO2_CLK_SEL_MASK) >>
                                RT5677_AD_STO2_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        case 9:
                regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_STO3_CLK_SEL_MASK) >>
                                RT5677_AD_STO3_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        case 8:
                regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_STO4_CLK_SEL_MASK) >>
                        RT5677_AD_STO4_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        case 7:
                regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_MONOL_CLK_SEL_MASK) >>
                        RT5677_AD_MONOL_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        case 6:
                regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting);
                asrc_setting = (asrc_setting & RT5677_AD_MONOR_CLK_SEL_MASK) >>
                        RT5677_AD_MONOR_CLK_SEL_SFT;
-                if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
-                        asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
-                        return 1;
                break;
        default:
-                break;
+                return 0;
        }
+        if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC &&
+            asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC)
+                return 1;
        return 0;
 }
diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c
index 39307ad41a34..b8d19b77bde9 100644
--- a/sound/soc/codecs/tas571x.c
+++ b/sound/soc/codecs/tas571x.c
@@ -4,6 +4,9 @@
 * Copyright (C) 2015 Google, Inc.
 * Copyright (c) 2013 Daniel Mack <zonque@gmail.com>
 *
+ * TAS5721 support:
+ * Copyright (C) 2016 Petr Kulhavy, Barix AG <petr@barix.com>
+ *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -57,6 +60,10 @@ static int tas571x_register_size(struct tas571x_private *priv, unsigned int reg)
        case TAS571X_CH1_VOL_REG:
        case TAS571X_CH2_VOL_REG:
                return priv->chip->vol_reg_size;
+        case TAS571X_INPUT_MUX_REG:
+        case TAS571X_CH4_SRC_SELECT_REG:
+        case TAS571X_PWM_MUX_REG:
+                return 4;
        default:
                return 1;
        }
@@ -167,6 +174,23 @@ static int tas571x_hw_params(struct snd_pcm_substream *substream,
                                  TAS571X_SDI_FMT_MASK, val);
 }
+static int tas571x_mute(struct snd_soc_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        u8 sysctl2;
+        int ret;
+        sysctl2 = mute ? TAS571X_SYS_CTRL_2_SDN_MASK : 0;
+        ret = snd_soc_update_bits(codec,
+                            TAS571X_SYS_CTRL_2_REG,
+                     TAS571X_SYS_CTRL_2_SDN_MASK,
+                     sysctl2);
+        usleep_range(1000, 2000);
+        return ret;
+}
 static int tas571x_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
@@ -214,6 +238,7 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec,
 static const struct snd_soc_dai_ops tas571x_dai_ops = {
        .set_fmt        = tas571x_set_dai_fmt,
        .hw_params      = tas571x_hw_params,
+        .digital_mute   = tas571x_mute,
 };
 static const char *const tas5711_supply_names[] = {
@@ -241,6 +266,26 @@ static const struct snd_kcontrol_new tas5711_controls[] = {
                   1, 1),
 };
+static const struct regmap_range tas571x_readonly_regs_range[] = {
+        regmap_reg_range(TAS571X_CLK_CTRL_REG,  TAS571X_DEV_ID_REG),
+};
+static const struct regmap_range tas571x_volatile_regs_range[] = {
+        regmap_reg_range(TAS571X_CLK_CTRL_REG,  TAS571X_ERR_STATUS_REG),
+        regmap_reg_range(TAS571X_OSC_TRIM_REG,  TAS571X_OSC_TRIM_REG),
+};
+static const struct regmap_access_table tas571x_write_regs = {
+        .no_ranges =    tas571x_readonly_regs_range,
+        .n_no_ranges =  ARRAY_SIZE(tas571x_readonly_regs_range),
+};
+static const struct regmap_access_table tas571x_volatile_regs = {
+        .yes_ranges =   tas571x_volatile_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(tas571x_volatile_regs_range),
+};
 static const struct reg_default tas5711_reg_defaults[] = {
        { 0x04, 0x05 },
        { 0x05, 0x40 },
@@ -260,6 +305,8 @@ static const struct regmap_config tas5711_regmap_config = {
        .reg_defaults                   = tas5711_reg_defaults,
        .num_reg_defaults               = ARRAY_SIZE(tas5711_reg_defaults),
        .cache_type                     = REGCACHE_RBTREE,
+        .wr_table                       = &tas571x_write_regs,
+        .volatile_table                 = &tas571x_volatile_regs,
 };
 static const struct tas571x_chip tas5711_chip = {
@@ -314,6 +361,8 @@ static const struct regmap_config tas5717_regmap_config = {
        .reg_defaults                   = tas5717_reg_defaults,
        .num_reg_defaults               = ARRAY_SIZE(tas5717_reg_defaults),
        .cache_type                     = REGCACHE_RBTREE,
+        .wr_table                       = &tas571x_write_regs,
+        .volatile_table                 = &tas571x_volatile_regs,
 };
 /* This entry is reused for tas5719 as the software interface is identical. */
@@ -326,6 +375,77 @@ static const struct tas571x_chip tas5717_chip = {
        .vol_reg_size                   = 2,
 };
+static const char *const tas5721_supply_names[] = {
+        "AVDD",
+        "DVDD",
+        "DRVDD",
+        "PVDD",
+};
+static const struct snd_kcontrol_new tas5721_controls[] = {
+        SOC_SINGLE_TLV("Master Volume",
+                       TAS571X_MVOL_REG,
+                       0, 0xff, 1, tas5711_volume_tlv),
+        SOC_DOUBLE_R_TLV("Speaker Volume",
+                         TAS571X_CH1_VOL_REG,
+                         TAS571X_CH2_VOL_REG,
+                         0, 0xff, 1, tas5711_volume_tlv),
+        SOC_DOUBLE("Speaker Switch",
+                   TAS571X_SOFT_MUTE_REG,
+                   TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,
+                   1, 1),
+};
+static const struct reg_default tas5721_reg_defaults[] = {
+        {TAS571X_CLK_CTRL_REG,          0x6c},
+        {TAS571X_DEV_ID_REG,            0x00},
+        {TAS571X_ERR_STATUS_REG,        0x00},
+        {TAS571X_SYS_CTRL_1_REG,        0xa0},
+        {TAS571X_SDI_REG,               0x05},
+        {TAS571X_SYS_CTRL_2_REG,        0x40},
+        {TAS571X_SOFT_MUTE_REG,         0x00},
+        {TAS571X_MVOL_REG,              0xff},
+        {TAS571X_CH1_VOL_REG,           0x30},
+        {TAS571X_CH2_VOL_REG,           0x30},
+        {TAS571X_CH3_VOL_REG,           0x30},
+        {TAS571X_VOL_CFG_REG,           0x91},
+        {TAS571X_MODULATION_LIMIT_REG,  0x02},
+        {TAS571X_IC_DELAY_CH1_REG,      0xac},
+        {TAS571X_IC_DELAY_CH2_REG,      0x54},
+        {TAS571X_IC_DELAY_CH3_REG,      0xac},
+        {TAS571X_IC_DELAY_CH4_REG,      0x54},
+        {TAS571X_PWM_CH_SDN_GROUP_REG,  0x30},
+        {TAS571X_START_STOP_PERIOD_REG, 0x0f},
+        {TAS571X_OSC_TRIM_REG,          0x82},
+        {TAS571X_BKND_ERR_REG,          0x02},
+        {TAS571X_INPUT_MUX_REG,         0x17772},
+        {TAS571X_CH4_SRC_SELECT_REG,    0x4303},
+        {TAS571X_PWM_MUX_REG,           0x1021345},
+};
+static const struct regmap_config tas5721_regmap_config = {
+        .reg_bits                       = 8,
+        .val_bits                       = 32,
+        .max_register                   = 0xff,
+        .reg_read                       = tas571x_reg_read,
+        .reg_write                      = tas571x_reg_write,
+        .reg_defaults                   = tas5721_reg_defaults,
+        .num_reg_defaults               = ARRAY_SIZE(tas5721_reg_defaults),
+        .cache_type                     = REGCACHE_RBTREE,
+        .wr_table                       = &tas571x_write_regs,
+        .volatile_table                 = &tas571x_volatile_regs,
+};
+static const struct tas571x_chip tas5721_chip = {
+        .supply_names                   = tas5721_supply_names,
+        .num_supply_names               = ARRAY_SIZE(tas5721_supply_names),
+        .controls                       = tas5711_controls,
+        .num_controls                   = ARRAY_SIZE(tas5711_controls),
+        .regmap_config                  = &tas5721_regmap_config,
+        .vol_reg_size                   = 1,
+};
 static const struct snd_soc_dapm_widget tas571x_dapm_widgets[] = {
        SND_SOC_DAPM_DAC("DACL", NULL, SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_DAC("DACR", NULL, SND_SOC_NOPM, 0, 0),
@@ -386,11 +506,10 @@ static int tas571x_i2c_probe(struct i2c_client *client,
        i2c_set_clientdata(client, priv);
        of_id = of_match_device(tas571x_of_match, dev);
-        if (!of_id) {
+        if (of_id)
-                dev_err(dev, "Unknown device type\n");
+                priv->chip = of_id->data;
-                return -EINVAL;
+        else
-        }
+                priv->chip = (void *) id->driver_data;
-        priv->chip = of_id->data;
        priv->mclk = devm_clk_get(dev, "mclk");
        if (IS_ERR(priv->mclk) && PTR_ERR(priv->mclk) != -ENOENT) {
@@ -445,10 +564,6 @@ static int tas571x_i2c_probe(struct i2c_client *client,
        if (ret)
                return ret;
-        ret = regmap_update_bits(priv->regmap, TAS571X_SYS_CTRL_2_REG,
-                                 TAS571X_SYS_CTRL_2_SDN_MASK, 0);
-        if (ret)
-                return ret;
        memcpy(&priv->codec_driver, &tas571x_codec, sizeof(priv->codec_driver));
        priv->codec_driver.controls = priv->chip->controls;
@@ -486,14 +601,16 @@ static const struct of_device_id tas571x_of_match[] = {
        { .compatible = "ti,tas5711", .data = &tas5711_chip, },
        { .compatible = "ti,tas5717", .data = &tas5717_chip, },
        { .compatible = "ti,tas5719", .data = &tas5717_chip, },
+        { .compatible = "ti,tas5721", .data = &tas5721_chip, },
        { }
 };
 MODULE_DEVICE_TABLE(of, tas571x_of_match);
 static const struct i2c_device_id tas571x_i2c_id[] = {
-        { "tas5711", 0 },
+        { "tas5711", (kernel_ulong_t) &tas5711_chip },
-        { "tas5717", 0 },
+        { "tas5717", (kernel_ulong_t) &tas5717_chip },
-        { "tas5719", 0 },
+        { "tas5719", (kernel_ulong_t) &tas5717_chip },
+        { "tas5721", (kernel_ulong_t) &tas5721_chip },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tas571x_i2c_id);
diff --git a/sound/soc/codecs/tas571x.h b/sound/soc/codecs/tas571x.h
index 0aee471232cd..cf800c364f0f 100644
--- a/sound/soc/codecs/tas571x.h
+++ b/sound/soc/codecs/tas571x.h
@@ -13,6 +13,10 @@
 #define _TAS571X_H
 /* device registers */
+#define TAS571X_CLK_CTRL_REG            0x00
+#define TAS571X_DEV_ID_REG              0x01
+#define TAS571X_ERR_STATUS_REG          0x02
+#define TAS571X_SYS_CTRL_1_REG          0x03
 #define TAS571X_SDI_REG                 0x04
 #define TAS571X_SDI_FMT_MASK            0x0f
@@ -27,7 +31,25 @@
 #define TAS571X_MVOL_REG                0x07
 #define TAS571X_CH1_VOL_REG             0x08
 #define TAS571X_CH2_VOL_REG             0x09
+#define TAS571X_CH3_VOL_REG             0x0a
+#define TAS571X_VOL_CFG_REG             0x0e
+#define TAS571X_MODULATION_LIMIT_REG    0x10
+#define TAS571X_IC_DELAY_CH1_REG        0x11
+#define TAS571X_IC_DELAY_CH2_REG        0x12
+#define TAS571X_IC_DELAY_CH3_REG        0x13
+#define TAS571X_IC_DELAY_CH4_REG        0x14
+#define TAS571X_PWM_CH_SDN_GROUP_REG    0x19    /* N/A on TAS5717, TAS5719 */
+#define TAS571X_PWM_CH1_SDN_MASK        (1<<0)
+#define TAS571X_PWM_CH2_SDN_SHIFT       (1<<1)
+#define TAS571X_PWM_CH3_SDN_SHIFT       (1<<2)
+#define TAS571X_PWM_CH4_SDN_SHIFT       (1<<3)
+#define TAS571X_START_STOP_PERIOD_REG   0x1a
 #define TAS571X_OSC_TRIM_REG            0x1b
+#define TAS571X_BKND_ERR_REG            0x1c
+#define TAS571X_INPUT_MUX_REG           0x20
+#define TAS571X_CH4_SRC_SELECT_REG      0x21
+#define TAS571X_PWM_MUX_REG             0x25
 #endif /* _TAS571X_H */
diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c
new file mode 100644
index 000000000000..f54fb46b77c2
--- /dev/null
+++ b/sound/soc/codecs/tas5720.c
@@ -0,0 +1,620 @@
+/*
+ * tas5720.c - ALSA SoC Texas Instruments TAS5720 Mono Audio Amplifier
+ *
+ * Copyright (C)2015-2016 Texas Instruments Incorporated -  http://www.ti.com
+ *
+ * Author: Andreas Dannenberg <dannenberg@ti.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.
+ *
+ * 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/errno.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/tlv.h>
+#include "tas5720.h"
+/* Define how often to check (and clear) the fault status register (in ms) */
+#define TAS5720_FAULT_CHECK_INTERVAL            200
+static const char * const tas5720_supply_names[] = {
+        "dvdd",         /* Digital power supply. Connect to 3.3-V supply. */
+        "pvdd",         /* Class-D amp and analog power supply (connected). */
+};
+#define TAS5720_NUM_SUPPLIES    ARRAY_SIZE(tas5720_supply_names)
+struct tas5720_data {
+        struct snd_soc_codec *codec;
+        struct regmap *regmap;
+        struct i2c_client *tas5720_client;
+        struct regulator_bulk_data supplies[TAS5720_NUM_SUPPLIES];
+        struct delayed_work fault_check_work;
+        unsigned int last_fault;
+};
+static int tas5720_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;
+        unsigned int rate = params_rate(params);
+        bool ssz_ds;
+        int ret;
+        switch (rate) {
+        case 44100:
+        case 48000:
+                ssz_ds = false;
+                break;
+        case 88200:
+        case 96000:
+                ssz_ds = true;
+                break;
+        default:
+                dev_err(codec->dev, "unsupported sample rate: %u\n", rate);
+                return -EINVAL;
+        }
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL1_REG,
+                                  TAS5720_SSZ_DS, ssz_ds);
+        if (ret < 0) {
+                dev_err(codec->dev, "error setting sample rate: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+static int tas5720_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        u8 serial_format;
+        int ret;
+        if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) {
+                dev_vdbg(codec->dev, "DAI Format master is not found\n");
+                return -EINVAL;
+        }
+        switch (fmt & (SND_SOC_DAIFMT_FORMAT_MASK |
+                       SND_SOC_DAIFMT_INV_MASK)) {
+        case (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF):
+                /* 1st data bit occur one BCLK cycle after the frame sync */
+                serial_format = TAS5720_SAIF_I2S;
+                break;
+        case (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF):
+                /*
+                 * Note that although the TAS5720 does not have a dedicated DSP
+                 * mode it doesn't care about the LRCLK duty cycle during TDM
+                 * operation. Therefore we can use the device's I2S mode with
+                 * its delaying of the 1st data bit to receive DSP_A formatted
+                 * data. See device datasheet for additional details.
+                 */
+                serial_format = TAS5720_SAIF_I2S;
+                break;
+        case (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF):
+                /*
+                 * Similar to DSP_A, we can use the fact that the TAS5720 does
+                 * not care about the LRCLK duty cycle during TDM to receive
+                 * DSP_B formatted data in LEFTJ mode (no delaying of the 1st
+                 * data bit).
+                 */
+                serial_format = TAS5720_SAIF_LEFTJ;
+                break;
+        case (SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF):
+                /* No delay after the frame sync */
+                serial_format = TAS5720_SAIF_LEFTJ;
+                break;
+        default:
+                dev_vdbg(codec->dev, "DAI Format is not found\n");
+                return -EINVAL;
+        }
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL1_REG,
+                                  TAS5720_SAIF_FORMAT_MASK,
+                                  serial_format);
+        if (ret < 0) {
+                dev_err(codec->dev, "error setting SAIF format: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+static int tas5720_set_dai_tdm_slot(struct snd_soc_dai *dai,
+                                    unsigned int tx_mask, unsigned int rx_mask,
+                                    int slots, int slot_width)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        unsigned int first_slot;
+        int ret;
+        if (!tx_mask) {
+                dev_err(codec->dev, "tx masks must not be 0\n");
+                return -EINVAL;
+        }
+        /*
+         * Determine the first slot that is being requested. We will only
+         * use the first slot that is found since the TAS5720 is a mono
+         * amplifier.
+         */
+        first_slot = __ffs(tx_mask);
+        if (first_slot > 7) {
+                dev_err(codec->dev, "slot selection out of bounds (%u)\n",
+                        first_slot);
+                return -EINVAL;
+        }
+        /* Enable manual TDM slot selection (instead of I2C ID based) */
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL1_REG,
+                                  TAS5720_TDM_CFG_SRC, TAS5720_TDM_CFG_SRC);
+        if (ret < 0)
+                goto error_snd_soc_update_bits;
+        /* Configure the TDM slot to process audio from */
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL2_REG,
+                                  TAS5720_TDM_SLOT_SEL_MASK, first_slot);
+        if (ret < 0)
+                goto error_snd_soc_update_bits;
+        return 0;
+error_snd_soc_update_bits:
+        dev_err(codec->dev, "error configuring TDM mode: %d\n", ret);
+        return ret;
+}
+static int tas5720_mute(struct snd_soc_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        int ret;
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL2_REG,
+                                  TAS5720_MUTE, mute ? TAS5720_MUTE : 0);
+        if (ret < 0) {
+                dev_err(codec->dev, "error (un-)muting device: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+static void tas5720_fault_check_work(struct work_struct *work)
+{
+        struct tas5720_data *tas5720 = container_of(work, struct tas5720_data,
+                        fault_check_work.work);
+        struct device *dev = tas5720->codec->dev;
+        unsigned int curr_fault;
+        int ret;
+        ret = regmap_read(tas5720->regmap, TAS5720_FAULT_REG, &curr_fault);
+        if (ret < 0) {
+                dev_err(dev, "failed to read FAULT register: %d\n", ret);
+                goto out;
+        }
+        /* Check/handle all errors except SAIF clock errors */
+        curr_fault &= TAS5720_OCE | TAS5720_DCE | TAS5720_OTE;
+        /*
+         * Only flag errors once for a given occurrence. This is needed as
+         * the TAS5720 will take time clearing the fault condition internally
+         * during which we don't want to bombard the system with the same
+         * error message over and over.
+         */
+        if ((curr_fault & TAS5720_OCE) && !(tas5720->last_fault & TAS5720_OCE))
+                dev_crit(dev, "experienced an over current hardware fault\n");
+        if ((curr_fault & TAS5720_DCE) && !(tas5720->last_fault & TAS5720_DCE))
+                dev_crit(dev, "experienced a DC detection fault\n");
+        if ((curr_fault & TAS5720_OTE) && !(tas5720->last_fault & TAS5720_OTE))
+                dev_crit(dev, "experienced an over temperature fault\n");
+        /* Store current fault value so we can detect any changes next time */
+        tas5720->last_fault = curr_fault;
+        if (!curr_fault)
+                goto out;
+        /*
+         * Periodically toggle SDZ (shutdown bit) H->L->H to clear any latching
+         * faults as long as a fault condition persists. Always going through
+         * the full sequence no matter the first return value to minimizes
+         * chances for the device to end up in shutdown mode.
+         */
+        ret = regmap_write_bits(tas5720->regmap, TAS5720_POWER_CTRL_REG,
+                                TAS5720_SDZ, 0);
+        if (ret < 0)
+                dev_err(dev, "failed to write POWER_CTRL register: %d\n", ret);
+        ret = regmap_write_bits(tas5720->regmap, TAS5720_POWER_CTRL_REG,
+                                TAS5720_SDZ, TAS5720_SDZ);
+        if (ret < 0)
+                dev_err(dev, "failed to write POWER_CTRL register: %d\n", ret);
+out:
+        /* Schedule the next fault check at the specified interval */
+        schedule_delayed_work(&tas5720->fault_check_work,
+                              msecs_to_jiffies(TAS5720_FAULT_CHECK_INTERVAL));
+}
+static int tas5720_codec_probe(struct snd_soc_codec *codec)
+{
+        struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec);
+        unsigned int device_id;
+        int ret;
+        tas5720->codec = codec;
+        ret = regulator_bulk_enable(ARRAY_SIZE(tas5720->supplies),
+                                    tas5720->supplies);
+        if (ret != 0) {
+                dev_err(codec->dev, "failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+        ret = regmap_read(tas5720->regmap, TAS5720_DEVICE_ID_REG, &device_id);
+        if (ret < 0) {
+                dev_err(codec->dev, "failed to read device ID register: %d\n",
+                        ret);
+                goto probe_fail;
+        }
+        if (device_id != TAS5720_DEVICE_ID) {
+                dev_err(codec->dev, "wrong device ID. expected: %u read: %u\n",
+                        TAS5720_DEVICE_ID, device_id);
+                ret = -ENODEV;
+                goto probe_fail;
+        }
+        /* Set device to mute */
+        ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL2_REG,
+                                  TAS5720_MUTE, TAS5720_MUTE);
+        if (ret < 0)
+                goto error_snd_soc_update_bits;
+        /*
+         * Enter shutdown mode - our default when not playing audio - to
+         * minimize current consumption. On the TAS5720 there is no real down
+         * side doing so as all device registers are preserved and the wakeup
+         * of the codec is rather quick which we do using a dapm widget.
+         */
+        ret = snd_soc_update_bits(codec, TAS5720_POWER_CTRL_REG,
+                                  TAS5720_SDZ, 0);
+        if (ret < 0)
+                goto error_snd_soc_update_bits;
+        INIT_DELAYED_WORK(&tas5720->fault_check_work, tas5720_fault_check_work);
+        return 0;
+error_snd_soc_update_bits:
+        dev_err(codec->dev, "error configuring device registers: %d\n", ret);
+probe_fail:
+        regulator_bulk_disable(ARRAY_SIZE(tas5720->supplies),
+                               tas5720->supplies);
+        return ret;
+}
+static int tas5720_codec_remove(struct snd_soc_codec *codec)
+{
+        struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        cancel_delayed_work_sync(&tas5720->fault_check_work);
+        ret = regulator_bulk_disable(ARRAY_SIZE(tas5720->supplies),
+                                     tas5720->supplies);
+        if (ret < 0)
+                dev_err(codec->dev, "failed to disable supplies: %d\n", ret);
+        return ret;
+};
+static int tas5720_dac_event(struct snd_soc_dapm_widget *w,
+                             struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        if (event & SND_SOC_DAPM_POST_PMU) {
+                /* Take TAS5720 out of shutdown mode */
+                ret = snd_soc_update_bits(codec, TAS5720_POWER_CTRL_REG,
+                                          TAS5720_SDZ, TAS5720_SDZ);
+                if (ret < 0) {
+                        dev_err(codec->dev, "error waking codec: %d\n", ret);
+                        return ret;
+                }
+                /*
+                 * Observe codec shutdown-to-active time. The datasheet only
+                 * lists a nominal value however just use-it as-is without
+                 * additional padding to minimize the delay introduced in
+                 * starting to play audio (actually there is other setup done
+                 * by the ASoC framework that will provide additional delays,
+                 * so we should always be safe).
+                 */
+                msleep(25);
+                /* Turn on TAS5720 periodic fault checking/handling */
+                tas5720->last_fault = 0;
+                schedule_delayed_work(&tas5720->fault_check_work,
+                                msecs_to_jiffies(TAS5720_FAULT_CHECK_INTERVAL));
+        } else if (event & SND_SOC_DAPM_PRE_PMD) {
+                /* Disable TAS5720 periodic fault checking/handling */
+                cancel_delayed_work_sync(&tas5720->fault_check_work);
+                /* Place TAS5720 in shutdown mode to minimize current draw */
+                ret = snd_soc_update_bits(codec, TAS5720_POWER_CTRL_REG,
+                                          TAS5720_SDZ, 0);
+                if (ret < 0) {
+                        dev_err(codec->dev, "error shutting down codec: %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+        return 0;
+}
+#ifdef CONFIG_PM
+static int tas5720_suspend(struct snd_soc_codec *codec)
+{
+        struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        regcache_cache_only(tas5720->regmap, true);
+        regcache_mark_dirty(tas5720->regmap);
+        ret = regulator_bulk_disable(ARRAY_SIZE(tas5720->supplies),
+                                     tas5720->supplies);
+        if (ret < 0)
+                dev_err(codec->dev, "failed to disable supplies: %d\n", ret);
+        return ret;
+}
+static int tas5720_resume(struct snd_soc_codec *codec)
+{
+        struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        ret = regulator_bulk_enable(ARRAY_SIZE(tas5720->supplies),
+                                    tas5720->supplies);
+        if (ret < 0) {
+                dev_err(codec->dev, "failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+        regcache_cache_only(tas5720->regmap, false);
+        ret = regcache_sync(tas5720->regmap);
+        if (ret < 0) {
+                dev_err(codec->dev, "failed to sync regcache: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+#else
+#define tas5720_suspend NULL
+#define tas5720_resume NULL
+#endif
+static bool tas5720_is_volatile_reg(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case TAS5720_DEVICE_ID_REG:
+        case TAS5720_FAULT_REG:
+                return true;
+        default:
+                return false;
+        }
+}
+static const struct regmap_config tas5720_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = TAS5720_MAX_REG,
+        .cache_type = REGCACHE_RBTREE,
+        .volatile_reg = tas5720_is_volatile_reg,
+};
+/*
+ * DAC analog gain. There are four discrete values to select from, ranging
+ * from 19.2 dB to 26.3dB.
+ */
+static const DECLARE_TLV_DB_RANGE(dac_analog_tlv,
+        0x0, 0x0, TLV_DB_SCALE_ITEM(1920, 0, 0),
+        0x1, 0x1, TLV_DB_SCALE_ITEM(2070, 0, 0),
+        0x2, 0x2, TLV_DB_SCALE_ITEM(2350, 0, 0),
+        0x3, 0x3, TLV_DB_SCALE_ITEM(2630, 0, 0),
+);
+/*
+ * DAC digital volumes. From -103.5 to 24 dB in 0.5 dB steps. Note that
+ * setting the gain below -100 dB (register value <0x7) is effectively a MUTE
+ * as per device datasheet.
+ */
+static DECLARE_TLV_DB_SCALE(dac_tlv, -10350, 50, 0);
+static const struct snd_kcontrol_new tas5720_snd_controls[] = {
+        SOC_SINGLE_TLV("Speaker Driver Playback Volume",
+                       TAS5720_VOLUME_CTRL_REG, 0, 0xff, 0, dac_tlv),
+        SOC_SINGLE_TLV("Speaker Driver Analog Gain", TAS5720_ANALOG_CTRL_REG,
+                       TAS5720_ANALOG_GAIN_SHIFT, 3, 0, dac_analog_tlv),
+};
+static const struct snd_soc_dapm_widget tas5720_dapm_widgets[] = {
+        SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, tas5720_dac_event,
+                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+        SND_SOC_DAPM_OUTPUT("OUT")
+};
+static const struct snd_soc_dapm_route tas5720_audio_map[] = {
+        { "DAC", NULL, "DAC IN" },
+        { "OUT", NULL, "DAC" },
+};
+static struct snd_soc_codec_driver soc_codec_dev_tas5720 = {
+        .probe = tas5720_codec_probe,
+        .remove = tas5720_codec_remove,
+        .suspend = tas5720_suspend,
+        .resume = tas5720_resume,
+        .controls = tas5720_snd_controls,
+        .num_controls = ARRAY_SIZE(tas5720_snd_controls),
+        .dapm_widgets = tas5720_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets),
+        .dapm_routes = tas5720_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map),
+};
+/* PCM rates supported by the TAS5720 driver */
+#define TAS5720_RATES   (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+                         SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
+/* Formats supported by TAS5720 driver */
+#define TAS5720_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE |\
+                         SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE)
+static struct snd_soc_dai_ops tas5720_speaker_dai_ops = {
+        .hw_params      = tas5720_hw_params,
+        .set_fmt        = tas5720_set_dai_fmt,
+        .set_tdm_slot   = tas5720_set_dai_tdm_slot,
+        .digital_mute   = tas5720_mute,
+};
+/*
+ * TAS5720 DAI structure
+ *
+ * Note that were are advertising .playback.channels_max = 2 despite this being
+ * a mono amplifier. The reason for that is that some serial ports such as TI's
+ * McASP module have a minimum number of channels (2) that they can output.
+ * Advertising more channels than we have will allow us to interface with such
+ * a serial port without really any negative side effects as the TAS5720 will
+ * simply ignore any extra channel(s) asides from the one channel that is
+ * configured to be played back.
+ */
+static struct snd_soc_dai_driver tas5720_dai[] = {
+        {
+                .name = "tas5720-amplifier",
+                .playback = {
+                        .stream_name = "Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = TAS5720_RATES,
+                        .formats = TAS5720_FORMATS,
+                },
+                .ops = &tas5720_speaker_dai_ops,
+        },
+};
+static int tas5720_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct device *dev = &client->dev;
+        struct tas5720_data *data;
+        int ret;
+        int i;
+        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+        data->tas5720_client = client;
+        data->regmap = devm_regmap_init_i2c(client, &tas5720_regmap_config);
+        if (IS_ERR(data->regmap)) {
+                ret = PTR_ERR(data->regmap);
+                dev_err(dev, "failed to allocate register map: %d\n", ret);
+                return ret;
+        }
+        for (i = 0; i < ARRAY_SIZE(data->supplies); i++)
+                data->supplies[i].supply = tas5720_supply_names[i];
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),
+                                      data->supplies);
+        if (ret != 0) {
+                dev_err(dev, "failed to request supplies: %d\n", ret);
+                return ret;
+        }
+        dev_set_drvdata(dev, data);
+        ret = snd_soc_register_codec(&client->dev,
+                                     &soc_codec_dev_tas5720,
+                                     tas5720_dai, ARRAY_SIZE(tas5720_dai));
+        if (ret < 0) {
+                dev_err(dev, "failed to register codec: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+static int tas5720_remove(struct i2c_client *client)
+{
+        struct device *dev = &client->dev;
+        snd_soc_unregister_codec(dev);
+        return 0;
+}
+static const struct i2c_device_id tas5720_id[] = {
+        { "tas5720", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tas5720_id);
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id tas5720_of_match[] = {
+        { .compatible = "ti,tas5720", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, tas5720_of_match);
+#endif
+static struct i2c_driver tas5720_i2c_driver = {
+        .driver = {
+                .name = "tas5720",
+                .of_match_table = of_match_ptr(tas5720_of_match),
+        },
+        .probe = tas5720_probe,
+        .remove = tas5720_remove,
+        .id_table = tas5720_id,
+};
+module_i2c_driver(tas5720_i2c_driver);
+MODULE_AUTHOR("Andreas Dannenberg <dannenberg@ti.com>");
+MODULE_DESCRIPTION("TAS5720 Audio amplifier driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/tas5720.h b/sound/soc/codecs/tas5720.h
new file mode 100644
index 000000000000..3d077c779b12
--- /dev/null
+++ b/sound/soc/codecs/tas5720.h
@@ -0,0 +1,90 @@
+/*
+ * tas5720.h - ALSA SoC Texas Instruments TAS5720 Mono Audio Amplifier
+ *
+ * Copyright (C)2015-2016 Texas Instruments Incorporated -  http://www.ti.com
+ *
+ * Author: Andreas Dannenberg <dannenberg@ti.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.
+ *
+ * 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 __TAS5720_H__
+#define __TAS5720_H__
+/* Register Address Map */
+#define TAS5720_DEVICE_ID_REG           0x00
+#define TAS5720_POWER_CTRL_REG          0x01
+#define TAS5720_DIGITAL_CTRL1_REG       0x02
+#define TAS5720_DIGITAL_CTRL2_REG       0x03
+#define TAS5720_VOLUME_CTRL_REG         0x04
+#define TAS5720_ANALOG_CTRL_REG         0x06
+#define TAS5720_FAULT_REG               0x08
+#define TAS5720_DIGITAL_CLIP2_REG       0x10
+#define TAS5720_DIGITAL_CLIP1_REG       0x11
+#define TAS5720_MAX_REG                 TAS5720_DIGITAL_CLIP1_REG
+/* TAS5720_DEVICE_ID_REG */
+#define TAS5720_DEVICE_ID               0x01
+/* TAS5720_POWER_CTRL_REG */
+#define TAS5720_DIG_CLIP_MASK           GENMASK(7, 2)
+#define TAS5720_SLEEP                   BIT(1)
+#define TAS5720_SDZ                     BIT(0)
+/* TAS5720_DIGITAL_CTRL1_REG */
+#define TAS5720_HPF_BYPASS              BIT(7)
+#define TAS5720_TDM_CFG_SRC             BIT(6)
+#define TAS5720_SSZ_DS                  BIT(3)
+#define TAS5720_SAIF_RIGHTJ_24BIT       (0x0)
+#define TAS5720_SAIF_RIGHTJ_20BIT       (0x1)
+#define TAS5720_SAIF_RIGHTJ_18BIT       (0x2)
+#define TAS5720_SAIF_RIGHTJ_16BIT       (0x3)
+#define TAS5720_SAIF_I2S                (0x4)
+#define TAS5720_SAIF_LEFTJ              (0x5)
+#define TAS5720_SAIF_FORMAT_MASK        GENMASK(2, 0)
+/* TAS5720_DIGITAL_CTRL2_REG */
+#define TAS5720_MUTE                    BIT(4)
+#define TAS5720_TDM_SLOT_SEL_MASK       GENMASK(2, 0)
+/* TAS5720_ANALOG_CTRL_REG */
+#define TAS5720_PWM_RATE_6_3_FSYNC      (0x0 << 4)
+#define TAS5720_PWM_RATE_8_4_FSYNC      (0x1 << 4)
+#define TAS5720_PWM_RATE_10_5_FSYNC     (0x2 << 4)
+#define TAS5720_PWM_RATE_12_6_FSYNC     (0x3 << 4)
+#define TAS5720_PWM_RATE_14_7_FSYNC     (0x4 << 4)
+#define TAS5720_PWM_RATE_16_8_FSYNC     (0x5 << 4)
+#define TAS5720_PWM_RATE_20_10_FSYNC    (0x6 << 4)
+#define TAS5720_PWM_RATE_24_12_FSYNC    (0x7 << 4)
+#define TAS5720_PWM_RATE_MASK           GENMASK(6, 4)
+#define TAS5720_ANALOG_GAIN_19_2DBV     (0x0 << 2)
+#define TAS5720_ANALOG_GAIN_20_7DBV     (0x1 << 2)
+#define TAS5720_ANALOG_GAIN_23_5DBV     (0x2 << 2)
+#define TAS5720_ANALOG_GAIN_26_3DBV     (0x3 << 2)
+#define TAS5720_ANALOG_GAIN_MASK        GENMASK(3, 2)
+#define TAS5720_ANALOG_GAIN_SHIFT       (0x2)
+/* TAS5720_FAULT_REG */
+#define TAS5720_OC_THRESH_100PCT        (0x0 << 4)
+#define TAS5720_OC_THRESH_75PCT         (0x1 << 4)
+#define TAS5720_OC_THRESH_50PCT         (0x2 << 4)
+#define TAS5720_OC_THRESH_25PCT         (0x3 << 4)
+#define TAS5720_OC_THRESH_MASK          GENMASK(5, 4)
+#define TAS5720_CLKE                    BIT(3)
+#define TAS5720_OCE                     BIT(2)
+#define TAS5720_DCE                     BIT(1)
+#define TAS5720_OTE                     BIT(0)
+#define TAS5720_FAULT_MASK              GENMASK(3, 0)
+/* TAS5720_DIGITAL_CLIP1_REG */
+#define TAS5720_CLIP1_MASK              GENMASK(7, 2)
+#define TAS5720_CLIP1_SHIFT             (0x2)
+#endif /* __TAS5720_H__ */
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index ee4def4f819f..3c5e1df01c19 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/acpi.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/slab.h>
@@ -1280,10 +1281,19 @@ static const struct i2c_device_id aic31xx_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id aic31xx_acpi_match[] = {
+        { "10TI3100", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match);
+#endif
 static struct i2c_driver aic31xx_i2c_driver = {
        .driver = {
                .name   = "tlv320aic31xx-codec",
                .of_match_table = of_match_ptr(tlv320aic31xx_of_match),
+                .acpi_match_table = ACPI_PTR(aic31xx_acpi_match),
        },
        .probe          = aic31xx_i2c_probe,
        .remove         = aic31xx_i2c_remove,
diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c
new file mode 100644
index 000000000000..59606cf3008f
--- /dev/null
+++ b/sound/soc/codecs/tlv320aic32x4-i2c.c
@@ -0,0 +1,74 @@
+/*
+ * linux/sound/soc/codecs/tlv320aic32x4-i2c.c
+ *
+ * Copyright 2011 NW Digital Radio
+ *
+ * Author: Jeremy McDermond <nh6z@nh6z.net>
+ *
+ * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include "tlv320aic32x4.h"
+static int aic32x4_i2c_probe(struct i2c_client *i2c,
+                             const struct i2c_device_id *id)
+{
+        struct regmap *regmap;
+        struct regmap_config config;
+        config = aic32x4_regmap_config;
+        config.reg_bits = 8;
+        config.val_bits = 8;
+        regmap = devm_regmap_init_i2c(i2c, &config);
+        return aic32x4_probe(&i2c->dev, regmap);
+}
+static int aic32x4_i2c_remove(struct i2c_client *i2c)
+{
+        return aic32x4_remove(&i2c->dev);
+}
+static const struct i2c_device_id aic32x4_i2c_id[] = {
+        { "tlv320aic32x4", 0 },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id);
+static const struct of_device_id aic32x4_of_id[] = {
+        { .compatible = "ti,tlv320aic32x4", },
+        { /* senitel */ }
+};
+MODULE_DEVICE_TABLE(of, aic32x4_of_id);
+static struct i2c_driver aic32x4_i2c_driver = {
+        .driver = {
+                .name = "tlv320aic32x4",
+                .of_match_table = aic32x4_of_id,
+        },
+        .probe =    aic32x4_i2c_probe,
+        .remove =   aic32x4_i2c_remove,
+        .id_table = aic32x4_i2c_id,
+};
+module_i2c_driver(aic32x4_i2c_driver);
+MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver I2C");
+MODULE_AUTHOR("Jeremy McDermond <nh6z@nh6z.net>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c
new file mode 100644
index 000000000000..724fcdd491b2
--- /dev/null
+++ b/sound/soc/codecs/tlv320aic32x4-spi.c
@@ -0,0 +1,76 @@
+/*
+ * linux/sound/soc/codecs/tlv320aic32x4-spi.c
+ *
+ * Copyright 2011 NW Digital Radio
+ *
+ * Author: Jeremy McDermond <nh6z@nh6z.net>
+ *
+ * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/spi/spi.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include "tlv320aic32x4.h"
+static int aic32x4_spi_probe(struct spi_device *spi)
+{
+        struct regmap *regmap;
+        struct regmap_config config;
+        config = aic32x4_regmap_config;
+        config.reg_bits = 7;
+        config.pad_bits = 1;
+        config.val_bits = 8;
+        config.read_flag_mask = 0x01;
+        regmap = devm_regmap_init_spi(spi, &config);
+        return aic32x4_probe(&spi->dev, regmap);
+}
+static int aic32x4_spi_remove(struct spi_device *spi)
+{
+        return aic32x4_remove(&spi->dev);
+}
+static const struct spi_device_id aic32x4_spi_id[] = {
+        { "tlv320aic32x4", 0 },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, aic32x4_spi_id);
+static const struct of_device_id aic32x4_of_id[] = {
+        { .compatible = "ti,tlv320aic32x4", },
+        { /* senitel */ }
+};
+MODULE_DEVICE_TABLE(of, aic32x4_of_id);
+static struct spi_driver aic32x4_spi_driver = {
+        .driver = {
+                .name = "tlv320aic32x4",
+                .owner = THIS_MODULE,
+                .of_match_table = aic32x4_of_id,
+        },
+        .probe =    aic32x4_spi_probe,
+        .remove =   aic32x4_spi_remove,
+        .id_table = aic32x4_spi_id,
+};
+module_spi_driver(aic32x4_spi_driver);
+MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver SPI");
+MODULE_AUTHOR("Jeremy McDermond <nh6z@nh6z.net>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index f2d3191961e1..85d4978d0384 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -30,7 +30,6 @@
 #include <linux/pm.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/i2c.h>
 #include <linux/cdev.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
@@ -160,7 +159,10 @@ static const struct aic32x4_rate_divs aic32x4_divs[] = {
        /* 48k rate */
        {AIC32X4_FREQ_12000000, 48000, 1, 8, 1920, 128, 2, 8, 128, 2, 8, 4},
        {AIC32X4_FREQ_24000000, 48000, 2, 8, 1920, 128, 8, 2, 64, 8, 4, 4},
-        {AIC32X4_FREQ_25000000, 48000, 2, 7, 8643, 128, 8, 2, 64, 8, 4, 4}
+        {AIC32X4_FREQ_25000000, 48000, 2, 7, 8643, 128, 8, 2, 64, 8, 4, 4},
+        /* 96k rate */
+        {AIC32X4_FREQ_25000000, 96000, 2, 7, 8643, 64, 4, 4, 64, 4, 4, 1},
 };
 static const struct snd_kcontrol_new hpl_output_mixer_controls[] = {
@@ -181,16 +183,71 @@ static const struct snd_kcontrol_new lor_output_mixer_controls[] = {
        SOC_DAPM_SINGLE("R_DAC Switch", AIC32X4_LORROUTE, 3, 1, 0),
 };
-static const struct snd_kcontrol_new left_input_mixer_controls[] = {
+static const char * const resistor_text[] = {
-        SOC_DAPM_SINGLE("IN1_L P Switch", AIC32X4_LMICPGAPIN, 6, 1, 0),
+        "Off", "10 kOhm", "20 kOhm", "40 kOhm",
-        SOC_DAPM_SINGLE("IN2_L P Switch", AIC32X4_LMICPGAPIN, 4, 1, 0),
-        SOC_DAPM_SINGLE("IN3_L P Switch", AIC32X4_LMICPGAPIN, 2, 1, 0),
 };
-static const struct snd_kcontrol_new right_input_mixer_controls[] = {
+/* Left mixer pins */
-        SOC_DAPM_SINGLE("IN1_R P Switch", AIC32X4_RMICPGAPIN, 6, 1, 0),
+static SOC_ENUM_SINGLE_DECL(in1l_lpga_p_enum, AIC32X4_LMICPGAPIN, 6, resistor_text);
-        SOC_DAPM_SINGLE("IN2_R P Switch", AIC32X4_RMICPGAPIN, 4, 1, 0),
+static SOC_ENUM_SINGLE_DECL(in2l_lpga_p_enum, AIC32X4_LMICPGAPIN, 4, resistor_text);
-        SOC_DAPM_SINGLE("IN3_R P Switch", AIC32X4_RMICPGAPIN, 2, 1, 0),
+static SOC_ENUM_SINGLE_DECL(in3l_lpga_p_enum, AIC32X4_LMICPGAPIN, 2, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in1r_lpga_p_enum, AIC32X4_LMICPGAPIN, 0, resistor_text);
+static SOC_ENUM_SINGLE_DECL(cml_lpga_n_enum, AIC32X4_LMICPGANIN, 6, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in2r_lpga_n_enum, AIC32X4_LMICPGANIN, 4, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in3r_lpga_n_enum, AIC32X4_LMICPGANIN, 2, resistor_text);
+static const struct snd_kcontrol_new in1l_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN1_L L+ Switch", in1l_lpga_p_enum),
+};
+static const struct snd_kcontrol_new in2l_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN2_L L+ Switch", in2l_lpga_p_enum),
+};
+static const struct snd_kcontrol_new in3l_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN3_L L+ Switch", in3l_lpga_p_enum),
+};
+static const struct snd_kcontrol_new in1r_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN1_R L+ Switch", in1r_lpga_p_enum),
+};
+static const struct snd_kcontrol_new cml_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("CM_L L- Switch", cml_lpga_n_enum),
+};
+static const struct snd_kcontrol_new in2r_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN2_R L- Switch", in2r_lpga_n_enum),
+};
+static const struct snd_kcontrol_new in3r_to_lmixer_controls[] = {
+        SOC_DAPM_ENUM("IN3_R L- Switch", in3r_lpga_n_enum),
+};
+/*  Right mixer pins */
+static SOC_ENUM_SINGLE_DECL(in1r_rpga_p_enum, AIC32X4_RMICPGAPIN, 6, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in2r_rpga_p_enum, AIC32X4_RMICPGAPIN, 4, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in3r_rpga_p_enum, AIC32X4_RMICPGAPIN, 2, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in2l_rpga_p_enum, AIC32X4_RMICPGAPIN, 0, resistor_text);
+static SOC_ENUM_SINGLE_DECL(cmr_rpga_n_enum, AIC32X4_RMICPGANIN, 6, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in1l_rpga_n_enum, AIC32X4_RMICPGANIN, 4, resistor_text);
+static SOC_ENUM_SINGLE_DECL(in3l_rpga_n_enum, AIC32X4_RMICPGANIN, 2, resistor_text);
+static const struct snd_kcontrol_new in1r_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN1_R R+ Switch", in1r_rpga_p_enum),
+};
+static const struct snd_kcontrol_new in2r_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN2_R R+ Switch", in2r_rpga_p_enum),
+};
+static const struct snd_kcontrol_new in3r_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN3_R R+ Switch", in3r_rpga_p_enum),
+};
+static const struct snd_kcontrol_new in2l_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN2_L R+ Switch", in2l_rpga_p_enum),
+};
+static const struct snd_kcontrol_new cmr_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("CM_R R- Switch", cmr_rpga_n_enum),
+};
+static const struct snd_kcontrol_new in1l_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN1_L R- Switch", in1l_rpga_n_enum),
+};
+static const struct snd_kcontrol_new in3l_to_rmixer_controls[] = {
+        SOC_DAPM_ENUM("IN3_L R- Switch", in3l_rpga_n_enum),
 };
 static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {
@@ -214,14 +271,39 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {
                           &lor_output_mixer_controls[0],
                           ARRAY_SIZE(lor_output_mixer_controls)),
        SND_SOC_DAPM_PGA("LOR Power", AIC32X4_OUTPWRCTL, 2, 0, NULL, 0),
-        SND_SOC_DAPM_MIXER("Left Input Mixer", SND_SOC_NOPM, 0, 0,
-                           &left_input_mixer_controls[0],
-                           ARRAY_SIZE(left_input_mixer_controls)),
-        SND_SOC_DAPM_MIXER("Right Input Mixer", SND_SOC_NOPM, 0, 0,
-                           &right_input_mixer_controls[0],
-                           ARRAY_SIZE(right_input_mixer_controls)),
-        SND_SOC_DAPM_ADC("Left ADC", "Left Capture", AIC32X4_ADCSETUP, 7, 0),
        SND_SOC_DAPM_ADC("Right ADC", "Right Capture", AIC32X4_ADCSETUP, 6, 0),
+        SND_SOC_DAPM_MUX("IN1_R to Right Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in1r_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("IN2_R to Right Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in2r_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("IN3_R to Right Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in3r_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("IN2_L to Right Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in2l_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("CM_R to Right Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        cmr_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("IN1_L to Right Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        in1l_to_rmixer_controls),
+        SND_SOC_DAPM_MUX("IN3_L to Right Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        in3l_to_rmixer_controls),
+        SND_SOC_DAPM_ADC("Left ADC", "Left Capture", AIC32X4_ADCSETUP, 7, 0),
+        SND_SOC_DAPM_MUX("IN1_L to Left Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in1l_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("IN2_L to Left Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in2l_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("IN3_L to Left Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in3l_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("IN1_R to Left Mixer Positive Resistor", SND_SOC_NOPM, 0, 0,
+                        in1r_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("CM_L to Left Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        cml_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("IN2_R to Left Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        in2r_to_lmixer_controls),
+        SND_SOC_DAPM_MUX("IN3_R to Left Mixer Negative Resistor", SND_SOC_NOPM, 0, 0,
+                        in3r_to_lmixer_controls),
        SND_SOC_DAPM_MICBIAS("Mic Bias", AIC32X4_MICBIAS, 6, 0),
        SND_SOC_DAPM_OUTPUT("HPL"),
@@ -261,19 +343,77 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
        {"LOR Power", NULL, "LOR Output Mixer"},
        {"LOR", NULL, "LOR Power"},
-        /* Left input */
-        {"Left Input Mixer", "IN1_L P Switch", "IN1_L"},
-        {"Left Input Mixer", "IN2_L P Switch", "IN2_L"},
-        {"Left Input Mixer", "IN3_L P Switch", "IN3_L"},
-        {"Left ADC", NULL, "Left Input Mixer"},
        /* Right Input */
-        {"Right Input Mixer", "IN1_R P Switch", "IN1_R"},
+        {"Right ADC", NULL, "IN1_R to Right Mixer Positive Resistor"},
-        {"Right Input Mixer", "IN2_R P Switch", "IN2_R"},
+        {"IN1_R to Right Mixer Positive Resistor", "10 kOhm", "IN1_R"},
-        {"Right Input Mixer", "IN3_R P Switch", "IN3_R"},
+        {"IN1_R to Right Mixer Positive Resistor", "20 kOhm", "IN1_R"},
+        {"IN1_R to Right Mixer Positive Resistor", "40 kOhm", "IN1_R"},
-        {"Right ADC", NULL, "Right Input Mixer"},
+        {"Right ADC", NULL, "IN2_R to Right Mixer Positive Resistor"},
+        {"IN2_R to Right Mixer Positive Resistor", "10 kOhm", "IN2_R"},
+        {"IN2_R to Right Mixer Positive Resistor", "20 kOhm", "IN2_R"},
+        {"IN2_R to Right Mixer Positive Resistor", "40 kOhm", "IN2_R"},
+        {"Right ADC", NULL, "IN3_R to Right Mixer Positive Resistor"},
+        {"IN3_R to Right Mixer Positive Resistor", "10 kOhm", "IN3_R"},
+        {"IN3_R to Right Mixer Positive Resistor", "20 kOhm", "IN3_R"},
+        {"IN3_R to Right Mixer Positive Resistor", "40 kOhm", "IN3_R"},
+        {"Right ADC", NULL, "IN2_L to Right Mixer Positive Resistor"},
+        {"IN2_L to Right Mixer Positive Resistor", "10 kOhm", "IN2_L"},
+        {"IN2_L to Right Mixer Positive Resistor", "20 kOhm", "IN2_L"},
+        {"IN2_L to Right Mixer Positive Resistor", "40 kOhm", "IN2_L"},
+        {"Right ADC", NULL, "CM_R to Right Mixer Negative Resistor"},
+        {"CM_R to Right Mixer Negative Resistor", "10 kOhm", "CM_R"},
+        {"CM_R to Right Mixer Negative Resistor", "20 kOhm", "CM_R"},
+        {"CM_R to Right Mixer Negative Resistor", "40 kOhm", "CM_R"},
+        {"Right ADC", NULL, "IN1_L to Right Mixer Negative Resistor"},
+        {"IN1_L to Right Mixer Negative Resistor", "10 kOhm", "IN1_L"},
+        {"IN1_L to Right Mixer Negative Resistor", "20 kOhm", "IN1_L"},
+        {"IN1_L to Right Mixer Negative Resistor", "40 kOhm", "IN1_L"},
+        {"Right ADC", NULL, "IN3_L to Right Mixer Negative Resistor"},
+        {"IN3_L to Right Mixer Negative Resistor", "10 kOhm", "IN3_L"},
+        {"IN3_L to Right Mixer Negative Resistor", "20 kOhm", "IN3_L"},
+        {"IN3_L to Right Mixer Negative Resistor", "40 kOhm", "IN3_L"},
+        /* Left Input */
+        {"Left ADC", NULL, "IN1_L to Left Mixer Positive Resistor"},
+        {"IN1_L to Left Mixer Positive Resistor", "10 kOhm", "IN1_L"},
+        {"IN1_L to Left Mixer Positive Resistor", "20 kOhm", "IN1_L"},
+        {"IN1_L to Left Mixer Positive Resistor", "40 kOhm", "IN1_L"},
+        {"Left ADC", NULL, "IN2_L to Left Mixer Positive Resistor"},
+        {"IN2_L to Left Mixer Positive Resistor", "10 kOhm", "IN2_L"},
+        {"IN2_L to Left Mixer Positive Resistor", "20 kOhm", "IN2_L"},
+        {"IN2_L to Left Mixer Positive Resistor", "40 kOhm", "IN2_L"},
+        {"Left ADC", NULL, "IN3_L to Left Mixer Positive Resistor"},
+        {"IN3_L to Left Mixer Positive Resistor", "10 kOhm", "IN3_L"},
+        {"IN3_L to Left Mixer Positive Resistor", "20 kOhm", "IN3_L"},
+        {"IN3_L to Left Mixer Positive Resistor", "40 kOhm", "IN3_L"},
+        {"Left ADC", NULL, "IN1_R to Left Mixer Positive Resistor"},
+        {"IN1_R to Left Mixer Positive Resistor", "10 kOhm", "IN1_R"},
+        {"IN1_R to Left Mixer Positive Resistor", "20 kOhm", "IN1_R"},
+        {"IN1_R to Left Mixer Positive Resistor", "40 kOhm", "IN1_R"},
+        {"Left ADC", NULL, "CM_L to Left Mixer Negative Resistor"},
+        {"CM_L to Left Mixer Negative Resistor", "10 kOhm", "CM_L"},
+        {"CM_L to Left Mixer Negative Resistor", "20 kOhm", "CM_L"},
+        {"CM_L to Left Mixer Negative Resistor", "40 kOhm", "CM_L"},
+        {"Left ADC", NULL, "IN2_R to Left Mixer Negative Resistor"},
+        {"IN2_R to Left Mixer Negative Resistor", "10 kOhm", "IN2_R"},
+        {"IN2_R to Left Mixer Negative Resistor", "20 kOhm", "IN2_R"},
+        {"IN2_R to Left Mixer Negative Resistor", "40 kOhm", "IN2_R"},
+        {"Left ADC", NULL, "IN3_R to Left Mixer Negative Resistor"},
+        {"IN3_R to Left Mixer Negative Resistor", "10 kOhm", "IN3_R"},
+        {"IN3_R to Left Mixer Negative Resistor", "20 kOhm", "IN3_R"},
+        {"IN3_R to Left Mixer Negative Resistor", "40 kOhm", "IN3_R"},
 };
 static const struct regmap_range_cfg aic32x4_regmap_pages[] = {
@@ -287,14 +427,12 @@ static const struct regmap_range_cfg aic32x4_regmap_pages[] = {
        },
 };
-static const struct regmap_config aic32x4_regmap = {
+const struct regmap_config aic32x4_regmap_config = {
-        .reg_bits = 8,
-        .val_bits = 8,
        .max_register = AIC32X4_RMICPGAVOL,
        .ranges = aic32x4_regmap_pages,
        .num_ranges = ARRAY_SIZE(aic32x4_regmap_pages),
 };
+EXPORT_SYMBOL(aic32x4_regmap_config);
 static inline int aic32x4_get_divs(int mclk, int rate)
 {
@@ -567,7 +705,7 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
-#define AIC32X4_RATES   SNDRV_PCM_RATE_8000_48000
+#define AIC32X4_RATES   SNDRV_PCM_RATE_8000_96000
 #define AIC32X4_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE \
                         | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
@@ -596,7 +734,7 @@ static struct snd_soc_dai_driver aic32x4_dai = {
        .symmetric_rates = 1,
 };
-static int aic32x4_probe(struct snd_soc_codec *codec)
+static int aic32x4_codec_probe(struct snd_soc_codec *codec)
 {
        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
        u32 tmp_reg;
@@ -655,7 +793,7 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
 }
 static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = {
-        .probe = aic32x4_probe,
+        .probe = aic32x4_codec_probe,
        .set_bias_level = aic32x4_set_bias_level,
        .suspend_bias_off = true,
@@ -777,24 +915,22 @@ error_ldo:
        return ret;
 }
-static int aic32x4_i2c_probe(struct i2c_client *i2c,
+int aic32x4_probe(struct device *dev, struct regmap *regmap)
-                             const struct i2c_device_id *id)
 {
-        struct aic32x4_pdata *pdata = i2c->dev.platform_data;
        struct aic32x4_priv *aic32x4;
-        struct device_node *np = i2c->dev.of_node;
+        struct aic32x4_pdata *pdata = dev->platform_data;
+        struct device_node *np = dev->of_node;
        int ret;
-        aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv),
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+        aic32x4 = devm_kzalloc(dev, sizeof(struct aic32x4_priv),
                               GFP_KERNEL);
        if (aic32x4 == NULL)
                return -ENOMEM;
-        aic32x4->regmap = devm_regmap_init_i2c(i2c, &aic32x4_regmap);
+        dev_set_drvdata(dev, aic32x4);
-        if (IS_ERR(aic32x4->regmap))
-                return PTR_ERR(aic32x4->regmap);
-        i2c_set_clientdata(i2c, aic32x4);
        if (pdata) {
                aic32x4->power_cfg = pdata->power_cfg;
@@ -804,7 +940,7 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
        } else if (np) {
                ret = aic32x4_parse_dt(aic32x4, np);
                if (ret) {
-                        dev_err(&i2c->dev, "Failed to parse DT node\n");
+                        dev_err(dev, "Failed to parse DT node\n");
                        return ret;
                }
        } else {
@@ -814,71 +950,48 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
                aic32x4->rstn_gpio = -1;
        }
-        aic32x4->mclk = devm_clk_get(&i2c->dev, "mclk");
+        aic32x4->mclk = devm_clk_get(dev, "mclk");
        if (IS_ERR(aic32x4->mclk)) {
-                dev_err(&i2c->dev, "Failed getting the mclk. The current implementation does not support the usage of this codec without mclk\n");
+                dev_err(dev, "Failed getting the mclk. The current implementation does not support the usage of this codec without mclk\n");
                return PTR_ERR(aic32x4->mclk);
        }
        if (gpio_is_valid(aic32x4->rstn_gpio)) {
-                ret = devm_gpio_request_one(&i2c->dev, aic32x4->rstn_gpio,
+                ret = devm_gpio_request_one(dev, aic32x4->rstn_gpio,
                                GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");
                if (ret != 0)
                        return ret;
        }
-        ret = aic32x4_setup_regulators(&i2c->dev, aic32x4);
+        ret = aic32x4_setup_regulators(dev, aic32x4);
        if (ret) {
-                dev_err(&i2c->dev, "Failed to setup regulators\n");
+                dev_err(dev, "Failed to setup regulators\n");
                return ret;
        }
-        ret = snd_soc_register_codec(&i2c->dev,
+        ret = snd_soc_register_codec(dev,
                        &soc_codec_dev_aic32x4, &aic32x4_dai, 1);
        if (ret) {
-                dev_err(&i2c->dev, "Failed to register codec\n");
+                dev_err(dev, "Failed to register codec\n");
                aic32x4_disable_regulators(aic32x4);
                return ret;
        }
-        i2c_set_clientdata(i2c, aic32x4);
        return 0;
 }
+EXPORT_SYMBOL(aic32x4_probe);
-static int aic32x4_i2c_remove(struct i2c_client *client)
+int aic32x4_remove(struct device *dev)
 {
-        struct aic32x4_priv *aic32x4 = i2c_get_clientdata(client);
+        struct aic32x4_priv *aic32x4 = dev_get_drvdata(dev);
        aic32x4_disable_regulators(aic32x4);
-        snd_soc_unregister_codec(&client->dev);
+        snd_soc_unregister_codec(dev);
        return 0;
 }
+EXPORT_SYMBOL(aic32x4_remove);
-static const struct i2c_device_id aic32x4_i2c_id[] = {
-        { "tlv320aic32x4", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id);
-static const struct of_device_id aic32x4_of_id[] = {
-        { .compatible = "ti,tlv320aic32x4", },
-        { /* senitel */ }
-};
-MODULE_DEVICE_TABLE(of, aic32x4_of_id);
-static struct i2c_driver aic32x4_i2c_driver = {
-        .driver = {
-                .name = "tlv320aic32x4",
-                .of_match_table = aic32x4_of_id,
-        },
-        .probe =    aic32x4_i2c_probe,
-        .remove =   aic32x4_i2c_remove,
-        .id_table = aic32x4_i2c_id,
-};
-module_i2c_driver(aic32x4_i2c_driver);
 MODULE_DESCRIPTION("ASoC tlv320aic32x4 codec driver");
 MODULE_AUTHOR("Javier Martin <javier.martin@vista-silicon.com>");
diff --git a/sound/soc/codecs/tlv320aic32x4.h b/sound/soc/codecs/tlv320aic32x4.h
index 995f033a855d..a197dd51addc 100644
--- a/sound/soc/codecs/tlv320aic32x4.h
+++ b/sound/soc/codecs/tlv320aic32x4.h
@@ -10,6 +10,13 @@
 #ifndef _TLV320AIC32X4_H
 #define _TLV320AIC32X4_H
+struct device;
+struct regmap_config;
+extern const struct regmap_config aic32x4_regmap_config;
+int aic32x4_probe(struct device *dev, struct regmap *regmap);
+int aic32x4_remove(struct device *dev);
 /* tlv320aic32x4 register space (in decimal to match datasheet) */
 #define AIC32X4_PAGE1           128
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index bc3de2e844e6..1f7081043566 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -824,7 +824,7 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
 {
        struct twl6040 *twl6040 = codec->control_data;
        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        int ret;
+        int ret = 0;
        switch (level) {
        case SND_SOC_BIAS_ON:
@@ -832,12 +832,16 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_PREPARE:
                break;
        case SND_SOC_BIAS_STANDBY:
-                if (priv->codec_powered)
+                if (priv->codec_powered) {
+                        /* Select low power PLL in standby */
+                        ret = twl6040_set_pll(twl6040, TWL6040_SYSCLK_SEL_LPPLL,
+                                              32768, 19200000);
                        break;
+                }
                ret = twl6040_power(twl6040, 1);
                if (ret)
-                        return ret;
+                        break;
                priv->codec_powered = 1;
@@ -853,7 +857,7 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
-        return 0;
+        return ret;
 }
 static int twl6040_startup(struct snd_pcm_substream *substream,
@@ -983,9 +987,9 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
                if (mute) {
                        /* Power down drivers and DACs */
                        hflctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA |
-                                    TWL6040_HFDRVENA);
+                                    TWL6040_HFDRVENA | TWL6040_HFSWENA);
                        hfrctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA |
-                                    TWL6040_HFDRVENA);
+                                    TWL6040_HFDRVENA | TWL6040_HFSWENA);
                }
                twl6040_reg_write(twl6040, TWL6040_REG_HFLCTL, hflctl);
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 720a14e0687d..0100e28f40dc 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3798,9 +3798,8 @@ static int wm8962_runtime_resume(struct device *dev)
        ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),
                                    wm8962->supplies);
        if (ret != 0) {
-                dev_err(dev,
+                dev_err(dev, "Failed to enable supplies: %d\n", ret);
-                        "Failed to enable supplies: %d\n", ret);
+                goto disable_clock;
-                return ret;
        }
        regcache_cache_only(wm8962->regmap, false);
@@ -3838,6 +3837,10 @@ static int wm8962_runtime_resume(struct device *dev)
        msleep(5);
        return 0;
+disable_clock:
+        clk_disable_unprepare(wm8962->pdata.mclk);
+        return ret;
 }
 static int wm8962_runtime_suspend(struct device *dev)
diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h
index 910aafd09d21..e63a318a3015 100644
--- a/sound/soc/codecs/wm8962.h
+++ b/sound/soc/codecs/wm8962.h
@@ -16,9 +16,9 @@
 #include <asm/types.h>
 #include <sound/soc.h>
-#define WM8962_SYSCLK_MCLK 1
+#define WM8962_SYSCLK_MCLK 0
-#define WM8962_SYSCLK_FLL  2
+#define WM8962_SYSCLK_FLL  1
-#define WM8962_SYSCLK_PLL3 3
+#define WM8962_SYSCLK_PLL3 2
 #define WM8962_FLL  1
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 2389ab47e25f..466492b7d4f5 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -643,6 +643,7 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 static struct platform_driver asoc_simple_card = {
        .driver = {
                .name = "asoc-simple-card",
+                .pm = &snd_soc_pm_ops,
                .of_match_table = asoc_simple_of_match,
        },
        .probe = asoc_simple_card_probe,
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 132bb83f8e99..bc3c7b5ac752 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -1,6 +1,7 @@
 config SND_KIRKWOOD_SOC
        tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
        depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
+        depends on HAS_DMA
        help
          Say Y or M if you want to add support for codecs attached to
          the Kirkwood I2S interface. You will also need to select the
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
index f7e789e97fbc..3abf51c07851 100644
--- a/sound/soc/mediatek/Kconfig
+++ b/sound/soc/mediatek/Kconfig
@@ -43,6 +43,7 @@ config SND_SOC_MT8173_RT5650_RT5676
        depends on SND_SOC_MEDIATEK && I2C
        select SND_SOC_RT5645
        select SND_SOC_RT5677
+        select SND_SOC_HDMI_CODEC
        help
          This adds ASoC driver for Mediatek MT8173 boards
          with the RT5650 and RT5676 codecs.
diff --git a/sound/soc/mediatek/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
index 5c4c58c69c51..bb593926c62d 100644
--- a/sound/soc/mediatek/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
@@ -134,7 +134,9 @@ static struct snd_soc_dai_link_component mt8173_rt5650_rt5676_codecs[] = {
 enum {
        DAI_LINK_PLAYBACK,
        DAI_LINK_CAPTURE,
+        DAI_LINK_HDMI,
        DAI_LINK_CODEC_I2S,
+        DAI_LINK_HDMI_I2S,
        DAI_LINK_INTERCODEC
 };
@@ -161,6 +163,16 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .dynamic = 1,
                .dpcm_capture = 1,
        },
+        [DAI_LINK_HDMI] = {
+                .name = "HDMI",
+                .stream_name = "HDMI PCM",
+                .cpu_dai_name = "HDMI",
+                .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,
+        },
        /* Back End DAI links */
        [DAI_LINK_CODEC_I2S] = {
@@ -177,6 +189,13 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
                .dpcm_playback = 1,
                .dpcm_capture = 1,
        },
+        [DAI_LINK_HDMI_I2S] = {
+                .name = "HDMI BE",
+                .cpu_dai_name = "HDMIO",
+                .no_pcm = 1,
+                .codec_dai_name = "i2s-hifi",
+                .dpcm_playback = 1,
+        },
        /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */
        [DAI_LINK_INTERCODEC] = {
                .name = "rt5650_rt5676 intercodec",
@@ -251,6 +270,14 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
        mt8173_rt5650_rt5676_dais[DAI_LINK_INTERCODEC].codec_of_node =
                mt8173_rt5650_rt5676_codecs[1].of_node;
+        mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node =
+                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 2);
+        if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codec_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);
diff --git a/sound/soc/mediatek/mt8173-rt5650.c b/sound/soc/mediatek/mt8173-rt5650.c
index bb09bb1b7f1c..a27a6673dbe3 100644
--- a/sound/soc/mediatek/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173-rt5650.c
@@ -85,12 +85,29 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
 {
        struct snd_soc_card *card = runtime->card;
        struct snd_soc_codec *codec = runtime->codec_dais[0]->codec;
+        const char *codec_capture_dai = runtime->codec_dais[1]->name;
        int ret;
        rt5645_sel_asrc_clk_src(codec,
-                                RT5645_DA_STEREO_FILTER |
+                                RT5645_DA_STEREO_FILTER,
-                                RT5645_AD_STEREO_FILTER,
                                RT5645_CLK_SEL_I2S1_ASRC);
+        if (!strcmp(codec_capture_dai, "rt5645-aif1")) {
+                rt5645_sel_asrc_clk_src(codec,
+                                        RT5645_AD_STEREO_FILTER,
+                                        RT5645_CLK_SEL_I2S1_ASRC);
+        } else if (!strcmp(codec_capture_dai, "rt5645-aif2")) {
+                rt5645_sel_asrc_clk_src(codec,
+                                        RT5645_AD_STEREO_FILTER,
+                                        RT5645_CLK_SEL_I2S2_ASRC);
+        } else {
+                dev_warn(card->dev,
+                         "Only one dai codec found in DTS, enabled rt5645 AD filter\n");
+                rt5645_sel_asrc_clk_src(codec,
+                                        RT5645_AD_STEREO_FILTER,
+                                        RT5645_CLK_SEL_I2S1_ASRC);
+        }
        /* enable jack detection */
        ret = snd_soc_card_jack_new(card, "Headset Jack",
                                    SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
@@ -110,6 +127,11 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
 static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = {
        {
+                /* Playback */
+                .dai_name = "rt5645-aif1",
+        },
+        {
+                /* Capture */
                .dai_name = "rt5645-aif1",
        },
 };
@@ -149,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
                .cpu_dai_name = "I2S",
                .no_pcm = 1,
                .codecs = mt8173_rt5650_codecs,
-                .num_codecs = 1,
+                .num_codecs = 2,
                .init = mt8173_rt5650_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
@@ -177,6 +199,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
 {
        struct snd_soc_card *card = &mt8173_rt5650_card;
        struct device_node *platform_node;
+        struct device_node *np;
+        const char *codec_capture_dai;
        int i, ret;
        platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -199,6 +223,26 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
                        "Property 'audio-codec' missing or invalid\n");
                return -EINVAL;
        }
+        mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node;
+        if (of_find_node_by_name(platform_node, "codec-capture")) {
+                np = of_get_child_by_name(pdev->dev.of_node, "codec-capture");
+                if (!np) {
+                        dev_err(&pdev->dev,
+                                "%s: Can't find codec-capture DT node\n",
+                                __func__);
+                        return -EINVAL;
+                }
+                ret = snd_soc_of_get_dai_name(np, &codec_capture_dai);
+                if (ret < 0) {
+                        dev_err(&pdev->dev,
+                                "%s codec_capture_dai name fail %d\n",
+                                __func__, ret);
+                        return ret;
+                }
+                mt8173_rt5650_codecs[1].dai_name = codec_capture_dai;
+        }
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);
diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c
index f1c58a2c12fb..2b5df2ef51a3 100644
--- a/sound/soc/mediatek/mtk-afe-pcm.c
+++ b/sound/soc/mediatek/mtk-afe-pcm.c
@@ -123,6 +123,7 @@
 #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_LRCK_INV           (0x1 << 2)
 #define AFE_TDM_CON1_BCK_INV            (0x1 << 1)
 #define AFE_TDM_CON1_EN                 (0x1 << 0)
@@ -449,6 +450,7 @@ static int mtk_afe_hdmi_prepare(struct snd_pcm_substream *substream,
                              runtime->rate * runtime->channels * 32);
        val = AFE_TDM_CON1_BCK_INV |
+              AFE_TDM_CON1_LRCK_INV |
              AFE_TDM_CON1_1_BCK_DELAY |
              AFE_TDM_CON1_MSB_ALIGNED | /* I2S mode */
              AFE_TDM_CON1_WLEN_32BIT |
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index c7563e230c7d..4a16e778966b 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -260,6 +260,10 @@ static void omap_st_on(struct omap_mcbsp *mcbsp)
        if (mcbsp->pdata->enable_st_clock)
                mcbsp->pdata->enable_st_clock(mcbsp->id, 1);
+        /* Disable Sidetone clock auto-gating for normal operation */
+        w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
+        MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w & ~(ST_AUTOIDLE));
        /* Enable McBSP Sidetone */
        w = MCBSP_READ(mcbsp, SSELCR);
        MCBSP_WRITE(mcbsp, SSELCR, w | SIDETONEEN);
@@ -279,6 +283,10 @@ static void omap_st_off(struct omap_mcbsp *mcbsp)
        w = MCBSP_READ(mcbsp, SSELCR);
        MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN));
+        /* Enable Sidetone clock auto-gating to reduce power consumption */
+        w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
+        MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w | ST_AUTOIDLE);
        if (mcbsp->pdata->enable_st_clock)
                mcbsp->pdata->enable_st_clock(mcbsp->id, 0);
 }
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 99381a27295b..a84f677234f0 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -82,6 +82,8 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
        struct dma_chan *chan;
        int err = 0;
+        memset(&config, 0x00, sizeof(config));
        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
        /* return if this is a bufferless transfer e.g.
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index ec522e94b0e2..b6cb9950f05d 100644
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -133,3 +133,4 @@ module_platform_driver(mmp_driver);
 MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
 MODULE_DESCRIPTION("ALSA SoC Brownstone");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:brownstone-audio");
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 5c8f9db50a47..d1661fa6ee08 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -207,3 +207,4 @@ module_platform_driver(mioa701_wm9713_driver);
 MODULE_AUTHOR("Robert Jarzmik (rjarzmik@free.fr)");
 MODULE_DESCRIPTION("ALSA SoC WM9713 MIO A701");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mioa701-wm9713");
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 51e790d006f5..96df9b2d8fc4 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -248,3 +248,4 @@ module_platform_driver(mmp_pcm_driver);
 MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
 MODULE_DESCRIPTION("MMP Soc Audio DMA module");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mmp-pcm-audio");
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index eca60c29791a..ca8b23f8c525 100644
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -482,3 +482,4 @@ module_platform_driver(asoc_mmp_sspa_driver);
 MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
 MODULE_DESCRIPTION("MMP SSPA SoC Interface");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mmp-sspa-dai");
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 4e74d9573f03..bcc81e920a67 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -161,3 +161,4 @@ module_platform_driver(palm27x_wm9712_driver);
 MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
 MODULE_DESCRIPTION("ALSA SoC Palm T|X, T5 and LifeDrive");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:palm27x-asoc");
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index da03fad1b9cd..3cad990dad2c 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -833,3 +833,4 @@ module_platform_driver(asoc_ssp_driver);
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_DESCRIPTION("PXA SSP/PCM SoC Interface");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa-ssp-dai");
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index f3de615aacd7..9615e6de1306 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -287,3 +287,4 @@ module_platform_driver(pxa2xx_ac97_driver);
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-ac97");
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index 9f390398d518..410d48b93031 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -117,3 +117,4 @@ module_platform_driver(pxa_pcm_driver);
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("Intel PXA2xx PCM DMA module");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa-pcm-audio");
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 6e8665430bd5..db000c6987a1 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -474,7 +474,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
        struct lpass_data *drvdata =
                snd_soc_platform_get_drvdata(soc_runtime->platform);
        struct lpass_variant *v = drvdata->variant;
-        int ret;
+        int ret = -EINVAL;
        struct lpass_pcm_data *data;
        size_t size = lpass_platform_pcm_hardware.buffer_bytes_max;
@@ -491,7 +491,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
                        data->rdma_ch = v->alloc_dma_channel(drvdata,
                                                SNDRV_PCM_STREAM_PLAYBACK);
-                if (IS_ERR_VALUE(data->rdma_ch))
+                if (data->rdma_ch < 0)
                        return data->rdma_ch;
                drvdata->substream[data->rdma_ch] = psubstream;
@@ -518,8 +518,10 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
                        data->wrdma_ch = v->alloc_dma_channel(drvdata,
                                                SNDRV_PCM_STREAM_CAPTURE);
-                if (IS_ERR_VALUE(data->wrdma_ch))
+                if (data->wrdma_ch < 0) {
+                        ret = data->wrdma_ch;
                        goto capture_alloc_err;
+                }
                drvdata->substream[data->wrdma_ch] = csubstream;
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 606399de684d..49354d17ea55 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -492,9 +492,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
         */
        if (!count) {
                clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
-                                              parent_clk_name,
+                                              parent_clk_name, 0, req_rate);
-                                              (parent_clk_name) ?
-                                              0 : CLK_IS_ROOT, req_rate);
                if (!IS_ERR(clk)) {
                        adg->clkout[CLKOUT] = clk;
                        of_clk_add_provider(np, of_clk_src_simple_get, clk);
@@ -506,9 +504,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
        else {
                for (i = 0; i < CLKOUTMAX; i++) {
                        clk = clk_register_fixed_rate(dev, clkout_name[i],
-                                                      parent_clk_name,
+                                                      parent_clk_name, 0,
-                                                      (parent_clk_name) ?
-                                                      0 : CLK_IS_ROOT,
                                                      req_rate);
                        if (!IS_ERR(clk)) {
                                adg->onecell.clks       = adg->clkout;
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 7658e8fd7bdc..6bc93cbb3049 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -316,11 +316,15 @@ static u32 rsnd_dmapp_get_id(struct rsnd_dai_stream *io,
                size = ARRAY_SIZE(gen2_id_table_cmd);
        }
-        if (!entry)
+        if ((!entry) || (size <= id)) {
-                return 0xFF;
+                struct device *dev = rsnd_priv_to_dev(rsnd_io_to_priv(io));
-        if (size <= id)
+                dev_err(dev, "unknown connection (%s[%d])\n",
-                return 0xFF;
+                        rsnd_mod_name(mod), rsnd_mod_id(mod));
+                /* use non-prohibited SRS number as error */
+                return 0x00; /* SSI00 */
+        }
        return entry[id];
 }
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index fc89a67258ca..a8f61d79333b 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -276,8 +276,9 @@ struct rsnd_mod {
 /*
 * status
 *
- * 0xH0000CB0
+ * 0xH0000CBA
 *
+ * A    0: probe        1: remove
 * B    0: init         1: quit
 * C    0: start        1: stop
 *
@@ -287,19 +288,19 @@ struct rsnd_mod {
 * H    0: fallback
 * H    0: hw_params
 */
+#define __rsnd_mod_shift_probe          0
+#define __rsnd_mod_shift_remove         0
 #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_probe          28 /* always called */
-#define __rsnd_mod_shift_remove         28 /* always called */
 #define __rsnd_mod_shift_irq            28 /* always called */
 #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            0
+#define __rsnd_mod_add_probe             1
-#define __rsnd_mod_add_remove           0
+#define __rsnd_mod_add_remove           -1
 #define __rsnd_mod_add_init              1
 #define __rsnd_mod_add_quit             -1
 #define __rsnd_mod_add_start             1
@@ -310,7 +311,7 @@ struct rsnd_mod {
 #define __rsnd_mod_add_hw_params        0
 #define __rsnd_mod_call_probe           0
-#define __rsnd_mod_call_remove          0
+#define __rsnd_mod_call_remove          1
 #define __rsnd_mod_call_init            0
 #define __rsnd_mod_call_quit            1
 #define __rsnd_mod_call_start           0
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 15d6ffe8be74..e39f916d0f2f 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -572,6 +572,9 @@ int rsnd_src_probe(struct rsnd_priv *priv)
        i = 0;
        for_each_child_of_node(node, np) {
+                if (!of_device_is_available(np))
+                        goto skip;
                src = rsnd_src_get(priv, i);
                snprintf(name, RSND_SRC_NAME_SIZE, "%s.%d",
@@ -595,6 +598,7 @@ int rsnd_src_probe(struct rsnd_priv *priv)
                if (ret)
                        goto rsnd_src_probe_done;
+skip:
                i++;
        }
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 1cf94d7fb9f4..ee7f15aa46fc 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1023,6 +1023,11 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg,
                control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos;
+                if (control_hdr->size != sizeof(*control_hdr)) {
+                        dev_err(tplg->dev, "ASoC: invalid control size\n");
+                        return -EINVAL;
+                }
                switch (control_hdr->ops.info) {
                case SND_SOC_TPLG_CTL_VOLSW:
                case SND_SOC_TPLG_CTL_STROBE:
@@ -1476,6 +1481,8 @@ widget:
        widget->dobj.type = SND_SOC_DOBJ_WIDGET;
        widget->dobj.ops = tplg->ops;
        widget->dobj.index = tplg->index;
+        kfree(template.sname);
+        kfree(template.name);
        list_add(&widget->dobj.list, &tplg->comp->dobj_list);
        return 0;
@@ -1499,10 +1506,17 @@ static int soc_tplg_dapm_widget_elems_load(struct soc_tplg *tplg,
        for (i = 0; i < count; i++) {
                widget = (struct snd_soc_tplg_dapm_widget *) tplg->pos;
+                if (widget->size != sizeof(*widget)) {
+                        dev_err(tplg->dev, "ASoC: invalid widget size\n");
+                        return -EINVAL;
+                }
                ret = soc_tplg_dapm_widget_create(tplg, widget);
-                if (ret < 0)
+                if (ret < 0) {
                        dev_err(tplg->dev, "ASoC: failed to load widget %s\n",
                                widget->name);
+                        return ret;
+                }
        }
        return 0;
@@ -1586,6 +1600,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
        return snd_soc_register_dai(tplg->comp, dai_drv);
 }
+/* create the FE DAI link */
 static int soc_tplg_link_create(struct soc_tplg *tplg,
        struct snd_soc_tplg_pcm *pcm)
 {
@@ -1598,6 +1613,16 @@ static int soc_tplg_link_create(struct soc_tplg *tplg,
        link->name = pcm->pcm_name;
        link->stream_name = pcm->pcm_name;
+        link->id = pcm->pcm_id;
+        link->cpu_dai_name = pcm->dai_name;
+        link->codec_name = "snd-soc-dummy";
+        link->codec_dai_name = "snd-soc-dummy-dai";
+        /* enable DPCM */
+        link->dynamic = 1;
+        link->dpcm_playback = pcm->playback;
+        link->dpcm_capture = pcm->capture;
        /* pass control to component driver for optional further init */
        ret = soc_tplg_dai_link_load(tplg, link);
@@ -1639,8 +1664,6 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
        if (tplg->pass != SOC_TPLG_PASS_PCM_DAI)
                return 0;
-        pcm = (struct snd_soc_tplg_pcm *)tplg->pos;
        if (soc_tplg_check_elem_count(tplg,
                sizeof(struct snd_soc_tplg_pcm), count,
                hdr->payload_size, "PCM DAI")) {
@@ -1650,7 +1673,13 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
        }
        /* create the FE DAIs and DAI links */
+        pcm = (struct snd_soc_tplg_pcm *)tplg->pos;
        for (i = 0; i < count; i++) {
+                if (pcm->size != sizeof(*pcm)) {
+                        dev_err(tplg->dev, "ASoC: invalid pcm size\n");
+                        return -EINVAL;
+                }
                soc_tplg_pcm_create(tplg, pcm);
                pcm++;
        }
@@ -1670,6 +1699,11 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg,
                return 0;
        manifest = (struct snd_soc_tplg_manifest *)tplg->pos;
+        if (manifest->size != sizeof(*manifest)) {
+                dev_err(tplg->dev, "ASoC: invalid manifest size\n");
+                return -EINVAL;
+        }
        tplg->pos += sizeof(struct snd_soc_tplg_manifest);
        if (tplg->comp && tplg->ops && tplg->ops->manifest)
@@ -1686,6 +1720,14 @@ static int soc_valid_header(struct soc_tplg *tplg,
        if (soc_tplg_get_hdr_offset(tplg) >= tplg->fw->size)
                return 0;
+        if (hdr->size != sizeof(*hdr)) {
+                dev_err(tplg->dev,
+                        "ASoC: invalid header size for type %d at offset 0x%lx size 0x%zx.\n",
+                        hdr->type, soc_tplg_get_hdr_offset(tplg),
+                        tplg->fw->size);
+                return -EINVAL;
+        }
        /* big endian firmware objects not supported atm */
        if (hdr->magic == cpu_to_be32(SND_SOC_TPLG_MAGIC)) {
                dev_err(tplg->dev,
diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c
index 39bcefe5eea0..488ef4ed8fba 100644
--- a/sound/soc/sti/sti_uniperif.c
+++ b/sound/soc/sti/sti_uniperif.c
@@ -11,6 +11,142 @@
 #include "uniperif.h"
 /*
+ * User frame size shall be 2, 4, 6 or 8 32-bits words length
+ * (i.e. 8, 16, 24 or 32 bytes)
+ * This constraint comes from allowed values for
+ * UNIPERIF_I2S_FMT_NUM_CH register
+ */
+#define UNIPERIF_MAX_FRAME_SZ 0x20
+#define UNIPERIF_ALLOWED_FRAME_SZ (0x08 | 0x10 | 0x18 | UNIPERIF_MAX_FRAME_SZ)
+int sti_uniperiph_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
+                               unsigned int rx_mask, int slots,
+                               int slot_width)
+{
+        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
+        struct uniperif *uni = priv->dai_data.uni;
+        int i, frame_size, avail_slots;
+        if (!UNIPERIF_TYPE_IS_TDM(uni)) {
+                dev_err(uni->dev, "cpu dai not in tdm mode\n");
+                return -EINVAL;
+        }
+        /* store info in unip context */
+        uni->tdm_slot.slots = slots;
+        uni->tdm_slot.slot_width = slot_width;
+        /* unip is unidirectionnal */
+        uni->tdm_slot.mask = (tx_mask != 0) ? tx_mask : rx_mask;
+        /* number of available timeslots */
+        for (i = 0, avail_slots = 0; i < uni->tdm_slot.slots; i++) {
+                if ((uni->tdm_slot.mask >> i) & 0x01)
+                        avail_slots++;
+        }
+        uni->tdm_slot.avail_slots = avail_slots;
+        /* frame size in bytes */
+        frame_size = uni->tdm_slot.avail_slots * uni->tdm_slot.slot_width / 8;
+        /* check frame size is allowed */
+        if ((frame_size > UNIPERIF_MAX_FRAME_SZ) ||
+            (frame_size & ~(int)UNIPERIF_ALLOWED_FRAME_SZ)) {
+                dev_err(uni->dev, "frame size not allowed: %d bytes\n",
+                        frame_size);
+                return -EINVAL;
+        }
+        return 0;
+}
+int sti_uniperiph_fix_tdm_chan(struct snd_pcm_hw_params *params,
+                               struct snd_pcm_hw_rule *rule)
+{
+        struct uniperif *uni = rule->private;
+        struct snd_interval t;
+        t.min = uni->tdm_slot.avail_slots;
+        t.max = uni->tdm_slot.avail_slots;
+        t.openmin = 0;
+        t.openmax = 0;
+        t.integer = 0;
+        return snd_interval_refine(hw_param_interval(params, rule->var), &t);
+}
+int sti_uniperiph_fix_tdm_format(struct snd_pcm_hw_params *params,
+                                 struct snd_pcm_hw_rule *rule)
+{
+        struct uniperif *uni = rule->private;
+        struct snd_mask *maskp = hw_param_mask(params, rule->var);
+        u64 format;
+        switch (uni->tdm_slot.slot_width) {
+        case 16:
+                format = SNDRV_PCM_FMTBIT_S16_LE;
+                break;
+        case 32:
+                format = SNDRV_PCM_FMTBIT_S32_LE;
+                break;
+        default:
+                dev_err(uni->dev, "format not supported: %d bits\n",
+                        uni->tdm_slot.slot_width);
+                return -EINVAL;
+        }
+        maskp->bits[0] &= (u_int32_t)format;
+        maskp->bits[1] &= (u_int32_t)(format >> 32);
+        /* clear remaining indexes */
+        memset(maskp->bits + 2, 0, (SNDRV_MASK_MAX - 64) / 8);
+        if (!maskp->bits[0] && !maskp->bits[1])
+                return -EINVAL;
+        return 0;
+}
+int sti_uniperiph_get_tdm_word_pos(struct uniperif *uni,
+                                   unsigned int *word_pos)
+{
+        int slot_width = uni->tdm_slot.slot_width / 8;
+        int slots_num = uni->tdm_slot.slots;
+        unsigned int slots_mask = uni->tdm_slot.mask;
+        int i, j, k;
+        unsigned int word16_pos[4];
+        /* word16_pos:
+         * word16_pos[0] = WORDX_LSB
+         * word16_pos[1] = WORDX_MSB,
+         * word16_pos[2] = WORDX+1_LSB
+         * word16_pos[3] = WORDX+1_MSB
+         */
+        /* set unip word position */
+        for (i = 0, j = 0, k = 0; (i < slots_num) && (k < WORD_MAX); i++) {
+                if ((slots_mask >> i) & 0x01) {
+                        word16_pos[j] = i * slot_width;
+                        if (slot_width == 4) {
+                                word16_pos[j + 1] = word16_pos[j] + 2;
+                                j++;
+                        }
+                        j++;
+                        if (j > 3) {
+                                word_pos[k] = word16_pos[1] |
+                                              (word16_pos[0] << 8) |
+                                              (word16_pos[3] << 16) |
+                                              (word16_pos[2] << 24);
+                                j = 0;
+                                k++;
+                        }
+                }
+        }
+        return 0;
+}
+/*
 * sti_uniperiph_dai_create_ctrl
 * This function is used to create Ctrl associated to DAI but also pcm device.
 * Request is done by front end to associate ctrl with pcm device id
@@ -45,10 +181,16 @@ int sti_uniperiph_dai_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params,
                                struct snd_soc_dai *dai)
 {
+        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
+        struct uniperif *uni = priv->dai_data.uni;
        struct snd_dmaengine_dai_dma_data *dma_data;
        int transfer_size;
-        transfer_size = params_channels(params) * UNIPERIF_FIFO_FRAMES;
+        if (uni->info->type == SND_ST_UNIPERIF_TYPE_TDM)
+                /* transfer size = user frame size (in 32-bits FIFO cell) */
+                transfer_size = snd_soc_params_to_frame_size(params) / 32;
+        else
+                transfer_size = params_channels(params) * UNIPERIF_FIFO_FRAMES;
        dma_data = snd_soc_dai_get_dma_data(dai, substream);
        dma_data->maxburst = transfer_size;
diff --git a/sound/soc/sti/uniperif.h b/sound/soc/sti/uniperif.h
index f0fd5a9944e9..eb9933c62ad6 100644
--- a/sound/soc/sti/uniperif.h
+++ b/sound/soc/sti/uniperif.h
@@ -25,7 +25,7 @@
        writel_relaxed((((value) & mask) << shift), ip->base + offset)
 /*
- * AUD_UNIPERIF_SOFT_RST reg
+ * UNIPERIF_SOFT_RST reg
 */
 #define UNIPERIF_SOFT_RST_OFFSET(ip) 0x0000
@@ -50,7 +50,7 @@
                UNIPERIF_SOFT_RST_SOFT_RST_MASK(ip))
 /*
- * AUD_UNIPERIF_FIFO_DATA reg
+ * UNIPERIF_FIFO_DATA reg
 */
 #define UNIPERIF_FIFO_DATA_OFFSET(ip) 0x0004
@@ -58,7 +58,7 @@
        writel_relaxed(value, ip->base + UNIPERIF_FIFO_DATA_OFFSET(ip))
 /*
- * AUD_UNIPERIF_CHANNEL_STA_REGN reg
+ * UNIPERIF_CHANNEL_STA_REGN reg
 */
 #define UNIPERIF_CHANNEL_STA_REGN(ip, n) (0x0060 + (4 * n))
@@ -105,7 +105,7 @@
        writel_relaxed(value, ip->base + UNIPERIF_CHANNEL_STA_REG5_OFFSET(ip))
 /*
- *  AUD_UNIPERIF_ITS reg
+ *  UNIPERIF_ITS reg
 */
 #define UNIPERIF_ITS_OFFSET(ip) 0x000C
@@ -143,7 +143,7 @@
                0 : (BIT(UNIPERIF_ITS_UNDERFLOW_REC_FAILED_SHIFT(ip))))
 /*
- *  AUD_UNIPERIF_ITS_BCLR reg
+ *  UNIPERIF_ITS_BCLR reg
 */
 /* FIFO_ERROR */
@@ -160,7 +160,7 @@
        writel_relaxed(value, ip->base + UNIPERIF_ITS_BCLR_OFFSET(ip))
 /*
- *  AUD_UNIPERIF_ITM reg
+ *  UNIPERIF_ITM reg
 */
 #define UNIPERIF_ITM_OFFSET(ip) 0x0018
@@ -188,7 +188,7 @@
                0 : (BIT(UNIPERIF_ITM_UNDERFLOW_REC_FAILED_SHIFT(ip))))
 /*
- *  AUD_UNIPERIF_ITM_BCLR reg
+ *  UNIPERIF_ITM_BCLR reg
 */
 #define UNIPERIF_ITM_BCLR_OFFSET(ip) 0x001c
@@ -213,7 +213,7 @@
                UNIPERIF_ITM_BCLR_DMA_ERROR_MASK(ip))
 /*
- *  AUD_UNIPERIF_ITM_BSET reg
+ *  UNIPERIF_ITM_BSET reg
 */
 #define UNIPERIF_ITM_BSET_OFFSET(ip) 0x0020
@@ -767,7 +767,7 @@
        SET_UNIPERIF_REG(ip, \
                UNIPERIF_CTRL_OFFSET(ip), \
                UNIPERIF_CTRL_READER_OUT_SEL_SHIFT(ip), \
-                CORAUD_UNIPERIF_CTRL_READER_OUT_SEL_MASK(ip), 1)
+                UNIPERIF_CTRL_READER_OUT_SEL_MASK(ip), 1)
 /* UNDERFLOW_REC_WINDOW */
 #define UNIPERIF_CTRL_UNDERFLOW_REC_WINDOW_SHIFT(ip) 20
@@ -1046,7 +1046,7 @@
                UNIPERIF_STATUS_1_UNDERFLOW_DURATION_MASK(ip), value)
 /*
- * AUD_UNIPERIF_CHANNEL_STA_REGN reg
+ * UNIPERIF_CHANNEL_STA_REGN reg
 */
 #define UNIPERIF_CHANNEL_STA_REGN(ip, n) (0x0060 + (4 * n))
@@ -1057,7 +1057,7 @@
                        UNIPERIF_CHANNEL_STA_REGN(ip, n))
 /*
- * AUD_UNIPERIF_USER_VALIDITY reg
+ * UNIPERIF_USER_VALIDITY reg
 */
 #define UNIPERIF_USER_VALIDITY_OFFSET(ip) 0x0090
@@ -1101,12 +1101,136 @@
                UNIPERIF_DBG_STANDBY_LEFT_SP_MASK(ip), value)
 /*
+ * UNIPERIF_TDM_ENABLE
+ */
+#define UNIPERIF_TDM_ENABLE_OFFSET(ip) 0x0118
+#define GET_UNIPERIF_TDM_ENABLE(ip) \
+        readl_relaxed(ip->base + UNIPERIF_TDM_ENABLE_OFFSET(ip))
+#define SET_UNIPERIF_TDM_ENABLE(ip, value) \
+        writel_relaxed(value, ip->base + UNIPERIF_TDM_ENABLE_OFFSET(ip))
+/* TDM_ENABLE */
+#define UNIPERIF_TDM_ENABLE_EN_TDM_SHIFT(ip) 0x0
+#define UNIPERIF_TDM_ENABLE_EN_TDM_MASK(ip) 0x1
+#define GET_UNIPERIF_TDM_ENABLE_EN_TDM(ip) \
+                GET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_ENABLE_OFFSET(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_SHIFT(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_MASK(ip))
+#define SET_UNIPERIF_TDM_ENABLE_TDM_ENABLE(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_ENABLE_OFFSET(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_SHIFT(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_MASK(ip), 1)
+#define SET_UNIPERIF_TDM_ENABLE_TDM_DISABLE(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_ENABLE_OFFSET(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_SHIFT(ip), \
+                UNIPERIF_TDM_ENABLE_EN_TDM_MASK(ip), 0)
+/*
+ * UNIPERIF_TDM_FS_REF_FREQ
+ */
+#define UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip) 0x011c
+#define GET_UNIPERIF_TDM_FS_REF_FREQ(ip) \
+        readl_relaxed(ip->base + UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip))
+#define SET_UNIPERIF_TDM_FS_REF_FREQ(ip, value) \
+        writel_relaxed(value, ip->base + \
+                        UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip))
+/* REF_FREQ */
+#define UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip) 0x0
+#define VALUE_UNIPERIF_TDM_FS_REF_FREQ_8KHZ(ip) 0
+#define VALUE_UNIPERIF_TDM_FS_REF_FREQ_16KHZ(ip) 1
+#define VALUE_UNIPERIF_TDM_FS_REF_FREQ_32KHZ(ip) 2
+#define VALUE_UNIPERIF_TDM_FS_REF_FREQ_48KHZ(ip) 3
+#define UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip) 0x3
+#define GET_UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ(ip) \
+                GET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip))
+#define SET_UNIPERIF_TDM_FS_REF_FREQ_8KHZ(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip), \
+                VALUE_UNIPERIF_TDM_FS_REF_FREQ_8KHZ(ip))
+#define SET_UNIPERIF_TDM_FS_REF_FREQ_16KHZ(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip), \
+                VALUE_UNIPERIF_TDM_FS_REF_FREQ_16KHZ(ip))
+#define SET_UNIPERIF_TDM_FS_REF_FREQ_32KHZ(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip), \
+                VALUE_UNIPERIF_TDM_FS_REF_FREQ_32KHZ(ip))
+#define SET_UNIPERIF_TDM_FS_REF_FREQ_48KHZ(ip) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_FREQ_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_FREQ_REF_FREQ_MASK(ip), \
+                VALUE_UNIPERIF_TDM_FS_REF_FREQ_48KHZ(ip))
+/*
+ * UNIPERIF_TDM_FS_REF_DIV
+ */
+#define UNIPERIF_TDM_FS_REF_DIV_OFFSET(ip) 0x0120
+#define GET_UNIPERIF_TDM_FS_REF_DIV(ip) \
+        readl_relaxed(ip->base + UNIPERIF_TDM_FS_REF_DIV_OFFSET(ip))
+#define SET_UNIPERIF_TDM_FS_REF_DIV(ip, value) \
+                writel_relaxed(value, ip->base + \
+                        UNIPERIF_TDM_FS_REF_DIV_OFFSET(ip))
+/* NUM_TIMESLOT */
+#define UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_SHIFT(ip) 0x0
+#define UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_MASK(ip) 0xff
+#define GET_UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT(ip) \
+                GET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_DIV_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_MASK(ip))
+#define SET_UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT(ip, value) \
+                SET_UNIPERIF_REG(ip, \
+                UNIPERIF_TDM_FS_REF_DIV_OFFSET(ip), \
+                UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_SHIFT(ip), \
+                UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT_MASK(ip), value)
+/*
+ * UNIPERIF_TDM_WORD_POS_X_Y
+ * 32 bits of UNIPERIF_TDM_WORD_POS_X_Y register shall be set in 1 shot
+ */
+#define UNIPERIF_TDM_WORD_POS_1_2_OFFSET(ip) 0x013c
+#define UNIPERIF_TDM_WORD_POS_3_4_OFFSET(ip) 0x0140
+#define UNIPERIF_TDM_WORD_POS_5_6_OFFSET(ip) 0x0144
+#define UNIPERIF_TDM_WORD_POS_7_8_OFFSET(ip) 0x0148
+#define GET_UNIPERIF_TDM_WORD_POS(ip, words) \
+        readl_relaxed(ip->base + UNIPERIF_TDM_WORD_POS_##words##_OFFSET(ip))
+#define SET_UNIPERIF_TDM_WORD_POS(ip, words, value) \
+                writel_relaxed(value, ip->base + \
+                UNIPERIF_TDM_WORD_POS_##words##_OFFSET(ip))
+/*
 * uniperipheral IP capabilities
 */
 #define UNIPERIF_FIFO_SIZE              70 /* FIFO is 70 cells deep */
 #define UNIPERIF_FIFO_FRAMES            4  /* FDMA trigger limit in frames */
+#define UNIPERIF_TYPE_IS_HDMI(p) \
+        ((p)->info->type == SND_ST_UNIPERIF_TYPE_HDMI)
+#define UNIPERIF_TYPE_IS_PCM(p) \
+        ((p)->info->type == SND_ST_UNIPERIF_TYPE_PCM)
+#define UNIPERIF_TYPE_IS_SPDIF(p) \
+        ((p)->info->type == SND_ST_UNIPERIF_TYPE_SPDIF)
+#define UNIPERIF_TYPE_IS_IEC958(p) \
+        (UNIPERIF_TYPE_IS_HDMI(p) || \
+                UNIPERIF_TYPE_IS_SPDIF(p))
+#define UNIPERIF_TYPE_IS_TDM(p) \
+        ((p)->info->type == SND_ST_UNIPERIF_TYPE_TDM)
 /*
 * Uniperipheral IP revisions
 */
@@ -1125,10 +1249,11 @@ enum uniperif_version {
 };
 enum uniperif_type {
-        SND_ST_UNIPERIF_PLAYER_TYPE_NONE,
+        SND_ST_UNIPERIF_TYPE_NONE,
-        SND_ST_UNIPERIF_PLAYER_TYPE_HDMI,
+        SND_ST_UNIPERIF_TYPE_HDMI,
-        SND_ST_UNIPERIF_PLAYER_TYPE_PCM,
+        SND_ST_UNIPERIF_TYPE_PCM,
-        SND_ST_UNIPERIF_PLAYER_TYPE_SPDIF
+        SND_ST_UNIPERIF_TYPE_SPDIF,
+        SND_ST_UNIPERIF_TYPE_TDM
 };
 enum uniperif_state {
@@ -1145,9 +1270,17 @@ enum uniperif_iec958_encoding_mode {
        UNIPERIF_IEC958_ENCODING_MODE_ENCODED
 };
+enum uniperif_word_pos {
+        WORD_1_2,
+        WORD_3_4,
+        WORD_5_6,
+        WORD_7_8,
+        WORD_MAX
+};
 struct uniperif_info {
        int id; /* instance value of the uniperipheral IP */
-        enum uniperif_type player_type;
+        enum uniperif_type type;
        int underflow_enabled;          /* Underflow recovery mode */
 };
@@ -1156,12 +1289,20 @@ struct uniperif_iec958_settings {
        struct snd_aes_iec958 iec958;
 };
+struct dai_tdm_slot {
+        unsigned int mask;
+        int slots;
+        int slot_width;
+        unsigned int avail_slots;
+};
 struct uniperif {
        /* System information */
        struct uniperif_info *info;
        struct device *dev;
        int ver; /* IP version, used by register access macros */
        struct regmap_field *clk_sel;
+        struct regmap_field *valid_sel;
        /* capabilities */
        const struct snd_pcm_hardware *hw;
@@ -1192,6 +1333,7 @@ struct uniperif {
        /* dai properties */
        unsigned int daifmt;
+        struct dai_tdm_slot tdm_slot;
        /* DAI callbacks */
        const struct snd_soc_dai_ops *dai_ops;
@@ -1209,6 +1351,28 @@ struct sti_uniperiph_data {
        struct sti_uniperiph_dai dai_data;
 };
+static const struct snd_pcm_hardware uni_tdm_hw = {
+        .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_MMAP |
+                SNDRV_PCM_INFO_MMAP_VALID,
+        .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates = SNDRV_PCM_RATE_CONTINUOUS,
+        .rate_min = 8000,
+        .rate_max = 48000,
+        .channels_min = 1,
+        .channels_max = 32,
+        .periods_min = 2,
+        .periods_max = 10,
+        .period_bytes_min = 128,
+        .period_bytes_max = 64 * PAGE_SIZE,
+        .buffer_bytes_max = 256 * PAGE_SIZE
+};
 /* uniperiph player*/
 int uni_player_init(struct platform_device *pdev,
                    struct uniperif *uni_player);
@@ -1226,4 +1390,28 @@ int sti_uniperiph_dai_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params,
                                struct snd_soc_dai *dai);
+static inline int sti_uniperiph_get_user_frame_size(
+        struct snd_pcm_runtime *runtime)
+{
+        return (runtime->channels * snd_pcm_format_width(runtime->format) / 8);
+}
+static inline int sti_uniperiph_get_unip_tdm_frame_size(struct uniperif *uni)
+{
+        return (uni->tdm_slot.slots * uni->tdm_slot.slot_width / 8);
+}
+int sti_uniperiph_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
+                               unsigned int rx_mask, int slots,
+                               int slot_width);
+int sti_uniperiph_get_tdm_word_pos(struct uniperif *uni,
+                                   unsigned int *word_pos);
+int sti_uniperiph_fix_tdm_chan(struct snd_pcm_hw_params *params,
+                               struct snd_pcm_hw_rule *rule);
+int sti_uniperiph_fix_tdm_format(struct snd_pcm_hw_params *params,
+                                 struct snd_pcm_hw_rule *rule);
 #endif
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 7aca6b92f718..ee1c7c245bc7 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -21,23 +21,14 @@
 /* sys config registers definitions */
 #define SYS_CFG_AUDIO_GLUE 0xA4
-#define SYS_CFG_AUDI0_GLUE_PCM_CLKX 8
 /*
 * Driver specific types.
 */
-#define UNIPERIF_PLAYER_TYPE_IS_HDMI(p) \
-        ((p)->info->player_type == SND_ST_UNIPERIF_PLAYER_TYPE_HDMI)
-#define UNIPERIF_PLAYER_TYPE_IS_PCM(p) \
-        ((p)->info->player_type == SND_ST_UNIPERIF_PLAYER_TYPE_PCM)
-#define UNIPERIF_PLAYER_TYPE_IS_SPDIF(p) \
-        ((p)->info->player_type == SND_ST_UNIPERIF_PLAYER_TYPE_SPDIF)
-#define UNIPERIF_PLAYER_TYPE_IS_IEC958(p) \
-        (UNIPERIF_PLAYER_TYPE_IS_HDMI(p) || \
-                UNIPERIF_PLAYER_TYPE_IS_SPDIF(p))
 #define UNIPERIF_PLAYER_CLK_ADJ_MIN  -999999
 #define UNIPERIF_PLAYER_CLK_ADJ_MAX  1000000
+#define UNIPERIF_PLAYER_I2S_OUT 1 /* player id connected to I2S/TDM TX bus */
 /*
 * Note: snd_pcm_hardware is linked to DMA controller but is declared here to
@@ -444,18 +435,11 @@ static int uni_player_prepare_pcm(struct uniperif *player,
        /* Force slot width to 32 in I2S mode (HW constraint) */
        if ((player->daifmt & SND_SOC_DAIFMT_FORMAT_MASK) ==
-                SND_SOC_DAIFMT_I2S) {
+                SND_SOC_DAIFMT_I2S)
                slot_width = 32;
-        } else {
+        else
-                switch (runtime->format) {
+                slot_width = snd_pcm_format_width(runtime->format);
-                case SNDRV_PCM_FORMAT_S16_LE:
-                        slot_width = 16;
-                        break;
-                default:
-                        slot_width = 32;
-                        break;
-                }
-        }
        output_frame_size = slot_width * runtime->channels;
        clk_div = player->mclk / runtime->rate;
@@ -530,7 +514,6 @@ static int uni_player_prepare_pcm(struct uniperif *player,
        SET_UNIPERIF_CONFIG_ONE_BIT_AUD_DISABLE(player);
        SET_UNIPERIF_I2S_FMT_ORDER_MSB(player);
-        SET_UNIPERIF_I2S_FMT_SCLK_EDGE_FALLING(player);
        /* No iec958 formatting as outputting to DAC  */
        SET_UNIPERIF_CTRL_SPDIF_FMT_OFF(player);
@@ -538,6 +521,55 @@ static int uni_player_prepare_pcm(struct uniperif *player,
        return 0;
 }
+static int uni_player_prepare_tdm(struct uniperif *player,
+                                  struct snd_pcm_runtime *runtime)
+{
+        int tdm_frame_size; /* unip tdm frame size in bytes */
+        int user_frame_size; /* user tdm frame size in bytes */
+        /* default unip TDM_WORD_POS_X_Y */
+        unsigned int word_pos[4] = {
+                0x04060002, 0x0C0E080A, 0x14161012, 0x1C1E181A};
+        int freq, ret;
+        tdm_frame_size =
+                sti_uniperiph_get_unip_tdm_frame_size(player);
+        user_frame_size =
+                sti_uniperiph_get_user_frame_size(runtime);
+        /* fix 16/0 format */
+        SET_UNIPERIF_CONFIG_MEM_FMT_16_0(player);
+        SET_UNIPERIF_I2S_FMT_DATA_SIZE_32(player);
+        /* number of words inserted on the TDM line */
+        SET_UNIPERIF_I2S_FMT_NUM_CH(player, user_frame_size / 4 / 2);
+        SET_UNIPERIF_I2S_FMT_ORDER_MSB(player);
+        SET_UNIPERIF_I2S_FMT_ALIGN_LEFT(player);
+        /* Enable the tdm functionality */
+        SET_UNIPERIF_TDM_ENABLE_TDM_ENABLE(player);
+        /* number of 8 bits timeslots avail in unip tdm frame */
+        SET_UNIPERIF_TDM_FS_REF_DIV_NUM_TIMESLOT(player, tdm_frame_size);
+        /* set the timeslot allocation for words in FIFO */
+        sti_uniperiph_get_tdm_word_pos(player, word_pos);
+        SET_UNIPERIF_TDM_WORD_POS(player, 1_2, word_pos[WORD_1_2]);
+        SET_UNIPERIF_TDM_WORD_POS(player, 3_4, word_pos[WORD_3_4]);
+        SET_UNIPERIF_TDM_WORD_POS(player, 5_6, word_pos[WORD_5_6]);
+        SET_UNIPERIF_TDM_WORD_POS(player, 7_8, word_pos[WORD_7_8]);
+        /* set unip clk rate (not done vai set_sysclk ops) */
+        freq = runtime->rate * tdm_frame_size * 8;
+        mutex_lock(&player->ctrl_lock);
+        ret = uni_player_clk_set_rate(player, freq);
+        if (!ret)
+                player->mclk = freq;
+        mutex_unlock(&player->ctrl_lock);
+        return 0;
+}
 /*
 * ALSA uniperipheral iec958 controls
 */
@@ -668,11 +700,29 @@ static int uni_player_startup(struct snd_pcm_substream *substream,
 {
        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
        struct uniperif *player = priv->dai_data.uni;
+        int ret;
        player->substream = substream;
        player->clk_adj = 0;
-        return 0;
+        if (!UNIPERIF_TYPE_IS_TDM(player))
+                return 0;
+        /* refine hw constraint in tdm mode */
+        ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                  SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  sti_uniperiph_fix_tdm_chan,
+                                  player, SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  -1);
+        if (ret < 0)
+                return ret;
+        return snd_pcm_hw_rule_add(substream->runtime, 0,
+                                   SNDRV_PCM_HW_PARAM_FORMAT,
+                                   sti_uniperiph_fix_tdm_format,
+                                   player, SNDRV_PCM_HW_PARAM_FORMAT,
+                                   -1);
 }
 static int uni_player_set_sysclk(struct snd_soc_dai *dai, int clk_id,
@@ -682,7 +732,7 @@ static int uni_player_set_sysclk(struct snd_soc_dai *dai, int clk_id,
        struct uniperif *player = priv->dai_data.uni;
        int ret;
-        if (dir == SND_SOC_CLOCK_IN)
+        if (UNIPERIF_TYPE_IS_TDM(player) || (dir == SND_SOC_CLOCK_IN))
                return 0;
        if (clk_id != 0)
@@ -714,7 +764,13 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
        }
        /* Calculate transfer size (in fifo cells and bytes) for frame count */
-        transfer_size = runtime->channels * UNIPERIF_FIFO_FRAMES;
+        if (player->info->type == SND_ST_UNIPERIF_TYPE_TDM) {
+                /* transfer size = user frame size (in 32 bits FIFO cell) */
+                transfer_size =
+                        sti_uniperiph_get_user_frame_size(runtime) / 4;
+        } else {
+                transfer_size = runtime->channels * UNIPERIF_FIFO_FRAMES;
+        }
        /* Calculate number of empty cells available before asserting DREQ */
        if (player->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0) {
@@ -738,16 +794,19 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
        SET_UNIPERIF_CONFIG_DMA_TRIG_LIMIT(player, trigger_limit);
        /* Uniperipheral setup depends on player type */
-        switch (player->info->player_type) {
+        switch (player->info->type) {
-        case SND_ST_UNIPERIF_PLAYER_TYPE_HDMI:
+        case SND_ST_UNIPERIF_TYPE_HDMI:
                ret = uni_player_prepare_iec958(player, runtime);
                break;
-        case SND_ST_UNIPERIF_PLAYER_TYPE_PCM:
+        case SND_ST_UNIPERIF_TYPE_PCM:
                ret = uni_player_prepare_pcm(player, runtime);
                break;
-        case SND_ST_UNIPERIF_PLAYER_TYPE_SPDIF:
+        case SND_ST_UNIPERIF_TYPE_SPDIF:
                ret = uni_player_prepare_iec958(player, runtime);
                break;
+        case SND_ST_UNIPERIF_TYPE_TDM:
+                ret = uni_player_prepare_tdm(player, runtime);
+                break;
        default:
                dev_err(player->dev, "invalid player type");
                return -EINVAL;
@@ -852,8 +911,8 @@ static int uni_player_start(struct uniperif *player)
         * will not take affect and hang the player.
         */
        if (player->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
-                if (UNIPERIF_PLAYER_TYPE_IS_IEC958(player))
+                if (UNIPERIF_TYPE_IS_IEC958(player))
-                                SET_UNIPERIF_CTRL_SPDIF_FMT_ON(player);
+                        SET_UNIPERIF_CTRL_SPDIF_FMT_ON(player);
        /* Force channel status update (no update if clk disable) */
        if (player->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
@@ -954,27 +1013,30 @@ static void uni_player_shutdown(struct snd_pcm_substream *substream,
        player->substream = NULL;
 }
-static int uni_player_parse_dt_clk_glue(struct platform_device *pdev,
+static int uni_player_parse_dt_audio_glue(struct platform_device *pdev,
-                                        struct uniperif *player)
+                                          struct uniperif *player)
 {
-        int bit_offset;
        struct device_node *node = pdev->dev.of_node;
        struct regmap *regmap;
+        struct reg_field regfield[2] = {
-        bit_offset = SYS_CFG_AUDI0_GLUE_PCM_CLKX + player->info->id;
+                /* PCM_CLK_SEL */
+                REG_FIELD(SYS_CFG_AUDIO_GLUE,
+                          8 + player->info->id,
+                          8 + player->info->id),
+                /* PCMP_VALID_SEL */
+                REG_FIELD(SYS_CFG_AUDIO_GLUE, 0, 1)
+        };
        regmap = syscon_regmap_lookup_by_phandle(node, "st,syscfg");
-        if (regmap) {
+        if (!regmap) {
-                struct reg_field regfield =
-                        REG_FIELD(SYS_CFG_AUDIO_GLUE, bit_offset, bit_offset);
-                player->clk_sel = regmap_field_alloc(regmap, regfield);
-        } else {
                dev_err(&pdev->dev, "sti-audio-clk-glue syscf not found\n");
                return -EINVAL;
        }
+        player->clk_sel = regmap_field_alloc(regmap, regfield[0]);
+        player->valid_sel = regmap_field_alloc(regmap, regfield[1]);
        return 0;
 }
@@ -1012,19 +1074,21 @@ static int uni_player_parse_dt(struct platform_device *pdev,
        }
        if (strcasecmp(mode, "hdmi") == 0)
-                info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_HDMI;
+                info->type = SND_ST_UNIPERIF_TYPE_HDMI;
        else if (strcasecmp(mode, "pcm") == 0)
-                info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_PCM;
+                info->type = SND_ST_UNIPERIF_TYPE_PCM;
        else if (strcasecmp(mode, "spdif") == 0)
-                info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_SPDIF;
+                info->type = SND_ST_UNIPERIF_TYPE_SPDIF;
+        else if (strcasecmp(mode, "tdm") == 0)
+                info->type = SND_ST_UNIPERIF_TYPE_TDM;
        else
-                info->player_type = SND_ST_UNIPERIF_PLAYER_TYPE_NONE;
+                info->type = SND_ST_UNIPERIF_TYPE_NONE;
        /* Save the info structure */
        player->info = info;
-        /* Get the PCM_CLK_SEL bit from audio-glue-ctrl SoC register */
+        /* Get PCM_CLK_SEL & PCMP_VALID_SEL from audio-glue-ctrl SoC reg */
-        if (uni_player_parse_dt_clk_glue(pdev, player))
+        if (uni_player_parse_dt_audio_glue(pdev, player))
                return -EINVAL;
        return 0;
@@ -1037,7 +1101,8 @@ static const struct snd_soc_dai_ops uni_player_dai_ops = {
                .trigger = uni_player_trigger,
                .hw_params = sti_uniperiph_dai_hw_params,
                .set_fmt = sti_uniperiph_dai_set_fmt,
-                .set_sysclk = uni_player_set_sysclk
+                .set_sysclk = uni_player_set_sysclk,
+                .set_tdm_slot = sti_uniperiph_set_tdm_slot
 };
 int uni_player_init(struct platform_device *pdev,
@@ -1047,7 +1112,6 @@ int uni_player_init(struct platform_device *pdev,
        player->dev = &pdev->dev;
        player->state = UNIPERIF_STATE_STOPPED;
-        player->hw = &uni_player_pcm_hw;
        player->dai_ops = &uni_player_dai_ops;
        ret = uni_player_parse_dt(pdev, player);
@@ -1057,6 +1121,11 @@ int uni_player_init(struct platform_device *pdev,
                return ret;
        }
+        if (UNIPERIF_TYPE_IS_TDM(player))
+                player->hw = &uni_tdm_hw;
+        else
+                player->hw = &uni_player_pcm_hw;
        /* Get uniperif resource */
        player->clk = of_clk_get(pdev->dev.of_node, 0);
        if (IS_ERR(player->clk))
@@ -1073,6 +1142,17 @@ int uni_player_init(struct platform_device *pdev,
                }
        }
+        /* connect to I2S/TDM TX bus */
+        if (player->valid_sel &&
+            (player->info->id == UNIPERIF_PLAYER_I2S_OUT)) {
+                ret = regmap_field_write(player->valid_sel, player->info->id);
+                if (ret) {
+                        dev_err(player->dev,
+                                "%s: unable to connect to tdm bus", __func__);
+                        return ret;
+                }
+        }
        ret = devm_request_irq(&pdev->dev, player->irq,
                               uni_player_irq_handler, IRQF_SHARED,
                               dev_name(&pdev->dev), player);
@@ -1087,7 +1167,7 @@ int uni_player_init(struct platform_device *pdev,
        SET_UNIPERIF_CTRL_SPDIF_LAT_OFF(player);
        SET_UNIPERIF_CONFIG_IDLE_MOD_DISABLE(player);
-        if (UNIPERIF_PLAYER_TYPE_IS_IEC958(player)) {
+        if (UNIPERIF_TYPE_IS_IEC958(player)) {
                /* Set default iec958 status bits  */
                /* Consumer, PCM, copyright, 2ch, mode 0 */
diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c
index 8a0eb2050169..eb74a328c928 100644
--- a/sound/soc/sti/uniperif_reader.c
+++ b/sound/soc/sti/uniperif_reader.c
@@ -73,55 +73,10 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id)
        return ret;
 }
-static int uni_reader_prepare(struct snd_pcm_substream *substream,
+static int uni_reader_prepare_pcm(struct snd_pcm_runtime *runtime,
-                              struct snd_soc_dai *dai)
+                                  struct uniperif *reader)
 {
-        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
-        struct uniperif *reader = priv->dai_data.uni;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        int transfer_size, trigger_limit;
        int slot_width;
-        int count = 10;
-        /* The reader should be stopped */
-        if (reader->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(reader->dev, "%s: invalid reader state %d", __func__,
-                        reader->state);
-                return -EINVAL;
-        }
-        /* Calculate transfer size (in fifo cells and bytes) for frame count */
-        transfer_size = runtime->channels * UNIPERIF_FIFO_FRAMES;
-        /* Calculate number of empty cells available before asserting DREQ */
-        if (reader->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
-                trigger_limit = UNIPERIF_FIFO_SIZE - transfer_size;
-        else
-                /*
-                 * Since SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0
-                 * FDMA_TRIGGER_LIMIT also controls when the state switches
-                 * from OFF or STANDBY to AUDIO DATA.
-                 */
-                trigger_limit = transfer_size;
-        /* Trigger limit must be an even number */
-        if ((!trigger_limit % 2) ||
-            (trigger_limit != 1 && transfer_size % 2) ||
-            (trigger_limit > UNIPERIF_CONFIG_DMA_TRIG_LIMIT_MASK(reader))) {
-                dev_err(reader->dev, "invalid trigger limit %d", trigger_limit);
-                return -EINVAL;
-        }
-        SET_UNIPERIF_CONFIG_DMA_TRIG_LIMIT(reader, trigger_limit);
-        switch (reader->daifmt & SND_SOC_DAIFMT_INV_MASK) {
-        case SND_SOC_DAIFMT_IB_IF:
-        case SND_SOC_DAIFMT_NB_IF:
-                SET_UNIPERIF_I2S_FMT_LR_POL_HIG(reader);
-                break;
-        default:
-                SET_UNIPERIF_I2S_FMT_LR_POL_LOW(reader);
-        }
        /* Force slot width to 32 in I2S mode */
        if ((reader->daifmt & SND_SOC_DAIFMT_FORMAT_MASK)
@@ -173,6 +128,109 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
+        /* Number of channels must be even */
+        if ((runtime->channels % 2) || (runtime->channels < 2) ||
+            (runtime->channels > 10)) {
+                dev_err(reader->dev, "%s: invalid nb of channels", __func__);
+                return -EINVAL;
+        }
+        SET_UNIPERIF_I2S_FMT_NUM_CH(reader, runtime->channels / 2);
+        SET_UNIPERIF_I2S_FMT_ORDER_MSB(reader);
+        return 0;
+}
+static int uni_reader_prepare_tdm(struct snd_pcm_runtime *runtime,
+                                  struct uniperif *reader)
+{
+        int frame_size; /* user tdm frame size in bytes */
+        /* default unip TDM_WORD_POS_X_Y */
+        unsigned int word_pos[4] = {
+                0x04060002, 0x0C0E080A, 0x14161012, 0x1C1E181A};
+        frame_size = sti_uniperiph_get_user_frame_size(runtime);
+        /* fix 16/0 format */
+        SET_UNIPERIF_CONFIG_MEM_FMT_16_0(reader);
+        SET_UNIPERIF_I2S_FMT_DATA_SIZE_32(reader);
+        /* number of words inserted on the TDM line */
+        SET_UNIPERIF_I2S_FMT_NUM_CH(reader, frame_size / 4 / 2);
+        SET_UNIPERIF_I2S_FMT_ORDER_MSB(reader);
+        SET_UNIPERIF_I2S_FMT_ALIGN_LEFT(reader);
+        SET_UNIPERIF_TDM_ENABLE_TDM_ENABLE(reader);
+        /*
+         * set the timeslots allocation for words in FIFO
+         *
+         * HW bug: (LSB word < MSB word) => this config is not possible
+         *         So if we want (LSB word < MSB) word, then it shall be
+         *         handled by user
+         */
+        sti_uniperiph_get_tdm_word_pos(reader, word_pos);
+        SET_UNIPERIF_TDM_WORD_POS(reader, 1_2, word_pos[WORD_1_2]);
+        SET_UNIPERIF_TDM_WORD_POS(reader, 3_4, word_pos[WORD_3_4]);
+        SET_UNIPERIF_TDM_WORD_POS(reader, 5_6, word_pos[WORD_5_6]);
+        SET_UNIPERIF_TDM_WORD_POS(reader, 7_8, word_pos[WORD_7_8]);
+        return 0;
+}
+static int uni_reader_prepare(struct snd_pcm_substream *substream,
+                              struct snd_soc_dai *dai)
+{
+        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
+        struct uniperif *reader = priv->dai_data.uni;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int transfer_size, trigger_limit, ret;
+        int count = 10;
+        /* The reader should be stopped */
+        if (reader->state != UNIPERIF_STATE_STOPPED) {
+                dev_err(reader->dev, "%s: invalid reader state %d", __func__,
+                        reader->state);
+                return -EINVAL;
+        }
+        /* Calculate transfer size (in fifo cells and bytes) for frame count */
+        if (reader->info->type == SND_ST_UNIPERIF_TYPE_TDM) {
+                /* transfer size = unip frame size (in 32 bits FIFO cell) */
+                transfer_size =
+                        sti_uniperiph_get_user_frame_size(runtime) / 4;
+        } else {
+                transfer_size = runtime->channels * UNIPERIF_FIFO_FRAMES;
+        }
+        /* Calculate number of empty cells available before asserting DREQ */
+        if (reader->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
+                trigger_limit = UNIPERIF_FIFO_SIZE - transfer_size;
+        else
+                /*
+                 * Since SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0
+                 * FDMA_TRIGGER_LIMIT also controls when the state switches
+                 * from OFF or STANDBY to AUDIO DATA.
+                 */
+                trigger_limit = transfer_size;
+        /* Trigger limit must be an even number */
+        if ((!trigger_limit % 2) ||
+            (trigger_limit != 1 && transfer_size % 2) ||
+            (trigger_limit > UNIPERIF_CONFIG_DMA_TRIG_LIMIT_MASK(reader))) {
+                dev_err(reader->dev, "invalid trigger limit %d", trigger_limit);
+                return -EINVAL;
+        }
+        SET_UNIPERIF_CONFIG_DMA_TRIG_LIMIT(reader, trigger_limit);
+        if (UNIPERIF_TYPE_IS_TDM(reader))
+                ret = uni_reader_prepare_tdm(runtime, reader);
+        else
+                ret = uni_reader_prepare_pcm(runtime, reader);
+        if (ret)
+                return ret;
        switch (reader->daifmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
                SET_UNIPERIF_I2S_FMT_ALIGN_LEFT(reader);
@@ -191,21 +249,26 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
-        SET_UNIPERIF_I2S_FMT_ORDER_MSB(reader);
+        /* Data clocking (changing) on the rising/falling edge */
+        switch (reader->daifmt & SND_SOC_DAIFMT_INV_MASK) {
-        /* Data clocking (changing) on the rising edge */
+        case SND_SOC_DAIFMT_NB_NF:
-        SET_UNIPERIF_I2S_FMT_SCLK_EDGE_RISING(reader);
+                SET_UNIPERIF_I2S_FMT_LR_POL_LOW(reader);
+                SET_UNIPERIF_I2S_FMT_SCLK_EDGE_RISING(reader);
-        /* Number of channels must be even */
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
-        if ((runtime->channels % 2) || (runtime->channels < 2) ||
+                SET_UNIPERIF_I2S_FMT_LR_POL_HIG(reader);
-            (runtime->channels > 10)) {
+                SET_UNIPERIF_I2S_FMT_SCLK_EDGE_RISING(reader);
-                dev_err(reader->dev, "%s: invalid nb of channels", __func__);
+                break;
-                return -EINVAL;
+        case SND_SOC_DAIFMT_IB_NF:
+                SET_UNIPERIF_I2S_FMT_LR_POL_LOW(reader);
+                SET_UNIPERIF_I2S_FMT_SCLK_EDGE_FALLING(reader);
+                break;
+        case SND_SOC_DAIFMT_IB_IF:
+                SET_UNIPERIF_I2S_FMT_LR_POL_HIG(reader);
+                SET_UNIPERIF_I2S_FMT_SCLK_EDGE_FALLING(reader);
+                break;
        }
-        SET_UNIPERIF_I2S_FMT_NUM_CH(reader, runtime->channels / 2);
        /* Clear any pending interrupts */
        SET_UNIPERIF_ITS_BCLR(reader, GET_UNIPERIF_ITS(reader));
@@ -293,6 +356,32 @@ static int  uni_reader_trigger(struct snd_pcm_substream *substream,
        }
 }
+static int uni_reader_startup(struct snd_pcm_substream *substream,
+                              struct snd_soc_dai *dai)
+{
+        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
+        struct uniperif *reader = priv->dai_data.uni;
+        int ret;
+        if (!UNIPERIF_TYPE_IS_TDM(reader))
+                return 0;
+        /* refine hw constraint in tdm mode */
+        ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                  SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  sti_uniperiph_fix_tdm_chan,
+                                  reader, SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  -1);
+        if (ret < 0)
+                return ret;
+        return snd_pcm_hw_rule_add(substream->runtime, 0,
+                                   SNDRV_PCM_HW_PARAM_FORMAT,
+                                   sti_uniperiph_fix_tdm_format,
+                                   reader, SNDRV_PCM_HW_PARAM_FORMAT,
+                                   -1);
+}
 static void uni_reader_shutdown(struct snd_pcm_substream *substream,
                                struct snd_soc_dai *dai)
 {
@@ -310,6 +399,7 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
 {
        struct uniperif_info *info;
        struct device_node *node = pdev->dev.of_node;
+        const char *mode;
        /* Allocate memory for the info structure */
        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -322,6 +412,17 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
                return -EINVAL;
        }
+        /* Read the device mode property */
+        if (of_property_read_string(node, "st,mode", &mode)) {
+                dev_err(&pdev->dev, "uniperipheral mode not defined");
+                return -EINVAL;
+        }
+        if (strcasecmp(mode, "tdm") == 0)
+                info->type = SND_ST_UNIPERIF_TYPE_TDM;
+        else
+                info->type = SND_ST_UNIPERIF_TYPE_PCM;
        /* Save the info structure */
        reader->info = info;
@@ -329,11 +430,13 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
 }
 static const struct snd_soc_dai_ops uni_reader_dai_ops = {
+                .startup = uni_reader_startup,
                .shutdown = uni_reader_shutdown,
                .prepare = uni_reader_prepare,
                .trigger = uni_reader_trigger,
                .hw_params = sti_uniperiph_dai_hw_params,
                .set_fmt = sti_uniperiph_dai_set_fmt,
+                .set_tdm_slot = sti_uniperiph_set_tdm_slot
 };
 int uni_reader_init(struct platform_device *pdev,
@@ -343,7 +446,6 @@ int uni_reader_init(struct platform_device *pdev,
        reader->dev = &pdev->dev;
        reader->state = UNIPERIF_STATE_STOPPED;
-        reader->hw = &uni_reader_pcm_hw;
        reader->dai_ops = &uni_reader_dai_ops;
        ret = uni_reader_parse_dt(pdev, reader);
@@ -352,6 +454,11 @@ int uni_reader_init(struct platform_device *pdev,
                return ret;
        }
+        if (UNIPERIF_TYPE_IS_TDM(reader))
+                reader->hw = &uni_tdm_hw;
+        else
+                reader->hw = &uni_reader_pcm_hw;
        ret = devm_request_irq(&pdev->dev, reader->irq,
                               uni_reader_irq_handler, IRQF_SHARED,
                               dev_name(&pdev->dev), reader);
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 6b7707270aa3..9f878619077a 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -30,6 +30,7 @@ endef
 FEATURE_TESTS_BASIC :=                  \
        backtrace                       \
        dwarf                           \
+        dwarf_getlocations              \
        fortify-source                  \
        sync-compare-and-swap           \
        glibc                           \
@@ -78,6 +79,7 @@ endif
 FEATURE_DISPLAY ?=                      \
        dwarf                           \
+        dwarf_getlocations              \
        glibc                           \
        gtk2                            \
        libaudit                        \
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index c5f4c417428d..4ae94dbfdab9 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -3,6 +3,7 @@ FILES=					\
        test-backtrace.bin              \
        test-bionic.bin                 \
        test-dwarf.bin                  \
+        test-dwarf_getlocations.bin     \
        test-fortify-source.bin         \
        test-sync-compare-and-swap.bin  \
        test-glibc.bin                  \
@@ -82,6 +83,9 @@ endif
 $(OUTPUT)test-dwarf.bin:
        $(BUILD) $(DWARFLIBS)
+$(OUTPUT)test-dwarf_getlocations.bin:
+        $(BUILD) $(DWARFLIBS)
 $(OUTPUT)test-libelf-mmap.bin:
        $(BUILD) -lelf
diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
index e499a36c1e4a..a282e8cb84f3 100644
--- a/tools/build/feature/test-all.c
+++ b/tools/build/feature/test-all.c
@@ -41,6 +41,10 @@
 # include "test-dwarf.c"
 #undef main
+#define main main_test_dwarf_getlocations
+# include "test-dwarf_getlocations.c"
+#undef main
 #define main main_test_libelf_getphdrnum
 # include "test-libelf-getphdrnum.c"
 #undef main
@@ -143,6 +147,7 @@ int main(int argc, char *argv[])
        main_test_libelf_mmap();
        main_test_glibc();
        main_test_dwarf();
+        main_test_dwarf_getlocations();
        main_test_libelf_getphdrnum();
        main_test_libunwind();
        main_test_libaudit();
diff --git a/tools/build/feature/test-dwarf_getlocations.c b/tools/build/feature/test-dwarf_getlocations.c
new file mode 100644
index 000000000000..70162699dd43
--- /dev/null
+++ b/tools/build/feature/test-dwarf_getlocations.c
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+#include <elfutils/libdw.h>
+int main(void)
+{
+        Dwarf_Addr base, start, end;
+        Dwarf_Attribute attr;
+        Dwarf_Op *op;
+        size_t nops;
+        ptrdiff_t offset = 0;
+        return (int)dwarf_getlocations(&attr, offset, &base, &start, &end, &op, &nops);
+}
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 0144b3d1bb77..88cccea3ca99 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1164,11 +1164,11 @@ process_filter(struct event_format *event, struct filter_arg **parg,
                current_op = current_exp;
        ret = collapse_tree(current_op, parg, error_str);
+        /* collapse_tree() may free current_op, and updates parg accordingly */
+        current_op = NULL;
        if (ret < 0)
                goto fail;
-        *parg = current_op;
        free(token);
        return 0;
diff --git a/tools/net/bpf_jit_disasm.c b/tools/net/bpf_jit_disasm.c
index 5b3241340945..544b05a53b70 100644
--- a/tools/net/bpf_jit_disasm.c
+++ b/tools/net/bpf_jit_disasm.c
@@ -98,6 +98,9 @@ static char *get_klog_buff(unsigned int *klen)
        char *buff;
        len = klogctl(CMD_ACTION_SIZE_BUFFER, NULL, 0);
+        if (len < 0)
+                return NULL;
        buff = malloc(len);
        if (!buff)
                return NULL;
diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c
index 9223c164e545..1f86ee8fb831 100644
--- a/tools/perf/arch/x86/util/dwarf-regs.c
+++ b/tools/perf/arch/x86/util/dwarf-regs.c
@@ -63,6 +63,8 @@ struct pt_regs_offset {
 # define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
 #endif
+/* TODO: switching by dwarf address size */
+#ifndef __x86_64__
 static const struct pt_regs_offset x86_32_regoffset_table[] = {
        REG_OFFSET_NAME_32("%ax",       eax),
        REG_OFFSET_NAME_32("%cx",       ecx),
@@ -75,6 +77,8 @@ static const struct pt_regs_offset x86_32_regoffset_table[] = {
        REG_OFFSET_END,
 };
+#define regoffset_table x86_32_regoffset_table
+#else
 static const struct pt_regs_offset x86_64_regoffset_table[] = {
        REG_OFFSET_NAME_64("%ax",       rax),
        REG_OFFSET_NAME_64("%dx",       rdx),
@@ -95,11 +99,7 @@ static const struct pt_regs_offset x86_64_regoffset_table[] = {
        REG_OFFSET_END,
 };
-/* TODO: switching by dwarf address size */
-#ifdef __x86_64__
 #define regoffset_table x86_64_regoffset_table
-#else
-#define regoffset_table x86_32_regoffset_table
 #endif
 /* Minus 1 for the ending REG_OFFSET_END */
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 3770c3dffe5e..52826696c852 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1415,21 +1415,19 @@ static int is_directory(const char *base_path, const struct dirent *dent)
        return S_ISDIR(st.st_mode);
 }
-#define for_each_lang(scripts_path, scripts_dir, lang_dirent, lang_next)\
+#define for_each_lang(scripts_path, scripts_dir, lang_dirent)           \
-        while (!readdir_r(scripts_dir, &lang_dirent, &lang_next) &&     \
+        while ((lang_dirent = readdir(scripts_dir)) != NULL)            \
-               lang_next)                                               \
+                if ((lang_dirent->d_type == DT_DIR ||                   \
-                if ((lang_dirent.d_type == DT_DIR ||                    \
+                     (lang_dirent->d_type == DT_UNKNOWN &&              \
-                     (lang_dirent.d_type == DT_UNKNOWN &&               \
+                      is_directory(scripts_path, lang_dirent))) &&      \
-                      is_directory(scripts_path, &lang_dirent))) &&     \
+                    (strcmp(lang_dirent->d_name, ".")) &&               \
-                    (strcmp(lang_dirent.d_name, ".")) &&                \
+                    (strcmp(lang_dirent->d_name, "..")))
-                    (strcmp(lang_dirent.d_name, "..")))
+#define for_each_script(lang_path, lang_dir, script_dirent)             \
-#define for_each_script(lang_path, lang_dir, script_dirent, script_next)\
+        while ((script_dirent = readdir(lang_dir)) != NULL)             \
-        while (!readdir_r(lang_dir, &script_dirent, &script_next) &&    \
+                if (script_dirent->d_type != DT_DIR &&                  \
-               script_next)                                             \
+                    (script_dirent->d_type != DT_UNKNOWN ||             \
-                if (script_dirent.d_type != DT_DIR &&                   \
+                     !is_directory(lang_path, script_dirent)))
-                    (script_dirent.d_type != DT_UNKNOWN ||              \
-                     !is_directory(lang_path, &script_dirent)))
 #define RECORD_SUFFIX                   "-record"
@@ -1575,7 +1573,7 @@ static int list_available_scripts(const struct option *opt __maybe_unused,
                                  const char *s __maybe_unused,
                                  int unset __maybe_unused)
 {
-        struct dirent *script_next, *lang_next, script_dirent, lang_dirent;
+        struct dirent *script_dirent, *lang_dirent;
        char scripts_path[MAXPATHLEN];
        DIR *scripts_dir, *lang_dir;
        char script_path[MAXPATHLEN];
@@ -1590,19 +1588,19 @@ static int list_available_scripts(const struct option *opt __maybe_unused,
        if (!scripts_dir)
                return -1;
-        for_each_lang(scripts_path, scripts_dir, lang_dirent, lang_next) {
+        for_each_lang(scripts_path, scripts_dir, lang_dirent) {
                snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
-                         lang_dirent.d_name);
+                         lang_dirent->d_name);
                lang_dir = opendir(lang_path);
                if (!lang_dir)
                        continue;
-                for_each_script(lang_path, lang_dir, script_dirent, script_next) {
+                for_each_script(lang_path, lang_dir, script_dirent) {
-                        script_root = get_script_root(&script_dirent, REPORT_SUFFIX);
+                        script_root = get_script_root(script_dirent, REPORT_SUFFIX);
                        if (script_root) {
                                desc = script_desc__findnew(script_root);
                                snprintf(script_path, MAXPATHLEN, "%s/%s",
-                                         lang_path, script_dirent.d_name);
+                                         lang_path, script_dirent->d_name);
                                read_script_info(desc, script_path);
                                free(script_root);
                        }
@@ -1690,7 +1688,7 @@ static int check_ev_match(char *dir_name, char *scriptname,
 */
 int find_scripts(char **scripts_array, char **scripts_path_array)
 {
-        struct dirent *script_next, *lang_next, script_dirent, lang_dirent;
+        struct dirent *script_dirent, *lang_dirent;
        char scripts_path[MAXPATHLEN], lang_path[MAXPATHLEN];
        DIR *scripts_dir, *lang_dir;
        struct perf_session *session;
@@ -1713,9 +1711,9 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
                return -1;
        }
-        for_each_lang(scripts_path, scripts_dir, lang_dirent, lang_next) {
+        for_each_lang(scripts_path, scripts_dir, lang_dirent) {
                snprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path,
-                         lang_dirent.d_name);
+                         lang_dirent->d_name);
 #ifdef NO_LIBPERL
                if (strstr(lang_path, "perl"))
                        continue;
@@ -1729,16 +1727,16 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
                if (!lang_dir)
                        continue;
-                for_each_script(lang_path, lang_dir, script_dirent, script_next) {
+                for_each_script(lang_path, lang_dir, script_dirent) {
                        /* Skip those real time scripts: xxxtop.p[yl] */
-                        if (strstr(script_dirent.d_name, "top."))
+                        if (strstr(script_dirent->d_name, "top."))
                                continue;
                        sprintf(scripts_path_array[i], "%s/%s", lang_path,
-                                script_dirent.d_name);
+                                script_dirent->d_name);
-                        temp = strchr(script_dirent.d_name, '.');
+                        temp = strchr(script_dirent->d_name, '.');
                        snprintf(scripts_array[i],
-                                (temp - script_dirent.d_name) + 1,
+                                (temp - script_dirent->d_name) + 1,
-                                "%s", script_dirent.d_name);
+                                "%s", script_dirent->d_name);
                        if (check_ev_match(lang_path,
                                        scripts_array[i], session))
@@ -1756,7 +1754,7 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
 static char *get_script_path(const char *script_root, const char *suffix)
 {
-        struct dirent *script_next, *lang_next, script_dirent, lang_dirent;
+        struct dirent *script_dirent, *lang_dirent;
        char scripts_path[MAXPATHLEN];
        char script_path[MAXPATHLEN];
        DIR *scripts_dir, *lang_dir;
@@ -1769,21 +1767,21 @@ static char *get_script_path(const char *script_root, const char *suffix)
        if (!scripts_dir)
                return NULL;
-        for_each_lang(scripts_path, scripts_dir, lang_dirent, lang_next) {
+        for_each_lang(scripts_path, scripts_dir, lang_dirent) {
                snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
-                         lang_dirent.d_name);
+                         lang_dirent->d_name);
                lang_dir = opendir(lang_path);
                if (!lang_dir)
                        continue;
-                for_each_script(lang_path, lang_dir, script_dirent, script_next) {
+                for_each_script(lang_path, lang_dir, script_dirent) {
-                        __script_root = get_script_root(&script_dirent, suffix);
+                        __script_root = get_script_root(script_dirent, suffix);
                        if (__script_root && !strcmp(script_root, __script_root)) {
                                free(__script_root);
                                closedir(lang_dir);
                                closedir(scripts_dir);
                                snprintf(script_path, MAXPATHLEN, "%s/%s",
-                                         lang_path, script_dirent.d_name);
+                                         lang_path, script_dirent->d_name);
                                return strdup(script_path);
                        }
                        free(__script_root);
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 1f19f2f999c8..307e8a1a003c 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -528,6 +528,7 @@ static int __run_perf_stat(int argc, const char **argv)
                perf_evlist__set_leader(evsel_list);
        evlist__for_each(evsel_list, counter) {
+try_again:
                if (create_perf_stat_counter(counter) < 0) {
                        /*
                         * PPC returns ENXIO for HW counters until 2.6.37
@@ -544,7 +545,11 @@ static int __run_perf_stat(int argc, const char **argv)
                                if ((counter->leader != counter) ||
                                    !(counter->leader->nr_members > 1))
                                        continue;
-                        }
+                        } else if (perf_evsel__fallback(counter, errno, msg, sizeof(msg))) {
+                                if (verbose)
+                                        ui__warning("%s\n", msg);
+                                goto try_again;
+                        }
                        perf_evsel__open_strerror(counter, &target,
                                                  errno, msg, sizeof(msg));
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index f7d7f5a1cad5..6f8f6430f2bf 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -268,6 +268,12 @@ else
    ifneq ($(feature-dwarf), 1)
      msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
      NO_DWARF := 1
+    else
+      ifneq ($(feature-dwarf_getlocations), 1)
+        msg := $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157);
+      else
+        CFLAGS += -DHAVE_DWARF_GETLOCATIONS
+      endif # dwarf_getlocations
    endif # Dwarf support
  endif # libelf support
 endif # NO_LIBELF
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index 577e600c8eb1..aea189b41cc8 100644
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -959,6 +959,7 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf)
        return 0;
 }
+#ifdef HAVE_DWARF_GETLOCATIONS
 /**
 * die_get_var_innermost_scope - Get innermost scope range of given variable DIE
 * @sp_die: a subprogram DIE
@@ -1080,3 +1081,11 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)
        return ret;
 }
+#else
+int die_get_var_range(Dwarf_Die *sp_die __maybe_unused,
+                      Dwarf_Die *vr_die __maybe_unused,
+                      struct strbuf *buf __maybe_unused)
+{
+        return -ENOTSUP;
+}
+#endif
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index dad55d04ffdd..edcf4ed4e99c 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -433,7 +433,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,
 {
        char filename[PATH_MAX];
        DIR *tasks;
-        struct dirent dirent, *next;
+        struct dirent *dirent;
        pid_t tgid, ppid;
        int rc = 0;
@@ -462,11 +462,11 @@ static int __event__synthesize_thread(union perf_event *comm_event,
                return 0;
        }
-        while (!readdir_r(tasks, &dirent, &next) && next) {
+        while ((dirent = readdir(tasks)) != NULL) {
                char *end;
                pid_t _pid;
-                _pid = strtol(dirent.d_name, &end, 10);
+                _pid = strtol(dirent->d_name, &end, 10);
                if (*end)
                        continue;
@@ -575,7 +575,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
 {
        DIR *proc;
        char proc_path[PATH_MAX];
-        struct dirent dirent, *next;
+        struct dirent *dirent;
        union perf_event *comm_event, *mmap_event, *fork_event;
        int err = -1;
@@ -600,9 +600,9 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
        if (proc == NULL)
                goto out_free_fork;
-        while (!readdir_r(proc, &dirent, &next) && next) {
+        while ((dirent = readdir(proc)) != NULL) {
                char *end;
-                pid_t pid = strtol(dirent.d_name, &end, 10);
+                pid_t pid = strtol(dirent->d_name, &end, 10);
                if (*end) /* only interested in proper numerical dirents */
                        continue;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 738ce226002b..645dc1828836 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2345,6 +2345,8 @@ out:
 bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
                          char *msg, size_t msgsize)
 {
+        int paranoid;
        if ((err == ENOENT || err == ENXIO || err == ENODEV) &&
            evsel->attr.type   == PERF_TYPE_HARDWARE &&
            evsel->attr.config == PERF_COUNT_HW_CPU_CYCLES) {
@@ -2364,6 +2366,22 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
                zfree(&evsel->name);
                return true;
+        } else if (err == EACCES && !evsel->attr.exclude_kernel &&
+                   (paranoid = perf_event_paranoid()) > 1) {
+                const char *name = perf_evsel__name(evsel);
+                char *new_name;
+                if (asprintf(&new_name, "%s%su", name, strchr(name, ':') ? "" : ":") < 0)
+                        return false;
+                if (evsel->name)
+                        free(evsel->name);
+                evsel->name = new_name;
+                scnprintf(msg, msgsize,
+"kernel.perf_event_paranoid=%d, trying to fall back to excluding kernel samples", paranoid);
+                evsel->attr.exclude_kernel = 1;
+                return true;
        }
        return false;
@@ -2382,12 +2400,13 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target,
                 "Consider tweaking /proc/sys/kernel/perf_event_paranoid,\n"
                 "which controls use of the performance events system by\n"
                 "unprivileged users (without CAP_SYS_ADMIN).\n\n"
-                 "The default value is 1:\n\n"
+                 "The current value is %d:\n\n"
                 "  -1: Allow use of (almost) all events by all users\n"
                 ">= 0: Disallow raw tracepoint access by users without CAP_IOC_LOCK\n"
                 ">= 1: Disallow CPU event access by users without CAP_SYS_ADMIN\n"
                 ">= 2: Disallow kernel profiling by users without CAP_SYS_ADMIN",
-                                 target->system_wide ? "system-wide " : "");
+                                 target->system_wide ? "system-wide " : "",
+                                 perf_event_paranoid());
        case ENOENT:
                return scnprintf(msg, size, "The %s event is not supported.",
                                 perf_evsel__name(evsel));
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 4c19d5e79d8c..bcbc983d4b12 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -138,11 +138,11 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {
 #define PERF_EVENT_TYPE(config)         __PERF_EVENT_FIELD(config, TYPE)
 #define PERF_EVENT_ID(config)           __PERF_EVENT_FIELD(config, EVENT)
-#define for_each_subsystem(sys_dir, sys_dirent, sys_next)              \
+#define for_each_subsystem(sys_dir, sys_dirent)                 \
-        while (!readdir_r(sys_dir, &sys_dirent, &sys_next) && sys_next)        \
+        while ((sys_dirent = readdir(sys_dir)) != NULL)         \
-        if (sys_dirent.d_type == DT_DIR &&                                     \
+                if (sys_dirent->d_type == DT_DIR &&             \
-           (strcmp(sys_dirent.d_name, ".")) &&                                 \
+                    (strcmp(sys_dirent->d_name, ".")) &&        \
-           (strcmp(sys_dirent.d_name, "..")))
+                    (strcmp(sys_dirent->d_name, "..")))
 static int tp_event_has_id(struct dirent *sys_dir, struct dirent *evt_dir)
 {
@@ -159,12 +159,12 @@ static int tp_event_has_id(struct dirent *sys_dir, struct dirent *evt_dir)
        return 0;
 }
-#define for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next)              \
+#define for_each_event(sys_dirent, evt_dir, evt_dirent)         \
-        while (!readdir_r(evt_dir, &evt_dirent, &evt_next) && evt_next)        \
+        while ((evt_dirent = readdir(evt_dir)) != NULL)         \
-        if (evt_dirent.d_type == DT_DIR &&                                     \
+                if (evt_dirent->d_type == DT_DIR &&             \
-           (strcmp(evt_dirent.d_name, ".")) &&                                 \
+                    (strcmp(evt_dirent->d_name, ".")) &&        \
-           (strcmp(evt_dirent.d_name, "..")) &&                                \
+                    (strcmp(evt_dirent->d_name, "..")) &&       \
-           (!tp_event_has_id(&sys_dirent, &evt_dirent)))
+                    (!tp_event_has_id(sys_dirent, evt_dirent)))
 #define MAX_EVENT_LENGTH 512
@@ -173,7 +173,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
 {
        struct tracepoint_path *path = NULL;
        DIR *sys_dir, *evt_dir;
-        struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
+        struct dirent *sys_dirent, *evt_dirent;
        char id_buf[24];
        int fd;
        u64 id;
@@ -184,18 +184,18 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
        if (!sys_dir)
                return NULL;
-        for_each_subsystem(sys_dir, sys_dirent, sys_next) {
+        for_each_subsystem(sys_dir, sys_dirent) {
                snprintf(dir_path, MAXPATHLEN, "%s/%s", tracing_events_path,
-                         sys_dirent.d_name);
+                         sys_dirent->d_name);
                evt_dir = opendir(dir_path);
                if (!evt_dir)
                        continue;
-                for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
+                for_each_event(sys_dirent, evt_dir, evt_dirent) {
                        snprintf(evt_path, MAXPATHLEN, "%s/%s/id", dir_path,
-                                 evt_dirent.d_name);
+                                 evt_dirent->d_name);
                        fd = open(evt_path, O_RDONLY);
                        if (fd < 0)
                                continue;
@@ -220,9 +220,9 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
                                        free(path);
                                        return NULL;
                                }
-                                strncpy(path->system, sys_dirent.d_name,
+                                strncpy(path->system, sys_dirent->d_name,
                                        MAX_EVENT_LENGTH);
-                                strncpy(path->name, evt_dirent.d_name,
+                                strncpy(path->name, evt_dirent->d_name,
                                        MAX_EVENT_LENGTH);
                                return path;
                        }
@@ -1812,7 +1812,7 @@ void print_tracepoint_events(const char *subsys_glob, const char *event_glob,
                             bool name_only)
 {
        DIR *sys_dir, *evt_dir;
-        struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
+        struct dirent *sys_dirent, *evt_dirent;
        char evt_path[MAXPATHLEN];
        char dir_path[MAXPATHLEN];
        char **evt_list = NULL;
@@ -1830,20 +1830,20 @@ restart:
                        goto out_close_sys_dir;
        }
-        for_each_subsystem(sys_dir, sys_dirent, sys_next) {
+        for_each_subsystem(sys_dir, sys_dirent) {
                if (subsys_glob != NULL &&
-                    !strglobmatch(sys_dirent.d_name, subsys_glob))
+                    !strglobmatch(sys_dirent->d_name, subsys_glob))
                        continue;
                snprintf(dir_path, MAXPATHLEN, "%s/%s", tracing_events_path,
-                         sys_dirent.d_name);
+                         sys_dirent->d_name);
                evt_dir = opendir(dir_path);
                if (!evt_dir)
                        continue;
-                for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
+                for_each_event(sys_dirent, evt_dir, evt_dirent) {
                        if (event_glob != NULL &&
-                            !strglobmatch(evt_dirent.d_name, event_glob))
+                            !strglobmatch(evt_dirent->d_name, event_glob))
                                continue;
                        if (!evt_num_known) {
@@ -1852,7 +1852,7 @@ restart:
                        }
                        snprintf(evt_path, MAXPATHLEN, "%s:%s",
-                                 sys_dirent.d_name, evt_dirent.d_name);
+                                 sys_dirent->d_name, evt_dirent->d_name);
                        evt_list[evt_i] = strdup(evt_path);
                        if (evt_list[evt_i] == NULL)
@@ -1905,7 +1905,7 @@ out_close_sys_dir:
 int is_valid_tracepoint(const char *event_string)
 {
        DIR *sys_dir, *evt_dir;
-        struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
+        struct dirent *sys_dirent, *evt_dirent;
        char evt_path[MAXPATHLEN];
        char dir_path[MAXPATHLEN];
@@ -1913,17 +1913,17 @@ int is_valid_tracepoint(const char *event_string)
        if (!sys_dir)
                return 0;
-        for_each_subsystem(sys_dir, sys_dirent, sys_next) {
+        for_each_subsystem(sys_dir, sys_dirent) {
                snprintf(dir_path, MAXPATHLEN, "%s/%s", tracing_events_path,
-                         sys_dirent.d_name);
+                         sys_dirent->d_name);
                evt_dir = opendir(dir_path);
                if (!evt_dir)
                        continue;
-                for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
+                for_each_event(sys_dirent, evt_dir, evt_dirent) {
                        snprintf(evt_path, MAXPATHLEN, "%s:%s",
-                                 sys_dirent.d_name, evt_dirent.d_name);
+                                 sys_dirent->d_name, evt_dirent->d_name);
                        if (!strcmp(evt_path, event_string)) {
                                closedir(evt_dir);
                                closedir(sys_dir);
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 47966a1618c7..f5ba111cd9fb 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2445,6 +2445,9 @@ static char *prefix_if_not_in(const char *pre, char *str)
 static char *setup_overhead(char *keys)
 {
+        if (sort__mode == SORT_MODE__DIFF)
+                return keys;
        keys = prefix_if_not_in("overhead", keys);
        if (symbol_conf.cumulate_callchain)
diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index 08afc6909953..267112b4e3db 100644
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -94,7 +94,7 @@ struct thread_map *thread_map__new_by_uid(uid_t uid)
        DIR *proc;
        int max_threads = 32, items, i;
        char path[256];
-        struct dirent dirent, *next, **namelist = NULL;
+        struct dirent *dirent, **namelist = NULL;
        struct thread_map *threads = thread_map__alloc(max_threads);
        if (threads == NULL)
@@ -107,16 +107,16 @@ struct thread_map *thread_map__new_by_uid(uid_t uid)
        threads->nr = 0;
        atomic_set(&threads->refcnt, 1);
-        while (!readdir_r(proc, &dirent, &next) && next) {
+        while ((dirent = readdir(proc)) != NULL) {
                char *end;
                bool grow = false;
                struct stat st;
-                pid_t pid = strtol(dirent.d_name, &end, 10);
+                pid_t pid = strtol(dirent->d_name, &end, 10);
                if (*end) /* only interested in proper numerical dirents */
                        continue;
-                snprintf(path, sizeof(path), "/proc/%s", dirent.d_name);
+                snprintf(path, sizeof(path), "/proc/%s", dirent->d_name);
                if (stat(path, &st) != 0)
                        continue;
author	Takashi Iwai <tiwai@suse.de>	2016-05-27 11:16:53 -0400
committer	Takashi Iwai <tiwai@suse.de>	2016-05-27 11:16:53 -0400
commit	eb4606e64a7d548f5d60a9583baa8104890b2c6e (patch)
tree	2dc8e587fc79c207dab2fb74830963cc84dcf801
parent	86c72d1ce91d804e4fa8d90b316a89597dd220f1 (diff)
parent	bf65921380cd50b87618df550398e06581f4a361 (diff)