388 files changed, 3348 insertions, 3427 deletions

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index c75e5d6b8fa8..a6eb7dcd4dd5 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml  \
             kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
             gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
             genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
-            80211.xml sh.xml regulator.xml w1.xml \
+            sh.xml regulator.xml w1.xml \
             writing_musb_glue_layer.xml iio.xml
 
 ifeq ($(DOCBOOKS),)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 21e2d8863705..be7c0d9506b1 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -106,6 +106,16 @@
                         use by PCI
                         Format: <irq>,<irq>...
 
+        acpi_mask_gpe=  [HW,ACPI]
+                        Due to the existence of _Lxx/_Exx, some GPEs triggered
+                        by unsupported hardware/firmware features can result in
+                        GPE floodings that cannot be automatically disabled by
+                        the GPE dispatcher.
+                        This facility can be used to prevent such uncontrolled
+                        GPE floodings.
+                        Format: <int>
+                        Support masking of GPEs numbered from 0x00 to 0x7f.
+
         acpi_no_auto_serialize  [HW,ACPI]
                         Disable auto-serialization of AML methods
                         AML control methods that contain the opcodes to create
@@ -3811,10 +3821,11 @@
                         it if 0 is given (See Documentation/cgroup-v1/memory.txt)
 
         swiotlb=        [ARM,IA-64,PPC,MIPS,X86]
-                        Format: { <int> | force }
+                        Format: { <int> | force | noforce }
                         <int> -- Number of I/O TLB slabs
                         force -- force using of bounce buffers even if they
                                  wouldn't be automatically used by the kernel
+                        noforce -- Never use bounce buffers (for debugging)
 
         switches=       [HW,M68k]
 
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index cd0243302bc1..d7b1f016bd62 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -63,10 +63,18 @@ SunXi family
         + User Manual
           http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf
 
+      - Allwinner H2+ (sun8i)
+        + No document available now, but is known to be working properly with
+          H3 drivers and memory map.
+
       - Allwinner H3 (sun8i)
         + Datasheet
           http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf
 
+      - Allwinner V3s (sun8i)
+        + Datasheet
+          http://linux-sunxi.org/File:Allwinner_V3s_Datasheet_V1.0.pdf
+
     * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
       - Allwinner A80
         + Datasheet
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index 51642159aedb..c0a3bb5a6e4e 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.
 
 io_poll (RW)
 ------------
-When read, this file shows the total number of block IO polls and how
-many returned success.  Writing '0' to this file will disable polling
-for this device.  Writing any non-zero value will enable this feature.
+When read, this file shows whether polling is enabled (1) or disabled
+(0).  Writing '0' to this file will disable polling for this device.
+Writing any non-zero value will enable this feature.
 
 io_poll_delay (RW)
 ------------------
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index a1bcfeed5f24..3c2fd72d0bf9 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -202,6 +202,7 @@ nodes to be present and contain the properties described below.
                             "marvell,armada-380-smp"
                             "marvell,armada-390-smp"
                             "marvell,armada-xp-smp"
+                            "marvell,98dx3236-smp"
                             "mediatek,mt6589-smp"
                             "mediatek,mt81xx-tz-smp"
                             "qcom,gcc-msm8660"
diff --git a/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt b/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt
new file mode 100644
index 000000000000..26eb9d3aa630
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt
@@ -0,0 +1,16 @@
+Resume Control
+--------------
+Available on Marvell SOCs: 98DX3336 and 98DX4251
+
+Required properties:
+
+- compatible: must be "marvell,98dx3336-resume-ctrl"
+
+- reg: Should contain resume control registers location and length
+
+Example:
+
+resume@20980 {
+        compatible = "marvell,98dx3336-resume-ctrl";
+        reg = <0x20980 0x10>;
+};
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 4d6467cc2aa2..d2c46449b4eb 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -12,6 +12,7 @@ using one of the following compatible strings:
   allwinner,sun8i-a23
   allwinner,sun8i-a33
   allwinner,sun8i-a83t
+  allwinner,sun8i-h2-plus
   allwinner,sun8i-h3
   allwinner,sun9i-a80
   allwinner,sun50i-a64
diff --git a/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt b/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
index 3938caacf11c..8346fb18a358 100644
--- a/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
+++ b/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
@@ -33,7 +33,7 @@ Required properties:
 - i80-if-timings: timing configuration for lcd i80 interface support.
 
 Optional Properties:
-- samsung,power-domain: a phandle to DECON power domain node.
+- power-domains: a phandle to DECON power domain node.
 - display-timings: timing settings for DECON, as described in document [1].
                 Can be used in case timings cannot be provided otherwise
                 or to override timings provided by the panel.
diff --git a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
index 3e5b9793341f..8682ab6d4a50 100644
--- a/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
+++ b/Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
@@ -8,8 +8,9 @@ This driver provides a simple power button event via an Interrupt.
 Required properties:
 - compatible: should be "ti,tps65217-pwrbutton" or "ti,tps65218-pwrbutton"
 
-Required properties for TPS65218:
+Required properties:
 - interrupts: should be one of the following
+   - <2>: For controllers compatible with tps65217
    - <3 IRQ_TYPE_EDGE_BOTH>: For controllers compatible with tps65218
 
 Examples:
@@ -17,6 +18,7 @@ Examples:
 &tps {
         tps65217-pwrbutton {
                 compatible = "ti,tps65217-pwrbutton";
+                interrupts = <2>;
         };
 };
 
diff --git a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
index 98d131acee95..a11072c5a866 100644
--- a/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
+++ b/Documentation/devicetree/bindings/power/supply/tps65217_charger.txt
@@ -2,11 +2,16 @@ TPS65217 Charger
 
 Required Properties:
 -compatible: "ti,tps65217-charger"
+-interrupts: TPS65217 interrupt numbers for the AC and USB charger input change.
+             Should be <0> for the USB charger and <1> for the AC adapter.
+-interrupt-names: Should be "USB" and "AC"
 
 This node is a subnode of the tps65217 PMIC.
 
 Example:
 
         tps65217-charger {
-                compatible = "ti,tps65090-charger";
+                compatible = "ti,tps65217-charger";
+                interrupts = <0>, <1>;
+                interrupt-names = "USB", "AC";
         };
diff --git a/Documentation/driver-api/infrastructure.rst b/Documentation/driver-api/infrastructure.rst
index 0bb0b5fc9512..6d9ff316b608 100644
--- a/Documentation/driver-api/infrastructure.rst
+++ b/Documentation/driver-api/infrastructure.rst
@@ -55,21 +55,6 @@ Device Drivers DMA Management
 .. kernel-doc:: drivers/base/dma-mapping.c
    :export:
 
-Device Drivers Power Management
--------------------------------
-
-.. kernel-doc:: drivers/base/power/main.c
-   :export:
-
-Device Drivers ACPI Support
----------------------------
-
-.. kernel-doc:: drivers/acpi/scan.c
-   :export:
-
-.. kernel-doc:: drivers/acpi/scan.c
-   :internal:
-
 Device drivers PnP support
 --------------------------
 
diff --git a/Documentation/networking/mpls-sysctl.txt b/Documentation/networking/mpls-sysctl.txt
index 9ed15f86c17c..15d8d16934fd 100644
--- a/Documentation/networking/mpls-sysctl.txt
+++ b/Documentation/networking/mpls-sysctl.txt
@@ -5,8 +5,8 @@ platform_labels - INTEGER
         possible to configure forwarding for label values equal to or
         greater than the number of platform labels.
 
-        A dense utliziation of the entries in the platform label table
-        is possible and expected aas the platform labels are locally
+        A dense utilization of the entries in the platform label table
+        is possible and expected as the platform labels are locally
         allocated.
 
         If the number of platform label table entries is set to 0 no
diff --git a/Documentation/unaligned-memory-access.txt b/Documentation/unaligned-memory-access.txt
index a445da098bc6..3f76c0c37920 100644
--- a/Documentation/unaligned-memory-access.txt
+++ b/Documentation/unaligned-memory-access.txt
@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
 #else
         const u16 *a = (const u16 *)addr1;
         const u16 *b = (const u16 *)addr2;
-        return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;
+        return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;
 #endif
 }
 
diff --git a/Documentation/vfio-mediated-device.txt b/Documentation/vfio-mediated-device.txt
index b38afec35edc..d226c7a5ba8b 100644
--- a/Documentation/vfio-mediated-device.txt
+++ b/Documentation/vfio-mediated-device.txt
@@ -127,22 +127,22 @@ the VFIO when devices are unbound from the driver.
 Physical Device Driver Interface
 --------------------------------
 
-The physical device driver interface provides the parent_ops[3] structure to
-define the APIs to manage work in the mediated core driver that is related to
-the physical device.
+The physical device driver interface provides the mdev_parent_ops[3] structure
+to define the APIs to manage work in the mediated core driver that is related
+to the physical device.
 
-The structures in the parent_ops structure are as follows:
+The structures in the mdev_parent_ops structure are as follows:
 
 * dev_attr_groups: attributes of the parent device
 * mdev_attr_groups: attributes of the mediated device
 * supported_config: attributes to define supported configurations
 
-The functions in the parent_ops structure are as follows:
+The functions in the mdev_parent_ops structure are as follows:
 
 * create: allocate basic resources in a driver for a mediated device
 * remove: free resources in a driver when a mediated device is destroyed
 
-The callbacks in the parent_ops structure are as follows:
+The callbacks in the mdev_parent_ops structure are as follows:
 
 * open: open callback of mediated device
 * close: close callback of mediated device
@@ -151,14 +151,14 @@ The callbacks in the parent_ops structure are as follows:
 * write: write emulation callback
 * mmap: mmap emulation callback
 
-A driver should use the parent_ops structure in the function call to register
-itself with the mdev core driver:
+A driver should use the mdev_parent_ops structure in the function call to
+register itself with the mdev core driver:
 
 extern int  mdev_register_device(struct device *dev,
-                                 const struct parent_ops *ops);
+                                 const struct mdev_parent_ops *ops);
 
-However, the parent_ops structure is not required in the function call that a
-driver should use to unregister itself with the mdev core driver:
+However, the mdev_parent_ops structure is not required in the function call
+that a driver should use to unregister itself with the mdev core driver:
 
 extern void mdev_unregister_device(struct device *dev);
 
@@ -223,6 +223,9 @@ Directories and files under the sysfs for Each Physical Device
 
         sprintf(buf, "%s-%s", dev_driver_string(parent->dev), group->name);
 
+  (or using mdev_parent_dev(mdev) to arrive at the parent device outside
+   of the core mdev code)
+
 * device_api
 
   This attribute should show which device API is being created, for example,
@@ -394,5 +397,5 @@ References
 
 [1] See Documentation/vfio.txt for more information on VFIO.
 [2] struct mdev_driver in include/linux/mdev.h
-[3] struct parent_ops in include/linux/mdev.h
+[3] struct mdev_parent_ops in include/linux/mdev.h
 [4] struct vfio_iommu_driver_ops in include/linux/vfio.h
diff --git a/MAINTAINERS b/MAINTAINERS
index cfff2c9e3d94..575c284c660f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1227,13 +1227,9 @@ S:	Maintained
 N:      efm32
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-M:      Daniel Ribeiro <drwyrm@gmail.com>
-M:      Stefan Schmidt <stefan@openezx.org>
-M:      Harald Welte <laforge@openezx.org>
-L:      openezx-devel@lists.openezx.org (moderated for non-subscribers)
-W:      http://www.openezx.org/
+M:      Robert Jarzmik <robert.jarzmik@free.fr>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-T:      topgit git://git.openezx.org/openezx.git
 F:      arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
@@ -2624,7 +2620,7 @@ M:	Lee Jones <lee@kernel.org>
 M:      Eric Anholt <eric@anholt.net>
 L:      linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
+T:      git git://github.com/anholt/linux
 S:      Maintained
 N:      bcm2835
 F:      drivers/staging/vc04_services
@@ -3800,6 +3796,7 @@ F:	include/linux/devcoredump.h
 DEVICE FREQUENCY (DEVFREQ)
 M:      MyungJoo Ham <myungjoo.ham@samsung.com>
 M:      Kyungmin Park <kyungmin.park@samsung.com>
+R:      Chanwoo Choi <cw00.choi@samsung.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 S:      Maintained
@@ -5080,9 +5077,11 @@ F:	drivers/net/wan/dlci.c
 F:      drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
+M:      Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:      linux-fbdev@vger.kernel.org
+T:      git git://github.com/bzolnier/linux.git
 Q:      http://patchwork.kernel.org/project/linux-fbdev/list/
-S:      Orphan
+S:      Maintained
 F:      Documentation/fb/
 F:      drivers/video/
 F:      include/video/
@@ -5504,6 +5503,7 @@ M:	Alex Elder <elder@kernel.org>
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
 F:      drivers/staging/greybus/
+L:      greybus-dev@lists.linaro.org
 
 GREYBUS AUDIO PROTOCOLS DRIVERS
 M:      Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@ -5961,6 +5961,7 @@ F:	drivers/media/platform/sti/hva
 Hyper-V CORE AND DRIVERS
 M:      "K. Y. Srinivasan" <kys@microsoft.com>
 M:      Haiyang Zhang <haiyangz@microsoft.com>
+M:      Stephen Hemminger <sthemmin@microsoft.com>
 L:      devel@linuxdriverproject.org
 S:      Maintained
 F:      arch/x86/include/asm/mshyperv.h
@@ -8852,17 +8853,22 @@ F:	drivers/video/fbdev/nvidia/
 NVM EXPRESS DRIVER
 M:      Keith Busch <keith.busch@intel.com>
 M:      Jens Axboe <axboe@fb.com>
+M:      Christoph Hellwig <hch@lst.de>
+M:      Sagi Grimberg <sagi@grimberg.me>
 L:      linux-nvme@lists.infradead.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
-W:      https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
+T:      git://git.infradead.org/nvme.git
+W:      http://git.infradead.org/nvme.git
 S:      Supported
 F:      drivers/nvme/host/
 F:      include/linux/nvme.h
+F:      include/uapi/linux/nvme_ioctl.h
 
 NVM EXPRESS TARGET DRIVER
 M:      Christoph Hellwig <hch@lst.de>
 M:      Sagi Grimberg <sagi@grimberg.me>
 L:      linux-nvme@lists.infradead.org
+T:      git://git.infradead.org/nvme.git
+W:      http://git.infradead.org/nvme.git
 S:      Supported
 F:      drivers/nvme/target/
 
@@ -8909,7 +8915,20 @@ M:	Josh Poimboeuf <jpoimboe@redhat.com>
 S:      Supported
 F:      tools/objtool/
 
-OMAP SUPPORT
+OMAP1 SUPPORT
+M:      Aaro Koskinen <aaro.koskinen@iki.fi>
+M:      Tony Lindgren <tony@atomide.com>
+L:      linux-omap@vger.kernel.org
+Q:      http://patchwork.kernel.org/project/linux-omap/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
+S:      Maintained
+F:      arch/arm/mach-omap1/
+F:      arch/arm/plat-omap/
+F:      arch/arm/configs/omap1_defconfig
+F:      drivers/i2c/busses/i2c-omap.c
+F:      include/linux/i2c-omap.h
+
+OMAP2+ SUPPORT
 M:      Tony Lindgren <tony@atomide.com>
 L:      linux-omap@vger.kernel.org
 W:      http://www.muru.com/linux/omap/
@@ -8917,8 +8936,8 @@ W:	http://linux.omap.com/
 Q:      http://patchwork.kernel.org/project/linux-omap/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:      Maintained
-F:      arch/arm/*omap*/
-F:      arch/arm/configs/omap1_defconfig
+F:      arch/arm/mach-omap2/
+F:      arch/arm/plat-omap/
 F:      arch/arm/configs/omap2plus_defconfig
 F:      drivers/i2c/busses/i2c-omap.c
 F:      drivers/irqchip/irq-omap-intc.c
@@ -9842,7 +9861,7 @@ M:	Mark Rutland <mark.rutland@arm.com>
 M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 L:      linux-arm-kernel@lists.infradead.org
 S:      Maintained
-F:      drivers/firmware/psci.c
+F:      drivers/firmware/psci*.c
 F:      include/linux/psci.h
 F:      include/uapi/linux/psci.h
 
@@ -13527,11 +13546,11 @@ F:	arch/x86/xen/*swiotlb*
 F:      drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
-M:      Dave Chinner <david@fromorbit.com>
+M:      Darrick J. Wong <darrick.wong@oracle.com>
 M:      linux-xfs@vger.kernel.org
 L:      linux-xfs@vger.kernel.org
 W:      http://xfs.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
+T:      git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 S:      Supported
 F:      Documentation/filesystems/xfs.txt
 F:      fs/xfs/
diff --git a/Makefile b/Makefile
index ec411ba9e40f..5f1a84735ff6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 10
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc3
 NAME = Roaring Lionus
 
 # *DOCUMENTATION*
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5fab553fd03a..186c4c214e0a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1502,8 +1502,7 @@ source kernel/Kconfig.preempt
 
 config HZ_FIXED
         int
-        default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \
-                ARCH_S5PV210 || ARCH_EXYNOS4
+        default 200 if ARCH_EBSA110
         default 128 if SOC_AT91RM9200
         default 0
 
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cccdbcb557b6..7327250f0bb6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -501,6 +501,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
         am3517-evm.dtb \
         am3517_mt_ventoux.dtb \
         logicpd-torpedo-37xx-devkit.dtb \
+        logicpd-som-lv-37xx-devkit.dtb \
         omap3430-sdp.dtb \
         omap3-beagle.dtb \
         omap3-beagle-xm.dtb \
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index dc561d505bbe..3e32dd18fd25 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -6,8 +6,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <dt-bindings/mfd/tps65217.h>
-
 / {
         cpus {
                 cpu@0 {
@@ -319,13 +317,13 @@
         ti,pmic-shutdown-controller;
 
         charger {
-                interrupts = <TPS65217_IRQ_AC>, <TPS65217_IRQ_USB>;
-                interrupts-names = "AC", "USB";
+                interrupts = <0>, <1>;
+                interrupt-names = "USB", "AC";
                 status = "okay";
         };
 
         pwrbutton {
-                interrupts = <TPS65217_IRQ_PB>;
+                interrupts = <2>;
                 status = "okay";
         };
 
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 64c8aa9057a3..18d72a245e88 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -16,6 +16,7 @@
         interrupt-parent = <&intc>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c0;
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index ac55f93fc91e..2df9e6050c2f 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -16,6 +16,7 @@
         interrupt-parent = <&wakeupgen>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         memory@0 {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index d6e43e5184c1..ad68d1eb3bc3 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -62,11 +62,6 @@
                         linux,default-trigger = "mmc0";
                 };
         };
-
-        extcon_usb2: extcon_usb2 {
-             compatible = "linux,extcon-usb-gpio";
-             id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
-        };
 };
 
 &mmc1 {
@@ -79,3 +74,8 @@
 &omap_dwc3_2 {
         extcon = <&extcon_usb2>;
 };
+
+&extcon_usb2 {
+        id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
+        vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 27d9149cedba..8350b4b34b08 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -23,11 +23,6 @@
                 reg = <0x0 0x80000000 0x0 0x80000000>;
         };
 
-        extcon_usb2: extcon_usb2 {
-                compatible = "linux,extcon-usb-gpio";
-                id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
-        };
-
         status-leds {
                 compatible = "gpio-leds";
                 cpu0-led {
@@ -76,6 +71,11 @@
         extcon = <&extcon_usb2>;
 };
 
+&extcon_usb2 {
+        id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
+        vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
+};
+
 &mmc1 {
         status = "okay";
         vmmc-supply = <&v3_3d>;
@@ -87,3 +87,7 @@
 &sn65hvs882 {
         load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
 };
+
+&pcie1 {
+        gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 555ae21f2b9a..814a720d5c3d 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -303,6 +303,13 @@
                         gpio-controller;
                         #gpio-cells = <2>;
                 };
+
+                extcon_usb2: tps659038_usb {
+                        compatible = "ti,palmas-usb-vid";
+                        ti,enable-vbus-detection;
+                        ti,enable-id-detection;
+                        /* ID & VBUS GPIOs provided in board dts */
+                };
         };
 };
 
@@ -369,7 +376,7 @@
 };
 
 &usb2 {
-        dr_mode = "otg";
+        dr_mode = "peripheral";
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index 1facc5f12cef..81b8cecb5820 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -12,6 +12,7 @@
         interrupt-parent = <&intc>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 61dd2f6b02bc..6db652ae9bd5 100644
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -12,6 +12,7 @@
         interrupt-parent = <&intc>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index addb7530cfbe..1faf24acd521 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -18,6 +18,7 @@
 
         compatible = "ti,dra7xx";
         interrupt-parent = <&crossbar_mpu>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
index ee6dac44edf1..e6df676886c0 100644
--- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
@@ -132,3 +132,19 @@
                 ti,palmas-long-press-seconds = <6>;
         };
 };
+
+&usb2_phy1 {
+        phy-supply = <&ldo4_reg>;
+};
+
+&usb2_phy2 {
+        phy-supply = <&ldo4_reg>;
+};
+
+&dss {
+        vdda_video-supply = <&ldo5_reg>;
+};
+
+&mmc1 {
+        vmmc_aux-supply = <&ldo1_reg>;
+};
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 685916e3d8a1..85cd8be22f71 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -31,11 +31,11 @@
                 };
         };
 
-        avic: avic-interrupt-controller@60000000 {
+        avic: interrupt-controller@68000000 {
                 compatible = "fsl,imx31-avic", "fsl,avic";
                 interrupt-controller;
                 #interrupt-cells = <1>;
-                reg = <0x60000000 0x100000>;
+                reg = <0x68000000 0x100000>;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index e476d01959ea..26d060484728 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -533,7 +533,6 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17071
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17071
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x17071
-                                MX6QDL_PAD_NANDF_CS2__GPIO6_IO15        0x000b0
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 53e6e63cbb02..89b834f3fa17 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1100,6 +1100,7 @@
                                 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 4fd6de29f07d..19cbd879c448 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -900,6 +900,7 @@
                                 reg = <0x021b8000 0x4000>;
                                 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 076a30f9bcae..10f333016197 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -977,6 +977,7 @@
                                 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 4f793a025a72..f1d6de8b3c19 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -17,6 +17,7 @@
         interrupt-parent = <&intc>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 serial0 = &uart1;
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 87ca50b53002..4d448f145ed1 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -734,6 +734,8 @@
         vmmc_aux-supply = <&vsim>;
         bus-width = <8>;
         non-removable;
+        no-sdio;
+        no-sd;
 };
 
 &mmc3 {
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index ecf5eb584c75..a3ff4933dbc1 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -17,6 +17,7 @@
         interrupt-parent = <&intc>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 8087456b5fbe..578c53f08309 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -15,6 +15,7 @@
         interrupt-parent = <&wakeupgen>;
         #address-cells = <1>;
         #size-cells = <1>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 968c67a49dbd..7cd92babc41a 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -17,6 +17,7 @@
 
         compatible = "ti,omap5";
         interrupt-parent = <&wakeupgen>;
+        chosen { };
 
         aliases {
                 i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 268bd470c865..407a4610f4a7 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -4,6 +4,7 @@
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8960.h>
+#include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -303,6 +304,9 @@
         firmware {
                 scm {
                         compatible = "qcom,scm-apq8064";
+
+                        clocks = <&rpmcc RPM_DAYTONA_FABRIC_CLK>;
+                        clock-names = "core";
                 };
         };
 
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 102838fcc588..15f4fd3f4695 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -81,7 +81,7 @@
                 #address-cells = <0>;
                 interrupt-controller;
                 reg = <0 0x2c001000 0 0x1000>,
-                      <0 0x2c002000 0 0x1000>,
+                      <0 0x2c002000 0 0x2000>,
                       <0 0x2c004000 0 0x2000>,
                       <0 0x2c006000 0 0x2000>;
                 interrupts = <1 9 0xf04>;
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 45d08cc37b01..bd107c5a0226 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -131,7 +131,7 @@
                 #address-cells = <0>;
                 interrupt-controller;
                 reg = <0 0x2c001000 0 0x1000>,
-                      <0 0x2c002000 0 0x1000>,
+                      <0 0x2c002000 0 0x2000>,
                       <0 0x2c004000 0 0x2000>,
                       <0 0x2c006000 0 0x2000>;
                 interrupts = <1 9 0xf04>;
diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 7ea617e47fe4..958b4c42d320 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -153,7 +153,8 @@
                                         switch0phy1: switch1phy0@1 {
                                                 reg = <1>;
                                                 interrupt-parent = <&switch0>;
-                                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;                                   };
+                                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
+                                        };
                                         switch0phy2: switch1phy0@2 {
                                                 reg = <2>;
                                                 interrupt-parent = <&switch0>;
diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig
index 5225fbcb250d..f3f8c5c658db 100644
--- a/arch/arm/mach-aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@ -5,6 +5,8 @@ menuconfig ARCH_ASPEED
         select WATCHDOG
         select ASPEED_WATCHDOG
         select MOXART_TIMER
+        select MFD_SYSCON
+        select PINCTRL
         help
           Say Y here if you want to run your kernel on an ASpeed BMC SoC.
 
@@ -14,6 +16,7 @@ config MACH_ASPEED_G4
         bool "Aspeed SoC 4th Generation"
         depends on ARCH_MULTI_V5
         select CPU_ARM926T
+        select PINCTRL_ASPEED_G4
         help
          Say yes if you intend to run on an Aspeed ast2400 or similar
          fourth generation BMCs, such as those used by OpenPower Power8
@@ -23,6 +26,7 @@ config MACH_ASPEED_G5
         bool "Aspeed SoC 5th Generation"
         depends on ARCH_MULTI_V6
         select CPU_V6
+        select PINCTRL_ASPEED_G5
         help
          Say yes if you intend to run on an Aspeed ast2500 or similar
          fifth generation Aspeed BMCs.
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index b4332b727e9c..3d89b7905bd9 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -55,7 +55,7 @@ static struct {
         int memctrl;
 } at91_pm_data;
 
-void __iomem *at91_ramc_base[2];
+static void __iomem *at91_ramc_base[2];
 
 static int at91_pm_valid_state(suspend_state_t state)
 {
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 3fcf8810f14e..bf980c6ef294 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -18,8 +18,6 @@
 #include <soc/at91/at91sam9_sdramc.h>
 
 #ifndef __ASSEMBLY__
-extern void __iomem *at91_ramc_base[];
-
 #define at91_ramc_read(id, field) \
         __raw_readl(at91_ramc_base[id] + field)
 
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index df42c93a93d6..f5dce9b4e617 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -31,10 +31,10 @@ static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
 static DEFINE_SPINLOCK(clockfw_lock);
 
-static void __clk_enable(struct clk *clk)
+void davinci_clk_enable(struct clk *clk)
 {
         if (clk->parent)
-                __clk_enable(clk->parent);
+                davinci_clk_enable(clk->parent);
         if (clk->usecount++ == 0) {
                 if (clk->flags & CLK_PSC)
                         davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
@@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk)
         }
 }
 
-static void __clk_disable(struct clk *clk)
+void davinci_clk_disable(struct clk *clk)
 {
         if (WARN_ON(clk->usecount == 0))
                 return;
@@ -56,7 +56,7 @@ static void __clk_disable(struct clk *clk)
                         clk->clk_disable(clk);
         }
         if (clk->parent)
-                __clk_disable(clk->parent);
+                davinci_clk_disable(clk->parent);
 }
 
 int davinci_clk_reset(struct clk *clk, bool reset)
@@ -103,7 +103,7 @@ int clk_enable(struct clk *clk)
                 return -EINVAL;
 
         spin_lock_irqsave(&clockfw_lock, flags);
-        __clk_enable(clk);
+        davinci_clk_enable(clk);
         spin_unlock_irqrestore(&clockfw_lock, flags);
 
         return 0;
@@ -118,7 +118,7 @@ void clk_disable(struct clk *clk)
                 return;
 
         spin_lock_irqsave(&clockfw_lock, flags);
-        __clk_disable(clk);
+        davinci_clk_disable(clk);
         spin_unlock_irqrestore(&clockfw_lock, flags);
 }
 EXPORT_SYMBOL(clk_disable);
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h
index e2a5437a1aee..fa2b83752e03 100644
--- a/arch/arm/mach-davinci/clock.h
+++ b/arch/arm/mach-davinci/clock.h
@@ -132,6 +132,8 @@ int davinci_set_sysclk_rate(struct clk *clk, unsigned long rate);
 int davinci_set_refclk_rate(unsigned long rate);
 int davinci_simple_set_rate(struct clk *clk, unsigned long rate);
 int davinci_clk_reset(struct clk *clk, bool reset);
+void davinci_clk_enable(struct clk *clk);
+void davinci_clk_disable(struct clk *clk);
 
 extern struct platform_device davinci_wdt_device;
 extern void davinci_watchdog_reset(struct platform_device *);
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 8ab3c099e9aa..d09765ba246b 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -319,6 +319,16 @@ static struct clk emac_clk = {
         .gpsc           = 1,
 };
 
+/*
+ * In order to avoid adding the emac_clk to the clock lookup table twice (and
+ * screwing up the linked list in the process) create a separate clock for
+ * mdio inheriting the rate from emac_clk.
+ */
+static struct clk mdio_clk = {
+        .name           = "mdio",
+        .parent         = &emac_clk,
+};
+
 static struct clk mcasp_clk = {
         .name           = "mcasp",
         .parent         = &async3_clk,
@@ -367,6 +377,16 @@ static struct clk aemif_clk = {
         .flags          = ALWAYS_ENABLED,
 };
 
+/*
+ * In order to avoid adding the aemif_clk to the clock lookup table twice (and
+ * screwing up the linked list in the process) create a separate clock for
+ * nand inheriting the rate from aemif_clk.
+ */
+static struct clk aemif_nand_clk = {
+        .name           = "nand",
+        .parent         = &aemif_clk,
+};
+
 static struct clk usb11_clk = {
         .name           = "usb11",
         .parent         = &pll0_sysclk4,
@@ -529,7 +549,7 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "arm",          &arm_clk),
         CLK(NULL,               "rmii",         &rmii_clk),
         CLK("davinci_emac.1",   NULL,           &emac_clk),
-        CLK("davinci_mdio.0",   "fck",          &emac_clk),
+        CLK("davinci_mdio.0",   "fck",          &mdio_clk),
         CLK("davinci-mcasp.0",  NULL,           &mcasp_clk),
         CLK("davinci-mcbsp.0",  NULL,           &mcbsp0_clk),
         CLK("davinci-mcbsp.1",  NULL,           &mcbsp1_clk),
@@ -537,7 +557,15 @@ static struct clk_lookup da850_clks[] = {
         CLK("da830-mmc.0",      NULL,           &mmcsd0_clk),
         CLK("da830-mmc.1",      NULL,           &mmcsd1_clk),
         CLK("ti-aemif",         NULL,           &aemif_clk),
-        CLK(NULL,               "aemif",        &aemif_clk),
+        /*
+         * The only user of this clock is davinci_nand and it get's it through
+         * con_id. The nand node itself is created from within the aemif
+         * driver to guarantee that it's probed after the aemif timing
+         * parameters are configured. of_dev_auxdata is not accessible from
+         * the aemif driver and can't be passed to of_platform_populate(). For
+         * that reason we're leaving the dev_id here as NULL.
+         */
+        CLK(NULL,               "aemif",        &aemif_nand_clk),
         CLK("ohci-da8xx",       "usb11",        &usb11_clk),
         CLK("musb-da8xx",       "usb20",        &usb20_clk),
         CLK("spi_davinci.0",    NULL,           &spi0_clk),
diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c
index c6feecf7ae24..9a6af0bd5dc3 100644
--- a/arch/arm/mach-davinci/usb-da8xx.c
+++ b/arch/arm/mach-davinci/usb-da8xx.c
@@ -22,6 +22,8 @@
 #define DA8XX_USB0_BASE         0x01e00000
 #define DA8XX_USB1_BASE         0x01e25000
 
+static struct clk *usb20_clk;
+
 static struct platform_device da8xx_usb_phy = {
         .name           = "da8xx-usb-phy",
         .id             = -1,
@@ -158,26 +160,13 @@ int __init da8xx_register_usb_refclkin(int rate)
 
 static void usb20_phy_clk_enable(struct clk *clk)
 {
-        struct clk *usb20_clk;
-        int err;
         u32 val;
         u32 timeout = 500000; /* 500 msec */
 
         val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
 
-        usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20");
-        if (IS_ERR(usb20_clk)) {
-                pr_err("could not get usb20 clk: %ld\n", PTR_ERR(usb20_clk));
-                return;
-        }
-
         /* The USB 2.O PLL requires that the USB 2.O PSC is enabled as well. */
-        err = clk_prepare_enable(usb20_clk);
-        if (err) {
-                pr_err("failed to enable usb20 clk: %d\n", err);
-                clk_put(usb20_clk);
-                return;
-        }
+        davinci_clk_enable(usb20_clk);
 
         /*
          * Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1
@@ -197,8 +186,7 @@ static void usb20_phy_clk_enable(struct clk *clk)
 
         pr_err("Timeout waiting for USB 2.0 PHY clock good\n");
 done:
-        clk_disable_unprepare(usb20_clk);
-        clk_put(usb20_clk);
+        davinci_clk_disable(usb20_clk);
 }
 
 static void usb20_phy_clk_disable(struct clk *clk)
@@ -285,11 +273,19 @@ static struct clk_lookup usb20_phy_clk_lookup =
 int __init da8xx_register_usb20_phy_clk(bool use_usb_refclkin)
 {
         struct clk *parent;
-        int ret = 0;
+        int ret;
+
+        usb20_clk = clk_get(&da8xx_usb20_dev.dev, "usb20");
+        ret = PTR_ERR_OR_ZERO(usb20_clk);
+        if (ret)
+                return ret;
 
         parent = clk_get(NULL, use_usb_refclkin ? "usb_refclkin" : "pll0_aux");
-        if (IS_ERR(parent))
-                return PTR_ERR(parent);
+        ret = PTR_ERR_OR_ZERO(parent);
+        if (ret) {
+                clk_put(usb20_clk);
+                return ret;
+        }
 
         usb20_phy_clk.parent = parent;
         ret = clk_register(&usb20_phy_clk);
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h
index 03c42e5400d2..b0cf2de77f81 100644
--- a/arch/arm/mach-ep93xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h
@@ -10,6 +10,7 @@
  */
 
 #include <mach/ep93xx-regs.h>
+#include <asm/mach-types.h>
 
 static unsigned char __raw_readb(unsigned int ptr)
 {
@@ -75,8 +76,19 @@ static void ethernet_reset(void)
                 ;
 }
 
+#define TS72XX_WDT_CONTROL_PHYS_BASE    0x23800000
+#define TS72XX_WDT_FEED_PHYS_BASE       0x23c00000
+#define TS72XX_WDT_FEED_VAL             0x05
+
+static void __maybe_unused ts72xx_watchdog_disable(void)
+{
+        __raw_writeb(TS72XX_WDT_FEED_VAL, TS72XX_WDT_FEED_PHYS_BASE);
+        __raw_writeb(0, TS72XX_WDT_CONTROL_PHYS_BASE);
+}
 
 static void arch_decomp_setup(void)
 {
+        if (machine_is_ts72xx())
+                ts72xx_watchdog_disable();
         ethernet_reset();
 }
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 0bb63b8d21e7..0a99140b6ba2 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -95,11 +95,6 @@ config SOC_EXYNOS4412
         default y
         depends on ARCH_EXYNOS4
 
-config SOC_EXYNOS4415
-        bool "SAMSUNG EXYNOS4415"
-        default y
-        depends on ARCH_EXYNOS4
-
 config SOC_EXYNOS5250
         bool "SAMSUNG EXYNOS5250"
         default y
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 757fc11de30d..c404c15ad07f 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -45,8 +45,8 @@ static struct platform_device exynos_cpuidle = {
         .id                = -1,
 };
 
-void __iomem *sysram_base_addr;
-void __iomem *sysram_ns_base_addr;
+void __iomem *sysram_base_addr __ro_after_init;
+void __iomem *sysram_ns_base_addr __ro_after_init;
 
 void __init exynos_sysram_init(void)
 {
@@ -210,7 +210,6 @@ static char const *const exynos_dt_compat[] __initconst = {
         "samsung,exynos4210",
         "samsung,exynos4212",
         "samsung,exynos4412",
-        "samsung,exynos4415",
         "samsung,exynos5",
         "samsung,exynos5250",
         "samsung,exynos5260",
diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c
index f086bf615b29..038fd8c993d0 100644
--- a/arch/arm/mach-exynos/mcpm-exynos.c
+++ b/arch/arm/mach-exynos/mcpm-exynos.c
@@ -32,7 +32,7 @@
 #define EXYNOS5420_USE_ARM_CORE_DOWN_STATE      BIT(29)
 #define EXYNOS5420_USE_L2_COMMON_UP_STATE       BIT(30)
 
-static void __iomem *ns_sram_base_addr;
+static void __iomem *ns_sram_base_addr __ro_after_init;
 
 /*
  * The common v7_exit_coherency_flush API could not be used because of the
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 98ffe1e62ad5..a5d68411a037 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -385,36 +385,6 @@ fail:
         return pen_release != -1 ? ret : 0;
 }
 
-/*
- * Initialise the CPU possible map early - this describes the CPUs
- * which may be present or become present in the system.
- */
-
-static void __init exynos_smp_init_cpus(void)
-{
-        void __iomem *scu_base = scu_base_addr();
-        unsigned int i, ncores;
-
-        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
-                ncores = scu_base ? scu_get_core_count(scu_base) : 1;
-        else
-                /*
-                 * CPU Nodes are passed thru DT and set_cpu_possible
-                 * is set by "arm_dt_init_cpu_maps".
-                 */
-                return;
-
-        /* sanity check */
-        if (ncores > nr_cpu_ids) {
-                pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
-                        ncores, nr_cpu_ids);
-                ncores = nr_cpu_ids;
-        }
-
-        for (i = 0; i < ncores; i++)
-                set_cpu_possible(i, true);
-}
-
 static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
 {
         int i;
@@ -479,7 +449,6 @@ static void exynos_cpu_die(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 const struct smp_operations exynos_smp_ops __initconst = {
-        .smp_init_cpus          = exynos_smp_init_cpus,
         .smp_prepare_cpus       = exynos_smp_prepare_cpus,
         .smp_secondary_init     = exynos_secondary_init,
         .smp_boot_secondary     = exynos_boot_secondary,
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 06332f626565..25e7c5326259 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -57,7 +57,7 @@ struct exynos_wkup_irq {
 struct exynos_pm_data {
         const struct exynos_wkup_irq *wkup_irq;
         unsigned int wake_disable_mask;
-        unsigned int *release_ret_regs;
+        const unsigned int *release_ret_regs;
 
         void (*pm_prepare)(void);
         void (*pm_resume_prepare)(void);
@@ -66,7 +66,7 @@ struct exynos_pm_data {
         int (*cpu_suspend)(unsigned long);
 };
 
-static const struct exynos_pm_data *pm_data;
+static const struct exynos_pm_data *pm_data __ro_after_init;
 
 static int exynos5420_cpu_state;
 static unsigned int exynos_pmu_spare3;
@@ -95,7 +95,7 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = {
         { /* sentinel */ },
 };
 
-static unsigned int exynos_release_ret_regs[] = {
+static const unsigned int exynos_release_ret_regs[] = {
         S5P_PAD_RET_MAUDIO_OPTION,
         S5P_PAD_RET_GPIO_OPTION,
         S5P_PAD_RET_UART_OPTION,
@@ -106,7 +106,7 @@ static unsigned int exynos_release_ret_regs[] = {
         REG_TABLE_END,
 };
 
-static unsigned int exynos3250_release_ret_regs[] = {
+static const unsigned int exynos3250_release_ret_regs[] = {
         S5P_PAD_RET_MAUDIO_OPTION,
         S5P_PAD_RET_GPIO_OPTION,
         S5P_PAD_RET_UART_OPTION,
@@ -119,7 +119,7 @@ static unsigned int exynos3250_release_ret_regs[] = {
         REG_TABLE_END,
 };
 
-static unsigned int exynos5420_release_ret_regs[] = {
+static const unsigned int exynos5420_release_ret_regs[] = {
         EXYNOS_PAD_RET_DRAM_OPTION,
         EXYNOS_PAD_RET_MAUDIO_OPTION,
         EXYNOS_PAD_RET_JTAG_OPTION,
@@ -270,7 +270,6 @@ EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
 EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
 EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu");
 EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu");
-EXYNOS_PMU_IRQ(exynos4415_pmu_irq, "samsung,exynos4415-pmu");
 EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu");
 EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-pmu");
 
diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h
index e883583a23f1..c58b68ab0cb6 100644
--- a/arch/arm/mach-hisi/core.h
+++ b/arch/arm/mach-hisi/core.h
@@ -15,5 +15,4 @@ extern void hix5hd2_set_cpu(int cpu, bool enable);
 extern void hix5hd2_cpu_die(unsigned int cpu);
 
 extern void hip01_set_cpu(int cpu, bool enable);
-extern void hip01_cpu_die(unsigned int cpu);
 #endif
diff --git a/arch/arm/mach-imx/devices/platform-flexcan.c b/arch/arm/mach-imx/devices/platform-flexcan.c
index 55d61eaf63c6..8a1a2fc4ce10 100644
--- a/arch/arm/mach-imx/devices/platform-flexcan.c
+++ b/arch/arm/mach-imx/devices/platform-flexcan.c
@@ -19,15 +19,6 @@
 #define imx_flexcan_data_entry(soc, _id, _hwid, _size)                  \
         [_id] = imx_flexcan_data_entry_single(soc, _id, _hwid, _size)
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_flexcan_data imx25_flexcan_data[] __initconst = {
-#define imx25_flexcan_data_entry(_id, _hwid)                            \
-        imx_flexcan_data_entry(MX25, _id, _hwid, SZ_16K)
-        imx25_flexcan_data_entry(0, 1),
-        imx25_flexcan_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX35
 const struct imx_flexcan_data imx35_flexcan_data[] __initconst = {
 #define imx35_flexcan_data_entry(_id, _hwid)                            \
diff --git a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
index 3d039ef021e0..466c9ccc6675 100644
--- a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
+++ b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
@@ -22,16 +22,6 @@
 #define imx_sdhci_esdhc_imx_data_entry(soc, devid, id, hwid)    \
         [id] = imx_sdhci_esdhc_imx_data_entry_single(soc, devid, id, hwid)
 
-#ifdef CONFIG_SOC_IMX25
-const struct imx_sdhci_esdhc_imx_data
-imx25_sdhci_esdhc_imx_data[] __initconst = {
-#define imx25_sdhci_esdhc_imx_data_entry(_id, _hwid)                    \
-        imx_sdhci_esdhc_imx_data_entry(MX25, "sdhci-esdhc-imx25", _id, _hwid)
-        imx25_sdhci_esdhc_imx_data_entry(0, 1),
-        imx25_sdhci_esdhc_imx_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX25 */
-
 #ifdef CONFIG_SOC_IMX35
 const struct imx_sdhci_esdhc_imx_data
 imx35_sdhci_esdhc_imx_data[] __initconst = {
diff --git a/arch/arm/mach-imx/mach-imx1.c b/arch/arm/mach-imx/mach-imx1.c
index de5ab8d88549..3a8406e45b65 100644
--- a/arch/arm/mach-imx/mach-imx1.c
+++ b/arch/arm/mach-imx/mach-imx1.c
@@ -37,7 +37,6 @@ static const char * const imx1_dt_board_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")
-        .map_io         = debug_ll_io_init,
         .init_early     = imx1_init_early,
         .init_irq       = imx1_init_irq,
         .dt_compat      = imx1_dt_board_compat,
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 7ba651a9b5b8..45e16bd7e2f2 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -31,7 +31,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/spi/l4f00242t03.h>
 
-#include <media/soc_camera.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -53,8 +52,6 @@
 #define SD1_CD                  IMX_GPIO_NR(2, 26)
 #define LCD_RESET               IMX_GPIO_NR(1, 3)
 #define LCD_ENABLE              IMX_GPIO_NR(1, 31)
-#define CSI_PWRDWN              IMX_GPIO_NR(4, 19)
-#define CSI_RESET               IMX_GPIO_NR(3, 6)
 
 static const int mx27pdk_pins[] __initconst = {
         /* UART1 */
@@ -144,21 +141,6 @@ static const int mx27pdk_pins[] __initconst = {
         PA30_PF_CONTRAST,
         LCD_ENABLE | GPIO_GPIO | GPIO_OUT,
         LCD_RESET | GPIO_GPIO | GPIO_OUT,
-        /* CSI */
-        PB10_PF_CSI_D0,
-        PB11_PF_CSI_D1,
-        PB12_PF_CSI_D2,
-        PB13_PF_CSI_D3,
-        PB14_PF_CSI_D4,
-        PB15_PF_CSI_MCLK,
-        PB16_PF_CSI_PIXCLK,
-        PB17_PF_CSI_D5,
-        PB18_PF_CSI_D6,
-        PB19_PF_CSI_D7,
-        PB20_PF_CSI_VSYNC,
-        PB21_PF_CSI_HSYNC,
-        CSI_PWRDWN | GPIO_GPIO | GPIO_OUT,
-        CSI_RESET | GPIO_GPIO | GPIO_OUT,
         /* SSI4 */
         PC16_PF_SSI4_FS,
         PC17_PF_SSI4_RXD,
@@ -166,11 +148,6 @@ static const int mx27pdk_pins[] __initconst = {
         PC19_PF_SSI4_CLK,
 };
 
-static struct gpio mx27_3ds_camera_gpios[] = {
-        { CSI_PWRDWN, GPIOF_OUT_INIT_HIGH, "camera-power" },
-        { CSI_RESET, GPIOF_OUT_INIT_HIGH, "camera-reset" },
-};
-
 static const struct imxuart_platform_data uart_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
 };
@@ -270,7 +247,6 @@ static struct regulator_init_data gpo_init = {
 
 static struct regulator_consumer_supply vmmc1_consumers[] = {
         REGULATOR_SUPPLY("vcore", "spi0.0"),
-        REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),
 };
 
 static struct regulator_init_data vmmc1_init = {
@@ -299,22 +275,6 @@ static struct regulator_init_data vgen_init = {
         .consumer_supplies = vgen_consumers,
 };
 
-static struct regulator_consumer_supply vvib_consumers[] = {
-        REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),
-};
-
-static struct regulator_init_data vvib_init = {
-        .constraints = {
-                .min_uV = 1300000,
-                .max_uV = 1300000,
-                .apply_uV = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies = ARRAY_SIZE(vvib_consumers),
-        .consumer_supplies = vvib_consumers,
-};
-
 static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {
         {
                 .id = MC13783_REG_VMMC1,
@@ -328,9 +288,6 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {
         }, {
                 .id = MC13783_REG_GPO3, /* Turn on 3.3V */
                 .init_data = &gpo_init,
-        }, {
-                .id = MC13783_REG_VVIB,  /* Power OV2640 */
-                .init_data = &vvib_init,
         },
 };
 
@@ -370,51 +327,6 @@ static const struct spi_imx_master spi2_pdata __initconst = {
         .num_chipselect = ARRAY_SIZE(spi2_chipselect),
 };
 
-static int mx27_3ds_camera_power(struct device *dev, int on)
-{
-        /* enable or disable the camera */
-        pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");
-        gpio_set_value(CSI_PWRDWN, on ? 0 : 1);
-
-        if (!on)
-                goto out;
-
-        /* If enabled, give a reset impulse */
-        gpio_set_value(CSI_RESET, 0);
-        msleep(20);
-        gpio_set_value(CSI_RESET, 1);
-        msleep(100);
-
-out:
-        return 0;
-}
-
-static struct i2c_board_info mx27_3ds_i2c_camera = {
-        I2C_BOARD_INFO("ov2640", 0x30),
-};
-
-static struct regulator_bulk_data mx27_3ds_camera_regs[] = {
-        { .supply = "cmos_vcore" },
-        { .supply = "cmos_2v8" },
-};
-
-static struct soc_camera_link iclink_ov2640 = {
-        .bus_id         = 0,
-        .board_info     = &mx27_3ds_i2c_camera,
-        .i2c_adapter_id = 0,
-        .power          = mx27_3ds_camera_power,
-        .regulators     = mx27_3ds_camera_regs,
-        .num_regulators = ARRAY_SIZE(mx27_3ds_camera_regs),
-};
-
-static struct platform_device mx27_3ds_ov2640 = {
-        .name   = "soc-camera-pdrv",
-        .id     = 0,
-        .dev    = {
-                .platform_data = &iclink_ov2640,
-        },
-};
-
 static struct imx_fb_videomode mx27_3ds_modes[] = {
         {       /* 480x640 @ 60 Hz */
                 .mode = {
@@ -471,14 +383,6 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {
         },
 };
 
-static struct platform_device *devices[] __initdata = {
-        &mx27_3ds_ov2640,
-};
-
-static const struct mx2_camera_platform_data mx27_3ds_cam_pdata __initconst = {
-        .clk = 26000000,
-};
-
 static const struct imxi2c_platform_data mx27_3ds_i2c0_data __initconst = {
         .bitrate = 100000,
 };
@@ -498,7 +402,6 @@ static void __init mx27pdk_init(void)
         imx27_add_spi_imx0(&spi1_pdata);
 
         imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);
-        platform_add_devices(devices, ARRAY_SIZE(devices));
         imx27_add_imx_fb(&mx27_3ds_fb_data);
 
         imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);
@@ -506,8 +409,6 @@ static void __init mx27pdk_init(void)
 
 static void __init mx27pdk_late_init(void)
 {
-        int ret;
-
         mx27_3ds_sdhc1_enable_level_translator();
         imx27_add_mxc_mmc(0, &sdhc1_pdata);
 
@@ -531,14 +432,6 @@ static void __init mx27pdk_late_init(void)
         if (mxc_expio_init(MX27_CS5_BASE_ADDR, IMX_GPIO_NR(3, 28)))
                 pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");
 
-        ret = gpio_request_array(mx27_3ds_camera_gpios,
-                                 ARRAY_SIZE(mx27_3ds_camera_gpios));
-        if (ret) {
-                pr_err("Failed to request camera gpios");
-                iclink_ov2640.power = NULL;
-        }
-
-        imx27_add_mx2_camera(&mx27_3ds_cam_pdata);
 
         imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);
 }
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 12b8a52c9cb4..558e5f8589cb 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -26,16 +26,12 @@
 #include <linux/regulator/machine.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
-#include <linux/memblock.h>
-
-#include <media/soc_camera.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/memory.h>
 #include <asm/mach/map.h>
-#include <asm/memblock.h>
 
 #include "3ds_debugboard.h"
 #include "common.h"
@@ -137,23 +133,6 @@ static int mx31_3ds_pins[] = {
         MX31_PIN_HSYNC__HSYNC,
         MX31_PIN_FPSHIFT__FPSHIFT,
         MX31_PIN_CONTRAST__CONTRAST,
-        /* CSI */
-        MX31_PIN_CSI_D6__CSI_D6,
-        MX31_PIN_CSI_D7__CSI_D7,
-        MX31_PIN_CSI_D8__CSI_D8,
-        MX31_PIN_CSI_D9__CSI_D9,
-        MX31_PIN_CSI_D10__CSI_D10,
-        MX31_PIN_CSI_D11__CSI_D11,
-        MX31_PIN_CSI_D12__CSI_D12,
-        MX31_PIN_CSI_D13__CSI_D13,
-        MX31_PIN_CSI_D14__CSI_D14,
-        MX31_PIN_CSI_D15__CSI_D15,
-        MX31_PIN_CSI_HSYNC__CSI_HSYNC,
-        MX31_PIN_CSI_MCLK__CSI_MCLK,
-        MX31_PIN_CSI_PIXCLK__CSI_PIXCLK,
-        MX31_PIN_CSI_VSYNC__CSI_VSYNC,
-        MX31_PIN_CSI_D5__GPIO3_5, /* CMOS PWDN */
-        IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */
         /* SSI */
         MX31_PIN_STXD4__STXD4,
         MX31_PIN_SRXD4__SRXD4,
@@ -162,98 +141,6 @@ static int mx31_3ds_pins[] = {
 };
 
 /*
- * Camera support
- */
-static phys_addr_t mx3_camera_base __initdata;
-#define MX31_3DS_CAMERA_BUF_SIZE SZ_8M
-
-#define MX31_3DS_GPIO_CAMERA_PW IOMUX_TO_GPIO(MX31_PIN_CSI_D5)
-#define MX31_3DS_GPIO_CAMERA_RST IOMUX_TO_GPIO(MX31_PIN_RI_DTE1)
-
-static struct gpio mx31_3ds_camera_gpios[] = {
-        { MX31_3DS_GPIO_CAMERA_PW, GPIOF_OUT_INIT_HIGH, "camera-power" },
-        { MX31_3DS_GPIO_CAMERA_RST, GPIOF_OUT_INIT_HIGH, "camera-reset" },
-};
-
-static const struct mx3_camera_pdata mx31_3ds_camera_pdata __initconst = {
-        .flags = MX3_CAMERA_DATAWIDTH_10,
-        .mclk_10khz = 2600,
-};
-
-static int __init mx31_3ds_init_camera(void)
-{
-        int dma, ret = -ENOMEM;
-        struct platform_device *pdev =
-                imx31_alloc_mx3_camera(&mx31_3ds_camera_pdata);
-
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
-
-        if (!mx3_camera_base)
-                goto err;
-
-        dma = dma_declare_coherent_memory(&pdev->dev,
-                                        mx3_camera_base, mx3_camera_base,
-                                        MX31_3DS_CAMERA_BUF_SIZE,
-                                        DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
-
-        if (!(dma & DMA_MEMORY_MAP))
-                goto err;
-
-        ret = platform_device_add(pdev);
-        if (ret)
-err:
-                platform_device_put(pdev);
-
-        return ret;
-}
-
-static int mx31_3ds_camera_power(struct device *dev, int on)
-{
-        /* enable or disable the camera */
-        pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");
-        gpio_set_value(MX31_3DS_GPIO_CAMERA_PW, on ? 0 : 1);
-
-        if (!on)
-                goto out;
-
-        /* If enabled, give a reset impulse */
-        gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 0);
-        msleep(20);
-        gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 1);
-        msleep(100);
-
-out:
-        return 0;
-}
-
-static struct i2c_board_info mx31_3ds_i2c_camera = {
-        I2C_BOARD_INFO("ov2640", 0x30),
-};
-
-static struct regulator_bulk_data mx31_3ds_camera_regs[] = {
-        { .supply = "cmos_vcore" },
-        { .supply = "cmos_2v8" },
-};
-
-static struct soc_camera_link iclink_ov2640 = {
-        .bus_id         = 0,
-        .board_info     = &mx31_3ds_i2c_camera,
-        .i2c_adapter_id = 0,
-        .power          = mx31_3ds_camera_power,
-        .regulators     = mx31_3ds_camera_regs,
-        .num_regulators = ARRAY_SIZE(mx31_3ds_camera_regs),
-};
-
-static struct platform_device mx31_3ds_ov2640 = {
-        .name   = "soc-camera-pdrv",
-        .id     = 0,
-        .dev    = {
-                .platform_data = &iclink_ov2640,
-        },
-};
-
-/*
  * FB support
  */
 static const struct fb_videomode fb_modedb[] = {
@@ -410,7 +297,6 @@ static struct regulator_init_data vmmc2_init = {
 
 static struct regulator_consumer_supply vmmc1_consumers[] = {
         REGULATOR_SUPPLY("vcore", "spi0.0"),
-        REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),
 };
 
 static struct regulator_init_data vmmc1_init = {
@@ -441,22 +327,6 @@ static struct regulator_init_data vgen_init = {
         .consumer_supplies = vgen_consumers,
 };
 
-static struct regulator_consumer_supply vvib_consumers[] = {
-        REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),
-};
-
-static struct regulator_init_data vvib_init = {
-        .constraints = {
-                .min_uV = 1300000,
-                .max_uV = 1300000,
-                .apply_uV = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies = ARRAY_SIZE(vvib_consumers),
-        .consumer_supplies = vvib_consumers,
-};
-
 static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {
         {
                 .id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */
@@ -480,9 +350,6 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {
         }, {
                 .id = MC13783_REG_VGEN,  /* Power LCD */
                 .init_data = &vgen_init,
-        }, {
-                .id = MC13783_REG_VVIB,  /* Power CMOS */
-                .init_data = &vvib_init,
         },
 };
 
@@ -688,10 +555,6 @@ static const struct imxi2c_platform_data mx31_3ds_i2c0_data __initconst = {
         .bitrate = 100000,
 };
 
-static struct platform_device *devices[] __initdata = {
-        &mx31_3ds_ov2640,
-};
-
 static void __init mx31_3ds_init(void)
 {
         imx31_soc_init();
@@ -723,14 +586,10 @@ static void __init mx31_3ds_init(void)
 
 static void __init mx31_3ds_late(void)
 {
-        int ret;
-
         mx31_3ds_spi_devs[0].irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));
         spi_register_board_info(mx31_3ds_spi_devs,
                                 ARRAY_SIZE(mx31_3ds_spi_devs));
 
-        platform_add_devices(devices, ARRAY_SIZE(devices));
-
         mx31_3ds_usbotg_init();
         if (otg_mode_host) {
                 otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
@@ -751,17 +610,6 @@ static void __init mx31_3ds_late(void)
                        "devices on the debug board are unusable.\n");
 
         imx31_add_mxc_mmc(0, &sdhc1_pdata);
-
-        /* CSI */
-        /* Camera power: default - off */
-        ret = gpio_request_array(mx31_3ds_camera_gpios,
-                                 ARRAY_SIZE(mx31_3ds_camera_gpios));
-        if (ret) {
-                pr_err("Failed to request camera gpios");
-                iclink_ov2640.power = NULL;
-        }
-
-        mx31_3ds_init_camera();
 }
 
 static void __init mx31_3ds_timer_init(void)
@@ -769,13 +617,6 @@ static void __init mx31_3ds_timer_init(void)
         mx31_clocks_init(26000000);
 }
 
-static void __init mx31_3ds_reserve(void)
-{
-        /* reserve MX31_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */
-        mx3_camera_base = arm_memblock_steal(MX31_3DS_CAMERA_BUF_SIZE,
-                                         MX31_3DS_CAMERA_BUF_SIZE);
-}
-
 MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
         /* Maintainer: Freescale Semiconductor, Inc. */
         .atag_offset = 0x100,
@@ -785,6 +626,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
         .init_time      = mx31_3ds_timer_init,
         .init_machine = mx31_3ds_init,
         .init_late      = mx31_3ds_late,
-        .reserve = mx31_3ds_reserve,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index c8c2e0956048..1c33a6ce326c 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -41,12 +41,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
-#include <asm/memblock.h>
 
 #include <video/platform_lcd.h>
 
-#include <media/soc_camera.h>
-
 #include "3ds_debugboard.h"
 #include "common.h"
 #include "devices-imx35.h"
@@ -233,83 +230,10 @@ static const iomux_v3_cfg_t mx35pdk_pads[] __initconst = {
         MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,
         MX35_PAD_D3_REV__IPU_DISPB_D3_REV,
         MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS,
-        /* CSI */
-        MX35_PAD_TX1__IPU_CSI_D_6,
-        MX35_PAD_TX0__IPU_CSI_D_7,
-        MX35_PAD_CSI_D8__IPU_CSI_D_8,
-        MX35_PAD_CSI_D9__IPU_CSI_D_9,
-        MX35_PAD_CSI_D10__IPU_CSI_D_10,
-        MX35_PAD_CSI_D11__IPU_CSI_D_11,
-        MX35_PAD_CSI_D12__IPU_CSI_D_12,
-        MX35_PAD_CSI_D13__IPU_CSI_D_13,
-        MX35_PAD_CSI_D14__IPU_CSI_D_14,
-        MX35_PAD_CSI_D15__IPU_CSI_D_15,
-        MX35_PAD_CSI_HSYNC__IPU_CSI_HSYNC,
-        MX35_PAD_CSI_MCLK__IPU_CSI_MCLK,
-        MX35_PAD_CSI_PIXCLK__IPU_CSI_PIXCLK,
-        MX35_PAD_CSI_VSYNC__IPU_CSI_VSYNC,
         /*PMIC IRQ*/
         MX35_PAD_GPIO2_0__GPIO2_0,
 };
 
-/*
- * Camera support
-*/
-static phys_addr_t mx3_camera_base __initdata;
-#define MX35_3DS_CAMERA_BUF_SIZE SZ_8M
-
-static const struct mx3_camera_pdata mx35_3ds_camera_pdata __initconst = {
-        .flags = MX3_CAMERA_DATAWIDTH_8,
-        .mclk_10khz = 2000,
-};
-
-static int __init imx35_3ds_init_camera(void)
-{
-        int dma, ret = -ENOMEM;
-        struct platform_device *pdev =
-                imx35_alloc_mx3_camera(&mx35_3ds_camera_pdata);
-
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
-
-        if (!mx3_camera_base)
-                goto err;
-
-        dma = dma_declare_coherent_memory(&pdev->dev,
-                                        mx3_camera_base, mx3_camera_base,
-                                        MX35_3DS_CAMERA_BUF_SIZE,
-                                        DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
-
-        if (!(dma & DMA_MEMORY_MAP))
-                goto err;
-
-        ret = platform_device_add(pdev);
-        if (ret)
-err:
-                platform_device_put(pdev);
-
-        return ret;
-}
-
-static struct i2c_board_info mx35_3ds_i2c_camera = {
-        I2C_BOARD_INFO("ov2640", 0x30),
-};
-
-static struct soc_camera_link iclink_ov2640 = {
-        .bus_id         = 0,
-        .board_info     = &mx35_3ds_i2c_camera,
-        .i2c_adapter_id = 0,
-        .power          = NULL,
-};
-
-static struct platform_device mx35_3ds_ov2640 = {
-        .name   = "soc-camera-pdrv",
-        .id     = 0,
-        .dev    = {
-                .platform_data = &iclink_ov2640,
-        },
-};
-
 static struct regulator_consumer_supply sw1_consumers[] = {
         {
                 .supply = "cpu_vcc",
@@ -321,10 +245,6 @@ static struct regulator_consumer_supply vcam_consumers[] = {
         REGULATOR_SUPPLY("VDDA", "0-000a"),
 };
 
-static struct regulator_consumer_supply vaudio_consumers[] = {
-        REGULATOR_SUPPLY("cmos_vio", "soc-camera-pdrv.0"),
-};
-
 static struct regulator_init_data sw1_init = {
         .constraints = {
                 .name = "SW1",
@@ -405,18 +325,6 @@ static struct regulator_init_data vvideo_init = {
         }
 };
 
-static struct regulator_init_data vaudio_init = {
-        .constraints = {
-                .name = "VAUDIO",
-                .min_uV = 2300000,
-                .max_uV = 3000000,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
-                .boot_on = 1
-        },
-        .num_consumer_supplies = ARRAY_SIZE(vaudio_consumers),
-        .consumer_supplies = vaudio_consumers,
-};
-
 static struct regulator_init_data vcam_init = {
         .constraints = {
                 .name = "VCAM",
@@ -460,7 +368,6 @@ static struct mc13xxx_regulator_init_data mx35_3ds_regulators[] = {
         { .id = MC13892_VDIG, .init_data = &vdig_init },
         { .id = MC13892_VUSB2, .init_data = &vusb2_init },
         { .id = MC13892_VVIDEO, .init_data = &vvideo_init },
-        { .id = MC13892_VAUDIO, .init_data = &vaudio_init },
         { .id = MC13892_VCAM, .init_data = &vcam_init },
         { .id = MC13892_VGEN1, .init_data = &vgen1_init },
         { .id = MC13892_VGEN2, .init_data = &vgen2_init },
@@ -583,8 +490,6 @@ static void __init mx35_3ds_init(void)
                 0, i2c_devices_3ds, ARRAY_SIZE(i2c_devices_3ds));
 
         imx35_add_ipu_core();
-        platform_device_register(&mx35_3ds_ov2640);
-        imx35_3ds_init_camera();
 }
 
 static void __init mx35_3ds_late_init(void)
@@ -607,13 +512,6 @@ static void __init mx35pdk_timer_init(void)
         mx35_clocks_init();
 }
 
-static void __init mx35_3ds_reserve(void)
-{
-        /* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */
-        mx3_camera_base = arm_memblock_steal(MX35_3DS_CAMERA_BUF_SIZE,
-                                         MX35_3DS_CAMERA_BUF_SIZE);
-}
-
 MACHINE_START(MX35_3DS, "Freescale MX35PDK")
         /* Maintainer: Freescale Semiconductor, Inc */
         .atag_offset = 0x100,
@@ -623,6 +521,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")
         .init_time      = mx35pdk_timer_init,
         .init_machine = mx35_3ds_init,
         .init_late      = mx35_3ds_late_init,
-        .reserve = mx35_3ds_reserve,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 9f0f55b0422c..b787ba6897e4 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -31,17 +31,13 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 #include <linux/gfp.h>
-#include <linux/memblock.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/fixed.h>
 
-#include <media/soc_camera.h>
-
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
-#include <asm/memblock.h>
 
 #include "common.h"
 #include "devices-imx31.h"
@@ -150,22 +146,6 @@ static unsigned int pcm037_pins[] = {
         MX31_PIN_D3_SPL__D3_SPL,
         MX31_PIN_D3_CLS__D3_CLS,
         MX31_PIN_LCS0__GPIO3_23,
-        /* CSI */
-        IOMUX_MODE(MX31_PIN_CSI_D5, IOMUX_CONFIG_GPIO),
-        MX31_PIN_CSI_D6__CSI_D6,
-        MX31_PIN_CSI_D7__CSI_D7,
-        MX31_PIN_CSI_D8__CSI_D8,
-        MX31_PIN_CSI_D9__CSI_D9,
-        MX31_PIN_CSI_D10__CSI_D10,
-        MX31_PIN_CSI_D11__CSI_D11,
-        MX31_PIN_CSI_D12__CSI_D12,
-        MX31_PIN_CSI_D13__CSI_D13,
-        MX31_PIN_CSI_D14__CSI_D14,
-        MX31_PIN_CSI_D15__CSI_D15,
-        MX31_PIN_CSI_HSYNC__CSI_HSYNC,
-        MX31_PIN_CSI_MCLK__CSI_MCLK,
-        MX31_PIN_CSI_PIXCLK__CSI_PIXCLK,
-        MX31_PIN_CSI_VSYNC__CSI_VSYNC,
         /* GPIO */
         IOMUX_MODE(MX31_PIN_ATA_DMACK, IOMUX_CONFIG_GPIO),
         /* OTG */
@@ -289,34 +269,6 @@ static struct at24_platform_data board_eeprom = {
         .flags = AT24_FLAG_ADDR16,
 };
 
-static int pcm037_camera_power(struct device *dev, int on)
-{
-        /* disable or enable the camera in X7 or X8 PCM970 connector */
-        gpio_set_value(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), !on);
-        return 0;
-}
-
-static struct i2c_board_info pcm037_i2c_camera[] = {
-        {
-                I2C_BOARD_INFO("mt9t031", 0x5d),
-        }, {
-                I2C_BOARD_INFO("mt9v022", 0x48),
-        },
-};
-
-static struct soc_camera_link iclink_mt9v022 = {
-        .bus_id         = 0,            /* Must match with the camera ID */
-        .board_info     = &pcm037_i2c_camera[1],
-        .i2c_adapter_id = 2,
-};
-
-static struct soc_camera_link iclink_mt9t031 = {
-        .bus_id         = 0,            /* Must match with the camera ID */
-        .power          = pcm037_camera_power,
-        .board_info     = &pcm037_i2c_camera[0],
-        .i2c_adapter_id = 2,
-};
-
 static struct i2c_board_info pcm037_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
@@ -326,22 +278,6 @@ static struct i2c_board_info pcm037_i2c_devices[] = {
         }
 };
 
-static struct platform_device pcm037_mt9t031 = {
-        .name   = "soc-camera-pdrv",
-        .id     = 0,
-        .dev    = {
-                .platform_data = &iclink_mt9t031,
-        },
-};
-
-static struct platform_device pcm037_mt9v022 = {
-        .name   = "soc-camera-pdrv",
-        .id     = 1,
-        .dev    = {
-                .platform_data = &iclink_mt9v022,
-        },
-};
-
 /* Not connected by default */
 #ifdef PCM970_SDHC_RW_SWITCH
 static int pcm970_sdhc1_get_ro(struct device *dev)
@@ -403,42 +339,9 @@ static const struct imxmmc_platform_data sdhc_pdata __initconst = {
         .exit = pcm970_sdhc1_exit,
 };
 
-struct mx3_camera_pdata camera_pdata __initdata = {
-        .flags          = MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,
-        .mclk_10khz     = 2000,
-};
-
-static phys_addr_t mx3_camera_base __initdata;
-#define MX3_CAMERA_BUF_SIZE SZ_4M
-
-static int __init pcm037_init_camera(void)
-{
-        int dma, ret = -ENOMEM;
-        struct platform_device *pdev = imx31_alloc_mx3_camera(&camera_pdata);
-
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
-
-        dma = dma_declare_coherent_memory(&pdev->dev,
-                                        mx3_camera_base, mx3_camera_base,
-                                        MX3_CAMERA_BUF_SIZE,
-                                        DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
-        if (!(dma & DMA_MEMORY_MAP))
-                goto err;
-
-        ret = platform_device_add(pdev);
-        if (ret)
-err:
-                platform_device_put(pdev);
-
-        return ret;
-}
-
 static struct platform_device *devices[] __initdata = {
         &pcm037_flash,
         &pcm037_sram_device,
-        &pcm037_mt9t031,
-        &pcm037_mt9v022,
 };
 
 static const struct fb_videomode fb_modedb[] = {
@@ -651,13 +554,6 @@ static void __init pcm037_timer_init(void)
         mx31_clocks_init(26000000);
 }
 
-static void __init pcm037_reserve(void)
-{
-        /* reserve 4 MiB for mx3-camera */
-        mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE,
-                        MX3_CAMERA_BUF_SIZE);
-}
-
 static void __init pcm037_init_late(void)
 {
         int ret;
@@ -677,16 +573,6 @@ static void __init pcm037_init_late(void)
 
         imx31_add_mxc_mmc(0, &sdhc_pdata);
 
-        /* CSI */
-        /* Camera power: default - off */
-        ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), "mt9t031-power");
-        if (!ret)
-                gpio_direction_output(IOMUX_TO_GPIO(MX31_PIN_CSI_D5), 1);
-        else
-                iclink_mt9t031.power = NULL;
-
-        pcm037_init_camera();
-
         pcm970_sja1000_resources[1].start =
                         gpio_to_irq(IOMUX_TO_GPIO(IOMUX_PIN(48, 105)));
         pcm970_sja1000_resources[1].end =
@@ -699,7 +585,6 @@ static void __init pcm037_init_late(void)
 MACHINE_START(PCM037, "Phytec Phycore pcm037")
         /* Maintainer: Pengutronix */
         .atag_offset = 0x100,
-        .reserve = pcm037_reserve,
         .map_io = mx31_map_io,
         .init_early = imx31_init_early,
         .init_irq = mx31_init_irq,
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index 2e895a82a6eb..922d49175cb4 100644
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -24,8 +24,6 @@
 
 #include <linux/usb/otg.h>
 
-#include <media/soc_camera.h>
-
 #include "common.h"
 #include "devices-imx31.h"
 #include "ehci.h"
@@ -39,17 +37,6 @@ static unsigned int marxbot_pins[] = {
         MX31_PIN_PC_READY__SD2_DATA1, MX31_PIN_PC_WAIT_B__SD2_DATA0,
         MX31_PIN_PC_CD2_B__SD2_CLK, MX31_PIN_PC_CD1_B__SD2_CMD,
         MX31_PIN_ATA_DIOR__GPIO3_28, MX31_PIN_ATA_DIOW__GPIO3_29,
-        /* CSI */
-        MX31_PIN_CSI_D6__CSI_D6, MX31_PIN_CSI_D7__CSI_D7,
-        MX31_PIN_CSI_D8__CSI_D8, MX31_PIN_CSI_D9__CSI_D9,
-        MX31_PIN_CSI_D10__CSI_D10, MX31_PIN_CSI_D11__CSI_D11,
-        MX31_PIN_CSI_D12__CSI_D12, MX31_PIN_CSI_D13__CSI_D13,
-        MX31_PIN_CSI_D14__CSI_D14, MX31_PIN_CSI_D15__CSI_D15,
-        MX31_PIN_CSI_HSYNC__CSI_HSYNC, MX31_PIN_CSI_MCLK__CSI_MCLK,
-        MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,
-        MX31_PIN_CSI_D4__GPIO3_4, MX31_PIN_CSI_D5__GPIO3_5,
-        MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,
-        MX31_PIN_TXD2__GPIO1_28,
         /* dsPIC resets */
         MX31_PIN_STXD5__GPIO1_21, MX31_PIN_SRXD5__GPIO1_22,
         /*battery detection */
@@ -143,82 +130,6 @@ static struct spi_board_info marxbot_spi_board_info[] __initdata = {
         },
 };
 
-#define TURRETCAM_POWER IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)
-#define BASECAM_POWER   IOMUX_TO_GPIO(MX31_PIN_CSI_D5)
-#define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)
-#define BASECAM_RST_B   IOMUX_TO_GPIO(MX31_PIN_CSI_D4)
-#define CAM_CHOICE      IOMUX_TO_GPIO(MX31_PIN_TXD2)
-
-static int marxbot_basecam_power(struct device *dev, int on)
-{
-        gpio_set_value(BASECAM_POWER, !on);
-        return 0;
-}
-
-static int marxbot_basecam_reset(struct device *dev)
-{
-        gpio_set_value(BASECAM_RST_B, 0);
-        udelay(100);
-        gpio_set_value(BASECAM_RST_B, 1);
-        return 0;
-}
-
-static struct i2c_board_info marxbot_i2c_devices[] = {
-        {
-                I2C_BOARD_INFO("mt9t031", 0x5d),
-        },
-};
-
-static struct soc_camera_link base_iclink = {
-        .bus_id         = 0,            /* Must match with the camera ID */
-        .power          = marxbot_basecam_power,
-        .reset          = marxbot_basecam_reset,
-        .board_info     = &marxbot_i2c_devices[0],
-        .i2c_adapter_id = 0,
-};
-
-static struct platform_device marxbot_camera[] = {
-        {
-                .name   = "soc-camera-pdrv",
-                .id     = 0,
-                .dev    = {
-                        .platform_data = &base_iclink,
-                },
-        },
-};
-
-static struct platform_device *marxbot_cameras[] __initdata = {
-        &marxbot_camera[0],
-};
-
-static int __init marxbot_cam_init(void)
-{
-        int ret = gpio_request(CAM_CHOICE, "cam-choice");
-        if (ret)
-                return ret;
-        gpio_direction_output(CAM_CHOICE, 0);
-
-        ret = gpio_request(BASECAM_RST_B, "basecam-reset");
-        if (ret)
-                return ret;
-        gpio_direction_output(BASECAM_RST_B, 1);
-        ret = gpio_request(BASECAM_POWER, "basecam-standby");
-        if (ret)
-                return ret;
-        gpio_direction_output(BASECAM_POWER, 0);
-
-        ret = gpio_request(TURRETCAM_RST_B, "turretcam-reset");
-        if (ret)
-                return ret;
-        gpio_direction_output(TURRETCAM_RST_B, 1);
-        ret = gpio_request(TURRETCAM_POWER, "turretcam-standby");
-        if (ret)
-                return ret;
-        gpio_direction_output(TURRETCAM_POWER, 0);
-
-        return 0;
-}
-
 #define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1)
 #define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1)
 #define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1)
@@ -356,9 +267,6 @@ void __init mx31moboard_marxbot_init(void)
         spi_register_board_info(marxbot_spi_board_info,
                 ARRAY_SIZE(marxbot_spi_board_info));
 
-        marxbot_cam_init();
-        platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras));
-
         /* battery present pin */
         gpio_request(IOMUX_TO_GPIO(MX31_PIN_LCS0), "bat-present");
         gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0));
diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c
index 89fc35a64448..5cdd7abce515 100644
--- a/arch/arm/mach-imx/mx31moboard-smartbot.c
+++ b/arch/arm/mach-imx/mx31moboard-smartbot.c
@@ -23,8 +23,6 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 
-#include <media/soc_camera.h>
-
 #include "board-mx31moboard.h"
 #include "common.h"
 #include "devices-imx31.h"
@@ -37,16 +35,6 @@ static unsigned int smartbot_pins[] = {
         /* UART1 */
         MX31_PIN_CTS2__CTS2, MX31_PIN_RTS2__RTS2,
         MX31_PIN_TXD2__TXD2, MX31_PIN_RXD2__RXD2,
-        /* CSI */
-        MX31_PIN_CSI_D4__CSI_D4, MX31_PIN_CSI_D5__CSI_D5,
-        MX31_PIN_CSI_D6__CSI_D6, MX31_PIN_CSI_D7__CSI_D7,
-        MX31_PIN_CSI_D8__CSI_D8, MX31_PIN_CSI_D9__CSI_D9,
-        MX31_PIN_CSI_D10__CSI_D10, MX31_PIN_CSI_D11__CSI_D11,
-        MX31_PIN_CSI_D12__CSI_D12, MX31_PIN_CSI_D13__CSI_D13,
-        MX31_PIN_CSI_D14__CSI_D14, MX31_PIN_CSI_D15__CSI_D15,
-        MX31_PIN_CSI_HSYNC__CSI_HSYNC, MX31_PIN_CSI_MCLK__CSI_MCLK,
-        MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,
-        MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,
         /* ENABLES */
         MX31_PIN_DTR_DCE1__GPIO2_8, MX31_PIN_DSR_DCE1__GPIO2_9,
         MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11,
@@ -56,65 +44,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
 };
 
-#define CAM_POWER       IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)
-#define CAM_RST_B       IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)
-
-static int smartbot_cam_power(struct device *dev, int on)
-{
-        gpio_set_value(CAM_POWER, !on);
-        return 0;
-}
-
-static int smartbot_cam_reset(struct device *dev)
-{
-        gpio_set_value(CAM_RST_B, 0);
-        udelay(100);
-        gpio_set_value(CAM_RST_B, 1);
-        return 0;
-}
-
-static struct i2c_board_info smartbot_i2c_devices[] = {
-        {
-                I2C_BOARD_INFO("mt9t031", 0x5d),
-        },
-};
-
-static struct soc_camera_link base_iclink = {
-        .bus_id         = 0,            /* Must match with the camera ID */
-        .power          = smartbot_cam_power,
-        .reset          = smartbot_cam_reset,
-        .board_info     = &smartbot_i2c_devices[0],
-        .i2c_adapter_id = 0,
-};
-
-static struct platform_device smartbot_camera[] = {
-        {
-                .name   = "soc-camera-pdrv",
-                .id     = 0,
-                .dev    = {
-                        .platform_data = &base_iclink,
-                },
-        },
-};
-
-static struct platform_device *smartbot_cameras[] __initdata = {
-        &smartbot_camera[0],
-};
-
-static int __init smartbot_cam_init(void)
-{
-        int ret = gpio_request(CAM_RST_B, "cam-reset");
-        if (ret)
-                return ret;
-        gpio_direction_output(CAM_RST_B, 1);
-        ret = gpio_request(CAM_POWER, "cam-standby");
-        if (ret)
-                return ret;
-        gpio_direction_output(CAM_POWER, 0);
-
-        return 0;
-}
-
 static const struct fsl_usb2_platform_data usb_pdata __initconst = {
         .operating_mode = FSL_USB2_DR_DEVICE,
         .phy_mode       = FSL_USB2_PHY_ULPI,
@@ -201,7 +130,4 @@ void __init mx31moboard_smartbot_init(int board)
         }
 
         smartbot_resets_init();
-
-        smartbot_cam_init();
-        platform_add_devices(smartbot_cameras, ARRAY_SIZE(smartbot_cameras));
 }
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index 13a7d72ee0c4..81ff4327a962 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -29,7 +29,7 @@ struct pcie_port {
         u8                      root_bus_nr;
         void __iomem            *base;
         spinlock_t              conf_lock;
-        char                    mem_space_name[16];
+        char                    mem_space_name[20];
         struct resource         res;
 };
 
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 46c742d3bd41..e62273aacb43 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -184,3 +184,78 @@ const struct smp_operations armada_xp_smp_ops __initconst = {
 
 CPU_METHOD_OF_DECLARE(armada_xp_smp, "marvell,armada-xp-smp",
                       &armada_xp_smp_ops);
+
+#define MV98DX3236_CPU_RESUME_CTRL_REG 0x08
+#define MV98DX3236_CPU_RESUME_ADDR_REG 0x04
+
+static const struct of_device_id of_mv98dx3236_resume_table[] = {
+        {
+                .compatible = "marvell,98dx3336-resume-ctrl",
+        },
+        { /* end of list */ },
+};
+
+static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
+{
+        struct device_node *np;
+        void __iomem *base;
+        WARN_ON(hw_cpu != 1);
+
+        np = of_find_matching_node(NULL, of_mv98dx3236_resume_table);
+        if (!np)
+                return -ENODEV;
+
+        base = of_io_request_and_map(np, 0, of_node_full_name(np));
+        of_node_put(np);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
+
+        writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG);
+        writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
+
+        iounmap(base);
+
+        return 0;
+}
+
+static int mv98dx3236_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        int ret, hw_cpu;
+
+        hw_cpu = cpu_logical_map(cpu);
+        set_secondary_cpu_clock(hw_cpu);
+        mv98dx3236_resume_set_cpu_boot_addr(hw_cpu,
+                                            armada_xp_secondary_startup);
+
+        /*
+         * This is needed to wake up CPUs in the offline state after
+         * using CPU hotplug.
+         */
+        arch_send_wakeup_ipi_mask(cpumask_of(cpu));
+
+        /*
+         * This is needed to take secondary CPUs out of reset on the
+         * initial boot.
+         */
+        ret = mvebu_cpu_reset_deassert(hw_cpu);
+        if (ret) {
+                pr_warn("unable to boot CPU: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static const struct smp_operations mv98dx3236_smp_ops __initconst = {
+        .smp_init_cpus          = armada_xp_smp_init_cpus,
+        .smp_prepare_cpus       = armada_xp_smp_prepare_cpus,
+        .smp_boot_secondary     = mv98dx3236_boot_secondary,
+        .smp_secondary_init     = armada_xp_secondary_init,
+#ifdef CONFIG_HOTPLUG_CPU
+        .cpu_die                = armada_xp_cpu_die,
+        .cpu_kill               = armada_xp_cpu_kill,
+#endif
+};
+
+CPU_METHOD_OF_DECLARE(mv98dx3236_smp, "marvell,98dx3236-smp",
+                      &mv98dx3236_smp_ops);
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 4f5fd4a084c0..43e3e188f521 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent);
  * OMAP specific clock functions shared between omap1 and omap2
  */
 
-int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-        get_option(&str, &mpurate);
-
-        if (!mpurate)
-                return 1;
-
-        if (mpurate < 1000)
-                mpurate *= 1000000;
-
-        return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /* Used for clocks that always have same value as the parent clock */
 unsigned long followparent_recalc(struct clk *clk)
 {
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h
index 1e4918a3a5ee..f2d1be211723 100644
--- a/arch/arm/mach-omap1/clock.h
+++ b/arch/arm/mach-omap1/clock.h
@@ -173,8 +173,6 @@ struct clk_functions {
         void            (*clk_disable_unused)(struct clk *clk);
 };
 
-extern int mpurate;
-
 extern int clk_init(struct clk_functions *custom_clocks);
 extern void clk_preinit(struct clk *clk);
 extern int clk_register(struct clk *clk);
diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h
index a7c5559caef2..eb76628ff843 100644
--- a/arch/arm/mach-omap1/include/mach/usb.h
+++ b/arch/arm/mach-omap1/include/mach/usb.h
@@ -10,8 +10,6 @@
 
 #include <linux/platform_data/usb-omap1.h>
 
-void omap_otg_init(struct omap_usb_config *config);
-
 #if IS_ENABLED(CONFIG_USB)
 void omap1_usb_init(struct omap_usb_config *pdata);
 #else
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 2506e598a067..455e2cf2866d 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -1,5 +1,5 @@
 /*
- * Platform level USB initialization for FS USB OTG controller on omap1 and 24xx
+ * Platform level USB initialization for FS USB OTG controller on omap1
  *
  * Copyright (C) 2004 Texas Instruments, Inc.
  *
@@ -58,11 +58,12 @@
 
 #ifdef  CONFIG_ARCH_OMAP_OTG
 
-void __init
+static void __init
 omap_otg_init(struct omap_usb_config *config)
 {
         u32             syscon;
         int             alt_pingroup = 0;
+        u16             w;
 
         /* NOTE:  no bus or clock setup (yet?) */
 
@@ -87,39 +88,35 @@ omap_otg_init(struct omap_usb_config *config)
         if (config->otg)
                 syscon |= OTG_EN;
 #endif
-        if (cpu_class_is_omap1())
-                pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
-                         omap_readl(USB_TRANSCEIVER_CTRL));
+        pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
+                 omap_readl(USB_TRANSCEIVER_CTRL));
         pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));
         omap_writel(syscon, OTG_SYSCON_2);
 
         printk("USB: hmc %d", config->hmc_mode);
         if (!alt_pingroup)
-                printk(", usb2 alt %d wires", config->pins[2]);
+                pr_cont(", usb2 alt %d wires", config->pins[2]);
         else if (config->pins[0])
-                printk(", usb0 %d wires%s", config->pins[0],
+                pr_cont(", usb0 %d wires%s", config->pins[0],
                         is_usb0_device(config) ? " (dev)" : "");
         if (config->pins[1])
-                printk(", usb1 %d wires", config->pins[1]);
+                pr_cont(", usb1 %d wires", config->pins[1]);
         if (!alt_pingroup && config->pins[2])
-                printk(", usb2 %d wires", config->pins[2]);
+                pr_cont(", usb2 %d wires", config->pins[2]);
         if (config->otg)
-                printk(", Mini-AB on usb%d", config->otg - 1);
-        printk("\n");
+                pr_cont(", Mini-AB on usb%d", config->otg - 1);
+        pr_cont("\n");
 
-        if (cpu_class_is_omap1()) {
-                u16 w;
+        /* leave USB clocks/controllers off until needed */
+        w = omap_readw(ULPD_SOFT_REQ);
+        w &= ~SOFT_USB_CLK_REQ;
+        omap_writew(w, ULPD_SOFT_REQ);
 
-                /* leave USB clocks/controllers off until needed */
-                w = omap_readw(ULPD_SOFT_REQ);
-                w &= ~SOFT_USB_CLK_REQ;
-                omap_writew(w, ULPD_SOFT_REQ);
+        w = omap_readw(ULPD_CLOCK_CTRL);
+        w &= ~USB_MCLK_EN;
+        w |= DIS_USB_PVCI_CLK;
+        omap_writew(w, ULPD_CLOCK_CTRL);
 
-                w = omap_readw(ULPD_CLOCK_CTRL);
-                w &= ~USB_MCLK_EN;
-                w |= DIS_USB_PVCI_CLK;
-                omap_writew(w, ULPD_CLOCK_CTRL);
-        }
         syscon = omap_readl(OTG_SYSCON_1);
         syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;
 
@@ -166,7 +163,7 @@ omap_otg_init(struct omap_usb_config *config)
 }
 
 #else
-void omap_otg_init(struct omap_usb_config *config) {}
+static void omap_otg_init(struct omap_usb_config *config) {}
 #endif
 
 #if IS_ENABLED(CONFIG_USB_OMAP)
@@ -573,13 +570,13 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
 
         printk("USB: hmc %d", config->hmc_mode);
         if (config->pins[0])
-                printk(", usb0 %d wires%s", config->pins[0],
+                pr_cont(", usb0 %d wires%s", config->pins[0],
                         is_usb0_device(config) ? " (dev)" : "");
         if (config->pins[1])
-                printk(", usb1 %d wires", config->pins[1]);
+                pr_cont(", usb1 %d wires", config->pins[1]);
         if (config->pins[2])
-                printk(", usb2 %d wires", config->pins[2]);
-        printk("\n");
+                pr_cont(", usb2 %d wires", config->pins[2]);
+        pr_cont("\n");
 
         /* use DPLL for 48 MHz function clock */
         pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 469894082fea..093458b62c8d 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -7,7 +7,7 @@ ccflags-y := -I$(srctree)/$(src)/include \
 
 # Common support
 obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \
-         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
+         common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
          omap_device.o omap-headsmp.o sram.o drm.o
 
 hwmod-common                            = omap_hwmod.o omap_hwmod_reset.o \
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 36d9943205ca..dc9e34e670a2 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -304,7 +304,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
         .init_late      = am43xx_init_late,
         .init_irq       = omap_gic_of_init,
         .init_machine   = omap_generic_init,
-        .init_time      = omap4_local_timer_init,
+        .init_time      = omap3_gptimer_timer_init,
         .dt_compat      = am43_boards_compat,
         .restart        = omap44xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index d058125876d8..1270afdcacdf 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -78,8 +78,6 @@ int __init omap2_clk_setup_ll_ops(void)
  * OMAP2+ specific clock functions
  */
 
-/* Private functions */
-
 /* Public functions */
 
 /**
@@ -112,65 +110,6 @@ void omap2_init_clk_clkdm(struct clk_hw *hw)
         }
 }
 
-static int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-        get_option(&str, &mpurate);
-
-        if (!mpurate)
-                return 1;
-
-        if (mpurate < 1000)
-                mpurate *= 1000000;
-
-        return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
-/**
- * omap2_clk_print_new_rates - print summary of current clock tree rates
- * @hfclkin_ck_name: clk name for the off-chip HF oscillator
- * @core_ck_name: clk name for the on-chip CORE_CLK
- * @mpu_ck_name: clk name for the ARM MPU clock
- *
- * Prints a short message to the console with the HFCLKIN oscillator
- * rate, the rate of the CORE clock, and the rate of the ARM MPU clock.
- * Called by the boot-time MPU rate switching code.   XXX This is intended
- * to be handled by the OPP layer code in the near future and should be
- * removed from the clock code.  No return value.
- */
-void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name,
-                                      const char *core_ck_name,
-                                      const char *mpu_ck_name)
-{
-        struct clk *hfclkin_ck, *core_ck, *mpu_ck;
-        unsigned long hfclkin_rate;
-
-        mpu_ck = clk_get(NULL, mpu_ck_name);
-        if (WARN(IS_ERR(mpu_ck), "clock: failed to get %s.\n", mpu_ck_name))
-                return;
-
-        core_ck = clk_get(NULL, core_ck_name);
-        if (WARN(IS_ERR(core_ck), "clock: failed to get %s.\n", core_ck_name))
-                return;
-
-        hfclkin_ck = clk_get(NULL, hfclkin_ck_name);
-        if (WARN(IS_ERR(hfclkin_ck), "Failed to get %s.\n", hfclkin_ck_name))
-                return;
-
-        hfclkin_rate = clk_get_rate(hfclkin_ck);
-
-        pr_info("Switched to new clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n",
-                (hfclkin_rate / 1000000), ((hfclkin_rate / 100000) % 10),
-                (clk_get_rate(core_ck) / 1000000),
-                (clk_get_rate(mpu_ck) / 1000000));
-}
-
 /**
  * ti_clk_init_features - init clock features struct for the SoC
  *
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 67da640ba1c7..4e66295dca25 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -64,10 +64,6 @@
 #define OMAP4XXX_EN_DPLL_FRBYPASS               0x6
 #define OMAP4XXX_EN_DPLL_LOCKED                 0x7
 
-void omap2_clk_print_new_rates(const char *hfclkin_ck_name,
-                               const char *core_ck_name,
-                               const char *mpu_ck_name);
-
 extern u16 cpu_mask;
 
 extern const struct clkops clkops_omap2_dflt_wait;
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index e71cca0950e9..8fa01c0ecdb2 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -46,8 +46,6 @@
 #define DISPC_CONTROL3          0x0848
 #define DISPC_IRQSTATUS         0x0018
 
-#define DSS_SYSCONFIG           0x10
-#define DSS_SYSSTATUS           0x14
 #define DSS_CONTROL             0x40
 #define DSS_SDI_CONTROL         0x44
 #define DSS_PLL_CONTROL         0x48
@@ -76,36 +74,6 @@ static struct platform_device omap_display_device = {
         },
 };
 
-struct omap_dss_hwmod_data {
-        const char *oh_name;
-        const char *dev_name;
-        const int id;
-};
-
-static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initconst = {
-        { "dss_core", "omapdss_dss", -1 },
-        { "dss_dispc", "omapdss_dispc", -1 },
-        { "dss_rfbi", "omapdss_rfbi", -1 },
-        { "dss_venc", "omapdss_venc", -1 },
-};
-
-static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initconst = {
-        { "dss_core", "omapdss_dss", -1 },
-        { "dss_dispc", "omapdss_dispc", -1 },
-        { "dss_rfbi", "omapdss_rfbi", -1 },
-        { "dss_venc", "omapdss_venc", -1 },
-        { "dss_dsi1", "omapdss_dsi", 0 },
-};
-
-static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
-        { "dss_core", "omapdss_dss", -1 },
-        { "dss_dispc", "omapdss_dispc", -1 },
-        { "dss_rfbi", "omapdss_rfbi", -1 },
-        { "dss_dsi1", "omapdss_dsi", 0 },
-        { "dss_dsi2", "omapdss_dsi", 1 },
-        { "dss_hdmi", "omapdss_hdmi", -1 },
-};
-
 #define OMAP4_DSIPHY_SYSCON_OFFSET              0x78
 
 static struct regmap *omap4_dsi_mux_syscon;
@@ -162,104 +130,6 @@ static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)
         return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);
 }
 
-static struct platform_device *create_dss_pdev(const char *pdev_name,
-                int pdev_id, const char *oh_name, void *pdata, int pdata_len,
-                struct platform_device *parent)
-{
-        struct platform_device *pdev;
-        struct omap_device *od;
-        struct omap_hwmod *ohs[1];
-        struct omap_hwmod *oh;
-        int r;
-
-        oh = omap_hwmod_lookup(oh_name);
-        if (!oh) {
-                pr_err("Could not look up %s\n", oh_name);
-                r = -ENODEV;
-                goto err;
-        }
-
-        pdev = platform_device_alloc(pdev_name, pdev_id);
-        if (!pdev) {
-                pr_err("Could not create pdev for %s\n", pdev_name);
-                r = -ENOMEM;
-                goto err;
-        }
-
-        if (parent != NULL)
-                pdev->dev.parent = &parent->dev;
-
-        if (pdev->id != -1)
-                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
-        else
-                dev_set_name(&pdev->dev, "%s", pdev->name);
-
-        ohs[0] = oh;
-        od = omap_device_alloc(pdev, ohs, 1);
-        if (IS_ERR(od)) {
-                pr_err("Could not alloc omap_device for %s\n", pdev_name);
-                r = -ENOMEM;
-                goto err;
-        }
-
-        r = platform_device_add_data(pdev, pdata, pdata_len);
-        if (r) {
-                pr_err("Could not set pdata for %s\n", pdev_name);
-                goto err;
-        }
-
-        r = omap_device_register(pdev);
-        if (r) {
-                pr_err("Could not register omap_device for %s\n", pdev_name);
-                goto err;
-        }
-
-        return pdev;
-
-err:
-        return ERR_PTR(r);
-}
-
-static struct platform_device *create_simple_dss_pdev(const char *pdev_name,
-                int pdev_id, void *pdata, int pdata_len,
-                struct platform_device *parent)
-{
-        struct platform_device *pdev;
-        int r;
-
-        pdev = platform_device_alloc(pdev_name, pdev_id);
-        if (!pdev) {
-                pr_err("Could not create pdev for %s\n", pdev_name);
-                r = -ENOMEM;
-                goto err;
-        }
-
-        if (parent != NULL)
-                pdev->dev.parent = &parent->dev;
-
-        if (pdev->id != -1)
-                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
-        else
-                dev_set_name(&pdev->dev, "%s", pdev->name);
-
-        r = platform_device_add_data(pdev, pdata, pdata_len);
-        if (r) {
-                pr_err("Could not set pdata for %s\n", pdev_name);
-                goto err;
-        }
-
-        r = platform_device_add(pdev);
-        if (r) {
-                pr_err("Could not register platform_device for %s\n", pdev_name);
-                goto err;
-        }
-
-        return pdev;
-
-err:
-        return ERR_PTR(r);
-}
-
 static enum omapdss_version __init omap_display_get_version(void)
 {
         if (cpu_is_omap24xx())
@@ -293,132 +163,6 @@ static enum omapdss_version __init omap_display_get_version(void)
                 return OMAPDSS_VER_UNKNOWN;
 }
 
-int __init omap_display_init(struct omap_dss_board_info *board_data)
-{
-        int r = 0;
-        struct platform_device *pdev;
-        int i, oh_count;
-        const struct omap_dss_hwmod_data *curr_dss_hwmod;
-        struct platform_device *dss_pdev;
-        enum omapdss_version ver;
-
-        /* create omapdss device */
-
-        ver = omap_display_get_version();
-
-        if (ver == OMAPDSS_VER_UNKNOWN) {
-                pr_err("DSS not supported on this SoC\n");
-                return -ENODEV;
-        }
-
-        board_data->version = ver;
-        board_data->dsi_enable_pads = omap_dsi_enable_pads;
-        board_data->dsi_disable_pads = omap_dsi_disable_pads;
-        board_data->set_min_bus_tput = omap_dss_set_min_bus_tput;
-
-        omap_display_device.dev.platform_data = board_data;
-
-        r = platform_device_register(&omap_display_device);
-        if (r < 0) {
-                pr_err("Unable to register omapdss device\n");
-                return r;
-        }
-
-        /* create devices for dss hwmods */
-
-        if (cpu_is_omap24xx()) {
-                curr_dss_hwmod = omap2_dss_hwmod_data;
-                oh_count = ARRAY_SIZE(omap2_dss_hwmod_data);
-        } else if (cpu_is_omap34xx()) {
-                curr_dss_hwmod = omap3_dss_hwmod_data;
-                oh_count = ARRAY_SIZE(omap3_dss_hwmod_data);
-        } else {
-                curr_dss_hwmod = omap4_dss_hwmod_data;
-                oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
-        }
-
-        /*
-         * First create the pdev for dss_core, which is used as a parent device
-         * by the other dss pdevs. Note: dss_core has to be the first item in
-         * the hwmod list.
-         */
-        dss_pdev = create_dss_pdev(curr_dss_hwmod[0].dev_name,
-                        curr_dss_hwmod[0].id,
-                        curr_dss_hwmod[0].oh_name,
-                        board_data, sizeof(*board_data),
-                        NULL);
-
-        if (IS_ERR(dss_pdev)) {
-                pr_err("Could not build omap_device for %s\n",
-                                curr_dss_hwmod[0].oh_name);
-
-                return PTR_ERR(dss_pdev);
-        }
-
-        for (i = 1; i < oh_count; i++) {
-                pdev = create_dss_pdev(curr_dss_hwmod[i].dev_name,
-                                curr_dss_hwmod[i].id,
-                                curr_dss_hwmod[i].oh_name,
-                                board_data, sizeof(*board_data),
-                                dss_pdev);
-
-                if (IS_ERR(pdev)) {
-                        pr_err("Could not build omap_device for %s\n",
-                                        curr_dss_hwmod[i].oh_name);
-
-                        return PTR_ERR(pdev);
-                }
-        }
-
-        /* Create devices for DPI and SDI */
-
-        pdev = create_simple_dss_pdev("omapdss_dpi", 0,
-                        board_data, sizeof(*board_data), dss_pdev);
-        if (IS_ERR(pdev)) {
-                pr_err("Could not build platform_device for omapdss_dpi\n");
-                return PTR_ERR(pdev);
-        }
-
-        if (cpu_is_omap34xx()) {
-                pdev = create_simple_dss_pdev("omapdss_sdi", 0,
-                                board_data, sizeof(*board_data), dss_pdev);
-                if (IS_ERR(pdev)) {
-                        pr_err("Could not build platform_device for omapdss_sdi\n");
-                        return PTR_ERR(pdev);
-                }
-        }
-
-        /* create DRM device */
-        r = omap_init_drm();
-        if (r < 0) {
-                pr_err("Unable to register omapdrm device\n");
-                return r;
-        }
-
-        /* create vrfb device */
-        r = omap_init_vrfb();
-        if (r < 0) {
-                pr_err("Unable to register omapvrfb device\n");
-                return r;
-        }
-
-        /* create FB device */
-        r = omap_init_fb();
-        if (r < 0) {
-                pr_err("Unable to register omapfb device\n");
-                return r;
-        }
-
-        /* create V4L2 display device */
-        r = omap_init_vout();
-        if (r < 0) {
-                pr_err("Unable to register omap_vout device\n");
-                return r;
-        }
-
-        return 0;
-}
-
 static void dispc_disable_outputs(void)
 {
         u32 v, irq_mask = 0;
@@ -573,7 +317,7 @@ static const char * const omapdss_compat_names[] __initconst = {
         "ti,dra7-dss",
 };
 
-struct device_node * __init omapdss_find_dss_of_node(void)
+static struct device_node * __init omapdss_find_dss_of_node(void)
 {
         struct device_node *node;
         int i;
diff --git a/arch/arm/mach-omap2/display.h b/arch/arm/mach-omap2/display.h
index 78f253005279..9a39646d4316 100644
--- a/arch/arm/mach-omap2/display.h
+++ b/arch/arm/mach-omap2/display.h
@@ -31,11 +31,4 @@ int omap_init_vrfb(void);
 int omap_init_fb(void);
 int omap_init_vout(void);
 
-struct device_node * __init omapdss_find_dss_of_node(void);
-
-struct omap_dss_board_info;
-
-/* Init with the board info */
-int omap_display_init(struct omap_dss_board_info *board_data);
-
 #endif
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
deleted file mode 100644
index 7a577145b68b..000000000000
--- a/arch/arm/mach-omap2/gpio.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * OMAP2+ specific gpio initialization
- *
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- * Author:
- *      Charulatha V <charu@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/gpio.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/of.h>
-#include <linux/platform_data/gpio-omap.h>
-
-#include "soc.h"
-#include "omap_hwmod.h"
-#include "omap_device.h"
-#include "omap-pm.h"
-
-#include "powerdomain.h"
-
-static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
-{
-        struct platform_device *pdev;
-        struct omap_gpio_platform_data *pdata;
-        struct omap_gpio_dev_attr *dev_attr;
-        char *name = "omap_gpio";
-        int id;
-        struct powerdomain *pwrdm;
-
-        /*
-         * extract the device id from name field available in the
-         * hwmod database and use the same for constructing ids for
-         * gpio devices.
-         * CAUTION: Make sure the name in the hwmod database does
-         * not change. If changed, make corresponding change here
-         * or make use of static variable mechanism to handle this.
-         */
-        sscanf(oh->name, "gpio%d", &id);
-
-        pdata = kzalloc(sizeof(struct omap_gpio_platform_data), GFP_KERNEL);
-        if (!pdata) {
-                pr_err("gpio%d: Memory allocation failed\n", id);
-                return -ENOMEM;
-        }
-
-        dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr;
-        pdata->bank_width = dev_attr->bank_width;
-        pdata->dbck_flag = dev_attr->dbck_flag;
-        pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
-        pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);
-        if (!pdata->regs) {
-                pr_err("gpio%d: Memory allocation failed\n", id);
-                kfree(pdata);
-                return -ENOMEM;
-        }
-
-        switch (oh->class->rev) {
-        case 0:
-                if (id == 1)
-                        /* non-wakeup GPIO pins for OMAP2 Bank1 */
-                        pdata->non_wakeup_gpios = 0xe203ffc0;
-                else if (id == 2)
-                        /* non-wakeup GPIO pins for OMAP2 Bank2 */
-                        pdata->non_wakeup_gpios = 0x08700040;
-                /* fall through */
-
-        case 1:
-                pdata->regs->revision = OMAP24XX_GPIO_REVISION;
-                pdata->regs->direction = OMAP24XX_GPIO_OE;
-                pdata->regs->datain = OMAP24XX_GPIO_DATAIN;
-                pdata->regs->dataout = OMAP24XX_GPIO_DATAOUT;
-                pdata->regs->set_dataout = OMAP24XX_GPIO_SETDATAOUT;
-                pdata->regs->clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT;
-                pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;
-                pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;
-                pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1;
-                pdata->regs->irqenable2 = OMAP24XX_GPIO_IRQENABLE2;
-                pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;
-                pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;
-                pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;
-                pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;
-                pdata->regs->ctrl = OMAP24XX_GPIO_CTRL;
-                pdata->regs->wkup_en = OMAP24XX_GPIO_WAKE_EN;
-                pdata->regs->leveldetect0 = OMAP24XX_GPIO_LEVELDETECT0;
-                pdata->regs->leveldetect1 = OMAP24XX_GPIO_LEVELDETECT1;
-                pdata->regs->risingdetect = OMAP24XX_GPIO_RISINGDETECT;
-                pdata->regs->fallingdetect = OMAP24XX_GPIO_FALLINGDETECT;
-                break;
-        case 2:
-                pdata->regs->revision = OMAP4_GPIO_REVISION;
-                pdata->regs->direction = OMAP4_GPIO_OE;
-                pdata->regs->datain = OMAP4_GPIO_DATAIN;
-                pdata->regs->dataout = OMAP4_GPIO_DATAOUT;
-                pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT;
-                pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT;
-                pdata->regs->irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0;
-                pdata->regs->irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1;
-                pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;
-                pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
-                pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;
-                pdata->regs->irqenable2 = OMAP4_GPIO_IRQSTATUSSET1;
-                pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;
-                pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;
-                pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;
-                pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE;
-                pdata->regs->ctrl = OMAP4_GPIO_CTRL;
-                pdata->regs->wkup_en = OMAP4_GPIO_IRQWAKEN0;
-                pdata->regs->leveldetect0 = OMAP4_GPIO_LEVELDETECT0;
-                pdata->regs->leveldetect1 = OMAP4_GPIO_LEVELDETECT1;
-                pdata->regs->risingdetect = OMAP4_GPIO_RISINGDETECT;
-                pdata->regs->fallingdetect = OMAP4_GPIO_FALLINGDETECT;
-                break;
-        default:
-                WARN(1, "Invalid gpio bank_type\n");
-                kfree(pdata->regs);
-                kfree(pdata);
-                return -EINVAL;
-        }
-
-        pwrdm = omap_hwmod_get_pwrdm(oh);
-        pdata->loses_context = pwrdm_can_ever_lose_context(pwrdm);
-
-        pdev = omap_device_build(name, id - 1, oh, pdata, sizeof(*pdata));
-        kfree(pdata);
-
-        if (IS_ERR(pdev)) {
-                WARN(1, "Can't build omap_device for %s:%s.\n",
-                                        name, oh->name);
-                return PTR_ERR(pdev);
-        }
-
-        return 0;
-}
-
-/*
- * gpio_init needs to be done before
- * machine_init functions access gpio APIs.
- * Hence gpio_init is a omap_postcore_initcall.
- */
-static int __init omap2_gpio_init(void)
-{
-        /* If dtb is there, the devices will be created dynamically */
-        if (of_have_populated_dt())
-                return -ENODEV;
-
-        return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init, NULL);
-}
-omap_postcore_initcall(omap2_gpio_init);
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 759e1d45ba25..0da4f2ea76c4 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -741,14 +741,14 @@ static int _init_main_clk(struct omap_hwmod *oh)
         int ret = 0;
         char name[MOD_CLK_MAX_NAME_LEN];
         struct clk *clk;
+        static const char modck[] = "_mod_ck";
 
-        /* +7 magic comes from '_mod_ck' suffix */
-        if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN)
+        if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
                 pr_warn("%s: warning: cropping name for %s\n", __func__,
                         oh->name);
 
-        strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7);
-        strcat(name, "_mod_ck");
+        strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck));
+        strlcat(name, modck, MOD_CLK_MAX_NAME_LEN);
 
         clk = clk_get(NULL, name);
         if (!IS_ERR(clk)) {
@@ -3249,6 +3249,36 @@ int __init omap_hwmod_setup_one(const char *oh_name)
 }
 
 /**
+ * omap_hwmod_setup_earlycon_flags - set up flags for early console
+ *
+ * Enable DEBUG_OMAPUART_FLAGS for uart hwmod that is being used as
+ * early concole so that hwmod core doesn't reset and keep it in idle
+ * that specific uart.
+ */
+#ifdef CONFIG_SERIAL_EARLYCON
+static void __init omap_hwmod_setup_earlycon_flags(void)
+{
+        struct device_node *np;
+        struct omap_hwmod *oh;
+        const char *uart;
+
+        np = of_find_node_by_path("/chosen");
+        if (np) {
+                uart = of_get_property(np, "stdout-path", NULL);
+                if (uart) {
+                        np = of_find_node_by_path(uart);
+                        if (np) {
+                                uart = of_get_property(np, "ti,hwmods", NULL);
+                                oh = omap_hwmod_lookup(uart);
+                                if (oh)
+                                        oh->flags |= DEBUG_OMAPUART_FLAGS;
+                        }
+                }
+        }
+}
+#endif
+
+/**
  * omap_hwmod_setup_all - set up all registered IP blocks
  *
  * Initialize and set up all IP blocks registered with the hwmod code.
@@ -3261,6 +3291,9 @@ static int __init omap_hwmod_setup_all(void)
         _ensure_mpu_hwmod_is_setup(NULL);
 
         omap_hwmod_for_each(_init, NULL);
+#ifdef CONFIG_SERIAL_EARLYCON
+        omap_hwmod_setup_earlycon_flags();
+#endif
         omap_hwmod_for_each(_setup, NULL);
 
         return 0;
diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h
index cdfbb44ceb0c..f22e9cb39f4a 100644
--- a/arch/arm/mach-omap2/omap_hwmod_common_data.h
+++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h
@@ -121,10 +121,6 @@ extern struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[];
 extern struct omap_hwmod_irq_info omap2_dispc_irqs[];
 extern struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[];
 extern struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[];
-extern struct omap_hwmod_irq_info omap2_gpio1_irqs[];
-extern struct omap_hwmod_irq_info omap2_gpio2_irqs[];
-extern struct omap_hwmod_irq_info omap2_gpio3_irqs[];
-extern struct omap_hwmod_irq_info omap2_gpio4_irqs[];
 extern struct omap_hwmod_irq_info omap2_dma_system_irqs[];
 extern struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[];
 extern struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[];
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 5b2f5138d938..2b138b65129a 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -295,10 +295,8 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)
                 GFP_KERNEL);
 
         if (!prcm_irq_chips || !prcm_irq_setup->saved_mask ||
-            !prcm_irq_setup->priority_mask) {
-                pr_err("PRCM: kzalloc failed\n");
+            !prcm_irq_setup->priority_mask)
                 goto err;
-        }
 
         memset(mask, 0, sizeof(mask));
 
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 56128da23c3a..07dd692c4737 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -510,18 +510,19 @@ void __init omap3_secure_sync32k_timer_init(void)
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \
+        defined(CONFIG_SOC_AM43XX)
 void __init omap3_gptimer_timer_init(void)
 {
         __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
                         1, "timer_sys_ck", "ti,timer-alwon", true);
-
-        clocksource_probe();
+        if (of_have_populated_dt())
+                clocksource_probe();
 }
 #endif
 
 #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) ||          \
-        defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
+        defined(CONFIG_SOC_DRA7XX)
 static void __init omap4_sync32k_timer_init(void)
 {
         __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 0b8300e6fca3..a057cf9c0e7b 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -696,32 +696,7 @@ static struct pxa27x_keypad_platform_data e2_keypad_platform_data = {
 };
 #endif /* CONFIG_MACH_EZX_E2 */
 
-#ifdef CONFIG_MACH_EZX_A780
-/* gpio_keys */
-static struct gpio_keys_button a780_buttons[] = {
-        [0] = {
-                .code       = SW_LID,
-                .gpio       = GPIO12_A780_FLIP_LID,
-                .active_low = 0,
-                .desc       = "A780 flip lid",
-                .type       = EV_SW,
-                .wakeup     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data a780_gpio_keys_platform_data = {
-        .buttons  = a780_buttons,
-        .nbuttons = ARRAY_SIZE(a780_buttons),
-};
-
-static struct platform_device a780_gpio_keys = {
-        .name = "gpio-keys",
-        .id   = -1,
-        .dev  = {
-                .platform_data = &a780_gpio_keys_platform_data,
-        },
-};
-
+#if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_A910)
 /* camera */
 static struct regulator_consumer_supply camera_dummy_supplies[] = {
         REGULATOR_SUPPLY("vdd", "0-005d"),
@@ -750,6 +725,35 @@ static struct platform_device camera_supply_dummy_device = {
                 .platform_data = &camera_dummy_config,
         },
 };
+#endif
+
+#ifdef CONFIG_MACH_EZX_A780
+/* gpio_keys */
+static struct gpio_keys_button a780_buttons[] = {
+        [0] = {
+                .code       = SW_LID,
+                .gpio       = GPIO12_A780_FLIP_LID,
+                .active_low = 0,
+                .desc       = "A780 flip lid",
+                .type       = EV_SW,
+                .wakeup     = 1,
+        },
+};
+
+static struct gpio_keys_platform_data a780_gpio_keys_platform_data = {
+        .buttons  = a780_buttons,
+        .nbuttons = ARRAY_SIZE(a780_buttons),
+};
+
+static struct platform_device a780_gpio_keys = {
+        .name = "gpio-keys",
+        .id   = -1,
+        .dev  = {
+                .platform_data = &a780_gpio_keys_platform_data,
+        },
+};
+
+/* camera */
 static int a780_camera_reset(struct device *dev)
 {
         gpio_set_value(GPIO19_GEN1_CAM_RST, 0);
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index d1db32b1a2c6..88e0068f92a8 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/leds.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 
diff --git a/arch/arm/mach-s3c24xx/bast-irq.c b/arch/arm/mach-s3c24xx/bast-irq.c
index 2bb08961e934..ad8f4cd7c327 100644
--- a/arch/arm/mach-s3c24xx/bast-irq.c
+++ b/arch/arm/mach-s3c24xx/bast-irq.c
@@ -44,7 +44,7 @@
 /* table of ISA irq nos to the relevant mask... zero means
  * the irq is not implemented
 */
-static unsigned char bast_pc104_irqmasks[] = {
+static const unsigned char bast_pc104_irqmasks[] = {
         0,   /* 0 */
         0,   /* 1 */
         0,   /* 2 */
@@ -63,7 +63,7 @@ static unsigned char bast_pc104_irqmasks[] = {
         0,   /* 15 */
 };
 
-static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
+static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
 
 static void
 bast_pc104_mask(struct irq_data *data)
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index f6c3f151d0d4..b59f4f4f256f 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -345,10 +345,40 @@ static struct s3c24xx_dma_channel s3c2410_dma_channels[DMACH_MAX] = {
         [DMACH_USB_EP4] = { S3C24XX_DMA_APB, true, S3C24XX_DMA_CHANREQ(4, 3), },
 };
 
+static const struct dma_slave_map s3c2410_dma_slave_map[] = {
+        { "s3c2410-sdi", "rx-tx", (void *)DMACH_SDI },
+        { "s3c2410-spi.0", "rx", (void *)DMACH_SPI0_RX },
+        { "s3c2410-spi.0", "tx", (void *)DMACH_SPI0_TX },
+        { "s3c2410-spi.1", "rx", (void *)DMACH_SPI1_RX },
+        { "s3c2410-spi.1", "tx", (void *)DMACH_SPI1_TX },
+        /*
+         * The DMA request source[1] (DMACH_UARTx_SRC2) are
+         * not used in the UART driver.
+         */
+        { "s3c2410-uart.0", "rx", (void *)DMACH_UART0 },
+        { "s3c2410-uart.0", "tx", (void *)DMACH_UART0 },
+        { "s3c2410-uart.1", "rx", (void *)DMACH_UART1 },
+        { "s3c2410-uart.1", "tx", (void *)DMACH_UART1 },
+        { "s3c2410-uart.2", "rx", (void *)DMACH_UART2 },
+        { "s3c2410-uart.2", "tx", (void *)DMACH_UART2 },
+        { "s3c24xx-iis", "rx", (void *)DMACH_I2S_IN },
+        { "s3c24xx-iis", "tx", (void *)DMACH_I2S_OUT },
+        { "s3c-hsudc", "rx0", (void *)DMACH_USB_EP1 },
+        { "s3c-hsudc", "tx0", (void *)DMACH_USB_EP1 },
+        { "s3c-hsudc", "rx1", (void *)DMACH_USB_EP2 },
+        { "s3c-hsudc", "tx1", (void *)DMACH_USB_EP2 },
+        { "s3c-hsudc", "rx2", (void *)DMACH_USB_EP3 },
+        { "s3c-hsudc", "tx2", (void *)DMACH_USB_EP3 },
+        { "s3c-hsudc", "rx3", (void *)DMACH_USB_EP4 },
+        { "s3c-hsudc", "tx3", (void *)DMACH_USB_EP4 }
+};
+
 static struct s3c24xx_dma_platdata s3c2410_dma_platdata = {
         .num_phy_channels = 4,
         .channels = s3c2410_dma_channels,
         .num_channels = DMACH_MAX,
+        .slave_map = s3c2410_dma_slave_map,
+        .slavecnt = ARRAY_SIZE(s3c2410_dma_slave_map),
 };
 
 struct platform_device s3c2410_device_dma = {
@@ -388,10 +418,36 @@ static struct s3c24xx_dma_channel s3c2412_dma_channels[DMACH_MAX] = {
         [DMACH_USB_EP4] = { S3C24XX_DMA_APB, true, 16 },
 };
 
+static const struct dma_slave_map s3c2412_dma_slave_map[] = {
+        { "s3c2412-sdi", "rx-tx", (void *)DMACH_SDI },
+        { "s3c2412-spi.0", "rx", (void *)DMACH_SPI0_RX },
+        { "s3c2412-spi.0", "tx", (void *)DMACH_SPI0_TX },
+        { "s3c2412-spi.1", "rx", (void *)DMACH_SPI1_RX },
+        { "s3c2412-spi.1", "tx", (void *)DMACH_SPI1_TX },
+        { "s3c2440-uart.0", "rx", (void *)DMACH_UART0 },
+        { "s3c2440-uart.0", "tx", (void *)DMACH_UART0 },
+        { "s3c2440-uart.1", "rx", (void *)DMACH_UART1 },
+        { "s3c2440-uart.1", "tx", (void *)DMACH_UART1 },
+        { "s3c2440-uart.2", "rx", (void *)DMACH_UART2 },
+        { "s3c2440-uart.2", "tx", (void *)DMACH_UART2 },
+        { "s3c2412-iis", "rx", (void *)DMACH_I2S_IN },
+        { "s3c2412-iis", "tx", (void *)DMACH_I2S_OUT },
+        { "s3c-hsudc", "rx0", (void *)DMACH_USB_EP1 },
+        { "s3c-hsudc", "tx0", (void *)DMACH_USB_EP1 },
+        { "s3c-hsudc", "rx1", (void *)DMACH_USB_EP2 },
+        { "s3c-hsudc", "tx1", (void *)DMACH_USB_EP2 },
+        { "s3c-hsudc", "rx2", (void *)DMACH_USB_EP3 },
+        { "s3c-hsudc", "tx2", (void *)DMACH_USB_EP3 },
+        { "s3c-hsudc", "rx3", (void *)DMACH_USB_EP4 },
+        { "s3c-hsudc", "tx3", (void *)DMACH_USB_EP4 }
+};
+
 static struct s3c24xx_dma_platdata s3c2412_dma_platdata = {
         .num_phy_channels = 4,
         .channels = s3c2412_dma_channels,
         .num_channels = DMACH_MAX,
+        .slave_map = s3c2412_dma_slave_map,
+        .slavecnt = ARRAY_SIZE(s3c2412_dma_slave_map),
 };
 
 struct platform_device s3c2412_device_dma = {
@@ -534,10 +590,30 @@ static struct s3c24xx_dma_channel s3c2443_dma_channels[DMACH_MAX] = {
         [DMACH_MIC_IN] = { S3C24XX_DMA_APB, true, 29 },
 };
 
+static const struct dma_slave_map s3c2443_dma_slave_map[] = {
+        { "s3c2440-sdi", "rx-tx", (void *)DMACH_SDI },
+        { "s3c2443-spi.0", "rx", (void *)DMACH_SPI0_RX },
+        { "s3c2443-spi.0", "tx", (void *)DMACH_SPI0_TX },
+        { "s3c2443-spi.1", "rx", (void *)DMACH_SPI1_RX },
+        { "s3c2443-spi.1", "tx", (void *)DMACH_SPI1_TX },
+        { "s3c2440-uart.0", "rx", (void *)DMACH_UART0 },
+        { "s3c2440-uart.0", "tx", (void *)DMACH_UART0 },
+        { "s3c2440-uart.1", "rx", (void *)DMACH_UART1 },
+        { "s3c2440-uart.1", "tx", (void *)DMACH_UART1 },
+        { "s3c2440-uart.2", "rx", (void *)DMACH_UART2 },
+        { "s3c2440-uart.2", "tx", (void *)DMACH_UART2 },
+        { "s3c2440-uart.3", "rx", (void *)DMACH_UART3 },
+        { "s3c2440-uart.3", "tx", (void *)DMACH_UART3 },
+        { "s3c24xx-iis", "rx", (void *)DMACH_I2S_IN },
+        { "s3c24xx-iis", "tx", (void *)DMACH_I2S_OUT },
+};
+
 static struct s3c24xx_dma_platdata s3c2443_dma_platdata = {
         .num_phy_channels = 6,
         .channels = s3c2443_dma_channels,
         .num_channels = DMACH_MAX,
+        .slave_map = s3c2443_dma_slave_map,
+        .slavecnt = ARRAY_SIZE(s3c2443_dma_slave_map),
 };
 
 struct platform_device s3c2443_device_dma = {
diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
index 65e5f9cb650f..b7970f1fa3d5 100644
--- a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
@@ -249,7 +249,7 @@ static int s3c2410_calc_bank(struct s3c_cpufreq_config *cfg,
         return 0;
 }
 
-static unsigned int tacc_tab[] = {
+static const unsigned int tacc_tab[] = {
         [0]     = 1,
         [1]     = 2,
         [2]     = 3,
diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c
index d75f95e487ee..0ae4d47a4663 100644
--- a/arch/arm/mach-s3c24xx/pm-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/pm-s3c2412.c
@@ -53,7 +53,7 @@ static int s3c2412_cpu_suspend(unsigned long arg)
 }
 
 /* mapping of interrupts to parts of the wakeup mask */
-static struct samsung_wakeup_mask wake_irqs[] = {
+static const struct samsung_wakeup_mask wake_irqs[] = {
         { .irq = IRQ_RTC,       .bit = S3C2412_PWRCFG_RTC_MASKIRQ, },
 };
 
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 7c66ce1a6bb6..9843eb4dd04e 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -56,7 +56,8 @@
 #include "watchdog-reset.h"
 
 /* External clock frequency */
-static unsigned long xtal_f = 12000000, xusbxti_f = 48000000;
+static unsigned long xtal_f __ro_after_init = 12000000;
+static unsigned long xusbxti_f __ro_after_init = 48000000;
 
 void __init s3c64xx_set_xtal_freq(unsigned long freq)
 {
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index b57783371d52..a3f39dd114f9 100644
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -58,9 +58,6 @@ static struct resource s3c64xx_iis0_resource[] = {
 
 static struct s3c_audio_pdata i2s0_pdata = {
         .cfg_gpio = s3c64xx_i2s_cfg_gpio,
-        .dma_filter = pl08x_filter_id,
-        .dma_playback = DMACH_I2S0_OUT,
-        .dma_capture = DMACH_I2S0_IN,
 };
 
 struct platform_device s3c64xx_device_iis0 = {
@@ -80,9 +77,6 @@ static struct resource s3c64xx_iis1_resource[] = {
 
 static struct s3c_audio_pdata i2s1_pdata = {
         .cfg_gpio = s3c64xx_i2s_cfg_gpio,
-        .dma_filter = pl08x_filter_id,
-        .dma_playback = DMACH_I2S1_OUT,
-        .dma_capture = DMACH_I2S1_IN,
 };
 
 struct platform_device s3c64xx_device_iis1 = {
@@ -102,9 +96,6 @@ static struct resource s3c64xx_iisv4_resource[] = {
 
 static struct s3c_audio_pdata i2sv4_pdata = {
         .cfg_gpio = s3c64xx_i2s_cfg_gpio,
-        .dma_filter = pl08x_filter_id,
-        .dma_playback = DMACH_HSI_I2SV40_TX,
-        .dma_capture = DMACH_HSI_I2SV40_RX,
         .type = {
                 .i2s = {
                         .quirks = QUIRK_PRI_6CHAN,
@@ -153,9 +144,6 @@ static struct resource s3c64xx_pcm0_resource[] = {
 
 static struct s3c_audio_pdata s3c_pcm0_pdata = {
         .cfg_gpio = s3c64xx_pcm_cfg_gpio,
-        .dma_filter = pl08x_filter_id,
-        .dma_capture = DMACH_PCM0_RX,
-        .dma_playback = DMACH_PCM0_TX,
 };
 
 struct platform_device s3c64xx_device_pcm0 = {
@@ -175,9 +163,6 @@ static struct resource s3c64xx_pcm1_resource[] = {
 
 static struct s3c_audio_pdata s3c_pcm1_pdata = {
         .cfg_gpio = s3c64xx_pcm_cfg_gpio,
-        .dma_filter = pl08x_filter_id,
-        .dma_playback = DMACH_PCM1_TX,
-        .dma_capture = DMACH_PCM1_RX,
 };
 
 struct platform_device s3c64xx_device_pcm1 = {
@@ -209,10 +194,6 @@ static struct resource s3c64xx_ac97_resource[] = {
 };
 
 static struct s3c_audio_pdata s3c_ac97_pdata = {
-        .dma_playback = DMACH_AC97_PCMOUT,
-        .dma_filter = pl08x_filter_id,
-        .dma_capture = DMACH_AC97_PCMIN,
-        .dma_capture_mic = DMACH_AC97_MICIN,
 };
 
 static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index 59d91b83b03d..b0be382ff6bb 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -285,7 +285,7 @@ static int s3c64xx_cpu_suspend(unsigned long arg)
 }
 
 /* mapping of interrupts to parts of the wakeup mask */
-static struct samsung_wakeup_mask wake_irqs[] = {
+static const struct samsung_wakeup_mask wake_irqs[] = {
         { .irq = IRQ_RTC_ALARM, .bit = S3C64XX_PWRCFG_RTC_ALARM_DISABLE, },
         { .irq = IRQ_RTC_TIC,   .bit = S3C64XX_PWRCFG_RTC_TICK_DISABLE, },
         { .irq = IRQ_PENDN,     .bit = S3C64XX_PWRCFG_TS_DISABLE, },
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
index 0c6bb458b7a4..e19266844e16 100644
--- a/arch/arm/mach-shmobile/platsmp-apmu.c
+++ b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -31,9 +31,21 @@ static struct {
         int bit;
 } apmu_cpus[NR_CPUS];
 
-#define WUPCR_OFFS 0x10
-#define PSTR_OFFS 0x40
-#define CPUNCR_OFFS(n) (0x100 + (0x10 * (n)))
+#define WUPCR_OFFS       0x10           /* Wake Up Control Register */
+#define PSTR_OFFS        0x40           /* Power Status Register */
+#define CPUNCR_OFFS(n)  (0x100 + (0x10 * (n)))
+                                        /* CPUn Power Status Control Register */
+#define DBGRCR_OFFS     0x180           /* Debug Resource Reset Control Reg. */
+
+/* Power Status Register */
+#define CPUNST(r, n)    (((r) >> (n * 4)) & 3)  /* CPUn Status Bit */
+#define CPUST_RUN       0               /* Run Mode */
+#define CPUST_STANDBY   3               /* CoreStandby Mode */
+
+/* Debug Resource Reset Control Register */
+#define DBGCPUREN       BIT(24)         /* CPU Other Reset Request Enable */
+#define DBGCPUNREN(n)   BIT((n) + 20)   /* CPUn Reset Request Enable */
+#define DBGCPUPREN      BIT(19)         /* CPU Peripheral Reset Req. Enable */
 
 static int __maybe_unused apmu_power_on(void __iomem *p, int bit)
 {
@@ -59,7 +71,7 @@ static int __maybe_unused apmu_power_off_poll(void __iomem *p, int bit)
         int k;
 
         for (k = 0; k < 1000; k++) {
-                if (((readl_relaxed(p + PSTR_OFFS) >> (bit * 4)) & 0x03) == 3)
+                if (CPUNST(readl_relaxed(p + PSTR_OFFS), bit) == CPUST_STANDBY)
                         return 1;
 
                 mdelay(1);
@@ -78,6 +90,8 @@ static int __maybe_unused apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu)
 #ifdef CONFIG_SMP
 static void apmu_init_cpu(struct resource *res, int cpu, int bit)
 {
+        u32 x;
+
         if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
                 return;
 
@@ -85,6 +99,11 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit)
         apmu_cpus[cpu].bit = bit;
 
         pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);
+
+        /* Setup for debug mode */
+        x = readl(apmu_cpus[cpu].iomem + DBGRCR_OFFS);
+        x |= DBGCPUREN | DBGCPUNREN(bit) | DBGCPUPREN;
+        writel(x, apmu_cpus[cpu].iomem + DBGRCR_OFFS);
 }
 
 static void apmu_parse_cfg(void (*fn)(struct resource *res, int cpu, int bit),
@@ -197,21 +216,9 @@ static void __init shmobile_smp_apmu_prepare_cpus_dt(unsigned int max_cpus)
         rcar_gen2_pm_init();
 }
 
-static int shmobile_smp_apmu_boot_secondary_md21(unsigned int cpu,
-                                                 struct task_struct *idle)
-{
-        /* Error out when hardware debug mode is enabled */
-        if (rcar_gen2_read_mode_pins() & BIT(21)) {
-                pr_warn("Unable to boot CPU%u when MD21 is set\n", cpu);
-                return -ENOTSUPP;
-        }
-
-        return shmobile_smp_apmu_boot_secondary(cpu, idle);
-}
-
 static struct smp_operations apmu_smp_ops __initdata = {
         .smp_prepare_cpus       = shmobile_smp_apmu_prepare_cpus_dt,
-        .smp_boot_secondary     = shmobile_smp_apmu_boot_secondary_md21,
+        .smp_boot_secondary     = shmobile_smp_apmu_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_can_disable        = shmobile_smp_cpu_can_disable,
         .cpu_die                = shmobile_smp_apmu_cpu_die,
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index dd9ac366868f..0178da7ace82 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -20,14 +20,30 @@
 
 /* RST */
 #define RST             0xe6160000
-#define CA15BAR         0x0020
-#define CA7BAR          0x0030
-#define CA15RESCNT      0x0040
-#define CA7RESCNT       0x0044
+
+#define CA15BAR         0x0020          /* CA15 Boot Address Register */
+#define CA7BAR          0x0030          /* CA7 Boot Address Register */
+#define CA15RESCNT      0x0040          /* CA15 Reset Control Register */
+#define CA7RESCNT       0x0044          /* CA7 Reset Control Register */
+
+/* SYS Boot Address Register */
+#define SBAR_BAREN      BIT(4)          /* SBAR is valid */
+
+/* Reset Control Registers */
+#define CA15RESCNT_CODE 0xa5a50000
+#define CA15RESCNT_CPUS 0xf             /* CPU0-3 */
+#define CA7RESCNT_CODE  0x5a5a0000
+#define CA7RESCNT_CPUS  0xf             /* CPU0-3 */
+
 
 /* On-chip RAM */
 #define ICRAM1          0xe63c0000      /* Inter Connect RAM1 (4 KiB) */
 
+static inline u32 phys_to_sbar(phys_addr_t addr)
+{
+        return (addr >> 8) & 0xfffffc00;
+}
+
 /* SYSC */
 #define SYSCIER 0x0c
 #define SYSCIMR 0x10
@@ -82,22 +98,24 @@ void __init rcar_gen2_pm_init(void)
 
         /* setup reset vectors */
         p = ioremap_nocache(RST, 0x63);
-        bar = (boot_vector_addr >> 8) & 0xfffffc00;
+        bar = phys_to_sbar(boot_vector_addr);
         if (has_a15) {
                 writel_relaxed(bar, p + CA15BAR);
-                writel_relaxed(bar | 0x10, p + CA15BAR);
+                writel_relaxed(bar | SBAR_BAREN, p + CA15BAR);
 
                 /* de-assert reset for CA15 CPUs */
-                writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) |
-                                0xa5a50000, p + CA15RESCNT);
+                writel_relaxed((readl_relaxed(p + CA15RESCNT) &
+                                ~CA15RESCNT_CPUS) | CA15RESCNT_CODE,
+                               p + CA15RESCNT);
         }
         if (has_a7) {
                 writel_relaxed(bar, p + CA7BAR);
-                writel_relaxed(bar | 0x10, p + CA7BAR);
+                writel_relaxed(bar | SBAR_BAREN, p + CA7BAR);
 
                 /* de-assert reset for CA7 CPUs */
-                writel_relaxed((readl_relaxed(p + CA7RESCNT) & ~0x0f) |
-                                0x5a5a0000, p + CA7RESCNT);
+                writel_relaxed((readl_relaxed(p + CA7RESCNT) &
+                                ~CA7RESCNT_CPUS) | CA7RESCNT_CODE,
+                               p + CA7RESCNT);
         }
         iounmap(p);
 
diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h
index 8a66b4aae035..6792e249cf56 100644
--- a/arch/arm/mach-shmobile/rcar-gen2.h
+++ b/arch/arm/mach-shmobile/rcar-gen2.h
@@ -2,8 +2,6 @@
 #define __ASM_RCAR_GEN2_H__
 
 void rcar_gen2_timer_init(void);
-#define MD(nr) BIT(nr)
-u32 rcar_gen2_read_mode_pins(void);
 void rcar_gen2_reserve(void);
 void rcar_gen2_pm_init(void);
 
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index ac63fa407b64..52d466b75973 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -29,24 +29,6 @@
 #include "common.h"
 #include "rcar-gen2.h"
 
-#define MODEMR 0xe6160060
-
-u32 rcar_gen2_read_mode_pins(void)
-{
-        static u32 mode;
-        static bool mode_valid;
-
-        if (!mode_valid) {
-                void __iomem *modemr = ioremap_nocache(MODEMR, 4);
-                BUG_ON(!modemr);
-                mode = ioread32(modemr);
-                iounmap(modemr);
-                mode_valid = true;
-        }
-
-        return mode;
-}
-
 static unsigned int __init get_extal_freq(void)
 {
         struct device_node *cpg, *extal;
diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c
index 2d6417af73b5..2948c22cfc53 100644
--- a/arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/arch/arm/mach-shmobile/smp-r8a7791.c
@@ -42,21 +42,9 @@ static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus)
         rcar_gen2_pm_init();
 }
 
-static int r8a7791_smp_boot_secondary(unsigned int cpu,
-                                      struct task_struct *idle)
-{
-        /* Error out when hardware debug mode is enabled */
-        if (rcar_gen2_read_mode_pins() & BIT(21)) {
-                pr_warn("Unable to boot CPU%u when MD21 is set\n", cpu);
-                return -ENOTSUPP;
-        }
-
-        return shmobile_smp_apmu_boot_secondary(cpu, idle);
-}
-
 const struct smp_operations r8a7791_smp_ops __initconst = {
         .smp_prepare_cpus       = r8a7791_smp_prepare_cpus,
-        .smp_boot_secondary     = r8a7791_smp_boot_secondary,
+        .smp_boot_secondary     = shmobile_smp_apmu_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_can_disable        = shmobile_smp_cpu_can_disable,
         .cpu_die                = shmobile_smp_apmu_cpu_die,
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 2e2bde271205..f44e3acb5c90 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -63,7 +63,9 @@ static const char * const sun8i_board_dt_compat[] = {
         "allwinner,sun8i-a23",
         "allwinner,sun8i-a33",
         "allwinner,sun8i-a83t",
+        "allwinner,sun8i-h2-plus",
         "allwinner,sun8i-h3",
+        "allwinner,sun8i-v3s",
         NULL,
 };
 
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 7478f6fb3664..ea6bff404161 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -23,7 +23,7 @@
 
 #include "board.h"
 
-static struct property_entry __initdata wifi_rfkill_prop[] = {
+static struct property_entry wifi_rfkill_prop[] __initdata = {
         PROPERTY_ENTRY_STRING("name", "wifi_rfkill"),
         PROPERTY_ENTRY_STRING("type", "wlan"),
         { },
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 56d0eb6e254e..c2499bff4986 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -4,7 +4,6 @@
 
 obj-y                           := pm.o
 obj-$(CONFIG_UX500_SOC_DB8500)  += cpu-db8500.o
-obj-$(CONFIG_MACH_MOP500)       += board-mop500-audio.o
 obj-$(CONFIG_SMP)               += platsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)       += hotplug.o
 obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
deleted file mode 100644
index b2a0899e7453..000000000000
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License terms: GNU General Public License (GPL), version 2
- */
-
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/gpio.h>
-#include <linux/platform_data/dma-ste-dma40.h>
-
-#include <linux/platform_data/asoc-ux500-msp.h>
-
-#include "ste-dma40-db8500.h"
-#include "board-mop500.h"
-
-static struct stedma40_chan_cfg msp0_dma_rx = {
-        .high_priority = true,
-        .dir = DMA_DEV_TO_MEM,
-        .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
-};
-
-static struct stedma40_chan_cfg msp0_dma_tx = {
-        .high_priority = true,
-        .dir = DMA_MEM_TO_DEV,
-        .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
-};
-
-struct msp_i2s_platform_data msp0_platform_data = {
-        .id = 0,
-        .msp_i2s_dma_rx = &msp0_dma_rx,
-        .msp_i2s_dma_tx = &msp0_dma_tx,
-};
-
-static struct stedma40_chan_cfg msp1_dma_rx = {
-        .high_priority = true,
-        .dir = DMA_DEV_TO_MEM,
-        .dev_type = DB8500_DMA_DEV30_MSP3,
-};
-
-static struct stedma40_chan_cfg msp1_dma_tx = {
-        .high_priority = true,
-        .dir = DMA_MEM_TO_DEV,
-        .dev_type = DB8500_DMA_DEV30_MSP1,
-};
-
-struct msp_i2s_platform_data msp1_platform_data = {
-        .id = 1,
-        .msp_i2s_dma_rx = NULL,
-        .msp_i2s_dma_tx = &msp1_dma_tx,
-};
-
-static struct stedma40_chan_cfg msp2_dma_rx = {
-        .high_priority = true,
-        .dir = DMA_DEV_TO_MEM,
-        .dev_type = DB8500_DMA_DEV14_MSP2,
-};
-
-static struct stedma40_chan_cfg msp2_dma_tx = {
-        .high_priority = true,
-        .dir = DMA_MEM_TO_DEV,
-        .dev_type = DB8500_DMA_DEV14_MSP2,
-        .use_fixed_channel = true,
-        .phy_channel = 1,
-};
-
-struct msp_i2s_platform_data msp2_platform_data = {
-        .id = 2,
-        .msp_i2s_dma_rx = &msp2_dma_rx,
-        .msp_i2s_dma_tx = &msp2_dma_tx,
-};
-
-struct msp_i2s_platform_data msp3_platform_data = {
-        .id             = 3,
-        .msp_i2s_dma_rx = &msp1_dma_rx,
-        .msp_i2s_dma_tx = NULL,
-};
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
deleted file mode 100644
index 7c7b0adca582..000000000000
--- a/arch/arm/mach-ux500/board-mop500.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef __BOARD_MOP500_H
-#define __BOARD_MOP500_H
-
-#include <linux/platform_data/asoc-ux500-msp.h>
-
-extern struct msp_i2s_platform_data msp0_platform_data;
-extern struct msp_i2s_platform_data msp1_platform_data;
-extern struct msp_i2s_platform_data msp2_platform_data;
-extern struct msp_i2s_platform_data msp3_platform_data;
-
-#endif
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 46b1da1bf5d2..24529cf58df6 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/amba/bus.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/irqchip.h>
@@ -34,7 +33,6 @@
 
 #include "setup.h"
 
-#include "board-mop500.h"
 #include "db8500-regs.h"
 
 static int __init ux500_l2x0_unlock(void)
@@ -142,21 +140,6 @@ static struct arm_pmu_platdata db8500_pmu_platdata = {
 static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
         /* Requires call-back bindings. */
         OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
-        /* Requires DMA bindings. */
-        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
-                       "ux500-msp-i2s.0", &msp0_platform_data),
-        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,
-                       "ux500-msp-i2s.1", &msp1_platform_data),
-        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,
-                       "ux500-msp-i2s.2", &msp2_platform_data),
-        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,
-                       "ux500-msp-i2s.3", &msp3_platform_data),
-        /* Requires non-DT:able platform data. */
-        OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),
-        OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),
-        OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
-        OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
-                        NULL),
         {},
 };
 
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 8f2f615ff958..e0ee139fdebf 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -31,10 +31,14 @@
 #define UX500_CPU1_JUMPADDR_OFFSET 0x1FF4
 #define UX500_CPU1_WAKEMAGIC_OFFSET 0x1FF0
 
-static void wakeup_secondary(void)
+static void __iomem *backupram;
+
+static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)
 {
         struct device_node *np;
-        static void __iomem *backupram;
+        static void __iomem *scu_base;
+        unsigned int ncores;
+        int i;
 
         np = of_find_compatible_node(NULL, NULL, "ste,dbx500-backupram");
         if (!np) {
@@ -48,29 +52,6 @@ static void wakeup_secondary(void)
                 return;
         }
 
-        /*
-         * write the address of secondary startup into the backup ram register
-         * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the
-         * backup ram register at offset 0x1FF0, which is what boot rom code
-         * is waiting for. This will wake up the secondary core from WFE.
-         */
-        writel(virt_to_phys(secondary_startup),
-               backupram + UX500_CPU1_JUMPADDR_OFFSET);
-        writel(0xA1FEED01,
-               backupram + UX500_CPU1_WAKEMAGIC_OFFSET);
-
-        /* make sure write buffer is drained */
-        mb();
-        iounmap(backupram);
-}
-
-static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)
-{
-        struct device_node *np;
-        static void __iomem *scu_base;
-        unsigned int ncores;
-        int i;
-
         np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
         if (!np) {
                 pr_err("No SCU base address\n");
@@ -92,7 +73,19 @@ static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)
 
 static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
-        wakeup_secondary();
+        /*
+         * write the address of secondary startup into the backup ram register
+         * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the
+         * backup ram register at offset 0x1FF0, which is what boot rom code
+         * is waiting for. This will wake up the secondary core from WFE.
+         */
+        writel(virt_to_phys(secondary_startup),
+               backupram + UX500_CPU1_JUMPADDR_OFFSET);
+        writel(0xA1FEED01,
+               backupram + UX500_CPU1_WAKEMAGIC_OFFSET);
+
+        /* make sure write buffer is drained */
+        mb();
         arch_send_wakeup_ipi_mask(cpumask_of(cpu));
         return 0;
 }
diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h
deleted file mode 100644
index 0296ae5b0fd9..000000000000
--- a/arch/arm/mach-ux500/ste-dma40-db8500.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * arch/arm/mach-ux500/ste_dma40_db8500.h
- * DB8500-SoC-specific configuration for DMA40
- *
- * Copyright (C) ST-Ericsson 2007-2010
- * License terms: GNU General Public License (GPL) version 2
- * Author: Per Friden <per.friden@stericsson.com>
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- */
-#ifndef STE_DMA40_DB8500_H
-#define STE_DMA40_DB8500_H
-
-#define DB8500_DMA_NR_DEV 64
-
-/*
- * Unless otherwise specified, all channels numbers are used for
- * TX & RX, and can be used for either source or destination
- * channels.
- */
-enum dma_dev_type {
-        DB8500_DMA_DEV0_SPI0 = 0,
-        DB8500_DMA_DEV1_SD_MMC0 = 1,
-        DB8500_DMA_DEV2_SD_MMC1 = 2,
-        DB8500_DMA_DEV3_SD_MMC2 = 3,
-        DB8500_DMA_DEV4_I2C1 = 4,
-        DB8500_DMA_DEV5_I2C3 = 5,
-        DB8500_DMA_DEV6_I2C2 = 6,
-        DB8500_DMA_DEV7_I2C4 = 7,                       /* Only on V1 and later */
-        DB8500_DMA_DEV8_SSP0 = 8,
-        DB8500_DMA_DEV9_SSP1 = 9,
-        DB8500_DMA_DEV10_MCDE_RX = 10,                  /* RX only */
-        DB8500_DMA_DEV11_UART2 = 11,
-        DB8500_DMA_DEV12_UART1 = 12,
-        DB8500_DMA_DEV13_UART0 = 13,
-        DB8500_DMA_DEV14_MSP2 = 14,
-        DB8500_DMA_DEV15_I2C0 = 15,
-        DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15 = 16,
-        DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14 = 17,
-        DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13 = 18,
-        DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12 = 19,
-        DB8500_DMA_DEV20_SLIM0_CH0_HSI_CH0 = 20,
-        DB8500_DMA_DEV21_SLIM0_CH1_HSI_CH1 = 21,
-        DB8500_DMA_DEV22_SLIM0_CH2_HSI_CH2 = 22,
-        DB8500_DMA_DEV23_SLIM0_CH3_HSI_CH3 = 23,
-        DB8500_DMA_DEV24_SXA0 = 24,
-        DB8500_DMA_DEV25_SXA1 = 25,
-        DB8500_DMA_DEV26_SXA2 = 26,
-        DB8500_DMA_DEV27_SXA3 = 27,
-        DB8500_DMA_DEV28_SD_MM2 = 28,
-        DB8500_DMA_DEV29_SD_MM0 = 29,
-        DB8500_DMA_DEV30_MSP1 = 30,
-        /* On DB8500v2, MSP3 RX replaces MSP1 RX */
-        DB8500_DMA_DEV30_MSP3 = 30,
-        DB8500_DMA_DEV31_MSP0_SLIM0_CH0 = 31,
-        DB8500_DMA_DEV32_SD_MM1 = 32,
-        DB8500_DMA_DEV33_SPI2 = 33,
-        DB8500_DMA_DEV34_I2C3_RX2_TX2 = 34,
-        DB8500_DMA_DEV35_SPI1 = 35,
-        DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11 = 36,
-        DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10 = 37,
-        DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9 = 38,
-        DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8 = 39,
-        DB8500_DMA_DEV40_SPI3 = 40,
-        DB8500_DMA_DEV41_SD_MM3 = 41,
-        DB8500_DMA_DEV42_SD_MM4 = 42,
-        DB8500_DMA_DEV43_SD_MM5 = 43,
-        DB8500_DMA_DEV44_SXA4 = 44,
-        DB8500_DMA_DEV45_SXA5 = 45,
-        DB8500_DMA_DEV46_SLIM0_CH8_SRC_SXA6 = 46,
-        DB8500_DMA_DEV47_SLIM0_CH9_SRC_SXA7 = 47,
-        DB8500_DMA_DEV48_CAC1 = 48,
-        DB8500_DMA_DEV49_CAC1_TX_HAC1_TX = 49,          /* TX only */
-        DB8500_DMA_DEV50_HAC1_TX = 50,                  /* TX only */
-        DB8500_DMA_MEMCPY_TX_0 = 51,                    /* TX only */
-        DB8500_DMA_DEV52_SLIM0_CH4_HSI_CH4 = 52,
-        DB8500_DMA_DEV53_SLIM0_CH5_HSI_CH5 = 53,
-        DB8500_DMA_DEV54_SLIM0_CH6_HSI_CH6 = 54,
-        DB8500_DMA_DEV55_SLIM0_CH7_HSI_CH7 = 55,
-        /* 56 -> 60 are channels reserved for memcpy only */
-        DB8500_DMA_DEV61_CAC0 = 61,
-        DB8500_DMA_DEV62_CAC0_TX_HAC0_TX = 62,          /* TX only */
-        DB8500_DMA_DEV63_HAC0_TX = 63,                  /* TX only */
-};
-
-#endif
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index cf7b95fddbb3..03fac123676d 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -77,15 +77,6 @@ static struct resource s3c_ac97_resource[] = {
         [1] = DEFINE_RES_IRQ(IRQ_S3C244X_AC97),
 };
 
-static struct s3c_audio_pdata s3c_ac97_pdata = {
-#ifdef CONFIG_S3C24XX_DMAC
-        .dma_filter = s3c24xx_dma_filter,
-#endif
-        .dma_playback = (void *)DMACH_PCM_OUT,
-        .dma_capture = (void *)DMACH_PCM_IN,
-        .dma_capture_mic = (void *)DMACH_MIC_IN,
-};
-
 struct platform_device s3c_device_ac97 = {
         .name           = "samsung-ac97",
         .id             = -1,
@@ -94,7 +85,6 @@ struct platform_device s3c_device_ac97 = {
         .dev            = {
                 .dma_mask               = &samsung_device_dma_mask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &s3c_ac97_pdata,
         }
 };
 #endif /* CONFIG_CPU_S3C2440 */
@@ -574,14 +564,6 @@ static struct resource s3c_iis_resource[] = {
         [0] = DEFINE_RES_MEM(S3C24XX_PA_IIS, S3C24XX_SZ_IIS),
 };
 
-static struct s3c_audio_pdata s3c_iis_platdata = {
-#ifdef CONFIG_S3C24XX_DMAC
-        .dma_filter = s3c24xx_dma_filter,
-#endif
-        .dma_playback = (void *)DMACH_I2S_OUT,
-        .dma_capture = (void *)DMACH_I2S_IN,
-};
-
 struct platform_device s3c_device_iis = {
         .name           = "s3c24xx-iis",
         .id             = -1,
@@ -590,7 +572,6 @@ struct platform_device s3c_device_iis = {
         .dev            = {
                 .dma_mask               = &samsung_device_dma_mask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &s3c_iis_platdata,
         }
 };
 #endif /* CONFIG_PLAT_S3C24XX */
diff --git a/arch/arm/plat-samsung/include/plat/wakeup-mask.h b/arch/arm/plat-samsung/include/plat/wakeup-mask.h
index 43e4acd2e1c6..bbfa84b0505a 100644
--- a/arch/arm/plat-samsung/include/plat/wakeup-mask.h
+++ b/arch/arm/plat-samsung/include/plat/wakeup-mask.h
@@ -38,7 +38,7 @@ struct samsung_wakeup_mask {
  * required to be correct before we enter sleep.
  */
 extern void samsung_sync_wakemask(void __iomem *reg,
-                                  struct samsung_wakeup_mask *masks,
+                                  const struct samsung_wakeup_mask *masks,
                                   int nr_masks);
 
 #endif /* __PLAT_WAKEUP_MASK_H */
diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c
index 20c3d9117cc2..b9de6b543330 100644
--- a/arch/arm/plat-samsung/wakeup-mask.c
+++ b/arch/arm/plat-samsung/wakeup-mask.c
@@ -20,7 +20,7 @@
 #include <plat/pm.h>
 
 void samsung_sync_wakemask(void __iomem *reg,
-                           struct samsung_wakeup_mask *mask, int nr_mask)
+                           const struct samsung_wakeup_mask *mask, int nr_mask)
 {
         struct irq_data *data;
         u32 val;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index fc033c0d2a0f..eada0b58ba1c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -356,5 +356,21 @@
                                 status = "disabled";
                         };
                 };
+
+                vpu: vpu@d0100000 {
+                        compatible = "amlogic,meson-gx-vpu";
+                        reg = <0x0 0xd0100000 0x0 0x100000>,
+                              <0x0 0xc883c000 0x0 0x1000>,
+                              <0x0 0xc8838000 0x0 0x1000>;
+                        reg-names = "vpu", "hhi", "dmc";
+                        interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        /* CVBS VDAC output port */
+                        cvbs_vdac_port: port@0 {
+                                reg = <0>;
+                        };
+                };
         };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 969682092e0f..4cbd626a9e88 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -142,6 +142,16 @@
                 clocks = <&wifi32k>;
                 clock-names = "ext_clock";
         };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
 };
 
 &uart_AO {
@@ -229,3 +239,9 @@
         clocks = <&clkc CLKID_FCLK_DIV4>;
         clock-names = "clkin0";
 };
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 203be28978d5..4a96e0f6f926 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -125,6 +125,16 @@
                 clocks = <&wifi32k>;
                 clock-names = "ext_clock";
         };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -234,3 +244,9 @@
         clocks = <&clkc CLKID_FCLK_DIV4>;
         clock-names = "clkin0";
 };
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 51edd5b5c460..596240c38a9c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -506,3 +506,7 @@
                  <&clkc CLKID_FCLK_DIV2>;
         clock-names = "core", "clkin0", "clkin1";
 };
+
+&vpu {
+        compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
index e99101ae9664..cea4a3eded9b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
@@ -117,6 +117,16 @@
                 clocks = <&wifi32k>;
                 clock-names = "ext_clock";
         };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
 };
 
 &uart_AO {
@@ -203,3 +213,9 @@
         clocks = <&clkc CLKID_FCLK_DIV4>;
         clock-names = "clkin0";
 };
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 9f89b99c4806..69216246275d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -43,7 +43,7 @@
 
 #include "meson-gx.dtsi"
 #include <dt-bindings/clock/gxbb-clkc.h>
-#include <dt-bindings/gpio/meson-gxbb-gpio.h>
+#include <dt-bindings/gpio/meson-gxl-gpio.h>
 
 / {
         compatible = "amlogic,meson-gxl";
@@ -299,3 +299,7 @@
                  <&clkc CLKID_FCLK_DIV2>;
         clock-names = "core", "clkin0", "clkin1";
 };
+
+&vpu {
+        compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index f859d75db8bd..5a337d339df1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -90,6 +90,16 @@
                 compatible = "mmc-pwrseq-emmc";
                 reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
         };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -167,3 +177,9 @@
                 max-speed = <1000>;
         };
 };
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
index c1974bbbddea..eb2f0c3e5e53 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
@@ -112,3 +112,7 @@
                 };
         };
 };
+
+&vpu {
+        compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
+};
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index a852e28a40e1..a83ed2c6bbf7 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -81,7 +81,7 @@
                 #address-cells = <0>;
                 interrupt-controller;
                 reg = <0x0 0x2c001000 0 0x1000>,
-                      <0x0 0x2c002000 0 0x1000>,
+                      <0x0 0x2c002000 0 0x2000>,
                       <0x0 0x2c004000 0 0x2000>,
                       <0x0 0x2c006000 0 0x2000>;
                 interrupts = <1 9 0xf04>;
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 9d1d7ad9b075..29ed6b61c737 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -64,6 +64,16 @@
                         reg = <0x0 0x86000000 0x0 0x200000>;
                         no-map;
                 };
+
+                memory@85800000 {
+                        reg = <0x0 0x85800000 0x0 0x800000>;
+                        no-map;
+                };
+
+                memory@86200000 {
+                        reg = <0x0 0x86200000 0x0 0x2600000>;
+                        no-map;
+                };
         };
 
         cpus {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
index 6ffb0517421a..dbea2c3d8f0c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
@@ -169,7 +169,7 @@
                 power-source = <3300>;
         };
 
-        sdhi0_pins_uhs: sd0 {
+        sdhi0_pins_uhs: sd0_uhs {
                 groups = "sdhi0_data4", "sdhi0_ctrl";
                 function = "sdhi0";
                 power-source = <1800>;
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 869dded0f09f..33b744d54739 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -331,6 +331,7 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_MESON=m
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_BACKLIGHT_GENERIC=m
diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h
new file mode 100644
index 000000000000..df411f3e083c
--- /dev/null
+++ b/arch/arm64/include/asm/asm-uaccess.h
@@ -0,0 +1,65 @@
+#ifndef __ASM_ASM_UACCESS_H
+#define __ASM_ASM_UACCESS_H
+
+#include <asm/alternative.h>
+#include <asm/kernel-pgtable.h>
+#include <asm/sysreg.h>
+#include <asm/assembler.h>
+
+/*
+ * User access enabling/disabling macros.
+ */
+#ifdef CONFIG_ARM64_SW_TTBR0_PAN
+        .macro  __uaccess_ttbr0_disable, tmp1
+        mrs     \tmp1, ttbr1_el1                // swapper_pg_dir
+        add     \tmp1, \tmp1, #SWAPPER_DIR_SIZE // reserved_ttbr0 at the end of swapper_pg_dir
+        msr     ttbr0_el1, \tmp1                // set reserved TTBR0_EL1
+        isb
+        .endm
+
+        .macro  __uaccess_ttbr0_enable, tmp1
+        get_thread_info \tmp1
+        ldr     \tmp1, [\tmp1, #TSK_TI_TTBR0]   // load saved TTBR0_EL1
+        msr     ttbr0_el1, \tmp1                // set the non-PAN TTBR0_EL1
+        isb
+        .endm
+
+        .macro  uaccess_ttbr0_disable, tmp1
+alternative_if_not ARM64_HAS_PAN
+        __uaccess_ttbr0_disable \tmp1
+alternative_else_nop_endif
+        .endm
+
+        .macro  uaccess_ttbr0_enable, tmp1, tmp2
+alternative_if_not ARM64_HAS_PAN
+        save_and_disable_irq \tmp2              // avoid preemption
+        __uaccess_ttbr0_enable \tmp1
+        restore_irq \tmp2
+alternative_else_nop_endif
+        .endm
+#else
+        .macro  uaccess_ttbr0_disable, tmp1
+        .endm
+
+        .macro  uaccess_ttbr0_enable, tmp1, tmp2
+        .endm
+#endif
+
+/*
+ * These macros are no-ops when UAO is present.
+ */
+        .macro  uaccess_disable_not_uao, tmp1
+        uaccess_ttbr0_disable \tmp1
+alternative_if ARM64_ALT_PAN_NOT_UAO
+        SET_PSTATE_PAN(1)
+alternative_else_nop_endif
+        .endm
+
+        .macro  uaccess_enable_not_uao, tmp1, tmp2
+        uaccess_ttbr0_enable \tmp1, \tmp2
+alternative_if ARM64_ALT_PAN_NOT_UAO
+        SET_PSTATE_PAN(0)
+alternative_else_nop_endif
+        .endm
+
+#endif
diff --git a/arch/arm64/include/asm/current.h b/arch/arm64/include/asm/current.h
index f2bcbe2d9889..86c404171305 100644
--- a/arch/arm64/include/asm/current.h
+++ b/arch/arm64/include/asm/current.h
@@ -9,9 +9,17 @@
 
 struct task_struct;
 
+/*
+ * We don't use read_sysreg() as we want the compiler to cache the value where
+ * possible.
+ */
 static __always_inline struct task_struct *get_current(void)
 {
-        return (struct task_struct *)read_sysreg(sp_el0);
+        unsigned long sp_el0;
+
+        asm ("mrs %0, sp_el0" : "=r" (sp_el0));
+
+        return (struct task_struct *)sp_el0;
 }
 
 #define current get_current()
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index d26750ca6e06..46da3ea638bb 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -22,8 +22,6 @@
 #include <asm/kernel-pgtable.h>
 #include <asm/sysreg.h>
 
-#ifndef __ASSEMBLY__
-
 /*
  * User space memory access functions
  */
@@ -424,66 +422,4 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count);
 extern __must_check long strlen_user(const char __user *str);
 extern __must_check long strnlen_user(const char __user *str, long n);
 
-#else   /* __ASSEMBLY__ */
-
-#include <asm/assembler.h>
-
-/*
- * User access enabling/disabling macros.
- */
-#ifdef CONFIG_ARM64_SW_TTBR0_PAN
-        .macro  __uaccess_ttbr0_disable, tmp1
-        mrs     \tmp1, ttbr1_el1                // swapper_pg_dir
-        add     \tmp1, \tmp1, #SWAPPER_DIR_SIZE // reserved_ttbr0 at the end of swapper_pg_dir
-        msr     ttbr0_el1, \tmp1                // set reserved TTBR0_EL1
-        isb
-        .endm
-
-        .macro  __uaccess_ttbr0_enable, tmp1
-        get_thread_info \tmp1
-        ldr     \tmp1, [\tmp1, #TSK_TI_TTBR0]   // load saved TTBR0_EL1
-        msr     ttbr0_el1, \tmp1                // set the non-PAN TTBR0_EL1
-        isb
-        .endm
-
-        .macro  uaccess_ttbr0_disable, tmp1
-alternative_if_not ARM64_HAS_PAN
-        __uaccess_ttbr0_disable \tmp1
-alternative_else_nop_endif
-        .endm
-
-        .macro  uaccess_ttbr0_enable, tmp1, tmp2
-alternative_if_not ARM64_HAS_PAN
-        save_and_disable_irq \tmp2              // avoid preemption
-        __uaccess_ttbr0_enable \tmp1
-        restore_irq \tmp2
-alternative_else_nop_endif
-        .endm
-#else
-        .macro  uaccess_ttbr0_disable, tmp1
-        .endm
-
-        .macro  uaccess_ttbr0_enable, tmp1, tmp2
-        .endm
-#endif
-
-/*
- * These macros are no-ops when UAO is present.
- */
-        .macro  uaccess_disable_not_uao, tmp1
-        uaccess_ttbr0_disable \tmp1
-alternative_if ARM64_ALT_PAN_NOT_UAO
-        SET_PSTATE_PAN(1)
-alternative_else_nop_endif
-        .endm
-
-        .macro  uaccess_enable_not_uao, tmp1, tmp2
-        uaccess_ttbr0_enable \tmp1, \tmp2
-alternative_if ARM64_ALT_PAN_NOT_UAO
-        SET_PSTATE_PAN(0)
-alternative_else_nop_endif
-        .endm
-
-#endif  /* __ASSEMBLY__ */
-
 #endif /* __ASM_UACCESS_H */
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index a7504f40d7ee..923841ffe4a9 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -31,7 +31,7 @@
 #include <asm/memory.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 #include <asm/unistd.h>
 
 /*
diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S
index add4a1334085..e88fb99c1561 100644
--- a/arch/arm64/lib/clear_user.S
+++ b/arch/arm64/lib/clear_user.S
@@ -17,7 +17,7 @@
  */
 #include <linux/linkage.h>
 
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 
         .text
 
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S
index fd6cd05593f9..4b5d826895ff 100644
--- a/arch/arm64/lib/copy_from_user.S
+++ b/arch/arm64/lib/copy_from_user.S
@@ -17,7 +17,7 @@
 #include <linux/linkage.h>
 
 #include <asm/cache.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 
 /*
  * Copy from user space to a kernel buffer (alignment handled by the hardware)
diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S
index d828540ded6f..47184c3a97da 100644
--- a/arch/arm64/lib/copy_in_user.S
+++ b/arch/arm64/lib/copy_in_user.S
@@ -19,7 +19,7 @@
 #include <linux/linkage.h>
 
 #include <asm/cache.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 
 /*
  * Copy from user space to user space (alignment handled by the hardware)
diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S
index 3e6ae2663b82..351f0766f7a6 100644
--- a/arch/arm64/lib/copy_to_user.S
+++ b/arch/arm64/lib/copy_to_user.S
@@ -17,7 +17,7 @@
 #include <linux/linkage.h>
 
 #include <asm/cache.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 
 /*
  * Copy to user space from a kernel buffer (alignment handled by the hardware)
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S
index 17f422a4dc55..83c27b6e6dca 100644
--- a/arch/arm64/mm/cache.S
+++ b/arch/arm64/mm/cache.S
@@ -23,7 +23,7 @@
 #include <asm/assembler.h>
 #include <asm/cpufeature.h>
 #include <asm/alternative.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 
 /*
  *      flush_icache_range(start,end)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 290a84f3351f..e04082700bb1 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -524,7 +524,8 @@ EXPORT_SYMBOL(dummy_dma_ops);
 
 static int __init arm64_dma_init(void)
 {
-        if (swiotlb_force || max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
+        if (swiotlb_force == SWIOTLB_FORCE ||
+            max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
                 swiotlb = 1;
 
         return atomic_pool_init();
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index a78a5c401806..156169c6981b 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -88,21 +88,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
                         break;
 
                 pud = pud_offset(pgd, addr);
-                printk(", *pud=%016llx", pud_val(*pud));
+                pr_cont(", *pud=%016llx", pud_val(*pud));
                 if (pud_none(*pud) || pud_bad(*pud))
                         break;
 
                 pmd = pmd_offset(pud, addr);
-                printk(", *pmd=%016llx", pmd_val(*pmd));
+                pr_cont(", *pmd=%016llx", pmd_val(*pmd));
                 if (pmd_none(*pmd) || pmd_bad(*pmd))
                         break;
 
                 pte = pte_offset_map(pmd, addr);
-                printk(", *pte=%016llx", pte_val(*pte));
+                pr_cont(", *pte=%016llx", pte_val(*pte));
                 pte_unmap(pte);
         } while(0);
 
-        printk("\n");
+        pr_cont("\n");
 }
 
 #ifdef CONFIG_ARM64_HW_AFDBM
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 212c4d1e2f26..716d1226ba69 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -401,7 +401,8 @@ static void __init free_unused_memmap(void)
  */
 void __init mem_init(void)
 {
-        if (swiotlb_force || max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
+        if (swiotlb_force == SWIOTLB_FORCE ||
+            max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
                 swiotlb_init(1);
 
         set_max_mapnr(pfn_to_page(max_pfn) - mem_map);
diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
index 47cf3f9d89ff..947830a459d2 100644
--- a/arch/arm64/xen/hypercall.S
+++ b/arch/arm64/xen/hypercall.S
@@ -49,7 +49,7 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <linux/uaccess.h>
+#include <asm/asm-uaccess.h>
 #include <xen/interface/xen.h>
 
 
diff --git a/arch/mips/kvm/entry.c b/arch/mips/kvm/entry.c
index 6a02b3a3fa65..e92fb190e2d6 100644
--- a/arch/mips/kvm/entry.c
+++ b/arch/mips/kvm/entry.c
@@ -521,6 +521,9 @@ void *kvm_mips_build_exit(void *addr)
         uasm_i_and(&p, V0, V0, AT);
         uasm_i_lui(&p, AT, ST0_CU0 >> 16);
         uasm_i_or(&p, V0, V0, AT);
+#ifdef CONFIG_64BIT
+        uasm_i_ori(&p, V0, V0, ST0_SX | ST0_UX);
+#endif
         uasm_i_mtc0(&p, V0, C0_STATUS);
         uasm_i_ehb(&p);
 
@@ -643,7 +646,7 @@ static void *kvm_mips_build_ret_to_guest(void *addr)
 
         /* Setup status register for running guest in UM */
         uasm_i_ori(&p, V1, V1, ST0_EXL | KSU_USER | ST0_IE);
-        UASM_i_LA(&p, AT, ~(ST0_CU0 | ST0_MX));
+        UASM_i_LA(&p, AT, ~(ST0_CU0 | ST0_MX | ST0_SX | ST0_UX));
         uasm_i_and(&p, V1, V1, AT);
         uasm_i_mtc0(&p, V1, C0_STATUS);
         uasm_i_ehb(&p);
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 06a60b19acfb..29ec9ab3fd55 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -360,8 +360,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
         dump_handler("kvm_exit", gebase + 0x2000, vcpu->arch.vcpu_run);
 
         /* Invalidate the icache for these ranges */
-        local_flush_icache_range((unsigned long)gebase,
-                                (unsigned long)gebase + ALIGN(size, PAGE_SIZE));
+        flush_icache_range((unsigned long)gebase,
+                           (unsigned long)gebase + ALIGN(size, PAGE_SIZE));
 
         /*
          * Allocate comm page for guest kernel, a TLB will be reserved for
diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index ef31fc24344e..552544616b9d 100644
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -44,6 +44,8 @@ SECTIONS
         /* Read-only sections, merged into text segment: */
         . = LOAD_BASE ;
 
+        _text = .;
+
         /* _s_kernel_ro must be page aligned */
         . = ALIGN(PAGE_SIZE);
         _s_kernel_ro = .;
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index 7581330ea35b..88fe0aad4390 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -49,7 +49,6 @@ struct thread_info {
 #define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_32BIT               4       /* 32 bit binary */
 #define TIF_MEMDIE              5       /* is terminating due to OOM killer */
-#define TIF_RESTORE_SIGMASK     6       /* restore saved signal mask */
 #define TIF_SYSCALL_AUDIT       7       /* syscall auditing active */
 #define TIF_NOTIFY_RESUME       8       /* callback before returning to user */
 #define TIF_SINGLESTEP          9       /* single stepping? */
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index da0d9cb63403..1e22f981cd81 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -235,9 +235,26 @@ void __init time_init(void)
 
         cr16_hz = 100 * PAGE0->mem_10msec;  /* Hz */
 
-        /* register at clocksource framework */
-        clocksource_register_hz(&clocksource_cr16, cr16_hz);
-
         /* register as sched_clock source */
         sched_clock_register(read_cr16_sched_clock, BITS_PER_LONG, cr16_hz);
 }
+
+static int __init init_cr16_clocksource(void)
+{
+        /*
+         * The cr16 interval timers are not syncronized across CPUs, so mark
+         * them unstable and lower rating on SMP systems.
+         */
+        if (num_online_cpus() > 1) {
+                clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
+                clocksource_cr16.rating = 0;
+        }
+
+        /* register at clocksource framework */
+        clocksource_register_hz(&clocksource_cr16,
+                100 * PAGE0->mem_10msec);
+
+        return 0;
+}
+
+device_initcall(init_cr16_clocksource);
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 8ff9253930af..1a0b4f63f0e9 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -234,7 +234,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long code,
             tsk->comm, code, address);
         print_vma_addr(KERN_CONT " in ", regs->iaoq[0]);
 
-        pr_cont(" trap #%lu: %s%c", code, trap_name(code),
+        pr_cont("\ntrap #%lu: %s%c", code, trap_name(code),
                 vma ? ',':'\n');
 
         if (vma)
diff --git a/arch/s390/include/asm/asm-prototypes.h b/arch/s390/include/asm/asm-prototypes.h
new file mode 100644
index 000000000000..2c3413b0ca52
--- /dev/null
+++ b/arch/s390/include/asm/asm-prototypes.h
@@ -0,0 +1,8 @@
+#ifndef _ASM_S390_PROTOTYPES_H
+
+#include <linux/kvm_host.h>
+#include <linux/ftrace.h>
+#include <asm/fpu/api.h>
+#include <asm-generic/asm-prototypes.h>
+
+#endif /* _ASM_S390_PROTOTYPES_H */
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 6b246aadf311..1b5c5ee9fc1b 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -94,7 +94,7 @@ static void update_mt_scaling(void)
  * Update process times based on virtual cpu times stored by entry.S
  * to the lowcore fields user_timer, system_timer & steal_clock.
  */
-static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)
+static int do_account_vtime(struct task_struct *tsk)
 {
         u64 timer, clock, user, system, steal;
         u64 user_scaled, system_scaled;
@@ -138,7 +138,7 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)
         }
         account_user_time(tsk, user);
         tsk->utimescaled += user_scaled;
-        account_system_time(tsk, hardirq_offset, system);
+        account_system_time(tsk, 0, system);
         tsk->stimescaled += system_scaled;
 
         steal = S390_lowcore.steal_timer;
@@ -152,7 +152,7 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)
 
 void vtime_task_switch(struct task_struct *prev)
 {
-        do_account_vtime(prev, 0);
+        do_account_vtime(prev);
         prev->thread.user_timer = S390_lowcore.user_timer;
         prev->thread.system_timer = S390_lowcore.system_timer;
         S390_lowcore.user_timer = current->thread.user_timer;
@@ -166,7 +166,7 @@ void vtime_task_switch(struct task_struct *prev)
  */
 void vtime_account_user(struct task_struct *tsk)
 {
-        if (do_account_vtime(tsk, HARDIRQ_OFFSET))
+        if (do_account_vtime(tsk))
                 virt_timer_expire();
 }
 
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 68557f52b961..854022772c5b 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -139,6 +139,19 @@ static __always_inline void __clear_bit(long nr, volatile unsigned long *addr)
         asm volatile("btr %1,%0" : ADDR : "Ir" (nr));
 }
 
+static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)
+{
+        bool negative;
+        asm volatile(LOCK_PREFIX "andb %2,%1\n\t"
+                CC_SET(s)
+                : CC_OUT(s) (negative), ADDR
+                : "ir" ((char) ~(1 << nr)) : "memory");
+        return negative;
+}
+
+// Let everybody know we have it
+#define clear_bit_unlock_is_negative_byte clear_bit_unlock_is_negative_byte
+
 /*
  * __clear_bit_unlock - Clears a bit in memory
  * @nr: Bit to clear
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index ffacfdcacb85..a5fd137417a2 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -1182,6 +1182,9 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)
         const char *name = get_name(bank, NULL);
         int err = 0;
 
+        if (!dev)
+                return -ENODEV;
+
         if (is_shared_bank(bank)) {
                 nb = node_to_amd_nb(amd_get_nb_id(cpu));
 
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index b47edb8f5256..410efb2c7b80 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -68,12 +68,10 @@ static struct dma_map_ops swiotlb_dma_ops = {
  */
 int __init pci_swiotlb_detect_override(void)
 {
-        int use_swiotlb = swiotlb | swiotlb_force;
-
-        if (swiotlb_force)
+        if (swiotlb_force == SWIOTLB_FORCE)
                 swiotlb = 1;
 
-        return use_swiotlb;
+        return swiotlb;
 }
 IOMMU_INIT_FINISH(pci_swiotlb_detect_override,
                   pci_xen_swiotlb_detect,
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 24db5fb6f575..a236decb81e4 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -132,12 +132,6 @@ module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO);
 
 #define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
 
-#define VMX_VPID_EXTENT_SUPPORTED_MASK          \
-        (VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT |  \
-        VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |    \
-        VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT |    \
-        VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
-
 /*
  * Hyper-V requires all of these, so mark them as supported even though
  * they are just treated the same as all-context.
@@ -10473,12 +10467,12 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
             !nested_guest_cr4_valid(vcpu, vmcs12->guest_cr4)) {
                 nested_vmx_entry_failure(vcpu, vmcs12,
                         EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);
-                goto out;
+                return 1;
         }
         if (vmcs12->vmcs_link_pointer != -1ull) {
                 nested_vmx_entry_failure(vcpu, vmcs12,
                         EXIT_REASON_INVALID_STATE, ENTRY_FAIL_VMCS_LINK_PTR);
-                goto out;
+                return 1;
         }
 
         /*
@@ -10498,7 +10492,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
                      ia32e != !!(vmcs12->guest_ia32_efer & EFER_LME))) {
                         nested_vmx_entry_failure(vcpu, vmcs12,
                                 EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);
-                        goto out;
+                        return 1;
                 }
         }
 
@@ -10516,7 +10510,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
                     ia32e != !!(vmcs12->host_ia32_efer & EFER_LME)) {
                         nested_vmx_entry_failure(vcpu, vmcs12,
                                 EXIT_REASON_INVALID_STATE, ENTRY_FAIL_DEFAULT);
-                        goto out;
+                        return 1;
                 }
         }
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 51ccfe08e32f..2f22810a7e0c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3070,6 +3070,8 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
         memset(&events->reserved, 0, sizeof(events->reserved));
 }
 
+static void kvm_set_hflags(struct kvm_vcpu *vcpu, unsigned emul_flags);
+
 static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
                                               struct kvm_vcpu_events *events)
 {
@@ -3106,10 +3108,13 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
                 vcpu->arch.apic->sipi_vector = events->sipi_vector;
 
         if (events->flags & KVM_VCPUEVENT_VALID_SMM) {
+                u32 hflags = vcpu->arch.hflags;
                 if (events->smi.smm)
-                        vcpu->arch.hflags |= HF_SMM_MASK;
+                        hflags |= HF_SMM_MASK;
                 else
-                        vcpu->arch.hflags &= ~HF_SMM_MASK;
+                        hflags &= ~HF_SMM_MASK;
+                kvm_set_hflags(vcpu, hflags);
+
                 vcpu->arch.smi_pending = events->smi.pending;
                 if (events->smi.smm_inside_nmi)
                         vcpu->arch.hflags |= HF_SMM_INSIDE_NMI_MASK;
diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
index a9fafb5c8738..a0b36a9d5df1 100644
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -48,7 +48,7 @@ int __init pci_xen_swiotlb_detect(void)
          * activate this IOMMU. If running as PV privileged, activate it
          * irregardless.
          */
-        if ((xen_initial_domain() || swiotlb || swiotlb_force))
+        if (xen_initial_domain() || swiotlb || swiotlb_force == SWIOTLB_FORCE)
                 xen_swiotlb = 1;
 
         /* If we are running under Xen, we MUST disable the native SWIOTLB.
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 8c394e30e5fe..f3f7b41116f7 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnlist(void)
                 size = PFN_PHYS(xen_start_info->nr_p2m_frames);
         }
 
-        if (!xen_is_e820_reserved(start, size)) {
-                memblock_reserve(start, size);
+        memblock_reserve(start, size);
+        if (!xen_is_e820_reserved(start, size))
                 return;
-        }
 
 #ifdef CONFIG_X86_32
         /*
@@ -727,6 +726,7 @@ static void __init xen_reserve_xen_mfnlist(void)
         BUG();
 #else
         xen_relocate_p2m();
+        memblock_free(start, size);
 #endif
 }
 
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 6e82769f4042..f0a9c07b4c7a 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -544,6 +544,8 @@ static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,
  * the timer to kick off queuing again.
  */
 static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock)
+        __releases(lock)
+        __acquires(lock)
 {
         struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd());
         DEFINE_WAIT(wait);
@@ -558,13 +560,12 @@ static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock)
                 if (may_queue(rwb, rqw, &wait, rw))
                         break;
 
-                if (lock)
+                if (lock) {
                         spin_unlock_irq(lock);
-
-                io_schedule();
-
-                if (lock)
+                        io_schedule();
                         spin_lock_irq(lock);
+                } else
+                        io_schedule();
         } while (1);
 
         finish_wait(&rqw->wait, &wait);
@@ -595,7 +596,7 @@ static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio)
  * in an irq held spinlock, if it holds one when calling this function.
  * If we do sleep, we'll release and re-grab it.
  */
-unsigned int wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock)
+enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock)
 {
         unsigned int ret = 0;
 
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index f616ad74cce7..44e888b0b041 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1461,16 +1461,25 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
         for (i = 0; i < ctcount; i++) {
                 unsigned int dlen = COMP_BUF_SIZE;
                 int ilen = ctemplate[i].inlen;
+                void *input_vec;
 
+                input_vec = kmalloc(ilen, GFP_KERNEL);
+                if (!input_vec) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+
+                memcpy(input_vec, ctemplate[i].input, ilen);
                 memset(output, 0, dlen);
                 init_completion(&result.completion);
-                sg_init_one(&src, ctemplate[i].input, ilen);
+                sg_init_one(&src, input_vec, ilen);
                 sg_init_one(&dst, output, dlen);
 
                 req = acomp_request_alloc(tfm);
                 if (!req) {
                         pr_err("alg: acomp: request alloc failed for %s\n",
                                algo);
+                        kfree(input_vec);
                         ret = -ENOMEM;
                         goto out;
                 }
@@ -1483,6 +1492,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                 if (ret) {
                         pr_err("alg: acomp: compression failed on test %d for %s: ret=%d\n",
                                i + 1, algo, -ret);
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
@@ -1491,6 +1501,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                         pr_err("alg: acomp: Compression test %d failed for %s: output len = %d\n",
                                i + 1, algo, req->dlen);
                         ret = -EINVAL;
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
@@ -1500,26 +1511,37 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                                i + 1, algo);
                         hexdump(output, req->dlen);
                         ret = -EINVAL;
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
 
+                kfree(input_vec);
                 acomp_request_free(req);
         }
 
         for (i = 0; i < dtcount; i++) {
                 unsigned int dlen = COMP_BUF_SIZE;
                 int ilen = dtemplate[i].inlen;
+                void *input_vec;
+
+                input_vec = kmalloc(ilen, GFP_KERNEL);
+                if (!input_vec) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
 
+                memcpy(input_vec, dtemplate[i].input, ilen);
                 memset(output, 0, dlen);
                 init_completion(&result.completion);
-                sg_init_one(&src, dtemplate[i].input, ilen);
+                sg_init_one(&src, input_vec, ilen);
                 sg_init_one(&dst, output, dlen);
 
                 req = acomp_request_alloc(tfm);
                 if (!req) {
                         pr_err("alg: acomp: request alloc failed for %s\n",
                                algo);
+                        kfree(input_vec);
                         ret = -ENOMEM;
                         goto out;
                 }
@@ -1532,6 +1554,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                 if (ret) {
                         pr_err("alg: acomp: decompression failed on test %d for %s: ret=%d\n",
                                i + 1, algo, -ret);
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
@@ -1540,6 +1563,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                         pr_err("alg: acomp: Decompression test %d failed for %s: output len = %d\n",
                                i + 1, algo, req->dlen);
                         ret = -EINVAL;
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
@@ -1549,10 +1573,12 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate,
                                i + 1, algo);
                         hexdump(output, req->dlen);
                         ret = -EINVAL;
+                        kfree(input_vec);
                         acomp_request_free(req);
                         goto out;
                 }
 
+                kfree(input_vec);
                 acomp_request_free(req);
         }
 
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
index 13caebd679f5..8c4e0a18460a 100644
--- a/drivers/acpi/acpi_watchdog.c
+++ b/drivers/acpi/acpi_watchdog.c
@@ -114,7 +114,7 @@ void __init acpi_watchdog_init(void)
         pdev = platform_device_register_simple("wdat_wdt", PLATFORM_DEVID_NONE,
                                                resources, nresources);
         if (IS_ERR(pdev))
-                pr_err("Failed to create platform device\n");
+                pr_err("Device creation failed: %ld\n", PTR_ERR(pdev));
 
         kfree(resources);
 
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index f8d65647ea79..fb19e1cdb641 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -98,7 +98,15 @@ static int find_child_checks(struct acpi_device *adev, bool check_children)
         if (check_children && list_empty(&adev->children))
                 return -ENODEV;
 
-        return sta_present ? FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
+        /*
+         * If the device has a _HID (or _CID) returning a valid ACPI/PNP
+         * device ID, it is better to make it look less attractive here, so that
+         * the other device with the same _ADR value (that may not have a valid
+         * device ID) can be matched going forward.  [This means a second spec
+         * violation in a row, so whatever we do here is best effort anyway.]
+         */
+        return sta_present && list_empty(&adev->pnp.ids) ?
+                        FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
 }
 
 struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
@@ -250,7 +258,6 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev)
         return 0;
 
  err:
-        acpi_dma_deconfigure(dev);
         ACPI_COMPANION_SET(dev, NULL);
         put_device(dev);
         put_device(&acpi_dev->dev);
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 1b41a2739dac..0c452265c111 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -37,6 +37,7 @@ void acpi_amba_init(void);
 static inline void acpi_amba_init(void) {}
 #endif
 int acpi_sysfs_init(void);
+void acpi_gpe_apply_masked_gpes(void);
 void acpi_container_init(void);
 void acpi_memory_hotplug_init(void);
 #ifdef  CONFIG_ACPI_HOTPLUG_IOAPIC
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 45dec874ea55..192691880d55 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2074,6 +2074,7 @@ int __init acpi_scan_init(void)
                 }
         }
 
+        acpi_gpe_apply_masked_gpes();
         acpi_update_all_gpes();
         acpi_ec_ecdt_start();
 
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 703c26e7022c..cf05ae973381 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -708,6 +708,62 @@ end:
         return result ? result : size;
 }
 
+/*
+ * A Quirk Mechanism for GPE Flooding Prevention:
+ *
+ * Quirks may be needed to prevent GPE flooding on a specific GPE. The
+ * flooding typically cannot be detected and automatically prevented by
+ * ACPI_GPE_DISPATCH_NONE check because there is a _Lxx/_Exx prepared in
+ * the AML tables. This normally indicates a feature gap in Linux, thus
+ * instead of providing endless quirk tables, we provide a boot parameter
+ * for those who want this quirk. For example, if the users want to prevent
+ * the GPE flooding for GPE 00, they need to specify the following boot
+ * parameter:
+ *   acpi_mask_gpe=0x00
+ * The masking status can be modified by the following runtime controlling
+ * interface:
+ *   echo unmask > /sys/firmware/acpi/interrupts/gpe00
+ */
+
+/*
+ * Currently, the GPE flooding prevention only supports to mask the GPEs
+ * numbered from 00 to 7f.
+ */
+#define ACPI_MASKABLE_GPE_MAX   0x80
+
+static u64 __initdata acpi_masked_gpes;
+
+static int __init acpi_gpe_set_masked_gpes(char *val)
+{
+        u8 gpe;
+
+        if (kstrtou8(val, 0, &gpe) || gpe > ACPI_MASKABLE_GPE_MAX)
+                return -EINVAL;
+        acpi_masked_gpes |= ((u64)1<<gpe);
+
+        return 1;
+}
+__setup("acpi_mask_gpe=", acpi_gpe_set_masked_gpes);
+
+void __init acpi_gpe_apply_masked_gpes(void)
+{
+        acpi_handle handle;
+        acpi_status status;
+        u8 gpe;
+
+        for (gpe = 0;
+             gpe < min_t(u8, ACPI_MASKABLE_GPE_MAX, acpi_current_gpe_count);
+             gpe++) {
+                if (acpi_masked_gpes & ((u64)1<<gpe)) {
+                        status = acpi_get_gpe_device(gpe, &handle);
+                        if (ACPI_SUCCESS(status)) {
+                                pr_info("Masking GPE 0x%x.\n", gpe);
+                                (void)acpi_mask_gpe(handle, gpe, TRUE);
+                        }
+                }
+        }
+}
+
 void acpi_irq_stats_init(void)
 {
         acpi_status status;
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index a5e1262b964b..2997026b4dfb 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -626,6 +626,7 @@ static int genpd_runtime_resume(struct device *dev)
 
  out:
         /* Measure resume latency. */
+        time_start = 0;
         if (timed && runtime_pm)
                 time_start = ktime_get();
 
diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c
index 5eb05dbf59b8..fc585f370549 100644
--- a/drivers/clk/clk-stm32f4.c
+++ b/drivers/clk/clk-stm32f4.c
@@ -768,5 +768,5 @@ fail:
         kfree(clks);
         iounmap(base);
 }
-CLK_OF_DECLARE(stm32f42xx_rcc, "st,stm32f42xx-rcc", stm32f4_rcc_init);
-CLK_OF_DECLARE(stm32f46xx_rcc, "st,stm32f469-rcc", stm32f4_rcc_init);
+CLK_OF_DECLARE_DRIVER(stm32f42xx_rcc, "st,stm32f42xx-rcc", stm32f4_rcc_init);
+CLK_OF_DECLARE_DRIVER(stm32f46xx_rcc, "st,stm32f469-rcc", stm32f4_rcc_init);
diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c
index 9375777776d9..b533f99550e1 100644
--- a/drivers/clk/renesas/clk-mstp.c
+++ b/drivers/clk/renesas/clk-mstp.c
@@ -37,12 +37,14 @@
  * @smstpcr: module stop control register
  * @mstpsr: module stop status register (optional)
  * @lock: protects writes to SMSTPCR
+ * @width_8bit: registers are 8-bit, not 32-bit
  */
 struct mstp_clock_group {
         struct clk_onecell_data data;
         void __iomem *smstpcr;
         void __iomem *mstpsr;
         spinlock_t lock;
+        bool width_8bit;
 };
 
 /**
@@ -59,6 +61,18 @@ struct mstp_clock {
 
 #define to_mstp_clock(_hw) container_of(_hw, struct mstp_clock, hw)
 
+static inline u32 cpg_mstp_read(struct mstp_clock_group *group,
+                                u32 __iomem *reg)
+{
+        return group->width_8bit ? readb(reg) : clk_readl(reg);
+}
+
+static inline void cpg_mstp_write(struct mstp_clock_group *group, u32 val,
+                                  u32 __iomem *reg)
+{
+        group->width_8bit ? writeb(val, reg) : clk_writel(val, reg);
+}
+
 static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
 {
         struct mstp_clock *clock = to_mstp_clock(hw);
@@ -70,12 +84,12 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
 
         spin_lock_irqsave(&group->lock, flags);
 
-        value = clk_readl(group->smstpcr);
+        value = cpg_mstp_read(group, group->smstpcr);
         if (enable)
                 value &= ~bitmask;
         else
                 value |= bitmask;
-        clk_writel(value, group->smstpcr);
+        cpg_mstp_write(group, value, group->smstpcr);
 
         spin_unlock_irqrestore(&group->lock, flags);
 
@@ -83,7 +97,7 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable)
                 return 0;
 
         for (i = 1000; i > 0; --i) {
-                if (!(clk_readl(group->mstpsr) & bitmask))
+                if (!(cpg_mstp_read(group, group->mstpsr) & bitmask))
                         break;
                 cpu_relax();
         }
@@ -114,9 +128,9 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw)
         u32 value;
 
         if (group->mstpsr)
-                value = clk_readl(group->mstpsr);
+                value = cpg_mstp_read(group, group->mstpsr);
         else
-                value = clk_readl(group->smstpcr);
+                value = cpg_mstp_read(group, group->smstpcr);
 
         return !(value & BIT(clock->bit_index));
 }
@@ -188,6 +202,9 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
                 return;
         }
 
+        if (of_device_is_compatible(np, "renesas,r7s72100-mstp-clocks"))
+                group->width_8bit = true;
+
         for (i = 0; i < MSTP_MAX_CLOCKS; ++i)
                 clks[i] = ERR_PTR(-ENOENT);
 
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index bc97b6a4b1cf..7fcaf26e8f81 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -26,6 +26,8 @@ static const struct of_device_id machines[] __initconst = {
         { .compatible = "allwinner,sun8i-a83t", },
         { .compatible = "allwinner,sun8i-h3", },
 
+        { .compatible = "apm,xgene-shadowcat", },
+
         { .compatible = "arm,integrator-ap", },
         { .compatible = "arm,integrator-cp", },
 
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6acbd4af632e..f91c25718d16 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -857,13 +857,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = {
         NULL,
 };
 
-static void intel_pstate_hwp_set(const struct cpumask *cpumask)
+static void intel_pstate_hwp_set(struct cpufreq_policy *policy)
 {
         int min, hw_min, max, hw_max, cpu, range, adj_range;
         struct perf_limits *perf_limits = limits;
         u64 value, cap;
 
-        for_each_cpu(cpu, cpumask) {
+        for_each_cpu(cpu, policy->cpus) {
                 int max_perf_pct, min_perf_pct;
                 struct cpudata *cpu_data = all_cpu_data[cpu];
                 s16 epp;
@@ -949,7 +949,7 @@ skip_epp:
 static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)
 {
         if (hwp_active)
-                intel_pstate_hwp_set(policy->cpus);
+                intel_pstate_hwp_set(policy);
 
         return 0;
 }
@@ -968,19 +968,28 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
 
 static int intel_pstate_resume(struct cpufreq_policy *policy)
 {
+        int ret;
+
         if (!hwp_active)
                 return 0;
 
+        mutex_lock(&intel_pstate_limits_lock);
+
         all_cpu_data[policy->cpu]->epp_policy = 0;
 
-        return intel_pstate_hwp_set_policy(policy);
+        ret = intel_pstate_hwp_set_policy(policy);
+
+        mutex_unlock(&intel_pstate_limits_lock);
+
+        return ret;
 }
 
-static void intel_pstate_hwp_set_online_cpus(void)
+static void intel_pstate_update_policies(void)
 {
-        get_online_cpus();
-        intel_pstate_hwp_set(cpu_online_mask);
-        put_online_cpus();
+        int cpu;
+
+        for_each_possible_cpu(cpu)
+                cpufreq_update_policy(cpu);
 }
 
 /************************** debugfs begin ************************/
@@ -1018,10 +1027,6 @@ static void __init intel_pstate_debug_expose_params(void)
         struct dentry *debugfs_parent;
         int i = 0;
 
-        if (hwp_active ||
-            pstate_funcs.get_target_pstate == get_target_pstate_use_cpu_load)
-                return;
-
         debugfs_parent = debugfs_create_dir("pstate_snb", NULL);
         if (IS_ERR_OR_NULL(debugfs_parent))
                 return;
@@ -1105,11 +1110,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
 
         limits->no_turbo = clamp_t(int, input, 0, 1);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -1134,11 +1138,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
                                    limits->max_perf_pct);
         limits->max_perf = div_ext_fp(limits->max_perf_pct, 100);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -1163,11 +1166,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
                                    limits->min_perf_pct);
         limits->min_perf = div_ext_fp(limits->min_perf_pct, 100);
 
-        if (hwp_active)
-                intel_pstate_hwp_set_online_cpus();
-
         mutex_unlock(&intel_pstate_limits_lock);
 
+        intel_pstate_update_policies();
+
         return count;
 }
 
@@ -2153,8 +2155,12 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy)
         if (per_cpu_limits)
                 perf_limits = cpu->perf_limits;
 
+        mutex_lock(&intel_pstate_limits_lock);
+
         intel_pstate_update_perf_limits(policy, perf_limits);
 
+        mutex_unlock(&intel_pstate_limits_lock);
+
         return 0;
 }
 
@@ -2487,7 +2493,10 @@ hwp_cpu_matched:
         if (rc)
                 goto out;
 
-        intel_pstate_debug_expose_params();
+        if (intel_pstate_driver == &intel_pstate && !hwp_active &&
+            pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)
+                intel_pstate_debug_expose_params();
+
         intel_pstate_sysfs_expose_params();
 
         if (hwp_active)
diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index a768da7138a1..b7872f62f674 100644
--- a/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@ -273,7 +273,8 @@ struct mv_cesa_op_ctx {
 #define CESA_TDMA_SRC_IN_SRAM                   BIT(30)
 #define CESA_TDMA_END_OF_REQ                    BIT(29)
 #define CESA_TDMA_BREAK_CHAIN                   BIT(28)
-#define CESA_TDMA_TYPE_MSK                      GENMASK(27, 0)
+#define CESA_TDMA_SET_STATE                     BIT(27)
+#define CESA_TDMA_TYPE_MSK                      GENMASK(26, 0)
 #define CESA_TDMA_DUMMY                         0
 #define CESA_TDMA_DATA                          1
 #define CESA_TDMA_OP                            2
diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c
index 317cf029c0cf..77c0fb936f47 100644
--- a/drivers/crypto/marvell/hash.c
+++ b/drivers/crypto/marvell/hash.c
@@ -280,13 +280,32 @@ static void mv_cesa_ahash_std_prepare(struct ahash_request *req)
         sreq->offset = 0;
 }
 
+static void mv_cesa_ahash_dma_step(struct ahash_request *req)
+{
+        struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
+        struct mv_cesa_req *base = &creq->base;
+
+        /* We must explicitly set the digest state. */
+        if (base->chain.first->flags & CESA_TDMA_SET_STATE) {
+                struct mv_cesa_engine *engine = base->engine;
+                int i;
+
+                /* Set the hash state in the IVDIG regs. */
+                for (i = 0; i < ARRAY_SIZE(creq->state); i++)
+                        writel_relaxed(creq->state[i], engine->regs +
+                                       CESA_IVDIG(i));
+        }
+
+        mv_cesa_dma_step(base);
+}
+
 static void mv_cesa_ahash_step(struct crypto_async_request *req)
 {
         struct ahash_request *ahashreq = ahash_request_cast(req);
         struct mv_cesa_ahash_req *creq = ahash_request_ctx(ahashreq);
 
         if (mv_cesa_req_get_type(&creq->base) == CESA_DMA_REQ)
-                mv_cesa_dma_step(&creq->base);
+                mv_cesa_ahash_dma_step(ahashreq);
         else
                 mv_cesa_ahash_std_step(ahashreq);
 }
@@ -584,12 +603,16 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)
         struct mv_cesa_ahash_dma_iter iter;
         struct mv_cesa_op_ctx *op = NULL;
         unsigned int frag_len;
+        bool set_state = false;
         int ret;
         u32 type;
 
         basereq->chain.first = NULL;
         basereq->chain.last = NULL;
 
+        if (!mv_cesa_mac_op_is_first_frag(&creq->op_tmpl))
+                set_state = true;
+
         if (creq->src_nents) {
                 ret = dma_map_sg(cesa_dev->dev, req->src, creq->src_nents,
                                  DMA_TO_DEVICE);
@@ -683,6 +706,15 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)
         if (type != CESA_TDMA_RESULT)
                 basereq->chain.last->flags |= CESA_TDMA_BREAK_CHAIN;
 
+        if (set_state) {
+                /*
+                 * Put the CESA_TDMA_SET_STATE flag on the first tdma desc to
+                 * let the step logic know that the IVDIG registers should be
+                 * explicitly set before launching a TDMA chain.
+                 */
+                basereq->chain.first->flags |= CESA_TDMA_SET_STATE;
+        }
+
         return 0;
 
 err_free_tdma:
diff --git a/drivers/crypto/marvell/tdma.c b/drivers/crypto/marvell/tdma.c
index 4416b88eca70..c76375ff376d 100644
--- a/drivers/crypto/marvell/tdma.c
+++ b/drivers/crypto/marvell/tdma.c
@@ -109,7 +109,14 @@ void mv_cesa_tdma_chain(struct mv_cesa_engine *engine,
                 last->next = dreq->chain.first;
                 engine->chain.last = dreq->chain.last;
 
-                if (!(last->flags & CESA_TDMA_BREAK_CHAIN))
+                /*
+                 * Break the DMA chain if the CESA_TDMA_BREAK_CHAIN is set on
+                 * the last element of the current chain, or if the request
+                 * being queued needs the IV regs to be set before lauching
+                 * the request.
+                 */
+                if (!(last->flags & CESA_TDMA_BREAK_CHAIN) &&
+                    !(dreq->chain.first->flags & CESA_TDMA_SET_STATE))
                         last->next_dma = dreq->chain.first->cur_dma;
         }
 }
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index a324801d6a66..47206a21bb90 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -593,11 +593,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
         list_add(&devfreq->node, &devfreq_list);
 
         governor = find_devfreq_governor(devfreq->governor_name);
-        if (!IS_ERR(governor))
-                devfreq->governor = governor;
-        if (devfreq->governor)
-                err = devfreq->governor->event_handler(devfreq,
-                                        DEVFREQ_GOV_START, NULL);
+        if (IS_ERR(governor)) {
+                dev_err(dev, "%s: Unable to find governor for the device\n",
+                        __func__);
+                err = PTR_ERR(governor);
+                goto err_init;
+        }
+
+        devfreq->governor = governor;
+        err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START,
+                                                NULL);
         if (err) {
                 dev_err(dev, "%s: Unable to start governor for the device\n",
                         __func__);
diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index a8ed7792ece2..9af86f46fbec 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -497,7 +497,7 @@ passive:
         if (IS_ERR(bus->devfreq)) {
                 dev_err(dev,
                         "failed to add devfreq dev with passive governor\n");
-                ret = -EPROBE_DEFER;
+                ret = PTR_ERR(bus->devfreq);
                 goto err;
         }
 
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index 70e13230d8db..9ad0b1934be9 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -721,11 +721,17 @@ static int scpi_sensor_get_value(u16 sensor, u64 *val)
 
         ret = scpi_send_message(CMD_SENSOR_VALUE, &id, sizeof(id),
                                 &buf, sizeof(buf));
-        if (!ret)
+        if (ret)
+                return ret;
+
+        if (scpi_info->is_legacy)
+                /* only 32-bits supported, hi_val can be junk */
+                *val = le32_to_cpu(buf.lo_val);
+        else
                 *val = (u64)le32_to_cpu(buf.hi_val) << 32 |
                         le32_to_cpu(buf.lo_val);
 
-        return ret;
+        return 0;
 }
 
 static int scpi_device_get_power_state(u16 dev_id)
diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c
index 44bdb78f837b..29d58feaf675 100644
--- a/drivers/firmware/psci_checker.c
+++ b/drivers/firmware/psci_checker.c
@@ -270,8 +270,7 @@ static int suspend_test_thread(void *arg)
         struct cpuidle_device *dev;
         struct cpuidle_driver *drv;
         /* No need for an actual callback, we just want to wake up the CPU. */
-        struct timer_list wakeup_timer =
-                TIMER_INITIALIZER(dummy_callback, 0, 0);
+        struct timer_list wakeup_timer;
 
         /* Wait for the main thread to give the start signal. */
         wait_for_completion(&suspend_threads_started);
@@ -287,6 +286,7 @@ static int suspend_test_thread(void *arg)
         pr_info("CPU %d entering suspend cycles, states 1 through %d\n",
                 cpu, drv->state_count - 1);
 
+        setup_timer_on_stack(&wakeup_timer, dummy_callback, 0);
         for (i = 0; i < NUM_SUSPEND_CYCLE; ++i) {
                 int index;
                 /*
diff --git a/drivers/gpu/drm/i915/gvt/cfg_space.c b/drivers/gpu/drm/i915/gvt/cfg_space.c
index db516382a4d4..711c31c8d8b4 100644
--- a/drivers/gpu/drm/i915/gvt/cfg_space.c
+++ b/drivers/gpu/drm/i915/gvt/cfg_space.c
@@ -123,6 +123,7 @@ static int emulate_pci_command_write(struct intel_vgpu *vgpu,
         u8 changed = old ^ new;
         int ret;
 
+        memcpy(vgpu_cfg_space(vgpu) + offset, p_data, bytes);
         if (!(changed & PCI_COMMAND_MEMORY))
                 return 0;
 
@@ -142,7 +143,6 @@ static int emulate_pci_command_write(struct intel_vgpu *vgpu,
                         return ret;
         }
 
-        memcpy(vgpu_cfg_space(vgpu) + offset, p_data, bytes);
         return 0;
 }
 
@@ -240,7 +240,7 @@ int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset,
         if (WARN_ON(bytes > 4))
                 return -EINVAL;
 
-        if (WARN_ON(offset + bytes >= INTEL_GVT_MAX_CFG_SPACE_SZ))
+        if (WARN_ON(offset + bytes > INTEL_GVT_MAX_CFG_SPACE_SZ))
                 return -EINVAL;
 
         /* First check if it's PCI_COMMAND */
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 7eaaf1c9ed2b..6c5fdf5b2ce2 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1998,6 +1998,8 @@ int intel_vgpu_init_gtt(struct intel_vgpu *vgpu)
         INIT_LIST_HEAD(&gtt->oos_page_list_head);
         INIT_LIST_HEAD(&gtt->post_shadow_list_head);
 
+        intel_vgpu_reset_ggtt(vgpu);
+
         ggtt_mm = intel_vgpu_create_mm(vgpu, INTEL_GVT_MM_GGTT,
                         NULL, 1, 0);
         if (IS_ERR(ggtt_mm)) {
@@ -2206,6 +2208,7 @@ int intel_vgpu_g2v_destroy_ppgtt_mm(struct intel_vgpu *vgpu,
 int intel_gvt_init_gtt(struct intel_gvt *gvt)
 {
         int ret;
+        void *page_addr;
 
         gvt_dbg_core("init gtt\n");
 
@@ -2218,6 +2221,23 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
                 return -ENODEV;
         }
 
+        gvt->gtt.scratch_ggtt_page =
+                alloc_page(GFP_KERNEL | GFP_ATOMIC | __GFP_ZERO);
+        if (!gvt->gtt.scratch_ggtt_page) {
+                gvt_err("fail to allocate scratch ggtt page\n");
+                return -ENOMEM;
+        }
+
+        page_addr = page_address(gvt->gtt.scratch_ggtt_page);
+
+        gvt->gtt.scratch_ggtt_mfn =
+                intel_gvt_hypervisor_virt_to_mfn(page_addr);
+        if (gvt->gtt.scratch_ggtt_mfn == INTEL_GVT_INVALID_ADDR) {
+                gvt_err("fail to translate scratch ggtt page\n");
+                __free_page(gvt->gtt.scratch_ggtt_page);
+                return -EFAULT;
+        }
+
         if (enable_out_of_sync) {
                 ret = setup_spt_oos(gvt);
                 if (ret) {
@@ -2239,6 +2259,41 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt)
  */
 void intel_gvt_clean_gtt(struct intel_gvt *gvt)
 {
+        __free_page(gvt->gtt.scratch_ggtt_page);
+
         if (enable_out_of_sync)
                 clean_spt_oos(gvt);
 }
+
+/**
+ * intel_vgpu_reset_ggtt - reset the GGTT entry
+ * @vgpu: a vGPU
+ *
+ * This function is called at the vGPU create stage
+ * to reset all the GGTT entries.
+ *
+ */
+void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu)
+{
+        struct intel_gvt *gvt = vgpu->gvt;
+        struct intel_gvt_gtt_pte_ops *ops = vgpu->gvt->gtt.pte_ops;
+        u32 index;
+        u32 offset;
+        u32 num_entries;
+        struct intel_gvt_gtt_entry e;
+
+        memset(&e, 0, sizeof(struct intel_gvt_gtt_entry));
+        e.type = GTT_TYPE_GGTT_PTE;
+        ops->set_pfn(&e, gvt->gtt.scratch_ggtt_mfn);
+        e.val64 |= _PAGE_PRESENT;
+
+        index = vgpu_aperture_gmadr_base(vgpu) >> PAGE_SHIFT;
+        num_entries = vgpu_aperture_sz(vgpu) >> PAGE_SHIFT;
+        for (offset = 0; offset < num_entries; offset++)
+                ops->set_entry(NULL, &e, index + offset, false, 0, vgpu);
+
+        index = vgpu_hidden_gmadr_base(vgpu) >> PAGE_SHIFT;
+        num_entries = vgpu_hidden_sz(vgpu) >> PAGE_SHIFT;
+        for (offset = 0; offset < num_entries; offset++)
+                ops->set_entry(NULL, &e, index + offset, false, 0, vgpu);
+}
diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h
index d250013bc37b..b315ab3593ec 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.h
+++ b/drivers/gpu/drm/i915/gvt/gtt.h
@@ -81,6 +81,9 @@ struct intel_gvt_gtt {
         struct list_head oos_page_use_list_head;
         struct list_head oos_page_free_list_head;
         struct list_head mm_lru_list_head;
+
+        struct page *scratch_ggtt_page;
+        unsigned long scratch_ggtt_mfn;
 };
 
 enum {
@@ -202,6 +205,7 @@ struct intel_vgpu_gtt {
 
 extern int intel_vgpu_init_gtt(struct intel_vgpu *vgpu);
 extern void intel_vgpu_clean_gtt(struct intel_vgpu *vgpu);
+void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu);
 
 extern int intel_gvt_init_gtt(struct intel_gvt *gvt);
 extern void intel_gvt_clean_gtt(struct intel_gvt *gvt);
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index ad0e9364ee70..0af17016f33f 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -175,6 +175,7 @@ struct intel_vgpu {
                 struct notifier_block group_notifier;
                 struct kvm *kvm;
                 struct work_struct release_work;
+                atomic_t released;
         } vdev;
 #endif
 };
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 4dd6722a7339..faaae07ae487 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -114,12 +114,15 @@ out:
 static kvm_pfn_t gvt_cache_find(struct intel_vgpu *vgpu, gfn_t gfn)
 {
         struct gvt_dma *entry;
+        kvm_pfn_t pfn;
 
         mutex_lock(&vgpu->vdev.cache_lock);
+
         entry = __gvt_cache_find(vgpu, gfn);
-        mutex_unlock(&vgpu->vdev.cache_lock);
+        pfn = (entry == NULL) ? 0 : entry->pfn;
 
-        return entry == NULL ? 0 : entry->pfn;
+        mutex_unlock(&vgpu->vdev.cache_lock);
+        return pfn;
 }
 
 static void gvt_cache_add(struct intel_vgpu *vgpu, gfn_t gfn, kvm_pfn_t pfn)
@@ -166,7 +169,7 @@ static void __gvt_cache_remove_entry(struct intel_vgpu *vgpu,
 
 static void gvt_cache_remove(struct intel_vgpu *vgpu, gfn_t gfn)
 {
-        struct device *dev = &vgpu->vdev.mdev->dev;
+        struct device *dev = mdev_dev(vgpu->vdev.mdev);
         struct gvt_dma *this;
         unsigned long g1;
         int rc;
@@ -195,7 +198,7 @@ static void gvt_cache_destroy(struct intel_vgpu *vgpu)
 {
         struct gvt_dma *dma;
         struct rb_node *node = NULL;
-        struct device *dev = &vgpu->vdev.mdev->dev;
+        struct device *dev = mdev_dev(vgpu->vdev.mdev);
         unsigned long gfn;
 
         mutex_lock(&vgpu->vdev.cache_lock);
@@ -396,7 +399,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev)
         struct device *pdev;
         void *gvt;
 
-        pdev = mdev->parent->dev;
+        pdev = mdev_parent_dev(mdev);
         gvt = kdev_to_i915(pdev)->gvt;
 
         type = intel_gvt_find_vgpu_type(gvt, kobject_name(kobj));
@@ -418,7 +421,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev)
         mdev_set_drvdata(mdev, vgpu);
 
         gvt_dbg_core("intel_vgpu_create succeeded for mdev: %s\n",
-                     dev_name(&mdev->dev));
+                     dev_name(mdev_dev(mdev)));
         return 0;
 }
 
@@ -482,7 +485,7 @@ static int intel_vgpu_open(struct mdev_device *mdev)
         vgpu->vdev.group_notifier.notifier_call = intel_vgpu_group_notifier;
 
         events = VFIO_IOMMU_NOTIFY_DMA_UNMAP;
-        ret = vfio_register_notifier(&mdev->dev, VFIO_IOMMU_NOTIFY, &events,
+        ret = vfio_register_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY, &events,
                                 &vgpu->vdev.iommu_notifier);
         if (ret != 0) {
                 gvt_err("vfio_register_notifier for iommu failed: %d\n", ret);
@@ -490,17 +493,26 @@ static int intel_vgpu_open(struct mdev_device *mdev)
         }
 
         events = VFIO_GROUP_NOTIFY_SET_KVM;
-        ret = vfio_register_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, &events,
+        ret = vfio_register_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY, &events,
                                 &vgpu->vdev.group_notifier);
         if (ret != 0) {
                 gvt_err("vfio_register_notifier for group failed: %d\n", ret);
                 goto undo_iommu;
         }
 
-        return kvmgt_guest_init(mdev);
+        ret = kvmgt_guest_init(mdev);
+        if (ret)
+                goto undo_group;
+
+        atomic_set(&vgpu->vdev.released, 0);
+        return ret;
+
+undo_group:
+        vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
+                                        &vgpu->vdev.group_notifier);
 
 undo_iommu:
-        vfio_unregister_notifier(&mdev->dev, VFIO_IOMMU_NOTIFY,
+        vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,
                                         &vgpu->vdev.iommu_notifier);
 out:
         return ret;
@@ -509,17 +521,26 @@ out:
 static void __intel_vgpu_release(struct intel_vgpu *vgpu)
 {
         struct kvmgt_guest_info *info;
+        int ret;
 
         if (!handle_valid(vgpu->handle))
                 return;
 
-        vfio_unregister_notifier(&vgpu->vdev.mdev->dev, VFIO_IOMMU_NOTIFY,
+        if (atomic_cmpxchg(&vgpu->vdev.released, 0, 1))
+                return;
+
+        ret = vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_IOMMU_NOTIFY,
                                         &vgpu->vdev.iommu_notifier);
-        vfio_unregister_notifier(&vgpu->vdev.mdev->dev, VFIO_GROUP_NOTIFY,
+        WARN(ret, "vfio_unregister_notifier for iommu failed: %d\n", ret);
+
+        ret = vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_GROUP_NOTIFY,
                                         &vgpu->vdev.group_notifier);
+        WARN(ret, "vfio_unregister_notifier for group failed: %d\n", ret);
 
         info = (struct kvmgt_guest_info *)vgpu->handle;
         kvmgt_guest_exit(info);
+
+        vgpu->vdev.kvm = NULL;
         vgpu->handle = 0;
 }
 
@@ -534,6 +555,7 @@ static void intel_vgpu_release_work(struct work_struct *work)
 {
         struct intel_vgpu *vgpu = container_of(work, struct intel_vgpu,
                                         vdev.release_work);
+
         __intel_vgpu_release(vgpu);
 }
 
@@ -1089,7 +1111,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
         return 0;
 }
 
-static const struct parent_ops intel_vgpu_ops = {
+static const struct mdev_parent_ops intel_vgpu_ops = {
         .supported_type_groups  = intel_vgpu_type_groups,
         .create                 = intel_vgpu_create,
         .remove                 = intel_vgpu_remove,
@@ -1134,6 +1156,10 @@ static int kvmgt_write_protect_add(unsigned long handle, u64 gfn)
 
         idx = srcu_read_lock(&kvm->srcu);
         slot = gfn_to_memslot(kvm, gfn);
+        if (!slot) {
+                srcu_read_unlock(&kvm->srcu, idx);
+                return -EINVAL;
+        }
 
         spin_lock(&kvm->mmu_lock);
 
@@ -1164,6 +1190,10 @@ static int kvmgt_write_protect_remove(unsigned long handle, u64 gfn)
 
         idx = srcu_read_lock(&kvm->srcu);
         slot = gfn_to_memslot(kvm, gfn);
+        if (!slot) {
+                srcu_read_unlock(&kvm->srcu, idx);
+                return -EINVAL;
+        }
 
         spin_lock(&kvm->mmu_lock);
 
@@ -1311,18 +1341,14 @@ static int kvmgt_guest_init(struct mdev_device *mdev)
 
 static bool kvmgt_guest_exit(struct kvmgt_guest_info *info)
 {
-        struct intel_vgpu *vgpu;
-
         if (!info) {
                 gvt_err("kvmgt_guest_info invalid\n");
                 return false;
         }
 
-        vgpu = info->vgpu;
-
         kvm_page_track_unregister_notifier(info->kvm, &info->track_node);
         kvmgt_protect_table_destroy(info);
-        gvt_cache_destroy(vgpu);
+        gvt_cache_destroy(info->vgpu);
         vfree(info);
 
         return true;
@@ -1372,7 +1398,7 @@ static unsigned long kvmgt_gfn_to_pfn(unsigned long handle, unsigned long gfn)
                 return pfn;
 
         pfn = INTEL_GVT_INVALID_ADDR;
-        dev = &info->vgpu->vdev.mdev->dev;
+        dev = mdev_dev(info->vgpu->vdev.mdev);
         rc = vfio_pin_pages(dev, &gfn, 1, IOMMU_READ | IOMMU_WRITE, &pfn);
         if (rc != 1) {
                 gvt_err("vfio_pin_pages failed for gfn 0x%lx: %d\n", gfn, rc);
diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
index d2a0fbc896c3..81cd921770c6 100644
--- a/drivers/gpu/drm/i915/gvt/opregion.c
+++ b/drivers/gpu/drm/i915/gvt/opregion.c
@@ -65,7 +65,7 @@ static int map_vgpu_opregion(struct intel_vgpu *vgpu, bool map)
         int i, ret;
 
         for (i = 0; i < INTEL_GVT_OPREGION_PAGES; i++) {
-                mfn = intel_gvt_hypervisor_virt_to_mfn(vgpu_opregion(vgpu)
+                mfn = intel_gvt_hypervisor_virt_to_mfn(vgpu_opregion(vgpu)->va
                         + i * PAGE_SIZE);
                 if (mfn == INTEL_GVT_INVALID_ADDR) {
                         gvt_err("fail to get MFN from VA\n");
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4a31b7a891ec..3dd7fc662859 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -244,14 +244,16 @@ err_phys:
 
 static void
 __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,
-                                struct sg_table *pages)
+                                struct sg_table *pages,
+                                bool needs_clflush)
 {
         GEM_BUG_ON(obj->mm.madv == __I915_MADV_PURGED);
 
         if (obj->mm.madv == I915_MADV_DONTNEED)
                 obj->mm.dirty = false;
 
-        if ((obj->base.read_domains & I915_GEM_DOMAIN_CPU) == 0 &&
+        if (needs_clflush &&
+            (obj->base.read_domains & I915_GEM_DOMAIN_CPU) == 0 &&
             !cpu_cache_is_coherent(obj->base.dev, obj->cache_level))
                 drm_clflush_sg(pages);
 
@@ -263,7 +265,7 @@ static void
 i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj,
                                struct sg_table *pages)
 {
-        __i915_gem_object_release_shmem(obj, pages);
+        __i915_gem_object_release_shmem(obj, pages, false);
 
         if (obj->mm.dirty) {
                 struct address_space *mapping = obj->base.filp->f_mapping;
@@ -2231,7 +2233,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj,
         struct sgt_iter sgt_iter;
         struct page *page;
 
-        __i915_gem_object_release_shmem(obj, pages);
+        __i915_gem_object_release_shmem(obj, pages, true);
 
         i915_gem_gtt_finish_pages(obj, pages);
 
@@ -2304,15 +2306,6 @@ unlock:
         mutex_unlock(&obj->mm.lock);
 }
 
-static unsigned int swiotlb_max_size(void)
-{
-#if IS_ENABLED(CONFIG_SWIOTLB)
-        return rounddown(swiotlb_nr_tbl() << IO_TLB_SHIFT, PAGE_SIZE);
-#else
-        return 0;
-#endif
-}
-
 static void i915_sg_trim(struct sg_table *orig_st)
 {
         struct sg_table new_st;
@@ -2322,7 +2315,7 @@ static void i915_sg_trim(struct sg_table *orig_st)
         if (orig_st->nents == orig_st->orig_nents)
                 return;
 
-        if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL))
+        if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL | __GFP_NOWARN))
                 return;
 
         new_sg = new_st.sgl;
@@ -2360,7 +2353,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
         GEM_BUG_ON(obj->base.read_domains & I915_GEM_GPU_DOMAINS);
         GEM_BUG_ON(obj->base.write_domain & I915_GEM_GPU_DOMAINS);
 
-        max_segment = swiotlb_max_size();
+        max_segment = swiotlb_max_segment();
         if (!max_segment)
                 max_segment = rounddown(UINT_MAX, PAGE_SIZE);
 
@@ -2728,6 +2721,7 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
         struct drm_i915_gem_request *request;
         struct i915_gem_context *incomplete_ctx;
         struct intel_timeline *timeline;
+        unsigned long flags;
         bool ring_hung;
 
         if (engine->irq_seqno_barrier)
@@ -2763,13 +2757,20 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
         if (i915_gem_context_is_default(incomplete_ctx))
                 return;
 
+        timeline = i915_gem_context_lookup_timeline(incomplete_ctx, engine);
+
+        spin_lock_irqsave(&engine->timeline->lock, flags);
+        spin_lock(&timeline->lock);
+
         list_for_each_entry_continue(request, &engine->timeline->requests, link)
                 if (request->ctx == incomplete_ctx)
                         reset_request(request);
 
-        timeline = i915_gem_context_lookup_timeline(incomplete_ctx, engine);
         list_for_each_entry(request, &timeline->requests, link)
                 reset_request(request);
+
+        spin_unlock(&timeline->lock);
+        spin_unlock_irqrestore(&engine->timeline->lock, flags);
 }
 
 void i915_gem_reset(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h
index e2b077df2da0..d229f47d1028 100644
--- a/drivers/gpu/drm/i915/i915_gem_request.h
+++ b/drivers/gpu/drm/i915/i915_gem_request.h
@@ -413,6 +413,25 @@ i915_gem_active_set(struct i915_gem_active *active,
         rcu_assign_pointer(active->request, request);
 }
 
+/**
+ * i915_gem_active_set_retire_fn - updates the retirement callback
+ * @active - the active tracker
+ * @fn - the routine called when the request is retired
+ * @mutex - struct_mutex used to guard retirements
+ *
+ * i915_gem_active_set_retire_fn() updates the function pointer that
+ * is called when the final request associated with the @active tracker
+ * is retired.
+ */
+static inline void
+i915_gem_active_set_retire_fn(struct i915_gem_active *active,
+                              i915_gem_retire_fn fn,
+                              struct mutex *mutex)
+{
+        lockdep_assert_held(mutex);
+        active->retire = fn ?: i915_gem_retire_noop;
+}
+
 static inline struct drm_i915_gem_request *
 __i915_gem_active_peek(const struct i915_gem_active *active)
 {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6daad8613760..3dc8724df400 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -16791,7 +16791,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
 
         for_each_intel_crtc(dev, crtc) {
                 struct intel_crtc_state *crtc_state = crtc->config;
-                int pixclk = 0;
 
                 __drm_atomic_helper_crtc_destroy_state(&crtc_state->base);
                 memset(crtc_state, 0, sizeof(*crtc_state));
@@ -16803,23 +16802,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                 crtc->base.enabled = crtc_state->base.enable;
                 crtc->active = crtc_state->base.active;
 
-                if (crtc_state->base.active) {
+                if (crtc_state->base.active)
                         dev_priv->active_crtcs |= 1 << crtc->pipe;
 
-                        if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
-                                pixclk = ilk_pipe_pixel_rate(crtc_state);
-                        else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
-                                pixclk = crtc_state->base.adjusted_mode.crtc_clock;
-                        else
-                                WARN_ON(dev_priv->display.modeset_calc_cdclk);
-
-                        /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
-                        if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled)
-                                pixclk = DIV_ROUND_UP(pixclk * 100, 95);
-                }
-
-                dev_priv->min_pixclk[crtc->pipe] = pixclk;
-
                 readout_plane_state(crtc);
 
                 DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
@@ -16892,6 +16877,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
         }
 
         for_each_intel_crtc(dev, crtc) {
+                int pixclk = 0;
+
                 crtc->base.hwmode = crtc->config->base.adjusted_mode;
 
                 memset(&crtc->base.mode, 0, sizeof(crtc->base.mode));
@@ -16919,10 +16906,23 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                          */
                         crtc->base.state->mode.private_flags = I915_MODE_FLAG_INHERITED;
 
+                        if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
+                                pixclk = ilk_pipe_pixel_rate(crtc->config);
+                        else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+                                pixclk = crtc->config->base.adjusted_mode.crtc_clock;
+                        else
+                                WARN_ON(dev_priv->display.modeset_calc_cdclk);
+
+                        /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
+                        if (IS_BROADWELL(dev_priv) && crtc->config->ips_enabled)
+                                pixclk = DIV_ROUND_UP(pixclk * 100, 95);
+
                         drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode);
                         update_scanline_offset(crtc);
                 }
 
+                dev_priv->min_pixclk[crtc->pipe] = pixclk;
+
                 intel_pipe_config_sanity_check(dev_priv, crtc->config);
         }
 }
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d9bc19be855e..0b8e8eb85c19 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -355,7 +355,8 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev,
                                     struct intel_dp *intel_dp);
 static void
 intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,
-                                              struct intel_dp *intel_dp);
+                                              struct intel_dp *intel_dp,
+                                              bool force_disable_vdd);
 static void
 intel_dp_pps_init(struct drm_device *dev, struct intel_dp *intel_dp);
 
@@ -516,7 +517,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
 
         /* init power sequencer on this pipe and port */
         intel_dp_init_panel_power_sequencer(dev, intel_dp);
-        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp);
+        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, true);
 
         /*
          * Even vdd force doesn't work until we've made
@@ -553,7 +554,7 @@ bxt_power_sequencer_idx(struct intel_dp *intel_dp)
          * Only the HW needs to be reprogrammed, the SW state is fixed and
          * has been setup during connector init.
          */
-        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp);
+        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, false);
 
         return 0;
 }
@@ -636,7 +637,7 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
                       port_name(port), pipe_name(intel_dp->pps_pipe));
 
         intel_dp_init_panel_power_sequencer(dev, intel_dp);
-        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp);
+        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, false);
 }
 
 void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)
@@ -2912,7 +2913,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp)
 
         /* init power sequencer on this pipe and port */
         intel_dp_init_panel_power_sequencer(dev, intel_dp);
-        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp);
+        intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, true);
 }
 
 static void vlv_pre_enable_dp(struct intel_encoder *encoder,
@@ -5055,7 +5056,8 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev,
 
 static void
 intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,
-                                              struct intel_dp *intel_dp)
+                                              struct intel_dp *intel_dp,
+                                              bool force_disable_vdd)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
         u32 pp_on, pp_off, pp_div, port_sel = 0;
@@ -5068,6 +5070,31 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,
 
         intel_pps_get_registers(dev_priv, intel_dp, &regs);
 
+        /*
+         * On some VLV machines the BIOS can leave the VDD
+         * enabled even on power seqeuencers which aren't
+         * hooked up to any port. This would mess up the
+         * power domain tracking the first time we pick
+         * one of these power sequencers for use since
+         * edp_panel_vdd_on() would notice that the VDD was
+         * already on and therefore wouldn't grab the power
+         * domain reference. Disable VDD first to avoid this.
+         * This also avoids spuriously turning the VDD on as
+         * soon as the new power seqeuencer gets initialized.
+         */
+        if (force_disable_vdd) {
+                u32 pp = ironlake_get_pp_control(intel_dp);
+
+                WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
+
+                if (pp & EDP_FORCE_VDD)
+                        DRM_DEBUG_KMS("VDD already on, disabling first\n");
+
+                pp &= ~EDP_FORCE_VDD;
+
+                I915_WRITE(regs.pp_ctrl, pp);
+        }
+
         pp_on = (seq->t1_t3 << PANEL_POWER_UP_DELAY_SHIFT) |
                 (seq->t8 << PANEL_LIGHT_ON_DELAY_SHIFT);
         pp_off = (seq->t9 << PANEL_LIGHT_OFF_DELAY_SHIFT) |
@@ -5122,7 +5149,7 @@ static void intel_dp_pps_init(struct drm_device *dev,
                 vlv_initial_power_sequencer_setup(intel_dp);
         } else {
                 intel_dp_init_panel_power_sequencer(dev, intel_dp);
-                intel_dp_init_panel_power_sequencer_registers(dev, intel_dp);
+                intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, false);
         }
 }
 
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index fd0e4dac7cc1..e589e17876dc 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -216,7 +216,8 @@ static void intel_overlay_submit_request(struct intel_overlay *overlay,
 {
         GEM_BUG_ON(i915_gem_active_peek(&overlay->last_flip,
                                         &overlay->i915->drm.struct_mutex));
-        overlay->last_flip.retire = retire;
+        i915_gem_active_set_retire_fn(&overlay->last_flip, retire,
+                                      &overlay->i915->drm.struct_mutex);
         i915_gem_active_set(&overlay->last_flip, req);
         i915_add_request(req);
 }
@@ -839,8 +840,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         if (ret)
                 goto out_unpin;
 
-        i915_gem_track_fb(overlay->vma->obj, new_bo,
-                          INTEL_FRONTBUFFER_OVERLAY(pipe));
+        i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL,
+                          vma->obj, INTEL_FRONTBUFFER_OVERLAY(pipe));
 
         overlay->old_vma = overlay->vma;
         overlay->vma = vma;
@@ -1430,6 +1431,8 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv)
         overlay->contrast = 75;
         overlay->saturation = 146;
 
+        init_request_active(&overlay->last_flip, NULL);
+
         regs = intel_overlay_map_regs(overlay);
         if (!regs)
                 goto out_unpin_bo;
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index d40ed9fdf68d..70b12f89a193 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -64,7 +64,8 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
 #define QUIRK_SKIP_INPUT_MAPPING        BIT(2)
 #define QUIRK_IS_MULTITOUCH             BIT(3)
 
-#define NOTEBOOK_QUIRKS                 QUIRK_FIX_NOTEBOOK_REPORT
+#define KEYBOARD_QUIRKS                 (QUIRK_FIX_NOTEBOOK_REPORT | \
+                                                 QUIRK_NO_INIT_REPORTS)
 #define TOUCHPAD_QUIRKS                 (QUIRK_NO_INIT_REPORTS | \
                                                  QUIRK_SKIP_INPUT_MAPPING | \
                                                  QUIRK_IS_MULTITOUCH)
@@ -170,11 +171,11 @@ static int asus_raw_event(struct hid_device *hdev,
 
 static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
 {
+        struct input_dev *input = hi->input;
         struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
 
         if (drvdata->quirks & QUIRK_IS_MULTITOUCH) {
                 int ret;
-                struct input_dev *input = hi->input;
 
                 input_set_abs_params(input, ABS_MT_POSITION_X, 0, MAX_X, 0, 0);
                 input_set_abs_params(input, ABS_MT_POSITION_Y, 0, MAX_Y, 0, 0);
@@ -191,10 +192,10 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
                         hid_err(hdev, "Asus input mt init slots failed: %d\n", ret);
                         return ret;
                 }
-
-                drvdata->input = input;
         }
 
+        drvdata->input = input;
+
         return 0;
 }
 
@@ -286,7 +287,11 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id)
                 goto err_stop_hw;
         }
 
-        drvdata->input->name = "Asus TouchPad";
+        if (drvdata->quirks & QUIRK_IS_MULTITOUCH) {
+                drvdata->input->name = "Asus TouchPad";
+        } else {
+                drvdata->input->name = "Asus Keyboard";
+        }
 
         if (drvdata->quirks & QUIRK_IS_MULTITOUCH) {
                 ret = asus_start_multitouch(hdev);
@@ -315,7 +320,7 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,
 
 static const struct hid_device_id asus_devices[] = {
         { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
-                 USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD), NOTEBOOK_QUIRKS},
+                 USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD), KEYBOARD_QUIRKS},
         { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
                          USB_DEVICE_ID_ASUSTEK_TOUCHPAD), TOUCHPAD_QUIRKS },
         { }
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ec277b96eaa1..54bd22dc1411 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -319,6 +319,7 @@
 #define USB_VENDOR_ID_DRAGONRISE                0x0079
 #define USB_DEVICE_ID_DRAGONRISE_WIIU           0x1800
 #define USB_DEVICE_ID_DRAGONRISE_PS3            0x1801
+#define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR     0x1803
 #define USB_DEVICE_ID_DRAGONRISE_GAMECUBE       0x1843
 
 #define USB_VENDOR_ID_DWAV              0x0eef
@@ -365,6 +366,9 @@
 #define USB_VENDOR_ID_FLATFROG          0x25b5
 #define USB_DEVICE_ID_MULTITOUCH_3200   0x0002
 
+#define USB_VENDOR_ID_FUTABA            0x0547
+#define USB_DEVICE_ID_LED_DISPLAY       0x7000
+
 #define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
 #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
 
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 5c925228847c..4ef73374a8f9 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -212,7 +212,6 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
         __s32 value;
         int ret = 0;
 
-        memset(buffer, 0, buffer_size);
         mutex_lock(&data->mutex);
         report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
         if (!report || (field_index >= report->maxfield)) {
@@ -256,6 +255,8 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
         int buffer_index = 0;
         int i;
 
+        memset(buffer, 0, buffer_size);
+
         mutex_lock(&data->mutex);
         report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
         if (!report || (field_index >= report->maxfield) ||
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 7687c0875395..f405b07d0381 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1099,8 +1099,11 @@ struct sony_sc {
         u8 led_delay_on[MAX_LEDS];
         u8 led_delay_off[MAX_LEDS];
         u8 led_count;
+        bool ds4_dongle_connected;
 };
 
+static void sony_set_leds(struct sony_sc *sc);
+
 static inline void sony_schedule_work(struct sony_sc *sc)
 {
         if (!sc->defer_initialization)
@@ -1430,6 +1433,31 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report,
                                 return -EILSEQ;
                         }
                 }
+
+                /*
+                 * In the case of a DS4 USB dongle, bit[2] of byte 31 indicates
+                 * if a DS4 is actually connected (indicated by '0').
+                 * For non-dongle, this bit is always 0 (connected).
+                 */
+                if (sc->hdev->vendor == USB_VENDOR_ID_SONY &&
+                    sc->hdev->product == USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) {
+                        bool connected = (rd[31] & 0x04) ? false : true;
+
+                        if (!sc->ds4_dongle_connected && connected) {
+                                hid_info(sc->hdev, "DualShock 4 USB dongle: controller connected\n");
+                                sony_set_leds(sc);
+                                sc->ds4_dongle_connected = true;
+                        } else if (sc->ds4_dongle_connected && !connected) {
+                                hid_info(sc->hdev, "DualShock 4 USB dongle: controller disconnected\n");
+                                sc->ds4_dongle_connected = false;
+                                /* Return 0, so hidraw can get the report. */
+                                return 0;
+                        } else if (!sc->ds4_dongle_connected) {
+                                /* Return 0, so hidraw can get the report. */
+                                return 0;
+                        }
+                }
+
                 dualshock4_parse_report(sc, rd, size);
         }
 
@@ -2390,6 +2418,12 @@ static int sony_check_add(struct sony_sc *sc)
                 }
 
                 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
+
+                snprintf(sc->hdev->uniq, sizeof(sc->hdev->uniq),
+                        "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+                        sc->mac_address[5], sc->mac_address[4],
+                        sc->mac_address[3], sc->mac_address[2],
+                        sc->mac_address[1], sc->mac_address[0]);
         } else if ((sc->quirks & SIXAXIS_CONTROLLER_USB) ||
                         (sc->quirks & NAVIGATION_CONTROLLER_USB)) {
                 buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
@@ -2548,7 +2582,7 @@ static int sony_input_configured(struct hid_device *hdev,
                         hid_err(sc->hdev,
                         "Unable to initialize multi-touch slots: %d\n",
                         ret);
-                        return ret;
+                        goto err_stop;
                 }
 
                 sony_init_output_report(sc, dualshock4_send_output_report);
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index b3e01c82af05..e9d6cc7cdfc5 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -83,11 +83,13 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
         { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
         { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_FUTABA, USB_DEVICE_ID_LED_DISPLAY, HID_QUIRK_NO_INIT_REPORTS },
         { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A, HID_QUIRK_ALWAYS_POLL },
         { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },
         { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 322ed9272811..841f2428e84a 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -1036,7 +1036,7 @@ static const u8 lm90_temp_emerg_index[3] = {
 };
 
 static const u8 lm90_min_alarm_bits[3] = { 5, 3, 11 };
-static const u8 lm90_max_alarm_bits[3] = { 0, 4, 12 };
+static const u8 lm90_max_alarm_bits[3] = { 6, 4, 12 };
 static const u8 lm90_crit_alarm_bits[3] = { 0, 1, 9 };
 static const u8 lm90_emergency_alarm_bits[3] = { 15, 13, 14 };
 static const u8 lm90_fault_bits[3] = { 0, 2, 10 };
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index f6b6d42385e1..784670e2736b 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -353,12 +353,12 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
                                         .value = 0x00,
-                                        .gain = IIO_G_TO_M_S_2(1024),
+                                        .gain = IIO_G_TO_M_S_2(1000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_6G,
                                         .value = 0x01,
-                                        .gain = IIO_G_TO_M_S_2(340),
+                                        .gain = IIO_G_TO_M_S_2(3000),
                                 },
                         },
                 },
@@ -366,6 +366,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .addr = 0x21,
                         .mask = 0x40,
                 },
+                /*
+                 * Data Alignment Setting - needs to be set to get
+                 * left-justified data like all other sensors.
+                 */
+                .das = {
+                        .addr = 0x21,
+                        .mask = 0x01,
+                },
                 .drdy_irq = {
                         .addr = 0x21,
                         .mask_int1 = 0x04,
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 38bc319904c4..9c8b558ba19e 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -561,7 +561,7 @@ config TI_ADS8688
 
 config TI_AM335X_ADC
         tristate "TI's AM335X ADC driver"
-        depends on MFD_TI_AM335X_TSCADC
+        depends on MFD_TI_AM335X_TSCADC && HAS_DMA
         select IIO_BUFFER
         select IIO_KFIFO_BUF
         help
diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index fe7775bb3740..df4045203a07 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -30,7 +30,9 @@ static int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
 
         for_each_set_bit(i, indio_dev->active_scan_mask, num_data_channels) {
                 const struct iio_chan_spec *channel = &indio_dev->channels[i];
-                unsigned int bytes_to_read = channel->scan_type.realbits >> 3;
+                unsigned int bytes_to_read =
+                        DIV_ROUND_UP(channel->scan_type.realbits +
+                                     channel->scan_type.shift, 8);
                 unsigned int storage_bytes =
                         channel->scan_type.storagebits >> 3;
 
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 975a1f19f747..79c8c7cd70d5 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -401,6 +401,15 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
                         return err;
         }
 
+        /* set DAS */
+        if (sdata->sensor_settings->das.addr) {
+                err = st_sensors_write_data_with_mask(indio_dev,
+                                        sdata->sensor_settings->das.addr,
+                                        sdata->sensor_settings->das.mask, 1);
+                if (err < 0)
+                        return err;
+        }
+
         if (sdata->int_pin_open_drain) {
                 dev_info(&indio_dev->dev,
                          "set interrupt line to open drain mode\n");
@@ -483,8 +492,10 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
         int err;
         u8 *outdata;
         struct st_sensor_data *sdata = iio_priv(indio_dev);
-        unsigned int byte_for_channel = ch->scan_type.realbits >> 3;
+        unsigned int byte_for_channel;
 
+        byte_for_channel = DIV_ROUND_UP(ch->scan_type.realbits +
+                                        ch->scan_type.shift, 8);
         outdata = kmalloc(byte_for_channel, GFP_KERNEL);
         if (!outdata)
                 return -ENOMEM;
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index 2d2ee353dde7..a5913e97945e 100644
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -153,7 +153,7 @@ static int quad8_write_raw(struct iio_dev *indio_dev,
                 ior_cfg = val | priv->preset_enable[chan->channel] << 1;
 
                 /* Load I/O control configuration */
-                outb(0x40 | ior_cfg, base_offset);
+                outb(0x40 | ior_cfg, base_offset + 1);
 
                 return 0;
         case IIO_CHAN_INFO_SCALE:
@@ -233,7 +233,7 @@ static ssize_t quad8_read_set_to_preset_on_index(struct iio_dev *indio_dev,
         const struct quad8_iio *const priv = iio_priv(indio_dev);
 
         return snprintf(buf, PAGE_SIZE, "%u\n",
-                priv->preset_enable[chan->channel]);
+                !priv->preset_enable[chan->channel]);
 }
 
 static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
@@ -241,7 +241,7 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
         size_t len)
 {
         struct quad8_iio *const priv = iio_priv(indio_dev);
-        const int base_offset = priv->base + 2 * chan->channel;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
         bool preset_enable;
         int ret;
         unsigned int ior_cfg;
@@ -250,6 +250,9 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
         if (ret)
                 return ret;
 
+        /* Preset enable is active low in Input/Output Control register */
+        preset_enable = !preset_enable;
+
         priv->preset_enable[chan->channel] = preset_enable;
 
         ior_cfg = priv->ab_enable[chan->channel] |
@@ -362,7 +365,7 @@ static int quad8_set_synchronous_mode(struct iio_dev *indio_dev,
         priv->synchronous_mode[chan->channel] = synchronous_mode;
 
         /* Load Index Control configuration to Index Control Register */
-        outb(0x40 | idr_cfg, base_offset);
+        outb(0x60 | idr_cfg, base_offset);
 
         return 0;
 }
@@ -444,7 +447,7 @@ static int quad8_set_index_polarity(struct iio_dev *indio_dev,
         priv->index_polarity[chan->channel] = index_polarity;
 
         /* Load Index Control configuration to Index Control Register */
-        outb(0x40 | idr_cfg, base_offset);
+        outb(0x60 | idr_cfg, base_offset);
 
         return 0;
 }
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index 5355507f8fa1..c9e319bff58b 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -66,10 +66,8 @@
 
 #define BMI160_REG_DUMMY                0x7F
 
-#define BMI160_ACCEL_PMU_MIN_USLEEP     3200
-#define BMI160_ACCEL_PMU_MAX_USLEEP     3800
-#define BMI160_GYRO_PMU_MIN_USLEEP      55000
-#define BMI160_GYRO_PMU_MAX_USLEEP      80000
+#define BMI160_ACCEL_PMU_MIN_USLEEP     3800
+#define BMI160_GYRO_PMU_MIN_USLEEP      80000
 #define BMI160_SOFTRESET_USLEEP         1000
 
 #define BMI160_CHANNEL(_type, _axis, _index) {                  \
@@ -151,20 +149,9 @@ static struct bmi160_regs bmi160_regs[] = {
         },
 };
 
-struct bmi160_pmu_time {
-        unsigned long min;
-        unsigned long max;
-};
-
-static struct bmi160_pmu_time bmi160_pmu_time[] = {
-        [BMI160_ACCEL] = {
-                .min = BMI160_ACCEL_PMU_MIN_USLEEP,
-                .max = BMI160_ACCEL_PMU_MAX_USLEEP
-        },
-        [BMI160_GYRO] = {
-                .min = BMI160_GYRO_PMU_MIN_USLEEP,
-                .max = BMI160_GYRO_PMU_MIN_USLEEP,
-        },
+static unsigned long bmi160_pmu_time[] = {
+        [BMI160_ACCEL] = BMI160_ACCEL_PMU_MIN_USLEEP,
+        [BMI160_GYRO] = BMI160_GYRO_PMU_MIN_USLEEP,
 };
 
 struct bmi160_scale {
@@ -289,7 +276,7 @@ int bmi160_set_mode(struct bmi160_data *data, enum bmi160_sensor_type t,
         if (ret < 0)
                 return ret;
 
-        usleep_range(bmi160_pmu_time[t].min, bmi160_pmu_time[t].max);
+        usleep_range(bmi160_pmu_time[t], bmi160_pmu_time[t] + 1000);
 
         return 0;
 }
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index a144ca3461fc..81bd8e8da4a6 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -113,7 +113,7 @@ static const char max44000_int_time_avail_str[] =
         "0.100 "
         "0.025 "
         "0.00625 "
-        "0.001625";
+        "0.0015625";
 
 /* Available scales (internal to ulux) with pretty manual alignment: */
 static const int max44000_scale_avail_ulux_array[] = {
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index c8413fc120e6..7031a8dd4d14 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1682,9 +1682,19 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att
                 size += ret;
         }
 
+        if (mlx4_is_master(mdev->dev) && flow_type == MLX4_FS_REGULAR &&
+            flow_attr->num_of_specs == 1) {
+                struct _rule_hw *rule_header = (struct _rule_hw *)(ctrl + 1);
+                enum ib_flow_spec_type header_spec =
+                        ((union ib_flow_spec *)(flow_attr + 1))->type;
+
+                if (header_spec == IB_FLOW_SPEC_ETH)
+                        mlx4_handle_eth_header_mcast_prio(ctrl, rule_header);
+        }
+
         ret = mlx4_cmd_imm(mdev->dev, mailbox->dma, reg_id, size >> 2, 0,
                            MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
-                           MLX4_CMD_WRAPPED);
+                           MLX4_CMD_NATIVE);
         if (ret == -ENOMEM)
                 pr_err("mcg table is full. Fail to register network rule.\n");
         else if (ret == -ENXIO)
@@ -1701,7 +1711,7 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id)
         int err;
         err = mlx4_cmd(dev, reg_id, 0, 0,
                        MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
-                       MLX4_CMD_WRAPPED);
+                       MLX4_CMD_NATIVE);
         if (err)
                 pr_err("Fail to detach network rule. registration id = 0x%llx\n",
                        reg_id);
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 019e02707cd5..3ef0f42984f2 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1023,7 +1023,7 @@ again:
         next_tail = (tail + sizeof(*cmd)) % CMD_BUFFER_SIZE;
         left      = (head - next_tail) % CMD_BUFFER_SIZE;
 
-        if (left <= 2) {
+        if (left <= 0x20) {
                 struct iommu_cmd sync_cmd;
                 int ret;
 
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index a88576d50740..8ccbd7023194 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -903,8 +903,10 @@ int __init detect_intel_iommu(void)
                 x86_init.iommu.iommu_init = intel_iommu_init;
 #endif
 
-        acpi_put_table(dmar_tbl);
-        dmar_tbl = NULL;
+        if (dmar_tbl) {
+                acpi_put_table(dmar_tbl);
+                dmar_tbl = NULL;
+        }
         up_write(&dmar_global_lock);
 
         return ret ? 1 : -ENODEV;
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index c66c273dfd8a..8a185250ae5a 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2037,6 +2037,25 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
         if (context_present(context))
                 goto out_unlock;
 
+        /*
+         * For kdump cases, old valid entries may be cached due to the
+         * in-flight DMA and copied pgtable, but there is no unmapping
+         * behaviour for them, thus we need an explicit cache flush for
+         * the newly-mapped device. For kdump, at this point, the device
+         * is supposed to finish reset at its driver probe stage, so no
+         * in-flight DMA will exist, and we don't need to worry anymore
+         * hereafter.
+         */
+        if (context_copied(context)) {
+                u16 did_old = context_domain_id(context);
+
+                if (did_old >= 0 && did_old < cap_ndoms(iommu->cap))
+                        iommu->flush.flush_context(iommu, did_old,
+                                                   (((u16)bus) << 8) | devfn,
+                                                   DMA_CCMD_MASK_NOBIT,
+                                                   DMA_CCMD_DEVICE_INVL);
+        }
+
         pgd = domain->pgd;
 
         context_clear_entry(context);
@@ -5185,6 +5204,25 @@ static void intel_iommu_remove_device(struct device *dev)
 }
 
 #ifdef CONFIG_INTEL_IOMMU_SVM
+#define MAX_NR_PASID_BITS (20)
+static inline unsigned long intel_iommu_get_pts(struct intel_iommu *iommu)
+{
+        /*
+         * Convert ecap_pss to extend context entry pts encoding, also
+         * respect the soft pasid_max value set by the iommu.
+         * - number of PASID bits = ecap_pss + 1
+         * - number of PASID table entries = 2^(pts + 5)
+         * Therefore, pts = ecap_pss - 4
+         * e.g. KBL ecap_pss = 0x13, PASID has 20 bits, pts = 15
+         */
+        if (ecap_pss(iommu->ecap) < 5)
+                return 0;
+
+        /* pasid_max is encoded as actual number of entries not the bits */
+        return find_first_bit((unsigned long *)&iommu->pasid_max,
+                        MAX_NR_PASID_BITS) - 5;
+}
+
 int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct intel_svm_dev *sdev)
 {
         struct device_domain_info *info;
@@ -5217,7 +5255,9 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct intel_svm_dev *sd
 
         if (!(ctx_lo & CONTEXT_PASIDE)) {
                 context[1].hi = (u64)virt_to_phys(iommu->pasid_state_table);
-                context[1].lo = (u64)virt_to_phys(iommu->pasid_table) | ecap_pss(iommu->ecap);
+                context[1].lo = (u64)virt_to_phys(iommu->pasid_table) |
+                        intel_iommu_get_pts(iommu);
+
                 wmb();
                 /* CONTEXT_TT_MULTI_LEVEL and CONTEXT_TT_DEV_IOTLB are both
                  * extended to permit requests-with-PASID if the PASIDE bit
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 0037153c80a6..2d9c5dd06e42 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -450,7 +450,7 @@ bool mei_cldev_enabled(struct mei_cl_device *cldev)
 EXPORT_SYMBOL_GPL(mei_cldev_enabled);
 
 /**
- * mei_cldev_enable_device - enable me client device
+ * mei_cldev_enable - enable me client device
  *     create connection with me client
  *
  * @cldev: me client device
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 391936c1aa04..b0395601c6ae 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -1541,7 +1541,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb,
 
         rets = first_chunk ? mei_cl_tx_flow_ctrl_creds(cl) : 1;
         if (rets < 0)
-                return rets;
+                goto err;
 
         if (rets == 0) {
                 cl_dbg(dev, cl, "No flow control credentials: not sending.\n");
@@ -1575,11 +1575,8 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb,
                         cb->buf.size, cb->buf_idx);
 
         rets = mei_write_message(dev, &mei_hdr, buf->data + cb->buf_idx);
-        if (rets) {
-                cl->status = rets;
-                list_move_tail(&cb->list, &cmpl_list->list);
-                return rets;
-        }
+        if (rets)
+                goto err;
 
         cl->status = 0;
         cl->writing_state = MEI_WRITING;
@@ -1587,14 +1584,21 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb,
         cb->completed = mei_hdr.msg_complete == 1;
 
         if (first_chunk) {
-                if (mei_cl_tx_flow_ctrl_creds_reduce(cl))
-                        return -EIO;
+                if (mei_cl_tx_flow_ctrl_creds_reduce(cl)) {
+                        rets = -EIO;
+                        goto err;
+                }
         }
 
         if (mei_hdr.msg_complete)
                 list_move_tail(&cb->list, &dev->write_waiting_list.list);
 
         return 0;
+
+err:
+        cl->status = rets;
+        list_move_tail(&cb->list, &cmpl_list->list);
+        return rets;
 }
 
 /**
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 25d1eb4933d0..7e8cf213fd81 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1012,15 +1012,6 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
                 goto out;
         }
 
-        /* Insert TSB and checksum infos */
-        if (priv->tsb_en) {
-                skb = bcm_sysport_insert_tsb(skb, dev);
-                if (!skb) {
-                        ret = NETDEV_TX_OK;
-                        goto out;
-                }
-        }
-
         /* The Ethernet switch we are interfaced with needs packets to be at
          * least 64 bytes (including FCS) otherwise they will be discarded when
          * they enter the switch port logic. When Broadcom tags are enabled, we
@@ -1028,13 +1019,21 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
          * (including FCS and tag) because the length verification is done after
          * the Broadcom tag is stripped off the ingress packet.
          */
-        if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
+        if (skb_put_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
                 ret = NETDEV_TX_OK;
                 goto out;
         }
 
-        skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ?
-                        ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;
+        /* Insert TSB and checksum infos */
+        if (priv->tsb_en) {
+                skb = bcm_sysport_insert_tsb(skb, dev);
+                if (!skb) {
+                        ret = NETDEV_TX_OK;
+                        goto out;
+                }
+        }
+
+        skb_len = skb->len;
 
         mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
         if (dma_mapping_error(kdev, mapping)) {
diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
index 92be2cd8f817..9906fda76087 100644
--- a/drivers/net/ethernet/cadence/macb_pci.c
+++ b/drivers/net/ethernet/cadence/macb_pci.c
@@ -1,5 +1,5 @@
 /**
- * macb_pci.c - Cadence GEM PCI wrapper.
+ * Cadence GEM PCI wrapper.
  *
  * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com
  *
@@ -45,32 +45,27 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         struct macb_platform_data plat_data;
         struct resource res[2];
 
-        /* sanity check */
-        if (!id)
-                return -EINVAL;
-
         /* enable pci device */
-        err = pci_enable_device(pdev);
+        err = pcim_enable_device(pdev);
         if (err < 0) {
-                dev_err(&pdev->dev, "Enabling PCI device has failed: 0x%04X",
-                        err);
-                return -EACCES;
+                dev_err(&pdev->dev, "Enabling PCI device has failed: %d", err);
+                return err;
         }
 
         pci_set_master(pdev);
 
         /* set up resources */
         memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));
-        res[0].start = pdev->resource[0].start;
-        res[0].end = pdev->resource[0].end;
+        res[0].start = pci_resource_start(pdev, 0);
+        res[0].end = pci_resource_end(pdev, 0);
         res[0].name = PCI_DRIVER_NAME;
         res[0].flags = IORESOURCE_MEM;
-        res[1].start = pdev->irq;
+        res[1].start = pci_irq_vector(pdev, 0);
         res[1].name = PCI_DRIVER_NAME;
         res[1].flags = IORESOURCE_IRQ;
 
-        dev_info(&pdev->dev, "EMAC physical base addr = 0x%p\n",
-                 (void *)(uintptr_t)pci_resource_start(pdev, 0));
+        dev_info(&pdev->dev, "EMAC physical base addr: %pa\n",
+                 &res[0].start);
 
         /* set up macb platform data */
         memset(&plat_data, 0, sizeof(plat_data));
@@ -100,7 +95,7 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         plat_info.num_res = ARRAY_SIZE(res);
         plat_info.data = &plat_data;
         plat_info.size_data = sizeof(plat_data);
-        plat_info.dma_mask = DMA_BIT_MASK(32);
+        plat_info.dma_mask = pdev->dma_mask;
 
         /* register platform device */
         plat_dev = platform_device_register_full(&plat_info);
@@ -120,7 +115,6 @@ err_hclk_register:
         clk_unregister(plat_data.pclk);
 
 err_pclk_register:
-        pci_disable_device(pdev);
         return err;
 }
 
@@ -130,7 +124,6 @@ static void macb_remove(struct pci_dev *pdev)
         struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
 
         platform_device_unregister(plat_dev);
-        pci_disable_device(pdev);
         clk_unregister(plat_data->pclk);
         clk_unregister(plat_data->hclk);
 }
diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index bbc8bd16cb97..dcbce6cac63e 100644
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -77,7 +77,7 @@ config OCTEON_MGMT_ETHERNET
 config LIQUIDIO_VF
         tristate "Cavium LiquidIO VF support"
         depends on 64BIT && PCI_MSI
-        select PTP_1588_CLOCK
+        imply PTP_1588_CLOCK
         ---help---
           This driver supports Cavium LiquidIO Intelligent Server Adapter
           based on CN23XX chips.
diff --git a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
index 0f0de5b63622..d04a6c163445 100644
--- a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
+++ b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
@@ -133,17 +133,15 @@ cxgb_find_route6(struct cxgb4_lld_info *lldi,
                 if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)
                         fl6.flowi6_oif = sin6_scope_id;
                 dst = ip6_route_output(&init_net, NULL, &fl6);
-                if (!dst)
-                        goto out;
-                if (!cxgb_our_interface(lldi, get_real_dev,
-                                        ip6_dst_idev(dst)->dev) &&
-                    !(ip6_dst_idev(dst)->dev->flags & IFF_LOOPBACK)) {
+                if (dst->error ||
+                    (!cxgb_our_interface(lldi, get_real_dev,
+                                         ip6_dst_idev(dst)->dev) &&
+                     !(ip6_dst_idev(dst)->dev->flags & IFF_LOOPBACK))) {
                         dst_release(dst);
-                        dst = NULL;
+                        return NULL;
                 }
         }
 
-out:
         return dst;
 }
 EXPORT_SYMBOL(cxgb_find_route6);
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 7e1633bf5a22..225e9a4877d7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -5155,7 +5155,9 @@ static netdev_features_t be_features_check(struct sk_buff *skb,
             skb->inner_protocol_type != ENCAP_TYPE_ETHER ||
             skb->inner_protocol != htons(ETH_P_TEB) ||
             skb_inner_mac_header(skb) - skb_transport_header(skb) !=
-            sizeof(struct udphdr) + sizeof(struct vxlanhdr))
+                sizeof(struct udphdr) + sizeof(struct vxlanhdr) ||
+            !adapter->vxlan_port ||
+            udp_hdr(skb)->dest != adapter->vxlan_port)
                 return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
 
         return features;
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 624ba9058dc4..c9b7ad65e563 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -733,6 +733,7 @@ static int dpaa_eth_cgr_init(struct dpaa_priv *priv)
         priv->cgr_data.cgr.cb = dpaa_eth_cgscn;
 
         /* Enable Congestion State Change Notifications and CS taildrop */
+        memset(&initcgr, 0, sizeof(initcgr));
         initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CSCN_EN | QM_CGR_WE_CS_THRES);
         initcgr.cgr.cscn_en = QM_CGR_EN;
 
@@ -2291,7 +2292,8 @@ static int dpaa_open(struct net_device *net_dev)
         net_dev->phydev = mac_dev->init_phy(net_dev, priv->mac_dev);
         if (!net_dev->phydev) {
                 netif_err(priv, ifup, net_dev, "init_phy() failed\n");
-                return -ENODEV;
+                err = -ENODEV;
+                goto phy_init_failed;
         }
 
         for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -2314,6 +2316,7 @@ mac_start_failed:
         for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++)
                 fman_port_disable(mac_dev->port[i]);
 
+phy_init_failed:
         dpaa_eth_napi_disable(priv);
 
         return err;
@@ -2420,6 +2423,7 @@ static int dpaa_ingress_cgr_init(struct dpaa_priv *priv)
         }
 
         /* Enable CS TD, but disable Congestion State Change Notifications. */
+        memset(&initcgr, 0, sizeof(initcgr));
         initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CS_THRES);
         initcgr.cgr.cscn_en = QM_CGR_EN;
         cs_th = DPAA_INGRESS_CS_THRESHOLD;
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index cbeea915f026..8037426ec50f 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -900,10 +900,10 @@ static void korina_restart_task(struct work_struct *work)
                                 DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR,
                                 &lp->rx_dma_regs->dmasm);
 
-        korina_free_ring(dev);
-
         napi_disable(&lp->napi);
 
+        korina_free_ring(dev);
+
         if (korina_init(dev) < 0) {
                 printk(KERN_ERR "%s: cannot restart device\n", dev->name);
                 return;
@@ -1064,12 +1064,12 @@ static int korina_close(struct net_device *dev)
         tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR;
         writel(tmp, &lp->rx_dma_regs->dmasm);
 
-        korina_free_ring(dev);
-
         napi_disable(&lp->napi);
 
         cancel_work_sync(&lp->restart_task);
 
+        korina_free_ring(dev);
+
         free_irq(lp->rx_irq, dev);
         free_irq(lp->tx_irq, dev);
         free_irq(lp->ovr_irq, dev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index 015198c14fa8..504461a464c5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -245,13 +245,9 @@ static u32 freq_to_shift(u16 freq)
 {
         u32 freq_khz = freq * 1000;
         u64 max_val_cycles = freq_khz * 1000 * MLX4_EN_WRAP_AROUND_SEC;
-        u64 tmp_rounded =
-                roundup_pow_of_two(max_val_cycles) > max_val_cycles ?
-                roundup_pow_of_two(max_val_cycles) - 1 : UINT_MAX;
-        u64 max_val_cycles_rounded = is_power_of_2(max_val_cycles + 1) ?
-                max_val_cycles : tmp_rounded;
+        u64 max_val_cycles_rounded = 1ULL << fls64(max_val_cycles - 1);
         /* calculate max possible multiplier in order to fit in 64bit */
-        u64 max_mul = div_u64(0xffffffffffffffffULL, max_val_cycles_rounded);
+        u64 max_mul = div64_u64(ULLONG_MAX, max_val_cycles_rounded);
 
         /* This comes from the reverse of clocksource_khz2mult */
         return ilog2(div_u64(max_mul * freq_khz, 1000000));
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index bcd955339058..edbe200ac2fa 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1638,7 +1638,8 @@ int mlx4_en_start_port(struct net_device *dev)
 
         /* Configure tx cq's and rings */
         for (t = 0 ; t < MLX4_EN_NUM_TX_TYPES; t++) {
-                u8 num_tx_rings_p_up = t == TX ? priv->num_tx_rings_p_up : 1;
+                u8 num_tx_rings_p_up = t == TX ?
+                        priv->num_tx_rings_p_up : priv->tx_ring_num[t];
 
                 for (i = 0; i < priv->tx_ring_num[t]; i++) {
                         /* Configure cq */
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 3c37e216bbf3..eac527e25ec9 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -445,8 +445,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                 ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn;
 
                 ring->stride = stride;
-                if (ring->stride <= TXBB_SIZE)
+                if (ring->stride <= TXBB_SIZE) {
+                        /* Stamp first unused send wqe */
+                        __be32 *ptr = (__be32 *)ring->buf;
+                        __be32 stamp = cpu_to_be32(1 << STAMP_SHIFT);
+                        *ptr = stamp;
+                        /* Move pointer to start of rx section */
                         ring->buf += TXBB_SIZE;
+                }
 
                 ring->log_stride = ffs(ring->stride) - 1;
                 ring->buf_size = ring->size * ring->stride;
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
index 2a9dd460a95f..e1f9e7cebf8f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/icm.c
+++ b/drivers/net/ethernet/mellanox/mlx4/icm.c
@@ -118,8 +118,13 @@ static int mlx4_alloc_icm_coherent(struct device *dev, struct scatterlist *mem,
         if (!buf)
                 return -ENOMEM;
 
+        if (offset_in_page(buf)) {
+                dma_free_coherent(dev, PAGE_SIZE << order,
+                                  buf, sg_dma_address(mem));
+                return -ENOMEM;
+        }
+
         sg_set_buf(mem, buf, PAGE_SIZE << order);
-        BUG_ON(mem->offset);
         sg_dma_len(mem) = PAGE_SIZE << order;
         return 0;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 5e7840a7a33b..bffa6f345f2f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -42,6 +42,7 @@
 #include <linux/io-mapping.h>
 #include <linux/delay.h>
 #include <linux/kmod.h>
+#include <linux/etherdevice.h>
 #include <net/devlink.h>
 
 #include <linux/mlx4/device.h>
@@ -782,6 +783,23 @@ int mlx4_is_slave_active(struct mlx4_dev *dev, int slave)
 }
 EXPORT_SYMBOL(mlx4_is_slave_active);
 
+void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl,
+                                       struct _rule_hw *eth_header)
+{
+        if (is_multicast_ether_addr(eth_header->eth.dst_mac) ||
+            is_broadcast_ether_addr(eth_header->eth.dst_mac)) {
+                struct mlx4_net_trans_rule_hw_eth *eth =
+                        (struct mlx4_net_trans_rule_hw_eth *)eth_header;
+                struct _rule_hw *next_rule = (struct _rule_hw *)(eth + 1);
+                bool last_rule = next_rule->size == 0 && next_rule->id == 0 &&
+                        next_rule->rsvd == 0;
+
+                if (last_rule)
+                        ctrl->prio = cpu_to_be16(MLX4_DOMAIN_NIC);
+        }
+}
+EXPORT_SYMBOL(mlx4_handle_eth_header_mcast_prio);
+
 static void slave_adjust_steering_mode(struct mlx4_dev *dev,
                                        struct mlx4_dev_cap *dev_cap,
                                        struct mlx4_init_hca_param *hca_param)
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index c548beaaf910..56185a0b827d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -4164,22 +4164,6 @@ static int validate_eth_header_mac(int slave, struct _rule_hw *eth_header,
         return 0;
 }
 
-static void handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl,
-                                         struct _rule_hw *eth_header)
-{
-        if (is_multicast_ether_addr(eth_header->eth.dst_mac) ||
-            is_broadcast_ether_addr(eth_header->eth.dst_mac)) {
-                struct mlx4_net_trans_rule_hw_eth *eth =
-                        (struct mlx4_net_trans_rule_hw_eth *)eth_header;
-                struct _rule_hw *next_rule = (struct _rule_hw *)(eth + 1);
-                bool last_rule = next_rule->size == 0 && next_rule->id == 0 &&
-                        next_rule->rsvd == 0;
-
-                if (last_rule)
-                        ctrl->prio = cpu_to_be16(MLX4_DOMAIN_NIC);
-        }
-}
-
 /*
  * In case of missing eth header, append eth header with a MAC address
  * assigned to the VF.
@@ -4363,10 +4347,7 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
         header_id = map_hw_to_sw_id(be16_to_cpu(rule_header->id));
 
         if (header_id == MLX4_NET_TRANS_RULE_ID_ETH)
-                handle_eth_header_mcast_prio(ctrl, rule_header);
-
-        if (slave == dev->caps.function)
-                goto execute;
+                mlx4_handle_eth_header_mcast_prio(ctrl, rule_header);
 
         switch (header_id) {
         case MLX4_NET_TRANS_RULE_ID_ETH:
@@ -4394,7 +4375,6 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
                 goto err_put_qp;
         }
 
-execute:
         err = mlx4_cmd_imm(dev, inbox->dma, &vhcr->out_param,
                            vhcr->in_modifier, 0,
                            MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
@@ -4473,6 +4453,7 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
         struct res_qp *rqp;
         struct res_fs_rule *rrule;
         u64 mirr_reg_id;
+        int qpn;
 
         if (dev->caps.steering_mode !=
             MLX4_STEERING_MODE_DEVICE_MANAGED)
@@ -4489,10 +4470,11 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
         }
         mirr_reg_id = rrule->mirr_rule_id;
         kfree(rrule->mirr_mbox);
+        qpn = rrule->qpn;
 
         /* Release the rule form busy state before removal */
         put_res(dev, slave, vhcr->in_param, RES_FS_RULE);
-        err = get_res(dev, slave, rrule->qpn, RES_QP, &rqp);
+        err = get_res(dev, slave, qpn, RES_QP, &rqp);
         if (err)
                 return err;
 
@@ -4517,7 +4499,7 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
         if (!err)
                 atomic_dec(&rqp->ref_count);
 out:
-        put_res(dev, slave, rrule->qpn, RES_QP);
+        put_res(dev, slave, qpn, RES_QP);
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index 7f6c225666c1..f0b460f47f29 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -723,6 +723,9 @@ static void mlx5e_ets_init(struct mlx5e_priv *priv)
         int i;
         struct ieee_ets ets;
 
+        if (!MLX5_CAP_GEN(priv->mdev, ets))
+                return;
+
         memset(&ets, 0, sizeof(ets));
         ets.ets_cap = mlx5_max_tc(priv->mdev) + 1;
         for (i = 0; i < ets.ets_cap; i++) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 352462af8d51..33a399a8b5d5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -171,7 +171,6 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset)
                 return NUM_SW_COUNTERS +
                        MLX5E_NUM_Q_CNTRS(priv) +
                        NUM_VPORT_COUNTERS + NUM_PPORT_COUNTERS +
-                       NUM_PCIE_COUNTERS +
                        MLX5E_NUM_RQ_STATS(priv) +
                        MLX5E_NUM_SQ_STATS(priv) +
                        MLX5E_NUM_PFC_COUNTERS(priv) +
@@ -219,14 +218,6 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)
                 strcpy(data + (idx++) * ETH_GSTRING_LEN,
                        pport_2819_stats_desc[i].format);
 
-        for (i = 0; i < NUM_PCIE_PERF_COUNTERS; i++)
-                strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       pcie_perf_stats_desc[i].format);
-
-        for (i = 0; i < NUM_PCIE_TAS_COUNTERS; i++)
-                strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       pcie_tas_stats_desc[i].format);
-
         for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {
                 for (i = 0; i < NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS; i++)
                         sprintf(data + (idx++) * ETH_GSTRING_LEN,
@@ -339,14 +330,6 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev,
                 data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.RFC_2819_counters,
                                                   pport_2819_stats_desc, i);
 
-        for (i = 0; i < NUM_PCIE_PERF_COUNTERS; i++)
-                data[idx++] = MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_perf_counters,
-                                                  pcie_perf_stats_desc, i);
-
-        for (i = 0; i < NUM_PCIE_TAS_COUNTERS; i++)
-                data[idx++] = MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_tas_counters,
-                                                  pcie_tas_stats_desc, i);
-
         for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {
                 for (i = 0; i < NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS; i++)
                         data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[prio],
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
index 3691451c728c..d088effd7160 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
@@ -247,6 +247,7 @@ static int set_flow_attrs(u32 *match_c, u32 *match_v,
         }
         if (fs->flow_type & FLOW_MAC_EXT &&
             !is_zero_ether_addr(fs->m_ext.h_dest)) {
+                mask_spec(fs->m_ext.h_dest, fs->h_ext.h_dest, ETH_ALEN);
                 ether_addr_copy(MLX5_ADDR_OF(fte_match_set_lyr_2_4,
                                              outer_headers_c, dmac_47_16),
                                 fs->m_ext.h_dest);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index cbfa38fc72c0..1236b27b1493 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -291,36 +291,12 @@ static void mlx5e_update_q_counter(struct mlx5e_priv *priv)
                                       &qcnt->rx_out_of_buffer);
 }
 
-static void mlx5e_update_pcie_counters(struct mlx5e_priv *priv)
-{
-        struct mlx5e_pcie_stats *pcie_stats = &priv->stats.pcie;
-        struct mlx5_core_dev *mdev = priv->mdev;
-        int sz = MLX5_ST_SZ_BYTES(mpcnt_reg);
-        void *out;
-        u32 *in;
-
-        in = mlx5_vzalloc(sz);
-        if (!in)
-                return;
-
-        out = pcie_stats->pcie_perf_counters;
-        MLX5_SET(mpcnt_reg, in, grp, MLX5_PCIE_PERFORMANCE_COUNTERS_GROUP);
-        mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_MPCNT, 0, 0);
-
-        out = pcie_stats->pcie_tas_counters;
-        MLX5_SET(mpcnt_reg, in, grp, MLX5_PCIE_TIMERS_AND_STATES_COUNTERS_GROUP);
-        mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_MPCNT, 0, 0);
-
-        kvfree(in);
-}
-
 void mlx5e_update_stats(struct mlx5e_priv *priv)
 {
         mlx5e_update_q_counter(priv);
         mlx5e_update_vport_counters(priv);
         mlx5e_update_pport_counters(priv);
         mlx5e_update_sw_counters(priv);
-        mlx5e_update_pcie_counters(priv);
 }
 
 void mlx5e_update_stats_work(struct work_struct *work)
@@ -3805,14 +3781,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
 
         mlx5_lag_add(mdev, netdev);
 
-        if (mlx5e_vxlan_allowed(mdev)) {
-                rtnl_lock();
-                udp_tunnel_get_rx_info(netdev);
-                rtnl_unlock();
-        }
-
         mlx5e_enable_async_events(priv);
-        queue_work(priv->wq, &priv->set_rx_mode_work);
 
         if (MLX5_CAP_GEN(mdev, vport_group_manager)) {
                 mlx5_query_nic_vport_mac_address(mdev, 0, rep.hw_id);
@@ -3822,6 +3791,18 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
                 rep.netdev = netdev;
                 mlx5_eswitch_register_vport_rep(esw, 0, &rep);
         }
+
+        if (netdev->reg_state != NETREG_REGISTERED)
+                return;
+
+        /* Device already registered: sync netdev system state */
+        if (mlx5e_vxlan_allowed(mdev)) {
+                rtnl_lock();
+                udp_tunnel_get_rx_info(netdev);
+                rtnl_unlock();
+        }
+
+        queue_work(priv->wq, &priv->set_rx_mode_work);
 }
 
 static void mlx5e_nic_disable(struct mlx5e_priv *priv)
@@ -3966,10 +3947,6 @@ void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev)
         const struct mlx5e_profile *profile = priv->profile;
 
         set_bit(MLX5E_STATE_DESTROYING, &priv->state);
-        if (profile->disable)
-                profile->disable(priv);
-
-        flush_workqueue(priv->wq);
 
         rtnl_lock();
         if (netif_running(netdev))
@@ -3977,6 +3954,10 @@ void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev)
         netif_device_detach(netdev);
         rtnl_unlock();
 
+        if (profile->disable)
+                profile->disable(priv);
+        flush_workqueue(priv->wq);
+
         mlx5e_destroy_q_counter(priv);
         profile->cleanup_rx(priv);
         mlx5e_close_drop_rq(priv);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index f202f872f57f..ba5db1dd23a9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -39,7 +39,7 @@
 #define MLX5E_READ_CTR32_CPU(ptr, dsc, i) \
         (*(u32 *)((char *)ptr + dsc[i].offset))
 #define MLX5E_READ_CTR32_BE(ptr, dsc, i) \
-        be32_to_cpu(*(__be32 *)((char *)ptr + dsc[i].offset))
+        be64_to_cpu(*(__be32 *)((char *)ptr + dsc[i].offset))
 
 #define MLX5E_DECLARE_STAT(type, fld) #fld, offsetof(type, fld)
 #define MLX5E_DECLARE_RX_STAT(type, fld) "rx%d_"#fld, offsetof(type, fld)
@@ -276,32 +276,6 @@ static const struct counter_desc pport_per_prio_pfc_stats_desc[] = {
         { "rx_%s_pause_transition", PPORT_PER_PRIO_OFF(rx_pause_transition) },
 };
 
-#define PCIE_PERF_OFF(c) \
-        MLX5_BYTE_OFF(mpcnt_reg, counter_set.pcie_perf_cntrs_grp_data_layout.c)
-#define PCIE_PERF_GET(pcie_stats, c) \
-        MLX5_GET(mpcnt_reg, pcie_stats->pcie_perf_counters, \
-                 counter_set.pcie_perf_cntrs_grp_data_layout.c)
-#define PCIE_TAS_OFF(c) \
-        MLX5_BYTE_OFF(mpcnt_reg, counter_set.pcie_tas_cntrs_grp_data_layout.c)
-#define PCIE_TAS_GET(pcie_stats, c) \
-        MLX5_GET(mpcnt_reg, pcie_stats->pcie_tas_counters, \
-                 counter_set.pcie_tas_cntrs_grp_data_layout.c)
-
-struct mlx5e_pcie_stats {
-        __be64 pcie_perf_counters[MLX5_ST_SZ_QW(mpcnt_reg)];
-        __be64 pcie_tas_counters[MLX5_ST_SZ_QW(mpcnt_reg)];
-};
-
-static const struct counter_desc pcie_perf_stats_desc[] = {
-        { "rx_pci_signal_integrity", PCIE_PERF_OFF(rx_errors) },
-        { "tx_pci_signal_integrity", PCIE_PERF_OFF(tx_errors) },
-};
-
-static const struct counter_desc pcie_tas_stats_desc[] = {
-        { "tx_pci_transport_nonfatal_msg", PCIE_TAS_OFF(non_fatal_err_msg_sent) },
-        { "tx_pci_transport_fatal_msg", PCIE_TAS_OFF(fatal_err_msg_sent) },
-};
-
 struct mlx5e_rq_stats {
         u64 packets;
         u64 bytes;
@@ -386,8 +360,6 @@ static const struct counter_desc sq_stats_desc[] = {
 #define NUM_PPORT_802_3_COUNTERS        ARRAY_SIZE(pport_802_3_stats_desc)
 #define NUM_PPORT_2863_COUNTERS         ARRAY_SIZE(pport_2863_stats_desc)
 #define NUM_PPORT_2819_COUNTERS         ARRAY_SIZE(pport_2819_stats_desc)
-#define NUM_PCIE_PERF_COUNTERS          ARRAY_SIZE(pcie_perf_stats_desc)
-#define NUM_PCIE_TAS_COUNTERS           ARRAY_SIZE(pcie_tas_stats_desc)
 #define NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS \
         ARRAY_SIZE(pport_per_prio_traffic_stats_desc)
 #define NUM_PPORT_PER_PRIO_PFC_COUNTERS \
@@ -397,7 +369,6 @@ static const struct counter_desc sq_stats_desc[] = {
                                          NUM_PPORT_2819_COUNTERS  + \
                                          NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS * \
                                          NUM_PPORT_PRIO)
-#define NUM_PCIE_COUNTERS               (NUM_PCIE_PERF_COUNTERS + NUM_PCIE_TAS_COUNTERS)
 #define NUM_RQ_STATS                    ARRAY_SIZE(rq_stats_desc)
 #define NUM_SQ_STATS                    ARRAY_SIZE(sq_stats_desc)
 
@@ -406,7 +377,6 @@ struct mlx5e_stats {
         struct mlx5e_qcounter_stats qcnt;
         struct mlx5e_vport_stats vport;
         struct mlx5e_pport_stats pport;
-        struct mlx5e_pcie_stats pcie;
         struct rtnl_link_stats64 vf_vport;
 };
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index d6807c3cc461..f14d9c9ba773 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1860,7 +1860,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
 
         if (!ESW_ALLOWED(esw))
                 return -EPERM;
-        if (!LEGAL_VPORT(esw, vport))
+        if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))
                 return -EINVAL;
 
         mutex_lock(&esw->state_lock);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 466e161010f7..03293ed1cc22 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -695,6 +695,12 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports)
                 if (err)
                         goto err_reps;
         }
+
+        /* disable PF RoCE so missed packets don't go through RoCE steering */
+        mlx5_dev_list_lock();
+        mlx5_remove_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
+        mlx5_dev_list_unlock();
+
         return 0;
 
 err_reps:
@@ -718,6 +724,11 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw)
 {
         int err, err1, num_vfs = esw->dev->priv.sriov.num_vfs;
 
+        /* enable back PF RoCE */
+        mlx5_dev_list_lock();
+        mlx5_add_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
+        mlx5_dev_list_unlock();
+
         mlx5_eswitch_disable_sriov(esw);
         err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);
         if (err) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index a263d8904a4c..0ac7a2fc916c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1263,6 +1263,7 @@ static struct mlx5_flow_handle *add_rule_fg(struct mlx5_flow_group *fg,
         nested_lock_ref_node(&fte->node, FS_MUTEX_CHILD);
         handle = add_rule_fte(fte, fg, dest, dest_num, false);
         if (IS_ERR(handle)) {
+                unlock_ref_node(&fte->node);
                 kfree(fte);
                 goto unlock_fg;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 54e5a786f191..6547f22e6b9b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -503,6 +503,13 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
         MLX5_SET(cmd_hca_cap, set_hca_cap, pkey_table_size,
                  to_fw_pkey_sz(dev, 128));
 
+        /* Check log_max_qp from HCA caps to set in current profile */
+        if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < profile[prof_sel].log_max_qp) {
+                mlx5_core_warn(dev, "log_max_qp value in current profile is %d, changing it to HCA capability limit (%d)\n",
+                               profile[prof_sel].log_max_qp,
+                               MLX5_CAP_GEN_MAX(dev, log_max_qp));
+                profile[prof_sel].log_max_qp = MLX5_CAP_GEN_MAX(dev, log_max_qp);
+        }
         if (prof->mask & MLX5_PROF_MASK_QP_SIZE)
                 MLX5_SET(cmd_hca_cap, set_hca_cap, log_max_qp,
                          prof->log_max_qp);
@@ -575,7 +582,6 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
         struct mlx5_priv *priv  = &mdev->priv;
         struct msix_entry *msix = priv->msix_arr;
         int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
-        int numa_node           = priv->numa_node;
         int err;
 
         if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) {
@@ -583,7 +589,7 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
                 return -ENOMEM;
         }
 
-        cpumask_set_cpu(cpumask_local_spread(i, numa_node),
+        cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node),
                         priv->irq_info[i].mask);
 
         err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);
@@ -1189,6 +1195,8 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv,
 {
         int err = 0;
 
+        mlx5_drain_health_wq(dev);
+
         mutex_lock(&dev->intf_state_mutex);
         if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {
                 dev_warn(&dev->pdev->dev, "%s: interface is down, NOP\n",
@@ -1351,10 +1359,9 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev,
 
         mlx5_enter_error_state(dev);
         mlx5_unload_one(dev, priv, false);
-        /* In case of kernel call save the pci state and drain health wq */
+        /* In case of kernel call save the pci state */
         if (state) {
                 pci_save_state(pdev);
-                mlx5_drain_health_wq(dev);
                 mlx5_pci_disable_device(dev);
         }
 
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f9b97f5946f8..44389c90056a 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -326,6 +326,7 @@ enum cfg_version {
 static const struct pci_device_id rtl8169_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8136), 0, 0, RTL_CFG_2 },
+        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8161), 0, 0, RTL_CFG_1 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_1 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index f341c1bc7001..00fafabab1d0 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -819,6 +819,7 @@ static struct sh_eth_cpu_data sh7734_data = {
         .tsu            = 1,
         .hw_crc         = 1,
         .select_mii     = 1,
+        .shift_rd0      = 1,
 };
 
 /* SH7763 */
@@ -1656,7 +1657,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
         else
                 goto out;
 
-        if (!likely(mdp->irq_enabled)) {
+        if (unlikely(!mdp->irq_enabled)) {
                 sh_eth_write(ndev, 0, EESIPR);
                 goto out;
         }
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index de2947ccc5ad..5eb0e684fd76 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -1323,7 +1323,8 @@ static int efx_ef10_init_nic(struct efx_nic *efx)
         }
 
         /* don't fail init if RSS setup doesn't work */
-        efx->type->rx_push_rss_config(efx, false, efx->rx_indir_table);
+        rc = efx->type->rx_push_rss_config(efx, false, efx->rx_indir_table);
+        efx->rss_active = (rc == 0);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 87bdc56b4e3a..18ebaea44e82 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -975,6 +975,8 @@ efx_ethtool_get_rxnfc(struct net_device *net_dev,
 
         case ETHTOOL_GRXFH: {
                 info->data = 0;
+                if (!efx->rss_active) /* No RSS */
+                        return 0;
                 switch (info->flow_type) {
                 case UDP_V4_FLOW:
                         if (efx->rx_hash_udp_4tuple)
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 1a635ced62d0..1c62c1a00fca 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -860,6 +860,7 @@ struct vfdi_status;
  * @rx_hash_key: Toeplitz hash key for RSS
  * @rx_indir_table: Indirection table for RSS
  * @rx_scatter: Scatter mode enabled for receives
+ * @rss_active: RSS enabled on hardware
  * @rx_hash_udp_4tuple: UDP 4-tuple hashing enabled
  * @int_error_count: Number of internal errors seen recently
  * @int_error_expire: Time at which error count will be expired
@@ -998,6 +999,7 @@ struct efx_nic {
         u8 rx_hash_key[40];
         u32 rx_indir_table[128];
         bool rx_scatter;
+        bool rss_active;
         bool rx_hash_udp_4tuple;
 
         unsigned int_error_count;
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index a3901bc96586..4e54e5dc9fcb 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -403,6 +403,7 @@ static int siena_init_nic(struct efx_nic *efx)
         efx_writeo(efx, &temp, FR_AZ_RX_CFG);
 
         siena_rx_push_rss_config(efx, false, efx->rx_indir_table);
+        efx->rss_active = true;
 
         /* Enable event logging */
         rc = efx_mcdi_log_ctrl(efx, true, false, 0);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
index c35597586121..3dc7d279f805 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
@@ -60,8 +60,9 @@ struct oxnas_dwmac {
         struct regmap   *regmap;
 };
 
-static int oxnas_dwmac_init(struct oxnas_dwmac *dwmac)
+static int oxnas_dwmac_init(struct platform_device *pdev, void *priv)
 {
+        struct oxnas_dwmac *dwmac = priv;
         unsigned int value;
         int ret;
 
@@ -105,20 +106,20 @@ static int oxnas_dwmac_init(struct oxnas_dwmac *dwmac)
         return 0;
 }
 
+static void oxnas_dwmac_exit(struct platform_device *pdev, void *priv)
+{
+        struct oxnas_dwmac *dwmac = priv;
+
+        clk_disable_unprepare(dwmac->clk);
+}
+
 static int oxnas_dwmac_probe(struct platform_device *pdev)
 {
         struct plat_stmmacenet_data *plat_dat;
         struct stmmac_resources stmmac_res;
-        struct device_node *sysctrl;
         struct oxnas_dwmac *dwmac;
         int ret;
 
-        sysctrl = of_parse_phandle(pdev->dev.of_node, "oxsemi,sys-ctrl", 0);
-        if (!sysctrl) {
-                dev_err(&pdev->dev, "failed to get sys-ctrl node\n");
-                return -EINVAL;
-        }
-
         ret = stmmac_get_platform_resources(pdev, &stmmac_res);
         if (ret)
                 return ret;
@@ -128,72 +129,48 @@ static int oxnas_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         dwmac->dev = &pdev->dev;
         plat_dat->bsp_priv = dwmac;
+        plat_dat->init = oxnas_dwmac_init;
+        plat_dat->exit = oxnas_dwmac_exit;
 
-        dwmac->regmap = syscon_node_to_regmap(sysctrl);
+        dwmac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+                                                        "oxsemi,sys-ctrl");
         if (IS_ERR(dwmac->regmap)) {
                 dev_err(&pdev->dev, "failed to have sysctrl regmap\n");
-                return PTR_ERR(dwmac->regmap);
+                ret = PTR_ERR(dwmac->regmap);
+                goto err_remove_config_dt;
         }
 
         dwmac->clk = devm_clk_get(&pdev->dev, "gmac");
-        if (IS_ERR(dwmac->clk))
-                return PTR_ERR(dwmac->clk);
+        if (IS_ERR(dwmac->clk)) {
+                ret = PTR_ERR(dwmac->clk);
+                goto err_remove_config_dt;
+        }
 
-        ret = oxnas_dwmac_init(dwmac);
+        ret = oxnas_dwmac_init(pdev, plat_dat->bsp_priv);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
 
         ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
         if (ret)
-                clk_disable_unprepare(dwmac->clk);
+                goto err_dwmac_exit;
 
-        return ret;
-}
 
-static int oxnas_dwmac_remove(struct platform_device *pdev)
-{
-        struct oxnas_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);
-        int ret = stmmac_dvr_remove(&pdev->dev);
-
-        clk_disable_unprepare(dwmac->clk);
-
-        return ret;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int oxnas_dwmac_suspend(struct device *dev)
-{
-        struct oxnas_dwmac *dwmac = get_stmmac_bsp_priv(dev);
-        int ret;
-
-        ret = stmmac_suspend(dev);
-        clk_disable_unprepare(dwmac->clk);
-
-        return ret;
-}
-
-static int oxnas_dwmac_resume(struct device *dev)
-{
-        struct oxnas_dwmac *dwmac = get_stmmac_bsp_priv(dev);
-        int ret;
-
-        ret = oxnas_dwmac_init(dwmac);
-        if (ret)
-                return ret;
+        return 0;
 
-        ret = stmmac_resume(dev);
+err_dwmac_exit:
+        oxnas_dwmac_exit(pdev, plat_dat->bsp_priv);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
         return ret;
 }
-#endif /* CONFIG_PM_SLEEP */
-
-static SIMPLE_DEV_PM_OPS(oxnas_dwmac_pm_ops,
-        oxnas_dwmac_suspend, oxnas_dwmac_resume);
 
 static const struct of_device_id oxnas_dwmac_match[] = {
         { .compatible = "oxsemi,ox820-dwmac" },
@@ -203,10 +180,10 @@ MODULE_DEVICE_TABLE(of, oxnas_dwmac_match);
 
 static struct platform_driver oxnas_dwmac_driver = {
         .probe  = oxnas_dwmac_probe,
-        .remove = oxnas_dwmac_remove,
+        .remove = stmmac_pltfr_remove,
         .driver = {
                 .name           = "oxnas-dwmac",
-                .pm             = &oxnas_dwmac_pm_ops,
+                .pm             = &stmmac_pltfr_pm_ops,
                 .of_match_table = oxnas_dwmac_match,
         },
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index bb40382e205d..39eb7a65bb9f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3339,13 +3339,6 @@ int stmmac_dvr_probe(struct device *device,
 
         spin_lock_init(&priv->lock);
 
-        ret = register_netdev(ndev);
-        if (ret) {
-                netdev_err(priv->dev, "%s: ERROR %i registering the device\n",
-                           __func__, ret);
-                goto error_netdev_register;
-        }
-
         /* If a specific clk_csr value is passed from the platform
          * this means that the CSR Clock Range selection cannot be
          * changed at run-time and it is fixed. Viceversa the driver'll try to
@@ -3372,11 +3365,21 @@ int stmmac_dvr_probe(struct device *device,
                 }
         }
 
-        return 0;
+        ret = register_netdev(ndev);
+        if (ret) {
+                netdev_err(priv->dev, "%s: ERROR %i registering the device\n",
+                           __func__, ret);
+                goto error_netdev_register;
+        }
+
+        return ret;
 
-error_mdio_register:
-        unregister_netdev(ndev);
 error_netdev_register:
+        if (priv->hw->pcs != STMMAC_PCS_RGMII &&
+            priv->hw->pcs != STMMAC_PCS_TBI &&
+            priv->hw->pcs != STMMAC_PCS_RTBI)
+                stmmac_mdio_unregister(ndev);
+error_mdio_register:
         netif_napi_del(&priv->napi);
 error_hw_init:
         clk_disable_unprepare(priv->pclk);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index fda01f770eff..b0344c213752 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -116,7 +116,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
         unsigned int mii_address = priv->hw->mii.addr;
         unsigned int mii_data = priv->hw->mii.data;
 
-        u32 value = MII_WRITE | MII_BUSY;
+        u32 value = MII_BUSY;
 
         value |= (phyaddr << priv->hw->mii.addr_shift)
                 & priv->hw->mii.addr_mask;
@@ -126,6 +126,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
                 & priv->hw->mii.clk_csr_mask;
         if (priv->plat->has_gmac4)
                 value |= MII_GMAC4_WRITE;
+        else
+                value |= MII_WRITE;
 
         /* Wait until any existing MII operation is complete */
         if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address))
diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index 031093e1c25f..dbfbb33ac66c 100644
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -99,6 +99,11 @@ struct ipvl_port {
         int                     count;
 };
 
+struct ipvl_skb_cb {
+        bool tx_pkt;
+};
+#define IPVL_SKB_CB(_skb) ((struct ipvl_skb_cb *)&((_skb)->cb[0]))
+
 static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
 {
         return rcu_dereference(d->rx_handler_data);
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index b4e990743e1d..83ce74acf82d 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -198,7 +198,7 @@ void ipvlan_process_multicast(struct work_struct *work)
         unsigned int mac_hash;
         int ret;
         u8 pkt_type;
-        bool hlocal, dlocal;
+        bool tx_pkt;
 
         __skb_queue_head_init(&list);
 
@@ -207,8 +207,11 @@ void ipvlan_process_multicast(struct work_struct *work)
         spin_unlock_bh(&port->backlog.lock);
 
         while ((skb = __skb_dequeue(&list)) != NULL) {
+                struct net_device *dev = skb->dev;
+                bool consumed = false;
+
                 ethh = eth_hdr(skb);
-                hlocal = ether_addr_equal(ethh->h_source, port->dev->dev_addr);
+                tx_pkt = IPVL_SKB_CB(skb)->tx_pkt;
                 mac_hash = ipvlan_mac_hash(ethh->h_dest);
 
                 if (ether_addr_equal(ethh->h_dest, port->dev->broadcast))
@@ -216,41 +219,45 @@ void ipvlan_process_multicast(struct work_struct *work)
                 else
                         pkt_type = PACKET_MULTICAST;
 
-                dlocal = false;
                 rcu_read_lock();
                 list_for_each_entry_rcu(ipvlan, &port->ipvlans, pnode) {
-                        if (hlocal && (ipvlan->dev == skb->dev)) {
-                                dlocal = true;
+                        if (tx_pkt && (ipvlan->dev == skb->dev))
                                 continue;
-                        }
                         if (!test_bit(mac_hash, ipvlan->mac_filters))
                                 continue;
-
+                        if (!(ipvlan->dev->flags & IFF_UP))
+                                continue;
                         ret = NET_RX_DROP;
                         len = skb->len + ETH_HLEN;
                         nskb = skb_clone(skb, GFP_ATOMIC);
-                        if (!nskb)
-                                goto acct;
-
-                        nskb->pkt_type = pkt_type;
-                        nskb->dev = ipvlan->dev;
-                        if (hlocal)
-                                ret = dev_forward_skb(ipvlan->dev, nskb);
-                        else
-                                ret = netif_rx(nskb);
-acct:
+                        local_bh_disable();
+                        if (nskb) {
+                                consumed = true;
+                                nskb->pkt_type = pkt_type;
+                                nskb->dev = ipvlan->dev;
+                                if (tx_pkt)
+                                        ret = dev_forward_skb(ipvlan->dev, nskb);
+                                else
+                                        ret = netif_rx(nskb);
+                        }
                         ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
+                        local_bh_enable();
                 }
                 rcu_read_unlock();
 
-                if (dlocal) {
+                if (tx_pkt) {
                         /* If the packet originated here, send it out. */
                         skb->dev = port->dev;
                         skb->pkt_type = pkt_type;
                         dev_queue_xmit(skb);
                 } else {
-                        kfree_skb(skb);
+                        if (consumed)
+                                consume_skb(skb);
+                        else
+                                kfree_skb(skb);
                 }
+                if (dev)
+                        dev_put(dev);
         }
 }
 
@@ -470,15 +477,24 @@ out:
 }
 
 static void ipvlan_multicast_enqueue(struct ipvl_port *port,
-                                     struct sk_buff *skb)
+                                     struct sk_buff *skb, bool tx_pkt)
 {
         if (skb->protocol == htons(ETH_P_PAUSE)) {
                 kfree_skb(skb);
                 return;
         }
 
+        /* Record that the deferred packet is from TX or RX path. By
+         * looking at mac-addresses on packet will lead to erronus decisions.
+         * (This would be true for a loopback-mode on master device or a
+         * hair-pin mode of the switch.)
+         */
+        IPVL_SKB_CB(skb)->tx_pkt = tx_pkt;
+
         spin_lock(&port->backlog.lock);
         if (skb_queue_len(&port->backlog) < IPVLAN_QBACKLOG_LIMIT) {
+                if (skb->dev)
+                        dev_hold(skb->dev);
                 __skb_queue_tail(&port->backlog, skb);
                 spin_unlock(&port->backlog.lock);
                 schedule_work(&port->wq);
@@ -537,7 +553,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
 
         } else if (is_multicast_ether_addr(eth->h_dest)) {
                 ipvlan_skb_crossing_ns(skb, NULL);
-                ipvlan_multicast_enqueue(ipvlan->port, skb);
+                ipvlan_multicast_enqueue(ipvlan->port, skb, true);
                 return NET_XMIT_SUCCESS;
         }
 
@@ -634,7 +650,7 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb,
                          */
                         if (nskb) {
                                 ipvlan_skb_crossing_ns(nskb, NULL);
-                                ipvlan_multicast_enqueue(port, nskb);
+                                ipvlan_multicast_enqueue(port, nskb, false);
                         }
                 }
         } else {
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 693ec5b66222..8b0f99300cbc 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -135,6 +135,7 @@ err:
 static void ipvlan_port_destroy(struct net_device *dev)
 {
         struct ipvl_port *port = ipvlan_port_get_rtnl(dev);
+        struct sk_buff *skb;
 
         dev->priv_flags &= ~IFF_IPVLAN_MASTER;
         if (port->mode == IPVLAN_MODE_L3S) {
@@ -144,7 +145,11 @@ static void ipvlan_port_destroy(struct net_device *dev)
         }
         netdev_rx_handler_unregister(dev);
         cancel_work_sync(&port->wq);
-        __skb_queue_purge(&port->backlog);
+        while ((skb = __skb_dequeue(&port->backlog)) != NULL) {
+                if (skb->dev)
+                        dev_put(skb->dev);
+                kfree_skb(skb);
+        }
         kfree(port);
 }
 
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 6c646e228833..6e98ede997d3 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -1367,6 +1367,7 @@ static struct usb_driver asix_driver = {
         .probe =        usbnet_probe,
         .suspend =      asix_suspend,
         .resume =       asix_resume,
+        .reset_resume = asix_resume,
         .disconnect =   usbnet_disconnect,
         .supports_autosuspend = 1,
         .disable_hub_initiated_lpm = 1,
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 7532646c3b7b..23dfb0eac098 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -967,6 +967,7 @@ static struct sk_buff *vrf_ip6_rcv(struct net_device *vrf_dev,
          */
         need_strict = rt6_need_strict(&ipv6_hdr(skb)->daddr);
         if (!ipv6_ndisc_frame(skb) && !need_strict) {
+                vrf_rx_stats(vrf_dev, skb->len);
                 skb->dev = vrf_dev;
                 skb->skb_iif = vrf_dev->ifindex;
 
@@ -1011,6 +1012,8 @@ static struct sk_buff *vrf_ip_rcv(struct net_device *vrf_dev,
                 goto out;
         }
 
+        vrf_rx_stats(vrf_dev, skb->len);
+
         skb_push(skb, skb->mac_len);
         dev_queue_xmit_nit(skb, vrf_dev);
         skb_pull(skb, skb->mac_len);
diff --git a/drivers/net/wan/slic_ds26522.c b/drivers/net/wan/slic_ds26522.c
index b776a0ab106c..9d9b4e0def2a 100644
--- a/drivers/net/wan/slic_ds26522.c
+++ b/drivers/net/wan/slic_ds26522.c
@@ -218,7 +218,7 @@ static int slic_ds26522_probe(struct spi_device *spi)
 
         ret = slic_ds26522_init_configure(spi);
         if (ret == 0)
-                pr_info("DS26522 cs%d configurated\n", spi->chip_select);
+                pr_info("DS26522 cs%d configured\n", spi->chip_select);
 
         return ret;
 }
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b40cfb076f02..2fc86dc7a8df 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1193,8 +1193,8 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
                 blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
                 blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
         }
-        if (ctrl->stripe_size)
-                blk_queue_chunk_sectors(q, ctrl->stripe_size >> 9);
+        if (ctrl->quirks & NVME_QUIRK_STRIPE_SIZE)
+                blk_queue_chunk_sectors(q, ctrl->max_hw_sectors);
         blk_queue_virt_boundary(q, ctrl->page_size - 1);
         if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)
                 vwc = true;
@@ -1250,19 +1250,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
         ctrl->max_hw_sectors =
                 min_not_zero(ctrl->max_hw_sectors, max_hw_sectors);
 
-        if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) && id->vs[3]) {
-                unsigned int max_hw_sectors;
-
-                ctrl->stripe_size = 1 << (id->vs[3] + page_shift);
-                max_hw_sectors = ctrl->stripe_size >> (page_shift - 9);
-                if (ctrl->max_hw_sectors) {
-                        ctrl->max_hw_sectors = min(max_hw_sectors,
-                                                        ctrl->max_hw_sectors);
-                } else {
-                        ctrl->max_hw_sectors = max_hw_sectors;
-                }
-        }
-
         nvme_set_queue_limits(ctrl, ctrl->admin_q);
         ctrl->sgls = le32_to_cpu(id->sgls);
         ctrl->kas = le16_to_cpu(id->kas);
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 771e2e761872..aa0bc60810a7 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1491,19 +1491,20 @@ static int
 nvme_fc_create_hw_io_queues(struct nvme_fc_ctrl *ctrl, u16 qsize)
 {
         struct nvme_fc_queue *queue = &ctrl->queues[1];
-        int i, j, ret;
+        int i, ret;
 
         for (i = 1; i < ctrl->queue_count; i++, queue++) {
                 ret = __nvme_fc_create_hw_queue(ctrl, queue, i, qsize);
-                if (ret) {
-                        for (j = i-1; j >= 0; j--)
-                                __nvme_fc_delete_hw_queue(ctrl,
-                                                &ctrl->queues[j], j);
-                        return ret;
-                }
+                if (ret)
+                        goto delete_queues;
         }
 
         return 0;
+
+delete_queues:
+        for (; i >= 0; i--)
+                __nvme_fc_delete_hw_queue(ctrl, &ctrl->queues[i], i);
+        return ret;
 }
 
 static int
@@ -2401,8 +2402,8 @@ __nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
         WARN_ON_ONCE(!changed);
 
         dev_info(ctrl->ctrl.device,
-                "NVME-FC{%d}: new ctrl: NQN \"%s\" (%p)\n",
-                ctrl->cnum, ctrl->ctrl.opts->subsysnqn, &ctrl);
+                "NVME-FC{%d}: new ctrl: NQN \"%s\"\n",
+                ctrl->cnum, ctrl->ctrl.opts->subsysnqn);
 
         kref_get(&ctrl->ctrl.kref);
 
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index bd5321441d12..6377e14586dc 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -135,7 +135,6 @@ struct nvme_ctrl {
 
         u32 page_size;
         u32 max_hw_sectors;
-        u32 stripe_size;
         u16 oncs;
         u16 vid;
         atomic_t abort_limit;
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 3d21a154dce7..19beeb7b2ac2 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -712,15 +712,8 @@ static void __nvme_process_cq(struct nvme_queue *nvmeq, unsigned int *tag)
                 req = blk_mq_tag_to_rq(*nvmeq->tags, cqe.command_id);
                 nvme_req(req)->result = cqe.result;
                 blk_mq_complete_request(req, le16_to_cpu(cqe.status) >> 1);
-
         }
 
-        /* If the controller ignores the cq head doorbell and continuously
-         * writes to the queue, it is theoretically possible to wrap around
-         * the queue twice and mistakenly return IRQ_NONE.  Linux only
-         * requires that 0.1% of your interrupts are handled, so this isn't
-         * a big problem.
-         */
         if (head == nvmeq->cq_head && phase == nvmeq->cq_phase)
                 return;
 
@@ -1909,10 +1902,10 @@ static int nvme_dev_map(struct nvme_dev *dev)
         if (!dev->bar)
                 goto release;
 
-       return 0;
+        return 0;
   release:
-       pci_release_mem_regions(pdev);
-       return -ENODEV;
+        pci_release_mem_regions(pdev);
+        return -ENODEV;
 }
 
 static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c
index b71e95044b43..a5c09e703bd8 100644
--- a/drivers/nvme/host/scsi.c
+++ b/drivers/nvme/host/scsi.c
@@ -2160,30 +2160,6 @@ static int nvme_trans_synchronize_cache(struct nvme_ns *ns,
         return nvme_trans_status_code(hdr, nvme_sc);
 }
 
-static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,
-                                                        u8 *cmd)
-{
-        u8 immed, no_flush;
-
-        immed = cmd[1] & 0x01;
-        no_flush = cmd[4] & 0x04;
-
-        if (immed != 0) {
-                return nvme_trans_completion(hdr, SAM_STAT_CHECK_CONDITION,
-                                        ILLEGAL_REQUEST, SCSI_ASC_INVALID_CDB,
-                                        SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
-        } else {
-                if (no_flush == 0) {
-                        /* Issue NVME FLUSH command prior to START STOP UNIT */
-                        int res = nvme_trans_synchronize_cache(ns, hdr);
-                        if (res)
-                                return res;
-                }
-
-                return 0;
-        }
-}
-
 static int nvme_trans_format_unit(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                                                         u8 *cmd)
 {
@@ -2439,9 +2415,6 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr)
         case SECURITY_PROTOCOL_OUT:
                 retcode = nvme_trans_security_protocol(ns, hdr, cmd);
                 break;
-        case START_STOP:
-                retcode = nvme_trans_start_stop(ns, hdr, cmd);
-                break;
         case SYNCHRONIZE_CACHE:
                 retcode = nvme_trans_synchronize_cache(ns, hdr);
                 break;
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index ec1ad2aa0a4c..95ae52390478 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -382,7 +382,6 @@ static void nvmet_execute_set_features(struct nvmet_req *req)
 {
         struct nvmet_subsys *subsys = req->sq->ctrl->subsys;
         u32 cdw10 = le32_to_cpu(req->cmd->common.cdw10[0]);
-        u64 val;
         u32 val32;
         u16 status = 0;
 
@@ -392,8 +391,7 @@ static void nvmet_execute_set_features(struct nvmet_req *req)
                         (subsys->max_qid - 1) | ((subsys->max_qid - 1) << 16));
                 break;
         case NVME_FEAT_KATO:
-                val = le64_to_cpu(req->cmd->prop_set.value);
-                val32 = val & 0xffff;
+                val32 = le32_to_cpu(req->cmd->common.cdw10[1]);
                 req->sq->ctrl->kato = DIV_ROUND_UP(val32, 1000);
                 nvmet_set_result(req, req->sq->ctrl->kato);
                 break;
diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
index bcb8ebeb01c5..4e8e6a22bce1 100644
--- a/drivers/nvme/target/fcloop.c
+++ b/drivers/nvme/target/fcloop.c
@@ -845,7 +845,7 @@ fcloop_create_remote_port(struct device *dev, struct device_attribute *attr,
         rport->lport = nport->lport;
         nport->rport = rport;
 
-        return ret ? ret : count;
+        return count;
 }
 
 
@@ -952,7 +952,7 @@ fcloop_create_target_port(struct device *dev, struct device_attribute *attr,
         tport->lport = nport->lport;
         nport->tport = tport;
 
-        return ret ? ret : count;
+        return count;
 }
 
 
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 965911d9b36a..398ea7f54826 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -981,8 +981,8 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
  * @cell: nvmem cell to be read.
  * @len: pointer to length of cell which will be populated on successful read.
  *
- * Return: ERR_PTR() on error or a valid pointer to a char * buffer on success.
- * The buffer should be freed by the consumer with a kfree().
+ * Return: ERR_PTR() on error or a valid pointer to a buffer on success. The
+ * buffer should be freed by the consumer with a kfree().
  */
 void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
 {
diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index ac27b9bac3b9..8e7b120696fa 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -71,7 +71,7 @@ static struct nvmem_config imx_ocotp_nvmem_config = {
 
 static const struct of_device_id imx_ocotp_dt_ids[] = {
         { .compatible = "fsl,imx6q-ocotp",  (void *)128 },
-        { .compatible = "fsl,imx6sl-ocotp", (void *)32 },
+        { .compatible = "fsl,imx6sl-ocotp", (void *)64 },
         { .compatible = "fsl,imx6sx-ocotp", (void *)128 },
         { },
 };
diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index b5305f08b184..2bdb6c389328 100644
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -21,11 +21,11 @@ static int qfprom_reg_read(void *context,
                         unsigned int reg, void *_val, size_t bytes)
 {
         void __iomem *base = context;
-        u32 *val = _val;
-        int i = 0, words = bytes / 4;
+        u8 *val = _val;
+        int i = 0, words = bytes;
 
         while (words--)
-                *val++ = readl(base + reg + (i++ * 4));
+                *val++ = readb(base + reg + i++);
 
         return 0;
 }
@@ -34,11 +34,11 @@ static int qfprom_reg_write(void *context,
                          unsigned int reg, void *_val, size_t bytes)
 {
         void __iomem *base = context;
-        u32 *val = _val;
-        int i = 0, words = bytes / 4;
+        u8 *val = _val;
+        int i = 0, words = bytes;
 
         while (words--)
-                writel(*val++, base + reg + (i++ * 4));
+                writeb(*val++, base + reg + i++);
 
         return 0;
 }
@@ -53,7 +53,7 @@ static int qfprom_remove(struct platform_device *pdev)
 static struct nvmem_config econfig = {
         .name = "qfprom",
         .owner = THIS_MODULE,
-        .stride = 4,
+        .stride = 1,
         .word_size = 1,
         .reg_read = qfprom_reg_read,
         .reg_write = qfprom_reg_write,
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index a579126832af..620c231a2889 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -212,7 +212,7 @@ static int meson_pmx_request_gpio(struct pinctrl_dev *pcdev,
 {
         struct meson_pinctrl *pc = pinctrl_dev_get_drvdata(pcdev);
 
-        meson_pmx_disable_other_groups(pc, range->pin_base + offset, -1);
+        meson_pmx_disable_other_groups(pc, offset, -1);
 
         return 0;
 }
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index aea310a91821..c9a146948192 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -382,26 +382,21 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 {
         int ret = 0;
         u32 pin_reg;
-        unsigned long flags;
-        bool level_trig;
-        u32 active_level;
+        unsigned long flags, irq_flags;
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
         struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
 
         spin_lock_irqsave(&gpio_dev->lock, flags);
         pin_reg = readl(gpio_dev->base + (d->hwirq)*4);
 
-        /*
-         * When level_trig is set EDGE and active_level is set HIGH in BIOS
-         * default settings, ignore incoming settings from client and use
-         * BIOS settings to configure GPIO register.
+        /* Ignore the settings coming from the client and
+         * read the values from the ACPI tables
+         * while setting the trigger type
          */
-        level_trig = !(pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF));
-        active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF);
 
-        if(level_trig &&
-           ((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH))
-                type = IRQ_TYPE_EDGE_FALLING;
+        irq_flags = irq_get_trigger_type(d->irq);
+        if (irq_flags != IRQ_TYPE_NONE)
+                type = irq_flags;
 
         switch (type & IRQ_TYPE_SENSE_MASK) {
         case IRQ_TYPE_EDGE_RISING:
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index 12f7d1eb65bc..07409fde02b2 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.c
@@ -56,6 +56,17 @@ static const struct samsung_pin_bank_type bank_type_alive = {
         .reg_offset = { 0x00, 0x04, 0x08, 0x0c, },
 };
 
+/* Exynos5433 has the 4bit widths for PINCFG_TYPE_DRV bitfields. */
+static const struct samsung_pin_bank_type exynos5433_bank_type_off = {
+        .fld_width = { 4, 1, 2, 4, 2, 2, },
+        .reg_offset = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, },
+};
+
+static const struct samsung_pin_bank_type exynos5433_bank_type_alive = {
+        .fld_width = { 4, 1, 2, 4, },
+        .reg_offset = { 0x00, 0x04, 0x08, 0x0c, },
+};
+
 static void exynos_irq_mask(struct irq_data *irqd)
 {
         struct irq_chip *chip = irq_data_get_irq_chip(irqd);
@@ -1335,82 +1346,82 @@ const struct samsung_pin_ctrl exynos5420_pin_ctrl[] __initconst = {
 
 /* pin banks of exynos5433 pin-controller - ALIVE */
 static const struct samsung_pin_bank_data exynos5433_pin_banks0[] = {
-        EXYNOS_PIN_BANK_EINTW(8, 0x000, "gpa0", 0x00),
-        EXYNOS_PIN_BANK_EINTW(8, 0x020, "gpa1", 0x04),
-        EXYNOS_PIN_BANK_EINTW(8, 0x040, "gpa2", 0x08),
-        EXYNOS_PIN_BANK_EINTW(8, 0x060, "gpa3", 0x0c),
-        EXYNOS_PIN_BANK_EINTW_EXT(8, 0x020, "gpf1", 0x1004, 1),
-        EXYNOS_PIN_BANK_EINTW_EXT(4, 0x040, "gpf2", 0x1008, 1),
-        EXYNOS_PIN_BANK_EINTW_EXT(4, 0x060, "gpf3", 0x100c, 1),
-        EXYNOS_PIN_BANK_EINTW_EXT(8, 0x080, "gpf4", 0x1010, 1),
-        EXYNOS_PIN_BANK_EINTW_EXT(8, 0x0a0, "gpf5", 0x1014, 1),
+        EXYNOS5433_PIN_BANK_EINTW(8, 0x000, "gpa0", 0x00),
+        EXYNOS5433_PIN_BANK_EINTW(8, 0x020, "gpa1", 0x04),
+        EXYNOS5433_PIN_BANK_EINTW(8, 0x040, "gpa2", 0x08),
+        EXYNOS5433_PIN_BANK_EINTW(8, 0x060, "gpa3", 0x0c),
+        EXYNOS5433_PIN_BANK_EINTW_EXT(8, 0x020, "gpf1", 0x1004, 1),
+        EXYNOS5433_PIN_BANK_EINTW_EXT(4, 0x040, "gpf2", 0x1008, 1),
+        EXYNOS5433_PIN_BANK_EINTW_EXT(4, 0x060, "gpf3", 0x100c, 1),
+        EXYNOS5433_PIN_BANK_EINTW_EXT(8, 0x080, "gpf4", 0x1010, 1),
+        EXYNOS5433_PIN_BANK_EINTW_EXT(8, 0x0a0, "gpf5", 0x1014, 1),
 };
 
 /* pin banks of exynos5433 pin-controller - AUD */
 static const struct samsung_pin_bank_data exynos5433_pin_banks1[] = {
-        EXYNOS_PIN_BANK_EINTG(7, 0x000, "gpz0", 0x00),
-        EXYNOS_PIN_BANK_EINTG(4, 0x020, "gpz1", 0x04),
+        EXYNOS5433_PIN_BANK_EINTG(7, 0x000, "gpz0", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(4, 0x020, "gpz1", 0x04),
 };
 
 /* pin banks of exynos5433 pin-controller - CPIF */
 static const struct samsung_pin_bank_data exynos5433_pin_banks2[] = {
-        EXYNOS_PIN_BANK_EINTG(2, 0x000, "gpv6", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x000, "gpv6", 0x00),
 };
 
 /* pin banks of exynos5433 pin-controller - eSE */
 static const struct samsung_pin_bank_data exynos5433_pin_banks3[] = {
-        EXYNOS_PIN_BANK_EINTG(3, 0x000, "gpj2", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(3, 0x000, "gpj2", 0x00),
 };
 
 /* pin banks of exynos5433 pin-controller - FINGER */
 static const struct samsung_pin_bank_data exynos5433_pin_banks4[] = {
-        EXYNOS_PIN_BANK_EINTG(4, 0x000, "gpd5", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(4, 0x000, "gpd5", 0x00),
 };
 
 /* pin banks of exynos5433 pin-controller - FSYS */
 static const struct samsung_pin_bank_data exynos5433_pin_banks5[] = {
-        EXYNOS_PIN_BANK_EINTG(6, 0x000, "gph1", 0x00),
-        EXYNOS_PIN_BANK_EINTG(7, 0x020, "gpr4", 0x04),
-        EXYNOS_PIN_BANK_EINTG(5, 0x040, "gpr0", 0x08),
-        EXYNOS_PIN_BANK_EINTG(8, 0x060, "gpr1", 0x0c),
-        EXYNOS_PIN_BANK_EINTG(2, 0x080, "gpr2", 0x10),
-        EXYNOS_PIN_BANK_EINTG(8, 0x0a0, "gpr3", 0x14),
+        EXYNOS5433_PIN_BANK_EINTG(6, 0x000, "gph1", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(7, 0x020, "gpr4", 0x04),
+        EXYNOS5433_PIN_BANK_EINTG(5, 0x040, "gpr0", 0x08),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x060, "gpr1", 0x0c),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x080, "gpr2", 0x10),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x0a0, "gpr3", 0x14),
 };
 
 /* pin banks of exynos5433 pin-controller - IMEM */
 static const struct samsung_pin_bank_data exynos5433_pin_banks6[] = {
-        EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpf0", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x000, "gpf0", 0x00),
 };
 
 /* pin banks of exynos5433 pin-controller - NFC */
 static const struct samsung_pin_bank_data exynos5433_pin_banks7[] = {
-        EXYNOS_PIN_BANK_EINTG(3, 0x000, "gpj0", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(3, 0x000, "gpj0", 0x00),
 };
 
 /* pin banks of exynos5433 pin-controller - PERIC */
 static const struct samsung_pin_bank_data exynos5433_pin_banks8[] = {
-        EXYNOS_PIN_BANK_EINTG(6, 0x000, "gpv7", 0x00),
-        EXYNOS_PIN_BANK_EINTG(5, 0x020, "gpb0", 0x04),
-        EXYNOS_PIN_BANK_EINTG(8, 0x040, "gpc0", 0x08),
-        EXYNOS_PIN_BANK_EINTG(2, 0x060, "gpc1", 0x0c),
-        EXYNOS_PIN_BANK_EINTG(6, 0x080, "gpc2", 0x10),
-        EXYNOS_PIN_BANK_EINTG(8, 0x0a0, "gpc3", 0x14),
-        EXYNOS_PIN_BANK_EINTG(2, 0x0c0, "gpg0", 0x18),
-        EXYNOS_PIN_BANK_EINTG(4, 0x0e0, "gpd0", 0x1c),
-        EXYNOS_PIN_BANK_EINTG(6, 0x100, "gpd1", 0x20),
-        EXYNOS_PIN_BANK_EINTG(8, 0x120, "gpd2", 0x24),
-        EXYNOS_PIN_BANK_EINTG(5, 0x140, "gpd4", 0x28),
-        EXYNOS_PIN_BANK_EINTG(2, 0x160, "gpd8", 0x2c),
-        EXYNOS_PIN_BANK_EINTG(7, 0x180, "gpd6", 0x30),
-        EXYNOS_PIN_BANK_EINTG(3, 0x1a0, "gpd7", 0x34),
-        EXYNOS_PIN_BANK_EINTG(5, 0x1c0, "gpg1", 0x38),
-        EXYNOS_PIN_BANK_EINTG(2, 0x1e0, "gpg2", 0x3c),
-        EXYNOS_PIN_BANK_EINTG(8, 0x200, "gpg3", 0x40),
+        EXYNOS5433_PIN_BANK_EINTG(6, 0x000, "gpv7", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(5, 0x020, "gpb0", 0x04),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x040, "gpc0", 0x08),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x060, "gpc1", 0x0c),
+        EXYNOS5433_PIN_BANK_EINTG(6, 0x080, "gpc2", 0x10),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x0a0, "gpc3", 0x14),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x0c0, "gpg0", 0x18),
+        EXYNOS5433_PIN_BANK_EINTG(4, 0x0e0, "gpd0", 0x1c),
+        EXYNOS5433_PIN_BANK_EINTG(6, 0x100, "gpd1", 0x20),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x120, "gpd2", 0x24),
+        EXYNOS5433_PIN_BANK_EINTG(5, 0x140, "gpd4", 0x28),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x160, "gpd8", 0x2c),
+        EXYNOS5433_PIN_BANK_EINTG(7, 0x180, "gpd6", 0x30),
+        EXYNOS5433_PIN_BANK_EINTG(3, 0x1a0, "gpd7", 0x34),
+        EXYNOS5433_PIN_BANK_EINTG(5, 0x1c0, "gpg1", 0x38),
+        EXYNOS5433_PIN_BANK_EINTG(2, 0x1e0, "gpg2", 0x3c),
+        EXYNOS5433_PIN_BANK_EINTG(8, 0x200, "gpg3", 0x40),
 };
 
 /* pin banks of exynos5433 pin-controller - TOUCH */
 static const struct samsung_pin_bank_data exynos5433_pin_banks9[] = {
-        EXYNOS_PIN_BANK_EINTG(3, 0x000, "gpj1", 0x00),
+        EXYNOS5433_PIN_BANK_EINTG(3, 0x000, "gpj1", 0x00),
 };
 
 /*
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.h b/drivers/pinctrl/samsung/pinctrl-exynos.h
index 5821525a2c84..a473092fb8d2 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.h
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.h
@@ -90,6 +90,37 @@
                 .pctl_res_idx   = pctl_idx,             \
         }                                               \
 
+#define EXYNOS5433_PIN_BANK_EINTG(pins, reg, id, offs)          \
+        {                                                       \
+                .type           = &exynos5433_bank_type_off,    \
+                .pctl_offset    = reg,                          \
+                .nr_pins        = pins,                         \
+                .eint_type      = EINT_TYPE_GPIO,               \
+                .eint_offset    = offs,                         \
+                .name           = id                            \
+        }
+
+#define EXYNOS5433_PIN_BANK_EINTW(pins, reg, id, offs)          \
+        {                                                       \
+                .type           = &exynos5433_bank_type_alive,  \
+                .pctl_offset    = reg,                          \
+                .nr_pins        = pins,                         \
+                .eint_type      = EINT_TYPE_WKUP,               \
+                .eint_offset    = offs,                         \
+                .name           = id                            \
+        }
+
+#define EXYNOS5433_PIN_BANK_EINTW_EXT(pins, reg, id, offs, pctl_idx) \
+        {                                                       \
+                .type           = &exynos5433_bank_type_alive,  \
+                .pctl_offset    = reg,                          \
+                .nr_pins        = pins,                         \
+                .eint_type      = EINT_TYPE_WKUP,               \
+                .eint_offset    = offs,                         \
+                .name           = id,                           \
+                .pctl_res_idx   = pctl_idx,                     \
+        }                                                       \
+
 /**
  * struct exynos_weint_data: irq specific data for all the wakeup interrupts
  * generated by the external wakeup interrupt controller.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5fe8be089b8b..59aa8e302bc3 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1034,7 +1034,7 @@ config SURFACE_PRO3_BUTTON
 
 config SURFACE_3_BUTTON
         tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
-        depends on ACPI && KEYBOARD_GPIO
+        depends on ACPI && KEYBOARD_GPIO && I2C
         ---help---
           This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
 
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 61f39abf5dc8..82d67715ce76 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -177,43 +177,43 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event);
 
 #if IS_ENABLED(CONFIG_LEDS_CLASS)
 static enum led_brightness logolamp_get(struct led_classdev *cdev);
-static void logolamp_set(struct led_classdev *cdev,
+static int logolamp_set(struct led_classdev *cdev,
                                enum led_brightness brightness);
 
 static struct led_classdev logolamp_led = {
  .name = "fujitsu::logolamp",
  .brightness_get = logolamp_get,
- .brightness_set = logolamp_set
+ .brightness_set_blocking = logolamp_set
 };
 
 static enum led_brightness kblamps_get(struct led_classdev *cdev);
-static void kblamps_set(struct led_classdev *cdev,
+static int kblamps_set(struct led_classdev *cdev,
                                enum led_brightness brightness);
 
 static struct led_classdev kblamps_led = {
  .name = "fujitsu::kblamps",
  .brightness_get = kblamps_get,
- .brightness_set = kblamps_set
+ .brightness_set_blocking = kblamps_set
 };
 
 static enum led_brightness radio_led_get(struct led_classdev *cdev);
-static void radio_led_set(struct led_classdev *cdev,
+static int radio_led_set(struct led_classdev *cdev,
                                enum led_brightness brightness);
 
 static struct led_classdev radio_led = {
  .name = "fujitsu::radio_led",
  .brightness_get = radio_led_get,
- .brightness_set = radio_led_set
+ .brightness_set_blocking = radio_led_set
 };
 
 static enum led_brightness eco_led_get(struct led_classdev *cdev);
-static void eco_led_set(struct led_classdev *cdev,
+static int eco_led_set(struct led_classdev *cdev,
                                enum led_brightness brightness);
 
 static struct led_classdev eco_led = {
  .name = "fujitsu::eco_led",
  .brightness_get = eco_led_get,
- .brightness_set = eco_led_set
+ .brightness_set_blocking = eco_led_set
 };
 #endif
 
@@ -267,48 +267,48 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
 #if IS_ENABLED(CONFIG_LEDS_CLASS)
 /* LED class callbacks */
 
-static void logolamp_set(struct led_classdev *cdev,
+static int logolamp_set(struct led_classdev *cdev,
                                enum led_brightness brightness)
 {
         if (brightness >= LED_FULL) {
                 call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
-                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);
+                return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);
         } else if (brightness >= LED_HALF) {
                 call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
-                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);
+                return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);
         } else {
-                call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);
+                return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);
         }
 }
 
-static void kblamps_set(struct led_classdev *cdev,
+static int kblamps_set(struct led_classdev *cdev,
                                enum led_brightness brightness)
 {
         if (brightness >= LED_FULL)
-                call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_ON);
+                return call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_ON);
         else
-                call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_OFF);
+                return call_fext_func(FUNC_LEDS, 0x1, KEYBOARD_LAMPS, FUNC_LED_OFF);
 }
 
-static void radio_led_set(struct led_classdev *cdev,
+static int radio_led_set(struct led_classdev *cdev,
                                 enum led_brightness brightness)
 {
         if (brightness >= LED_FULL)
-                call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, RADIO_LED_ON);
+                return call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, RADIO_LED_ON);
         else
-                call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, 0x0);
+                return call_fext_func(FUNC_RFKILL, 0x5, RADIO_LED_ON, 0x0);
 }
 
-static void eco_led_set(struct led_classdev *cdev,
+static int eco_led_set(struct led_classdev *cdev,
                                 enum led_brightness brightness)
 {
         int curr;
 
         curr = call_fext_func(FUNC_LEDS, 0x2, ECO_LED, 0x0);
         if (brightness >= LED_FULL)
-                call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr | ECO_LED_ON);
+                return call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr | ECO_LED_ON);
         else
-                call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr & ~ECO_LED_ON);
+                return call_fext_func(FUNC_LEDS, 0x1, ECO_LED, curr & ~ECO_LED_ON);
 }
 
 static enum led_brightness logolamp_get(struct led_classdev *cdev)
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index 039374e9fdc0..95d77ec5c5d7 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -87,7 +87,7 @@ static int pmu_reset_deassert(struct reset_controller_dev *rc, unsigned long id)
         return 0;
 }
 
-static struct reset_control_ops pmu_reset_ops = {
+static const struct reset_control_ops pmu_reset_ops = {
         .reset = pmu_reset_reset,
         .assert = pmu_reset_assert,
         .deassert = pmu_reset_deassert,
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 8130dfe89745..4971aa54756a 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
                         /* Initialize the device private structure. */
                         struct octeon_ethernet *priv = netdev_priv(dev);
 
+                        SET_NETDEV_DEV(dev, &pdev->dev);
                         dev->netdev_ops = &cvm_oct_pow_netdev_ops;
                         priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
                         priv->port = CVMX_PIP_NUM_INPUT_PORTS;
@@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
                         }
 
                         /* Initialize the device private structure. */
+                        SET_NETDEV_DEV(dev, &pdev->dev);
                         priv = netdev_priv(dev);
                         priv->netdev = dev;
                         priv->of_node = cvm_oct_node_for_port(pip, interface,
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 0aa9e7d697a5..25dbd8c7aec7 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -239,6 +239,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
         if (ifp->desc.bNumEndpoints >= num_ep)
                 goto skip_to_next_endpoint_or_interface_descriptor;
 
+        /* Check for duplicate endpoint addresses */
+        for (i = 0; i < ifp->desc.bNumEndpoints; ++i) {
+                if (ifp->endpoint[i].desc.bEndpointAddress ==
+                    d->bEndpointAddress) {
+                        dev_warn(ddev, "config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n",
+                            cfgno, inum, asnum, d->bEndpointAddress);
+                        goto skip_to_next_endpoint_or_interface_descriptor;
+                }
+        }
+
         endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];
         ++ifp->desc.bNumEndpoints;
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 1fa5c0f29c64..a56c75e09786 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -103,8 +103,7 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
 
 static void hub_release(struct kref *kref);
 static int usb_reset_and_verify_device(struct usb_device *udev);
-static void hub_usb3_port_prepare_disable(struct usb_hub *hub,
-                                          struct usb_port *port_dev);
+static int hub_port_disable(struct usb_hub *hub, int port1, int set_state);
 
 static inline char *portspeed(struct usb_hub *hub, int portstatus)
 {
@@ -903,34 +902,6 @@ static int hub_set_port_link_state(struct usb_hub *hub, int port1,
 }
 
 /*
- * USB-3 does not have a similar link state as USB-2 that will avoid negotiating
- * a connection with a plugged-in cable but will signal the host when the cable
- * is unplugged. Disable remote wake and set link state to U3 for USB-3 devices
- */
-static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
-{
-        struct usb_port *port_dev = hub->ports[port1 - 1];
-        struct usb_device *hdev = hub->hdev;
-        int ret = 0;
-
-        if (!hub->error) {
-                if (hub_is_superspeed(hub->hdev)) {
-                        hub_usb3_port_prepare_disable(hub, port_dev);
-                        ret = hub_set_port_link_state(hub, port_dev->portnum,
-                                                      USB_SS_PORT_LS_U3);
-                } else {
-                        ret = usb_clear_port_feature(hdev, port1,
-                                        USB_PORT_FEAT_ENABLE);
-                }
-        }
-        if (port_dev->child && set_state)
-                usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);
-        if (ret && ret != -ENODEV)
-                dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret);
-        return ret;
-}
-
-/*
  * Disable a port and mark a logical connect-change event, so that some
  * time later hub_wq will disconnect() any existing usb_device on the port
  * and will re-enumerate if there actually is a device attached.
@@ -4162,6 +4133,34 @@ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
 
 #endif  /* CONFIG_PM */
 
+/*
+ * USB-3 does not have a similar link state as USB-2 that will avoid negotiating
+ * a connection with a plugged-in cable but will signal the host when the cable
+ * is unplugged. Disable remote wake and set link state to U3 for USB-3 devices
+ */
+static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
+{
+        struct usb_port *port_dev = hub->ports[port1 - 1];
+        struct usb_device *hdev = hub->hdev;
+        int ret = 0;
+
+        if (!hub->error) {
+                if (hub_is_superspeed(hub->hdev)) {
+                        hub_usb3_port_prepare_disable(hub, port_dev);
+                        ret = hub_set_port_link_state(hub, port_dev->portnum,
+                                                      USB_SS_PORT_LS_U3);
+                } else {
+                        ret = usb_clear_port_feature(hdev, port1,
+                                        USB_PORT_FEAT_ENABLE);
+                }
+        }
+        if (port_dev->child && set_state)
+                usb_set_device_state(port_dev->child, USB_STATE_NOTATTACHED);
+        if (ret && ret != -ENODEV)
+                dev_err(&port_dev->dev, "cannot disable (err = %d)\n", ret);
+        return ret;
+}
+
 
 /* USB 2.0 spec, 7.1.7.3 / fig 7-29:
  *
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index b95930f20d90..c55db4aa54d6 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3753,7 +3753,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,
                 hs_ep->desc_list = dma_alloc_coherent(hsotg->dev,
                         MAX_DMA_DESC_NUM_GENERIC *
                         sizeof(struct dwc2_dma_desc),
-                        &hs_ep->desc_list_dma, GFP_KERNEL);
+                        &hs_ep->desc_list_dma, GFP_ATOMIC);
                 if (!hs_ep->desc_list) {
                         ret = -ENOMEM;
                         goto error2;
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index a786256535b6..11fe68a4627b 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -247,8 +247,6 @@ MODULE_DEVICE_TABLE(of, dwc2_of_match_table);
 static void dwc2_get_device_property(struct dwc2_hsotg *hsotg,
                                      char *property, u8 size, u64 *value)
 {
-        u8 val8;
-        u16 val16;
         u32 val32;
 
         switch (size) {
@@ -256,17 +254,7 @@ static void dwc2_get_device_property(struct dwc2_hsotg *hsotg,
                 *value = device_property_read_bool(hsotg->dev, property);
                 break;
         case 1:
-                if (device_property_read_u8(hsotg->dev, property, &val8))
-                        return;
-
-                *value = val8;
-                break;
         case 2:
-                if (device_property_read_u16(hsotg->dev, property, &val16))
-                        return;
-
-                *value = val16;
-                break;
         case 4:
                 if (device_property_read_u32(hsotg->dev, property, &val32))
                         return;
@@ -1100,13 +1088,13 @@ static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg)
         /* Buffer DMA */
         dwc2_set_param_bool(hsotg, &p->g_dma,
                             false, "gadget-dma",
-                            true, false,
+                            dma_capable, false,
                             dma_capable);
 
         /* DMA Descriptor */
         dwc2_set_param_bool(hsotg, &p->g_dma_desc, false,
                             "gadget-dma-desc",
-                            p->g_dma, false,
+                            !!hw->dma_desc_enable, false,
                             !!hw->dma_desc_enable);
 }
 
@@ -1130,8 +1118,14 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
 
                 dwc2_set_param_bool(hsotg, &p->host_dma,
                                     false, "host-dma",
-                                    true, false,
+                                    dma_capable, false,
                                     dma_capable);
+                dwc2_set_param_host_rx_fifo_size(hsotg,
+                                params->host_rx_fifo_size);
+                dwc2_set_param_host_nperio_tx_fifo_size(hsotg,
+                                params->host_nperio_tx_fifo_size);
+                dwc2_set_param_host_perio_tx_fifo_size(hsotg,
+                                params->host_perio_tx_fifo_size);
         }
         dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);
         dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
@@ -1140,12 +1134,6 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
                         params->host_support_fs_ls_low_power);
         dwc2_set_param_enable_dynamic_fifo(hsotg,
                         params->enable_dynamic_fifo);
-        dwc2_set_param_host_rx_fifo_size(hsotg,
-                        params->host_rx_fifo_size);
-        dwc2_set_param_host_nperio_tx_fifo_size(hsotg,
-                        params->host_nperio_tx_fifo_size);
-        dwc2_set_param_host_perio_tx_fifo_size(hsotg,
-                        params->host_perio_tx_fifo_size);
         dwc2_set_param_max_transfer_size(hsotg,
                         params->max_transfer_size);
         dwc2_set_param_max_packet_count(hsotg,
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index de5a8570be04..14b760209680 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -45,9 +45,7 @@
 #define DWC3_XHCI_RESOURCES_NUM 2
 
 #define DWC3_SCRATCHBUF_SIZE    4096    /* each buffer is assumed to be 4KiB */
-#define DWC3_EVENT_SIZE         4       /* bytes */
-#define DWC3_EVENT_MAX_NUM      64      /* 2 events/endpoint */
-#define DWC3_EVENT_BUFFERS_SIZE (DWC3_EVENT_SIZE * DWC3_EVENT_MAX_NUM)
+#define DWC3_EVENT_BUFFERS_SIZE 4096
 #define DWC3_EVENT_TYPE_MASK    0xfe
 
 #define DWC3_EVENT_TYPE_DEV     0
@@ -311,9 +309,8 @@
 #define DWC3_DCFG_SUPERSPEED_PLUS (5 << 0)  /* DWC_usb31 only */
 #define DWC3_DCFG_SUPERSPEED    (4 << 0)
 #define DWC3_DCFG_HIGHSPEED     (0 << 0)
-#define DWC3_DCFG_FULLSPEED2    (1 << 0)
+#define DWC3_DCFG_FULLSPEED     (1 << 0)
 #define DWC3_DCFG_LOWSPEED      (2 << 0)
-#define DWC3_DCFG_FULLSPEED1    (3 << 0)
 
 #define DWC3_DCFG_NUMP_SHIFT    17
 #define DWC3_DCFG_NUMP(n)       (((n) >> DWC3_DCFG_NUMP_SHIFT) & 0x1f)
@@ -405,9 +402,8 @@
 #define DWC3_DSTS_SUPERSPEED_PLUS       (5 << 0) /* DWC_usb31 only */
 #define DWC3_DSTS_SUPERSPEED            (4 << 0)
 #define DWC3_DSTS_HIGHSPEED             (0 << 0)
-#define DWC3_DSTS_FULLSPEED2            (1 << 0)
+#define DWC3_DSTS_FULLSPEED             (1 << 0)
 #define DWC3_DSTS_LOWSPEED              (2 << 0)
-#define DWC3_DSTS_FULLSPEED1            (3 << 0)
 
 /* Device Generic Command Register */
 #define DWC3_DGCMD_SET_LMP              0x01
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 29e80cc9b634..eb1b9cb3f9d1 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/dwc3-omap.h>
@@ -510,7 +511,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
 
         /* check the DMA Status */
         reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
-
+        irq_set_status_flags(omap->irq, IRQ_NOAUTOEN);
         ret = devm_request_threaded_irq(dev, omap->irq, dwc3_omap_interrupt,
                                         dwc3_omap_interrupt_thread, IRQF_SHARED,
                                         "dwc3-omap", omap);
@@ -531,7 +532,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
         }
 
         dwc3_omap_enable_irqs(omap);
-
+        enable_irq(omap->irq);
         return 0;
 
 err2:
@@ -552,6 +553,7 @@ static int dwc3_omap_remove(struct platform_device *pdev)
         extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);
         extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);
         dwc3_omap_disable_irqs(omap);
+        disable_irq(omap->irq);
         of_platform_depopulate(omap->dev);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 2b73339f286b..cce0a220b6b0 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -38,6 +38,7 @@
 #define PCI_DEVICE_ID_INTEL_BXT_M               0x1aaa
 #define PCI_DEVICE_ID_INTEL_APL                 0x5aaa
 #define PCI_DEVICE_ID_INTEL_KBP                 0xa2b0
+#define PCI_DEVICE_ID_INTEL_GLK                 0x31aa
 
 #define PCI_INTEL_BXT_DSM_UUID          "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
 #define PCI_INTEL_BXT_FUNC_PMU_PWR      4
@@ -73,16 +74,6 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
 {
         struct platform_device          *dwc3 = dwc->dwc3;
         struct pci_dev                  *pdev = dwc->pci;
-        int                             ret;
-
-        struct property_entry sysdev_property[] = {
-                PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
-                { },
-        };
-
-        ret = platform_device_add_properties(dwc3, sysdev_property);
-        if (ret)
-                return ret;
 
         if (pdev->vendor == PCI_VENDOR_ID_AMD &&
             pdev->device == PCI_DEVICE_ID_AMD_NL_USB) {
@@ -105,6 +96,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
                         PROPERTY_ENTRY_BOOL("snps,disable_scramble_quirk"),
                         PROPERTY_ENTRY_BOOL("snps,dis_u3_susphy_quirk"),
                         PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
+                        PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
                         { },
                 };
 
@@ -115,7 +107,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
                 int ret;
 
                 struct property_entry properties[] = {
-                        PROPERTY_ENTRY_STRING("dr-mode", "peripheral"),
+                        PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
+                        PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
                         { }
                 };
 
@@ -167,6 +160,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
                         PROPERTY_ENTRY_BOOL("snps,usb3_lpm_capable"),
                         PROPERTY_ENTRY_BOOL("snps,has-lpm-erratum"),
                         PROPERTY_ENTRY_BOOL("snps,dis_enblslpm_quirk"),
+                        PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
                         { },
                 };
 
@@ -274,6 +268,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT_M), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_KBP), },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK), },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },
         {  }    /* Terminating Entry */
 };
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 4878d187c7d4..9bb1f8526f3e 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -39,18 +39,13 @@ static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep);
 static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 struct dwc3_ep *dep, struct dwc3_request *req);
 
-static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
-                u32 len, u32 type, bool chain)
+static void dwc3_ep0_prepare_one_trb(struct dwc3 *dwc, u8 epnum,
+                dma_addr_t buf_dma, u32 len, u32 type, bool chain)
 {
-        struct dwc3_gadget_ep_cmd_params params;
         struct dwc3_trb                 *trb;
         struct dwc3_ep                  *dep;
 
-        int                             ret;
-
         dep = dwc->eps[epnum];
-        if (dep->flags & DWC3_EP_BUSY)
-                return 0;
 
         trb = &dwc->ep0_trb[dep->trb_enqueue];
 
@@ -71,15 +66,23 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
                 trb->ctrl |= (DWC3_TRB_CTRL_IOC
                                 | DWC3_TRB_CTRL_LST);
 
-        if (chain)
+        trace_dwc3_prepare_trb(dep, trb);
+}
+
+static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum)
+{
+        struct dwc3_gadget_ep_cmd_params params;
+        struct dwc3_ep                  *dep;
+        int                             ret;
+
+        dep = dwc->eps[epnum];
+        if (dep->flags & DWC3_EP_BUSY)
                 return 0;
 
         memset(&params, 0, sizeof(params));
         params.param0 = upper_32_bits(dwc->ep0_trb_addr);
         params.param1 = lower_32_bits(dwc->ep0_trb_addr);
 
-        trace_dwc3_prepare_trb(dep, trb);
-
         ret = dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_STARTTRANSFER, &params);
         if (ret < 0)
                 return ret;
@@ -280,8 +283,9 @@ void dwc3_ep0_out_start(struct dwc3 *dwc)
 
         complete(&dwc->ep0_in_setup);
 
-        ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8,
+        dwc3_ep0_prepare_one_trb(dwc, 0, dwc->ctrl_req_addr, 8,
                         DWC3_TRBCTL_CONTROL_SETUP, false);
+        ret = dwc3_ep0_start_trans(dwc, 0);
         WARN_ON(ret < 0);
 }
 
@@ -912,9 +916,9 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
                         dwc->ep0_next_event = DWC3_EP0_COMPLETE;
 
-                        ret = dwc3_ep0_start_trans(dwc, epnum,
-                                        dwc->ctrl_req_addr, 0,
-                                        DWC3_TRBCTL_CONTROL_DATA, false);
+                        dwc3_ep0_prepare_one_trb(dwc, epnum, dwc->ctrl_req_addr,
+                                        0, DWC3_TRBCTL_CONTROL_DATA, false);
+                        ret = dwc3_ep0_start_trans(dwc, epnum);
                         WARN_ON(ret < 0);
                 }
         }
@@ -993,9 +997,10 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
         req->direction = !!dep->number;
 
         if (req->request.length == 0) {
-                ret = dwc3_ep0_start_trans(dwc, dep->number,
+                dwc3_ep0_prepare_one_trb(dwc, dep->number,
                                 dwc->ctrl_req_addr, 0,
                                 DWC3_TRBCTL_CONTROL_DATA, false);
+                ret = dwc3_ep0_start_trans(dwc, dep->number);
         } else if (!IS_ALIGNED(req->request.length, dep->endpoint.maxpacket)
                         && (dep->number == 0)) {
                 u32     transfer_size = 0;
@@ -1011,7 +1016,7 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 if (req->request.length > DWC3_EP0_BOUNCE_SIZE) {
                         transfer_size = ALIGN(req->request.length - maxpacket,
                                               maxpacket);
-                        ret = dwc3_ep0_start_trans(dwc, dep->number,
+                        dwc3_ep0_prepare_one_trb(dwc, dep->number,
                                                    req->request.dma,
                                                    transfer_size,
                                                    DWC3_TRBCTL_CONTROL_DATA,
@@ -1023,18 +1028,20 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
 
                 dwc->ep0_bounced = true;
 
-                ret = dwc3_ep0_start_trans(dwc, dep->number,
+                dwc3_ep0_prepare_one_trb(dwc, dep->number,
                                 dwc->ep0_bounce_addr, transfer_size,
                                 DWC3_TRBCTL_CONTROL_DATA, false);
+                ret = dwc3_ep0_start_trans(dwc, dep->number);
         } else {
                 ret = usb_gadget_map_request_by_dev(dwc->sysdev,
                                 &req->request, dep->number);
                 if (ret)
                         return;
 
-                ret = dwc3_ep0_start_trans(dwc, dep->number, req->request.dma,
+                dwc3_ep0_prepare_one_trb(dwc, dep->number, req->request.dma,
                                 req->request.length, DWC3_TRBCTL_CONTROL_DATA,
                                 false);
+                ret = dwc3_ep0_start_trans(dwc, dep->number);
         }
 
         WARN_ON(ret < 0);
@@ -1048,8 +1055,9 @@ static int dwc3_ep0_start_control_status(struct dwc3_ep *dep)
         type = dwc->three_stage_setup ? DWC3_TRBCTL_CONTROL_STATUS3
                 : DWC3_TRBCTL_CONTROL_STATUS2;
 
-        return dwc3_ep0_start_trans(dwc, dep->number,
+        dwc3_ep0_prepare_one_trb(dwc, dep->number,
                         dwc->ctrl_req_addr, 0, type, false);
+        return dwc3_ep0_start_trans(dwc, dep->number);
 }
 
 static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index efddaf5d11d1..204c754cc647 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -180,11 +180,11 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
         if (req->request.status == -EINPROGRESS)
                 req->request.status = status;
 
-        if (dwc->ep0_bounced && dep->number == 0)
+        if (dwc->ep0_bounced && dep->number <= 1)
                 dwc->ep0_bounced = false;
-        else
-                usb_gadget_unmap_request_by_dev(dwc->sysdev,
-                                &req->request, req->direction);
+
+        usb_gadget_unmap_request_by_dev(dwc->sysdev,
+                        &req->request, req->direction);
 
         trace_dwc3_gadget_giveback(req);
 
@@ -1720,7 +1720,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
                         reg |= DWC3_DCFG_LOWSPEED;
                         break;
                 case USB_SPEED_FULL:
-                        reg |= DWC3_DCFG_FULLSPEED1;
+                        reg |= DWC3_DCFG_FULLSPEED;
                         break;
                 case USB_SPEED_HIGH:
                         reg |= DWC3_DCFG_HIGHSPEED;
@@ -2232,9 +2232,14 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
 
         dep = dwc->eps[epnum];
 
-        if (!(dep->flags & DWC3_EP_ENABLED) &&
-            !(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
-                return;
+        if (!(dep->flags & DWC3_EP_ENABLED)) {
+                if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
+                        return;
+
+                /* Handle only EPCMDCMPLT when EP disabled */
+                if (event->endpoint_event != DWC3_DEPEVT_EPCMDCMPLT)
+                        return;
+        }
 
         if (epnum == 0 || epnum == 1) {
                 dwc3_ep0_interrupt(dwc, event);
@@ -2531,8 +2536,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
                 dwc->gadget.ep0->maxpacket = 64;
                 dwc->gadget.speed = USB_SPEED_HIGH;
                 break;
-        case DWC3_DSTS_FULLSPEED2:
-        case DWC3_DSTS_FULLSPEED1:
+        case DWC3_DSTS_FULLSPEED:
                 dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
                 dwc->gadget.ep0->maxpacket = 64;
                 dwc->gadget.speed = USB_SPEED_FULL;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 41ab61f9b6e0..002822d98fda 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1694,9 +1694,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                 value = min(w_length, (u16) 1);
                 break;
 
-        /* function drivers must handle get/set altsetting; if there's
-         * no get() method, we know only altsetting zero works.
-         */
+        /* function drivers must handle get/set altsetting */
         case USB_REQ_SET_INTERFACE:
                 if (ctrl->bRequestType != USB_RECIP_INTERFACE)
                         goto unknown;
@@ -1705,7 +1703,13 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                 f = cdev->config->interface[intf];
                 if (!f)
                         break;
-                if (w_value && !f->set_alt)
+
+                /*
+                 * If there's no get_alt() method, we know only altsetting zero
+                 * works. There is no need to check if set_alt() is not NULL
+                 * as we check this in usb_add_function().
+                 */
+                if (w_value && !f->get_alt)
                         break;
                 value = f->set_alt(f, w_index, w_value);
                 if (value == USB_GADGET_DELAYED_STATUS) {
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index aab3fc1dbb94..5e746adc8a2d 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -2091,8 +2091,8 @@ static int __ffs_data_do_entity(enum ffs_entity_type type,
 
         case FFS_STRING:
                 /*
-                 * Strings are indexed from 1 (0 is magic ;) reserved
-                 * for languages list or some such)
+                 * Strings are indexed from 1 (0 is reserved
+                 * for languages list)
                  */
                 if (*valuep > helper->ffs->strings_count)
                         helper->ffs->strings_count = *valuep;
@@ -2252,7 +2252,7 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type,
 
                 if (len < sizeof(*d) ||
                     d->bFirstInterfaceNumber >= ffs->interfaces_count ||
-                    !d->Reserved1)
+                    d->Reserved1)
                         return -EINVAL;
                 for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i)
                         if (d->Reserved2[i])
@@ -3666,6 +3666,7 @@ static void ffs_closed(struct ffs_data *ffs)
 {
         struct ffs_dev *ffs_obj;
         struct f_fs_opts *opts;
+        struct config_item *ci;
 
         ENTER();
         ffs_dev_lock();
@@ -3689,8 +3690,11 @@ static void ffs_closed(struct ffs_data *ffs)
             || !atomic_read(&opts->func_inst.group.cg_item.ci_kref.refcount))
                 goto done;
 
-        unregister_gadget_item(ffs_obj->opts->
-                               func_inst.group.cg_item.ci_parent->ci_parent);
+        ci = opts->func_inst.group.cg_item.ci_parent->ci_parent;
+        ffs_dev_unlock();
+
+        unregister_gadget_item(ci);
+        return;
 done:
         ffs_dev_unlock();
 }
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 3151d2a0fe59..5f8139b8e601 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -593,7 +593,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                 }
                 status = usb_ep_enable(hidg->out_ep);
                 if (status < 0) {
-                        ERROR(cdev, "Enable IN endpoint FAILED!\n");
+                        ERROR(cdev, "Enable OUT endpoint FAILED!\n");
                         goto fail;
                 }
                 hidg->out_ep->driver_data = hidg;
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index e8f4102d19df..6bde4396927c 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         /* data and/or status stage for control request */
         } else if (dev->state == STATE_DEV_SETUP) {
 
-                /* IN DATA+STATUS caller makes len <= wLength */
+                len = min_t(size_t, len, dev->setup_wLength);
                 if (dev->setup_in) {
                         retval = setup_req (dev->gadget->ep0, dev->req, len);
                         if (retval == 0) {
@@ -1734,10 +1734,12 @@ static struct usb_gadget_driver gadgetfs_driver = {
  * such as configuration notifications.
  */
 
-static int is_valid_config (struct usb_config_descriptor *config)
+static int is_valid_config(struct usb_config_descriptor *config,
+                unsigned int total)
 {
         return config->bDescriptorType == USB_DT_CONFIG
                 && config->bLength == USB_DT_CONFIG_SIZE
+                && total >= USB_DT_CONFIG_SIZE
                 && config->bConfigurationValue != 0
                 && (config->bmAttributes & USB_CONFIG_ATT_ONE) != 0
                 && (config->bmAttributes & USB_CONFIG_ATT_WAKEUP) == 0;
@@ -1762,7 +1764,8 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         }
         spin_unlock_irq(&dev->lock);
 
-        if (len < (USB_DT_CONFIG_SIZE + USB_DT_DEVICE_SIZE + 4))
+        if ((len < (USB_DT_CONFIG_SIZE + USB_DT_DEVICE_SIZE + 4)) ||
+            (len > PAGE_SIZE * 4))
                 return -EINVAL;
 
         /* we might need to change message format someday */
@@ -1786,7 +1789,8 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         /* full or low speed config */
         dev->config = (void *) kbuf;
         total = le16_to_cpu(dev->config->wTotalLength);
-        if (!is_valid_config (dev->config) || total >= length)
+        if (!is_valid_config(dev->config, total) ||
+                        total > length - USB_DT_DEVICE_SIZE)
                 goto fail;
         kbuf += total;
         length -= total;
@@ -1795,10 +1799,13 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
         if (kbuf [1] == USB_DT_CONFIG) {
                 dev->hs_config = (void *) kbuf;
                 total = le16_to_cpu(dev->hs_config->wTotalLength);
-                if (!is_valid_config (dev->hs_config) || total >= length)
+                if (!is_valid_config(dev->hs_config, total) ||
+                                total > length - USB_DT_DEVICE_SIZE)
                         goto fail;
                 kbuf += total;
                 length -= total;
+        } else {
+                dev->hs_config = NULL;
         }
 
         /* could support multiple configs, using another encoding! */
@@ -1811,7 +1818,6 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                         || dev->dev->bDescriptorType != USB_DT_DEVICE
                         || dev->dev->bNumConfigurations != 1)
                 goto fail;
-        dev->dev->bNumConfigurations = 1;
         dev->dev->bcdUSB = cpu_to_le16 (0x0200);
 
         /* triggers gadgetfs_bind(); then we can enumerate. */
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 9483489080f6..0402177f93cd 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1317,7 +1317,11 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
                         if (!ret)
                                 break;
                 }
-                if (!ret && !udc->driver)
+                if (ret)
+                        ret = -ENODEV;
+                else if (udc->driver)
+                        ret = -EBUSY;
+                else
                         goto found;
         } else {
                 list_for_each_entry(udc, &udc_list, list) {
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 02b14e91ae6c..c60abe3a68f9 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -330,7 +330,7 @@ static void nuke(struct dummy *dum, struct dummy_ep *ep)
 /* caller must hold lock */
 static void stop_activity(struct dummy *dum)
 {
-        struct dummy_ep *ep;
+        int i;
 
         /* prevent any more requests */
         dum->address = 0;
@@ -338,8 +338,8 @@ static void stop_activity(struct dummy *dum)
         /* The timer is left running so that outstanding URBs can fail */
 
         /* nuke any pending requests first, so driver i/o is quiesced */
-        list_for_each_entry(ep, &dum->gadget.ep_list, ep.ep_list)
-                nuke(dum, ep);
+        for (i = 0; i < DUMMY_ENDPOINTS; ++i)
+                nuke(dum, &dum->ep[i]);
 
         /* driver now does any non-usb quiescing necessary */
 }
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index be9e63836881..414e3c376dbb 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -43,7 +43,6 @@ struct at91_usbh_data {
         struct gpio_desc *overcurrent_pin[AT91_MAX_USBH_PORTS];
         u8 ports;                               /* number of ports on root hub */
         u8 overcurrent_supported;
-        u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS];
         u8 overcurrent_status[AT91_MAX_USBH_PORTS];
         u8 overcurrent_changed[AT91_MAX_USBH_PORTS];
 };
@@ -266,8 +265,7 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
         if (!valid_port(port))
                 return;
 
-        gpiod_set_value(pdata->vbus_pin[port],
-                        pdata->vbus_pin_active_low[port] ^ enable);
+        gpiod_set_value(pdata->vbus_pin[port], enable);
 }
 
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -275,8 +273,7 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
         if (!valid_port(port))
                 return -EINVAL;
 
-        return gpiod_get_value(pdata->vbus_pin[port]) ^
-               pdata->vbus_pin_active_low[port];
+        return gpiod_get_value(pdata->vbus_pin[port]);
 }
 
 /*
@@ -533,18 +530,17 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                 pdata->ports = ports;
 
         at91_for_each_port(i) {
-                pdata->vbus_pin[i] = devm_gpiod_get_optional(&pdev->dev,
-                                                             "atmel,vbus-gpio",
-                                                             GPIOD_IN);
+                if (i >= pdata->ports)
+                        break;
+
+                pdata->vbus_pin[i] =
+                        devm_gpiod_get_index_optional(&pdev->dev, "atmel,vbus",
+                                                      i, GPIOD_OUT_HIGH);
                 if (IS_ERR(pdata->vbus_pin[i])) {
                         err = PTR_ERR(pdata->vbus_pin[i]);
                         dev_err(&pdev->dev, "unable to claim gpio \"vbus\": %d\n", err);
                         continue;
                 }
-
-                pdata->vbus_pin_active_low[i] = gpiod_get_value(pdata->vbus_pin[i]);
-
-                ohci_at91_usb_set_power(pdata, i, 1);
         }
 
         at91_for_each_port(i) {
@@ -552,8 +548,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                         break;
 
                 pdata->overcurrent_pin[i] =
-                        devm_gpiod_get_optional(&pdev->dev,
-                                                "atmel,oc-gpio", GPIOD_IN);
+                        devm_gpiod_get_index_optional(&pdev->dev, "atmel,oc",
+                                                      i, GPIOD_IN);
                 if (IS_ERR(pdata->overcurrent_pin[i])) {
                         err = PTR_ERR(pdata->overcurrent_pin[i]);
                         dev_err(&pdev->dev, "unable to claim gpio \"overcurrent\": %d\n", err);
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 321de2e0161b..8414ed2a02de 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -979,6 +979,40 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id)
         xhci->devs[slot_id] = NULL;
 }
 
+/*
+ * Free a virt_device structure.
+ * If the virt_device added a tt_info (a hub) and has children pointing to
+ * that tt_info, then free the child first. Recursive.
+ * We can't rely on udev at this point to find child-parent relationships.
+ */
+void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_id)
+{
+        struct xhci_virt_device *vdev;
+        struct list_head *tt_list_head;
+        struct xhci_tt_bw_info *tt_info, *next;
+        int i;
+
+        vdev = xhci->devs[slot_id];
+        if (!vdev)
+                return;
+
+        tt_list_head = &(xhci->rh_bw[vdev->real_port - 1].tts);
+        list_for_each_entry_safe(tt_info, next, tt_list_head, tt_list) {
+                /* is this a hub device that added a tt_info to the tts list */
+                if (tt_info->slot_id == slot_id) {
+                        /* are any devices using this tt_info? */
+                        for (i = 1; i < HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
+                                vdev = xhci->devs[i];
+                                if (vdev && (vdev->tt_info == tt_info))
+                                        xhci_free_virt_devices_depth_first(
+                                                xhci, i);
+                        }
+                }
+        }
+        /* we are now at a leaf device */
+        xhci_free_virt_device(xhci, slot_id);
+}
+
 int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,
                 struct usb_device *udev, gfp_t flags)
 {
@@ -1795,7 +1829,7 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
         int size;
         int i, j, num_ports;
 
-        del_timer_sync(&xhci->cmd_timer);
+        cancel_delayed_work_sync(&xhci->cmd_timer);
 
         /* Free the Event Ring Segment Table and the actual Event Ring */
         size = sizeof(struct xhci_erst_entry)*(xhci->erst.num_entries);
@@ -1828,8 +1862,8 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
                 }
         }
 
-        for (i = 1; i < MAX_HC_SLOTS; ++i)
-                xhci_free_virt_device(xhci, i);
+        for (i = HCS_MAX_SLOTS(xhci->hcs_params1); i > 0; i--)
+                xhci_free_virt_devices_depth_first(xhci, i);
 
         dma_pool_destroy(xhci->segment_pool);
         xhci->segment_pool = NULL;
@@ -2342,9 +2376,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
 
         INIT_LIST_HEAD(&xhci->cmd_list);
 
-        /* init command timeout timer */
-        setup_timer(&xhci->cmd_timer, xhci_handle_command_timeout,
-                    (unsigned long)xhci);
+        /* init command timeout work */
+        INIT_DELAYED_WORK(&xhci->cmd_timer, xhci_handle_command_timeout);
+        init_completion(&xhci->cmd_ring_stop_completion);
 
         page_size = readl(&xhci->op_regs->page_size);
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 1094ebd2838f..bac961cd24ad 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -579,8 +579,10 @@ static int xhci_mtk_probe(struct platform_device *pdev)
                 goto disable_ldos;
 
         irq = platform_get_irq(pdev, 0);
-        if (irq < 0)
+        if (irq < 0) {
+                ret = irq;
                 goto disable_clk;
+        }
 
         /* Initialize dma_mask and coherent_dma_mask to 32-bits */
         ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index e96ae80d107e..954abfd5014d 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -165,7 +165,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                  pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI ||
                  pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI ||
                  pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI ||
-                 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI)) {
+                 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI ||
+                 pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI)) {
                 xhci->quirks |= XHCI_PME_STUCK_QUIRK;
         }
         if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index bdf6b13d9b67..25f522b09dd9 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -279,23 +279,76 @@ void xhci_ring_cmd_db(struct xhci_hcd *xhci)
         readl(&xhci->dba->doorbell[0]);
 }
 
-static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
+static bool xhci_mod_cmd_timer(struct xhci_hcd *xhci, unsigned long delay)
+{
+        return mod_delayed_work(system_wq, &xhci->cmd_timer, delay);
+}
+
+static struct xhci_command *xhci_next_queued_cmd(struct xhci_hcd *xhci)
+{
+        return list_first_entry_or_null(&xhci->cmd_list, struct xhci_command,
+                                        cmd_list);
+}
+
+/*
+ * Turn all commands on command ring with status set to "aborted" to no-op trbs.
+ * If there are other commands waiting then restart the ring and kick the timer.
+ * This must be called with command ring stopped and xhci->lock held.
+ */
+static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci,
+                                         struct xhci_command *cur_cmd)
+{
+        struct xhci_command *i_cmd;
+        u32 cycle_state;
+
+        /* Turn all aborted commands in list to no-ops, then restart */
+        list_for_each_entry(i_cmd, &xhci->cmd_list, cmd_list) {
+
+                if (i_cmd->status != COMP_CMD_ABORT)
+                        continue;
+
+                i_cmd->status = COMP_CMD_STOP;
+
+                xhci_dbg(xhci, "Turn aborted command %p to no-op\n",
+                         i_cmd->command_trb);
+                /* get cycle state from the original cmd trb */
+                cycle_state = le32_to_cpu(
+                        i_cmd->command_trb->generic.field[3]) & TRB_CYCLE;
+                /* modify the command trb to no-op command */
+                i_cmd->command_trb->generic.field[0] = 0;
+                i_cmd->command_trb->generic.field[1] = 0;
+                i_cmd->command_trb->generic.field[2] = 0;
+                i_cmd->command_trb->generic.field[3] = cpu_to_le32(
+                        TRB_TYPE(TRB_CMD_NOOP) | cycle_state);
+
+                /*
+                 * caller waiting for completion is called when command
+                 *  completion event is received for these no-op commands
+                 */
+        }
+
+        xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
+
+        /* ring command ring doorbell to restart the command ring */
+        if ((xhci->cmd_ring->dequeue != xhci->cmd_ring->enqueue) &&
+            !(xhci->xhc_state & XHCI_STATE_DYING)) {
+                xhci->current_cmd = cur_cmd;
+                xhci_mod_cmd_timer(xhci, XHCI_CMD_DEFAULT_TIMEOUT);
+                xhci_ring_cmd_db(xhci);
+        }
+}
+
+/* Must be called with xhci->lock held, releases and aquires lock back */
+static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
 {
         u64 temp_64;
         int ret;
 
         xhci_dbg(xhci, "Abort command ring\n");
 
-        temp_64 = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
-        xhci->cmd_ring_state = CMD_RING_STATE_ABORTED;
+        reinit_completion(&xhci->cmd_ring_stop_completion);
 
-        /*
-         * Writing the CMD_RING_ABORT bit should cause a cmd completion event,
-         * however on some host hw the CMD_RING_RUNNING bit is correctly cleared
-         * but the completion event in never sent. Use the cmd timeout timer to
-         * handle those cases. Use twice the time to cover the bit polling retry
-         */
-        mod_timer(&xhci->cmd_timer, jiffies + (2 * XHCI_CMD_DEFAULT_TIMEOUT));
+        temp_64 = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
         xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
                         &xhci->op_regs->cmd_ring);
 
@@ -315,17 +368,30 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
                 udelay(1000);
                 ret = xhci_handshake(&xhci->op_regs->cmd_ring,
                                      CMD_RING_RUNNING, 0, 3 * 1000 * 1000);
-                if (ret == 0)
-                        return 0;
-
-                xhci_err(xhci, "Stopped the command ring failed, "
-                                "maybe the host is dead\n");
-                del_timer(&xhci->cmd_timer);
-                xhci->xhc_state |= XHCI_STATE_DYING;
-                xhci_halt(xhci);
-                return -ESHUTDOWN;
+                if (ret < 0) {
+                        xhci_err(xhci, "Stopped the command ring failed, "
+                                 "maybe the host is dead\n");
+                        xhci->xhc_state |= XHCI_STATE_DYING;
+                        xhci_halt(xhci);
+                        return -ESHUTDOWN;
+                }
+        }
+        /*
+         * Writing the CMD_RING_ABORT bit should cause a cmd completion event,
+         * however on some host hw the CMD_RING_RUNNING bit is correctly cleared
+         * but the completion event in never sent. Wait 2 secs (arbitrary
+         * number) to handle those cases after negation of CMD_RING_RUNNING.
+         */
+        spin_unlock_irqrestore(&xhci->lock, flags);
+        ret = wait_for_completion_timeout(&xhci->cmd_ring_stop_completion,
+                                          msecs_to_jiffies(2000));
+        spin_lock_irqsave(&xhci->lock, flags);
+        if (!ret) {
+                xhci_dbg(xhci, "No stop event for abort, ring start fail?\n");
+                xhci_cleanup_command_queue(xhci);
+        } else {
+                xhci_handle_stopped_cmd_ring(xhci, xhci_next_queued_cmd(xhci));
         }
-
         return 0;
 }
 
@@ -1207,101 +1273,62 @@ void xhci_cleanup_command_queue(struct xhci_hcd *xhci)
                 xhci_complete_del_and_free_cmd(cur_cmd, COMP_CMD_ABORT);
 }
 
-/*
- * Turn all commands on command ring with status set to "aborted" to no-op trbs.
- * If there are other commands waiting then restart the ring and kick the timer.
- * This must be called with command ring stopped and xhci->lock held.
- */
-static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci,
-                                         struct xhci_command *cur_cmd)
-{
-        struct xhci_command *i_cmd, *tmp_cmd;
-        u32 cycle_state;
-
-        /* Turn all aborted commands in list to no-ops, then restart */
-        list_for_each_entry_safe(i_cmd, tmp_cmd, &xhci->cmd_list,
-                                 cmd_list) {
-
-                if (i_cmd->status != COMP_CMD_ABORT)
-                        continue;
-
-                i_cmd->status = COMP_CMD_STOP;
-
-                xhci_dbg(xhci, "Turn aborted command %p to no-op\n",
-                         i_cmd->command_trb);
-                /* get cycle state from the original cmd trb */
-                cycle_state = le32_to_cpu(
-                        i_cmd->command_trb->generic.field[3]) & TRB_CYCLE;
-                /* modify the command trb to no-op command */
-                i_cmd->command_trb->generic.field[0] = 0;
-                i_cmd->command_trb->generic.field[1] = 0;
-                i_cmd->command_trb->generic.field[2] = 0;
-                i_cmd->command_trb->generic.field[3] = cpu_to_le32(
-                        TRB_TYPE(TRB_CMD_NOOP) | cycle_state);
-
-                /*
-                 * caller waiting for completion is called when command
-                 *  completion event is received for these no-op commands
-                 */
-        }
-
-        xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
-
-        /* ring command ring doorbell to restart the command ring */
-        if ((xhci->cmd_ring->dequeue != xhci->cmd_ring->enqueue) &&
-            !(xhci->xhc_state & XHCI_STATE_DYING)) {
-                xhci->current_cmd = cur_cmd;
-                mod_timer(&xhci->cmd_timer, jiffies + XHCI_CMD_DEFAULT_TIMEOUT);
-                xhci_ring_cmd_db(xhci);
-        }
-        return;
-}
-
-
-void xhci_handle_command_timeout(unsigned long data)
+void xhci_handle_command_timeout(struct work_struct *work)
 {
         struct xhci_hcd *xhci;
         int ret;
         unsigned long flags;
         u64 hw_ring_state;
-        bool second_timeout = false;
-        xhci = (struct xhci_hcd *) data;
 
-        /* mark this command to be cancelled */
+        xhci = container_of(to_delayed_work(work), struct xhci_hcd, cmd_timer);
+
         spin_lock_irqsave(&xhci->lock, flags);
-        if (xhci->current_cmd) {
-                if (xhci->current_cmd->status == COMP_CMD_ABORT)
-                        second_timeout = true;
-                xhci->current_cmd->status = COMP_CMD_ABORT;
+
+        /*
+         * If timeout work is pending, or current_cmd is NULL, it means we
+         * raced with command completion. Command is handled so just return.
+         */
+        if (!xhci->current_cmd || delayed_work_pending(&xhci->cmd_timer)) {
+                spin_unlock_irqrestore(&xhci->lock, flags);
+                return;
         }
+        /* mark this command to be cancelled */
+        xhci->current_cmd->status = COMP_CMD_ABORT;
 
         /* Make sure command ring is running before aborting it */
         hw_ring_state = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
         if ((xhci->cmd_ring_state & CMD_RING_STATE_RUNNING) &&
             (hw_ring_state & CMD_RING_RUNNING))  {
-                spin_unlock_irqrestore(&xhci->lock, flags);
+                /* Prevent new doorbell, and start command abort */
+                xhci->cmd_ring_state = CMD_RING_STATE_ABORTED;
                 xhci_dbg(xhci, "Command timeout\n");
-                ret = xhci_abort_cmd_ring(xhci);
+                ret = xhci_abort_cmd_ring(xhci, flags);
                 if (unlikely(ret == -ESHUTDOWN)) {
                         xhci_err(xhci, "Abort command ring failed\n");
                         xhci_cleanup_command_queue(xhci);
+                        spin_unlock_irqrestore(&xhci->lock, flags);
                         usb_hc_died(xhci_to_hcd(xhci)->primary_hcd);
                         xhci_dbg(xhci, "xHCI host controller is dead.\n");
+
+                        return;
                 }
-                return;
+
+                goto time_out_completed;
         }
 
-        /* command ring failed to restart, or host removed. Bail out */
-        if (second_timeout || xhci->xhc_state & XHCI_STATE_REMOVING) {
-                spin_unlock_irqrestore(&xhci->lock, flags);
-                xhci_dbg(xhci, "command timed out twice, ring start fail?\n");
+        /* host removed. Bail out */
+        if (xhci->xhc_state & XHCI_STATE_REMOVING) {
+                xhci_dbg(xhci, "host removed, ring start fail?\n");
                 xhci_cleanup_command_queue(xhci);
-                return;
+
+                goto time_out_completed;
         }
 
         /* command timeout on stopped ring, ring can't be aborted */
         xhci_dbg(xhci, "Command timeout on stopped ring\n");
         xhci_handle_stopped_cmd_ring(xhci, xhci->current_cmd);
+
+time_out_completed:
         spin_unlock_irqrestore(&xhci->lock, flags);
         return;
 }
@@ -1333,7 +1360,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
 
         cmd = list_entry(xhci->cmd_list.next, struct xhci_command, cmd_list);
 
-        del_timer(&xhci->cmd_timer);
+        cancel_delayed_work(&xhci->cmd_timer);
 
         trace_xhci_cmd_completion(cmd_trb, (struct xhci_generic_trb *) event);
 
@@ -1341,7 +1368,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
 
         /* If CMD ring stopped we own the trbs between enqueue and dequeue */
         if (cmd_comp_code == COMP_CMD_STOP) {
-                xhci_handle_stopped_cmd_ring(xhci, cmd);
+                complete_all(&xhci->cmd_ring_stop_completion);
                 return;
         }
 
@@ -1359,8 +1386,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
          */
         if (cmd_comp_code == COMP_CMD_ABORT) {
                 xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
-                if (cmd->status == COMP_CMD_ABORT)
+                if (cmd->status == COMP_CMD_ABORT) {
+                        if (xhci->current_cmd == cmd)
+                                xhci->current_cmd = NULL;
                         goto event_handled;
+                }
         }
 
         cmd_type = TRB_FIELD_TO_TYPE(le32_to_cpu(cmd_trb->generic.field[3]));
@@ -1421,7 +1451,9 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
         if (cmd->cmd_list.next != &xhci->cmd_list) {
                 xhci->current_cmd = list_entry(cmd->cmd_list.next,
                                                struct xhci_command, cmd_list);
-                mod_timer(&xhci->cmd_timer, jiffies + XHCI_CMD_DEFAULT_TIMEOUT);
+                xhci_mod_cmd_timer(xhci, XHCI_CMD_DEFAULT_TIMEOUT);
+        } else if (xhci->current_cmd == cmd) {
+                xhci->current_cmd = NULL;
         }
 
 event_handled:
@@ -1939,8 +1971,9 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         struct xhci_ep_ctx *ep_ctx;
         u32 trb_comp_code;
         u32 remaining, requested;
-        bool on_data_stage;
+        u32 trb_type;
 
+        trb_type = TRB_FIELD_TO_TYPE(le32_to_cpu(ep_trb->generic.field[3]));
         slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags));
         xdev = xhci->devs[slot_id];
         ep_index = TRB_TO_EP_ID(le32_to_cpu(event->flags)) - 1;
@@ -1950,14 +1983,11 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         requested = td->urb->transfer_buffer_length;
         remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
 
-        /* not setup (dequeue), or status stage means we are at data stage */
-        on_data_stage = (ep_trb != ep_ring->dequeue && ep_trb != td->last_trb);
-
         switch (trb_comp_code) {
         case COMP_SUCCESS:
-                if (ep_trb != td->last_trb) {
+                if (trb_type != TRB_STATUS) {
                         xhci_warn(xhci, "WARN: Success on ctrl %s TRB without IOC set?\n",
-                                  on_data_stage ? "data" : "setup");
+                                  (trb_type == TRB_DATA) ? "data" : "setup");
                         *status = -ESHUTDOWN;
                         break;
                 }
@@ -1967,15 +1997,25 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 *status = 0;
                 break;
         case COMP_STOP_SHORT:
-                if (on_data_stage)
+                if (trb_type == TRB_DATA || trb_type == TRB_NORMAL)
                         td->urb->actual_length = remaining;
                 else
                         xhci_warn(xhci, "WARN: Stopped Short Packet on ctrl setup or status TRB\n");
                 goto finish_td;
         case COMP_STOP:
-                if (on_data_stage)
+                switch (trb_type) {
+                case TRB_SETUP:
+                        td->urb->actual_length = 0;
+                        goto finish_td;
+                case TRB_DATA:
+                case TRB_NORMAL:
                         td->urb->actual_length = requested - remaining;
-                goto finish_td;
+                        goto finish_td;
+                default:
+                        xhci_warn(xhci, "WARN: unexpected TRB Type %d\n",
+                                  trb_type);
+                        goto finish_td;
+                }
         case COMP_STOP_INVAL:
                 goto finish_td;
         default:
@@ -1987,7 +2027,7 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 /* else fall through */
         case COMP_STALL:
                 /* Did we transfer part of the data (middle) phase? */
-                if (on_data_stage)
+                if (trb_type == TRB_DATA || trb_type == TRB_NORMAL)
                         td->urb->actual_length = requested - remaining;
                 else if (!td->urb_length_set)
                         td->urb->actual_length = 0;
@@ -1995,14 +2035,15 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         }
 
         /* stopped at setup stage, no data transferred */
-        if (ep_trb == ep_ring->dequeue)
+        if (trb_type == TRB_SETUP)
                 goto finish_td;
 
         /*
          * if on data stage then update the actual_length of the URB and flag it
          * as set, so it won't be overwritten in the event for the last TRB.
          */
-        if (on_data_stage) {
+        if (trb_type == TRB_DATA ||
+                trb_type == TRB_NORMAL) {
                 td->urb_length_set = true;
                 td->urb->actual_length = requested - remaining;
                 xhci_dbg(xhci, "Waiting for status stage event\n");
@@ -3790,9 +3831,9 @@ static int queue_command(struct xhci_hcd *xhci, struct xhci_command *cmd,
 
         /* if there are no other commands queued we start the timeout timer */
         if (xhci->cmd_list.next == &cmd->cmd_list &&
-            !timer_pending(&xhci->cmd_timer)) {
+            !delayed_work_pending(&xhci->cmd_timer)) {
                 xhci->current_cmd = cmd;
-                mod_timer(&xhci->cmd_timer, jiffies + XHCI_CMD_DEFAULT_TIMEOUT);
+                xhci_mod_cmd_timer(xhci, XHCI_CMD_DEFAULT_TIMEOUT);
         }
 
         queue_trb(xhci, xhci->cmd_ring, false, field1, field2, field3,
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1cd56417cbec..0c8deb9ed42d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3787,8 +3787,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
 
         mutex_lock(&xhci->mutex);
 
-        if (xhci->xhc_state)    /* dying, removing or halted */
+        if (xhci->xhc_state) {  /* dying, removing or halted */
+                ret = -ESHUTDOWN;
                 goto out;
+        }
 
         if (!udev->slot_id) {
                 xhci_dbg_trace(xhci, trace_xhci_dbg_address,
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 8ccc11a974b8..2d7b6374b58d 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1568,7 +1568,8 @@ struct xhci_hcd {
 #define CMD_RING_STATE_STOPPED         (1 << 2)
         struct list_head        cmd_list;
         unsigned int            cmd_ring_reserved_trbs;
-        struct timer_list       cmd_timer;
+        struct delayed_work     cmd_timer;
+        struct completion       cmd_ring_stop_completion;
         struct xhci_command     *current_cmd;
         struct xhci_ring        *event_ring;
         struct xhci_erst        erst;
@@ -1934,7 +1935,7 @@ void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci,
                 unsigned int slot_id, unsigned int ep_index,
                 struct xhci_dequeue_state *deq_state);
 void xhci_stop_endpoint_command_watchdog(unsigned long arg);
-void xhci_handle_command_timeout(unsigned long data);
+void xhci_handle_command_timeout(struct work_struct *work);
 
 void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id,
                 unsigned int ep_index, unsigned int stream_id);
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 310238c6b5cd..896798071817 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -469,6 +469,7 @@ static const struct musb_platform_ops bfin_ops = {
         .init           = bfin_musb_init,
         .exit           = bfin_musb_exit,
 
+        .fifo_offset    = bfin_fifo_offset,
         .readb          = bfin_readb,
         .writeb         = bfin_writeb,
         .readw          = bfin_readw,
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 9e226468a13e..fca288bbc800 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2050,6 +2050,7 @@ struct musb_pending_work {
         struct list_head node;
 };
 
+#ifdef CONFIG_PM
 /*
  * Called from musb_runtime_resume(), musb_resume(), and
  * musb_queue_resume_work(). Callers must take musb->lock.
@@ -2077,6 +2078,7 @@ static int musb_run_resume_work(struct musb *musb)
 
         return error;
 }
+#endif
 
 /*
  * Called to run work if device is active or else queue the work to happen
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index a611e2f67bdc..ade902ea1221 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -216,6 +216,7 @@ struct musb_platform_ops {
         void    (*pre_root_reset_end)(struct musb *musb);
         void    (*post_root_reset_end)(struct musb *musb);
         int     (*phy_callback)(enum musb_vbus_id_status status);
+        void    (*clear_ep_rxintr)(struct musb *musb, int epnum);
 };
 
 /*
@@ -626,6 +627,12 @@ static inline void musb_platform_post_root_reset_end(struct musb *musb)
                 musb->ops->post_root_reset_end(musb);
 }
 
+static inline void musb_platform_clear_ep_rxintr(struct musb *musb, int epnum)
+{
+        if (musb->ops->clear_ep_rxintr)
+                musb->ops->clear_ep_rxintr(musb, epnum);
+}
+
 /*
  * gets the "dr_mode" property from DT and converts it into musb_mode
  * if the property is not found or not recognized returns MUSB_OTG
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index feae1561b9ab..9f125e179acd 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -267,6 +267,17 @@ static void otg_timer(unsigned long _musb)
         pm_runtime_put_autosuspend(dev);
 }
 
+void dsps_musb_clear_ep_rxintr(struct musb *musb, int epnum)
+{
+        u32 epintr;
+        struct dsps_glue *glue = dev_get_drvdata(musb->controller->parent);
+        const struct dsps_musb_wrapper *wrp = glue->wrp;
+
+        /* musb->lock might already been held */
+        epintr = (1 << epnum) << wrp->rxep_shift;
+        musb_writel(musb->ctrl_base, wrp->epintr_status, epintr);
+}
+
 static irqreturn_t dsps_interrupt(int irq, void *hci)
 {
         struct musb  *musb = hci;
@@ -622,6 +633,7 @@ static struct musb_platform_ops dsps_ops = {
 
         .set_mode       = dsps_musb_set_mode,
         .recover        = dsps_musb_recover,
+        .clear_ep_rxintr = dsps_musb_clear_ep_rxintr,
 };
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index f6cdbad00dac..ac3a4952abb4 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2374,12 +2374,11 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh)
         int                     is_in = usb_pipein(urb->pipe);
         int                     status = 0;
         u16                     csr;
+        struct dma_channel      *dma = NULL;
 
         musb_ep_select(regs, hw_end);
 
         if (is_dma_capable()) {
-                struct dma_channel      *dma;
-
                 dma = is_in ? ep->rx_channel : ep->tx_channel;
                 if (dma) {
                         status = ep->musb->dma_controller->channel_abort(dma);
@@ -2395,10 +2394,9 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh)
                 /* giveback saves bulk toggle */
                 csr = musb_h_flush_rxfifo(ep, 0);
 
-                /* REVISIT we still get an irq; should likely clear the
-                 * endpoint's irq status here to avoid bogus irqs.
-                 * clearing that status is platform-specific...
-                 */
+                /* clear the endpoint's irq status here to avoid bogus irqs */
+                if (is_dma_capable() && dma)
+                        musb_platform_clear_ep_rxintr(musb, ep->epnum);
         } else if (ep->epnum) {
                 musb_h_tx_flush_fifo(ep);
                 csr = musb_readw(epio, MUSB_TXCSR);
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index f7b13fd25257..a3dcbd55e436 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -157,5 +157,5 @@ struct musb_dma_controller {
         void __iomem                    *base;
         u8                              channel_count;
         u8                              used_channels;
-        u8                              irq;
+        int                             irq;
 };
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 5f17a3b9916d..80260b08398b 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -50,6 +50,7 @@
 #define CYBERJACK_PRODUCT_ID    0x0100
 
 /* Function prototypes */
+static int cyberjack_attach(struct usb_serial *serial);
 static int cyberjack_port_probe(struct usb_serial_port *port);
 static int cyberjack_port_remove(struct usb_serial_port *port);
 static int  cyberjack_open(struct tty_struct *tty,
@@ -77,6 +78,7 @@ static struct usb_serial_driver cyberjack_device = {
         .description =          "Reiner SCT Cyberjack USB card reader",
         .id_table =             id_table,
         .num_ports =            1,
+        .attach =               cyberjack_attach,
         .port_probe =           cyberjack_port_probe,
         .port_remove =          cyberjack_port_remove,
         .open =                 cyberjack_open,
@@ -100,6 +102,14 @@ struct cyberjack_private {
         short           wrsent;         /* Data already sent */
 };
 
+static int cyberjack_attach(struct usb_serial *serial)
+{
+        if (serial->num_bulk_out < serial->num_ports)
+                return -ENODEV;
+
+        return 0;
+}
+
 static int cyberjack_port_probe(struct usb_serial_port *port)
 {
         struct cyberjack_private *priv;
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index 8282a6a18fee..22f23a429a95 100644
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -1237,6 +1237,7 @@ static int f81534_attach(struct usb_serial *serial)
 static int f81534_port_probe(struct usb_serial_port *port)
 {
         struct f81534_port_private *port_priv;
+        int ret;
 
         port_priv = devm_kzalloc(&port->dev, sizeof(*port_priv), GFP_KERNEL);
         if (!port_priv)
@@ -1246,10 +1247,11 @@ static int f81534_port_probe(struct usb_serial_port *port)
         mutex_init(&port_priv->mcr_mutex);
 
         /* Assign logic-to-phy mapping */
-        port_priv->phy_num = f81534_logic_to_phy_port(port->serial, port);
-        if (port_priv->phy_num < 0 || port_priv->phy_num >= F81534_NUM_PORT)
-                return -ENODEV;
+        ret = f81534_logic_to_phy_port(port->serial, port);
+        if (ret < 0)
+                return ret;
 
+        port_priv->phy_num = ret;
         usb_set_serial_port_data(port, port_priv);
         dev_dbg(&port->dev, "%s: port_number: %d, phy_num: %d\n", __func__,
                         port->port_number, port_priv->phy_num);
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 97cabf803c2f..b2f2e87aed94 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1043,6 +1043,7 @@ static int garmin_write_bulk(struct usb_serial_port *port,
                    "%s - usb_submit_urb(write bulk) failed with status = %d\n",
                                 __func__, status);
                 count = status;
+                kfree(buffer);
         }
 
         /* we are done with this urb, so let the host driver
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index dcc0c58aaad5..d50e5773483f 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2751,6 +2751,11 @@ static int edge_startup(struct usb_serial *serial)
                                         EDGE_COMPATIBILITY_MASK1,
                                         EDGE_COMPATIBILITY_MASK2 };
 
+        if (serial->num_bulk_in < 1 || serial->num_interrupt_in < 1) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
         dev = serial->dev;
 
         /* create our private serial structure */
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index c339163698eb..9a0db2965fbb 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1499,8 +1499,7 @@ static int do_boot_mode(struct edgeport_serial *serial,
 
                 dev_dbg(dev, "%s - Download successful -- Device rebooting...\n", __func__);
 
-                /* return an error on purpose */
-                return -ENODEV;
+                return 1;
         }
 
 stayinbootmode:
@@ -1508,7 +1507,7 @@ stayinbootmode:
         dev_dbg(dev, "%s - STAYING IN BOOT MODE\n", __func__);
         serial->product_info.TiMode = TI_MODE_BOOT;
 
-        return 0;
+        return 1;
 }
 
 static int ti_do_config(struct edgeport_port *port, int feature, int on)
@@ -2546,6 +2545,13 @@ static int edge_startup(struct usb_serial *serial)
         int status;
         u16 product_id;
 
+        /* Make sure we have the required endpoints when in download mode. */
+        if (serial->interface->cur_altsetting->desc.bNumEndpoints > 1) {
+                if (serial->num_bulk_in < serial->num_ports ||
+                                serial->num_bulk_out < serial->num_ports)
+                        return -ENODEV;
+        }
+
         /* create our private serial structure */
         edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL);
         if (!edge_serial)
@@ -2553,14 +2559,18 @@ static int edge_startup(struct usb_serial *serial)
 
         mutex_init(&edge_serial->es_lock);
         edge_serial->serial = serial;
+        INIT_DELAYED_WORK(&edge_serial->heartbeat_work, edge_heartbeat_work);
         usb_set_serial_data(serial, edge_serial);
 
         status = download_fw(edge_serial);
-        if (status) {
+        if (status < 0) {
                 kfree(edge_serial);
                 return status;
         }
 
+        if (status > 0)
+                return 1;       /* bind but do not register any ports */
+
         product_id = le16_to_cpu(
                         edge_serial->serial->dev->descriptor.idProduct);
 
@@ -2572,7 +2582,6 @@ static int edge_startup(struct usb_serial *serial)
                 }
         }
 
-        INIT_DELAYED_WORK(&edge_serial->heartbeat_work, edge_heartbeat_work);
         edge_heartbeat_schedule(edge_serial);
 
         return 0;
@@ -2580,6 +2589,9 @@ static int edge_startup(struct usb_serial *serial)
 
 static void edge_disconnect(struct usb_serial *serial)
 {
+        struct edgeport_serial *edge_serial = usb_get_serial_data(serial);
+
+        cancel_delayed_work_sync(&edge_serial->heartbeat_work);
 }
 
 static void edge_release(struct usb_serial *serial)
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 344b4eea4bd5..d57fb5199218 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -68,6 +68,16 @@ struct iuu_private {
         u32 clk;
 };
 
+static int iuu_attach(struct usb_serial *serial)
+{
+        unsigned char num_ports = serial->num_ports;
+
+        if (serial->num_bulk_in < num_ports || serial->num_bulk_out < num_ports)
+                return -ENODEV;
+
+        return 0;
+}
+
 static int iuu_port_probe(struct usb_serial_port *port)
 {
         struct iuu_private *priv;
@@ -1196,6 +1206,7 @@ static struct usb_serial_driver iuu_device = {
         .tiocmset = iuu_tiocmset,
         .set_termios = iuu_set_termios,
         .init_termios = iuu_init_termios,
+        .attach = iuu_attach,
         .port_probe = iuu_port_probe,
         .port_remove = iuu_port_remove,
 };
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index e49ad0c63ad8..83523fcf6fb9 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -699,6 +699,19 @@ MODULE_FIRMWARE("keyspan_pda/keyspan_pda.fw");
 MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw");
 #endif
 
+static int keyspan_pda_attach(struct usb_serial *serial)
+{
+        unsigned char num_ports = serial->num_ports;
+
+        if (serial->num_bulk_out < num_ports ||
+                        serial->num_interrupt_in < num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int keyspan_pda_port_probe(struct usb_serial_port *port)
 {
 
@@ -776,6 +789,7 @@ static struct usb_serial_driver keyspan_pda_device = {
         .break_ctl =            keyspan_pda_break_ctl,
         .tiocmget =             keyspan_pda_tiocmget,
         .tiocmset =             keyspan_pda_tiocmset,
+        .attach =               keyspan_pda_attach,
         .port_probe =           keyspan_pda_port_probe,
         .port_remove =          keyspan_pda_port_remove,
 };
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 2363654cafc9..813035f51fe7 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -51,6 +51,7 @@
 
 
 /* Function prototypes */
+static int kobil_attach(struct usb_serial *serial);
 static int kobil_port_probe(struct usb_serial_port *probe);
 static int kobil_port_remove(struct usb_serial_port *probe);
 static int  kobil_open(struct tty_struct *tty, struct usb_serial_port *port);
@@ -86,6 +87,7 @@ static struct usb_serial_driver kobil_device = {
         .description =          "KOBIL USB smart card terminal",
         .id_table =             id_table,
         .num_ports =            1,
+        .attach =               kobil_attach,
         .port_probe =           kobil_port_probe,
         .port_remove =          kobil_port_remove,
         .ioctl =                kobil_ioctl,
@@ -113,6 +115,16 @@ struct kobil_private {
 };
 
 
+static int kobil_attach(struct usb_serial *serial)
+{
+        if (serial->num_interrupt_out < serial->num_ports) {
+                dev_err(&serial->interface->dev, "missing interrupt-out endpoint\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int kobil_port_probe(struct usb_serial_port *port)
 {
         struct usb_serial *serial = port->serial;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index d52caa03679c..91bc170b408a 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -65,8 +65,6 @@ struct moschip_port {
         struct urb              *write_urb_pool[NUM_URBS];
 };
 
-static struct usb_serial_driver moschip7720_2port_driver;
-
 #define USB_VENDOR_ID_MOSCHIP           0x9710
 #define MOSCHIP_DEVICE_ID_7720          0x7720
 #define MOSCHIP_DEVICE_ID_7715          0x7715
@@ -970,25 +968,6 @@ static void mos7720_bulk_out_data_callback(struct urb *urb)
                 tty_port_tty_wakeup(&mos7720_port->port->port);
 }
 
-/*
- * mos77xx_probe
- *      this function installs the appropriate read interrupt endpoint callback
- *      depending on whether the device is a 7720 or 7715, thus avoiding costly
- *      run-time checks in the high-frequency callback routine itself.
- */
-static int mos77xx_probe(struct usb_serial *serial,
-                         const struct usb_device_id *id)
-{
-        if (id->idProduct == MOSCHIP_DEVICE_ID_7715)
-                moschip7720_2port_driver.read_int_callback =
-                        mos7715_interrupt_callback;
-        else
-                moschip7720_2port_driver.read_int_callback =
-                        mos7720_interrupt_callback;
-
-        return 0;
-}
-
 static int mos77xx_calc_num_ports(struct usb_serial *serial)
 {
         u16 product = le16_to_cpu(serial->dev->descriptor.idProduct);
@@ -1917,6 +1896,11 @@ static int mos7720_startup(struct usb_serial *serial)
         u16 product;
         int ret_val;
 
+        if (serial->num_bulk_in < 2 || serial->num_bulk_out < 2) {
+                dev_err(&serial->interface->dev, "missing bulk endpoints\n");
+                return -ENODEV;
+        }
+
         product = le16_to_cpu(serial->dev->descriptor.idProduct);
         dev = serial->dev;
 
@@ -1941,19 +1925,18 @@ static int mos7720_startup(struct usb_serial *serial)
                         tmp->interrupt_in_endpointAddress;
                 serial->port[1]->interrupt_in_urb = NULL;
                 serial->port[1]->interrupt_in_buffer = NULL;
+
+                if (serial->port[0]->interrupt_in_urb) {
+                        struct urb *urb = serial->port[0]->interrupt_in_urb;
+
+                        urb->complete = mos7715_interrupt_callback;
+                }
         }
 
         /* setting configuration feature to one */
         usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
                         (__u8)0x03, 0x00, 0x01, 0x00, NULL, 0x00, 5000);
 
-        /* start the interrupt urb */
-        ret_val = usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL);
-        if (ret_val)
-                dev_err(&dev->dev,
-                        "%s - Error %d submitting control urb\n",
-                        __func__, ret_val);
-
 #ifdef CONFIG_USB_SERIAL_MOS7715_PARPORT
         if (product == MOSCHIP_DEVICE_ID_7715) {
                 ret_val = mos7715_parport_init(serial);
@@ -1961,6 +1944,13 @@ static int mos7720_startup(struct usb_serial *serial)
                         return ret_val;
         }
 #endif
+        /* start the interrupt urb */
+        ret_val = usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL);
+        if (ret_val) {
+                dev_err(&dev->dev, "failed to submit interrupt urb: %d\n",
+                        ret_val);
+        }
+
         /* LSR For Port 1 */
         read_mos_reg(serial, 0, MOS7720_LSR, &data);
         dev_dbg(&dev->dev, "LSR:%x\n", data);
@@ -1970,6 +1960,8 @@ static int mos7720_startup(struct usb_serial *serial)
 
 static void mos7720_release(struct usb_serial *serial)
 {
+        usb_kill_urb(serial->port[0]->interrupt_in_urb);
+
 #ifdef CONFIG_USB_SERIAL_MOS7715_PARPORT
         /* close the parallel port */
 
@@ -2019,11 +2011,6 @@ static int mos7720_port_probe(struct usb_serial_port *port)
         if (!mos7720_port)
                 return -ENOMEM;
 
-        /* Initialize all port interrupt end point to port 0 int endpoint.
-         * Our device has only one interrupt endpoint common to all ports.
-         */
-        port->interrupt_in_endpointAddress =
-                port->serial->port[0]->interrupt_in_endpointAddress;
         mos7720_port->port = port;
 
         usb_set_serial_port_data(port, mos7720_port);
@@ -2053,7 +2040,6 @@ static struct usb_serial_driver moschip7720_2port_driver = {
         .close                  = mos7720_close,
         .throttle               = mos7720_throttle,
         .unthrottle             = mos7720_unthrottle,
-        .probe                  = mos77xx_probe,
         .attach                 = mos7720_startup,
         .release                = mos7720_release,
         .port_probe             = mos7720_port_probe,
@@ -2067,7 +2053,7 @@ static struct usb_serial_driver moschip7720_2port_driver = {
         .chars_in_buffer        = mos7720_chars_in_buffer,
         .break_ctl              = mos7720_break,
         .read_bulk_callback     = mos7720_bulk_in_callback,
-        .read_int_callback      = NULL  /* dynamically assigned in probe() */
+        .read_int_callback      = mos7720_interrupt_callback,
 };
 
 static struct usb_serial_driver * const serial_drivers[] = {
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 9a220b8e810f..ea27fb23967a 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -214,7 +214,6 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 struct moschip_port {
         int port_num;           /*Actual port number in the device(1,2,etc) */
-        struct urb *write_urb;  /* write URB for this port */
         struct urb *read_urb;   /* read URB for this port */
         __u8 shadowLCR;         /* last LCR value received */
         __u8 shadowMCR;         /* last MCR value received */
@@ -1037,9 +1036,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
                                 serial,
                                 serial->port[0]->interrupt_in_urb->interval);
 
-                        /* start interrupt read for mos7840               *
-                         * will continue as long as mos7840 is connected  */
-
+                        /* start interrupt read for mos7840 */
                         response =
                             usb_submit_urb(serial->port[0]->interrupt_in_urb,
                                            GFP_KERNEL);
@@ -1186,7 +1183,6 @@ static void mos7840_close(struct usb_serial_port *port)
                 }
         }
 
-        usb_kill_urb(mos7840_port->write_urb);
         usb_kill_urb(mos7840_port->read_urb);
         mos7840_port->read_urb_busy = false;
 
@@ -1199,12 +1195,6 @@ static void mos7840_close(struct usb_serial_port *port)
                 }
         }
 
-        if (mos7840_port->write_urb) {
-                /* if this urb had a transfer buffer already (old tx) free it */
-                kfree(mos7840_port->write_urb->transfer_buffer);
-                usb_free_urb(mos7840_port->write_urb);
-        }
-
         Data = 0x0;
         mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
 
@@ -2113,6 +2103,17 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)
         return mos7840_num_ports;
 }
 
+static int mos7840_attach(struct usb_serial *serial)
+{
+        if (serial->num_bulk_in < serial->num_ports ||
+                        serial->num_bulk_out < serial->num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int mos7840_port_probe(struct usb_serial_port *port)
 {
         struct usb_serial *serial = port->serial;
@@ -2388,6 +2389,7 @@ static struct usb_serial_driver moschip7840_4port_device = {
         .tiocmset = mos7840_tiocmset,
         .tiocmiwait = usb_serial_generic_tiocmiwait,
         .get_icount = usb_serial_generic_get_icount,
+        .attach = mos7840_attach,
         .port_probe = mos7840_port_probe,
         .port_remove = mos7840_port_remove,
         .read_bulk_callback = mos7840_bulk_in_callback,
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index f6c6900bccf0..a180b17d2432 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -38,6 +38,7 @@ static int  omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
                                 const unsigned char *buf, int count);
 static int  omninet_write_room(struct tty_struct *tty);
 static void omninet_disconnect(struct usb_serial *serial);
+static int omninet_attach(struct usb_serial *serial);
 static int omninet_port_probe(struct usb_serial_port *port);
 static int omninet_port_remove(struct usb_serial_port *port);
 
@@ -56,6 +57,7 @@ static struct usb_serial_driver zyxel_omninet_device = {
         .description =          "ZyXEL - omni.net lcd plus usb",
         .id_table =             id_table,
         .num_ports =            1,
+        .attach =               omninet_attach,
         .port_probe =           omninet_port_probe,
         .port_remove =          omninet_port_remove,
         .open =                 omninet_open,
@@ -104,6 +106,17 @@ struct omninet_data {
         __u8    od_outseq;      /* Sequence number for bulk_out URBs */
 };
 
+static int omninet_attach(struct usb_serial *serial)
+{
+        /* The second bulk-out endpoint is used for writing. */
+        if (serial->num_bulk_out < 2) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int omninet_port_probe(struct usb_serial_port *port)
 {
         struct omninet_data *od;
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index a4b88bc038b6..b8bf52bf7a94 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -134,6 +134,7 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty);
 static int oti6858_tiocmget(struct tty_struct *tty);
 static int oti6858_tiocmset(struct tty_struct *tty,
                                 unsigned int set, unsigned int clear);
+static int oti6858_attach(struct usb_serial *serial);
 static int oti6858_port_probe(struct usb_serial_port *port);
 static int oti6858_port_remove(struct usb_serial_port *port);
 
@@ -158,6 +159,7 @@ static struct usb_serial_driver oti6858_device = {
         .write_bulk_callback =  oti6858_write_bulk_callback,
         .write_room =           oti6858_write_room,
         .chars_in_buffer =      oti6858_chars_in_buffer,
+        .attach =               oti6858_attach,
         .port_probe =           oti6858_port_probe,
         .port_remove =          oti6858_port_remove,
 };
@@ -324,6 +326,20 @@ static void send_data(struct work_struct *work)
         usb_serial_port_softint(port);
 }
 
+static int oti6858_attach(struct usb_serial *serial)
+{
+        unsigned char num_ports = serial->num_ports;
+
+        if (serial->num_bulk_in < num_ports ||
+                        serial->num_bulk_out < num_ports ||
+                        serial->num_interrupt_in < num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int oti6858_port_probe(struct usb_serial_port *port)
 {
         struct oti6858_private *priv;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ae682e4eeaef..46fca6b75846 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -220,9 +220,17 @@ static int pl2303_probe(struct usb_serial *serial,
 static int pl2303_startup(struct usb_serial *serial)
 {
         struct pl2303_serial_private *spriv;
+        unsigned char num_ports = serial->num_ports;
         enum pl2303_type type = TYPE_01;
         unsigned char *buf;
 
+        if (serial->num_bulk_in < num_ports ||
+                        serial->num_bulk_out < num_ports ||
+                        serial->num_interrupt_in < num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
         spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
         if (!spriv)
                 return -ENOMEM;
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 659cb8606bd9..5709cc93b083 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -408,16 +408,12 @@ static void qt2_close(struct usb_serial_port *port)
 {
         struct usb_serial *serial;
         struct qt2_port_private *port_priv;
-        unsigned long flags;
         int i;
 
         serial = port->serial;
         port_priv = usb_get_serial_port_data(port);
 
-        spin_lock_irqsave(&port_priv->urb_lock, flags);
         usb_kill_urb(port_priv->write_urb);
-        port_priv->urb_in_use = false;
-        spin_unlock_irqrestore(&port_priv->urb_lock, flags);
 
         /* flush the port transmit buffer */
         i = usb_control_msg(serial->dev,
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index ef0dbf0703c5..475e6c31b266 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -154,6 +154,19 @@ static int spcp8x5_probe(struct usb_serial *serial,
         return 0;
 }
 
+static int spcp8x5_attach(struct usb_serial *serial)
+{
+        unsigned char num_ports = serial->num_ports;
+
+        if (serial->num_bulk_in < num_ports ||
+                        serial->num_bulk_out < num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int spcp8x5_port_probe(struct usb_serial_port *port)
 {
         const struct usb_device_id *id = usb_get_serial_data(port->serial);
@@ -477,6 +490,7 @@ static struct usb_serial_driver spcp8x5_device = {
         .tiocmget               = spcp8x5_tiocmget,
         .tiocmset               = spcp8x5_tiocmset,
         .probe                  = spcp8x5_probe,
+        .attach                 = spcp8x5_attach,
         .port_probe             = spcp8x5_port_probe,
         .port_remove            = spcp8x5_port_remove,
 };
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 8db9d071d940..64b85b8dedf3 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -579,6 +579,13 @@ static int ti_startup(struct usb_serial *serial)
                 goto free_tdev;
         }
 
+        if (serial->num_bulk_in < serial->num_ports ||
+                        serial->num_bulk_out < serial->num_ports) {
+                dev_err(&serial->interface->dev, "missing endpoints\n");
+                status = -ENODEV;
+                goto free_tdev;
+        }
+
         return 0;
 
 free_tdev:
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index af3c7eecff91..16cc18369111 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -2109,6 +2109,13 @@ UNUSUAL_DEV(  0x152d, 0x2566, 0x0114, 0x0114,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_BROKEN_FUA ),
 
+/* Reported-by George Cherian <george.cherian@cavium.com> */
+UNUSUAL_DEV(0x152d, 0x9561, 0x0000, 0x9999,
+                "JMicron",
+                "JMS56x",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NO_REPORT_OPCODES),
+
 /*
  * Entrega Technologies U1-SC25 (later Xircom PortGear PGSCSI)
  * and Mac USB Dock USB-SCSI */
diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c
index be1ee89ee917..36d75c367d22 100644
--- a/drivers/vfio/mdev/mdev_core.c
+++ b/drivers/vfio/mdev/mdev_core.c
@@ -27,6 +27,45 @@ static LIST_HEAD(parent_list);
 static DEFINE_MUTEX(parent_list_lock);
 static struct class_compat *mdev_bus_compat_class;
 
+static LIST_HEAD(mdev_list);
+static DEFINE_MUTEX(mdev_list_lock);
+
+struct device *mdev_parent_dev(struct mdev_device *mdev)
+{
+        return mdev->parent->dev;
+}
+EXPORT_SYMBOL(mdev_parent_dev);
+
+void *mdev_get_drvdata(struct mdev_device *mdev)
+{
+        return mdev->driver_data;
+}
+EXPORT_SYMBOL(mdev_get_drvdata);
+
+void mdev_set_drvdata(struct mdev_device *mdev, void *data)
+{
+        mdev->driver_data = data;
+}
+EXPORT_SYMBOL(mdev_set_drvdata);
+
+struct device *mdev_dev(struct mdev_device *mdev)
+{
+        return &mdev->dev;
+}
+EXPORT_SYMBOL(mdev_dev);
+
+struct mdev_device *mdev_from_dev(struct device *dev)
+{
+        return dev_is_mdev(dev) ? to_mdev_device(dev) : NULL;
+}
+EXPORT_SYMBOL(mdev_from_dev);
+
+uuid_le mdev_uuid(struct mdev_device *mdev)
+{
+        return mdev->uuid;
+}
+EXPORT_SYMBOL(mdev_uuid);
+
 static int _find_mdev_device(struct device *dev, void *data)
 {
         struct mdev_device *mdev;
@@ -42,7 +81,7 @@ static int _find_mdev_device(struct device *dev, void *data)
         return 0;
 }
 
-static bool mdev_device_exist(struct parent_device *parent, uuid_le uuid)
+static bool mdev_device_exist(struct mdev_parent *parent, uuid_le uuid)
 {
         struct device *dev;
 
@@ -56,9 +95,9 @@ static bool mdev_device_exist(struct parent_device *parent, uuid_le uuid)
 }
 
 /* Should be called holding parent_list_lock */
-static struct parent_device *__find_parent_device(struct device *dev)
+static struct mdev_parent *__find_parent_device(struct device *dev)
 {
-        struct parent_device *parent;
+        struct mdev_parent *parent;
 
         list_for_each_entry(parent, &parent_list, next) {
                 if (parent->dev == dev)
@@ -69,8 +108,8 @@ static struct parent_device *__find_parent_device(struct device *dev)
 
 static void mdev_release_parent(struct kref *kref)
 {
-        struct parent_device *parent = container_of(kref, struct parent_device,
-                                                    ref);
+        struct mdev_parent *parent = container_of(kref, struct mdev_parent,
+                                                  ref);
         struct device *dev = parent->dev;
 
         kfree(parent);
@@ -78,7 +117,7 @@ static void mdev_release_parent(struct kref *kref)
 }
 
 static
-inline struct parent_device *mdev_get_parent(struct parent_device *parent)
+inline struct mdev_parent *mdev_get_parent(struct mdev_parent *parent)
 {
         if (parent)
                 kref_get(&parent->ref);
@@ -86,7 +125,7 @@ inline struct parent_device *mdev_get_parent(struct parent_device *parent)
         return parent;
 }
 
-static inline void mdev_put_parent(struct parent_device *parent)
+static inline void mdev_put_parent(struct mdev_parent *parent)
 {
         if (parent)
                 kref_put(&parent->ref, mdev_release_parent);
@@ -95,7 +134,7 @@ static inline void mdev_put_parent(struct parent_device *parent)
 static int mdev_device_create_ops(struct kobject *kobj,
                                   struct mdev_device *mdev)
 {
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
         int ret;
 
         ret = parent->ops->create(kobj, mdev);
@@ -122,7 +161,7 @@ static int mdev_device_create_ops(struct kobject *kobj,
  */
 static int mdev_device_remove_ops(struct mdev_device *mdev, bool force_remove)
 {
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
         int ret;
 
         /*
@@ -153,10 +192,10 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
  * Add device to list of registered parent devices.
  * Returns a negative value on error, otherwise 0.
  */
-int mdev_register_device(struct device *dev, const struct parent_ops *ops)
+int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)
 {
         int ret;
-        struct parent_device *parent;
+        struct mdev_parent *parent;
 
         /* check for mandatory ops */
         if (!ops || !ops->create || !ops->remove || !ops->supported_type_groups)
@@ -229,7 +268,7 @@ EXPORT_SYMBOL(mdev_register_device);
 
 void mdev_unregister_device(struct device *dev)
 {
-        struct parent_device *parent;
+        struct mdev_parent *parent;
         bool force_remove = true;
 
         mutex_lock(&parent_list_lock);
@@ -266,7 +305,7 @@ int mdev_device_create(struct kobject *kobj, struct device *dev, uuid_le uuid)
 {
         int ret;
         struct mdev_device *mdev;
-        struct parent_device *parent;
+        struct mdev_parent *parent;
         struct mdev_type *type = to_mdev_type(kobj);
 
         parent = mdev_get_parent(type->parent);
@@ -316,6 +355,11 @@ int mdev_device_create(struct kobject *kobj, struct device *dev, uuid_le uuid)
         dev_dbg(&mdev->dev, "MDEV: created\n");
 
         mutex_unlock(&parent->lock);
+
+        mutex_lock(&mdev_list_lock);
+        list_add(&mdev->next, &mdev_list);
+        mutex_unlock(&mdev_list_lock);
+
         return ret;
 
 create_failed:
@@ -329,12 +373,30 @@ create_err:
 
 int mdev_device_remove(struct device *dev, bool force_remove)
 {
-        struct mdev_device *mdev;
-        struct parent_device *parent;
+        struct mdev_device *mdev, *tmp;
+        struct mdev_parent *parent;
         struct mdev_type *type;
         int ret;
+        bool found = false;
 
         mdev = to_mdev_device(dev);
+
+        mutex_lock(&mdev_list_lock);
+        list_for_each_entry(tmp, &mdev_list, next) {
+                if (tmp == mdev) {
+                        found = true;
+                        break;
+                }
+        }
+
+        if (found)
+                list_del(&mdev->next);
+
+        mutex_unlock(&mdev_list_lock);
+
+        if (!found)
+                return -ENODEV;
+
         type = to_mdev_type(mdev->type_kobj);
         parent = mdev->parent;
         mutex_lock(&parent->lock);
@@ -342,6 +404,11 @@ int mdev_device_remove(struct device *dev, bool force_remove)
         ret = mdev_device_remove_ops(mdev, force_remove);
         if (ret) {
                 mutex_unlock(&parent->lock);
+
+                mutex_lock(&mdev_list_lock);
+                list_add(&mdev->next, &mdev_list);
+                mutex_unlock(&mdev_list_lock);
+
                 return ret;
         }
 
@@ -349,7 +416,8 @@ int mdev_device_remove(struct device *dev, bool force_remove)
         device_unregister(dev);
         mutex_unlock(&parent->lock);
         mdev_put_parent(parent);
-        return ret;
+
+        return 0;
 }
 
 static int __init mdev_init(void)
diff --git a/drivers/vfio/mdev/mdev_private.h b/drivers/vfio/mdev/mdev_private.h
index d35097cbf3d7..a9cefd70a705 100644
--- a/drivers/vfio/mdev/mdev_private.h
+++ b/drivers/vfio/mdev/mdev_private.h
@@ -16,10 +16,33 @@
 int  mdev_bus_register(void);
 void mdev_bus_unregister(void);
 
+struct mdev_parent {
+        struct device *dev;
+        const struct mdev_parent_ops *ops;
+        struct kref ref;
+        struct mutex lock;
+        struct list_head next;
+        struct kset *mdev_types_kset;
+        struct list_head type_list;
+};
+
+struct mdev_device {
+        struct device dev;
+        struct mdev_parent *parent;
+        uuid_le uuid;
+        void *driver_data;
+        struct kref ref;
+        struct list_head next;
+        struct kobject *type_kobj;
+};
+
+#define to_mdev_device(dev)     container_of(dev, struct mdev_device, dev)
+#define dev_is_mdev(d)          ((d)->bus == &mdev_bus_type)
+
 struct mdev_type {
         struct kobject kobj;
         struct kobject *devices_kobj;
-        struct parent_device *parent;
+        struct mdev_parent *parent;
         struct list_head next;
         struct attribute_group *group;
 };
@@ -29,8 +52,8 @@ struct mdev_type {
 #define to_mdev_type(_kobj)             \
         container_of(_kobj, struct mdev_type, kobj)
 
-int  parent_create_sysfs_files(struct parent_device *parent);
-void parent_remove_sysfs_files(struct parent_device *parent);
+int  parent_create_sysfs_files(struct mdev_parent *parent);
+void parent_remove_sysfs_files(struct mdev_parent *parent);
 
 int  mdev_create_sysfs_files(struct device *dev, struct mdev_type *type);
 void mdev_remove_sysfs_files(struct device *dev, struct mdev_type *type);
diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c
index 1a53deb2ee10..802df210929b 100644
--- a/drivers/vfio/mdev/mdev_sysfs.c
+++ b/drivers/vfio/mdev/mdev_sysfs.c
@@ -92,7 +92,7 @@ static struct kobj_type mdev_type_ktype = {
         .release = mdev_type_release,
 };
 
-struct mdev_type *add_mdev_supported_type(struct parent_device *parent,
+struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent,
                                           struct attribute_group *group)
 {
         struct mdev_type *type;
@@ -158,7 +158,7 @@ static void remove_mdev_supported_type(struct mdev_type *type)
         kobject_put(&type->kobj);
 }
 
-static int add_mdev_supported_type_groups(struct parent_device *parent)
+static int add_mdev_supported_type_groups(struct mdev_parent *parent)
 {
         int i;
 
@@ -183,7 +183,7 @@ static int add_mdev_supported_type_groups(struct parent_device *parent)
 }
 
 /* mdev sysfs functions */
-void parent_remove_sysfs_files(struct parent_device *parent)
+void parent_remove_sysfs_files(struct mdev_parent *parent)
 {
         struct mdev_type *type, *tmp;
 
@@ -196,7 +196,7 @@ void parent_remove_sysfs_files(struct parent_device *parent)
         kset_unregister(parent->mdev_types_kset);
 }
 
-int parent_create_sysfs_files(struct parent_device *parent)
+int parent_create_sysfs_files(struct mdev_parent *parent)
 {
         int ret;
 
diff --git a/drivers/vfio/mdev/vfio_mdev.c b/drivers/vfio/mdev/vfio_mdev.c
index ffc36758cb84..fa848a701b8b 100644
--- a/drivers/vfio/mdev/vfio_mdev.c
+++ b/drivers/vfio/mdev/vfio_mdev.c
@@ -27,7 +27,7 @@
 static int vfio_mdev_open(void *device_data)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
         int ret;
 
         if (unlikely(!parent->ops->open))
@@ -46,7 +46,7 @@ static int vfio_mdev_open(void *device_data)
 static void vfio_mdev_release(void *device_data)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
 
         if (likely(parent->ops->release))
                 parent->ops->release(mdev);
@@ -58,7 +58,7 @@ static long vfio_mdev_unlocked_ioctl(void *device_data,
                                      unsigned int cmd, unsigned long arg)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
 
         if (unlikely(!parent->ops->ioctl))
                 return -EINVAL;
@@ -70,7 +70,7 @@ static ssize_t vfio_mdev_read(void *device_data, char __user *buf,
                               size_t count, loff_t *ppos)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
 
         if (unlikely(!parent->ops->read))
                 return -EINVAL;
@@ -82,7 +82,7 @@ static ssize_t vfio_mdev_write(void *device_data, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
 
         if (unlikely(!parent->ops->write))
                 return -EINVAL;
@@ -93,7 +93,7 @@ static ssize_t vfio_mdev_write(void *device_data, const char __user *buf,
 static int vfio_mdev_mmap(void *device_data, struct vm_area_struct *vma)
 {
         struct mdev_device *mdev = device_data;
-        struct parent_device *parent = mdev->parent;
+        struct mdev_parent *parent = mdev->parent;
 
         if (unlikely(!parent->ops->mmap))
                 return -EINVAL;
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index dcd7c2a99618..324c52e3a1a4 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -1142,6 +1142,10 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma)
                         return ret;
 
                 vdev->barmap[index] = pci_iomap(pdev, index, 0);
+                if (!vdev->barmap[index]) {
+                        pci_release_selected_regions(pdev, 1 << index);
+                        return -ENOMEM;
+                }
         }
 
         vma->vm_private_data = vdev;
diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c
index 5ffd1d9ad4bd..357243d76f10 100644
--- a/drivers/vfio/pci/vfio_pci_rdwr.c
+++ b/drivers/vfio/pci/vfio_pci_rdwr.c
@@ -193,7 +193,10 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,
         if (!vdev->has_vga)
                 return -EINVAL;
 
-        switch (pos) {
+        if (pos > 0xbfffful)
+                return -EINVAL;
+
+        switch ((u32)pos) {
         case 0xa0000 ... 0xbffff:
                 count = min(count, (size_t)(0xc0000 - pos));
                 iomem = ioremap_nocache(0xa0000, 0xbffff - 0xa0000 + 1);
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index f3726ba12aa6..9266271a787a 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -268,28 +268,38 @@ static void vfio_lock_acct(struct task_struct *task, long npage)
 {
         struct vwork *vwork;
         struct mm_struct *mm;
+        bool is_current;
 
         if (!npage)
                 return;
 
-        mm = get_task_mm(task);
+        is_current = (task->mm == current->mm);
+
+        mm = is_current ? task->mm : get_task_mm(task);
         if (!mm)
-                return; /* process exited or nothing to do */
+                return; /* process exited */
 
         if (down_write_trylock(&mm->mmap_sem)) {
                 mm->locked_vm += npage;
                 up_write(&mm->mmap_sem);
-                mmput(mm);
+                if (!is_current)
+                        mmput(mm);
                 return;
         }
 
+        if (is_current) {
+                mm = get_task_mm(task);
+                if (!mm)
+                        return;
+        }
+
         /*
          * Couldn't get mmap_sem lock, so must setup to update
          * mm->locked_vm later. If locked_vm were atomic, we
          * wouldn't need this silliness
          */
         vwork = kmalloc(sizeof(struct vwork), GFP_KERNEL);
-        if (!vwork) {
+        if (WARN_ON(!vwork)) {
                 mmput(mm);
                 return;
         }
@@ -393,77 +403,71 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
 static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,
                                   long npage, unsigned long *pfn_base)
 {
-        unsigned long limit;
-        bool lock_cap = ns_capable(task_active_pid_ns(dma->task)->user_ns,
-                                   CAP_IPC_LOCK);
-        struct mm_struct *mm;
-        long ret, i = 0, lock_acct = 0;
+        unsigned long limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
+        bool lock_cap = capable(CAP_IPC_LOCK);
+        long ret, pinned = 0, lock_acct = 0;
         bool rsvd;
         dma_addr_t iova = vaddr - dma->vaddr + dma->iova;
 
-        mm = get_task_mm(dma->task);
-        if (!mm)
+        /* This code path is only user initiated */
+        if (!current->mm)
                 return -ENODEV;
 
-        ret = vaddr_get_pfn(mm, vaddr, dma->prot, pfn_base);
+        ret = vaddr_get_pfn(current->mm, vaddr, dma->prot, pfn_base);
         if (ret)
-                goto pin_pg_remote_exit;
+                return ret;
 
+        pinned++;
         rsvd = is_invalid_reserved_pfn(*pfn_base);
-        limit = task_rlimit(dma->task, RLIMIT_MEMLOCK) >> PAGE_SHIFT;
 
         /*
          * Reserved pages aren't counted against the user, externally pinned
          * pages are already counted against the user.
          */
         if (!rsvd && !vfio_find_vpfn(dma, iova)) {
-                if (!lock_cap && mm->locked_vm + 1 > limit) {
+                if (!lock_cap && current->mm->locked_vm + 1 > limit) {
                         put_pfn(*pfn_base, dma->prot);
                         pr_warn("%s: RLIMIT_MEMLOCK (%ld) exceeded\n", __func__,
                                         limit << PAGE_SHIFT);
-                        ret = -ENOMEM;
-                        goto pin_pg_remote_exit;
+                        return -ENOMEM;
                 }
                 lock_acct++;
         }
 
-        i++;
-        if (likely(!disable_hugepages)) {
-                /* Lock all the consecutive pages from pfn_base */
-                for (vaddr += PAGE_SIZE, iova += PAGE_SIZE; i < npage;
-                     i++, vaddr += PAGE_SIZE, iova += PAGE_SIZE) {
-                        unsigned long pfn = 0;
+        if (unlikely(disable_hugepages))
+                goto out;
 
-                        ret = vaddr_get_pfn(mm, vaddr, dma->prot, &pfn);
-                        if (ret)
-                                break;
+        /* Lock all the consecutive pages from pfn_base */
+        for (vaddr += PAGE_SIZE, iova += PAGE_SIZE; pinned < npage;
+             pinned++, vaddr += PAGE_SIZE, iova += PAGE_SIZE) {
+                unsigned long pfn = 0;
 
-                        if (pfn != *pfn_base + i ||
-                            rsvd != is_invalid_reserved_pfn(pfn)) {
+                ret = vaddr_get_pfn(current->mm, vaddr, dma->prot, &pfn);
+                if (ret)
+                        break;
+
+                if (pfn != *pfn_base + pinned ||
+                    rsvd != is_invalid_reserved_pfn(pfn)) {
+                        put_pfn(pfn, dma->prot);
+                        break;
+                }
+
+                if (!rsvd && !vfio_find_vpfn(dma, iova)) {
+                        if (!lock_cap &&
+                            current->mm->locked_vm + lock_acct + 1 > limit) {
                                 put_pfn(pfn, dma->prot);
+                                pr_warn("%s: RLIMIT_MEMLOCK (%ld) exceeded\n",
+                                        __func__, limit << PAGE_SHIFT);
                                 break;
                         }
-
-                        if (!rsvd && !vfio_find_vpfn(dma, iova)) {
-                                if (!lock_cap &&
-                                    mm->locked_vm + lock_acct + 1 > limit) {
-                                        put_pfn(pfn, dma->prot);
-                                        pr_warn("%s: RLIMIT_MEMLOCK (%ld) "
-                                                "exceeded\n", __func__,
-                                                limit << PAGE_SHIFT);
-                                        break;
-                                }
-                                lock_acct++;
-                        }
+                        lock_acct++;
                 }
         }
 
-        vfio_lock_acct(dma->task, lock_acct);
-        ret = i;
+out:
+        vfio_lock_acct(current, lock_acct);
 
-pin_pg_remote_exit:
-        mmput(mm);
-        return ret;
+        return pinned;
 }
 
 static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova,
@@ -473,10 +477,10 @@ static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova,
         long unlocked = 0, locked = 0;
         long i;
 
-        for (i = 0; i < npage; i++) {
+        for (i = 0; i < npage; i++, iova += PAGE_SIZE) {
                 if (put_pfn(pfn++, dma->prot)) {
                         unlocked++;
-                        if (vfio_find_vpfn(dma, iova + (i << PAGE_SHIFT)))
+                        if (vfio_find_vpfn(dma, iova))
                                 locked++;
                 }
         }
diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c
index 2d3b691f3fc4..038ac6934fe9 100644
--- a/drivers/video/fbdev/cobalt_lcdfb.c
+++ b/drivers/video/fbdev/cobalt_lcdfb.c
@@ -308,6 +308,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev)
         info->screen_size = resource_size(res);
         info->screen_base = devm_ioremap(&dev->dev, res->start,
                                          info->screen_size);
+        if (!info->screen_base) {
+                framebuffer_release(info);
+                return -ENOMEM;
+        }
+
         info->fbops = &cobalt_lcd_fbops;
         info->fix = cobalt_lcdfb_fix;
         info->fix.smem_start = res->start;
diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
index 778acf80aacb..85dd20e05726 100644
--- a/drivers/xen/arm-device.c
+++ b/drivers/xen/arm-device.c
@@ -58,9 +58,13 @@ static int xen_map_device_mmio(const struct resource *resources,
         xen_pfn_t *gpfns;
         xen_ulong_t *idxs;
         int *errs;
-        struct xen_add_to_physmap_range xatp;
 
         for (i = 0; i < count; i++) {
+                struct xen_add_to_physmap_range xatp = {
+                        .domid = DOMID_SELF,
+                        .space = XENMAPSPACE_dev_mmio
+                };
+
                 r = &resources[i];
                 nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
                 if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
@@ -87,9 +91,7 @@ static int xen_map_device_mmio(const struct resource *resources,
                         idxs[j] = XEN_PFN_DOWN(r->start) + j;
                 }
 
-                xatp.domid = DOMID_SELF;
                 xatp.size = nr;
-                xatp.space = XENMAPSPACE_dev_mmio;
 
                 set_xen_guest_handle(xatp.gpfns, gpfns);
                 set_xen_guest_handle(xatp.idxs, idxs);
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index c03f9c86c7e3..3c41470c7fc4 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -369,8 +369,7 @@ static void evtchn_fifo_resume(void)
                 }
 
                 ret = init_control_block(cpu, control_block);
-                if (ret < 0)
-                        BUG();
+                BUG_ON(ret < 0);
         }
 
         /*
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index e8c7f09d01be..6890897a6f30 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -125,7 +125,7 @@ static int add_evtchn(struct per_user_data *u, struct user_evtchn *evtchn)
         while (*new) {
                 struct user_evtchn *this;
 
-                this = container_of(*new, struct user_evtchn, node);
+                this = rb_entry(*new, struct user_evtchn, node);
 
                 parent = *new;
                 if (this->port < evtchn->port)
@@ -157,7 +157,7 @@ static struct user_evtchn *find_evtchn(struct per_user_data *u, unsigned port)
         while (node) {
                 struct user_evtchn *evtchn;
 
-                evtchn = container_of(node, struct user_evtchn, node);
+                evtchn = rb_entry(node, struct user_evtchn, node);
 
                 if (evtchn->port < port)
                         node = node->rb_left;
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 478fb91e3df2..f905d6eeb048 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -275,6 +275,10 @@ retry:
                 rc = 0;
         } else
                 rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs);
+
+        if (!rc)
+                swiotlb_set_max_segment(PAGE_SIZE);
+
         return rc;
 error:
         if (repeat--) {
@@ -392,7 +396,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
         if (dma_capable(dev, dev_addr, size) &&
             !range_straddles_page_boundary(phys, size) &&
                 !xen_arch_need_swiotlb(dev, phys, dev_addr) &&
-                !swiotlb_force) {
+                (swiotlb_force != SWIOTLB_FORCE)) {
                 /* we are not interested in the dma_addr returned by
                  * xen_dma_map_page, only in the potential cache flushes executed
                  * by the function. */
@@ -552,7 +556,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
                 phys_addr_t paddr = sg_phys(sg);
                 dma_addr_t dev_addr = xen_phys_to_bus(paddr);
 
-                if (swiotlb_force ||
+                if (swiotlb_force == SWIOTLB_FORCE ||
                     xen_arch_need_swiotlb(hwdev, paddr, dev_addr) ||
                     !dma_capable(hwdev, dev_addr, sg->length) ||
                     range_straddles_page_boundary(paddr, sg->length)) {
diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h
index e74f9c1fbd80..867a2e425208 100644
--- a/drivers/xen/xenbus/xenbus_comms.h
+++ b/drivers/xen/xenbus/xenbus_comms.h
@@ -42,7 +42,6 @@ int xb_write(const void *data, unsigned len);
 int xb_read(void *data, unsigned len);
 int xb_data_to_read(void);
 int xb_wait_for_data_to_read(void);
-int xs_input_avail(void);
 extern struct xenstore_domain_interface *xen_store_interface;
 extern int xen_store_evtchn;
 extern enum xenstore_init xen_store_domain_type;
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index 6c0ead4be784..79130b310247 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -302,6 +302,29 @@ static void watch_fired(struct xenbus_watch *watch,
         mutex_unlock(&adap->dev_data->reply_mutex);
 }
 
+static int xenbus_command_reply(struct xenbus_file_priv *u,
+                                unsigned int msg_type, const char *reply)
+{
+        struct {
+                struct xsd_sockmsg hdr;
+                const char body[16];
+        } msg;
+        int rc;
+
+        msg.hdr = u->u.msg;
+        msg.hdr.type = msg_type;
+        msg.hdr.len = strlen(reply) + 1;
+        if (msg.hdr.len > sizeof(msg.body))
+                return -E2BIG;
+
+        mutex_lock(&u->reply_mutex);
+        rc = queue_reply(&u->read_buffers, &msg, sizeof(msg.hdr) + msg.hdr.len);
+        wake_up(&u->read_waitq);
+        mutex_unlock(&u->reply_mutex);
+
+        return rc;
+}
+
 static int xenbus_write_transaction(unsigned msg_type,
                                     struct xenbus_file_priv *u)
 {
@@ -316,12 +339,12 @@ static int xenbus_write_transaction(unsigned msg_type,
                         rc = -ENOMEM;
                         goto out;
                 }
-        } else if (msg_type == XS_TRANSACTION_END) {
+        } else if (u->u.msg.tx_id != 0) {
                 list_for_each_entry(trans, &u->transactions, list)
                         if (trans->handle.id == u->u.msg.tx_id)
                                 break;
                 if (&trans->list == &u->transactions)
-                        return -ESRCH;
+                        return xenbus_command_reply(u, XS_ERROR, "ENOENT");
         }
 
         reply = xenbus_dev_request_and_reply(&u->u.msg);
@@ -372,12 +395,12 @@ static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
         path = u->u.buffer + sizeof(u->u.msg);
         token = memchr(path, 0, u->u.msg.len);
         if (token == NULL) {
-                rc = -EILSEQ;
+                rc = xenbus_command_reply(u, XS_ERROR, "EINVAL");
                 goto out;
         }
         token++;
         if (memchr(token, 0, u->u.msg.len - (token - path)) == NULL) {
-                rc = -EILSEQ;
+                rc = xenbus_command_reply(u, XS_ERROR, "EINVAL");
                 goto out;
         }
 
@@ -411,23 +434,7 @@ static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
         }
 
         /* Success.  Synthesize a reply to say all is OK. */
-        {
-                struct {
-                        struct xsd_sockmsg hdr;
-                        char body[3];
-                } __packed reply = {
-                        {
-                                .type = msg_type,
-                                .len = sizeof(reply.body)
-                        },
-                        "OK"
-                };
-
-                mutex_lock(&u->reply_mutex);
-                rc = queue_reply(&u->read_buffers, &reply, sizeof(reply));
-                wake_up(&u->read_waitq);
-                mutex_unlock(&u->reply_mutex);
-        }
+        rc = xenbus_command_reply(u, msg_type, "OK");
 
 out:
         return rc;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6254cee8f8f3..5db5d1340d69 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -328,6 +328,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
         struct file *file = iocb->ki_filp;
         struct inode *inode = bdev_file_inode(file);
         struct block_device *bdev = I_BDEV(inode);
+        struct blk_plug plug;
         struct blkdev_dio *dio;
         struct bio *bio;
         bool is_read = (iov_iter_rw(iter) == READ);
@@ -353,6 +354,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
         dio->multi_bio = false;
         dio->should_dirty = is_read && (iter->type == ITER_IOVEC);
 
+        blk_start_plug(&plug);
         for (;;) {
                 bio->bi_bdev = bdev;
                 bio->bi_iter.bi_sector = pos >> 9;
@@ -394,6 +396,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
                 submit_bio(bio);
                 bio = bio_alloc(GFP_KERNEL, nr_pages);
         }
+        blk_finish_plug(&plug);
 
         if (!dio->is_sync)
                 return -EIOCBQUEUED;
diff --git a/fs/buffer.c b/fs/buffer.c
index d21771fcf7d3..0e87401cf335 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1660,7 +1660,7 @@ void clean_bdev_aliases(struct block_device *bdev, sector_t block, sector_t len)
                         head = page_buffers(page);
                         bh = head;
                         do {
-                                if (!buffer_mapped(bh))
+                                if (!buffer_mapped(bh) || (bh->b_blocknr < block))
                                         goto next;
                                 if (bh->b_blocknr >= block + len)
                                         break;
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index 6eeea1dcba41..95cd4c3b06c3 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -248,7 +248,8 @@ retry:
                 goto out;
 
         if (fscrypt_dummy_context_enabled(inode)) {
-                memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE);
+                memset(raw_key, 0x42, keysize/2);
+                memset(raw_key+keysize/2, 0x24, keysize - (keysize/2));
                 goto got_key;
         }
 
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 6ed7c2eebeec..d6cd7ea4851d 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -179,6 +179,11 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)
                 BUG_ON(1);
         }
 
+        /* No restrictions on file types which are never encrypted */
+        if (!S_ISREG(child->i_mode) && !S_ISDIR(child->i_mode) &&
+            !S_ISLNK(child->i_mode))
+                return 1;
+
         /* no restrictions if the parent directory is not encrypted */
         if (!parent->i_sb->s_cop->is_encrypted(parent))
                 return 1;
diff --git a/fs/dax.c b/fs/dax.c
index a8732fbed381..5c74f60d0a50 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -451,16 +451,37 @@ void dax_wake_mapping_entry_waiter(struct address_space *mapping,
                 __wake_up(wq, TASK_NORMAL, wake_all ? 0 : 1, &key);
 }
 
+static int __dax_invalidate_mapping_entry(struct address_space *mapping,
+                                          pgoff_t index, bool trunc)
+{
+        int ret = 0;
+        void *entry;
+        struct radix_tree_root *page_tree = &mapping->page_tree;
+
+        spin_lock_irq(&mapping->tree_lock);
+        entry = get_unlocked_mapping_entry(mapping, index, NULL);
+        if (!entry || !radix_tree_exceptional_entry(entry))
+                goto out;
+        if (!trunc &&
+            (radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_DIRTY) ||
+             radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_TOWRITE)))
+                goto out;
+        radix_tree_delete(page_tree, index);
+        mapping->nrexceptional--;
+        ret = 1;
+out:
+        put_unlocked_mapping_entry(mapping, index, entry);
+        spin_unlock_irq(&mapping->tree_lock);
+        return ret;
+}
 /*
  * Delete exceptional DAX entry at @index from @mapping. Wait for radix tree
  * entry to get unlocked before deleting it.
  */
 int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index)
 {
-        void *entry;
+        int ret = __dax_invalidate_mapping_entry(mapping, index, true);
 
-        spin_lock_irq(&mapping->tree_lock);
-        entry = get_unlocked_mapping_entry(mapping, index, NULL);
         /*
          * This gets called from truncate / punch_hole path. As such, the caller
          * must hold locks protecting against concurrent modifications of the
@@ -468,16 +489,46 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index)
          * caller has seen exceptional entry for this index, we better find it
          * at that index as well...
          */
-        if (WARN_ON_ONCE(!entry || !radix_tree_exceptional_entry(entry))) {
-                spin_unlock_irq(&mapping->tree_lock);
-                return 0;
-        }
-        radix_tree_delete(&mapping->page_tree, index);
+        WARN_ON_ONCE(!ret);
+        return ret;
+}
+
+/*
+ * Invalidate exceptional DAX entry if easily possible. This handles DAX
+ * entries for invalidate_inode_pages() so we evict the entry only if we can
+ * do so without blocking.
+ */
+int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index)
+{
+        int ret = 0;
+        void *entry, **slot;
+        struct radix_tree_root *page_tree = &mapping->page_tree;
+
+        spin_lock_irq(&mapping->tree_lock);
+        entry = __radix_tree_lookup(page_tree, index, NULL, &slot);
+        if (!entry || !radix_tree_exceptional_entry(entry) ||
+            slot_locked(mapping, slot))
+                goto out;
+        if (radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_DIRTY) ||
+            radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_TOWRITE))
+                goto out;
+        radix_tree_delete(page_tree, index);
         mapping->nrexceptional--;
+        ret = 1;
+out:
         spin_unlock_irq(&mapping->tree_lock);
-        dax_wake_mapping_entry_waiter(mapping, index, entry, true);
+        if (ret)
+                dax_wake_mapping_entry_waiter(mapping, index, entry, true);
+        return ret;
+}
 
-        return 1;
+/*
+ * Invalidate exceptional DAX entry if it is clean.
+ */
+int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
+                                      pgoff_t index)
+{
+        return __dax_invalidate_mapping_entry(mapping, index, false);
 }
 
 /*
@@ -488,15 +539,16 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index)
  * otherwise it will simply fall out of the page cache under memory
  * pressure without ever having been dirtied.
  */
-static int dax_load_hole(struct address_space *mapping, void *entry,
+static int dax_load_hole(struct address_space *mapping, void **entry,
                          struct vm_fault *vmf)
 {
         struct page *page;
+        int ret;
 
         /* Hole page already exists? Return it...  */
-        if (!radix_tree_exceptional_entry(entry)) {
-                vmf->page = entry;
-                return VM_FAULT_LOCKED;
+        if (!radix_tree_exceptional_entry(*entry)) {
+                page = *entry;
+                goto out;
         }
 
         /* This will replace locked radix tree entry with a hole page */
@@ -504,8 +556,17 @@ static int dax_load_hole(struct address_space *mapping, void *entry,
                                    vmf->gfp_mask | __GFP_ZERO);
         if (!page)
                 return VM_FAULT_OOM;
+ out:
         vmf->page = page;
-        return VM_FAULT_LOCKED;
+        ret = finish_fault(vmf);
+        vmf->page = NULL;
+        *entry = page;
+        if (!ret) {
+                /* Grab reference for PTE that is now referencing the page */
+                get_page(page);
+                return VM_FAULT_NOPAGE;
+        }
+        return ret;
 }
 
 static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size,
@@ -934,6 +995,17 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
         if (WARN_ON_ONCE(iomap->type != IOMAP_MAPPED))
                 return -EIO;
 
+        /*
+         * Write can allocate block for an area which has a hole page mapped
+         * into page tables. We have to tear down these mappings so that data
+         * written by write(2) is visible in mmap.
+         */
+        if ((iomap->flags & IOMAP_F_NEW) && inode->i_mapping->nrpages) {
+                invalidate_inode_pages2_range(inode->i_mapping,
+                                              pos >> PAGE_SHIFT,
+                                              (end - 1) >> PAGE_SHIFT);
+        }
+
         while (pos < end) {
                 unsigned offset = pos & (PAGE_SIZE - 1);
                 struct blk_dax_ctl dax = { 0 };
@@ -992,23 +1064,6 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
         if (iov_iter_rw(iter) == WRITE)
                 flags |= IOMAP_WRITE;
 
-        /*
-         * Yes, even DAX files can have page cache attached to them:  A zeroed
-         * page is inserted into the pagecache when we have to serve a write
-         * fault on a hole.  It should never be dirtied and can simply be
-         * dropped from the pagecache once we get real data for the page.
-         *
-         * XXX: This is racy against mmap, and there's nothing we can do about
-         * it. We'll eventually need to shift this down even further so that
-         * we can check if we allocated blocks over a hole first.
-         */
-        if (mapping->nrpages) {
-                ret = invalidate_inode_pages2_range(mapping,
-                                pos >> PAGE_SHIFT,
-                                (pos + iov_iter_count(iter) - 1) >> PAGE_SHIFT);
-                WARN_ON_ONCE(ret);
-        }
-
         while (iov_iter_count(iter)) {
                 ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops,
                                 iter, dax_iomap_actor);
@@ -1023,6 +1078,15 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
 }
 EXPORT_SYMBOL_GPL(dax_iomap_rw);
 
+static int dax_fault_return(int error)
+{
+        if (error == 0)
+                return VM_FAULT_NOPAGE;
+        if (error == -ENOMEM)
+                return VM_FAULT_OOM;
+        return VM_FAULT_SIGBUS;
+}
+
 /**
  * dax_iomap_fault - handle a page fault on a DAX file
  * @vma: The virtual memory area where the fault occurred
@@ -1055,12 +1119,6 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
         if (pos >= i_size_read(inode))
                 return VM_FAULT_SIGBUS;
 
-        entry = grab_mapping_entry(mapping, vmf->pgoff, 0);
-        if (IS_ERR(entry)) {
-                error = PTR_ERR(entry);
-                goto out;
-        }
-
         if ((vmf->flags & FAULT_FLAG_WRITE) && !vmf->cow_page)
                 flags |= IOMAP_WRITE;
 
@@ -1071,9 +1129,15 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
          */
         error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);
         if (error)
-                goto unlock_entry;
+                return dax_fault_return(error);
         if (WARN_ON_ONCE(iomap.offset + iomap.length < pos + PAGE_SIZE)) {
-                error = -EIO;           /* fs corruption? */
+                vmf_ret = dax_fault_return(-EIO);       /* fs corruption? */
+                goto finish_iomap;
+        }
+
+        entry = grab_mapping_entry(mapping, vmf->pgoff, 0);
+        if (IS_ERR(entry)) {
+                vmf_ret = dax_fault_return(PTR_ERR(entry));
                 goto finish_iomap;
         }
 
@@ -1096,13 +1160,13 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
                 }
 
                 if (error)
-                        goto finish_iomap;
+                        goto error_unlock_entry;
 
                 __SetPageUptodate(vmf->cow_page);
                 vmf_ret = finish_fault(vmf);
                 if (!vmf_ret)
                         vmf_ret = VM_FAULT_DONE_COW;
-                goto finish_iomap;
+                goto unlock_entry;
         }
 
         switch (iomap.type) {
@@ -1114,12 +1178,15 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
                 }
                 error = dax_insert_mapping(mapping, iomap.bdev, sector,
                                 PAGE_SIZE, &entry, vma, vmf);
+                /* -EBUSY is fine, somebody else faulted on the same PTE */
+                if (error == -EBUSY)
+                        error = 0;
                 break;
         case IOMAP_UNWRITTEN:
         case IOMAP_HOLE:
                 if (!(vmf->flags & FAULT_FLAG_WRITE)) {
-                        vmf_ret = dax_load_hole(mapping, entry, vmf);
-                        break;
+                        vmf_ret = dax_load_hole(mapping, &entry, vmf);
+                        goto unlock_entry;
                 }
                 /*FALLTHRU*/
         default:
@@ -1128,31 +1195,25 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
                 break;
         }
 
+ error_unlock_entry:
+        vmf_ret = dax_fault_return(error) | major;
+ unlock_entry:
+        put_locked_mapping_entry(mapping, vmf->pgoff, entry);
  finish_iomap:
         if (ops->iomap_end) {
-                if (error || (vmf_ret & VM_FAULT_ERROR)) {
-                        /* keep previous error */
-                        ops->iomap_end(inode, pos, PAGE_SIZE, 0, flags,
-                                        &iomap);
-                } else {
-                        error = ops->iomap_end(inode, pos, PAGE_SIZE,
-                                        PAGE_SIZE, flags, &iomap);
-                }
-        }
- unlock_entry:
-        if (vmf_ret != VM_FAULT_LOCKED || error)
-                put_locked_mapping_entry(mapping, vmf->pgoff, entry);
- out:
-        if (error == -ENOMEM)
-                return VM_FAULT_OOM | major;
-        /* -EBUSY is fine, somebody else faulted on the same PTE */
-        if (error < 0 && error != -EBUSY)
-                return VM_FAULT_SIGBUS | major;
-        if (vmf_ret) {
-                WARN_ON_ONCE(error); /* -EBUSY from ops->iomap_end? */
-                return vmf_ret;
+                int copied = PAGE_SIZE;
+
+                if (vmf_ret & VM_FAULT_ERROR)
+                        copied = 0;
+                /*
+                 * The fault is done by now and there's no way back (other
+                 * thread may be already happily using PTE we have installed).
+                 * Just ignore error from ->iomap_end since we cannot do much
+                 * with it.
+                 */
+                ops->iomap_end(inode, pos, PAGE_SIZE, copied, flags, &iomap);
         }
-        return VM_FAULT_NOPAGE | major;
+        return vmf_ret;
 }
 EXPORT_SYMBOL_GPL(dax_iomap_fault);
 
@@ -1277,16 +1338,6 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
                 goto fallback;
 
         /*
-         * grab_mapping_entry() will make sure we get a 2M empty entry, a DAX
-         * PMD or a HZP entry.  If it can't (because a 4k page is already in
-         * the tree, for instance), it will return -EEXIST and we just fall
-         * back to 4k entries.
-         */
-        entry = grab_mapping_entry(mapping, pgoff, RADIX_DAX_PMD);
-        if (IS_ERR(entry))
-                goto fallback;
-
-        /*
          * Note that we don't use iomap_apply here.  We aren't doing I/O, only
          * setting up a mapping, so really we're using iomap_begin() as a way
          * to look up our filesystem block.
@@ -1294,10 +1345,21 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
         pos = (loff_t)pgoff << PAGE_SHIFT;
         error = ops->iomap_begin(inode, pos, PMD_SIZE, iomap_flags, &iomap);
         if (error)
-                goto unlock_entry;
+                goto fallback;
+
         if (iomap.offset + iomap.length < pos + PMD_SIZE)
                 goto finish_iomap;
 
+        /*
+         * grab_mapping_entry() will make sure we get a 2M empty entry, a DAX
+         * PMD or a HZP entry.  If it can't (because a 4k page is already in
+         * the tree, for instance), it will return -EEXIST and we just fall
+         * back to 4k entries.
+         */
+        entry = grab_mapping_entry(mapping, pgoff, RADIX_DAX_PMD);
+        if (IS_ERR(entry))
+                goto finish_iomap;
+
         vmf.pgoff = pgoff;
         vmf.flags = flags;
         vmf.gfp_mask = mapping_gfp_mask(mapping) | __GFP_IO;
@@ -1310,7 +1372,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
         case IOMAP_UNWRITTEN:
         case IOMAP_HOLE:
                 if (WARN_ON_ONCE(write))
-                        goto finish_iomap;
+                        goto unlock_entry;
                 result = dax_pmd_load_hole(vma, pmd, &vmf, address, &iomap,
                                 &entry);
                 break;
@@ -1319,20 +1381,23 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
                 break;
         }
 
+ unlock_entry:
+        put_locked_mapping_entry(mapping, pgoff, entry);
  finish_iomap:
         if (ops->iomap_end) {
-                if (result == VM_FAULT_FALLBACK) {
-                        ops->iomap_end(inode, pos, PMD_SIZE, 0, iomap_flags,
-                                        &iomap);
-                } else {
-                        error = ops->iomap_end(inode, pos, PMD_SIZE, PMD_SIZE,
-                                        iomap_flags, &iomap);
-                        if (error)
-                                result = VM_FAULT_FALLBACK;
-                }
+                int copied = PMD_SIZE;
+
+                if (result == VM_FAULT_FALLBACK)
+                        copied = 0;
+                /*
+                 * The fault is done by now and there's no way back (other
+                 * thread may be already happily using PMD we have installed).
+                 * Just ignore error from ->iomap_end since we cannot do much
+                 * with it.
+                 */
+                ops->iomap_end(inode, pos, PMD_SIZE, copied, iomap_flags,
+                                &iomap);
         }
- unlock_entry:
-        put_locked_mapping_entry(mapping, pgoff, entry);
  fallback:
         if (result == VM_FAULT_FALLBACK) {
                 split_huge_pmd(vma, pmd, address);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 0093ea2512a8..f073bfca694b 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -751,9 +751,8 @@ static int ext2_get_blocks(struct inode *inode,
                         mutex_unlock(&ei->truncate_mutex);
                         goto cleanup;
                 }
-        } else {
-                *new = true;
         }
+        *new = true;
 
         ext2_splice_branch(inode, iblock, partial, indirect_blks, count);
         mutex_unlock(&ei->truncate_mutex);
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index b5f184493c57..d663d3d7c81c 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -258,7 +258,6 @@ out:
 static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         int result;
-        handle_t *handle = NULL;
         struct inode *inode = file_inode(vma->vm_file);
         struct super_block *sb = inode->i_sb;
         bool write = vmf->flags & FAULT_FLAG_WRITE;
@@ -266,24 +265,12 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (write) {
                 sb_start_pagefault(sb);
                 file_update_time(vma->vm_file);
-                down_read(&EXT4_I(inode)->i_mmap_sem);
-                handle = ext4_journal_start_sb(sb, EXT4_HT_WRITE_PAGE,
-                                                EXT4_DATA_TRANS_BLOCKS(sb));
-        } else
-                down_read(&EXT4_I(inode)->i_mmap_sem);
-
-        if (IS_ERR(handle))
-                result = VM_FAULT_SIGBUS;
-        else
-                result = dax_iomap_fault(vma, vmf, &ext4_iomap_ops);
-
-        if (write) {
-                if (!IS_ERR(handle))
-                        ext4_journal_stop(handle);
-                up_read(&EXT4_I(inode)->i_mmap_sem);
+        }
+        down_read(&EXT4_I(inode)->i_mmap_sem);
+        result = dax_iomap_fault(vma, vmf, &ext4_iomap_ops);
+        up_read(&EXT4_I(inode)->i_mmap_sem);
+        if (write)
                 sb_end_pagefault(sb);
-        } else
-                up_read(&EXT4_I(inode)->i_mmap_sem);
 
         return result;
 }
@@ -292,7 +279,6 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
                                                 pmd_t *pmd, unsigned int flags)
 {
         int result;
-        handle_t *handle = NULL;
         struct inode *inode = file_inode(vma->vm_file);
         struct super_block *sb = inode->i_sb;
         bool write = flags & FAULT_FLAG_WRITE;
@@ -300,27 +286,13 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
         if (write) {
                 sb_start_pagefault(sb);
                 file_update_time(vma->vm_file);
-                down_read(&EXT4_I(inode)->i_mmap_sem);
-                handle = ext4_journal_start_sb(sb, EXT4_HT_WRITE_PAGE,
-                                ext4_chunk_trans_blocks(inode,
-                                                        PMD_SIZE / PAGE_SIZE));
-        } else
-                down_read(&EXT4_I(inode)->i_mmap_sem);
-
-        if (IS_ERR(handle))
-                result = VM_FAULT_SIGBUS;
-        else {
-                result = dax_iomap_pmd_fault(vma, addr, pmd, flags,
-                                             &ext4_iomap_ops);
         }
-
-        if (write) {
-                if (!IS_ERR(handle))
-                        ext4_journal_stop(handle);
-                up_read(&EXT4_I(inode)->i_mmap_sem);
+        down_read(&EXT4_I(inode)->i_mmap_sem);
+        result = dax_iomap_pmd_fault(vma, addr, pmd, flags,
+                                     &ext4_iomap_ops);
+        up_read(&EXT4_I(inode)->i_mmap_sem);
+        if (write)
                 sb_end_pagefault(sb);
-        } else
-                up_read(&EXT4_I(inode)->i_mmap_sem);
 
         return result;
 }
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index d3fea0bd89e2..6043306e8e21 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -510,18 +510,6 @@ void fsnotify_detach_group_marks(struct fsnotify_group *group)
         }
 }
 
-void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old)
-{
-        assert_spin_locked(&old->lock);
-        new->inode = old->inode;
-        new->mnt = old->mnt;
-        if (old->group)
-                fsnotify_get_group(old->group);
-        new->group = old->group;
-        new->mask = old->mask;
-        new->free_mark = old->free_mark;
-}
-
 /*
  * Nothing fancy, just initialize lists and locks and counters.
  */
diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c
index e5ebc3770460..d346d42c54d1 100644
--- a/fs/xfs/libxfs/xfs_ag_resv.c
+++ b/fs/xfs/libxfs/xfs_ag_resv.c
@@ -256,6 +256,9 @@ xfs_ag_resv_init(
                         goto out;
         }
 
+        ASSERT(xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved +
+               xfs_perag_resv(pag, XFS_AG_RESV_AGFL)->ar_reserved <=
+               pag->pagf_freeblks + pag->pagf_flcount);
 out:
         return error;
 }
diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c
index 6fb2215f8ff7..50add5272807 100644
--- a/fs/xfs/libxfs/xfs_refcount_btree.c
+++ b/fs/xfs/libxfs/xfs_refcount_btree.c
@@ -409,13 +409,14 @@ xfs_refcountbt_calc_size(
  */
 xfs_extlen_t
 xfs_refcountbt_max_size(
-        struct xfs_mount        *mp)
+        struct xfs_mount        *mp,
+        xfs_agblock_t           agblocks)
 {
         /* Bail out if we're uninitialized, which can happen in mkfs. */
         if (mp->m_refc_mxr[0] == 0)
                 return 0;
 
-        return xfs_refcountbt_calc_size(mp, mp->m_sb.sb_agblocks);
+        return xfs_refcountbt_calc_size(mp, agblocks);
 }
 
 /*
@@ -430,22 +431,24 @@ xfs_refcountbt_calc_reserves(
 {
         struct xfs_buf          *agbp;
         struct xfs_agf          *agf;
+        xfs_agblock_t           agblocks;
         xfs_extlen_t            tree_len;
         int                     error;
 
         if (!xfs_sb_version_hasreflink(&mp->m_sb))
                 return 0;
 
-        *ask += xfs_refcountbt_max_size(mp);
 
         error = xfs_alloc_read_agf(mp, NULL, agno, 0, &agbp);
         if (error)
                 return error;
 
         agf = XFS_BUF_TO_AGF(agbp);
+        agblocks = be32_to_cpu(agf->agf_length);
         tree_len = be32_to_cpu(agf->agf_refcount_blocks);
         xfs_buf_relse(agbp);
 
+        *ask += xfs_refcountbt_max_size(mp, agblocks);
         *used += tree_len;
 
         return error;
diff --git a/fs/xfs/libxfs/xfs_refcount_btree.h b/fs/xfs/libxfs/xfs_refcount_btree.h
index 3be7768bd51a..9db008b955b7 100644
--- a/fs/xfs/libxfs/xfs_refcount_btree.h
+++ b/fs/xfs/libxfs/xfs_refcount_btree.h
@@ -66,7 +66,8 @@ extern void xfs_refcountbt_compute_maxlevels(struct xfs_mount *mp);
 
 extern xfs_extlen_t xfs_refcountbt_calc_size(struct xfs_mount *mp,
                 unsigned long long len);
-extern xfs_extlen_t xfs_refcountbt_max_size(struct xfs_mount *mp);
+extern xfs_extlen_t xfs_refcountbt_max_size(struct xfs_mount *mp,
+                xfs_agblock_t agblocks);
 
 extern int xfs_refcountbt_calc_reserves(struct xfs_mount *mp,
                 xfs_agnumber_t agno, xfs_extlen_t *ask, xfs_extlen_t *used);
diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
index de25771764ba..74e5a54bc428 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.c
+++ b/fs/xfs/libxfs/xfs_rmap_btree.c
@@ -550,13 +550,14 @@ xfs_rmapbt_calc_size(
  */
 xfs_extlen_t
 xfs_rmapbt_max_size(
-        struct xfs_mount        *mp)
+        struct xfs_mount        *mp,
+        xfs_agblock_t           agblocks)
 {
         /* Bail out if we're uninitialized, which can happen in mkfs. */
         if (mp->m_rmap_mxr[0] == 0)
                 return 0;
 
-        return xfs_rmapbt_calc_size(mp, mp->m_sb.sb_agblocks);
+        return xfs_rmapbt_calc_size(mp, agblocks);
 }
 
 /*
@@ -571,25 +572,24 @@ xfs_rmapbt_calc_reserves(
 {
         struct xfs_buf          *agbp;
         struct xfs_agf          *agf;
-        xfs_extlen_t            pool_len;
+        xfs_agblock_t           agblocks;
         xfs_extlen_t            tree_len;
         int                     error;
 
         if (!xfs_sb_version_hasrmapbt(&mp->m_sb))
                 return 0;
 
-        /* Reserve 1% of the AG or enough for 1 block per record. */
-        pool_len = max(mp->m_sb.sb_agblocks / 100, xfs_rmapbt_max_size(mp));
-        *ask += pool_len;
-
         error = xfs_alloc_read_agf(mp, NULL, agno, 0, &agbp);
         if (error)
                 return error;
 
         agf = XFS_BUF_TO_AGF(agbp);
+        agblocks = be32_to_cpu(agf->agf_length);
         tree_len = be32_to_cpu(agf->agf_rmap_blocks);
         xfs_buf_relse(agbp);
 
+        /* Reserve 1% of the AG or enough for 1 block per record. */
+        *ask += max(agblocks / 100, xfs_rmapbt_max_size(mp, agblocks));
         *used += tree_len;
 
         return error;
diff --git a/fs/xfs/libxfs/xfs_rmap_btree.h b/fs/xfs/libxfs/xfs_rmap_btree.h
index 2a9ac472fb15..19c08e933049 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.h
+++ b/fs/xfs/libxfs/xfs_rmap_btree.h
@@ -60,7 +60,8 @@ extern void xfs_rmapbt_compute_maxlevels(struct xfs_mount *mp);
 
 extern xfs_extlen_t xfs_rmapbt_calc_size(struct xfs_mount *mp,
                 unsigned long long len);
-extern xfs_extlen_t xfs_rmapbt_max_size(struct xfs_mount *mp);
+extern xfs_extlen_t xfs_rmapbt_max_size(struct xfs_mount *mp,
+                xfs_agblock_t agblocks);
 
 extern int xfs_rmapbt_calc_reserves(struct xfs_mount *mp,
                 xfs_agnumber_t agno, xfs_extlen_t *ask, xfs_extlen_t *used);
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 93d12fa2670d..242e8091296d 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -631,6 +631,20 @@ xfs_growfs_data_private(
         xfs_set_low_space_thresholds(mp);
         mp->m_alloc_set_aside = xfs_alloc_set_aside(mp);
 
+        /*
+         * If we expanded the last AG, free the per-AG reservation
+         * so we can reinitialize it with the new size.
+         */
+        if (new) {
+                struct xfs_perag        *pag;
+
+                pag = xfs_perag_get(mp, agno);
+                error = xfs_ag_resv_free(pag);
+                xfs_perag_put(pag);
+                if (error)
+                        goto out;
+        }
+
         /* Reserve AG metadata blocks. */
         error = xfs_fs_reserve_ag_blocks(mp);
         if (error && error != -ENOSPC)
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index ff4d6311c7f4..70ca4f608321 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1597,7 +1597,8 @@ xfs_inode_free_cowblocks(
          * If the mapping is dirty or under writeback we cannot touch the
          * CoW fork.  Leave it alone if we're in the midst of a directio.
          */
-        if (mapping_tagged(VFS_I(ip)->i_mapping, PAGECACHE_TAG_DIRTY) ||
+        if ((VFS_I(ip)->i_state & I_DIRTY_PAGES) ||
+            mapping_tagged(VFS_I(ip)->i_mapping, PAGECACHE_TAG_DIRTY) ||
             mapping_tagged(VFS_I(ip)->i_mapping, PAGECACHE_TAG_WRITEBACK) ||
             atomic_read(&VFS_I(ip)->i_dio_count))
                 return 0;
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index fe86a668a57e..6e4c7446c3d4 100644
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -526,13 +526,14 @@ xfs_cui_recover(
         xfs_refcount_finish_one_cleanup(tp, rcur, error);
         error = xfs_defer_finish(&tp, &dfops, NULL);
         if (error)
-                goto abort_error;
+                goto abort_defer;
         set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags);
         error = xfs_trans_commit(tp);
         return error;
 
 abort_error:
         xfs_refcount_finish_one_cleanup(tp, rcur, error);
+abort_defer:
         xfs_defer_cancel(&dfops);
         xfs_trans_cancel(tp);
         return error;
diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
index 276d3023d60f..de6195e38910 100644
--- a/fs/xfs/xfs_sysfs.c
+++ b/fs/xfs/xfs_sysfs.c
@@ -396,7 +396,7 @@ max_retries_show(
         int             retries;
         struct xfs_error_cfg *cfg = to_error_cfg(kobject);
 
-        if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
+        if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
                 retries = -1;
         else
                 retries = cfg->max_retries;
@@ -422,7 +422,7 @@ max_retries_store(
                 return -EINVAL;
 
         if (val == -1)
-                cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
+                cfg->max_retries = XFS_ERR_RETRY_FOREVER;
         else
                 cfg->max_retries = val;
         return count;
diff --git a/include/asm-generic/asm-prototypes.h b/include/asm-generic/asm-prototypes.h
index df13637e4017..939869c772b1 100644
--- a/include/asm-generic/asm-prototypes.h
+++ b/include/asm-generic/asm-prototypes.h
@@ -1,7 +1,13 @@
 #include <linux/bitops.h>
+#undef __memset
 extern void *__memset(void *, int, __kernel_size_t);
+#undef __memcpy
 extern void *__memcpy(void *, const void *, __kernel_size_t);
+#undef __memmove
 extern void *__memmove(void *, const void *, __kernel_size_t);
+#undef memset
 extern void *memset(void *, int, __kernel_size_t);
+#undef memcpy
 extern void *memcpy(void *, const void *, __kernel_size_t);
+#undef memmove
 extern void *memmove(void *, const void *, __kernel_size_t);
diff --git a/include/dt-bindings/mfd/tps65217.h b/include/dt-bindings/mfd/tps65217.h
deleted file mode 100644
index cafb9e60cf12..000000000000
--- a/include/dt-bindings/mfd/tps65217.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This header provides macros for TI TPS65217 DT bindings.
- *
- * Copyright (C) 2016 Texas Instruments
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DT_BINDINGS_TPS65217_H__
-#define __DT_BINDINGS_TPS65217_H__
-
-#define TPS65217_IRQ_USB        0
-#define TPS65217_IRQ_AC         1
-#define TPS65217_IRQ_PB         2
-
-#endif
diff --git a/include/linux/dax.h b/include/linux/dax.h
index f97bcfe79472..24ad71173995 100644
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -41,6 +41,9 @@ ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
 int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
                         struct iomap_ops *ops);
 int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);
+int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index);
+int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
+                                      pgoff_t index);
 void dax_wake_mapping_entry_waiter(struct address_space *mapping,
                 pgoff_t index, void *entry, bool wake_all);
 
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 702314253797..a0934e6c9bab 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -610,7 +610,6 @@ bool bpf_helper_changes_pkt_data(void *func);
 struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,
                                        const struct bpf_insn *patch, u32 len);
 void bpf_warn_invalid_xdp_action(u32 act);
-void bpf_warn_invalid_xdp_buffer(void);
 
 #ifdef CONFIG_BPF_JIT
 extern int bpf_jit_enable;
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 0cf34d6cc253..487246546ebe 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -323,8 +323,6 @@ extern void fsnotify_init_mark(struct fsnotify_mark *mark, void (*free_mark)(str
 extern struct fsnotify_mark *fsnotify_find_inode_mark(struct fsnotify_group *group, struct inode *inode);
 /* find (and take a reference) to a mark associated with group and vfsmount */
 extern struct fsnotify_mark *fsnotify_find_vfsmount_mark(struct fsnotify_group *group, struct vfsmount *mnt);
-/* copy the values from old into new */
-extern void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old);
 /* set the ignored_mask of a mark */
 extern void fsnotify_set_mark_ignored_mask_locked(struct fsnotify_mark *mark, __u32 mask);
 /* set the mask of a mark (might pin the object into memory */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e0341af6950e..76f39754e7b0 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -146,15 +146,6 @@ enum {
         DISK_EVENT_EJECT_REQUEST                = 1 << 1, /* eject requested */
 };
 
-#define BLK_SCSI_MAX_CMDS       (256)
-#define BLK_SCSI_CMD_PER_LONG   (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
-
-struct blk_scsi_cmd_filter {
-        unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
-        unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
-        struct kobject kobj;
-};
-
 struct disk_part_tbl {
         struct rcu_head rcu_head;
         int len;
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 228bd44efa4c..497f2b3a5a62 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -116,6 +116,16 @@ struct st_sensor_bdu {
 };
 
 /**
+ * struct st_sensor_das - ST sensor device data alignment selection
+ * @addr: address of the register.
+ * @mask: mask to write the das flag for left alignment.
+ */
+struct st_sensor_das {
+        u8 addr;
+        u8 mask;
+};
+
+/**
  * struct st_sensor_data_ready_irq - ST sensor device data-ready interrupt
  * @addr: address of the register.
  * @mask_int1: mask to enable/disable IRQ on INT1 pin.
@@ -185,6 +195,7 @@ struct st_sensor_transfer_function {
  * @enable_axis: Enable one or more axis of the sensor.
  * @fs: Full scale register and full scale list available.
  * @bdu: Block data update register.
+ * @das: Data Alignment Selection register.
  * @drdy_irq: Data ready register of the sensor.
  * @multi_read_bit: Use or not particular bit for [I2C/SPI] multi-read.
  * @bootime: samples to discard when sensor passing from power-down to power-up.
@@ -200,6 +211,7 @@ struct st_sensor_settings {
         struct st_sensor_axis enable_axis;
         struct st_sensor_fullscale fs;
         struct st_sensor_bdu bdu;
+        struct st_sensor_das das;
         struct st_sensor_data_ready_irq drdy_irq;
         bool multi_read_bit;
         unsigned int bootime;
diff --git a/include/linux/mdev.h b/include/linux/mdev.h
index ec819e9a115a..b6e048e1045f 100644
--- a/include/linux/mdev.h
+++ b/include/linux/mdev.h
@@ -13,34 +13,10 @@
 #ifndef MDEV_H
 #define MDEV_H
 
-/* Parent device */
-struct parent_device {
-        struct device           *dev;
-        const struct parent_ops *ops;
-
-        /* internal */
-        struct kref             ref;
-        struct mutex            lock;
-        struct list_head        next;
-        struct kset             *mdev_types_kset;
-        struct list_head        type_list;
-};
-
-/* Mediated device */
-struct mdev_device {
-        struct device           dev;
-        struct parent_device    *parent;
-        uuid_le                 uuid;
-        void                    *driver_data;
-
-        /* internal */
-        struct kref             ref;
-        struct list_head        next;
-        struct kobject          *type_kobj;
-};
+struct mdev_device;
 
 /**
- * struct parent_ops - Structure to be registered for each parent device to
+ * struct mdev_parent_ops - Structure to be registered for each parent device to
  * register the device to mdev module.
  *
  * @owner:              The module owner.
@@ -86,10 +62,9 @@ struct mdev_device {
  *                      @mdev: mediated device structure
  *                      @vma: vma structure
  * Parent device that support mediated device should be registered with mdev
- * module with parent_ops structure.
+ * module with mdev_parent_ops structure.
  **/
-
-struct parent_ops {
+struct mdev_parent_ops {
         struct module   *owner;
         const struct attribute_group **dev_attr_groups;
         const struct attribute_group **mdev_attr_groups;
@@ -103,7 +78,7 @@ struct parent_ops {
                         size_t count, loff_t *ppos);
         ssize_t (*write)(struct mdev_device *mdev, const char __user *buf,
                          size_t count, loff_t *ppos);
-        ssize_t (*ioctl)(struct mdev_device *mdev, unsigned int cmd,
+        long    (*ioctl)(struct mdev_device *mdev, unsigned int cmd,
                          unsigned long arg);
         int     (*mmap)(struct mdev_device *mdev, struct vm_area_struct *vma);
 };
@@ -142,27 +117,22 @@ struct mdev_driver {
 };
 
 #define to_mdev_driver(drv)     container_of(drv, struct mdev_driver, driver)
-#define to_mdev_device(dev)     container_of(dev, struct mdev_device, dev)
-
-static inline void *mdev_get_drvdata(struct mdev_device *mdev)
-{
-        return mdev->driver_data;
-}
 
-static inline void mdev_set_drvdata(struct mdev_device *mdev, void *data)
-{
-        mdev->driver_data = data;
-}
+extern void *mdev_get_drvdata(struct mdev_device *mdev);
+extern void mdev_set_drvdata(struct mdev_device *mdev, void *data);
+extern uuid_le mdev_uuid(struct mdev_device *mdev);
 
 extern struct bus_type mdev_bus_type;
 
-#define dev_is_mdev(d) ((d)->bus == &mdev_bus_type)
-
 extern int  mdev_register_device(struct device *dev,
-                                 const struct parent_ops *ops);
+                                 const struct mdev_parent_ops *ops);
 extern void mdev_unregister_device(struct device *dev);
 
 extern int  mdev_register_driver(struct mdev_driver *drv, struct module *owner);
 extern void mdev_unregister_driver(struct mdev_driver *drv);
 
+extern struct device *mdev_parent_dev(struct mdev_device *mdev);
+extern struct device *mdev_dev(struct mdev_device *mdev);
+extern struct mdev_device *mdev_from_dev(struct device *dev);
+
 #endif /* MDEV_H */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 93bdb3485192..6533c16e27ad 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -1384,6 +1384,8 @@ int set_phv_bit(struct mlx4_dev *dev, u8 port, int new_val);
 int get_phv_bit(struct mlx4_dev *dev, u8 port, int *phv);
 int mlx4_get_is_vlan_offload_disabled(struct mlx4_dev *dev, u8 port,
                                       bool *vlan_offload_disabled);
+void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl,
+                                       struct _rule_hw *eth_header);
 int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 9f489365b3d3..52b437431c6a 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -1071,11 +1071,6 @@ enum {
         MLX5_INFINIBAND_PORT_COUNTERS_GROUP   = 0x20,
 };
 
-enum {
-        MLX5_PCIE_PERFORMANCE_COUNTERS_GROUP       = 0x0,
-        MLX5_PCIE_TIMERS_AND_STATES_COUNTERS_GROUP = 0x2,
-};
-
 static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz)
 {
         if (pkey_sz > MLX5_MAX_LOG_PKEY_TABLE)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 0ae55361e674..735b36335f29 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -123,7 +123,6 @@ enum {
         MLX5_REG_HOST_ENDIANNESS = 0x7004,
         MLX5_REG_MCIA            = 0x9014,
         MLX5_REG_MLCR            = 0x902b,
-        MLX5_REG_MPCNT           = 0x9051,
 };
 
 enum mlx5_dcbx_oper_mode {
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 57bec544e20a..a852e9db6f0d 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1757,80 +1757,6 @@ struct mlx5_ifc_eth_802_3_cntrs_grp_data_layout_bits {
         u8         reserved_at_4c0[0x300];
 };
 
-struct mlx5_ifc_pcie_perf_cntrs_grp_data_layout_bits {
-        u8         life_time_counter_high[0x20];
-
-        u8         life_time_counter_low[0x20];
-
-        u8         rx_errors[0x20];
-
-        u8         tx_errors[0x20];
-
-        u8         l0_to_recovery_eieos[0x20];
-
-        u8         l0_to_recovery_ts[0x20];
-
-        u8         l0_to_recovery_framing[0x20];
-
-        u8         l0_to_recovery_retrain[0x20];
-
-        u8         crc_error_dllp[0x20];
-
-        u8         crc_error_tlp[0x20];
-
-        u8         reserved_at_140[0x680];
-};
-
-struct mlx5_ifc_pcie_tas_cntrs_grp_data_layout_bits {
-        u8         life_time_counter_high[0x20];
-
-        u8         life_time_counter_low[0x20];
-
-        u8         time_to_boot_image_start[0x20];
-
-        u8         time_to_link_image[0x20];
-
-        u8         calibration_time[0x20];
-
-        u8         time_to_first_perst[0x20];
-
-        u8         time_to_detect_state[0x20];
-
-        u8         time_to_l0[0x20];
-
-        u8         time_to_crs_en[0x20];
-
-        u8         time_to_plastic_image_start[0x20];
-
-        u8         time_to_iron_image_start[0x20];
-
-        u8         perst_handler[0x20];
-
-        u8         times_in_l1[0x20];
-
-        u8         times_in_l23[0x20];
-
-        u8         dl_down[0x20];
-
-        u8         config_cycle1usec[0x20];
-
-        u8         config_cycle2to7usec[0x20];
-
-        u8         config_cycle_8to15usec[0x20];
-
-        u8         config_cycle_16_to_63usec[0x20];
-
-        u8         config_cycle_64usec[0x20];
-
-        u8         correctable_err_msg_sent[0x20];
-
-        u8         non_fatal_err_msg_sent[0x20];
-
-        u8         fatal_err_msg_sent[0x20];
-
-        u8         reserved_at_2e0[0x4e0];
-};
-
 struct mlx5_ifc_cmd_inter_comp_event_bits {
         u8         command_completion_vector[0x20];
 
@@ -2995,12 +2921,6 @@ union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits {
         u8         reserved_at_0[0x7c0];
 };
 
-union mlx5_ifc_pcie_cntrs_grp_data_layout_auto_bits {
-        struct mlx5_ifc_pcie_perf_cntrs_grp_data_layout_bits pcie_perf_cntrs_grp_data_layout;
-        struct mlx5_ifc_pcie_tas_cntrs_grp_data_layout_bits pcie_tas_cntrs_grp_data_layout;
-        u8         reserved_at_0[0x7c0];
-};
-
 union mlx5_ifc_event_auto_bits {
         struct mlx5_ifc_comp_event_bits comp_event;
         struct mlx5_ifc_dct_events_bits dct_events;
@@ -7320,18 +7240,6 @@ struct mlx5_ifc_ppcnt_reg_bits {
         union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits counter_set;
 };
 
-struct mlx5_ifc_mpcnt_reg_bits {
-        u8         reserved_at_0[0x8];
-        u8         pcie_index[0x8];
-        u8         reserved_at_10[0xa];
-        u8         grp[0x6];
-
-        u8         clr[0x1];
-        u8         reserved_at_21[0x1f];
-
-        union mlx5_ifc_pcie_cntrs_grp_data_layout_auto_bits counter_set;
-};
-
 struct mlx5_ifc_ppad_reg_bits {
         u8         reserved_at_0[0x3];
         u8         single_mac[0x1];
@@ -7937,7 +7845,6 @@ union mlx5_ifc_ports_control_registers_document_bits {
         struct mlx5_ifc_pmtu_reg_bits pmtu_reg;
         struct mlx5_ifc_ppad_reg_bits ppad_reg;
         struct mlx5_ifc_ppcnt_reg_bits ppcnt_reg;
-        struct mlx5_ifc_mpcnt_reg_bits mpcnt_reg;
         struct mlx5_ifc_pplm_reg_bits pplm_reg;
         struct mlx5_ifc_pplr_reg_bits pplr_reg;
         struct mlx5_ifc_ppsc_reg_bits ppsc_reg;
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index c56b39890a41..6b5818d6de32 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -73,13 +73,13 @@
  */
 enum pageflags {
         PG_locked,              /* Page is locked. Don't touch. */
-        PG_waiters,             /* Page has waiters, check its waitqueue */
         PG_error,
         PG_referenced,
         PG_uptodate,
         PG_dirty,
         PG_lru,
         PG_active,
+        PG_waiters,             /* Page has waiters, check its waitqueue. Must be bit #7 and in the same byte as "PG_locked" */
         PG_slab,
         PG_owner_priv_1,        /* Owner use. If pagecache, fs may use*/
         PG_arch_1,
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 5dea8f6440e4..52bda854593b 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -306,7 +306,9 @@ void radix_tree_iter_replace(struct radix_tree_root *,
 void radix_tree_replace_slot(struct radix_tree_root *root,
                              void **slot, void *item);
 void __radix_tree_delete_node(struct radix_tree_root *root,
-                              struct radix_tree_node *node);
+                              struct radix_tree_node *node,
+                              radix_tree_update_node_t update_node,
+                              void *private);
 void *radix_tree_delete_item(struct radix_tree_root *, unsigned long, void *);
 void *radix_tree_delete(struct radix_tree_root *, unsigned long);
 void radix_tree_clear_tags(struct radix_tree_root *root,
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 183f37c8a5e1..4ee479f2f355 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -9,7 +9,13 @@ struct device;
 struct page;
 struct scatterlist;
 
-extern int swiotlb_force;
+enum swiotlb_force {
+        SWIOTLB_NORMAL,         /* Default - depending on HW DMA mask etc. */
+        SWIOTLB_FORCE,          /* swiotlb=force */
+        SWIOTLB_NO_FORCE,       /* swiotlb=noforce */
+};
+
+extern enum swiotlb_force swiotlb_force;
 
 /*
  * Maximum allowable number of contiguous slabs to map,
@@ -108,11 +114,14 @@ swiotlb_dma_supported(struct device *hwdev, u64 mask);
 
 #ifdef CONFIG_SWIOTLB
 extern void __init swiotlb_free(void);
+unsigned int swiotlb_max_segment(void);
 #else
 static inline void swiotlb_free(void) { }
+static inline unsigned int swiotlb_max_segment(void) { return 0; }
 #endif
 
 extern void swiotlb_print_info(void);
 extern int is_swiotlb_buffer(phys_addr_t paddr);
+extern void swiotlb_set_max_segment(unsigned int);
 
 #endif /* __LINUX_SWIOTLB_H */
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index f0cf5a1b777e..0378e88f6fd3 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -110,6 +110,7 @@ struct netns_ipv4 {
         int sysctl_tcp_orphan_retries;
         int sysctl_tcp_fin_timeout;
         unsigned int sysctl_tcp_notsent_lowat;
+        int sysctl_tcp_tw_reuse;
 
         int sysctl_igmp_max_memberships;
         int sysctl_igmp_max_msf;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 207147b4c6b2..6061963cca98 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -252,7 +252,6 @@ extern int sysctl_tcp_wmem[3];
 extern int sysctl_tcp_rmem[3];
 extern int sysctl_tcp_app_win;
 extern int sysctl_tcp_adv_win_scale;
-extern int sysctl_tcp_tw_reuse;
 extern int sysctl_tcp_frto;
 extern int sysctl_tcp_low_latency;
 extern int sysctl_tcp_nometrics_save;
diff --git a/include/trace/events/swiotlb.h b/include/trace/events/swiotlb.h
index 7ea4c5e7c448..288c0c54a2b4 100644
--- a/include/trace/events/swiotlb.h
+++ b/include/trace/events/swiotlb.h
@@ -11,16 +11,16 @@ TRACE_EVENT(swiotlb_bounced,
         TP_PROTO(struct device *dev,
                  dma_addr_t dev_addr,
                  size_t size,
-                 int swiotlb_force),
+                 enum swiotlb_force swiotlb_force),
 
         TP_ARGS(dev, dev_addr, size, swiotlb_force),
 
         TP_STRUCT__entry(
-                __string(       dev_name,       dev_name(dev)   )
-                __field(        u64,    dma_mask                )
-                __field(        dma_addr_t,     dev_addr        )
-                __field(        size_t, size                    )
-                __field(        int,    swiotlb_force           )
+                __string(       dev_name,       dev_name(dev)           )
+                __field(        u64,    dma_mask                        )
+                __field(        dma_addr_t,     dev_addr                )
+                __field(        size_t, size                            )
+                __field(        enum swiotlb_force,     swiotlb_force   )
         ),
 
         TP_fast_assign(
@@ -37,7 +37,10 @@ TRACE_EVENT(swiotlb_bounced,
                 __entry->dma_mask,
                 (unsigned long long)__entry->dev_addr,
                 __entry->size,
-                __entry->swiotlb_force ? "swiotlb_force" : "" )
+                __print_symbolic(__entry->swiotlb_force,
+                        { SWIOTLB_NORMAL,       "NORMAL" },
+                        { SWIOTLB_FORCE,        "FORCE" },
+                        { SWIOTLB_NO_FORCE,     "NO_FORCE" }))
 );
 
 #endif /*  _TRACE_SWIOTLB_H */
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index acc63697a0cc..b2a31a55a612 100644
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -93,6 +93,7 @@ struct usb_ext_prop_desc {
  * |   0 | magic     | LE32         | FUNCTIONFS_DESCRIPTORS_MAGIC_V2      |
  * |   4 | length    | LE32         | length of the whole data chunk       |
  * |   8 | flags     | LE32         | combination of functionfs_flags      |
+ * |     | eventfd   | LE32         | eventfd file descriptor              |
  * |     | fs_count  | LE32         | number of full-speed descriptors     |
  * |     | hs_count  | LE32         | number of high-speed descriptors     |
  * |     | ss_count  | LE32         | number of super-speed descriptors    |
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 8b1dde96a0fa..7b44195da81b 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -231,9 +231,11 @@ static void untag_chunk(struct node *p)
         if (size)
                 new = alloc_chunk(size);
 
+        mutex_lock(&entry->group->mark_mutex);
         spin_lock(&entry->lock);
         if (chunk->dead || !entry->inode) {
                 spin_unlock(&entry->lock);
+                mutex_unlock(&entry->group->mark_mutex);
                 if (new)
                         free_chunk(new);
                 goto out;
@@ -251,6 +253,7 @@ static void untag_chunk(struct node *p)
                 list_del_rcu(&chunk->hash);
                 spin_unlock(&hash_lock);
                 spin_unlock(&entry->lock);
+                mutex_unlock(&entry->group->mark_mutex);
                 fsnotify_destroy_mark(entry, audit_tree_group);
                 goto out;
         }
@@ -258,8 +261,8 @@ static void untag_chunk(struct node *p)
         if (!new)
                 goto Fallback;
 
-        fsnotify_duplicate_mark(&new->mark, entry);
-        if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.inode, NULL, 1)) {
+        if (fsnotify_add_mark_locked(&new->mark, entry->group, entry->inode,
+                                     NULL, 1)) {
                 fsnotify_put_mark(&new->mark);
                 goto Fallback;
         }
@@ -293,6 +296,7 @@ static void untag_chunk(struct node *p)
                 owner->root = new;
         spin_unlock(&hash_lock);
         spin_unlock(&entry->lock);
+        mutex_unlock(&entry->group->mark_mutex);
         fsnotify_destroy_mark(entry, audit_tree_group);
         fsnotify_put_mark(&new->mark);  /* drop initial reference */
         goto out;
@@ -309,6 +313,7 @@ Fallback:
         put_tree(owner);
         spin_unlock(&hash_lock);
         spin_unlock(&entry->lock);
+        mutex_unlock(&entry->group->mark_mutex);
 out:
         fsnotify_put_mark(entry);
         spin_lock(&hash_lock);
@@ -386,18 +391,21 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
 
         chunk_entry = &chunk->mark;
 
+        mutex_lock(&old_entry->group->mark_mutex);
         spin_lock(&old_entry->lock);
         if (!old_entry->inode) {
                 /* old_entry is being shot, lets just lie */
                 spin_unlock(&old_entry->lock);
+                mutex_unlock(&old_entry->group->mark_mutex);
                 fsnotify_put_mark(old_entry);
                 free_chunk(chunk);
                 return -ENOENT;
         }
 
-        fsnotify_duplicate_mark(chunk_entry, old_entry);
-        if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->inode, NULL, 1)) {
+        if (fsnotify_add_mark_locked(chunk_entry, old_entry->group,
+                                     old_entry->inode, NULL, 1)) {
                 spin_unlock(&old_entry->lock);
+                mutex_unlock(&old_entry->group->mark_mutex);
                 fsnotify_put_mark(chunk_entry);
                 fsnotify_put_mark(old_entry);
                 return -ENOSPC;
@@ -413,6 +421,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
                 chunk->dead = 1;
                 spin_unlock(&chunk_entry->lock);
                 spin_unlock(&old_entry->lock);
+                mutex_unlock(&old_entry->group->mark_mutex);
 
                 fsnotify_destroy_mark(chunk_entry, audit_tree_group);
 
@@ -445,6 +454,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
         spin_unlock(&hash_lock);
         spin_unlock(&chunk_entry->lock);
         spin_unlock(&old_entry->lock);
+        mutex_unlock(&old_entry->group->mark_mutex);
         fsnotify_destroy_mark(old_entry, audit_tree_group);
         fsnotify_put_mark(chunk_entry); /* drop initial reference */
         fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 042fd7e8e030..f75c4d031eeb 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1471,6 +1471,7 @@ int __cpuhp_setup_state(enum cpuhp_state state,
                         bool multi_instance)
 {
         int cpu, ret = 0;
+        bool dynstate;
 
         if (cpuhp_cb_check(state) || !name)
                 return -EINVAL;
@@ -1480,6 +1481,12 @@ int __cpuhp_setup_state(enum cpuhp_state state,
         ret = cpuhp_store_callbacks(state, name, startup, teardown,
                                     multi_instance);
 
+        dynstate = state == CPUHP_AP_ONLINE_DYN;
+        if (ret > 0 && dynstate) {
+                state = ret;
+                ret = 0;
+        }
+
         if (ret || !invoke || !startup)
                 goto out;
 
@@ -1508,7 +1515,7 @@ out:
          * If the requested state is CPUHP_AP_ONLINE_DYN, return the
          * dynamically allocated state in case of success.
          */
-        if (!ret && state == CPUHP_AP_ONLINE_DYN)
+        if (!ret && dynstate)
                 return state;
         return ret;
 }
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 6f382e07de77..0b92d605fb69 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -640,6 +640,7 @@ static inline void radix_tree_shrink(struct radix_tree_root *root,
                                 update_node(node, private);
                 }
 
+                WARN_ON_ONCE(!list_empty(&node->private_list));
                 radix_tree_node_free(node);
         }
 }
@@ -666,6 +667,7 @@ static void delete_node(struct radix_tree_root *root,
                         root->rnode = NULL;
                 }
 
+                WARN_ON_ONCE(!list_empty(&node->private_list));
                 radix_tree_node_free(node);
 
                 node = parent;
@@ -767,6 +769,7 @@ static void radix_tree_free_nodes(struct radix_tree_node *node)
                         struct radix_tree_node *old = child;
                         offset = child->offset + 1;
                         child = child->parent;
+                        WARN_ON_ONCE(!list_empty(&node->private_list));
                         radix_tree_node_free(old);
                         if (old == entry_to_node(node))
                                 return;
@@ -1824,15 +1827,19 @@ EXPORT_SYMBOL(radix_tree_gang_lookup_tag_slot);
  *      __radix_tree_delete_node    -    try to free node after clearing a slot
  *      @root:          radix tree root
  *      @node:          node containing @index
+ *      @update_node:   callback for changing leaf nodes
+ *      @private:       private data to pass to @update_node
  *
  *      After clearing the slot at @index in @node from radix tree
  *      rooted at @root, call this function to attempt freeing the
  *      node and shrinking the tree.
  */
 void __radix_tree_delete_node(struct radix_tree_root *root,
-                              struct radix_tree_node *node)
+                              struct radix_tree_node *node,
+                              radix_tree_update_node_t update_node,
+                              void *private)
 {
-        delete_node(root, node, NULL, NULL);
+        delete_node(root, node, update_node, private);
 }
 
 /**
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index cb1b54ee8527..975b8fc4f1e1 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -53,7 +53,7 @@
  */
 #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)
 
-int swiotlb_force;
+enum swiotlb_force swiotlb_force;
 
 /*
  * Used to do a quick range check in swiotlb_tbl_unmap_single and
@@ -83,6 +83,12 @@ static unsigned int *io_tlb_list;
 static unsigned int io_tlb_index;
 
 /*
+ * Max segment that we can provide which (if pages are contingous) will
+ * not be bounced (unless SWIOTLB_FORCE is set).
+ */
+unsigned int max_segment;
+
+/*
  * We need to save away the original address corresponding to a mapped entry
  * for the sync operations.
  */
@@ -106,8 +112,12 @@ setup_io_tlb_npages(char *str)
         }
         if (*str == ',')
                 ++str;
-        if (!strcmp(str, "force"))
-                swiotlb_force = 1;
+        if (!strcmp(str, "force")) {
+                swiotlb_force = SWIOTLB_FORCE;
+        } else if (!strcmp(str, "noforce")) {
+                swiotlb_force = SWIOTLB_NO_FORCE;
+                io_tlb_nslabs = 1;
+        }
 
         return 0;
 }
@@ -120,6 +130,20 @@ unsigned long swiotlb_nr_tbl(void)
 }
 EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
 
+unsigned int swiotlb_max_segment(void)
+{
+        return max_segment;
+}
+EXPORT_SYMBOL_GPL(swiotlb_max_segment);
+
+void swiotlb_set_max_segment(unsigned int val)
+{
+        if (swiotlb_force == SWIOTLB_FORCE)
+                max_segment = 1;
+        else
+                max_segment = rounddown(val, PAGE_SIZE);
+}
+
 /* default to 64MB */
 #define IO_TLB_DEFAULT_SIZE (64UL<<20)
 unsigned long swiotlb_size_or_default(void)
@@ -201,6 +225,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
         if (verbose)
                 swiotlb_print_info();
 
+        swiotlb_set_max_segment(io_tlb_nslabs << IO_TLB_SHIFT);
         return 0;
 }
 
@@ -279,6 +304,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
         rc = swiotlb_late_init_with_tbl(vstart, io_tlb_nslabs);
         if (rc)
                 free_pages((unsigned long)vstart, order);
+
         return rc;
 }
 
@@ -333,6 +359,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
 
         late_alloc = 1;
 
+        swiotlb_set_max_segment(io_tlb_nslabs << IO_TLB_SHIFT);
+
         return 0;
 
 cleanup4:
@@ -347,6 +375,7 @@ cleanup2:
         io_tlb_end = 0;
         io_tlb_start = 0;
         io_tlb_nslabs = 0;
+        max_segment = 0;
         return -ENOMEM;
 }
 
@@ -375,6 +404,7 @@ void __init swiotlb_free(void)
                                    PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
         }
         io_tlb_nslabs = 0;
+        max_segment = 0;
 }
 
 int is_swiotlb_buffer(phys_addr_t paddr)
@@ -543,8 +573,15 @@ static phys_addr_t
 map_single(struct device *hwdev, phys_addr_t phys, size_t size,
            enum dma_data_direction dir, unsigned long attrs)
 {
-        dma_addr_t start_dma_addr = phys_to_dma(hwdev, io_tlb_start);
+        dma_addr_t start_dma_addr;
 
+        if (swiotlb_force == SWIOTLB_NO_FORCE) {
+                dev_warn_ratelimited(hwdev, "Cannot do DMA to address %pa\n",
+                                     &phys);
+                return SWIOTLB_MAP_ERROR;
+        }
+
+        start_dma_addr = phys_to_dma(hwdev, io_tlb_start);
         return swiotlb_tbl_map_single(hwdev, start_dma_addr, phys, size,
                                       dir, attrs);
 }
@@ -721,6 +758,9 @@ static void
 swiotlb_full(struct device *dev, size_t size, enum dma_data_direction dir,
              int do_panic)
 {
+        if (swiotlb_force == SWIOTLB_NO_FORCE)
+                return;
+
         /*
          * Ran out of IOMMU space for this operation. This is very bad.
          * Unfortunately the drivers cannot handle this operation properly.
@@ -763,7 +803,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
          * we can safely return the device addr and not worry about bounce
          * buffering it.
          */
-        if (dma_capable(dev, dev_addr, size) && !swiotlb_force)
+        if (dma_capable(dev, dev_addr, size) && swiotlb_force != SWIOTLB_FORCE)
                 return dev_addr;
 
         trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
@@ -904,7 +944,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
                 phys_addr_t paddr = sg_phys(sg);
                 dma_addr_t dev_addr = phys_to_dma(hwdev, paddr);
 
-                if (swiotlb_force ||
+                if (swiotlb_force == SWIOTLB_FORCE ||
                     !dma_capable(hwdev, dev_addr, sg->length)) {
                         phys_addr_t map = map_single(hwdev, sg_phys(sg),
                                                      sg->length, dir, attrs);
diff --git a/mm/filemap.c b/mm/filemap.c
index 82f26cde830c..d0e4d1002059 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -912,6 +912,29 @@ void add_page_wait_queue(struct page *page, wait_queue_t *waiter)
 }
 EXPORT_SYMBOL_GPL(add_page_wait_queue);
 
+#ifndef clear_bit_unlock_is_negative_byte
+
+/*
+ * PG_waiters is the high bit in the same byte as PG_lock.
+ *
+ * On x86 (and on many other architectures), we can clear PG_lock and
+ * test the sign bit at the same time. But if the architecture does
+ * not support that special operation, we just do this all by hand
+ * instead.
+ *
+ * The read of PG_waiters has to be after (or concurrently with) PG_locked
+ * being cleared, but a memory barrier should be unneccssary since it is
+ * in the same byte as PG_locked.
+ */
+static inline bool clear_bit_unlock_is_negative_byte(long nr, volatile void *mem)
+{
+        clear_bit_unlock(nr, mem);
+        /* smp_mb__after_atomic(); */
+        return test_bit(PG_waiters, mem);
+}
+
+#endif
+
 /**
  * unlock_page - unlock a locked page
  * @page: the page
@@ -921,16 +944,19 @@ EXPORT_SYMBOL_GPL(add_page_wait_queue);
  * mechanism between PageLocked pages and PageWriteback pages is shared.
  * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
  *
- * The mb is necessary to enforce ordering between the clear_bit and the read
- * of the waitqueue (to avoid SMP races with a parallel wait_on_page_locked()).
+ * Note that this depends on PG_waiters being the sign bit in the byte
+ * that contains PG_locked - thus the BUILD_BUG_ON(). That allows us to
+ * clear the PG_locked bit and test PG_waiters at the same time fairly
+ * portably (architectures that do LL/SC can test any bit, while x86 can
+ * test the sign bit).
  */
 void unlock_page(struct page *page)
 {
+        BUILD_BUG_ON(PG_waiters != 7);
         page = compound_head(page);
         VM_BUG_ON_PAGE(!PageLocked(page), page);
-        clear_bit_unlock(PG_locked, &page->flags);
-        smp_mb__after_atomic();
-        wake_up_page(page, PG_locked);
+        if (clear_bit_unlock_is_negative_byte(PG_locked, &page->flags))
+                wake_up_page_bit(page, PG_locked);
 }
 EXPORT_SYMBOL(unlock_page);
 
diff --git a/mm/memory.c b/mm/memory.c
index 7d23b5050248..9f2c15cdb32c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3008,13 +3008,6 @@ static int do_set_pmd(struct vm_fault *vmf, struct page *page)
         ret = 0;
         count_vm_event(THP_FILE_MAPPED);
 out:
-        /*
-         * If we are going to fallback to pte mapping, do a
-         * withdraw with pmd lock held.
-         */
-        if (arch_needs_pgtable_deposit() && ret == VM_FAULT_FALLBACK)
-                vmf->prealloc_pte = pgtable_trans_huge_withdraw(vma->vm_mm,
-                                                                vmf->pmd);
         spin_unlock(vmf->ptl);
         return ret;
 }
@@ -3055,20 +3048,18 @@ int alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 
                 ret = do_set_pmd(vmf, page);
                 if (ret != VM_FAULT_FALLBACK)
-                        goto fault_handled;
+                        return ret;
         }
 
         if (!vmf->pte) {
                 ret = pte_alloc_one_map(vmf);
                 if (ret)
-                        goto fault_handled;
+                        return ret;
         }
 
         /* Re-check under ptl */
-        if (unlikely(!pte_none(*vmf->pte))) {
-                ret = VM_FAULT_NOPAGE;
-                goto fault_handled;
-        }
+        if (unlikely(!pte_none(*vmf->pte)))
+                return VM_FAULT_NOPAGE;
 
         flush_icache_page(vma, page);
         entry = mk_pte(page, vma->vm_page_prot);
@@ -3088,15 +3079,8 @@ int alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 
         /* no need to invalidate: a not-present page won't be cached */
         update_mmu_cache(vma, vmf->address, vmf->pte);
-        ret = 0;
 
-fault_handled:
-        /* preallocated pagetable is unused: free it */
-        if (vmf->prealloc_pte) {
-                pte_free(vmf->vma->vm_mm, vmf->prealloc_pte);
-                vmf->prealloc_pte = 0;
-        }
-        return ret;
+        return 0;
 }
 
 
@@ -3360,15 +3344,24 @@ static int do_shared_fault(struct vm_fault *vmf)
 static int do_fault(struct vm_fault *vmf)
 {
         struct vm_area_struct *vma = vmf->vma;
+        int ret;
 
         /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
         if (!vma->vm_ops->fault)
-                return VM_FAULT_SIGBUS;
-        if (!(vmf->flags & FAULT_FLAG_WRITE))
-                return do_read_fault(vmf);
-        if (!(vma->vm_flags & VM_SHARED))
-                return do_cow_fault(vmf);
-        return do_shared_fault(vmf);
+                ret = VM_FAULT_SIGBUS;
+        else if (!(vmf->flags & FAULT_FLAG_WRITE))
+                ret = do_read_fault(vmf);
+        else if (!(vma->vm_flags & VM_SHARED))
+                ret = do_cow_fault(vmf);
+        else
+                ret = do_shared_fault(vmf);
+
+        /* preallocated pagetable is unused: free it */
+        if (vmf->prealloc_pte) {
+                pte_free(vma->vm_mm, vmf->prealloc_pte);
+                vmf->prealloc_pte = 0;
+        }
+        return ret;
 }
 
 static int numa_migrate_prep(struct page *page, struct vm_area_struct *vma,
diff --git a/mm/truncate.c b/mm/truncate.c
index fd97f1dbce29..dd7b24e083c5 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -24,20 +24,12 @@
 #include <linux/rmap.h>
 #include "internal.h"
 
-static void clear_exceptional_entry(struct address_space *mapping,
-                                    pgoff_t index, void *entry)
+static void clear_shadow_entry(struct address_space *mapping, pgoff_t index,
+                               void *entry)
 {
         struct radix_tree_node *node;
         void **slot;
 
-        /* Handled by shmem itself */
-        if (shmem_mapping(mapping))
-                return;
-
-        if (dax_mapping(mapping)) {
-                dax_delete_mapping_entry(mapping, index);
-                return;
-        }
         spin_lock_irq(&mapping->tree_lock);
         /*
          * Regular page slots are stabilized by the page lock even
@@ -55,6 +47,56 @@ unlock:
         spin_unlock_irq(&mapping->tree_lock);
 }
 
+/*
+ * Unconditionally remove exceptional entry. Usually called from truncate path.
+ */
+static void truncate_exceptional_entry(struct address_space *mapping,
+                                       pgoff_t index, void *entry)
+{
+        /* Handled by shmem itself */
+        if (shmem_mapping(mapping))
+                return;
+
+        if (dax_mapping(mapping)) {
+                dax_delete_mapping_entry(mapping, index);
+                return;
+        }
+        clear_shadow_entry(mapping, index, entry);
+}
+
+/*
+ * Invalidate exceptional entry if easily possible. This handles exceptional
+ * entries for invalidate_inode_pages() so for DAX it evicts only unlocked and
+ * clean entries.
+ */
+static int invalidate_exceptional_entry(struct address_space *mapping,
+                                        pgoff_t index, void *entry)
+{
+        /* Handled by shmem itself */
+        if (shmem_mapping(mapping))
+                return 1;
+        if (dax_mapping(mapping))
+                return dax_invalidate_mapping_entry(mapping, index);
+        clear_shadow_entry(mapping, index, entry);
+        return 1;
+}
+
+/*
+ * Invalidate exceptional entry if clean. This handles exceptional entries for
+ * invalidate_inode_pages2() so for DAX it evicts only clean entries.
+ */
+static int invalidate_exceptional_entry2(struct address_space *mapping,
+                                         pgoff_t index, void *entry)
+{
+        /* Handled by shmem itself */
+        if (shmem_mapping(mapping))
+                return 1;
+        if (dax_mapping(mapping))
+                return dax_invalidate_mapping_entry_sync(mapping, index);
+        clear_shadow_entry(mapping, index, entry);
+        return 1;
+}
+
 /**
  * do_invalidatepage - invalidate part or all of a page
  * @page: the page which is affected
@@ -262,7 +304,8 @@ void truncate_inode_pages_range(struct address_space *mapping,
                                 break;
 
                         if (radix_tree_exceptional_entry(page)) {
-                                clear_exceptional_entry(mapping, index, page);
+                                truncate_exceptional_entry(mapping, index,
+                                                           page);
                                 continue;
                         }
 
@@ -351,7 +394,8 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         }
 
                         if (radix_tree_exceptional_entry(page)) {
-                                clear_exceptional_entry(mapping, index, page);
+                                truncate_exceptional_entry(mapping, index,
+                                                           page);
                                 continue;
                         }
 
@@ -470,7 +514,8 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
                                 break;
 
                         if (radix_tree_exceptional_entry(page)) {
-                                clear_exceptional_entry(mapping, index, page);
+                                invalidate_exceptional_entry(mapping, index,
+                                                             page);
                                 continue;
                         }
 
@@ -592,7 +637,9 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                                 break;
 
                         if (radix_tree_exceptional_entry(page)) {
-                                clear_exceptional_entry(mapping, index, page);
+                                if (!invalidate_exceptional_entry2(mapping,
+                                                                   index, page))
+                                        ret = -EBUSY;
                                 continue;
                         }
 
diff --git a/mm/workingset.c b/mm/workingset.c
index 241fa5d6b3b2..abb58ffa3c64 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -473,7 +473,8 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
         if (WARN_ON_ONCE(node->exceptional))
                 goto out_invalid;
         inc_node_state(page_pgdat(virt_to_page(node)), WORKINGSET_NODERECLAIM);
-        __radix_tree_delete_node(&mapping->page_tree, node);
+        __radix_tree_delete_node(&mapping->page_tree, node,
+                                 workingset_update_node, mapping);
 
 out_invalid:
         spin_unlock(&mapping->tree_lock);
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 019557d0a11d..09cfe87f0a44 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1059,7 +1059,9 @@ static void __exit lane_module_cleanup(void)
 {
         int i;
 
+#ifdef CONFIG_PROC_FS
         remove_proc_entry("lec", atm_proc_root);
+#endif
 
         deregister_atm_ioctl(&lane_ioctl_ops);
 
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 8e0c0635ee97..fb55327dcfea 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -75,6 +75,7 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)
         struct nlattr *nla;
         struct sk_buff *skb;
         unsigned long flags;
+        void *msg_header;
 
         al = sizeof(struct net_dm_alert_msg);
         al += dm_hit_limit * sizeof(struct net_dm_drop_point);
@@ -82,21 +83,41 @@ static struct sk_buff *reset_per_cpu_data(struct per_cpu_dm_data *data)
 
         skb = genlmsg_new(al, GFP_KERNEL);
 
-        if (skb) {
-                genlmsg_put(skb, 0, 0, &net_drop_monitor_family,
-                                0, NET_DM_CMD_ALERT);
-                nla = nla_reserve(skb, NLA_UNSPEC,
-                                  sizeof(struct net_dm_alert_msg));
-                msg = nla_data(nla);
-                memset(msg, 0, al);
-        } else {
-                mod_timer(&data->send_timer, jiffies + HZ / 10);
+        if (!skb)
+                goto err;
+
+        msg_header = genlmsg_put(skb, 0, 0, &net_drop_monitor_family,
+                                 0, NET_DM_CMD_ALERT);
+        if (!msg_header) {
+                nlmsg_free(skb);
+                skb = NULL;
+                goto err;
+        }
+        nla = nla_reserve(skb, NLA_UNSPEC,
+                          sizeof(struct net_dm_alert_msg));
+        if (!nla) {
+                nlmsg_free(skb);
+                skb = NULL;
+                goto err;
         }
+        msg = nla_data(nla);
+        memset(msg, 0, al);
+        goto out;
 
+err:
+        mod_timer(&data->send_timer, jiffies + HZ / 10);
+out:
         spin_lock_irqsave(&data->lock, flags);
         swap(data->skb, skb);
         spin_unlock_irqrestore(&data->lock, flags);
 
+        if (skb) {
+                struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data;
+                struct genlmsghdr *gnlh = (struct genlmsghdr *)nlmsg_data(nlh);
+
+                genlmsg_end(skb, genlmsg_data(gnlh));
+        }
+
         return skb;
 }
 
diff --git a/net/core/filter.c b/net/core/filter.c
index e6c412b94dec..1969b3f118c1 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2972,12 +2972,6 @@ void bpf_warn_invalid_xdp_action(u32 act)
 }
 EXPORT_SYMBOL_GPL(bpf_warn_invalid_xdp_action);
 
-void bpf_warn_invalid_xdp_buffer(void)
-{
-        WARN_ONCE(1, "Illegal XDP buffer encountered, expect throughput degradation\n");
-}
-EXPORT_SYMBOL_GPL(bpf_warn_invalid_xdp_buffer);
-
 static u32 sk_filter_convert_ctx_access(enum bpf_access_type type, int dst_reg,
                                         int src_reg, int ctx_off,
                                         struct bpf_insn *insn_buf,
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index d6447dc10371..fe4e1531976c 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -468,8 +468,9 @@ ip_proto_again:
                         if (hdr->flags & GRE_ACK)
                                 offset += sizeof(((struct pptp_gre_header *)0)->ack);
 
-                        ppp_hdr = skb_header_pointer(skb, nhoff + offset,
-                                                     sizeof(_ppp_hdr), _ppp_hdr);
+                        ppp_hdr = __skb_header_pointer(skb, nhoff + offset,
+                                                     sizeof(_ppp_hdr),
+                                                     data, hlen, _ppp_hdr);
                         if (!ppp_hdr)
                                 goto out_bad;
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 18b5aae99bec..75e3ea7bda08 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -3898,6 +3898,9 @@ static int rtnl_stats_get(struct sk_buff *skb, struct nlmsghdr *nlh)
         u32 filter_mask;
         int err;
 
+        if (nlmsg_len(nlh) < sizeof(*ifsm))
+                return -EINVAL;
+
         ifsm = nlmsg_data(nlh);
         if (ifsm->ifindex > 0)
                 dev = __dev_get_by_index(net, ifsm->ifindex);
@@ -3947,6 +3950,9 @@ static int rtnl_stats_dump(struct sk_buff *skb, struct netlink_callback *cb)
 
         cb->seq = net->dev_base_seq;
 
+        if (nlmsg_len(cb->nlh) < sizeof(*ifsm))
+                return -EINVAL;
+
         ifsm = nlmsg_data(cb->nlh);
         filter_mask = ifsm->filter_mask;
         if (!filter_mask)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 3ff8938893ec..eae0332b0e8c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -85,7 +85,7 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
         if (tb)
                 return tb;
 
-        if (id == RT_TABLE_LOCAL)
+        if (id == RT_TABLE_LOCAL && !net->ipv4.fib_has_custom_rules)
                 alias = fib_new_table(net, RT_TABLE_MAIN);
 
         tb = fib_trie_table(id, alias);
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 68d622133f53..5b15459955f8 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -219,9 +219,14 @@ static void igmp_start_timer(struct ip_mc_list *im, int max_delay)
 static void igmp_gq_start_timer(struct in_device *in_dev)
 {
         int tv = prandom_u32() % in_dev->mr_maxdelay;
+        unsigned long exp = jiffies + tv + 2;
+
+        if (in_dev->mr_gq_running &&
+            time_after_eq(exp, (in_dev->mr_gq_timer).expires))
+                return;
 
         in_dev->mr_gq_running = 1;
-        if (!mod_timer(&in_dev->mr_gq_timer, jiffies+tv+2))
+        if (!mod_timer(&in_dev->mr_gq_timer, exp))
                 in_dev_hold(in_dev);
 }
 
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 57e1405e8282..53ae0c6315ad 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1225,8 +1225,14 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb)
                  * which has interface index (iif) as the first member of the
                  * underlying inet{6}_skb_parm struct. This code then overlays
                  * PKTINFO_SKB_CB and in_pktinfo also has iif as the first
-                 * element so the iif is picked up from the prior IPCB
+                 * element so the iif is picked up from the prior IPCB. If iif
+                 * is the loopback interface, then return the sending interface
+                 * (e.g., process binds socket to eth0 for Tx which is
+                 * redirected to loopback in the rtable/dst).
                  */
+                if (pktinfo->ipi_ifindex == LOOPBACK_IFINDEX)
+                        pktinfo->ipi_ifindex = inet_iif(skb);
+
                 pktinfo->ipi_spec_dst.s_addr = fib_compute_spec_dst(skb);
         } else {
                 pktinfo->ipi_ifindex = 0;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a82a11747b3f..0fcac8e7a2b2 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1914,7 +1914,8 @@ local_input:
                 }
         }
 
-        rth = rt_dst_alloc(net->loopback_dev, flags | RTCF_LOCAL, res.type,
+        rth = rt_dst_alloc(l3mdev_master_dev_rcu(dev) ? : net->loopback_dev,
+                           flags | RTCF_LOCAL, res.type,
                            IN_DEV_CONF_GET(in_dev, NOPOLICY), false, do_cache);
         if (!rth)
                 goto e_nobufs;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 80bc36b25de2..22cbd61079b5 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -433,13 +433,6 @@ static struct ctl_table ipv4_table[] = {
                 .extra2         = &tcp_adv_win_scale_max,
         },
         {
-                .procname       = "tcp_tw_reuse",
-                .data           = &sysctl_tcp_tw_reuse,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = proc_dointvec
-        },
-        {
                 .procname       = "tcp_frto",
                 .data           = &sysctl_tcp_frto,
                 .maxlen         = sizeof(int),
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
+        {
+                .procname       = "tcp_tw_reuse",
+                .data           = &init_net.ipv4.sysctl_tcp_tw_reuse,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec
+        },
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
         {
                 .procname       = "fib_multipath_use_neigh",
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 30d81f533ada..fe9da4fb96bf 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -84,7 +84,6 @@
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
 
-int sysctl_tcp_tw_reuse __read_mostly;
 int sysctl_tcp_low_latency __read_mostly;
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -120,7 +119,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
            and use initial timestamp retrieved from peer table.
          */
         if (tcptw->tw_ts_recent_stamp &&
-            (!twp || (sysctl_tcp_tw_reuse &&
+            (!twp || (sock_net(sk)->ipv4.sysctl_tcp_tw_reuse &&
                              get_seconds() - tcptw->tw_ts_recent_stamp > 1))) {
                 tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;
                 if (tp->write_seq == 0)
@@ -2456,6 +2455,7 @@ static int __net_init tcp_sk_init(struct net *net)
         net->ipv4.sysctl_tcp_orphan_retries = 0;
         net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;
         net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;
+        net->ipv4.sysctl_tcp_tw_reuse = 0;
 
         return 0;
 fail:
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 70d0de404197..38122d04fadc 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1373,7 +1373,7 @@ emsgsize:
          */
 
         cork->length += length;
-        if (((length > mtu) ||
+        if ((((length + fragheaderlen) > mtu) ||
              (skb && skb_is_gso(skb))) &&
             (sk->sk_protocol == IPPROTO_UDP) &&
             (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 8938b6ba57a0..3d73278b86ca 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -47,7 +47,8 @@ static inline struct l2tp_ip_sock *l2tp_ip_sk(const struct sock *sk)
         return (struct l2tp_ip_sock *)sk;
 }
 
-static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif, u32 tunnel_id)
+static struct sock *__l2tp_ip_bind_lookup(const struct net *net, __be32 laddr,
+                                          __be32 raddr, int dif, u32 tunnel_id)
 {
         struct sock *sk;
 
@@ -61,6 +62,7 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif
                 if ((l2tp->conn_id == tunnel_id) &&
                     net_eq(sock_net(sk), net) &&
                     !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
+                    (!inet->inet_daddr || !raddr || inet->inet_daddr == raddr) &&
                     (!sk->sk_bound_dev_if || !dif ||
                      sk->sk_bound_dev_if == dif))
                         goto found;
@@ -71,15 +73,6 @@ found:
         return sk;
 }
 
-static inline struct sock *l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif, u32 tunnel_id)
-{
-        struct sock *sk = __l2tp_ip_bind_lookup(net, laddr, dif, tunnel_id);
-        if (sk)
-                sock_hold(sk);
-
-        return sk;
-}
-
 /* When processing receive frames, there are two cases to
  * consider. Data frames consist of a non-zero session-id and an
  * optional cookie. Control frames consist of a regular L2TP header
@@ -183,8 +176,8 @@ pass_up:
                 struct iphdr *iph = (struct iphdr *) skb_network_header(skb);
 
                 read_lock_bh(&l2tp_ip_lock);
-                sk = __l2tp_ip_bind_lookup(net, iph->daddr, inet_iif(skb),
-                                           tunnel_id);
+                sk = __l2tp_ip_bind_lookup(net, iph->daddr, iph->saddr,
+                                           inet_iif(skb), tunnel_id);
                 if (!sk) {
                         read_unlock_bh(&l2tp_ip_lock);
                         goto discard;
@@ -280,7 +273,7 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                 inet->inet_saddr = 0;  /* Use device */
 
         write_lock_bh(&l2tp_ip_lock);
-        if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr,
+        if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr, 0,
                                   sk->sk_bound_dev_if, addr->l2tp_conn_id)) {
                 write_unlock_bh(&l2tp_ip_lock);
                 ret = -EADDRINUSE;
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index f092ac441fdd..331ccf5a7bad 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -59,12 +59,14 @@ static inline struct l2tp_ip6_sock *l2tp_ip6_sk(const struct sock *sk)
 
 static struct sock *__l2tp_ip6_bind_lookup(struct net *net,
                                            struct in6_addr *laddr,
+                                           const struct in6_addr *raddr,
                                            int dif, u32 tunnel_id)
 {
         struct sock *sk;
 
         sk_for_each_bound(sk, &l2tp_ip6_bind_table) {
-                const struct in6_addr *addr = inet6_rcv_saddr(sk);
+                const struct in6_addr *sk_laddr = inet6_rcv_saddr(sk);
+                const struct in6_addr *sk_raddr = &sk->sk_v6_daddr;
                 struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk);
 
                 if (l2tp == NULL)
@@ -72,7 +74,8 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net,
 
                 if ((l2tp->conn_id == tunnel_id) &&
                     net_eq(sock_net(sk), net) &&
-                    (!addr || ipv6_addr_equal(addr, laddr)) &&
+                    (!sk_laddr || ipv6_addr_any(sk_laddr) || ipv6_addr_equal(sk_laddr, laddr)) &&
+                    (!raddr || ipv6_addr_any(sk_raddr) || ipv6_addr_equal(sk_raddr, raddr)) &&
                     (!sk->sk_bound_dev_if || !dif ||
                      sk->sk_bound_dev_if == dif))
                         goto found;
@@ -83,17 +86,6 @@ found:
         return sk;
 }
 
-static inline struct sock *l2tp_ip6_bind_lookup(struct net *net,
-                                                struct in6_addr *laddr,
-                                                int dif, u32 tunnel_id)
-{
-        struct sock *sk = __l2tp_ip6_bind_lookup(net, laddr, dif, tunnel_id);
-        if (sk)
-                sock_hold(sk);
-
-        return sk;
-}
-
 /* When processing receive frames, there are two cases to
  * consider. Data frames consist of a non-zero session-id and an
  * optional cookie. Control frames consist of a regular L2TP header
@@ -197,8 +189,8 @@ pass_up:
                 struct ipv6hdr *iph = ipv6_hdr(skb);
 
                 read_lock_bh(&l2tp_ip6_lock);
-                sk = __l2tp_ip6_bind_lookup(net, &iph->daddr, inet6_iif(skb),
-                                            tunnel_id);
+                sk = __l2tp_ip6_bind_lookup(net, &iph->daddr, &iph->saddr,
+                                            inet6_iif(skb), tunnel_id);
                 if (!sk) {
                         read_unlock_bh(&l2tp_ip6_lock);
                         goto discard;
@@ -330,7 +322,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         rcu_read_unlock();
 
         write_lock_bh(&l2tp_ip6_lock);
-        if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr, bound_dev_if,
+        if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr, NULL, bound_dev_if,
                                    addr->l2tp_conn_id)) {
                 write_unlock_bh(&l2tp_ip6_lock);
                 err = -EADDRINUSE;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2c21b7039136..0d8b716e509e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3287,7 +3287,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
         int extra_head = fast_tx->hdr_len - (ETH_HLEN - 2);
         int hw_headroom = sdata->local->hw.extra_tx_headroom;
         struct ethhdr eth;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_tx_info *info;
         struct ieee80211_hdr *hdr = (void *)fast_tx->hdr;
         struct ieee80211_tx_data tx;
         ieee80211_tx_result r;
@@ -3351,6 +3351,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
         memcpy(skb->data + fast_tx->da_offs, eth.h_dest, ETH_ALEN);
         memcpy(skb->data + fast_tx->sa_offs, eth.h_source, ETH_ALEN);
 
+        info = IEEE80211_SKB_CB(skb);
         memset(info, 0, sizeof(*info));
         info->band = fast_tx->band;
         info->control.vif = &sdata->vif;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 2d4c4d3911c0..9c62b6325f7a 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -606,7 +606,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
         rcu_assign_pointer(flow->sf_acts, acts);
         packet->priority = flow->key.phy.priority;
         packet->mark = flow->key.phy.skb_mark;
-        packet->protocol = flow->key.eth.type;
 
         rcu_read_lock();
         dp = get_dp_rcu(net, ovs_header->dp_ifindex);
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 08aa926cd5cf..2c0a00f7f1b7 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -312,7 +312,8 @@ static bool icmp6hdr_ok(struct sk_buff *skb)
  * Returns 0 if it encounters a non-vlan or incomplete packet.
  * Returns 1 after successfully parsing vlan tag.
  */
-static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh)
+static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh,
+                          bool untag_vlan)
 {
         struct vlan_head *vh = (struct vlan_head *)skb->data;
 
@@ -330,7 +331,20 @@ static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh)
         key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT);
         key_vh->tpid = vh->tpid;
 
-        __skb_pull(skb, sizeof(struct vlan_head));
+        if (unlikely(untag_vlan)) {
+                int offset = skb->data - skb_mac_header(skb);
+                u16 tci;
+                int err;
+
+                __skb_push(skb, offset);
+                err = __skb_vlan_pop(skb, &tci);
+                __skb_pull(skb, offset);
+                if (err)
+                        return err;
+                __vlan_hwaccel_put_tag(skb, key_vh->tpid, tci);
+        } else {
+                __skb_pull(skb, sizeof(struct vlan_head));
+        }
         return 1;
 }
 
@@ -351,13 +365,13 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
                 key->eth.vlan.tpid = skb->vlan_proto;
         } else {
                 /* Parse outer vlan tag in the non-accelerated case. */
-                res = parse_vlan_tag(skb, &key->eth.vlan);
+                res = parse_vlan_tag(skb, &key->eth.vlan, true);
                 if (res <= 0)
                         return res;
         }
 
         /* Parse inner vlan tag. */
-        res = parse_vlan_tag(skb, &key->eth.cvlan);
+        res = parse_vlan_tag(skb, &key->eth.cvlan, false);
         if (res <= 0)
                 return res;
 
@@ -800,29 +814,15 @@ int ovs_flow_key_extract_userspace(struct net *net, const struct nlattr *attr,
         if (err)
                 return err;
 
-        if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) {
-                /* key_extract assumes that skb->protocol is set-up for
-                 * layer 3 packets which is the case for other callers,
-                 * in particular packets recieved from the network stack.
-                 * Here the correct value can be set from the metadata
-                 * extracted above.
-                 */
-                skb->protocol = key->eth.type;
-        } else {
-                struct ethhdr *eth;
-
-                skb_reset_mac_header(skb);
-                eth = eth_hdr(skb);
-
-                /* Normally, setting the skb 'protocol' field would be
-                 * handled by a call to eth_type_trans(), but it assumes
-                 * there's a sending device, which we may not have.
-                 */
-                if (eth_proto_is_802_3(eth->h_proto))
-                        skb->protocol = eth->h_proto;
-                else
-                        skb->protocol = htons(ETH_P_802_2);
-        }
+        /* key_extract assumes that skb->protocol is set-up for
+         * layer 3 packets which is the case for other callers,
+         * in particular packets received from the network stack.
+         * Here the correct value can be set from the metadata
+         * extracted above.
+         * For L2 packet key eth type would be zero. skb protocol
+         * would be set to correct value later during key-extact.
+         */
 
+        skb->protocol = key->eth.type;
         return key_extract(skb, key);
 }
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 3fbba79a4ef0..1ecdf809b5fa 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -148,13 +148,15 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n)
         unsigned long cl;
         unsigned long fh;
         int err;
-        int tp_created = 0;
+        int tp_created;
 
         if ((n->nlmsg_type != RTM_GETTFILTER) &&
             !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                 return -EPERM;
 
 replay:
+        tp_created = 0;
+
         err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, NULL);
         if (err < 0)
                 return err;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 333f8e268431..970db7a41684 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -153,10 +153,14 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 
                 switch (ip_tunnel_info_af(info)) {
                 case AF_INET:
+                        skb_key.enc_control.addr_type =
+                                FLOW_DISSECTOR_KEY_IPV4_ADDRS;
                         skb_key.enc_ipv4.src = key->u.ipv4.src;
                         skb_key.enc_ipv4.dst = key->u.ipv4.dst;
                         break;
                 case AF_INET6:
+                        skb_key.enc_control.addr_type =
+                                FLOW_DISSECTOR_KEY_IPV6_ADDRS;
                         skb_key.enc_ipv6.src = key->u.ipv6.src;
                         skb_key.enc_ipv6.dst = key->u.ipv6.dst;
                         break;
diff --git a/net/socket.c b/net/socket.c
index 8487bf136e5c..a8c2307590b8 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -537,7 +537,7 @@ int sockfs_setattr(struct dentry *dentry, struct iattr *iattr)
 {
         int err = simple_setattr(dentry, iattr);
 
-        if (!err) {
+        if (!err && (iattr->ia_valid & ATTR_UID)) {
                 struct socket *sock = SOCKET_I(d_inode(dentry));
 
                 sock->sk->sk_uid = iattr->ia_uid;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 333c5dae0072..800caaa699a1 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -441,15 +441,19 @@ static void __tipc_shutdown(struct socket *sock, int error)
         while ((skb = __skb_dequeue(&sk->sk_receive_queue)) != NULL) {
                 if (TIPC_SKB_CB(skb)->bytes_read) {
                         kfree_skb(skb);
-                } else {
-                        if (!tipc_sk_type_connectionless(sk) &&
-                            sk->sk_state != TIPC_DISCONNECTING) {
-                                tipc_set_sk_state(sk, TIPC_DISCONNECTING);
-                                tipc_node_remove_conn(net, dnode, tsk->portid);
-                        }
-                        tipc_sk_respond(sk, skb, error);
+                        continue;
+                }
+                if (!tipc_sk_type_connectionless(sk) &&
+                    sk->sk_state != TIPC_DISCONNECTING) {
+                        tipc_set_sk_state(sk, TIPC_DISCONNECTING);
+                        tipc_node_remove_conn(net, dnode, tsk->portid);
                 }
+                tipc_sk_respond(sk, skb, error);
         }
+
+        if (tipc_sk_type_connectionless(sk))
+                return;
+
         if (sk->sk_state != TIPC_DISCONNECTING) {
                 skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,
                                       TIPC_CONN_MSG, SHORT_H_SIZE, 0, dnode,
@@ -457,10 +461,8 @@ static void __tipc_shutdown(struct socket *sock, int error)
                                       tsk->portid, error);
                 if (skb)
                         tipc_node_xmit_skb(net, skb, dnode, tsk->portid);
-                if (!tipc_sk_type_connectionless(sk)) {
-                        tipc_node_remove_conn(net, dnode, tsk->portid);
-                        tipc_set_sk_state(sk, TIPC_DISCONNECTING);
-                }
+                tipc_node_remove_conn(net, dnode, tsk->portid);
+                tipc_set_sk_state(sk, TIPC_DISCONNECTING);
         }
 }
 
diff --git a/samples/Kconfig b/samples/Kconfig
index a6d2a43bbf2e..b124f62ed6cb 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
         help
           Build samples of blackfin gptimers sample module.
 
+config SAMPLE_VFIO_MDEV_MTTY
+        tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
+        depends on VFIO_MDEV_DEVICE && m
+        help
+          Build a virtual tty sample driver for use as a VFIO
+          mediated device
+
 endif # SAMPLES
diff --git a/samples/Makefile b/samples/Makefile
index e17d66d77f09..86a137e451d9 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -2,4 +2,5 @@
 
 obj-$(CONFIG_SAMPLES)   += kobject/ kprobes/ trace_events/ livepatch/ \
                            hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
-                           configfs/ connector/ v4l/ trace_printk/ blackfin/
+                           configfs/ connector/ v4l/ trace_printk/ blackfin/ \
+                           vfio-mdev/
diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
index a932edbe38eb..cbbd868a50a8 100644
--- a/samples/vfio-mdev/Makefile
+++ b/samples/vfio-mdev/Makefile
@@ -1,13 +1 @@
-#
-# Makefile for mtty.c file
-#
-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-
-obj-m:=mtty.o
-
-modules clean modules_install:
-        $(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
-
-default: modules
-
-module: modules
+obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o
diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c
index 6b633a4ea333..1fc57a5093a7 100644
--- a/samples/vfio-mdev/mtty.c
+++ b/samples/vfio-mdev/mtty.c
@@ -164,7 +164,7 @@ static struct mdev_state *find_mdev_state_by_uuid(uuid_le uuid)
         struct mdev_state *mds;
 
         list_for_each_entry(mds, &mdev_devices_list, next) {
-                if (uuid_le_cmp(mds->mdev->uuid, uuid) == 0)
+                if (uuid_le_cmp(mdev_uuid(mds->mdev), uuid) == 0)
                         return mds;
         }
 
@@ -341,7 +341,8 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state,
                                 pr_err("Serial port %d: Fifo level trigger\n",
                                         index);
 #endif
-                                mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                                mtty_trigger_interrupt(
+                                                mdev_uuid(mdev_state->mdev));
                         }
                 } else {
 #if defined(DEBUG_INTR)
@@ -355,7 +356,8 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state,
                          */
                         if (mdev_state->s[index].uart_reg[UART_IER] &
                                                                 UART_IER_RLSI)
-                                mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                                mtty_trigger_interrupt(
+                                                mdev_uuid(mdev_state->mdev));
                 }
                 mutex_unlock(&mdev_state->rxtx_lock);
                 break;
@@ -374,7 +376,8 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state,
                                 pr_err("Serial port %d: IER_THRI write\n",
                                         index);
 #endif
-                                mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                                mtty_trigger_interrupt(
+                                                mdev_uuid(mdev_state->mdev));
                         }
 
                         mutex_unlock(&mdev_state->rxtx_lock);
@@ -445,7 +448,7 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state,
 #if defined(DEBUG_INTR)
                         pr_err("Serial port %d: MCR_OUT2 write\n", index);
 #endif
-                        mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                        mtty_trigger_interrupt(mdev_uuid(mdev_state->mdev));
                 }
 
                 if ((mdev_state->s[index].uart_reg[UART_IER] & UART_IER_MSI) &&
@@ -453,7 +456,7 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state,
 #if defined(DEBUG_INTR)
                         pr_err("Serial port %d: MCR RTS/DTR write\n", index);
 #endif
-                        mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                        mtty_trigger_interrupt(mdev_uuid(mdev_state->mdev));
                 }
                 break;
 
@@ -504,7 +507,8 @@ static void handle_bar_read(unsigned int index, struct mdev_state *mdev_state,
 #endif
                         if (mdev_state->s[index].uart_reg[UART_IER] &
                                                          UART_IER_THRI)
-                                mtty_trigger_interrupt(mdev_state->mdev->uuid);
+                                mtty_trigger_interrupt(
+                                        mdev_uuid(mdev_state->mdev));
                 }
                 mutex_unlock(&mdev_state->rxtx_lock);
 
@@ -734,7 +738,7 @@ int mtty_create(struct kobject *kobj, struct mdev_device *mdev)
 
         for (i = 0; i < 2; i++) {
                 snprintf(name, MTTY_STRING_LEN, "%s-%d",
-                        dev_driver_string(mdev->parent->dev), i + 1);
+                        dev_driver_string(mdev_parent_dev(mdev)), i + 1);
                 if (!strcmp(kobj->name, name)) {
                         nr_ports = i + 1;
                         break;
@@ -1298,10 +1302,8 @@ static ssize_t
 sample_mdev_dev_show(struct device *dev, struct device_attribute *attr,
                      char *buf)
 {
-        struct mdev_device *mdev = to_mdev_device(dev);
-
-        if (mdev)
-                return sprintf(buf, "This is MDEV %s\n", dev_name(&mdev->dev));
+        if (mdev_from_dev(dev))
+                return sprintf(buf, "This is MDEV %s\n", dev_name(dev));
 
         return sprintf(buf, "\n");
 }
@@ -1402,7 +1404,7 @@ struct attribute_group *mdev_type_groups[] = {
         NULL,
 };
 
-struct parent_ops mdev_fops = {
+struct mdev_parent_ops mdev_fops = {
         .owner                  = THIS_MODULE,
         .dev_attr_groups        = mtty_dev_groups,
         .mdev_attr_groups       = mdev_dev_groups,
@@ -1447,6 +1449,7 @@ static int __init mtty_dev_init(void)
 
         if (IS_ERR(mtty_dev.vd_class)) {
                 pr_err("Error: failed to register mtty_dev class\n");
+                ret = PTR_ERR(mtty_dev.vd_class);
                 goto failed1;
         }
 
@@ -1458,7 +1461,8 @@ static int __init mtty_dev_init(void)
         if (ret)
                 goto failed2;
 
-        if (mdev_register_device(&mtty_dev.dev, &mdev_fops) != 0)
+        ret = mdev_register_device(&mtty_dev.dev, &mdev_fops);
+        if (ret)
                 goto failed3;
 
         mutex_init(&mdev_list_lock);
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index 950fd2e64bb7..12262c0cc691 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -39,6 +39,9 @@
 #include "hash-map.h"
 #endif
 
+#if BUILDING_GCC_VERSION >= 7000
+#include "memmodel.h"
+#endif
 #include "emit-rtl.h"
 #include "debug.h"
 #include "target.h"
@@ -91,6 +94,9 @@
 #include "tree-ssa-alias.h"
 #include "tree-ssa.h"
 #include "stringpool.h"
+#if BUILDING_GCC_VERSION >= 7000
+#include "tree-vrp.h"
+#endif
 #include "tree-ssanames.h"
 #include "print-tree.h"
 #include "tree-eh.h"
@@ -287,6 +293,22 @@ static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct c
         return NULL;
 }
 
+static inline bool cgraph_for_node_and_aliases(cgraph_node_ptr node, bool (*callback)(cgraph_node_ptr, void *), void *data, bool include_overwritable)
+{
+        cgraph_node_ptr alias;
+
+        if (callback(node, data))
+                return true;
+
+        for (alias = node->same_body; alias; alias = alias->next) {
+                if (include_overwritable || cgraph_function_body_availability(alias) > AVAIL_OVERWRITABLE)
+                        if (cgraph_for_node_and_aliases(alias, callback, data, include_overwritable))
+                                return true;
+        }
+
+        return false;
+}
+
 #define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
         for ((node) = cgraph_first_function_with_gimple_body(); (node); \
                 (node) = cgraph_next_function_with_gimple_body(node))
@@ -399,6 +421,7 @@ typedef union gimple_statement_d gassign;
 typedef union gimple_statement_d gcall;
 typedef union gimple_statement_d gcond;
 typedef union gimple_statement_d gdebug;
+typedef union gimple_statement_d ggoto;
 typedef union gimple_statement_d gphi;
 typedef union gimple_statement_d greturn;
 
@@ -452,6 +475,16 @@ static inline const gdebug *as_a_const_gdebug(const_gimple stmt)
         return stmt;
 }
 
+static inline ggoto *as_a_ggoto(gimple stmt)
+{
+        return stmt;
+}
+
+static inline const ggoto *as_a_const_ggoto(const_gimple stmt)
+{
+        return stmt;
+}
+
 static inline gphi *as_a_gphi(gimple stmt)
 {
         return stmt;
@@ -496,6 +529,14 @@ static inline const greturn *as_a_const_greturn(const_gimple stmt)
 
 typedef struct rtx_def rtx_insn;
 
+static inline const char *get_decl_section_name(const_tree decl)
+{
+        if (DECL_SECTION_NAME(decl) == NULL_TREE)
+                return NULL;
+
+        return TREE_STRING_POINTER(DECL_SECTION_NAME(decl));
+}
+
 static inline void set_decl_section_name(tree node, const char *value)
 {
         if (value)
@@ -511,6 +552,7 @@ typedef struct gimple_statement_base gassign;
 typedef struct gimple_statement_call gcall;
 typedef struct gimple_statement_base gcond;
 typedef struct gimple_statement_base gdebug;
+typedef struct gimple_statement_base ggoto;
 typedef struct gimple_statement_phi gphi;
 typedef struct gimple_statement_base greturn;
 
@@ -564,6 +606,16 @@ static inline const gdebug *as_a_const_gdebug(const_gimple stmt)
         return stmt;
 }
 
+static inline ggoto *as_a_ggoto(gimple stmt)
+{
+        return stmt;
+}
+
+static inline const ggoto *as_a_const_ggoto(const_gimple stmt)
+{
+        return stmt;
+}
+
 static inline gphi *as_a_gphi(gimple stmt)
 {
         return as_a<gphi>(stmt);
@@ -611,6 +663,11 @@ inline bool is_a_helper<const gassign *>::test(const_gimple gs)
 
 #define INSN_DELETED_P(insn) (insn)->deleted()
 
+static inline const char *get_decl_section_name(const_tree decl)
+{
+        return DECL_SECTION_NAME(decl);
+}
+
 /* symtab/cgraph related */
 #define debug_cgraph_node(node) (node)->debug()
 #define cgraph_get_node(decl) cgraph_node::get(decl)
@@ -619,6 +676,7 @@ inline bool is_a_helper<const gassign *>::test(const_gimple gs)
 #define cgraph_n_nodes symtab->cgraph_count
 #define cgraph_max_uid symtab->cgraph_max_uid
 #define varpool_get_node(decl) varpool_node::get(decl)
+#define dump_varpool_node(file, node) (node)->dump(file)
 
 #define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
         (caller)->create_edge((callee), (call_stmt), (count), (freq))
@@ -674,6 +732,11 @@ static inline cgraph_node_ptr cgraph_alias_target(cgraph_node_ptr node)
         return node->get_alias_target();
 }
 
+static inline bool cgraph_for_node_and_aliases(cgraph_node_ptr node, bool (*callback)(cgraph_node_ptr, void *), void *data, bool include_overwritable)
+{
+        return node->call_for_symbol_thunks_and_aliases(callback, data, include_overwritable);
+}
+
 static inline struct cgraph_node_hook_list *cgraph_add_function_insertion_hook(cgraph_node_hook hook, void *data)
 {
         return symtab->add_cgraph_insertion_hook(hook, data);
@@ -731,6 +794,13 @@ static inline gimple gimple_build_assign_with_ops(enum tree_code subcode, tree l
 
 template <>
 template <>
+inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
+{
+        return gs->code == GIMPLE_GOTO;
+}
+
+template <>
+template <>
 inline bool is_a_helper<const greturn *>::test(const_gimple gs)
 {
         return gs->code == GIMPLE_RETURN;
@@ -766,6 +836,16 @@ static inline const gcall *as_a_const_gcall(const_gimple stmt)
         return as_a<const gcall *>(stmt);
 }
 
+static inline ggoto *as_a_ggoto(gimple stmt)
+{
+        return as_a<ggoto *>(stmt);
+}
+
+static inline const ggoto *as_a_const_ggoto(const_gimple stmt)
+{
+        return as_a<const ggoto *>(stmt);
+}
+
 static inline gphi *as_a_gphi(gimple stmt)
 {
         return as_a<gphi *>(stmt);
@@ -828,4 +908,9 @@ static inline void debug_gimple_stmt(const_gimple s)
 #define debug_gimple_stmt(s) debug_gimple_stmt(CONST_CAST_GIMPLE(s))
 #endif
 
+#if BUILDING_GCC_VERSION >= 7000
+#define get_inner_reference(exp, pbitsize, pbitpos, poffset, pmode, punsignedp, preversep, pvolatilep, keep_aligning)   \
+        get_inner_reference(exp, pbitsize, pbitpos, poffset, pmode, punsignedp, preversep, pvolatilep)
+#endif
+
 #endif
diff --git a/scripts/gcc-plugins/latent_entropy_plugin.c b/scripts/gcc-plugins/latent_entropy_plugin.c
index 12541126575b..8ff203ad4809 100644
--- a/scripts/gcc-plugins/latent_entropy_plugin.c
+++ b/scripts/gcc-plugins/latent_entropy_plugin.c
@@ -328,9 +328,9 @@ static enum tree_code get_op(tree *rhs)
                         op = LROTATE_EXPR;
                         /*
                          * This code limits the value of random_const to
-                         * the size of a wide int for the rotation
+                         * the size of a long for the rotation
                          */
-                        random_const &= HOST_BITS_PER_WIDE_INT - 1;
+                        random_const %= TYPE_PRECISION(long_unsigned_type_node);
                         break;
                 }
 
diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c
index ee47924aef0d..827161bc269c 100644
--- a/sound/firewire/fireworks/fireworks_stream.c
+++ b/sound/firewire/fireworks/fireworks_stream.c
@@ -117,7 +117,7 @@ destroy_stream(struct snd_efw *efw, struct amdtp_stream *stream)
                 conn = &efw->in_conn;
 
         amdtp_stream_destroy(stream);
-        cmp_connection_destroy(&efw->out_conn);
+        cmp_connection_destroy(conn);
 }
 
 static int
diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c
index 4ad3bd7fd445..f1657a4e0621 100644
--- a/sound/firewire/tascam/tascam-stream.c
+++ b/sound/firewire/tascam/tascam-stream.c
@@ -343,7 +343,7 @@ int snd_tscm_stream_init_duplex(struct snd_tscm *tscm)
         if (err < 0)
                 amdtp_stream_destroy(&tscm->rx_stream);
 
-        return 0;
+        return err;
 }
 
 /* At bus reset, streaming is stopped and some registers are clear. */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 9448daff9d8b..7d660ee1d5e8 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2230,6 +2230,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),
         SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),
         SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS),
+        SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3),
         SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
         SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),
         SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),
@@ -6983,6 +6984,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
         SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),
         SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),
+        SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71SL", ALC662_FIXUP_ASUS_MODE8),
         SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
         SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
         SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 15d1d5c63c3c..c90607ebe155 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -384,6 +384,9 @@ static void snd_complete_urb(struct urb *urb)
         if (unlikely(atomic_read(&ep->chip->shutdown)))
                 goto exit_clear;
 
+        if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
+                goto exit_clear;
+
         if (usb_pipeout(ep->pipe)) {
                 retire_outbound_urb(ep, ctx);
                 /* can be stopped during retire callback */
@@ -534,6 +537,11 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep)
                         alive, ep->ep_num);
         clear_bit(EP_FLAG_STOPPING, &ep->flags);
 
+        ep->data_subs = NULL;
+        ep->sync_slave = NULL;
+        ep->retire_data_urb = NULL;
+        ep->prepare_data_urb = NULL;
+
         return 0;
 }
 
@@ -912,9 +920,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
 /**
  * snd_usb_endpoint_start: start an snd_usb_endpoint
  *
- * @ep:         the endpoint to start
- * @can_sleep:  flag indicating whether the operation is executed in
- *              non-atomic context
+ * @ep: the endpoint to start
  *
  * A call to this function will increment the use count of the endpoint.
  * In case it is not already running, the URBs for this endpoint will be
@@ -924,7 +930,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
  *
  * Returns an error if the URB submission failed, 0 in all other cases.
  */
-int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep)
+int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)
 {
         int err;
         unsigned int i;
@@ -938,8 +944,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep)
 
         /* just to be sure */
         deactivate_urbs(ep, false);
-        if (can_sleep)
-                wait_clear_urbs(ep);
 
         ep->active_mask = 0;
         ep->unlink_mask = 0;
@@ -1020,10 +1024,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep)
 
         if (--ep->use_count == 0) {
                 deactivate_urbs(ep, false);
-                ep->data_subs = NULL;
-                ep->sync_slave = NULL;
-                ep->retire_data_urb = NULL;
-                ep->prepare_data_urb = NULL;
                 set_bit(EP_FLAG_STOPPING, &ep->flags);
         }
 }
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h
index 6428392d8f62..584f295d7c77 100644
--- a/sound/usb/endpoint.h
+++ b/sound/usb/endpoint.h
@@ -18,7 +18,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
                                 struct audioformat *fmt,
                                 struct snd_usb_endpoint *sync_ep);
 
-int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep);
+int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep);
 void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep);
 void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep);
 int  snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 34c6d4f2c0b6..9aa5b1855481 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -218,7 +218,7 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
         }
 }
 
-static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep)
+static int start_endpoints(struct snd_usb_substream *subs)
 {
         int err;
 
@@ -231,7 +231,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep)
                 dev_dbg(&subs->dev->dev, "Starting data EP @%p\n", ep);
 
                 ep->data_subs = subs;
-                err = snd_usb_endpoint_start(ep, can_sleep);
+                err = snd_usb_endpoint_start(ep);
                 if (err < 0) {
                         clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags);
                         return err;
@@ -260,7 +260,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep)
                 dev_dbg(&subs->dev->dev, "Starting sync EP @%p\n", ep);
 
                 ep->sync_slave = subs->data_endpoint;
-                err = snd_usb_endpoint_start(ep, can_sleep);
+                err = snd_usb_endpoint_start(ep);
                 if (err < 0) {
                         clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags);
                         return err;
@@ -850,7 +850,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
         /* for playback, submit the URBs now; otherwise, the first hwptr_done
          * updates for all URBs would happen at the same time when starting */
         if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK)
-                ret = start_endpoints(subs, true);
+                ret = start_endpoints(subs);
 
  unlock:
         snd_usb_unlock_shutdown(subs->stream->chip);
@@ -1666,7 +1666,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                err = start_endpoints(subs, false);
+                err = start_endpoints(subs);
                 if (err < 0)
                         return err;
 
diff --git a/usr/Makefile b/usr/Makefile
index 17a513268325..0b87e71c00fc 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -5,8 +5,10 @@
 klibcdirs:;
 PHONY += klibcdirs
 
-suffix_y = $(CONFIG_INITRAMFS_COMPRESSION)
-AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
+suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
+datafile_y = initramfs_data.cpio$(suffix_y)
+AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/$(datafile_y)"
+
 
 # Generate builtin.o based on initramfs_data.o
 obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
@@ -14,7 +16,7 @@ obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
 # initramfs_data.o contains the compressed initramfs_data.cpio image.
 # The image is included using .incbin, a dependency which is not
 # tracked automatically.
-$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
+$(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE
 
 #####
 # Generate the initramfs cpio archive
@@ -38,10 +40,8 @@ endif
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
-targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 \
-        initramfs_data.cpio.lzma initramfs_data.cpio.xz \
-        initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
-        initramfs_data.cpio
+targets := $(datafile_y)
+
 # do not try to update files included in initramfs
 $(deps_initramfs): ;
 
@@ -51,6 +51,6 @@ $(deps_initramfs): klibcdirs
 # 2) There are changes in which files are included (added or deleted)
 # 3) If gen_init_cpio are newer than initramfs_data.cpio
 # 4) arguments to gen_initramfs.sh changes
-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
+$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
         $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
         $(call if_changed,initfs)